diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index a1d2625a47..6e727b7cde 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -26,7 +26,7 @@
 <!--- List any breaking changes here. -->
 
 ## Obsoletions / Deprecations
-<!--- Obsolete and Deprecated attributes on APIs MUST only be included when discussed with Core team. @grokys, @kekekeks & @danwalmsley -->
+<!--- Obsolete and Deprecated attributes on APIs MUST only be included when discussed with Core team. @grokys, @kekekeks & @MrJul -->
 
 ## Fixed issues
 <!--- If the pull request fixes issue(s) list them like this: 
diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
new file mode 100644
index 0000000000..43de3ddefd
--- /dev/null
+++ b/.github/copilot-instructions.md
@@ -0,0 +1,3 @@
+
+When running code review, please refer to the following documents if they are relevant to the changed parts of the codebase:
+- `native/Avalonia.Native/**` -> `native/Avalonia.Native/README.md`
diff --git a/.github/workflows/update-api.yml b/.github/workflows/update-api.yml
index 27a0598d3b..5e45fcd567 100644
--- a/.github/workflows/update-api.yml
+++ b/.github/workflows/update-api.yml
@@ -59,7 +59,9 @@ jobs:
               repo: context.repo.repo,
               pull_number: context.issue.number,
             });
-            if (pr.head.repo.full_name !== `${context.repo.owner}/${context.repo.repo}`) {
+            const isFork = pr.head.repo.full_name !== `${context.repo.owner}/${context.repo.repo}`;
+            const isTrustedOverride = context.payload.comment.body.includes('/trusted');
+            if (isFork && !isTrustedOverride) {
               core.setFailed('Cannot run /update-api on fork PRs — would execute untrusted code with write permissions.');
               return;
             }
diff --git a/Avalonia.Desktop.slnf b/Avalonia.Desktop.slnf
index dfa0945890..3edf421eb4 100644
--- a/Avalonia.Desktop.slnf
+++ b/Avalonia.Desktop.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "Avalonia.sln",
+    "path": "Avalonia.slnx",
     "projects": [
       "packages\\Avalonia\\Avalonia.csproj",
       "samples\\AppWithoutLifetime\\AppWithoutLifetime.csproj",
diff --git a/Avalonia.sln b/Avalonia.sln
deleted file mode 100644
index 207f673c26..0000000000
--- a/Avalonia.sln
+++ /dev/null
@@ -1,764 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-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("{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.Controls", "src\Avalonia.Controls\Avalonia.Controls.csproj", "{D2221C82-4A25-4583-9B43-D791E3F6820C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Themes.Simple", "src\Avalonia.Themes.Simple\Avalonia.Themes.Simple.csproj", "{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}"
-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.Base.UnitTests", "tests\Avalonia.Base.UnitTests\Avalonia.Base.UnitTests.csproj", "{2905FF23-53FB-45E6-AA49-6AF47A172056}"
-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}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Markup", "Markup", "{8B6A8209-894F-4BA1-B880-965FD453982C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Markup.Xaml", "src\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj", "{3E53A01A-B331-47F3-B828-4A5717E77A24}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{9B9E3891-2366-4253-A952-D08BCEB71098}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{A689DEF5-D50F-4975-8B72-124C9EB54066}"
-	ProjectSection(SolutionItems) = preProject
-		.editorconfig = .editorconfig
-		src\Shared\CallerArgumentExpressionAttribute.cs = src\Shared\CallerArgumentExpressionAttribute.cs
-		src\Shared\IsExternalInit.cs = src\Shared\IsExternalInit.cs
-		src\Shared\ModuleInitializer.cs = src\Shared\ModuleInitializer.cs
-		src\Shared\SourceGeneratorAttributes.cs = src\Shared\SourceGeneratorAttributes.cs
-		src\Shared\StreamCompatibilityExtensions.cs = src\Shared\StreamCompatibilityExtensions.cs
-		src\Shared\StringCompatibilityExtensions.cs = src\Shared\StringCompatibilityExtensions.cs
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Markup", "src\Markup\Avalonia.Markup\Avalonia.Markup.csproj", "{6417E941-21BC-467B-A771-0DE389353CE6}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Markup.UnitTests", "tests\Avalonia.Markup.UnitTests\Avalonia.Markup.UnitTests.csproj", "{8EF392D5-1416-45AA-9956-7CBBC3229E8A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BindingDemo", "samples\BindingDemo\BindingDemo.csproj", "{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Skia", "Skia", "{3743B0F2-CC41-4F14-A8C8-267F579BF91E}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Android", "Android", "{7CF9789C-F1D3-4D0E-90E5-F1DF67A2753F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Android", "src\Android\Avalonia.Android\Avalonia.Android.csproj", "{7B92AF71-6287-4693-9DCB-BD5B6E927E23}"
-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}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.LeakTests", "tests\Avalonia.LeakTests\Avalonia.LeakTests.csproj", "{E1AA3DBF-9056-4530-9376-18119A7A3FFE}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.UnitTests", "tests\Avalonia.UnitTests\Avalonia.UnitTests.csproj", "{88060192-33D5-4932-B0F9-8BD2763E857D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Benchmarks", "tests\Avalonia.Benchmarks\Avalonia.Benchmarks.csproj", "{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.DesignerSupport", "src\Avalonia.DesignerSupport\Avalonia.DesignerSupport.csproj", "{799A7BB5-3C2C-48B6-85A7-406A12C420DA}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlCatalog", "samples\ControlCatalog\ControlCatalog.csproj", "{D0A739B9-3C68-4BA6-A328-41606954B6BD}"
-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.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}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Interop", "Interop", "{A0CC0258-D18C-4AB3-854F-7101680FC3F9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RenderDemo", "samples\RenderDemo\RenderDemo.csproj", "{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlCatalog.Android", "samples\ControlCatalog.Android\ControlCatalog.Android.csproj", "{29132311-1848-4FD6-AE0C-4FF841151BD3}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Skia", "src\Skia\Avalonia.Skia\Avalonia.Skia.csproj", "{7D2D3083-71DD-4CC9-8907-39A0D86FB322}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Props", "Props", "{F3AC8BC1-27F5-4255-9AFC-04ABFD11683A}"
-	ProjectSection(SolutionItems) = preProject
-		build\AnalyzerProject.targets = build\AnalyzerProject.targets
-		build\AvaloniaPublicKey.props = build\AvaloniaPublicKey.props
-		build\Base.props = build\Base.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\NetAnalyzers.props = build\NetAnalyzers.props
-		build\NullableEnable.props = build\NullableEnable.props
-		build\ReferenceCoreLibraries.props = build\ReferenceCoreLibraries.props
-		build\SampleApp.props = build\SampleApp.props
-		build\SharedVersion.props = build\SharedVersion.props
-		build\SkiaSharp.props = build\SkiaSharp.props
-		build\SourceGenerators.props = build\SourceGenerators.props
-		build\SourceLink.props = build\SourceLink.props
-		build\TargetFrameworks.props = build\TargetFrameworks.props
-		build\TrimmingEnable.props = build\TrimmingEnable.props
-		build\UnitTests.NetFX.props = build\UnitTests.NetFX.props
-		build\XUnit.props = build\XUnit.props
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Targets", "Targets", "{4D6FAF79-58B4-482F-9122-0668C346364C}"
-	ProjectSection(SolutionItems) = preProject
-		build\BuildTargets.targets = build\BuildTargets.targets
-		build\DevSingleProject.targets = build\DevSingleProject.targets
-		build\UnitTests.NetCore.targets = build\UnitTests.NetCore.targets
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Linux", "Linux", "{86C53C40-57AA-45B8-AD42-FAE0EFDF0F2B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.LinuxFramebuffer", "src\Linux\Avalonia.LinuxFramebuffer\Avalonia.LinuxFramebuffer.csproj", "{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Win32.Interoperability", "src\Windows\Avalonia.Win32.Interoperability\Avalonia.Win32.Interoperability.csproj", "{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Skia.RenderTests", "tests\Avalonia.Skia.RenderTests\Avalonia.Skia.RenderTests.csproj", "{E1582370-37B3-403C-917F-8209551B1634}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Remote.Protocol", "src\Avalonia.Remote.Protocol\Avalonia.Remote.Protocol.csproj", "{D78A720C-C0C6-478B-8564-F167F9BDD01B}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{4ED8B739-6F4E-4CD4-B993-545E6B5CE637}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Designer.HostApp", "src\tools\Avalonia.Designer.HostApp\Avalonia.Designer.HostApp.csproj", "{050CC912-FF49-4A8B-B534-9544017446DD}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Skia.UnitTests", "tests\Avalonia.Skia.UnitTests\Avalonia.Skia.UnitTests.csproj", "{E1240B49-7B4B-4371-A00E-068778C5CF0B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.OpenGL", "src\Avalonia.OpenGL\Avalonia.OpenGL.csproj", "{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Native", "src\Avalonia.Native\Avalonia.Native.csproj", "{12A91A62-C064-42CA-9A8C-A1272F354388}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Packages", "Packages", "{E870DCD7-F46A-498D-83FC-D0FD13E0A11C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia", "packages\Avalonia\Avalonia.csproj", "{D49233F8-F29C-47DD-9975-C4C9E4502720}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Desktop", "src\Avalonia.Desktop\Avalonia.Desktop.csproj", "{3C471044-3640-45E3-B1B2-16D2FF8399EE}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Build.Tasks", "src\Avalonia.Build.Tasks\Avalonia.Build.Tasks.csproj", "{BF28998D-072C-439A-AFBB-2FE5021241E0}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "_build", "nukebuild\_build.csproj", "{3F00BC43-5095-477F-93D8-E65B08179A00}"
-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}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Dialogs", "src\Avalonia.Dialogs\Avalonia.Dialogs.csproj", "{4D55985A-1EE2-4F25-AD39-6EA8BC04F8FB}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.FreeDesktop", "src\Avalonia.FreeDesktop\Avalonia.FreeDesktop.csproj", "{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.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\Headless\Avalonia.Headless\Avalonia.Headless.csproj", "{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Headless.Vnc", "src\Headless\Avalonia.Headless.Vnc\Avalonia.Headless.Vnc.csproj", "{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Markup.Xaml.Loader", "src\Markup\Avalonia.Markup.Xaml.Loader\Avalonia.Markup.Xaml.Loader.csproj", "{909A8CBD-7D0E-42FD-B841-022AD8925820}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sandbox", "samples\Sandbox\Sandbox.csproj", "{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.MicroCom", "src\Avalonia.MicroCom\Avalonia.MicroCom.csproj", "{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MiniMvvm", "samples\MiniMvvm\MiniMvvm.csproj", "{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTestApp", "samples\IntegrationTestApp\IntegrationTestApp.csproj", "{676D6BFD-029D-4E43-BFC7-3892265CE251}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TextTestApp", "samples\TextTestApp\TextTestApp.csproj", "{CE728F96-A593-462C-B8D4-1D5AFFDB5B4F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.IntegrationTests.Appium", "tests\Avalonia.IntegrationTests.Appium\Avalonia.IntegrationTests.Appium.csproj", "{F2CE566B-E7F6-447A-AB1A-3F574A6FE43A}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Browser", "Browser", "{86A3F706-DC3C-43C6-BE1B-B98F5BAAA268}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WindowsInteropTest", "samples\interop\WindowsInteropTest\WindowsInteropTest.csproj", "{26A98DA1-D89D-4A95-8152-349F404DA2E2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlSamples", "samples\SampleControls\ControlSamples.csproj", "{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlCatalog.iOS", "samples\ControlCatalog.iOS\ControlCatalog.iOS.csproj", "{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevAnalyzers", "src\tools\DevAnalyzers\DevAnalyzers.csproj", "{2B390431-288C-435C-BB6B-A374033BD8D1}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Controls.ColorPicker", "src\Avalonia.Controls.ColorPicker\Avalonia.Controls.ColorPicker.csproj", "{7BF6C69D-FC14-43EB-9ED0-782C16F3D5D9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.DesignerSupport.Tests", "tests\Avalonia.DesignerSupport.Tests\Avalonia.DesignerSupport.Tests.csproj", "{EABE2161-989B-42BF-BD8D-1E34B20C21F1}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevGenerators", "src\tools\DevGenerators\DevGenerators.csproj", "{1BBFAD42-B99E-47E0-B00A-A4BC6B6BB4BB}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SingleProjectSandbox", "samples\SingleProjectSandbox\SingleProjectSandbox.csproj", "{3B8519C1-2F51-4F12-A348-120AB91D4532}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Browser", "src\Browser\Avalonia.Browser\Avalonia.Browser.csproj", "{4A39637C-9338-4925-A4DB-D072E292EC78}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlCatalog.Browser", "samples\ControlCatalog.Browser\ControlCatalog.Browser.csproj", "{15B93A4C-1B46-43F6-B534-7B25B6E99932}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GpuInterop", "samples\GpuInterop\GpuInterop.csproj", "{C810060E-3809-4B74-A125-F11533AF9C1B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Analyzers.CSharp", "src\tools\Avalonia.Analyzers.CSharp\Avalonia.Analyzers.CSharp.csproj", "{C692FE73-43DB-49CE-87FC-F03ED61F25C9}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{176582E8-46AF-416A-85C1-13A5C6744497}"
-	ProjectSection(SolutionItems) = preProject
-		.editorconfig = .editorconfig
-		azure-pipelines-integrationtests.yml = azure-pipelines-integrationtests.yml
-		azure-pipelines.yml = azure-pipelines.yml
-		CODE_OF_CONDUCT.md = CODE_OF_CONDUCT.md
-		CONTRIBUTING.md = CONTRIBUTING.md
-		Directory.Build.props = Directory.Build.props
-		Directory.Build.targets = Directory.Build.targets
-		dirs.proj = dirs.proj
-		global.json = global.json
-		licence.md = licence.md
-		NOTICE.md = NOTICE.md
-		NuGet.Config = NuGet.Config
-		readme.md = readme.md
-		Directory.Packages.props = Directory.Packages.props
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Generators", "src\tools\Avalonia.Generators\Avalonia.Generators.csproj", "{DDA28789-C21A-4654-86CE-D01E81F095C5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Fonts.Inter", "src\Avalonia.Fonts.Inter\Avalonia.Fonts.Inter.csproj", "{13F1135D-BA1A-435C-9C5B-A368D1D63DE4}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Generators.Sandbox", "samples\Generators.Sandbox\Generators.Sandbox.csproj", "{A82AD1BC-EBE6-4FC3-A13B-D52A50297533}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppWithoutLifetime", "samples\AppWithoutLifetime\AppWithoutLifetime.csproj", "{F8928267-688E-4A51-989C-612A72446D33}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SafeAreaDemo", "samples\SafeAreaDemo\SafeAreaDemo.csproj", "{6B60A970-D5D2-49C2-8BAB-F9C7973B74B6}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SafeAreaDemo.Android", "samples\SafeAreaDemo.Android\SafeAreaDemo.Android.csproj", "{22E3BC08-EAF7-4889-BDC4-B4D3046C4E2D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SafeAreaDemo.Desktop", "samples\SafeAreaDemo.Desktop\SafeAreaDemo.Desktop.csproj", "{4CDAD037-34A2-4CCF-A03A-C6C7B988A572}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SafeAreaDemo.iOS", "samples\SafeAreaDemo.iOS\SafeAreaDemo.iOS.csproj", "{FC956F9A-4C3A-4A1A-ACDD-BB54DCB661DD}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Headless", "Headless", "{FF237916-7150-496B-89ED-6CA3292896E7}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Headless.XUnit", "src\Headless\Avalonia.Headless.XUnit\Avalonia.Headless.XUnit.csproj", "{F47F8316-4D4B-4026-8EF3-16B2CFDA8119}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Headless.NUnit", "src\Headless\Avalonia.Headless.NUnit\Avalonia.Headless.NUnit.csproj", "{ED976634-B118-43F8-8B26-0279C7A7044F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Generators.Tests", "tests\Avalonia.Generators.Tests\Avalonia.Generators.Tests.csproj", "{4B8EBBEB-A1AD-49EC-8B69-B93ED15BFA64}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Metal", "src\Avalonia.Metal\Avalonia.Metal.csproj", "{60B4ED1F-ECFA-453B-8A70-1788261C8355}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Build.Tasks.UnitTest", "tests\Avalonia.Build.Tasks.UnitTest\Avalonia.Build.Tasks.UnitTest.csproj", "{B0FD6A48-FBAB-4676-B36A-DE76B0922B12}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestFiles", "TestFiles", "{9D6AEF22-221F-4F4B-B335-A4BA510F002C}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BuildTasks", "BuildTasks", "{5BF0C3B8-E595-4940-AB30-2DA206C2F085}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PInvoke", "tests\TestFiles\BuildTasks\PInvoke\PInvoke.csproj", "{0A948D71-99C5-43E9-BACB-B0BA59EA25B4}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UnloadableAssemblyLoadContext", "UnloadableAssemblyLoadContext", "{9CCA131B-DE95-4D44-8788-C3CAE28574CD}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnloadableAssemblyLoadContext", "samples\UnloadableAssemblyLoadContext\UnloadableAssemblyLoadContext\UnloadableAssemblyLoadContext.csproj", "{D7FE3E0F-3FE0-4F87-A2F5-24F1454D84C0}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnloadableAssemblyLoadContextPlug", "samples\UnloadableAssemblyLoadContext\UnloadableAssemblyLoadContextPlug\UnloadableAssemblyLoadContextPlug.csproj", "{DA5F1FF9-4259-4C54-B443-85CFA226EE6A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Vulkan", "src\Avalonia.Vulkan\Avalonia.Vulkan.csproj", "{3E2DE2B6-13BC-4C27-BCB9-A423B86CAF77}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.RenderTests.WpfCompare", "tests\Avalonia.RenderTests.WpfCompare\Avalonia.RenderTests.WpfCompare.csproj", "{9AE1B827-21AC-4063-AB22-C8804B7F931E}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Win32.Automation", "src\Windows\Avalonia.Win32.Automation\Avalonia.Win32.Automation.csproj", "{0097673D-DBCE-476E-82FE-E78A56E58AA2}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XEmbedSample", "samples\XEmbedSample\XEmbedSample.csproj", "{255614F5-CB64-4ECA-A026-E0B1AF6A2EF4}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ControlCatalog.MacCatalyst", "samples\ControlCatalog.MacCatalyst\ControlCatalog.MacCatalyst.csproj", "{DE3C28DD-B602-4750-831D-345102A54CA0}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ControlCatalog.tvOS", "samples\ControlCatalog.tvOS\ControlCatalog.tvOS.csproj", "{14342787-B4EF-4076-8C91-BA6C523DE8DF}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HarfBuzz", "HarfBuzz", "{7670D720-6E84-4AFC-8331-A5C399481905}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.HarfBuzz", "src\HarfBuzz\Avalonia.HarfBuzz\Avalonia.HarfBuzz.csproj", "{E2BFA463-6402-4EF8-8945-FD9A10A914D1}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Headless.NUnit.PerAssembly.UnitTests", "tests\Avalonia.Headless.NUnit.PerAssembly.UnitTests\Avalonia.Headless.NUnit.PerAssembly.UnitTests.csproj", "{A175EFAE-476C-4DAA-87D5-742C18CFCC27}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Headless.NUnit.PerTest.UnitTests", "tests\Avalonia.Headless.NUnit.PerTest.UnitTests\Avalonia.Headless.NUnit.PerTest.UnitTests.csproj", "{09EC467F-0F25-4E6F-A836-2BAEC8F6AB0C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Headless.XUnit.PerAssembly.UnitTests", "tests\Avalonia.Headless.XUnit.PerAssembly.UnitTests\Avalonia.Headless.XUnit.PerAssembly.UnitTests.csproj", "{342D2657-2F84-493C-B74B-9D2CAE5D9DAB}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Headless.XUnit.PerTest.UnitTests", "tests\Avalonia.Headless.XUnit.PerTest.UnitTests\Avalonia.Headless.XUnit.PerTest.UnitTests.csproj", "{26918642-829D-4FA2-B60A-BE8D83F4E063}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.IntegrationTests.Win32", "tests\Avalonia.IntegrationTests.Win32\Avalonia.IntegrationTests.Win32.csproj", "{11522B0D-BF31-42D5-8FC5-41E58F319AF9}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Analyzers.CodeFixes.CSharp", "src\tools\Avalonia.Analyzers.CodeFixes.CSharp\Avalonia.Analyzers.CodeFixes.CSharp.csproj", "{FDFB9C25-552D-420B-9D4A-DB0BB6472239}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Analyzers.VisualBasic", "src\tools\Avalonia.Analyzers.VisualBasic\Avalonia.Analyzers.VisualBasic.csproj", "{A7644C3B-B843-44F1-9940-560D56CB0936}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.FreeDesktop.AtSpi", "src\Avalonia.FreeDesktop.AtSpi\Avalonia.FreeDesktop.AtSpi.csproj", "{742C3613-514C-4D6B-804A-2A7925F278F3}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.DBus.Generators", "src\tools\Avalonia.DBus.Generators\Avalonia.DBus.Generators.csproj", "{98A16FFD-0C99-4665-AC64-DC17E86879A2}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{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}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B09B78D8-9B26-48B0-9149-D64A2F120F3F}.Release|Any CPU.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}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{811A76CF-1CF6-440F-963B-BBE31BD72A82}.Release|Any CPU.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}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D2221C82-4A25-4583-9B43-D791E3F6820C}.Release|Any CPU.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}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Release|Any CPU.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}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}.Release|Any CPU.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}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2905FF23-53FB-45E6-AA49-6AF47A172056}.Release|Any CPU.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}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{99135EAB-653D-47E4-A378-C96E1278CA44}.Release|Any CPU.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}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3E53A01A-B331-47F3-B828-4A5717E77A24}.Release|Any CPU.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}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6417E941-21BC-467B-A771-0DE389353CE6}.Release|Any CPU.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}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8EF392D5-1416-45AA-9956-7CBBC3229E8A}.Release|Any CPU.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}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}.Release|Any CPU.Build.0 = 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}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7B92AF71-6287-4693-9DCB-BD5B6E927E23}.Release|Any CPU.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}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4488AD85-1495-4809-9AA4-DDFE0A48527E}.Release|Any CPU.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}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Release|Any CPU.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}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{88060192-33D5-4932-B0F9-8BD2763E857D}.Release|Any CPU.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}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Release|Any CPU.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}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Release|Any CPU.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}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D0A739B9-3C68-4BA6-A328-41606954B6BD}.Release|Any CPU.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}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2B888490-D14A-4BCA-AB4B-48676FA93C9B}.Release|Any CPU.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}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}.Release|Any CPU.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}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FBCAF3D0-2808-4934-8E96-3F607594517B}.Release|Any CPU.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}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}.Release|Any CPU.Build.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}.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
-		{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}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7D2D3083-71DD-4CC9-8907-39A0D86FB322}.Release|Any CPU.Build.0 = Release|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}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Release|Any CPU.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}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Release|Any CPU.Build.0 = Release|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}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E1582370-37B3-403C-917F-8209551B1634}.Release|Any CPU.Build.0 = Release|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}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Release|Any CPU.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}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|Any CPU.Build.0 = Release|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}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.Release|Any CPU.Build.0 = Release|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}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}.Release|Any CPU.Build.0 = Release|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}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{12A91A62-C064-42CA-9A8C-A1272F354388}.Release|Any CPU.Build.0 = Release|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}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D49233F8-F29C-47DD-9975-C4C9E4502720}.Release|Any CPU.Build.0 = Release|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}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3C471044-3640-45E3-B1B2-16D2FF8399EE}.Release|Any CPU.Build.0 = Release|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}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BF28998D-072C-439A-AFBB-2FE5021241E0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3F00BC43-5095-477F-93D8-E65B08179A00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3F00BC43-5095-477F-93D8-E65B08179A00}.Release|Any CPU.ActiveCfg = Release|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}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{41B02319-965D-4945-8005-C1A3D1224165}.Release|Any CPU.Build.0 = Release|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}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B}.Release|Any CPU.Build.0 = Release|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}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4D55985A-1EE2-4F25-AD39-6EA8BC04F8FB}.Release|Any CPU.Build.0 = Release|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}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA}.Release|Any CPU.Build.0 = Release|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}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C42D2FC1-A531-4ED4-84B9-89AEC7C962FC}.Release|Any CPU.Build.0 = Release|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}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC}.Release|Any CPU.Build.0 = Release|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}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E}.Release|Any CPU.Build.0 = Release|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}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{909A8CBD-7D0E-42FD-B841-022AD8925820}.Release|Any CPU.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}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.Release|Any CPU.Build.0 = Release|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}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.Release|Any CPU.Build.0 = Release|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}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{676D6BFD-029D-4E43-BFC7-3892265CE251}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{676D6BFD-029D-4E43-BFC7-3892265CE251}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{676D6BFD-029D-4E43-BFC7-3892265CE251}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{676D6BFD-029D-4E43-BFC7-3892265CE251}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CE728F96-A593-462C-B8D4-1D5AFFDB5B4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CE728F96-A593-462C-B8D4-1D5AFFDB5B4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CE728F96-A593-462C-B8D4-1D5AFFDB5B4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CE728F96-A593-462C-B8D4-1D5AFFDB5B4F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F2CE566B-E7F6-447A-AB1A-3F574A6FE43A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F2CE566B-E7F6-447A-AB1A-3F574A6FE43A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F2CE566B-E7F6-447A-AB1A-3F574A6FE43A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F2CE566B-E7F6-447A-AB1A-3F574A6FE43A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{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}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{26A98DA1-D89D-4A95-8152-349F404DA2E2}.Release|Any CPU.Build.0 = Release|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}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.Release|Any CPU.Build.0 = Release|Any CPU
-		{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2B390431-288C-435C-BB6B-A374033BD8D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2B390431-288C-435C-BB6B-A374033BD8D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2B390431-288C-435C-BB6B-A374033BD8D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2B390431-288C-435C-BB6B-A374033BD8D1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7BF6C69D-FC14-43EB-9ED0-782C16F3D5D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7BF6C69D-FC14-43EB-9ED0-782C16F3D5D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7BF6C69D-FC14-43EB-9ED0-782C16F3D5D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7BF6C69D-FC14-43EB-9ED0-782C16F3D5D9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EABE2161-989B-42BF-BD8D-1E34B20C21F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EABE2161-989B-42BF-BD8D-1E34B20C21F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EABE2161-989B-42BF-BD8D-1E34B20C21F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EABE2161-989B-42BF-BD8D-1E34B20C21F1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1BBFAD42-B99E-47E0-B00A-A4BC6B6BB4BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1BBFAD42-B99E-47E0-B00A-A4BC6B6BB4BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1BBFAD42-B99E-47E0-B00A-A4BC6B6BB4BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1BBFAD42-B99E-47E0-B00A-A4BC6B6BB4BB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3B8519C1-2F51-4F12-A348-120AB91D4532}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3B8519C1-2F51-4F12-A348-120AB91D4532}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3B8519C1-2F51-4F12-A348-120AB91D4532}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3B8519C1-2F51-4F12-A348-120AB91D4532}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4A39637C-9338-4925-A4DB-D072E292EC78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4A39637C-9338-4925-A4DB-D072E292EC78}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4A39637C-9338-4925-A4DB-D072E292EC78}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4A39637C-9338-4925-A4DB-D072E292EC78}.Release|Any CPU.Build.0 = Release|Any CPU
-		{15B93A4C-1B46-43F6-B534-7B25B6E99932}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{15B93A4C-1B46-43F6-B534-7B25B6E99932}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{15B93A4C-1B46-43F6-B534-7B25B6E99932}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{15B93A4C-1B46-43F6-B534-7B25B6E99932}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C810060E-3809-4B74-A125-F11533AF9C1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C810060E-3809-4B74-A125-F11533AF9C1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C810060E-3809-4B74-A125-F11533AF9C1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C810060E-3809-4B74-A125-F11533AF9C1B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C692FE73-43DB-49CE-87FC-F03ED61F25C9}.Debug|Any CPU.ActiveCfg = Release|Any CPU
-		{C692FE73-43DB-49CE-87FC-F03ED61F25C9}.Debug|Any CPU.Build.0 = Release|Any CPU
-		{C692FE73-43DB-49CE-87FC-F03ED61F25C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C692FE73-43DB-49CE-87FC-F03ED61F25C9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DDA28789-C21A-4654-86CE-D01E81F095C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DDA28789-C21A-4654-86CE-D01E81F095C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DDA28789-C21A-4654-86CE-D01E81F095C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DDA28789-C21A-4654-86CE-D01E81F095C5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{13F1135D-BA1A-435C-9C5B-A368D1D63DE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{13F1135D-BA1A-435C-9C5B-A368D1D63DE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{13F1135D-BA1A-435C-9C5B-A368D1D63DE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{13F1135D-BA1A-435C-9C5B-A368D1D63DE4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A82AD1BC-EBE6-4FC3-A13B-D52A50297533}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A82AD1BC-EBE6-4FC3-A13B-D52A50297533}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A82AD1BC-EBE6-4FC3-A13B-D52A50297533}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A82AD1BC-EBE6-4FC3-A13B-D52A50297533}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F8928267-688E-4A51-989C-612A72446D33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F8928267-688E-4A51-989C-612A72446D33}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F8928267-688E-4A51-989C-612A72446D33}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F8928267-688E-4A51-989C-612A72446D33}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6B60A970-D5D2-49C2-8BAB-F9C7973B74B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6B60A970-D5D2-49C2-8BAB-F9C7973B74B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6B60A970-D5D2-49C2-8BAB-F9C7973B74B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6B60A970-D5D2-49C2-8BAB-F9C7973B74B6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{22E3BC08-EAF7-4889-BDC4-B4D3046C4E2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{22E3BC08-EAF7-4889-BDC4-B4D3046C4E2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{22E3BC08-EAF7-4889-BDC4-B4D3046C4E2D}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{22E3BC08-EAF7-4889-BDC4-B4D3046C4E2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{22E3BC08-EAF7-4889-BDC4-B4D3046C4E2D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{22E3BC08-EAF7-4889-BDC4-B4D3046C4E2D}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{4CDAD037-34A2-4CCF-A03A-C6C7B988A572}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4CDAD037-34A2-4CCF-A03A-C6C7B988A572}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4CDAD037-34A2-4CCF-A03A-C6C7B988A572}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4CDAD037-34A2-4CCF-A03A-C6C7B988A572}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FC956F9A-4C3A-4A1A-ACDD-BB54DCB661DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FC956F9A-4C3A-4A1A-ACDD-BB54DCB661DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FC956F9A-4C3A-4A1A-ACDD-BB54DCB661DD}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{FC956F9A-4C3A-4A1A-ACDD-BB54DCB661DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FC956F9A-4C3A-4A1A-ACDD-BB54DCB661DD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FC956F9A-4C3A-4A1A-ACDD-BB54DCB661DD}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{F47F8316-4D4B-4026-8EF3-16B2CFDA8119}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F47F8316-4D4B-4026-8EF3-16B2CFDA8119}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F47F8316-4D4B-4026-8EF3-16B2CFDA8119}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F47F8316-4D4B-4026-8EF3-16B2CFDA8119}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ED976634-B118-43F8-8B26-0279C7A7044F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ED976634-B118-43F8-8B26-0279C7A7044F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ED976634-B118-43F8-8B26-0279C7A7044F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ED976634-B118-43F8-8B26-0279C7A7044F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4B8EBBEB-A1AD-49EC-8B69-B93ED15BFA64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4B8EBBEB-A1AD-49EC-8B69-B93ED15BFA64}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4B8EBBEB-A1AD-49EC-8B69-B93ED15BFA64}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4B8EBBEB-A1AD-49EC-8B69-B93ED15BFA64}.Release|Any CPU.Build.0 = Release|Any CPU
-		{60B4ED1F-ECFA-453B-8A70-1788261C8355}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{60B4ED1F-ECFA-453B-8A70-1788261C8355}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{60B4ED1F-ECFA-453B-8A70-1788261C8355}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{60B4ED1F-ECFA-453B-8A70-1788261C8355}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B0FD6A48-FBAB-4676-B36A-DE76B0922B12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0FD6A48-FBAB-4676-B36A-DE76B0922B12}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0FD6A48-FBAB-4676-B36A-DE76B0922B12}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0FD6A48-FBAB-4676-B36A-DE76B0922B12}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0A948D71-99C5-43E9-BACB-B0BA59EA25B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0A948D71-99C5-43E9-BACB-B0BA59EA25B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0A948D71-99C5-43E9-BACB-B0BA59EA25B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0A948D71-99C5-43E9-BACB-B0BA59EA25B4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D7FE3E0F-3FE0-4F87-A2F5-24F1454D84C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D7FE3E0F-3FE0-4F87-A2F5-24F1454D84C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D7FE3E0F-3FE0-4F87-A2F5-24F1454D84C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D7FE3E0F-3FE0-4F87-A2F5-24F1454D84C0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DA5F1FF9-4259-4C54-B443-85CFA226EE6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DA5F1FF9-4259-4C54-B443-85CFA226EE6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DA5F1FF9-4259-4C54-B443-85CFA226EE6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DA5F1FF9-4259-4C54-B443-85CFA226EE6A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3E2DE2B6-13BC-4C27-BCB9-A423B86CAF77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3E2DE2B6-13BC-4C27-BCB9-A423B86CAF77}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3E2DE2B6-13BC-4C27-BCB9-A423B86CAF77}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3E2DE2B6-13BC-4C27-BCB9-A423B86CAF77}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9AE1B827-21AC-4063-AB22-C8804B7F931E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9AE1B827-21AC-4063-AB22-C8804B7F931E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9AE1B827-21AC-4063-AB22-C8804B7F931E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9AE1B827-21AC-4063-AB22-C8804B7F931E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0097673D-DBCE-476E-82FE-E78A56E58AA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0097673D-DBCE-476E-82FE-E78A56E58AA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0097673D-DBCE-476E-82FE-E78A56E58AA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0097673D-DBCE-476E-82FE-E78A56E58AA2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{255614F5-CB64-4ECA-A026-E0B1AF6A2EF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{255614F5-CB64-4ECA-A026-E0B1AF6A2EF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{255614F5-CB64-4ECA-A026-E0B1AF6A2EF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{255614F5-CB64-4ECA-A026-E0B1AF6A2EF4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DE3C28DD-B602-4750-831D-345102A54CA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DE3C28DD-B602-4750-831D-345102A54CA0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DE3C28DD-B602-4750-831D-345102A54CA0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DE3C28DD-B602-4750-831D-345102A54CA0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{14342787-B4EF-4076-8C91-BA6C523DE8DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{14342787-B4EF-4076-8C91-BA6C523DE8DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{14342787-B4EF-4076-8C91-BA6C523DE8DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{14342787-B4EF-4076-8C91-BA6C523DE8DF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E2BFA463-6402-4EF8-8945-FD9A10A914D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E2BFA463-6402-4EF8-8945-FD9A10A914D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E2BFA463-6402-4EF8-8945-FD9A10A914D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E2BFA463-6402-4EF8-8945-FD9A10A914D1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A175EFAE-476C-4DAA-87D5-742C18CFCC27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A175EFAE-476C-4DAA-87D5-742C18CFCC27}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A175EFAE-476C-4DAA-87D5-742C18CFCC27}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A175EFAE-476C-4DAA-87D5-742C18CFCC27}.Release|Any CPU.Build.0 = Release|Any CPU
-		{09EC467F-0F25-4E6F-A836-2BAEC8F6AB0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{09EC467F-0F25-4E6F-A836-2BAEC8F6AB0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{09EC467F-0F25-4E6F-A836-2BAEC8F6AB0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{09EC467F-0F25-4E6F-A836-2BAEC8F6AB0C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{342D2657-2F84-493C-B74B-9D2CAE5D9DAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{342D2657-2F84-493C-B74B-9D2CAE5D9DAB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{342D2657-2F84-493C-B74B-9D2CAE5D9DAB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{342D2657-2F84-493C-B74B-9D2CAE5D9DAB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{26918642-829D-4FA2-B60A-BE8D83F4E063}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{26918642-829D-4FA2-B60A-BE8D83F4E063}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{26918642-829D-4FA2-B60A-BE8D83F4E063}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{26918642-829D-4FA2-B60A-BE8D83F4E063}.Release|Any CPU.Build.0 = Release|Any CPU
-		{11522B0D-BF31-42D5-8FC5-41E58F319AF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{11522B0D-BF31-42D5-8FC5-41E58F319AF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{11522B0D-BF31-42D5-8FC5-41E58F319AF9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{11522B0D-BF31-42D5-8FC5-41E58F319AF9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FDFB9C25-552D-420B-9D4A-DB0BB6472239}.Debug|Any CPU.ActiveCfg = Release|Any CPU
-		{FDFB9C25-552D-420B-9D4A-DB0BB6472239}.Debug|Any CPU.Build.0 = Release|Any CPU
-		{FDFB9C25-552D-420B-9D4A-DB0BB6472239}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FDFB9C25-552D-420B-9D4A-DB0BB6472239}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A7644C3B-B843-44F1-9940-560D56CB0936}.Debug|Any CPU.ActiveCfg = Release|Any CPU
-		{A7644C3B-B843-44F1-9940-560D56CB0936}.Debug|Any CPU.Build.0 = Release|Any CPU
-		{A7644C3B-B843-44F1-9940-560D56CB0936}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A7644C3B-B843-44F1-9940-560D56CB0936}.Release|Any CPU.Build.0 = Release|Any CPU
-		{742C3613-514C-4D6B-804A-2A7925F278F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{742C3613-514C-4D6B-804A-2A7925F278F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{742C3613-514C-4D6B-804A-2A7925F278F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{742C3613-514C-4D6B-804A-2A7925F278F3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{98A16FFD-0C99-4665-AC64-DC17E86879A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{98A16FFD-0C99-4665-AC64-DC17E86879A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{98A16FFD-0C99-4665-AC64-DC17E86879A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{98A16FFD-0C99-4665-AC64-DC17E86879A2}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{811A76CF-1CF6-440F-963B-BBE31BD72A82} = {B39A8919-9F95-48FE-AD7B-76E08B509888}
-		{5CCB5571-7C30-4E7D-967D-0E2158EBD91F} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
-		{2905FF23-53FB-45E6-AA49-6AF47A172056} = {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}
-		{6417E941-21BC-467B-A771-0DE389353CE6} = {8B6A8209-894F-4BA1-B880-965FD453982C}
-		{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}
-		{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}
-		{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}
-		{F1FDC5B0-4654-416F-AE69-E3E9BBD87801} = {9B9E3891-2366-4253-A952-D08BCEB71098}
-		{29132311-1848-4FD6-AE0C-4FF841151BD3} = {9B9E3891-2366-4253-A952-D08BCEB71098}
-		{7D2D3083-71DD-4CC9-8907-39A0D86FB322} = {3743B0F2-CC41-4F14-A8C8-267F579BF91E}
-		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9} = {86C53C40-57AA-45B8-AD42-FAE0EFDF0F2B}
-		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E} = {B39A8919-9F95-48FE-AD7B-76E08B509888}
-		{E1582370-37B3-403C-917F-8209551B1634} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
-		{050CC912-FF49-4A8B-B534-9544017446DD} = {4ED8B739-6F4E-4CD4-B993-545E6B5CE637}
-		{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}
-		{41B02319-965D-4945-8005-C1A3D1224165} = {86C53C40-57AA-45B8-AD42-FAE0EFDF0F2B}
-		{D775DECB-4E00-4ED5-A75A-5FCE58ADFF0B} = {9B9E3891-2366-4253-A952-D08BCEB71098}
-		{4D36CEC8-53F2-40A5-9A37-79AAE356E2DA} = {86C53C40-57AA-45B8-AD42-FAE0EFDF0F2B}
-		{8C89950F-F5D9-47FC-8066-CBC1EC3DF8FC} = {FF237916-7150-496B-89ED-6CA3292896E7}
-		{B859AE7C-F34F-4A9E-88AE-E0E7229FDE1E} = {FF237916-7150-496B-89ED-6CA3292896E7}
-		{909A8CBD-7D0E-42FD-B841-022AD8925820} = {8B6A8209-894F-4BA1-B880-965FD453982C}
-		{11BE52AF-E2DD-4CF0-B19A-05285ACAF571} = {9B9E3891-2366-4253-A952-D08BCEB71098}
-		{BC594FD5-4AF2-409E-A1E6-04123F54D7C5} = {9B9E3891-2366-4253-A952-D08BCEB71098}
-		{676D6BFD-029D-4E43-BFC7-3892265CE251} = {9B9E3891-2366-4253-A952-D08BCEB71098}
-		{CE728F96-A593-462C-B8D4-1D5AFFDB5B4F} = {9B9E3891-2366-4253-A952-D08BCEB71098}
-		{F2CE566B-E7F6-447A-AB1A-3F574A6FE43A} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
-		{26A98DA1-D89D-4A95-8152-349F404DA2E2} = {A0CC0258-D18C-4AB3-854F-7101680FC3F9}
-		{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270} = {9B9E3891-2366-4253-A952-D08BCEB71098}
-		{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B} = {9B9E3891-2366-4253-A952-D08BCEB71098}
-		{2B390431-288C-435C-BB6B-A374033BD8D1} = {4ED8B739-6F4E-4CD4-B993-545E6B5CE637}
-		{EABE2161-989B-42BF-BD8D-1E34B20C21F1} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
-		{1BBFAD42-B99E-47E0-B00A-A4BC6B6BB4BB} = {4ED8B739-6F4E-4CD4-B993-545E6B5CE637}
-		{3B8519C1-2F51-4F12-A348-120AB91D4532} = {9B9E3891-2366-4253-A952-D08BCEB71098}
-		{4A39637C-9338-4925-A4DB-D072E292EC78} = {86A3F706-DC3C-43C6-BE1B-B98F5BAAA268}
-		{15B93A4C-1B46-43F6-B534-7B25B6E99932} = {9B9E3891-2366-4253-A952-D08BCEB71098}
-		{C810060E-3809-4B74-A125-F11533AF9C1B} = {9B9E3891-2366-4253-A952-D08BCEB71098}
-		{C692FE73-43DB-49CE-87FC-F03ED61F25C9} = {4ED8B739-6F4E-4CD4-B993-545E6B5CE637}
-		{DDA28789-C21A-4654-86CE-D01E81F095C5} = {4ED8B739-6F4E-4CD4-B993-545E6B5CE637}
-		{A82AD1BC-EBE6-4FC3-A13B-D52A50297533} = {9B9E3891-2366-4253-A952-D08BCEB71098}
-		{F8928267-688E-4A51-989C-612A72446D33} = {9B9E3891-2366-4253-A952-D08BCEB71098}
-		{6B60A970-D5D2-49C2-8BAB-F9C7973B74B6} = {9B9E3891-2366-4253-A952-D08BCEB71098}
-		{22E3BC08-EAF7-4889-BDC4-B4D3046C4E2D} = {9B9E3891-2366-4253-A952-D08BCEB71098}
-		{4CDAD037-34A2-4CCF-A03A-C6C7B988A572} = {9B9E3891-2366-4253-A952-D08BCEB71098}
-		{FC956F9A-4C3A-4A1A-ACDD-BB54DCB661DD} = {9B9E3891-2366-4253-A952-D08BCEB71098}
-		{F47F8316-4D4B-4026-8EF3-16B2CFDA8119} = {FF237916-7150-496B-89ED-6CA3292896E7}
-		{ED976634-B118-43F8-8B26-0279C7A7044F} = {FF237916-7150-496B-89ED-6CA3292896E7}
-		{4B8EBBEB-A1AD-49EC-8B69-B93ED15BFA64} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
-		{B0FD6A48-FBAB-4676-B36A-DE76B0922B12} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
-		{9D6AEF22-221F-4F4B-B335-A4BA510F002C} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
-		{5BF0C3B8-E595-4940-AB30-2DA206C2F085} = {9D6AEF22-221F-4F4B-B335-A4BA510F002C}
-		{0A948D71-99C5-43E9-BACB-B0BA59EA25B4} = {5BF0C3B8-E595-4940-AB30-2DA206C2F085}
-		{9CCA131B-DE95-4D44-8788-C3CAE28574CD} = {9B9E3891-2366-4253-A952-D08BCEB71098}
-		{D7FE3E0F-3FE0-4F87-A2F5-24F1454D84C0} = {9CCA131B-DE95-4D44-8788-C3CAE28574CD}
-		{DA5F1FF9-4259-4C54-B443-85CFA226EE6A} = {9CCA131B-DE95-4D44-8788-C3CAE28574CD}
-		{9AE1B827-21AC-4063-AB22-C8804B7F931E} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
-		{0097673D-DBCE-476E-82FE-E78A56E58AA2} = {B39A8919-9F95-48FE-AD7B-76E08B509888}
-		{255614F5-CB64-4ECA-A026-E0B1AF6A2EF4} = {9B9E3891-2366-4253-A952-D08BCEB71098}
-		{DE3C28DD-B602-4750-831D-345102A54CA0} = {9B9E3891-2366-4253-A952-D08BCEB71098}
-		{14342787-B4EF-4076-8C91-BA6C523DE8DF} = {9B9E3891-2366-4253-A952-D08BCEB71098}
-		{E2BFA463-6402-4EF8-8945-FD9A10A914D1} = {7670D720-6E84-4AFC-8331-A5C399481905}
-		{A175EFAE-476C-4DAA-87D5-742C18CFCC27} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
-		{09EC467F-0F25-4E6F-A836-2BAEC8F6AB0C} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
-		{342D2657-2F84-493C-B74B-9D2CAE5D9DAB} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
-		{26918642-829D-4FA2-B60A-BE8D83F4E063} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
-		{11522B0D-BF31-42D5-8FC5-41E58F319AF9} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
-		{FDFB9C25-552D-420B-9D4A-DB0BB6472239} = {4ED8B739-6F4E-4CD4-B993-545E6B5CE637}
-		{A7644C3B-B843-44F1-9940-560D56CB0936} = {4ED8B739-6F4E-4CD4-B993-545E6B5CE637}
-		{742C3613-514C-4D6B-804A-2A7925F278F3} = {86C53C40-57AA-45B8-AD42-FAE0EFDF0F2B}
-		{98A16FFD-0C99-4665-AC64-DC17E86879A2} = {4ED8B739-6F4E-4CD4-B993-545E6B5CE637}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {87366D66-1391-4D90-8999-95A620AD786A}
-	EndGlobalSection
-EndGlobal
diff --git a/Avalonia.slnx b/Avalonia.slnx
new file mode 100644
index 0000000000..8505649676
--- /dev/null
+++ b/Avalonia.slnx
@@ -0,0 +1,197 @@
+<Solution>
+  <Folder Name="/Android/">
+    <Project Path="src/Android/Avalonia.Android/Avalonia.Android.csproj" />
+  </Folder>
+  <Folder Name="/Browser/">
+    <Project Path="src/Browser/Avalonia.Browser/Avalonia.Browser.csproj" />
+  </Folder>
+  <Folder Name="/HarfBuzz/">
+    <Project Path="src/HarfBuzz/Avalonia.HarfBuzz/Avalonia.HarfBuzz.csproj" />
+  </Folder>
+  <Folder Name="/Headless/">
+    <Project Path="src/Headless/Avalonia.Headless.NUnit/Avalonia.Headless.NUnit.csproj" />
+    <Project Path="src/Headless/Avalonia.Headless.Vnc/Avalonia.Headless.Vnc.csproj" />
+    <Project Path="src/Headless/Avalonia.Headless.XUnit/Avalonia.Headless.XUnit.csproj" />
+    <Project Path="src/Headless/Avalonia.Headless/Avalonia.Headless.csproj" />
+  </Folder>
+  <Folder Name="/iOS/">
+    <Project Path="src/iOS/Avalonia.iOS/Avalonia.iOS.csproj" />
+  </Folder>
+  <Folder Name="/Linux/">
+    <Project Path="src/Avalonia.FreeDesktop.AtSpi/Avalonia.FreeDesktop.AtSpi.csproj" />
+    <Project Path="src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj" />
+    <Project Path="src/Avalonia.X11/Avalonia.X11.csproj" />
+    <Project Path="src/Linux/Avalonia.LinuxFramebuffer/Avalonia.LinuxFramebuffer.csproj" />
+  </Folder>
+  <Folder Name="/Markup/">
+    <Project Path="src/Markup/Avalonia.Markup.Xaml.Loader/Avalonia.Markup.Xaml.Loader.csproj" />
+    <Project Path="src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj" />
+    <Project Path="src/Markup/Avalonia.Markup/Avalonia.Markup.csproj" />
+  </Folder>
+  <Folder Name="/Packages/">
+    <Project Path="packages/Avalonia/Avalonia.csproj" />
+    <Project Path="src/Avalonia.Desktop/Avalonia.Desktop.csproj" />
+  </Folder>
+  <Folder Name="/Props/">
+    <File Path="build/AvaloniaPublicKey.props" />
+    <File Path="build/Base.props" />
+    <File Path="build/CoreLibraries.props" />
+    <File Path="build/DevAnalyzers.props" />
+    <File Path="build/EmbedXaml.props" />
+    <File Path="build/HarfBuzzSharp.props" />
+    <File Path="build/MicroCOM.props" />
+    <File Path="build/NetAnalyzers.props" />
+    <File Path="build/NullableEnable.props" />
+    <File Path="build/ReferenceCoreLibraries.props" />
+    <File Path="build/SampleApp.props" />
+    <File Path="build/SharedVersion.props" />
+    <File Path="build/SkiaSharp.props" />
+    <File Path="build/SourceGenerators.props" />
+    <File Path="build/SourceLink.props" />
+    <File Path="build/TargetFrameworks.props" />
+    <File Path="build/TrimmingEnable.props" />
+    <File Path="build/UnitTests.NetFX.props" />
+    <File Path="build/XUnit.props" />
+  </Folder>
+  <Folder Name="/Samples/">
+    <Project Path="samples/AppWithoutLifetime/AppWithoutLifetime.csproj" />
+    <Project Path="samples/BindingDemo/BindingDemo.csproj" />
+    <Project Path="samples/ControlCatalog.Android/ControlCatalog.Android.csproj">
+      <Deploy />
+    </Project>
+    <Project Path="samples/ControlCatalog.Browser/ControlCatalog.Browser.csproj" />
+    <Project Path="samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj" />
+    <Project Path="samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj" />
+    <Project Path="samples/ControlCatalog.MacCatalyst/ControlCatalog.MacCatalyst.csproj" />
+    <Project Path="samples/ControlCatalog.tvOS/ControlCatalog.tvOS.csproj" />
+    <Project Path="samples/ControlCatalog/ControlCatalog.csproj" />
+    <Project Path="samples/Generators.Sandbox/Generators.Sandbox.csproj" />
+    <Project Path="samples/GpuInterop/GpuInterop.csproj" />
+    <Project Path="samples/IntegrationTestApp/IntegrationTestApp.csproj" />
+    <Project Path="samples/MiniMvvm/MiniMvvm.csproj" />
+    <Project Path="samples/PlatformSanityChecks/PlatformSanityChecks.csproj" />
+    <Project Path="samples/RenderDemo/RenderDemo.csproj" />
+    <Project Path="samples/SafeAreaDemo.Android/SafeAreaDemo.Android.csproj">
+      <Deploy />
+    </Project>
+    <Project Path="samples/SafeAreaDemo.Desktop/SafeAreaDemo.Desktop.csproj" />
+    <Project Path="samples/SafeAreaDemo.iOS/SafeAreaDemo.iOS.csproj">
+      <Deploy />
+    </Project>
+    <Project Path="samples/SafeAreaDemo/SafeAreaDemo.csproj" />
+    <Project Path="samples/SampleControls/ControlSamples.csproj" />
+    <Project Path="samples/Sandbox/Sandbox.csproj" />
+    <Project Path="samples/SingleProjectSandbox/SingleProjectSandbox.csproj" />
+    <Project Path="samples/TextTestApp/TextTestApp.csproj" />
+    <Project Path="samples/VirtualizationDemo/VirtualizationDemo.csproj" />
+    <Project Path="samples/XEmbedSample/XEmbedSample.csproj" />
+  </Folder>
+  <Folder Name="/Samples/Interop/">
+    <Project Path="samples/interop/WindowsInteropTest/WindowsInteropTest.csproj" />
+  </Folder>
+  <Folder Name="/Samples/UnloadableAssemblyLoadContext/">
+    <Project Path="samples/UnloadableAssemblyLoadContext/UnloadableAssemblyLoadContext/UnloadableAssemblyLoadContext.csproj" />
+    <Project Path="samples/UnloadableAssemblyLoadContext/UnloadableAssemblyLoadContextPlug/UnloadableAssemblyLoadContextPlug.csproj" />
+  </Folder>
+  <Folder Name="/Shared/">
+    <File Path=".editorconfig" />
+    <File Path="src/Shared/CallerArgumentExpressionAttribute.cs" />
+    <File Path="src/Shared/IsExternalInit.cs" />
+    <File Path="src/Shared/ModuleInitializer.cs" />
+    <File Path="src/Shared/SourceGeneratorAttributes.cs" />
+    <File Path="src/Shared/StreamCompatibilityExtensions.cs" />
+    <File Path="src/Shared/StringCompatibilityExtensions.cs" />
+  </Folder>
+  <Folder Name="/Skia/">
+    <Project Path="src/Skia/Avalonia.Skia/Avalonia.Skia.csproj" />
+  </Folder>
+  <Folder Name="/Solution Items/">
+    <File Path=".editorconfig" />
+    <File Path="azure-pipelines-integrationtests.yml" />
+    <File Path="azure-pipelines.yml" />
+    <File Path="CODE_OF_CONDUCT.md" />
+    <File Path="CONTRIBUTING.md" />
+    <File Path="Directory.Build.props" />
+    <File Path="Directory.Build.targets" />
+    <File Path="Directory.Packages.props" />
+    <File Path="dirs.proj" />
+    <File Path="global.json" />
+    <File Path="licence.md" />
+    <File Path="NOTICE.md" />
+    <File Path="NuGet.Config" />
+    <File Path="readme.md" />
+  </Folder>
+  <Folder Name="/Targets/">
+    <File Path="build/AnalyzerProject.targets" />
+    <File Path="build/BuildTargets.targets" />
+    <File Path="build/DevSingleProject.targets" />
+    <File Path="build/UnitTests.NetCore.targets" />
+  </Folder>
+  <Folder Name="/Tests/">
+    <Project Path="tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj" />
+    <Project Path="tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj" />
+    <Project Path="tests/Avalonia.Build.Tasks.UnitTest/Avalonia.Build.Tasks.UnitTest.csproj" />
+    <Project Path="tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj" />
+    <Project Path="tests/Avalonia.DesignerSupport.TestApp/Avalonia.DesignerSupport.TestApp.csproj" />
+    <Project Path="tests/Avalonia.DesignerSupport.Tests/Avalonia.DesignerSupport.Tests.csproj" />
+    <Project Path="tests/Avalonia.Generators.Tests/Avalonia.Generators.Tests.csproj" />
+    <Project Path="tests/Avalonia.Headless.NUnit.PerAssembly.UnitTests/Avalonia.Headless.NUnit.PerAssembly.UnitTests.csproj" />
+    <Project Path="tests/Avalonia.Headless.NUnit.PerTest.UnitTests/Avalonia.Headless.NUnit.PerTest.UnitTests.csproj" />
+    <Project Path="tests/Avalonia.Headless.XUnit.PerAssembly.UnitTests/Avalonia.Headless.XUnit.PerAssembly.UnitTests.csproj" />
+    <Project Path="tests/Avalonia.Headless.XUnit.PerTest.UnitTests/Avalonia.Headless.XUnit.PerTest.UnitTests.csproj" />
+    <Project Path="tests/Avalonia.IntegrationTests.Appium/Avalonia.IntegrationTests.Appium.csproj" />
+    <Project Path="tests/Avalonia.IntegrationTests.Win32/Avalonia.IntegrationTests.Win32.csproj" />
+    <Project Path="tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj" />
+    <Project Path="tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj" />
+    <Project Path="tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj" />
+    <Project Path="tests/Avalonia.RenderTests.WpfCompare/Avalonia.RenderTests.WpfCompare.csproj" />
+    <Project Path="tests/Avalonia.Skia.RenderTests/Avalonia.Skia.RenderTests.csproj" />
+    <Project Path="tests/Avalonia.Skia.UnitTests/Avalonia.Skia.UnitTests.csproj" />
+    <Project Path="tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj" />
+  </Folder>
+  <Folder Name="/Tests/TestFiles/" />
+  <Folder Name="/Tests/TestFiles/BuildTasks/">
+    <Project Path="tests/TestFiles/BuildTasks/PInvoke/PInvoke.csproj" />
+  </Folder>
+  <Folder Name="/Themes/">
+    <Project Path="src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj" />
+    <Project Path="src/Avalonia.Themes.Simple/Avalonia.Themes.Simple.csproj" />
+  </Folder>
+  <Folder Name="/Tools/">
+    <Project Path="src/tools/Avalonia.Analyzers.CodeFixes.CSharp/Avalonia.Analyzers.CodeFixes.CSharp.csproj">
+      <BuildType Project="Release" />
+    </Project>
+    <Project Path="src/tools/Avalonia.Analyzers.CSharp/Avalonia.Analyzers.CSharp.csproj">
+      <BuildType Project="Release" />
+    </Project>
+    <Project Path="src/tools/Avalonia.Analyzers.VisualBasic/Avalonia.Analyzers.VisualBasic.csproj">
+      <BuildType Project="Release" />
+    </Project>
+    <Project Path="src/tools/Avalonia.DBus.Generators/Avalonia.DBus.Generators.csproj" />
+    <Project Path="src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj" />
+    <Project Path="src/tools/Avalonia.Generators/Avalonia.Generators.csproj" />
+    <Project Path="src/tools/DevAnalyzers/DevAnalyzers.csproj" />
+    <Project Path="src/tools/DevGenerators/DevGenerators.csproj" />
+  </Folder>
+  <Folder Name="/Windows/">
+    <Project Path="src/Windows/Avalonia.Win32.Automation/Avalonia.Win32.Automation.csproj" />
+    <Project Path="src/Windows/Avalonia.Win32.Interoperability/Avalonia.Win32.Interoperability.csproj" />
+    <Project Path="src/Windows/Avalonia.Win32/Avalonia.Win32.csproj" />
+  </Folder>
+  <Project Path="nukebuild/_build.csproj">
+    <Build Project="false" />
+  </Project>
+  <Project Path="src/Avalonia.Base/Avalonia.Base.csproj" />
+  <Project Path="src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj" />
+  <Project Path="src/Avalonia.Controls.ColorPicker/Avalonia.Controls.ColorPicker.csproj" />
+  <Project Path="src/Avalonia.Controls/Avalonia.Controls.csproj" />
+  <Project Path="src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj" />
+  <Project Path="src/Avalonia.Dialogs/Avalonia.Dialogs.csproj" />
+  <Project Path="src/Avalonia.Fonts.Inter/Avalonia.Fonts.Inter.csproj" />
+  <Project Path="src/Avalonia.Metal/Avalonia.Metal.csproj" />
+  <Project Path="src/Avalonia.MicroCom/Avalonia.MicroCom.csproj" />
+  <Project Path="src/Avalonia.Native/Avalonia.Native.csproj" />
+  <Project Path="src/Avalonia.OpenGL/Avalonia.OpenGL.csproj" />
+  <Project Path="src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj" />
+  <Project Path="src/Avalonia.Vulkan/Avalonia.Vulkan.csproj" />
+</Solution>
diff --git a/Avalonia.sln.DotSettings b/Avalonia.slnx.DotSettings
similarity index 100%
rename from Avalonia.sln.DotSettings
rename to Avalonia.slnx.DotSettings
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 9441c68cac..0b02597482 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -7,7 +7,7 @@
     <PackageVersion Include="Appium.WebDriver" Version="5.2.0" />
     <PackageVersion Include="Avalonia.Angle.Windows.Natives" Version="2.1.25547.20250602" />
     <PackageVersion Include="Avalonia.BuildServices" Version="11.3.2" />
-    <PackageVersion Include="AvaloniaUI.DiagnosticsSupport" Version="2.2.0-beta2" />
+    <PackageVersion Include="AvaloniaUI.DiagnosticsSupport" Version="2.2.0-beta3" />
     <PackageVersion Include="BenchmarkDotNet" Version="0.15.6" />
     <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
     <PackageVersion Include="Dotnet.Bundle" Version="0.9.13" />
@@ -15,9 +15,9 @@
     <PackageVersion Include="HarfBuzzSharp" Version="8.3.1.3" />
     <PackageVersion Include="HarfBuzzSharp.NativeAssets.Linux" Version="8.3.1.3" />
     <PackageVersion Include="HarfBuzzSharp.NativeAssets.WebAssembly" Version="8.3.1.3" />
-    <PackageVersion Include="MicroCom.CodeGenerator" Version="0.11.0" />
-    <PackageVersion Include="MicroCom.CodeGenerator.MSBuild" Version="0.11.0" />
-    <PackageVersion Include="MicroCom.Runtime" Version="0.11.0" />
+    <PackageVersion Include="MicroCom.CodeGenerator" Version="0.11.4" />
+    <PackageVersion Include="MicroCom.CodeGenerator.MSBuild" Version="0.11.4" />
+    <PackageVersion Include="MicroCom.Runtime" Version="0.11.4" />
     <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.10" />
     <PackageVersion Include="Microsoft.Build.Framework" Version="18.0.2" />
     <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="15.1.548" />
@@ -37,8 +37,8 @@
     <PackageVersion Include="NuGet.Protocol" Version="7.0.1" />
     <PackageVersion Include="Nuke.Common" Version="10.1.0" />
     <PackageVersion Include="Numerge" Version="1.0.0" />
-    <PackageVersion Include="NUnit" Version="4.4.0" />
-    <PackageVersion Include="NUnit3TestAdapter" Version="6.1.0" />
+    <PackageVersion Include="NUnit" Version="4.5.1" />
+    <PackageVersion Include="NUnit3TestAdapter" Version="6.2.0" />
     <PackageVersion Include="Quamotion.RemoteViewing" Version="1.1.211" />
     <PackageVersion Include="SharpCompress" Version="0.41.0" />
     <PackageVersion Include="Silk.NET.Direct3D.Compilers" Version="2.22.0" />
@@ -62,13 +62,13 @@
     <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
     <PackageVersion Include="Tmds.DBus.Protocol" Version="0.90.3" />
     <PackageVersion Include="Tmds.DBus.SourceGenerator" Version="0.0.22" />
-    <PackageVersion Include="Xamarin.AndroidX.AppCompat" Version="1.7.1.1" />
-    <PackageVersion Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.2.0" />
-    <PackageVersion Include="Xamarin.AndroidX.Window" Version="1.5.1" />
+    <PackageVersion Include="Xamarin.AndroidX.AppCompat" Version="1.7.1.3" />
+    <PackageVersion Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.2.0.2" />
+    <PackageVersion Include="Xamarin.AndroidX.Window" Version="1.5.1.2" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
     <PackageVersion Include="Xunit.StaFact" Version="3.0.13" />
-    <PackageVersion Include="xunit.v3.extensibility.core" Version="3.2.1" />
-    <PackageVersion Include="xunit.v3.mtp-v2" Version="3.2.1" />
+    <PackageVersion Include="xunit.v3.extensibility.core" Version="3.2.2" />
+    <PackageVersion Include="xunit.v3.mtp-v2" Version="3.2.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 0000000000..fcf55a12b9
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,11 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+If you discover a security vulnerability in any of our SDKs, tools, services, or repositories, please help us keep the community safe by reporting it responsibly.
+
+You can report security vulnerabilities by emailing **[security@avaloniaui.net](mailto:security@avaloniaui.net)**.
+
+Please avoid disclosing the issue publicly until we have had a reasonable amount of time to investigate and release a patch or mitigation. We review all legitimate reports and will work with you to quickly resolve the issue.
+
+Please note that Avalonia does not operate a bug bounty programme.
diff --git a/api/Avalonia.Android.nupkg.xml b/api/Avalonia.Android.nupkg.xml
deleted file mode 100644
index 98f8c40204..0000000000
--- a/api/Avalonia.Android.nupkg.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- https://learn.microsoft.com/dotnet/fundamentals/package-validation/diagnostic-ids -->
-<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Android.Platform.Specific.IAndroidView</Target>
-    <Left>baseline/Avalonia.Android/lib/net10.0-android36.0/Avalonia.Android.dll</Left>
-    <Right>current/Avalonia.Android/lib/net10.0-android36.0/Avalonia.Android.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Android.AvaloniaMainActivity.CreateAppBuilder</Target>
-    <Left>baseline/Avalonia.Android/lib/net10.0-android36.0/Avalonia.Android.dll</Left>
-    <Right>current/Avalonia.Android/lib/net10.0-android36.0/Avalonia.Android.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Android.AvaloniaMainActivity.CustomizeAppBuilder(Avalonia.AppBuilder)</Target>
-    <Left>baseline/Avalonia.Android/lib/net10.0-android36.0/Avalonia.Android.dll</Left>
-    <Right>current/Avalonia.Android/lib/net10.0-android36.0/Avalonia.Android.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Android.AvaloniaActivity</Target>
-    <Left>baseline/Avalonia.Android/lib/net10.0-android36.0/Avalonia.Android.dll</Left>
-    <Right>current/Avalonia.Android/lib/net10.0-android36.0/Avalonia.Android.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Android.AvaloniaMainActivity</Target>
-    <Left>baseline/Avalonia.Android/lib/net10.0-android36.0/Avalonia.Android.dll</Left>
-    <Right>current/Avalonia.Android/lib/net10.0-android36.0/Avalonia.Android.dll</Right>
-  </Suppression>
-</Suppressions>
diff --git a/api/Avalonia.Headless.XUnit.nupkg.xml b/api/Avalonia.Headless.XUnit.nupkg.xml
deleted file mode 100644
index c87cf909fe..0000000000
--- a/api/Avalonia.Headless.XUnit.nupkg.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- https://learn.microsoft.com/dotnet/fundamentals/package-validation/diagnostic-ids -->
-<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Headless.XUnit.AvaloniaTestFrameworkTypeDiscoverer</Target>
-    <Left>baseline/Avalonia.Headless.XUnit/lib/net10.0/Avalonia.Headless.XUnit.dll</Left>
-    <Right>current/Avalonia.Headless.XUnit/lib/net10.0/Avalonia.Headless.XUnit.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Headless.XUnit.AvaloniaUIFactDiscoverer</Target>
-    <Left>baseline/Avalonia.Headless.XUnit/lib/net10.0/Avalonia.Headless.XUnit.dll</Left>
-    <Right>current/Avalonia.Headless.XUnit/lib/net10.0/Avalonia.Headless.XUnit.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Headless.XUnit.AvaloniaTestFrameworkTypeDiscoverer</Target>
-    <Left>baseline/Avalonia.Headless.XUnit/lib/net8.0/Avalonia.Headless.XUnit.dll</Left>
-    <Right>current/Avalonia.Headless.XUnit/lib/net8.0/Avalonia.Headless.XUnit.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Headless.XUnit.AvaloniaUIFactDiscoverer</Target>
-    <Left>baseline/Avalonia.Headless.XUnit/lib/net8.0/Avalonia.Headless.XUnit.dll</Left>
-    <Right>current/Avalonia.Headless.XUnit/lib/net8.0/Avalonia.Headless.XUnit.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Headless.XUnit.AvaloniaFactAttribute.#ctor</Target>
-    <Left>baseline/Avalonia.Headless.XUnit/lib/net10.0/Avalonia.Headless.XUnit.dll</Left>
-    <Right>current/Avalonia.Headless.XUnit/lib/net10.0/Avalonia.Headless.XUnit.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Headless.XUnit.AvaloniaTheoryDiscoverer.#ctor(Xunit.Abstractions.IMessageSink)</Target>
-    <Left>baseline/Avalonia.Headless.XUnit/lib/net10.0/Avalonia.Headless.XUnit.dll</Left>
-    <Right>current/Avalonia.Headless.XUnit/lib/net10.0/Avalonia.Headless.XUnit.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Headless.XUnit.AvaloniaFactAttribute.#ctor</Target>
-    <Left>baseline/Avalonia.Headless.XUnit/lib/net8.0/Avalonia.Headless.XUnit.dll</Left>
-    <Right>current/Avalonia.Headless.XUnit/lib/net8.0/Avalonia.Headless.XUnit.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Headless.XUnit.AvaloniaTheoryDiscoverer.#ctor(Xunit.Abstractions.IMessageSink)</Target>
-    <Left>baseline/Avalonia.Headless.XUnit/lib/net8.0/Avalonia.Headless.XUnit.dll</Left>
-    <Right>current/Avalonia.Headless.XUnit/lib/net8.0/Avalonia.Headless.XUnit.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0007</DiagnosticId>
-    <Target>T:Avalonia.Headless.XUnit.AvaloniaTheoryDiscoverer</Target>
-    <Left>baseline/Avalonia.Headless.XUnit/lib/net10.0/Avalonia.Headless.XUnit.dll</Left>
-    <Right>current/Avalonia.Headless.XUnit/lib/net10.0/Avalonia.Headless.XUnit.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0007</DiagnosticId>
-    <Target>T:Avalonia.Headless.XUnit.AvaloniaTheoryDiscoverer</Target>
-    <Left>baseline/Avalonia.Headless.XUnit/lib/net8.0/Avalonia.Headless.XUnit.dll</Left>
-    <Right>current/Avalonia.Headless.XUnit/lib/net8.0/Avalonia.Headless.XUnit.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Headless.XUnit.AvaloniaTestFrameworkAttribute</Target>
-    <Left>baseline/Avalonia.Headless.XUnit/lib/net10.0/Avalonia.Headless.XUnit.dll</Left>
-    <Right>current/Avalonia.Headless.XUnit/lib/net10.0/Avalonia.Headless.XUnit.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Headless.XUnit.AvaloniaTestFrameworkAttribute</Target>
-    <Left>baseline/Avalonia.Headless.XUnit/lib/net8.0/Avalonia.Headless.XUnit.dll</Left>
-    <Right>current/Avalonia.Headless.XUnit/lib/net8.0/Avalonia.Headless.XUnit.dll</Right>
-  </Suppression>
-</Suppressions>
diff --git a/api/Avalonia.Headless.nupkg.xml b/api/Avalonia.Headless.nupkg.xml
deleted file mode 100644
index 229047057a..0000000000
--- a/api/Avalonia.Headless.nupkg.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- https://learn.microsoft.com/dotnet/fundamentals/package-validation/diagnostic-ids -->
-<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Headless.HeadlessWindowExtensions.DragDrop(Avalonia.Controls.TopLevel,Avalonia.Point,Avalonia.Input.Raw.RawDragEventType,Avalonia.Input.IDataObject,Avalonia.Input.DragDropEffects,Avalonia.Input.RawInputModifiers)</Target>
-    <Left>baseline/Avalonia.Headless/lib/net10.0/Avalonia.Headless.dll</Left>
-    <Right>current/Avalonia.Headless/lib/net10.0/Avalonia.Headless.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Headless.HeadlessWindowExtensions.KeyPress(Avalonia.Controls.TopLevel,Avalonia.Input.Key,Avalonia.Input.RawInputModifiers)</Target>
-    <Left>baseline/Avalonia.Headless/lib/net10.0/Avalonia.Headless.dll</Left>
-    <Right>current/Avalonia.Headless/lib/net10.0/Avalonia.Headless.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Headless.HeadlessWindowExtensions.KeyRelease(Avalonia.Controls.TopLevel,Avalonia.Input.Key,Avalonia.Input.RawInputModifiers)</Target>
-    <Left>baseline/Avalonia.Headless/lib/net10.0/Avalonia.Headless.dll</Left>
-    <Right>current/Avalonia.Headless/lib/net10.0/Avalonia.Headless.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Headless.HeadlessWindowExtensions.DragDrop(Avalonia.Controls.TopLevel,Avalonia.Point,Avalonia.Input.Raw.RawDragEventType,Avalonia.Input.IDataObject,Avalonia.Input.DragDropEffects,Avalonia.Input.RawInputModifiers)</Target>
-    <Left>baseline/Avalonia.Headless/lib/net8.0/Avalonia.Headless.dll</Left>
-    <Right>current/Avalonia.Headless/lib/net8.0/Avalonia.Headless.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Headless.HeadlessWindowExtensions.KeyPress(Avalonia.Controls.TopLevel,Avalonia.Input.Key,Avalonia.Input.RawInputModifiers)</Target>
-    <Left>baseline/Avalonia.Headless/lib/net8.0/Avalonia.Headless.dll</Left>
-    <Right>current/Avalonia.Headless/lib/net8.0/Avalonia.Headless.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Headless.HeadlessWindowExtensions.KeyRelease(Avalonia.Controls.TopLevel,Avalonia.Input.Key,Avalonia.Input.RawInputModifiers)</Target>
-    <Left>baseline/Avalonia.Headless/lib/net8.0/Avalonia.Headless.dll</Left>
-    <Right>current/Avalonia.Headless/lib/net8.0/Avalonia.Headless.dll</Right>
-  </Suppression>
-</Suppressions>
diff --git a/api/Avalonia.LinuxFramebuffer.nupkg.xml b/api/Avalonia.LinuxFramebuffer.nupkg.xml
deleted file mode 100644
index 0fa6ef4e03..0000000000
--- a/api/Avalonia.LinuxFramebuffer.nupkg.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- https://learn.microsoft.com/dotnet/fundamentals/package-validation/diagnostic-ids -->
-<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.LinuxFramebuffer.FbdevOutput.CreateFramebufferRenderTarget</Target>
-    <Left>baseline/Avalonia.LinuxFramebuffer/lib/net10.0/Avalonia.LinuxFramebuffer.dll</Left>
-    <Right>current/Avalonia.LinuxFramebuffer/lib/net10.0/Avalonia.LinuxFramebuffer.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.LinuxFramebuffer.FbdevOutput.Lock</Target>
-    <Left>baseline/Avalonia.LinuxFramebuffer/lib/net10.0/Avalonia.LinuxFramebuffer.dll</Left>
-    <Right>current/Avalonia.LinuxFramebuffer/lib/net10.0/Avalonia.LinuxFramebuffer.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.LinuxFramebuffer.FbdevOutput.CreateFramebufferRenderTarget</Target>
-    <Left>baseline/Avalonia.LinuxFramebuffer/lib/net8.0/Avalonia.LinuxFramebuffer.dll</Left>
-    <Right>current/Avalonia.LinuxFramebuffer/lib/net8.0/Avalonia.LinuxFramebuffer.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.LinuxFramebuffer.FbdevOutput.Lock</Target>
-    <Left>baseline/Avalonia.LinuxFramebuffer/lib/net8.0/Avalonia.LinuxFramebuffer.dll</Left>
-    <Right>current/Avalonia.LinuxFramebuffer/lib/net8.0/Avalonia.LinuxFramebuffer.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.LinuxFramebuffer.FbdevOutput</Target>
-    <Left>baseline/Avalonia.LinuxFramebuffer/lib/net10.0/Avalonia.LinuxFramebuffer.dll</Left>
-    <Right>current/Avalonia.LinuxFramebuffer/lib/net10.0/Avalonia.LinuxFramebuffer.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.LinuxFramebuffer.FbdevOutput</Target>
-    <Left>baseline/Avalonia.LinuxFramebuffer/lib/net8.0/Avalonia.LinuxFramebuffer.dll</Left>
-    <Right>current/Avalonia.LinuxFramebuffer/lib/net8.0/Avalonia.LinuxFramebuffer.dll</Right>
-  </Suppression>
-</Suppressions>
diff --git a/api/Avalonia.Skia.nupkg.xml b/api/Avalonia.Skia.nupkg.xml
deleted file mode 100644
index b73745af8e..0000000000
--- a/api/Avalonia.Skia.nupkg.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- https://learn.microsoft.com/dotnet/fundamentals/package-validation/diagnostic-ids -->
-<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Skia.ISkiaGpu</Target>
-    <Left>baseline/Avalonia.Skia/lib/net10.0/Avalonia.Skia.dll</Left>
-    <Right>current/Avalonia.Skia/lib/net10.0/Avalonia.Skia.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Skia.ISkiaGpuRenderTarget2</Target>
-    <Left>baseline/Avalonia.Skia/lib/net10.0/Avalonia.Skia.dll</Left>
-    <Right>current/Avalonia.Skia/lib/net10.0/Avalonia.Skia.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Skia.ISkiaGpuWithPlatformGraphicsContext</Target>
-    <Left>baseline/Avalonia.Skia/lib/net10.0/Avalonia.Skia.dll</Left>
-    <Right>current/Avalonia.Skia/lib/net10.0/Avalonia.Skia.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Skia.ISkiaGpu</Target>
-    <Left>baseline/Avalonia.Skia/lib/net8.0/Avalonia.Skia.dll</Left>
-    <Right>current/Avalonia.Skia/lib/net8.0/Avalonia.Skia.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Skia.ISkiaGpuRenderTarget2</Target>
-    <Left>baseline/Avalonia.Skia/lib/net8.0/Avalonia.Skia.dll</Left>
-    <Right>current/Avalonia.Skia/lib/net8.0/Avalonia.Skia.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Skia.ISkiaGpuWithPlatformGraphicsContext</Target>
-    <Left>baseline/Avalonia.Skia/lib/net8.0/Avalonia.Skia.dll</Left>
-    <Right>current/Avalonia.Skia/lib/net8.0/Avalonia.Skia.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Skia.Helpers.DrawingContextHelper.WrapSkiaCanvas(SkiaSharp.SKCanvas,Avalonia.Vector)</Target>
-    <Left>baseline/Avalonia.Skia/lib/net10.0/Avalonia.Skia.dll</Left>
-    <Right>current/Avalonia.Skia/lib/net10.0/Avalonia.Skia.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Skia.ISkiaGpu.TryCreateRenderTarget(System.Collections.Generic.IEnumerable{System.Object})</Target>
-    <Left>baseline/Avalonia.Skia/lib/net10.0/Avalonia.Skia.dll</Left>
-    <Right>current/Avalonia.Skia/lib/net10.0/Avalonia.Skia.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Skia.ISkiaGpuRenderTarget.BeginRenderingSession</Target>
-    <Left>baseline/Avalonia.Skia/lib/net10.0/Avalonia.Skia.dll</Left>
-    <Right>current/Avalonia.Skia/lib/net10.0/Avalonia.Skia.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Skia.ISkiaGpuRenderTarget.BeginRenderingSession(System.Nullable{Avalonia.PixelSize})</Target>
-    <Left>baseline/Avalonia.Skia/lib/net10.0/Avalonia.Skia.dll</Left>
-    <Right>current/Avalonia.Skia/lib/net10.0/Avalonia.Skia.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Skia.Helpers.DrawingContextHelper.WrapSkiaCanvas(SkiaSharp.SKCanvas,Avalonia.Vector)</Target>
-    <Left>baseline/Avalonia.Skia/lib/net8.0/Avalonia.Skia.dll</Left>
-    <Right>current/Avalonia.Skia/lib/net8.0/Avalonia.Skia.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Skia.ISkiaGpu.TryCreateRenderTarget(System.Collections.Generic.IEnumerable{System.Object})</Target>
-    <Left>baseline/Avalonia.Skia/lib/net8.0/Avalonia.Skia.dll</Left>
-    <Right>current/Avalonia.Skia/lib/net8.0/Avalonia.Skia.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Skia.ISkiaGpuRenderTarget.BeginRenderingSession</Target>
-    <Left>baseline/Avalonia.Skia/lib/net8.0/Avalonia.Skia.dll</Left>
-    <Right>current/Avalonia.Skia/lib/net8.0/Avalonia.Skia.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Skia.ISkiaGpuRenderTarget.BeginRenderingSession(System.Nullable{Avalonia.PixelSize})</Target>
-    <Left>baseline/Avalonia.Skia/lib/net8.0/Avalonia.Skia.dll</Left>
-    <Right>current/Avalonia.Skia/lib/net8.0/Avalonia.Skia.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Skia.ISkiaGpu.TryCreateRenderTarget(System.Collections.Generic.IEnumerable{Avalonia.Platform.Surfaces.IPlatformRenderSurface})</Target>
-    <Left>baseline/Avalonia.Skia/lib/net10.0/Avalonia.Skia.dll</Left>
-    <Right>current/Avalonia.Skia/lib/net10.0/Avalonia.Skia.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Skia.ISkiaGpu.TryGetGrContext</Target>
-    <Left>baseline/Avalonia.Skia/lib/net10.0/Avalonia.Skia.dll</Left>
-    <Right>current/Avalonia.Skia/lib/net10.0/Avalonia.Skia.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Skia.ISkiaGpuRenderTarget.BeginRenderingSession(Avalonia.Platform.IRenderTarget.RenderTargetSceneInfo)</Target>
-    <Left>baseline/Avalonia.Skia/lib/net10.0/Avalonia.Skia.dll</Left>
-    <Right>current/Avalonia.Skia/lib/net10.0/Avalonia.Skia.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Skia.ISkiaGpuRenderTarget.BeginRenderingSession(System.Nullable{Avalonia.PixelSize})</Target>
-    <Left>baseline/Avalonia.Skia/lib/net10.0/Avalonia.Skia.dll</Left>
-    <Right>current/Avalonia.Skia/lib/net10.0/Avalonia.Skia.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>P:Avalonia.Skia.ISkiaGpu.PlatformGraphicsContext</Target>
-    <Left>baseline/Avalonia.Skia/lib/net10.0/Avalonia.Skia.dll</Left>
-    <Right>current/Avalonia.Skia/lib/net10.0/Avalonia.Skia.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Skia.ISkiaGpu.TryCreateRenderTarget(System.Collections.Generic.IEnumerable{Avalonia.Platform.Surfaces.IPlatformRenderSurface})</Target>
-    <Left>baseline/Avalonia.Skia/lib/net8.0/Avalonia.Skia.dll</Left>
-    <Right>current/Avalonia.Skia/lib/net8.0/Avalonia.Skia.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Skia.ISkiaGpu.TryGetGrContext</Target>
-    <Left>baseline/Avalonia.Skia/lib/net8.0/Avalonia.Skia.dll</Left>
-    <Right>current/Avalonia.Skia/lib/net8.0/Avalonia.Skia.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Skia.ISkiaGpuRenderTarget.BeginRenderingSession(Avalonia.Platform.IRenderTarget.RenderTargetSceneInfo)</Target>
-    <Left>baseline/Avalonia.Skia/lib/net8.0/Avalonia.Skia.dll</Left>
-    <Right>current/Avalonia.Skia/lib/net8.0/Avalonia.Skia.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Skia.ISkiaGpuRenderTarget.BeginRenderingSession(System.Nullable{Avalonia.PixelSize})</Target>
-    <Left>baseline/Avalonia.Skia/lib/net8.0/Avalonia.Skia.dll</Left>
-    <Right>current/Avalonia.Skia/lib/net8.0/Avalonia.Skia.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>P:Avalonia.Skia.ISkiaGpu.PlatformGraphicsContext</Target>
-    <Left>baseline/Avalonia.Skia/lib/net8.0/Avalonia.Skia.dll</Left>
-    <Right>current/Avalonia.Skia/lib/net8.0/Avalonia.Skia.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Skia.ISkiaGpu</Target>
-    <Left>baseline/Avalonia.Skia/lib/net10.0/Avalonia.Skia.dll</Left>
-    <Right>current/Avalonia.Skia/lib/net10.0/Avalonia.Skia.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Skia.ISkiaGpuWithPlatformGraphicsContext</Target>
-    <Left>baseline/Avalonia.Skia/lib/net10.0/Avalonia.Skia.dll</Left>
-    <Right>current/Avalonia.Skia/lib/net10.0/Avalonia.Skia.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Skia.ISkiaGpu</Target>
-    <Left>baseline/Avalonia.Skia/lib/net8.0/Avalonia.Skia.dll</Left>
-    <Right>current/Avalonia.Skia/lib/net8.0/Avalonia.Skia.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Skia.ISkiaGpuWithPlatformGraphicsContext</Target>
-    <Left>baseline/Avalonia.Skia/lib/net8.0/Avalonia.Skia.dll</Left>
-    <Right>current/Avalonia.Skia/lib/net8.0/Avalonia.Skia.dll</Right>
-  </Suppression>
-</Suppressions>
diff --git a/api/Avalonia.Win32.Interoperability.nupkg.xml b/api/Avalonia.Win32.Interoperability.nupkg.xml
deleted file mode 100644
index 3672bb9b99..0000000000
--- a/api/Avalonia.Win32.Interoperability.nupkg.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- https://learn.microsoft.com/dotnet/fundamentals/package-validation/diagnostic-ids -->
-<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Win32.Interoperability.WinFormsAvaloniaControlHost.PreFilterMessage(System.Windows.Forms.Message@)</Target>
-    <Left>baseline/Avalonia.Win32.Interoperability/lib/net461/Avalonia.Win32.Interoperability.dll</Left>
-    <Right>current/Avalonia.Win32.Interoperability/lib/net461/Avalonia.Win32.Interoperability.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Win32.Interoperability.WinFormsAvaloniaControlHost.PreFilterMessage(System.Windows.Forms.Message@)</Target>
-    <Left>baseline/Avalonia.Win32.Interoperability/lib/net6.0-windows7.0/Avalonia.Win32.Interoperability.dll</Left>
-    <Right>current/Avalonia.Win32.Interoperability/lib/net6.0-windows7.0/Avalonia.Win32.Interoperability.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Win32.Interoperability.WinFormsAvaloniaControlHost.PreFilterMessage(System.Windows.Forms.Message@)</Target>
-    <Left>baseline/Avalonia.Win32.Interoperability/lib/net8.0-windows7.0/Avalonia.Win32.Interoperability.dll</Left>
-    <Right>current/Avalonia.Win32.Interoperability/lib/net8.0-windows7.0/Avalonia.Win32.Interoperability.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Win32.Interoperability.WinFormsAvaloniaControlHost</Target>
-    <Left>baseline/Avalonia.Win32.Interoperability/lib/net461/Avalonia.Win32.Interoperability.dll</Left>
-    <Right>current/Avalonia.Win32.Interoperability/lib/net461/Avalonia.Win32.Interoperability.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Win32.Interoperability.WinFormsAvaloniaControlHost</Target>
-    <Left>baseline/Avalonia.Win32.Interoperability/lib/net6.0-windows7.0/Avalonia.Win32.Interoperability.dll</Left>
-    <Right>current/Avalonia.Win32.Interoperability/lib/net6.0-windows7.0/Avalonia.Win32.Interoperability.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Win32.Interoperability.WinFormsAvaloniaControlHost</Target>
-    <Left>baseline/Avalonia.Win32.Interoperability/lib/net8.0-windows7.0/Avalonia.Win32.Interoperability.dll</Left>
-    <Right>current/Avalonia.Win32.Interoperability/lib/net8.0-windows7.0/Avalonia.Win32.Interoperability.dll</Right>
-  </Suppression>
-</Suppressions>
diff --git a/api/Avalonia.nupkg.xml b/api/Avalonia.nupkg.xml
deleted file mode 100644
index b2a81dd55d..0000000000
--- a/api/Avalonia.nupkg.xml
+++ /dev/null
@@ -1,5644 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- https://learn.microsoft.com/dotnet/fundamentals/package-validation/diagnostic-ids -->
-<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Animation.CustomAnimatorBase</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Animation.CustomAnimatorBase`1</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Animation.Easings.CubicBezierEasing</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.Primitives.IScrollable</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Data.Core.Plugins.BindingPlugins</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Data.Core.Plugins.DataValidationBase</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Data.Core.Plugins.ExceptionValidationPlugin</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Data.Core.Plugins.IDataValidationPlugin</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Data.Core.Plugins.IndeiValidationPlugin</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Data.Core.Plugins.IPropertyAccessorPlugin</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Data.Core.Plugins.IStreamPlugin</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Data.Core.Plugins.PropertyAccessorBase</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Data.Core.Plugins.PropertyError</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Diagnostics.AppliedStyle</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Diagnostics.StyledElementExtensions</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Diagnostics.StyleDiagnostics</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Input.DataObjectExtensions</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Input.Gestures</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Input.GotFocusEventArgs</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Input.IDataObject</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Input.IKeyboardNavigationHandler</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Input.KeyboardNavigationHandler</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Input.TextInput.ITextInputMethodRoot</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Layout.IEmbeddedLayoutRoot</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Layout.ILayoutRoot</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Layout.LayoutManager</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Media.Fonts.FontFamilyLoader</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Media.TextFormatting.TextRange</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Platform.IGeometryContext2</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Platform.IOptionalFeatureProvider</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Platform.IReadableBitmapWithAlphaImpl</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Platform.IRenderTarget2</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Platform.IRenderTargetWithProperties</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Platform.OptionalFeatureProviderExtensions</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Rendering.IHitTester</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Rendering.IRenderer</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Rendering.IRenderRoot</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Styling.IStyleable</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Utilities.MathUtilities</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Utilities.StringTokenizer</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.VisualTree.IHostedVisualTreeRoot</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.ApplicationLifetimes.ClassicDesktopStyleApplicationLifetimeOptions</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.ApplicationLifetimes.IActivatableApplicationLifetime</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.AutoCompleteBox.BindingEvaluator`1</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.Chrome.CaptionButtons</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.Chrome.TitleBar</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.ContextRequestedEventArgs</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.Diagnostics.IPopupHostProvider</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.FileDialog</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.FileDialogFilter</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.FileSystemDialog</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.Generators.TreeContainerIndex</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.Generators.TreeItemContainerGenerator</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.NativeMenuItemToggleType</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.OpenFileDialog</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.OpenFolderDialog</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.Platform.ISystemDialogImpl</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.Platform.ManagedDispatcherImpl</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.Platform.Surfaces.FramebufferLockProperties</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.Platform.Surfaces.FuncFramebufferRenderTarget</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.Platform.Surfaces.IFramebufferPlatformSurface</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.Platform.Surfaces.IFramebufferRenderTarget</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.Platform.Surfaces.IFramebufferRenderTargetWithProperties</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.Primitives.ChromeOverlayLayer</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.Primitives.IPopupHost</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.Primitives.IScrollable</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.Primitives.LightDismissOverlayLayer</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.Primitives.OverlayLayer</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.Primitives.SelectionHandleType</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.Remote.RemoteServer</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.Remote.RemoteWidget</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.SaveFileDialog</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.SystemDecorations</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.SystemDialog</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Platform.ExtendClientAreaChromeHints</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Platform.IApplicationPlatformEvents</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Markup.Xaml.ConstructorArgumentAttribute</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Markup.Xaml.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Markup.Xaml.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.OpenGL.Surfaces.IGlPlatformSurfaceRenderTarget2</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.OpenGL.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.OpenGL.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.OpenGL.Surfaces.IGlPlatformSurfaceRenderTargetWithCorruptionInfo</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.OpenGL.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.OpenGL.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Media.Fonts.FontFamilyLoader</Target>
-    <Left>baseline/Avalonia/lib/net6.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net6.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Animation.CustomAnimatorBase</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Animation.CustomAnimatorBase`1</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Animation.Easings.CubicBezierEasing</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.Primitives.IScrollable</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Data.Core.Plugins.BindingPlugins</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Data.Core.Plugins.DataValidationBase</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Data.Core.Plugins.ExceptionValidationPlugin</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Data.Core.Plugins.IDataValidationPlugin</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Data.Core.Plugins.IndeiValidationPlugin</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Data.Core.Plugins.IPropertyAccessorPlugin</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Data.Core.Plugins.IStreamPlugin</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Data.Core.Plugins.PropertyAccessorBase</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Data.Core.Plugins.PropertyError</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Diagnostics.AppliedStyle</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Diagnostics.StyledElementExtensions</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Diagnostics.StyleDiagnostics</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Input.DataObjectExtensions</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Input.Gestures</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Input.GotFocusEventArgs</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Input.IDataObject</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Input.IKeyboardNavigationHandler</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Input.KeyboardNavigationHandler</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Input.TextInput.ITextInputMethodRoot</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Layout.IEmbeddedLayoutRoot</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Layout.ILayoutRoot</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Layout.LayoutManager</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Media.Fonts.FontFamilyLoader</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Media.TextFormatting.TextRange</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Platform.IGeometryContext2</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Platform.IOptionalFeatureProvider</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Platform.IReadableBitmapWithAlphaImpl</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Platform.IRenderTarget2</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Platform.IRenderTargetWithProperties</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Platform.OptionalFeatureProviderExtensions</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Rendering.IHitTester</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Rendering.IRenderer</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Rendering.IRenderRoot</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Styling.IStyleable</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Utilities.MathUtilities</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Utilities.StringTokenizer</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.VisualTree.IHostedVisualTreeRoot</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.ApplicationLifetimes.ClassicDesktopStyleApplicationLifetimeOptions</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.ApplicationLifetimes.IActivatableApplicationLifetime</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.AutoCompleteBox.BindingEvaluator`1</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.Chrome.CaptionButtons</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.Chrome.TitleBar</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.ContextRequestedEventArgs</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.Diagnostics.IPopupHostProvider</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.FileDialog</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.FileDialogFilter</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.FileSystemDialog</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.Generators.TreeContainerIndex</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.Generators.TreeItemContainerGenerator</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.NativeMenuItemToggleType</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.OpenFileDialog</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.OpenFolderDialog</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.Platform.ISystemDialogImpl</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.Platform.ManagedDispatcherImpl</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.Platform.Surfaces.FramebufferLockProperties</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.Platform.Surfaces.FuncFramebufferRenderTarget</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.Platform.Surfaces.IFramebufferPlatformSurface</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.Platform.Surfaces.IFramebufferRenderTarget</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.Platform.Surfaces.IFramebufferRenderTargetWithProperties</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.Primitives.ChromeOverlayLayer</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.Primitives.IPopupHost</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.Primitives.IScrollable</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.Primitives.LightDismissOverlayLayer</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.Primitives.OverlayLayer</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.Primitives.SelectionHandleType</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.Remote.RemoteServer</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.Remote.RemoteWidget</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.SaveFileDialog</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.SystemDecorations</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Controls.SystemDialog</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Platform.ExtendClientAreaChromeHints</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Platform.IApplicationPlatformEvents</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Markup.Xaml.ConstructorArgumentAttribute</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Markup.Xaml.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Markup.Xaml.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.OpenGL.Surfaces.IGlPlatformSurfaceRenderTarget2</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.OpenGL.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.OpenGL.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.OpenGL.Surfaces.IGlPlatformSurfaceRenderTargetWithCorruptionInfo</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.OpenGL.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.OpenGL.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Media.Fonts.FontFamilyLoader</Target>
-    <Left>baseline/Avalonia/lib/netstandard2.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/netstandard2.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Controls.ResourcesChangedEventArgs.Empty</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Data.BindingPriority.TemplatedParent</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Input.DataFormats.FileNames</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Input.DataFormats.Files</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Input.DataFormats.Text</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Input.GestureRecognizers.SwipeGestureRecognizer.CrossAxisCancelThresholdProperty</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Input.GestureRecognizers.SwipeGestureRecognizer.EdgeSizeProperty</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Input.HoldingState.Cancelled</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Input.InputElement.GotFocusEvent</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Input.InputElement.LostFocusEvent</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Media.DrawingImage.ViewboxProperty</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Media.Fonts.FontCollectionBase._glyphTypefaceCache</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Media.RadialGradientBrush.RadiusProperty</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Animation.Animation.SetAnimator(Avalonia.Animation.IAnimationSetter,Avalonia.Animation.CustomAnimatorBase)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.AvaloniaObjectExtensions.Bind(Avalonia.AvaloniaObject,Avalonia.AvaloniaProperty,Avalonia.Data.BindingBase,System.Object)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.ResourcesChangedEventArgs.#ctor</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Data.CompiledBindingPathBuilder.SetRawSource(System.Object)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Data.CompiledBindingPathBuilder.StreamObservable</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Data.CompiledBindingPathBuilder.StreamTask</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Data.CompiledBindingPathBuilder.TypeCast(System.Type)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Data.ReflectionBinding.#ctor(System.String,Avalonia.Data.BindingMode)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.DataObject.Contains(System.String)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.DataObject.Get(System.String)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.DataObject.GetDataFormats</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.DataObject.Set(System.String,System.Object)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.DragDrop.DoDragDrop(Avalonia.Input.PointerEventArgs,Avalonia.Input.IDataObject,Avalonia.Input.DragDropEffects)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.DragEventArgs.#ctor(Avalonia.Interactivity.RoutedEvent{Avalonia.Input.DragEventArgs},Avalonia.Input.IDataObject,Avalonia.Interactivity.Interactive,Avalonia.Point,Avalonia.Input.KeyModifiers)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.DragEventArgs.get_Data</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.FocusManager.#ctor(Avalonia.Input.IInputElement)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.FocusManager.ClearFocus</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.FocusManager.ClearFocusOnElementRemoved(Avalonia.Input.IInputElement,Avalonia.Visual)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.FocusManager.FindNextElement(Avalonia.Input.NavigationDirection)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.FocusManager.TryMoveFocus(Avalonia.Input.NavigationDirection)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.GestureRecognizers.SwipeGestureRecognizer.get_CrossAxisCancelThreshold</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.GestureRecognizers.SwipeGestureRecognizer.get_EdgeSize</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.GestureRecognizers.SwipeGestureRecognizer.set_CrossAxisCancelThreshold(System.Double)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.GestureRecognizers.SwipeGestureRecognizer.set_EdgeSize(System.Double)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.HoldingRoutedEventArgs.#ctor(Avalonia.Input.HoldingState,Avalonia.Point,Avalonia.Input.PointerType)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.IFocusManager.ClearFocus</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.IInputRoot.get_KeyboardNavigationHandler</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.IInputRoot.get_PlatformSettings</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.IInputRoot.get_PointerOverElement</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.IInputRoot.get_ShowAccessKeys</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.IInputRoot.set_PointerOverElement(Avalonia.Input.IInputElement)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.IInputRoot.set_ShowAccessKeys(System.Boolean)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.IKeyboardNavigationHandler.Move(Avalonia.Input.IInputElement,Avalonia.Input.NavigationDirection,Avalonia.Input.KeyModifiers)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.InputElement.AddPinchEndedHandler(Avalonia.Interactivity.Interactive,System.EventHandler{Avalonia.Input.PinchEndedEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.InputElement.AddPinchHandler(Avalonia.Interactivity.Interactive,System.EventHandler{Avalonia.Input.PinchEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.InputElement.AddPointerTouchPadGestureMagnifyHandler(Avalonia.Interactivity.Interactive,System.EventHandler{Avalonia.Input.PointerDeltaEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.InputElement.AddPointerTouchPadGestureRotateHandler(Avalonia.Interactivity.Interactive,System.EventHandler{Avalonia.Input.PointerDeltaEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.InputElement.AddPointerTouchPadGestureSwipeHandler(Avalonia.Interactivity.Interactive,System.EventHandler{Avalonia.Input.PointerDeltaEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.InputElement.AddPullGestureEndedHandler(Avalonia.Interactivity.Interactive,System.EventHandler{Avalonia.Input.PullGestureEndedEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.InputElement.AddPullGestureHandler(Avalonia.Interactivity.Interactive,System.EventHandler{Avalonia.Input.PullGestureEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.InputElement.AddScrollGestureEndedHandler(Avalonia.Interactivity.Interactive,System.EventHandler{Avalonia.Input.ScrollGestureEndedEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.InputElement.AddScrollGestureHandler(Avalonia.Interactivity.Interactive,System.EventHandler{Avalonia.Input.ScrollGestureEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.InputElement.AddScrollGestureInertiaStartingHandler(Avalonia.Interactivity.Interactive,System.EventHandler{Avalonia.Input.ScrollGestureInertiaStartingEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.InputElement.OnGotFocus(Avalonia.Input.GotFocusEventArgs)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.InputElement.OnLostFocus(Avalonia.Interactivity.RoutedEventArgs)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.InputElement.RemovePinchEndedHandler(Avalonia.Interactivity.Interactive,System.EventHandler{Avalonia.Input.PinchEndedEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.InputElement.RemovePinchHandler(Avalonia.Interactivity.Interactive,System.EventHandler{Avalonia.Input.PinchEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.InputElement.RemovePointerTouchPadGestureMagnifyHandler(Avalonia.Interactivity.Interactive,System.EventHandler{Avalonia.Input.PointerDeltaEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.InputElement.RemovePointerTouchPadGestureRotateHandler(Avalonia.Interactivity.Interactive,System.EventHandler{Avalonia.Input.PointerDeltaEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.InputElement.RemovePointerTouchPadGestureSwipeHandler(Avalonia.Interactivity.Interactive,System.EventHandler{Avalonia.Input.PointerDeltaEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.InputElement.RemovePullGestureEndedHandler(Avalonia.Interactivity.Interactive,System.EventHandler{Avalonia.Input.PullGestureEndedEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.InputElement.RemovePullGestureHandler(Avalonia.Interactivity.Interactive,System.EventHandler{Avalonia.Input.PullGestureEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.InputElement.RemoveScrollGestureEndedHandler(Avalonia.Interactivity.Interactive,System.EventHandler{Avalonia.Input.ScrollGestureEndedEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.InputElement.RemoveScrollGestureHandler(Avalonia.Interactivity.Interactive,System.EventHandler{Avalonia.Input.ScrollGestureEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.InputElement.RemoveScrollGestureInertiaStartingHandler(Avalonia.Interactivity.Interactive,System.EventHandler{Avalonia.Input.ScrollGestureInertiaStartingEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.KeyboardNavigationHandler.Move(Avalonia.Input.IInputElement,Avalonia.Input.NavigationDirection,Avalonia.Input.KeyModifiers)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.Platform.IClipboard.GetDataAsync(System.String)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.Platform.IClipboard.GetFormatsAsync</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.Platform.IClipboard.GetTextAsync</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.Platform.IClipboard.SetDataObjectAsync(Avalonia.Input.IDataObject)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.Platform.IClipboard.SetTextAsync(System.String)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.Platform.IClipboard.TryGetInProcessDataObjectAsync</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.Platform.IPlatformDragSource.DoDragDrop(Avalonia.Input.PointerEventArgs,Avalonia.Input.IDataObject,Avalonia.Input.DragDropEffects)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.Raw.RawDragEvent.#ctor(Avalonia.Input.Raw.IDragDropDevice,Avalonia.Input.Raw.RawDragEventType,Avalonia.Input.IInputRoot,Avalonia.Point,Avalonia.Input.IDataObject,Avalonia.Input.DragDropEffects,Avalonia.Input.RawInputModifiers)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.Raw.RawDragEvent.get_Data</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.Raw.RawKeyEventArgs.#ctor(Avalonia.Input.IInputDevice,System.UInt64,Avalonia.Input.IInputRoot,Avalonia.Input.Raw.RawKeyEventType,Avalonia.Input.Key,Avalonia.Input.RawInputModifiers,Avalonia.Input.PhysicalKey,Avalonia.Input.KeyDeviceType,System.String)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.Raw.RawKeyEventArgs.#ctor(Avalonia.Input.IInputDevice,System.UInt64,Avalonia.Input.IInputRoot,Avalonia.Input.Raw.RawKeyEventType,Avalonia.Input.Key,Avalonia.Input.RawInputModifiers,Avalonia.Input.PhysicalKey,System.String)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.Raw.RawKeyEventArgs.#ctor(Avalonia.Input.IKeyboardDevice,System.UInt64,Avalonia.Input.IInputRoot,Avalonia.Input.Raw.RawKeyEventType,Avalonia.Input.Key,Avalonia.Input.RawInputModifiers)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.SwipeGestureEventArgs.#ctor(System.Int32,Avalonia.Input.SwipeDirection,Avalonia.Vector,Avalonia.Point)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.SwipeGestureEventArgs.get_StartPoint</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.TextInput.TextInputMethodClient.ShowInputPanel</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Layout.LayoutHelper.RoundLayoutSizeUp(Avalonia.Size,System.Double,System.Double)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Layout.LayoutHelper.RoundLayoutThickness(Avalonia.Thickness,System.Double,System.Double)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.Color.ToUint32</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.DrawingContext.PushPostTransform(Avalonia.Matrix)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.DrawingContext.PushPreTransform(Avalonia.Matrix)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.DrawingContext.PushTransformContainer</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.DrawingImage.get_Viewbox</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.DrawingImage.set_Viewbox(System.Nullable{Avalonia.Rect})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.Fonts.FontCollectionBase.Initialize(Avalonia.Platform.IFontManagerImpl)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.Fonts.FontCollectionBase.TryGetGlyphTypeface(System.String,Avalonia.Media.Fonts.FontCollectionKey,Avalonia.Media.GlyphTypeface@)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.Fonts.IFontCollection.Initialize(Avalonia.Platform.IFontManagerImpl)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.Imaging.Bitmap.CopyPixels(Avalonia.Platform.ILockedFramebuffer,Avalonia.Platform.AlphaFormat)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.Immutable.ImmutableRadialGradientBrush.get_Radius</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.IRadialGradientBrush.get_Radius</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.RadialGradientBrush.get_Radius</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.RadialGradientBrush.set_Radius(System.Double)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.StreamGeometryContext.ArcTo(Avalonia.Point,Avalonia.Size,System.Double,System.Boolean,Avalonia.Media.SweepDirection)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.StreamGeometryContext.CubicBezierTo(Avalonia.Point,Avalonia.Point,Avalonia.Point)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.StreamGeometryContext.LineTo(Avalonia.Point)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.StreamGeometryContext.QuadraticBezierTo(Avalonia.Point,Avalonia.Point)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.TextFormatting.GenericTextRunProperties.#ctor(Avalonia.Media.Typeface,Avalonia.Media.FontFeatureCollection,System.Double,Avalonia.Media.TextDecorationCollection,Avalonia.Media.IBrush,Avalonia.Media.IBrush,Avalonia.Media.BaselineAlignment,System.Globalization.CultureInfo)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.TextFormatting.GenericTextRunProperties.#ctor(Avalonia.Media.Typeface,System.Double,Avalonia.Media.TextDecorationCollection,Avalonia.Media.IBrush,Avalonia.Media.IBrush,Avalonia.Media.BaselineAlignment,System.Globalization.CultureInfo)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.TextFormatting.TextCollapsingProperties.CreateCollapsedRuns(Avalonia.Media.TextFormatting.TextLine,System.Int32,Avalonia.Media.FlowDirection,Avalonia.Media.TextFormatting.TextRun)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.TextFormatting.TextLayout.#ctor(System.String,Avalonia.Media.Typeface,Avalonia.Media.FontFeatureCollection,System.Double,Avalonia.Media.IBrush,Avalonia.Media.TextAlignment,Avalonia.Media.TextWrapping,Avalonia.Media.TextTrimming,Avalonia.Media.TextDecorationCollection,Avalonia.Media.FlowDirection,System.Double,System.Double,System.Double,System.Double,System.Int32,System.Collections.Generic.IReadOnlyList{Avalonia.Utilities.ValueSpan{Avalonia.Media.TextFormatting.TextRunProperties}})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M: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,Avalonia.Media.FlowDirection,System.Double,System.Double,System.Double,System.Double,System.Int32,System.Collections.Generic.IReadOnlyList{Avalonia.Utilities.ValueSpan{Avalonia.Media.TextFormatting.TextRunProperties}})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.TextFormatting.TextShaperOptions.#ctor(Avalonia.Media.GlyphTypeface,System.Collections.Generic.IReadOnlyList{Avalonia.Media.FontFeature},System.Double,System.SByte,System.Globalization.CultureInfo,System.Double,System.Double)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.TextFormatting.TextShaperOptions.#ctor(Avalonia.Media.GlyphTypeface,System.Double,System.SByte,System.Globalization.CultureInfo,System.Double,System.Double)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.ICursorFactory.CreateCursor(Avalonia.Platform.IBitmapImpl,Avalonia.PixelPoint)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.IDrawingContextImplWithEffects.PushEffect(Avalonia.Media.IEffect)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.IFontManagerImpl.TryMatchCharacter(System.Int32,Avalonia.Media.FontStyle,Avalonia.Media.FontWeight,Avalonia.Media.FontStretch,System.Globalization.CultureInfo,Avalonia.Media.Typeface@)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.IGeometryContext.ArcTo(Avalonia.Point,Avalonia.Size,System.Double,System.Boolean,Avalonia.Media.SweepDirection)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.IGeometryContext.CubicBezierTo(Avalonia.Point,Avalonia.Point,Avalonia.Point)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.IGeometryContext.LineTo(Avalonia.Point)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.IGeometryContext.QuadraticBezierTo(Avalonia.Point,Avalonia.Point)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.IPlatformRenderInterfaceContext.CreateOffscreenRenderTarget(Avalonia.PixelSize,System.Double)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.IPlatformRenderInterfaceContext.CreateRenderTarget(System.Collections.Generic.IEnumerable{System.Object})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.IRenderTarget.CreateDrawingContext(Avalonia.PixelSize,Avalonia.Platform.RenderTargetDrawingContextProperties@)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.IRenderTarget.CreateDrawingContext(System.Boolean)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.LockedFramebuffer.#ctor(System.IntPtr,Avalonia.PixelSize,System.Int32,Avalonia.Vector,Avalonia.Platform.PixelFormat,System.Action)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Rendering.Composition.ICompositionGpuImportedObject.get_ImportCompeted</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Rendering.DefaultRenderTimer.add_Tick(System.Action{System.TimeSpan})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Rendering.DefaultRenderTimer.remove_Tick(System.Action{System.TimeSpan})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Rendering.DefaultRenderTimer.Start</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Rendering.DefaultRenderTimer.Stop</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Rendering.IRenderTimer.add_Tick(System.Action{System.TimeSpan})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Rendering.IRenderTimer.remove_Tick(System.Action{System.TimeSpan})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Rendering.SceneInvalidatedEventArgs.#ctor(Avalonia.Rendering.IRenderRoot,Avalonia.Rect)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Rendering.SceneInvalidatedEventArgs.get_RenderRoot</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Rendering.SleepLoopRenderTimer.add_Tick(System.Action{System.TimeSpan})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Rendering.SleepLoopRenderTimer.remove_Tick(System.Action{System.TimeSpan})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Rendering.ThreadProxyRenderTimer.add_Tick(System.Action{System.TimeSpan})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Rendering.ThreadProxyRenderTimer.remove_Tick(System.Action{System.TimeSpan})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Utilities.AvaloniaResourcesIndexReaderWriter.WriteResources(System.IO.Stream,System.Collections.Generic.List{System.ValueTuple{System.String,System.Int32,System.Func{System.IO.Stream}}})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Visual.get_VisualRoot</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Visuals.Platform.PathGeometryContext.ArcTo(Avalonia.Point,Avalonia.Size,System.Double,System.Boolean,Avalonia.Media.SweepDirection)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Visuals.Platform.PathGeometryContext.CubicBezierTo(Avalonia.Point,Avalonia.Point,Avalonia.Point)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Visuals.Platform.PathGeometryContext.LineTo(Avalonia.Point)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Visuals.Platform.PathGeometryContext.QuadraticBezierTo(Avalonia.Point,Avalonia.Point)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.VisualTree.VisualExtensions.GetVisualRoot(Avalonia.Visual)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.VisualTreeAttachmentEventArgs.#ctor(Avalonia.Visual,Avalonia.Rendering.IRenderRoot)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.VisualTreeAttachmentEventArgs.get_Root</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Controls.ContextMenu.PlacementModeProperty</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Controls.Control.ContextRequestedEvent</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Controls.Documents.Inline.TextDecorationsProperty</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Controls.DrawerPage.DrawerBreakpointWidthProperty</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Controls.NativeMenuBar.EnableMenuItemClickForwardingProperty</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Controls.NativeMenuItem.ToggleTypeProperty</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Controls.Primitives.FlyoutBase.IsOpenProperty</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Controls.Primitives.Popup.PlacementModeProperty</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Controls.Primitives.ToggleButton.CheckedEvent</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Controls.Primitives.ToggleButton.IndeterminateEvent</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Controls.Primitives.ToggleButton.UncheckedEvent</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Controls.Primitives.VisualLayerManager.ChromeOverlayLayerProperty</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Controls.TabItem.IconProperty</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Controls.TextBlock.LetterSpacingProperty</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Controls.TextBox.LetterSpacingProperty</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Controls.TopLevel.PointerOverElementProperty</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Controls.Window.ExtendClientAreaChromeHintsProperty</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Controls.Window.SystemDecorationsProperty</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.AppBuilder.get_LifetimeOverride</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Application.add_UrlsOpened(System.EventHandler{Avalonia.UrlOpenedEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Application.remove_UrlsOpened(System.EventHandler{Avalonia.UrlOpenedEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Automation.Peers.AutomationPeer.GetVisualRootCore</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.ContextMenu.get_PlacementMode</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.ContextMenu.set_PlacementMode(Avalonia.Controls.PlacementMode)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Design.CreatePreviewWithControl(System.Object)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Design.GetDataContext(Avalonia.Controls.Templates.IDataTemplate)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Design.GetPreviewWith(Avalonia.Controls.Templates.IDataTemplate)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Design.GetPreviewWith(Avalonia.Styling.IStyle)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Design.SetDataContext(Avalonia.Controls.Templates.IDataTemplate,System.Object)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Design.SetPreviewWith(Avalonia.AvaloniaObject,Avalonia.Controls.Control)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Design.SetPreviewWith(Avalonia.AvaloniaObject,Avalonia.Controls.ITemplate{Avalonia.Controls.Control})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Design.SetPreviewWith(Avalonia.Controls.ResourceDictionary,Avalonia.Controls.ITemplate{Avalonia.Controls.Control})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Design.SetPreviewWith(Avalonia.Controls.Templates.IDataTemplate,Avalonia.Controls.Control)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Design.SetPreviewWith(Avalonia.Controls.Templates.IDataTemplate,Avalonia.Controls.ITemplate{Avalonia.Controls.Control})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Design.SetPreviewWith(Avalonia.Styling.IStyle,Avalonia.Controls.Control)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Design.SetPreviewWith(Avalonia.Styling.IStyle,Avalonia.Controls.ITemplate{Avalonia.Controls.Control})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.DrawerPage.get_DrawerBreakpointWidth</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.DrawerPage.set_DrawerBreakpointWidth(System.Double)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Embedding.Offscreen.OffscreenTopLevelImplBase.get_Surfaces</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Generators.ItemContainerGenerator.ContainerFromIndex(System.Int32)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Generators.ItemContainerGenerator.IndexFromContainer(Avalonia.Controls.Control)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.ItemsControl.ItemsControlFromItemContaner(Avalonia.Controls.Control)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.NativeMenuBar.SetEnableMenuItemClickForwarding(Avalonia.Controls.MenuItem,System.Boolean)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.NativeMenuItem.get_ToggleType</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.PageSelectionChangedEventArgs.#ctor(Avalonia.Controls.Page,Avalonia.Controls.Page)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Platform.DefaultMenuInteractionHandler.GotFocus(System.Object,Avalonia.Input.GotFocusEventArgs)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Platform.IInsetsManager.get_DisplayEdgeToEdge</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Platform.IInsetsManager.set_DisplayEdgeToEdge(System.Boolean)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Platform.InsetsManagerBase.get_DisplayEdgeToEdge</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Platform.InsetsManagerBase.set_DisplayEdgeToEdge(System.Boolean)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.AccessText.get_AccessKey</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.AdornerLayer.#ctor</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.OverlayPopupHost.#ctor(Avalonia.Controls.Primitives.OverlayLayer)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.OverlayPopupHost.ConfigurePosition(Avalonia.Visual,Avalonia.Controls.PlacementMode,Avalonia.Point,Avalonia.Controls.Primitives.PopupPositioning.PopupAnchor,Avalonia.Controls.Primitives.PopupPositioning.PopupGravity,Avalonia.Controls.Primitives.PopupPositioning.PopupPositionerConstraintAdjustment,System.Nullable{Avalonia.Rect})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.OverlayPopupHost.CreatePopupHost(Avalonia.Visual,Avalonia.IAvaloniaDependencyResolver,System.Boolean)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.OverlayPopupHost.CreatePopupHost(Avalonia.Visual,Avalonia.IAvaloniaDependencyResolver)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.OverlayPopupHost.SetChild(Avalonia.Controls.Control)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.OverlayPopupHost.TakeFocus</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.Popup.get_Host</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.Popup.get_PlacementMode</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.Popup.set_PlacementMode(Avalonia.Controls.PlacementMode)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.PopupRoot.ConfigurePosition(Avalonia.Visual,Avalonia.Controls.PlacementMode,Avalonia.Point,Avalonia.Controls.Primitives.PopupPositioning.PopupAnchor,Avalonia.Controls.Primitives.PopupPositioning.PopupGravity,Avalonia.Controls.Primitives.PopupPositioning.PopupPositionerConstraintAdjustment,System.Nullable{Avalonia.Rect})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.TextSearch.GetText(Avalonia.Controls.Control)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.TextSearch.GetText(Avalonia.Interactivity.Interactive)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.TextSearch.GetTextBinding(Avalonia.Interactivity.Interactive)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.TextSearch.SetText(Avalonia.Controls.Control,System.String)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.TextSearch.SetText(Avalonia.Interactivity.Interactive,System.String)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.TextSearch.SetTextBinding(Avalonia.Interactivity.Interactive,Avalonia.Data.BindingBase)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.ToggleButton.add_Checked(System.EventHandler{Avalonia.Interactivity.RoutedEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.ToggleButton.add_Indeterminate(System.EventHandler{Avalonia.Interactivity.RoutedEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.ToggleButton.add_Unchecked(System.EventHandler{Avalonia.Interactivity.RoutedEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.ToggleButton.OnChecked(Avalonia.Interactivity.RoutedEventArgs)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.ToggleButton.OnIndeterminate(Avalonia.Interactivity.RoutedEventArgs)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.ToggleButton.OnUnchecked(Avalonia.Interactivity.RoutedEventArgs)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.ToggleButton.remove_Checked(System.EventHandler{Avalonia.Interactivity.RoutedEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.ToggleButton.remove_Indeterminate(System.EventHandler{Avalonia.Interactivity.RoutedEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.ToggleButton.remove_Unchecked(System.EventHandler{Avalonia.Interactivity.RoutedEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.VisualLayerManager.get_AdornerLayer</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.VisualLayerManager.get_ChromeOverlayLayer</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.VisualLayerManager.get_IsPopup</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.VisualLayerManager.get_LightDismissOverlayLayer</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.VisualLayerManager.get_OverlayLayer</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.VisualLayerManager.get_TextSelectorLayer</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.VisualLayerManager.set_IsPopup(System.Boolean)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Screens.ScreenFromWindow(Avalonia.Platform.IWindowBaseImpl)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.TabbedPage.FindNextEnabledTab(System.Int32,System.Int32)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.TabItem.get_Icon</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.TabItem.SubscribeToOwnerProperties(Avalonia.AvaloniaObject)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.TopLevel.#ctor(Avalonia.Platform.ITopLevelImpl,Avalonia.IAvaloniaDependencyResolver)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.TopLevel.get_PlatformSettings</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.TopLevel.StartRendering</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.TopLevel.StopRendering</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.TreeView.get_ItemContainerGenerator</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Window.get_ExtendClientAreaChromeHints</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Window.get_SystemDecorations</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Window.set_ExtendClientAreaChromeHints(Avalonia.Platform.ExtendClientAreaChromeHints)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Window.SortWindowsByZOrder(Avalonia.Controls.Window[])</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.WindowBase.ArrangeSetBounds(Avalonia.Size)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.ITopLevelImpl.get_Surfaces</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.IWindowImpl.GetWindowsZOrder(System.Span{Avalonia.Controls.Window},System.Span{System.Int64})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.IWindowImpl.SetExtendClientAreaChromeHints(Avalonia.Platform.ExtendClientAreaChromeHints)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.IWindowImpl.SetSystemDecorations(Avalonia.Controls.SystemDecorations)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.Screen.#ctor(System.Double,Avalonia.PixelRect,Avalonia.PixelRect,System.Boolean)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.Screen.get_PixelDensity</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.Screen.get_Primary</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.Screen.set_Bounds(Avalonia.PixelRect)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.Screen.set_CurrentOrientation(Avalonia.Platform.ScreenOrientation)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.Screen.set_DisplayName(System.String)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.Screen.set_IsPrimary(System.Boolean)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.Screen.set_Scaling(System.Double)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.Screen.set_WorkingArea(Avalonia.PixelRect)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Dialogs.ManagedFileDialogExtensions.ShowManagedAsync(Avalonia.Controls.OpenFileDialog,Avalonia.Controls.Window,Avalonia.Dialogs.ManagedFileDialogOptions)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Dialogs.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Dialogs.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Dialogs.ManagedFileDialogExtensions.ShowManagedAsync``1(Avalonia.Controls.OpenFileDialog,Avalonia.Controls.Window,Avalonia.Dialogs.ManagedFileDialogOptions)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Dialogs.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Dialogs.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Data.Binding.#ctor(System.String,Avalonia.Data.BindingMode)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Markup.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Markup.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Markup.Xaml.MarkupExtensions.ReflectionBindingExtension.#ctor(System.String,Avalonia.Data.BindingMode)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Markup.Xaml.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Markup.Xaml.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Markup.Xaml.XamlLoadException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Markup.Xaml.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Markup.Xaml.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.OpenGL.Egl.EglPlatformSurfaceRenderTargetBase.BeginDraw</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.OpenGL.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.OpenGL.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.OpenGL.Egl.EglPlatformSurfaceRenderTargetBase.BeginDraw(System.Nullable{Avalonia.PixelSize})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.OpenGL.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.OpenGL.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.OpenGL.Egl.EglPlatformSurfaceRenderTargetBase.BeginDrawCore</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.OpenGL.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.OpenGL.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.OpenGL.Egl.EglPlatformSurfaceRenderTargetBase.BeginDrawCore(System.Nullable{Avalonia.PixelSize})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.OpenGL.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.OpenGL.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.OpenGL.IGlPlatformSurfaceRenderTargetFactory.CanRenderToSurface(Avalonia.OpenGL.IGlContext,System.Object)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.OpenGL.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.OpenGL.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.OpenGL.IGlPlatformSurfaceRenderTargetFactory.CreateRenderTarget(Avalonia.OpenGL.IGlContext,System.Object)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.OpenGL.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.OpenGL.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.OpenGL.Surfaces.IGlPlatformSurfaceRenderTarget.BeginDraw</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.OpenGL.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.OpenGL.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.OpenGL.Surfaces.IGlPlatformSurfaceRenderTarget.BeginDraw(System.Nullable{Avalonia.PixelSize})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.OpenGL.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.OpenGL.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Vulkan.IVulkanKhrSurfacePlatformSurfaceFactory.CanRenderToSurface(Avalonia.Vulkan.IVulkanPlatformGraphicsContext,System.Object)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Vulkan.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Vulkan.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Vulkan.IVulkanKhrSurfacePlatformSurfaceFactory.CreateSurface(Avalonia.Vulkan.IVulkanPlatformGraphicsContext,System.Object)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Vulkan.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Vulkan.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Vulkan.IVulkanPlatformGraphicsContext.CreateRenderTarget(System.Collections.Generic.IEnumerable{System.Object})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Vulkan.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Vulkan.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Media.Fonts.FontCollectionBase._glyphTypefaceCache</Target>
-    <Left>baseline/Avalonia/lib/net6.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net6.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.Fonts.FontCollectionBase.Initialize(Avalonia.Platform.IFontManagerImpl)</Target>
-    <Left>baseline/Avalonia/lib/net6.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net6.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.Fonts.IFontCollection.Initialize(Avalonia.Platform.IFontManagerImpl)</Target>
-    <Left>baseline/Avalonia/lib/net6.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net6.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.IFontManagerImpl.TryMatchCharacter(System.Int32,Avalonia.Media.FontStyle,Avalonia.Media.FontWeight,Avalonia.Media.FontStretch,System.Globalization.CultureInfo,Avalonia.Media.Typeface@)</Target>
-    <Left>baseline/Avalonia/lib/net6.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net6.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Dialogs.Internal.ManagedFileChooserFilterViewModel.#ctor(Avalonia.Platform.Storage.FilePickerFileType)</Target>
-    <Left>baseline/Avalonia/lib/net6.0/Avalonia.Dialogs.dll</Left>
-    <Right>current/Avalonia/lib/net6.0/Avalonia.Dialogs.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Controls.ResourcesChangedEventArgs.Empty</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Data.BindingPriority.TemplatedParent</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Input.DataFormats.FileNames</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Input.DataFormats.Files</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Input.DataFormats.Text</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Input.GestureRecognizers.SwipeGestureRecognizer.CrossAxisCancelThresholdProperty</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Input.GestureRecognizers.SwipeGestureRecognizer.EdgeSizeProperty</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Input.HoldingState.Cancelled</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Input.InputElement.GotFocusEvent</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Input.InputElement.LostFocusEvent</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Media.DrawingImage.ViewboxProperty</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Media.Fonts.FontCollectionBase._glyphTypefaceCache</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Media.RadialGradientBrush.RadiusProperty</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Animation.Animation.SetAnimator(Avalonia.Animation.IAnimationSetter,Avalonia.Animation.CustomAnimatorBase)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.AvaloniaObjectExtensions.Bind(Avalonia.AvaloniaObject,Avalonia.AvaloniaProperty,Avalonia.Data.BindingBase,System.Object)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.ResourcesChangedEventArgs.#ctor</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Data.CompiledBindingPathBuilder.SetRawSource(System.Object)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Data.CompiledBindingPathBuilder.StreamObservable</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Data.CompiledBindingPathBuilder.StreamTask</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Data.CompiledBindingPathBuilder.TypeCast(System.Type)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Data.ReflectionBinding.#ctor(System.String,Avalonia.Data.BindingMode)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.DataObject.Contains(System.String)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.DataObject.Get(System.String)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.DataObject.GetDataFormats</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.DataObject.Set(System.String,System.Object)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.DragDrop.DoDragDrop(Avalonia.Input.PointerEventArgs,Avalonia.Input.IDataObject,Avalonia.Input.DragDropEffects)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.DragEventArgs.#ctor(Avalonia.Interactivity.RoutedEvent{Avalonia.Input.DragEventArgs},Avalonia.Input.IDataObject,Avalonia.Interactivity.Interactive,Avalonia.Point,Avalonia.Input.KeyModifiers)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.DragEventArgs.get_Data</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.FocusManager.#ctor(Avalonia.Input.IInputElement)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.FocusManager.ClearFocus</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.FocusManager.ClearFocusOnElementRemoved(Avalonia.Input.IInputElement,Avalonia.Visual)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.FocusManager.FindNextElement(Avalonia.Input.NavigationDirection)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.FocusManager.TryMoveFocus(Avalonia.Input.NavigationDirection)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.GestureRecognizers.SwipeGestureRecognizer.get_CrossAxisCancelThreshold</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.GestureRecognizers.SwipeGestureRecognizer.get_EdgeSize</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.GestureRecognizers.SwipeGestureRecognizer.set_CrossAxisCancelThreshold(System.Double)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.GestureRecognizers.SwipeGestureRecognizer.set_EdgeSize(System.Double)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.HoldingRoutedEventArgs.#ctor(Avalonia.Input.HoldingState,Avalonia.Point,Avalonia.Input.PointerType)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.IFocusManager.ClearFocus</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.IInputRoot.get_KeyboardNavigationHandler</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.IInputRoot.get_PlatformSettings</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.IInputRoot.get_PointerOverElement</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.IInputRoot.get_ShowAccessKeys</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.IInputRoot.set_PointerOverElement(Avalonia.Input.IInputElement)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.IInputRoot.set_ShowAccessKeys(System.Boolean)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.IKeyboardNavigationHandler.Move(Avalonia.Input.IInputElement,Avalonia.Input.NavigationDirection,Avalonia.Input.KeyModifiers)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.InputElement.AddPinchEndedHandler(Avalonia.Interactivity.Interactive,System.EventHandler{Avalonia.Input.PinchEndedEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.InputElement.AddPinchHandler(Avalonia.Interactivity.Interactive,System.EventHandler{Avalonia.Input.PinchEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.InputElement.AddPointerTouchPadGestureMagnifyHandler(Avalonia.Interactivity.Interactive,System.EventHandler{Avalonia.Input.PointerDeltaEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.InputElement.AddPointerTouchPadGestureRotateHandler(Avalonia.Interactivity.Interactive,System.EventHandler{Avalonia.Input.PointerDeltaEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.InputElement.AddPointerTouchPadGestureSwipeHandler(Avalonia.Interactivity.Interactive,System.EventHandler{Avalonia.Input.PointerDeltaEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.InputElement.AddPullGestureEndedHandler(Avalonia.Interactivity.Interactive,System.EventHandler{Avalonia.Input.PullGestureEndedEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.InputElement.AddPullGestureHandler(Avalonia.Interactivity.Interactive,System.EventHandler{Avalonia.Input.PullGestureEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.InputElement.AddScrollGestureEndedHandler(Avalonia.Interactivity.Interactive,System.EventHandler{Avalonia.Input.ScrollGestureEndedEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.InputElement.AddScrollGestureHandler(Avalonia.Interactivity.Interactive,System.EventHandler{Avalonia.Input.ScrollGestureEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.InputElement.AddScrollGestureInertiaStartingHandler(Avalonia.Interactivity.Interactive,System.EventHandler{Avalonia.Input.ScrollGestureInertiaStartingEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.InputElement.OnGotFocus(Avalonia.Input.GotFocusEventArgs)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.InputElement.OnLostFocus(Avalonia.Interactivity.RoutedEventArgs)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.InputElement.RemovePinchEndedHandler(Avalonia.Interactivity.Interactive,System.EventHandler{Avalonia.Input.PinchEndedEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.InputElement.RemovePinchHandler(Avalonia.Interactivity.Interactive,System.EventHandler{Avalonia.Input.PinchEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.InputElement.RemovePointerTouchPadGestureMagnifyHandler(Avalonia.Interactivity.Interactive,System.EventHandler{Avalonia.Input.PointerDeltaEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.InputElement.RemovePointerTouchPadGestureRotateHandler(Avalonia.Interactivity.Interactive,System.EventHandler{Avalonia.Input.PointerDeltaEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.InputElement.RemovePointerTouchPadGestureSwipeHandler(Avalonia.Interactivity.Interactive,System.EventHandler{Avalonia.Input.PointerDeltaEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.InputElement.RemovePullGestureEndedHandler(Avalonia.Interactivity.Interactive,System.EventHandler{Avalonia.Input.PullGestureEndedEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.InputElement.RemovePullGestureHandler(Avalonia.Interactivity.Interactive,System.EventHandler{Avalonia.Input.PullGestureEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.InputElement.RemoveScrollGestureEndedHandler(Avalonia.Interactivity.Interactive,System.EventHandler{Avalonia.Input.ScrollGestureEndedEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.InputElement.RemoveScrollGestureHandler(Avalonia.Interactivity.Interactive,System.EventHandler{Avalonia.Input.ScrollGestureEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.InputElement.RemoveScrollGestureInertiaStartingHandler(Avalonia.Interactivity.Interactive,System.EventHandler{Avalonia.Input.ScrollGestureInertiaStartingEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.KeyboardNavigationHandler.Move(Avalonia.Input.IInputElement,Avalonia.Input.NavigationDirection,Avalonia.Input.KeyModifiers)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.Platform.IClipboard.GetDataAsync(System.String)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.Platform.IClipboard.GetFormatsAsync</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.Platform.IClipboard.GetTextAsync</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.Platform.IClipboard.SetDataObjectAsync(Avalonia.Input.IDataObject)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.Platform.IClipboard.SetTextAsync(System.String)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.Platform.IClipboard.TryGetInProcessDataObjectAsync</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.Platform.IPlatformDragSource.DoDragDrop(Avalonia.Input.PointerEventArgs,Avalonia.Input.IDataObject,Avalonia.Input.DragDropEffects)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.Raw.RawDragEvent.#ctor(Avalonia.Input.Raw.IDragDropDevice,Avalonia.Input.Raw.RawDragEventType,Avalonia.Input.IInputRoot,Avalonia.Point,Avalonia.Input.IDataObject,Avalonia.Input.DragDropEffects,Avalonia.Input.RawInputModifiers)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.Raw.RawDragEvent.get_Data</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.Raw.RawKeyEventArgs.#ctor(Avalonia.Input.IInputDevice,System.UInt64,Avalonia.Input.IInputRoot,Avalonia.Input.Raw.RawKeyEventType,Avalonia.Input.Key,Avalonia.Input.RawInputModifiers,Avalonia.Input.PhysicalKey,Avalonia.Input.KeyDeviceType,System.String)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.Raw.RawKeyEventArgs.#ctor(Avalonia.Input.IInputDevice,System.UInt64,Avalonia.Input.IInputRoot,Avalonia.Input.Raw.RawKeyEventType,Avalonia.Input.Key,Avalonia.Input.RawInputModifiers,Avalonia.Input.PhysicalKey,System.String)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.Raw.RawKeyEventArgs.#ctor(Avalonia.Input.IKeyboardDevice,System.UInt64,Avalonia.Input.IInputRoot,Avalonia.Input.Raw.RawKeyEventType,Avalonia.Input.Key,Avalonia.Input.RawInputModifiers)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.SwipeGestureEventArgs.#ctor(System.Int32,Avalonia.Input.SwipeDirection,Avalonia.Vector,Avalonia.Point)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.SwipeGestureEventArgs.get_StartPoint</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Input.TextInput.TextInputMethodClient.ShowInputPanel</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Layout.LayoutHelper.RoundLayoutSizeUp(Avalonia.Size,System.Double,System.Double)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Layout.LayoutHelper.RoundLayoutThickness(Avalonia.Thickness,System.Double,System.Double)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.Color.ToUint32</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.DrawingContext.PushPostTransform(Avalonia.Matrix)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.DrawingContext.PushPreTransform(Avalonia.Matrix)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.DrawingContext.PushTransformContainer</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.DrawingImage.get_Viewbox</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.DrawingImage.set_Viewbox(System.Nullable{Avalonia.Rect})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.Fonts.FontCollectionBase.Initialize(Avalonia.Platform.IFontManagerImpl)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.Fonts.FontCollectionBase.TryGetGlyphTypeface(System.String,Avalonia.Media.Fonts.FontCollectionKey,Avalonia.Media.GlyphTypeface@)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.Fonts.IFontCollection.Initialize(Avalonia.Platform.IFontManagerImpl)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.Imaging.Bitmap.CopyPixels(Avalonia.Platform.ILockedFramebuffer,Avalonia.Platform.AlphaFormat)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.Immutable.ImmutableRadialGradientBrush.get_Radius</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.IRadialGradientBrush.get_Radius</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.RadialGradientBrush.get_Radius</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.RadialGradientBrush.set_Radius(System.Double)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.StreamGeometryContext.ArcTo(Avalonia.Point,Avalonia.Size,System.Double,System.Boolean,Avalonia.Media.SweepDirection)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.StreamGeometryContext.CubicBezierTo(Avalonia.Point,Avalonia.Point,Avalonia.Point)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.StreamGeometryContext.LineTo(Avalonia.Point)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.StreamGeometryContext.QuadraticBezierTo(Avalonia.Point,Avalonia.Point)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.TextFormatting.GenericTextRunProperties.#ctor(Avalonia.Media.Typeface,Avalonia.Media.FontFeatureCollection,System.Double,Avalonia.Media.TextDecorationCollection,Avalonia.Media.IBrush,Avalonia.Media.IBrush,Avalonia.Media.BaselineAlignment,System.Globalization.CultureInfo)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.TextFormatting.GenericTextRunProperties.#ctor(Avalonia.Media.Typeface,System.Double,Avalonia.Media.TextDecorationCollection,Avalonia.Media.IBrush,Avalonia.Media.IBrush,Avalonia.Media.BaselineAlignment,System.Globalization.CultureInfo)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.TextFormatting.TextCollapsingProperties.CreateCollapsedRuns(Avalonia.Media.TextFormatting.TextLine,System.Int32,Avalonia.Media.FlowDirection,Avalonia.Media.TextFormatting.TextRun)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.TextFormatting.TextLayout.#ctor(System.String,Avalonia.Media.Typeface,Avalonia.Media.FontFeatureCollection,System.Double,Avalonia.Media.IBrush,Avalonia.Media.TextAlignment,Avalonia.Media.TextWrapping,Avalonia.Media.TextTrimming,Avalonia.Media.TextDecorationCollection,Avalonia.Media.FlowDirection,System.Double,System.Double,System.Double,System.Double,System.Int32,System.Collections.Generic.IReadOnlyList{Avalonia.Utilities.ValueSpan{Avalonia.Media.TextFormatting.TextRunProperties}})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M: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,Avalonia.Media.FlowDirection,System.Double,System.Double,System.Double,System.Double,System.Int32,System.Collections.Generic.IReadOnlyList{Avalonia.Utilities.ValueSpan{Avalonia.Media.TextFormatting.TextRunProperties}})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.TextFormatting.TextShaperOptions.#ctor(Avalonia.Media.GlyphTypeface,System.Collections.Generic.IReadOnlyList{Avalonia.Media.FontFeature},System.Double,System.SByte,System.Globalization.CultureInfo,System.Double,System.Double)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.TextFormatting.TextShaperOptions.#ctor(Avalonia.Media.GlyphTypeface,System.Double,System.SByte,System.Globalization.CultureInfo,System.Double,System.Double)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.ICursorFactory.CreateCursor(Avalonia.Platform.IBitmapImpl,Avalonia.PixelPoint)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.IDrawingContextImplWithEffects.PushEffect(Avalonia.Media.IEffect)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.IFontManagerImpl.TryMatchCharacter(System.Int32,Avalonia.Media.FontStyle,Avalonia.Media.FontWeight,Avalonia.Media.FontStretch,System.Globalization.CultureInfo,Avalonia.Media.Typeface@)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.IGeometryContext.ArcTo(Avalonia.Point,Avalonia.Size,System.Double,System.Boolean,Avalonia.Media.SweepDirection)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.IGeometryContext.CubicBezierTo(Avalonia.Point,Avalonia.Point,Avalonia.Point)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.IGeometryContext.LineTo(Avalonia.Point)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.IGeometryContext.QuadraticBezierTo(Avalonia.Point,Avalonia.Point)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.IPlatformRenderInterfaceContext.CreateOffscreenRenderTarget(Avalonia.PixelSize,System.Double)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.IPlatformRenderInterfaceContext.CreateRenderTarget(System.Collections.Generic.IEnumerable{System.Object})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.IRenderTarget.CreateDrawingContext(Avalonia.PixelSize,Avalonia.Platform.RenderTargetDrawingContextProperties@)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.IRenderTarget.CreateDrawingContext(System.Boolean)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.LockedFramebuffer.#ctor(System.IntPtr,Avalonia.PixelSize,System.Int32,Avalonia.Vector,Avalonia.Platform.PixelFormat,System.Action)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Rendering.Composition.ICompositionGpuImportedObject.get_ImportCompeted</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Rendering.DefaultRenderTimer.add_Tick(System.Action{System.TimeSpan})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Rendering.DefaultRenderTimer.remove_Tick(System.Action{System.TimeSpan})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Rendering.DefaultRenderTimer.Start</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Rendering.DefaultRenderTimer.Stop</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Rendering.IRenderTimer.add_Tick(System.Action{System.TimeSpan})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Rendering.IRenderTimer.remove_Tick(System.Action{System.TimeSpan})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Rendering.SceneInvalidatedEventArgs.#ctor(Avalonia.Rendering.IRenderRoot,Avalonia.Rect)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Rendering.SceneInvalidatedEventArgs.get_RenderRoot</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Rendering.SleepLoopRenderTimer.add_Tick(System.Action{System.TimeSpan})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Rendering.SleepLoopRenderTimer.remove_Tick(System.Action{System.TimeSpan})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Rendering.ThreadProxyRenderTimer.add_Tick(System.Action{System.TimeSpan})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Rendering.ThreadProxyRenderTimer.remove_Tick(System.Action{System.TimeSpan})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Utilities.AvaloniaResourcesIndexReaderWriter.WriteResources(System.IO.Stream,System.Collections.Generic.List{System.ValueTuple{System.String,System.Int32,System.Func{System.IO.Stream}}})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Visual.get_VisualRoot</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Visuals.Platform.PathGeometryContext.ArcTo(Avalonia.Point,Avalonia.Size,System.Double,System.Boolean,Avalonia.Media.SweepDirection)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Visuals.Platform.PathGeometryContext.CubicBezierTo(Avalonia.Point,Avalonia.Point,Avalonia.Point)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Visuals.Platform.PathGeometryContext.LineTo(Avalonia.Point)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Visuals.Platform.PathGeometryContext.QuadraticBezierTo(Avalonia.Point,Avalonia.Point)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.VisualTree.VisualExtensions.GetVisualRoot(Avalonia.Visual)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.VisualTreeAttachmentEventArgs.#ctor(Avalonia.Visual,Avalonia.Rendering.IRenderRoot)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.VisualTreeAttachmentEventArgs.get_Root</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Controls.ContextMenu.PlacementModeProperty</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Controls.Control.ContextRequestedEvent</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Controls.Documents.Inline.TextDecorationsProperty</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Controls.DrawerPage.DrawerBreakpointWidthProperty</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Controls.NativeMenuBar.EnableMenuItemClickForwardingProperty</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Controls.NativeMenuItem.ToggleTypeProperty</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Controls.Primitives.FlyoutBase.IsOpenProperty</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Controls.Primitives.Popup.PlacementModeProperty</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Controls.Primitives.ToggleButton.CheckedEvent</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Controls.Primitives.ToggleButton.IndeterminateEvent</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Controls.Primitives.ToggleButton.UncheckedEvent</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Controls.Primitives.VisualLayerManager.ChromeOverlayLayerProperty</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Controls.TabItem.IconProperty</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Controls.TextBlock.LetterSpacingProperty</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Controls.TextBox.LetterSpacingProperty</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Controls.TopLevel.PointerOverElementProperty</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Controls.Window.ExtendClientAreaChromeHintsProperty</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Controls.Window.SystemDecorationsProperty</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.AppBuilder.get_LifetimeOverride</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Application.add_UrlsOpened(System.EventHandler{Avalonia.UrlOpenedEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Application.remove_UrlsOpened(System.EventHandler{Avalonia.UrlOpenedEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Automation.Peers.AutomationPeer.GetVisualRootCore</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.ContextMenu.get_PlacementMode</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.ContextMenu.set_PlacementMode(Avalonia.Controls.PlacementMode)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Design.CreatePreviewWithControl(System.Object)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Design.GetDataContext(Avalonia.Controls.Templates.IDataTemplate)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Design.GetPreviewWith(Avalonia.Controls.Templates.IDataTemplate)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Design.GetPreviewWith(Avalonia.Styling.IStyle)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Design.SetDataContext(Avalonia.Controls.Templates.IDataTemplate,System.Object)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Design.SetPreviewWith(Avalonia.AvaloniaObject,Avalonia.Controls.Control)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Design.SetPreviewWith(Avalonia.AvaloniaObject,Avalonia.Controls.ITemplate{Avalonia.Controls.Control})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Design.SetPreviewWith(Avalonia.Controls.ResourceDictionary,Avalonia.Controls.ITemplate{Avalonia.Controls.Control})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Design.SetPreviewWith(Avalonia.Controls.Templates.IDataTemplate,Avalonia.Controls.Control)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Design.SetPreviewWith(Avalonia.Controls.Templates.IDataTemplate,Avalonia.Controls.ITemplate{Avalonia.Controls.Control})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Design.SetPreviewWith(Avalonia.Styling.IStyle,Avalonia.Controls.Control)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Design.SetPreviewWith(Avalonia.Styling.IStyle,Avalonia.Controls.ITemplate{Avalonia.Controls.Control})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.DrawerPage.get_DrawerBreakpointWidth</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.DrawerPage.set_DrawerBreakpointWidth(System.Double)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Embedding.Offscreen.OffscreenTopLevelImplBase.get_Surfaces</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Generators.ItemContainerGenerator.ContainerFromIndex(System.Int32)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Generators.ItemContainerGenerator.IndexFromContainer(Avalonia.Controls.Control)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.ItemsControl.ItemsControlFromItemContaner(Avalonia.Controls.Control)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.NativeMenuBar.SetEnableMenuItemClickForwarding(Avalonia.Controls.MenuItem,System.Boolean)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.NativeMenuItem.get_ToggleType</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.PageSelectionChangedEventArgs.#ctor(Avalonia.Controls.Page,Avalonia.Controls.Page)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Platform.DefaultMenuInteractionHandler.GotFocus(System.Object,Avalonia.Input.GotFocusEventArgs)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Platform.IInsetsManager.get_DisplayEdgeToEdge</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Platform.IInsetsManager.set_DisplayEdgeToEdge(System.Boolean)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Platform.InsetsManagerBase.get_DisplayEdgeToEdge</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Platform.InsetsManagerBase.set_DisplayEdgeToEdge(System.Boolean)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.AccessText.get_AccessKey</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.AdornerLayer.#ctor</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.OverlayPopupHost.#ctor(Avalonia.Controls.Primitives.OverlayLayer)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.OverlayPopupHost.ConfigurePosition(Avalonia.Visual,Avalonia.Controls.PlacementMode,Avalonia.Point,Avalonia.Controls.Primitives.PopupPositioning.PopupAnchor,Avalonia.Controls.Primitives.PopupPositioning.PopupGravity,Avalonia.Controls.Primitives.PopupPositioning.PopupPositionerConstraintAdjustment,System.Nullable{Avalonia.Rect})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.OverlayPopupHost.CreatePopupHost(Avalonia.Visual,Avalonia.IAvaloniaDependencyResolver,System.Boolean)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.OverlayPopupHost.CreatePopupHost(Avalonia.Visual,Avalonia.IAvaloniaDependencyResolver)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.OverlayPopupHost.SetChild(Avalonia.Controls.Control)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.OverlayPopupHost.TakeFocus</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.Popup.get_Host</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.Popup.get_PlacementMode</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.Popup.set_PlacementMode(Avalonia.Controls.PlacementMode)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.PopupRoot.ConfigurePosition(Avalonia.Visual,Avalonia.Controls.PlacementMode,Avalonia.Point,Avalonia.Controls.Primitives.PopupPositioning.PopupAnchor,Avalonia.Controls.Primitives.PopupPositioning.PopupGravity,Avalonia.Controls.Primitives.PopupPositioning.PopupPositionerConstraintAdjustment,System.Nullable{Avalonia.Rect})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.TextSearch.GetText(Avalonia.Controls.Control)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.TextSearch.GetText(Avalonia.Interactivity.Interactive)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.TextSearch.GetTextBinding(Avalonia.Interactivity.Interactive)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.TextSearch.SetText(Avalonia.Controls.Control,System.String)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.TextSearch.SetText(Avalonia.Interactivity.Interactive,System.String)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.TextSearch.SetTextBinding(Avalonia.Interactivity.Interactive,Avalonia.Data.BindingBase)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.ToggleButton.add_Checked(System.EventHandler{Avalonia.Interactivity.RoutedEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.ToggleButton.add_Indeterminate(System.EventHandler{Avalonia.Interactivity.RoutedEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.ToggleButton.add_Unchecked(System.EventHandler{Avalonia.Interactivity.RoutedEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.ToggleButton.OnChecked(Avalonia.Interactivity.RoutedEventArgs)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.ToggleButton.OnIndeterminate(Avalonia.Interactivity.RoutedEventArgs)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.ToggleButton.OnUnchecked(Avalonia.Interactivity.RoutedEventArgs)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.ToggleButton.remove_Checked(System.EventHandler{Avalonia.Interactivity.RoutedEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.ToggleButton.remove_Indeterminate(System.EventHandler{Avalonia.Interactivity.RoutedEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.ToggleButton.remove_Unchecked(System.EventHandler{Avalonia.Interactivity.RoutedEventArgs})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.VisualLayerManager.get_AdornerLayer</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.VisualLayerManager.get_ChromeOverlayLayer</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.VisualLayerManager.get_IsPopup</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.VisualLayerManager.get_LightDismissOverlayLayer</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.VisualLayerManager.get_OverlayLayer</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.VisualLayerManager.get_TextSelectorLayer</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Primitives.VisualLayerManager.set_IsPopup(System.Boolean)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Screens.ScreenFromWindow(Avalonia.Platform.IWindowBaseImpl)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.TabbedPage.FindNextEnabledTab(System.Int32,System.Int32)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.TabItem.get_Icon</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.TabItem.SubscribeToOwnerProperties(Avalonia.AvaloniaObject)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.TopLevel.#ctor(Avalonia.Platform.ITopLevelImpl,Avalonia.IAvaloniaDependencyResolver)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.TopLevel.get_PlatformSettings</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.TopLevel.StartRendering</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.TopLevel.StopRendering</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.TreeView.get_ItemContainerGenerator</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Window.get_ExtendClientAreaChromeHints</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Window.get_SystemDecorations</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Window.set_ExtendClientAreaChromeHints(Avalonia.Platform.ExtendClientAreaChromeHints)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.Window.SortWindowsByZOrder(Avalonia.Controls.Window[])</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Controls.WindowBase.ArrangeSetBounds(Avalonia.Size)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.ITopLevelImpl.get_Surfaces</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.IWindowImpl.GetWindowsZOrder(System.Span{Avalonia.Controls.Window},System.Span{System.Int64})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.IWindowImpl.SetExtendClientAreaChromeHints(Avalonia.Platform.ExtendClientAreaChromeHints)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.IWindowImpl.SetSystemDecorations(Avalonia.Controls.SystemDecorations)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.Screen.#ctor(System.Double,Avalonia.PixelRect,Avalonia.PixelRect,System.Boolean)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.Screen.get_PixelDensity</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.Screen.get_Primary</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.Screen.set_Bounds(Avalonia.PixelRect)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.Screen.set_CurrentOrientation(Avalonia.Platform.ScreenOrientation)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.Screen.set_DisplayName(System.String)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.Screen.set_IsPrimary(System.Boolean)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.Screen.set_Scaling(System.Double)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.Screen.set_WorkingArea(Avalonia.PixelRect)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Dialogs.Internal.ManagedFileChooserFilterViewModel.#ctor(Avalonia.Platform.Storage.FilePickerFileType)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Dialogs.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Dialogs.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Dialogs.ManagedFileDialogExtensions.ShowManagedAsync(Avalonia.Controls.OpenFileDialog,Avalonia.Controls.Window,Avalonia.Dialogs.ManagedFileDialogOptions)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Dialogs.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Dialogs.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Dialogs.ManagedFileDialogExtensions.ShowManagedAsync``1(Avalonia.Controls.OpenFileDialog,Avalonia.Controls.Window,Avalonia.Dialogs.ManagedFileDialogOptions)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Dialogs.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Dialogs.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Data.Binding.#ctor(System.String,Avalonia.Data.BindingMode)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Markup.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Markup.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Markup.Xaml.MarkupExtensions.ReflectionBindingExtension.#ctor(System.String,Avalonia.Data.BindingMode)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Markup.Xaml.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Markup.Xaml.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Markup.Xaml.XamlLoadException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Markup.Xaml.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Markup.Xaml.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.OpenGL.Egl.EglPlatformSurfaceRenderTargetBase.BeginDraw</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.OpenGL.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.OpenGL.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.OpenGL.Egl.EglPlatformSurfaceRenderTargetBase.BeginDraw(System.Nullable{Avalonia.PixelSize})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.OpenGL.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.OpenGL.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.OpenGL.Egl.EglPlatformSurfaceRenderTargetBase.BeginDrawCore</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.OpenGL.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.OpenGL.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.OpenGL.Egl.EglPlatformSurfaceRenderTargetBase.BeginDrawCore(System.Nullable{Avalonia.PixelSize})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.OpenGL.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.OpenGL.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.OpenGL.IGlPlatformSurfaceRenderTargetFactory.CanRenderToSurface(Avalonia.OpenGL.IGlContext,System.Object)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.OpenGL.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.OpenGL.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.OpenGL.IGlPlatformSurfaceRenderTargetFactory.CreateRenderTarget(Avalonia.OpenGL.IGlContext,System.Object)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.OpenGL.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.OpenGL.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.OpenGL.Surfaces.IGlPlatformSurfaceRenderTarget.BeginDraw</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.OpenGL.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.OpenGL.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.OpenGL.Surfaces.IGlPlatformSurfaceRenderTarget.BeginDraw(System.Nullable{Avalonia.PixelSize})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.OpenGL.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.OpenGL.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Vulkan.IVulkanKhrSurfacePlatformSurfaceFactory.CanRenderToSurface(Avalonia.Vulkan.IVulkanPlatformGraphicsContext,System.Object)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Vulkan.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Vulkan.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Vulkan.IVulkanKhrSurfacePlatformSurfaceFactory.CreateSurface(Avalonia.Vulkan.IVulkanPlatformGraphicsContext,System.Object)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Vulkan.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Vulkan.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Vulkan.IVulkanPlatformGraphicsContext.CreateRenderTarget(System.Collections.Generic.IEnumerable{System.Object})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Vulkan.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Vulkan.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>F:Avalonia.Media.Fonts.FontCollectionBase._glyphTypefaceCache</Target>
-    <Left>baseline/Avalonia/lib/netstandard2.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/netstandard2.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.Fonts.FontCollectionBase.Initialize(Avalonia.Platform.IFontManagerImpl)</Target>
-    <Left>baseline/Avalonia/lib/netstandard2.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/netstandard2.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Media.Fonts.IFontCollection.Initialize(Avalonia.Platform.IFontManagerImpl)</Target>
-    <Left>baseline/Avalonia/lib/netstandard2.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/netstandard2.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.IFontManagerImpl.TryMatchCharacter(System.Int32,Avalonia.Media.FontStyle,Avalonia.Media.FontWeight,Avalonia.Media.FontStretch,System.Globalization.CultureInfo,Avalonia.Media.Typeface@)</Target>
-    <Left>baseline/Avalonia/lib/netstandard2.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/netstandard2.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Dialogs.Internal.ManagedFileChooserFilterViewModel.#ctor(Avalonia.Platform.Storage.FilePickerFileType)</Target>
-    <Left>baseline/Avalonia/lib/netstandard2.0/Avalonia.Dialogs.dll</Left>
-    <Right>current/Avalonia/lib/netstandard2.0/Avalonia.Dialogs.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.IDrawingContextImplWithEffects.PopEffect</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Base.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Platform.IDrawingContextImplWithEffects.PushEffect(Avalonia.Media.IEffect)</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Base.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0005</DiagnosticId>
-    <Target>M:Avalonia.Controls.Embedding.Offscreen.OffscreenTopLevelImplBase.get_Surfaces</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0005</DiagnosticId>
-    <Target>P:Avalonia.Controls.Embedding.Offscreen.OffscreenTopLevelImplBase.Surfaces</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0005</DiagnosticId>
-    <Target>M:Avalonia.OpenGL.Egl.EglPlatformSurfaceRenderTargetBase.BeginDrawCore(Avalonia.Platform.IRenderTarget.RenderTargetSceneInfo)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.OpenGL.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.OpenGL.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0005</DiagnosticId>
-    <Target>M:Avalonia.OpenGL.Egl.EglPlatformSurfaceRenderTargetBase.BeginDrawCore(System.Nullable{Avalonia.PixelSize})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.OpenGL.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.OpenGL.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0005</DiagnosticId>
-    <Target>M:Avalonia.Controls.Embedding.Offscreen.OffscreenTopLevelImplBase.get_Surfaces</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0005</DiagnosticId>
-    <Target>P:Avalonia.Controls.Embedding.Offscreen.OffscreenTopLevelImplBase.Surfaces</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0005</DiagnosticId>
-    <Target>M:Avalonia.OpenGL.Egl.EglPlatformSurfaceRenderTargetBase.BeginDrawCore(Avalonia.Platform.IRenderTarget.RenderTargetSceneInfo)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.OpenGL.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.OpenGL.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0005</DiagnosticId>
-    <Target>M:Avalonia.OpenGL.Egl.EglPlatformSurfaceRenderTargetBase.BeginDrawCore(System.Nullable{Avalonia.PixelSize})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.OpenGL.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.OpenGL.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>E:Avalonia.Input.IInputElement.GotFocus</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>E:Avalonia.Input.IInputElement.LostFocus</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Input.IFocusManager.FindFirstFocusableElement</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Input.IFocusManager.FindLastFocusableElement</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Input.IFocusManager.FindNextElement(Avalonia.Input.NavigationDirection,Avalonia.Input.FindNextElementOptions)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Input.IFocusManager.Focus(Avalonia.Input.IInputElement,Avalonia.Input.NavigationMethod,Avalonia.Input.KeyModifiers)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Input.IFocusManager.TryMoveFocus(Avalonia.Input.NavigationDirection,Avalonia.Input.FindNextElementOptions)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Input.IKeyboardNavigationHandler.Move(Avalonia.Input.IInputElement,Avalonia.Input.NavigationDirection,Avalonia.Input.KeyModifiers,System.Nullable{Avalonia.Input.KeyDeviceType})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Platform.ICursorFactory.CreateCursor(Avalonia.Media.Imaging.Bitmap,Avalonia.PixelPoint)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Platform.IDrawingContextImpl.PopTextOptions</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Platform.IDrawingContextImpl.PushTextOptions(Avalonia.Media.TextOptions)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Platform.IDrawingContextImplWithEffects.PushEffect(System.Nullable{Avalonia.Rect},Avalonia.Media.IEffect)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Platform.IDrawingContextLayerImpl.CreateDrawingContext</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Platform.IFontManagerImpl.TryMatchCharacter(System.Int32,Avalonia.Media.FontStyle,Avalonia.Media.FontWeight,Avalonia.Media.FontStretch,System.String,System.Globalization.CultureInfo,Avalonia.Media.Typeface@)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Platform.IGeometryContext.ArcTo(Avalonia.Point,Avalonia.Size,System.Double,System.Boolean,Avalonia.Media.SweepDirection,System.Boolean)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Platform.IGeometryContext.CubicBezierTo(Avalonia.Point,Avalonia.Point,Avalonia.Point,System.Boolean)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Platform.IGeometryContext.LineTo(Avalonia.Point,System.Boolean)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Platform.IGeometryContext.QuadraticBezierTo(Avalonia.Point,Avalonia.Point,System.Boolean)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Platform.IPlatformRenderInterfaceContext.CreateOffscreenRenderTarget(Avalonia.PixelSize,Avalonia.Vector,System.Boolean)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Platform.IPlatformRenderInterfaceContext.CreateRenderTarget(System.Collections.Generic.IEnumerable{Avalonia.Platform.Surfaces.IPlatformRenderSurface})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Platform.IRenderTarget.CreateDrawingContext(Avalonia.PixelSize,Avalonia.Platform.RenderTargetDrawingContextProperties@)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Platform.IRenderTarget.CreateDrawingContext(Avalonia.Platform.IRenderTarget.RenderTargetSceneInfo,Avalonia.Platform.RenderTargetDrawingContextProperties@)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Platform.IRenderTargetBitmapImpl.CreateDrawingContext</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Rendering.IRenderTimer.Start</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Rendering.IRenderTimer.Stop</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>P:Avalonia.Input.IInputRoot.FocusRoot</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>P:Avalonia.Platform.IDrawingContextLayerImpl.IsCorrupted</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>P:Avalonia.Platform.ILockedFramebuffer.AlphaFormat</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>P:Avalonia.Platform.IPlatformRenderInterfaceContext.MaxOffscreenRenderTargetPixelSize</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>P:Avalonia.Platform.IReadableBitmapImpl.AlphaFormat</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>P:Avalonia.Platform.IRenderTarget.Properties</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Platform.IWindowImpl.SetWindowDecorations(Avalonia.Controls.WindowDecorations)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Platform.IWindowingPlatform.GetWindowsZOrder(System.ReadOnlySpan{Avalonia.Platform.IWindowImpl},System.Span{System.Int64})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>P:Avalonia.Platform.ITopLevelImpl.Surfaces</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>P:Avalonia.Platform.IWindowImpl.RequestedDrawnDecorations</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.OpenGL.IGlPlatformSurfaceRenderTargetFactory.CanRenderToSurface(Avalonia.OpenGL.IGlContext,Avalonia.Platform.Surfaces.IPlatformRenderSurface)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.OpenGL.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.OpenGL.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.OpenGL.IGlPlatformSurfaceRenderTargetFactory.CreateRenderTarget(Avalonia.OpenGL.IGlContext,Avalonia.Platform.Surfaces.IPlatformRenderSurface)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.OpenGL.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.OpenGL.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.OpenGL.Surfaces.IGlPlatformSurfaceRenderTarget.BeginDraw(Avalonia.Platform.IRenderTarget.RenderTargetSceneInfo)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.OpenGL.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.OpenGL.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.OpenGL.Surfaces.IGlPlatformSurfaceRenderTarget.BeginDraw(System.Nullable{Avalonia.PixelSize})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.OpenGL.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.OpenGL.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>P:Avalonia.OpenGL.Surfaces.IGlPlatformSurfaceRenderTarget.IsCorrupted</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.OpenGL.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.OpenGL.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Vulkan.IVulkanKhrSurfacePlatformSurfaceFactory.CanRenderToSurface(Avalonia.Vulkan.IVulkanPlatformGraphicsContext,Avalonia.Platform.Surfaces.IPlatformRenderSurface)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Vulkan.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Vulkan.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Vulkan.IVulkanKhrSurfacePlatformSurfaceFactory.CreateSurface(Avalonia.Vulkan.IVulkanPlatformGraphicsContext,Avalonia.Platform.Surfaces.IPlatformRenderSurface)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Vulkan.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Vulkan.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Vulkan.IVulkanPlatformGraphicsContext.CreateRenderTarget(System.Collections.Generic.IEnumerable{Avalonia.Platform.Surfaces.IPlatformRenderSurface})</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Vulkan.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Vulkan.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Input.Platform.IClipboard.SetDataAsync(Avalonia.Input.IAsyncDataTransfer)</Target>
-    <Left>baseline/Avalonia/lib/net6.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net6.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Input.Platform.IClipboard.TryGetDataAsync</Target>
-    <Left>baseline/Avalonia/lib/net6.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net6.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Input.Platform.IClipboard.TryGetInProcessDataAsync</Target>
-    <Left>baseline/Avalonia/lib/net6.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net6.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Input.Platform.IPlatformDragSource.DoDragDropAsync(Avalonia.Input.PointerEventArgs,Avalonia.Input.IDataTransfer,Avalonia.Input.DragDropEffects)</Target>
-    <Left>baseline/Avalonia/lib/net6.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net6.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Platform.IFontManagerImpl.TryMatchCharacter(System.Int32,Avalonia.Media.FontStyle,Avalonia.Media.FontWeight,Avalonia.Media.FontStretch,System.String,System.Globalization.CultureInfo,Avalonia.Media.Typeface@)</Target>
-    <Left>baseline/Avalonia/lib/net6.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net6.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Platform.IPlatformRenderInterfaceImportedImage.SnapshotWithTimelineSemaphores(Avalonia.Platform.IPlatformRenderInterfaceImportedSemaphore,System.UInt64,Avalonia.Platform.IPlatformRenderInterfaceImportedSemaphore,System.UInt64)</Target>
-    <Left>baseline/Avalonia/lib/net6.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net6.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Platform.Storage.IStorageProvider.SaveFilePickerWithResultAsync(Avalonia.Platform.Storage.FilePickerSaveOptions)</Target>
-    <Left>baseline/Avalonia/lib/net6.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net6.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.OpenGL.IGlExternalSemaphore.SignalTimelineSemaphore(Avalonia.OpenGL.IGlExternalImageTexture,System.UInt64)</Target>
-    <Left>baseline/Avalonia/lib/net6.0/Avalonia.OpenGL.dll</Left>
-    <Right>current/Avalonia/lib/net6.0/Avalonia.OpenGL.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.OpenGL.IGlExternalSemaphore.WaitTimelineSemaphore(Avalonia.OpenGL.IGlExternalImageTexture,System.UInt64)</Target>
-    <Left>baseline/Avalonia/lib/net6.0/Avalonia.OpenGL.dll</Left>
-    <Right>current/Avalonia/lib/net6.0/Avalonia.OpenGL.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>P:Avalonia.OpenGL.IGlExternalImageTexture.TextureType</Target>
-    <Left>baseline/Avalonia/lib/net6.0/Avalonia.OpenGL.dll</Left>
-    <Right>current/Avalonia/lib/net6.0/Avalonia.OpenGL.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>E:Avalonia.Input.IInputElement.GotFocus</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>E:Avalonia.Input.IInputElement.LostFocus</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Input.IFocusManager.FindFirstFocusableElement</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Input.IFocusManager.FindLastFocusableElement</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Input.IFocusManager.FindNextElement(Avalonia.Input.NavigationDirection,Avalonia.Input.FindNextElementOptions)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Input.IFocusManager.Focus(Avalonia.Input.IInputElement,Avalonia.Input.NavigationMethod,Avalonia.Input.KeyModifiers)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Input.IFocusManager.TryMoveFocus(Avalonia.Input.NavigationDirection,Avalonia.Input.FindNextElementOptions)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Input.IKeyboardNavigationHandler.Move(Avalonia.Input.IInputElement,Avalonia.Input.NavigationDirection,Avalonia.Input.KeyModifiers,System.Nullable{Avalonia.Input.KeyDeviceType})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Input.Platform.IClipboard.SetDataAsync(Avalonia.Input.IAsyncDataTransfer)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Input.Platform.IClipboard.TryGetDataAsync</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Input.Platform.IClipboard.TryGetInProcessDataAsync</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Input.Platform.IPlatformDragSource.DoDragDropAsync(Avalonia.Input.PointerEventArgs,Avalonia.Input.IDataTransfer,Avalonia.Input.DragDropEffects)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Platform.ICursorFactory.CreateCursor(Avalonia.Media.Imaging.Bitmap,Avalonia.PixelPoint)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Platform.IDrawingContextImpl.PopTextOptions</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Platform.IDrawingContextImpl.PushTextOptions(Avalonia.Media.TextOptions)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Platform.IDrawingContextImplWithEffects.PushEffect(System.Nullable{Avalonia.Rect},Avalonia.Media.IEffect)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Platform.IDrawingContextLayerImpl.CreateDrawingContext</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Platform.IFontManagerImpl.TryMatchCharacter(System.Int32,Avalonia.Media.FontStyle,Avalonia.Media.FontWeight,Avalonia.Media.FontStretch,System.String,System.Globalization.CultureInfo,Avalonia.Media.Typeface@)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Platform.IGeometryContext.ArcTo(Avalonia.Point,Avalonia.Size,System.Double,System.Boolean,Avalonia.Media.SweepDirection,System.Boolean)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Platform.IGeometryContext.CubicBezierTo(Avalonia.Point,Avalonia.Point,Avalonia.Point,System.Boolean)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Platform.IGeometryContext.LineTo(Avalonia.Point,System.Boolean)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Platform.IGeometryContext.QuadraticBezierTo(Avalonia.Point,Avalonia.Point,System.Boolean)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Platform.IPlatformRenderInterfaceContext.CreateOffscreenRenderTarget(Avalonia.PixelSize,Avalonia.Vector,System.Boolean)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Platform.IPlatformRenderInterfaceContext.CreateRenderTarget(System.Collections.Generic.IEnumerable{Avalonia.Platform.Surfaces.IPlatformRenderSurface})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Platform.IPlatformRenderInterfaceImportedImage.SnapshotWithTimelineSemaphores(Avalonia.Platform.IPlatformRenderInterfaceImportedSemaphore,System.UInt64,Avalonia.Platform.IPlatformRenderInterfaceImportedSemaphore,System.UInt64)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Platform.IRenderTarget.CreateDrawingContext(Avalonia.PixelSize,Avalonia.Platform.RenderTargetDrawingContextProperties@)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Platform.IRenderTarget.CreateDrawingContext(Avalonia.Platform.IRenderTarget.RenderTargetSceneInfo,Avalonia.Platform.RenderTargetDrawingContextProperties@)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Platform.IRenderTargetBitmapImpl.CreateDrawingContext</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Platform.Storage.IStorageProvider.SaveFilePickerWithResultAsync(Avalonia.Platform.Storage.FilePickerSaveOptions)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Rendering.IRenderTimer.Start</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Rendering.IRenderTimer.Stop</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>P:Avalonia.Input.IInputRoot.FocusRoot</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>P:Avalonia.Platform.IDrawingContextLayerImpl.IsCorrupted</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>P:Avalonia.Platform.ILockedFramebuffer.AlphaFormat</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>P:Avalonia.Platform.IPlatformRenderInterfaceContext.MaxOffscreenRenderTargetPixelSize</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>P:Avalonia.Platform.IReadableBitmapImpl.AlphaFormat</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>P:Avalonia.Platform.IRenderTarget.Properties</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Platform.IWindowImpl.SetWindowDecorations(Avalonia.Controls.WindowDecorations)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Platform.IWindowingPlatform.GetWindowsZOrder(System.ReadOnlySpan{Avalonia.Platform.IWindowImpl},System.Span{System.Int64})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>P:Avalonia.Platform.ITopLevelImpl.Surfaces</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>P:Avalonia.Platform.IWindowImpl.RequestedDrawnDecorations</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.OpenGL.IGlExternalSemaphore.SignalTimelineSemaphore(Avalonia.OpenGL.IGlExternalImageTexture,System.UInt64)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.OpenGL.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.OpenGL.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.OpenGL.IGlExternalSemaphore.WaitTimelineSemaphore(Avalonia.OpenGL.IGlExternalImageTexture,System.UInt64)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.OpenGL.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.OpenGL.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.OpenGL.IGlPlatformSurfaceRenderTargetFactory.CanRenderToSurface(Avalonia.OpenGL.IGlContext,Avalonia.Platform.Surfaces.IPlatformRenderSurface)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.OpenGL.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.OpenGL.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.OpenGL.IGlPlatformSurfaceRenderTargetFactory.CreateRenderTarget(Avalonia.OpenGL.IGlContext,Avalonia.Platform.Surfaces.IPlatformRenderSurface)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.OpenGL.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.OpenGL.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.OpenGL.Surfaces.IGlPlatformSurfaceRenderTarget.BeginDraw(Avalonia.Platform.IRenderTarget.RenderTargetSceneInfo)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.OpenGL.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.OpenGL.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.OpenGL.Surfaces.IGlPlatformSurfaceRenderTarget.BeginDraw(System.Nullable{Avalonia.PixelSize})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.OpenGL.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.OpenGL.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>P:Avalonia.OpenGL.IGlExternalImageTexture.TextureType</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.OpenGL.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.OpenGL.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>P:Avalonia.OpenGL.Surfaces.IGlPlatformSurfaceRenderTarget.IsCorrupted</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.OpenGL.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.OpenGL.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Vulkan.IVulkanKhrSurfacePlatformSurfaceFactory.CanRenderToSurface(Avalonia.Vulkan.IVulkanPlatformGraphicsContext,Avalonia.Platform.Surfaces.IPlatformRenderSurface)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Vulkan.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Vulkan.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Vulkan.IVulkanKhrSurfacePlatformSurfaceFactory.CreateSurface(Avalonia.Vulkan.IVulkanPlatformGraphicsContext,Avalonia.Platform.Surfaces.IPlatformRenderSurface)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Vulkan.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Vulkan.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Vulkan.IVulkanPlatformGraphicsContext.CreateRenderTarget(System.Collections.Generic.IEnumerable{Avalonia.Platform.Surfaces.IPlatformRenderSurface})</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Vulkan.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Vulkan.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Input.Platform.IClipboard.SetDataAsync(Avalonia.Input.IAsyncDataTransfer)</Target>
-    <Left>baseline/Avalonia/lib/netstandard2.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/netstandard2.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Input.Platform.IClipboard.TryGetDataAsync</Target>
-    <Left>baseline/Avalonia/lib/netstandard2.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/netstandard2.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Input.Platform.IClipboard.TryGetInProcessDataAsync</Target>
-    <Left>baseline/Avalonia/lib/netstandard2.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/netstandard2.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Input.Platform.IPlatformDragSource.DoDragDropAsync(Avalonia.Input.PointerEventArgs,Avalonia.Input.IDataTransfer,Avalonia.Input.DragDropEffects)</Target>
-    <Left>baseline/Avalonia/lib/netstandard2.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/netstandard2.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Platform.IFontManagerImpl.TryMatchCharacter(System.Int32,Avalonia.Media.FontStyle,Avalonia.Media.FontWeight,Avalonia.Media.FontStretch,System.String,System.Globalization.CultureInfo,Avalonia.Media.Typeface@)</Target>
-    <Left>baseline/Avalonia/lib/netstandard2.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/netstandard2.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Platform.IPlatformRenderInterfaceImportedImage.SnapshotWithTimelineSemaphores(Avalonia.Platform.IPlatformRenderInterfaceImportedSemaphore,System.UInt64,Avalonia.Platform.IPlatformRenderInterfaceImportedSemaphore,System.UInt64)</Target>
-    <Left>baseline/Avalonia/lib/netstandard2.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/netstandard2.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.Platform.Storage.IStorageProvider.SaveFilePickerWithResultAsync(Avalonia.Platform.Storage.FilePickerSaveOptions)</Target>
-    <Left>baseline/Avalonia/lib/netstandard2.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/netstandard2.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.OpenGL.IGlExternalSemaphore.SignalTimelineSemaphore(Avalonia.OpenGL.IGlExternalImageTexture,System.UInt64)</Target>
-    <Left>baseline/Avalonia/lib/netstandard2.0/Avalonia.OpenGL.dll</Left>
-    <Right>current/Avalonia/lib/netstandard2.0/Avalonia.OpenGL.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Avalonia.OpenGL.IGlExternalSemaphore.WaitTimelineSemaphore(Avalonia.OpenGL.IGlExternalImageTexture,System.UInt64)</Target>
-    <Left>baseline/Avalonia/lib/netstandard2.0/Avalonia.OpenGL.dll</Left>
-    <Right>current/Avalonia/lib/netstandard2.0/Avalonia.OpenGL.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>P:Avalonia.OpenGL.IGlExternalImageTexture.TextureType</Target>
-    <Left>baseline/Avalonia/lib/netstandard2.0/Avalonia.OpenGL.dll</Left>
-    <Right>current/Avalonia/lib/netstandard2.0/Avalonia.OpenGL.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0007</DiagnosticId>
-    <Target>T:Avalonia.Controls.ResourcesChangedEventArgs</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0007</DiagnosticId>
-    <Target>T:Avalonia.Controls.ResourcesChangedEventArgs</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Input.DataObject</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Input.IInputRoot</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Media.ImmediateDrawingContext</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Media.StreamGeometryContext</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Platform.IDrawingContextLayerImpl</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Platform.IDrawingContextLayerWithRenderContextAffinityImpl</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Platform.IPlatformGraphicsContext</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Platform.IPlatformGraphicsWithFeatures</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Platform.IPlatformRenderInterfaceContext</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Platform.IRenderTargetBitmapImpl</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Platform.IWriteableBitmapImpl</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Application</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Controls.Embedding.EmbeddableControlRoot</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Controls.Embedding.Offscreen.OffscreenTopLevelImplBase</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Controls.Platform.IWin32OptionsTopLevelImpl</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Controls.Primitives.OverlayPopupHost</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Controls.Primitives.PopupRoot</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Controls.TopLevel</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Controls.Window</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Controls.WindowBase</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Platform.IPopupImpl</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Platform.ITopLevelImpl</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Platform.IWindowBaseImpl</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Platform.IWindowImpl</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Dialogs.AboutAvaloniaDialog</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Dialogs.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Dialogs.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Metal.IMetalDevice</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Metal.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Metal.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.OpenGL.Egl.EglContext</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.OpenGL.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.OpenGL.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.OpenGL.Egl.EglPlatformSurfaceRenderTargetBase</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.OpenGL.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.OpenGL.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.OpenGL.IGlContext</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.OpenGL.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.OpenGL.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Vulkan.IVulkanDevice</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Vulkan.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Vulkan.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Vulkan.IVulkanPlatformGraphicsContext</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Vulkan.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Vulkan.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Input.DataObject</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Input.IInputRoot</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Media.ImmediateDrawingContext</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Media.StreamGeometryContext</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Platform.IDrawingContextLayerImpl</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Platform.IDrawingContextLayerWithRenderContextAffinityImpl</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Platform.IPlatformGraphicsContext</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Platform.IPlatformGraphicsWithFeatures</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Platform.IPlatformRenderInterfaceContext</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Platform.IRenderTargetBitmapImpl</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Platform.IWriteableBitmapImpl</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Application</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Controls.Embedding.EmbeddableControlRoot</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Controls.Embedding.Offscreen.OffscreenTopLevelImplBase</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Controls.Platform.IWin32OptionsTopLevelImpl</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Controls.Primitives.OverlayPopupHost</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Controls.Primitives.PopupRoot</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Controls.TopLevel</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Controls.Window</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Controls.WindowBase</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Platform.IPopupImpl</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Platform.ITopLevelImpl</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Platform.IWindowBaseImpl</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Platform.IWindowImpl</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Dialogs.AboutAvaloniaDialog</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Dialogs.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Dialogs.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Metal.IMetalDevice</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Metal.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Metal.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.OpenGL.Egl.EglContext</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.OpenGL.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.OpenGL.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.OpenGL.Egl.EglPlatformSurfaceRenderTargetBase</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.OpenGL.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.OpenGL.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.OpenGL.IGlContext</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.OpenGL.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.OpenGL.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Vulkan.IVulkanDevice</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Vulkan.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Vulkan.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Vulkan.IVulkanPlatformGraphicsContext</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Vulkan.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Vulkan.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0009</DiagnosticId>
-    <Target>T:Avalonia.Controls.ResourcesChangedEventArgs</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0009</DiagnosticId>
-    <Target>T:Avalonia.Input.DataObject</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0009</DiagnosticId>
-    <Target>T:Avalonia.Input.HoldingRoutedEventArgs</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0009</DiagnosticId>
-    <Target>T:Avalonia.Controls.Primitives.AdornerLayer</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0009</DiagnosticId>
-    <Target>T:Avalonia.Controls.Primitives.OverlayPopupHost</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0009</DiagnosticId>
-    <Target>T:Avalonia.Controls.Primitives.VisualLayerManager</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0009</DiagnosticId>
-    <Target>T:Avalonia.Platform.Screen</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0009</DiagnosticId>
-    <Target>T:Avalonia.Controls.ResourcesChangedEventArgs</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0009</DiagnosticId>
-    <Target>T:Avalonia.Input.DataObject</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0009</DiagnosticId>
-    <Target>T:Avalonia.Input.HoldingRoutedEventArgs</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0009</DiagnosticId>
-    <Target>T:Avalonia.Controls.Primitives.AdornerLayer</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0009</DiagnosticId>
-    <Target>T:Avalonia.Controls.Primitives.OverlayPopupHost</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0009</DiagnosticId>
-    <Target>T:Avalonia.Controls.Primitives.VisualLayerManager</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0009</DiagnosticId>
-    <Target>T:Avalonia.Platform.Screen</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0012</DiagnosticId>
-    <Target>M:Avalonia.Media.Fonts.FontCollectionBase.get_Count</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0012</DiagnosticId>
-    <Target>M:Avalonia.Media.Fonts.FontCollectionBase.get_Item(System.Int32)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0012</DiagnosticId>
-    <Target>M:Avalonia.Media.Fonts.FontCollectionBase.GetEnumerator</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0012</DiagnosticId>
-    <Target>P:Avalonia.Media.Fonts.FontCollectionBase.Count</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0012</DiagnosticId>
-    <Target>P:Avalonia.Media.Fonts.FontCollectionBase.Item(System.Int32)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0012</DiagnosticId>
-    <Target>M:Avalonia.Platform.Screen.Equals(Avalonia.Platform.Screen)</Target>
-    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0012</DiagnosticId>
-    <Target>M:Avalonia.Media.Fonts.FontCollectionBase.get_Count</Target>
-    <Left>baseline/Avalonia/lib/net6.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net6.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0012</DiagnosticId>
-    <Target>M:Avalonia.Media.Fonts.FontCollectionBase.get_Item(System.Int32)</Target>
-    <Left>baseline/Avalonia/lib/net6.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net6.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0012</DiagnosticId>
-    <Target>M:Avalonia.Media.Fonts.FontCollectionBase.GetEnumerator</Target>
-    <Left>baseline/Avalonia/lib/net6.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net6.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0012</DiagnosticId>
-    <Target>P:Avalonia.Media.Fonts.FontCollectionBase.Count</Target>
-    <Left>baseline/Avalonia/lib/net6.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net6.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0012</DiagnosticId>
-    <Target>P:Avalonia.Media.Fonts.FontCollectionBase.Item(System.Int32)</Target>
-    <Left>baseline/Avalonia/lib/net6.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net6.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0012</DiagnosticId>
-    <Target>M:Avalonia.Media.Fonts.FontCollectionBase.get_Count</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0012</DiagnosticId>
-    <Target>M:Avalonia.Media.Fonts.FontCollectionBase.get_Item(System.Int32)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0012</DiagnosticId>
-    <Target>M:Avalonia.Media.Fonts.FontCollectionBase.GetEnumerator</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0012</DiagnosticId>
-    <Target>P:Avalonia.Media.Fonts.FontCollectionBase.Count</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0012</DiagnosticId>
-    <Target>P:Avalonia.Media.Fonts.FontCollectionBase.Item(System.Int32)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0012</DiagnosticId>
-    <Target>M:Avalonia.Platform.Screen.Equals(Avalonia.Platform.Screen)</Target>
-    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
-    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0012</DiagnosticId>
-    <Target>M:Avalonia.Media.Fonts.FontCollectionBase.get_Count</Target>
-    <Left>baseline/Avalonia/lib/netstandard2.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/netstandard2.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0012</DiagnosticId>
-    <Target>M:Avalonia.Media.Fonts.FontCollectionBase.get_Item(System.Int32)</Target>
-    <Left>baseline/Avalonia/lib/netstandard2.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/netstandard2.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0012</DiagnosticId>
-    <Target>M:Avalonia.Media.Fonts.FontCollectionBase.GetEnumerator</Target>
-    <Left>baseline/Avalonia/lib/netstandard2.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/netstandard2.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0012</DiagnosticId>
-    <Target>P:Avalonia.Media.Fonts.FontCollectionBase.Count</Target>
-    <Left>baseline/Avalonia/lib/netstandard2.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/netstandard2.0/Avalonia.Base.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0012</DiagnosticId>
-    <Target>P:Avalonia.Media.Fonts.FontCollectionBase.Item(System.Int32)</Target>
-    <Left>baseline/Avalonia/lib/netstandard2.0/Avalonia.Base.dll</Left>
-    <Right>current/Avalonia/lib/netstandard2.0/Avalonia.Base.dll</Right>
-  </Suppression>
-</Suppressions>
diff --git a/build/MicroCOM.props b/build/MicroCOM.props
new file mode 100644
index 0000000000..1efa4b2ef3
--- /dev/null
+++ b/build/MicroCOM.props
@@ -0,0 +1,26 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <!-- Uncomment to use local MicroCOM build -->
+    <!--<UseLocalMicroComBuild>true</UseLocalMicroComBuild>-->
+  
+    <LocalMicroComPath Condition="'$(LocalMicroComPath)' == ''">$(MSBuildThisFileDirectory)/../../MicroCom</LocalMicroComPath>
+  </PropertyGroup>
+
+  <!-- Local build: delegate to MicroCom's own targets -->
+  <Import Condition="'$(UseLocalMicroComBuild)' == 'true'"
+          Project="$(LocalMicroComPath)/UseLocalBuild.targets" />
+
+  <!-- NuGet packages: include based on property flags -->
+  <ItemGroup Condition="'$(UseLocalMicroComBuild)' != 'true'">
+    <PackageReference Condition="'$(UseMicroCom)' == 'true'"
+                      Include="MicroCom.Runtime" />
+    <PackageReference Condition="'$(UseMicroComGenerator)' == 'true'"
+                      Include="MicroCom.CodeGenerator" />
+    <PackageReference Condition="'$(UseMicroComGeneratorMSBuild)' == 'true'"
+                      Include="MicroCom.CodeGenerator.MSBuild"
+                      PrivateAssets="all" />
+    <PackageReference Condition="'$(UseMicroComGeneratorRoslyn)' == 'true'"
+                      Include="MicroCom.CodeGenerator.Roslyn"
+                      PrivateAssets="all" />
+  </ItemGroup>
+</Project>
diff --git a/build/SharedVersion.props b/build/SharedVersion.props
index b8c0dd4d43..cff9a24f54 100644
--- a/build/SharedVersion.props
+++ b/build/SharedVersion.props
@@ -2,7 +2,7 @@
   xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Product>Avalonia</Product>
-    <Version>12.0.999</Version>
+    <Version>12.1.999</Version>
     <Authors>Avalonia Team</Authors>
     <Copyright>Copyright 2013-$([System.DateTime]::Now.ToString(`yyyy`)) &#169; The AvaloniaUI Project</Copyright>
     <PackageProjectUrl>https://avaloniaui.net/?utm_source=nuget&amp;utm_medium=referral&amp;utm_content=project_homepage_link</PackageProjectUrl>
diff --git a/docs/build.md b/docs/build.md
index 2285e56d01..bd8ae3fc02 100644
--- a/docs/build.md
+++ b/docs/build.md
@@ -42,7 +42,7 @@ dotnet run
 
 If you want to open Avalonia in Visual Studio you have two options:
 
-- Avalonia.sln: This contains the whole of Avalonia in including desktop, mobile and web. You must have a number of dotnet workloads installed in order to build everything in this solution
+- Avalonia.slnx: This contains the whole of Avalonia in including desktop, mobile and web. You must have a number of dotnet workloads installed in order to build everything in this solution
 - Avalonia.Desktop.slnf: This solution filter opens only the parts of Avalonia required to run on desktop. This requires no extra workloads to be installed.
 
 Avalonia requires Visual Studio 2022 or newer. The free Visual Studio Community edition works fine.
diff --git a/external/Avalonia.DBus b/external/Avalonia.DBus
index f91a822c25..864a052828 160000
--- a/external/Avalonia.DBus
+++ b/external/Avalonia.DBus
@@ -1 +1 @@
-Subproject commit f91a822c258476f185e51112388775591e6ef9d6
+Subproject commit 864a05282841bf04006890f04d11d60d1a046aa9
diff --git a/native/Avalonia.Native/README.md b/native/Avalonia.Native/README.md
new file mode 100644
index 0000000000..47e06b996e
--- /dev/null
+++ b/native/Avalonia.Native/README.md
@@ -0,0 +1,87 @@
+# Avalonia.Native
+
+This project implements the macOS native platform backend for Avalonia using Objective-C++ and COM (Component Object Model) interfaces.
+
+
+## COM Reference Management
+
+This codebase uses COM for cross-boundary object lifetime management. COM types are typically prefixed with `IAvn` (interfaces) or `Avn` (implementations). All COM objects ultimately derive from `IUnknown` and use reference counting (`AddRef`/`Release`).
+
+**No raw COM pointer should ever be stored in class fields, instance variables, closures, or containers.** Raw COM pointers are only acceptable as function parameters and local variables with the lifetime of the current function call.
+
+### COM Return Value Convention
+
+By convention, any COM interface reference returned from a COM call has its reference counter incremented — it is the caller's responsibility to release it. With the `IFoo* GetFoo()` pattern it is hard to track this correctly, so all methods in `avn.idl` should use the out-parameter pattern instead:
+
+```cpp
+// WRONG — easy to leak or forget Release:
+IFoo* GetFoo();
+
+// CORRECT — use HRESULT + out-parameter:
+HRESULT GetFoo(IFoo** ppv);
+```
+# Smart pointer types
+
+### Objective-C Objects
+
+For Objective-C objects, reference counting is provided by the compiler. Objective-C pointers _look_ like raw pointers, however every `NSObject*` reference is properly ref-counted by ARC (Automatic Reference Counting). No manual wrapping is needed for `NSObject*` fields.
+
+### COM Smart Pointer Types
+
+All retained COM references must use one of the following wrappers defined in `inc/comimpl.h`:
+
+#### `ComPtr<T>` — Owning Reference
+
+Use for any COM pointer that the holder needs to keep alive.
+
+```cpp
+ComPtr<IAvnWindow> _window; // correct
+IAvnWindow* _window;        // WRONG — raw COM pointer in a field
+```
+
+#### `ComObjectWeakPtr<T>` — Non-Owning Weak Reference
+
+Use for intentional non-owning references to `ComObject`-derived objects (internal implementations). Allows safely referencing COM objects without extending their lifetime.
+
+```cpp
+ComObjectWeakPtr<WindowBaseImpl> _parent; // correct
+WindowBaseImpl* _parent;                  // WRONG
+```
+
+Access weak references with `tryGet()`, which returns a `ComPtr<T>` (null if the object was destroyed):
+
+```cpp
+auto parent = _parent.tryGet();
+if (parent) {
+    parent->DoSomething();
+}
+```
+
+#### `ComStaticPtr<T>` — Process-Lifetime Static Reference
+
+Use for static/global COM singletons that must live for the entire process lifetime. Intentionally does **not** Release in its destructor to avoid crashes during app teardown.
+
+```cpp
+static ComStaticPtr<IAvnGlDisplay> GlDisplay; // correct
+static IAvnGlDisplay* GlDisplay;              // WRONG
+```
+
+Assign via `set()`:
+
+```cpp
+GlDisplay.set(comnew<AvnGlDisplay>());
+```
+
+### `comnew<T>(args...)` — COM Object Factory
+
+A convenience template similar to `std::make_shared`. Creates a new COM object and returns it wrapped in a `ComPtr<T>` with correct ownership (no double-AddRef):
+
+```cpp
+// Instead of:
+ComPtr<Cursor> cursor(new Cursor(nsCursor), true);
+
+// Write:
+ComPtr<Cursor> cursor = comnew<Cursor>(nsCursor);
+```
+
+This works because `new T()` on a `ComObject`-derived type starts with refcount=1, and `comnew` wraps it in a `ComPtr` that takes ownership without an additional `AddRef`.
diff --git a/native/Avalonia.Native/inc/comimpl.h b/native/Avalonia.Native/inc/comimpl.h
index e16adb1ec2..0b09ee66fb 100644
--- a/native/Avalonia.Native/inc/comimpl.h
+++ b/native/Avalonia.Native/inc/comimpl.h
@@ -8,6 +8,7 @@
 
 #include <cstring>
 #include <memory>
+#include <utility>
 
 /**
  START_COM_CALL causes AddRef to be called at the beginning of a function.
@@ -110,6 +111,11 @@ public:
     
     TInterface** getPPV()
     {
+        if(_obj)
+        {
+            _obj->Release();
+            _obj = nullptr;
+        }
         return &_obj;
     }
 
@@ -138,6 +144,78 @@ public:
     }
 };
 
+template<class T, class... Args>
+ComPtr<T> comnew(Args&&... args)
+{
+    return ComPtr<T>(new T(std::forward<Args>(args)...), true);
+}
+
+/**
+ * ComStaticPtr is a COM smart pointer for process-lifetime static singletons.
+ * It AddRef/Release on set/reset, but intentionally does NOT Release in its destructor
+ * to avoid crashes during app teardown when destruction order is undefined.
+ */
+template<class TInterface>
+class ComStaticPtr
+{
+private:
+    TInterface* _obj = nullptr;
+public:
+    ComStaticPtr() = default;
+    ~ComStaticPtr() = default;
+
+    ComStaticPtr(const ComPtr<TInterface>& ptr)
+    {
+        _obj = ptr;
+        if (_obj)
+            _obj->AddRef();
+    }
+
+    ComStaticPtr(const ComStaticPtr&) = delete;
+    ComStaticPtr(ComStaticPtr&&) = delete;
+    ComStaticPtr& operator=(const ComStaticPtr&) = delete;
+    ComStaticPtr& operator=(ComStaticPtr&&) = delete;
+
+    void set(TInterface* obj)
+    {
+        if (_obj == obj)
+            return;
+        if (_obj)
+            _obj->Release();
+        _obj = obj;
+        if (_obj)
+            _obj->AddRef();
+    }
+
+    void setNoAddRef(TInterface* obj)
+    {
+        if (_obj)
+            _obj->Release();
+        _obj = obj;
+    }
+
+    void reset()
+    {
+        if (_obj)
+        {
+            _obj->Release();
+            _obj = nullptr;
+        }
+    }
+
+    TInterface* getRaw() const { return _obj; }
+    
+    template<class TCast> ComPtr<TCast> getComPtr()
+    {
+        if (_obj == nullptr)
+            return nullptr;
+        return dynamic_cast<TCast*>(_obj);
+    }
+
+    operator TInterface*() const { return _obj; }
+    TInterface* operator->() const { return _obj; }
+};
+
 class ComObjectWeakRefToken
 {
 public:
@@ -249,6 +327,9 @@ public:
         _rawPtr = nullptr;
         _token = nullptr;
     }
+    
+    bool operator==(const ComObjectWeakPtr& other) const { return _rawPtr == other._rawPtr; }
+    bool operator!=(const ComObjectWeakPtr& other) const { return _rawPtr != other._rawPtr; }
 };
 
 #define FORWARD_IUNKNOWN() \
diff --git a/native/Avalonia.Native/src/OSX/AvnString.mm b/native/Avalonia.Native/src/OSX/AvnString.mm
index 78a40b215e..b6964195e1 100644
--- a/native/Avalonia.Native/src/OSX/AvnString.mm
+++ b/native/Avalonia.Native/src/OSX/AvnString.mm
@@ -79,16 +79,14 @@ public:
 class AvnStringArrayImpl : public virtual ComSingleObject<IAvnStringArray, &IID_IAvnStringArray>
 {
 private:
-    std::vector<ComPtr<IAvnString>> _list;
+    std::vector<ComPtr<AvnStringImpl>> _list;
 public:
     FORWARD_IUNKNOWN()
     AvnStringArrayImpl(NSArray<NSString*>* array)
     {
         for(int c = 0; c < [array count]; c++)
         {
-            ComPtr<IAvnString> s;
-            *s.getPPV() = new AvnStringImpl([array objectAtIndex:c]);
-            _list.push_back(s);
+            _list.push_back(comnew<AvnStringImpl>([array objectAtIndex:c]));
         }
     }
     
@@ -96,17 +94,14 @@ public:
     {
         for(int c = 0; c < [array count]; c++)
         {
-            ComPtr<IAvnString> s;
-            *s.getPPV() = new AvnStringImpl([array objectAtIndex:c].absoluteString);
+            auto s = comnew<AvnStringImpl>([array objectAtIndex:c].absoluteString);
             _list.push_back(s);
         }
     }
     
     AvnStringArrayImpl(NSString* string)
     {
-        ComPtr<IAvnString> s;
-        *s.getPPV() = new AvnStringImpl(string);
-        _list.push_back(s);
+        _list.push_back(comnew<AvnStringImpl>(string));
     }
     
     virtual unsigned int GetCount() override
diff --git a/native/Avalonia.Native/src/OSX/AvnWindow.mm b/native/Avalonia.Native/src/OSX/AvnWindow.mm
index 1e7c98cb3a..b2f20d556b 100644
--- a/native/Avalonia.Native/src/OSX/AvnWindow.mm
+++ b/native/Avalonia.Native/src/OSX/AvnWindow.mm
@@ -37,7 +37,7 @@
     bool _isTransitioningToFullScreen;
     bool _isTitlebarSession;
     AvnMenu* _menu;
-    IAvnAutomationPeer* _automationPeer;
+    ComPtr<IAvnAutomationPeer> _automationPeer;
     AvnAutomationNode* _automationNode;
 }
 
@@ -144,8 +144,6 @@
     {
         auto appMenu = ::GetAppMenu();
 
-        auto nativeAppMenu = dynamic_cast<AvnAppMenu*>(appMenu);
-
         [[appMenuItem menu] removeItem:appMenuItem];
 
         if(_menu != nullptr)
@@ -153,9 +151,9 @@
             [_menu setHasGlobalMenuItem:false];
         }
 
-        [nativeAppMenu->GetNative() addItem:appMenuItem];
+        [appMenu->GetNative() addItem:appMenuItem];
 
-        [NSApp setMenu:nativeAppMenu->GetNative()];
+        [NSApp setMenu:appMenu->GetNative()];
     }
 }
 
@@ -658,6 +656,18 @@
 
 - (void)raisePropertyChanged:(AvnAutomationProperty)property
 {
+    switch (property)
+    {
+        case AutomationPeer_Name:
+            NSAccessibilityPostNotification(self, NSAccessibilityTitleChangedNotification);
+            break;
+        case AutomationPeer_BoundingRectangle:
+            NSAccessibilityPostNotification(self, NSAccessibilityMovedNotification);
+            NSAccessibilityPostNotification(self, NSAccessibilityResizedNotification);
+            break;
+        default:
+            break;
+    }
 }
 
 @end
diff --git a/native/Avalonia.Native/src/OSX/StorageProvider.mm b/native/Avalonia.Native/src/OSX/StorageProvider.mm
index e0a471a4f3..6abf4604bc 100644
--- a/native/Avalonia.Native/src/OSX/StorageProvider.mm
+++ b/native/Avalonia.Native/src/OSX/StorageProvider.mm
@@ -172,6 +172,7 @@ public:
     {
         @autoreleasepool
         {
+            ComPtr<IAvnSystemDialogEvents> ownedEvents(events); // for use in the callback
             auto panel = [NSOpenPanel openPanel];
             
             panel.allowsMultipleSelection = allowMultiple;
@@ -201,7 +202,7 @@ public:
                     if(urls.count > 0)
                     {
                         auto uriStrings = CreateAvnStringArray(urls);
-                        events->OnCompleted(uriStrings);
+                        ownedEvents->OnCompleted(uriStrings);
     
                         [panel orderOut:panel];
                         
@@ -214,7 +215,7 @@ public:
                     }
                 }
                 
-                events->OnCompleted(nullptr);
+                ownedEvents->OnCompleted(nullptr);
                 
             };
             
@@ -239,6 +240,7 @@ public:
     {
         @autoreleasepool
         {
+            ComPtr<IAvnSystemDialogEvents> ownedEvents(events); // for use in the callback
             auto panel = [NSOpenPanel openPanel];
             
             panel.allowsMultipleSelection = allowMultiple;
@@ -273,7 +275,7 @@ public:
                     if(urls.count > 0)
                     {
                         auto uriStrings = CreateAvnStringArray(urls);
-                        events->OnCompleted(uriStrings);
+                        ownedEvents->OnCompleted(uriStrings);
 
                         [panel orderOut:panel];
                         
@@ -286,7 +288,7 @@ public:
                     }
                 }
                 
-                events->OnCompleted(nullptr);
+                ownedEvents->OnCompleted(nullptr);
                 
             };
             
@@ -310,6 +312,7 @@ public:
     {
         @autoreleasepool
         {
+            ComPtr<IAvnSystemDialogEvents> ownedEvents(events); // for use in the callback
             auto panel = [NSSavePanel savePanel];
             
             if(title != nullptr)
@@ -350,7 +353,7 @@ public:
                     auto url = [panel URL];
                     auto urls = [NSArray<NSURL*> arrayWithObject:url];
                     auto uriStrings = CreateAvnStringArray(urls);
-                    events->OnCompletedWithFilter(uriStrings, selectedIndex);
+                    ownedEvents->OnCompletedWithFilter(uriStrings, selectedIndex);
 
                     [panel orderOut:panel];
                     
@@ -362,7 +365,7 @@ public:
                     return;
                 }
                 
-                events->OnCompletedWithFilter(nullptr, selectedIndex);
+                ownedEvents->OnCompletedWithFilter(nullptr, selectedIndex);
                 
             };
             
diff --git a/native/Avalonia.Native/src/OSX/TopLevelImpl.mm b/native/Avalonia.Native/src/OSX/TopLevelImpl.mm
index bdfc1be62f..d0b62d9d55 100644
--- a/native/Avalonia.Native/src/OSX/TopLevelImpl.mm
+++ b/native/Avalonia.Native/src/OSX/TopLevelImpl.mm
@@ -311,7 +311,9 @@ HRESULT TopLevelImpl::BeginDragAndDropOperation(
 
     for (auto i = 0; i < itemCount; ++i)
     {
-        auto item = source->GetItem(i);
+        ComPtr<IAvnClipboardDataItem> item;
+        if(S_OK != source->GetItem(i, item.getPPV()))
+            continue;
         auto writeableItem = [[WriteableClipboardItem alloc] initWithItem:item source:source];
         auto draggingItem = [[NSDraggingItem alloc] initWithPasteboardWriter:writeableItem];
         [draggingItem setDraggingFrame:dragItemRect contents:dragItemImage];
diff --git a/native/Avalonia.Native/src/OSX/WindowBaseImpl.h b/native/Avalonia.Native/src/OSX/WindowBaseImpl.h
index 873a520d6d..2fbbf60bba 100644
--- a/native/Avalonia.Native/src/OSX/WindowBaseImpl.h
+++ b/native/Avalonia.Native/src/OSX/WindowBaseImpl.h
@@ -101,7 +101,7 @@ protected:
     AutoFitContentView *StandardContainer;
     AvnPoint lastPositionSet;
     bool _shown;
-    std::list<WindowBaseImpl*> _children;
+    std::list<ComObjectWeakPtr<WindowBaseImpl>> _children;
 
 public:
     ComObjectWeakPtr<WindowBaseImpl> Parent = nullptr;
diff --git a/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm b/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm
index 551ea4c2e0..2a1de62b05 100644
--- a/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm
+++ b/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm
@@ -27,7 +27,7 @@ WindowBaseImpl::~WindowBaseImpl() {
 }
 
 WindowBaseImpl::WindowBaseImpl(IAvnWindowBaseEvents *events, bool usePanel) : TopLevelImpl(events) {
-    _children = std::list<WindowBaseImpl*>();
+    _children = std::list<ComObjectWeakPtr<WindowBaseImpl>>();
     _shown = false;
     _inResize = false;
     BaseEvents = events;
diff --git a/native/Avalonia.Native/src/OSX/WindowImpl.mm b/native/Avalonia.Native/src/OSX/WindowImpl.mm
index f42b7c27cb..548d7aaf09 100644
--- a/native/Avalonia.Native/src/OSX/WindowImpl.mm
+++ b/native/Avalonia.Native/src/OSX/WindowImpl.mm
@@ -100,11 +100,14 @@ void WindowImpl::ZOrderChildWindows()
 {
     for(auto iterator = _children.begin(); iterator != _children.end(); iterator++)
     {
-        auto window = (*iterator)->Window;
+        auto child = (*iterator).tryGet();
+        if (!child) continue;
+        
+        auto window = child->Window;
         
         // #9565: Only bring window to front if it's on the currently active space
         if ([window isOnActiveSpace]) {
-            (*iterator)->BringToFront();
+            child->BringToFront();
         }
     }
 }
@@ -113,7 +116,8 @@ bool WindowImpl::CanBecomeKeyWindow()
 {
     for(auto iterator = _children.begin(); iterator != _children.end(); iterator++)
     {
-        if((*iterator)->IsModal())
+        auto child = (*iterator).tryGet();
+        if(child && child->IsModal())
         {
             return false;
         }
diff --git a/native/Avalonia.Native/src/OSX/automation.mm b/native/Avalonia.Native/src/OSX/automation.mm
index b42dc22f7a..412e7ddc5f 100644
--- a/native/Avalonia.Native/src/OSX/automation.mm
+++ b/native/Avalonia.Native/src/OSX/automation.mm
@@ -8,7 +8,7 @@
 
 @implementation AvnAccessibilityElement
 {
-    IAvnAutomationPeer* _peer;
+    ComPtr<IAvnAutomationPeer> _peer;
     AvnAutomationNode* _node;
     NSMutableArray* _children;
     NSArray<NSString*>* _attributeNames;
@@ -70,7 +70,7 @@
     return [NSString stringWithFormat:@"%@ '%@' (%p)",
         GetNSStringAndRelease(_peer->GetClassName()),
         GetNSStringAndRelease(_peer->GetName()),
-        _peer];
+        _peer.getRaw()];
 }
 
 - (IAvnAutomationPeer *)peer
@@ -317,7 +317,30 @@
 - (id)accessibilityParent
 {
     auto parentPeer = _peer->GetParent();
-    return parentPeer ? [AvnAccessibilityElement acquire:parentPeer] : [NSApplication sharedApplication];
+
+    if (parentPeer == nullptr)
+        return [NSApplication sharedApplication];
+
+    // When the parent is a root provider, return the AvnView (content view)
+    // rather than the AvnWindow. macOS accessibility requires that the parent
+    // chain is consistent with the children chain: AvnView exposes these
+    // elements as its accessibilityChildren, so the elements must report
+    // AvnView as their accessibilityParent.  A mismatch causes macOS to be
+    // unable to resolve AXUIElementRefs back to the correct object, which
+    // makes setter calls like AXUIElementSetAttributeValue silently land on
+    // AvnView instead of the target AvnAccessibilityElement.
+    if (parentPeer->IsRootProvider())
+    {
+        auto window = parentPeer->RootProvider_GetWindow();
+        if (window != nullptr)
+        {
+            auto holder = dynamic_cast<INSViewHolder*>(window);
+            if (holder != nullptr)
+                return holder->GetNSView();
+        }
+    }
+
+    return [AvnAccessibilityElement acquire:parentPeer];
 }
 
 - (id)accessibilityTopLevelUIElement
@@ -403,7 +426,11 @@
 
 - (BOOL)isAccessibilitySelectorAllowed:(SEL)selector
 {
-    if (selector == @selector(accessibilityPerformShowMenu))
+    if (selector == @selector(setAccessibilityValue:))
+    {
+        return _peer->IsValueProvider() || _peer->IsRangeValueProvider();
+    }
+    else if (selector == @selector(accessibilityPerformShowMenu))
     {
         return _peer->IsExpandCollapseProvider() && _peer->ExpandCollapseProvider_GetShowsMenu();
     }
@@ -422,7 +449,7 @@
     {
         return _peer->IsRangeValueProvider();
     }
-    
+
     return [super isAccessibilitySelectorAllowed:selector];
 }
 
@@ -461,8 +488,32 @@
 
 - (void)raisePropertyChanged:(AvnAutomationProperty)property
 {
-    if (property == AutomationPeer_Name && _peer->GetLiveSetting() != LiveSettingOff)
-        [self raiseLiveRegionChanged];
+    switch (property)
+    {
+        case AutomationPeer_Name:
+            NSAccessibilityPostNotification(self, NSAccessibilityTitleChangedNotification);
+            if (_peer->GetLiveSetting() != LiveSettingOff)
+                [self raiseLiveRegionChanged];
+            break;
+        case ValueProvider_Value:
+        case RangeValueProvider_Value:
+            NSAccessibilityPostNotification(self, NSAccessibilityValueChangedNotification);
+            break;
+        case AutomationPeer_BoundingRectangle:
+            NSAccessibilityPostNotification(self, NSAccessibilityMovedNotification);
+            NSAccessibilityPostNotification(self, NSAccessibilityResizedNotification);
+            break;
+        case SelectionItemProvider_IsSelected:
+        case SelectionProvider_Selection:
+            NSAccessibilityPostNotification(self, NSAccessibilitySelectedChildrenChangedNotification);
+            break;
+        case ToggleProvider_ToggleState:
+        case ExpandCollapseProvider_ExpandCollapseState:
+            NSAccessibilityPostNotification(self, NSAccessibilityValueChangedNotification);
+            break;
+        default:
+            break;
+    }
 }
 
 - (void)raiseLiveRegionChanged
diff --git a/native/Avalonia.Native/src/OSX/cgl.mm b/native/Avalonia.Native/src/OSX/cgl.mm
index 4fc4064df1..e963322033 100644
--- a/native/Avalonia.Native/src/OSX/cgl.mm
+++ b/native/Avalonia.Native/src/OSX/cgl.mm
@@ -219,7 +219,7 @@ public:
     }
 };
 
-static IAvnGlDisplay* GlDisplay = new AvnGlDisplay();
+static ComStaticPtr<AvnGlDisplay> GlDisplay(comnew<AvnGlDisplay>());
 
 
 extern IAvnGlDisplay* GetGlDisplay()
diff --git a/native/Avalonia.Native/src/OSX/clipboard.mm b/native/Avalonia.Native/src/OSX/clipboard.mm
index 9786a64b27..f050a894c8 100644
--- a/native/Avalonia.Native/src/OSX/clipboard.mm
+++ b/native/Avalonia.Native/src/OSX/clipboard.mm
@@ -183,7 +183,9 @@ public:
         
         for (auto i = 0; i < count; ++i)
         {
-            auto item = source->GetItem(i);
+            ComPtr<IAvnClipboardDataItem> item;
+            if(S_OK != source->GetItem(i, item.getPPV()))
+                continue;
             auto writeableItem = [[WriteableClipboardItem alloc] initWithItem:item source:source];
             [writeableItems addObject:writeableItem];
         }
@@ -219,8 +221,8 @@ extern IAvnClipboard* CreateClipboard(NSPasteboard* pb)
 
 @implementation WriteableClipboardItem
 {
-    IAvnClipboardDataItem* _item;
-    IAvnClipboardDataSource* _source;
+    ComPtr<IAvnClipboardDataItem> _item;
+    ComPtr<IAvnClipboardDataSource> _source;
 }
     
 - (nonnull WriteableClipboardItem*) initWithItem:(nonnull IAvnClipboardDataItem*)item source:(nonnull IAvnClipboardDataSource*)source
@@ -229,9 +231,6 @@ extern IAvnClipboard* CreateClipboard(NSPasteboard* pb)
     _item = item;
     _source = source;
     
-    // Each item references its source so it doesn't get disposed too early.
-    source->AddRef();
-    
     return self;
 }
 
@@ -283,8 +282,9 @@ NSString* TryConvertFormatToUti(NSString* format)
 
 - (nonnull NSArray<NSPasteboardType>*) writableTypesForPasteboard:(nonnull NSPasteboard*)pasteboard
 {
-    auto formats = _item->ProvideFormats();
-    if (formats == nullptr)
+    ComPtr<IAvnStringArray> formats;
+    auto hr = _item->ProvideFormats(formats.getPPV());
+    if (hr != S_OK || formats == nullptr)
         return [NSArray array];
     
     auto count = formats->GetCount();
@@ -304,7 +304,6 @@ NSString* TryConvertFormatToUti(NSString* format)
         if (uti != nil)
             [utis addObject:uti];
     }
-    formats->Release();
     
     [utis addObject:GetAvnCustomDataType()];
     
@@ -323,8 +322,9 @@ NSString* TryConvertFormatToUti(NSString* format)
     if ([type isEqualToString:GetAvnCustomDataType()])
         return @"";
     
-    ComPtr<IAvnClipboardDataValue> value(_item->GetValue([type UTF8String]), true);
-    if (value.getRaw() == nullptr)
+    ComPtr<IAvnClipboardDataValue> value;
+    HRESULT hr = _item->GetValue([type UTF8String], value.getPPV());
+    if (hr != S_OK || value.getRaw() == nullptr)
         return nil;
     
     if (value->IsString())
@@ -336,19 +336,4 @@ NSString* TryConvertFormatToUti(NSString* format)
     return [NSData dataWithBytesNoCopy:buffer length:length];
 }
 
-- (void) dealloc
-{
-    if (_item != nullptr)
-    {
-        _item->Release();
-        _item = nullptr;
-    }
-    
-    if (_source != nullptr)
-    {
-        _source->Release();
-        _source = nullptr;
-    }
-}
-
 @end
diff --git a/native/Avalonia.Native/src/OSX/common.h b/native/Avalonia.Native/src/OSX/common.h
index a993784fc4..6564a457af 100644
--- a/native/Avalonia.Native/src/OSX/common.h
+++ b/native/Avalonia.Native/src/OSX/common.h
@@ -36,7 +36,8 @@ extern IAvnPlatformRenderTimer* CreatePlatformRenderTimer();
 extern IAvnNativeObjectsMemoryManagement* CreateMemoryManagementHelper();
 extern void SetAppMenu(IAvnMenu *menu);
 extern void SetServicesMenu (IAvnMenu* menu);
-extern IAvnMenu* GetAppMenu ();
+class AvnAppMenu;
+extern AvnAppMenu* GetAppMenu ();
 extern NSMenuItem* GetAppMenuItem ();
 extern void SetDockMenu(NSMenu* menu);
 
diff --git a/native/Avalonia.Native/src/OSX/cursor.h b/native/Avalonia.Native/src/OSX/cursor.h
index 75a9c3d2ad..cc7f765785 100644
--- a/native/Avalonia.Native/src/OSX/cursor.h
+++ b/native/Avalonia.Native/src/OSX/cursor.h
@@ -28,5 +28,4 @@ public:
     }
 };
 
-extern std::map<AvnStandardCursorType, Cursor*> s_cursorMap;
 #endif /* cursor_h */
diff --git a/native/Avalonia.Native/src/OSX/cursor.mm b/native/Avalonia.Native/src/OSX/cursor.mm
index 855a9a9abc..9947aa7c53 100644
--- a/native/Avalonia.Native/src/OSX/cursor.mm
+++ b/native/Avalonia.Native/src/OSX/cursor.mm
@@ -3,24 +3,24 @@
 
 class CursorFactory : public ComSingleObject<IAvnCursorFactory, &IID_IAvnCursorFactory>
 {
-    Cursor* arrowCursor = new Cursor([NSCursor arrowCursor]);
-    Cursor* crossCursor = new Cursor([NSCursor crosshairCursor]);
-    Cursor* resizeUpCursor = new Cursor([NSCursor resizeUpCursor]);
-    Cursor* resizeDownCursor = new Cursor([NSCursor resizeDownCursor]);
-    Cursor* resizeUpDownCursor = new Cursor([NSCursor resizeUpDownCursor]);
-    Cursor* dragCopyCursor = new Cursor([NSCursor dragCopyCursor]);
-    Cursor* openHandCursor = new Cursor([NSCursor openHandCursor]);
-    Cursor* dragLinkCursor = new Cursor([NSCursor dragLinkCursor]);
-    Cursor* pointingHandCursor = new Cursor([NSCursor pointingHandCursor]);
-    Cursor* contextualMenuCursor = new Cursor([NSCursor contextualMenuCursor]);
-    Cursor* IBeamCursor = new Cursor([NSCursor IBeamCursor]);
-    Cursor* resizeLeftCursor = new Cursor([NSCursor resizeLeftCursor]);
-    Cursor* resizeRightCursor = new Cursor([NSCursor resizeRightCursor]);
-    Cursor* resizeWestEastCursor = new Cursor([NSCursor resizeLeftRightCursor]);
-    Cursor* operationNotAllowedCursor = new Cursor([NSCursor operationNotAllowedCursor]);
-    Cursor* noCursor = new Cursor([NSCursor arrowCursor], true);
+    ComPtr<Cursor> arrowCursor = comnew<Cursor>([NSCursor arrowCursor]);
+    ComPtr<Cursor> crossCursor = comnew<Cursor>([NSCursor crosshairCursor]);
+    ComPtr<Cursor> resizeUpCursor = comnew<Cursor>([NSCursor resizeUpCursor]);
+    ComPtr<Cursor> resizeDownCursor = comnew<Cursor>([NSCursor resizeDownCursor]);
+    ComPtr<Cursor> resizeUpDownCursor = comnew<Cursor>([NSCursor resizeUpDownCursor]);
+    ComPtr<Cursor> dragCopyCursor = comnew<Cursor>([NSCursor dragCopyCursor]);
+    ComPtr<Cursor> openHandCursor = comnew<Cursor>([NSCursor openHandCursor]);
+    ComPtr<Cursor> dragLinkCursor = comnew<Cursor>([NSCursor dragLinkCursor]);
+    ComPtr<Cursor> pointingHandCursor = comnew<Cursor>([NSCursor pointingHandCursor]);
+    ComPtr<Cursor> contextualMenuCursor = comnew<Cursor>([NSCursor contextualMenuCursor]);
+    ComPtr<Cursor> IBeamCursor = comnew<Cursor>([NSCursor IBeamCursor]);
+    ComPtr<Cursor> resizeLeftCursor = comnew<Cursor>([NSCursor resizeLeftCursor]);
+    ComPtr<Cursor> resizeRightCursor = comnew<Cursor>([NSCursor resizeRightCursor]);
+    ComPtr<Cursor> resizeWestEastCursor = comnew<Cursor>([NSCursor resizeLeftRightCursor]);
+    ComPtr<Cursor> operationNotAllowedCursor = comnew<Cursor>([NSCursor operationNotAllowedCursor]);
+    ComPtr<Cursor> noCursor = comnew<Cursor>([NSCursor arrowCursor], true);
 
-    std::map<AvnStandardCursorType, Cursor*> s_cursorMap =
+    std::map<AvnStandardCursorType, ComPtr<Cursor>> s_cursorMap =
     {
         { CursorArrow, arrowCursor },
         { CursorAppStarting, arrowCursor },
diff --git a/native/Avalonia.Native/src/OSX/menu.h b/native/Avalonia.Native/src/OSX/menu.h
index eb706d3e07..72c19eb120 100644
--- a/native/Avalonia.Native/src/OSX/menu.h
+++ b/native/Avalonia.Native/src/OSX/menu.h
@@ -29,8 +29,8 @@ class AvnAppMenuItem : public ComSingleObject<IAvnMenuItem, &IID_IAvnMenuItem>
 {
 private:
     NSMenuItem* _native; // here we hold a pointer to an AvnMenuItem
-    IAvnActionCallback* _callback;
-    IAvnPredicateCallback* _predicate;
+    ComPtr<IAvnActionCallback> _callback;
+    ComPtr<IAvnPredicateCallback> _predicate;
     bool _isCheckable;
     
 public:
diff --git a/native/Avalonia.Native/src/OSX/menu.mm b/native/Avalonia.Native/src/OSX/menu.mm
index 1adbe093bb..a67c96a796 100644
--- a/native/Avalonia.Native/src/OSX/menu.mm
+++ b/native/Avalonia.Native/src/OSX/menu.mm
@@ -35,7 +35,7 @@
 
 @implementation AvnMenuItem
 {
-    AvnAppMenuItem* _item;
+    ComObjectWeakPtr<AvnAppMenuItem> _item;
 }
 
 - (id) initWithAvnAppMenuItem: (AvnAppMenuItem*)menuItem
@@ -61,13 +61,19 @@
     {
         return YES;
     }
+    auto item = _item.tryGet();
+    if(item == nullptr)
+        return NO;
     
-    return _item->EvaluateItemEnabled();
+    return item->EvaluateItemEnabled();
 }
 
 - (void)didSelectItem:(nullable id)sender
 {
-    _item->RaiseOnClicked();
+    auto item = _item.tryGet();
+    if(item == nullptr)
+        return;
+    item->RaiseOnClicked();
 }
 @end
 
@@ -478,17 +484,15 @@ extern IAvnMenuItem* CreateAppMenuItemSeparator()
     }
 }
 
-static IAvnMenu* s_appMenu = nullptr;
+static ComStaticPtr<AvnAppMenu> s_appMenu;
 static NSMenuItem* s_appMenuItem = nullptr;
 
 extern void SetAppMenu(IAvnMenu *menu)
 {
-    s_appMenu = menu;
+    s_appMenu.set(dynamic_cast<AvnAppMenu*>(menu));
     
     if(s_appMenu != nullptr)
     {
-        auto nativeMenu = dynamic_cast<AvnAppMenu*>(s_appMenu);
-        
         auto currentMenu = [s_appMenuItem menu];
         
         if (currentMenu != nullptr)
@@ -496,7 +500,7 @@ extern void SetAppMenu(IAvnMenu *menu)
             [currentMenu removeItem:s_appMenuItem];
         }
         
-        s_appMenuItem = [nativeMenu->GetNative() itemAtIndex:0];
+        s_appMenuItem = [s_appMenu->GetNative() itemAtIndex:0];
         
         if (currentMenu == nullptr)
         {
@@ -524,9 +528,9 @@ extern void SetServicesMenu (IAvnMenu* menu)
     [NSApplication sharedApplication].servicesMenu = nativeMenu->GetNative();
 }
 
-extern IAvnMenu* GetAppMenu ()
+extern AvnAppMenu* GetAppMenu ()
 {
-    return s_appMenu;
+    return s_appMenu.getRaw();
 }
 
 extern NSMenuItem* GetAppMenuItem ()
diff --git a/native/Avalonia.Native/src/OSX/metal.mm b/native/Avalonia.Native/src/OSX/metal.mm
index 517872b147..3da1282306 100644
--- a/native/Avalonia.Native/src/OSX/metal.mm
+++ b/native/Avalonia.Native/src/OSX/metal.mm
@@ -304,7 +304,7 @@ public:
     }
 };
 
-static AvnMetalDisplay* _display = new AvnMetalDisplay();
+static ComStaticPtr<AvnMetalDisplay> _display(comnew<AvnMetalDisplay>());
 
 extern IAvnMetalDisplay* GetMetalDisplay()
 {
diff --git a/nukebuild/Build.cs b/nukebuild/Build.cs
index 41c5cbe0cf..b9e27bdfcc 100644
--- a/nukebuild/Build.cs
+++ b/nukebuild/Build.cs
@@ -481,7 +481,7 @@ partial class Build : NukeBuild
                     .SetProperty("AvaloniaVersion", Parameters.Version)
                     .SetProperty("NuGetPackageRoot", nugetCacheDirectory)
                     .SetPackageDirectory(nugetCacheDirectory)
-                    .SetProjectFile(buildTestsDirectory / "BuildTests.sln")
+                    .SetProjectFile(buildTestsDirectory / "BuildTests.slnx")
                     .SetProcessAdditionalArguments("--nodeReuse:false"));
 
                 // Standard compilation - should have compiled XAML
diff --git a/nukebuild/_build.csproj b/nukebuild/_build.csproj
index c4d20ad4b7..c58a2b894b 100644
--- a/nukebuild/_build.csproj
+++ b/nukebuild/_build.csproj
@@ -7,11 +7,11 @@
     <NoWarn>$(NoWarn);CS0649;CA1847</NoWarn>
     <NukeTelemetryVersion>1</NukeTelemetryVersion>
     <TargetFramework>$(AvsCurrentTargetFramework)</TargetFramework>
+    <UseMicroComGenerator>true</UseMicroComGenerator>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Nuke.Common" />
-    <PackageReference Include="MicroCom.CodeGenerator" />
     <PackageReference Include="Numerge" />
     <!-- Keep in sync with Avalonia.Build.Tasks -->
     <PackageReference Include="Mono.Cecil" />
@@ -22,6 +22,8 @@
     <PackageDownload Include="dotnet-ilrepack" Version="[2.0.44]" />
   </ItemGroup>
 
+  <Import Project="..\build\MicroCOM.props" />
+
   <ItemGroup>
     <NukeMetadata Include="**\*.json" Exclude="bin\**;obj\**" />
     <NukeExternalFiles Include="**\*.*.ext" Exclude="bin\**;obj\**" />
diff --git a/readme.md b/readme.md
index 08fd014798..9ed6c59f90 100644
--- a/readme.md
+++ b/readme.md
@@ -1,10 +1,8 @@
 [![Star_Banner@3x](https://github.com/user-attachments/assets/d55eb468-fa5c-499f-858e-54618beb6f92)](https://github.com/sponsors/AvaloniaUI)
-[![Hero](https://github.com/user-attachments/assets/7436f0e7-8aea-4cff-886a-e2faef29ca37)](https://avaloniaui.net?utm_source=github&utm_medium=referral&utm_content=readme_link)
+[![Hero](https://github.com/user-attachments/assets/404db53f-f515-4a3a-bb18-f145dc34cedb)](https://avaloniaui.net?utm_source=github&utm_medium=referral&utm_content=readme_link)
 
-[![Telegram](https://raw.githubusercontent.com/Patrolavia/telegram-badge/master/chat.svg)](https://t.me/Avalonia)
- [![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://img.shields.io/opencollective/backers/Avalonia?logo=opencollective)](#backers) [![Sponsors on Open Collective](https://img.shields.io/opencollective/sponsors/Avalonia?logo=opencollective)](#sponsors) [![GitHub Sponsors](https://img.shields.io/github/sponsors/AvaloniaUI?logo=github)](https://github.com/sponsors/AvaloniaUI) ![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)  ![Size](https://img.shields.io/github/repo-size/avaloniaui/avalonia.svg) 
+ [![Build Status](https://dev.azure.com/AvaloniaUI/AvaloniaUI/_apis/build/status/AvaloniaUI.Avalonia)](https://dev.azure.com/AvaloniaUI/AvaloniaUI/_build/latest?definitionId=4) ![License](https://img.shields.io/github/license/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)
 
 ## 📖 About 
 
@@ -14,26 +12,33 @@ Considered by many to be the spiritual successor to WPF, Avalonia UI provides a
 
 For those seeking a cross-platform WPF, we have created [Avalonia XPF]([https://avaloniaui.net/xpf](https://avaloniaui.net/xpf?utm_source=github&utm_medium=referral&utm_content=readme_link)), enabling WPF applications to run on macOS and Linux with little to no code changes. Avalonia XPF is a commercial product and is licensed per-app, per-platform. 
 
-#### Blog
+### Blog
 To see the latest announcements and read about the state of Avalonia, check out the [Avalonia UI Blog](https://www.avaloniaui.net/blog?utm_source=github&utm_medium=referral&utm_content=readme_link).
 
-#### Breaking Changes
-You can also see what [breaking changes](https://github.com/AvaloniaUI/Avalonia/issues/3538) we have planned and what our [past breaking changes](https://github.com/AvaloniaUI/Avalonia/wiki/Breaking-Changes) have been. 
+### Sponsorship
+Avalonia development is supported by the generous sponsorship of [Devolutions](https://devolutions.net/?utm_source=pr&utm_medium=partnership&utm_campaign=avalonia&utm_id=C086&member_status=responded). 
 
-#### Awesome Avalonia
-[Awesome Avalonia](https://github.com/AvaloniaCommunity/awesome-avalonia) is community-curated list of awesome Avalonia UI tools, libraries, projects and resources. Go and see what people are building with Avalonia!
+<picture>
+  <source media="(prefers-color-scheme: dark)" srcset="https://github.com/user-attachments/assets/218a7077-6978-4c37-adc7-4a24bb0edcb9">
+  <source media="(prefers-color-scheme: light)" srcset="https://github.com/user-attachments/assets/597e3650-0b80-496e-84b2-db51fbe7e06e">
+<img alt="Devolutions Logo" src="https://github.com/user-attachments/assets/597e3650-0b80-496e-84b2-db51fbe7e06e" width="200" >
+</picture>
 
+--- 
 ## 🚀 Getting Started
 
-See our [Get Started](https://avaloniaui.net/gettingstarted?utm_source=github&utm_medium=referral&utm_content=readme_link) guide to begin developing apps with Avalonia UI. 
+See our [Get Started](https://docs.avaloniaui.net/docs/get-started?utm_source=github&utm_medium=referral&utm_content=readme_link) guide to begin developing apps with Avalonia UI. 
+
+### Visual Studio Code
+The [Avalonia for Code](https://marketplace.visualstudio.com/items?itemName=AvaloniaTeam.vscode-avalonia) extension gives you everything you need to build cross-platform .NET apps. XAML previewing, code completion, diagnostics, and code navigation, all inside the world's most popular editor. It's the fastest way to get started with Avalonia.
 
-### Visual Studio 
-The Avalonia [Visual Studio Extension](https://marketplace.visualstudio.com/items?itemName=AvaloniaTeam.AvaloniaVS) contains project and control templates that will help you get started, or you can use the .NET Core CLI. For a starter guide see our [documentation](https://docs.avaloniaui.net/docs/getting-started).
+### Visual Studio 2022 & 2026
+The Avalonia [Visual Studio Extension](https://marketplace.visualstudio.com/items?itemName=AvaloniaTeam.AvaloniaVS) contains project and control templates, a live XAML previewer, code completion, and full diagnostics directly into Visual Studio. 
 
 ### JetBrains Rider
-[JetBrains Rider](https://www.jetbrains.com/rider/whatsnew/?mkt_tok=eyJpIjoiTURBNU1HSmhNV0kwTUdFMiIsInQiOiJtNnU2VEc1TlNLa1ZRVkROYmdZYVpYREJsaU1qdUhmS3dxSzRHczdYWHl0RVlTNDMwSFwvNUs3VENTNVM0bVcyNFdaRmVYZzVWTTF1N3VrQWNGTkJreEhlam1hMlB4UVVWcHBGM1dNOUxoXC95YnRQdGgyUXl1YmZCM3h3d3BVWWdBIn0%3D#avalonia-support) now has official support for Avalonia.
+[JetBrains Rider](https://www.jetbrains.com/rider/whatsnew/?mkt_tok=eyJpIjoiTURBNU1HSmhNV0kwTUdFMiIsInQiOiJtNnU2VEc1TlNLa1ZRVkROYmdZYVpYREJsaU1qdUhmS3dxSzRHczdYWHl0RVlTNDMwSFwvNUs3VENTNVM0bVcyNFdaRmVYZzVWTTF1N3VrQWNGTkJreEhlam1hMlB4UVVWcHBGM1dNOUxoXC95YnRQdGgyUXl1YmZCM3h3d3BVWWdBIn0%3D#avalonia-support) supports for Avalonia.
 
-Code completion, inspections and refactorings are supported out of the box, for XAML previewer add `https://plugins.jetbrains.com/plugins/dev/14839` to plugin repositories and install [AvaloniaRider](https://github.com/ForNeVeR/AvaloniaRider) plugin.
+Code completion, inspections and refactorings are supported out of the box. To enable previewing XAML, you will require a 3rd party, community-maintained extension: `https://plugins.jetbrains.com/plugins/dev/14839` to plugin repositories and install [AvaloniaRider](https://github.com/ForNeVeR/AvaloniaRider) plugin.
 
 ### Avalonia Packages
 Avalonia is delivered via <b>NuGet</b> package manager. You can find the packages here: https://www.nuget.org/packages/Avalonia/
@@ -43,79 +48,58 @@ Use these commands in the Package Manager console to install Avalonia manually:
 Install-Package Avalonia
 Install-Package Avalonia.Desktop
 ```
-
-## Showcase
-[![Showcase_Banner@3x](https://github.com/user-attachments/assets/42d21506-3d5a-4213-a4b4-7889a48acdc8)](https://avaloniaui.net/showcase?utm_source=github&utm_medium=referral&utm_content=readme_link)
-
-See what others have built with Avalonia UI on our [Showcase](https://avaloniaui.net/showcase?utm_source=github&utm_medium=referral&utm_content=readme_link). We welcome submissions! 
-
-## Sponsors 
-Avalonia development is supported by the generous sponsorship of [Devolutions](https://devolutions.net/?utm_source=pr&utm_medium=partnership&utm_campaign=avalonia&utm_id=C086&member_status=responded). 
-
-<a href="https://devolutions.net/?utm_source=pr&utm_medium=partnership&utm_campaign=avalonia&utm_id=C086&member_status=responded"><img width="200" alt="devolutions-color-hr" src="https://github.com/user-attachments/assets/597e3650-0b80-496e-84b2-db51fbe7e06e"/></a>
-
-
-## Community 
-Join our community hub to get early access to upcoming features, share your thoughts, and connect directly with the Avalonia team. 
-[![communityannouncement-banner 1](https://github.com/user-attachments/assets/21950b56-cd28-4574-9a0a-73bb17b89d31)](https://avaloniaui.community) 
+---
 
 ## Bleeding Edge Builds
 
 We also have a [nightly build](https://github.com/AvaloniaUI/Avalonia/wiki/Using-nightly-build-feed) which tracks the current state of master. Although these packages are less stable than the release on NuGet.org, you'll get all the latest features and bugfixes right away and many of our users actually prefer this feed!
 
+---
 ## Learning
 
 ### Documentation 
 Documentation can be found at https://docs.avaloniaui.net. 
 
 ### Tutorials 
-We also have a [tutorial](https://docs.avaloniaui.net/docs/getting-started/programming-with-avalonia) over there for newcomers.
+We also have a [tutorial](https://docs.avaloniaui.net/docs/get-started/starter-tutorial) over there for newcomers.
 
 ### Samples
 We have a [range of samples](https://github.com/AvaloniaUI/Avalonia.Samples) to help you get started.
 
+### Breaking Changes
+You can also see what [breaking changes](https://docs.avaloniaui.net/docs/avalonia12-breaking-changes) between Avalonia 11 and Avalonia 12. 
+
+---
 ## Building and Using
 
 See the [build instructions here](docs/build.md).
 
+---
 ## Contributing
 
-This project exists thanks to all the people who contribute.
-<a href="https://github.com/AvaloniaUI/Avalonia/graphs/contributors"><img src="https://opencollective.com/Avalonia/contributors.svg?width=890&button=false" /></a>
-
-Please read the [contribution guidelines](CONTRIBUTING.md) before submitting a pull request.
+This project exists thanks to all the people who contribute. Please read the [contribution guidelines](CONTRIBUTING.md) before submitting a pull request.
 
-## Code of Conduct
+### Code of Conduct
 
 This project has adopted the code of conduct defined by the Contributor Covenant to clarify expected behavior in our community.
-For more information see the [Code of Conduct](CODE_OF_CONDUCT.md). 
+For more information, see the [Code of Conduct](CODE_OF_CONDUCT.md). 
 
-## Licence
-
-Avalonia is licenced under the [MIT licence](licence.md).
-
-## Donate
-
-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.  
+---
+## Security
 
-If you need support see Commercial Support section below.
+If you discover a security vulnerability in any of our SDKs, tools, services, or repositories, please help us keep the community safe by reporting it responsibly.
 
-Donate with BTC or use [Open Collective](https://opencollective.com/avalonia).
+You can report security vulnerabilities by emailing **[security@avaloniaui.net](mailto:security@avaloniaui.net)**.
 
-**BTC**: bc1q05wx78qemgy9x6ytl5ljk2xrt00yqargyjm8gx
+Please avoid disclosing the issue publicly until we have had a reasonable amount of time to investigate and release a patch or mitigation. We review all legitimate reports and will work with you to quickly resolve the issue.
 
-### Backers
+Please note that Avalonia does not operate a bug bounty programme.
 
-Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com/Avalonia#backer)]
-
-<a href="https://opencollective.com/Avalonia#backers" target="_blank"><img src="https://opencollective.com/Avalonia/backers.svg?width=890"></a>
-
-## Commercial Support 
-
-We have a range of [support plans available](https://avaloniaui.net/support?utm_source=github&utm_medium=referral&utm_content=readme_link) for those looking to partner with the creators of Avalonia, enabling access to the best support at every step of the development process.
+---
+## Licence
 
-*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)*
+Avalonia is licenced under the [MIT licence](licence.md).
 
-## Avalonia XPF - Our cross-platform WPF
+## XPF - cross-platform WPF
 Unleash the full potential of your existing WPF apps with our cross-platform UI framework, enabling WPF apps to run on macOS and Linux without requiring expensive and risky rewrites.
-[![GH_Banner](https://github.com/user-attachments/assets/a6176267-1187-45ff-b82b-fcc7048e54b7)](https://avaloniaui.net/xpf?utm_source=github&utm_medium=referral&utm_content=readme_ad)
+[![GH_Banner](https://github.com/user-attachments/assets/d0a3cb13-f35d-41dd-aec9-632fe848acb0)](https://avaloniaui.net/xpf?utm_source=github&utm_medium=referral&utm_content=readme_ad)
diff --git a/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj b/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj
index 73b983f788..22a091449f 100644
--- a/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj
+++ b/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj
@@ -5,6 +5,7 @@
     <TargetFramework>$(AvsCurrentTargetFramework)</TargetFramework>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <UseMicroCom>true</UseMicroCom>
   </PropertyGroup>
 
   <ItemGroup>
@@ -37,4 +38,5 @@
 
   <Import Project="..\..\build\SampleApp.props" />
   <Import Project="..\..\build\ReferenceCoreLibraries.props" />
+  <Import Project="..\..\build\MicroCOM.props" />
 </Project>
diff --git a/samples/ControlCatalog/App.xaml b/samples/ControlCatalog/App.xaml
index 179f64233e..6ab30cc180 100644
--- a/samples/ControlCatalog/App.xaml
+++ b/samples/ControlCatalog/App.xaml
@@ -8,7 +8,8 @@
     <ResourceDictionary>
       <!-- Custom controls defined in other assemblies -->
       <ResourceDictionary.MergedDictionaries>
-        <ResourceInclude Source="avares://ControlSamples/HamburgerMenu/HamburgerMenu.xaml" />
+        <ResourceInclude Source="avares://ControlCatalog/ScrollPage.xaml"/>
+        <ResourceInclude Source="avares://ControlCatalog/NavHeaderItem.xaml"/>
       </ResourceDictionary.MergedDictionaries>
 
       <!-- Resources used only in the control catalog -->
diff --git a/samples/ControlCatalog/App.xaml.cs b/samples/ControlCatalog/App.xaml.cs
index f14fbb1fa3..71e4113a3a 100644
--- a/samples/ControlCatalog/App.xaml.cs
+++ b/samples/ControlCatalog/App.xaml.cs
@@ -18,7 +18,7 @@ namespace ControlCatalog
         private FluentTheme? _fluentTheme;
         private SimpleTheme? _simpleTheme;
         private IStyle? _colorPickerFluent, _colorPickerSimple;
-        
+
         public App()
         {
             DataContext = new ApplicationViewModel();
@@ -34,7 +34,7 @@ namespace ControlCatalog
             _simpleTheme = (SimpleTheme)Resources["SimpleTheme"]!;
             _colorPickerFluent = (IStyle)Resources["ColorPickerFluent"]!;
             _colorPickerSimple = (IStyle)Resources["ColorPickerSimple"]!;
-            
+
             SetCatalogThemes(CatalogTheme.Fluent);
         }
 
@@ -44,16 +44,22 @@ namespace ControlCatalog
             {
                 desktopLifetime.MainWindow = new MainWindow { DataContext = new MainWindowViewModel() };
             }
-            else if(ApplicationLifetime is IActivityApplicationLifetime singleViewFactoryApplicationLifetime)
+            else if (ApplicationLifetime is IActivityApplicationLifetime singleViewFactoryApplicationLifetime)
             {
-                singleViewFactoryApplicationLifetime.MainViewFactory = () => new MainView { DataContext = new MainWindowViewModel() };
+                singleViewFactoryApplicationLifetime.MainViewFactory = () => new PageNavigationHost()
+                {
+                    Page = new MainView { DataContext = new MainWindowViewModel() }
+                };
             }
             else if (ApplicationLifetime is ISingleViewApplicationLifetime singleViewLifetime)
             {
-                singleViewLifetime.MainView = new MainView { DataContext = new MainWindowViewModel() };
+                singleViewLifetime.MainView = new PageNavigationHost()
+                {
+                    Page = new MainView { DataContext = new MainWindowViewModel() }
+                };
             }
 
-            if (this.TryGetFeature<IActivatableLifetime>() is {} activatableApplicationLifetime)
+            if (this.TryGetFeature<IActivatableLifetime>() is { } activatableApplicationLifetime)
             {
                 activatableApplicationLifetime.Activated += (sender, args) =>
                     Console.WriteLine($"App activated: {args.Kind}");
@@ -99,14 +105,14 @@ namespace ControlCatalog
         }
 
         private CatalogTheme _prevTheme;
-        public static CatalogTheme CurrentTheme => ((App)Current!)._prevTheme; 
+        public static CatalogTheme CurrentTheme => ((App)Current!)._prevTheme;
         public static void SetCatalogThemes(CatalogTheme theme)
         {
             var app = (App)Current!;
             var prevTheme = app._prevTheme;
             app._prevTheme = theme;
             var shouldReopenWindow = prevTheme != theme;
-            
+
             if (app._themeStylesContainer.Count == 0)
             {
                 app._themeStylesContainer.Add(new Style());
@@ -130,18 +136,27 @@ namespace ControlCatalog
                 if (app.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktopLifetime)
                 {
                     var oldWindow = desktopLifetime.MainWindow;
-                    var newWindow = new MainWindow();
+                    var newWindow = new MainWindow()
+                    {
+                        DataContext = new MainWindowViewModel()
+                    };
                     desktopLifetime.MainWindow = newWindow;
                     newWindow.Show();
                     oldWindow?.Close();
                 }
                 else if (app.ApplicationLifetime is IActivityApplicationLifetime singleViewFactoryApplicationLifetime)
                 {
-                    singleViewFactoryApplicationLifetime.MainViewFactory = () => new MainView { DataContext = new MainWindowViewModel() };
+                    singleViewFactoryApplicationLifetime.MainViewFactory = () => new PageNavigationHost()
+                    {
+                        Page = new MainView { DataContext = new MainWindowViewModel() }
+                    };
                 }
                 else if (app.ApplicationLifetime is ISingleViewApplicationLifetime singleViewLifetime)
                 {
-                    singleViewLifetime.MainView = new MainView();
+                    singleViewLifetime.MainView = new PageNavigationHost()
+                    {
+                        Page = new MainView { DataContext = new MainWindowViewModel() }
+                    };
                 }
             }
         }
diff --git a/samples/ControlCatalog/Assets/Icon.png b/samples/ControlCatalog/Assets/Icon.png
new file mode 100644
index 0000000000..41a2a618fb
Binary files /dev/null and b/samples/ControlCatalog/Assets/Icon.png differ
diff --git a/samples/ControlCatalog/ControlCatalog.csproj b/samples/ControlCatalog/ControlCatalog.csproj
index 2ce24a4d20..800793ca0b 100644
--- a/samples/ControlCatalog/ControlCatalog.csproj
+++ b/samples/ControlCatalog/ControlCatalog.csproj
@@ -14,6 +14,7 @@
     <AvaloniaResource Include="Assets\**\*" />
   </ItemGroup>
   <ItemGroup>
+    <None Remove="Assets\Icon.png" />
     <None Remove="Assets\image1.jpg" />
     <None Remove="Assets\image2.jpg" />
     <None Remove="Assets\image3.jpg" />
@@ -38,7 +39,12 @@
     <ProjectReference Include="..\..\src\Avalonia.Fonts.Inter\Avalonia.Fonts.Inter.csproj" />
     <ProjectReference Include="..\..\src\Skia\Avalonia.Skia\Avalonia.Skia.csproj" />
     <ProjectReference Include="..\MiniMvvm\MiniMvvm.csproj" />
-    <ProjectReference Include="..\SampleControls\ControlSamples.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <AvaloniaXaml Update="NavHeaderItem.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </AvaloniaXaml>
   </ItemGroup>
 
   <Import Project="..\..\build\BuildTargets.targets" />
diff --git a/samples/ControlCatalog/Icons.cs b/samples/ControlCatalog/Icons.cs
new file mode 100644
index 0000000000..58d0e0b7d4
--- /dev/null
+++ b/samples/ControlCatalog/Icons.cs
@@ -0,0 +1,194 @@
+namespace ControlCatalog
+{
+    internal static class Icons
+    {
+        // Layers/Composition
+        public const string Layers = "M12,16L19.36,10.27L21,9L12,2L3,9L4.63,10.27M12,18.54L4.62,12.81L3,14.07L12,21.07L21,14.07L19.37,12.8";
+
+        // Keyboard
+        public const string Keyboard = "M19,10H17V8H19M19,13H17V11H19M16,10H14V8H16M16,13H14V11H16M16,17H8V15H16M7,10H5V8H7M7,13H5V11H7M8,11H10V13H8M8,8H10V10H8M11,11H13V13H11M11,8H13V10H11M20,5H4C2.89,5 2,5.89 2,7V17A2,2 0 0,0 4,19H20A2,2 0 0,0 22,17V7C22,5.89 21.1,5 20,5Z";
+
+        // Blur/Acrylic
+        public const string Blur = "M14.5,10C16.43,10 18,8.43 18,6.5C18,4.57 16.43,3 14.5,3C12.57,3 11,4.57 11,6.5C11,8.43 12.57,10 14.5,10M14.5,4A2.5,2.5 0 0,1 17,6.5A2.5,2.5 0 0,1 14.5,9A2.5,2.5 0 0,1 12,6.5A2.5,2.5 0 0,1 14.5,4M8.5,14C10.43,14 12,12.43 12,10.5C12,8.57 10.43,7 8.5,7C6.57,7 5,8.57 5,10.5C5,12.43 6.57,14 8.5,14M8.5,8A2.5,2.5 0 0,1 11,10.5A2.5,2.5 0 0,1 8.5,13A2.5,2.5 0 0,1 6,10.5A2.5,2.5 0 0,1 8.5,8M14.5,16A4.5,4.5 0 0,0 10,20.5A4.5,4.5 0 0,0 14.5,25A4.5,4.5 0 0,0 19,20.5A4.5,4.5 0 0,0 14.5,16M14.5,24A3.5,3.5 0 0,1 11,20.5A3.5,3.5 0 0,1 14.5,17A3.5,3.5 0 0,1 18,20.5A3.5,3.5 0 0,1 14.5,24Z";
+
+        // Adorner/Sparkle
+        public const string Sparkle = "M12,1L9,9L1,12L9,15L12,23L15,15L23,12L15,9";
+
+        // Text/AutoComplete
+        public const string TextInput = "M20,21H4V3H20V21M6,9H14V7H6V9M6,13H18V11H6V13M6,17H14V15H6V17Z";
+
+        // Border/Square
+        public const string Border = "M4,4H20V20H4V4M6,8V6H8V8H6M6,12V10H8V12H6M6,16V14H8V16H6M6,20V18H8V20H6M10,20V18H12V20H10M14,20V18H16V20H14M18,20V18H20V20H18M18,16V14H20V16H18M18,12V10H20V12H18M18,8V6H20V8H18M14,8V6H16V8H14M10,8V6H12V8H10Z";
+
+        // Lightning/Cache
+        public const string Lightning = "M11,21H7L13,3H17L14,10H20L11,21Z";
+
+        // Cursor Click/Button
+        public const string CursorClick = "M10.76,8.69A0.76,0.76 0 0,0 10,9.45V20.9C10,21.32 10.34,21.66 10.76,21.66C10.95,21.66 11.11,21.6 11.24,21.5L13.15,19.95L14.81,23.57C14.94,23.84 15.21,24 15.5,24C15.62,24 15.74,23.97 15.85,23.92L17.28,23.26C17.69,23.07 17.86,22.59 17.66,22.17L16,18.54L18.44,18.19C18.87,18.13 19.1,17.73 18.91,17.37L12.1,8.89C11.95,8.76 11.79,8.69 10.76,8.69M15,10V8H20V10H15M13.83,4.76L16.66,1.93L18.07,3.34L15.24,6.17L13.83,4.76M10,0V5H8V0H10M3.93,14.66L6.76,11.83L8.17,13.24L5.34,16.07L3.93,14.66M3.93,3.34L5.34,1.93L8.17,4.76L6.76,6.17L3.93,3.34M7,10H2V8H7V10Z";
+
+        // Spinner/ButtonSpinner
+        public const string Spinner = "M12,4V2A10,10 0 0,0 2,12H4A8,8 0 0,1 12,4Z";
+
+        // Calendar
+        public const string Calendar = "M19,19H5V8H19M16,1V3H8V1H6V3H5C3.89,3 3,3.9 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V5C21,3.89 20.1,3 19,3H18V1M9,15H7V13H9V15M13,15H11V13H13V15M17,15H15V13H17V15M9,11H7V9H9V11M13,11H11V9H13V11M17,11H15V9H17V11Z";
+
+        // Canvas/Artboard
+        public const string Canvas = "M17.5,12A1.5,1.5 0 0,1 16,10.5A1.5,1.5 0 0,1 17.5,9A1.5,1.5 0 0,1 19,10.5A1.5,1.5 0 0,1 17.5,12M14.5,8A1.5,1.5 0 0,1 13,6.5A1.5,1.5 0 0,1 14.5,5A1.5,1.5 0 0,1 16,6.5A1.5,1.5 0 0,1 14.5,8M9.5,8A1.5,1.5 0 0,1 8,6.5A1.5,1.5 0 0,1 9.5,5A1.5,1.5 0 0,1 11,6.5A1.5,1.5 0 0,1 9.5,8M6.5,12A1.5,1.5 0 0,1 5,10.5A1.5,1.5 0 0,1 6.5,9A1.5,1.5 0 0,1 8,10.5A1.5,1.5 0 0,1 6.5,12M12,3A9,9 0 0,0 3,12A9,9 0 0,0 12,21A1.5,1.5 0 0,0 13.5,19.5C13.5,19.11 13.35,18.76 13.11,18.5C12.88,18.23 12.73,17.88 12.73,17.5A1.5,1.5 0 0,1 14.23,16H16A5,5 0 0,0 21,11C21,6.58 16.97,3 12,3Z";
+
+        // Command/Terminal
+        public const string Terminal = "M20,19V7H4V19H20M20,3A2,2 0 0,1 22,5V19A2,2 0 0,1 20,21H4A2,2 0 0,1 2,19V5C2,3.89 2.9,3 4,3H20M13,17V15H18V17H13M9.58,13L5.57,9H8.4L11.7,12.3C12.09,12.69 12.09,13.33 11.7,13.72L8.42,17H5.59L9.58,13Z";
+
+        // Slides/Carousel
+        public const string Slides = "M2,6H6V18H2V6M7,6H17V18H7V6M18,6H22V18H18V6Z";
+
+        // Checkbox
+        public const string Checkbox = "M19,3H5C3.89,3 3,3.89 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V5C21,3.89 20.1,3 19,3M10,17L5,12L6.41,10.58L10,14.17L17.59,6.58L19,8";
+
+        // Clipboard
+        public const string Clipboard = "M19,3H14.82C14.4,1.84 13.3,1 12,1C10.7,1 9.6,1.84 9.18,3H5A2,2 0 0,0 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V5A2,2 0 0,0 19,3M12,3A1,1 0 0,1 13,4A1,1 0 0,1 12,5A1,1 0 0,1 11,4A1,1 0 0,1 12,3";
+
+        // Palette/Color
+        public const string Palette = "M12,3A9,9 0 0,0 3,12A9,9 0 0,0 12,21A1.5,1.5 0 0,0 13.5,19.5C13.5,19.11 13.35,18.76 13.11,18.5C12.88,18.23 12.73,17.88 12.73,17.5A1.5,1.5 0 0,1 14.23,16H16A5,5 0 0,0 21,11C21,6.58 16.97,3 12,3M6.5,12A1.5,1.5 0 0,1 5,10.5A1.5,1.5 0 0,1 6.5,9A1.5,1.5 0 0,1 8,10.5A1.5,1.5 0 0,1 6.5,12M9.5,8A1.5,1.5 0 0,1 8,6.5A1.5,1.5 0 0,1 9.5,5A1.5,1.5 0 0,1 11,6.5A1.5,1.5 0 0,1 9.5,8M14.5,8A1.5,1.5 0 0,1 13,6.5A1.5,1.5 0 0,1 14.5,5A1.5,1.5 0 0,1 16,6.5A1.5,1.5 0 0,1 14.5,8M17.5,12A1.5,1.5 0 0,1 16,10.5A1.5,1.5 0 0,1 17.5,9A1.5,1.5 0 0,1 19,10.5A1.5,1.5 0 0,1 17.5,12Z";
+
+        // Dropdown/ComboBox
+        public const string Dropdown = "M7,10L12,15L17,10H7Z";
+
+        // Container/Box
+        public const string Container = "M2,2H8V4H16V2H22V8H20V16H22V22H16V20H8V22H2V16H4V8H2V2M16,8V6H8V8H6V16H8V18H16V16H18V8H16M4,4V6H6V4H4M18,4V6H20V4H18M4,18V20H6V18H4M18,18V20H20V18H18Z";
+
+        // Document/Page
+        public const string Document = "M14,2H6A2,2 0 0,0 4,4V20A2,2 0 0,0 6,22H18A2,2 0 0,0 20,20V8L14,2M18,20H6V4H13V9H18V20Z";
+
+        // Menu/Context
+        public const string Menu = "M3,6H21V8H3V6M3,11H21V13H3V11M3,16H21V18H3V16Z";
+
+        // Cursor/Pointer
+        public const string Cursor = "M13.64,21.97C13.14,22.21 12.54,22 12.31,21.5L10.13,16.76L7.62,18.78C7.45,18.92 7.24,19 7,19A1,1 0 0,1 6,18V3A1,1 0 0,1 7,2C7.24,2 7.47,2.09 7.64,2.23L7.65,2.22L19.14,11.86C19.57,12.22 19.39,12.92 18.83,13.03L14.83,13.78L17,18.5C17.24,19 17,19.59 16.5,19.83L13.64,21.97Z";
+
+        // Brush/Drawing
+        public const string Brush = "M20.71,4.63L19.37,3.29C19,2.9 18.35,2.9 17.96,3.29L9,12.25L11.75,15L20.71,6.04C21.1,5.65 21.1,5 20.71,4.63M7,14A3,3 0 0,0 4,17C4,18.31 2.84,19 2,19C2.92,20.22 4.5,21 6,21A4,4 0 0,0 10,17A3,3 0 0,0 7,14Z";
+
+        // Grid/Table
+        public const string Grid = "M10,4V8H14V4H10M16,4V8H20V4H16M16,10V14H20V10H16M16,16V20H20V16H16M14,20V16H10V20H14M8,20V16H4V20H8M8,14V10H4V14H8M8,8V4H4V8H8M10,14H14V10H10V14Z";
+
+        // Shield/Validation
+        public const string Shield = "M10,17L6,13L7.41,11.59L10,14.17L16.59,7.58L18,9M12,1L3,5V11C3,16.55 6.84,21.74 12,23C17.16,21.74 21,16.55 21,11V5L12,1Z";
+
+        // Clock
+        public const string Clock = "M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M16.2,16.2L11,13V7H12.5V12.2L17,14.9L16.2,16.2Z";
+
+        // Dialog/Message
+        public const string Dialog = "M20,2H4A2,2 0 0,0 2,4V22L6,18H20A2,2 0 0,0 22,16V4A2,2 0 0,0 20,2Z";
+
+        // DragDrop/Move
+        public const string DragDrop = "M13,6V11H18V7.75L22.25,12L18,16.25V13H13V18H16.25L12,22.25L7.75,18H11V13H6V16.25L1.75,12L6,7.75V11H11V6H7.75L12,1.75L16.25,6H13Z";
+
+        // Sidebar/Drawer
+        public const string Drawer = "M3,2H21A1,1 0 0,1 22,3V21A1,1 0 0,1 21,22H3A1,1 0 0,1 2,21V3A1,1 0 0,1 3,2M10,4V20H20V4H10M4,4V20H8V4H4Z";
+
+        // Expand
+        public const string Expand = "M10,21V19H6.41L10.91,14.5L9.5,13.09L5,17.59V14H3V21H10M14.5,10.91L19,6.41V10H21V3H14V5H17.59L13.09,9.5L14.5,10.91Z";
+
+        // Flyout/Popup
+        public const string Flyout = "M19,19H5V5H19M19,3H5A2,2 0 0,0 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V5A2,2 0 0,0 19,3M7,9H10V7H7V9M7,13H17V11H7V13M7,17H14V15H7V17Z";
+
+        // Target/Focus
+        public const string Target = "M12,8A4,4 0 0,0 8,12A4,4 0 0,0 12,16A4,4 0 0,0 16,12A4,4 0 0,0 12,8M3.05,13H1V11H3.05C3.5,6.83 6.83,3.5 11,3.05V1H13V3.05C17.17,3.5 20.5,6.83 20.95,11H23V13H20.95C20.5,17.17 17.17,20.5 13,20.95V23H11V20.95C6.83,20.5 3.5,17.17 3.05,13M12,5A7,7 0 0,0 5,12A7,7 0 0,0 12,19A7,7 0 0,0 19,12A7,7 0 0,0 12,5Z";
+
+        // Gesture/Touch
+        public const string Gesture = "M5,15A2,2 0 0,0 3,17V19H7V17A2,2 0 0,0 5,15M5,11A6,6 0 0,0 -1,17H1A4,4 0 0,1 5,13V11M5,7C0.03,7 -4,11.03 -4,16V17H-2V16C-2,12.13 1.13,9 5,9V7M20.5,9.5L12,18L8.5,14.5L7.08,15.91L12,20.84L21.92,10.91L20.5,9.5Z";
+
+        // Image/Photo
+        public const string Image = "M8.5,13.5L11,16.5L14.5,12L19,18H5M21,19V5C21,3.89 20.1,3 19,3H5A2,2 0 0,0 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19Z";
+
+        // Tag/Label
+        public const string Tag = "M5.5,7A1.5,1.5 0 0,1 4,5.5A1.5,1.5 0 0,1 5.5,4A1.5,1.5 0 0,1 7,5.5A1.5,1.5 0 0,1 5.5,7M21.41,11.58L12.41,2.58C12.05,2.22 11.55,2 11,2H4C2.89,2 2,2.89 2,4V11C2,11.55 2.22,12.05 2.59,12.41L11.58,21.41C11.95,21.77 12.45,22 13,22C13.55,22 14.05,21.77 14.41,21.41L21.41,14.41C21.78,14.05 22,13.55 22,13C22,12.45 21.77,11.95 21.41,11.58Z";
+
+        // Transform/Rotate
+        public const string Transform = "M16.89,15.5L18.31,16.89C19.21,15.73 19.76,14.39 19.93,13H17.91C17.77,13.87 17.43,14.72 16.89,15.5M13,17.9V19.92C14.39,19.75 15.74,19.21 16.9,18.31L15.46,16.87C14.71,17.41 13.87,17.76 13,17.9M19.93,11C19.76,9.61 19.21,8.27 18.31,7.11L16.89,8.53C17.43,9.28 17.77,10.13 17.91,11M15.55,5.55L11,1V5.07C7.06,5.56 4,8.92 4,12.95C4,17.18 7.32,20.56 11.46,20.93C11.64,20.95 11.82,20.97 12,20.97C12.18,20.97 12.36,20.95 12.54,20.93C12.69,20.92 12.83,20.89 13,20.87V18.9C12.82,18.92 12.65,18.95 12.47,18.95C12.32,18.96 12.16,18.97 12,18.97C8.42,18.97 5.53,16.12 5.53,12.58C5.53,9.36 7.88,6.67 11,6.15V10L15.55,5.55Z";
+
+        // List
+        public const string List = "M7,5H21V7H7V5M7,13V11H21V13H7M4,4.5A1.5,1.5 0 0,1 5.5,6A1.5,1.5 0 0,1 4,7.5A1.5,1.5 0 0,1 2.5,6A1.5,1.5 0 0,1 4,4.5M4,10.5A1.5,1.5 0 0,1 5.5,12A1.5,1.5 0 0,1 4,13.5A1.5,1.5 0 0,1 2.5,12A1.5,1.5 0 0,1 4,10.5M7,19V17H21V19H7M4,16.5A1.5,1.5 0 0,1 5.5,18A1.5,1.5 0 0,1 4,19.5A1.5,1.5 0 0,1 2.5,18A1.5,1.5 0 0,1 4,16.5Z";
+
+        // Bell/Notification
+        public const string Bell = "M21,19V20H3V19L5,17V11C5,7.9 7.03,5.17 10,4.29C10,4.19 10,4.1 10,4A2,2 0 0,1 12,2A2,2 0 0,1 14,4C14,4.1 14,4.19 14,4.29C16.97,5.17 19,7.9 19,11V17L21,19M14,21A2,2 0 0,1 12,23A2,2 0 0,1 10,21";
+
+        // Number/Hash
+        public const string Number = "M5.41,21L6.12,17H2.12L2.47,15H6.47L7.53,9H3.53L3.88,7H7.88L8.59,3H10.59L9.88,7H15.88L16.59,3H18.59L17.88,7H21.88L21.53,9H17.53L16.47,15H20.47L20.12,17H16.12L15.41,21H13.41L14.12,17H8.12L7.41,21H5.41M9.47,9L8.41,15H14.41L15.47,9H9.47Z";
+
+        // Cube/3D
+        public const string Cube = "M21,16.5C21,16.88 20.79,17.21 20.47,17.38L12.57,21.82C12.41,21.94 12.21,22 12,22C11.79,22 11.59,21.94 11.43,21.82L3.53,17.38C3.21,17.21 3,16.88 3,16.5V7.5C3,7.12 3.21,6.79 3.53,6.62L11.43,2.18C11.59,2.06 11.79,2 12,2C12.21,2 12.41,2.06 12.57,2.18L20.47,6.62C20.79,6.79 21,7.12 21,7.5V16.5M12,4.15L5,8.09V15.91L12,19.85L19,15.91V8.09L12,4.15Z";
+
+        // Dots/Pagination
+        public const string Dots = "M12,16A2,2 0 0,1 14,18A2,2 0 0,1 12,20A2,2 0 0,1 10,18A2,2 0 0,1 12,16M12,10A2,2 0 0,1 14,12A2,2 0 0,1 12,14A2,2 0 0,1 10,12A2,2 0 0,1 12,10M12,4A2,2 0 0,1 14,6A2,2 0 0,1 12,8A2,2 0 0,1 10,6A2,2 0 0,1 12,4Z";
+
+        // Info/Information
+        public const string Info = "M13,9H11V7H13M13,17H11V11H13M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z";
+
+        // Progress/Loading
+        public const string Progress = "M13,2.03V2.05L13,4.05C17.39,4.59 20.5,8.58 19.96,12.97C19.5,16.61 16.64,19.5 13,19.93V21.93C18.5,21.38 22.5,16.5 21.95,11C21.5,6.25 17.73,2.5 13,2.03M11,2.06C9.05,2.25 7.19,3 5.67,4.26L7.1,5.74C8.22,4.84 9.57,4.26 11,4.06V2.06M4.26,5.67C3,7.19 2.25,9.04 2.05,11H4.05C4.24,9.58 4.8,8.23 5.69,7.1L4.26,5.67M2.06,13C2.26,14.96 3.03,16.81 4.27,18.33L5.69,16.9C4.81,15.77 4.24,14.42 4.06,13H2.06M7.1,18.37L5.67,19.74C7.18,21 9.04,21.79 11,22V20C9.58,19.82 8.23,19.25 7.1,18.37Z";
+
+        // Radio
+        public const string Radio = "M12,20A8,8 0 0,1 4,12A8,8 0 0,1 12,4A8,8 0 0,1 20,12A8,8 0 0,1 12,20M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M12,7A5,5 0 0,0 7,12A5,5 0 0,0 12,17A5,5 0 0,0 17,12A5,5 0 0,0 12,7Z";
+
+        // Refresh
+        public const string Refresh = "M17.65,6.35C16.2,4.9 14.21,4 12,4A8,8 0 0,0 4,12A8,8 0 0,0 12,20C15.73,20 18.84,17.45 19.73,14H17.65C16.83,16.33 14.61,18 12,18A6,6 0 0,1 6,12A6,6 0 0,1 12,6C13.66,6 15.14,6.69 16.22,7.78L13,11H20V4L17.65,6.35Z";
+
+        // Layout/Grid
+        public const string Layout = "M19,11H13V5H19M19,19H13V13H19M11,11H5V5H11M11,19H5V13H11M3,3V21H21V3";
+
+        // Scroll
+        public const string Scroll = "M15,20H9V12H4.16L12,4.16L19.84,12H15V20Z";
+
+        // Slider/Tune
+        public const string Slider = "M7,5H21V7H7V5M7,13V11H21V13H7M4,4.5A1.5,1.5 0 0,1 5.5,6A1.5,1.5 0 0,1 4,7.5A1.5,1.5 0 0,1 2.5,6A1.5,1.5 0 0,1 4,4.5M4,10.5A1.5,1.5 0 0,1 5.5,12A1.5,1.5 0 0,1 4,13.5A1.5,1.5 0 0,1 2.5,12A1.5,1.5 0 0,1 4,10.5M7,19V17H21V19H7M4,16.5A1.5,1.5 0 0,1 5.5,18A1.5,1.5 0 0,1 4,19.5A1.5,1.5 0 0,1 2.5,18A1.5,1.5 0 0,1 4,16.5Z";
+
+        // Split/SplitView
+        public const string Split = "M18,4H6C4.89,4 4,4.89 4,6V18A2,2 0 0,0 6,20H18A2,2 0 0,0 20,18V6C20,4.89 19.1,4 18,4M18,6V18H13V6H18Z";
+
+        // Tab
+        public const string Tab = "M21,3H3C1.89,3 1,3.89 1,5V19A2,2 0 0,0 3,21H21C22.1,21 23,20.1 23,19V5C23,3.89 22.1,3 21,3M21,19H3V5H13V9H21V19Z";
+
+        // Theme/Palette
+        public const string Theme = "M12,18V6A6,6 0 0,1 18,12A6,6 0 0,1 12,18M20,15.31L23.31,12L20,8.69V4H15.31L12,0.69L8.69,4H4V8.69L0.69,12L4,15.31V20H8.69L12,23.31L15.31,20H20V15.31Z";
+
+        // Toggle/Switch
+        public const string Toggle = "M17,7H7A5,5 0 0,0 2,12A5,5 0 0,0 7,17H17A5,5 0 0,0 22,12A5,5 0 0,0 17,7M17,15A3,3 0 0,1 14,12A3,3 0 0,1 17,9A3,3 0 0,1 20,12A3,3 0 0,1 17,15Z";
+
+        // Tooltip/Info bubble
+        public const string Tooltip = "M4,2H20A2,2 0 0,1 22,4V16A2,2 0 0,1 20,18H13.9L10.2,21.71C10,21.9 9.75,22 9.5,22V22H9A1,1 0 0,1 8,21V18H4A2,2 0 0,1 2,16V4A2,2 0 0,1 4,2M11,15H13V13H11V15M11,11H13V5H11V11Z";
+
+        // Animation/Transition
+        public const string Transition = "M2,5.27L3.28,4L20,20.72L18.73,22L12.73,16H7V19L3,15L7,11V14H9.73L5,9.27V14H3V5.27M21,9L17,5V8H14V10H17V13L21,9M17,17V14H15V17H17Z";
+
+        // Tree/Hierarchy
+        public const string Tree = "M15,20A1,1 0 0,0 16,19V4H8V19A1,1 0 0,0 9,20H2V22H22V20H15Z";
+
+        // Viewbox/Resize
+        public const string Viewbox = "M5,15H3V19A2,2 0 0,0 5,21H9V19H5M5,5H9V3H5A2,2 0 0,0 3,5V9H5M19,3H15V5H19V9H21V5A2,2 0 0,0 19,3M19,19H15V21H19A2,2 0 0,0 21,19V15H19";
+
+        // Puzzle/Embed
+        public const string Puzzle = "M20.5,11H19V7C19,5.89 18.1,5 17,5H13V3.5A2.5,2.5 0 0,0 10.5,1A2.5,2.5 0 0,0 8,3.5V5H4A2,2 0 0,0 2,7V10.8H3.5C5.04,10.8 6.2,11.96 6.2,13.5C6.2,15.04 5.04,16.2 3.5,16.2H2V20A2,2 0 0,0 4,22H7.8V20.5C7.8,18.96 8.96,17.8 10.5,17.8C12.04,17.8 13.2,18.96 13.2,20.5V22H17A2,2 0 0,0 19,20V16H20.5A2.5,2.5 0 0,0 23,13.5A2.5,2.5 0 0,0 20.5,11Z";
+
+        // Window/Application
+        public const string Window = "M4,4H20V20H4V4M6,8V18H18V8H6Z";
+
+        // Header/Title
+        public const string Header = "M3,4H5V10H9V4H11V18H9V12H5V18H3V4M13,8H15.31L15.63,5H17.63L17.31,8H19.31L19.63,5H21.63L21.31,8H23V10H21.1L20.9,12H23V14H20.69L20.37,17H18.37L18.69,14H16.69L16.37,17H14.37L14.69,14H13V12H14.9L15.1,10H13V8M17.1,10L16.9,12H18.9L19.1,10H17.1Z";
+
+        // Monitor/Screen
+        public const string Monitor = "M21,16H3V4H21M21,2H3C1.89,2 1,2.89 1,4V16A2,2 0 0,0 3,18H10V20H8V22H16V20H14V18H21A2,2 0 0,0 23,16V4C23,2.89 22.1,2 21,2Z";
+
+        // Navigation/Compass
+        public const string Navigation = "M12,2L4.5,20.29L5.21,21L12,18L18.79,21L19.5,20.29L12,2Z";
+
+        // OpenGL/3D Box (same as Cube but outline variant)
+        public const string Cube3D = "M21,16.5C21,16.88 20.79,17.21 20.47,17.38L12.57,21.82C12.41,21.94 12.21,22 12,22C11.79,22 11.59,21.94 11.43,21.82L3.53,17.38C3.21,17.21 3,16.88 3,16.5V7.5C3,7.12 3.21,6.79 3.53,6.62L11.43,2.18C11.59,2.06 11.79,2 12,2C12.21,2 12.41,2.06 12.57,2.18L20.47,6.62C20.79,6.79 21,7.12 21,7.5V16.5M12,4.15L6.04,7.5L12,10.85L17.96,7.5L12,4.15M5,15.91L11,19.29V12.58L5,9.21V15.91M19,15.91V9.21L13,12.58V19.29L19,15.91Z";
+
+        // Horizontal dots/Pager
+        public const string HorizontalDots = "M16,12A2,2 0 0,1 18,10A2,2 0 0,1 20,12A2,2 0 0,1 18,14A2,2 0 0,1 16,12M10,12A2,2 0 0,1 12,10A2,2 0 0,1 14,12A2,2 0 0,1 12,14A2,2 0 0,1 10,12M4,12A2,2 0 0,1 6,10A2,2 0 0,1 8,12A2,2 0 0,1 6,14A2,2 0 0,1 4,12Z";
+
+        // Slider tune/adjust
+        public const string Tune = "M3,17V19H9V17H3M3,5V7H13V5H3M13,21V19H21V17H13V15H11V21H13M7,9V11H3V13H7V15H9V9H7M21,13V11H11V13H21M15,9H17V7H21V5H17V3H15V9Z";
+    }
+}
diff --git a/samples/ControlCatalog/MainView.xaml b/samples/ControlCatalog/MainView.xaml
index adea1b90fc..ea71773d13 100644
--- a/samples/ControlCatalog/MainView.xaml
+++ b/samples/ControlCatalog/MainView.xaml
@@ -1,312 +1,157 @@
-<UserControl x:Class="ControlCatalog.MainView"
-             xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="using:ControlCatalog"
-             xmlns:controls="using:ControlSamples"
-             xmlns:models="using:ControlCatalog.Models"
-             xmlns:pages="using:ControlCatalog.Pages"
-             xmlns:viewModels="using:ControlCatalog.ViewModels"
-             x:DataType="viewModels:MainWindowViewModel">
-  <Grid>
-    <Grid.Styles>
-      <Style Selector="TextBlock.h2">
-        <Setter Property="TextWrapping" Value="Wrap" />
-        <Setter Property="MaxWidth" Value="400" />
-        <Setter Property="HorizontalAlignment" Value="Left" />
-      </Style>
-    </Grid.Styles>
-    <controls:HamburgerMenu Name="Sidebar">
-      <TabItem Header="Composition">
-        <pages:CompositionPage />
-      </TabItem>
-      <TabItem Header="Accelerator">
-        <pages:AcceleratorPage />
-      </TabItem>
-      <TabItem Header="Acrylic">
-        <pages:AcrylicPage />
-      </TabItem>
-      <TabItem Header="AdornerLayer">
-        <pages:AdornerLayerPage />
-      </TabItem>
-      <TabItem Header="AutoCompleteBox">
-        <pages:AutoCompleteBoxPage />
-      </TabItem>
-      <TabItem Header="Border">
-        <pages:BorderPage />
-      </TabItem>
-      <TabItem Header="BitmapCache">
-        <pages:BitmapCachePage />
-      </TabItem>
-      <TabItem Header="Buttons">
-        <pages:ButtonsPage />
-      </TabItem>
-      <TabItem Header="ButtonSpinner">
-        <pages:ButtonSpinnerPage />
-      </TabItem>
-      <TabItem Header="Calendar">
-        <pages:CalendarPage />
-      </TabItem>
-      <TabItem Header="Canvas">
-        <pages:CanvasPage />
-      </TabItem>
-      <TabItem Header="CommandBar"
-               ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-               ScrollViewer.VerticalScrollBarVisibility="Disabled">
-        <pages:CommandBarPage />
-      </TabItem>
-      <TabItem Header="Carousel"
-               ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-               ScrollViewer.VerticalScrollBarVisibility="Disabled">
-        <pages:CarouselDemoPage />
-      </TabItem>
-      <TabItem Header="CarouselPage"
-               ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-               ScrollViewer.VerticalScrollBarVisibility="Disabled">
-        <pages:CarouselDemoPage />
-      </TabItem>
+<DrawerPage x:Class="ControlCatalog.MainView"
+            xmlns="https://github.com/avaloniaui"
+            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+            xmlns:local="using:ControlCatalog"
+            xmlns:controls="using:ControlSamples"
+            xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+            xmlns:models="using:ControlCatalog.Models"
+            xmlns:pages="using:ControlCatalog.Pages"
+            xmlns:viewModels="using:ControlCatalog.ViewModels"
+            d:DesignWidth="1200"
+            d:DesignHeight="720"
+            x:DataType="viewModels:MainWindowViewModel"
+            DrawerLayoutBehavior="Split"
+            IsOpen="{Binding IsDrawerOpened , Mode=TwoWay}"
+            DisplayMode="{Binding DisplayMode, Mode=TwoWay}"
+            DrawerLength="260"
+            CompactDrawerLength="52"
+            DrawerFooter="{Binding}"
+            Drawer="{Binding}"
+            DrawerHeader="{Binding}">
+  <Design.DataContext>
+    <viewModels:MainWindowViewModel/>
+  </Design.DataContext>
+  <DrawerPage.Resources>
+    <ResourceDictionary>
+      <x:Double x:Key="TabbedPageTabItemHeaderFontSize">20</x:Double>
+      <Thickness x:Key="TabbedPageTabStripPadding">10</Thickness>
+    </ResourceDictionary>
+  </DrawerPage.Resources>
+  <DrawerPage.Styles>
+    <Style Selector="TextBlock.h2">
+      <Setter Property="TextWrapping" Value="Wrap" />
+      <Setter Property="MaxWidth" Value="400" />
+      <Setter Property="HorizontalAlignment" Value="Left" />
+    </Style>
+  </DrawerPage.Styles>
+  <DrawerPage.DrawerTemplate>
+    <DataTemplate x:DataType="viewModels:MainWindowViewModel">
+      <ListBox ItemsSource="{Binding Pages}"
+               Padding="0,10,0,10"
+               Background="Transparent"
+               ItemContainerTheme="{StaticResource NavHeaderItem}"
+               SelectedIndex="{Binding SelectedPageIndex}">
+        <ListBox.ItemTemplate>
+          <DataTemplate x:DataType="viewModels:PageItem">
+            <Grid ColumnDefinitions="20,*">
+              <PathIcon Grid.Column="0" Width="16" Height="16"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Data="{Binding IconData}"/>
+              <TextBlock Grid.Column="1" Text="{Binding Header}"
+                         VerticalAlignment="Center"
+                         Margin="12,0,0,0"
+                         TextTrimming="CharacterEllipsis"/>
+            </Grid>
+          </DataTemplate>
+        </ListBox.ItemTemplate>
+      </ListBox>
+    </DataTemplate>
+  </DrawerPage.DrawerTemplate>
+  <DrawerPage.DrawerHeaderTemplate>
+    <DataTemplate x:DataType="viewModels:MainWindowViewModel">
+      <DockPanel LastChildFill="True" Margin="6">
+        <TextBox Name="SearchBox"
+                 DockPanel.Dock="Bottom"
+                 PlaceholderText="Search..."
+                 Text="{Binding Query, Mode=TwoWay}"
+                 Margin="4,0,8,4"
+                 VerticalContentAlignment="Center"
+                 IsVisible="{Binding IsDrawerOpened}">
+          <TextBox.InnerLeftContent>
+            <PathIcon Width="14" Height="14" Margin="6,0,0,0"
+                      VerticalAlignment="Center"
+                      Data="M10 2.5a7.5 7.5 0 0 1 5.964 12.048l4.743 4.745a1 1 0 0 1-1.32 1.497l-.094-.083-4.745-4.743A7.5 7.5 0 1 1 10 2.5Zm0 2a5.5 5.5 0 1 0 0 11 5.5 5.5 0 0 0 0-11Z" />
+          </TextBox.InnerLeftContent>
+        </TextBox>
+        <Border HorizontalAlignment="Stretch" Padding="10">
+          <Image Source="/Assets/Icon.png" VerticalAlignment="Center"
+                 HorizontalAlignment="Center"
+                 MaxHeight="120"
+                 Stretch="Uniform"/>
+        </Border>
+      </DockPanel>
+    </DataTemplate>
+  </DrawerPage.DrawerHeaderTemplate>
+  <DrawerPage.DrawerFooterTemplate>
+    <DataTemplate x:DataType="viewModels:MainWindowViewModel">
+      <Expander HorizontalAlignment="Stretch"
+                HorizontalContentAlignment="Stretch"
+                Header="Settings"
+                Margin="0"
+                BorderThickness="0"
+                ExpandDirection="Up">
+        <StackPanel Width="152" Spacing="8">
+          <ComboBox x:Name="Decorations"
+                    HorizontalAlignment="Stretch"
+                    SelectedIndex="{Binding SelectedDecorationIndex}"
+                    SelectionChanged="Decorations_SelectionChanged"
+                    ToolTip.Tip="System Decorations">
+            <ComboBox.Items>
+              <WindowDecorations>None</WindowDecorations>
+              <WindowDecorations>BorderOnly</WindowDecorations>
+              <WindowDecorations>Full</WindowDecorations>
+            </ComboBox.Items>
+          </ComboBox>
+          <ComboBox HorizontalAlignment="Stretch"
+                    DisplayMemberBinding="{Binding Key, x:DataType=ThemeVariant}"
+                    SelectedIndex="0"
+                    SelectionChanged="ThemeVariants_SelectionChanged"
+                    ToolTip.Tip="Theme Variant">
+            <ComboBox.Items>
+              <ThemeVariant>Default</ThemeVariant>
+              <ThemeVariant>Light</ThemeVariant>
+              <ThemeVariant>Dark</ThemeVariant>
+            </ComboBox.Items>
+          </ComboBox>
+          <ComboBox HorizontalAlignment="Stretch"
+                    SelectedItem="{x:Static local:App.CurrentTheme}"
+                    SelectionChanged="Themes_SelectionChanged"
+                    ToolTip.Tip="Catalog Theme">
+            <ComboBox.Items>
+              <models:CatalogTheme>Fluent</models:CatalogTheme>
+              <models:CatalogTheme>Simple</models:CatalogTheme>
+            </ComboBox.Items>
+          </ComboBox>
+          <ComboBox HorizontalAlignment="Stretch"
+                    SelectedIndex="0"
+                    SelectionChanged="TransparencyLevels_SelectionChanged"
+                    ToolTip.Tip="Window Transparency Level">
+            <ComboBox.Items>
+              <WindowTransparencyLevel>None</WindowTransparencyLevel>
+              <WindowTransparencyLevel>Transparent</WindowTransparencyLevel>
+              <WindowTransparencyLevel>Blur</WindowTransparencyLevel>
+              <WindowTransparencyLevel>AcrylicBlur</WindowTransparencyLevel>
+              <WindowTransparencyLevel>Mica</WindowTransparencyLevel>
+            </ComboBox.Items>
+          </ComboBox>
+          <ComboBox HorizontalAlignment="Stretch"
+                    SelectedIndex="0"
+                    SelectionChanged="FlowDirection_SelectionChanged"
+                    ToolTip.Tip="Flow Direction">
+            <ComboBox.Items>
+              <FlowDirection>LeftToRight</FlowDirection>
+              <FlowDirection>RightToLeft</FlowDirection>
+            </ComboBox.Items>
+          </ComboBox>
+          <ComboBox HorizontalAlignment="Stretch"
+                    ItemsSource="{Binding WindowStates}"
+                    SelectedItem="{Binding WindowState}"
+                    ToolTip.Tip="Window State"/>
+        </StackPanel>
+      </Expander>
+    </DataTemplate>
+  </DrawerPage.DrawerFooterTemplate>
 
-      <TabItem Header="CheckBox">
-        <pages:CheckBoxPage />
-      </TabItem>
-      <TabItem Header="Clipboard">
-        <pages:ClipboardPage />
-      </TabItem>
-      <TabItem Header="ColorPicker">
-        <pages:ColorPickerPage />
-      </TabItem>
-      <TabItem Header="ComboBox">
-        <pages:ComboBoxPage />
-      </TabItem>
-      <TabItem Header="Container Queries">
-        <pages:ContainerQueryPage />
-      </TabItem>
-      <TabItem Header="ContentPage"
-               ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-               ScrollViewer.VerticalScrollBarVisibility="Disabled">
-        <pages:ContentDemoPage />
-      </TabItem>
-      <TabItem Header="ContextFlyout">
-        <pages:ContextFlyoutPage />
-      </TabItem>
-      <TabItem Header="ContextMenu">
-        <pages:ContextMenuPage />
-      </TabItem>
-      <TabItem Header="Cursor" ScrollViewer.VerticalScrollBarVisibility="Disabled">
-        <pages:CursorPage />
-      </TabItem>
-      <TabItem Header="Custom Drawing" ScrollViewer.VerticalScrollBarVisibility="Disabled">
-        <pages:CustomDrawing />
-      </TabItem>
-      <TabItem Header="DataGrid"
-               ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-               ScrollViewer.VerticalScrollBarVisibility="Disabled">
-        <pages:DataGridPage />
-      </TabItem>
-      <TabItem Header="Data Validation">
-        <pages:DataValidationPage />
-      </TabItem>
-      <TabItem Header="Date/Time Picker">
-        <pages:DateTimePickerPage />
-      </TabItem>
-      <TabItem Header="CalendarDatePicker">
-        <pages:CalendarDatePickerPage />
-      </TabItem>
-      <TabItem Header="Dialogs">
-        <pages:DialogsPage />
-      </TabItem>
-      <TabItem Header="Drag+Drop">
-        <pages:DragAndDropPage />
-      </TabItem>
-      <TabItem Header="DrawerPage"
-               ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-               ScrollViewer.VerticalScrollBarVisibility="Disabled">
-        <pages:DrawerDemoPage />
-      </TabItem>
-      <TabItem Header="Expander">
-        <pages:ExpanderPage />
-      </TabItem>
-      <TabItem Header="Flyouts">
-        <pages:FlyoutsPage />
-      </TabItem>
-      <TabItem Header="Focus">
-        <pages:FocusPage />
-      </TabItem>
-      <TabItem Header="Gestures">
-        <pages:GesturePage />
-      </TabItem>
-      <TabItem Header="Image"
-               ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-               ScrollViewer.VerticalScrollBarVisibility="Disabled">
-        <pages:ImagePage />
-      </TabItem>
-      <TabItem Header="Label">
-        <pages:LabelsPage />
-      </TabItem>
-      <TabItem Header="LayoutTransformControl">
-        <pages:LayoutTransformControlPage />
-      </TabItem>
-      <TabItem Header="ListBox" ScrollViewer.VerticalScrollBarVisibility="Disabled">
-        <pages:ListBoxPage />
-      </TabItem>
-      <TabItem Header="Menu">
-        <pages:MenuPage />
-      </TabItem>
-      <TabItem Header="NavigationPage"
-               ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-               ScrollViewer.VerticalScrollBarVisibility="Disabled">
-        <pages:NavigationDemoPage />
-      </TabItem>
-      <TabItem Header="Notifications">
-        <pages:NotificationsPage />
-      </TabItem>
-      <TabItem Header="NumericUpDown">
-        <pages:NumericUpDownPage />
-      </TabItem>
-      <TabItem Header="OpenGL">
-        <pages:OpenGlPage />
-      </TabItem>
-      <TabItem Header="OpenGL Lease">
-        <pages:OpenGlLeasePage />
-      </TabItem>
-      <TabItem Header="PipsPager">
-        <pages:PipsPagerPage />
-      </TabItem>
-      <TabItem Header="Platform Information">
-        <pages:PlatformInfoPage />
-      </TabItem>
-      <TabItem Header="Pointers">
-        <pages:PointersPage />
-      </TabItem>
-      <TabItem Header="ProgressBar">
-        <pages:ProgressBarPage />
-      </TabItem>
-      <TabItem Header="RadioButton">
-        <pages:RadioButtonPage />
-      </TabItem>
-      <TabItem Header="RefreshContainer">
-        <pages:RefreshContainerPage />
-      </TabItem>
-      <TabItem Header="RelativePanel">
-        <pages:RelativePanelPage />
-      </TabItem>
-      <TabItem Header="ScrollViewer">
-        <pages:ScrollViewerPage />
-      </TabItem>
-      <TabItem Header="Slider">
-        <pages:SliderPage />
-      </TabItem>
-      <TabItem Header="SplitView">
-        <pages:SplitViewPage />
-      </TabItem>
-      <TabItem Header="TabbedPage"
-               ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-               ScrollViewer.VerticalScrollBarVisibility="Disabled">
-        <pages:TabbedDemoPage />
-      </TabItem>
-      <TabItem Header="TabControl">
-        <pages:TabControlPage />
-      </TabItem>
-      <TabItem Header="TabStrip">
-        <pages:TabStripPage />
-      </TabItem>
-      <TabItem Header="TextBox">
-        <pages:TextBoxPage />
-      </TabItem>
-      <TabItem Header="TextBlock">
-        <pages:TextBlockPage />
-      </TabItem>
-      <TabItem Header="Theme Variants">
-        <pages:ThemePage />
-      </TabItem>
-      <TabItem Header="ToggleSwitch">
-        <pages:ToggleSwitchPage />
-      </TabItem>
-      <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>
-      <TabItem Header="HeaderedContentControl">
-        <pages:HeaderedContentPage />
-      </TabItem>
-      <TabItem Header="Screens">
-        <pages:ScreenPage />
-      </TabItem>
-      <FlyoutBase.AttachedFlyout>
-        <Flyout>
-          <StackPanel Width="152" Spacing="8">
-            <ComboBox x:Name="Decorations"
-                      HorizontalAlignment="Stretch"
-                      SelectedIndex="0"
-                      SelectionChanged="Decorations_SelectionChanged"
-                      ToolTip.Tip="System Decorations">
-              <ComboBox.Items>
-                <WindowDecorations>None</WindowDecorations>
-                <WindowDecorations>BorderOnly</WindowDecorations>
-                <WindowDecorations>Full</WindowDecorations>
-              </ComboBox.Items>
-            </ComboBox>
-            <ComboBox HorizontalAlignment="Stretch"
-                      DisplayMemberBinding="{Binding Key, x:DataType=ThemeVariant}"
-                      SelectedIndex="0"
-                      SelectionChanged="ThemeVariants_SelectionChanged"
-                      ToolTip.Tip="Theme Variant">
-              <ComboBox.Items>
-                <ThemeVariant>Default</ThemeVariant>
-                <ThemeVariant>Light</ThemeVariant>
-                <ThemeVariant>Dark</ThemeVariant>
-              </ComboBox.Items>
-            </ComboBox>
-            <ComboBox HorizontalAlignment="Stretch"
-                      SelectedItem="{x:Static local:App.CurrentTheme}"
-                      SelectionChanged="Themes_SelectionChanged"
-                      ToolTip.Tip="Catalog Theme">
-              <ComboBox.Items>
-                <models:CatalogTheme>Fluent</models:CatalogTheme>
-                <models:CatalogTheme>Simple</models:CatalogTheme>
-              </ComboBox.Items>
-            </ComboBox>
-            <ComboBox HorizontalAlignment="Stretch"
-                      SelectedIndex="0"
-                      SelectionChanged="TransparencyLevels_SelectionChanged"
-                      ToolTip.Tip="Window Transparency Level">
-              <ComboBox.Items>
-                <WindowTransparencyLevel>None</WindowTransparencyLevel>
-                <WindowTransparencyLevel>Transparent</WindowTransparencyLevel>
-                <WindowTransparencyLevel>Blur</WindowTransparencyLevel>
-                <WindowTransparencyLevel>AcrylicBlur</WindowTransparencyLevel>
-                <WindowTransparencyLevel>Mica</WindowTransparencyLevel>
-              </ComboBox.Items>
-            </ComboBox>
-            <ComboBox HorizontalAlignment="Stretch"
-                      SelectedIndex="0"
-                      SelectionChanged="FlowDirection_SelectionChanged"
-                      ToolTip.Tip="Flow Direction">
-              <ComboBox.Items>
-                <FlowDirection>LeftToRight</FlowDirection>
-                <FlowDirection>RightToLeft</FlowDirection>
-              </ComboBox.Items>
-            </ComboBox>
-            <ComboBox HorizontalAlignment="Stretch"
-                      ItemsSource="{Binding WindowStates}"
-                      SelectedItem="{Binding WindowState}"
-                      ToolTip.Tip="Window State"/>
-          </StackPanel>
-        </Flyout>
-      </FlyoutBase.AttachedFlyout>
-    </controls:HamburgerMenu>
-  </Grid>
-</UserControl>
+  <NavigationPage Name="NavPage"/>
+</DrawerPage>
diff --git a/samples/ControlCatalog/MainView.xaml.cs b/samples/ControlCatalog/MainView.xaml.cs
index 82172a8ec4..5ad85da149 100644
--- a/samples/ControlCatalog/MainView.xaml.cs
+++ b/samples/ControlCatalog/MainView.xaml.cs
@@ -10,13 +10,80 @@ using ControlCatalog.ViewModels;
 
 namespace ControlCatalog
 {
-    public partial class MainView : UserControl
+    public partial class MainView : DrawerPage
     {
         private Action? _disposeTransparencySetters;
 
         public MainView()
         {
             InitializeComponent();
+
+            Loaded += MainView_Loaded;
+            Unloaded += MainView_Unloaded;
+        }
+
+        private const double WideBreakpoint = 1008;
+        private const double NarrowBreakpoint = 640;
+
+        private void MainView_Loaded(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
+        {
+            if (DataContext == null)
+                return;
+
+            SizeChanged += OnDrawerSizeChanged;
+            UpdateAdaptiveLayout();
+        }
+
+        private void MainView_Unloaded(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
+        {
+            SizeChanged -= OnDrawerSizeChanged;
+            _lastAppliedMode = null;
+        }
+
+        private SplitViewDisplayMode? _lastAppliedMode;
+        private bool _updatingLayout;
+
+        private void OnDrawerSizeChanged(object? sender, SizeChangedEventArgs e)
+        {
+            if (e.WidthChanged)
+                UpdateAdaptiveLayout();
+        }
+
+        private void UpdateAdaptiveLayout()
+        {
+            if (_updatingLayout || DataContext == null)
+                return;
+
+            var width = Bounds.Width;
+            if (width <= 0)
+                return;
+
+            SplitViewDisplayMode targetMode;
+            if (width >= WideBreakpoint)
+                targetMode = SplitViewDisplayMode.Inline;
+            else if (width >= NarrowBreakpoint)
+                targetMode = SplitViewDisplayMode.CompactInline;
+            else
+                targetMode = SplitViewDisplayMode.Overlay;
+
+            if (_lastAppliedMode == targetMode)
+                return;
+
+            _updatingLayout = true;
+            try
+            {
+                _lastAppliedMode = targetMode;
+                ViewModel.DisplayMode = targetMode;
+
+                if (targetMode == SplitViewDisplayMode.Inline)
+                    ViewModel.IsDrawerOpened = true;
+                else if (targetMode == SplitViewDisplayMode.Overlay)
+                    ViewModel.IsDrawerOpened = false;
+            }
+            finally
+            {
+                _updatingLayout = false;
+            }
         }
 
         private void Themes_SelectionChanged(object? sender, SelectionChangedEventArgs e)
@@ -66,22 +133,38 @@ namespace ControlCatalog
                     var semiTransparentBrush = new ImmutableSolidColorBrush(Colors.Gray, 0.2);
                     _disposeTransparencySetters =
                         (Action)topLevel.SetValue(BackgroundProperty, transparentBrush, Avalonia.Data.BindingPriority.Style)!.Dispose +
-                        Sidebar.SetValue(BackgroundProperty, semiTransparentBrush, Avalonia.Data.BindingPriority.Style)!.Dispose +
-                        Sidebar.SetValue(SplitView.PaneBackgroundProperty, semiTransparentBrush, Avalonia.Data.BindingPriority.Style)!.Dispose;
+                        SetValue(BackgroundProperty, semiTransparentBrush, Avalonia.Data.BindingPriority.Style)!.Dispose +
+                        SetValue(DrawerPage.DrawerBackgroundProperty, semiTransparentBrush, Avalonia.Data.BindingPriority.Style)!.Dispose;
                 }
             }
         }
 
+        protected override void OnDataContextChanged(EventArgs e)
+        {
+            base.OnDataContextChanged(e);
+
+            if (ViewModel != null)
+            {
+                ViewModel.Navigator = NavPage;
+            }
+        }
+
         internal MainWindowViewModel ViewModel => (MainWindowViewModel)DataContext!;
 
         protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
         {
             base.OnAttachedToVisualTree(e);
 
-            if (TopLevel.GetTopLevel(this) is Window window)
-                Decorations.SelectedIndex = (int)window.WindowDecorations;
+            if (DataContext == null)
+                return;
 
-            var insets = TopLevel.GetTopLevel(this)!.InsetsManager;
+            UpdateAdaptiveLayout();
+
+            var topLevel = TopLevel.GetTopLevel(this)!;
+            if (topLevel is Window window)
+                ViewModel.SelectedDecorationIndex = (int)window.WindowDecorations;
+
+            var insets = topLevel.InsetsManager;
             if (insets != null)
             {
                 // In real life application these events should be unsubscribed to avoid memory leaks.
@@ -111,6 +194,8 @@ namespace ControlCatalog
                     ViewModel.IsSystemBarVisible = insets.IsSystemBarVisible ?? true;
                 };
             }
+
+            ViewModel.SelectedPageIndex = 0;
         }
     }
 }
diff --git a/samples/ControlCatalog/NavHeaderItem.xaml b/samples/ControlCatalog/NavHeaderItem.xaml
new file mode 100644
index 0000000000..6867661ebb
--- /dev/null
+++ b/samples/ControlCatalog/NavHeaderItem.xaml
@@ -0,0 +1,101 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="using:ControlCatalog">
+  
+
+  <ResourceDictionary.ThemeDictionaries>
+    <ResourceDictionary x:Key="Dark">
+      <Color x:Key="HamburgerBaseHighColor">#99FFFFFF</Color>
+      <Color x:Key="HamburgerChromeMediumColor">#FF1F1F1F</Color>
+      <Color x:Key="HamburgerAltHighColor">#FF000000</Color>
+      <Color x:Key="HamburgerChromeLowColor">#FF171717</Color>
+    </ResourceDictionary>
+    <ResourceDictionary x:Key="Default">
+      <Color x:Key="HamburgerBaseHighColor">#99000000</Color>
+      <Color x:Key="HamburgerChromeMediumColor">#FFE6E6E6</Color>
+      <Color x:Key="HamburgerAltHighColor">#FFFFFFFF</Color>
+      <Color x:Key="HamburgerChromeLowColor">#FFF2F2F2</Color>
+    </ResourceDictionary>
+  </ResourceDictionary.ThemeDictionaries> 
+  <x:Double x:Key="NavigationItemHeight">36</x:Double>
+  <BoxShadows x:Key="NavigationItemShadow">1 1 1 1 #2000, 0 0 1 1 #2fff</BoxShadows>
+  <Design.PreviewWith>
+    <Border Padding="0">
+      <ListBox ItemContainerTheme="{StaticResource NavHeaderItem}">
+        <ListBoxItem IsEnabled="False">Disabled</ListBoxItem>
+        <ListBoxItem>
+          Test
+        </ListBoxItem>
+        <ListBoxItem>Test</ListBoxItem>
+      </ListBox>
+    </Border>
+  </Design.PreviewWith>
+  <ControlTheme x:Key="NavHeaderItem" TargetType="ListBoxItem">
+    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="HorizontalAlignment" Value="Stretch" />
+    <Setter Property="VerticalAlignment" Value="Stretch" />
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="Height" Value="{StaticResource NavigationItemHeight}" />
+    <Setter Property="Padding" Value="14,0,4,0" />
+    <Setter Property="Margin" Value="4,2,8,0" />
+    <Setter Property="CornerRadius" Value="8" />
+    <Setter Property="ClipToBounds" Value="False" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Name="PART_LayoutRoot"
+                HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <Panel>
+            <Border Name="PART_SelectedPipe"
+                    Width="{DynamicResource TabItemPipeThickness}"
+                    Height="{DynamicResource TabItemVerticalPipeHeight}"
+                    Margin="6,0,0,0"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    Background="{DynamicResource TabItemHeaderSelectedPipeFill}"
+                    IsVisible="False"
+                    CornerRadius="4"/>
+            <ContentPresenter Name="PART_ContentPresenter"
+                              Padding="{TemplateBinding Padding}"
+                              Margin="0"
+                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                              Content="{TemplateBinding Content}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                              TextElement.FontFamily="{TemplateBinding FontFamily}"
+                              TextElement.FontSize="{TemplateBinding FontSize}"
+                              TextElement.FontWeight="{TemplateBinding FontWeight}" />
+          </Panel>
+        </Border>
+      </ControlTemplate>
+    </Setter>    
+
+    <Style Selector="^:pointerover">
+      <Setter Property="Background" Value="{DynamicResource ThemeControlHighlightMidBrush}"/>
+
+      <Style Selector="^ /template/ Border#PART_LayoutRoot">
+        <Setter Property="Background" Value="{DynamicResource HamburgerChromeLowColor}" />
+        <Setter Property="BoxShadow" Value="{StaticResource NavigationItemShadow}" />
+        <Setter Property="TextElement.Foreground" Value="{DynamicResource HamburgerBaseHighColor}" />
+      </Style>
+    </Style>
+
+    <Style Selector="^:selected">
+      <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush4}"/>
+
+      <Style Selector="^ /template/ Border#PART_SelectedPipe">
+        <Setter Property="IsVisible" Value="True" />
+      </Style>
+    </Style>
+
+    <Style Selector="^:pressed /template/ Border#PART_LayoutRoot">
+      <Setter Property="Border.Background" Value="{DynamicResource HamburgerChromeLowColor}" />
+      <Setter Property="Border.BoxShadow" Value="{StaticResource NavigationItemShadow}" />
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource HamburgerBaseHighColor}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/samples/ControlCatalog/Pages/AcceleratorPage.xaml b/samples/ControlCatalog/Pages/AcceleratorPage.xaml
index 18072ef1c3..62fcf0d746 100644
--- a/samples/ControlCatalog/Pages/AcceleratorPage.xaml
+++ b/samples/ControlCatalog/Pages/AcceleratorPage.xaml
@@ -1,115 +1,116 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<ContentPage Theme="{StaticResource ScrollPage}" xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             Header="Accelerator"
              x:Class="ControlCatalog.Pages.AcceleratorPage">
-  <StackPanel Orientation="Vertical" Spacing="4">
+    <StackPanel Orientation="Vertical" Spacing="4">
 
-    <WrapPanel HorizontalAlignment="Left">
-      <StackPanel>
-        <Menu>
-          <MenuItem Header="_First">
-            <MenuItem Header="Standard _Menu Item" InputGesture="Ctrl+A" />
-            <MenuItem Header="_Disabled Menu Item" IsEnabled="False" InputGesture="Ctrl+D" />
-            <Separator />
-            <MenuItem Header="Menu with Sub _Menu">
-              <MenuItem Header="Submenu _1" />
-              <MenuItem Header="Submenu _2 with Submenu">
-                <MenuItem Header="Submenu Level 2" />
+      <WrapPanel HorizontalAlignment="Left">
+        <StackPanel>
+          <Menu>
+            <MenuItem Header="_First">
+              <MenuItem Header="Standard _Menu Item" InputGesture="Ctrl+A" />
+              <MenuItem Header="_Disabled Menu Item" IsEnabled="False" InputGesture="Ctrl+D" />
+              <Separator />
+              <MenuItem Header="Menu with Sub _Menu">
+                <MenuItem Header="Submenu _1" />
+                <MenuItem Header="Submenu _2 with Submenu">
+                  <MenuItem Header="Submenu Level 2" />
+                </MenuItem>
+                <MenuItem Header="Submenu _3 with Submenu Disabled" IsEnabled="False">
+                  <MenuItem Header="Submenu Level 2" />
+                </MenuItem>
               </MenuItem>
-              <MenuItem Header="Submenu _3 with Submenu Disabled" IsEnabled="False">
-                <MenuItem Header="Submenu Level 2" />
+              <MenuItem Header="Menu Item with _Icon" InputGesture="Ctrl+Shift+B">
+                <MenuItem.Icon>
+                  <Image Source="/Assets/github_icon.png" />
+                </MenuItem.Icon>
               </MenuItem>
+              <MenuItem Header="Menu Item with _Checkbox" ToggleType="CheckBox" />
             </MenuItem>
-            <MenuItem Header="Menu Item with _Icon" InputGesture="Ctrl+Shift+B">
-              <MenuItem.Icon>
-                <Image Source="/Assets/github_icon.png" />
-              </MenuItem.Icon>
-            </MenuItem>
-            <MenuItem Header="Menu Item with _Checkbox" ToggleType="CheckBox" />
-          </MenuItem>
-          <MenuItem Header="_Second">
-            <MenuItem Header="Second _Menu Item" />
-            <MenuItem IsChecked="True" Header="Second _Menu toggle item" ToggleType="CheckBox" />
-            <Separator />
-            <MenuItem GroupName="A" Header="Radio 1 - group" ToggleType="Radio" />
-            <MenuItem IsChecked="True" GroupName="A" Header="Radio 2 - group" ToggleType="Radio" />
-            <MenuItem GroupName="A" Header="Radio 3 - group" ToggleType="Radio">
-              <MenuItem Header="Radio 4 - group" ToggleType="Radio" GroupName="A" />
-              <MenuItem Header="Radio 5 - group" ToggleType="Radio" GroupName="A" />
-            </MenuItem>
-            <Separator />
-            <MenuItem Header="Radio 1" ToggleType="Radio" />
-            <MenuItem IsChecked="True" Header="Radio 2" ToggleType="Radio" />
-            <MenuItem Header="Radio 3" ToggleType="Radio">
-              <MenuItem Header="Radio 4" ToggleType="Radio" />
-              <MenuItem Header="Radio 5" ToggleType="Radio" />
+            <MenuItem Header="_Second">
+              <MenuItem Header="Second _Menu Item" />
+              <MenuItem IsChecked="True" Header="Second _Menu toggle item" ToggleType="CheckBox" />
+              <Separator />
+              <MenuItem GroupName="A" Header="Radio 1 - group" ToggleType="Radio" />
+              <MenuItem IsChecked="True" GroupName="A" Header="Radio 2 - group" ToggleType="Radio" />
+              <MenuItem GroupName="A" Header="Radio 3 - group" ToggleType="Radio">
+                <MenuItem Header="Radio 4 - group" ToggleType="Radio" GroupName="A" />
+                <MenuItem Header="Radio 5 - group" ToggleType="Radio" GroupName="A" />
+              </MenuItem>
+              <Separator />
+              <MenuItem Header="Radio 1" ToggleType="Radio" />
+              <MenuItem IsChecked="True" Header="Radio 2" ToggleType="Radio" />
+              <MenuItem Header="Radio 3" ToggleType="Radio">
+                <MenuItem Header="Radio 4" ToggleType="Radio" />
+                <MenuItem Header="Radio 5" ToggleType="Radio" />
+              </MenuItem>
             </MenuItem>
-          </MenuItem>
-          <MenuItem Header="Thir_d">
-            <MenuItem Header="About"/>
-            <MenuItem Header="_Child">
-              <MenuItem Header="_Grandchild"/>
+            <MenuItem Header="Thir_d">
+              <MenuItem Header="About"/>
+              <MenuItem Header="_Child">
+                <MenuItem Header="_Grandchild"/>
+              </MenuItem>
             </MenuItem>
-          </MenuItem>
-        </Menu>
-      </StackPanel>
+          </Menu>
+        </StackPanel>
 
-    </WrapPanel>
+      </WrapPanel>
 
-    <StackPanel Spacing="10">
-      <TextBlock Classes="h2">Accelerator Support</TextBlock>
+      <StackPanel Spacing="10">
+        <TextBlock Classes="h2">Accelerator Support</TextBlock>
 
-      <TabControl Margin="10" BorderBrush="Gray" BorderThickness="1">
-        <TabItem Header="_Tab 1">
-          <StackPanel>
-            <TextBlock Margin="5">This is tab 1 content</TextBlock>
-            <Label Name="Tab1Label1" Target="Tab1TextBox1">_Label Tab1Label1</Label>
-            <TextBox Name="Tab1TextBox1" Margin="5">This is tab 1 content</TextBox>
-            <Label Name="Tab1Label2" Target="Tab1TextBox2">Label _Tab1Label2</Label>
-            <TextBox Name="Tab1TextBox2" Margin="5">This is tab 1 content</TextBox>
-          </StackPanel>
+        <TabControl Margin="10" BorderBrush="Gray" BorderThickness="1">
+          <TabItem Header="_Tab 1">
+            <StackPanel>
+              <TextBlock Margin="5">This is tab 1 content</TextBlock>
+              <Label Name="Tab1Label1" Target="Tab1TextBox1">_Label Tab1Label1</Label>
+              <TextBox Name="Tab1TextBox1" Margin="5">This is tab 1 content</TextBox>
+              <Label Name="Tab1Label2" Target="Tab1TextBox2">Label _Tab1Label2</Label>
+              <TextBox Name="Tab1TextBox2" Margin="5">This is tab 1 content</TextBox>
+            </StackPanel>
 
-        </TabItem>
-        <TabItem Header="T_ab 2">
-          <TextBlock Margin="5">This is tab 2 content</TextBlock>
-        </TabItem>
-        <TabItem Header="_Tab 3">
+          </TabItem>
+          <TabItem Header="T_ab 2">
+            <TextBlock Margin="5">This is tab 2 content</TextBlock>
+          </TabItem>
+          <TabItem Header="_Tab 3">
 
-        </TabItem>
-        <TabItem Header="_Tab 4">
-          <TextBlock Margin="5">This is tab 4 content</TextBlock>
-        </TabItem>
-        <TabItem Header="_Fab 5">
-          <TextBlock Margin="5">This is fab 5 content</TextBlock>
-        </TabItem>
-      </TabControl>
-    </StackPanel>
+          </TabItem>
+          <TabItem Header="_Tab 4">
+            <TextBlock Margin="5">This is tab 4 content</TextBlock>
+          </TabItem>
+          <TabItem Header="_Fab 5">
+            <TextBlock Margin="5">This is fab 5 content</TextBlock>
+          </TabItem>
+        </TabControl>
+      </StackPanel>
 
 
-    <StackPanel Spacing="10">
-      <Label Name="Label0">Label with Ac_celerator 'C' and no Target</Label>
-      <TextBox Name="TextBox0" Text="Some Text"></TextBox>
+      <StackPanel Spacing="10">
+        <Label Name="Label0">Label with Ac_celerator 'C' and no Target</Label>
+        <TextBox Name="TextBox0" Text="Some Text"></TextBox>
 
-      <Label Name="Label1" Target="TextBox1">_Label with Accelerator 'L'</Label>
-      <TextBox Name="TextBox1" Text="Some Text"></TextBox>
+        <Label Name="Label1" Target="TextBox1">_Label with Accelerator 'L'</Label>
+        <TextBox Name="TextBox1" Text="Some Text"></TextBox>
 
-      <Label Name="Label2" Target="TextBox2">La_bel with Accelerator 'B'</Label>
-      <TextBox Name="TextBox2" Text="Some Text"></TextBox>
+        <Label Name="Label2" Target="TextBox2">La_bel with Accelerator 'B'</Label>
+        <TextBox Name="TextBox2" Text="Some Text"></TextBox>
 
-      <Label Name="Label3" Target="TextBox3">L_abel with Accelerator 'A'</Label>
-      <TextBox Name="TextBox3" Text="Some Text"></TextBox>
+        <Label Name="Label3" Target="TextBox3">L_abel with Accelerator 'A'</Label>
+        <TextBox Name="TextBox3" Text="Some Text"></TextBox>
 
-      <Label Name="Label4" Target="TextBox4">La_bel with Accelerator 'B'</Label>
-      <TextBox Name="TextBox4" Text="Some Text"></TextBox>
+        <Label Name="Label4" Target="TextBox4">La_bel with Accelerator 'B'</Label>
+        <TextBox Name="TextBox4" Text="Some Text"></TextBox>
 
-      <Label Name="Label5" Target="TextBox5">_Flabel with Accelerator 'F' (Same as in Menu > File)</Label>
-      <TextBox Name="TextBox5" Text="Some Text"></TextBox>
+        <Label Name="Label5" Target="TextBox5">_Flabel with Accelerator 'F' (Same as in Menu > File)</Label>
+        <TextBox Name="TextBox5" Text="Some Text"></TextBox>
 
-    </StackPanel>
+      </StackPanel>
 
-    <StackPanel Spacing="10" Orientation="Horizontal">
-      <Button Name="Button1">_Button 1</Button>
-      <Button Name="Button2">_Button 2</Button>
-      <Button Name="Button3">_Button 3</Button>
+      <StackPanel Spacing="10" Orientation="Horizontal">
+        <Button Name="Button1">_Button 1</Button>
+        <Button Name="Button2">_Button 2</Button>
+        <Button Name="Button3">_Button 3</Button>
+      </StackPanel>
     </StackPanel>
-  </StackPanel>
-</UserControl>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/AcceleratorPage.xaml.cs b/samples/ControlCatalog/Pages/AcceleratorPage.xaml.cs
index e013d9aaac..40afacc053 100644
--- a/samples/ControlCatalog/Pages/AcceleratorPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/AcceleratorPage.xaml.cs
@@ -2,7 +2,7 @@ using Avalonia.Controls;
 
 namespace ControlCatalog.Pages
 {
-    public partial class AcceleratorPage : UserControl
+    public partial class AcceleratorPage : ContentPage
     {
         public AcceleratorPage()
         {
diff --git a/samples/ControlCatalog/Pages/AcrylicPage.xaml b/samples/ControlCatalog/Pages/AcrylicPage.xaml
index 4fd0933879..4a68fbfafd 100644
--- a/samples/ControlCatalog/Pages/AcrylicPage.xaml
+++ b/samples/ControlCatalog/Pages/AcrylicPage.xaml
@@ -1,12 +1,13 @@
-<UserControl x:Class="ControlCatalog.Pages.AcrylicPage"
+<ContentPage Theme="{StaticResource ScrollPage}" x:Class="ControlCatalog.Pages.AcrylicPage"
              xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              d:DesignHeight="800"
+             Header="Acrylic"
              d:DesignWidth="400"
              mc:Ignorable="d">
-  <UserControl.Styles>
+  <ContentPage.Styles>
     <Style Selector="ExperimentalAcrylicBorder">
       <Setter Property="CornerRadius" Value="5" />
       <Setter Property="MaxWidth" Value="660" />
@@ -22,144 +23,143 @@
       <Setter Property="LargeChange" Value="0.2" />
       <Setter Property="SmallChange" Value="0.1" />
     </Style>
-  </UserControl.Styles>
-  <StackPanel Spacing="20">
+  </ContentPage.Styles>
+    <StackPanel Spacing="20">
 
-    <ExperimentalAcrylicBorder>
-      <ExperimentalAcrylicBorder.Material>
-        <ExperimentalAcrylicMaterial BackgroundSource="Digger" TintColor="White" />
-      </ExperimentalAcrylicBorder.Material>
-      <Grid Margin="20,10"
-            ColumnDefinitions="Auto,*,Auto"
-            RowDefinitions="Auto,Auto">
-        <TextBlock Grid.Row="0"
-                   Grid.Column="0"
-                   Text="TintOpacity" />
-        <Slider Name="TintOpacitySlider"
-                Grid.Row="0"
-                Grid.Column="1"
-                Value="0.9" />
-        <TextBlock Grid.Row="0"
-                   Grid.Column="2"
-                   Text="{Binding #TintOpacitySlider.Value, StringFormat=\{0:0.#\}}" />
-        <TextBlock Grid.Row="1"
-                   Grid.Column="0"
-                   Text="MaterialOpacity" />
-        <Slider Name="MaterialOpacitySlider"
-                Grid.Row="1"
-                Grid.Column="1"
-                Value="0.8" />
-        <TextBlock Grid.Row="1"
-                   Grid.Column="2"
-                   Text="{Binding #MaterialOpacitySlider.Value, StringFormat=\{0:0.#\}}" />
-      </Grid>
-    </ExperimentalAcrylicBorder>
-
-    <UniformGrid x:Name="BordersGrid"
-                 HorizontalAlignment="Stretch"
-                 MaxWidth="660"
-                 Columns="3">
-      <UniformGrid.Styles>
-        <Style Selector="ExperimentalAcrylicBorder">
-          <Setter Property="Height" Value="{Binding $self.Bounds.Width}" />
-          <Setter Property="Margin" Value="10" />
-          <Setter Property="MaxWidth" Value="200" />
-        </Style>
-      </UniformGrid.Styles>
       <ExperimentalAcrylicBorder>
         <ExperimentalAcrylicBorder.Material>
-          <ExperimentalAcrylicMaterial BackgroundSource="Digger"
-                                       MaterialOpacity="{Binding #MaterialOpacitySlider.Value}"
-                                       TintColor="#FF0000"
-                                       TintOpacity="{Binding #TintOpacitySlider.Value}" />
+          <ExperimentalAcrylicMaterial BackgroundSource="Digger" TintColor="White" />
         </ExperimentalAcrylicBorder.Material>
+        <Grid Margin="20,10"
+              ColumnDefinitions="Auto,*,Auto"
+              RowDefinitions="Auto,Auto">
+          <TextBlock Grid.Row="0"
+                     Grid.Column="0"
+                     Text="TintOpacity" />
+          <Slider Name="TintOpacitySlider"
+                  Grid.Row="0"
+                  Grid.Column="1"
+                  Value="0.9" />
+          <TextBlock Grid.Row="0"
+                     Grid.Column="2"
+                     Text="{Binding #TintOpacitySlider.Value, StringFormat=\{0:0.#\}}" />
+          <TextBlock Grid.Row="1"
+                     Grid.Column="0"
+                     Text="MaterialOpacity" />
+          <Slider Name="MaterialOpacitySlider"
+                  Grid.Row="1"
+                  Grid.Column="1"
+                  Value="0.8" />
+          <TextBlock Grid.Row="1"
+                     Grid.Column="2"
+                     Text="{Binding #MaterialOpacitySlider.Value, StringFormat=\{0:0.#\}}" />
+        </Grid>
       </ExperimentalAcrylicBorder>
 
-      <ExperimentalAcrylicBorder>
-        <ExperimentalAcrylicBorder.Material>
-          <ExperimentalAcrylicMaterial BackgroundSource="Digger"
-                                       MaterialOpacity="{Binding #MaterialOpacitySlider.Value}"
-                                       TintColor="#00FF00"
-                                       TintOpacity="{Binding #TintOpacitySlider.Value}" />
-        </ExperimentalAcrylicBorder.Material>
-      </ExperimentalAcrylicBorder>
+      <UniformGrid x:Name="BordersGrid"
+                   HorizontalAlignment="Stretch"
+                   MaxWidth="660"
+                   Columns="3">
+        <UniformGrid.Styles>
+          <Style Selector="ExperimentalAcrylicBorder">
+            <Setter Property="Height" Value="{Binding $self.Bounds.Width}" />
+            <Setter Property="Margin" Value="10" />
+            <Setter Property="MaxWidth" Value="200" />
+          </Style>
+        </UniformGrid.Styles>
+        <ExperimentalAcrylicBorder>
+          <ExperimentalAcrylicBorder.Material>
+            <ExperimentalAcrylicMaterial BackgroundSource="Digger"
+                                         MaterialOpacity="{Binding #MaterialOpacitySlider.Value}"
+                                         TintColor="#FF0000"
+                                         TintOpacity="{Binding #TintOpacitySlider.Value}" />
+          </ExperimentalAcrylicBorder.Material>
+        </ExperimentalAcrylicBorder>
 
-      <ExperimentalAcrylicBorder>
-        <ExperimentalAcrylicBorder.Material>
-          <ExperimentalAcrylicMaterial BackgroundSource="Digger"
-                                       MaterialOpacity="{Binding #MaterialOpacitySlider.Value}"
-                                       TintColor="#000000"
-                                       TintOpacity="{Binding #TintOpacitySlider.Value}" />
-        </ExperimentalAcrylicBorder.Material>
-      </ExperimentalAcrylicBorder>
+        <ExperimentalAcrylicBorder>
+          <ExperimentalAcrylicBorder.Material>
+            <ExperimentalAcrylicMaterial BackgroundSource="Digger"
+                                         MaterialOpacity="{Binding #MaterialOpacitySlider.Value}"
+                                         TintColor="#00FF00"
+                                         TintOpacity="{Binding #TintOpacitySlider.Value}" />
+          </ExperimentalAcrylicBorder.Material>
+        </ExperimentalAcrylicBorder>
 
-      <ExperimentalAcrylicBorder>
-        <ExperimentalAcrylicBorder.Material>
-          <ExperimentalAcrylicMaterial BackgroundSource="Digger"
-                                       MaterialOpacity="{Binding #MaterialOpacitySlider.Value}"
-                                       TintColor="#0000FF"
-                                       TintOpacity="{Binding #TintOpacitySlider.Value}" />
-        </ExperimentalAcrylicBorder.Material>
-      </ExperimentalAcrylicBorder>
+        <ExperimentalAcrylicBorder>
+          <ExperimentalAcrylicBorder.Material>
+            <ExperimentalAcrylicMaterial BackgroundSource="Digger"
+                                         MaterialOpacity="{Binding #MaterialOpacitySlider.Value}"
+                                         TintColor="#000000"
+                                         TintOpacity="{Binding #TintOpacitySlider.Value}" />
+          </ExperimentalAcrylicBorder.Material>
+        </ExperimentalAcrylicBorder>
 
-      <ExperimentalAcrylicBorder>
-        <ExperimentalAcrylicBorder.Material>
-          <ExperimentalAcrylicMaterial BackgroundSource="Digger"
-                                       MaterialOpacity="{Binding #MaterialOpacitySlider.Value}"
-                                       TintColor="#FFFF00"
-                                       TintOpacity="{Binding #TintOpacitySlider.Value}" />
-        </ExperimentalAcrylicBorder.Material>
-      </ExperimentalAcrylicBorder>
+        <ExperimentalAcrylicBorder>
+          <ExperimentalAcrylicBorder.Material>
+            <ExperimentalAcrylicMaterial BackgroundSource="Digger"
+                                         MaterialOpacity="{Binding #MaterialOpacitySlider.Value}"
+                                         TintColor="#0000FF"
+                                         TintOpacity="{Binding #TintOpacitySlider.Value}" />
+          </ExperimentalAcrylicBorder.Material>
+        </ExperimentalAcrylicBorder>
 
-      <ExperimentalAcrylicBorder>
-        <ExperimentalAcrylicBorder.Material>
-          <ExperimentalAcrylicMaterial BackgroundSource="Digger"
-                                       MaterialOpacity="{Binding #MaterialOpacitySlider.Value}"
-                                       TintColor="#000000"
-                                       TintOpacity="{Binding #TintOpacitySlider.Value}" />
-        </ExperimentalAcrylicBorder.Material>
-      </ExperimentalAcrylicBorder>
+        <ExperimentalAcrylicBorder>
+          <ExperimentalAcrylicBorder.Material>
+            <ExperimentalAcrylicMaterial BackgroundSource="Digger"
+                                         MaterialOpacity="{Binding #MaterialOpacitySlider.Value}"
+                                         TintColor="#FFFF00"
+                                         TintOpacity="{Binding #TintOpacitySlider.Value}" />
+          </ExperimentalAcrylicBorder.Material>
+        </ExperimentalAcrylicBorder>
 
+        <ExperimentalAcrylicBorder>
+          <ExperimentalAcrylicBorder.Material>
+            <ExperimentalAcrylicMaterial BackgroundSource="Digger"
+                                         MaterialOpacity="{Binding #MaterialOpacitySlider.Value}"
+                                         TintColor="#000000"
+                                         TintOpacity="{Binding #TintOpacitySlider.Value}" />
+          </ExperimentalAcrylicBorder.Material>
+        </ExperimentalAcrylicBorder>
 
-      <ExperimentalAcrylicBorder>
-        <ExperimentalAcrylicBorder.Material>
-          <ExperimentalAcrylicMaterial BackgroundSource="Digger"
-                                       MaterialOpacity="{Binding #MaterialOpacitySlider.Value}"
-                                       TintColor="White"
-                                       TintOpacity="{Binding #TintOpacitySlider.Value}" />
-        </ExperimentalAcrylicBorder.Material>
-      </ExperimentalAcrylicBorder>
 
-      <ExperimentalAcrylicBorder>
-        <ExperimentalAcrylicBorder.Material>
-          <ExperimentalAcrylicMaterial BackgroundSource="Digger"
-                                       MaterialOpacity="{Binding #MaterialOpacitySlider.Value}"
-                                       TintColor="#3c3c3c"
-                                       TintOpacity="{Binding #TintOpacitySlider.Value}" />
-        </ExperimentalAcrylicBorder.Material>
-      </ExperimentalAcrylicBorder>
+        <ExperimentalAcrylicBorder>
+          <ExperimentalAcrylicBorder.Material>
+            <ExperimentalAcrylicMaterial BackgroundSource="Digger"
+                                         MaterialOpacity="{Binding #MaterialOpacitySlider.Value}"
+                                         TintColor="White"
+                                         TintOpacity="{Binding #TintOpacitySlider.Value}" />
+          </ExperimentalAcrylicBorder.Material>
+        </ExperimentalAcrylicBorder>
 
-      <ExperimentalAcrylicBorder>
+        <ExperimentalAcrylicBorder>
+          <ExperimentalAcrylicBorder.Material>
+            <ExperimentalAcrylicMaterial BackgroundSource="Digger"
+                                         MaterialOpacity="{Binding #MaterialOpacitySlider.Value}"
+                                         TintColor="#3c3c3c"
+                                         TintOpacity="{Binding #TintOpacitySlider.Value}" />
+          </ExperimentalAcrylicBorder.Material>
+        </ExperimentalAcrylicBorder>
+
+        <ExperimentalAcrylicBorder>
+          <ExperimentalAcrylicBorder.Material>
+            <ExperimentalAcrylicMaterial BackgroundSource="Digger"
+                                         MaterialOpacity="{Binding #MaterialOpacitySlider.Value}"
+                                         TintColor="White"
+                                         TintOpacity="{Binding #TintOpacitySlider.Value}" />
+          </ExperimentalAcrylicBorder.Material>
+        </ExperimentalAcrylicBorder>
+
+      </UniformGrid>
+
+
+      <ExperimentalAcrylicBorder Width="{Binding #BordersGrid.Bounds.Width}"
+                                 Height="160">
         <ExperimentalAcrylicBorder.Material>
           <ExperimentalAcrylicMaterial BackgroundSource="Digger"
                                        MaterialOpacity="{Binding #MaterialOpacitySlider.Value}"
-                                       TintColor="White"
+                                       TintColor="Red"
                                        TintOpacity="{Binding #TintOpacitySlider.Value}" />
         </ExperimentalAcrylicBorder.Material>
       </ExperimentalAcrylicBorder>
-
-    </UniformGrid>
-
-
-    <ExperimentalAcrylicBorder Width="{Binding #BordersGrid.Bounds.Width}"
-                               Height="160">
-      <ExperimentalAcrylicBorder.Material>
-        <ExperimentalAcrylicMaterial BackgroundSource="Digger"
-                                     MaterialOpacity="{Binding #MaterialOpacitySlider.Value}"
-                                     TintColor="Red"
-                                     TintOpacity="{Binding #TintOpacitySlider.Value}" />
-      </ExperimentalAcrylicBorder.Material>
-    </ExperimentalAcrylicBorder>
-  </StackPanel>
-
-</UserControl>
+    </StackPanel>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/AcrylicPage.xaml.cs b/samples/ControlCatalog/Pages/AcrylicPage.xaml.cs
index 9516655bb9..adb5b05706 100644
--- a/samples/ControlCatalog/Pages/AcrylicPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/AcrylicPage.xaml.cs
@@ -2,7 +2,7 @@
 
 namespace ControlCatalog.Pages
 {
-    public partial class AcrylicPage : UserControl
+    public partial class AcrylicPage : ContentPage
     {
         public AcrylicPage()
         {
diff --git a/samples/ControlCatalog/Pages/AdornerLayerPage.xaml b/samples/ControlCatalog/Pages/AdornerLayerPage.xaml
index e9a245a8e1..35907c7ef8 100644
--- a/samples/ControlCatalog/Pages/AdornerLayerPage.xaml
+++ b/samples/ControlCatalog/Pages/AdornerLayerPage.xaml
@@ -1,52 +1,52 @@
-<UserControl x:Class="ControlCatalog.Pages.AdornerLayerPage"
+<ContentPage Theme="{StaticResource ScrollPage}" x:Class="ControlCatalog.Pages.AdornerLayerPage"
              xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              d:DesignHeight="800"
              d:DesignWidth="400"
+             Header="Adorner Layer"
              mc:Ignorable="d">
+    <DockPanel>
+      <Grid ColumnDefinitions="Auto,*" RowDefinitions="Auto" Margin="16" DockPanel.Dock="Top">
+        <TextBlock Grid.Column="0" Grid.Row="0">Rotation</TextBlock>
+        <Slider Name="rotation" Maximum="360" Grid.Column="1" Grid.Row="0"/>
+      </Grid>
 
-  <DockPanel>
-    <Grid ColumnDefinitions="Auto,*" RowDefinitions="Auto" Margin="16" DockPanel.Dock="Top">
-      <TextBlock Grid.Column="0" Grid.Row="0">Rotation</TextBlock>
-      <Slider Name="rotation" Maximum="360" Grid.Column="1" Grid.Row="0"/>
-    </Grid>
+      <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" DockPanel.Dock="Top">
+        <Button Name="AddAdorner"
+                Click="AddAdorner_OnClick"
+                Content="Add Adorner"
+                Margin="6" />
+        <Button Name="RemoveAdorner"
+                Click="RemoveAdorner_OnClick"
+                Content="Remove Adorner"
+                Margin="6" />
+      </StackPanel>
 
-    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" DockPanel.Dock="Top">
-      <Button Name="AddAdorner" 
-              Click="AddAdorner_OnClick"
-              Content="Add Adorner" 
-              Margin="6" />
-      <Button Name="RemoveAdorner" 
-              Click="RemoveAdorner_OnClick"
-              Content="Remove Adorner"
-              Margin="6" />
-    </StackPanel>
+      <Grid ColumnDefinitions="24,Auto,24"
+            RowDefinitions="24,Auto,24"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center">
+        <Border Background="{DynamicResource SystemAccentColor}" Grid.Column="1" Grid.Row="0"/>
+        <Border Background="{DynamicResource SystemAccentColor}" Grid.Column="0" Grid.Row="1"/>
+        <Border Background="{DynamicResource SystemAccentColor}" Grid.Column="2" Grid.Row="1"/>
+        <Border Background="{DynamicResource SystemAccentColor}" Grid.Column="1" Grid.Row="2"/>
 
-    <Grid ColumnDefinitions="24,Auto,24" 
-          RowDefinitions="24,Auto,24"
-          HorizontalAlignment="Center"
-          VerticalAlignment="Center">
-      <Border Background="{DynamicResource SystemAccentColor}" Grid.Column="1" Grid.Row="0"/>
-      <Border Background="{DynamicResource SystemAccentColor}" Grid.Column="0" Grid.Row="1"/>
-      <Border Background="{DynamicResource SystemAccentColor}" Grid.Column="2" Grid.Row="1"/>
-      <Border Background="{DynamicResource SystemAccentColor}" Grid.Column="1" Grid.Row="2"/>
+        <LayoutTransformControl Name="layoutTransform" Grid.Column="1" Grid.Row="1">
+          <LayoutTransformControl.LayoutTransform>
+            <RotateTransform Angle="{Binding #rotation.Value}"/>
+          </LayoutTransformControl.LayoutTransform>
 
-      <LayoutTransformControl Name="layoutTransform" Grid.Column="1" Grid.Row="1">
-        <LayoutTransformControl.LayoutTransform>
-          <RotateTransform Angle="{Binding #rotation.Value}"/>
-        </LayoutTransformControl.LayoutTransform>
-
-        <Button Name="AdornerButton"
-                Content="Adorned Button" 
-                HorizontalAlignment="Stretch" HorizontalContentAlignment="Center"
-                VerticalContentAlignment="Center" VerticalAlignment="Stretch" 
-                Width="200" Height="42">
-          <AdornerLayer.Adorner>
-            <Border AdornerLayer.IsClipEnabled="False" ClipToBounds="False" Background="Red" Opacity="0.3" Margin="-5" Padding="5"
-                    IsHitTestVisible="False">
-              <Canvas
+          <Button Name="AdornerButton"
+                  Content="Adorned Button"
+                  HorizontalAlignment="Stretch" HorizontalContentAlignment="Center"
+                  VerticalContentAlignment="Center" VerticalAlignment="Stretch"
+                  Width="200" Height="42">
+            <AdornerLayer.Adorner>
+              <Border AdornerLayer.IsClipEnabled="False" ClipToBounds="False" Background="Red" Opacity="0.3" Margin="-5" Padding="5"
+                      IsHitTestVisible="False">
+                <Canvas
                 x:Name="AdornerCanvas"
                 HorizontalAlignment="Stretch"
                 VerticalAlignment="Stretch"
@@ -54,24 +54,23 @@
                 IsHitTestVisible="False"
                 IsVisible="True"
                 AdornerLayer.IsClipEnabled="False">
-                <Line StartPoint="-10000,0" EndPoint="10000,0" Stroke="Cyan" StrokeThickness="1" />
-                <Line StartPoint="-10000,42" EndPoint="10000,42" Stroke="Cyan" StrokeThickness="1" />
-                <Line StartPoint="0,-10000" EndPoint="0,10000" Stroke="Cyan" StrokeThickness="1" />
-                <Line StartPoint="200,-10000" EndPoint="200,10000" Stroke="Cyan" StrokeThickness="1" />
-              </Canvas>
-            </Border>
-          </AdornerLayer.Adorner>
-          <Button.ContextMenu>
-            <ContextMenu PlacementTarget="{ResolveByName AdornerCanvas}" Placement="TopEdgeAlignedLeft">
-              <MenuItem Header="Menu 1"/>
-              <MenuItem Header="Menu 2"/>
-            </ContextMenu>
-          </Button.ContextMenu>
-        </Button>
-        
+                  <Line StartPoint="-10000,0" EndPoint="10000,0" Stroke="Cyan" StrokeThickness="1" />
+                  <Line StartPoint="-10000,42" EndPoint="10000,42" Stroke="Cyan" StrokeThickness="1" />
+                  <Line StartPoint="0,-10000" EndPoint="0,10000" Stroke="Cyan" StrokeThickness="1" />
+                  <Line StartPoint="200,-10000" EndPoint="200,10000" Stroke="Cyan" StrokeThickness="1" />
+                </Canvas>
+              </Border>
+            </AdornerLayer.Adorner>
+            <Button.ContextMenu>
+              <ContextMenu PlacementTarget="{ResolveByName AdornerCanvas}" Placement="TopEdgeAlignedLeft">
+                <MenuItem Header="Menu 1"/>
+                <MenuItem Header="Menu 2"/>
+              </ContextMenu>
+            </Button.ContextMenu>
+          </Button>
 
-      </LayoutTransformControl>
-    </Grid>
-  </DockPanel>
 
-</UserControl>
+        </LayoutTransformControl>
+      </Grid>
+    </DockPanel>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/AdornerLayerPage.xaml.cs b/samples/ControlCatalog/Pages/AdornerLayerPage.xaml.cs
index 526b8a492b..5ee8d44479 100644
--- a/samples/ControlCatalog/Pages/AdornerLayerPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/AdornerLayerPage.xaml.cs
@@ -4,7 +4,7 @@ using Avalonia.Interactivity;
 
 namespace ControlCatalog.Pages
 {
-    public partial class AdornerLayerPage : UserControl
+    public partial class AdornerLayerPage : ContentPage
     {
         private Control? _adorner;
 
diff --git a/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml b/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml
index 35e917f996..4edb00b7c3 100644
--- a/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml
+++ b/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml
@@ -1,79 +1,83 @@
-<UserControl x:Class="ControlCatalog.Pages.AutoCompleteBoxPage"
+<ContentPage Theme="{StaticResource ScrollPage}" x:Class="ControlCatalog.Pages.AutoCompleteBoxPage"
              xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:sys="using:System"
              xmlns:models="using:ControlCatalog.Models"
              d:DesignHeight="600"
+             Header="AutoCompleteBox"
              d:DesignWidth="400">
-  <StackPanel Orientation="Vertical"
-              Spacing="4"
-              MaxWidth="660">
-    <TextBlock Classes="h2">A control into which the user can input text</TextBlock>
+  <ScrollViewer
+  HorizontalScrollBarVisibility="Disabled">
+    <StackPanel Orientation="Vertical"
+                Spacing="4"
+                MaxWidth="660">
+      <TextBlock Classes="h2">A control into which the user can input text</TextBlock>
 
-    <UniformGrid Margin="-8,0"
-                 Columns="2">
-      <UniformGrid.Styles>
-        <Style Selector="StackPanel">
-          <Setter Property="Margin" Value="8" />
-        </Style>
-      </UniformGrid.Styles>
+      <UniformGrid Margin="-8,0"
+                   Columns="2">
+        <UniformGrid.Styles>
+          <Style Selector="StackPanel">
+            <Setter Property="Margin" Value="8" />
+          </Style>
+        </UniformGrid.Styles>
+        <StackPanel>
+          <TextBlock Text="MinimumPrefixLength: 0" />
+          <AutoCompleteBox MinimumPrefixLength="0" />
+        </StackPanel>
+        <StackPanel>
+          <TextBlock Text="MinimumPrefixLength: 1" />
+          <AutoCompleteBox MinimumPrefixLength="1" />
+        </StackPanel>
+        <StackPanel>
+          <TextBlock Text="MinimumPrefixLength: 3" />
+          <AutoCompleteBox MinimumPrefixLength="3" />
+        </StackPanel>
+        <StackPanel>
+          <TextBlock Text="MinimumPopulateDelay: 1s" />
+          <AutoCompleteBox MinimumPopulateDelay="00:00:01" />
+        </StackPanel>
+        <StackPanel>
+          <TextBlock Text="MaxDropDownHeight: 60" />
+          <AutoCompleteBox MaxDropDownHeight="60" />
+        </StackPanel>
+        <StackPanel>
+          <TextBlock Text="PlaceholderText" />
+          <AutoCompleteBox PlaceholderText="Hello World" />
+        </StackPanel>
+        <StackPanel>
+          <TextBlock Text="PlaceholderText with custom color" />
+          <AutoCompleteBox PlaceholderText="Search here..." PlaceholderForeground="Green" />
+        </StackPanel>
+        <StackPanel>
+          <TextBlock Text="Disabled" />
+          <AutoCompleteBox IsEnabled="False" />
+        </StackPanel>
+        <StackPanel>
+          <TextBlock Text="ValueMemberBinding" />
+          <AutoCompleteBox ValueMemberBinding="{Binding Capital, x:DataType=models:StateData}" />
+        </StackPanel>
+        <StackPanel>
+          <TextBlock Text="Multi-Binding" />
+          <AutoCompleteBox Name="MultiBindingBox" FilterMode="Contains" />
+        </StackPanel>
+        <StackPanel>
+          <TextBlock Text="Async Populate" />
+          <AutoCompleteBox Name="AsyncBox" FilterMode="None" />
+        </StackPanel>
+        <StackPanel>
+          <TextBlock Text="Custom Autocomplete" />
+          <AutoCompleteBox Name="CustomAutocompleteBox" FilterMode="None" />
+        </StackPanel>
+      </UniformGrid>
       <StackPanel>
-        <TextBlock Text="MinimumPrefixLength: 0" />
-        <AutoCompleteBox MinimumPrefixLength="0" />
+        <TextBlock Text="With Validation Errors" />
+        <AutoCompleteBox Name="ValidationErrors" FilterMode="None">
+          <DataValidationErrors.Error>
+            <sys:Exception />
+          </DataValidationErrors.Error>
+        </AutoCompleteBox>
       </StackPanel>
-      <StackPanel>
-        <TextBlock Text="MinimumPrefixLength: 1" />
-        <AutoCompleteBox MinimumPrefixLength="1" />
-      </StackPanel>
-      <StackPanel>
-        <TextBlock Text="MinimumPrefixLength: 3" />
-        <AutoCompleteBox MinimumPrefixLength="3" />
-      </StackPanel>
-      <StackPanel>
-        <TextBlock Text="MinimumPopulateDelay: 1s" />
-        <AutoCompleteBox MinimumPopulateDelay="00:00:01" />
-      </StackPanel>
-      <StackPanel>
-        <TextBlock Text="MaxDropDownHeight: 60" />
-        <AutoCompleteBox MaxDropDownHeight="60" />
-      </StackPanel>
-      <StackPanel>
-        <TextBlock Text="PlaceholderText" />
-        <AutoCompleteBox PlaceholderText="Hello World" />
-      </StackPanel>
-      <StackPanel>
-        <TextBlock Text="PlaceholderText with custom color" />
-        <AutoCompleteBox PlaceholderText="Search here..." PlaceholderForeground="Green" />
-      </StackPanel>
-      <StackPanel>
-        <TextBlock Text="Disabled" />
-        <AutoCompleteBox IsEnabled="False" />
-      </StackPanel>
-      <StackPanel>
-        <TextBlock Text="ValueMemberBinding" />
-        <AutoCompleteBox ValueMemberBinding="{Binding Capital, x:DataType=models:StateData}" />
-      </StackPanel>
-      <StackPanel>
-        <TextBlock Text="Multi-Binding" />
-        <AutoCompleteBox Name="MultiBindingBox" FilterMode="Contains" />
-      </StackPanel>
-      <StackPanel>
-        <TextBlock Text="Async Populate" />
-        <AutoCompleteBox Name="AsyncBox" FilterMode="None" />
-      </StackPanel>
-      <StackPanel>
-        <TextBlock Text="Custom Autocomplete" />
-        <AutoCompleteBox Name="CustomAutocompleteBox" FilterMode="None" />
-      </StackPanel>
-    </UniformGrid>
-    <StackPanel>
-      <TextBlock Text="With Validation Errors" />
-      <AutoCompleteBox Name="ValidationErrors" FilterMode="None">
-        <DataValidationErrors.Error>
-          <sys:Exception />
-        </DataValidationErrors.Error>
-      </AutoCompleteBox>
     </StackPanel>
-  </StackPanel>
-</UserControl>
+  </ScrollViewer>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml.cs b/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml.cs
index 47b6eb7f4a..295aa9d139 100644
--- a/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml.cs
@@ -11,7 +11,7 @@ using ControlCatalog.Models;
 
 namespace ControlCatalog.Pages
 {
-    public partial class AutoCompleteBoxPage : UserControl
+    public partial class AutoCompleteBoxPage : ContentPage
     {
         private static StateData[] BuildAllStates()
         {
diff --git a/samples/ControlCatalog/Pages/BitmapCachePage.axaml b/samples/ControlCatalog/Pages/BitmapCachePage.axaml
index 5902be8e51..4298f29e8f 100644
--- a/samples/ControlCatalog/Pages/BitmapCachePage.axaml
+++ b/samples/ControlCatalog/Pages/BitmapCachePage.axaml
@@ -1,45 +1,49 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<ContentPage Theme="{StaticResource ScrollPage}" 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"
+             Header="Bitmap Cache"
              x:Class="ControlCatalog.Pages.BitmapCachePage">
+  <ScrollViewer
+  HorizontalScrollBarVisibility="Disabled">
     <DockPanel>
-        <DockPanel.Resources>
-            <BitmapCache x:Key="Cache"/>
-            <ScaleTransform x:Key="Transform" ScaleX="1" ScaleY="{Binding $self.ScaleX, Mode=OneWay}"/>
-            <TranslateTransform x:Key="SubPixelTransform"/>
-        </DockPanel.Resources>
-        <StackPanel DockPanel.Dock="Right" ZIndex="1">
-            <TextBlock>Render at scale</TextBlock>
-            <Slider Minimum="0.1" Maximum="4" Value="{Binding Source={StaticResource Cache}, Path=RenderAtScale, Mode=TwoWay}" Width="200"/>
-            <TextBlock>Scale</TextBlock>
-            <Slider Minimum="0.1" Maximum="4" Value="{Binding Source={StaticResource Transform}, Path=ScaleX, Mode=TwoWay}" Width="200"/>
-            <CheckBox IsChecked="{Binding Source={StaticResource Cache}, Path=EnableClearType, Mode=TwoWay}">Enable clear type</CheckBox>
+      <DockPanel.Resources>
+        <BitmapCache x:Key="Cache"/>
+        <ScaleTransform x:Key="Transform" ScaleX="1" ScaleY="{Binding $self.ScaleX, Mode=OneWay}"/>
+        <TranslateTransform x:Key="SubPixelTransform"/>
+      </DockPanel.Resources>
+      <StackPanel DockPanel.Dock="Right" ZIndex="1">
+        <TextBlock>Render at scale</TextBlock>
+        <Slider Minimum="0.1" Maximum="4" Value="{Binding Source={StaticResource Cache}, Path=RenderAtScale, Mode=TwoWay}" Width="200"/>
+        <TextBlock>Scale</TextBlock>
+        <Slider Minimum="0.1" Maximum="4" Value="{Binding Source={StaticResource Transform}, Path=ScaleX, Mode=TwoWay}" Width="200"/>
+        <CheckBox IsChecked="{Binding Source={StaticResource Cache}, Path=EnableClearType, Mode=TwoWay}">Enable clear type</CheckBox>
 
-            <CheckBox IsChecked="{Binding Source={StaticResource Cache}, Path=SnapsToDevicePixels, Mode=TwoWay}">Snap to device pixels</CheckBox>
-            <TextBlock>Subpixel offset X</TextBlock>
-            <Slider Minimum="0" Maximum="1" Value="{Binding Source={StaticResource SubPixelTransform}, Path=X, Mode=TwoWay}" Width="200"/>
-        </StackPanel>
-        <Decorator RenderTransform="{StaticResource SubPixelTransform}">
-            <Border Background="Beige" Margin="10"
-                    RenderTransform="{StaticResource Transform}"
-                    RenderTransformOrigin="0.5,0.5">
-                <Border Margin="10"
-                    CacheMode="{StaticResource Cache}"
-                    TextElement.Foreground="Black">
-                    <Border
-                        Margin="10"
-                        BorderThickness="2"
-                        BorderBrush="Black"
-                        Background="White">
-                        <StackPanel>
-                            <Slider MinWidth="200"/>
-                            <TextBlock TextWrapping="Wrap">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</TextBlock>
-                        </StackPanel>
-                    </Border>
-                </Border>
+        <CheckBox IsChecked="{Binding Source={StaticResource Cache}, Path=SnapsToDevicePixels, Mode=TwoWay}">Snap to device pixels</CheckBox>
+        <TextBlock>Subpixel offset X</TextBlock>
+        <Slider Minimum="0" Maximum="1" Value="{Binding Source={StaticResource SubPixelTransform}, Path=X, Mode=TwoWay}" Width="200"/>
+      </StackPanel>
+      <Decorator RenderTransform="{StaticResource SubPixelTransform}">
+        <Border Background="Beige" Margin="10"
+                RenderTransform="{StaticResource Transform}"
+                RenderTransformOrigin="0.5,0.5">
+          <Border Margin="10"
+                  CacheMode="{StaticResource Cache}"
+                  TextElement.Foreground="Black">
+            <Border
+            Margin="10"
+            BorderThickness="2"
+            BorderBrush="Black"
+            Background="White">
+              <StackPanel>
+                <Slider MinWidth="200"/>
+                <TextBlock TextWrapping="Wrap">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</TextBlock>
+              </StackPanel>
             </Border>
-        </Decorator>
+          </Border>
+        </Border>
+      </Decorator>
     </DockPanel>
-</UserControl>
+  </ScrollViewer>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/BitmapCachePage.axaml.cs b/samples/ControlCatalog/Pages/BitmapCachePage.axaml.cs
index 92b3cbec68..be7cf7a7ea 100644
--- a/samples/ControlCatalog/Pages/BitmapCachePage.axaml.cs
+++ b/samples/ControlCatalog/Pages/BitmapCachePage.axaml.cs
@@ -4,10 +4,10 @@ using Avalonia.Markup.Xaml;
 
 namespace ControlCatalog.Pages;
 
-public partial class BitmapCachePage : UserControl
+public partial class BitmapCachePage : ContentPage
 {
     public BitmapCachePage()
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/samples/ControlCatalog/Pages/BorderPage.xaml b/samples/ControlCatalog/Pages/BorderPage.xaml
index c811ddaa22..297e3fcfb8 100644
--- a/samples/ControlCatalog/Pages/BorderPage.xaml
+++ b/samples/ControlCatalog/Pages/BorderPage.xaml
@@ -1,61 +1,65 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<ContentPage Theme="{StaticResource ScrollPage}" xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              d:DesignHeight="800"
              d:DesignWidth="400"
+             Header="Border"
              x:Class="ControlCatalog.Pages.BorderPage">
-  <StackPanel Orientation="Vertical" Spacing="4">
-    <StackPanel.Resources>
-      <SolidColorBrush x:Key="SemiTransparentSystemAccentBrush" Color="{DynamicResource SystemAccentColor}" Opacity="0.4" />
-    </StackPanel.Resources>
-    <TextBlock Classes="h2">A control which decorates a child with a border and background</TextBlock>
+  <ScrollViewer
+  HorizontalScrollBarVisibility="Disabled">
+    <StackPanel Orientation="Vertical" Spacing="4">
+      <StackPanel.Resources>
+        <SolidColorBrush x:Key="SemiTransparentSystemAccentBrush" Color="{DynamicResource SystemAccentColor}" Opacity="0.4" />
+      </StackPanel.Resources>
+      <TextBlock Classes="h2">A control which decorates a child with a border and background</TextBlock>
 
-    <StackPanel Orientation="Vertical"
-                Margin="0,16,0,0"
-                HorizontalAlignment="Center"
-                Spacing="16">
-      <Border BorderBrush="{DynamicResource SystemAccentColor}" BorderThickness="2" Padding="16">
-        <TextBlock>Border</TextBlock>
-      </Border>
-      <Border Background="{DynamicResource SystemAccentColorDark1}" 
-              BorderBrush="{DynamicResource SemiTransparentSystemAccentBrush}" 
-              BackgroundSizing="CenterBorder"
-              BorderThickness="8"
-              Padding="12">
-        <TextBlock>Background And CenterBorder</TextBlock>
-      </Border>
-      <Border Background="{DynamicResource SystemAccentColorDark1}" 
-              BorderBrush="{DynamicResource SemiTransparentSystemAccentBrush}" 
-              BackgroundSizing="InnerBorderEdge"
-              BorderThickness="8"
-              Padding="12">
-        <TextBlock>Background And InnerBorderEdge</TextBlock>
-      </Border>
-      <Border Background="{DynamicResource SystemAccentColorDark1}" 
-              BorderBrush="{DynamicResource SemiTransparentSystemAccentBrush}" 
-              BackgroundSizing="OuterBorderEdge"
-              BorderThickness="8"
-              Padding="12">
-        <TextBlock>Background And OuterBorderEdge</TextBlock>
-      </Border>
-      <Border BorderBrush="{DynamicResource SystemAccentColor}"
-              BorderThickness="4"
-              CornerRadius="8"
-              Padding="16">
-        <TextBlock>Rounded Corners</TextBlock>
-      </Border>
-      <Border Background="{DynamicResource SystemAccentColor}"
-              CornerRadius="8"
-              Padding="16">
-        <TextBlock>Rounded Corners</TextBlock>
-      </Border>
-      <Border Width="100" Height="100"
-              BorderThickness="0"
-              Background="White"
-              CornerRadius="100" ClipToBounds="True">
-        <Image Source="/Assets/maple-leaf-888807_640.jpg" Stretch="UniformToFill" />
-      </Border>
-      <TextBlock Text="Border with Clipping" HorizontalAlignment="Center" />
+      <StackPanel Orientation="Vertical"
+                  Margin="0,16,0,0"
+                  HorizontalAlignment="Center"
+                  Spacing="16">
+        <Border BorderBrush="{DynamicResource SystemAccentColor}" BorderThickness="2" Padding="16">
+          <TextBlock>Border</TextBlock>
+        </Border>
+        <Border Background="{DynamicResource SystemAccentColorDark1}"
+                BorderBrush="{DynamicResource SemiTransparentSystemAccentBrush}"
+                BackgroundSizing="CenterBorder"
+                BorderThickness="8"
+                Padding="12">
+          <TextBlock>Background And CenterBorder</TextBlock>
+        </Border>
+        <Border Background="{DynamicResource SystemAccentColorDark1}"
+                BorderBrush="{DynamicResource SemiTransparentSystemAccentBrush}"
+                BackgroundSizing="InnerBorderEdge"
+                BorderThickness="8"
+                Padding="12">
+          <TextBlock>Background And InnerBorderEdge</TextBlock>
+        </Border>
+        <Border Background="{DynamicResource SystemAccentColorDark1}"
+                BorderBrush="{DynamicResource SemiTransparentSystemAccentBrush}"
+                BackgroundSizing="OuterBorderEdge"
+                BorderThickness="8"
+                Padding="12">
+          <TextBlock>Background And OuterBorderEdge</TextBlock>
+        </Border>
+        <Border BorderBrush="{DynamicResource SystemAccentColor}"
+                BorderThickness="4"
+                CornerRadius="8"
+                Padding="16">
+          <TextBlock>Rounded Corners</TextBlock>
+        </Border>
+        <Border Background="{DynamicResource SystemAccentColor}"
+                CornerRadius="8"
+                Padding="16">
+          <TextBlock>Rounded Corners</TextBlock>
+        </Border>
+        <Border Width="100" Height="100"
+                BorderThickness="0"
+                Background="White"
+                CornerRadius="100" ClipToBounds="True">
+          <Image Source="/Assets/maple-leaf-888807_640.jpg" Stretch="UniformToFill" />
+        </Border>
+        <TextBlock Text="Border with Clipping" HorizontalAlignment="Center" />
+      </StackPanel>
     </StackPanel>
-  </StackPanel>
-</UserControl>
+  </ScrollViewer>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/BorderPage.xaml.cs b/samples/ControlCatalog/Pages/BorderPage.xaml.cs
index 944df86f8c..71aebf24ff 100644
--- a/samples/ControlCatalog/Pages/BorderPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/BorderPage.xaml.cs
@@ -2,7 +2,7 @@ using Avalonia.Controls;
 
 namespace ControlCatalog.Pages
 {
-    public partial class BorderPage : UserControl
+    public partial class BorderPage : ContentPage
     {
         public BorderPage()
         {
diff --git a/samples/ControlCatalog/Pages/ButtonSpinnerPage.xaml b/samples/ControlCatalog/Pages/ButtonSpinnerPage.xaml
index 900e304559..c21a772c2a 100644
--- a/samples/ControlCatalog/Pages/ButtonSpinnerPage.xaml
+++ b/samples/ControlCatalog/Pages/ButtonSpinnerPage.xaml
@@ -1,6 +1,7 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<ContentPage Theme="{StaticResource ScrollPage}" xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              x:Class="ControlCatalog.Pages.ButtonSpinnerPage"
+             Header="Button Spinner"
              xmlns:sys="using:System">
 
   <StackPanel Orientation="Vertical" Spacing="4">
@@ -30,4 +31,4 @@
     </StackPanel>
   </StackPanel>
 
-</UserControl>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/ButtonSpinnerPage.xaml.cs b/samples/ControlCatalog/Pages/ButtonSpinnerPage.xaml.cs
index fad4b466fe..28f4b20084 100644
--- a/samples/ControlCatalog/Pages/ButtonSpinnerPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ButtonSpinnerPage.xaml.cs
@@ -3,7 +3,7 @@ using Avalonia.Controls;
 
 namespace ControlCatalog.Pages
 {
-    public partial class ButtonSpinnerPage : UserControl
+    public partial class ButtonSpinnerPage : ContentPage
     {
         public ButtonSpinnerPage()
         {
diff --git a/samples/ControlCatalog/Pages/ButtonsPage.xaml b/samples/ControlCatalog/Pages/ButtonsPage.xaml
index f13581aa18..695ae28515 100644
--- a/samples/ControlCatalog/Pages/ButtonsPage.xaml
+++ b/samples/ControlCatalog/Pages/ButtonsPage.xaml
@@ -1,8 +1,9 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<ContentPage Theme="{StaticResource ScrollPage}" xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             Header="Buttons"
              x:Class="ControlCatalog.Pages.ButtonsPage">
 
-  <UserControl.Resources>
+  <ContentPage.Resources>
 
     <MenuFlyout x:Key="SharedMenuFlyout"
                 Placement="Bottom">
@@ -16,9 +17,9 @@
       <MenuItem Header="Item 3" />
     </MenuFlyout>
 
-  </UserControl.Resources>
+  </ContentPage.Resources>
       
-  <UserControl.Styles >
+  <ContentPage.Styles >
 
     <Style Selector="Border.header-border">
       <Setter Property="Background">
@@ -45,7 +46,7 @@
       <Setter Property="Margin" Value="0,0,0,15" />
     </Style>
 
-  </UserControl.Styles>
+  </ContentPage.Styles>
 
   <!-- Styles and overall page design based on AcrylicPage -->
 
@@ -288,4 +289,4 @@
     </Border>
 
   </StackPanel>
-</UserControl>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/ButtonsPage.xaml.cs b/samples/ControlCatalog/Pages/ButtonsPage.xaml.cs
index 6dcee1ab7d..611fc76241 100644
--- a/samples/ControlCatalog/Pages/ButtonsPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ButtonsPage.xaml.cs
@@ -3,7 +3,7 @@ using Avalonia.Interactivity;
 
 namespace ControlCatalog.Pages
 {
-    public partial class ButtonsPage : UserControl
+    public partial class ButtonsPage : ContentPage
     {
         private int repeatButtonClickCount = 0;
 
diff --git a/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml b/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml
index 8734758d26..769dbc0dac 100644
--- a/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml
+++ b/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml
@@ -1,7 +1,8 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<ContentPage Theme="{StaticResource ScrollPage}" xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:vm="using:ControlCatalog.ViewModels"
              x:DataType="vm:MainWindowViewModel"
+             Header="CalenderDatePicker"
              x:Class="ControlCatalog.Pages.CalendarDatePickerPage">
   <StackPanel Orientation="Vertical" Spacing="4">
     <TextBlock Classes="h2">A control for selecting dates with a calendar drop-down</TextBlock>
@@ -52,4 +53,4 @@
 
     </StackPanel>
   </StackPanel>
-</UserControl>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml.cs b/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml.cs
index 73e1fe4bba..0e4fcbd986 100644
--- a/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml.cs
@@ -3,7 +3,7 @@ using Avalonia.Controls;
 
 namespace ControlCatalog.Pages
 {
-    public partial class CalendarDatePickerPage : UserControl
+    public partial class CalendarDatePickerPage : ContentPage
     {
         public CalendarDatePickerPage()
         {
diff --git a/samples/ControlCatalog/Pages/CalendarPage.xaml b/samples/ControlCatalog/Pages/CalendarPage.xaml
index e142c4da72..99727e9124 100644
--- a/samples/ControlCatalog/Pages/CalendarPage.xaml
+++ b/samples/ControlCatalog/Pages/CalendarPage.xaml
@@ -1,5 +1,6 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<ContentPage Theme="{StaticResource ScrollPage}" xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             Header="Calendar"
              x:Class="ControlCatalog.Pages.CalendarPage">
   <StackPanel Orientation="Vertical" Spacing="4">
     <TextBlock Classes="h2">A calendar control for selecting dates</TextBlock>
@@ -49,4 +50,4 @@
       </StackPanel>
     </WrapPanel>
   </StackPanel>
-</UserControl>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/CalendarPage.xaml.cs b/samples/ControlCatalog/Pages/CalendarPage.xaml.cs
index 56f511be55..d9118326f9 100644
--- a/samples/ControlCatalog/Pages/CalendarPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/CalendarPage.xaml.cs
@@ -3,7 +3,7 @@ using Avalonia.Controls;
 
 namespace ControlCatalog.Pages
 {
-    public partial class CalendarPage : UserControl
+    public partial class CalendarPage : ContentPage
     {
         public CalendarPage()
         {
diff --git a/samples/ControlCatalog/Pages/CanvasPage.xaml b/samples/ControlCatalog/Pages/CanvasPage.xaml
index 416164f391..a9e342181d 100644
--- a/samples/ControlCatalog/Pages/CanvasPage.xaml
+++ b/samples/ControlCatalog/Pages/CanvasPage.xaml
@@ -1,5 +1,6 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<ContentPage Theme="{StaticResource ScrollPage}" xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             Header="Canvas"
              x:Class="ControlCatalog.Pages.CanvasPage">
   <StackPanel Orientation="Vertical" Spacing="4">
     <TextBlock Classes="h2">A panel which lays out its children by explicit coordinates</TextBlock>
@@ -34,4 +35,4 @@
       <Polyline Points="0,0 65,0 78,-26 91,39 104,-39 117,13 130,0 195,0" Stroke="Brown" Canvas.Left="30" Canvas.Top="350"/>
     </Canvas>
   </StackPanel>
-</UserControl>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/CanvasPage.xaml.cs b/samples/ControlCatalog/Pages/CanvasPage.xaml.cs
index e52df597a9..b94aabca94 100644
--- a/samples/ControlCatalog/Pages/CanvasPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/CanvasPage.xaml.cs
@@ -2,7 +2,7 @@ using Avalonia.Controls;
 
 namespace ControlCatalog.Pages
 {
-    public partial class CanvasPage : UserControl
+    public partial class CanvasPage : ContentPage
     {
         public CanvasPage()
         {
diff --git a/samples/ControlCatalog/Pages/CarouselDemoPage.xaml b/samples/ControlCatalog/Pages/CarouselDemoPage.xaml
index df4317fcad..792441ddb4 100644
--- a/samples/ControlCatalog/Pages/CarouselDemoPage.xaml
+++ b/samples/ControlCatalog/Pages/CarouselDemoPage.xaml
@@ -1,11 +1,14 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<ContentPage Theme="{StaticResource ScrollPage}" xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             Header="Carousel Demo Page"
              x:Class="ControlCatalog.Pages.CarouselDemoPage">
-  <NavigationPage x:Name="SampleNav">
-    <NavigationPage.Styles>
-      <Style Selector="NavigationPage#SampleNav /template/ Border#PART_NavigationBar">
-        <Setter Property="Background" Value="Transparent" />
-      </Style>
-    </NavigationPage.Styles>
-  </NavigationPage>
-</UserControl>
+  <Grid>
+    <NavigationPage x:Name="SampleNav">
+      <NavigationPage.Styles>
+        <Style Selector="NavigationPage#SampleNav /template/ Border#PART_NavigationBar">
+          <Setter Property="Background" Value="Transparent" />
+        </Style>
+      </NavigationPage.Styles>
+    </NavigationPage>
+  </Grid>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/CarouselDemoPage.xaml.cs b/samples/ControlCatalog/Pages/CarouselDemoPage.xaml.cs
index 36c9961658..0d59d296f6 100644
--- a/samples/ControlCatalog/Pages/CarouselDemoPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/CarouselDemoPage.xaml.cs
@@ -4,7 +4,7 @@ using Avalonia.Interactivity;
 
 namespace ControlCatalog.Pages
 {
-    public partial class CarouselDemoPage : UserControl
+    public partial class CarouselDemoPage : ContentPage
     {
         private static readonly (string Group, string Title, string Description, Func<UserControl> Factory)[] Demos =
         {
diff --git a/samples/ControlCatalog/Pages/CarouselPage.xaml b/samples/ControlCatalog/Pages/CarouselPage.xaml
index c6e20fec5b..bdb40b9038 100644
--- a/samples/ControlCatalog/Pages/CarouselPage.xaml
+++ b/samples/ControlCatalog/Pages/CarouselPage.xaml
@@ -1,5 +1,6 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<ContentPage Theme="{StaticResource ScrollPage}" xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             Header="Carousel"
              x:Class="ControlCatalog.Pages.CarouselPage">
   <StackPanel Orientation="Vertical" Spacing="4" HorizontalAlignment="Stretch">
     <TextBlock Classes="h2">A swipeable items control that can reveal adjacent pages with ViewportFraction.</TextBlock>
@@ -115,4 +116,4 @@
     </StackPanel>
     
   </StackPanel>
-</UserControl>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/CarouselPage.xaml.cs b/samples/ControlCatalog/Pages/CarouselPage.xaml.cs
index 0a0c973b90..c4a6ffa12f 100644
--- a/samples/ControlCatalog/Pages/CarouselPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/CarouselPage.xaml.cs
@@ -7,7 +7,7 @@ using ControlCatalog.Pages.Transitions;
 
 namespace ControlCatalog.Pages
 {
-    public partial class CarouselPage : UserControl
+    public partial class CarouselPage : ContentPage
     {
         public CarouselPage()
         {
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CareCompanionAppPage.xaml.cs b/samples/ControlCatalog/Pages/CarouselPage/CareCompanionAppPage.xaml.cs
index f7c87f56a3..bc8be3ea87 100644
--- a/samples/ControlCatalog/Pages/CarouselPage/CareCompanionAppPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/CarouselPage/CareCompanionAppPage.xaml.cs
@@ -703,7 +703,7 @@ public partial class CareCompanionAppPage : UserControl
 
         var home = BuildHomeTab();
         home.Header = "Home";
-        home.Icon = Geometry.Parse("M10 20v-6h4v6h5v-8h3L12 3 2 12h3v8z");
+        home.Icon = new PathIcon { Data = Geometry.Parse("M10 20v-6h4v6h5v-8h3L12 3 2 12h3v8z") };
 
         tp.Pages = new ObservableCollection<Page>
         {
@@ -729,7 +729,7 @@ public partial class CareCompanionAppPage : UserControl
         => new ContentPage
         {
             Header = header,
-            Icon = Geometry.Parse(iconData),
+            Icon = new PathIcon { Data = Geometry.Parse(iconData) },
             Background = new SolidColorBrush(BgLight),
             Content = new StackPanel
             {
diff --git a/samples/ControlCatalog/Pages/CarouselPage/SanctuaryMainPage.xaml b/samples/ControlCatalog/Pages/CarouselPage/SanctuaryMainPage.xaml
index b701ab89ba..d8d5f322c3 100644
--- a/samples/ControlCatalog/Pages/CarouselPage/SanctuaryMainPage.xaml
+++ b/samples/ControlCatalog/Pages/CarouselPage/SanctuaryMainPage.xaml
@@ -93,7 +93,7 @@
       <ContentPage Header="Home"
                    Background="#221710">
         <ContentPage.Icon>
-          <StreamGeometry>M10 20v-6h4v6h5v-8h3L12 3 2 12h3v8z</StreamGeometry>
+          <PathIcon Data="M10 20v-6h4v6h5v-8h3L12 3 2 12h3v8z" />
         </ContentPage.Icon>
         <ScrollViewer HorizontalScrollBarVisibility="Disabled"
                       VerticalScrollBarVisibility="Hidden">
@@ -243,7 +243,7 @@
       <ContentPage Header="Explore"
                    Background="#221710">
         <ContentPage.Icon>
-          <StreamGeometry>M12 10.9c-.61 0-1.1.49-1.1 1.1s.49 1.1 1.1 1.1c.61 0 1.1-.49 1.1-1.1s-.49-1.1-1.1-1.1zM12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm2.19 12.19L6 18l3.81-8.19L18 6l-3.81 8.19z</StreamGeometry>
+          <PathIcon Data="M12 10.9c-.61 0-1.1.49-1.1 1.1s.49 1.1 1.1 1.1c.61 0 1.1-.49 1.1-1.1s-.49-1.1-1.1-1.1zM12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm2.19 12.19L6 18l3.81-8.19L18 6l-3.81 8.19z" />
         </ContentPage.Icon>
         <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"
                     Spacing="12" Margin="32">
@@ -260,7 +260,7 @@
       <ContentPage Header="Saved"
                    Background="#221710">
         <ContentPage.Icon>
-          <StreamGeometry>M12 21.35l-1.45-1.32C5.4 15.36 2 12.28 2 8.5 2 5.42 4.42 3 7.5 3c1.74 0 3.41.81 4.5 2.09C13.09 3.81 14.76 3 16.5 3 19.58 3 22 5.42 22 8.5c0 3.78-3.4 6.86-8.55 11.54L12 21.35z</StreamGeometry>
+          <PathIcon Data="M12 21.35l-1.45-1.32C5.4 15.36 2 12.28 2 8.5 2 5.42 4.42 3 7.5 3c1.74 0 3.41.81 4.5 2.09C13.09 3.81 14.76 3 16.5 3 19.58 3 22 5.42 22 8.5c0 3.78-3.4 6.86-8.55 11.54L12 21.35z" />
         </ContentPage.Icon>
         <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"
                     Spacing="12" Margin="32">
@@ -277,7 +277,7 @@
       <ContentPage Header="Profile"
                    Background="#221710">
         <ContentPage.Icon>
-          <StreamGeometry>M12 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm0 2c-2.67 0-8 1.34-8 4v2h16v-2c0-2.66-5.33-4-8-4z</StreamGeometry>
+          <PathIcon Data="M12 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm0 2c-2.67 0-8 1.34-8 4v2h16v-2c0-2.66-5.33-4-8-4z" />
         </ContentPage.Icon>
         <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"
                     Spacing="12" Margin="32">
diff --git a/samples/ControlCatalog/Pages/CheckBoxPage.xaml b/samples/ControlCatalog/Pages/CheckBoxPage.xaml
index 2f60fc5dae..4f9c59448b 100644
--- a/samples/ControlCatalog/Pages/CheckBoxPage.xaml
+++ b/samples/ControlCatalog/Pages/CheckBoxPage.xaml
@@ -1,5 +1,6 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<ContentPage Theme="{StaticResource ScrollPage}" xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             Header="CheckBox"
              x:Class="ControlCatalog.Pages.CheckBoxPage">
   <StackPanel Orientation="Vertical" Spacing="4">
     <TextBlock Classes="h2">A check box control</TextBlock>
@@ -25,4 +26,4 @@
       </StackPanel>
     </StackPanel>
   </StackPanel>
-</UserControl>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/CheckBoxPage.xaml.cs b/samples/ControlCatalog/Pages/CheckBoxPage.xaml.cs
index 95ff21ef6d..b63d7084d6 100644
--- a/samples/ControlCatalog/Pages/CheckBoxPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/CheckBoxPage.xaml.cs
@@ -2,7 +2,7 @@ using Avalonia.Controls;
 
 namespace ControlCatalog.Pages
 {
-    public partial class CheckBoxPage : UserControl
+    public partial class CheckBoxPage : ContentPage
     {
         public CheckBoxPage()
         {
diff --git a/samples/ControlCatalog/Pages/ClipboardPage.xaml b/samples/ControlCatalog/Pages/ClipboardPage.xaml
index 864a520aca..86e99b9305 100644
--- a/samples/ControlCatalog/Pages/ClipboardPage.xaml
+++ b/samples/ControlCatalog/Pages/ClipboardPage.xaml
@@ -1,5 +1,6 @@
-<UserControl x:Class="ControlCatalog.Pages.ClipboardPage"
+<ContentPage Theme="{StaticResource ScrollPage}" x:Class="ControlCatalog.Pages.ClipboardPage"
              xmlns="https://github.com/avaloniaui"
+             Header="Clipboard"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <StackPanel Orientation="Vertical" Spacing="4">
     <TextBlock Classes="h2">Example of ClipboardPage capabilities</TextBlock>
@@ -27,4 +28,4 @@
       />
     </Viewbox>
   </StackPanel>
-</UserControl>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/ClipboardPage.xaml.cs b/samples/ControlCatalog/Pages/ClipboardPage.xaml.cs
index 4cdde6b824..0bc5447313 100644
--- a/samples/ControlCatalog/Pages/ClipboardPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ClipboardPage.xaml.cs
@@ -15,14 +15,12 @@ using Avalonia.Threading;
 
 namespace ControlCatalog.Pages
 {
-    public partial class ClipboardPage : UserControl
+    public partial class ClipboardPage : ContentPage
     {
         private readonly DataFormat<byte[]> _customBinaryDataFormat =
             DataFormat.CreateBytesApplicationFormat("controlcatalog-binary-data");
 
         private INotificationManager? _notificationManager;
-        private INotificationManager NotificationManager => _notificationManager
-            ??= new WindowNotificationManager(TopLevel.GetTopLevel(this)!);
 
         private readonly DispatcherTimer _clipboardLastDataObjectChecker;
         private DataTransfer? _storedDataTransfer;
@@ -107,7 +105,7 @@ namespace ControlCatalog.Pages
 
                 if (invalidFile.Count > 0)
                 {
-                    NotificationManager.Show(new Notification("Warning", "There is one o more invalid path.", NotificationType.Warning));
+                    _notificationManager?.Show(new Notification("Warning", "There is one o more invalid path.", NotificationType.Warning));
                 }
 
                 if (files.Count > 0)
@@ -116,11 +114,11 @@ namespace ControlCatalog.Pages
                     foreach (var file in files)
                         dataTransfer.Add(DataTransferItem.Create(DataFormat.File, file));
                     await clipboard.SetDataAsync(dataTransfer);
-                    NotificationManager.Show(new Notification("Success", "Copy completed.", NotificationType.Success));
+                    _notificationManager?.Show(new Notification("Success", "Copy completed.", NotificationType.Success));
                 }
                 else
                 {
-                    NotificationManager.Show(new Notification("Warning", "Any files to copy in Clipboard.", NotificationType.Warning));
+                    _notificationManager?.Show(new Notification("Warning", "Any files to copy in Clipboard.", NotificationType.Warning));
                 }
             }
         }
@@ -179,6 +177,7 @@ namespace ControlCatalog.Pages
         {
             _clipboardLastDataObjectChecker.Start();
             base.OnAttachedToVisualTree(e);
+            _notificationManager = new WindowNotificationManager(TopLevel.GetTopLevel(this)!);
         }
 
         protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
diff --git a/samples/ControlCatalog/Pages/ColorPickerPage.xaml b/samples/ControlCatalog/Pages/ColorPickerPage.xaml
index fb397085e7..f0b303e0d4 100644
--- a/samples/ControlCatalog/Pages/ColorPickerPage.xaml
+++ b/samples/ControlCatalog/Pages/ColorPickerPage.xaml
@@ -1,4 +1,4 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<ContentPage Theme="{StaticResource ScrollPage}" 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"
@@ -7,11 +7,12 @@
              mc:Ignorable="d"
              d:DesignWidth="800"
              d:DesignHeight="450"
+             Header="Color Picker"
              x:Class="ControlCatalog.Pages.ColorPickerPage">
 
-  <UserControl.Resources>
+  <ContentPage.Resources>
     <converters:ColorToBrushConverter x:Key="ToBrushConverter"/>
-  </UserControl.Resources>
+  </ContentPage.Resources>
 
   <Grid x:Name="LayoutRoot"
         ColumnDefinitions="Auto,10,Auto"
@@ -125,4 +126,4 @@
                       Margin="0,2,0,0" />
     </Grid>
   </Grid>
-</UserControl>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/ColorPickerPage.xaml.cs b/samples/ControlCatalog/Pages/ColorPickerPage.xaml.cs
index 4d2d236ed3..cc225b576d 100644
--- a/samples/ControlCatalog/Pages/ColorPickerPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ColorPickerPage.xaml.cs
@@ -5,7 +5,7 @@ using Avalonia.Media;
 
 namespace ControlCatalog.Pages
 {
-    public partial class ColorPickerPage : UserControl
+    public partial class ColorPickerPage : ContentPage
     {
         public ColorPickerPage()
         {
diff --git a/samples/ControlCatalog/Pages/ComboBoxPage.xaml b/samples/ControlCatalog/Pages/ComboBoxPage.xaml
index 449c10f000..149fd73d0a 100644
--- a/samples/ControlCatalog/Pages/ComboBoxPage.xaml
+++ b/samples/ControlCatalog/Pages/ComboBoxPage.xaml
@@ -1,4 +1,4 @@
-<UserControl
+<ContentPage
     x:Class="ControlCatalog.Pages.ComboBoxPage"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -149,4 +149,4 @@
             </WrapPanel>
         </StackPanel>
     </StackPanel>
-</UserControl>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/ComboBoxPage.xaml.cs b/samples/ControlCatalog/Pages/ComboBoxPage.xaml.cs
index 301b052cb8..720aae9ef5 100644
--- a/samples/ControlCatalog/Pages/ComboBoxPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ComboBoxPage.xaml.cs
@@ -4,7 +4,7 @@ using ControlCatalog.ViewModels;
 
 namespace ControlCatalog.Pages
 {
-    public partial class ComboBoxPage : UserControl
+    public partial class ComboBoxPage : ContentPage
     {
         public ComboBoxPage()
         {
diff --git a/samples/ControlCatalog/Pages/CommandBar/CommandBarCustomizationPage.xaml b/samples/ControlCatalog/Pages/CommandBar/CommandBarCustomizationPage.xaml
index 1ea3349129..3ce911d9f8 100644
--- a/samples/ControlCatalog/Pages/CommandBar/CommandBarCustomizationPage.xaml
+++ b/samples/ControlCatalog/Pages/CommandBar/CommandBarCustomizationPage.xaml
@@ -15,9 +15,9 @@
         <TextBlock Text="Live Preview" FontWeight="SemiBold" FontSize="13" />
         <CommandBar x:Name="LiveBar">
           <CommandBar.PrimaryCommands>
-            <AppBarButton Label="New"><AppBarButton.Icon><PathIcon Data="{StaticResource AddIcon}" /></AppBarButton.Icon></AppBarButton>
-            <AppBarButton Label="Save"><AppBarButton.Icon><PathIcon Data="{StaticResource SaveIcon}" /></AppBarButton.Icon></AppBarButton>
-            <AppBarButton Label="Share"><AppBarButton.Icon><PathIcon Data="{StaticResource ShareIcon}" /></AppBarButton.Icon></AppBarButton>
+            <CommandBarButton Label="New"><CommandBarButton.Icon><PathIcon Data="{StaticResource AddIcon}" /></CommandBarButton.Icon></CommandBarButton>
+            <CommandBarButton Label="Save"><CommandBarButton.Icon><PathIcon Data="{StaticResource SaveIcon}" /></CommandBarButton.Icon></CommandBarButton>
+            <CommandBarButton Label="Share"><CommandBarButton.Icon><PathIcon Data="{StaticResource ShareIcon}" /></CommandBarButton.Icon></CommandBarButton>
           </CommandBar.PrimaryCommands>
         </CommandBar>
 
@@ -74,7 +74,7 @@
         <TextBlock Text="About" FontWeight="SemiBold" />
         <TextBlock Text="CommandBar inherits from TemplatedControl, so Background, Foreground, BorderBrush, BorderThickness, and CornerRadius are available out of the box."
                    FontSize="12" Opacity="0.7" TextWrapping="Wrap" />
-        <TextBlock Text="Foreground is an inherited property: setting it on the CommandBar cascades to all PathIcons inside AppBarButton/AppBarToggleButton."
+        <TextBlock Text="Foreground is an inherited property: setting it on the CommandBar cascades to all PathIcons inside CommandBarButton/CommandBarToggleButton."
                    FontSize="12" Opacity="0.7" TextWrapping="Wrap" Margin="0,4,0,0" />
       </StackPanel>
     </ScrollViewer>
@@ -89,20 +89,20 @@
 
         <TextBlock Text="Default theme" FontSize="12" Opacity="0.7" />
         <CommandBar OverflowButtonVisibility="Collapsed">
-          <AppBarButton Label="New"><AppBarButton.Icon><PathIcon Data="{StaticResource AddIcon}" /></AppBarButton.Icon></AppBarButton>
-          <AppBarButton Label="Save"><AppBarButton.Icon><PathIcon Data="{StaticResource SaveIcon}" /></AppBarButton.Icon></AppBarButton>
+          <CommandBarButton Label="New"><CommandBarButton.Icon><PathIcon Data="{StaticResource AddIcon}" /></CommandBarButton.Icon></CommandBarButton>
+          <CommandBarButton Label="Save"><CommandBarButton.Icon><PathIcon Data="{StaticResource SaveIcon}" /></CommandBarButton.Icon></CommandBarButton>
         </CommandBar>
 
         <TextBlock Text="Solid color" FontSize="12" Opacity="0.7" />
         <CommandBar Background="#0078D4" Foreground="White" OverflowButtonVisibility="Collapsed">
-          <AppBarButton Label="New"><AppBarButton.Icon><PathIcon Data="{StaticResource AddIcon}" /></AppBarButton.Icon></AppBarButton>
-          <AppBarButton Label="Save"><AppBarButton.Icon><PathIcon Data="{StaticResource SaveIcon}" /></AppBarButton.Icon></AppBarButton>
+          <CommandBarButton Label="New"><CommandBarButton.Icon><PathIcon Data="{StaticResource AddIcon}" /></CommandBarButton.Icon></CommandBarButton>
+          <CommandBarButton Label="Save"><CommandBarButton.Icon><PathIcon Data="{StaticResource SaveIcon}" /></CommandBarButton.Icon></CommandBarButton>
         </CommandBar>
 
         <TextBlock Text="Dark" FontSize="12" Opacity="0.7" />
         <CommandBar Background="#1C1C1E" Foreground="White" OverflowButtonVisibility="Collapsed">
-          <AppBarButton Label="New"><AppBarButton.Icon><PathIcon Data="{StaticResource AddIcon}" /></AppBarButton.Icon></AppBarButton>
-          <AppBarButton Label="Save"><AppBarButton.Icon><PathIcon Data="{StaticResource SaveIcon}" /></AppBarButton.Icon></AppBarButton>
+          <CommandBarButton Label="New"><CommandBarButton.Icon><PathIcon Data="{StaticResource AddIcon}" /></CommandBarButton.Icon></CommandBarButton>
+          <CommandBarButton Label="Save"><CommandBarButton.Icon><PathIcon Data="{StaticResource SaveIcon}" /></CommandBarButton.Icon></CommandBarButton>
         </CommandBar>
 
         <TextBlock Text="Pill shape (CornerRadius=20)" FontSize="12" Opacity="0.7" />
@@ -111,8 +111,8 @@
                     BorderBrush="#CCCCCC"
                     BorderThickness="1"
                     OverflowButtonVisibility="Collapsed">
-          <AppBarButton Label="New"><AppBarButton.Icon><PathIcon Data="{StaticResource AddIcon}" /></AppBarButton.Icon></AppBarButton>
-          <AppBarButton Label="Save"><AppBarButton.Icon><PathIcon Data="{StaticResource SaveIcon}" /></AppBarButton.Icon></AppBarButton>
+          <CommandBarButton Label="New"><CommandBarButton.Icon><PathIcon Data="{StaticResource AddIcon}" /></CommandBarButton.Icon></CommandBarButton>
+          <CommandBarButton Label="Save"><CommandBarButton.Icon><PathIcon Data="{StaticResource SaveIcon}" /></CommandBarButton.Icon></CommandBarButton>
         </CommandBar>
       </StackPanel>
     </ScrollViewer>
diff --git a/samples/ControlCatalog/Pages/CommandBar/CommandBarDynamicOverflowPage.xaml b/samples/ControlCatalog/Pages/CommandBar/CommandBarDynamicOverflowPage.xaml
index 2f771ab42e..f3098dee0f 100644
--- a/samples/ControlCatalog/Pages/CommandBar/CommandBarDynamicOverflowPage.xaml
+++ b/samples/ControlCatalog/Pages/CommandBar/CommandBarDynamicOverflowPage.xaml
@@ -8,6 +8,7 @@
     <StreamGeometry x:Key="BoldIcon">M15.6,10.79C17.04,10.07 18,8.64 18,7C18,4.79 16.21,3 14,3H7V21H14.73C16.78,21 18.5,19.37 18.5,17.32C18.5,15.82 17.72,14.53 16.5,13.77C16.2,13.59 15.9,13.44 15.6,13.32V10.79M10,6.5H13C13.83,6.5 14.5,7.17 14.5,8C14.5,8.83 13.83,9.5 13,9.5H10V6.5M13.5,17.5H10V14H13.5C14.33,14 15,14.67 15,15.5C15,16.33 14.33,17.5 13.5,17.5Z</StreamGeometry>
     <StreamGeometry x:Key="ItalicIcon">M10,4V7H12.21L8.79,15H6V18H14V15H11.79L15.21,7H18V4H10Z</StreamGeometry>
     <StreamGeometry x:Key="DeleteIcon">M19,4H15.5L14.5,3H9.5L8.5,4H5V6H19M6,19A2,2 0 0,0 8,21H16A2,2 0 0,0 18,19V7H6V19Z</StreamGeometry>
+    <StreamGeometry x:Key="ExportIcon">M14,2H6A2,2 0 0,0 4,4V20A2,2 0 0,0 6,22H18A2,2 0 0,0 20,20V8L14,2M18,20H6V4H13V9H18V20M16,11V18.1L13.9,16L11.1,18.8L8.3,16L11.1,13.2L9,11.1L16,11Z</StreamGeometry>
   </UserControl.Resources>
 
   <DockPanel>
@@ -33,6 +34,18 @@
                   IsChecked="True"
                   IsCheckedChanged="OnDynamicOverflowChanged" />
 
+        <CheckBox x:Name="SecondaryVisibleCheck"
+                  Content="Include secondary command"
+                  IsChecked="False"
+                  IsCheckedChanged="OnSecondaryVisibilityChanged" />
+
+        <Separator />
+
+        <TextBlock Text="Resize to force grouped commands into overflow and verify that primary separators never become leading, trailing, or overflow items."
+                   FontSize="12"
+                   Opacity="0.7"
+                   TextWrapping="Wrap" />
+
         <Separator />
 
         <TextBlock Text="Overflow Priority" FontWeight="SemiBold" />
@@ -47,11 +60,11 @@
 
     <Border DockPanel.Dock="Right" Width="1" Background="{DynamicResource SystemControlForegroundBaseMediumLowBrush}" />
 
-    <StackPanel Margin="12" Spacing="8">
-      <TextBlock x:Name="StatusText"
-                 Text="Showing 6 of 6 commands, 0 in overflow"
-                 FontSize="12"
-                 Opacity="0.7" />
+      <StackPanel Margin="12" Spacing="8">
+        <TextBlock x:Name="StatusText"
+                   Text="Visible primary: 6 commands, 2 separators&#x0a;Overflow items: 2 commands, 1 separator&#x0a;Synthetic overflow divider: present"
+                   FontSize="12"
+                   Opacity="0.7" />
       <Border x:Name="BarContainer"
               Width="400"
               HorizontalAlignment="Left"
@@ -61,13 +74,18 @@
               ClipToBounds="True">
         <CommandBar x:Name="DemoBar" IsDynamicOverflowEnabled="True">
           <CommandBar.PrimaryCommands>
-            <AppBarButton Label="New" DynamicOverflowOrder="0"><AppBarButton.Icon><PathIcon Data="{StaticResource AddIcon}" /></AppBarButton.Icon></AppBarButton>
-            <AppBarButton Label="Save" DynamicOverflowOrder="0"><AppBarButton.Icon><PathIcon Data="{StaticResource SaveIcon}" /></AppBarButton.Icon></AppBarButton>
-            <AppBarButton Label="Share" DynamicOverflowOrder="1"><AppBarButton.Icon><PathIcon Data="{StaticResource ShareIcon}" /></AppBarButton.Icon></AppBarButton>
-            <AppBarButton Label="Bold" DynamicOverflowOrder="2"><AppBarButton.Icon><PathIcon Data="{StaticResource BoldIcon}" /></AppBarButton.Icon></AppBarButton>
-            <AppBarButton Label="Italic" DynamicOverflowOrder="2"><AppBarButton.Icon><PathIcon Data="{StaticResource ItalicIcon}" /></AppBarButton.Icon></AppBarButton>
-            <AppBarButton Label="Delete" DynamicOverflowOrder="3"><AppBarButton.Icon><PathIcon Data="{StaticResource DeleteIcon}" /></AppBarButton.Icon></AppBarButton>
+            <CommandBarButton Label="New" DynamicOverflowOrder="0"><CommandBarButton.Icon><PathIcon Data="{StaticResource AddIcon}" /></CommandBarButton.Icon></CommandBarButton>
+            <CommandBarButton Label="Save" DynamicOverflowOrder="0"><CommandBarButton.Icon><PathIcon Data="{StaticResource SaveIcon}" /></CommandBarButton.Icon></CommandBarButton>
+            <CommandBarSeparator />
+            <CommandBarButton Label="Share" DynamicOverflowOrder="1"><CommandBarButton.Icon><PathIcon Data="{StaticResource ShareIcon}" /></CommandBarButton.Icon></CommandBarButton>
+            <CommandBarButton Label="Bold" DynamicOverflowOrder="2"><CommandBarButton.Icon><PathIcon Data="{StaticResource BoldIcon}" /></CommandBarButton.Icon></CommandBarButton>
+            <CommandBarSeparator />
+            <CommandBarButton Label="Italic" DynamicOverflowOrder="2"><CommandBarButton.Icon><PathIcon Data="{StaticResource ItalicIcon}" /></CommandBarButton.Icon></CommandBarButton>
+            <CommandBarButton Label="Delete" DynamicOverflowOrder="3"><CommandBarButton.Icon><PathIcon Data="{StaticResource DeleteIcon}" /></CommandBarButton.Icon></CommandBarButton>
           </CommandBar.PrimaryCommands>
+          <CommandBar.SecondaryCommands>
+            <CommandBarButton x:Name="DemoSecondaryCommand" Label="Export"><CommandBarButton.Icon><PathIcon Data="{StaticResource ExportIcon}" /></CommandBarButton.Icon></CommandBarButton>
+          </CommandBar.SecondaryCommands>
         </CommandBar>
       </Border>
     </StackPanel>
diff --git a/samples/ControlCatalog/Pages/CommandBar/CommandBarDynamicOverflowPage.xaml.cs b/samples/ControlCatalog/Pages/CommandBar/CommandBarDynamicOverflowPage.xaml.cs
index 45a1c95527..19a451b55c 100644
--- a/samples/ControlCatalog/Pages/CommandBar/CommandBarDynamicOverflowPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/CommandBar/CommandBarDynamicOverflowPage.xaml.cs
@@ -9,7 +9,13 @@ namespace ControlCatalog.Pages
         public CommandBarDynamicOverflowPage()
         {
             InitializeComponent();
+            if (SecondaryVisibleCheck.IsChecked != true)
+            {
+                DemoBar.SecondaryCommands?.Remove(DemoSecondaryCommand);
+            }
+
             ((INotifyCollectionChanged)DemoBar.OverflowItems).CollectionChanged += OnOverflowChanged;
+            ((INotifyCollectionChanged)DemoBar.VisiblePrimaryCommands).CollectionChanged += OnOverflowChanged;
             UpdateStatus();
         }
 
@@ -29,6 +35,26 @@ namespace ControlCatalog.Pages
             DemoBar.IsDynamicOverflowEnabled = DynamicOverflowCheck.IsChecked == true;
         }
 
+        private void OnSecondaryVisibilityChanged(object? sender, RoutedEventArgs e)
+        {
+            if (DemoBar?.SecondaryCommands == null || DemoSecondaryCommand == null)
+                return;
+
+            bool shouldInclude = SecondaryVisibleCheck.IsChecked == true;
+            bool isIncluded = DemoBar.SecondaryCommands.Contains(DemoSecondaryCommand);
+
+            if (shouldInclude && !isIncluded)
+            {
+                DemoBar.SecondaryCommands.Add(DemoSecondaryCommand);
+            }
+            else if (!shouldInclude && isIncluded)
+            {
+                DemoBar.SecondaryCommands.Remove(DemoSecondaryCommand);
+            }
+
+            UpdateStatus();
+        }
+
         private void OnOverflowChanged(object? sender, NotifyCollectionChangedEventArgs e)
         {
             UpdateStatus();
@@ -36,10 +62,40 @@ namespace ControlCatalog.Pages
 
         private void UpdateStatus()
         {
-            var total = DemoBar.PrimaryCommands.Count;
-            var overflow = DemoBar.OverflowItems.Count;
-            var visible = total - overflow;
-            StatusText.Text = $"Showing {visible} of {total} commands, {overflow} in overflow";
+            int visiblePrimaryCommandCount = 0;
+            int visiblePrimarySeparatorCount = 0;
+            foreach (var item in DemoBar.VisiblePrimaryCommands)
+            {
+                if (item is CommandBarSeparator)
+                    visiblePrimarySeparatorCount++;
+                else
+                    visiblePrimaryCommandCount++;
+            }
+
+            int overflowCommandCount = 0;
+            int overflowSeparatorCount = 0;
+            bool hasSyntheticOverflowDivider = false;
+            foreach (var item in DemoBar.OverflowItems)
+            {
+                if (item is CommandBarSeparator separator)
+                {
+                    overflowSeparatorCount++;
+                    if (!DemoBar.PrimaryCommands.Contains(separator) &&
+                        !DemoBar.SecondaryCommands.Contains(separator))
+                    {
+                        hasSyntheticOverflowDivider = true;
+                    }
+                }
+                else
+                {
+                    overflowCommandCount++;
+                }
+            }
+
+            StatusText.Text =
+                $"Visible primary: {visiblePrimaryCommandCount} commands, {visiblePrimarySeparatorCount} separators\n" +
+                $"Overflow items: {overflowCommandCount} commands, {overflowSeparatorCount} separators\n" +
+                $"Synthetic overflow divider: {(hasSyntheticOverflowDivider ? "present" : "absent")}";
         }
     }
 }
diff --git a/samples/ControlCatalog/Pages/CommandBar/CommandBarEventsPage.xaml b/samples/ControlCatalog/Pages/CommandBar/CommandBarEventsPage.xaml
index 8dbc44e19b..b4728aa918 100644
--- a/samples/ControlCatalog/Pages/CommandBar/CommandBarEventsPage.xaml
+++ b/samples/ControlCatalog/Pages/CommandBar/CommandBarEventsPage.xaml
@@ -64,13 +64,13 @@
         <CommandBar x:Name="DemoBar"
                     OverflowButtonVisibility="Auto">
           <CommandBar.PrimaryCommands>
-            <AppBarButton Label="New"><AppBarButton.Icon><PathIcon Data="{StaticResource AddIcon}" /></AppBarButton.Icon></AppBarButton>
-            <AppBarButton Label="Save"><AppBarButton.Icon><PathIcon Data="{StaticResource SaveIcon}" /></AppBarButton.Icon></AppBarButton>
-            <AppBarButton Label="Share"><AppBarButton.Icon><PathIcon Data="{StaticResource ShareIcon}" /></AppBarButton.Icon></AppBarButton>
+            <CommandBarButton Label="New"><CommandBarButton.Icon><PathIcon Data="{StaticResource AddIcon}" /></CommandBarButton.Icon></CommandBarButton>
+            <CommandBarButton Label="Save"><CommandBarButton.Icon><PathIcon Data="{StaticResource SaveIcon}" /></CommandBarButton.Icon></CommandBarButton>
+            <CommandBarButton Label="Share"><CommandBarButton.Icon><PathIcon Data="{StaticResource ShareIcon}" /></CommandBarButton.Icon></CommandBarButton>
           </CommandBar.PrimaryCommands>
           <CommandBar.SecondaryCommands>
-            <AppBarButton Label="Export"><AppBarButton.Icon><PathIcon Data="{StaticResource ExportIcon}" /></AppBarButton.Icon></AppBarButton>
-            <AppBarButton Label="Delete"><AppBarButton.Icon><PathIcon Data="{StaticResource DeleteIcon}" /></AppBarButton.Icon></AppBarButton>
+            <CommandBarButton Label="Export"><CommandBarButton.Icon><PathIcon Data="{StaticResource ExportIcon}" /></CommandBarButton.Icon></CommandBarButton>
+            <CommandBarButton Label="Delete"><CommandBarButton.Icon><PathIcon Data="{StaticResource DeleteIcon}" /></CommandBarButton.Icon></CommandBarButton>
           </CommandBar.SecondaryCommands>
         </CommandBar>
 
diff --git a/samples/ControlCatalog/Pages/CommandBar/CommandBarEventsPage.xaml.cs b/samples/ControlCatalog/Pages/CommandBar/CommandBarEventsPage.xaml.cs
index c2f0b439f0..f82fcbddb9 100644
--- a/samples/ControlCatalog/Pages/CommandBar/CommandBarEventsPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/CommandBar/CommandBarEventsPage.xaml.cs
@@ -141,13 +141,13 @@ namespace ControlCatalog.Pages
 
         private void OnCommandItemClick(object? sender, RoutedEventArgs e)
         {
-            if (sender is AppBarButton button)
+            if (sender is CommandBarButton button)
                 AppendLog($"Click, {button.Label}, {DescribePlacement(button)}");
         }
 
-        private AppBarButton CreateButton(string label)
+        private CommandBarButton CreateButton(string label)
         {
-            var button = new AppBarButton
+            var button = new CommandBarButton
             {
                 Label = label,
                 Icon = new PathIcon
@@ -170,14 +170,14 @@ namespace ControlCatalog.Pages
         {
             foreach (var item in items)
             {
-                if (item is AppBarButton button)
+                if (item is CommandBarButton button)
                     button.Click -= OnCommandItemClick;
             }
         }
 
         private void AttachItemHandler(ICommandBarElement item)
         {
-            if (item is not AppBarButton button)
+            if (item is not CommandBarButton button)
                 return;
 
             button.Click -= OnCommandItemClick;
@@ -191,10 +191,10 @@ namespace ControlCatalog.Pages
                 return;
 
             var item = items[^1];
-            var label = item is AppBarButton button ? button.Label ?? "(unnamed)" : item.GetType().Name;
+            var label = item is CommandBarButton button ? button.Label ?? "(unnamed)" : item.GetType().Name;
 
-            if (item is AppBarButton appBarButton)
-                appBarButton.Click -= OnCommandItemClick;
+            if (item is CommandBarButton commandBarButton)
+                commandBarButton.Click -= OnCommandItemClick;
 
             items.RemoveAt(items.Count - 1);
 
@@ -202,7 +202,7 @@ namespace ControlCatalog.Pages
             RefreshState();
         }
 
-        private static string DescribePlacement(AppBarButton button)
+        private static string DescribePlacement(CommandBarButton button)
         {
             return button.IsInOverflow ? "overflow" : "primary";
         }
diff --git a/samples/ControlCatalog/Pages/CommandBar/CommandBarFirstLookPage.xaml b/samples/ControlCatalog/Pages/CommandBar/CommandBarFirstLookPage.xaml
index b83d1c3e57..60c23d9c64 100644
--- a/samples/ControlCatalog/Pages/CommandBar/CommandBarFirstLookPage.xaml
+++ b/samples/ControlCatalog/Pages/CommandBar/CommandBarFirstLookPage.xaml
@@ -36,7 +36,7 @@
         <Separator />
 
         <TextBlock Text="Separators" FontWeight="SemiBold" />
-        <TextBlock Text="AppBarSeparator creates visual dividers between command groups."
+        <TextBlock Text="CommandBarSeparator creates visual dividers between command groups."
                    FontSize="12" Opacity="0.7" TextWrapping="Wrap" />
       </StackPanel>
     </ScrollViewer>
@@ -52,35 +52,35 @@
             <TextBlock Text="Document Editor" VerticalAlignment="Center" Margin="8,0" />
           </CommandBar.Content>
           <CommandBar.PrimaryCommands>
-            <AppBarButton Label="New" Click="OnButtonClick">
-              <AppBarButton.Icon><PathIcon Data="{StaticResource AddIcon}" /></AppBarButton.Icon>
-            </AppBarButton>
-            <AppBarButton Label="Save" Click="OnButtonClick">
-              <AppBarButton.Icon><PathIcon Data="{StaticResource SaveIcon}" /></AppBarButton.Icon>
-            </AppBarButton>
-            <AppBarSeparator />
-            <AppBarToggleButton Label="Bold" IsCheckedChanged="OnToggleChanged">
-              <AppBarToggleButton.Icon><PathIcon Data="{StaticResource BoldIcon}" /></AppBarToggleButton.Icon>
-            </AppBarToggleButton>
-            <AppBarToggleButton Label="Italic" IsCheckedChanged="OnToggleChanged">
-              <AppBarToggleButton.Icon><PathIcon Data="{StaticResource ItalicIcon}" /></AppBarToggleButton.Icon>
-            </AppBarToggleButton>
-            <AppBarSeparator />
-            <AppBarButton Label="Share" Click="OnButtonClick">
-              <AppBarButton.Icon><PathIcon Data="{StaticResource ShareIcon}" /></AppBarButton.Icon>
-            </AppBarButton>
+            <CommandBarButton Label="New" Click="OnButtonClick">
+              <CommandBarButton.Icon><PathIcon Data="{StaticResource AddIcon}" /></CommandBarButton.Icon>
+            </CommandBarButton>
+            <CommandBarButton Label="Save" Click="OnButtonClick">
+              <CommandBarButton.Icon><PathIcon Data="{StaticResource SaveIcon}" /></CommandBarButton.Icon>
+            </CommandBarButton>
+            <CommandBarSeparator />
+            <CommandBarToggleButton Label="Bold" IsCheckedChanged="OnToggleChanged">
+              <CommandBarToggleButton.Icon><PathIcon Data="{StaticResource BoldIcon}" /></CommandBarToggleButton.Icon>
+            </CommandBarToggleButton>
+            <CommandBarToggleButton Label="Italic" IsCheckedChanged="OnToggleChanged">
+              <CommandBarToggleButton.Icon><PathIcon Data="{StaticResource ItalicIcon}" /></CommandBarToggleButton.Icon>
+            </CommandBarToggleButton>
+            <CommandBarSeparator />
+            <CommandBarButton Label="Share" Click="OnButtonClick">
+              <CommandBarButton.Icon><PathIcon Data="{StaticResource ShareIcon}" /></CommandBarButton.Icon>
+            </CommandBarButton>
           </CommandBar.PrimaryCommands>
           <CommandBar.SecondaryCommands>
-            <AppBarButton Label="Export" Click="OnButtonClick">
-              <AppBarButton.Icon><PathIcon Data="{StaticResource ExportIcon}" /></AppBarButton.Icon>
-            </AppBarButton>
-            <AppBarButton Label="Print" Click="OnButtonClick">
-              <AppBarButton.Icon><PathIcon Data="{StaticResource PrintIcon}" /></AppBarButton.Icon>
-            </AppBarButton>
-            <AppBarSeparator />
-            <AppBarButton Label="Delete" Click="OnButtonClick">
-              <AppBarButton.Icon><PathIcon Data="{StaticResource DeleteIcon}" /></AppBarButton.Icon>
-            </AppBarButton>
+            <CommandBarButton Label="Export" Click="OnButtonClick">
+              <CommandBarButton.Icon><PathIcon Data="{StaticResource ExportIcon}" /></CommandBarButton.Icon>
+            </CommandBarButton>
+            <CommandBarButton Label="Print" Click="OnButtonClick">
+              <CommandBarButton.Icon><PathIcon Data="{StaticResource PrintIcon}" /></CommandBarButton.Icon>
+            </CommandBarButton>
+            <CommandBarSeparator />
+            <CommandBarButton Label="Delete" Click="OnButtonClick">
+              <CommandBarButton.Icon><PathIcon Data="{StaticResource DeleteIcon}" /></CommandBarButton.Icon>
+            </CommandBarButton>
           </CommandBar.SecondaryCommands>
         </CommandBar>
 
diff --git a/samples/ControlCatalog/Pages/CommandBar/CommandBarFirstLookPage.xaml.cs b/samples/ControlCatalog/Pages/CommandBar/CommandBarFirstLookPage.xaml.cs
index c624ffcad6..9e15c0fb6c 100644
--- a/samples/ControlCatalog/Pages/CommandBar/CommandBarFirstLookPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/CommandBar/CommandBarFirstLookPage.xaml.cs
@@ -12,13 +12,13 @@ namespace ControlCatalog.Pages
 
         private void OnButtonClick(object? sender, RoutedEventArgs e)
         {
-            if (sender is AppBarButton btn)
+            if (sender is CommandBarButton btn)
                 StatusText.Text = $"{btn.Label} clicked";
         }
 
         private void OnToggleChanged(object? sender, RoutedEventArgs e)
         {
-            if (sender is AppBarToggleButton btn)
+            if (sender is CommandBarToggleButton btn)
                 StatusText.Text = btn.IsChecked == true
                     ? $"{btn.Label} enabled"
                     : $"{btn.Label} disabled";
diff --git a/samples/ControlCatalog/Pages/CommandBar/CommandBarKeyboardPage.xaml b/samples/ControlCatalog/Pages/CommandBar/CommandBarKeyboardPage.xaml
new file mode 100644
index 0000000000..7b820b0183
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CommandBar/CommandBarKeyboardPage.xaml
@@ -0,0 +1,121 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="ControlCatalog.Pages.CommandBarKeyboardPage">
+  <UserControl.Resources>
+    <StreamGeometry x:Key="AddIcon">M19,13H13V19H11V13H5V11H11V5H13V11H19V13Z</StreamGeometry>
+    <StreamGeometry x:Key="SaveIcon">M15,9H5V5H15M12,19A3,3 0 0,1 9,16A3,3 0 0,1 12,13A3,3 0 0,1 15,16A3,3 0 0,1 12,19M17,3H5C3.89,3 3,3.9 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V7L17,3Z</StreamGeometry>
+    <StreamGeometry x:Key="BoldIcon">M15.6,10.79C17.04,10.07 18,8.64 18,7C18,4.79 16.21,3 14,3H7V21H14.73C16.78,21 18.5,19.37 18.5,17.32C18.5,15.82 17.72,14.53 16.5,13.77C16.2,13.59 15.9,13.44 15.6,13.32V10.79M10,6.5H13C13.83,6.5 14.5,7.17 14.5,8C14.5,8.83 13.83,9.5 13,9.5H10V6.5M13.5,17.5H10V14H13.5C14.33,14 15,14.67 15,15.5C15,16.33 14.33,17.5 13.5,17.5Z</StreamGeometry>
+    <StreamGeometry x:Key="ShareIcon">M18,16.08C17.24,16.08 16.56,16.38 16.04,16.85L8.91,12.7C8.96,12.47 9,12.24 9,12C9,11.76 8.96,11.53 8.91,11.3L15.96,7.19C16.5,7.69 17.21,8 18,8A3,3 0 0,0 21,5A3,3 0 0,0 18,2A3,3 0 0,0 15,5C15,5.24 15.04,5.47 15.09,5.7L8.04,9.81C7.5,9.31 6.79,9 6,9A3,3 0 0,0 3,12A3,3 0 0,0 6,15C6.79,15 7.5,14.69 8.04,14.19L15.16,18.34C15.11,18.55 15.08,18.77 15.08,19C15.08,20.61 16.39,21.91 18,21.91C19.61,21.91 20.92,20.61 20.92,19C20.92,17.39 19.61,16.08 18,16.08Z</StreamGeometry>
+    <StreamGeometry x:Key="DeleteIcon">M19,4H15.5L14.5,3H9.5L8.5,4H5V6H19M6,19A2,2 0 0,0 8,21H16A2,2 0 0,0 18,19V7H6V19Z</StreamGeometry>
+  </UserControl.Resources>
+
+  <DockPanel>
+    <ScrollViewer DockPanel.Dock="Right" Width="240">
+      <StackPanel Margin="12" Spacing="8">
+        <TextBlock Text="How to test" FontWeight="SemiBold" FontSize="16"
+                   Foreground="{DynamicResource SystemControlHighlightAccentBrush}" />
+
+        <TextBlock FontSize="12" Opacity="0.7" TextWrapping="Wrap"
+                   Text="1. Click &quot;Open overflow&quot; below, or click the ··· button with the mouse." />
+        <TextBlock FontSize="12" Opacity="0.7" TextWrapping="Wrap"
+                   Text="2. Use Up/Down arrow keys to navigate. Focus wraps from last to first and back." />
+        <TextBlock FontSize="12" Opacity="0.7" TextWrapping="Wrap"
+                   Text="3. The separator and the disabled Delete item are skipped during navigation." />
+        <TextBlock FontSize="12" Opacity="0.7" TextWrapping="Wrap"
+                   Text="4. Press Escape to close. Focus returns to the ··· button." />
+        <TextBlock FontSize="12" Opacity="0.7" TextWrapping="Wrap"
+                   Text="5. You can also Tab into the CommandBar. Focus walks through primary items and the ··· button in order." />
+
+        <Separator />
+
+        <Button Content="Open overflow"
+                HorizontalAlignment="Stretch"
+                Click="OnOpenOverflow" />
+
+        <Button Content="Clear Log"
+                HorizontalAlignment="Stretch"
+                Click="OnClearLog" />
+
+        <Separator />
+
+        <TextBlock Text="About" FontWeight="SemiBold" />
+        <TextBlock FontSize="12" Opacity="0.7" TextWrapping="Wrap"
+                   Text="The focus log updates as keyboard navigation moves between overflow items. Separators and disabled items are excluded from the cycle." />
+      </StackPanel>
+    </ScrollViewer>
+
+    <Border DockPanel.Dock="Right" Width="1"
+            Background="{DynamicResource SystemControlForegroundBaseMediumLowBrush}" />
+
+    <ScrollViewer>
+      <StackPanel Spacing="16" Margin="12,12,12,0">
+        <TextBlock Classes="h2">Keyboard navigation in the overflow popup: Up/Down to move, Home/End to jump, Escape to close.</TextBlock>
+
+        <CommandBar x:Name="DemoBar">
+          <CommandBar.PrimaryCommands>
+            <CommandBarButton Label="New">
+              <CommandBarButton.Icon><PathIcon Data="{StaticResource AddIcon}" /></CommandBarButton.Icon>
+            </CommandBarButton>
+            <CommandBarButton Label="Save">
+              <CommandBarButton.Icon><PathIcon Data="{StaticResource SaveIcon}" /></CommandBarButton.Icon>
+            </CommandBarButton>
+          </CommandBar.PrimaryCommands>
+          <CommandBar.SecondaryCommands>
+            <CommandBarButton x:Name="BtnCopy"     Label="Copy" />
+            <CommandBarButton x:Name="BtnPaste"    Label="Paste" />
+            <CommandBarToggleButton x:Name="BtnBold" Label="Bold">
+              <CommandBarToggleButton.Icon><PathIcon Data="{StaticResource BoldIcon}" /></CommandBarToggleButton.Icon>
+            </CommandBarToggleButton>
+            <CommandBarSeparator />
+            <CommandBarButton x:Name="BtnShare"    Label="Share">
+              <CommandBarButton.Icon><PathIcon Data="{StaticResource ShareIcon}" /></CommandBarButton.Icon>
+            </CommandBarButton>
+            <CommandBarButton x:Name="BtnDelete"   Label="Delete" IsEnabled="False">
+              <CommandBarButton.Icon><PathIcon Data="{StaticResource DeleteIcon}" /></CommandBarButton.Icon>
+            </CommandBarButton>
+            <CommandBarButton x:Name="BtnExport"   Label="Export" />
+          </CommandBar.SecondaryCommands>
+        </CommandBar>
+
+        <!-- Keyboard shortcuts reference -->
+        <Border BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
+                BorderThickness="1"
+                CornerRadius="6"
+                Padding="10">
+          <StackPanel Spacing="6">
+            <TextBlock Text="Keyboard shortcuts" FontWeight="SemiBold" />
+            <Grid ColumnDefinitions="80,*" RowDefinitions="Auto,Auto,Auto,Auto,Auto">
+              <TextBlock Grid.Row="0" Grid.Column="0" FontFamily="Consolas,Menlo,monospace" FontSize="12" Text="Down" />
+              <TextBlock Grid.Row="0" Grid.Column="1" FontSize="12" Opacity="0.7" Text="Next item (wraps to first)" />
+              <TextBlock Grid.Row="1" Grid.Column="0" FontFamily="Consolas,Menlo,monospace" FontSize="12" Text="Up" />
+              <TextBlock Grid.Row="1" Grid.Column="1" FontSize="12" Opacity="0.7" Text="Previous item (wraps to last)" />
+              <TextBlock Grid.Row="2" Grid.Column="0" FontFamily="Consolas,Menlo,monospace" FontSize="12" Text="Home" />
+              <TextBlock Grid.Row="2" Grid.Column="1" FontSize="12" Opacity="0.7" Text="First item" />
+              <TextBlock Grid.Row="3" Grid.Column="0" FontFamily="Consolas,Menlo,monospace" FontSize="12" Text="End" />
+              <TextBlock Grid.Row="3" Grid.Column="1" FontSize="12" Opacity="0.7" Text="Last item" />
+              <TextBlock Grid.Row="4" Grid.Column="0" FontFamily="Consolas,Menlo,monospace" FontSize="12" Text="Escape" />
+              <TextBlock Grid.Row="4" Grid.Column="1" FontSize="12" Opacity="0.7" Text="Close menu, focus returns to ··· button" />
+            </Grid>
+          </StackPanel>
+        </Border>
+
+        <!-- Focus log -->
+        <Border BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
+                BorderThickness="1"
+                CornerRadius="6"
+                Padding="10">
+          <StackPanel Spacing="6">
+            <TextBlock Text="Focus log" FontWeight="SemiBold" />
+            <TextBlock x:Name="FocusLogText"
+                       FontFamily="Consolas, Menlo, monospace"
+                       FontSize="12"
+                       TextWrapping="Wrap"
+                       MinHeight="120"
+                       Opacity="0.8"
+                       Text="Open the overflow menu and use keyboard navigation." />
+          </StackPanel>
+        </Border>
+      </StackPanel>
+    </ScrollViewer>
+  </DockPanel>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/CommandBar/CommandBarKeyboardPage.xaml.cs b/samples/ControlCatalog/Pages/CommandBar/CommandBarKeyboardPage.xaml.cs
new file mode 100644
index 0000000000..013614db7f
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CommandBar/CommandBarKeyboardPage.xaml.cs
@@ -0,0 +1,93 @@
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+
+namespace ControlCatalog.Pages
+{
+    public partial class CommandBarKeyboardPage : UserControl
+    {
+        private readonly List<string> _log = new();
+
+        public CommandBarKeyboardPage()
+        {
+            InitializeComponent();
+            Loaded += OnLoaded;
+            Unloaded += OnUnloaded;
+        }
+
+        private void OnLoaded(object? sender, RoutedEventArgs e)
+        {
+            DemoBar.Opened += OnOpened;
+            DemoBar.Closed += OnClosed;
+
+            BtnCopy.GotFocus += OnItemFocused;
+            BtnPaste.GotFocus += OnItemFocused;
+            BtnBold.GotFocus += OnItemFocused;
+            BtnShare.GotFocus += OnItemFocused;
+            BtnDelete.GotFocus += OnItemFocused;
+            BtnExport.GotFocus += OnItemFocused;
+        }
+
+        private void OnUnloaded(object? sender, RoutedEventArgs e)
+        {
+            DemoBar.Opened -= OnOpened;
+            DemoBar.Closed -= OnClosed;
+
+            BtnCopy.GotFocus -= OnItemFocused;
+            BtnPaste.GotFocus -= OnItemFocused;
+            BtnBold.GotFocus -= OnItemFocused;
+            BtnShare.GotFocus -= OnItemFocused;
+            BtnDelete.GotFocus -= OnItemFocused;
+            BtnExport.GotFocus -= OnItemFocused;
+        }
+
+        private void OnOpened(object? sender, RoutedEventArgs e)
+            => AppendLog("Opened. Use arrow keys to navigate.");
+
+        private void OnClosed(object? sender, RoutedEventArgs e)
+            => AppendLog("Closed");
+
+        private void OnItemFocused(object? sender, FocusChangedEventArgs e)
+        {
+            var label = sender switch
+            {
+                CommandBarButton btn => btn.Label ?? "(unnamed)",
+                CommandBarToggleButton t => t.Label ?? "(unnamed)",
+                _ => sender?.GetType().Name ?? "?"
+            };
+
+            var method = e.NavigationMethod switch
+            {
+                NavigationMethod.Directional => "arrow key",
+                NavigationMethod.Tab => "Tab",
+                NavigationMethod.Pointer => "pointer",
+                _ => "unspecified"
+            };
+
+            AppendLog($"Focus: {label} ({method})");
+        }
+
+        private void OnOpenOverflow(object? sender, RoutedEventArgs e)
+        {
+            DemoBar.IsOpen = true;
+        }
+
+        private void OnClearLog(object? sender, RoutedEventArgs e)
+        {
+            _log.Clear();
+            FocusLogText.Text = "Log cleared.";
+        }
+
+        private void AppendLog(string message)
+        {
+            _log.Add(message);
+
+            if (_log.Count > 10)
+                _log.RemoveAt(0);
+
+            FocusLogText.Text = string.Join("\n", _log.Select((entry, i) => $"{i + 1,2}. {entry}"));
+        }
+    }
+}
diff --git a/samples/ControlCatalog/Pages/CommandBar/CommandBarLabelPositionPage.xaml b/samples/ControlCatalog/Pages/CommandBar/CommandBarLabelPositionPage.xaml
index a1dbea2db1..a4b23542d7 100644
--- a/samples/ControlCatalog/Pages/CommandBar/CommandBarLabelPositionPage.xaml
+++ b/samples/ControlCatalog/Pages/CommandBar/CommandBarLabelPositionPage.xaml
@@ -15,10 +15,10 @@
       <TextBlock Text="Bottom (default)" FontWeight="SemiBold" />
       <TextBlock Text="Label appears below the icon." FontSize="12" Opacity="0.7" />
       <CommandBar DefaultLabelPosition="Bottom" OverflowButtonVisibility="Collapsed">
-        <AppBarButton Label="New"><AppBarButton.Icon><PathIcon Data="{StaticResource AddIcon}" /></AppBarButton.Icon></AppBarButton>
-        <AppBarButton Label="Save"><AppBarButton.Icon><PathIcon Data="{StaticResource SaveIcon}" /></AppBarButton.Icon></AppBarButton>
-        <AppBarButton Label="Share"><AppBarButton.Icon><PathIcon Data="{StaticResource ShareIcon}" /></AppBarButton.Icon></AppBarButton>
-        <AppBarButton Label="Delete"><AppBarButton.Icon><PathIcon Data="{StaticResource DeleteIcon}" /></AppBarButton.Icon></AppBarButton>
+        <CommandBarButton Label="New"><CommandBarButton.Icon><PathIcon Data="{StaticResource AddIcon}" /></CommandBarButton.Icon></CommandBarButton>
+        <CommandBarButton Label="Save"><CommandBarButton.Icon><PathIcon Data="{StaticResource SaveIcon}" /></CommandBarButton.Icon></CommandBarButton>
+        <CommandBarButton Label="Share"><CommandBarButton.Icon><PathIcon Data="{StaticResource ShareIcon}" /></CommandBarButton.Icon></CommandBarButton>
+        <CommandBarButton Label="Delete"><CommandBarButton.Icon><PathIcon Data="{StaticResource DeleteIcon}" /></CommandBarButton.Icon></CommandBarButton>
       </CommandBar>
 
       <Separator />
@@ -26,10 +26,10 @@
       <TextBlock Text="Right" FontWeight="SemiBold" />
       <TextBlock Text="Label appears to the right of the icon." FontSize="12" Opacity="0.7" />
       <CommandBar DefaultLabelPosition="Right" OverflowButtonVisibility="Collapsed">
-        <AppBarButton Label="New"><AppBarButton.Icon><PathIcon Data="{StaticResource AddIcon}" /></AppBarButton.Icon></AppBarButton>
-        <AppBarButton Label="Save"><AppBarButton.Icon><PathIcon Data="{StaticResource SaveIcon}" /></AppBarButton.Icon></AppBarButton>
-        <AppBarButton Label="Share"><AppBarButton.Icon><PathIcon Data="{StaticResource ShareIcon}" /></AppBarButton.Icon></AppBarButton>
-        <AppBarButton Label="Delete"><AppBarButton.Icon><PathIcon Data="{StaticResource DeleteIcon}" /></AppBarButton.Icon></AppBarButton>
+        <CommandBarButton Label="New"><CommandBarButton.Icon><PathIcon Data="{StaticResource AddIcon}" /></CommandBarButton.Icon></CommandBarButton>
+        <CommandBarButton Label="Save"><CommandBarButton.Icon><PathIcon Data="{StaticResource SaveIcon}" /></CommandBarButton.Icon></CommandBarButton>
+        <CommandBarButton Label="Share"><CommandBarButton.Icon><PathIcon Data="{StaticResource ShareIcon}" /></CommandBarButton.Icon></CommandBarButton>
+        <CommandBarButton Label="Delete"><CommandBarButton.Icon><PathIcon Data="{StaticResource DeleteIcon}" /></CommandBarButton.Icon></CommandBarButton>
       </CommandBar>
 
       <Separator />
@@ -37,10 +37,10 @@
       <TextBlock Text="Collapsed (icon only)" FontWeight="SemiBold" />
       <TextBlock Text="No label shown. Use ToolTip.Tip to preserve accessibility." FontSize="12" Opacity="0.7" />
       <CommandBar DefaultLabelPosition="Collapsed" OverflowButtonVisibility="Collapsed">
-        <AppBarButton ToolTip.Tip="New"><AppBarButton.Icon><PathIcon Data="{StaticResource AddIcon}" /></AppBarButton.Icon></AppBarButton>
-        <AppBarButton ToolTip.Tip="Save"><AppBarButton.Icon><PathIcon Data="{StaticResource SaveIcon}" /></AppBarButton.Icon></AppBarButton>
-        <AppBarButton ToolTip.Tip="Share"><AppBarButton.Icon><PathIcon Data="{StaticResource ShareIcon}" /></AppBarButton.Icon></AppBarButton>
-        <AppBarButton ToolTip.Tip="Delete"><AppBarButton.Icon><PathIcon Data="{StaticResource DeleteIcon}" /></AppBarButton.Icon></AppBarButton>
+        <CommandBarButton ToolTip.Tip="New"><CommandBarButton.Icon><PathIcon Data="{StaticResource AddIcon}" /></CommandBarButton.Icon></CommandBarButton>
+        <CommandBarButton ToolTip.Tip="Save"><CommandBarButton.Icon><PathIcon Data="{StaticResource SaveIcon}" /></CommandBarButton.Icon></CommandBarButton>
+        <CommandBarButton ToolTip.Tip="Share"><CommandBarButton.Icon><PathIcon Data="{StaticResource ShareIcon}" /></CommandBarButton.Icon></CommandBarButton>
+        <CommandBarButton ToolTip.Tip="Delete"><CommandBarButton.Icon><PathIcon Data="{StaticResource DeleteIcon}" /></CommandBarButton.Icon></CommandBarButton>
       </CommandBar>
     </StackPanel>
   </ScrollViewer>
diff --git a/samples/ControlCatalog/Pages/CommandBar/CommandBarOverflowPage.xaml b/samples/ControlCatalog/Pages/CommandBar/CommandBarOverflowPage.xaml
index be3371a8e8..46bcac3fac 100644
--- a/samples/ControlCatalog/Pages/CommandBar/CommandBarOverflowPage.xaml
+++ b/samples/ControlCatalog/Pages/CommandBar/CommandBarOverflowPage.xaml
@@ -59,13 +59,13 @@
 
         <CommandBar x:Name="DemoBar" IsDynamicOverflowEnabled="True">
           <CommandBar.PrimaryCommands>
-            <AppBarButton Label="New"><AppBarButton.Icon><PathIcon Data="{StaticResource AddIcon}" /></AppBarButton.Icon></AppBarButton>
-            <AppBarButton Label="Save"><AppBarButton.Icon><PathIcon Data="{StaticResource SaveIcon}" /></AppBarButton.Icon></AppBarButton>
-            <AppBarButton Label="Share"><AppBarButton.Icon><PathIcon Data="{StaticResource ShareIcon}" /></AppBarButton.Icon></AppBarButton>
+            <CommandBarButton Label="New"><CommandBarButton.Icon><PathIcon Data="{StaticResource AddIcon}" /></CommandBarButton.Icon></CommandBarButton>
+            <CommandBarButton Label="Save"><CommandBarButton.Icon><PathIcon Data="{StaticResource SaveIcon}" /></CommandBarButton.Icon></CommandBarButton>
+            <CommandBarButton Label="Share"><CommandBarButton.Icon><PathIcon Data="{StaticResource ShareIcon}" /></CommandBarButton.Icon></CommandBarButton>
           </CommandBar.PrimaryCommands>
           <CommandBar.SecondaryCommands>
-            <AppBarButton Label="Export"><AppBarButton.Icon><PathIcon Data="{StaticResource ExportIcon}" /></AppBarButton.Icon></AppBarButton>
-            <AppBarButton Label="Delete"><AppBarButton.Icon><PathIcon Data="{StaticResource DeleteIcon}" /></AppBarButton.Icon></AppBarButton>
+            <CommandBarButton Label="Export"><CommandBarButton.Icon><PathIcon Data="{StaticResource ExportIcon}" /></CommandBarButton.Icon></CommandBarButton>
+            <CommandBarButton Label="Delete"><CommandBarButton.Icon><PathIcon Data="{StaticResource DeleteIcon}" /></CommandBarButton.Icon></CommandBarButton>
           </CommandBar.SecondaryCommands>
         </CommandBar>
       </StackPanel>
diff --git a/samples/ControlCatalog/Pages/CommandBar/CommandBarOverflowPage.xaml.cs b/samples/ControlCatalog/Pages/CommandBar/CommandBarOverflowPage.xaml.cs
index a0d5f24b7f..ff5ee07f2a 100644
--- a/samples/ControlCatalog/Pages/CommandBar/CommandBarOverflowPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/CommandBar/CommandBarOverflowPage.xaml.cs
@@ -42,13 +42,13 @@ namespace ControlCatalog.Pages
         private void OnAddPrimary(object? sender, RoutedEventArgs e)
         {
             _primaryCount++;
-            DemoBar.PrimaryCommands.Add(new AppBarButton { Label = $"Cmd {_primaryCount}" });
+            DemoBar.PrimaryCommands.Add(new CommandBarButton { Label = $"Cmd {_primaryCount}" });
         }
 
         private void OnAddSecondary(object? sender, RoutedEventArgs e)
         {
             _secondaryCount++;
-            DemoBar.SecondaryCommands.Add(new AppBarButton { Label = $"Sec {_secondaryCount}" });
+            DemoBar.SecondaryCommands.Add(new CommandBarButton { Label = $"Sec {_secondaryCount}" });
         }
     }
 }
diff --git a/samples/ControlCatalog/Pages/CommandBar/CommandBarTogglePage.xaml b/samples/ControlCatalog/Pages/CommandBar/CommandBarTogglePage.xaml
index d2513038c0..794bd3fcd4 100644
--- a/samples/ControlCatalog/Pages/CommandBar/CommandBarTogglePage.xaml
+++ b/samples/ControlCatalog/Pages/CommandBar/CommandBarTogglePage.xaml
@@ -28,7 +28,7 @@
         <Separator />
 
         <TextBlock Text="About" FontWeight="SemiBold" />
-        <TextBlock Text="AppBarToggleButton maintains checked/unchecked state. When checked, it shows a highlight background. Bind IsChecked to a boolean property."
+        <TextBlock Text="CommandBarToggleButton maintains checked/unchecked state. When checked, it shows a highlight background. Bind IsChecked to a boolean property."
                    FontSize="12" Opacity="0.7" TextWrapping="Wrap" />
       </StackPanel>
     </ScrollViewer>
@@ -37,25 +37,25 @@
 
     <ScrollViewer>
       <StackPanel Spacing="12" Margin="12,12,12,0">
-        <TextBlock Classes="h2">AppBarToggleButton supports on/off states for formatting and feature toggles.</TextBlock>
+        <TextBlock Classes="h2">CommandBarToggleButton supports on/off states for formatting and feature toggles.</TextBlock>
 
         <TextBlock Text="Text Formatting" FontWeight="SemiBold" />
         <CommandBar x:Name="FormatBar" OverflowButtonVisibility="Collapsed">
-          <AppBarToggleButton x:Name="BoldToggle"
+          <CommandBarToggleButton x:Name="BoldToggle"
                               Label="Bold"
                               IsCheckedChanged="OnFormatChanged">
-            <AppBarToggleButton.Icon><PathIcon Data="{StaticResource BoldIcon}" /></AppBarToggleButton.Icon>
-          </AppBarToggleButton>
-          <AppBarToggleButton x:Name="ItalicToggle"
+            <CommandBarToggleButton.Icon><PathIcon Data="{StaticResource BoldIcon}" /></CommandBarToggleButton.Icon>
+          </CommandBarToggleButton>
+          <CommandBarToggleButton x:Name="ItalicToggle"
                               Label="Italic"
                               IsCheckedChanged="OnFormatChanged">
-            <AppBarToggleButton.Icon><PathIcon Data="{StaticResource ItalicIcon}" /></AppBarToggleButton.Icon>
-          </AppBarToggleButton>
-          <AppBarToggleButton x:Name="UnderlineToggle"
+            <CommandBarToggleButton.Icon><PathIcon Data="{StaticResource ItalicIcon}" /></CommandBarToggleButton.Icon>
+          </CommandBarToggleButton>
+          <CommandBarToggleButton x:Name="UnderlineToggle"
                               Label="Underline"
                               IsCheckedChanged="OnFormatChanged">
-            <AppBarToggleButton.Icon><PathIcon Data="{StaticResource UnderlineIcon}" /></AppBarToggleButton.Icon>
-          </AppBarToggleButton>
+            <CommandBarToggleButton.Icon><PathIcon Data="{StaticResource UnderlineIcon}" /></CommandBarToggleButton.Icon>
+          </CommandBarToggleButton>
         </CommandBar>
 
         <TextBlock x:Name="FormatStatus"
@@ -67,9 +67,9 @@
 
         <TextBlock Text="Favorite" FontWeight="SemiBold" />
         <CommandBar OverflowButtonVisibility="Collapsed">
-          <AppBarToggleButton Label="Favorite">
-            <AppBarToggleButton.Icon><PathIcon Data="{StaticResource FavoriteIcon}" /></AppBarToggleButton.Icon>
-          </AppBarToggleButton>
+          <CommandBarToggleButton Label="Favorite">
+            <CommandBarToggleButton.Icon><PathIcon Data="{StaticResource FavoriteIcon}" /></CommandBarToggleButton.Icon>
+          </CommandBarToggleButton>
         </CommandBar>
       </StackPanel>
     </ScrollViewer>
diff --git a/samples/ControlCatalog/Pages/CommandBarPage.xaml b/samples/ControlCatalog/Pages/CommandBarPage.xaml
index 6cf280ea95..3c648ea012 100644
--- a/samples/ControlCatalog/Pages/CommandBarPage.xaml
+++ b/samples/ControlCatalog/Pages/CommandBarPage.xaml
@@ -1,8 +1,11 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<ContentPage Theme="{StaticResource ScrollPage}" xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             Header="CommandBar"
              x:Class="ControlCatalog.Pages.CommandBarPage">
-  <UserControl.Resources>
+  <ContentPage.Resources>
     <SolidColorBrush x:Key="NavigationBarBackground" Color="Transparent" />
-  </UserControl.Resources>
-  <NavigationPage x:Name="SampleNav" />
-</UserControl>
+  </ContentPage.Resources>
+  <Grid>
+    <NavigationPage x:Name="SampleNav" />
+  </Grid>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/CommandBarPage.xaml.cs b/samples/ControlCatalog/Pages/CommandBarPage.xaml.cs
index 7aaf6d22be..0b81c698d2 100644
--- a/samples/ControlCatalog/Pages/CommandBarPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/CommandBarPage.xaml.cs
@@ -7,13 +7,13 @@ using Avalonia.Media;
 
 namespace ControlCatalog.Pages
 {
-    public partial class CommandBarPage : UserControl
+    public partial class CommandBarPage : ContentPage
     {
         private static readonly (string Group, string Title, string Description, Func<UserControl> Factory)[] Demos =
         {
             // Overview
             ("Overview", "First Look",     "A CommandBar with primary commands, secondary overflow menu, and custom content area.", () => new CommandBarFirstLookPage()),
-            ("Overview", "Toggle Buttons", "AppBarToggleButton for stateful actions like Bold, Italic, and Favorite.",              () => new CommandBarTogglePage()),
+            ("Overview", "Toggle Buttons", "CommandBarToggleButton for stateful actions like Bold, Italic, and Favorite.",              () => new CommandBarTogglePage()),
 
             // Appearance
             ("Appearance", "Label Positions", "Configure label position: Bottom (default), Right, or Collapsed (icon only).",       () => new CommandBarLabelPositionPage()),
@@ -23,6 +23,7 @@ namespace ControlCatalog.Pages
             ("Features", "Overflow Menu",    "Secondary commands appear in an overflow popup. Configure visibility and sticky behavior.", () => new CommandBarOverflowPage()),
             ("Features", "Dynamic Overflow", "IsDynamicOverflowEnabled moves primary commands to overflow as space shrinks.",             () => new CommandBarDynamicOverflowPage()),
             ("Features", "Events & State",  "Observe Opening, Opened, Closing, and Closed while tracking IsOpen, HasSecondaryCommands, and IsOverflowButtonVisible.", () => new CommandBarEventsPage()),
+            ("Features", "Keyboard Navigation", "Up/Down to move between overflow items, Home/End to jump to first/last, Escape to close and return focus.", () => new CommandBarKeyboardPage()),
         };
 
         public CommandBarPage()
diff --git a/samples/ControlCatalog/Pages/CompositionPage.axaml b/samples/ControlCatalog/Pages/CompositionPage.axaml
index 4d9bb41781..a3e9b047a8 100644
--- a/samples/ControlCatalog/Pages/CompositionPage.axaml
+++ b/samples/ControlCatalog/Pages/CompositionPage.axaml
@@ -1,62 +1,61 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:pages="using:ControlCatalog.Pages"
-             x:Class="ControlCatalog.Pages.CompositionPage">
-  <TabControl>
-    <TabItem Header="Implicit animations">
-      <StackPanel>
-        <Grid ColumnDefinitions="*,10,40" Margin="0 0 40 0">
-          <ItemsControl x:Name="Items">
-            <ItemsControl.ItemsPanel>
-              <ItemsPanelTemplate>
-                <WrapPanel/>
-              </ItemsPanelTemplate>
-            </ItemsControl.ItemsPanel>
-            <ItemsControl.DataTemplates>
-              <DataTemplate DataType="pages:CompositionPageColorItem">
-                <Border 
-                  pages:CompositionPage.EnableAnimations="True"
-                  Padding="10" BorderBrush="Gray" BorderThickness="2"
-                  Background="{Binding ColorBrush}" Width="100" Height="100" Margin="10">
-                    <TextBlock Text="{Binding ColorHexValue}"/>
-                </Border>
-              </DataTemplate>
-            </ItemsControl.DataTemplates>
-          </ItemsControl>
-          <GridSplitter Margin="2" BorderThickness="1" BorderBrush="Gray" 
-                        Background="#e0e0e0" Grid.Column="1"
-                        ResizeDirection="Columns" ResizeBehavior="PreviousAndNext"
-          />
-          <Border Grid.Column="2">
-            <LayoutTransformControl HorizontalAlignment="Center" MinWidth="30">
-              <LayoutTransformControl.LayoutTransform>
-                <RotateTransform Angle="90"/>
-              </LayoutTransformControl.LayoutTransform>
-              <TextBlock>Resize me</TextBlock>
-            </LayoutTransformControl>
-          </Border>
-        </Grid>
+<TabbedPage xmlns="https://github.com/avaloniaui"
+            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+            xmlns:pages="using:ControlCatalog.Pages"
+            Header="Composition"
+            x:Class="ControlCatalog.Pages.CompositionPage">
+  <ContentPage Theme="{StaticResource ScrollPage}" Header="Implicit animations">
+    <StackPanel>
+      <Grid ColumnDefinitions="*,10,40" Margin="0 0 40 0">
+        <ItemsControl x:Name="Items">
+          <ItemsControl.ItemsPanel>
+            <ItemsPanelTemplate>
+              <WrapPanel/>
+            </ItemsPanelTemplate>
+          </ItemsControl.ItemsPanel>
+          <ItemsControl.DataTemplates>
+            <DataTemplate DataType="pages:CompositionPageColorItem">
+              <Border
+              pages:CompositionPage.EnableAnimations="True"
+              Padding="10" BorderBrush="Gray" BorderThickness="2"
+              Background="{Binding ColorBrush}" Width="100" Height="100" Margin="10">
+                <TextBlock Text="{Binding ColorHexValue}"/>
+              </Border>
+            </DataTemplate>
+          </ItemsControl.DataTemplates>
+        </ItemsControl>
+        <GridSplitter Margin="2" BorderThickness="1" BorderBrush="Gray"
+                      Background="#e0e0e0" Grid.Column="1"
+                      ResizeDirection="Columns" ResizeBehavior="PreviousAndNext"
+                      />
+        <Border Grid.Column="2">
+          <LayoutTransformControl HorizontalAlignment="Center" MinWidth="30">
+            <LayoutTransformControl.LayoutTransform>
+              <RotateTransform Angle="90"/>
+            </LayoutTransformControl.LayoutTransform>
+            <TextBlock>Resize me</TextBlock>
+          </LayoutTransformControl>
+        </Border>
+      </Grid>
+    </StackPanel>
+  </ContentPage>
+  <ContentPage Theme="{StaticResource ScrollPage}" Header="Animation">
+    <DockPanel>
+      <Button DockPanel.Dock="Top" Margin="10" Click="ButtonThreadSleep">Thread.Sleep(10000);</Button>
+      <Control x:Name="SolidVisualHost" />
+    </DockPanel>
+  </ContentPage>
+  <ContentPage Theme="{StaticResource ScrollPage}" Header="Custom">
+    <DockPanel>
+      <StackPanel DockPanel.Dock="Top" Orientation="Horizontal">
+        <Button Margin="10" Click="ButtonThreadSleep">Thread.Sleep(10000);</Button>
+        <Button Margin="10" Click="ButtonStartCustomVisual">Start</Button>
+        <Button Margin="10" Click="ButtonStopCustomVisual">Stop</Button>
+        <CheckBox Margin="10"
+                  x:Name="PreciseDirtyRectsCheckboxCustomVisual"
+                  IsCheckedChanged="PreciseDirtyRectsCheckboxCustomVisualChanged"
+                  >Precise dirty rects</CheckBox>
       </StackPanel>
-    </TabItem>
-    <TabItem Header="Animation">
-      <DockPanel>
-        <Button DockPanel.Dock="Top" Margin="10" Click="ButtonThreadSleep">Thread.Sleep(10000);</Button>
-        <Control x:Name="SolidVisualHost" />
-      </DockPanel>
-    </TabItem>
-    <TabItem Header="Custom">
-      <DockPanel>
-        <StackPanel DockPanel.Dock="Top" Orientation="Horizontal">
-          <Button Margin="10" Click="ButtonThreadSleep">Thread.Sleep(10000);</Button>
-          <Button Margin="10" Click="ButtonStartCustomVisual">Start</Button>
-          <Button Margin="10" Click="ButtonStopCustomVisual">Stop</Button>
-          <CheckBox Margin="10" 
-                    x:Name="PreciseDirtyRectsCheckboxCustomVisual"
-                    IsCheckedChanged="PreciseDirtyRectsCheckboxCustomVisualChanged"
-                    >Precise dirty rects</CheckBox>
-        </StackPanel>
-        <Control x:Name="CustomVisualHost" />
-      </DockPanel>
-    </TabItem>
-  </TabControl>
-</UserControl>
+      <Control x:Name="CustomVisualHost" />
+    </DockPanel>
+  </ContentPage>
+</TabbedPage>
diff --git a/samples/ControlCatalog/Pages/CompositionPage.axaml.cs b/samples/ControlCatalog/Pages/CompositionPage.axaml.cs
index 287bde0be8..8f5d75f4ce 100644
--- a/samples/ControlCatalog/Pages/CompositionPage.axaml.cs
+++ b/samples/ControlCatalog/Pages/CompositionPage.axaml.cs
@@ -15,7 +15,7 @@ using Math = System.Math;
 
 namespace ControlCatalog.Pages;
 
-public partial class CompositionPage : UserControl
+public partial class CompositionPage : TabbedPage
 {
     private ImplicitAnimationCollection? _implicitAnimations;
     private CompositionCustomVisual? _customVisual;
diff --git a/samples/ControlCatalog/Pages/ConnectedAnimationDemoPage.xaml b/samples/ControlCatalog/Pages/ConnectedAnimationDemoPage.xaml
index bf37b4cc4f..ca4a85af8d 100644
--- a/samples/ControlCatalog/Pages/ConnectedAnimationDemoPage.xaml
+++ b/samples/ControlCatalog/Pages/ConnectedAnimationDemoPage.xaml
@@ -1,6 +1,8 @@
-<UserControl x:Class="ControlCatalog.Pages.ConnectedAnimationDemoPage"
+<ContentPage Theme="{StaticResource ScrollPage}" x:Class="ControlCatalog.Pages.ConnectedAnimationDemoPage"
              xmlns="https://github.com/avaloniaui"
+             Header="Connected Animations"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Grid>
   <NavigationPage x:Name="SampleNav">
     <NavigationPage.Styles>
       <Style Selector="NavigationPage#SampleNav /template/ Border#PART_NavigationBar">
@@ -8,4 +10,5 @@
       </Style>
     </NavigationPage.Styles>
   </NavigationPage>
-</UserControl>
+  </Grid>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/ConnectedAnimationDemoPage.xaml.cs b/samples/ControlCatalog/Pages/ConnectedAnimationDemoPage.xaml.cs
index 0c13bb360e..5d666730ae 100644
--- a/samples/ControlCatalog/Pages/ConnectedAnimationDemoPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ConnectedAnimationDemoPage.xaml.cs
@@ -7,7 +7,7 @@ using Avalonia.Media;
 
 namespace ControlCatalog.Pages
 {
-    public partial class ConnectedAnimationDemoPage : UserControl
+    public partial class ConnectedAnimationDemoPage : ContentPage
     {
         private static readonly (string Group, string Title, string Description, Func<UserControl> Factory)[] Demos = [];
 
diff --git a/samples/ControlCatalog/Pages/ContainerQueryPage.xaml b/samples/ControlCatalog/Pages/ContainerQueryPage.xaml
index e6b0558a04..96f7a87586 100644
--- a/samples/ControlCatalog/Pages/ContainerQueryPage.xaml
+++ b/samples/ControlCatalog/Pages/ContainerQueryPage.xaml
@@ -1,9 +1,10 @@
-<UserControl x:Class="ControlCatalog.Pages.ContainerQueryPage"
+<ContentPage Theme="{StaticResource ScrollPage}" x:Class="ControlCatalog.Pages.ContainerQueryPage"
              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:viewModels="using:ControlCatalog.ViewModels"
+             Header="Container Queries"
              d:DesignHeight="800"
              d:DesignWidth="400"
              mc:Ignorable="d">
@@ -107,4 +108,4 @@
       </ScrollViewer>
     </Border>
   </StackPanel>
-</UserControl>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/ContainerQueryPage.xaml.cs b/samples/ControlCatalog/Pages/ContainerQueryPage.xaml.cs
index acd67c6629..b43723005e 100644
--- a/samples/ControlCatalog/Pages/ContainerQueryPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ContainerQueryPage.xaml.cs
@@ -2,7 +2,7 @@
 
 namespace ControlCatalog.Pages
 {
-    public partial class ContainerQueryPage : UserControl
+    public partial class ContainerQueryPage : ContentPage
     {
         public ContainerQueryPage()
         {
diff --git a/samples/ControlCatalog/Pages/ContentDemoPage.xaml b/samples/ControlCatalog/Pages/ContentDemoPage.xaml
index d8f2155a1b..bcf0ca67ef 100644
--- a/samples/ControlCatalog/Pages/ContentDemoPage.xaml
+++ b/samples/ControlCatalog/Pages/ContentDemoPage.xaml
@@ -1,11 +1,14 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<ContentPage Theme="{StaticResource ScrollPage}" xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             Header="Content Page"
              x:Class="ControlCatalog.Pages.ContentDemoPage">
-  <NavigationPage x:Name="SampleNav">
-    <NavigationPage.Styles>
-      <Style Selector="NavigationPage#SampleNav /template/ Border#PART_NavigationBar">
-        <Setter Property="Background" Value="Transparent" />
-      </Style>
-    </NavigationPage.Styles>
-  </NavigationPage>
-</UserControl>
+  <Grid>
+    <NavigationPage x:Name="SampleNav">
+      <NavigationPage.Styles>
+        <Style Selector="NavigationPage#SampleNav /template/ Border#PART_NavigationBar">
+          <Setter Property="Background" Value="Transparent" />
+        </Style>
+      </NavigationPage.Styles>
+    </NavigationPage>
+  </Grid>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/ContentDemoPage.xaml.cs b/samples/ControlCatalog/Pages/ContentDemoPage.xaml.cs
index e667cfc0ff..b47dde07c1 100644
--- a/samples/ControlCatalog/Pages/ContentDemoPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ContentDemoPage.xaml.cs
@@ -7,7 +7,7 @@ using Avalonia.Media;
 
 namespace ControlCatalog.Pages
 {
-    public partial class ContentDemoPage : UserControl
+    public partial class ContentDemoPage : ContentPage
     {
         private static readonly (string Group, string Title, string Description, Func<UserControl> Factory)[] Demos =
         {
diff --git a/samples/ControlCatalog/Pages/ContentPage/ContentPageCommandBarPage.xaml.cs b/samples/ControlCatalog/Pages/ContentPage/ContentPageCommandBarPage.xaml.cs
index 07bdbb52a2..3bb6b30082 100644
--- a/samples/ControlCatalog/Pages/ContentPage/ContentPageCommandBarPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ContentPage/ContentPageCommandBarPage.xaml.cs
@@ -78,7 +78,7 @@ namespace ControlCatalog.Pages
         private void OnAddPrimary(object? sender, RoutedEventArgs e)
         {
             _itemCounter++;
-            var btn = new AppBarButton { Label = $"Action {_itemCounter}" };
+            var btn = new CommandBarButton { Label = $"Action {_itemCounter}" };
             if (UseIconCheck.IsChecked == true)
             {
                 var preset = IconPresets[(_itemCounter - 1) % IconPresets.Length];
@@ -93,13 +93,13 @@ namespace ControlCatalog.Pages
         private void OnAddSecondary(object? sender, RoutedEventArgs e)
         {
             _itemCounter++;
-            _secondaryItems.Add(new AppBarButton { Label = $"Item {_itemCounter}" });
+            _secondaryItems.Add(new CommandBarButton { Label = $"Item {_itemCounter}" });
             RebuildCommandBar();
         }
 
         private void OnAddSeparator(object? sender, RoutedEventArgs e)
         {
-            _primaryItems.Add(new AppBarSeparator());
+            _primaryItems.Add(new CommandBarSeparator());
             RebuildCommandBar();
         }
 
@@ -177,26 +177,26 @@ namespace ControlCatalog.Pages
 
             foreach (var item in _primaryItems)
             {
-                if (item is AppBarButton btn)
+                if (item is CommandBarButton btn)
                 {
                     PathIcon? icon = null;
                     if (btn.Icon is PathIcon src)
                         icon = new PathIcon { Data = src.Data };
-                    commandBar.PrimaryCommands.Add(new AppBarButton
+                    commandBar.PrimaryCommands.Add(new CommandBarButton
                     {
                         Label = btn.Label,
                         Icon = icon,
                         IsCompact = btn.IsCompact,
                     });
                 }
-                else if (item is AppBarSeparator)
-                    commandBar.PrimaryCommands.Add(new AppBarSeparator());
+                else if (item is CommandBarSeparator)
+                    commandBar.PrimaryCommands.Add(new CommandBarSeparator());
             }
 
             foreach (var item in _secondaryItems)
             {
-                if (item is AppBarButton btn)
-                    commandBar.SecondaryCommands.Add(new AppBarButton { Label = btn.Label });
+                if (item is CommandBarButton btn)
+                    commandBar.SecondaryCommands.Add(new CommandBarButton { Label = btn.Label });
             }
 
             if (_position == "Top")
@@ -204,7 +204,7 @@ namespace ControlCatalog.Pages
             else
                 NavigationPage.SetBottomCommandBar(activePage, commandBar);
 
-            var primaryCount = _primaryItems.Count(i => i is AppBarButton);
+            var primaryCount = _primaryItems.Count(i => i is CommandBarButton);
             var secondaryCount = _secondaryItems.Count;
             StatusText.Text = $"{primaryCount} primary, {secondaryCount} secondary ({_position})";
         }
diff --git a/samples/ControlCatalog/Pages/ContextFlyoutPage.xaml b/samples/ControlCatalog/Pages/ContextFlyoutPage.xaml
index c23393e63c..fa52c05bfa 100644
--- a/samples/ControlCatalog/Pages/ContextFlyoutPage.xaml
+++ b/samples/ControlCatalog/Pages/ContextFlyoutPage.xaml
@@ -1,18 +1,19 @@
-<UserControl x:Class="ControlCatalog.Pages.ContextFlyoutPage"
+<ContentPage Theme="{StaticResource ScrollPage}" x:Class="ControlCatalog.Pages.ContextFlyoutPage"
              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:viewModels="using:ControlCatalog.ViewModels"
+             Header="ContextFlyout"
              d:DesignHeight="450"
              d:DesignWidth="800"
              mc:Ignorable="d"
              x:DataType="viewModels:ContextPageViewModel">
-  <UserControl.Styles>
+  <ContentPage.Styles>
     <Style Selector="FlyoutPresenter.NoPadding">
       <Setter Property="Padding" Value="0" />
     </Style>
-  </UserControl.Styles>
+  </ContentPage.Styles>
 
   <StackPanel Orientation="Vertical" Spacing="4">
     <StackPanel.Styles>
@@ -156,4 +157,4 @@
       </TextBox.ContextFlyout>
     </TextBox>
   </StackPanel>
-</UserControl>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/ContextFlyoutPage.xaml.cs b/samples/ControlCatalog/Pages/ContextFlyoutPage.xaml.cs
index bef2c8212d..f25b9341c3 100644
--- a/samples/ControlCatalog/Pages/ContextFlyoutPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ContextFlyoutPage.xaml.cs
@@ -7,7 +7,7 @@ using ControlCatalog.ViewModels;
 
 namespace ControlCatalog.Pages
 {
-    public partial class ContextFlyoutPage : UserControl
+    public partial class ContextFlyoutPage : ContentPage
     {
         public ContextFlyoutPage()
         {
diff --git a/samples/ControlCatalog/Pages/ContextMenuPage.xaml b/samples/ControlCatalog/Pages/ContextMenuPage.xaml
index 0e7c7b9451..4d1d02aed8 100644
--- a/samples/ControlCatalog/Pages/ContextMenuPage.xaml
+++ b/samples/ControlCatalog/Pages/ContextMenuPage.xaml
@@ -1,7 +1,8 @@
-<UserControl x:Class="ControlCatalog.Pages.ContextMenuPage"
+<ContentPage Theme="{StaticResource ScrollPage}" x:Class="ControlCatalog.Pages.ContextMenuPage"
              xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:viewModels="using:ControlCatalog.ViewModels"
+             Header="ContextMenu"
              x:DataType="viewModels:ContextPageViewModel">
   <StackPanel Orientation="Vertical" Spacing="4">
     <TextBlock Classes="h2">A right click menu that can be applied to any control.</TextBlock>
@@ -86,4 +87,4 @@
       </Border>
     </UniformGrid>
   </StackPanel>
-</UserControl>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/ContextMenuPage.xaml.cs b/samples/ControlCatalog/Pages/ContextMenuPage.xaml.cs
index a71398181c..86ce807127 100644
--- a/samples/ControlCatalog/Pages/ContextMenuPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ContextMenuPage.xaml.cs
@@ -6,7 +6,7 @@ using ControlCatalog.ViewModels;
 
 namespace ControlCatalog.Pages
 {
-    public partial class ContextMenuPage : UserControl
+    public partial class ContextMenuPage : ContentPage
     {
         public ContextMenuPage()
         {
diff --git a/samples/ControlCatalog/Pages/CursorPage.xaml b/samples/ControlCatalog/Pages/CursorPage.xaml
index 66f2b8b2e3..ae20193c97 100644
--- a/samples/ControlCatalog/Pages/CursorPage.xaml
+++ b/samples/ControlCatalog/Pages/CursorPage.xaml
@@ -1,6 +1,7 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<ContentPage Theme="{StaticResource ScrollPage}" xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:viewModels="using:ControlCatalog.ViewModels"
+             Header="Cursors"
              x:Class="ControlCatalog.Pages.CursorPage"
              x:DataType="viewModels:CursorPageViewModel">
   <Grid ColumnDefinitions="*,*" RowDefinitions="Auto,*">
@@ -27,4 +28,4 @@
       </Button>
     </StackPanel>
  </Grid>
-</UserControl>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/CursorPage.xaml.cs b/samples/ControlCatalog/Pages/CursorPage.xaml.cs
index f9119175e2..88699ac6f2 100644
--- a/samples/ControlCatalog/Pages/CursorPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/CursorPage.xaml.cs
@@ -3,7 +3,7 @@ using ControlCatalog.ViewModels;
 
 namespace ControlCatalog.Pages
 {
-    public partial class CursorPage : UserControl
+    public partial class CursorPage : ContentPage
     {
         public CursorPage()
         {
diff --git a/samples/ControlCatalog/Pages/CustomDrawing.xaml b/samples/ControlCatalog/Pages/CustomDrawing.xaml
index 04b7fcfea5..f1cb2dab14 100644
--- a/samples/ControlCatalog/Pages/CustomDrawing.xaml
+++ b/samples/ControlCatalog/Pages/CustomDrawing.xaml
@@ -1,15 +1,16 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<ContentPage Theme="{StaticResource ScrollPage}" 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"
+             Header="Custom Drawing"
              xmlns:converters="using:ControlCatalog.Converter"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="ControlCatalog.Pages.CustomDrawing">
 
-  <UserControl.Resources>
+  <ContentPage.Resources>
     <converters:DegToRadConverter x:Key="DegToRadConverter"/>
-  </UserControl.Resources>
+  </ContentPage.Resources>
   
   <Grid>
     <Grid.ColumnDefinitions>
@@ -104,4 +105,4 @@
     </Grid>
   </Grid>
   
-</UserControl>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/CustomDrawing.xaml.cs b/samples/ControlCatalog/Pages/CustomDrawing.xaml.cs
index d3fedb76be..0eae942075 100644
--- a/samples/ControlCatalog/Pages/CustomDrawing.xaml.cs
+++ b/samples/ControlCatalog/Pages/CustomDrawing.xaml.cs
@@ -4,7 +4,7 @@ using Avalonia.Interactivity;
 
 namespace ControlCatalog.Pages
 {
-    public partial class CustomDrawing : UserControl
+    public partial class CustomDrawing : ContentPage
     {
         public CustomDrawing()
         {
diff --git a/samples/ControlCatalog/Pages/DataGridPage.xaml b/samples/ControlCatalog/Pages/DataGridPage.xaml
index 3187e13f9f..04adf56700 100644
--- a/samples/ControlCatalog/Pages/DataGridPage.xaml
+++ b/samples/ControlCatalog/Pages/DataGridPage.xaml
@@ -1,5 +1,6 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<ContentPage Theme="{StaticResource ScrollPage}" xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             Header="DataGrid"
              x:Class="ControlCatalog.Pages.DataGridPage">
 
   <StackPanel>
@@ -8,4 +9,4 @@
                      Click="OnLinkClicked" />
   </StackPanel>
 
-</UserControl>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/DataGridPage.xaml.cs b/samples/ControlCatalog/Pages/DataGridPage.xaml.cs
index 5fa4ec8b0e..1154506e2e 100644
--- a/samples/ControlCatalog/Pages/DataGridPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/DataGridPage.xaml.cs
@@ -4,7 +4,7 @@ using Avalonia.Interactivity;
 
 namespace ControlCatalog.Pages;
 
-public partial class DataGridPage : UserControl
+public partial class DataGridPage : ContentPage
 {
     public DataGridPage()
     {
diff --git a/samples/ControlCatalog/Pages/DataValidationPage.axaml b/samples/ControlCatalog/Pages/DataValidationPage.axaml
index d46562addd..de4e398725 100644
--- a/samples/ControlCatalog/Pages/DataValidationPage.axaml
+++ b/samples/ControlCatalog/Pages/DataValidationPage.axaml
@@ -1,14 +1,15 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<ContentPage Theme="{StaticResource ScrollPage}" 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:viewModels="clr-namespace:ControlCatalog.ViewModels"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             Header="Data Validation"
              x:DataType="viewModels:DataValidationViewModel"
              x:Class="ControlCatalog.Pages.DataValidationPage">
-  <UserControl.DataContext>
+  <ContentPage.DataContext>
     <viewModels:DataValidationViewModel />
-  </UserControl.DataContext>
+  </ContentPage.DataContext>
   <StackPanel TextBlock.TextWrapping="Wrap">
     <Label Target="Email1" Content="Email validation" />
     <TextBox x:Name="Email1"
@@ -38,5 +39,5 @@
       </TextBox.Styles>
     </TextBox>
   </StackPanel>
-</UserControl>
+</ContentPage>
 
diff --git a/samples/ControlCatalog/Pages/DataValidationPage.axaml.cs b/samples/ControlCatalog/Pages/DataValidationPage.axaml.cs
index e38f85fec4..26bb75ca79 100644
--- a/samples/ControlCatalog/Pages/DataValidationPage.axaml.cs
+++ b/samples/ControlCatalog/Pages/DataValidationPage.axaml.cs
@@ -4,7 +4,7 @@ using Avalonia.Markup.Xaml;
 
 namespace ControlCatalog.Pages;
 
-public partial class DataValidationPage : UserControl
+public partial class DataValidationPage : ContentPage
 {
     public DataValidationPage()
     {
diff --git a/samples/ControlCatalog/Pages/DateTimePickerPage.xaml b/samples/ControlCatalog/Pages/DateTimePickerPage.xaml
index 7a1bfaa824..2183204c05 100644
--- a/samples/ControlCatalog/Pages/DateTimePickerPage.xaml
+++ b/samples/ControlCatalog/Pages/DateTimePickerPage.xaml
@@ -1,7 +1,8 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<ContentPage Theme="{StaticResource ScrollPage}" 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"
+             Header="DateTimePicker"
              xmlns:sys="using:System"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="ControlCatalog.Pages.DateTimePickerPage">
@@ -207,4 +208,4 @@
       
     </StackPanel>
   </StackPanel>
-</UserControl>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/DateTimePickerPage.xaml.cs b/samples/ControlCatalog/Pages/DateTimePickerPage.xaml.cs
index b5968a6b2a..99250d5fb0 100644
--- a/samples/ControlCatalog/Pages/DateTimePickerPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/DateTimePickerPage.xaml.cs
@@ -2,7 +2,7 @@
 
 namespace ControlCatalog.Pages
 {
-    public partial class DateTimePickerPage : UserControl
+    public partial class DateTimePickerPage : ContentPage
     {
         public DateTimePickerPage()
         {
diff --git a/samples/ControlCatalog/Pages/DialogsPage.xaml b/samples/ControlCatalog/Pages/DialogsPage.xaml
index e6b3568909..296b632b91 100644
--- a/samples/ControlCatalog/Pages/DialogsPage.xaml
+++ b/samples/ControlCatalog/Pages/DialogsPage.xaml
@@ -1,6 +1,7 @@
-<UserControl x:Class="ControlCatalog.Pages.DialogsPage"
+<ContentPage Theme="{StaticResource ScrollPage}" x:Class="ControlCatalog.Pages.DialogsPage"
              xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             Header="Dialogs"
              xmlns:storage="clr-namespace:Avalonia.Platform.Storage;assembly=Avalonia.Base"
              xmlns:generic="clr-namespace:System.Collections.Generic;assembly=System.Collections">
   <StackPanel Margin="4"
@@ -84,4 +85,4 @@
              PlaceholderText="Picked file content" />
 
   </StackPanel>
-</UserControl>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/DialogsPage.xaml.cs b/samples/ControlCatalog/Pages/DialogsPage.xaml.cs
index adcf844552..616e3d4f62 100644
--- a/samples/ControlCatalog/Pages/DialogsPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/DialogsPage.xaml.cs
@@ -12,7 +12,7 @@ using Avalonia.Platform.Storage;
 
 namespace ControlCatalog.Pages
 {
-    public partial class DialogsPage : UserControl
+    public partial class DialogsPage : ContentPage
     {
         public DialogsPage()
         {
diff --git a/samples/ControlCatalog/Pages/DragAndDropPage.xaml b/samples/ControlCatalog/Pages/DragAndDropPage.xaml
index 7982ddc1d0..2ca9ed27a0 100644
--- a/samples/ControlCatalog/Pages/DragAndDropPage.xaml
+++ b/samples/ControlCatalog/Pages/DragAndDropPage.xaml
@@ -1,15 +1,16 @@
-<UserControl x:Class="ControlCatalog.Pages.DragAndDropPage"
+<ContentPage Theme="{StaticResource ScrollPage}" x:Class="ControlCatalog.Pages.DragAndDropPage"
              xmlns="https://github.com/avaloniaui"
+             Header="Drag And Drop"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-  <UserControl.Styles>
+  <ContentPage.Styles>
     <Style Selector="Border.draggable">
       <Setter Property="Background" Value="Transparent" />
       <Setter Property="BorderBrush" Value="{DynamicResource SystemAccentColor}" />
       <Setter Property="BorderThickness" Value="2" />
       <Setter Property="Padding" Value="16" />
     </Style>
-  </UserControl.Styles>
+  </ContentPage.Styles>
 
   <StackPanel Orientation="Vertical" Spacing="4">
     <TextBlock Classes="h2">Example of Drag+Drop capabilities</TextBlock>
@@ -57,4 +58,4 @@
 
     <ContentControl x:Name="DropState" TextBlock.TextWrapping="Wrap" />
   </StackPanel>
-</UserControl>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/DragAndDropPage.xaml.cs b/samples/ControlCatalog/Pages/DragAndDropPage.xaml.cs
index fe2b306477..b2a91da381 100644
--- a/samples/ControlCatalog/Pages/DragAndDropPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/DragAndDropPage.xaml.cs
@@ -13,7 +13,7 @@ using Avalonia.Platform.Storage;
 
 namespace ControlCatalog.Pages
 {
-    public partial class DragAndDropPage : UserControl
+    public partial class DragAndDropPage : ContentPage
     {
         private readonly DataFormat<string> _customFormat =
             DataFormat.CreateStringApplicationFormat("xxx-avalonia-controlcatalog-custom");
diff --git a/samples/ControlCatalog/Pages/DrawerDemoPage.xaml b/samples/ControlCatalog/Pages/DrawerDemoPage.xaml
index 671a9a8487..f1edd0bc63 100644
--- a/samples/ControlCatalog/Pages/DrawerDemoPage.xaml
+++ b/samples/ControlCatalog/Pages/DrawerDemoPage.xaml
@@ -1,11 +1,14 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<ContentPage Theme="{StaticResource ScrollPage}" xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             Header="Drawer Page"
              x:Class="ControlCatalog.Pages.DrawerDemoPage">
-  <NavigationPage x:Name="SampleNav">
-    <NavigationPage.Styles>
-      <Style Selector="NavigationPage#SampleNav /template/ Border#PART_NavigationBar">
-        <Setter Property="Background" Value="Transparent" />
-      </Style>
-    </NavigationPage.Styles>
-  </NavigationPage>
-</UserControl>
+  <Grid>
+    <NavigationPage x:Name="SampleNav">
+      <NavigationPage.Styles>
+        <Style Selector="NavigationPage#SampleNav /template/ Border#PART_NavigationBar">
+          <Setter Property="Background" Value="Transparent" />
+        </Style>
+      </NavigationPage.Styles>
+    </NavigationPage>
+  </Grid>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/DrawerDemoPage.xaml.cs b/samples/ControlCatalog/Pages/DrawerDemoPage.xaml.cs
index cd8aa9cd5b..27eb93ff03 100644
--- a/samples/ControlCatalog/Pages/DrawerDemoPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/DrawerDemoPage.xaml.cs
@@ -4,7 +4,7 @@ using Avalonia.Interactivity;
 
 namespace ControlCatalog.Pages
 {
-    public partial class DrawerDemoPage : UserControl
+    public partial class DrawerDemoPage : ContentPage
     {
         private static readonly (string Group, string Title, string Description, Func<UserControl> Factory)[] Demos =
         {
diff --git a/samples/ControlCatalog/Pages/DrawerPage/DrawerPageCustomizationPage.xaml b/samples/ControlCatalog/Pages/DrawerPage/DrawerPageCustomizationPage.xaml
index 4987e8979e..3adffed5f7 100644
--- a/samples/ControlCatalog/Pages/DrawerPage/DrawerPageCustomizationPage.xaml
+++ b/samples/ControlCatalog/Pages/DrawerPage/DrawerPageCustomizationPage.xaml
@@ -72,6 +72,14 @@
           <ComboBoxItem Content="Purple" />
         </ComboBox>
 
+        <TextBlock Text="Header Template" FontSize="12" Opacity="0.7" />
+        <ComboBox x:Name="HeaderTemplateCombo" SelectedIndex="0"
+                  SelectionChanged="OnHeaderTemplateChanged" HorizontalAlignment="Stretch">
+          <ComboBoxItem Content="None (direct control)" />
+          <ComboBoxItem Content="Banner" />
+          <ComboBoxItem Content="Avatar card" />
+        </ComboBox>
+
         <TextBlock Text="Footer Background" FontSize="12" Opacity="0.7" />
         <ComboBox x:Name="FooterBgCombo" SelectedIndex="0"
                   SelectionChanged="OnFooterBgChanged" HorizontalAlignment="Stretch">
@@ -82,6 +90,14 @@
           <ComboBoxItem Content="Maroon" />
         </ComboBox>
 
+        <TextBlock Text="Footer Template" FontSize="12" Opacity="0.7" />
+        <ComboBox x:Name="FooterTemplateCombo" SelectedIndex="0"
+                  SelectionChanged="OnFooterTemplateChanged" HorizontalAlignment="Stretch">
+          <ComboBoxItem Content="None (direct control)" />
+          <ComboBoxItem Content="Version badge" />
+          <ComboBoxItem Content="Icon + label" />
+        </ComboBox>
+
         <TextBlock Text="Drawer Icon" FontSize="12" Opacity="0.7" />
         <ComboBox x:Name="IconCombo" SelectedIndex="0"
                   SelectionChanged="OnIconChanged" HorizontalAlignment="Stretch">
diff --git a/samples/ControlCatalog/Pages/DrawerPage/DrawerPageCustomizationPage.xaml.cs b/samples/ControlCatalog/Pages/DrawerPage/DrawerPageCustomizationPage.xaml.cs
index 243bc5868b..d948252385 100644
--- a/samples/ControlCatalog/Pages/DrawerPage/DrawerPageCustomizationPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/DrawerPage/DrawerPageCustomizationPage.xaml.cs
@@ -1,8 +1,10 @@
 using System.Linq;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Templates;
 using Avalonia.Input.GestureRecognizers;
 using Avalonia.Interactivity;
+using Avalonia.Layout;
 using Avalonia.Media;
 
 namespace ControlCatalog.Pages
@@ -143,7 +145,7 @@ namespace ControlCatalog.Pages
         {
             if (!_isLoaded)
                 return;
-            DemoDrawer.DrawerIcon = Geometry.Parse(_iconPaths[IconCombo.SelectedIndex]);
+            DemoDrawer.DrawerIcon = new PathIcon { Data = Geometry.Parse(_iconPaths[IconCombo.SelectedIndex]) };
         }
 
         private void OnBackdropChanged(object? sender, SelectionChangedEventArgs e)
@@ -164,7 +166,7 @@ namespace ControlCatalog.Pages
             if (!_isLoaded)
                 return;
             if (ShowHeaderCheck.IsChecked == true)
-                DemoDrawer.DrawerHeader = DrawerHeaderBorder;
+                DemoDrawer.DrawerHeader = HeaderTemplateCombo.SelectedIndex == 0 ? DrawerHeaderBorder : (object)"My Application";
             else
                 DemoDrawer.DrawerHeader = null;
         }
@@ -174,9 +176,128 @@ namespace ControlCatalog.Pages
             if (!_isLoaded)
                 return;
             if (ShowFooterCheck.IsChecked == true)
-                DemoDrawer.DrawerFooter = DrawerFooterBorder;
+            {
+                DemoDrawer.DrawerFooter = FooterTemplateCombo.SelectedIndex switch
+                {
+                    1 => (object)"v12.0",
+                    2 => (object)"Avalonia",
+                    _ => DrawerFooterBorder
+                };
+            }
             else
+            {
                 DemoDrawer.DrawerFooter = null;
+            }
+        }
+
+        private void OnHeaderTemplateChanged(object? sender, SelectionChangedEventArgs e)
+        {
+            if (!_isLoaded)
+                return;
+
+            switch (HeaderTemplateCombo.SelectedIndex)
+            {
+                case 1:
+                    DemoDrawer.DrawerHeader = "My Application";
+                    DemoDrawer.DrawerHeaderTemplate = new FuncDataTemplate<string>((data, _) =>
+                        new Border
+                        {
+                            Padding = new Avalonia.Thickness(16),
+                            Child = new StackPanel
+                            {
+                                Spacing = 2,
+                                Children =
+                                {
+                                    new TextBlock { Text = data, FontSize = 18, FontWeight = FontWeight.SemiBold, Foreground = Brushes.White },
+                                    new TextBlock { Text = "Navigation", FontSize = 12, Foreground = Brushes.White, Opacity = 0.7 }
+                                }
+                            }
+                        });
+                    break;
+
+                case 2:
+                    DemoDrawer.DrawerHeader = "My Application";
+                    DemoDrawer.DrawerHeaderTemplate = new FuncDataTemplate<string>((data, _) =>
+                    {
+                        var initial = data?.Length > 0 ? data[0].ToString().ToUpperInvariant() : "?";
+                        var avatar = new Border
+                        {
+                            Width = 40,
+                            Height = 40,
+                            CornerRadius = new Avalonia.CornerRadius(20),
+                            Background = new SolidColorBrush(Color.Parse("#1976D2")),
+                            Child = new TextBlock
+                            {
+                                Text = initial,
+                                FontSize = 18,
+                                FontWeight = FontWeight.Bold,
+                                Foreground = Brushes.White,
+                                HorizontalAlignment = HorizontalAlignment.Center,
+                                VerticalAlignment = VerticalAlignment.Center
+                            }
+                        };
+                        var label = new TextBlock { Text = data, FontSize = 14, FontWeight = FontWeight.SemiBold, VerticalAlignment = VerticalAlignment.Center };
+                        var row = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 10 };
+                        row.Children.Add(avatar);
+                        row.Children.Add(label);
+                        return new Border { Padding = new Avalonia.Thickness(12), Child = row };
+                    });
+                    break;
+
+                default:
+                    DemoDrawer.DrawerHeader = DrawerHeaderBorder;
+                    DemoDrawer.DrawerHeaderTemplate = null;
+                    break;
+            }
+        }
+
+        private void OnFooterTemplateChanged(object? sender, SelectionChangedEventArgs e)
+        {
+            if (!_isLoaded)
+                return;
+
+            switch (FooterTemplateCombo.SelectedIndex)
+            {
+                case 1:
+                    DemoDrawer.DrawerFooter = "v12.0";
+                    DemoDrawer.DrawerFooterTemplate = new FuncDataTemplate<string>((data, _) =>
+                        new Border
+                        {
+                            Padding = new Avalonia.Thickness(12, 8),
+                            Child = new Border
+                            {
+                                Padding = new Avalonia.Thickness(8, 4),
+                                CornerRadius = new Avalonia.CornerRadius(4),
+                                Background = new SolidColorBrush(Color.Parse("#1976D2")),
+                                Child = new TextBlock { Text = data, FontSize = 11, Foreground = Brushes.White, FontWeight = FontWeight.SemiBold }
+                            }
+                        });
+                    break;
+
+                case 2:
+                    DemoDrawer.DrawerFooter = "Avalonia";
+                    DemoDrawer.DrawerFooterTemplate = new FuncDataTemplate<string>((data, _) =>
+                    {
+                        var icon = new PathIcon
+                        {
+                            Width = 14,
+                            Height = 14,
+                            Data = Geometry.Parse("M13,9H11V7H13M13,17H11V11H13M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z"),
+                            Opacity = 0.5
+                        };
+                        var label = new TextBlock { Text = data, FontSize = 12, Opacity = 0.6, VerticalAlignment = VerticalAlignment.Center };
+                        var row = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 6 };
+                        row.Children.Add(icon);
+                        row.Children.Add(label);
+                        return new Border { Padding = new Avalonia.Thickness(14, 10), Child = row };
+                    });
+                    break;
+
+                default:
+                    DemoDrawer.DrawerFooter = DrawerFooterBorder;
+                    DemoDrawer.DrawerFooterTemplate = null;
+                    break;
+            }
         }
 
         private void OnMenuItemClick(object? sender, RoutedEventArgs e)
diff --git a/samples/ControlCatalog/Pages/DrawerPage/EcoTrackerAppPage.xaml b/samples/ControlCatalog/Pages/DrawerPage/EcoTrackerAppPage.xaml
index 1e9106ccfe..22320fbc8d 100644
--- a/samples/ControlCatalog/Pages/DrawerPage/EcoTrackerAppPage.xaml
+++ b/samples/ControlCatalog/Pages/DrawerPage/EcoTrackerAppPage.xaml
@@ -52,13 +52,9 @@
         </DrawerPage.Resources>
 
         <DrawerPage.DrawerIcon>
-          <StreamGeometry>M12 3C9 6 6 9 6 13C6 17.4 8.7 21 12 22C15.3 21 18 17.4 18 13C18 9 15 6 12 3Z</StreamGeometry>
+          <PathIcon Width="22" Height="22"
+                    Data="M12 3C9 6 6 9 6 13C6 17.4 8.7 21 12 22C15.3 21 18 17.4 18 13C18 9 15 6 12 3Z" />
         </DrawerPage.DrawerIcon>
-        <DrawerPage.DrawerIconTemplate>
-          <DataTemplate DataType="Geometry">
-            <PathIcon Width="22" Height="22" Data="{Binding}" />
-          </DataTemplate>
-        </DrawerPage.DrawerIconTemplate>
 
         <DrawerPage.DrawerHeader>
           <StackPanel Background="{StaticResource EcoDrawerBg}" Margin="0,0,0,8">
diff --git a/samples/ControlCatalog/Pages/ExpanderPage.xaml b/samples/ControlCatalog/Pages/ExpanderPage.xaml
index b5a2e6cdd0..322da30a61 100644
--- a/samples/ControlCatalog/Pages/ExpanderPage.xaml
+++ b/samples/ControlCatalog/Pages/ExpanderPage.xaml
@@ -1,7 +1,8 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<ContentPage Theme="{StaticResource ScrollPage}" xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:viewModels="using:ControlCatalog.ViewModels"
              x:Class="ControlCatalog.Pages.ExpanderPage"
+             Header="Expander"
              x:DataType="viewModels:ExpanderPageViewModel">
   <StackPanel Orientation="Vertical" Spacing="4">
     <TextBlock Classes="h2">Expands to show nested content</TextBlock>
@@ -72,4 +73,4 @@
       </Expander>
     </StackPanel>
   </StackPanel>
-</UserControl>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/ExpanderPage.xaml.cs b/samples/ControlCatalog/Pages/ExpanderPage.xaml.cs
index 05c5cbee53..65b7b7e30b 100644
--- a/samples/ControlCatalog/Pages/ExpanderPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ExpanderPage.xaml.cs
@@ -3,7 +3,7 @@ using ControlCatalog.ViewModels;
 
 namespace ControlCatalog.Pages
 {
-    public partial class ExpanderPage : UserControl
+    public partial class ExpanderPage : ContentPage
     {
         public ExpanderPage()
         {
diff --git a/samples/ControlCatalog/Pages/FlyoutsPage.axaml b/samples/ControlCatalog/Pages/FlyoutsPage.axaml
index 64a005c987..840557bb9f 100644
--- a/samples/ControlCatalog/Pages/FlyoutsPage.axaml
+++ b/samples/ControlCatalog/Pages/FlyoutsPage.axaml
@@ -1,11 +1,12 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<ContentPage Theme="{StaticResource ScrollPage}" 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="700"
+             Header="Flyouts"
              x:Class="ControlCatalog.Pages.FlyoutsPage">
 
-    <UserControl.Resources>
+    <ContentPage.Resources>
         <MenuFlyout x:Key="SharedMenuFlyout">
             <MenuItem Header="Item 1">
                 <MenuItem Header="Subitem 1" />
@@ -25,7 +26,7 @@
                 <TextBlock Text="Flyout Content with a custom presenter theme!" TextWrapping="Wrap" />
             </Panel>
         </Flyout>
-    </UserControl.Resources>
+    </ContentPage.Resources>
 
     <ScrollViewer HorizontalScrollBarVisibility="Disabled">
         <StackPanel Spacing="10">
@@ -282,4 +283,4 @@
         </StackPanel>
     </ScrollViewer>
     
-</UserControl>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/FlyoutsPage.axaml.cs b/samples/ControlCatalog/Pages/FlyoutsPage.axaml.cs
index 91e92bc227..d6f54df074 100644
--- a/samples/ControlCatalog/Pages/FlyoutsPage.axaml.cs
+++ b/samples/ControlCatalog/Pages/FlyoutsPage.axaml.cs
@@ -7,7 +7,7 @@ using Avalonia.Interactivity;
 
 namespace ControlCatalog.Pages
 {
-    public partial class FlyoutsPage : UserControl
+    public partial class FlyoutsPage : ContentPage
     {
         public FlyoutsPage()
         {
diff --git a/samples/ControlCatalog/Pages/FocusPage.xaml b/samples/ControlCatalog/Pages/FocusPage.xaml
index f4bad7d138..6cb2647907 100644
--- a/samples/ControlCatalog/Pages/FocusPage.xaml
+++ b/samples/ControlCatalog/Pages/FocusPage.xaml
@@ -1,9 +1,10 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<ContentPage Theme="{StaticResource ScrollPage}" 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:generic="clr-namespace:System.Collections.Generic;assembly=netstandard"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             Header="Focus"
              x:Class="ControlCatalog.Pages.FocusPage">
   <TabControl>
     <TabItem Header="XY Focus">
@@ -47,4 +48,4 @@
       </StackPanel>
     </TabItem>
   </TabControl>
-</UserControl>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/FocusPage.xaml.cs b/samples/ControlCatalog/Pages/FocusPage.xaml.cs
index 2cc8067885..18aae471ab 100644
--- a/samples/ControlCatalog/Pages/FocusPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/FocusPage.xaml.cs
@@ -4,7 +4,7 @@ using Avalonia.Markup.Xaml;
 
 namespace ControlCatalog.Pages;
 
-public partial class FocusPage : UserControl
+public partial class FocusPage : ContentPage
 {
     public FocusPage()
     {
diff --git a/samples/ControlCatalog/Pages/GesturePage.xaml b/samples/ControlCatalog/Pages/GesturePage.xaml
index 00d36d6cea..da9ed5f807 100644
--- a/samples/ControlCatalog/Pages/GesturePage.xaml
+++ b/samples/ControlCatalog/Pages/GesturePage.xaml
@@ -1,170 +1,14 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<ContentPage Theme="{StaticResource ScrollPage}" xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             d:DesignHeight="800"
-             d:DesignWidth="400"
+             Header="Gestures"
              x:Class="ControlCatalog.Pages.GesturePage">
-  <TabControl>
-    <TabItem>
-      <TabItem.Header>
-        <TextBlock FontWeight="Bold"
-                   FontSize="18"
-                   Margin="5">Pull Gexture (Touch / Pen)</TextBlock>
-
-      </TabItem.Header>
-      <StackPanel>
-        <TextBlock Margin="5">Pull from colored rectangles</TextBlock>
-        <Border>
-          <DockPanel HorizontalAlignment="Stretch"
-                     ClipToBounds="True"
-                     Margin="5"
-                     Height="200">
-            <Border DockPanel.Dock="Top"
-                    Margin="2"
-                    Name="TopPullZone"
-                    Background="Transparent"
-                    BorderBrush="Red"
-                    HorizontalAlignment="Stretch"
-                    Height="50"
-                    BorderThickness="1">
-              <Border.GestureRecognizers>
-                <PullGestureRecognizer PullDirection="TopToBottom"/>
-              </Border.GestureRecognizers>
-              <Border Width="10"
-                      Height="10"
-                      HorizontalAlignment="Center"
-                      VerticalAlignment="Center"
-                      CornerRadius="5"
-                      Name="TopBall"
-                      Background="Green"/>
-            </Border>
-            <Border DockPanel.Dock="Bottom"
-                    BorderBrush="Green"
-                    Margin="2"
-                    Background="Transparent"
-                    Name="BottomPullZone"
-                    HorizontalAlignment="Stretch"
-                    Height="50"
-                    BorderThickness="1">
-              <Border.GestureRecognizers>
-                <PullGestureRecognizer PullDirection="BottomToTop"/>
-              </Border.GestureRecognizers>
-              <Border Width="10"
-                      Name="BottomBall"
-                      HorizontalAlignment="Center"
-                      VerticalAlignment="Center"
-                      Height="10"
-                      CornerRadius="5"
-                      Background="Green"/>
-            </Border>
-            <Border DockPanel.Dock="Right"
-                    Margin="2"
-                    Background="Transparent"
-                    Name="RightPullZone"
-                    BorderBrush="Blue"
-                    HorizontalAlignment="Right"
-                    VerticalAlignment="Stretch"
-                    Width="50"
-                    BorderThickness="1">
-              <Border.GestureRecognizers>
-                <PullGestureRecognizer PullDirection="RightToLeft"/>
-              </Border.GestureRecognizers>
-              <Border Width="10"
-                      Height="10"
-                      Name="RightBall"
-                      HorizontalAlignment="Center"
-                      VerticalAlignment="Center"
-                      CornerRadius="5"
-                      Background="Green"/>
-
-            </Border>
-            <Border DockPanel.Dock="Left"
-                    Margin="2"
-                    Background="Transparent"
-                    Name="LeftPullZone"
-                    BorderBrush="Orange"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Stretch"
-                    Width="50"
-                    BorderThickness="1">
-              <Border.GestureRecognizers>
-                <PullGestureRecognizer PullDirection="LeftToRight"/>
-              </Border.GestureRecognizers>
-              <Border Width="10"
-                      Height="10"
-                      Name="LeftBall"
-                      HorizontalAlignment="Center"
-                      VerticalAlignment="Center"
-                      CornerRadius="5"
-                      Background="Green"/>
-
-            </Border>
-          </DockPanel>
-        </Border>
-      </StackPanel>
-    </TabItem>
-
-    <TabItem>
-      <TabItem.Header>
-        <TextBlock FontWeight="Bold"
-                   FontSize="18"
-                   Margin="5">Pinch/Zoom Gexture (Multi Touch)</TextBlock>
-      </TabItem.Header>
-      <StackPanel>
-        <Border ClipToBounds="True">
-          <Image Stretch="UniformToFill"
-                 Margin="5"
-                 Name="PinchImage"
-                 Source="/Assets/delicate-arch-896885_640.jpg">
-            <Image.GestureRecognizers>
-              <PinchGestureRecognizer/>
-              <ScrollGestureRecognizer CanHorizontallyScroll="True" CanVerticallyScroll="True"/>
-            </Image.GestureRecognizers>
-          </Image>
-        </Border>
-        <Button HorizontalAlignment="Center" Name="ResetButton">Reset</Button>
-      </StackPanel>
-    </TabItem>
-
-    <TabItem>
-      <TabItem.Header>
-        <TextBlock FontWeight="Bold"
-                   FontSize="18"
-                   Margin="5">Pinch/Rotation Gexture (Multi Touch)</TextBlock>
-      </TabItem.Header>
-      <DockPanel>
-        <Slider Minimum="0"
-                Maximum="360"
-                DockPanel.Dock="Bottom"
-                x:Name="AngleSlider"
-                />
-        <Panel x:Name="RotationGesture">
-          <Panel.GestureRecognizers>
-            <PinchGestureRecognizer/>
-          </Panel.GestureRecognizers>
-          <Border BorderThickness="1.5" BorderBrush="LawnGreen"/>
-          <Panel HorizontalAlignment="Center"
-                 Width="100"
-                 Height="100">
-            <Panel.RenderTransform>
-              <RotateTransform Angle="{Binding #AngleSlider.Value}"/>
-            </Panel.RenderTransform>
-            <Rectangle Fill="SkyBlue"/>
-            <Rectangle HorizontalAlignment="Center"
-                       VerticalAlignment="Top"
-                       Fill="Yellow"
-                       Width="5"
-                       Height="35"/>
-          </Panel>
-
-          <TextBlock Text="{Binding #AngleSlider.Value, StringFormat=0°}"
-               VerticalAlignment="Center"
-               HorizontalAlignment="Center"
-               FontWeight="DemiBold"
-               FontSize="20"
-               />
-        </Panel>
-      </DockPanel>
-    </TabItem>
-  </TabControl>
-</UserControl>
+  <Grid>
+    <NavigationPage x:Name="SampleNav">
+      <NavigationPage.Styles>
+        <Style Selector="NavigationPage#SampleNav /template/ Border#PART_NavigationBar">
+          <Setter Property="Background" Value="Transparent" />
+        </Style>
+      </NavigationPage.Styles>
+    </NavigationPage>
+  </Grid>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/GesturePage.xaml.cs b/samples/ControlCatalog/Pages/GesturePage.xaml.cs
new file mode 100644
index 0000000000..56c09573d0
--- /dev/null
+++ b/samples/ControlCatalog/Pages/GesturePage.xaml.cs
@@ -0,0 +1,39 @@
+using System;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+
+namespace ControlCatalog.Pages
+{
+    public partial class GesturePage : ContentPage
+    {
+        private static readonly (string Group, string Title, string Description, Func<UserControl> Factory)[] Demos =
+        {
+            ("Touch / Pen", "Pull Gesture",
+                "Press and drag from colored border zones. A green ball tracks the pull delta and springs back on release.",
+                () => new GesturePullPage()),
+
+            ("Multi Touch", "Pinch / Zoom",
+                "Pinch to scale an image using composition visuals. Scroll to pan when zoomed in.",
+                () => new GesturePinchZoomPage()),
+
+            ("Multi Touch", "Pinch / Rotation",
+                "Pinch to rotate a rectangle. The Angle property from the pinch event drives a RotateTransform.",
+                () => new GesturePinchRotationPage()),
+
+            ("Touch / Pen / Mouse", "Swipe Gesture",
+                "Swipe horizontally or vertically. Configure direction, threshold, and mouse support. Shows live delta, velocity, and direction.",
+                () => new GestureSwipePage()),
+        };
+
+        public GesturePage()
+        {
+            InitializeComponent();
+            Loaded += OnLoaded;
+        }
+
+        private async void OnLoaded(object? sender, RoutedEventArgs e)
+        {
+            await SampleNav.PushAsync(NavigationDemoHelper.CreateGalleryHomePage(SampleNav, Demos), null);
+        }
+    }
+}
diff --git a/samples/ControlCatalog/Pages/Gestures/GesturePinchRotationPage.xaml b/samples/ControlCatalog/Pages/Gestures/GesturePinchRotationPage.xaml
new file mode 100644
index 0000000000..b46af74c3b
--- /dev/null
+++ b/samples/ControlCatalog/Pages/Gestures/GesturePinchRotationPage.xaml
@@ -0,0 +1,59 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="ControlCatalog.Pages.GesturePinchRotationPage">
+  <DockPanel>
+    <ScrollViewer DockPanel.Dock="Right" Width="260">
+      <StackPanel Margin="12" Spacing="8">
+        <TextBlock Text="How It Works" FontSize="16" FontWeight="SemiBold"
+                   Foreground="{DynamicResource SystemControlHighlightAccentBrush}" />
+        <TextBlock TextWrapping="Wrap" FontSize="12" Opacity="0.7"
+                   Text="A PinchGestureRecognizer raises Pinch events that include an Angle property. The angle is applied to a RotateTransform on the inner panel." />
+        <TextBlock TextWrapping="Wrap" FontSize="12" Opacity="0.7"
+                   Text="Use the slider below to manually adjust the rotation angle, or use a multi-touch pinch/twist gesture." />
+
+        <Separator />
+
+        <TextBlock Text="API" FontWeight="SemiBold" FontSize="13" />
+        <StackPanel Spacing="4">
+          <TextBlock FontSize="13" FontFamily="Cascadia Code, Consolas, Monospace"
+                     Text="PinchEventArgs.Angle" />
+          <TextBlock FontSize="12" TextWrapping="Wrap" Opacity="0.7"
+                     Text="The rotation angle in degrees from the pinch gesture." />
+        </StackPanel>
+      </StackPanel>
+    </ScrollViewer>
+
+    <Border DockPanel.Dock="Right" Width="1" Background="{DynamicResource SystemControlForegroundBaseMediumLowBrush}" />
+
+    <DockPanel Margin="12">
+      <Slider Minimum="0"
+              Maximum="360"
+              DockPanel.Dock="Bottom"
+              x:Name="AngleSlider" />
+      <Panel x:Name="RotationGesture">
+        <Panel.GestureRecognizers>
+          <PinchGestureRecognizer/>
+        </Panel.GestureRecognizers>
+        <Border BorderThickness="1.5" BorderBrush="LawnGreen"/>
+        <Panel HorizontalAlignment="Center"
+               Width="100"
+               Height="100">
+          <Panel.RenderTransform>
+            <RotateTransform Angle="{Binding #AngleSlider.Value}"/>
+          </Panel.RenderTransform>
+          <Rectangle Fill="SkyBlue"/>
+          <Rectangle HorizontalAlignment="Center"
+                     VerticalAlignment="Top"
+                     Fill="Yellow"
+                     Width="5"
+                     Height="35"/>
+        </Panel>
+        <TextBlock Text="{Binding #AngleSlider.Value, StringFormat={}{0:F0}\°}"
+                   VerticalAlignment="Center"
+                   HorizontalAlignment="Center"
+                   FontWeight="DemiBold"
+                   FontSize="20" />
+      </Panel>
+    </DockPanel>
+  </DockPanel>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/Gestures/GesturePinchRotationPage.xaml.cs b/samples/ControlCatalog/Pages/Gestures/GesturePinchRotationPage.xaml.cs
new file mode 100644
index 0000000000..55d5e619ee
--- /dev/null
+++ b/samples/ControlCatalog/Pages/Gestures/GesturePinchRotationPage.xaml.cs
@@ -0,0 +1,33 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Input;
+
+namespace ControlCatalog.Pages
+{
+    public partial class GesturePinchRotationPage : UserControl
+    {
+        private bool _isInit;
+
+        public GesturePinchRotationPage()
+        {
+            InitializeComponent();
+        }
+
+        protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnAttachedToVisualTree(e);
+
+            if (_isInit)
+            {
+                return;
+            }
+
+            _isInit = true;
+
+            RotationGesture.AddHandler(InputElement.PinchEvent, (s, e) =>
+            {
+                AngleSlider.Value = e.Angle;
+            });
+        }
+    }
+}
diff --git a/samples/ControlCatalog/Pages/Gestures/GesturePinchZoomPage.xaml b/samples/ControlCatalog/Pages/Gestures/GesturePinchZoomPage.xaml
new file mode 100644
index 0000000000..6932741e5b
--- /dev/null
+++ b/samples/ControlCatalog/Pages/Gestures/GesturePinchZoomPage.xaml
@@ -0,0 +1,51 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="ControlCatalog.Pages.GesturePinchZoomPage">
+  <DockPanel>
+    <ScrollViewer DockPanel.Dock="Right" Width="260">
+      <StackPanel Margin="12" Spacing="8">
+        <TextBlock Text="How It Works" FontSize="16" FontWeight="SemiBold"
+                   Foreground="{DynamicResource SystemControlHighlightAccentBrush}" />
+        <TextBlock TextWrapping="Wrap" FontSize="12" Opacity="0.7"
+                   Text="Attach a PinchGestureRecognizer and a ScrollGestureRecognizer to an image. Pinch to zoom in and out, then scroll to pan when zoomed." />
+        <TextBlock TextWrapping="Wrap" FontSize="12" Opacity="0.7"
+                   Text="The composition visual's Scale and Offset are updated directly for smooth performance." />
+
+        <Separator />
+
+        <TextBlock Text="API" FontWeight="SemiBold" FontSize="13" />
+        <StackPanel Spacing="4">
+          <TextBlock FontSize="13" FontFamily="Cascadia Code, Consolas, Monospace"
+                     Text="PinchGestureRecognizer" />
+          <TextBlock FontSize="12" TextWrapping="Wrap" Opacity="0.7"
+                     Text="Raises Pinch (with Scale) and PinchEnded events." />
+        </StackPanel>
+        <StackPanel Spacing="4">
+          <TextBlock FontSize="13" FontFamily="Cascadia Code, Consolas, Monospace"
+                     Text="ScrollGestureRecognizer" />
+          <TextBlock FontSize="12" TextWrapping="Wrap" Opacity="0.7"
+                     Text="CanHorizontallyScroll / CanVerticallyScroll enable panning." />
+        </StackPanel>
+
+        <Separator />
+
+        <Button x:Name="ResetButton"
+                Content="Reset"
+                HorizontalAlignment="Stretch" />
+      </StackPanel>
+    </ScrollViewer>
+
+    <Border DockPanel.Dock="Right" Width="1" Background="{DynamicResource SystemControlForegroundBaseMediumLowBrush}" />
+
+    <Border Margin="12" ClipToBounds="True">
+      <Image Stretch="UniformToFill"
+             Name="PinchImage"
+             Source="/Assets/delicate-arch-896885_640.jpg">
+        <Image.GestureRecognizers>
+          <PinchGestureRecognizer/>
+          <ScrollGestureRecognizer CanHorizontallyScroll="True" CanVerticallyScroll="True"/>
+        </Image.GestureRecognizers>
+      </Image>
+    </Border>
+  </DockPanel>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/GesturePage.cs b/samples/ControlCatalog/Pages/Gestures/GesturePinchZoomPage.xaml.cs
similarity index 55%
rename from samples/ControlCatalog/Pages/GesturePage.cs
rename to samples/ControlCatalog/Pages/Gestures/GesturePinchZoomPage.xaml.cs
index 2906091daa..9906a646c4 100644
--- a/samples/ControlCatalog/Pages/GesturePage.cs
+++ b/samples/ControlCatalog/Pages/Gestures/GesturePinchZoomPage.xaml.cs
@@ -2,18 +2,16 @@ using System;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Input;
-using Avalonia.LogicalTree;
 using Avalonia.Rendering.Composition;
-using Avalonia.Utilities;
 
 namespace ControlCatalog.Pages
 {
-    public partial class GesturePage : UserControl
+    public partial class GesturePinchZoomPage : UserControl
     {
         private bool _isInit;
         private double _currentScale;
 
-        public GesturePage()
+        public GesturePinchZoomPage()
         {
             InitializeComponent();
         }
@@ -29,17 +27,10 @@ namespace ControlCatalog.Pages
 
             _isInit = true;
 
-            SetPullHandlers(TopPullZone, false);
-            SetPullHandlers(BottomPullZone, true);
-            SetPullHandlers(RightPullZone, true);
-            SetPullHandlers(LeftPullZone, false);
-
             var image = PinchImage;
             SetPinchHandlers(image);
 
-            var reset = ResetButton;
-
-            reset.Click += (_, _) =>
+            ResetButton.Click += (_, _) =>
             {
                 var compositionVisual = ElementComposition.GetElementVisual(image);
 
@@ -51,11 +42,6 @@ namespace ControlCatalog.Pages
                     image.InvalidateMeasure();
                 }
             };
-
-            RotationGesture.AddHandler(InputElement.PinchEvent, (s, e) =>
-            {
-                AngleSlider.Value = e.Angle;
-            });
         }
 
         private void SetPinchHandlers(Control? control)
@@ -144,71 +130,5 @@ namespace ControlCatalog.Pages
                 }
             });
         }
-
-        private void SetPullHandlers(Control control, bool inverse)
-        {
-            var ball = control.FindLogicalDescendantOfType<Border>();
-
-            Vector3D defaultOffset = default;
-
-            CompositionVisual? ballCompositionVisual = null;
-
-            if (ball != null)
-            {
-                InitComposition(ball);
-            }
-            else
-            {
-                return;
-            }
-
-            control.LayoutUpdated += (s, e) =>
-            {
-                InitComposition(ball!);
-                if (ballCompositionVisual != null)
-                {
-                    defaultOffset = ballCompositionVisual.Offset;
-                }
-            };
-
-            control.AddHandler(InputElement.PullGestureEvent, (s, e) =>
-            {
-                Vector3D center = new((float)control.Bounds.Center.X, (float)control.Bounds.Center.Y, 0);
-                InitComposition(ball!);
-                if (ballCompositionVisual != null)
-                {
-                    ballCompositionVisual.Offset = defaultOffset + new Vector3D(e.Delta.X * 0.4f, e.Delta.Y * 0.4f, 0) * (inverse ? -1 : 1);
-
-                    e.Handled = true;
-                }
-            });
-
-            control.AddHandler(InputElement.PullGestureEndedEvent, (s, e) =>
-            {
-                InitComposition(ball!);
-                if (ballCompositionVisual != null)
-                {
-                    ballCompositionVisual.Offset = defaultOffset;
-                }
-            });
-
-            void InitComposition(Control control)
-            {
-                ballCompositionVisual = ElementComposition.GetElementVisual(ball);
-
-                if (ballCompositionVisual != null)
-                {
-                    var offsetAnimation = ballCompositionVisual.Compositor.CreateVector3KeyFrameAnimation();
-                    offsetAnimation.Target = "Offset";
-                    offsetAnimation.InsertExpressionKeyFrame(1.0f, "this.FinalValue");
-                    offsetAnimation.Duration = TimeSpan.FromMilliseconds(100);
-
-                    var implicitAnimations = ballCompositionVisual.Compositor.CreateImplicitAnimationCollection();
-                    implicitAnimations["Offset"] = offsetAnimation;
-
-                    ballCompositionVisual.ImplicitAnimations = implicitAnimations;
-                }
-            }
-        }
     }
 }
diff --git a/samples/ControlCatalog/Pages/Gestures/GesturePullPage.xaml b/samples/ControlCatalog/Pages/Gestures/GesturePullPage.xaml
new file mode 100644
index 0000000000..6fa77bafd7
--- /dev/null
+++ b/samples/ControlCatalog/Pages/Gestures/GesturePullPage.xaml
@@ -0,0 +1,113 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="ControlCatalog.Pages.GesturePullPage">
+  <DockPanel>
+    <ScrollViewer DockPanel.Dock="Right" Width="260">
+      <StackPanel Margin="12" Spacing="8">
+        <TextBlock Text="How It Works" FontSize="16" FontWeight="SemiBold"
+                   Foreground="{DynamicResource SystemControlHighlightAccentBrush}" />
+        <TextBlock TextWrapping="Wrap" FontSize="12" Opacity="0.7"
+                   Text="Attach a PullGestureRecognizer to any control. Press and drag in the specified pull direction to fire PullGesture events with a delta vector." />
+        <TextBlock TextWrapping="Wrap" FontSize="12" Opacity="0.7"
+                   Text="When the pointer is released, PullGestureEnded fires so the control can spring back." />
+
+        <Separator />
+
+        <TextBlock Text="API" FontWeight="SemiBold" FontSize="13" />
+        <StackPanel Spacing="4">
+          <TextBlock FontSize="13" FontFamily="Cascadia Code, Consolas, Monospace"
+                     Text="PullDirection" />
+          <TextBlock FontSize="12" TextWrapping="Wrap" Opacity="0.7"
+                     Text="TopToBottom, BottomToTop, LeftToRight, or RightToLeft." />
+        </StackPanel>
+      </StackPanel>
+    </ScrollViewer>
+
+    <Border DockPanel.Dock="Right" Width="1" Background="{DynamicResource SystemControlForegroundBaseMediumLowBrush}" />
+
+    <Border Margin="12">
+      <DockPanel HorizontalAlignment="Stretch"
+                 ClipToBounds="True"
+                 Height="200">
+        <Border DockPanel.Dock="Top"
+                Margin="2"
+                Name="TopPullZone"
+                Background="Transparent"
+                BorderBrush="Red"
+                HorizontalAlignment="Stretch"
+                Height="50"
+                BorderThickness="1">
+          <Border.GestureRecognizers>
+            <PullGestureRecognizer PullDirection="TopToBottom"/>
+          </Border.GestureRecognizers>
+          <Border Width="10"
+                  Height="10"
+                  HorizontalAlignment="Center"
+                  VerticalAlignment="Center"
+                  CornerRadius="5"
+                  Name="TopBall"
+                  Background="Green"/>
+        </Border>
+        <Border DockPanel.Dock="Bottom"
+                BorderBrush="Green"
+                Margin="2"
+                Background="Transparent"
+                Name="BottomPullZone"
+                HorizontalAlignment="Stretch"
+                Height="50"
+                BorderThickness="1">
+          <Border.GestureRecognizers>
+            <PullGestureRecognizer PullDirection="BottomToTop"/>
+          </Border.GestureRecognizers>
+          <Border Width="10"
+                  Name="BottomBall"
+                  HorizontalAlignment="Center"
+                  VerticalAlignment="Center"
+                  Height="10"
+                  CornerRadius="5"
+                  Background="Green"/>
+        </Border>
+        <Border DockPanel.Dock="Right"
+                Margin="2"
+                Background="Transparent"
+                Name="RightPullZone"
+                BorderBrush="Blue"
+                HorizontalAlignment="Right"
+                VerticalAlignment="Stretch"
+                Width="50"
+                BorderThickness="1">
+          <Border.GestureRecognizers>
+            <PullGestureRecognizer PullDirection="RightToLeft"/>
+          </Border.GestureRecognizers>
+          <Border Width="10"
+                  Height="10"
+                  Name="RightBall"
+                  HorizontalAlignment="Center"
+                  VerticalAlignment="Center"
+                  CornerRadius="5"
+                  Background="Green"/>
+        </Border>
+        <Border DockPanel.Dock="Left"
+                Margin="2"
+                Background="Transparent"
+                Name="LeftPullZone"
+                BorderBrush="Orange"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Stretch"
+                Width="50"
+                BorderThickness="1">
+          <Border.GestureRecognizers>
+            <PullGestureRecognizer PullDirection="LeftToRight"/>
+          </Border.GestureRecognizers>
+          <Border Width="10"
+                  Height="10"
+                  Name="LeftBall"
+                  HorizontalAlignment="Center"
+                  VerticalAlignment="Center"
+                  CornerRadius="5"
+                  Background="Green"/>
+        </Border>
+      </DockPanel>
+    </Border>
+  </DockPanel>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/Gestures/GesturePullPage.xaml.cs b/samples/ControlCatalog/Pages/Gestures/GesturePullPage.xaml.cs
new file mode 100644
index 0000000000..e375ce5b4a
--- /dev/null
+++ b/samples/ControlCatalog/Pages/Gestures/GesturePullPage.xaml.cs
@@ -0,0 +1,100 @@
+using System;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.LogicalTree;
+using Avalonia.Rendering.Composition;
+
+namespace ControlCatalog.Pages
+{
+    public partial class GesturePullPage : UserControl
+    {
+        private bool _isInit;
+
+        public GesturePullPage()
+        {
+            InitializeComponent();
+        }
+
+        protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnAttachedToVisualTree(e);
+
+            if (_isInit)
+            {
+                return;
+            }
+
+            _isInit = true;
+
+            SetPullHandlers(TopPullZone, false);
+            SetPullHandlers(BottomPullZone, true);
+            SetPullHandlers(RightPullZone, true);
+            SetPullHandlers(LeftPullZone, false);
+        }
+
+        private void SetPullHandlers(Control control, bool inverse)
+        {
+            var ball = control.FindLogicalDescendantOfType<Border>();
+
+            Vector3D defaultOffset = default;
+
+            CompositionVisual? ballCompositionVisual = null;
+
+            if (ball != null)
+            {
+                InitComposition(ball);
+            }
+            else
+            {
+                return;
+            }
+
+            control.LayoutUpdated += (s, e) =>
+            {
+                InitComposition(ball!);
+                if (ballCompositionVisual != null)
+                {
+                    defaultOffset = ballCompositionVisual.Offset;
+                }
+            };
+
+            control.AddHandler(InputElement.PullGestureEvent, (s, e) =>
+            {
+                InitComposition(ball!);
+                if (ballCompositionVisual != null)
+                {
+                    ballCompositionVisual.Offset = defaultOffset + new Vector3D(e.Delta.X * 0.4f, e.Delta.Y * 0.4f, 0) * (inverse ? -1 : 1);
+                    e.Handled = true;
+                }
+            });
+
+            control.AddHandler(InputElement.PullGestureEndedEvent, (s, e) =>
+            {
+                InitComposition(ball!);
+                if (ballCompositionVisual != null)
+                {
+                    ballCompositionVisual.Offset = defaultOffset;
+                }
+            });
+
+            void InitComposition(Control control)
+            {
+                ballCompositionVisual = ElementComposition.GetElementVisual(ball);
+
+                if (ballCompositionVisual != null)
+                {
+                    var offsetAnimation = ballCompositionVisual.Compositor.CreateVector3KeyFrameAnimation();
+                    offsetAnimation.Target = "Offset";
+                    offsetAnimation.InsertExpressionKeyFrame(1.0f, "this.FinalValue");
+                    offsetAnimation.Duration = TimeSpan.FromMilliseconds(100);
+
+                    var implicitAnimations = ballCompositionVisual.Compositor.CreateImplicitAnimationCollection();
+                    implicitAnimations["Offset"] = offsetAnimation;
+
+                    ballCompositionVisual.ImplicitAnimations = implicitAnimations;
+                }
+            }
+        }
+    }
+}
diff --git a/samples/ControlCatalog/Pages/Gestures/GestureSwipePage.xaml b/samples/ControlCatalog/Pages/Gestures/GestureSwipePage.xaml
new file mode 100644
index 0000000000..1ba905377d
--- /dev/null
+++ b/samples/ControlCatalog/Pages/Gestures/GestureSwipePage.xaml
@@ -0,0 +1,123 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="ControlCatalog.Pages.GestureSwipePage">
+  <DockPanel>
+    <ScrollViewer DockPanel.Dock="Right" Width="260">
+      <StackPanel Margin="12" Spacing="8">
+        <TextBlock Text="How It Works" FontSize="16" FontWeight="SemiBold"
+                   Foreground="{DynamicResource SystemControlHighlightAccentBrush}" />
+        <TextBlock TextWrapping="Wrap" FontSize="12" Opacity="0.7"
+                   Text="Attach a SwipeGestureRecognizer to any control. Drag horizontally or vertically to fire SwipeGesture events with a delta vector and velocity." />
+        <TextBlock TextWrapping="Wrap" FontSize="12" Opacity="0.7"
+                   Text="When the pointer is released, SwipeGestureEnded fires with the final velocity so you can apply fling logic." />
+
+        <Separator />
+
+        <TextBlock Text="Options" FontWeight="SemiBold" FontSize="14" />
+
+        <CheckBox x:Name="HorizontalCheck"
+                  Content="CanHorizontallySwipe"
+                  IsChecked="True"
+                  IsCheckedChanged="OnDirectionChanged" />
+        <CheckBox x:Name="VerticalCheck"
+                  Content="CanVerticallySwipe"
+                  IsChecked="True"
+                  IsCheckedChanged="OnDirectionChanged" />
+        <CheckBox x:Name="MouseCheck"
+                  Content="IsMouseEnabled"
+                  IsChecked="True"
+                  IsCheckedChanged="OnMouseEnabledChanged" />
+
+        <Separator />
+
+        <TextBlock Text="Threshold" FontWeight="SemiBold" FontSize="13" />
+        <DockPanel>
+          <TextBlock x:Name="ThresholdText"
+                     DockPanel.Dock="Right"
+                     Text="0"
+                     Width="30"
+                     VerticalAlignment="Center" />
+          <Slider x:Name="ThresholdSlider"
+                  Minimum="0"
+                  Maximum="50"
+                  Value="0"
+                  ValueChanged="OnThresholdChanged" />
+        </DockPanel>
+        <TextBlock FontSize="11" TextWrapping="Wrap" Opacity="0.5"
+                   Text="0 = platform default. Higher values require more movement before a swipe starts." />
+
+        <Separator />
+
+        <TextBlock Text="Status" FontWeight="SemiBold" FontSize="14" />
+        <TextBlock x:Name="DirectionText"
+                   Text="Direction: (none)"
+                   Opacity="0.7" />
+        <TextBlock x:Name="DeltaText"
+                   Text="Delta: 0, 0"
+                   Opacity="0.7" />
+        <TextBlock x:Name="VelocityText"
+                   Text="Velocity: 0, 0"
+                   Opacity="0.7" />
+
+        <Separator />
+
+        <TextBlock Text="API" FontWeight="SemiBold" FontSize="13" />
+        <StackPanel Spacing="4">
+          <TextBlock FontSize="13" FontFamily="Cascadia Code, Consolas, Monospace"
+                     Text="CanHorizontallySwipe" />
+          <TextBlock FontSize="12" TextWrapping="Wrap" Opacity="0.7"
+                     Text="Enable horizontal swipe tracking." />
+        </StackPanel>
+        <StackPanel Spacing="4">
+          <TextBlock FontSize="13" FontFamily="Cascadia Code, Consolas, Monospace"
+                     Text="CanVerticallySwipe" />
+          <TextBlock FontSize="12" TextWrapping="Wrap" Opacity="0.7"
+                     Text="Enable vertical swipe tracking." />
+        </StackPanel>
+        <StackPanel Spacing="4">
+          <TextBlock FontSize="13" FontFamily="Cascadia Code, Consolas, Monospace"
+                     Text="Threshold" />
+          <TextBlock FontSize="12" TextWrapping="Wrap" Opacity="0.7"
+                     Text="Minimum pixel distance before a swipe is recognized. 0 uses platform default." />
+        </StackPanel>
+        <StackPanel Spacing="4">
+          <TextBlock FontSize="13" FontFamily="Cascadia Code, Consolas, Monospace"
+                     Text="IsMouseEnabled" />
+          <TextBlock FontSize="12" TextWrapping="Wrap" Opacity="0.7"
+                     Text="Allow mouse pointer to trigger swipes (touch/pen always enabled)." />
+        </StackPanel>
+      </StackPanel>
+    </ScrollViewer>
+
+    <Border DockPanel.Dock="Right" Width="1" Background="{DynamicResource SystemControlForegroundBaseMediumLowBrush}" />
+
+    <Border Margin="12"
+            BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
+            BorderThickness="1"
+            CornerRadius="6"
+            ClipToBounds="True">
+      <Panel x:Name="SwipePanel" Background="Transparent">
+        <Panel.GestureRecognizers>
+          <SwipeGestureRecognizer x:Name="SwipeRecognizer"
+                                  CanHorizontallySwipe="True"
+                                  CanVerticallySwipe="True"
+                                  IsMouseEnabled="True" />
+        </Panel.GestureRecognizers>
+        <Border x:Name="SwipeIndicator"
+                Width="80" Height="80"
+                CornerRadius="40"
+                Background="{DynamicResource SystemControlHighlightAccentBrush}"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center">
+          <TextBlock x:Name="SwipeDirectionLabel"
+                     Text="Swipe here"
+                     FontSize="11"
+                     FontWeight="SemiBold"
+                     Foreground="White"
+                     HorizontalAlignment="Center"
+                     VerticalAlignment="Center" />
+        </Border>
+      </Panel>
+    </Border>
+  </DockPanel>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/Gestures/GestureSwipePage.xaml.cs b/samples/ControlCatalog/Pages/Gestures/GestureSwipePage.xaml.cs
new file mode 100644
index 0000000000..92b5fafaca
--- /dev/null
+++ b/samples/ControlCatalog/Pages/Gestures/GestureSwipePage.xaml.cs
@@ -0,0 +1,125 @@
+using System;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.Controls.Primitives;
+using Avalonia.Rendering.Composition;
+
+namespace ControlCatalog.Pages
+{
+    public partial class GestureSwipePage : UserControl
+    {
+        private bool _isInit;
+        private CompositionVisual? _indicatorVisual;
+        private Vector3D _swipeDelta;
+
+        public GestureSwipePage()
+        {
+            InitializeComponent();
+        }
+
+        protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnAttachedToVisualTree(e);
+
+            if (_isInit)
+            {
+                return;
+            }
+
+            _isInit = true;
+
+            SwipePanel.AddHandler(InputElement.SwipeGestureEvent, OnSwipeGesture);
+            SwipePanel.AddHandler(InputElement.SwipeGestureEndedEvent, OnSwipeGestureEnded);
+        }
+
+        private void EnsureVisual()
+        {
+            if (_indicatorVisual != null)
+            {
+                return;
+            }
+
+            _indicatorVisual = ElementComposition.GetElementVisual(SwipeIndicator);
+
+            if (_indicatorVisual != null)
+            {
+                var offsetAnimation = _indicatorVisual.Compositor.CreateVector3KeyFrameAnimation();
+                offsetAnimation.Target = "Offset";
+                offsetAnimation.InsertExpressionKeyFrame(1.0f, "this.FinalValue");
+                offsetAnimation.Duration = TimeSpan.FromMilliseconds(150);
+
+                var implicitAnimations = _indicatorVisual.Compositor.CreateImplicitAnimationCollection();
+                implicitAnimations["Offset"] = offsetAnimation;
+
+                _indicatorVisual.ImplicitAnimations = implicitAnimations;
+            }
+        }
+
+        private void OnSwipeGesture(object? sender, SwipeGestureEventArgs e)
+        {
+            EnsureVisual();
+
+            if (_indicatorVisual != null)
+            {
+                _swipeDelta += new Vector3D(-e.Delta.X, -e.Delta.Y, 0);
+                _indicatorVisual.Offset += new Vector3D(-e.Delta.X, -e.Delta.Y, 0);
+            }
+
+            DirectionText.Text = $"Direction: {e.SwipeDirection}";
+            DeltaText.Text = $"Delta: {e.Delta.X:F1}, {e.Delta.Y:F1}";
+            VelocityText.Text = $"Velocity: {e.Velocity.X:F0}, {e.Velocity.Y:F0}";
+            SwipeDirectionLabel.Text = e.SwipeDirection.ToString();
+            SwipeDirectionLabel.Opacity = 1;
+
+            e.Handled = true;
+        }
+
+        private void OnSwipeGestureEnded(object? sender, SwipeGestureEndedEventArgs e)
+        {
+            if (_indicatorVisual != null)
+            {
+                _indicatorVisual.Offset -= _swipeDelta;
+            }
+
+            _swipeDelta = default;
+
+            VelocityText.Text = $"Velocity: {e.Velocity.X:F0}, {e.Velocity.Y:F0} (ended)";
+            SwipeDirectionLabel.Text = "Swipe here";
+            SwipeDirectionLabel.Opacity = 0.5;
+        }
+
+        private void OnDirectionChanged(object? sender, RoutedEventArgs e)
+        {
+            if (SwipeRecognizer == null)
+            {
+                return;
+            }
+
+            SwipeRecognizer.CanHorizontallySwipe = HorizontalCheck.IsChecked == true;
+            SwipeRecognizer.CanVerticallySwipe = VerticalCheck.IsChecked == true;
+        }
+
+        private void OnMouseEnabledChanged(object? sender, RoutedEventArgs e)
+        {
+            if (SwipeRecognizer == null)
+            {
+                return;
+            }
+
+            SwipeRecognizer.IsMouseEnabled = MouseCheck.IsChecked == true;
+        }
+
+        private void OnThresholdChanged(object? sender, RangeBaseValueChangedEventArgs e)
+        {
+            if (SwipeRecognizer == null || ThresholdText == null)
+            {
+                return;
+            }
+
+            SwipeRecognizer.Threshold = e.NewValue;
+            ThresholdText.Text = $"{e.NewValue:F0}";
+        }
+    }
+}
diff --git a/samples/ControlCatalog/Pages/HeaderedContentPage.axaml b/samples/ControlCatalog/Pages/HeaderedContentPage.axaml
index 86a2b00b72..cbf12695fd 100644
--- a/samples/ControlCatalog/Pages/HeaderedContentPage.axaml
+++ b/samples/ControlCatalog/Pages/HeaderedContentPage.axaml
@@ -1,8 +1,9 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<ContentPage Theme="{StaticResource ScrollPage}" 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"
+             Header="HeaderContent"
              x:Class="ControlCatalog.Pages.HeaderedContentPage">
   <WrapPanel ItemWidth="400">
           <HeaderedContentControl Header="This is the text header!"
@@ -26,5 +27,5 @@
             <TextBlock Text="This is the content. But the header can also be non textual"/>
           </HeaderedContentControl>
         </WrapPanel>
-</UserControl>
+</ContentPage>
 
diff --git a/samples/ControlCatalog/Pages/HeaderedContentPage.axaml.cs b/samples/ControlCatalog/Pages/HeaderedContentPage.axaml.cs
index ab967c4214..bfe033f90c 100644
--- a/samples/ControlCatalog/Pages/HeaderedContentPage.axaml.cs
+++ b/samples/ControlCatalog/Pages/HeaderedContentPage.axaml.cs
@@ -4,7 +4,7 @@ using Avalonia.Markup.Xaml;
 
 namespace ControlCatalog.Pages;
 
-public partial class HeaderedContentPage : UserControl
+public partial class HeaderedContentPage : ContentPage
 {
     public HeaderedContentPage()
     {
diff --git a/samples/ControlCatalog/Pages/ImagePage.xaml b/samples/ControlCatalog/Pages/ImagePage.xaml
index 444d370e42..abd9ff47b0 100644
--- a/samples/ControlCatalog/Pages/ImagePage.xaml
+++ b/samples/ControlCatalog/Pages/ImagePage.xaml
@@ -1,5 +1,6 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<ContentPage Theme="{StaticResource ScrollPage}" xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             Header="Images"
              x:Class="ControlCatalog.Pages.ImagePage">
   <DockPanel>
     <StackPanel DockPanel.Dock="Top" Orientation="Vertical" Spacing="4">
@@ -65,4 +66,4 @@
     </Grid>
     
   </DockPanel>
-</UserControl>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/ImagePage.xaml.cs b/samples/ControlCatalog/Pages/ImagePage.xaml.cs
index f8630d7db6..eccdb9435f 100644
--- a/samples/ControlCatalog/Pages/ImagePage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ImagePage.xaml.cs
@@ -5,7 +5,7 @@ using Avalonia.Media.Imaging;
 
 namespace ControlCatalog.Pages
 {
-    public partial class ImagePage : UserControl
+    public partial class ImagePage : ContentPage
     {
         public ImagePage()
         {
diff --git a/samples/ControlCatalog/Pages/LabelsPage.axaml b/samples/ControlCatalog/Pages/LabelsPage.axaml
index 5bfb2ee10e..cd367aa38a 100644
--- a/samples/ControlCatalog/Pages/LabelsPage.axaml
+++ b/samples/ControlCatalog/Pages/LabelsPage.axaml
@@ -1,13 +1,14 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<ContentPage Theme="{StaticResource ScrollPage}" 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:models="using:ControlCatalog.Models"
              mc:Ignorable="d" d:DesignWidth="400" d:DesignHeight="250"
+             Header="Labels"
              x:Class="ControlCatalog.Pages.LabelsPage"
              x:Name="_labelsPage"
              x:DataType="models:Person">
-    <UserControl.Styles>
+    <ContentPage.Styles>
         <Style Selector="Label">
             <Setter Property="VerticalAlignment" Value="Center"/>
             <Setter Property="Margin" Value="6,3,0,3"/>
@@ -23,7 +24,7 @@
         <Style Selector="Button[IsDefault=true]">
             <Setter Property="Background" Value="{DynamicResource HighlightBrush}"/>
         </Style>
-    </UserControl.Styles>
+    </ContentPage.Styles>
     <ScrollViewer VerticalScrollBarVisibility="Auto" 
                   HorizontalScrollBarVisibility="Hidden">
         <Grid HorizontalAlignment="Left" VerticalAlignment="Top" RowDefinitions="Auto,Auto,Auto,Auto,Auto,*" ColumnDefinitions="Auto,6,*" Width="246">
@@ -41,4 +42,4 @@
             </StackPanel>
         </Grid>
     </ScrollViewer>
-</UserControl>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/LabelsPage.axaml.cs b/samples/ControlCatalog/Pages/LabelsPage.axaml.cs
index f3a7647f8c..b26112b351 100644
--- a/samples/ControlCatalog/Pages/LabelsPage.axaml.cs
+++ b/samples/ControlCatalog/Pages/LabelsPage.axaml.cs
@@ -3,7 +3,7 @@ using ControlCatalog.Models;
 
 namespace ControlCatalog.Pages
 {
-    public partial class LabelsPage : UserControl
+    public partial class LabelsPage : ContentPage
     {
         private Person? _person;
 
diff --git a/samples/ControlCatalog/Pages/LayoutTransformControlPage.xaml b/samples/ControlCatalog/Pages/LayoutTransformControlPage.xaml
index 8cf3610b47..d12bbfc302 100644
--- a/samples/ControlCatalog/Pages/LayoutTransformControlPage.xaml
+++ b/samples/ControlCatalog/Pages/LayoutTransformControlPage.xaml
@@ -1,5 +1,6 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<ContentPage Theme="{StaticResource ScrollPage}" xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             Header="LayoutTransformControl"
              x:Class="ControlCatalog.Pages.LayoutTransformControlPage">
   <DockPanel>
     <Grid ColumnDefinitions="Auto,*" RowDefinitions="Auto" Margin="16" DockPanel.Dock="Top">
@@ -24,4 +25,4 @@
       </LayoutTransformControl>
     </Grid>
   </DockPanel>
-</UserControl>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/LayoutTransformControlPage.xaml.cs b/samples/ControlCatalog/Pages/LayoutTransformControlPage.xaml.cs
index 2060790594..e3815238be 100644
--- a/samples/ControlCatalog/Pages/LayoutTransformControlPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/LayoutTransformControlPage.xaml.cs
@@ -2,7 +2,7 @@ using Avalonia.Controls;
 
 namespace ControlCatalog.Pages
 {
-    public partial class LayoutTransformControlPage : UserControl
+    public partial class LayoutTransformControlPage : ContentPage
     {
         public LayoutTransformControlPage()
         {
diff --git a/samples/ControlCatalog/Pages/ListBoxPage.xaml b/samples/ControlCatalog/Pages/ListBoxPage.xaml
index e3a706bfed..f73a4c18ed 100644
--- a/samples/ControlCatalog/Pages/ListBoxPage.xaml
+++ b/samples/ControlCatalog/Pages/ListBoxPage.xaml
@@ -1,6 +1,7 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<ContentPage xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:viewModels="using:ControlCatalog.ViewModels"
+             Header="ListBox"
              x:Class="ControlCatalog.Pages.ListBoxPage"
              x:DataType="viewModels:ListBoxPageViewModel">
   <DockPanel>
@@ -47,4 +48,4 @@
              SelectionMode="{Binding SelectionMode^}"
              WrapSelection="{Binding WrapSelection}"/>
   </DockPanel>
-</UserControl>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/ListBoxPage.xaml.cs b/samples/ControlCatalog/Pages/ListBoxPage.xaml.cs
index 3dac437f3a..208b5cce4b 100644
--- a/samples/ControlCatalog/Pages/ListBoxPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ListBoxPage.xaml.cs
@@ -3,7 +3,7 @@ using ControlCatalog.ViewModels;
 
 namespace ControlCatalog.Pages
 {
-    public partial class ListBoxPage : UserControl
+    public partial class ListBoxPage : ContentPage
     {
         public ListBoxPage()
         {
diff --git a/samples/ControlCatalog/Pages/MenuPage.xaml b/samples/ControlCatalog/Pages/MenuPage.xaml
index bbcc759ca7..d9fb5d81bf 100644
--- a/samples/ControlCatalog/Pages/MenuPage.xaml
+++ b/samples/ControlCatalog/Pages/MenuPage.xaml
@@ -1,7 +1,8 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<ContentPage Theme="{StaticResource ScrollPage}" xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:viewModels="using:ControlCatalog.ViewModels"
              x:Class="ControlCatalog.Pages.MenuPage"
+             Header="Menus"
              x:DataType="viewModels:MenuPageViewModel">
   <StackPanel Orientation="Vertical" Spacing="4">
     <TextBlock Classes="h2">Exported menu fallback</TextBlock>
@@ -95,4 +96,4 @@
             </StackPanel>
         </WrapPanel>
     </StackPanel>
-</UserControl>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/MenuPage.xaml.cs b/samples/ControlCatalog/Pages/MenuPage.xaml.cs
index a07306b81d..56a229a594 100644
--- a/samples/ControlCatalog/Pages/MenuPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/MenuPage.xaml.cs
@@ -4,7 +4,7 @@ using ControlCatalog.ViewModels;
 
 namespace ControlCatalog.Pages
 {
-    public partial class MenuPage : UserControl
+    public partial class MenuPage : ContentPage
     {
         public MenuPage()
         {
diff --git a/samples/ControlCatalog/Pages/NativeEmbedPage.xaml b/samples/ControlCatalog/Pages/NativeEmbedPage.xaml
index 89e636112c..71d622bae4 100644
--- a/samples/ControlCatalog/Pages/NativeEmbedPage.xaml
+++ b/samples/ControlCatalog/Pages/NativeEmbedPage.xaml
@@ -1,10 +1,11 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<ContentPage Theme="{StaticResource ScrollPage}" 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"
+             Header="Native Embedding"
              x:Class="ControlCatalog.Pages.NativeEmbedPage">
   <DockPanel>
     <Menu DockPanel.Dock="Top">
@@ -65,4 +66,4 @@
       </DockPanel>
     </Grid>
   </DockPanel>
-</UserControl>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/NativeEmbedPage.xaml.cs b/samples/ControlCatalog/Pages/NativeEmbedPage.xaml.cs
index b9bac10f9a..1cd1f78cc0 100644
--- a/samples/ControlCatalog/Pages/NativeEmbedPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/NativeEmbedPage.xaml.cs
@@ -7,7 +7,7 @@ using Avalonia.Platform;
 
 namespace ControlCatalog.Pages
 {
-    public partial class NativeEmbedPage : UserControl
+    public partial class NativeEmbedPage : ContentPage
     {
         public NativeEmbedPage()
         {
diff --git a/samples/ControlCatalog/Pages/NavigationDemoPage.xaml b/samples/ControlCatalog/Pages/NavigationDemoPage.xaml
index 4849b2d5b8..0f7536b6a3 100644
--- a/samples/ControlCatalog/Pages/NavigationDemoPage.xaml
+++ b/samples/ControlCatalog/Pages/NavigationDemoPage.xaml
@@ -1,11 +1,14 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<ContentPage Theme="{StaticResource ScrollPage}" xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             Header="Navigation Page"
              x:Class="ControlCatalog.Pages.NavigationDemoPage">
-  <NavigationPage x:Name="SampleNav">
-    <NavigationPage.Styles>
-      <Style Selector="NavigationPage#SampleNav /template/ Border#PART_NavigationBar">
-        <Setter Property="Background" Value="Transparent" />
-      </Style>
-    </NavigationPage.Styles>
-  </NavigationPage>
-</UserControl>
+  <Grid>
+    <NavigationPage x:Name="SampleNav">
+      <NavigationPage.Styles>
+        <Style Selector="NavigationPage#SampleNav /template/ Border#PART_NavigationBar">
+          <Setter Property="Background" Value="Transparent" />
+        </Style>
+      </NavigationPage.Styles>
+    </NavigationPage>
+</Grid>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/NavigationDemoPage.xaml.cs b/samples/ControlCatalog/Pages/NavigationDemoPage.xaml.cs
index d65a43a6ad..7ca41ab893 100644
--- a/samples/ControlCatalog/Pages/NavigationDemoPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/NavigationDemoPage.xaml.cs
@@ -4,7 +4,7 @@ using Avalonia.Interactivity;
 
 namespace ControlCatalog.Pages
 {
-    public partial class NavigationDemoPage : UserControl
+    public partial class NavigationDemoPage : ContentPage
     {
         private static readonly (string Group, string Title, string Description, Func<UserControl> Factory)[] Demos =
         {
diff --git a/samples/ControlCatalog/Pages/NavigationPage/LAvenirAppPage.xaml.cs b/samples/ControlCatalog/Pages/NavigationPage/LAvenirAppPage.xaml.cs
index beb0b2dccb..3ccdcaefa8 100644
--- a/samples/ControlCatalog/Pages/NavigationPage/LAvenirAppPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/NavigationPage/LAvenirAppPage.xaml.cs
@@ -59,26 +59,6 @@ public partial class LAvenirAppPage : UserControl
             _infoPanel.IsVisible = Bounds.Width >= 650;
     }
 
-    void ApplyRootNavigationBarAppearance()
-    {
-        if (_navPage == null)
-            return;
-
-        _navPage.Background = new SolidColorBrush(BgLight);
-        _navPage.Resources["NavigationBarBackground"] = new SolidColorBrush(BgLight);
-        _navPage.Resources["NavigationBarForeground"] = new SolidColorBrush(TextDark);
-    }
-
-    void ApplyDetailNavigationBarAppearance()
-    {
-        if (_navPage == null)
-            return;
-
-        _navPage.Background = new SolidColorBrush(BgDark);
-        _navPage.Resources["NavigationBarBackground"] = new SolidColorBrush(BgDark);
-        _navPage.Resources["NavigationBarForeground"] = Brushes.White;
-    }
-
     TabbedPage BuildMenuTabbedPage()
     {
         var tp = new TabbedPage
@@ -112,7 +92,6 @@ public partial class LAvenirAppPage : UserControl
             VerticalAlignment = VerticalAlignment.Center,
             TextAlignment     = TextAlignment.Center,
         };
-        ApplyRootNavigationBarAppearance();
 
         NavigationPage.SetTopCommandBar(tp, new Button
         {
@@ -140,7 +119,7 @@ public partial class LAvenirAppPage : UserControl
             Content    = menuView,
             Background = new SolidColorBrush(BgLight),
             Header     = "Menu",
-            Icon       = Geometry.Parse("M11 9H9V2H7v7H5V2H3v7c0 2.12 1.66 3.84 3.75 3.97V22h2.5v-9.03C11.34 12.84 13 11.12 13 9V2h-2v7zm5-3v8h2.5v8H21V2c-2.76 0-5 2.24-5 4z"),
+            Icon       = new PathIcon { Data = Geometry.Parse("M11 9H9V2H7v7H5V2H3v7c0 2.12 1.66 3.84 3.75 3.97V22h2.5v-9.03C11.34 12.84 13 11.12 13 9V2h-2v7zm5-3v8h2.5v8H21V2c-2.76 0-5 2.24-5 4z") },
         };
 
         var reservationsPage = new ContentPage
@@ -148,7 +127,7 @@ public partial class LAvenirAppPage : UserControl
             Content    = new LAvenirReservationsView(),
             Background = new SolidColorBrush(BgLight),
             Header     = "Reservations",
-            Icon       = Geometry.Parse("M19 3h-1V1h-2v2H8V1H6v2H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm0 16H5V8h14v11zM9 10H7v2h2v-2zm4 0h-2v2h2v-2zm4 0h-2v2h2v-2z"),
+            Icon       = new PathIcon { Data = Geometry.Parse("M19 3h-1V1h-2v2H8V1H6v2H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm0 16H5V8h14v11zM9 10H7v2h2v-2zm4 0h-2v2h2v-2zm4 0h-2v2h2v-2z") },
         };
 
         var profilePage = new ContentPage
@@ -156,7 +135,7 @@ public partial class LAvenirAppPage : UserControl
             Content    = new LAvenirProfileView(),
             Background = new SolidColorBrush(BgLight),
             Header     = "Profile",
-            Icon       = Geometry.Parse("M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 3c1.66 0 3 1.34 3 3s-1.34 3-3 3-3-1.34-3-3 1.34-3 3-3zm0 14.2c-2.5 0-4.71-1.28-6-3.22.03-1.99 4-3.08 6-3.08 1.99 0 5.97 1.09 6 3.08-1.29 1.94-3.5 3.22-6 3.22z"),
+            Icon       = new PathIcon { Data = Geometry.Parse("M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 3c1.66 0 3 1.34 3 3s-1.34 3-3 3-3-1.34-3-3 1.34-3 3-3zm0 14.2c-2.5 0-4.71-1.28-6-3.22.03-1.99 4-3.08 6-3.08 1.99 0 5.97 1.09 6 3.08-1.29 1.94-3.5 3.22-6 3.22z") },
         };
 
         tp.Pages = new ObservableCollection<Page> { menuPage, reservationsPage, profilePage };
@@ -165,8 +144,7 @@ public partial class LAvenirAppPage : UserControl
 
     async void PushDishDetail(string name, string price, string description, string imageFile)
     {
-        if (_navPage == null)
-            return;
+        if (_navPage == null) return;
 
         var detail = new ContentPage
         {
@@ -175,19 +153,22 @@ public partial class LAvenirAppPage : UserControl
             Header     = name,
         };
         NavigationPage.SetBottomCommandBar(detail, BuildFloatingBar(price));
-        detail.Navigating += args =>
-        {
-            if (args.NavigationType == NavigationType.Pop)
-                ApplyRootNavigationBarAppearance();
 
-            return Task.CompletedTask;
+        _navPage.Background = new SolidColorBrush(BgDark);
+        _navPage.Resources["NavigationBarBackground"] = new SolidColorBrush(BgDark);
+        _navPage.Resources["NavigationBarForeground"] = Brushes.White;
+
+        detail.NavigatedFrom += (_, _) =>
+        {
+            if (_navPage != null)
+            {
+                _navPage.Background = new SolidColorBrush(BgLight);
+                _navPage.Resources["NavigationBarBackground"] = new SolidColorBrush(BgLight);
+                _navPage.Resources["NavigationBarForeground"] = new SolidColorBrush(TextDark);
+            }
         };
 
-        ApplyDetailNavigationBarAppearance();
         await _navPage.PushAsync(detail);
-
-        if (!ReferenceEquals(_navPage.CurrentPage, detail))
-            ApplyRootNavigationBarAppearance();
     }
 
     Border BuildFloatingBar(string price)
diff --git a/samples/ControlCatalog/Pages/NavigationPage/NavigationPageToolbarPage.xaml.cs b/samples/ControlCatalog/Pages/NavigationPage/NavigationPageToolbarPage.xaml.cs
index c141f47781..724f8de84a 100644
--- a/samples/ControlCatalog/Pages/NavigationPage/NavigationPageToolbarPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/NavigationPage/NavigationPageToolbarPage.xaml.cs
@@ -49,7 +49,7 @@ namespace ControlCatalog.Pages
         private void OnAddPrimary(object? sender, RoutedEventArgs e)
         {
             _itemCount++;
-            _rootCommandBar.PrimaryCommands.Add(new AppBarButton
+            _rootCommandBar.PrimaryCommands.Add(new CommandBarButton
             {
                 Label = $"Item {_itemCount}",
                 Icon = new PathIcon { Data = (Geometry)this.FindResource("AddIcon")! }
@@ -60,7 +60,7 @@ namespace ControlCatalog.Pages
         private void OnAddSecondary(object? sender, RoutedEventArgs e)
         {
             _itemCount++;
-            _rootCommandBar.SecondaryCommands.Add(new AppBarButton
+            _rootCommandBar.SecondaryCommands.Add(new CommandBarButton
             {
                 Label = $"Secondary {_itemCount}"
             });
@@ -69,13 +69,13 @@ namespace ControlCatalog.Pages
 
         private void OnAddPrimarySeparator(object? sender, RoutedEventArgs e)
         {
-            _rootCommandBar.PrimaryCommands.Add(new AppBarSeparator());
+            _rootCommandBar.PrimaryCommands.Add(new CommandBarSeparator());
             UpdateStatus();
         }
 
         private void OnAddSecondarySeparator(object? sender, RoutedEventArgs e)
         {
-            _rootCommandBar.SecondaryCommands.Add(new AppBarSeparator());
+            _rootCommandBar.SecondaryCommands.Add(new CommandBarSeparator());
             UpdateStatus();
         }
 
@@ -125,13 +125,13 @@ namespace ControlCatalog.Pages
             {
                 PrimaryCommands =
                 {
-                    new AppBarButton { Label = "Search", Icon = new PathIcon { Data = (Geometry)this.FindResource("SearchIcon")! } },
-                    new AppBarButton { Label = "Share",  Icon = new PathIcon { Data = (Geometry)this.FindResource("ShareIcon")! } },
-                    new AppBarButton { Label = "Edit",   Icon = new PathIcon { Data = (Geometry)this.FindResource("EditIcon")! } },
+                    new CommandBarButton { Label = "Search", Icon = new PathIcon { Data = (Geometry)this.FindResource("SearchIcon")! } },
+                    new CommandBarButton { Label = "Share",  Icon = new PathIcon { Data = (Geometry)this.FindResource("ShareIcon")! } },
+                    new CommandBarButton { Label = "Edit",   Icon = new PathIcon { Data = (Geometry)this.FindResource("EditIcon")! } },
                 },
                 SecondaryCommands =
                 {
-                    new AppBarButton { Label = "Delete", Icon = new PathIcon { Data = (Geometry)this.FindResource("DeleteIcon")! } }
+                    new CommandBarButton { Label = "Delete", Icon = new PathIcon { Data = (Geometry)this.FindResource("DeleteIcon")! } }
                 }
             };
     }
diff --git a/samples/ControlCatalog/Pages/NavigationPage/PulseAppPage.xaml.cs b/samples/ControlCatalog/Pages/NavigationPage/PulseAppPage.xaml.cs
index f50d40f151..33e89b9b65 100644
--- a/samples/ControlCatalog/Pages/NavigationPage/PulseAppPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/NavigationPage/PulseAppPage.xaml.cs
@@ -99,7 +99,7 @@ public partial class PulseAppPage : UserControl
             Content    = homeView,
             Background = new SolidColorBrush(BgDashboard),
             Header     = "Home",
-            Icon       = Geometry.Parse("M10 20v-6h4v6h5v-8h3L12 3 2 12h3v8z"),
+            Icon       = new PathIcon { Data = Geometry.Parse("M10 20v-6h4v6h5v-8h3L12 3 2 12h3v8z") },
         };
 
         var workoutsPage = new ContentPage
@@ -107,7 +107,7 @@ public partial class PulseAppPage : UserControl
             Content    = new PulseWorkoutsView(),
             Background = new SolidColorBrush(BgDashboard),
             Header     = "Workouts",
-            Icon       = Geometry.Parse("M20.57 14.86L22 13.43 20.57 12 17 15.57 8.43 7 12 3.43 10.57 2 9.14 3.43 7.71 2 5.57 4.14 4.14 2.71 2.71 4.14l1.43 1.43L2 7.71l1.43 1.43L2 10.57 3.43 12 7 8.43 15.57 17 12 20.57 13.43 22l1.43-1.43L16.29 22l2.14-2.14 1.43 1.43 1.43-1.43-1.43-1.43L22 16.29z"),
+            Icon       = new PathIcon { Data = Geometry.Parse("M20.57 14.86L22 13.43 20.57 12 17 15.57 8.43 7 12 3.43 10.57 2 9.14 3.43 7.71 2 5.57 4.14 4.14 2.71 2.71 4.14l1.43 1.43L2 7.71l1.43 1.43L2 10.57 3.43 12 7 8.43 15.57 17 12 20.57 13.43 22l1.43-1.43L16.29 22l2.14-2.14 1.43 1.43 1.43-1.43-1.43-1.43L22 16.29z") },
         };
 
         var profilePage = new ContentPage
@@ -115,7 +115,7 @@ public partial class PulseAppPage : UserControl
             Content    = new PulseProfileView(),
             Background = new SolidColorBrush(BgDashboard),
             Header     = "Profile",
-            Icon       = Geometry.Parse("M12 2C9.243 2 7 4.243 7 7s2.243 5 5 5 5-2.243 5-5-2.243-5-5-5zM12 14c-5.523 0-10 3.582-10 8a1 1 0 001 1h18a1 1 0 001-1c0-4.418-4.477-8-10-8z"),
+            Icon       = new PathIcon { Data = Geometry.Parse("M12 2C9.243 2 7 4.243 7 7s2.243 5 5 5 5-2.243 5-5-2.243-5-5-5zM12 14c-5.523 0-10 3.582-10 8a1 1 0 001 1h18a1 1 0 001-1c0-4.418-4.477-8-10-8z") },
         };
 
         tp.Pages = new ObservableCollection<Page> { homePage, workoutsPage, profilePage };
diff --git a/samples/ControlCatalog/Pages/NavigationPage/RetroGamingAppPage.xaml.cs b/samples/ControlCatalog/Pages/NavigationPage/RetroGamingAppPage.xaml.cs
index 25091493ea..6e194cf1a5 100644
--- a/samples/ControlCatalog/Pages/NavigationPage/RetroGamingAppPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/NavigationPage/RetroGamingAppPage.xaml.cs
@@ -51,30 +51,11 @@ public partial class RetroGamingAppPage : UserControl
             _infoPanel.IsVisible = Bounds.Width >= 650;
     }
 
-    void ApplyHomeNavigationBarAppearance()
-    {
-        if (_nav == null)
-            return;
-
-        _nav.Resources["NavigationBarBackground"] = new SolidColorBrush(SurfaceColor);
-        _nav.Resources["NavigationBarForeground"] = new SolidColorBrush(CyanColor);
-    }
-
-    void ApplyDetailNavigationBarAppearance()
-    {
-        if (_nav == null)
-            return;
-
-        _nav.Resources["NavigationBarBackground"] = Brushes.Transparent;
-        _nav.Resources["NavigationBarForeground"] = new SolidColorBrush(CyanColor);
-    }
-
     ContentPage BuildHomePage()
     {
         var page = new ContentPage { Background = new SolidColorBrush(BgColor) };
         page.Header = BuildPixelArcadeLogo();
         NavigationPage.SetTopCommandBar(page, BuildNavBarRight());
-        ApplyHomeNavigationBarAppearance();
 
         var panel = new Panel();
         panel.Children.Add(BuildHomeTabbedPage());
@@ -193,7 +174,7 @@ public partial class RetroGamingAppPage : UserControl
         var homeTab = new ContentPage
         {
             Header     = "Home",
-            Icon       = Geometry.Parse("M10,20V14H14V20H19V12H22L12,3L2,12H5V20H10Z"),
+            Icon       = new PathIcon { Data = Geometry.Parse("M10,20V14H14V20H19V12H22L12,3L2,12H5V20H10Z") },
             Background = new SolidColorBrush(BgColor),
             Content    = homeView,
         };
@@ -204,7 +185,7 @@ public partial class RetroGamingAppPage : UserControl
         var gamesTab = new ContentPage
         {
             Header     = "Games",
-            Icon       = Geometry.Parse("M7.97,16L5,19C4.67,19.3 4.23,19.5 3.75,19.5A1.75,1.75 0 0,1 2,17.75V17.5L3,10.12C3.21,7.81 5.14,6 7.5,6H16.5C18.86,6 20.79,7.81 21,10.12L22,17.5V17.75A1.75,1.75 0 0,1 20.25,19.5C19.77,19.5 19.33,19.3 19,19L16.03,16H7.97M7,9V11H5V13H7V15H9V13H11V11H9V9H7M14.5,12A1.5,1.5 0 0,0 13,13.5A1.5,1.5 0 0,0 14.5,15A1.5,1.5 0 0,0 16,13.5A1.5,1.5 0 0,0 14.5,12M17.5,9A1.5,1.5 0 0,0 16,10.5A1.5,1.5 0 0,0 17.5,12A1.5,1.5 0 0,0 19,10.5A1.5,1.5 0 0,0 17.5,9Z"),
+            Icon       = new PathIcon { Data = Geometry.Parse("M7.97,16L5,19C4.67,19.3 4.23,19.5 3.75,19.5A1.75,1.75 0 0,1 2,17.75V17.5L3,10.12C3.21,7.81 5.14,6 7.5,6H16.5C18.86,6 20.79,7.81 21,10.12L22,17.5V17.75A1.75,1.75 0 0,1 20.25,19.5C19.77,19.5 19.33,19.3 19,19L16.03,16H7.97M7,9V11H5V13H7V15H9V13H11V11H9V9H7M14.5,12A1.5,1.5 0 0,0 13,13.5A1.5,1.5 0 0,0 14.5,15A1.5,1.5 0 0,0 16,13.5A1.5,1.5 0 0,0 14.5,12M17.5,9A1.5,1.5 0 0,0 16,10.5A1.5,1.5 0 0,0 17.5,12A1.5,1.5 0 0,0 19,10.5A1.5,1.5 0 0,0 17.5,9Z") },
             Background = new SolidColorBrush(BgColor),
             Content    = gamesView,
         };
@@ -212,7 +193,7 @@ public partial class RetroGamingAppPage : UserControl
         var favTab = new ContentPage
         {
             Header     = "Favorites",
-            Icon       = Geometry.Parse("M12,21.35L10.55,20.03C5.4,15.36 2,12.27 2,8.5C2,5.41 4.42,3 7.5,3C9.24,3 10.91,3.81 12,5.08C13.09,3.81 14.76,3 16.5,3C19.58,3 22,5.41 22,8.5C22,12.27 18.6,15.36 13.45,20.03L12,21.35Z"),
+            Icon       = new PathIcon { Data = Geometry.Parse("M12,21.35L10.55,20.03C5.4,15.36 2,12.27 2,8.5C2,5.41 4.42,3 7.5,3C9.24,3 10.91,3.81 12,5.08C13.09,3.81 14.76,3 16.5,3C19.58,3 22,5.41 22,8.5C22,12.27 18.6,15.36 13.45,20.03L12,21.35Z") },
             Background = new SolidColorBrush(BgColor),
             Content    = new RetroGamingFavoritesView(),
         };
@@ -220,7 +201,7 @@ public partial class RetroGamingAppPage : UserControl
         var profileTab = new ContentPage
         {
             Header     = "Profile",
-            Icon       = Geometry.Parse("M12,4A4,4 0 0,1 16,8A4,4 0 0,1 12,12A4,4 0 0,1 8,8A4,4 0 0,1 12,4M12,14C16.42,14 20,15.79 20,18V20H4V18C4,15.79 7.58,14 12,14Z"),
+            Icon       = new PathIcon { Data = Geometry.Parse("M12,4A4,4 0 0,1 16,8A4,4 0 0,1 12,12A4,4 0 0,1 8,8A4,4 0 0,1 12,4M12,14C16.42,14 20,15.79 20,18V20H4V18C4,15.79 7.58,14 12,14Z") },
             Background = new SolidColorBrush(BgColor),
             Content    = new RetroGamingProfileView(),
         };
@@ -279,8 +260,7 @@ public partial class RetroGamingAppPage : UserControl
 
     async void PushDetailPage(string gameTitle)
     {
-        if (_nav == null)
-            return;
+        if (_nav == null) return;
 
         var detailView = new RetroGamingDetailView(gameTitle);
 
@@ -291,13 +271,8 @@ public partial class RetroGamingAppPage : UserControl
         };
 
         NavigationPage.SetBarLayoutBehavior(page, BarLayoutBehavior.Overlay);
-        page.Navigating += args =>
-        {
-            if (args.NavigationType == NavigationType.Pop)
-                ApplyHomeNavigationBarAppearance();
-
-            return Task.CompletedTask;
-        };
+        page.NavigatedTo   += (_, _) => { if (_nav != null) _nav.Resources["NavigationBarBackground"] = Brushes.Transparent; };
+        page.NavigatedFrom += (_, _) => { if (_nav != null) _nav.Resources["NavigationBarBackground"] = new SolidColorBrush(SurfaceColor); };
 
         var cmdBar = new StackPanel
         {
@@ -326,10 +301,6 @@ public partial class RetroGamingAppPage : UserControl
         cmdBar.Children.Add(shareBtn);
         NavigationPage.SetTopCommandBar(page, cmdBar);
 
-        ApplyDetailNavigationBarAppearance();
         await _nav.PushAsync(page);
-
-        if (!ReferenceEquals(_nav.CurrentPage, page))
-            ApplyHomeNavigationBarAppearance();
     }
 }
diff --git a/samples/ControlCatalog/Pages/NotificationsPage.xaml b/samples/ControlCatalog/Pages/NotificationsPage.xaml
index b4094d8a2e..2ae1db7d43 100644
--- a/samples/ControlCatalog/Pages/NotificationsPage.xaml
+++ b/samples/ControlCatalog/Pages/NotificationsPage.xaml
@@ -1,8 +1,9 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<ContentPage Theme="{StaticResource ScrollPage}" xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:viewModels="using:ControlCatalog.ViewModels"
              xmlns:system="clr-namespace:System;assembly=System.Runtime"
              x:Class="ControlCatalog.Pages.NotificationsPage"
+             Header="Notifications"
              x:DataType="viewModels:NotificationViewModel">
   <DockPanel>
     <TextBlock DockPanel.Dock="Top"
@@ -25,4 +26,4 @@
       <WindowNotificationManager x:Name="ControlNotifications" />
     </Border>
   </DockPanel>
-</UserControl>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/NotificationsPage.xaml.cs b/samples/ControlCatalog/Pages/NotificationsPage.xaml.cs
index f3db564571..5ff67e10dc 100644
--- a/samples/ControlCatalog/Pages/NotificationsPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/NotificationsPage.xaml.cs
@@ -5,7 +5,7 @@ using ControlCatalog.ViewModels;
 
 namespace ControlCatalog.Pages
 {
-    public partial class NotificationsPage : UserControl
+    public partial class NotificationsPage : ContentPage
     {
         private NotificationViewModel _viewModel;
 
diff --git a/samples/ControlCatalog/Pages/NumericUpDownPage.xaml b/samples/ControlCatalog/Pages/NumericUpDownPage.xaml
index a112f79c02..dcc84c3ae8 100644
--- a/samples/ControlCatalog/Pages/NumericUpDownPage.xaml
+++ b/samples/ControlCatalog/Pages/NumericUpDownPage.xaml
@@ -1,8 +1,9 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<ContentPage Theme="{StaticResource ScrollPage}" xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:sys="using:System"
              xmlns:converter="using:ControlCatalog.Converter"
              xmlns:pages="using:ControlCatalog.Pages"
+             Header="NumericUpDown"
              x:Class="ControlCatalog.Pages.NumericUpDownPage"
              x:DataType="pages:NumbersPageViewModel">
   <StackPanel Orientation="Vertical" Spacing="4"
@@ -139,4 +140,4 @@
       </NumericUpDown>
     </StackPanel>
   </StackPanel>
-</UserControl>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/NumericUpDownPage.xaml.cs b/samples/ControlCatalog/Pages/NumericUpDownPage.xaml.cs
index 379090830d..db64fba0ef 100644
--- a/samples/ControlCatalog/Pages/NumericUpDownPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/NumericUpDownPage.xaml.cs
@@ -9,7 +9,7 @@ using MiniMvvm;
 
 namespace ControlCatalog.Pages
 {
-    public partial class NumericUpDownPage : UserControl
+    public partial class NumericUpDownPage : ContentPage
     {
         public NumericUpDownPage()
         {
diff --git a/samples/ControlCatalog/Pages/OpenGlPage.xaml b/samples/ControlCatalog/Pages/OpenGlPage.xaml
index 0e557cc1ad..9119be05f5 100644
--- a/samples/ControlCatalog/Pages/OpenGlPage.xaml
+++ b/samples/ControlCatalog/Pages/OpenGlPage.xaml
@@ -1,7 +1,8 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<ContentPage Theme="{StaticResource ScrollPage}" xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              x:Class="ControlCatalog.Pages.OpenGlPage"
              xmlns:pages="using:ControlCatalog.Pages"
+             Header="OpenGL"
              xmlns:openGl="clr-namespace:ControlCatalog.Pages.OpenGl">
   <Grid x:Name="MainGrid">
     <pages:OpenGlPageControl x:Name="GL"/>
@@ -10,4 +11,4 @@
             IsVisible="False"
             VerticalAlignment="Bottom" HorizontalAlignment="Right"  Click="SnapshotClick">Snapshot</Button>
   </Grid>
-</UserControl>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/OpenGlPage.xaml.cs b/samples/ControlCatalog/Pages/OpenGlPage.xaml.cs
index 09173e01a5..51dc4c2c72 100644
--- a/samples/ControlCatalog/Pages/OpenGlPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/OpenGlPage.xaml.cs
@@ -11,7 +11,7 @@ using ControlCatalog.Pages.OpenGl;
 
 namespace ControlCatalog.Pages
 {
-    public partial class OpenGlPage : UserControl
+    public partial class OpenGlPage : ContentPage
     {
         public OpenGlPage()
         {
diff --git a/samples/ControlCatalog/Pages/PipsPager/PipsPagerCustomButtonsPage.xaml b/samples/ControlCatalog/Pages/PipsPager/PipsPagerCustomButtonThemesPage.xaml
similarity index 83%
rename from samples/ControlCatalog/Pages/PipsPager/PipsPagerCustomButtonsPage.xaml
rename to samples/ControlCatalog/Pages/PipsPager/PipsPagerCustomButtonThemesPage.xaml
index 8b9856424d..3e32f253f5 100644
--- a/samples/ControlCatalog/Pages/PipsPager/PipsPagerCustomButtonsPage.xaml
+++ b/samples/ControlCatalog/Pages/PipsPager/PipsPagerCustomButtonThemesPage.xaml
@@ -1,17 +1,17 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             x:Class="ControlCatalog.Pages.PipsPagerCustomButtonsPage">
+             x:Class="ControlCatalog.Pages.PipsPagerCustomButtonThemesPage">
   <DockPanel>
     <ScrollViewer DockPanel.Dock="Right" Width="220">
       <StackPanel Margin="12" Spacing="8">
-        <TextBlock Text="Custom Buttons" FontSize="16" FontWeight="SemiBold"
+        <TextBlock Text="Custom Button Themes" FontSize="16" FontWeight="SemiBold"
                    Foreground="{DynamicResource SystemControlHighlightAccentBrush}" />
         <TextBlock TextWrapping="Wrap" FontSize="12" Opacity="0.7"
-                   Text="Replace the default chevron navigation buttons with custom styled buttons using PreviousButtonStyle and NextButtonStyle." />
+                   Text="Replace the default chevron navigation buttons with custom button themes using PreviousButtonTheme and NextButtonTheme." />
         <Separator />
         <TextBlock Text="Properties" FontSize="13" FontWeight="SemiBold" />
-        <TextBlock FontSize="12" TextWrapping="Wrap" Text="PreviousButtonStyle" />
-        <TextBlock FontSize="12" TextWrapping="Wrap" Text="NextButtonStyle" />
+        <TextBlock FontSize="12" TextWrapping="Wrap" Text="PreviousButtonTheme" />
+        <TextBlock FontSize="12" TextWrapping="Wrap" Text="NextButtonTheme" />
         <TextBlock FontSize="12" TextWrapping="Wrap" Text="IsPreviousButtonVisible" />
         <TextBlock FontSize="12" TextWrapping="Wrap" Text="IsNextButtonVisible" />
       </StackPanel>
@@ -27,7 +27,7 @@
         <PipsPager NumberOfPages="5" MaxVisiblePips="5"
                    IsPreviousButtonVisible="True" IsNextButtonVisible="True">
           <PipsPager.Resources>
-            <ControlTheme x:Key="CustomPreviousButtonStyle" TargetType="Button">
+            <ControlTheme x:Key="CustomPreviousButtonTheme" TargetType="Button">
               <Setter Property="Content" Value="Prev" />
               <Setter Property="Background" Value="LightGray" />
               <Setter Property="Foreground" Value="Black" />
@@ -41,7 +41,7 @@
                 </ControlTemplate>
               </Setter>
             </ControlTheme>
-            <ControlTheme x:Key="CustomNextButtonStyle" TargetType="Button">
+            <ControlTheme x:Key="CustomNextButtonTheme" TargetType="Button">
               <Setter Property="Content" Value="Next" />
               <Setter Property="Background" Value="LightGray" />
               <Setter Property="Foreground" Value="Black" />
@@ -56,12 +56,12 @@
               </Setter>
             </ControlTheme>
           </PipsPager.Resources>
-          <PipsPager.PreviousButtonStyle>
-            <StaticResource ResourceKey="CustomPreviousButtonStyle" />
-          </PipsPager.PreviousButtonStyle>
-          <PipsPager.NextButtonStyle>
-            <StaticResource ResourceKey="CustomNextButtonStyle" />
-          </PipsPager.NextButtonStyle>
+          <PipsPager.PreviousButtonTheme>
+            <StaticResource ResourceKey="CustomPreviousButtonTheme" />
+          </PipsPager.PreviousButtonTheme>
+          <PipsPager.NextButtonTheme>
+            <StaticResource ResourceKey="CustomNextButtonTheme" />
+          </PipsPager.NextButtonTheme>
         </PipsPager>
       </StackPanel>
 
diff --git a/samples/ControlCatalog/Pages/PipsPager/PipsPagerCustomButtonThemesPage.xaml.cs b/samples/ControlCatalog/Pages/PipsPager/PipsPagerCustomButtonThemesPage.xaml.cs
new file mode 100644
index 0000000000..26682b9d61
--- /dev/null
+++ b/samples/ControlCatalog/Pages/PipsPager/PipsPagerCustomButtonThemesPage.xaml.cs
@@ -0,0 +1,11 @@
+using Avalonia.Controls;
+
+namespace ControlCatalog.Pages;
+
+public partial class PipsPagerCustomButtonThemesPage : UserControl
+{
+    public PipsPagerCustomButtonThemesPage()
+    {
+        InitializeComponent();
+    }
+}
diff --git a/samples/ControlCatalog/Pages/PipsPager/PipsPagerCustomButtonsPage.xaml.cs b/samples/ControlCatalog/Pages/PipsPager/PipsPagerCustomButtonsPage.xaml.cs
deleted file mode 100644
index 4fc74995bc..0000000000
--- a/samples/ControlCatalog/Pages/PipsPager/PipsPagerCustomButtonsPage.xaml.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Avalonia.Controls;
-
-namespace ControlCatalog.Pages;
-
-public partial class PipsPagerCustomButtonsPage : UserControl
-{
-    public PipsPagerCustomButtonsPage()
-    {
-        InitializeComponent();
-    }
-}
diff --git a/samples/ControlCatalog/Pages/PipsPagerPage.xaml b/samples/ControlCatalog/Pages/PipsPagerPage.xaml
index 54112daae0..aee21a7d01 100644
--- a/samples/ControlCatalog/Pages/PipsPagerPage.xaml
+++ b/samples/ControlCatalog/Pages/PipsPagerPage.xaml
@@ -1,11 +1,14 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<ContentPage Theme="{StaticResource ScrollPage}" xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             Header="PipsPager"
              x:Class="ControlCatalog.Pages.PipsPagerPage">
-  <NavigationPage x:Name="SampleNav">
-    <NavigationPage.Styles>
-      <Style Selector="NavigationPage#SampleNav /template/ Border#PART_NavigationBar">
-        <Setter Property="Background" Value="Transparent" />
-      </Style>
-    </NavigationPage.Styles>
-  </NavigationPage>
-</UserControl>
+  <Grid>
+    <NavigationPage x:Name="SampleNav">
+      <NavigationPage.Styles>
+        <Style Selector="NavigationPage#SampleNav /template/ Border#PART_NavigationBar">
+          <Setter Property="Background" Value="Transparent" />
+        </Style>
+      </NavigationPage.Styles>
+    </NavigationPage>
+  </Grid>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/PipsPagerPage.xaml.cs b/samples/ControlCatalog/Pages/PipsPagerPage.xaml.cs
index 33cc6d0fdf..5a3b142f59 100644
--- a/samples/ControlCatalog/Pages/PipsPagerPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/PipsPagerPage.xaml.cs
@@ -4,7 +4,7 @@ using Avalonia.Interactivity;
 
 namespace ControlCatalog.Pages
 {
-    public partial class PipsPagerPage : UserControl
+    public partial class PipsPagerPage : ContentPage
     {
         private static readonly (string Group, string Title, string Description, Func<UserControl> Factory)[] Demos =
         {
@@ -25,9 +25,9 @@ namespace ControlCatalog.Pages
             ("Appearance", "Custom Colors",
                 "Override pip indicator colors using resource keys for normal, selected, and hover states.",
                 () => new PipsPagerCustomColorsPage()),
-            ("Appearance", "Custom Buttons",
-                "Replace the default chevron navigation buttons with custom styled buttons.",
-                () => new PipsPagerCustomButtonsPage()),
+            ("Appearance", "Custom Button Themes",
+                "Replace the default chevron navigation buttons with custom button themes.",
+                () => new PipsPagerCustomButtonThemesPage()),
             ("Appearance", "Custom Templates",
                 "Override pip item templates to create squares, pills, numbers, or any custom shape.",
                 () => new PipsPagerCustomTemplatesPage()),
diff --git a/samples/ControlCatalog/Pages/PlatformInfoPage.xaml b/samples/ControlCatalog/Pages/PlatformInfoPage.xaml
index 22c47f6bef..f86d53b740 100644
--- a/samples/ControlCatalog/Pages/PlatformInfoPage.xaml
+++ b/samples/ControlCatalog/Pages/PlatformInfoPage.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="ControlCatalog.Pages.PlatformInfoPage"
+<ContentPage Theme="{StaticResource ScrollPage}" x:Class="ControlCatalog.Pages.PlatformInfoPage"
              xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -7,6 +7,7 @@
              d:DesignHeight="800"
              d:DesignWidth="400"
              mc:Ignorable="d"
+             Header="Platform Info"
              x:DataType="viewModels:PlatformInformationViewModel">
   <StackPanel Spacing="20">
     <TextBlock Text="{Binding PlatformInfo}" />
@@ -53,4 +54,4 @@
       </WrapPanel>
     </StackPanel>
   </StackPanel>
-</UserControl>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/PlatformInfoPage.xaml.cs b/samples/ControlCatalog/Pages/PlatformInfoPage.xaml.cs
index 5066bc51de..db1bbef40c 100644
--- a/samples/ControlCatalog/Pages/PlatformInfoPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/PlatformInfoPage.xaml.cs
@@ -3,7 +3,7 @@ using ControlCatalog.ViewModels;
 
 namespace ControlCatalog.Pages
 {
-    public partial class PlatformInfoPage : UserControl
+    public partial class PlatformInfoPage : ContentPage
     {
         public PlatformInfoPage()
         {
diff --git a/samples/ControlCatalog/Pages/PointersPage.xaml b/samples/ControlCatalog/Pages/PointersPage.xaml
index dda85316f6..2f958b901b 100644
--- a/samples/ControlCatalog/Pages/PointersPage.xaml
+++ b/samples/ControlCatalog/Pages/PointersPage.xaml
@@ -1,12 +1,12 @@
-<UserControl x:Class="ControlCatalog.Pages.PointersPage"
+<TabbedPage x:Class="ControlCatalog.Pages.PointersPage"
              xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             Header="Pointers"
              xmlns:local="using:ControlCatalog.Pages">
-  <TabControl>
-    <TabItem Header="Contacts">
+    <ContentPage Theme="{StaticResource ScrollPage}" Header="Contacts">
       <local:PointerContactsTab />
-    </TabItem>
-    <TabItem Header="IntermediatePoints">
+    </ContentPage>
+    <ContentPage Theme="{StaticResource ScrollPage}" Header="IntermediatePoints">
       <Panel TextElement.Foreground="Black">
         <local:PointerCanvas x:Name="IntermediatePointsCanvas"
                              DrawOnlyPoints="True"
@@ -28,8 +28,8 @@
                    HorizontalAlignment="Left"
                    VerticalAlignment="Top" />
       </Panel>
-    </TabItem>
-    <TabItem Header="Pressure">
+    </ContentPage>
+    <ContentPage Theme="{StaticResource ScrollPage}" Header="Pressure">
       <Panel TextElement.Foreground="Black">
         <local:PointerCanvas x:Name="PressureCanvas"
                              DrawOnlyPoints="False"
@@ -39,8 +39,8 @@
                    HorizontalAlignment="Left"
                    VerticalAlignment="Top" />
       </Panel>
-    </TabItem>
-    <TabItem Header="Capture">
+    </ContentPage>
+    <ContentPage Theme="{StaticResource ScrollPage}" Header="Capture">
       <WrapPanel>
         <Border Name="BorderCapture1"
                 MinWidth="250"
@@ -65,6 +65,5 @@
           <TextBlock>Capture 2</TextBlock>
         </Border>
       </WrapPanel>
-    </TabItem>
-  </TabControl>
-</UserControl>
+    </ContentPage>
+</TabbedPage>
diff --git a/samples/ControlCatalog/Pages/PointersPage.xaml.cs b/samples/ControlCatalog/Pages/PointersPage.xaml.cs
index adf45029ec..388c8fa382 100644
--- a/samples/ControlCatalog/Pages/PointersPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/PointersPage.xaml.cs
@@ -4,7 +4,7 @@ using Avalonia.Input;
 
 namespace ControlCatalog.Pages;
 
-public partial class PointersPage : UserControl
+public partial class PointersPage : TabbedPage
 {
     public PointersPage()
     {
diff --git a/samples/ControlCatalog/Pages/ProgressBarPage.xaml b/samples/ControlCatalog/Pages/ProgressBarPage.xaml
index 52e1e198b5..3b80b5a6bb 100644
--- a/samples/ControlCatalog/Pages/ProgressBarPage.xaml
+++ b/samples/ControlCatalog/Pages/ProgressBarPage.xaml
@@ -1,4 +1,8 @@
-<UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:Class="ControlCatalog.Pages.ProgressBarPage">
+<ContentPage Theme="{StaticResource ScrollPage}"
+             xmlns="https://github.com/avaloniaui" 
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+             Header="ProgressBar"
+             x:Class="ControlCatalog.Pages.ProgressBarPage">
   <StackPanel Orientation="Vertical" Spacing="4">
     <TextBlock Classes="h2">A progress bar control</TextBlock>
     <StackPanel Spacing="5">
@@ -18,10 +22,10 @@
       <CheckBox x:Name="isIndeterminate" Margin="10,16,0,0" Content="Toggle Indeterminate" />
       <StackPanel Orientation="Horizontal" Margin="0,16,0,0" HorizontalAlignment="Center" Spacing="16">
         <StackPanel Spacing="16">
-          <ProgressBar IsIndeterminate="{Binding #isIndeterminate.IsChecked}" ShowProgressText="{Binding #showProgress.IsChecked}" Value="{Binding #hprogress.Value}" 
+          <ProgressBar IsIndeterminate="{Binding #isIndeterminate.IsChecked}" ShowProgressText="{Binding #showProgress.IsChecked}" Value="{Binding #hprogress.Value}"
                        Minimum="{Binding #minimum.Value}" Maximum="{Binding #maximum.Value}" ProgressTextFormat="{Binding #stringFormat.Text}"/>
         </StackPanel>
-        <ProgressBar IsIndeterminate="{Binding #isIndeterminate.IsChecked}" ShowProgressText="{Binding #showProgress.IsChecked}" Value="{Binding #vprogress.Value}" Orientation="Vertical" 
+        <ProgressBar IsIndeterminate="{Binding #isIndeterminate.IsChecked}" ShowProgressText="{Binding #showProgress.IsChecked}" Value="{Binding #vprogress.Value}" Orientation="Vertical"
                      Minimum="{Binding #minimum.Value}" Maximum="{Binding #maximum.Value}" ProgressTextFormat="{Binding #stringFormat.Text}"/>
       </StackPanel>
       <StackPanel Margin="16">
@@ -36,4 +40,4 @@
       </StackPanel>
     </StackPanel>
   </StackPanel>
-</UserControl>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/ProgressBarPage.xaml.cs b/samples/ControlCatalog/Pages/ProgressBarPage.xaml.cs
index 42b9fe29d7..244161a61e 100644
--- a/samples/ControlCatalog/Pages/ProgressBarPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ProgressBarPage.xaml.cs
@@ -2,7 +2,7 @@ using Avalonia.Controls;
 
 namespace ControlCatalog.Pages
 {
-    public partial class ProgressBarPage : UserControl
+    public partial class ProgressBarPage : ContentPage
     {
         public ProgressBarPage()
         {
diff --git a/samples/ControlCatalog/Pages/RadioButtonPage.xaml b/samples/ControlCatalog/Pages/RadioButtonPage.xaml
index 8623d81b3f..efb63ea124 100644
--- a/samples/ControlCatalog/Pages/RadioButtonPage.xaml
+++ b/samples/ControlCatalog/Pages/RadioButtonPage.xaml
@@ -1,5 +1,6 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<ContentPage Theme="{StaticResource ScrollPage}" xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             Header="RadioButton"
              x:Class="ControlCatalog.Pages.RadioButtonPage">
   <StackPanel Orientation="Vertical" Spacing="4">
     <TextBlock Classes="h2">Allows the selection of a single option of many</TextBlock>
@@ -37,4 +38,4 @@
       </StackPanel>
     </StackPanel>
   </StackPanel>
-</UserControl>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/RadioButtonPage.xaml.cs b/samples/ControlCatalog/Pages/RadioButtonPage.xaml.cs
index 798df9fe77..8199a7caf5 100644
--- a/samples/ControlCatalog/Pages/RadioButtonPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/RadioButtonPage.xaml.cs
@@ -2,7 +2,7 @@ using Avalonia.Controls;
 
 namespace ControlCatalog.Pages
 {
-    public partial class RadioButtonPage : UserControl
+    public partial class RadioButtonPage : ContentPage
     {
         public RadioButtonPage()
         {
diff --git a/samples/ControlCatalog/Pages/RefreshContainerPage.axaml b/samples/ControlCatalog/Pages/RefreshContainerPage.axaml
index f6ea26a84c..06f54dd28a 100644
--- a/samples/ControlCatalog/Pages/RefreshContainerPage.axaml
+++ b/samples/ControlCatalog/Pages/RefreshContainerPage.axaml
@@ -1,4 +1,4 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<ContentPage Theme="{StaticResource ScrollPage}" 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"
@@ -6,6 +6,7 @@
              mc:Ignorable="d"
              d:DesignWidth="800"
              d:DesignHeight="450"
+             Header="RefreshContainer"
              x:DataType="viewModels:RefreshContainerViewModel"
              x:Class="ControlCatalog.Pages.RefreshContainerPage">
   <DockPanel HorizontalAlignment="Stretch"
@@ -24,4 +25,4 @@
                ItemsSource="{Binding Items}"/>
     </RefreshContainer>
   </DockPanel>
-</UserControl>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/RefreshContainerPage.axaml.cs b/samples/ControlCatalog/Pages/RefreshContainerPage.axaml.cs
index a710cd7e5c..2c886fa9de 100644
--- a/samples/ControlCatalog/Pages/RefreshContainerPage.axaml.cs
+++ b/samples/ControlCatalog/Pages/RefreshContainerPage.axaml.cs
@@ -3,7 +3,7 @@ using ControlCatalog.ViewModels;
 
 namespace ControlCatalog.Pages
 {
-    public partial class RefreshContainerPage : UserControl
+    public partial class RefreshContainerPage : ContentPage
     {
         private RefreshContainerViewModel _viewModel;
 
diff --git a/samples/ControlCatalog/Pages/RelativePanelPage.axaml b/samples/ControlCatalog/Pages/RelativePanelPage.axaml
index a6647b0d36..ccc39befd4 100644
--- a/samples/ControlCatalog/Pages/RelativePanelPage.axaml
+++ b/samples/ControlCatalog/Pages/RelativePanelPage.axaml
@@ -1,8 +1,9 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<ContentPage Theme="{StaticResource ScrollPage}" 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"
+             Header="RelativePanel"
              x:Class="ControlCatalog.Pages.RelativePanelPage">
   <ScrollViewer HorizontalScrollBarVisibility="Auto"
                 VerticalScrollBarVisibility="Auto">
@@ -60,4 +61,4 @@
         </Border>
     </RelativePanel>
   </ScrollViewer>
-</UserControl>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/RelativePanelPage.axaml.cs b/samples/ControlCatalog/Pages/RelativePanelPage.axaml.cs
index aec13a18e3..3c59deb791 100644
--- a/samples/ControlCatalog/Pages/RelativePanelPage.axaml.cs
+++ b/samples/ControlCatalog/Pages/RelativePanelPage.axaml.cs
@@ -2,7 +2,7 @@
 
 namespace ControlCatalog.Pages
 {
-    public partial class RelativePanelPage : UserControl
+    public partial class RelativePanelPage : ContentPage
     {
         public RelativePanelPage()
         {
diff --git a/samples/ControlCatalog/Pages/ScreenPage.cs b/samples/ControlCatalog/Pages/ScreenPage.cs
index 66e90c2b34..9791152923 100644
--- a/samples/ControlCatalog/Pages/ScreenPage.cs
+++ b/samples/ControlCatalog/Pages/ScreenPage.cs
@@ -11,7 +11,7 @@ using Avalonia.Threading;
 
 namespace ControlCatalog.Pages
 {
-    public class ScreenPage : UserControl
+    public class ScreenPage : ContentPage
     {
         private double _leftMost;
         private double _topMost;
diff --git a/samples/ControlCatalog/Pages/ScrollViewerPage.xaml b/samples/ControlCatalog/Pages/ScrollViewerPage.xaml
index f931542a04..0567dbe451 100644
--- a/samples/ControlCatalog/Pages/ScrollViewerPage.xaml
+++ b/samples/ControlCatalog/Pages/ScrollViewerPage.xaml
@@ -1,10 +1,10 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<TabbedPage xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:pages="using:ControlCatalog.Pages"
              x:Class="ControlCatalog.Pages.ScrollViewerPage"
+             Header="ScrollViewer"
              x:DataType="pages:ScrollViewerPageViewModel">
-  <TabControl>
-    <TabItem Header="ScrollViewer">
+    <ContentPage Theme="{StaticResource ScrollPage}" Header="ScrollViewer">
       <StackPanel Orientation="Vertical"
                   Spacing="20">
         <TextBlock TextWrapping="Wrap"
@@ -51,8 +51,8 @@
           </ScrollViewer>
         </Grid>
       </StackPanel>
-    </TabItem>
-    <TabItem Header="Snapping">
+    </ContentPage>
+    <ContentPage Theme="{StaticResource ScrollPage}" Header="Snapping">
       <StackPanel Orientation="Vertical"
                   Spacing="4">
         <TextBlock TextWrapping="Wrap"
@@ -267,6 +267,5 @@
           </Border>
         </Grid>
       </StackPanel>
-    </TabItem>
-  </TabControl>  
-</UserControl>
+    </ContentPage> 
+</TabbedPage>
diff --git a/samples/ControlCatalog/Pages/ScrollViewerPage.xaml.cs b/samples/ControlCatalog/Pages/ScrollViewerPage.xaml.cs
index 7c684357d3..cfdd5bab54 100644
--- a/samples/ControlCatalog/Pages/ScrollViewerPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ScrollViewerPage.xaml.cs
@@ -92,7 +92,7 @@ namespace ControlCatalog.Pages
         public List<SnapPointsAlignment> AvailableSnapPointsAlignment { get; }
     }
 
-    public partial class ScrollViewerPage : UserControl
+    public partial class ScrollViewerPage : TabbedPage
     {
         public ScrollViewerPage()
         {
diff --git a/samples/ControlCatalog/Pages/SliderPage.xaml b/samples/ControlCatalog/Pages/SliderPage.xaml
index 7821e885ba..445564cb54 100644
--- a/samples/ControlCatalog/Pages/SliderPage.xaml
+++ b/samples/ControlCatalog/Pages/SliderPage.xaml
@@ -1,5 +1,6 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<ContentPage Theme="{StaticResource ScrollPage}" xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             Header="Sliders"
              xmlns:sys="using:System"
              x:Class="ControlCatalog.Pages.SliderPage">
   <StackPanel Orientation="Vertical" Spacing="4">
@@ -80,4 +81,4 @@
     </StackPanel>
 
   </StackPanel>
-</UserControl>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/SliderPage.xaml.cs b/samples/ControlCatalog/Pages/SliderPage.xaml.cs
index 8345df8716..f65f714300 100644
--- a/samples/ControlCatalog/Pages/SliderPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/SliderPage.xaml.cs
@@ -2,7 +2,7 @@ using Avalonia.Controls;
 
 namespace ControlCatalog.Pages
 {
-    public partial class SliderPage : UserControl
+    public partial class SliderPage : ContentPage
     {
         public SliderPage()
         {
diff --git a/samples/ControlCatalog/Pages/SplitViewPage.xaml b/samples/ControlCatalog/Pages/SplitViewPage.xaml
index 201765ad88..144688e358 100644
--- a/samples/ControlCatalog/Pages/SplitViewPage.xaml
+++ b/samples/ControlCatalog/Pages/SplitViewPage.xaml
@@ -1,8 +1,9 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<ContentPage Theme="{StaticResource ScrollPage}" 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:viewModels="using:ControlCatalog.ViewModels"
+             Header="SplitView"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="ControlCatalog.Pages.SplitViewPage"
              x:DataType="viewModels:SplitViewPageViewModel">
@@ -109,4 +110,4 @@
     </Grid>
   </Border>
 
-</UserControl>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/SplitViewPage.xaml.cs b/samples/ControlCatalog/Pages/SplitViewPage.xaml.cs
index b711db3c49..4917a13ccf 100644
--- a/samples/ControlCatalog/Pages/SplitViewPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/SplitViewPage.xaml.cs
@@ -3,7 +3,7 @@ using ControlCatalog.ViewModels;
 
 namespace ControlCatalog.Pages
 {
-    public partial class SplitViewPage : UserControl
+    public partial class SplitViewPage : ContentPage
     {
         public SplitViewPage()
         {
diff --git a/samples/ControlCatalog/Pages/TabControlPage.xaml b/samples/ControlCatalog/Pages/TabControlPage.xaml
index a3bacfd92a..e7aa18ea84 100644
--- a/samples/ControlCatalog/Pages/TabControlPage.xaml
+++ b/samples/ControlCatalog/Pages/TabControlPage.xaml
@@ -1,7 +1,8 @@
-<UserControl
+<ContentPage
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:Class="ControlCatalog.Pages.TabControlPage"
     xmlns="https://github.com/avaloniaui"
+             Header="TabControl"
     xmlns:viewModels="using:ControlCatalog.ViewModels"
     x:DataType="viewModels:TabControlPageViewModel">
     <DockPanel Classes.WithContentTemplates="{Binding IsChecked, ElementName=UseContentTemplates}">
@@ -108,4 +109,4 @@
             </StackPanel>
         </Grid>
     </DockPanel>
-</UserControl>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/TabControlPage.xaml.cs b/samples/ControlCatalog/Pages/TabControlPage.xaml.cs
index b7f34eda86..366b5216ef 100644
--- a/samples/ControlCatalog/Pages/TabControlPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/TabControlPage.xaml.cs
@@ -6,7 +6,7 @@ using ControlCatalog.ViewModels;
 
 namespace ControlCatalog.Pages
 {
-    public partial class TabControlPage : UserControl
+    public partial class TabControlPage : ContentPage
     {
         public TabControlPage()
         {
diff --git a/samples/ControlCatalog/Pages/TabStripPage.xaml b/samples/ControlCatalog/Pages/TabStripPage.xaml
index b576beeb5f..f4a47af353 100644
--- a/samples/ControlCatalog/Pages/TabStripPage.xaml
+++ b/samples/ControlCatalog/Pages/TabStripPage.xaml
@@ -1,6 +1,7 @@
-<UserControl xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+<ContentPage Theme="{StaticResource ScrollPage}" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              x:Class="ControlCatalog.Pages.TabStripPage"
              xmlns="https://github.com/avaloniaui"
+             Header="TabStrip"
              xmlns:viewModels="using:ControlCatalog.ViewModels"
              x:DataType="viewModels:TabControlPageViewModel">
     <StackPanel Orientation="Vertical" Spacing="4">
@@ -31,4 +32,4 @@
             </TabStrip.ItemTemplate>
         </TabStrip>
     </StackPanel>
-</UserControl>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/TabStripPage.xaml.cs b/samples/ControlCatalog/Pages/TabStripPage.xaml.cs
index d2873f6586..d830109833 100644
--- a/samples/ControlCatalog/Pages/TabStripPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/TabStripPage.xaml.cs
@@ -3,7 +3,7 @@ using ControlCatalog.ViewModels;
 
 namespace ControlCatalog.Pages
 {
-    public partial class TabStripPage : UserControl
+    public partial class TabStripPage : ContentPage
     {
         public TabStripPage()
         {
diff --git a/samples/ControlCatalog/Pages/TabbedDemoPage.xaml b/samples/ControlCatalog/Pages/TabbedDemoPage.xaml
index bb1467060b..58a3b4fe82 100644
--- a/samples/ControlCatalog/Pages/TabbedDemoPage.xaml
+++ b/samples/ControlCatalog/Pages/TabbedDemoPage.xaml
@@ -1,11 +1,14 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<ContentPage Theme="{StaticResource ScrollPage}" xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             Header="Tabbed Page"
              x:Class="ControlCatalog.Pages.TabbedDemoPage">
-  <NavigationPage x:Name="SampleNav">
-    <NavigationPage.Styles>
-      <Style Selector="NavigationPage#SampleNav /template/ Border#PART_NavigationBar">
-        <Setter Property="Background" Value="Transparent" />
-      </Style>
-    </NavigationPage.Styles>
-  </NavigationPage>
-</UserControl>
+  <Grid>
+    <NavigationPage x:Name="SampleNav">
+      <NavigationPage.Styles>
+        <Style Selector="NavigationPage#SampleNav /template/ Border#PART_NavigationBar">
+          <Setter Property="Background" Value="Transparent" />
+        </Style>
+      </NavigationPage.Styles>
+    </NavigationPage>
+  </Grid>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/TabbedDemoPage.xaml.cs b/samples/ControlCatalog/Pages/TabbedDemoPage.xaml.cs
index 51da6330a1..88692c97f3 100644
--- a/samples/ControlCatalog/Pages/TabbedDemoPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/TabbedDemoPage.xaml.cs
@@ -4,7 +4,7 @@ using Avalonia.Interactivity;
 
 namespace ControlCatalog.Pages
 {
-    public partial class TabbedDemoPage : UserControl
+    public partial class TabbedDemoPage : ContentPage
     {
         private static readonly (string Group, string Title, string Description, Func<UserControl> Factory)[] Demos =
         {
diff --git a/samples/ControlCatalog/Pages/TextBlockPage.xaml b/samples/ControlCatalog/Pages/TextBlockPage.xaml
index 7c0300d318..3418cffe74 100644
--- a/samples/ControlCatalog/Pages/TextBlockPage.xaml
+++ b/samples/ControlCatalog/Pages/TextBlockPage.xaml
@@ -1,5 +1,6 @@
-<UserControl x:Class="ControlCatalog.Pages.TextBlockPage"
+<ContentPage Theme="{StaticResource ScrollPage}" x:Class="ControlCatalog.Pages.TextBlockPage"
              xmlns="https://github.com/avaloniaui"
+             Header="TextBlock"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <StackPanel>
     <TextBlock Classes="h2">A control that can display text</TextBlock>
@@ -137,4 +138,4 @@
       </Border>
     </WrapPanel>
   </StackPanel>
-</UserControl>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/TextBlockPage.xaml.cs b/samples/ControlCatalog/Pages/TextBlockPage.xaml.cs
index d097d1d083..d10d255a4f 100644
--- a/samples/ControlCatalog/Pages/TextBlockPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/TextBlockPage.xaml.cs
@@ -2,7 +2,7 @@ using Avalonia.Controls;
 
 namespace ControlCatalog.Pages
 {
-    public partial class TextBlockPage : UserControl
+    public partial class TextBlockPage : ContentPage
     {
         public TextBlockPage()
         {
diff --git a/samples/ControlCatalog/Pages/TextBoxPage.xaml b/samples/ControlCatalog/Pages/TextBoxPage.xaml
index 346e561dfc..9b5a412f86 100644
--- a/samples/ControlCatalog/Pages/TextBoxPage.xaml
+++ b/samples/ControlCatalog/Pages/TextBoxPage.xaml
@@ -1,6 +1,7 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<ContentPage Theme="{StaticResource ScrollPage}" xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              x:Class="ControlCatalog.Pages.TextBoxPage"
+             Header="TextBox"
              xmlns:sys="using:System">
   <StackPanel Orientation="Vertical" Spacing="4">
     <Label Classes="h2">A control into which the user can input text</Label>
@@ -101,4 +102,4 @@
              FontFamily="avares://ControlCatalog/Assets/Fonts#WenQuanYi Micro Hei"
              Text="计算机科学（是系统性研究信息与计算的理论基础以及它们在计算机系统中如何实现与应用的实用技术的学科。它通常被形容为对那些创造、描述以及转换信息的算法处理的系统研究。计算机科学包含很多分支领域；有些强调特定结果的计算，比如计算机图形学；而有些是探討计算问题的性质，比如计算复杂性理论；还有一些领域專注于怎样实现计算，比如程式語言理論是研究描述计算的方法，而程式设计是应用特定的程式語言解决特定的计算问题，人机交互则是專注于怎样使计算机和计算变得有用、好用，以及随时随地为人所用。&#xD;&#xD;有时公众会误以为计算机科学就是解决计算机问题的事业（比如信息技术），或者只是与使用计算机的经验有关，如玩游戏、上网或者文字处理。其实计算机科学所关注的，不仅仅是去理解实现类似游戏、浏览器这些软件的程序的性质，更要通过现有的知识创造新的程序或者改进已有的程序。" />
   </StackPanel>
-</UserControl>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/TextBoxPage.xaml.cs b/samples/ControlCatalog/Pages/TextBoxPage.xaml.cs
index 035f951a6b..3c38a05c53 100644
--- a/samples/ControlCatalog/Pages/TextBoxPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/TextBoxPage.xaml.cs
@@ -2,7 +2,7 @@ using Avalonia.Controls;
 
 namespace ControlCatalog.Pages
 {
-    public partial class TextBoxPage : UserControl
+    public partial class TextBoxPage : ContentPage
     {
         public TextBoxPage()
         {
diff --git a/samples/ControlCatalog/Pages/ThemePage.axaml b/samples/ControlCatalog/Pages/ThemePage.axaml
index 7eb95471a0..ccc5769fe7 100644
--- a/samples/ControlCatalog/Pages/ThemePage.axaml
+++ b/samples/ControlCatalog/Pages/ThemePage.axaml
@@ -1,13 +1,14 @@
-<UserControl x:Class="ControlCatalog.Pages.ThemePage"
+<ContentPage Theme="{StaticResource ScrollPage}" x:Class="ControlCatalog.Pages.ThemePage"
              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:pages="clr-namespace:ControlCatalog.Pages"
+             Header="Theme"
              d:DesignWidth="300"
              mc:Ignorable="d">
 
-  <UserControl.Resources>
+  <ContentPage.Resources>
     <ResourceDictionary>
       <ResourceDictionary.ThemeDictionaries>
         <ResourceDictionary x:Key="Dark">
@@ -52,7 +53,7 @@
         </ResourceDictionary>
       </ResourceDictionary.ThemeDictionaries>
     </ResourceDictionary>
-  </UserControl.Resources>
+  </ContentPage.Resources>
 
   <ThemeVariantScope x:Name="ThemeVariantScope">
     <Border Background="{DynamicResource DemoBackground}"
@@ -76,4 +77,4 @@
       </Grid>
     </Border>
   </ThemeVariantScope>
-</UserControl>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/ThemePage.axaml.cs b/samples/ControlCatalog/Pages/ThemePage.axaml.cs
index d355b399a4..4f45e93ed0 100644
--- a/samples/ControlCatalog/Pages/ThemePage.axaml.cs
+++ b/samples/ControlCatalog/Pages/ThemePage.axaml.cs
@@ -4,7 +4,7 @@ using Avalonia.Styling;
 
 namespace ControlCatalog.Pages
 {
-    public partial class ThemePage : UserControl
+    public partial class ThemePage : ContentPage
     {
         public static ThemeVariant Pink { get; } = new("Pink", ThemeVariant.Light);
         
diff --git a/samples/ControlCatalog/Pages/ToggleSwitchPage.xaml b/samples/ControlCatalog/Pages/ToggleSwitchPage.xaml
index 6afe6dd135..126cc7e7d2 100644
--- a/samples/ControlCatalog/Pages/ToggleSwitchPage.xaml
+++ b/samples/ControlCatalog/Pages/ToggleSwitchPage.xaml
@@ -1,5 +1,6 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<ContentPage Theme="{StaticResource ScrollPage}" xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             Header="ToggleSwitch"
              x:Class="ControlCatalog.Pages.ToggleSwitchPage" Margin="5">
   <StackPanel MaxWidth="500"
               HorizontalAlignment="Stretch">
@@ -17,7 +18,7 @@
       <StackPanel>
         <ToggleSwitch Content="h_eadered" IsChecked="true" Margin="10"/>
         <TextBox Classes="CodeBox"
-          Text="&lt;ToggleSwitch&gt;headered&lt;/ToggleSwitch&gt;"/>
+                 Text="&lt;ToggleSwitch&gt;headered&lt;/ToggleSwitch&gt;"/>
       </StackPanel>
     </Border>
 
@@ -26,14 +27,14 @@
     <Border Classes="Thin">
       <StackPanel>
         <ToggleSwitch Content="_Custom"
-          OnContent="On"
-          OffContent="Off"
-          Margin="10"/>
+                      OnContent="On"
+                      OffContent="Off"
+                      Margin="10"/>
 
-        <TextBox Text="&lt;ToggleSwitch Content=&quot;Custom&quot; 
-ContentOn=&quot;On&quot; 
-ContentOff=&quot;Off&quot; /&gt;"
-          Classes="CodeBox"/>
+        <TextBox Text="&lt;ToggleSwitch Content=&quot;Custom&quot;
+        ContentOn=&quot;On&quot;
+        ContentOff=&quot;Off&quot; /&gt;"
+        Classes="CodeBox"/>
       </StackPanel>
     </Border>
 
@@ -55,7 +56,7 @@ ContentOff=&quot;Off&quot; /&gt;"
     </Border>
   </StackPanel>
 
-  <UserControl.Styles >
+  <ContentPage.Styles >
     <Style Selector="TextBox.CodeBox" >
       <Setter Property="Padding" Value="10"/>
       <Setter Property="IsReadOnly" Value="True"/>
@@ -75,6 +76,6 @@ ContentOff=&quot;Off&quot; /&gt;"
       <Setter Property="CornerRadius" Value="2"/>
     </Style>
 
-  </UserControl.Styles>
-</UserControl>
+  </ContentPage.Styles>
+</ContentPage>
 
diff --git a/samples/ControlCatalog/Pages/ToggleSwitchPage.xaml.cs b/samples/ControlCatalog/Pages/ToggleSwitchPage.xaml.cs
index 77d77daeed..a60eb295b0 100644
--- a/samples/ControlCatalog/Pages/ToggleSwitchPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ToggleSwitchPage.xaml.cs
@@ -2,7 +2,7 @@
 
 namespace ControlCatalog.Pages
 {
-    public partial class ToggleSwitchPage : UserControl
+    public partial class ToggleSwitchPage : ContentPage
     {
         public ToggleSwitchPage()
         {
diff --git a/samples/ControlCatalog/Pages/ToolTipPage.xaml b/samples/ControlCatalog/Pages/ToolTipPage.xaml
index 8b76cccbc9..cc3a50b8e9 100644
--- a/samples/ControlCatalog/Pages/ToolTipPage.xaml
+++ b/samples/ControlCatalog/Pages/ToolTipPage.xaml
@@ -1,5 +1,6 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<ContentPage Theme="{StaticResource ScrollPage}" xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             Header="ToolTip"
              x:Class="ControlCatalog.Pages.ToolTipPage">
     <StackPanel Orientation="Vertical"
                 Spacing="4">
@@ -10,7 +11,7 @@
                      HorizontalAlignment="Center">
             <ToggleSwitch Margin="5" 
                           HorizontalAlignment="Center"
-                          IsChecked="{Binding Path=(ToolTip.ServiceEnabled), RelativeSource={RelativeSource AncestorType=UserControl}}"
+                          IsChecked="{Binding Path=(ToolTip.ServiceEnabled), RelativeSource={RelativeSource AncestorType=ContentPage}}"
                           Content="Enable ToolTip service" />
             <ToggleSwitch Margin="5"
                           IsChecked="{Binding ElementName=Border, Path=(ToolTip.IsOpen)}"
@@ -91,4 +92,4 @@
           </Border>
         </UniformGrid>
     </StackPanel>
-</UserControl>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/ToolTipPage.xaml.cs b/samples/ControlCatalog/Pages/ToolTipPage.xaml.cs
index cd0b5c72a8..e436407dc5 100644
--- a/samples/ControlCatalog/Pages/ToolTipPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ToolTipPage.xaml.cs
@@ -6,7 +6,7 @@ using Avalonia.Interactivity;
 
 namespace ControlCatalog.Pages
 {
-    public partial class ToolTipPage : UserControl
+    public partial class ToolTipPage : ContentPage
     {
         public ToolTipPage()
         {
diff --git a/samples/ControlCatalog/Pages/TransitioningContentControlPage.axaml b/samples/ControlCatalog/Pages/TransitioningContentControlPage.axaml
index 03ef86fb61..5435ed278d 100644
--- a/samples/ControlCatalog/Pages/TransitioningContentControlPage.axaml
+++ b/samples/ControlCatalog/Pages/TransitioningContentControlPage.axaml
@@ -1,19 +1,20 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<ContentPage Theme="{StaticResource ScrollPage}" 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="using:ControlCatalog.Converter"
              xmlns:system="using:System"
+             Header="TransitioningContentControl"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:DataType="vm:TransitioningContentControlPageViewModel"
              x:Class="ControlCatalog.Pages.TransitioningContentControlPage">
 
-    <UserControl.DataContext>
+    <ContentPage.DataContext>
         <vm:TransitioningContentControlPageViewModel />
-    </UserControl.DataContext>
+    </ContentPage.DataContext>
 
-    <UserControl.Styles>
+    <ContentPage.Styles>
         <Style Selector="HeaderedContentControl">
             <Setter Property="Template">
                 <Setter.Value>
@@ -36,12 +37,12 @@
                 </Setter.Value>
             </Setter>
         </Style>
-    </UserControl.Styles>
+    </ContentPage.Styles>
   
-  <UserControl.Resources>
+  <ContentPage.Resources>
     <converter:MathSubtractConverter x:Key="MathSubtractConverter" />
     <system:Double x:Key="TopMargin">8</system:Double>
-  </UserControl.Resources>
+  </ContentPage.Resources>
   
     <DockPanel LastChildFill="True" 
                Height="{Binding Path=Bounds.Height, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Grid}, Converter={StaticResource MathSubtractConverter},ConverterParameter={StaticResource TopMargin}}">
@@ -81,4 +82,4 @@
             </TransitioningContentControl>
         </Border>
     </DockPanel>
-</UserControl>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/TransitioningContentControlPage.axaml.cs b/samples/ControlCatalog/Pages/TransitioningContentControlPage.axaml.cs
index 863ddae6e0..818ab6219d 100644
--- a/samples/ControlCatalog/Pages/TransitioningContentControlPage.axaml.cs
+++ b/samples/ControlCatalog/Pages/TransitioningContentControlPage.axaml.cs
@@ -2,7 +2,7 @@ using Avalonia.Controls;
 
 namespace ControlCatalog.Pages
 {
-    public partial class TransitioningContentControlPage : UserControl
+    public partial class TransitioningContentControlPage : ContentPage
     {
         public TransitioningContentControlPage()
         {
diff --git a/samples/ControlCatalog/Pages/TreeViewPage.xaml b/samples/ControlCatalog/Pages/TreeViewPage.xaml
index 2e3fca58cb..88dc65b5f2 100644
--- a/samples/ControlCatalog/Pages/TreeViewPage.xaml
+++ b/samples/ControlCatalog/Pages/TreeViewPage.xaml
@@ -1,6 +1,7 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<ContentPage Theme="{StaticResource ScrollPage}" xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:viewModels="using:ControlCatalog.ViewModels"
+             Header="TreeView"
              x:Class="ControlCatalog.Pages.TreeViewPage"
              x:DataType="viewModels:TreeViewPageViewModel">
   <StackPanel Orientation="Vertical" Spacing="4">
@@ -32,4 +33,4 @@
       </StackPanel>
     </StackPanel>
   </StackPanel>
-</UserControl>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/TreeViewPage.xaml.cs b/samples/ControlCatalog/Pages/TreeViewPage.xaml.cs
index c43c2eb49e..d03590febd 100644
--- a/samples/ControlCatalog/Pages/TreeViewPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/TreeViewPage.xaml.cs
@@ -3,7 +3,7 @@ using ControlCatalog.ViewModels;
 
 namespace ControlCatalog.Pages
 {
-    public partial class TreeViewPage : UserControl
+    public partial class TreeViewPage : ContentPage
     {
         public TreeViewPage()
         {
diff --git a/samples/ControlCatalog/Pages/ViewboxPage.xaml b/samples/ControlCatalog/Pages/ViewboxPage.xaml
index e66655253c..3848e405db 100644
--- a/samples/ControlCatalog/Pages/ViewboxPage.xaml
+++ b/samples/ControlCatalog/Pages/ViewboxPage.xaml
@@ -1,6 +1,7 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<ContentPage Theme="{StaticResource ScrollPage}" xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:collections="using:System.Collections"
+             Header="ViewBox"
              x:Class="ControlCatalog.Pages.ViewboxPage">
 
     <Grid RowDefinitions="Auto,*,*">
@@ -50,4 +51,4 @@
         </Grid>
 
     </Grid>
-</UserControl>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/ViewboxPage.xaml.cs b/samples/ControlCatalog/Pages/ViewboxPage.xaml.cs
index c140cb9857..f7b1ea3f75 100644
--- a/samples/ControlCatalog/Pages/ViewboxPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ViewboxPage.xaml.cs
@@ -2,7 +2,7 @@ using Avalonia.Controls;
 
 namespace ControlCatalog.Pages
 {
-    public partial class ViewboxPage : UserControl
+    public partial class ViewboxPage : ContentPage
     {
         public ViewboxPage()
         {
diff --git a/samples/ControlCatalog/Pages/WindowCustomizationsPage.xaml b/samples/ControlCatalog/Pages/WindowCustomizationsPage.xaml
index df84c0bd6b..0017ee09b5 100644
--- a/samples/ControlCatalog/Pages/WindowCustomizationsPage.xaml
+++ b/samples/ControlCatalog/Pages/WindowCustomizationsPage.xaml
@@ -1,9 +1,10 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<ContentPage Theme="{StaticResource ScrollPage}" 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:viewModels="using:ControlCatalog.ViewModels"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             Header="Window Customizations"
              x:Class="ControlCatalog.Pages.WindowCustomizationsPage"
              x:DataType="viewModels:MainWindowViewModel"
              x:CompileBindings="True">
@@ -50,4 +51,4 @@
     </StackPanel>
 
   </StackPanel>
-</UserControl>
+</ContentPage>
diff --git a/samples/ControlCatalog/Pages/WindowCustomizationsPage.xaml.cs b/samples/ControlCatalog/Pages/WindowCustomizationsPage.xaml.cs
index d62c7ec10f..2ee8677eba 100644
--- a/samples/ControlCatalog/Pages/WindowCustomizationsPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/WindowCustomizationsPage.xaml.cs
@@ -2,7 +2,7 @@
 
 namespace ControlCatalog.Pages
 {
-    public partial class WindowCustomizationsPage : UserControl
+    public partial class WindowCustomizationsPage : ContentPage
     {
         public WindowCustomizationsPage()
         {
diff --git a/samples/ControlCatalog/ScrollPage.xaml b/samples/ControlCatalog/ScrollPage.xaml
new file mode 100644
index 0000000000..6d5ecb815e
--- /dev/null
+++ b/samples/ControlCatalog/ScrollPage.xaml
@@ -0,0 +1,34 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:controls="using:ControlCatalog">
+
+  <ControlTheme x:Key="ScrollPage" TargetType="ContentPage">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <DockPanel>
+          <ContentPresenter Name="PART_TopCommandBar"
+                            DockPanel.Dock="Top"
+                            HorizontalContentAlignment="Stretch"
+                            IsVisible="False" />
+          <ContentPresenter Name="PART_BottomCommandBar"
+                            DockPanel.Dock="Bottom"
+                            HorizontalContentAlignment="Stretch"
+                            IsVisible="False" />
+
+          <ScrollViewer Margin="20,20,5,0"
+            HorizontalScrollBarVisibility="Disabled">
+            <ContentPresenter Name="PART_ContentPresenter"
+                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Content="{TemplateBinding Content}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            CornerRadius="{TemplateBinding CornerRadius}" />
+          </ScrollViewer>
+        </DockPanel>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs b/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
index ce9209f61a..0d877b253f 100644
--- a/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
@@ -8,7 +8,7 @@ using MiniMvvm;
 
 namespace ControlCatalog.ViewModels
 {
-    class MainWindowViewModel : ViewModelBase
+    partial class MainWindowViewModel : ViewModelBase
     {
         private WindowState _windowState;
         private WindowState[] _windowStates = Array.Empty<WindowState>();
@@ -20,6 +20,7 @@ namespace ControlCatalog.ViewModels
         private bool _canResize;
         private bool _canMinimize;
         private bool _canMaximize;
+        private int _selectedDecorationIndex;
 
         public MainWindowViewModel()
         {
@@ -51,6 +52,8 @@ namespace ControlCatalog.ViewModels
             CanResize = true;
             CanMinimize = true;
             CanMaximize = true;
+
+            Filter();
         }        
         
         public bool ExtendClientAreaEnabled
@@ -113,6 +116,12 @@ namespace ControlCatalog.ViewModels
             set { RaiseAndSetIfChanged(ref _canMaximize, value); }
         }
 
+        public int SelectedDecorationIndex
+        {
+            get { return _selectedDecorationIndex; }
+            set { RaiseAndSetIfChanged(ref _selectedDecorationIndex, value); }
+        }
+
 
         public MiniCommand AboutCommand { get; }
 
diff --git a/samples/ControlCatalog/ViewModels/MainWindowViewModel_PageList.cs b/samples/ControlCatalog/ViewModels/MainWindowViewModel_PageList.cs
new file mode 100644
index 0000000000..4c85f64765
--- /dev/null
+++ b/samples/ControlCatalog/ViewModels/MainWindowViewModel_PageList.cs
@@ -0,0 +1,196 @@
+using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Dialogs;
+using System;
+using System.ComponentModel.DataAnnotations;
+using Avalonia;
+using MiniMvvm;
+using Avalonia.Collections;
+using ControlCatalog.Pages;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace ControlCatalog.ViewModels
+{
+    partial class MainWindowViewModel
+    {
+        private int _selectedPageIndex;
+        private bool _isDrawerOpened = true;
+        private bool _ignoreListChange = false;
+        private string? _query = "";
+        private PageItem? _currentItem;
+        private SplitViewDisplayMode _displayMode;
+
+        private List<PageItem> _items = new()
+        {
+            new PageItem("Composition", () => new CompositionPage(), Icons.Layers),
+            new PageItem("Accelerator", () => new AcceleratorPage(), Icons.Keyboard),
+            new PageItem("Acrylic", () => new AcrylicPage(), Icons.Blur),
+            new PageItem("AdornerLayer", () => new AdornerLayerPage(), Icons.Sparkle),
+            new PageItem("AutoCompleteBox",() => new AutoCompleteBoxPage(), Icons.TextInput),
+            new PageItem("Border",() => new BorderPage(), Icons.Border),
+            new PageItem("BitmapCache",() => new BitmapCachePage(), Icons.Lightning),
+            new PageItem("Buttons",() => new ButtonsPage(), Icons.CursorClick),
+            new PageItem("ButtonSpinner",() => new ButtonSpinnerPage(), Icons.Spinner),
+            new PageItem("Calendar",() => new CalendarPage(), Icons.Calendar),
+            new PageItem("Canvas",() => new CanvasPage(), Icons.Canvas),
+            new PageItem("CommandBar",() => new CommandBarPage(), Icons.Terminal),
+            new PageItem("Carousel",() => new Pages.CarouselPage(), Icons.Slides),
+            new PageItem("CarouselPage",() => new CarouselDemoPage(), Icons.Slides),
+            new PageItem("CheckBox",() => new CheckBoxPage(), Icons.Checkbox),
+            new PageItem("Clipboard",() => new ClipboardPage(), Icons.Clipboard),
+            new PageItem("ColorPicker",() => new ColorPickerPage(), Icons.Palette),
+            new PageItem("ComboBox",() => new ComboBoxPage(), Icons.Dropdown),
+            new PageItem("Container Queries",() => new ContainerQueryPage(), Icons.Container),
+            new PageItem("ContentPage",() => new ContentDemoPage(), Icons.Document),
+            new PageItem("ContextFlyout",() => new ContextFlyoutPage(), Icons.Menu),
+            new PageItem("ContextMenu",() => new ContextMenuPage(), Icons.Menu),
+            new PageItem("Cursor",() => new CursorPage(), Icons.Cursor),
+            new PageItem("Custom Drawing",() => new CustomDrawing(), Icons.Brush),
+            new PageItem("DataGrid",() => new DataGridPage(), Icons.Grid),
+            new PageItem("Data Validation",() => new DataValidationPage(), Icons.Shield),
+            new PageItem("Date/Time Picker",() => new DateTimePickerPage(), Icons.Clock),
+            new PageItem("CalendarDatePicker",() => new CalendarDatePickerPage(), Icons.Calendar),
+            new PageItem("Dialogs",() => new DialogsPage(), Icons.Dialog),
+            new PageItem("Drag+Drop",() => new DragAndDropPage(), Icons.DragDrop),
+            new PageItem("DrawerPage",() => new DrawerDemoPage(), Icons.Drawer),
+            new PageItem("Expander",() => new ExpanderPage(), Icons.Expand),
+            new PageItem("Flyouts",() => new FlyoutsPage(), Icons.Flyout),
+            new PageItem("Focus",() => new FocusPage(), Icons.Target),
+            new PageItem("Gestures",() => new GesturePage(), Icons.Gesture),
+            new PageItem("Image",() => new ImagePage(), Icons.Image),
+            new PageItem("Label",() => new LabelsPage(), Icons.Tag),
+            new PageItem("LayoutTransformControl",() => new LayoutTransformControlPage(), Icons.Transform),
+            new PageItem("ListBox",() => new ListBoxPage(), Icons.List),
+            new PageItem("Menu",() => new MenuPage(), Icons.Menu),
+            new PageItem("NavigationPage",() => new NavigationDemoPage(), Icons.Navigation),
+            new PageItem("Notifications",() => new NotificationsPage(), Icons.Bell),
+            new PageItem("NumericUpDown",() => new NumericUpDownPage(), Icons.Number),
+            new PageItem("OpenGL",() => new OpenGlPage(), Icons.Cube3D),
+            new PageItem("OpenGL Lease",() => new OpenGlLeasePage(), Icons.Cube3D),
+            new PageItem("PipsPager",() => new PipsPagerPage(), Icons.HorizontalDots),
+            new PageItem("Platform Information",() => new PlatformInfoPage(), Icons.Info),
+            new PageItem("Pointers",() => new PointersPage(), Icons.Cursor),
+            new PageItem("ProgressBar",() => new ProgressBarPage(), Icons.Progress),
+            new PageItem("RadioButton",() => new RadioButtonPage(), Icons.Radio),
+            new PageItem("RefreshContainer",() => new RefreshContainerPage(), Icons.Refresh),
+            new PageItem("RelativePanel",() => new RelativePanelPage(), Icons.Layout),
+            new PageItem("ScrollViewer",() => new ScrollViewerPage(), Icons.Scroll),
+            new PageItem("Slider",() => new SliderPage(), Icons.Tune),
+            new PageItem("SplitView",() => new SplitViewPage(), Icons.Split),
+            new PageItem("TabbedPage",() => new TabbedDemoPage(), Icons.Tab),
+            new PageItem("TabControl",() => new TabControlPage(), Icons.Tab),
+            new PageItem("TabStrip",() => new TabStripPage(), Icons.Tab),
+            new PageItem("TextBox",() => new TextBoxPage(), Icons.TextInput),
+            new PageItem("TextBlock",() => new TextBlockPage(), Icons.TextInput),
+            new PageItem("Theme Variants",() => new ThemePage(), Icons.Theme),
+            new PageItem("ToggleSwitch",() => new ToggleSwitchPage(), Icons.Toggle),
+            new PageItem("ToolTip",() => new ToolTipPage(), Icons.Tooltip),
+            new PageItem("TransitioningContentControl",() => new TransitioningContentControlPage(), Icons.Transition),
+            new PageItem("TreeView",() => new TreeViewPage(), Icons.Tree),
+            new PageItem("Viewbox",() => new ViewboxPage(), Icons.Viewbox),
+            new PageItem("Native Embed",() => new NativeEmbedPage(), Icons.Puzzle),
+            new PageItem("Window Customizations",() => new WindowCustomizationsPage(), Icons.Window),
+            new PageItem("HeaderedContentControl",() => new HeaderedContentPage(), Icons.Header),
+            new PageItem("Screens",() => new ScreenPage(), Icons.Monitor),
+        };
+
+        public AvaloniaList<PageItem> Pages { get; } = new AvaloniaList<PageItem>();
+
+        public void Filter(string? query = "")
+        {
+            try
+            {
+                _ignoreListChange = true;
+                Pages.Clear();
+
+                if (!string.IsNullOrWhiteSpace(query))
+                    Pages.AddRange(_items.Where(x => x.Header.Contains(query)));
+                else
+                    Pages.AddRange(_items);
+            }
+            finally
+            {
+                _ignoreListChange = false;
+                if (_currentItem != null)
+                {
+                    var newIndex = Pages.IndexOf(_currentItem);
+                    if (newIndex != -1)
+                    {
+                        SelectedPageIndex = newIndex;
+                    }
+                }
+            }
+        }
+
+        public INavigation? Navigator { get; internal set; }
+
+        public int SelectedPageIndex
+        {
+            get { return _selectedPageIndex; }
+            set
+            {
+                RaiseAndSetIfChanged(ref _selectedPageIndex, value);
+
+                if (!_ignoreListChange)
+                {
+                    NavigateTo(_selectedPageIndex);
+
+                    if (DisplayMode == SplitViewDisplayMode.CompactOverlay || DisplayMode == SplitViewDisplayMode.Overlay)
+                        IsDrawerOpened = false;
+                }
+            }
+        }
+
+        public bool IsDrawerOpened
+        {
+            get { return _isDrawerOpened; }
+            set { RaiseAndSetIfChanged(ref _isDrawerOpened, value); }
+        }
+
+        public SplitViewDisplayMode DisplayMode
+        {
+            get { return _displayMode; }
+            set { RaiseAndSetIfChanged(ref _displayMode, value); }
+        }
+
+        public string? Query
+        {
+            get { return _query; }
+            set
+            {
+                RaiseAndSetIfChanged(ref _query, value);
+
+                Filter(value);
+            }
+        }
+
+        private async void NavigateTo(int pageIndex)
+        {
+            if (pageIndex < 0 || pageIndex >= Pages.Count || Navigator is null)
+                return;
+
+            var item = Pages[pageIndex];
+
+            if (item != null)
+            {
+                var view = item.Factory();
+                if (view is Page page && view.GetType() != Navigator.NavigationStack.LastOrDefault()?.GetType())
+                {
+                    _currentItem = item;
+                    await Navigator.ReplaceAsync(page);
+                }
+            }
+        }
+    }
+
+    class PageItem(string header, Func<object> factory, string? iconData = null)
+    {
+        public string Header { get; } = header;
+        public Func<object> Factory { get; } = factory;
+        public string? IconData { get; } = iconData;
+
+        public bool IsVisible { get; set; } = true;
+    }
+}
diff --git a/samples/SampleControls/HamburgerMenu/HamburgerMenu.cs b/samples/SampleControls/HamburgerMenu/HamburgerMenu.cs
index 57f8a138af..0e45b28a78 100644
--- a/samples/SampleControls/HamburgerMenu/HamburgerMenu.cs
+++ b/samples/SampleControls/HamburgerMenu/HamburgerMenu.cs
@@ -1,4 +1,6 @@
-using Avalonia;
+using System;
+using System.Linq;
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
 using Avalonia.Media;
@@ -8,6 +10,8 @@ namespace ControlSamples
     public class HamburgerMenu : TabControl
     {
         private SplitView? _splitView;
+        private TextBox? _searchBox;
+        private bool _initialized;
 
         public static readonly StyledProperty<IBrush?> PaneBackgroundProperty =
             SplitView.PaneBackgroundProperty.AddOwner<HamburgerMenu>();
@@ -41,6 +45,68 @@ namespace ControlSamples
             base.OnApplyTemplate(e);
 
             _splitView = e.NameScope.Find<SplitView>("PART_NavigationPane");
+            _searchBox = e.NameScope.Find<TextBox>("PART_SearchBox");
+
+            if (_searchBox is not null)
+            {
+                _searchBox.TextChanged += OnSearchTextChanged;
+            }
+        }
+
+        protected override void OnLoaded(Avalonia.Interactivity.RoutedEventArgs e)
+        {
+            base.OnLoaded(e);
+
+            if (!_initialized)
+            {
+                _initialized = true;
+                SortItems();
+            }
+        }
+
+        private void SortItems()
+        {
+            var items = Items.OfType<TabItem>().ToList();
+            var sorted = items.OrderBy(t => t.Header?.ToString() ?? "", StringComparer.OrdinalIgnoreCase).ToList();
+
+            // Only reorder if needed
+            bool needsSort = false;
+            for (int i = 0; i < items.Count; i++)
+            {
+                if (!ReferenceEquals(items[i], sorted[i]))
+                {
+                    needsSort = true;
+                    break;
+                }
+            }
+
+            if (needsSort)
+            {
+                Items.Clear();
+                foreach (var item in sorted)
+                {
+                    Items.Add(item);
+                }
+            }
+        }
+
+        private void OnSearchTextChanged(object? sender, TextChangedEventArgs e)
+        {
+            var searchText = _searchBox?.Text;
+            var hasFilter = !string.IsNullOrWhiteSpace(searchText);
+
+            foreach (var item in Items.OfType<TabItem>())
+            {
+                if (hasFilter)
+                {
+                    var header = item.Header?.ToString() ?? "";
+                    item.IsVisible = header.Contains(searchText!, StringComparison.OrdinalIgnoreCase);
+                }
+                else
+                {
+                    item.IsVisible = true;
+                }
+            }
         }
 
         protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
diff --git a/samples/SampleControls/HamburgerMenu/HamburgerMenu.xaml b/samples/SampleControls/HamburgerMenu/HamburgerMenu.xaml
index 49972bdc64..b4d9900617 100644
--- a/samples/SampleControls/HamburgerMenu/HamburgerMenu.xaml
+++ b/samples/SampleControls/HamburgerMenu/HamburgerMenu.xaml
@@ -33,8 +33,8 @@
       <Color x:Key="HamburgerAltHighColor">#FFFFFFFF</Color>
       <Color x:Key="HamburgerChromeLowColor">#FFF2F2F2</Color>
     </ResourceDictionary>
-  </ResourceDictionary.ThemeDictionaries>
-  
+  </ResourceDictionary.ThemeDictionaries> 
+
   <x:Double x:Key="PaneCompactWidth">40</x:Double>
   <x:Double x:Key="PaneExpandWidth">220</x:Double>
   <x:Double x:Key="HeaderHeight">36</x:Double>
@@ -134,14 +134,14 @@
 
     <Style Selector="^:pointerover">
       <Setter Property="Background" Value="{DynamicResource ThemeControlHighlightMidBrush}"/>
-      
+
       <Style Selector="^ /template/ Border#PART_LayoutRoot">
         <Setter Property="Background" Value="{DynamicResource HamburgerChromeLowColor}" />
         <Setter Property="BoxShadow" Value="{StaticResource NavigationItemShadow}" />
         <Setter Property="TextElement.Foreground" Value="{DynamicResource HamburgerBaseHighColor}" />
       </Style>
     </Style>
-    
+
     <Style Selector="^:selected">
       <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush4}"/>
 
@@ -175,10 +175,21 @@
                      OpenPaneLength="{StaticResource PaneExpandWidth}"
                      PaneBackground="Transparent">
             <SplitView.Pane>
-              <Grid Margin="0,0,1,5" RowDefinitions="Auto, *, Auto">
+              <Grid Margin="0,0,1,5" RowDefinitions="Auto, Auto, *, Auto">
                 <Panel Height="{StaticResource HeaderHeight}" />
+                <TextBox x:Name="PART_SearchBox"
+                         Grid.Row="1"
+                         PlaceholderText="Search…"
+                         Margin="4,0,8,4"
+                         VerticalContentAlignment="Center">
+                  <TextBox.InnerLeftContent>
+                    <PathIcon Width="14" Height="14" Margin="6,0,0,0"
+                              VerticalAlignment="Center"
+                              Data="M10 2.5a7.5 7.5 0 0 1 5.964 12.048l4.743 4.745a1 1 0 0 1-1.32 1.497l-.094-.083-4.745-4.743A7.5 7.5 0 1 1 10 2.5Zm0 2a5.5 5.5 0 1 0 0 11 5.5 5.5 0 0 0 0-11Z" />
+                  </TextBox.InnerLeftContent>
+                </TextBox>
                 <ScrollViewer x:Name="PART_ScrollViewer"
-                              Grid.Row="1"
+                              Grid.Row="2"
                               HorizontalAlignment="Stretch"
                               HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
                               VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
@@ -195,7 +206,7 @@
                   </ItemsPresenter>
                 </ScrollViewer>
                 <Button x:Name="SettingsButton"
-                        Grid.Row="2"
+                        Grid.Row="3"
                         Theme="{StaticResource NavigationButton}"
                         Content="Settings"
                         Flyout="{TemplateBinding (FlyoutBase.AttachedFlyout)}"
diff --git a/src/Android/Avalonia.Android/AndroidDispatcherImpl.cs b/src/Android/Avalonia.Android/AndroidDispatcherImpl.cs
index 8ee5f2a8f0..ea23b64a42 100644
--- a/src/Android/Avalonia.Android/AndroidDispatcherImpl.cs
+++ b/src/Android/Avalonia.Android/AndroidDispatcherImpl.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Diagnostics;
+using System.Threading;
 using Android.OS;
 using Avalonia.Controls.Documents;
 using Avalonia.Threading;
@@ -19,8 +20,7 @@ namespace Avalonia.Android
         private readonly Runnable _timerSignaler;
         private readonly Runnable _wakeupSignaler;
         private readonly MessageQueue _queue;
-        private readonly object _lock = new();
-        private bool _signaled;
+        private int _signaled;
         private bool _backgroundProcessingRequested;
         
 
@@ -46,8 +46,7 @@ namespace Avalonia.Android
         public event Action? Signaled;
         private void OnSignaled()
         {
-            lock (_lock)
-                _signaled = false;
+            Interlocked.Exchange(ref _signaled, 0);
             Signaled?.Invoke();
         }
 
@@ -68,13 +67,11 @@ namespace Avalonia.Android
 
         public void Signal()
         {
-            lock (_lock)
+            if (Interlocked.CompareExchange(ref _signaled, 1, 0) != 0)
             {
-                if(_signaled)
-                    return;
-                _signaled = true;
-                _handler.Post(_signaler);
+                return;
             }
+            _handler.Post(_signaler);
         }
 
         readonly Stopwatch _clock = Stopwatch.StartNew();
@@ -133,11 +130,9 @@ namespace Avalonia.Android
                 // "background" jobs not being processed
                 // So we need to examine the queue state to prevent that scenario
                 
-                lock (_lock)
+                if (Volatile.Read(ref _signaled) != 0)
                 {
-                    // There are higher priority jobs enqueued, we'll be called again
-                    if (_signaled)
-                        return;
+                    return;
                 }
                 
                 if (CanQueryPendingInput)
diff --git a/src/Android/Avalonia.Android/AvaloniaAccessHelper.cs b/src/Android/Avalonia.Android/AvaloniaAccessHelper.cs
index ca06998dbc..6d5128ece2 100644
--- a/src/Android/Avalonia.Android/AvaloniaAccessHelper.cs
+++ b/src/Android/Avalonia.Android/AvaloniaAccessHelper.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
+
 using Android.OS;
 using AndroidX.Core.View.Accessibility;
 using AndroidX.CustomView.Widget;
@@ -134,9 +134,18 @@ namespace Avalonia.Android
 
         protected override bool OnPerformActionForVirtualView(int virtualViewId, int action, Bundle? arguments)
         {
-            return (GetNodeInfoProvidersFromVirtualViewId(virtualViewId) ?? [])
-                .Select(x => TryPerformNodeAction(x, action, arguments))
-                .Aggregate(false, (a, b) => a | b);
+            var providers = GetNodeInfoProvidersFromVirtualViewId(virtualViewId);
+            if (providers == null)
+            {
+                return false;
+            }
+
+            var result = false;
+            foreach (var provider in providers)
+            {
+                result |= TryPerformNodeAction(provider, action, arguments);
+            }
+            return result;
         }
 
         private static bool TryPerformNodeAction(INodeInfoProvider nodeInfoProvider, int action, Bundle? arguments)
diff --git a/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs b/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
index 20284906be..da128cec96 100644
--- a/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
+++ b/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
@@ -4,6 +4,7 @@ using Android.App;
 using Android.Content;
 using Android.Graphics;
 using Android.Graphics.Drawables;
+using Android.OS;
 using Android.Runtime;
 using Android.Views;
 using AndroidX.AppCompat.App;
@@ -144,6 +145,7 @@ namespace Avalonia.Android.Platform.SkiaPlatform
             private readonly TopLevelImpl _tl;
             private Size _oldSize;
             private double _oldScaling;
+            private Paint? _clearPaint;
 
             public SurfaceViewImpl(Context context, TopLevelImpl tl, bool placeOnTop) : base(context)
             {
@@ -159,11 +161,13 @@ namespace Avalonia.Android.Platform.SkiaPlatform
                 // can be seen below, but it does not.
                 if (OperatingSystem.IsAndroidVersionAtLeast(29))
                 {
-                    // Android 10+ does this (BlendMode was new)
-                    var paint = new Paint();
-                    paint.SetColor(0);
-                    paint.BlendMode = BlendMode.Clear;
-                    canvas.DrawRect(0, 0, Width, Height, paint);
+                    if (_clearPaint == null)
+                    {
+                        _clearPaint = new Paint();
+                        _clearPaint.SetColor(0);
+                        _clearPaint.BlendMode = BlendMode.Clear;
+                    }
+                    canvas.DrawRect(0, 0, Width, Height, _clearPaint);
                 }
                 else
                 {
@@ -384,7 +388,7 @@ namespace Avalonia.Android.Platform.SkiaPlatform
         {
             if(Input != null)
             {
-                var args = new RawTextInputEventArgs(AndroidKeyboardDevice.Instance!, (ulong)DateTime.Now.Ticks, InputRoot!, text);
+                var args = new RawTextInputEventArgs(AndroidKeyboardDevice.Instance!, (ulong)SystemClock.UptimeMillis(), InputRoot!, text);
 
                 Input(args);
             }
diff --git a/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidKeyboardEventsHelper.cs b/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidKeyboardEventsHelper.cs
index 03be7c2153..59b1bc9899 100644
--- a/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidKeyboardEventsHelper.cs
+++ b/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidKeyboardEventsHelper.cs
@@ -10,6 +10,18 @@ namespace Avalonia.Android.Platform.Specific.Helpers
 {
     internal class AndroidKeyboardEventsHelper<TView> : IDisposable where TView : TopLevelImpl
     {
+        private static readonly string[] s_asciiStringCache = InitAsciiStringCache();
+
+        private static string[] InitAsciiStringCache()
+        {
+            var cache = new string[128];
+            for (int i = 0; i < 128; i++)
+            {
+                cache[i] = ((char)i).ToString();
+            }
+            return cache;
+        }
+
         private readonly TView _view;
 
         public bool HandleEvents { get; set; }
@@ -79,7 +91,7 @@ namespace Avalonia.Android.Platform.Specific.Helpers
                   AndroidKeyboardDevice.Instance!,
                   Convert.ToUInt64(e.EventTime),
                   inputRoot,
-                  unicodeTextInput ?? Convert.ToChar(e.UnicodeChar).ToString()
+                  unicodeTextInput ?? CharToString(e.UnicodeChar)
                   );
                 _view.Input?.Invoke(rawTextEvent);
 
@@ -107,6 +119,15 @@ namespace Avalonia.Android.Platform.Specific.Helpers
             return rv;
         }
 
+        private static string CharToString(int unicodeChar)
+        {
+            if (unicodeChar >= 0 && unicodeChar < s_asciiStringCache.Length)
+            {
+                return s_asciiStringCache[unicodeChar];
+            }
+            return char.ConvertFromUtf32(unicodeChar);
+        }
+
         private static string? GetKeySymbol(int unicodeChar, PhysicalKey physicalKey)
         {
             // Handle a very limited set of control characters so that we're consistent with other platforms
@@ -126,7 +147,7 @@ namespace Avalonia.Android.Platform.Specific.Helpers
                     if (unicodeChar <= 0x7F)
                     {
                         var asciiChar = (char)unicodeChar;
-                        return KeySymbolHelper.IsAllowedAsciiKeySymbol(asciiChar) ? asciiChar.ToString() : null;
+                        return KeySymbolHelper.IsAllowedAsciiKeySymbol(asciiChar) ? s_asciiStringCache[asciiChar] : null;
                     }
                     return char.ConvertFromUtf32(unicodeChar);
             }
diff --git a/src/Avalonia.Base/Animation/Animation.cs b/src/Avalonia.Base/Animation/Animation.cs
index 0391280ede..5f15f14534 100644
--- a/src/Avalonia.Base/Animation/Animation.cs
+++ b/src/Avalonia.Base/Animation/Animation.cs
@@ -42,6 +42,15 @@ namespace Avalonia.Animation
                 o => o._playbackDirection,
                 (o, v) => o._playbackDirection = v);
 
+        /// <summary>
+        /// Defines the <see cref="PlaybackBehavior"/> property.
+        /// </summary>
+        public static readonly DirectProperty<Animation, PlaybackBehavior> PlaybackBehaviorProperty =
+            AvaloniaProperty.RegisterDirect<Animation, PlaybackBehavior>(
+                nameof(PlaybackBehavior),
+                o => o._playbackBehavior,
+                (o, v) => o._playbackBehavior = v);
+
         /// <summary>
         /// Defines the <see cref="FillMode"/> property.
         /// </summary>
@@ -91,6 +100,7 @@ namespace Avalonia.Animation
         private TimeSpan _duration;
         private IterationCount _iterationCount = new IterationCount(1);
         private PlaybackDirection _playbackDirection;
+        private PlaybackBehavior _playbackBehavior;
         private FillMode _fillMode;
         private Easing _easing = new LinearEasing();
         private TimeSpan _delay = TimeSpan.Zero;
@@ -124,6 +134,19 @@ namespace Avalonia.Animation
             set { SetAndRaise(PlaybackDirectionProperty, ref _playbackDirection, value); }
         }
 
+        /// <summary>
+        /// Gets or sets the playback behavior for this animation.
+        /// When set to <see cref="PlaybackBehavior.Auto"/>, manually started animations and
+        /// animations targeting <see cref="Visual.IsVisibleProperty"/> always play,
+        /// while style-applied animations pause when the control is not effectively visible
+        /// (see <see cref="Visual.IsEffectivelyVisible"/>).
+        /// </summary>
+        public PlaybackBehavior PlaybackBehavior
+        {
+            get { return _playbackBehavior; }
+            set { SetAndRaise(PlaybackBehaviorProperty, ref _playbackBehavior, value); }
+        }
+
         /// <summary>
         /// Gets or sets the value fill mode for this animation.
         /// </summary> 
@@ -192,11 +215,12 @@ namespace Avalonia.Animation
             return null;
         }
 
-        private (IList<IAnimator> Animators, IList<IDisposable> subscriptions) InterpretKeyframes(Animatable control)
+        private (IList<IAnimator> Animators, IList<IDisposable> subscriptions, bool animatesVisibility) InterpretKeyframes(Animatable control)
         {
             var handlerList = new Dictionary<(Type type, AvaloniaProperty Property), Func<IAnimator>>();
             var animatorKeyFrames = new List<AnimatorKeyFrame>();
             var subscriptions = new List<IDisposable>();
+            var animatesVisibility = false;
 
             foreach (var keyframe in Children)
             {
@@ -207,6 +231,9 @@ namespace Avalonia.Animation
                         throw new InvalidOperationException("No Setter property assigned.");
                     }
 
+                    if (setter.Property == Visual.IsVisibleProperty)
+                        animatesVisibility = true;
+
                     var handler = Animation.GetAnimator(setter) ?? GetAnimatorType(setter.Property);
 
                     if (handler == null)
@@ -265,19 +292,31 @@ namespace Avalonia.Animation
                 }
             }
 
-            return (newAnimatorInstances, subscriptions);
+            return (newAnimatorInstances, subscriptions, animatesVisibility);
         }
 
-        IDisposable IAnimation.Apply(Animatable control, IClock? clock, IObservable<bool> match, Action? onComplete)
-            => Apply(control, clock, match, onComplete);
-        
+        IDisposable IAnimation.Apply(Animatable control, IClock? clock, IObservable<bool> match, Action? onComplete,
+            bool isManuallyStarted)
+            => Apply(control, clock, match, onComplete, isManuallyStarted);
+
         /// <inheritdoc cref="IAnimation.Apply"/>
-        internal IDisposable Apply(Animatable control, IClock? clock, IObservable<bool> match, Action? onComplete)
+        internal IDisposable Apply(Animatable control, IClock? clock, IObservable<bool> match, Action? onComplete,
+            bool isManuallyStarted = false)
         {
-            var (animators, subscriptions) = InterpretKeyframes(control);
+            var (animators, subscriptions, animatesVisibility) = InterpretKeyframes(control);
+
+            var shouldPauseOnInvisible = _playbackBehavior switch
+            {
+                PlaybackBehavior.Auto => !(animatesVisibility || isManuallyStarted),
+                PlaybackBehavior.Always => false,
+                PlaybackBehavior.OnlyIfVisible => true,
+                _ => throw new InvalidOperationException($"Unknown PlaybackBehavior value: {_playbackBehavior}"),
+            };
+
             if (animators.Count == 1)
             {
-                var subscription = animators[0].Apply(this, control, clock, match, onComplete);
+                var subscription = animators[0].Apply(this, control, clock, match,
+                    onComplete, shouldPauseOnInvisible);
 
                 if (subscription is not null)
                 {
@@ -297,7 +336,8 @@ namespace Avalonia.Animation
                         completionTasks!.Add(tcs.Task);
                     }
 
-                    var subscription = animator.Apply(this, control, clock, match, animatorOnComplete);
+                    var subscription = animator.Apply(this, control, clock, match,
+                        animatorOnComplete, shouldPauseOnInvisible);
 
                     if (subscription is not null)
                     {
@@ -348,7 +388,7 @@ namespace Avalonia.Animation
                 run.TrySetResult(null);
                 subscriptions?.Dispose();
                 cancellation?.Dispose();
-            });
+            }, isManuallyStarted: true);
 
             cancellation = cancellationToken.Register(() =>
             {
diff --git a/src/Avalonia.Base/Animation/AnimationInstance`1.cs b/src/Avalonia.Base/Animation/AnimationInstance`1.cs
index 6358dd2c6b..757e5f8987 100644
--- a/src/Avalonia.Base/Animation/AnimationInstance`1.cs
+++ b/src/Avalonia.Base/Animation/AnimationInstance`1.cs
@@ -38,7 +38,9 @@ namespace Avalonia.Animation
         private EventHandler? _visibilityChangedHandler;
         private EventHandler<VisualTreeAttachmentEventArgs>? _detachedHandler;
 
-        public AnimationInstance(Animation animation, Animatable control, Animator<T> animator, IClock baseClock, Action? OnComplete, Func<double, T, T> Interpolator)
+        private readonly bool _shouldPauseOnInvisible;
+
+        public AnimationInstance(Animation animation, Animatable control, Animator<T> animator, IClock baseClock, Action? OnComplete, Func<double, T, T> Interpolator, bool shouldPauseOnInvisible)
         {
             _animator = animator;
             _animation = animation;
@@ -49,6 +51,7 @@ namespace Avalonia.Animation
             _lastInterpValue = default!;
             _firstKFValue = default!;
             _neutralValue = default!;
+            _shouldPauseOnInvisible = shouldPauseOnInvisible;
             FetchProperties();
         }
 
@@ -120,29 +123,36 @@ namespace Avalonia.Animation
 
             if (_targetControl is Visual visual)
             {
-                _visibilityChangedHandler = (_, _) =>
+                if (_shouldPauseOnInvisible)
                 {
-                    if (_clock is null || _clock.PlayState == PlayState.Stop)
-                        return;
-                    if (visual.IsEffectivelyVisible)
-                    {
-                        if (_clock.PlayState == PlayState.Pause)
-                            _clock.PlayState = PlayState.Run;
-                    }
-                    else
+                    _visibilityChangedHandler = (_, _) =>
                     {
-                        if (_clock.PlayState == PlayState.Run)
-                            _clock.PlayState = PlayState.Pause;
-                    }
-                };
-                visual.IsEffectivelyVisibleChanged += _visibilityChangedHandler;
-
-                // If already invisible when animation starts, pause immediately.
-                if (!visual.IsEffectivelyVisible)
-                    _clock.PlayState = PlayState.Pause;
+                        if (_clock is null || _clock.PlayState == PlayState.Stop)
+                            return;
+                        if (visual.IsEffectivelyVisible)
+                        {
+                            if (_clock.PlayState == PlayState.Pause)
+                                _clock.PlayState = PlayState.Run;
+                        }
+                        else
+                        {
+                            if (_clock.PlayState == PlayState.Run)
+                                _clock.PlayState = PlayState.Pause;
+                        }
+                    };
+                    visual.IsEffectivelyVisibleChanged += _visibilityChangedHandler;
+
+                    // If already invisible when animation starts, pause immediately.
+                    if (!visual.IsEffectivelyVisible)
+                        _clock.PlayState = PlayState.Pause;
+                }
 
                 // Stop and dispose the animation when detached from the visual tree.
-                _detachedHandler = (_, _) => DoComplete();
+                _detachedHandler = (_, _) =>
+                {
+                    SetFinalValue();
+                    DoComplete();
+                };
                 visual.DetachedFromVisualTree += _detachedHandler;
             }
 
@@ -166,6 +176,12 @@ namespace Avalonia.Animation
             }
         }
 
+        private void SetFinalValue()
+        {
+            var easedTime = _easeFunc!.Ease(_playbackReversed ? 0.0 : 1.0);
+            _lastInterpValue = _interpolator(easedTime, _neutralValue);
+        }
+
         private void ApplyFinalFill()
         {
             if (_animator.Property is null)
@@ -231,8 +247,7 @@ namespace Avalonia.Animation
             // when the duration is set to zero while animating and snap to the last iterated value.
             if (_currentIteration + 1 > _iterationCount || _duration == TimeSpan.Zero)
             {
-                var easedTime = _easeFunc!.Ease(_playbackReversed ? 0.0 : 1.0);
-                _lastInterpValue = _interpolator(easedTime, _neutralValue);
+                SetFinalValue();
                 DoComplete();
                 return;
             }
diff --git a/src/Avalonia.Base/Animation/Animators/Animator`1.cs b/src/Avalonia.Base/Animation/Animators/Animator`1.cs
index 954b62f9bc..20311c8389 100644
--- a/src/Avalonia.Base/Animation/Animators/Animator`1.cs
+++ b/src/Avalonia.Base/Animation/Animators/Animator`1.cs
@@ -17,9 +17,9 @@ namespace Avalonia.Animation.Animators
         public AvaloniaProperty? Property { get; set; }
 
         /// <inheritdoc/>
-        public virtual IDisposable? Apply(Animation animation, Animatable control, IClock? clock, IObservable<bool> match, Action? onComplete)
+        public virtual IDisposable? Apply(Animation animation, Animatable control, IClock? clock, IObservable<bool> match, Action? onComplete, bool shouldPauseOnInvisible)
         {
-            var subject = new DisposeAnimationInstanceSubject<T>(this, animation, control, clock, onComplete);
+            var subject = new DisposeAnimationInstanceSubject<T>(this, animation, control, clock, onComplete, shouldPauseOnInvisible);
             return new CompositeDisposable(match.Subscribe(subject), subject);
         }
 
@@ -103,7 +103,7 @@ namespace Avalonia.Animation.Animators
         /// <summary>
         /// Runs the KeyFrames Animation.
         /// </summary>
-        internal IDisposable Run(Animation animation, Animatable control, IClock? clock, Action? onComplete)
+        internal IDisposable Run(Animation animation, Animatable control, IClock? clock, Action? onComplete, bool shouldPauseOnInvisible)
         {
             var instance = new AnimationInstance<T>(
                 animation,
@@ -111,7 +111,8 @@ namespace Avalonia.Animation.Animators
                 this,
                 clock ?? control.Clock ?? Clock.GlobalClock,
                 onComplete,
-                InterpolationHandler);
+                InterpolationHandler,
+                shouldPauseOnInvisible);
 
             return BindAnimation(control, instance);
         }
diff --git a/src/Avalonia.Base/Animation/Animators/BaseBrushAnimator.cs b/src/Avalonia.Base/Animation/Animators/BaseBrushAnimator.cs
index c81be67060..e18b98ad26 100644
--- a/src/Avalonia.Base/Animation/Animators/BaseBrushAnimator.cs
+++ b/src/Avalonia.Base/Animation/Animators/BaseBrushAnimator.cs
@@ -38,20 +38,20 @@ namespace Avalonia.Animation.Animators
 
         /// <inheritdoc/>
         public override IDisposable? Apply(Animation animation, Animatable control, IClock? clock,
-            IObservable<bool> match, Action? onComplete)
+            IObservable<bool> match, Action? onComplete, bool shouldPauseOnInvisible)
         {
             if (TryCreateCustomRegisteredAnimator(out var animator)
                 || TryCreateGradientAnimator(out animator)
                 || TryCreateSolidColorBrushAnimator(out animator))
             {
-                return animator.Apply(animation, control, clock, match, onComplete);
+                return animator.Apply(animation, control, clock, match, onComplete, shouldPauseOnInvisible);
             }
 
             Logger.TryGet(LogEventLevel.Error, LogArea.Animations)?.Log(
                 this,
                 "The animation's keyframe value types set is not supported.");
 
-            return base.Apply(animation, control, clock, match, onComplete);
+            return base.Apply(animation, control, clock, match, onComplete, shouldPauseOnInvisible);
         }
 
         /// <summary>
diff --git a/src/Avalonia.Base/Animation/Animators/TransformAnimator.cs b/src/Avalonia.Base/Animation/Animators/TransformAnimator.cs
index b1fc720e6a..aef5c78f95 100644
--- a/src/Avalonia.Base/Animation/Animators/TransformAnimator.cs
+++ b/src/Avalonia.Base/Animation/Animators/TransformAnimator.cs
@@ -14,7 +14,8 @@ namespace Avalonia.Animation.Animators
         DoubleAnimator? _doubleAnimator;
 
         /// <inheritdoc/>
-        public override IDisposable? Apply(Animation animation, Animatable control, IClock? clock, IObservable<bool> obsMatch, Action? onComplete)
+        public override IDisposable? Apply(Animation animation, Animatable control, IClock? clock,
+            IObservable<bool> obsMatch, Action? onComplete, bool shouldPauseOnInvisible)
         {
             var ctrl = (Visual)control;
 
@@ -65,7 +66,8 @@ namespace Avalonia.Animation.Animators
                 // 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);
+                    return _doubleAnimator.Apply(animation, (Transform) ctrl.RenderTransform, clock ?? control.Clock,
+                        obsMatch, onComplete, shouldPauseOnInvisible);
                 }
                 // It's a TransformGroup and try finding the target there.
                 else if (renderTransformType == typeof(TransformGroup))
@@ -74,7 +76,8 @@ namespace Avalonia.Animation.Animators
                     {
                         if (transform.GetType() == Property.OwnerType)
                         {
-                            return _doubleAnimator.Apply(animation, transform, clock ?? control.Clock, obsMatch, onComplete);
+                            return _doubleAnimator.Apply(animation, transform, clock ?? control.Clock,
+                                obsMatch, onComplete, shouldPauseOnInvisible);
                         }
                     }
                 }
diff --git a/src/Avalonia.Base/Animation/DisposeAnimationInstanceSubject.cs b/src/Avalonia.Base/Animation/DisposeAnimationInstanceSubject.cs
index af25766289..7d355cc77c 100644
--- a/src/Avalonia.Base/Animation/DisposeAnimationInstanceSubject.cs
+++ b/src/Avalonia.Base/Animation/DisposeAnimationInstanceSubject.cs
@@ -6,24 +6,18 @@ namespace Avalonia.Animation
     /// <summary>
     /// Manages the lifetime of animation instances as determined by its selector state.
     /// </summary>
-    internal class DisposeAnimationInstanceSubject<T> : IObserver<bool>, IDisposable
+    internal class DisposeAnimationInstanceSubject<T>(
+        Animator<T> animator,
+        Animation animation,
+        Animatable control,
+        IClock? clock,
+        Action? onComplete,
+        bool shouldPauseOnInvisible)
+        : IObserver<bool>, IDisposable
     {
         private IDisposable? _lastInstance;
         private bool _lastMatch;
-        private readonly Animator<T> _animator;
-        private readonly Animation _animation;
-        private readonly Animatable _control;
-        private readonly Action? _onComplete;
-        private readonly IClock? _clock;
 
-        public DisposeAnimationInstanceSubject(Animator<T> animator, Animation animation, Animatable control, IClock? clock, Action? onComplete)
-        {
-            this._animator = animator;
-            this._animation = animation;
-            this._control = control;
-            this._onComplete = onComplete;
-            this._clock = clock;
-        }
         public void Dispose()
         {
             _lastInstance?.Dispose();
@@ -47,7 +41,7 @@ namespace Avalonia.Animation
 
                 if (matchVal)
                 {
-                    _lastInstance = _animator.Run(_animation, _control, _clock, _onComplete);
+                    _lastInstance = animator.Run(animation, control, clock, onComplete, shouldPauseOnInvisible);
                 }
                 else
                 {
diff --git a/src/Avalonia.Base/Animation/IAnimation.cs b/src/Avalonia.Base/Animation/IAnimation.cs
index a5b8b75b12..53146a3edd 100644
--- a/src/Avalonia.Base/Animation/IAnimation.cs
+++ b/src/Avalonia.Base/Animation/IAnimation.cs
@@ -14,7 +14,8 @@ namespace Avalonia.Animation
         /// <summary>
         /// Apply the animation to the specified control and run it when <paramref name="match" /> produces <c>true</c>.
         /// </summary>
-        internal IDisposable Apply(Animatable control, IClock? clock, IObservable<bool> match, Action? onComplete = null);
+        internal IDisposable Apply(Animatable control, IClock? clock, IObservable<bool> match,
+            Action? onComplete = null, bool isManuallyStarted = false);
 
         /// <summary>
         /// Run the animation on the specified control.
diff --git a/src/Avalonia.Base/Animation/IAnimator.cs b/src/Avalonia.Base/Animation/IAnimator.cs
index 9fed7be9be..f065ad3730 100644
--- a/src/Avalonia.Base/Animation/IAnimator.cs
+++ b/src/Avalonia.Base/Animation/IAnimator.cs
@@ -12,11 +12,12 @@ namespace Avalonia.Animation
         /// <summary>
         /// The target property.
         /// </summary>
-        AvaloniaProperty? Property {get; set;}
+        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);
+        IDisposable? Apply(Animation animation, Animatable control, IClock? clock,
+            IObservable<bool> match, Action? onComplete, bool shouldPauseOnInvisible);
     }
 }
diff --git a/src/Avalonia.Base/Animation/PlaybackBehavior.cs b/src/Avalonia.Base/Animation/PlaybackBehavior.cs
new file mode 100644
index 0000000000..4dcfd5c784
--- /dev/null
+++ b/src/Avalonia.Base/Animation/PlaybackBehavior.cs
@@ -0,0 +1,29 @@
+namespace Avalonia.Animation
+{
+    /// <summary>
+    /// Determines whether an animation pauses when its target control is not effectively visible
+    /// (see <see cref="Visual.IsEffectivelyVisible"/>).
+    /// </summary>
+    public enum PlaybackBehavior
+    {
+        /// <summary>
+        /// The system decides based on context. Manually started animations
+        /// (via <see cref="Animation.RunAsync(Animatable, System.Threading.CancellationToken)"/>)
+        /// and animations that target <see cref="Visual.IsVisibleProperty"/> always play.
+        /// Style-applied animations pause when the control is not effectively visible
+        /// (see <see cref="Visual.IsEffectivelyVisible"/>).
+        /// </summary>
+        Auto,
+
+        /// <summary>
+        /// The animation always plays regardless of the control's effective visibility state.
+        /// </summary>
+        Always,
+
+        /// <summary>
+        /// The animation pauses when the control is not effectively visible
+        /// (see <see cref="Visual.IsEffectivelyVisible"/>).
+        /// </summary>
+        OnlyIfVisible,
+    }
+}
diff --git a/src/Avalonia.Base/Data/Core/Parsers/BindingExpressionVisitor.cs b/src/Avalonia.Base/Data/Core/Parsers/BindingExpressionVisitor.cs
index 8525dd8493..841bcb19a7 100644
--- a/src/Avalonia.Base/Data/Core/Parsers/BindingExpressionVisitor.cs
+++ b/src/Avalonia.Base/Data/Core/Parsers/BindingExpressionVisitor.cs
@@ -303,29 +303,14 @@ internal class BindingExpressionVisitor<TIn>(LambdaExpression expression) : Expr
         }
     }
 
-    private static Func<object, object>? CreateGetter(PropertyInfo info)
+    private static Func<object, object?>? CreateGetter(PropertyInfo info)
     {
-        if (info.GetMethod == null)
-            return null;
-        var target = Expression.Parameter(typeof(object), "target");
-        return Expression.Lambda<Func<object, object>>(
-                Expression.Convert(Expression.Call(Expression.Convert(target, info.DeclaringType!), info.GetMethod),
-                    typeof(object)),
-                target)
-            .Compile();
+        return info.CanRead ? info.GetValue : null;
     }
 
     private static Action<object, object?>? CreateSetter(PropertyInfo info)
     {
-        if (info.SetMethod == null)
-            return null;
-        var target = Expression.Parameter(typeof(object), "target");
-        var value = Expression.Parameter(typeof(object), "value");
-        return Expression.Lambda<Action<object, object?>>(
-                Expression.Call(Expression.Convert(target, info.DeclaringType!), info.SetMethod,
-                    Expression.Convert(value, info.SetMethod.GetParameters()[0].ParameterType)),
-                target, value)
-            .Compile();
+        return info.CanWrite ? info.SetValue : null;
     }
 
     private static T GetValue<T>(Expression expr)
diff --git a/src/Avalonia.Base/Input/DragDrop.cs b/src/Avalonia.Base/Input/DragDrop.cs
index 33f538c443..fa94e37b8c 100644
--- a/src/Avalonia.Base/Input/DragDrop.cs
+++ b/src/Avalonia.Base/Input/DragDrop.cs
@@ -127,7 +127,7 @@ namespace Avalonia.Input
         /// <seealso cref="DataTransfer"/>
         /// </summary>
         public static Task<DragDropEffects> DoDragDropAsync(
-            PointerEventArgs triggerEvent,
+            PointerPressedEventArgs triggerEvent,
             IDataTransfer dataTransfer,
             DragDropEffects allowedEffects)
         {
diff --git a/src/Avalonia.Base/Input/FocusManager.cs b/src/Avalonia.Base/Input/FocusManager.cs
index a273ff6d89..72a13d385d 100644
--- a/src/Avalonia.Base/Input/FocusManager.cs
+++ b/src/Avalonia.Base/Input/FocusManager.cs
@@ -75,30 +75,44 @@ namespace Avalonia.Input
 
             if (element is not null)
             {
-                if (!CanFocus(element))
-                    return false;
+                return FocusCore(keyboardDevice, element, method, keyModifiers);
+            }
+
+            if (_focusRoot?.GetValue(FocusedElementProperty) is { } restore && restore != Current)
+            {
+                return FocusCore(keyboardDevice, restore, method, keyModifiers);
+            }
+
+            _focusRoot = null;
+            keyboardDevice.SetFocusedElement(null, NavigationMethod.Unspecified, KeyModifiers.None, false);
+            return false;
+        }
+
+        private bool FocusCore(
+            KeyboardDevice keyboardDevice,
+            IInputElement element,
+            NavigationMethod method,
+            KeyModifiers keyModifiers)
+        {
+            if (!CanFocus(element))
+                return false;
+
+            keyboardDevice.SetFocusedElement(element, method, keyModifiers);
 
-                if (GetFocusScope(element) is StyledElement scope)
+            if (keyboardDevice.FocusedElement is { } effectivelyFocusedElement)
+            {
+                if (GetFocusScope(effectivelyFocusedElement) is { } scope)
                 {
-                    scope.SetValue(FocusedElementProperty, element);
+                    scope.SetValue(FocusedElementProperty, effectivelyFocusedElement);
                     _focusRoot = GetFocusRoot(scope);
                 }
 
-                keyboardDevice.SetFocusedElement(element, method, keyModifiers);
-                return true;
-            }
-            else if (_focusRoot?.GetValue(FocusedElementProperty) is { } restore &&
-                restore != Current &&
-                Focus(restore))
-            {
-                return true;
-            }
-            else
-            {
-                _focusRoot = null;
-                keyboardDevice.SetFocusedElement(null, NavigationMethod.Unspecified, KeyModifiers.None, false);
-                return false;
+                return effectivelyFocusedElement == element;
             }
+
+            _focusRoot = null;
+            keyboardDevice.SetFocusedElement(null, NavigationMethod.Unspecified, KeyModifiers.None, false);
+            return false;
         }
 
         internal void ClearFocusOnElementRemoved(IInputElement removedElement, Visual oldParent)
@@ -111,7 +125,7 @@ namespace Avalonia.Input
                 scope.ClearValue(FocusedElementProperty);
             }
 
-            if (Current == removedElement) 
+            if (Current == removedElement)
                 Focus(null);
         }
 
@@ -158,7 +172,7 @@ namespace Avalonia.Input
         /// </summary>
         internal static FocusManager? GetFocusManager(IInputElement? element)
         {
-            
+
             // Element might not be a visual, and not attached to the root.
             // But IFocusManager is always expected to be a FocusManager. 
             return (FocusManager?)(element as Visual)?.GetInputRoot()?.FocusManager
@@ -188,8 +202,12 @@ namespace Avalonia.Input
         {
             if (CanFocus(e))
             {
-                if (ev.Pointer.Type == PointerType.Mouse || ev is PointerReleasedEventArgs)
-                    return true;
+                return ev switch
+                {
+                    PointerReleasedEventArgs releasedEventArgs when releasedEventArgs.Pointer.Type != PointerType.Mouse => true,
+                    PointerPressedEventArgs pressedEventArgs when pressedEventArgs.Pointer.Type == PointerType.Mouse => true,
+                    _ => false,
+                };
             }
 
             return false;
@@ -229,7 +247,7 @@ namespace Avalonia.Input
             var root = v.PresentationSource?.InputRoot.FocusRoot as Visual;
 
             while (root is IHostedVisualTreeRoot hosted &&
-                hosted.Host?.PresentationSource?.InputRoot.FocusRoot is {} parentRoot)
+                hosted.Host?.PresentationSource?.InputRoot.FocusRoot is { } parentRoot)
             {
                 root = parentRoot;
             }
diff --git a/src/Avalonia.Base/Input/GestureRecognizers/ScrollGestureRecognizer.cs b/src/Avalonia.Base/Input/GestureRecognizers/ScrollGestureRecognizer.cs
index a00a7be6c2..5ac1be7152 100644
--- a/src/Avalonia.Base/Input/GestureRecognizers/ScrollGestureRecognizer.cs
+++ b/src/Avalonia.Base/Input/GestureRecognizers/ScrollGestureRecognizer.cs
@@ -33,6 +33,7 @@ namespace Avalonia.Input.GestureRecognizers
         private TimeSpan _lastTime;
         private TimeSpan _inertiaStartTime;
         private int _currentInertiaGestureId;
+        private Point _delta;
 
         /// <summary>
         /// Defines the <see cref="CanHorizontallyScroll"/> property.
@@ -133,8 +134,6 @@ namespace Avalonia.Input.GestureRecognizers
                         _trackedRootPoint = new Point(
                             _trackedRootPoint.X - (_trackedRootPoint.X >= rootPoint.X ? ScrollStartDistance : -ScrollStartDistance),
                             _trackedRootPoint.Y - (_trackedRootPoint.Y >= rootPoint.Y ? ScrollStartDistance : -ScrollStartDistance));
-
-                        Capture(e.Pointer);
                     }
                 }
 
@@ -142,12 +141,23 @@ namespace Avalonia.Input.GestureRecognizers
                 {
                     var vector = _trackedRootPoint - rootPoint;
 
-                    _velocityTracker?.AddPosition(TimeSpan.FromMilliseconds(e.Timestamp), _pointerPressedPoint - rootPoint);
+                    var oldDelta = _delta;
+                    _delta = _pointerPressedPoint - rootPoint;
+
+                    if (oldDelta == _delta)
+                        return;
+
+                    _velocityTracker?.AddPosition(TimeSpan.FromMilliseconds(e.Timestamp), _delta);
 
                     _lastMoveTimestamp = e.Timestamp;
-                    Target!.RaiseEvent(new ScrollGestureEventArgs(_gestureId, vector));
+                    var scrollEventArgs = new ScrollGestureEventArgs(_gestureId, vector);
+                    Target!.RaiseEvent(scrollEventArgs);
                     _trackedRootPoint = rootPoint;
-                    e.Handled = true;
+                    e.Handled = scrollEventArgs.Handled;
+                    if(e.Handled)
+                    {
+                        Capture(e.Pointer);
+                    }
                 }
             }
         }
@@ -166,7 +176,9 @@ namespace Avalonia.Input.GestureRecognizers
                 _stopWatch?.Stop();
                 _stopWatch = null;
                 _inertia = default;
+                _delta = default;
                 _scrolling = false;
+                _velocityTracker = null;
                 Target!.RaiseEvent(new ScrollGestureEndedEventArgs(_gestureId));
                 _gestureId = 0;
                 _lastMoveTimestamp = null;
diff --git a/src/Avalonia.Base/Input/GestureRecognizers/VelocityTracker.cs b/src/Avalonia.Base/Input/GestureRecognizers/VelocityTracker.cs
index 4e46e19d02..e7871fde6b 100644
--- a/src/Avalonia.Base/Input/GestureRecognizers/VelocityTracker.cs
+++ b/src/Avalonia.Base/Input/GestureRecognizers/VelocityTracker.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Diagnostics;
-using Avalonia.Utilities;
 
 namespace Avalonia.Input.GestureRecognizers
 {
@@ -71,6 +70,8 @@ namespace Avalonia.Input.GestureRecognizers
         private readonly PointAtTime[] _samples = new PointAtTime[HistorySize];
         private int _index = 0;
 
+        private Stopwatch _sinceLastSample = new Stopwatch();
+
         /// <summary>
         /// Adds a position as the given time to the tracker.
         /// </summary>
@@ -78,6 +79,7 @@ namespace Avalonia.Input.GestureRecognizers
         /// <param name="position"></param>
         public void AddPosition(TimeSpan time, Vector position)
         {
+            _sinceLastSample.Restart();
             _index++;
             if (_index == HistorySize)
             {
@@ -94,6 +96,11 @@ namespace Avalonia.Input.GestureRecognizers
         /// Returns null if there is no data on which to base an estimate.
         protected virtual VelocityEstimate? GetVelocityEstimate()
         {
+            if (_sinceLastSample.ElapsedMilliseconds > AssumePointerMoveStoppedMilliseconds)
+            {
+                return new VelocityEstimate(default, 1.0, default, default);
+            }
+
             Span<double> x = stackalloc double[HistorySize];
             Span<double> y = stackalloc double[HistorySize];
             Span<double> w = stackalloc double[HistorySize];
@@ -159,17 +166,6 @@ namespace Avalonia.Input.GestureRecognizers
                     }
                 }
             }
-            else if(sampleCount > 1)
-            {
-                // Return linear velocity if we don't have enough samples
-                var distance = newestSample.Point - oldestSample.Point;
-                return new VelocityEstimate(
-                  PixelsPerSecond: new Vector(distance.X / duration.Milliseconds * 1000, distance.Y / duration.Milliseconds * 1000),
-                  Confidence: 1,
-                  Duration: duration,
-                  Offset: offset
-                );
-            }
 
             // We're unable to make a velocity estimate but we did have at least one
             // valid pointer position.
@@ -302,7 +298,7 @@ namespace Avalonia.Input.GestureRecognizers
             // Solve R B = Qt W Y to find B. This is easy because R is upper triangular.
             // We just work from bottom-right to top-left calculating B's coefficients.
             // "m" isn't expected to be bigger than HistorySize=20, so allocation on stack is safe.
-            Span<double> wy = stackalloc double[m];  
+            Span<double> wy = stackalloc double[m];
             for (int h = 0; h < m; h += 1)
             {
                 wy[h] = y[h] * w[h];
@@ -360,7 +356,7 @@ namespace Avalonia.Input.GestureRecognizers
             }
             return result;
         }
-        
+
         private static double Norm(Span<double> v)
         {
             return Math.Sqrt(Multiply(v, v));
diff --git a/src/Avalonia.Base/Input/IFocusManager.cs b/src/Avalonia.Base/Input/IFocusManager.cs
index d9e8d36f8b..2cf51c7965 100644
--- a/src/Avalonia.Base/Input/IFocusManager.cs
+++ b/src/Avalonia.Base/Input/IFocusManager.cs
@@ -24,8 +24,8 @@ namespace Avalonia.Input
         /// If <paramref name="element"/> is null, this method tries to clear the focus. However, it is not advised.
         /// For a better user experience, focus should be moved to another element when possible.
         ///
-        /// When this method return <c>true</c>, it is not guaranteed that the focus has been moved
-        /// to <paramref name="element"/>. The focus might have been redirected to another element.
+        /// When this method returns <c>true</c>, the focus has been moved to <paramref name="element"/>.
+        /// When this method returns <c>false</c>, the focus may have been canceled or redirected to another element.
         /// </remarks>
         bool Focus(
             IInputElement? element,
diff --git a/src/Avalonia.Base/Input/Platform/IPlatformDragSource.cs b/src/Avalonia.Base/Input/Platform/IPlatformDragSource.cs
index 4ad36576ca..d5835d96b5 100644
--- a/src/Avalonia.Base/Input/Platform/IPlatformDragSource.cs
+++ b/src/Avalonia.Base/Input/Platform/IPlatformDragSource.cs
@@ -3,11 +3,11 @@ using Avalonia.Metadata;
 
 namespace Avalonia.Input.Platform
 {
-    [NotClientImplementable]
+    [PrivateApi]
     public interface IPlatformDragSource
     {
         Task<DragDropEffects> DoDragDropAsync(
-            PointerEventArgs triggerEvent,
+            PointerPressedEventArgs triggerEvent,
             IDataTransfer dataTransfer,
             DragDropEffects allowedEffects);
     }
diff --git a/src/Avalonia.Base/Layout/LayoutHelper.cs b/src/Avalonia.Base/Layout/LayoutHelper.cs
index fd81ffaa49..286a79ee8a 100644
--- a/src/Avalonia.Base/Layout/LayoutHelper.cs
+++ b/src/Avalonia.Base/Layout/LayoutHelper.cs
@@ -265,5 +265,20 @@ namespace Avalonia.Layout
             // should be.
             return Math.Round(value, 8, MidpointRounding.ToZero);
         }
+
+        internal static double ValidateScaling(double scaling)
+        {
+            if (MathUtilities.IsNegativeOrNonFinite(scaling) || MathUtilities.IsZero(scaling))
+                throw new InvalidOperationException($"Invalid render scaling value {scaling}");
+
+            if (MathUtilities.IsOne(scaling))
+            {
+                // Ensure we've got exactly 1.0 and not an approximation,
+                // so we don't have to use MathUtilities.IsOne in various layout hot paths.
+                return 1.0;
+            }
+
+            return scaling;
+        }
     }
 }
diff --git a/src/Avalonia.Base/Media/Effects/EffectAnimator.cs b/src/Avalonia.Base/Media/Effects/EffectAnimator.cs
index e2c4cc096c..a81e58f2d0 100644
--- a/src/Avalonia.Base/Media/Effects/EffectAnimator.cs
+++ b/src/Avalonia.Base/Media/Effects/EffectAnimator.cs
@@ -10,17 +10,17 @@ namespace Avalonia.Animation.Animators;
 internal class EffectAnimator : Animator<IEffect?>
 {
     public override IDisposable? Apply(Animation animation, Animatable control, IClock? clock,
-        IObservable<bool> match, Action? onComplete)
+        IObservable<bool> match, Action? onComplete, bool shouldPauseOnInvisible)
     {
         if (TryCreateAnimator<BlurEffectAnimator, IBlurEffect>(out var animator)
             || TryCreateAnimator<DropShadowEffectAnimator, IDropShadowEffect>(out animator))
-            return animator.Apply(animation, control, clock, match, onComplete);
+            return animator.Apply(animation, control, clock, match, onComplete, shouldPauseOnInvisible);
 
         Logger.TryGet(LogEventLevel.Error, LogArea.Animations)?.Log(
             this,
             "The animation's keyframe value types set is not supported.");
 
-        return base.Apply(animation, control, clock, match, onComplete);
+        return base.Apply(animation, control, clock, match, onComplete, shouldPauseOnInvisible);
     }
 
     private bool TryCreateAnimator<TAnimator, TInterface>([NotNullWhen(true)] out IAnimator? animator)
diff --git a/src/Avalonia.Base/Platform/DefaultPlatformSettings.cs b/src/Avalonia.Base/Platform/DefaultPlatformSettings.cs
index 5f17627ace..cce11db12d 100644
--- a/src/Avalonia.Base/Platform/DefaultPlatformSettings.cs
+++ b/src/Avalonia.Base/Platform/DefaultPlatformSettings.cs
@@ -14,11 +14,13 @@ namespace Avalonia.Platform
     [PrivateApi]
     public class DefaultPlatformSettings : IPlatformSettings
     {
+        private const int TouchTapSize = 10;
+        private const int TouchDoubleTapSize = 50; // Default TouchModeN_DtapDist value on win32
         public virtual Size GetTapSize(PointerType type)
         {
             return type switch
             {
-                PointerType.Touch or PointerType.Pen => new(10, 10),
+                PointerType.Touch or PointerType.Pen => new(TouchTapSize, TouchTapSize),
                 _ => new(4, 4),
             };
         }
@@ -27,7 +29,7 @@ namespace Avalonia.Platform
         {
             return type switch
             {
-                PointerType.Touch or PointerType.Pen => new(16, 16),
+                PointerType.Touch or PointerType.Pen => new(TouchDoubleTapSize, TouchDoubleTapSize),
                 _ => new(4, 4),
             };
         }
diff --git a/src/Avalonia.Base/Platform/IRenderTarget.cs b/src/Avalonia.Base/Platform/IRenderTarget.cs
index e66d14995e..2e7d56405a 100644
--- a/src/Avalonia.Base/Platform/IRenderTarget.cs
+++ b/src/Avalonia.Base/Platform/IRenderTarget.cs
@@ -12,11 +12,6 @@ namespace Avalonia.Platform
     [PrivateApi]
     public interface IRenderTarget : IDisposable
     {
-        /// <summary>
-        /// Indicates if the render target is no longer usable and needs to be recreated
-        /// </summary>
-        bool IsCorrupted { get; }
-
         /// <summary>
         /// Gets the properties of the render target.
         /// </summary>
@@ -33,9 +28,9 @@ namespace Avalonia.Platform
         IDrawingContextImpl CreateDrawingContext(RenderTargetSceneInfo sceneInfo, out RenderTargetDrawingContextProperties properties);
 
         /// <summary>
-        /// Indicates if the render target is currently ready to be rendered to
+        /// Gets the current readiness state of the render target.
         /// </summary>
-        bool IsReady => true;
+        PlatformRenderTargetState PlatformRenderTargetState => PlatformRenderTargetState.Ready;
         
         public record struct RenderTargetSceneInfo(PixelSize Size, double Scaling);
     }
diff --git a/src/Avalonia.Base/Platform/ManagedDispatcherImpl.cs b/src/Avalonia.Base/Platform/ManagedDispatcherImpl.cs
index c8225f775b..fc1cfbf5b1 100644
--- a/src/Avalonia.Base/Platform/ManagedDispatcherImpl.cs
+++ b/src/Avalonia.Base/Platform/ManagedDispatcherImpl.cs
@@ -7,7 +7,7 @@ using Avalonia.Threading;
 namespace Avalonia.Controls.Platform;
 
 [Unstable]
-public class ManagedDispatcherImpl : IControlledDispatcherImpl
+public class ManagedDispatcherImpl : IControlledDispatcherImpl, IDispatcherImplWithExplicitBackgroundProcessing
 {
     private readonly IManagedDispatcherInputProvider? _inputProvider;
     private readonly AutoResetEvent _wakeup = new(false);
@@ -16,6 +16,7 @@ public class ManagedDispatcherImpl : IControlledDispatcherImpl
     private readonly Stopwatch _clock = Stopwatch.StartNew();
     private TimeSpan? _nextTimer; 
     private readonly Thread _loopThread = Thread.CurrentThread;
+    private bool _backgroundProcessingRequested;
 
     public interface IManagedDispatcherInputProvider
     {
@@ -56,6 +57,22 @@ public class ManagedDispatcherImpl : IControlledDispatcherImpl
     public bool CanQueryPendingInput => _inputProvider != null;
     public bool HasPendingInput => _inputProvider?.HasInput ?? false;
     
+    private Action? ReadyForBackgroundProcessing { get; set; }
+    event Action? IDispatcherImplWithExplicitBackgroundProcessing.ReadyForBackgroundProcessing
+    {
+        add => ReadyForBackgroundProcessing += value;
+        remove => ReadyForBackgroundProcessing -= value;
+    }
+
+    void IDispatcherImplWithExplicitBackgroundProcessing.RequestBackgroundProcessing()
+    {
+        lock (_lock)
+        {
+            _backgroundProcessingRequested = true;
+            _wakeup.Set();
+        }
+    }
+    
     public void RunLoop(CancellationToken token)
     {
         CancellationTokenRegistration registration = default;
@@ -98,6 +115,19 @@ public class ManagedDispatcherImpl : IControlledDispatcherImpl
                 _inputProvider.DispatchNextInputEvent();
                 continue;
             }
+            
+            bool triggerBackgroundProcessing;
+            lock (_lock)
+            {
+                triggerBackgroundProcessing = _backgroundProcessingRequested;
+                _backgroundProcessingRequested = false;
+            }
+
+            if (triggerBackgroundProcessing)
+            {
+                ReadyForBackgroundProcessing?.Invoke();
+                continue;
+            }
 
             TimeSpan? nextTimer;
             lock (_lock)
diff --git a/src/Avalonia.Base/Platform/RenderTargetProperties.cs b/src/Avalonia.Base/Platform/RenderTargetProperties.cs
index c4a0948180..de4f3f4345 100644
--- a/src/Avalonia.Base/Platform/RenderTargetProperties.cs
+++ b/src/Avalonia.Base/Platform/RenderTargetProperties.cs
@@ -3,6 +3,36 @@ using Avalonia.Metadata;
 
 namespace Avalonia.Platform;
 
+/// <summary>
+/// Describes the current readiness state of a platform render target.
+/// Flows through the entire rendering pipeline from platform to compositor.
+/// </summary>
+[PrivateApi]
+[SuppressMessage("Performance", "CA1815:Override equals and operator equals on value types", Justification = "Private API, not meant to be compared")]
+public readonly struct PlatformRenderTargetState
+{
+    /// <summary>
+    /// Indicates if the render target is currently ready to be rendered to.
+    /// </summary>
+    public bool IsReady { get; init; }
+    
+    /// <summary>
+    /// Indicates if the render target is no longer usable and needs to be recreated
+    /// </summary>
+    public bool IsCorrupted { get; init; }
+    
+    /// <summary>
+    /// A readiness state indicating the target is ready to render.
+    /// </summary>
+    public static PlatformRenderTargetState Ready => new() { IsReady = true };
+
+    public static PlatformRenderTargetState NotReadyTryLater => default;
+    
+    public static PlatformRenderTargetState Corrupted => new() { IsCorrupted = true, IsReady = true};
+
+    public static PlatformRenderTargetState Disposed => new() { IsCorrupted = true};
+}
+
 [PrivateApi]
 [SuppressMessage("Performance", "CA1815:Override equals and operator equals on value types", Justification = "Private API, not meant to be compared")]
 public struct RenderTargetProperties
diff --git a/src/Avalonia.Base/Platform/Surfaces/IPlatformRenderSurface.cs b/src/Avalonia.Base/Platform/Surfaces/IPlatformRenderSurface.cs
index ff71a700c4..0c085c20b8 100644
--- a/src/Avalonia.Base/Platform/Surfaces/IPlatformRenderSurface.cs
+++ b/src/Avalonia.Base/Platform/Surfaces/IPlatformRenderSurface.cs
@@ -11,5 +11,5 @@ public interface IPlatformRenderSurface
 [PrivateApi]
 public interface IPlatformRenderSurfaceRenderTarget
 {
-    bool IsReady => true;
+    PlatformRenderTargetState State => PlatformRenderTargetState.Ready;
 }
diff --git a/src/Avalonia.Base/Rendering/Composition/Animations/AnimationInstanceBase.cs b/src/Avalonia.Base/Rendering/Composition/Animations/AnimationInstanceBase.cs
index 8a25f23e59..226331853a 100644
--- a/src/Avalonia.Base/Rendering/Composition/Animations/AnimationInstanceBase.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Animations/AnimationInstanceBase.cs
@@ -30,7 +30,9 @@ internal abstract class AnimationInstanceBase : IAnimationInstance
             _trackedObjects = new ();
             foreach (var t in trackedObjects)
             {
-                var obj = Parameters.GetObjectParameter(t.name);
+                var obj = (t.name == ExpressionKeywords.Target) 
+                    ? TargetObject 
+                    : Parameters.GetObjectParameter(t.name);
                 if (obj is ServerObject tracked)
                 {
                     var off = tracked.GetCompositionProperty(t.member);
diff --git a/src/Avalonia.Base/Rendering/Composition/Expressions/DelegateExpressionFfi.cs b/src/Avalonia.Base/Rendering/Composition/Expressions/DelegateExpressionFfi.cs
index c70056b5aa..042e7429c6 100644
--- a/src/Avalonia.Base/Rendering/Composition/Expressions/DelegateExpressionFfi.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Expressions/DelegateExpressionFfi.cs
@@ -62,12 +62,10 @@ namespace Avalonia.Rendering.Composition.Expressions
                     var arg = arguments[c].Type;
                     if (parameter != arg)
                     {
-                        var canCast = (parameter == VariantType.Double && arg == VariantType.Scalar)
-                                      || (parameter == VariantType.Vector3D && arg == VariantType.Vector3)
+                        var canCast =  (parameter == VariantType.Vector3D && arg == VariantType.Vector3)
                                       || (parameter == VariantType.Vector && arg == VariantType.Vector2)
                                       || (anyCast && (
-                                          (arg == VariantType.Double && parameter == VariantType.Scalar)
-                                          || (arg == VariantType.Vector3D && parameter == VariantType.Vector3)
+                                          (arg == VariantType.Vector3D && parameter == VariantType.Vector3)
                                           || (arg == VariantType.Vector && parameter == VariantType.Vector2)
                                       ));
                         if (!canCast)
@@ -112,7 +110,7 @@ namespace Avalonia.Rendering.Composition.Expressions
         static readonly Dictionary<Type, VariantType> TypeMap = new Dictionary<Type, VariantType>
         {
             [typeof(bool)] = VariantType.Boolean,
-            [typeof(float)] = VariantType.Scalar,
+            [typeof(float)] = VariantType.Double,
             [typeof(double)] = VariantType.Double,
             [typeof(Vector2)] = VariantType.Vector2,
             [typeof(Vector)] = VariantType.Vector,
diff --git a/src/Avalonia.Base/Rendering/Composition/Expressions/Expression.cs b/src/Avalonia.Base/Rendering/Composition/Expressions/Expression.cs
index d9f39d0ce0..7f5253f476 100644
--- a/src/Avalonia.Base/Rendering/Composition/Expressions/Expression.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Expressions/Expression.cs
@@ -104,6 +104,17 @@ namespace Avalonia.Rendering.Composition.Expressions
         False
     }
 
+    internal static class ExpressionKeywords
+    {
+        public const string StartingValue = "this.startingvalue";
+        public const string CurrentValue = "this.currentvalue";
+        public const string FinalValue = "this.finalvalue";
+        public const string Pi = "pi";
+        public const string True = "true";
+        public const string False = "false";
+        public const string Target = "this.target";
+    }
+
     internal class ConditionalExpression : Expression
     {
         public Expression Condition { get; }
@@ -202,6 +213,10 @@ namespace Avalonia.Rendering.Composition.Expressions
             Target.CollectReferences(references);
             if (Target is ParameterExpression pe)
                 references.Add((pe.Name, Member));
+            else if (Target is KeywordExpression { Keyword : ExpressionKeyword.Target })
+            {
+                references.Add((ExpressionKeywords.Target, Member));
+            }
         }
 
         public override ExpressionVariant Evaluate(ref ExpressionEvaluationContext context)
diff --git a/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionParser.cs b/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionParser.cs
index 885499bc2c..45e4e164c1 100644
--- a/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionParser.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionParser.cs
@@ -25,19 +25,19 @@ namespace Avalonia.Rendering.Composition.Expressions
         {
             // We can parse keywords, parameter names and constants
             expr = null;
-            if (parser.TryParseKeywordLowerCase("this.startingvalue"))
+            if (parser.TryParseKeywordLowerCase(ExpressionKeywords.StartingValue))
                 expr = new KeywordExpression(ExpressionKeyword.StartingValue);
-            else if(parser.TryParseKeywordLowerCase("this.currentvalue"))
+            else if(parser.TryParseKeywordLowerCase(ExpressionKeywords.CurrentValue))
                 expr = new KeywordExpression(ExpressionKeyword.CurrentValue);
-            else if(parser.TryParseKeywordLowerCase("this.finalvalue"))
+            else if(parser.TryParseKeywordLowerCase(ExpressionKeywords.FinalValue))
                 expr = new KeywordExpression(ExpressionKeyword.FinalValue);
-            else if(parser.TryParseKeywordLowerCase("pi"))
+            else if(parser.TryParseKeywordLowerCase(ExpressionKeywords.Pi))
                 expr = new KeywordExpression(ExpressionKeyword.Pi);
-            else if(parser.TryParseKeywordLowerCase("true"))
+            else if(parser.TryParseKeywordLowerCase(ExpressionKeywords.True))
                 expr = new KeywordExpression(ExpressionKeyword.True);
-            else if(parser.TryParseKeywordLowerCase("false"))
+            else if(parser.TryParseKeywordLowerCase(ExpressionKeywords.False))
                 expr = new KeywordExpression(ExpressionKeyword.False);
-            else if (parser.TryParseKeywordLowerCase("this.target"))
+            else if (parser.TryParseKeywordLowerCase(ExpressionKeywords.Target))
                 expr = new KeywordExpression(ExpressionKeyword.Target);
 
             if (expr != null)
diff --git a/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionVariant.cs b/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionVariant.cs
index 136ef69b55..bbaab572d5 100644
--- a/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionVariant.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionVariant.cs
@@ -10,7 +10,6 @@ namespace Avalonia.Rendering.Composition.Expressions
     {
         Invalid,
         Boolean,
-        Scalar,
         Double,
         Vector2,
         Vector3,
@@ -33,7 +32,6 @@ namespace Avalonia.Rendering.Composition.Expressions
         [FieldOffset(0)] public VariantType Type;
 
         [FieldOffset(4)] public bool Boolean;
-        [FieldOffset(4)] public float Scalar;
         [FieldOffset(4)] public double Double;
         [FieldOffset(4)] public Vector2 Vector2;
         [FieldOffset(4)] public Vector3 Vector3;
@@ -45,191 +43,194 @@ namespace Avalonia.Rendering.Composition.Expressions
         [FieldOffset(4)] public Matrix4x4 Matrix4x4;
         [FieldOffset(4)] public Quaternion Quaternion;
         [FieldOffset(4)] public Color Color;
-        
+
 
         public ExpressionVariant GetProperty(string property)
         {
             if (Type == VariantType.Vector2)
             {
-                if (ReferenceEquals(property, "X"))
+                if (IsMatch(property, "X"))
                     return Vector2.X;
-                if (ReferenceEquals(property, "Y"))
+                if (IsMatch(property, "Y"))
                     return Vector2.Y;
                 return default;
             }
-            
+
             if (Type == VariantType.Vector)
             {
-                if (ReferenceEquals(property, "X"))
+                if (IsMatch(property, "X"))
                     return Vector.X;
-                if (ReferenceEquals(property, "Y"))
+                if (IsMatch(property, "Y"))
                     return Vector.Y;
                 return default;
             }
 
             if (Type == VariantType.Vector3)
             {
-                if (ReferenceEquals(property, "X"))
+                if (IsMatch(property, "X"))
                     return Vector3.X;
-                if (ReferenceEquals(property, "Y"))
+                if (IsMatch(property, "Y"))
                     return Vector3.Y;
-                if (ReferenceEquals(property, "Z"))
+                if (IsMatch(property, "Z"))
                     return Vector3.Z;
-                if(ReferenceEquals(property, "XY"))
+                if (IsMatch(property, "XY"))
                     return new Vector2(Vector3.X, Vector3.Y);
-                if(ReferenceEquals(property, "YX"))
+                if (IsMatch(property, "YX"))
                     return new Vector2(Vector3.Y, Vector3.X);
-                if(ReferenceEquals(property, "XZ"))
+                if (IsMatch(property, "XZ"))
                     return new Vector2(Vector3.X, Vector3.Z);
-                if(ReferenceEquals(property, "ZX"))
+                if (IsMatch(property, "ZX"))
                     return new Vector2(Vector3.Z, Vector3.X);
-                if(ReferenceEquals(property, "YZ"))
+                if (IsMatch(property, "YZ"))
                     return new Vector2(Vector3.Y, Vector3.Z);
-                if(ReferenceEquals(property, "ZY"))
+                if (IsMatch(property, "ZY"))
                     return new Vector2(Vector3.Z, Vector3.Y);
                 return default;
             }
-            
+
             if (Type == VariantType.Vector3D)
             {
-                if (ReferenceEquals(property, "X"))
+                if (IsMatch(property, "X"))
                     return Vector3D.X;
-                if (ReferenceEquals(property, "Y"))
+                if (IsMatch(property, "Y"))
                     return Vector3D.Y;
-                if (ReferenceEquals(property, "Z"))
+                if (IsMatch(property, "Z"))
                     return Vector3D.Z;
-                if(ReferenceEquals(property, "XY"))
+                if (IsMatch(property, "XY"))
                     return new Vector(Vector3D.X, Vector3D.Y);
-                if(ReferenceEquals(property, "YX"))
+                if (IsMatch(property, "YX"))
                     return new Vector(Vector3D.Y, Vector3D.X);
-                if(ReferenceEquals(property, "XZ"))
+                if (IsMatch(property, "XZ"))
                     return new Vector(Vector3D.X, Vector3D.Z);
-                if(ReferenceEquals(property, "ZX"))
+                if (IsMatch(property, "ZX"))
                     return new Vector(Vector3D.Z, Vector3D.X);
-                if(ReferenceEquals(property, "YZ"))
+                if (IsMatch(property, "YZ"))
                     return new Vector(Vector3D.Y, Vector3D.Z);
-                if(ReferenceEquals(property, "ZY"))
+                if (IsMatch(property, "ZY"))
                     return new Vector(Vector3D.Z, Vector3D.Y);
                 return default;
             }
 
             if (Type == VariantType.Vector4)
             {
-                if (ReferenceEquals(property, "X"))
+                if (IsMatch(property, "X"))
                     return Vector4.X;
-                if (ReferenceEquals(property, "Y"))
+                if (IsMatch(property, "Y"))
                     return Vector4.Y;
-                if (ReferenceEquals(property, "Z"))
+                if (IsMatch(property, "Z"))
                     return Vector4.Z;
-                if (ReferenceEquals(property, "W"))
+                if (IsMatch(property, "W"))
                     return Vector4.W;
                 return default;
             }
 
             if (Type == VariantType.Matrix3x2)
             {
-                if (ReferenceEquals(property, "M11"))
+                if (IsMatch(property, "M11"))
                     return Matrix3x2.M11;
-                if (ReferenceEquals(property, "M12"))
+                if (IsMatch(property, "M12"))
                     return Matrix3x2.M12;
-                if (ReferenceEquals(property, "M21"))
+                if (IsMatch(property, "M21"))
                     return Matrix3x2.M21;
-                if (ReferenceEquals(property, "M22"))
+                if (IsMatch(property, "M22"))
                     return Matrix3x2.M22;
-                if (ReferenceEquals(property, "M31"))
+                if (IsMatch(property, "M31"))
                     return Matrix3x2.M31;
-                if (ReferenceEquals(property, "M32"))
+                if (IsMatch(property, "M32"))
                     return Matrix3x2.M32;
                 return default;
             }
-            
+
             if (Type == VariantType.AvaloniaMatrix)
             {
-                if (ReferenceEquals(property, "M11"))
+                if (IsMatch(property, "M11"))
                     return AvaloniaMatrix.M11;
-                if (ReferenceEquals(property, "M12"))
+                if (IsMatch(property, "M12"))
                     return AvaloniaMatrix.M12;
-                if (ReferenceEquals(property, "M13"))
+                if (IsMatch(property, "M13"))
                     return AvaloniaMatrix.M13;
-                if (ReferenceEquals(property, "M21"))
+                if (IsMatch(property, "M21"))
                     return AvaloniaMatrix.M21;
-                if (ReferenceEquals(property, "M22"))
+                if (IsMatch(property, "M22"))
                     return AvaloniaMatrix.M22;
-                if (ReferenceEquals(property, "M23"))
+                if (IsMatch(property, "M23"))
                     return AvaloniaMatrix.M23;
-                if (ReferenceEquals(property, "M31"))
+                if (IsMatch(property, "M31"))
                     return AvaloniaMatrix.M31;
-                if (ReferenceEquals(property, "M32"))
+                if (IsMatch(property, "M32"))
                     return AvaloniaMatrix.M32;
-                if (ReferenceEquals(property, "M33"))
+                if (IsMatch(property, "M33"))
                     return AvaloniaMatrix.M33;
                 return default;
             }
 
             if (Type == VariantType.Matrix4x4)
             {
-                if (ReferenceEquals(property, "M11"))
+                if (IsMatch(property, "M11"))
                     return Matrix4x4.M11;
-                if (ReferenceEquals(property, "M12"))
+                if (IsMatch(property, "M12"))
                     return Matrix4x4.M12;
-                if (ReferenceEquals(property, "M13"))
+                if (IsMatch(property, "M13"))
                     return Matrix4x4.M13;
-                if (ReferenceEquals(property, "M14"))
+                if (IsMatch(property, "M14"))
                     return Matrix4x4.M14;
-                if (ReferenceEquals(property, "M21"))
+                if (IsMatch(property, "M21"))
                     return Matrix4x4.M21;
-                if (ReferenceEquals(property, "M22"))
+                if (IsMatch(property, "M22"))
                     return Matrix4x4.M22;
-                if (ReferenceEquals(property, "M23"))
+                if (IsMatch(property, "M23"))
                     return Matrix4x4.M23;
-                if (ReferenceEquals(property, "M24"))
+                if (IsMatch(property, "M24"))
                     return Matrix4x4.M24;
-                if (ReferenceEquals(property, "M31"))
+                if (IsMatch(property, "M31"))
                     return Matrix4x4.M31;
-                if (ReferenceEquals(property, "M32"))
+                if (IsMatch(property, "M32"))
                     return Matrix4x4.M32;
-                if (ReferenceEquals(property, "M33"))
+                if (IsMatch(property, "M33"))
                     return Matrix4x4.M33;
-                if (ReferenceEquals(property, "M34"))
+                if (IsMatch(property, "M34"))
                     return Matrix4x4.M34;
-                if (ReferenceEquals(property, "M41"))
+                if (IsMatch(property, "M41"))
                     return Matrix4x4.M41;
-                if (ReferenceEquals(property, "M42"))
+                if (IsMatch(property, "M42"))
                     return Matrix4x4.M42;
-                if (ReferenceEquals(property, "M43"))
+                if (IsMatch(property, "M43"))
                     return Matrix4x4.M43;
-                if (ReferenceEquals(property, "M44"))
+                if (IsMatch(property, "M44"))
                     return Matrix4x4.M44;
                 return default;
             }
 
             if (Type == VariantType.Quaternion)
             {
-                if (ReferenceEquals(property, "X"))
+                if (IsMatch(property, "X"))
                     return Quaternion.X;
-                if (ReferenceEquals(property, "Y"))
+                if (IsMatch(property, "Y"))
                     return Quaternion.Y;
-                if (ReferenceEquals(property, "Z"))
+                if (IsMatch(property, "Z"))
                     return Quaternion.Z;
-                if (ReferenceEquals(property, "W"))
+                if (IsMatch(property, "W"))
                     return Quaternion.W;
                 return default;
             }
-            
+
             if (Type == VariantType.Color)
             {
-                if (ReferenceEquals(property, "A"))
+                if (IsMatch(property, "A"))
                     return Color.A;
-                if (ReferenceEquals(property, "R"))
+                if (IsMatch(property, "R"))
                     return Color.R;
-                if (ReferenceEquals(property, "G"))
+                if (IsMatch(property, "G"))
                     return Color.G;
-                if (ReferenceEquals(property, "B"))
+                if (IsMatch(property, "B"))
                     return Color.B;
                 return default;
             }
 
             return default;
+
+            static bool IsMatch(string propertyName, string memberName) =>
+                string.Equals(propertyName, memberName, StringComparison.Ordinal);
         }
 
         public static implicit operator ExpressionVariant(bool value) =>
@@ -238,13 +239,6 @@ namespace Avalonia.Rendering.Composition.Expressions
                 Type = VariantType.Boolean,
                 Boolean = value
             };
-
-        public static implicit operator ExpressionVariant(float scalar) =>
-            new ExpressionVariant
-            {
-                Type = VariantType.Scalar,
-                Scalar = scalar
-            };
         
         public static implicit operator ExpressionVariant(double d) =>
             new ExpressionVariant
@@ -300,7 +294,7 @@ namespace Avalonia.Rendering.Composition.Expressions
         public static implicit operator ExpressionVariant(Matrix value) =>
             new ExpressionVariant
             {
-                Type = VariantType.Matrix3x2,
+                Type = VariantType.AvaloniaMatrix,
                 AvaloniaMatrix = value
             };
 
@@ -330,15 +324,12 @@ namespace Avalonia.Rendering.Composition.Expressions
             if (left.Type != right.Type || left.Type == VariantType.Invalid)
                 return default;
 
-            if (left.Type == VariantType.Scalar)
-                return left.Scalar + right.Scalar;
-            
             if (left.Type == VariantType.Double)
                 return left.Double + right.Double;
 
             if (left.Type == VariantType.Vector2)
                 return left.Vector2 + right.Vector2;
-            
+
             if (left.Type == VariantType.Vector)
                 return left.Vector + right.Vector;
 
@@ -350,16 +341,16 @@ namespace Avalonia.Rendering.Composition.Expressions
 
             if (left.Type == VariantType.Vector4)
                 return left.Vector4 + right.Vector4;
-            
+
             if (left.Type == VariantType.Matrix3x2)
                 return left.Matrix3x2 + right.Matrix3x2;
-            
+
             if (left.Type == VariantType.Matrix4x4)
                 return left.Matrix4x4 + right.Matrix4x4;
-            
+
             if (left.Type == VariantType.Quaternion)
                 return left.Quaternion + right.Quaternion;
-            
+
             return default;
         }
 
@@ -368,15 +359,12 @@ namespace Avalonia.Rendering.Composition.Expressions
             if (left.Type != right.Type || left.Type == VariantType.Invalid)
                 return default;
 
-            if (left.Type == VariantType.Scalar)
-                return left.Scalar - right.Scalar;
-            
             if (left.Type == VariantType.Double)
                 return left.Double - right.Double;
 
             if (left.Type == VariantType.Vector2)
                 return left.Vector2 - right.Vector2;
-            
+
             if (left.Type == VariantType.Vector)
                 return left.Vector - right.Vector;
 
@@ -388,13 +376,13 @@ namespace Avalonia.Rendering.Composition.Expressions
 
             if (left.Type == VariantType.Vector4)
                 return left.Vector4 - right.Vector4;
-            
+
             if (left.Type == VariantType.Matrix3x2)
                 return left.Matrix3x2 - right.Matrix3x2;
-            
+
             if (left.Type == VariantType.Matrix4x4)
                 return left.Matrix4x4 - right.Matrix4x4;
-            
+
             if (left.Type == VariantType.Quaternion)
                 return left.Quaternion - right.Quaternion;
 
@@ -403,34 +391,31 @@ namespace Avalonia.Rendering.Composition.Expressions
 
         public static ExpressionVariant operator -(ExpressionVariant left)
         {
-
-            if (left.Type == VariantType.Scalar)
-                return -left.Scalar;
             
             if (left.Type == VariantType.Double)
                 return -left.Double;
 
             if (left.Type == VariantType.Vector2)
                 return -left.Vector2;
-            
+
             if (left.Type == VariantType.Vector)
                 return -left.Vector;
 
             if (left.Type == VariantType.Vector3)
                 return -left.Vector3;
-            
+
             if (left.Type == VariantType.Vector3D)
                 return -left.Vector3D;
 
             if (left.Type == VariantType.Vector4)
                 return -left.Vector4;
-            
+
             if (left.Type == VariantType.Matrix3x2)
                 return -left.Matrix3x2;
-            
+
             if (left.Type == VariantType.AvaloniaMatrix)
                 return -left.AvaloniaMatrix;
-            
+
             if (left.Type == VariantType.Matrix4x4)
                 return -left.Matrix4x4;
 
@@ -445,9 +430,6 @@ namespace Avalonia.Rendering.Composition.Expressions
             if (left.Type == VariantType.Invalid || right.Type == VariantType.Invalid)
                 return default;
 
-            if (left.Type == VariantType.Scalar && right.Type == VariantType.Scalar)
-                return left.Scalar * right.Scalar;
-            
             if (left.Type == VariantType.Double && right.Type == VariantType.Double)
                 return left.Double * right.Double;
 
@@ -457,53 +439,50 @@ namespace Avalonia.Rendering.Composition.Expressions
             if (left.Type == VariantType.Vector && right.Type == VariantType.Vector)
                 return Vector.Multiply(left.Vector, right.Vector);
 
-            if (left.Type == VariantType.Vector2 && right.Type == VariantType.Scalar)
-                return left.Vector2 * right.Scalar;
-            
-            if (left.Type == VariantType.Vector && right.Type == VariantType.Scalar)
-                return left.Vector * right.Scalar;
-            
+            if (left.Type == VariantType.Vector2 && right.Type == VariantType.Double)
+                return left.Vector2 * (float)right.Double;
+
             if (left.Type == VariantType.Vector && right.Type == VariantType.Double)
                 return left.Vector * right.Double;
 
             if (left.Type == VariantType.Vector3 && right.Type == VariantType.Vector3)
                 return left.Vector3 * right.Vector3;
-            
+
             if (left.Type == VariantType.Vector3D && right.Type == VariantType.Vector3D)
                 return Vector3D.Multiply(left.Vector3D, right.Vector3D);
 
-            if (left.Type == VariantType.Vector3 && right.Type == VariantType.Scalar)
-                return left.Vector3 * right.Scalar;
-            
-            if (left.Type == VariantType.Vector3D && right.Type == VariantType.Scalar)
-                return Vector3D.Multiply(left.Vector3D, right.Scalar);
+            if (left.Type == VariantType.Vector3 && right.Type == VariantType.Double)
+                return left.Vector3 * (float)right.Double;
+
+            if (left.Type == VariantType.Vector3D && right.Type == VariantType.Double)
+                return Vector3D.Multiply(left.Vector3D, right.Double);
 
             if (left.Type == VariantType.Vector4 && right.Type == VariantType.Vector4)
                 return left.Vector4 * right.Vector4;
 
-            if (left.Type == VariantType.Vector4 && right.Type == VariantType.Scalar)
-                return left.Vector4 * right.Scalar;
-            
+            if (left.Type == VariantType.Vector4 && right.Type == VariantType.Double)
+                return left.Vector4 * (float)right.Double;
+
             if (left.Type == VariantType.Matrix3x2 && right.Type == VariantType.Matrix3x2)
                 return left.Matrix3x2 * right.Matrix3x2;
 
-            if (left.Type == VariantType.Matrix3x2 && right.Type == VariantType.Scalar)
-                return left.Matrix3x2 * right.Scalar;
-            
+            if (left.Type == VariantType.Matrix3x2 && right.Type == VariantType.Double)
+                return left.Matrix3x2 * (float)right.Double;
+
             if (left.Type == VariantType.AvaloniaMatrix && right.Type == VariantType.AvaloniaMatrix)
                 return left.AvaloniaMatrix * right.AvaloniaMatrix;
-            
+
             if (left.Type == VariantType.Matrix4x4 && right.Type == VariantType.Matrix4x4)
                 return left.Matrix4x4 * right.Matrix4x4;
 
-            if (left.Type == VariantType.Matrix4x4 && right.Type == VariantType.Scalar)
-                return left.Matrix4x4 * right.Scalar;
-            
+            if (left.Type == VariantType.Matrix4x4 && right.Type == VariantType.Double)
+                return left.Matrix4x4 * (float)right.Double;
+
             if (left.Type == VariantType.Quaternion && right.Type == VariantType.Quaternion)
                 return left.Quaternion * right.Quaternion;
 
-            if (left.Type == VariantType.Quaternion && right.Type == VariantType.Scalar)
-                return left.Quaternion * right.Scalar;
+            if (left.Type == VariantType.Quaternion && right.Type == VariantType.Double)
+                return left.Quaternion * (float)right.Double;
 
             return default;
         }
@@ -513,9 +492,6 @@ namespace Avalonia.Rendering.Composition.Expressions
             if (left.Type == VariantType.Invalid || right.Type == VariantType.Invalid)
                 return default;
 
-            if (left.Type == VariantType.Scalar && right.Type == VariantType.Scalar)
-                return left.Scalar / right.Scalar;
-            
             if (left.Type == VariantType.Double && right.Type == VariantType.Double)
                 return left.Double / right.Double;
 
@@ -525,14 +501,11 @@ namespace Avalonia.Rendering.Composition.Expressions
             if (left.Type == VariantType.Vector && right.Type == VariantType.Vector)
                 return Vector.Divide(left.Vector, right.Vector);
 
-            if (left.Type == VariantType.Vector2 && right.Type == VariantType.Scalar)
-                return left.Vector2 / right.Scalar;
-            
-            if (left.Type == VariantType.Vector && right.Type == VariantType.Scalar)
-                return left.Vector / right.Scalar;
-            
+            if (left.Type == VariantType.Vector2 && right.Type == VariantType.Double)
+                return left.Vector2 / (float)right.Double;
+
             if (left.Type == VariantType.Vector && right.Type == VariantType.Double)
-                return left.Vector / right.Scalar;
+                return left.Vector / right.Double;
 
             if (left.Type == VariantType.Vector3 && right.Type == VariantType.Vector3)
                 return left.Vector3 / right.Vector3;
@@ -540,21 +513,18 @@ namespace Avalonia.Rendering.Composition.Expressions
             if (left.Type == VariantType.Vector3D && right.Type == VariantType.Vector3D)
                 return Vector3D.Divide(left.Vector3D, right.Vector3D);
 
-            if (left.Type == VariantType.Vector3 && right.Type == VariantType.Scalar)
-                return left.Vector3 / right.Scalar;
-
-            if (left.Type == VariantType.Vector3D && right.Type == VariantType.Scalar)
-                return Avalonia.Vector3D.Divide(left.Vector3D, right.Scalar);
-            
+            if (left.Type == VariantType.Vector3 && right.Type == VariantType.Double)
+                return left.Vector3 / (float)right.Double;
+             
             if (left.Type == VariantType.Vector3D && right.Type == VariantType.Double)
                 return Avalonia.Vector3D.Divide(left.Vector3D, right.Double);
 
             if (left.Type == VariantType.Vector4 && right.Type == VariantType.Vector4)
                 return left.Vector4 / right.Vector4;
 
-            if (left.Type == VariantType.Vector4 && right.Type == VariantType.Scalar)
-                return left.Vector4 / right.Scalar;
-            
+            if (left.Type == VariantType.Vector4 && right.Type == VariantType.Double)
+                return left.Vector4 / (float)right.Double;
+
             if (left.Type == VariantType.Quaternion && right.Type == VariantType.Quaternion)
                 return left.Quaternion / right.Quaternion;
 
@@ -564,11 +534,7 @@ namespace Avalonia.Rendering.Composition.Expressions
         public ExpressionVariant EqualsTo(ExpressionVariant right)
         {
             if (Type != right.Type || Type == VariantType.Invalid)
-                return default;
-
-            if (Type == VariantType.Scalar)
-                return Scalar == right.Scalar;
-            
+                return default;       
             
             if (Type == VariantType.Double)
                 return Double == right.Double;
@@ -623,8 +589,6 @@ namespace Avalonia.Rendering.Composition.Expressions
 
         public static ExpressionVariant operator %(ExpressionVariant left, ExpressionVariant right)
         {
-            if (left.Type == VariantType.Scalar && right.Type == VariantType.Scalar)
-                return left.Scalar % right.Scalar;
             if (left.Type == VariantType.Double && right.Type == VariantType.Double)
                 return left.Double % right.Double;
             return default;
@@ -632,18 +596,13 @@ namespace Avalonia.Rendering.Composition.Expressions
 
         public static ExpressionVariant operator <(ExpressionVariant left, ExpressionVariant right)
         {
-            if (left.Type == VariantType.Scalar && right.Type == VariantType.Scalar)
-                return left.Scalar < right.Scalar;
             if (left.Type == VariantType.Double && right.Type == VariantType.Double)
                 return left.Double < right.Double;
             return default;
         }
 
         public static ExpressionVariant operator >(ExpressionVariant left, ExpressionVariant right)
-        {
-            if (left.Type == VariantType.Scalar && right.Type == VariantType.Scalar)
-                return left.Scalar > right.Scalar;
-            
+        {            
             if (left.Type == VariantType.Double && right.Type == VariantType.Double)
                 return left.Double > right.Double;
             return default;
@@ -659,207 +618,89 @@ namespace Avalonia.Rendering.Composition.Expressions
         public ExpressionVariant Or(ExpressionVariant right)
         {
             if (Type == VariantType.Boolean && right.Type == VariantType.Boolean)
-                return Boolean && right.Boolean;
+                return Boolean || right.Boolean;
             return default;
         }
 
         public bool TryCast<T>(out T res) where T : struct
         {
-            if (typeof(T) == typeof(bool))
-            {
-                if (Type == VariantType.Boolean)
-                {
-                    res = (T) (object) Boolean;
-                    return true;
-                }
-            }
-
-            if (typeof(T) == typeof(float))
+            switch (default(T))
             {
-                if (Type == VariantType.Scalar)
-                {
-                    res = (T) (object) Scalar;
-                    return true;
-                }
-                if (Type == VariantType.Double)
-                {
-                    res = (T)(object)Scalar;
+                case bool when Type is VariantType.Boolean:
+                    res = (T)(object)Boolean;
                     return true;
-                }
-            }
-            
-            if (typeof(T) == typeof(double))
-            {
-                if (Type == VariantType.Double)
-                {
-                    res = (T) (object) Double;
-                    return true;
-                }
-
-                if (Type == VariantType.Scalar)
-                {
+                case float when Type is VariantType.Double:
                     res = (T)(object)(float)Double;
                     return true;
-                }
-            }
-
-            if (typeof(T) == typeof(Vector2))
-            {
-                if (Type == VariantType.Vector2)
-                {
-                    res = (T) (object) Vector2;
+                case double when Type is VariantType.Double:
+                    res = (T)(object)Double;
                     return true;
-                }
-
-                if (Type == VariantType.Vector)
-                {
-                    res = (T) (object) Vector.ToVector2();
+                case System.Numerics.Vector2 when Type is VariantType.Vector2:
+                    res = (T)(object)Vector2;
                     return true;
-                }
-            }
-            
-            if (typeof(T) == typeof(Vector))
-            {
-                if (Type == VariantType.Vector)
-                {
-                    res = (T) (object) Vector;
+                case System.Numerics.Vector2 when Type is VariantType.Vector:
+                    res = (T)(object)Vector.ToVector2();
                     return true;
-                }
-
-                if (Type == VariantType.Vector2)
-                {
+                case Avalonia.Vector when Type is VariantType.Vector:
+                    res = (T)(object)Vector;
+                    return true;
+                case Avalonia.Vector when Type is VariantType.Vector2:
                     res = (T)(object)new Vector(Vector2);
                     return true;
-                }
-            }
-
-            if (typeof(T) == typeof(Vector3))
-            {
-                if (Type == VariantType.Vector3)
-                {
-                    res = (T) (object) Vector3;
+                case System.Numerics.Vector3 when Type is VariantType.Vector3:
+                    res = (T)(object)Vector3;
                     return true;
-                }
-                if (Type == VariantType.Vector3D)
-                {
-                    res = (T) (object) Vector3D.ToVector3();
+                case System.Numerics.Vector3 when Type is VariantType.Vector3D:
+                    res = (T)(object)Vector3D.ToVector3();
                     return true;
-                }
-            }
-            
-            if (typeof(T) == typeof(Vector3D))
-            {
-                if (Type == VariantType.Vector3D)
-                {
-                    res = (T) (object) Vector3D;
+                case Avalonia.Vector3D when Type is VariantType.Vector3D:
+                    res = (T)(object)Vector3D;
                     return true;
-                }
-                
-                if (Type == VariantType.Vector3)
-                {
+                case Avalonia.Vector3D when Type is VariantType.Vector3:
                     res = (T)(object)new Vector3D(Vector3);
                     return true;
-                }
-            }
-
-            if (typeof(T) == typeof(Vector4))
-            {
-                if (Type == VariantType.Vector4)
-                {
-                    res = (T) (object) Vector4;
+                case System.Numerics.Vector4 when Type is VariantType.Vector4:
+                    res = (T)(object)Vector4;
                     return true;
-                }
-            }
-
-            if (typeof(T) == typeof(Matrix3x2))
-            {
-                if (Type == VariantType.Matrix3x2)
-                {
-                    res = (T) (object) Matrix3x2;
+                case System.Numerics.Matrix3x2 when Type is VariantType.Matrix3x2:
+                    res = (T)(object)Matrix3x2;
                     return true;
-                }
-            }
-            
-            if (typeof(T) == typeof(Matrix))
-            {
-                if (Type == VariantType.AvaloniaMatrix)
-                {
-                    res = (T) (object) Matrix3x2;
+                case Avalonia.Matrix when Type is VariantType.AvaloniaMatrix:
+                    res = (T)(object)AvaloniaMatrix;
                     return true;
-                }
-            }
-
-            if (typeof(T) == typeof(Matrix4x4))
-            {
-                if (Type == VariantType.Matrix4x4)
-                {
-                    res = (T) (object) Matrix4x4;
+                case System.Numerics.Matrix4x4 when Type is VariantType.Matrix4x4:
+                    res = (T)(object)Matrix4x4;
                     return true;
-                }
-            }
-
-            if (typeof(T) == typeof(Quaternion))
-            {
-                if (Type == VariantType.Quaternion)
-                {
-                    res = (T) (object) Quaternion;
+                case System.Numerics.Quaternion when Type is VariantType.Quaternion:
+                    res = (T)(object)Quaternion;
                     return true;
-                }
-            }
-            
-            if (typeof(T) == typeof(Avalonia.Media.Color))
-            {
-                if (Type == VariantType.Color)
-                {
-                    res = (T) (object) Color;
+                case Avalonia.Media.Color when Type is VariantType.Color:
+                    res = (T)(object)Color;
                     return true;
-                }
+                default:
+                    res = default;
+                    return false;
             }
-
-            res = default;
-            return false;
         }
 
         public static ExpressionVariant Create<T>(T v) where T : struct
-        {
-            if (typeof(T) == typeof(bool))
-                return (bool) (object) v;
-
-            if (typeof(T) == typeof(float))
-                return (float) (object) v;
-
-            if (typeof(T) == typeof(Vector2))
-                return (Vector2) (object) v;
-            
-            if (typeof(T) == typeof(Vector))
-                return (Vector) (object) v;
-
-            if (typeof(T) == typeof(Vector3))
-                return (Vector3) (object) v;
-            
-            if (typeof(T) == typeof(Vector3D))
-                return (Vector3D) (object) v;
-
-            if (typeof(T) == typeof(Vector4))
-                return (Vector4) (object) v;
-
-            if (typeof(T) == typeof(Matrix3x2))
-                return (Matrix3x2) (object) v;
-            
-            if (typeof(T) == typeof(Matrix))
-                return (Matrix) (object) v;
-
-            if (typeof(T) == typeof(Matrix4x4))
-                return (Matrix4x4) (object) v;
-
-            if (typeof(T) == typeof(Quaternion))
-                return (Quaternion) (object) v;
-            
-            if (typeof(T) == typeof(Avalonia.Media.Color))
-                return (Avalonia.Media.Color) (object) v;
-
-            throw new ArgumentException("Invalid variant type: " + typeof(T));
-        }
+            => default(T) switch
+            {
+                bool => (bool)(object)v,
+                float => (float)(object)v,
+                double => (double)(object)v,
+                System.Numerics.Vector2 => (Vector2)(object)v,
+                Avalonia.Vector => (Vector)(object)v,
+                System.Numerics.Vector3 => (Vector3)(object)v,
+                Avalonia.Vector3D => (Vector3D)(object)v,
+                System.Numerics.Vector4 => (Vector4)(object)v,
+                System.Numerics.Matrix3x2 => (Matrix3x2)(object)v,
+                Avalonia.Matrix => (Matrix)(object)v,
+                System.Numerics.Matrix4x4 => (Matrix4x4)(object)v,
+                System.Numerics.Quaternion => (Quaternion)(object)v,
+                Avalonia.Media.Color => (Avalonia.Media.Color)(object)v,
+                _ => throw new ArgumentException("Invalid variant type: " + typeof(T))
+            };
 
         public T CastOrDefault<T>() where T : struct
         {
@@ -869,35 +710,23 @@ namespace Avalonia.Rendering.Composition.Expressions
 
         public override string ToString()
         {
-            if (Type == VariantType.Boolean)
-                return Boolean.ToString();
-            if (Type == VariantType.Scalar)
-                return Scalar.ToString(CultureInfo.InvariantCulture);
-            if (Type == VariantType.Double)
-                return Double.ToString(CultureInfo.InvariantCulture);
-            if (Type == VariantType.Vector2)
-                return Vector2.ToString();
-            if (Type == VariantType.Vector)
-                return Vector.ToString();
-            if (Type == VariantType.Vector3)
-                return Vector3.ToString();
-            if (Type == VariantType.Vector3D)
-                return Vector3D.ToString();
-            if (Type == VariantType.Vector4)
-                return Vector4.ToString();
-            if (Type == VariantType.Quaternion)
-                return Quaternion.ToString();
-            if (Type == VariantType.Matrix3x2)
-                return Matrix3x2.ToString();
-            if (Type == VariantType.AvaloniaMatrix)
-                return AvaloniaMatrix.ToString();
-            if (Type == VariantType.Matrix4x4)
-                return Matrix4x4.ToString();
-            if (Type == VariantType.Color)
-                return Color.ToString();
-            if (Type == VariantType.Invalid)
-                return "Invalid";
-            return "Unknown";
+            return Type switch
+            {
+                VariantType.Boolean => Boolean.ToString(),
+                VariantType.Double => Double.ToString(CultureInfo.InvariantCulture),
+                VariantType.Vector2 => Vector2.ToString(),
+                VariantType.Vector => Vector.ToString(),
+                VariantType.Vector3 => Vector3.ToString(),
+                VariantType.Vector3D => Vector3D.ToString(),
+                VariantType.Vector4 => Vector4.ToString(),
+                VariantType.Quaternion => Quaternion.ToString(),
+                VariantType.Matrix3x2 => Matrix3x2.ToString(),
+                VariantType.AvaloniaMatrix => AvaloniaMatrix.ToString(),
+                VariantType.Matrix4x4 => Matrix4x4.ToString(),
+                VariantType.Color => Color.ToString(),
+                VariantType.Invalid => "Invalid",
+                _ => "Unknown"
+            };
         }
     }
 
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/CompositionProperty.cs b/src/Avalonia.Base/Rendering/Composition/Server/CompositionProperty.cs
index 180c717803..a0aea862de 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/CompositionProperty.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/CompositionProperty.cs
@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
 using Avalonia.Rendering.Composition.Expressions;
 
 namespace Avalonia.Rendering.Composition.Server;
@@ -11,15 +8,6 @@ internal class CompositionProperty
     private static int s_nextId = 1;
     private static readonly object _lock = new();
 
-    private static Dictionary<Type, List<CompositionProperty>> s_dynamicRegistry = new();
-
-    class ReadOnlyRegistry : Dictionary<Type, IReadOnlyDictionary<string, CompositionProperty>>
-    {
-
-    }
-
-    private static volatile ReadOnlyRegistry? s_ReadOnlyRegistry;
-
     public CompositionProperty(int id, string name, Type owner, Func<SimpleServerObject, ExpressionVariant>? getVariant)
     {
         Id = id;
@@ -43,59 +31,8 @@ internal class CompositionProperty
             prop = new CompositionProperty<TField>(id, name, typeof(TOwner), getField, setField, getVariant);
         }
 
-        s_ReadOnlyRegistry = null;
         return prop;
     }
-
-    static void PopulatePropertiesForType(Type type, List<CompositionProperty> l)
-    {
-        Type? t = type;
-        while (t != null && t != typeof(object))
-        {
-            if (s_dynamicRegistry.TryGetValue(t, out var lst))
-                l.AddRange(lst);
-            t = t.BaseType;
-        }
-    }
-
-    static ReadOnlyRegistry Build()
-    {
-        var reg = new ReadOnlyRegistry();
-        foreach (var type in s_dynamicRegistry.Keys)
-        {
-            var lst = new List<CompositionProperty>();
-            PopulatePropertiesForType(type, lst);
-            reg[type] = lst.ToDictionary(x => x.Name);
-        }
-
-        return reg;
-    }
-    
-    public static IReadOnlyDictionary<string, CompositionProperty>? TryGetPropertiesForType(Type t)
-    {
-        GetRegistry().TryGetValue(t, out var rv);
-        return rv;
-    }
-
-    public static CompositionProperty? Find(Type owner, string name)
-    {
-        if (TryGetPropertiesForType(owner)?.TryGetValue(name, out var prop) == true)
-            return prop;
-        return null;
-    }
-
-    static ReadOnlyRegistry GetRegistry()
-    {
-        var reg = s_ReadOnlyRegistry;
-        if (reg != null)
-            return reg;
-        lock (_lock)
-        {
-            // ReSharper disable once NonAtomicCompoundOperator
-            // This is the only line ever that would set the field to a not-null value, and we are inside of a lock
-            return s_ReadOnlyRegistry ??= Build();
-        }
-    }
 }
 
 internal class CompositionProperty<T> : CompositionProperty
@@ -112,4 +49,4 @@ internal class CompositionProperty<T> : CompositionProperty
         GetField = getField;
         SetField = setField;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs
index e8ae84eb03..fe857ac466 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs
@@ -138,7 +138,7 @@ namespace Avalonia.Rendering.Composition.Server
             if (Root == null) 
                 return;
 
-            if (_renderTarget?.IsCorrupted == true)
+            if (_renderTarget?.PlatformRenderTargetState.IsCorrupted == true)
             {
                 _layer?.Dispose();
                 _layer = null;
@@ -178,7 +178,7 @@ namespace Avalonia.Rendering.Composition.Server
             if (!_redrawRequested)
                 return;
             
-            if (!_renderTarget.IsReady)
+            if (!_renderTarget.PlatformRenderTargetState.IsReady)
             {
                 IsWaitingForReadyRenderTarget = IsEnabled;
                 return;
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositorAnimations.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositorAnimations.cs
index 0e59cd8f03..525bafb8a1 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositorAnimations.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositorAnimations.cs
@@ -26,7 +26,12 @@ internal class ServerCompositorAnimations
         _clockItemsToUpdate.Clear();
 
         while (_dirtyAnimatedObjectQueue.Count > 0)
-            _dirtyAnimatedObjectQueue.Dequeue().EvaluateAnimations();
+        {
+            var animation = _dirtyAnimatedObjectQueue.Dequeue();
+            _dirtyAnimatedObjects.Remove(animation);
+            animation.EvaluateAnimations();
+        }
+
         _dirtyAnimatedObjects.Clear();
     }
 
@@ -37,4 +42,4 @@ internal class ServerCompositorAnimations
         if (_dirtyAnimatedObjects.Add(obj))
             _dirtyAnimatedObjectQueue.Enqueue(obj);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerObject.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerObject.cs
index f975e8e726..ac022f5356 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerObject.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerObject.cs
@@ -71,7 +71,7 @@ namespace Avalonia.Rendering.Composition.Server
         ExpressionVariant IExpressionObject.GetProperty(string name)
         {
             if (_animations == null)
-                return CompositionProperty.Find(this.GetType(), name)?.GetVariant?.Invoke(this) ?? default;
+                return GetCompositionProperty(name)?.GetVariant?.Invoke(this) ?? default;
 
             return _animations.GetPropertyForAnimation(name);
         }
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerObjectAnimations.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerObjectAnimations.cs
index 1d213781c7..c62c82ea5c 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerObjectAnimations.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerObjectAnimations.cs
@@ -12,18 +12,15 @@ class ServerObjectAnimations
     private readonly ServerObject _owner;
     private InlineDictionary<CompositionProperty, ServerObjectSubscriptionStore> _subscriptions;
     private InlineDictionary<CompositionProperty, ServerObjectAnimationInstance> _animations;
-    private readonly IReadOnlyDictionary<string, CompositionProperty> _properties;
 
     public ServerObjectAnimations(ServerObject owner)
     {
         _owner = owner;
-        _properties = CompositionProperty.TryGetPropertiesForType(owner.GetType()) ??
-                      new Dictionary<string, CompositionProperty>();
     }
 
     private class ServerObjectSubscriptionStore
     {
-        public bool IsValid;
+        public bool IsValid = true;
         public RefTrackingDictionary<IAnimationInstance>? Subscribers;
 
         public void Invalidate()
@@ -84,6 +81,7 @@ class ServerObjectAnimations
                 NeedsUpdate = false;
                 _property.SetField(Owner._owner, GetVariant().CastOrDefault<T>());
                 Owner._owner.NotifyAnimatedValueChanged(_property);
+                Owner.OnSetDirectValue(_property);
             }
         }
     }
@@ -143,7 +141,8 @@ class ServerObjectAnimations
     
     public ExpressionVariant GetPropertyForAnimation(string name)
     {
-        if (!_properties.TryGetValue(name, out var prop))
+        var prop = _owner.GetCompositionProperty(name);
+        if (prop is null)
             return default;
 
         if (_subscriptions.TryGetValue(prop, out var subs))
@@ -172,4 +171,4 @@ class ServerObjectAnimations
         else
             Debug.Assert(false);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Styling/StyleInstance.cs b/src/Avalonia.Base/Styling/StyleInstance.cs
index c397aef8c6..1ecaf3734a 100644
--- a/src/Avalonia.Base/Styling/StyleInstance.cs
+++ b/src/Avalonia.Base/Styling/StyleInstance.cs
@@ -72,7 +72,8 @@ namespace Avalonia.Styling
                 _animationTrigger ??= new LightweightSubject<bool>();
                 _animationApplyDisposables ??= new List<IDisposable>();
                 foreach (var animation in _animations)
-                    _animationApplyDisposables.Add(animation.Apply(animatable, null, _animationTrigger));
+                    _animationApplyDisposables.Add(animation.Apply(animatable, null, _animationTrigger,
+                        onComplete: null, isManuallyStarted: false));
 
                 if (_activator is null)
                     _animationTrigger.OnNext(true);
diff --git a/src/Avalonia.Base/Threading/AvaloniaSynchronizationContext.cs b/src/Avalonia.Base/Threading/AvaloniaSynchronizationContext.cs
index 5639963e9e..a5fa41d534 100644
--- a/src/Avalonia.Base/Threading/AvaloniaSynchronizationContext.cs
+++ b/src/Avalonia.Base/Threading/AvaloniaSynchronizationContext.cs
@@ -1,12 +1,11 @@
 using System;
-using System.Runtime.ConstrainedExecution;
 using System.Threading;
 using Avalonia.Utilities;
 
 namespace Avalonia.Threading
 {
     /// <summary>
-    /// SynchronizationContext to be used on main thread
+    /// A <see cref="SynchronizationContext"/> that uses a <see cref="Dispatcher"/> to post messages.
     /// </summary>
     public class AvaloniaSynchronizationContext : SynchronizationContext
     {
@@ -16,7 +15,7 @@ namespace Avalonia.Threading
         private readonly Dispatcher _dispatcher;
 
         // This constructor is here to enforce STA behavior for unit tests
-        internal AvaloniaSynchronizationContext(Dispatcher dispatcher, DispatcherPriority priority, bool isStaThread = false)
+        internal AvaloniaSynchronizationContext(Dispatcher dispatcher, DispatcherPriority priority, bool isStaThread)
         {
             _dispatcher = dispatcher;
             Priority = priority;
@@ -26,17 +25,17 @@ namespace Avalonia.Threading
         }
 
         public AvaloniaSynchronizationContext()
-            : this(Dispatcher.UIThread, DispatcherPriority.Default, Thread.CurrentThread.GetApartmentState() == ApartmentState.STA)
+            : this(Dispatcher.CurrentDispatcher, DispatcherPriority.Default)
         {
         }
 
         public AvaloniaSynchronizationContext(DispatcherPriority priority)
-            : this(Dispatcher.UIThread, priority, false)
+            : this(Dispatcher.CurrentDispatcher, priority)
         {
         }
 
         public AvaloniaSynchronizationContext(Dispatcher dispatcher, DispatcherPriority priority)
-            : this(dispatcher, priority, false)
+            : this(dispatcher, priority, dispatcher.IsSta)
         {
         }
 
@@ -55,7 +54,7 @@ namespace Avalonia.Threading
                 return;
             }
 
-            SetSynchronizationContext(Dispatcher.UIThread.GetContextWithPriority(DispatcherPriority.Normal));
+            SetSynchronizationContext(Dispatcher.CurrentDispatcher.GetContextWithPriority(DispatcherPriority.Normal));
         }
 
         /// <inheritdoc/>
@@ -105,7 +104,7 @@ namespace Avalonia.Threading
             }
         }
 
-        public static RestoreContext Ensure(DispatcherPriority priority) => Ensure(Dispatcher.UIThread, priority);
+        public static RestoreContext Ensure(DispatcherPriority priority) => Ensure(Dispatcher.CurrentDispatcher, priority);
         public static RestoreContext Ensure(Dispatcher dispatcher, DispatcherPriority priority)
         {
             if (Current is AvaloniaSynchronizationContext avaloniaContext 
diff --git a/src/Avalonia.Base/Threading/Dispatcher.ThreadStorage.cs b/src/Avalonia.Base/Threading/Dispatcher.ThreadStorage.cs
index 7d9d0b39cf..eb0fbbcdf0 100644
--- a/src/Avalonia.Base/Threading/Dispatcher.ThreadStorage.cs
+++ b/src/Avalonia.Base/Threading/Dispatcher.ThreadStorage.cs
@@ -44,7 +44,14 @@ public partial class Dispatcher
             return null;
         }
     }
-    
+
+    /// <summary>
+    /// Gets the dispatcher for the UI thread.
+    /// </summary>
+    /// <remarks>
+    /// Control and libraries author are encouraged to use <see cref="CurrentDispatcher"/> and
+    /// <see cref="AvaloniaObject.Dispatcher"/> instead.
+    /// </remarks>
     public static Dispatcher UIThread
     {
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
diff --git a/src/Avalonia.Base/Threading/Dispatcher.cs b/src/Avalonia.Base/Threading/Dispatcher.cs
index 07582ac3f4..100df0acbc 100644
--- a/src/Avalonia.Base/Threading/Dispatcher.cs
+++ b/src/Avalonia.Base/Threading/Dispatcher.cs
@@ -13,10 +13,6 @@ namespace Avalonia.Threading;
 /// <summary>
 /// Provides services for managing work items on a thread.
 /// </summary>
-/// <remarks>
-/// In Avalonia, there is usually only a single <see cref="Dispatcher"/> in the application -
-/// the one for the UI thread, retrieved via the <see cref="UIThread"/> property.
-/// </remarks>
 public partial class Dispatcher : IDispatcher
 {
     private IDispatcherImpl _impl;
@@ -52,6 +48,8 @@ public partial class Dispatcher : IDispatcher
                 s_currentThreadDispatcher = new() { Reference = new WeakReference<Dispatcher>(this) });
         }
 
+        IsSta = _thread.GetApartmentState() == ApartmentState.STA;
+
         if (impl is null)
         {
             var st = Stopwatch.StartNew();
@@ -70,6 +68,8 @@ public partial class Dispatcher : IDispatcher
 
     public bool SupportsRunLoops => _controlledImpl != null;
 
+    internal bool IsSta { get; }
+
     /// <summary>
     /// Checks that the current thread is the UI thread.
     /// </summary>
diff --git a/src/Avalonia.Base/Threading/DispatcherTimer.cs b/src/Avalonia.Base/Threading/DispatcherTimer.cs
index ea88109bdf..443b9ae89f 100644
--- a/src/Avalonia.Base/Threading/DispatcherTimer.cs
+++ b/src/Avalonia.Base/Threading/DispatcherTimer.cs
@@ -7,65 +7,102 @@ namespace Avalonia.Threading;
 ///     A timer that is integrated into the Dispatcher queues, and will
 ///     be processed after a given amount of time at a specified priority.
 /// </summary>
-public partial class DispatcherTimer
+public class DispatcherTimer
 {
     internal static int ActiveTimersCount { get; private set; }
 
     /// <summary>
-    ///     Creates a timer that uses theUI thread's Dispatcher2 to
-    ///     process the timer event at background priority.
+    /// Creates a timer that uses <see cref="Avalonia.Threading.Dispatcher.CurrentDispatcher"/> to
+    /// process the timer event at background priority.
     /// </summary>
-    public DispatcherTimer() : this(DispatcherPriority.Background)
+    public DispatcherTimer()
+        : this(TimeSpan.Zero, DispatcherPriority.Background, Dispatcher.CurrentDispatcher)
     {
     }
 
     /// <summary>
-    ///     Creates a timer that uses the UI thread's Dispatcher2 to
-    ///     process the timer event at the specified priority.
+    /// Creates a timer that uses <see cref="Avalonia.Threading.Dispatcher.CurrentDispatcher"/> to
+    /// process the timer event at the specified priority.
     /// </summary>
-    /// <param name="priority">
-    ///     The priority to process the timer at.
-    /// </param>
-    public DispatcherTimer(DispatcherPriority priority) : this(Threading.Dispatcher.UIThread, priority,
-        TimeSpan.FromMilliseconds(0))
+    /// <param name="priority">The priority to process the timer at.</param>
+    public DispatcherTimer(DispatcherPriority priority)
+        : this(TimeSpan.Zero, priority, Dispatcher.CurrentDispatcher)
     {
     }
 
     /// <summary>
-    ///     Creates a timer that uses the specified Dispatcher2 to
-    ///     process the timer event at the specified priority.
+    /// Creates a timer that uses the specified <see cref="Avalonia.Threading.Dispatcher"/> to
+    /// process the timer event at the specified priority.
     /// </summary>
-    /// <param name="priority">
-    ///     The priority to process the timer at.
-    /// </param>
-    /// <param name="dispatcher">
-    ///     The dispatcher to use to process the timer.
-    /// </param>
-    internal DispatcherTimer(DispatcherPriority priority, Dispatcher dispatcher) : this(dispatcher, priority,
-        TimeSpan.FromMilliseconds(0))
+    /// <param name="priority">The priority to process the timer at.</param>
+    /// <param name="dispatcher">The dispatcher to use to process the timer.</param>
+    public DispatcherTimer(DispatcherPriority priority, Dispatcher dispatcher)
+        : this(TimeSpan.Zero, priority, dispatcher)
     {
     }
 
     /// <summary>
-    ///     Creates a timer that uses the UI thread's Dispatcher2 to
-    ///     process the timer event at the specified priority after the specified timeout.
+    /// Creates a timer that uses the specified <see cref="Avalonia.Threading.Dispatcher"/> to
+    /// process the timer event at the specified priority after the specified timeout.
     /// </summary>
-    /// <param name="interval">
-    ///     The interval to tick the timer after.
-    /// </param>
-    /// <param name="priority">
-    ///     The priority to process the timer at.
-    /// </param>
-    /// <param name="callback">
-    ///     The callback to call when the timer ticks.
-    /// </param>
-    public DispatcherTimer(TimeSpan interval, DispatcherPriority priority, EventHandler callback)
-        : this(Threading.Dispatcher.UIThread, priority, interval)
+    /// <param name="interval">The interval to tick the timer after.</param>
+    /// <param name="priority">The priority to process the timer at.</param>
+    /// <param name="dispatcher">The dispatcher to use to process the timer.</param>
+    public DispatcherTimer(TimeSpan interval, DispatcherPriority priority, Dispatcher dispatcher)
     {
-        if (callback == null)
+        ArgumentNullException.ThrowIfNull(dispatcher);
+
+        DispatcherPriority.Validate(priority, "priority");
+        if (priority == DispatcherPriority.Inactive)
+        {
+            throw new ArgumentException("Specified priority is not valid.", nameof(priority));
+        }
+
+        var ms = interval.TotalMilliseconds;
+        if (ms < 0)
         {
-            throw new ArgumentNullException(nameof(callback));
+            throw new ArgumentOutOfRangeException(nameof(interval),
+                "TimeSpan period must be greater than or equal to zero.");
         }
+        if (ms > int.MaxValue)
+        {
+            throw new ArgumentOutOfRangeException(nameof(interval),
+                "TimeSpan period must be less than or equal to Int32.MaxValue.");
+        }
+
+        _dispatcher = dispatcher;
+        _priority = priority;
+        _interval = interval;
+    }
+
+    /// <summary>
+    /// Creates a timer that uses <see cref="Avalonia.Threading.Dispatcher.CurrentDispatcher"/> to
+    /// process the timer event at the specified priority after the specified timeout and with
+    /// the specified handler.
+    /// </summary>
+    /// <param name="interval">The interval to tick the timer after.</param>
+    /// <param name="priority">The priority to process the timer at.</param>
+    /// <param name="callback">The callback to call when the timer ticks.</param>
+    /// <remarks>This constructor immediately starts the timer.</remarks>
+    public DispatcherTimer(TimeSpan interval, DispatcherPriority priority, EventHandler callback)
+        : this(interval, priority, Dispatcher.CurrentDispatcher, callback)
+    {
+    }
+
+    /// <summary>
+    /// Creates a timer that uses the specified <see cref="Avalonia.Threading.Dispatcher"/> to
+    /// process the timer event at the specified priority after the specified timeout and with
+    /// the specified handler.
+    /// </summary>
+    /// <param name="interval">The interval to tick the timer after.</param>
+    /// <param name="priority">The priority to process the timer at.</param>
+    /// <param name="dispatcher">The dispatcher to use to process the timer.</param>
+    /// <param name="callback">The callback to call when the timer ticks.</param>
+    /// <remarks>This constructor immediately starts the timer.</remarks>
+    public DispatcherTimer(TimeSpan interval, DispatcherPriority priority, Dispatcher dispatcher, EventHandler callback)
+        : this(interval, priority, dispatcher)
+    {
+        ArgumentNullException.ThrowIfNull(callback);
 
         Tick += callback;
         Start();
@@ -252,33 +289,6 @@ public partial class DispatcherTimer
     /// </summary>
     public object? Tag { get; set; }
 
-
-    internal DispatcherTimer(Dispatcher dispatcher, DispatcherPriority priority, TimeSpan interval)
-    {
-        if (dispatcher == null)
-        {
-            throw new ArgumentNullException(nameof(dispatcher));
-        }
-
-        DispatcherPriority.Validate(priority, "priority");
-        if (priority == DispatcherPriority.Inactive)
-        {
-            throw new ArgumentException("Specified priority is not valid.", nameof(priority));
-        }
-
-        if (interval.TotalMilliseconds < 0)
-            throw new ArgumentOutOfRangeException(nameof(interval), "TimeSpan period must be greater than or equal to zero.");
-
-        if (interval.TotalMilliseconds > Int32.MaxValue)
-            throw new ArgumentOutOfRangeException(nameof(interval),
-                "TimeSpan period must be less than or equal to Int32.MaxValue.");
-
-
-        _dispatcher = dispatcher;
-        _priority = priority;
-        _interval = interval;
-    }
-
     private void Restart()
     {
         lock (_instanceLock)
diff --git a/src/Avalonia.Controls/Chrome/WindowDrawnDecorations.cs b/src/Avalonia.Controls/Chrome/WindowDrawnDecorations.cs
index 48847b5f59..26dffa8f5d 100644
--- a/src/Avalonia.Controls/Chrome/WindowDrawnDecorations.cs
+++ b/src/Avalonia.Controls/Chrome/WindowDrawnDecorations.cs
@@ -1,7 +1,9 @@
 using System;
 using Avalonia.Automation;
 using Avalonia.Controls.Metadata;
+using Avalonia.Controls.Platform;
 using Avalonia.Controls.Primitives;
+using Avalonia.Layout;
 using Avalonia.LogicalTree;
 using Avalonia.Reactive;
 using Avalonia.Styling;
@@ -14,7 +16,8 @@ namespace Avalonia.Controls.Chrome;
 /// TopLevelHost extracts overlay/underlay/popover visuals from the template content
 /// and inserts them into its own visual tree.
 /// </summary>
-[PseudoClasses(pcNormal, pcMaximized, pcFullscreen, pcHasShadow, pcHasBorder, pcHasTitlebar)]
+[PseudoClasses(pcNormal, pcMaximized, pcFullscreen, pcHasShadow, pcHasBorder, pcHasTitlebar,
+    pcHasMaximize, pcHasFullscreen, pcHasMinimize)]
 [TemplatePart(PART_CloseButton, typeof(Button))]
 [TemplatePart(PART_MinimizeButton, typeof(Button))]
 [TemplatePart(PART_MaximizeButton, typeof(Button))]
@@ -30,6 +33,9 @@ public class WindowDrawnDecorations : StyledElement
     internal const string pcHasShadow = ":has-shadow";
     internal const string pcHasBorder = ":has-border";
     internal const string pcHasTitlebar = ":has-titlebar";
+    internal const string pcHasMaximize = ":has-maximize";
+    internal const string pcHasFullscreen = ":has-fullscreen";
+    internal const string pcHasMinimize = ":has-minimize";
 
     // Template part names for caption buttons
     internal const string PART_CloseButton = "PART_CloseButton";
@@ -138,6 +144,7 @@ public class WindowDrawnDecorations : StyledElement
     private IDisposable? _windowSubscriptions;
     private Window? _hostWindow;
     private double _titleBarHeightOverride = -1;
+    private double _renderScaling = 1.0;
 
     /// <summary>
     /// Raised when any property affecting the effective geometry changes
@@ -145,6 +152,22 @@ public class WindowDrawnDecorations : StyledElement
     /// </summary>
     internal event Action? EffectiveGeometryChanged;
 
+    /// <summary>
+    /// Gets or sets the current render scaling factor used for pixel-aligning
+    /// decoration geometry (title bar height, frame/shadow thickness).
+    /// </summary>
+    internal double RenderScaling
+    {
+        get => _renderScaling;
+        set
+        {
+            if (_renderScaling == value)
+                return;
+            _renderScaling = value;
+            UpdateEffectiveGeometry();
+        }
+    }
+
     /// <summary>
     /// Gets or sets the decorations template.
     /// </summary>
@@ -365,8 +388,11 @@ public class WindowDrawnDecorations : StyledElement
         Detach();
         _hostWindow = window;
 
+        window.AllowedWindowActionsChanged += OnAllowedWindowActionsChanged;
+
         _windowSubscriptions = new CompositeDisposable
         {
+            Disposable.Create(() => window.AllowedWindowActionsChanged -= OnAllowedWindowActionsChanged),
             window.GetObservable(Window.TitleProperty)
                 .Subscribe(title => SetCurrentValue(TitleProperty, title)),
             window.GetObservable(Window.CanMaximizeProperty)
@@ -389,6 +415,7 @@ public class WindowDrawnDecorations : StyledElement
                 }),
         };
 
+        UpdateAllowedActionsPseudoClasses();
         UpdateMaximizeButtonState();
         UpdateMinimizeButtonState();
         UpdateFullScreenButtonState();
@@ -529,46 +556,71 @@ public class WindowDrawnDecorations : StyledElement
         e.Handled = true;
     }
 
+    private PlatformAllowedWindowActions EffectiveAllowedActions =>
+        _hostWindow?.AllowedWindowActions ?? PlatformAllowedWindowActions.All;
+
     private void UpdateMaximizeButtonState()
     {
         if (_maximizeButton == null)
             return;
-        _maximizeButton.IsEnabled = _hostWindow?.WindowState switch
-        {
-            WindowState.Maximized or WindowState.FullScreen => _hostWindow.CanResize,
-            WindowState.Normal => _hostWindow.CanMaximize,
-            _ => true
-        };
+        _maximizeButton.IsEnabled = EffectiveAllowedActions.HasFlag(PlatformAllowedWindowActions.Maximize)
+            && (_hostWindow?.WindowState switch
+            {
+                WindowState.Maximized or WindowState.FullScreen => _hostWindow.CanResize,
+                WindowState.Normal => _hostWindow.CanMaximize,
+                _ => true
+            });
     }
 
     private void UpdateMinimizeButtonState()
     {
         if (_minimizeButton == null)
             return;
-        _minimizeButton.IsEnabled = _hostWindow?.CanMinimize ?? true;
+        _minimizeButton.IsEnabled = EffectiveAllowedActions.HasFlag(PlatformAllowedWindowActions.Minimize)
+            && (_hostWindow?.CanMinimize ?? true);
     }
 
     private void UpdateFullScreenButtonState()
     {
         if (_fullScreenButton == null)
             return;
-        _fullScreenButton.IsEnabled = _hostWindow?.WindowState == WindowState.FullScreen
-            ? _hostWindow.CanResize
-            : _hostWindow?.CanMaximize ?? true;
+        _fullScreenButton.IsEnabled = EffectiveAllowedActions.HasFlag(PlatformAllowedWindowActions.Fullscreen)
+            && (_hostWindow?.WindowState == WindowState.FullScreen
+                ? _hostWindow.CanResize
+                : _hostWindow?.CanMaximize ?? true);
+    }
+
+    private void OnAllowedWindowActionsChanged(PlatformAllowedWindowActions actions)
+    {
+        UpdateAllowedActionsPseudoClasses();
+        UpdateMaximizeButtonState();
+        UpdateMinimizeButtonState();
+        UpdateFullScreenButtonState();
+    }
+
+    private void UpdateAllowedActionsPseudoClasses()
+    {
+        var actions = EffectiveAllowedActions;
+        PseudoClasses.Set(pcHasMaximize, actions.HasFlag(PlatformAllowedWindowActions.Maximize));
+        PseudoClasses.Set(pcHasFullscreen, actions.HasFlag(PlatformAllowedWindowActions.Fullscreen));
+        PseudoClasses.Set(pcHasMinimize, actions.HasFlag(PlatformAllowedWindowActions.Minimize));
     }
 
     private void UpdateEffectiveGeometry()
     {
+        var scale = _renderScaling;
+
         TitleBarHeight = EnabledParts.HasFlag(DrawnWindowDecorationParts.TitleBar)
-            ? (TitleBarHeightOverride == -1 ? DefaultTitleBarHeight : TitleBarHeightOverride)
+            ? LayoutHelper.RoundLayoutValue(
+                TitleBarHeightOverride == -1 ? DefaultTitleBarHeight : TitleBarHeightOverride, scale)
             : 0;
 
         FrameThickness = EnabledParts.HasFlag(DrawnWindowDecorationParts.Border)
-            ? (FrameThicknessOverride ?? DefaultFrameThickness)
+            ? LayoutHelper.RoundLayoutThickness(FrameThicknessOverride ?? DefaultFrameThickness, scale)
             : default;
 
         ShadowThickness = EnabledParts.HasFlag(DrawnWindowDecorationParts.Shadow)
-            ? (ShadowThicknessOverride ?? DefaultShadowThickness)
+            ? LayoutHelper.RoundLayoutThickness(ShadowThicknessOverride ?? DefaultShadowThickness, scale)
             : default;
 
         EffectiveGeometryChanged?.Invoke();
diff --git a/src/Avalonia.Controls/ComboBox.cs b/src/Avalonia.Controls/ComboBox.cs
index eb1eab5856..1571eb9fe7 100644
--- a/src/Avalonia.Controls/ComboBox.cs
+++ b/src/Avalonia.Controls/ComboBox.cs
@@ -86,7 +86,8 @@ namespace Avalonia.Controls
         /// Defines the <see cref="Text"/> property
         /// </summary>
         public static readonly StyledProperty<string?> TextProperty =
-            TextBlock.TextProperty.AddOwner<ComboBox>(new(string.Empty, BindingMode.TwoWay));
+            TextBlock.TextProperty.AddOwner<ComboBox>(new(string.Empty, BindingMode.TwoWay,
+                enableDataValidation: true));
 
         /// <summary>
         /// Defines the <see cref="SelectionBoxItemTemplate"/> property.
diff --git a/src/Avalonia.Controls/CommandBar/CommandBar.cs b/src/Avalonia.Controls/CommandBar/CommandBar.cs
index 392ffb7ddc..6b92a935ad 100644
--- a/src/Avalonia.Controls/CommandBar/CommandBar.cs
+++ b/src/Avalonia.Controls/CommandBar/CommandBar.cs
@@ -7,6 +7,8 @@ using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
 using Avalonia.Interactivity;
 using Avalonia.Metadata;
+using Avalonia.Reactive;
+using Avalonia.Threading;
 
 namespace Avalonia.Controls
 {
@@ -14,9 +16,10 @@ namespace Avalonia.Controls
     /// A command bar that provides primary commands displayed inline and secondary commands
     /// accessible via an overflow menu.
     /// </summary>
-    [TemplatePart("PART_OverflowButton",   typeof(Button))]
+    [TemplatePart("PART_OverflowButton",    typeof(Button))]
     [TemplatePart("PART_OverflowPopup",    typeof(Popup))]
-    [TemplatePart("PART_ContentPresenter", typeof(Control))]
+    [TemplatePart("PART_OverflowPresenter", typeof(ItemsControl))]
+    [TemplatePart("PART_ContentPresenter",  typeof(Control))]
     public class CommandBar : TemplatedControl
     {
         /// <summary>
@@ -129,12 +132,16 @@ namespace Avalonia.Controls
 
         private Button? _overflowButton;
         private Popup? _overflowPopup;
+        private ItemsControl? _overflowPresenter;
         private Control? _contentPresenter;
 
         private readonly ObservableCollection<ICommandBarElement> _visiblePrimaryCommands = new();
         private readonly ObservableCollection<ICommandBarElement> _overflowItems = new();
+        private readonly CommandBarSeparator _overflowPrimarySecondarySeparator = new();
+        private readonly CompositeDisposable _secondaryCommandVisibilitySubscriptions = new();
         private bool _isDynamicUpdateInProgress;
         private double _constraintWidth = double.PositiveInfinity;
+        private bool _openedViaKeyboard;
 
         public CommandBar()
         {
@@ -147,6 +154,7 @@ namespace Avalonia.Controls
             var secondaryCommands = new ObservableCollection<ICommandBarElement>();
             SetCurrentValue(SecondaryCommandsProperty, (IList<ICommandBarElement>)secondaryCommands);
 
+            RebuildSecondaryCommandVisibilitySubscriptions();
             SizeChanged += CommandBar_SizeChanged;
         }
 
@@ -348,14 +356,33 @@ namespace Avalonia.Controls
             base.OnApplyTemplate(e);
 
             if (_overflowButton != null)
+            {
                 _overflowButton.Click -= OnOverflowButtonClick;
+                _overflowButton.GotFocus -= OnOverflowButtonGotFocus;
+                _overflowButton.RemoveHandler(Input.InputElement.KeyDownEvent, OnOverflowButtonKeyDown);
+                _overflowButton.RemoveHandler(Input.InputElement.PointerPressedEvent, OnOverflowButtonPointerPressed);
+            }
+            if (_overflowPresenter != null)
+                _overflowPresenter.KeyDown -= OnOverflowPresenterKeyDown;
+            if (_overflowPopup != null)
+                _overflowPopup.Opened -= OnOverflowPopupOpened;
 
             _overflowButton = e.NameScope.Find<Button>("PART_OverflowButton");
             _overflowPopup = e.NameScope.Find<Popup>("PART_OverflowPopup");
+            _overflowPresenter = e.NameScope.Find<ItemsControl>("PART_OverflowPresenter");
             _contentPresenter = e.NameScope.Find<Control>("PART_ContentPresenter");
 
             if (_overflowButton != null)
+            {
                 _overflowButton.Click += OnOverflowButtonClick;
+                _overflowButton.GotFocus += OnOverflowButtonGotFocus;
+                _overflowButton.AddHandler(Input.InputElement.KeyDownEvent, OnOverflowButtonKeyDown, handledEventsToo: true);
+                _overflowButton.AddHandler(Input.InputElement.PointerPressedEvent, OnOverflowButtonPointerPressed, handledEventsToo: true);
+            }
+            if (_overflowPresenter != null)
+                _overflowPresenter.KeyDown += OnOverflowPresenterKeyDown;
+            if (_overflowPopup != null)
+                _overflowPopup.Opened += OnOverflowPopupOpened;
 
             ApplyLabelPositionToChildren();
             UpdateOverflowButtonVisibility();
@@ -363,13 +390,25 @@ namespace Avalonia.Controls
             UpdateDynamicOverflow();
         }
 
+        protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnAttachedToVisualTree(e);
+            RebuildSecondaryCommandVisibilitySubscriptions();
+        }
+
+        protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            _secondaryCommandVisibilitySubscriptions.Clear();
+            base.OnDetachedFromVisualTree(e);
+        }
+
         protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
 
             if (change.Property == IsOpenProperty)
             {
-                var isOpen = (bool)change.NewValue!;
+                var isOpen = change.GetNewValue<bool>();
                 if (isOpen)
                 {
                     RaiseEvent(new RoutedEventArgs(OpeningEvent));
@@ -416,6 +455,7 @@ namespace Avalonia.Controls
                     oldSecondary.CollectionChanged -= OnSecondaryCommandsChanged;
                 if (change.NewValue is INotifyCollectionChanged newSecondary)
                     newSecondary.CollectionChanged += OnSecondaryCommandsChanged;
+                RebuildSecondaryCommandVisibilitySubscriptions();
                 UpdateDynamicOverflow();
             }
         }
@@ -446,6 +486,105 @@ namespace Avalonia.Controls
             SetCurrentValue(IsOpenProperty, !IsOpen);
         }
 
+        private void OnOverflowButtonGotFocus(object? sender, Input.FocusChangedEventArgs e)
+        {
+            _openedViaKeyboard = e.NavigationMethod is Input.NavigationMethod.Directional
+                or Input.NavigationMethod.Tab;
+        }
+
+        private void OnOverflowButtonKeyDown(object? sender, Input.KeyEventArgs e)
+        {
+            if (e.Key is Input.Key.Enter or Input.Key.Space)
+                _openedViaKeyboard = true;
+        }
+
+        private void OnOverflowButtonPointerPressed(object? sender, Input.PointerPressedEventArgs e)
+        {
+            _openedViaKeyboard = false;
+        }
+
+        private void OnOverflowPresenterKeyDown(object? sender, Input.KeyEventArgs e)
+        {
+            switch (e.Key)
+            {
+                case Input.Key.Up:
+                    NavigateOverflow(forward: false);
+                    e.Handled = true;
+                    break;
+                case Input.Key.Down:
+                    NavigateOverflow(forward: true);
+                    e.Handled = true;
+                    break;
+                case Input.Key.Home:
+                    FocusOverflowItem(first: true);
+                    e.Handled = true;
+                    break;
+                case Input.Key.End:
+                    FocusOverflowItem(first: false);
+                    e.Handled = true;
+                    break;
+                case Input.Key.Escape:
+                    SetCurrentValue(IsOpenProperty, false);
+                    _overflowButton?.Focus(Input.NavigationMethod.Unspecified);
+                    e.Handled = true;
+                    break;
+            }
+        }
+
+        private void OnOverflowPopupOpened(object? sender, EventArgs e)
+        {
+            var method = _openedViaKeyboard
+                ? Input.NavigationMethod.Directional
+                : Input.NavigationMethod.Pointer;
+
+            Dispatcher.UIThread.Post(() =>
+            {
+                if (IsOpen)
+                    FocusOverflowItem(first: true, method);
+            }, DispatcherPriority.Loaded);
+        }
+
+        private void NavigateOverflow(bool forward)
+        {
+            var items = GetFocusableOverflowItems();
+            if (items.Count == 0)
+                return;
+
+            int current = -1;
+            for (int i = 0; i < items.Count; i++)
+            {
+                if (items[i].IsFocused || items[i].IsKeyboardFocusWithin)
+                {
+                    current = i;
+                    break;
+                }
+            }
+
+            int next = current < 0
+                ? (forward ? 0 : items.Count - 1)
+                : (forward ? (current + 1) % items.Count : (current - 1 + items.Count) % items.Count);
+
+            items[next].Focus(Input.NavigationMethod.Directional);
+        }
+
+        private void FocusOverflowItem(bool first, Input.NavigationMethod method = Input.NavigationMethod.Directional)
+        {
+            var items = GetFocusableOverflowItems();
+            if (items.Count > 0)
+                items[first ? 0 : items.Count - 1].Focus(method);
+        }
+
+        private List<Control> GetFocusableOverflowItems()
+        {
+            var result = new List<Control>();
+            foreach (var item in _overflowItems)
+            {
+                if (item is Control { IsEnabled: true, IsVisible: true, Focusable: true } control && item is not CommandBarSeparator)
+                    result.Add(control);
+            }
+            return result;
+        }
+
         private void OnPrimaryCommandsChanged(object? sender, NotifyCollectionChangedEventArgs e)
         {
             if (e.NewItems != null)
@@ -461,6 +600,7 @@ namespace Avalonia.Controls
 
         private void OnSecondaryCommandsChanged(object? sender, NotifyCollectionChangedEventArgs e)
         {
+            RebuildSecondaryCommandVisibilitySubscriptions();
             UpdateDynamicOverflow();
         }
 
@@ -476,12 +616,9 @@ namespace Avalonia.Controls
             {
                 _visiblePrimaryCommands.Clear();
                 _overflowItems.Clear();
+                SetOverflowMode(_overflowPrimarySecondarySeparator, false);
 
-                foreach (var item in SecondaryCommands)
-                {
-                    SetOverflowMode(item, true);
-                    _overflowItems.Add(item);
-                }
+                var overflowedPrimaryCommands = new List<ICommandBarElement>();
 
                 var availableWidth = double.IsFinite(_constraintWidth) ? _constraintWidth : Bounds.Width;
 
@@ -516,7 +653,7 @@ namespace Avalonia.Controls
 
                         int primaryNonSepCount = 0;
                         foreach (var item in PrimaryCommands)
-                            if (item is not AppBarSeparator)
+                            if (item is not CommandBarSeparator)
                                 primaryNonSepCount++;
 
                         const double overflowButtonWidth = 48;
@@ -547,14 +684,12 @@ namespace Avalonia.Controls
                             ? a.Order.CompareTo(b.Order)
                             : a.Index.CompareTo(b.Index));
 
-                        // Separators stay in the primary bar but are not counted toward maxItems.
-                        // If no non-separator buttons fit, separators are moved to overflow too.
                         var visibleIndices = new HashSet<int>();
                         int nonSeparatorCount = 0;
                         for (var i = 0; i < prioritized.Count; i++)
                         {
                             var idx = prioritized[i].Index;
-                            if (PrimaryCommands[idx] is AppBarSeparator)
+                            if (PrimaryCommands[idx] is CommandBarSeparator)
                                 visibleIndices.Add(idx);
                             else if (nonSeparatorCount < maxItems)
                             {
@@ -566,6 +701,8 @@ namespace Avalonia.Controls
                         if (nonSeparatorCount == 0)
                             visibleIndices.Clear();
 
+                        TrimOrphanedSeparatorsFromVisibleCommands(PrimaryCommands, visibleIndices);
+
                         for (var i = 0; i < PrimaryCommands.Count; i++)
                         {
                             if (visibleIndices.Contains(i))
@@ -573,15 +710,20 @@ namespace Avalonia.Controls
                                 SetOverflowMode(PrimaryCommands[i], false);
                                 _visiblePrimaryCommands.Add(PrimaryCommands[i]);
                             }
+                            else if (PrimaryCommands[i] is CommandBarSeparator)
+                            {
+                                SetOverflowMode(PrimaryCommands[i], false);
+                            }
                             else
                             {
                                 SetOverflowMode(PrimaryCommands[i], true);
-                                _overflowItems.Add(PrimaryCommands[i]);
+                                overflowedPrimaryCommands.Add(PrimaryCommands[i]);
                             }
                         }
                     }
                 }
 
+                AddOverflowItems(overflowedPrimaryCommands);
                 HasSecondaryCommands = _overflowItems.Count > 0;
                 UpdateOverflowButtonVisibility();
             }
@@ -596,8 +738,8 @@ namespace Avalonia.Controls
 
         private static int GetDynamicOverflowOrder(ICommandBarElement element) => element switch
         {
-            AppBarButton b => b.DynamicOverflowOrder,
-            AppBarToggleButton t => t.DynamicOverflowOrder,
+            CommandBarButton b => b.DynamicOverflowOrder,
+            CommandBarToggleButton t => t.DynamicOverflowOrder,
             _ => 0
         };
 
@@ -609,15 +751,17 @@ namespace Avalonia.Controls
             if (SecondaryCommands != null)
                 foreach (var cmd in SecondaryCommands)
                     ApplyLabelPositionToElement(cmd);
+
+            ApplyLabelPositionToElement(_overflowPrimarySecondarySeparator);
         }
 
         private void ApplyLabelPositionToElement(ICommandBarElement element)
         {
             element.IsCompact = DefaultLabelPosition == CommandBarDefaultLabelPosition.Collapsed;
 
-            if (element is AppBarButton abb)
+            if (element is CommandBarButton abb)
                 abb.LabelPosition = DefaultLabelPosition;
-            else if (element is AppBarToggleButton atb)
+            else if (element is CommandBarToggleButton atb)
                 atb.LabelPosition = DefaultLabelPosition;
         }
 
@@ -636,5 +780,121 @@ namespace Avalonia.Controls
                 _ => HasSecondaryCommands // Auto
             };
         }
+
+        private void AddOverflowItems(IReadOnlyList<ICommandBarElement> overflowedPrimaryCommands)
+        {
+            for (var i = 0; i < overflowedPrimaryCommands.Count; i++)
+                _overflowItems.Add(overflowedPrimaryCommands[i]);
+
+            if (overflowedPrimaryCommands.Count > 0 && HasVisibleElements(SecondaryCommands))
+            {
+                SetOverflowMode(_overflowPrimarySecondarySeparator, true);
+                _overflowItems.Add(_overflowPrimarySecondarySeparator);
+            }
+
+            foreach (var item in SecondaryCommands)
+            {
+                SetOverflowMode(item, true);
+                _overflowItems.Add(item);
+            }
+        }
+
+        private void RebuildSecondaryCommandVisibilitySubscriptions()
+        {
+            _secondaryCommandVisibilitySubscriptions.Clear();
+
+            if (SecondaryCommands is null)
+                return;
+
+            for (var i = 0; i < SecondaryCommands.Count; i++)
+            {
+                if (SecondaryCommands[i] is Avalonia.Visual visual)
+                {
+                    bool isInitialValue = true;
+                    visual.GetObservable(Avalonia.Visual.IsVisibleProperty)
+                        .Subscribe(_ =>
+                        {
+                            if (isInitialValue)
+                            {
+                                isInitialValue = false;
+                                return;
+                            }
+
+                            UpdateDynamicOverflow();
+                        })
+                        .DisposeWith(_secondaryCommandVisibilitySubscriptions);
+                }
+            }
+        }
+
+        private static bool HasVisibleElements(IList<ICommandBarElement> commands)
+        {
+            for (var i = 0; i < commands.Count; i++)
+            {
+                if (commands[i] is Avalonia.Visual visual && visual.IsVisible)
+                    return true;
+            }
+
+            return false;
+        }
+
+        private static void TrimOrphanedSeparatorsFromVisibleCommands(
+            IList<ICommandBarElement> commands, HashSet<int> visibleIndices)
+        {
+            var toRemove = new List<int>();
+            for (var i = 0; i < commands.Count; i++)
+            {
+                if (!visibleIndices.Contains(i) || commands[i] is not CommandBarSeparator)
+                    continue;
+
+                bool hasNonSeparatorBefore = FindNonSeparatorInVisibleCommands(
+                    commands, visibleIndices, forward: false, startIndex: i - 1, out _);
+                bool hasNonSeparatorAfter = FindNonSeparatorInVisibleCommands(
+                    commands, visibleIndices, forward: true, startIndex: i + 1, out _);
+
+                if (!hasNonSeparatorBefore || !hasNonSeparatorAfter)
+                    toRemove.Add(i);
+            }
+
+            foreach (var idx in toRemove)
+                visibleIndices.Remove(idx);
+
+            bool previousWasSeparator = false;
+            for (var i = 0; i < commands.Count; i++)
+            {
+                if (!visibleIndices.Contains(i))
+                    continue;
+
+                if (commands[i] is CommandBarSeparator)
+                {
+                    if (previousWasSeparator)
+                        visibleIndices.Remove(i);
+                    else
+                        previousWasSeparator = true;
+                }
+                else
+                {
+                    previousWasSeparator = false;
+                }
+            }
+        }
+
+        private static bool FindNonSeparatorInVisibleCommands(
+            IList<ICommandBarElement> commands, HashSet<int> visibleIndices,
+            bool forward, int startIndex, out int foundIndex)
+        {
+            foundIndex = -1;
+            var i = startIndex;
+            while (forward ? i < commands.Count : i >= 0)
+            {
+                if (visibleIndices.Contains(i) && commands[i] is not CommandBarSeparator)
+                {
+                    foundIndex = i;
+                    return true;
+                }
+                i += forward ? 1 : -1;
+            }
+            return false;
+        }
     }
 }
diff --git a/src/Avalonia.Controls/CommandBar/AppBarButton.cs b/src/Avalonia.Controls/CommandBar/CommandBarButton.cs
similarity index 80%
rename from src/Avalonia.Controls/CommandBar/AppBarButton.cs
rename to src/Avalonia.Controls/CommandBar/CommandBarButton.cs
index 9e251f77bf..776f4edc47 100644
--- a/src/Avalonia.Controls/CommandBar/AppBarButton.cs
+++ b/src/Avalonia.Controls/CommandBar/CommandBarButton.cs
@@ -3,49 +3,49 @@ namespace Avalonia.Controls
     /// <summary>
     /// A button for use in a <see cref="CommandBar"/>.
     /// </summary>
-    public class AppBarButton : Button, ICommandBarElement
+    public class CommandBarButton : Button, ICommandBarElement
     {
-        static AppBarButton()
+        static CommandBarButton()
         {
-            ForegroundProperty.Changed.AddClassHandler<AppBarButton>((x, _) => x.UpdateIconForeground());
-            IconProperty.Changed.AddClassHandler<AppBarButton>((x, _) => x.UpdateIconForeground());
+            ForegroundProperty.Changed.AddClassHandler<CommandBarButton>((x, _) => x.UpdateIconForeground());
+            IconProperty.Changed.AddClassHandler<CommandBarButton>((x, _) => x.UpdateIconForeground());
         }
 
         /// <summary>
         /// Defines the <see cref="Label"/> property.
         /// </summary>
         public static readonly StyledProperty<string?> LabelProperty =
-            AvaloniaProperty.Register<AppBarButton, string?>(nameof(Label));
+            AvaloniaProperty.Register<CommandBarButton, string?>(nameof(Label));
 
         /// <summary>
         /// Defines the <see cref="Icon"/> property.
         /// </summary>
         public static readonly StyledProperty<object?> IconProperty =
-            AvaloniaProperty.Register<AppBarButton, object?>(nameof(Icon));
+            AvaloniaProperty.Register<CommandBarButton, object?>(nameof(Icon));
 
         /// <summary>
         /// Defines the <see cref="IsCompact"/> property.
         /// </summary>
         public static readonly StyledProperty<bool> IsCompactProperty =
-            AvaloniaProperty.Register<AppBarButton, bool>(nameof(IsCompact));
+            AvaloniaProperty.Register<CommandBarButton, bool>(nameof(IsCompact));
 
         /// <summary>
         /// Defines the <see cref="DynamicOverflowOrder"/> property.
         /// </summary>
         public static readonly StyledProperty<int> DynamicOverflowOrderProperty =
-            AvaloniaProperty.Register<AppBarButton, int>(nameof(DynamicOverflowOrder));
+            AvaloniaProperty.Register<CommandBarButton, int>(nameof(DynamicOverflowOrder));
 
         /// <summary>
         /// Defines the <see cref="LabelPosition"/> property.
         /// </summary>
         public static readonly StyledProperty<CommandBarDefaultLabelPosition> LabelPositionProperty =
-            AvaloniaProperty.Register<AppBarButton, CommandBarDefaultLabelPosition>(nameof(LabelPosition), CommandBarDefaultLabelPosition.Bottom);
+            AvaloniaProperty.Register<CommandBarButton, CommandBarDefaultLabelPosition>(nameof(LabelPosition), CommandBarDefaultLabelPosition.Bottom);
 
         /// <summary>
         /// Defines the <see cref="IsInOverflow"/> property.
         /// </summary>
         public static readonly StyledProperty<bool> IsInOverflowProperty =
-            AvaloniaProperty.Register<AppBarButton, bool>(nameof(IsInOverflow));
+            AvaloniaProperty.Register<CommandBarButton, bool>(nameof(IsInOverflow));
 
         /// <summary>
         /// Gets or sets the text label for the button.
diff --git a/src/Avalonia.Controls/CommandBar/AppBarSeparator.cs b/src/Avalonia.Controls/CommandBar/CommandBarSeparator.cs
similarity index 81%
rename from src/Avalonia.Controls/CommandBar/AppBarSeparator.cs
rename to src/Avalonia.Controls/CommandBar/CommandBarSeparator.cs
index 53c114528f..16f3868441 100644
--- a/src/Avalonia.Controls/CommandBar/AppBarSeparator.cs
+++ b/src/Avalonia.Controls/CommandBar/CommandBarSeparator.cs
@@ -1,23 +1,21 @@
-using Avalonia.Controls.Primitives;
-
 namespace Avalonia.Controls
 {
     /// <summary>
     /// A visual separator for use in a <see cref="CommandBar"/>.
     /// </summary>
-    public class AppBarSeparator : TemplatedControl, ICommandBarElement
+    public class CommandBarSeparator : Separator, ICommandBarElement
     {
         /// <summary>
         /// Defines the <see cref="IsCompact"/> property.
         /// </summary>
         public static readonly StyledProperty<bool> IsCompactProperty =
-            AvaloniaProperty.Register<AppBarSeparator, bool>(nameof(IsCompact));
+            AvaloniaProperty.Register<CommandBarSeparator, bool>(nameof(IsCompact));
 
         /// <summary>
         /// Defines the <see cref="IsInOverflow"/> property.
         /// </summary>
         public static readonly StyledProperty<bool> IsInOverflowProperty =
-            AvaloniaProperty.Register<AppBarSeparator, bool>(nameof(IsInOverflow));
+            AvaloniaProperty.Register<CommandBarSeparator, bool>(nameof(IsInOverflow));
 
         /// <summary>
         /// Gets or sets whether the separator is in compact mode.
diff --git a/src/Avalonia.Controls/CommandBar/AppBarToggleButton.cs b/src/Avalonia.Controls/CommandBar/CommandBarToggleButton.cs
similarity index 79%
rename from src/Avalonia.Controls/CommandBar/AppBarToggleButton.cs
rename to src/Avalonia.Controls/CommandBar/CommandBarToggleButton.cs
index 2476e3cb93..6d7ce4b61e 100644
--- a/src/Avalonia.Controls/CommandBar/AppBarToggleButton.cs
+++ b/src/Avalonia.Controls/CommandBar/CommandBarToggleButton.cs
@@ -5,49 +5,49 @@ namespace Avalonia.Controls
     /// <summary>
     /// A toggle button for use in a <see cref="CommandBar"/>.
     /// </summary>
-    public class AppBarToggleButton : ToggleButton, ICommandBarElement
+    public class CommandBarToggleButton : ToggleButton, ICommandBarElement
     {
-        static AppBarToggleButton()
+        static CommandBarToggleButton()
         {
-            ForegroundProperty.Changed.AddClassHandler<AppBarToggleButton>((x, _) => x.UpdateIconForeground());
-            IconProperty.Changed.AddClassHandler<AppBarToggleButton>((x, _) => x.UpdateIconForeground());
+            ForegroundProperty.Changed.AddClassHandler<CommandBarToggleButton>((x, _) => x.UpdateIconForeground());
+            IconProperty.Changed.AddClassHandler<CommandBarToggleButton>((x, _) => x.UpdateIconForeground());
         }
 
         /// <summary>
         /// Defines the <see cref="Label"/> property.
         /// </summary>
         public static readonly StyledProperty<string?> LabelProperty =
-            AvaloniaProperty.Register<AppBarToggleButton, string?>(nameof(Label));
+            AvaloniaProperty.Register<CommandBarToggleButton, string?>(nameof(Label));
 
         /// <summary>
         /// Defines the <see cref="Icon"/> property.
         /// </summary>
         public static readonly StyledProperty<object?> IconProperty =
-            AvaloniaProperty.Register<AppBarToggleButton, object?>(nameof(Icon));
+            AvaloniaProperty.Register<CommandBarToggleButton, object?>(nameof(Icon));
 
         /// <summary>
         /// Defines the <see cref="IsCompact"/> property.
         /// </summary>
         public static readonly StyledProperty<bool> IsCompactProperty =
-            AvaloniaProperty.Register<AppBarToggleButton, bool>(nameof(IsCompact));
+            AvaloniaProperty.Register<CommandBarToggleButton, bool>(nameof(IsCompact));
 
         /// <summary>
         /// Defines the <see cref="DynamicOverflowOrder"/> property.
         /// </summary>
         public static readonly StyledProperty<int> DynamicOverflowOrderProperty =
-            AvaloniaProperty.Register<AppBarToggleButton, int>(nameof(DynamicOverflowOrder));
+            AvaloniaProperty.Register<CommandBarToggleButton, int>(nameof(DynamicOverflowOrder));
 
         /// <summary>
         /// Defines the <see cref="LabelPosition"/> property.
         /// </summary>
         public static readonly StyledProperty<CommandBarDefaultLabelPosition> LabelPositionProperty =
-            AvaloniaProperty.Register<AppBarToggleButton, CommandBarDefaultLabelPosition>(nameof(LabelPosition), CommandBarDefaultLabelPosition.Bottom);
+            AvaloniaProperty.Register<CommandBarToggleButton, CommandBarDefaultLabelPosition>(nameof(LabelPosition), CommandBarDefaultLabelPosition.Bottom);
 
         /// <summary>
         /// Defines the <see cref="IsInOverflow"/> property.
         /// </summary>
         public static readonly StyledProperty<bool> IsInOverflowProperty =
-            AvaloniaProperty.Register<AppBarToggleButton, bool>(nameof(IsInOverflow));
+            AvaloniaProperty.Register<CommandBarToggleButton, bool>(nameof(IsInOverflow));
 
         /// <summary>
         /// Gets or sets the text label for the button.
diff --git a/src/Avalonia.Controls/DateTimePickers/DatePickerPresenter.cs b/src/Avalonia.Controls/DateTimePickers/DatePickerPresenter.cs
index bfe928309f..eac695b0b1 100644
--- a/src/Avalonia.Controls/DateTimePickers/DatePickerPresenter.cs
+++ b/src/Avalonia.Controls/DateTimePickers/DatePickerPresenter.cs
@@ -457,18 +457,17 @@ namespace Avalonia.Controls
                 }
             }
 
-            ConfigureSpacer(items._firstSpacer, columnIndex > 1);
-            ConfigureSpacer(items._secondSpacer, columnIndex > 2);
+            ConfigureSpacer(items._firstSpacer, columnIndex > 1, 1);
+            ConfigureSpacer(items._secondSpacer, columnIndex > 2, 3);
+            return;
 
-            static void ConfigureSpacer(Control? spacer, bool visible)
+            static void ConfigureSpacer(Control? spacer, bool visible, int column)
             {
                 if (spacer == null)
                     return;
-
                 // ternary conditional operator is used to make sure grid cells will be validated
-                Grid.SetColumn(spacer, visible ? 1 : 0);
+                Grid.SetColumn(spacer, visible ? column : 0);
                 spacer.IsVisible = visible;
-
             }
         }
 
diff --git a/src/Avalonia.Controls/Design.cs b/src/Avalonia.Controls/Design.cs
index 1e7912d75f..1f7dd4d934 100644
--- a/src/Avalonia.Controls/Design.cs
+++ b/src/Avalonia.Controls/Design.cs
@@ -303,11 +303,11 @@ namespace Avalonia.Controls
         public static void ApplyDesignModeProperties(Control target, Control source)
         {
             if (source.IsSet(WidthProperty))
-                target.Bind(Layoutable.WidthProperty, target.GetBindingObservable(WidthProperty));
+                target.Bind(Layoutable.WidthProperty, source[!WidthProperty]);
             if (source.IsSet(HeightProperty))
-                target.Bind(Layoutable.HeightProperty, target.GetBindingObservable(HeightProperty));
+                target.Bind(Layoutable.HeightProperty, source[!HeightProperty]);
             if (source.IsSet(DataContextProperty))
-                target.Bind(StyledElement.DataContextProperty, target.GetBindingObservable(DataContextProperty));
+                target.Bind(StyledElement.DataContextProperty, source[!DataContextProperty]);
             if (source.IsSet(DesignStyleProperty))
                 target.Styles.Add(GetDesignStyle(source));
         }
diff --git a/src/Avalonia.Controls/Page/CarouselPage.cs b/src/Avalonia.Controls/Page/CarouselPage.cs
index 1b640fd528..22bee65871 100644
--- a/src/Avalonia.Controls/Page/CarouselPage.cs
+++ b/src/Avalonia.Controls/Page/CarouselPage.cs
@@ -1,6 +1,6 @@
+using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
 using Avalonia.Animation;
 using Avalonia.Automation;
 using Avalonia.Automation.Peers;
@@ -11,7 +11,6 @@ using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
 using Avalonia.Input;
 using Avalonia.Interactivity;
-using Avalonia.Media;
 using Avalonia.Threading;
 
 namespace Avalonia.Controls
@@ -111,6 +110,8 @@ namespace Avalonia.Controls
             set => SetValue(IsKeyboardNavigationEnabledProperty, value);
         }
 
+        protected override Type StyleKeyOverride => typeof(CarouselPage);
+
         protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
             base.OnApplyTemplate(e);
diff --git a/src/Avalonia.Controls/Page/ContentPage.cs b/src/Avalonia.Controls/Page/ContentPage.cs
index b7523b4688..41fec8d1fc 100644
--- a/src/Avalonia.Controls/Page/ContentPage.cs
+++ b/src/Avalonia.Controls/Page/ContentPage.cs
@@ -151,6 +151,8 @@ namespace Avalonia.Controls
 
         protected override AutomationPeer OnCreateAutomationPeer() => new ContentPageAutomationPeer(this);
 
+        protected override Type StyleKeyOverride => typeof(ContentPage);
+
         protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
             base.OnApplyTemplate(e);
diff --git a/src/Avalonia.Controls/Page/DrawerPage.cs b/src/Avalonia.Controls/Page/DrawerPage.cs
index 954ec9c918..e2cefeb5d9 100644
--- a/src/Avalonia.Controls/Page/DrawerPage.cs
+++ b/src/Avalonia.Controls/Page/DrawerPage.cs
@@ -124,6 +124,18 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<object?> DrawerFooterProperty =
             AvaloniaProperty.Register<DrawerPage, object?>(nameof(DrawerFooter));
 
+        /// <summary>
+        /// Defines the <see cref="DrawerHeaderTemplate"/> property.
+        /// </summary>
+        public static readonly StyledProperty<IDataTemplate?> DrawerHeaderTemplateProperty =
+            AvaloniaProperty.Register<DrawerPage, IDataTemplate?>(nameof(DrawerHeaderTemplate));
+
+        /// <summary>
+        /// Defines the <see cref="DrawerFooterTemplate"/> property.
+        /// </summary>
+        public static readonly StyledProperty<IDataTemplate?> DrawerFooterTemplateProperty =
+            AvaloniaProperty.Register<DrawerPage, IDataTemplate?>(nameof(DrawerFooterTemplate));
+
         /// <summary>
         /// Defines the <see cref="DrawerIcon"/> property.
         /// </summary>
@@ -403,6 +415,7 @@ namespace Avalonia.Controls
         /// <summary>
         /// Gets or sets the header content displayed at the top of the drawer pane.
         /// </summary>
+        [DependsOn(nameof(DrawerHeaderTemplate))]
         public object? DrawerHeader
         {
             get => GetValue(DrawerHeaderProperty);
@@ -412,12 +425,31 @@ namespace Avalonia.Controls
         /// <summary>
         /// Gets or sets the footer content displayed at the bottom of the drawer pane.
         /// </summary>
+        [DependsOn(nameof(DrawerFooterTemplate))]
         public object? DrawerFooter
         {
             get => GetValue(DrawerFooterProperty);
             set => SetValue(DrawerFooterProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets the data template used to display <see cref="DrawerHeader"/>.
+        /// </summary>
+        public IDataTemplate? DrawerHeaderTemplate
+        {
+            get => GetValue(DrawerHeaderTemplateProperty);
+            set => SetValue(DrawerHeaderTemplateProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the data template used to display <see cref="DrawerFooter"/>.
+        /// </summary>
+        public IDataTemplate? DrawerFooterTemplate
+        {
+            get => GetValue(DrawerFooterTemplateProperty);
+            set => SetValue(DrawerFooterTemplateProperty, value);
+        }
+
         /// <summary>
         /// Gets or sets the icon displayed in the drawer toggle button.
         /// </summary>
@@ -535,6 +567,8 @@ namespace Avalonia.Controls
             set => SetValue(DisplayModeProperty, value);
         }
 
+        protected override Type StyleKeyOverride => typeof(DrawerPage);
+
         protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
             base.OnApplyTemplate(e);
diff --git a/src/Avalonia.Controls/Page/NavigationPage.cs b/src/Avalonia.Controls/Page/NavigationPage.cs
index 8e38fbbdbc..525851af89 100644
--- a/src/Avalonia.Controls/Page/NavigationPage.cs
+++ b/src/Avalonia.Controls/Page/NavigationPage.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
@@ -7,14 +6,13 @@ using Avalonia.Animation;
 using Avalonia.Automation;
 using Avalonia.Automation.Peers;
 using Avalonia.Controls.Metadata;
-using Avalonia.Logging;
-using Avalonia.LogicalTree;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
-using Avalonia.Controls.Shapes;
 using Avalonia.Input;
 using Avalonia.Input.GestureRecognizers;
 using Avalonia.Interactivity;
+using Avalonia.Logging;
+using Avalonia.LogicalTree;
 using Avalonia.Media;
 using Avalonia.Metadata;
 using Avalonia.Reactive;
@@ -63,13 +61,14 @@ namespace Avalonia.Controls
         private ContentPresenter? _modalPresenter;
         private ContentPresenter? _topCommandBarPresenter;
         private IDisposable? _hasNavigationBarSub;
+        private IDisposable? _hasBackButtonSub;
         private IDisposable? _isBackButtonEnabledSub;
         private IDisposable? _barLayoutBehaviorSub;
         private IDisposable? _barHeightSub;
         private IDisposable? _backButtonContentSub;
         private bool _isNavigating;
         private bool _canGoBack;
-        private bool? _isBackButtonEffectivelyVisible;
+        private bool _isBackButtonEffectivelyVisible;
         private bool _isNavBarEffectivelyVisible;
         private double _effectiveBarHeight;
         private bool _isBackButtonEffectivelyEnabled;
@@ -110,8 +109,8 @@ namespace Avalonia.Controls
         /// <summary>
         /// Defines the <see cref="IsBackButtonEffectivelyVisible"/> property.
         /// </summary>
-        public static readonly DirectProperty<NavigationPage, bool?> IsBackButtonEffectivelyVisibleProperty =
-            AvaloniaProperty.RegisterDirect<NavigationPage, bool?>(nameof(IsBackButtonEffectivelyVisible), o => o.IsBackButtonEffectivelyVisible);
+        public static readonly DirectProperty<NavigationPage, bool> IsBackButtonEffectivelyVisibleProperty =
+            AvaloniaProperty.RegisterDirect<NavigationPage, bool>(nameof(IsBackButtonEffectivelyVisible), o => o.IsBackButtonEffectivelyVisible);
 
         /// <summary>
         /// Defines the <see cref="IsNavBarEffectivelyVisible"/> property.
@@ -330,7 +329,7 @@ namespace Avalonia.Controls
         /// <summary>
         /// Gets the effective back-button visibility.
         /// </summary>
-        public bool? IsBackButtonEffectivelyVisible
+        public bool IsBackButtonEffectivelyVisible
         {
             get => _isBackButtonEffectivelyVisible;
             private set => SetAndRaise(IsBackButtonEffectivelyVisibleProperty, ref _isBackButtonEffectivelyVisible, value);
@@ -618,6 +617,8 @@ namespace Avalonia.Controls
             }
         }
 
+        protected override Type StyleKeyOverride => typeof(NavigationPage);
+
         protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             if (change.Property == PagesProperty &&
@@ -730,6 +731,8 @@ namespace Avalonia.Controls
 
             _hasNavigationBarSub?.Dispose();
             _hasNavigationBarSub = null;
+            _hasBackButtonSub?.Dispose();
+            _hasBackButtonSub = null;
             _isBackButtonEnabledSub?.Dispose();
             _isBackButtonEnabledSub = null;
             _barLayoutBehaviorSub?.Dispose();
@@ -1840,6 +1843,9 @@ namespace Avalonia.Controls
             _hasNavigationBarSub?.Dispose();
             _hasNavigationBarSub = null;
 
+            _hasBackButtonSub?.Dispose();
+            _hasBackButtonSub = null;
+
             _isBackButtonEnabledSub?.Dispose();
             _isBackButtonEnabledSub = null;
 
@@ -1857,6 +1863,9 @@ namespace Avalonia.Controls
                 _hasNavigationBarSub = page.GetObservable(HasNavigationBarProperty)
                     .Subscribe(new AnonymousObserver<bool>(_ => UpdateIsNavBarEffectivelyVisible()));
 
+                _hasBackButtonSub = page.GetObservable(HasBackButtonProperty)
+                    .Subscribe(new AnonymousObserver<bool>(_ => UpdateIsBackButtonEffectivelyVisible()));
+
                 _isBackButtonEnabledSub = page.GetObservable(IsBackButtonEnabledProperty)
                     .Subscribe(new AnonymousObserver<bool>(_ => UpdateIsBackButtonEffectivelyEnabled()));
 
diff --git a/src/Avalonia.Controls/Page/Page.cs b/src/Avalonia.Controls/Page/Page.cs
index a12ce76ddf..4dcb84312d 100644
--- a/src/Avalonia.Controls/Page/Page.cs
+++ b/src/Avalonia.Controls/Page/Page.cs
@@ -26,6 +26,12 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<object?> HeaderProperty =
             AvaloniaProperty.Register<Page, object?>(nameof(Header));
 
+        /// <summary>
+        /// Defines the <see cref="HeaderTemplate"/> property.
+        /// </summary>
+        public static readonly StyledProperty<IDataTemplate?> HeaderTemplateProperty =
+            AvaloniaProperty.Register<Page, IDataTemplate?>(nameof(HeaderTemplate));
+
         /// <summary>
         /// Defines the <see cref="Icon"/> property.
         /// </summary>
@@ -92,6 +98,15 @@ namespace Avalonia.Controls
             set => SetValue(HeaderProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets the data template used to display the header.
+        /// </summary>
+        public IDataTemplate? HeaderTemplate
+        {
+            get => GetValue(HeaderTemplateProperty);
+            set => SetValue(HeaderTemplateProperty, value);
+        }
+
         /// <summary>
         /// Gets or sets the icon displayed alongside the page header.
         /// </summary>
diff --git a/src/Avalonia.Controls/Page/TabbedPage.cs b/src/Avalonia.Controls/Page/TabbedPage.cs
index 69815eb56a..89e926dc3c 100644
--- a/src/Avalonia.Controls/Page/TabbedPage.cs
+++ b/src/Avalonia.Controls/Page/TabbedPage.cs
@@ -9,7 +9,6 @@ using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
 using Avalonia.Input;
 using Avalonia.Input.GestureRecognizers;
-using Avalonia.LogicalTree;
 using Avalonia.Threading;
 
 namespace Avalonia.Controls
@@ -150,6 +149,8 @@ namespace Avalonia.Controls
             set => SetValue(IndicatorTemplateProperty, value);
         }
 
+        protected override Type StyleKeyOverride => typeof(TabbedPage);
+
         protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
         {
             base.OnAttachedToVisualTree(e);
diff --git a/src/Avalonia.Controls/PipsPager/PipsPager.cs b/src/Avalonia.Controls/PipsPager/PipsPager.cs
index b976df4826..a83c4ade0d 100644
--- a/src/Avalonia.Controls/PipsPager/PipsPager.cs
+++ b/src/Avalonia.Controls/PipsPager/PipsPager.cs
@@ -87,16 +87,16 @@ namespace Avalonia.Controls
                 x => x.TemplateSettings);
 
         /// <summary>
-        /// Defines the <see cref="PreviousButtonStyle"/> property.
+        /// Defines the <see cref="PreviousButtonTheme"/> property.
         /// </summary>
-        public static readonly StyledProperty<ControlTheme?> PreviousButtonStyleProperty =
-            AvaloniaProperty.Register<PipsPager, ControlTheme?>(nameof(PreviousButtonStyle));
+        public static readonly StyledProperty<ControlTheme?> PreviousButtonThemeProperty =
+            AvaloniaProperty.Register<PipsPager, ControlTheme?>(nameof(PreviousButtonTheme));
 
         /// <summary>
-        /// Defines the <see cref="NextButtonStyle"/> property.
+        /// Defines the <see cref="NextButtonTheme"/> property.
         /// </summary>
-        public static readonly StyledProperty<ControlTheme?> NextButtonStyleProperty =
-            AvaloniaProperty.Register<PipsPager, ControlTheme?>(nameof(NextButtonStyle));
+        public static readonly StyledProperty<ControlTheme?> NextButtonThemeProperty =
+            AvaloniaProperty.Register<PipsPager, ControlTheme?>(nameof(NextButtonTheme));
 
         /// <summary>
         /// Defines the <see cref="SelectedIndexChanged"/> event.
@@ -195,21 +195,21 @@ namespace Avalonia.Controls
         }
 
         /// <summary>
-        /// Gets or sets the style for the previous button.
+        /// Gets or sets the theme for the previous button.
         /// </summary>
-        public ControlTheme? PreviousButtonStyle
+        public ControlTheme? PreviousButtonTheme
         {
-            get => GetValue(PreviousButtonStyleProperty);
-            set => SetValue(PreviousButtonStyleProperty, value);
+            get => GetValue(PreviousButtonThemeProperty);
+            set => SetValue(PreviousButtonThemeProperty, value);
         }
 
         /// <summary>
-        /// Gets or sets the style for the next button.
+        /// Gets or sets the theme for the next button.
         /// </summary>
-        public ControlTheme? NextButtonStyle
+        public ControlTheme? NextButtonTheme
         {
-            get => GetValue(NextButtonStyleProperty);
-            set => SetValue(NextButtonStyleProperty, value);
+            get => GetValue(NextButtonThemeProperty);
+            set => SetValue(NextButtonThemeProperty, value);
         }
 
         /// <inheritdoc/>
diff --git a/src/Avalonia.Controls/Platform/IWindowImpl.cs b/src/Avalonia.Controls/Platform/IWindowImpl.cs
index 7a55a0386b..d864ca35c3 100644
--- a/src/Avalonia.Controls/Platform/IWindowImpl.cs
+++ b/src/Avalonia.Controls/Platform/IWindowImpl.cs
@@ -16,6 +16,14 @@ namespace Avalonia.Platform
         /// Gets or sets the minimized/maximized state of the window.
         /// </summary>
         WindowState WindowState { get; set; }
+        
+        /// <summary>
+        /// Indicates if platform implementation has a working getter for <see cref="WindowState"/> that produces
+        /// consistent results with WindowStateChanged callback.
+        /// If false, Window will not call the getter and will only use the setter and
+        /// <see cref="WindowStateChanged"/> callback to track window state.
+        /// </summary>
+        bool WindowStateGetterIsUsable { get; }
 
         /// <summary>
         /// Gets or sets a method called when the minimized/maximized state of the window changes.
@@ -154,5 +162,15 @@ namespace Avalonia.Platform
         /// </summary>
         /// <param name="titleBarHeight">-1 for platform default, otherwise the height in DIPs.</param>
         void SetExtendClientAreaTitleBarHeightHint(double titleBarHeight);
+
+        /// <summary>
+        /// Gets the window actions that the underlying platform currently allows.
+        /// </summary>
+        PlatformAllowedWindowActions AllowedWindowActions => PlatformAllowedWindowActions.All;
+
+        /// <summary>
+        /// Gets or sets a callback invoked when <see cref="AllowedWindowActions"/> changes.
+        /// </summary>
+        Action<PlatformAllowedWindowActions>? AllowedWindowActionsChanged { get => null; set { } }
     }
 }
diff --git a/src/Avalonia.Controls/Platform/InProcessDragSource.cs b/src/Avalonia.Controls/Platform/InProcessDragSource.cs
index 1a7b719499..6a8b79eab6 100644
--- a/src/Avalonia.Controls/Platform/InProcessDragSource.cs
+++ b/src/Avalonia.Controls/Platform/InProcessDragSource.cs
@@ -31,7 +31,7 @@ namespace Avalonia.Platform
         }
 
         public async Task<DragDropEffects> DoDragDropAsync(
-            PointerEventArgs triggerEvent,
+            PointerPressedEventArgs triggerEvent,
             IDataTransfer dataTransfer,
             DragDropEffects allowedEffects)
         {
diff --git a/src/Avalonia.Controls/Platform/PlatformAllowedWindowActions.cs b/src/Avalonia.Controls/Platform/PlatformAllowedWindowActions.cs
new file mode 100644
index 0000000000..35871c0803
--- /dev/null
+++ b/src/Avalonia.Controls/Platform/PlatformAllowedWindowActions.cs
@@ -0,0 +1,33 @@
+using System;
+using Avalonia.Metadata;
+
+namespace Avalonia.Controls.Platform;
+
+/// <summary>
+/// Flags indicating which window actions the underlying platform supports.
+/// </summary>
+[Flags, PrivateApi]
+public enum PlatformAllowedWindowActions
+{
+    None = 0,
+
+    /// <summary>
+    /// The underlying platform supports maximizing/unmaximizing windows.
+    /// </summary>
+    Maximize = 1 << 0,
+
+    /// <summary>
+    /// The underlying platform supports fullscreen mode.
+    /// </summary>
+    Fullscreen = 1 << 1,
+
+    /// <summary>
+    /// The underlying platform supports minimizing windows.
+    /// </summary>
+    Minimize = 1 << 2,
+
+    /// <summary>
+    /// All actions are supported (default when the underlying platform does not report capabilities).
+    /// </summary>
+    All = Maximize | Fullscreen | Minimize,
+}
diff --git a/src/Avalonia.Controls/PresentationSource/PresentationSource.RenderRoot.cs b/src/Avalonia.Controls/PresentationSource/PresentationSource.RenderRoot.cs
index d017cb3f5c..2a9e833a48 100644
--- a/src/Avalonia.Controls/PresentationSource/PresentationSource.RenderRoot.cs
+++ b/src/Avalonia.Controls/PresentationSource/PresentationSource.RenderRoot.cs
@@ -1,5 +1,6 @@
-using System;
 using Avalonia.Input;
+using System;
+using Avalonia.Layout;
 using Avalonia.Rendering;
 using Avalonia.Rendering.Composition;
 
@@ -7,7 +8,6 @@ namespace Avalonia.Controls;
 
 internal partial class PresentationSource
 {
-    private readonly Func<Size> _clientSizeProvider;
     public CompositingRenderer Renderer { get; }
     IRenderer IPresentationSource.Renderer => Renderer;
     Visual IPresentationSource.RootVisual => RootVisual;
@@ -15,8 +15,8 @@ internal partial class PresentationSource
     //TODO: Can we PLEASE get rid of this abomination in tests and use actual hit-testing engine instead?
     public IHitTester? HitTesterOverride { get; set; }
     
-    public double RenderScaling => PlatformImpl?.RenderScaling ?? 1;
-    public Size ClientSize => _clientSizeProvider();
+    public double RenderScaling { get; private set; } = 1.0;
+    public Size ClientSize => PlatformImpl?.ClientSize ?? default;
     
     public void SceneInvalidated(object? sender, SceneInvalidatedEventArgs sceneInvalidatedEventArgs)
     {
@@ -26,4 +26,7 @@ internal partial class PresentationSource
     public PixelPoint PointToScreen(Point point) => PlatformImpl?.PointToScreen(point) ?? default;
 
     public Point PointToClient(PixelPoint point) => PlatformImpl?.PointToClient(point) ?? default;
-}
\ No newline at end of file
+
+    private void HandleScalingChanged(double scaling)
+        => RenderScaling = LayoutHelper.ValidateScaling(scaling);
+}
diff --git a/src/Avalonia.Controls/PresentationSource/PresentationSource.cs b/src/Avalonia.Controls/PresentationSource/PresentationSource.cs
index 9917f82c93..8f298d2e30 100644
--- a/src/Avalonia.Controls/PresentationSource/PresentationSource.cs
+++ b/src/Avalonia.Controls/PresentationSource/PresentationSource.cs
@@ -23,18 +23,19 @@ internal partial class PresentationSource : IPresentationSource, IInputRoot, IDi
 
     public PresentationSource(InputElement rootVisual, InputElement defaultFocusVisual,
         ITopLevelImpl platformImpl,
-        IAvaloniaDependencyResolver dependencyResolver, Func<Size> clientSizeProvider)
+        IAvaloniaDependencyResolver dependencyResolver)
     {
-        _clientSizeProvider = clientSizeProvider;
-
         PlatformImpl = platformImpl;
 
-    
+
         _inputManager = TryGetService<IInputManager>(dependencyResolver);
         _handleInputCore = HandleInputCore;
         
         PlatformImpl.SetInputRoot(this);
         PlatformImpl.Input = HandleInput;
+
+        RenderScaling = LayoutHelper.ValidateScaling(platformImpl.RenderScaling);
+        PlatformImpl.ScalingChanged += HandleScalingChanged;
         
         _pointerOverPreProcessor = new PointerOverPreProcessor(this);
         _pointerOverPreProcessorSubscription = _inputManager?.PreProcess.Subscribe(_pointerOverPreProcessor);
@@ -83,6 +84,7 @@ internal partial class PresentationSource : IPresentationSource, IInputRoot, IDi
         // We need to wait for the renderer to complete any in-flight operations
         Renderer.Dispose();
 
+        PlatformImpl?.ScalingChanged -= HandleScalingChanged;
         PlatformImpl = null;
         _pointerOverPreProcessor?.OnCompleted();
         _pointerOverPreProcessorSubscription?.Dispose();
diff --git a/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs b/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs
index 89993d8e66..395c24824f 100644
--- a/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs
@@ -535,6 +535,8 @@ namespace Avalonia.Controls.Presenters
                 var scrollable = Child as ILogicalScrollable;
                 var isLogical = scrollable?.IsLogicalScrollEnabled == true;
                 var logicalScrollItemSize = new Vector(1, 1);
+                var canXScroll = false;
+                var canYScroll = false;
 
                 double x = Offset.X;
                 double y = Offset.Y;
@@ -565,6 +567,8 @@ namespace Avalonia.Controls.Presenters
                     y += dy;
                     y = Math.Max(y, 0);
                     y = Math.Min(y, Extent.Height - Viewport.Height);
+
+                    canYScroll = dy != 0;
                 }
 
                 if (Extent.Width > Viewport.Width)
@@ -581,6 +585,8 @@ namespace Avalonia.Controls.Presenters
                     x += dx;
                     x = Math.Max(x, 0);
                     x = Math.Min(x, Extent.Width - Viewport.Width);
+
+                    canXScroll = dx != 0;
                 }
 
                 if (isLogical)
@@ -615,6 +621,12 @@ namespace Avalonia.Controls.Presenters
 
                 e.Handled = !IsScrollChainingEnabled || offsetChanged;
 
+                if(!e.Handled && !IsScrollChainingEnabled)
+                {
+                    // Gesture may cause an overscroll so we mark the event as handled if it did.
+                    e.Handled = canXScroll || canYScroll;
+                }
+
                 e.ShouldEndScrollGesture = !IsScrollChainingEnabled && !offsetChanged;
             }
         }
diff --git a/src/Avalonia.Controls/Presenters/TextPresenter.cs b/src/Avalonia.Controls/Presenters/TextPresenter.cs
index 05c74b39e5..b7d52e9894 100644
--- a/src/Avalonia.Controls/Presenters/TextPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/TextPresenter.cs
@@ -1,14 +1,14 @@
 using System;
 using System.Collections.Generic;
-using System.Data;
 using Avalonia.Controls.Documents;
 using Avalonia.Controls.Primitives;
-using Avalonia.Interactivity;
+using Avalonia.Input;
 using Avalonia.Layout;
 using Avalonia.Media;
 using Avalonia.Media.Immutable;
 using Avalonia.Media.TextFormatting;
 using Avalonia.Metadata;
+using Avalonia.Platform;
 using Avalonia.Threading;
 using Avalonia.Utilities;
 using Avalonia.VisualTree;
@@ -334,6 +334,7 @@ namespace Avalonia.Controls.Presenters
         protected override bool BypassFlowDirectionPolicies => true;
 
         internal TextSelectionHandleCanvas? TextSelectionHandleCanvas { get; set; }
+        internal TextBoxTextInputMethodClient? CurrentImClient { get; set; }
 
         /// <summary>
         /// Creates the <see cref="TextLayout"/> used to render the text.
@@ -496,7 +497,6 @@ namespace Avalonia.Controls.Presenters
         public void HideCaret()
         {
             _caretBlink = false;
-            RemoveTextSelectionCanvas();
             _caretTimer?.Stop();
             InvalidateTextLayout();
         }
@@ -647,7 +647,7 @@ namespace Avalonia.Controls.Presenters
             InvalidateArrange();
 
             // The textWidth used here is matching that TextBlock uses to measure the text.
-            var textWidth = TextLayout.OverhangLeading + TextLayout.WidthIncludingTrailingWhitespace + TextLayout.OverhangTrailing;
+            var textWidth = TextLayout.WidthIncludingTrailingWhitespace;
             return new Size(textWidth, TextLayout.Height);
         }
 
@@ -655,7 +655,7 @@ namespace Avalonia.Controls.Presenters
         {
             var finalWidth = finalSize.Width;
 
-            var textWidth = TextLayout.OverhangLeading + TextLayout.WidthIncludingTrailingWhitespace + TextLayout.OverhangTrailing;
+            var textWidth = TextLayout.WidthIncludingTrailingWhitespace;
             textWidth = Math.Ceiling(textWidth);
 
             if (finalSize.Width < textWidth)
@@ -944,7 +944,7 @@ namespace Avalonia.Controls.Presenters
             ResetCaretTimer();
         }
 
-        private void EnsureTextSelectionLayer()
+        internal void EnsureTextSelectionLayer()
         {
             if (TextSelectionHandleCanvas == null)
             {
@@ -963,7 +963,7 @@ namespace Avalonia.Controls.Presenters
                 _layer?.Add(TextSelectionHandleCanvas);
         }
 
-        private void RemoveTextSelectionCanvas()
+        internal void RemoveTextSelectionCanvas()
         {
             if(_layer != null && TextSelectionHandleCanvas is { } canvas)
             {
@@ -977,11 +977,8 @@ namespace Avalonia.Controls.Presenters
         protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
         {
             base.OnDetachedFromVisualTree(e);
-            if (TextSelectionHandleCanvas is { } c)
-            {
-                _layer?.Remove(c);
-                c.SetPresenter(null);
-            }
+
+            RemoveTextSelectionCanvas();
 
             if (_caretTimer != null)
             {
@@ -1026,15 +1023,7 @@ namespace Avalonia.Controls.Presenters
                 OnPreeditChanged(PreeditText, PreeditTextCursorPosition);
             }
 
-            if(change.Property == TextProperty)
-            {
-                if (!string.IsNullOrEmpty(PreeditText))
-                {
-                    SetCurrentValue(PreeditTextProperty, null);
-                }
-            }
-
-            if(change.Property == CaretIndexProperty)
+            if(change.Property == TextProperty || change.Property == CaretIndexProperty)
             {
                 if (!string.IsNullOrEmpty(PreeditText))
                 {
@@ -1067,7 +1056,7 @@ namespace Avalonia.Controls.Presenters
                 case nameof(SelectionStart):
                 case nameof(SelectionEnd):
                 case nameof(SelectionForegroundBrush):
-                case nameof(ShowSelectionHighlightProperty):
+                case nameof(ShowSelectionHighlight):
 
                 case nameof(PasswordChar):
                 case nameof(RevealPassword):
diff --git a/src/Avalonia.Controls/Primitives/AdornerLayer.cs b/src/Avalonia.Controls/Primitives/AdornerLayer.cs
index 1c8b24f627..e9a4fe4368 100644
--- a/src/Avalonia.Controls/Primitives/AdornerLayer.cs
+++ b/src/Avalonia.Controls/Primitives/AdornerLayer.cs
@@ -73,7 +73,7 @@ namespace Avalonia.Controls.Primitives
         public static AdornerLayer? GetAdornerLayer(Visual visual)
         {
             // Check if the visual is inside an OverlayLayer with a dedicated AdornerLayer
-            foreach (var ancestor in visual.GetVisualAncestors())
+            foreach (var ancestor in visual.GetSelfAndVisualAncestors())
             {
                 if (GetDirectAdornerLayer(ancestor) is { } adornerLayer)
                     return adornerLayer;
diff --git a/src/Avalonia.Controls/Primitives/OverlayLayer.cs b/src/Avalonia.Controls/Primitives/OverlayLayer.cs
index a9d9b072f2..057995a8c5 100644
--- a/src/Avalonia.Controls/Primitives/OverlayLayer.cs
+++ b/src/Avalonia.Controls/Primitives/OverlayLayer.cs
@@ -29,7 +29,7 @@ namespace Avalonia.Controls.Primitives
         /// <returns>The <see cref="OverlayLayer"/> associated with the visual, or null if no overlay layer exists.</returns>
         public static OverlayLayer? GetOverlayLayer(Visual visual)
         {
-            foreach (var v in visual.GetVisualAncestors())
+            foreach (var v in visual.GetSelfAndVisualAncestors())
                 if (v is VisualLayerManager { OverlayLayer: { } layer })
                     return layer;
 
diff --git a/src/Avalonia.Controls/Primitives/PopupOverlayLayer.cs b/src/Avalonia.Controls/Primitives/PopupOverlayLayer.cs
index 4ca54e3d8f..a335ba080a 100644
--- a/src/Avalonia.Controls/Primitives/PopupOverlayLayer.cs
+++ b/src/Avalonia.Controls/Primitives/PopupOverlayLayer.cs
@@ -11,7 +11,7 @@ namespace Avalonia.Controls.Primitives
 
         public static PopupOverlayLayer? GetPopupOverlayLayer(Visual visual)
         {
-            foreach (var v in visual.GetVisualAncestors())
+            foreach (var v in visual.GetSelfAndVisualAncestors())
                 if (v is VisualLayerManager { PopupOverlayLayer: { } layer })
                     return layer;
 
diff --git a/src/Avalonia.Controls/Primitives/TextSelectionCanvas.cs b/src/Avalonia.Controls/Primitives/TextSelectionCanvas.cs
index 049188008a..9ae80787a5 100644
--- a/src/Avalonia.Controls/Primitives/TextSelectionCanvas.cs
+++ b/src/Avalonia.Controls/Primitives/TextSelectionCanvas.cs
@@ -2,23 +2,33 @@
 using System.Collections.Generic;
 using System.Linq;
 using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Primitives.PopupPositioning;
 using Avalonia.Input;
-using Avalonia.Layout;
+using Avalonia.Interactivity;
+using Avalonia.Media.TextFormatting;
+using Avalonia.Threading;
 using Avalonia.VisualTree;
 
 namespace Avalonia.Controls.Primitives
 {
     internal class TextSelectionHandleCanvas : Canvas
     {
+        private static readonly bool s_shouldWrapAroundSelection;
+
         private const int ContextMenuPadding = 16;
 
         private readonly TextSelectionHandle _caretHandle;
-        private readonly TextSelectionHandle _startHandle;
-        private readonly TextSelectionHandle _endHandle;
+        private readonly TextSelectionHandle _handle1;
+        private readonly TextSelectionHandle _handle2;
         private TextPresenter? _presenter;
         private TextBox? _textBox;
         private bool _showHandle;
-        private bool _canShowContextMenu = true;
+        private IDisposable? _showDisposable;
+        private PresenterVisualListener _layoutListener;
+        private int? _savedSelectionStart;
+        private int? _saveSelectionEnd;
+        private SelectionHandleType? _initialHandleType;
+        private bool _isInTouchMode;
 
         internal bool ShowHandles
         {
@@ -29,8 +39,8 @@ namespace Avalonia.Controls.Primitives
 
                 if (!value)
                 {
-                    _startHandle.IsVisible = false;
-                    _endHandle.IsVisible = false;
+                    _handle1.IsVisible = false;
+                    _handle2.IsVisible = false;
                     _caretHandle.IsVisible = false;
                 }
 
@@ -38,167 +48,297 @@ namespace Avalonia.Controls.Primitives
             }
         }
 
+        static TextSelectionHandleCanvas()
+        {
+            s_shouldWrapAroundSelection = !OperatingSystem.IsAndroid();
+        }
+
         public TextSelectionHandleCanvas()
         {
             _caretHandle = new TextSelectionHandle() { SelectionHandleType = SelectionHandleType.Caret };
-            _startHandle = new TextSelectionHandle();
-            _endHandle = new TextSelectionHandle();
+            _handle1 = new TextSelectionHandle();
+            _handle2 = new TextSelectionHandle();
+
+            _caretHandle.SelectionHandleType = SelectionHandleType.Caret;
+            _handle1.SelectionHandleType = SelectionHandleType.Start;
+            _handle2.SelectionHandleType = SelectionHandleType.End;
 
             Children.Add(_caretHandle);
-            Children.Add(_startHandle);
-            Children.Add(_endHandle);
+            Children.Add(_handle1);
+            Children.Add(_handle2);
 
             _caretHandle.DragStarted += Handle_DragStarted;
             _caretHandle.DragDelta += CaretHandle_DragDelta;
             _caretHandle.DragCompleted += Handle_DragCompleted;
-            _startHandle.DragDelta += StartHandle_DragDelta;
-            _startHandle.DragCompleted += Handle_DragCompleted;
-            _startHandle.DragStarted += Handle_DragStarted;
-            _endHandle.DragDelta += EndHandle_DragDelta;
-            _endHandle.DragCompleted += Handle_DragCompleted;
-            _endHandle.DragStarted += Handle_DragStarted;
-
-            _caretHandle.Classes.Add("caret");
-            _startHandle.Classes.Add("start");
-            _endHandle.Classes.Add("end");
-
-            _startHandle.SetTopLeft(default);
+            _handle1.DragDelta += SelectionHandle_DragDelta;
+            _handle1.DragCompleted += Handle_DragCompleted;
+            _handle1.DragStarted += Handle_DragStarted;
+            _handle2.DragDelta += SelectionHandle_DragDelta;
+            _handle2.DragCompleted += Handle_DragCompleted;
+            _handle2.DragStarted += Handle_DragStarted;
+
+            _handle1.SetTopLeft(default);
             _caretHandle.SetTopLeft(default);
-            _endHandle.SetTopLeft(default);
-
-            _startHandle.PointerReleased += Handle_PointerReleased;
-            _caretHandle.PointerReleased += Handle_PointerReleased;
-            _endHandle.PointerReleased += Handle_PointerReleased;
+            _handle2.SetTopLeft(default);
 
-            _startHandle.Holding += Caret_Holding;
-            _caretHandle.Holding += Caret_Holding;
-            _endHandle.Holding += Caret_Holding;
+            _handle1.ContextCanceled += Caret_ContextCanceled;
+            _caretHandle.ContextCanceled += Caret_ContextCanceled;
+            _handle2.ContextCanceled += Caret_ContextCanceled;
+            _handle1.ContextRequested += Caret_ContextRequested;
+            _caretHandle.ContextRequested += Caret_ContextRequested;
+            _handle2.ContextRequested += Caret_ContextRequested;
 
             IsVisible = ShowHandles;
 
             ClipToBounds = false;
+
+            _layoutListener = new PresenterVisualListener();
+            _layoutListener.Invalidated += LayoutListener_Invalidated;
+        }
+
+        private void LayoutListener_Invalidated(object? sender, EventArgs e)
+        {
+            if (ShowHandles)
+                MoveHandlesToSelection();
         }
 
-        private void Handle_PointerReleased(object? sender, PointerReleasedEventArgs e)
+        private void Caret_ContextCanceled(object? sender, RoutedEventArgs e)
         {
-            ShowContextMenu();
+            CloseFlyout();
+        }
+
+        private void Caret_ContextRequested(object? sender, ContextRequestedEventArgs e)
+        {
+            ShowFlyout();
+            e.Handled = true;
         }
 
         private void Handle_DragStarted(object? sender, VectorEventArgs e)
         {
-            if (_textBox?.ContextFlyout is { } flyout)
-            {
-                flyout.Hide();
-            }
+            _savedSelectionStart = _textBox?.SelectionStart;
+            _saveSelectionEnd = _textBox?.SelectionEnd;
+            _initialHandleType = (sender as TextSelectionHandle)?.SelectionHandleType;
+            CloseFlyout();
         }
 
-        private void EndHandle_DragDelta(object? sender, VectorEventArgs e)
+        private void CloseFlyout()
         {
-            if (sender is TextSelectionHandle handle)
-                DragSelectionHandle(handle);
+            _textBox?.RaiseEvent(new Interactivity.RoutedEventArgs(InputElement.ContextCanceledEvent));
         }
 
-        private void StartHandle_DragDelta(object? sender, VectorEventArgs e)
+        private void SelectionHandle_DragDelta(object? sender, VectorEventArgs e)
         {
             if (sender is TextSelectionHandle handle)
+            {
                 DragSelectionHandle(handle);
+                e.Handled = true;
+            }
         }
 
         private void CaretHandle_DragDelta(object? sender, VectorEventArgs e)
         {
-            _canShowContextMenu = false;
             if (_presenter != null && _textBox != null)
             {
-                var point = ToPresenter(_caretHandle.IndicatorPosition);
+                var indicatorPosition = GetSearchPoint(_caretHandle);
+                var point = ToPresenter(indicatorPosition);
+                using var _ = BeginChange();
                 _presenter.MoveCaretToPoint(point);
-                _textBox.SelectionStart = _textBox.SelectionEnd = _presenter.CaretIndex;
-                var points = _presenter.GetCaretPoints();
+                var caretIndex = _presenter.CaretIndex;
+                _textBox.SetCurrentValue(TextBox.CaretIndexProperty, caretIndex);
+                _textBox.SetCurrentValue(TextBox.SelectionStartProperty, caretIndex);
+                _textBox.SetCurrentValue(TextBox.SelectionEndProperty, caretIndex);
 
-                _caretHandle?.SetTopLeft(ToLayer(points.Item2));
+                var caretBound = _presenter.GetCursorRectangle();
+                _caretHandle.SetTopLeft(ToLayer(caretBound.BottomLeft));
             }
         }
 
+        public void Hide()
+        {
+            ShowHandles = false;
+            _isInTouchMode = false;
+        }
+
+        internal void Show(bool forceTouchMode = false)
+        {
+            _isInTouchMode = _isInTouchMode || forceTouchMode;
+            if (_isInTouchMode)
+            {
+                ShowHandles = true;
+                MoveHandlesToSelection();
+
+                CheckStateAndShowFlyout();
+            }
+        }
+
+        private IDisposable? BeginChange()
+        {
+            return _presenter?.CurrentImClient?.BeginChange();
+        }
+
         private void Handle_DragCompleted(object? sender, VectorEventArgs e)
         {
+            _savedSelectionStart = -1;
+            _saveSelectionEnd = -1;
+
+            if (!_handle1.IsDragging)
+            {
+                _handle1.NeedsIndicatorUpdate = true;
+                _handle1.SelectionHandleType = SelectionHandleType.Start;
+            }
+
+            if (!_handle2.IsDragging)
+            {
+                _handle2.NeedsIndicatorUpdate = true;
+                _handle2.SelectionHandleType = SelectionHandleType.End;
+            }
+
             MoveHandlesToSelection();
+            CheckStateAndShowFlyout();
+        }
 
-            ShowContextMenu();
+        private void CheckStateAndShowFlyout()
+        {
+            if (_textBox?.SelectionStart != _textBox?.SelectionEnd && !(_handle1.IsDragging || _handle2.IsDragging))
+            {
+                // Show flyout if there's a selection
+                ShowFlyout();
+            }
         }
 
         private void EnsureVisible()
         {
-            if (_textBox is { } t && t.VisualRoot is Visual r)
+            _showDisposable?.Dispose();
+            _showDisposable = null;
+
+            if (_presenter is { } presenter && presenter.VisualRoot is InputElement root)
             {
-                var bounds = t.Bounds;
-                var topLeft = t.TranslatePoint(default, r) ?? default;
-                bounds = bounds.WithX(topLeft.X).WithY(topLeft.Y);
-
-                var hasSelection = _textBox.SelectionStart != _textBox.SelectionEnd;
-
-                _startHandle.IsVisible = bounds.Contains(new Point(GetLeft(_startHandle), GetTop(_startHandle))) &&
-                                         ShowHandles && hasSelection;
-                _endHandle.IsVisible = bounds.Contains(new Point(GetLeft(_endHandle), GetTop(_endHandle))) &&
-                                       ShowHandles && hasSelection;
-                _caretHandle.IsVisible = bounds.Contains(new Point(GetLeft(_caretHandle), GetTop(_caretHandle))) &&
-                                         ShowHandles && !hasSelection;
+                var bounds = presenter.GetTransformedBounds();
+
+                if (bounds == null)
+                    return;
+
+                var clip = bounds.Value.Clip.Inflate(_textBox?.Padding ?? new Thickness(4, 0));
+
+                var isSelectionDragging = _handle1.IsDragging || _handle2.IsDragging;
+
+                var hasSelection = _presenter.SelectionStart != _presenter.SelectionEnd || isSelectionDragging;
+
+                _handle1.IsVisible = ShowHandles && hasSelection &&
+                    (_handle1.IsDragging || !IsOccluded(_handle1.IndicatorPosition));
+                _handle2.IsVisible = ShowHandles && hasSelection &&
+                    (_handle2.IsDragging || !IsOccluded(_handle2.IndicatorPosition));
+                _caretHandle.IsVisible = ShowHandles && (!hasSelection) &&
+                    (_caretHandle.IsDragging || !IsOccluded(_caretHandle.IndicatorPosition));
+
+                bool IsOccluded(Point point)
+                {
+                    return !clip.Contains(point);
+                }
+
+                if (ShowHandles && !hasSelection)
+                {
+                    _showDisposable = DispatcherTimer.RunOnce(() =>
+                        {
+                            ShowHandles = false;
+                            _showDisposable?.Dispose();
+                        }, TimeSpan.FromSeconds(5), DispatcherPriority.Background);
+                }
             }
         }
 
+        private Point GetSearchPoint(TextSelectionHandle handle)
+        {
+            if (_presenter == null)
+                return default;
+
+            var caretBounds = _presenter.GetCursorRectangle();
+            var searchOffset = caretBounds.Height / 2;
+            var indicator = handle.IndicatorPosition;
+            return indicator.WithY(indicator.Y - searchOffset);
+        }
+
         private void DragSelectionHandle(TextSelectionHandle handle)
         {
-            if (_presenter != null && _textBox != null)
+            if (_presenter is { } presenter && _textBox is { } textbox)
             {
-                if (_textBox.ContextFlyout is { } flyout)
-                {
-                    flyout.Hide();
-                }
+                CloseFlyout();
 
-                var point = ToPresenter(handle.IndicatorPosition);
-                point = point.WithY(point.Y - _presenter.FontSize / 2);
-                var hit = _presenter.TextLayout.HitTestPoint(point);
-                var position = hit.CharacterHit.FirstCharacterIndex + hit.CharacterHit.TrailingLength;
+                var position = GetTextPosition(handle);
+
+                var otherHandle = handle == _handle1 ? _handle2 : _handle1;
 
-                var otherHandle = handle == _startHandle ? _endHandle : _startHandle;
+                using var _ = BeginChange();
 
-                if (handle.SelectionHandleType == SelectionHandleType.Start)
+                // Some platforms do not allow handles to cause selection bounds to reverse, i.e. allow handles to move over each other.
+                if (!s_shouldWrapAroundSelection)
                 {
-                    if (position >= _textBox.SelectionEnd)
-                        position = _textBox.SelectionEnd - 1;
-                    _textBox.SelectionStart = position;
+                    if (handle.SelectionHandleType == SelectionHandleType.Start)
+                    {
+                        position = position >= textbox.SelectionEnd ? textbox.SelectionEnd - 1 : position;
+                        textbox.SetCurrentValue(TextBox.SelectionStartProperty, position);
+                    }
+                    else
+                    {
+                        position = position <= textbox.SelectionStart ? textbox.SelectionStart + 1 : position;
+                        textbox.SetCurrentValue(TextBox.SelectionEndProperty, position);
+                    }
                 }
                 else
                 {
-                    if (position <= _textBox.SelectionStart)
-                        position = _textBox.SelectionStart + 1;
-                    _textBox.SelectionEnd = position;
-                }
+                    // For platforms that do, update the handle types for each and adjust selection.
 
-                var selectionStart = _textBox.SelectionStart;
-                var selectionEnd = _textBox.SelectionEnd;
-                var start = Math.Min(selectionStart, selectionEnd);
-                var length = Math.Max(selectionStart, selectionEnd) - start;
-                var rects = new List<Rect>(_presenter.TextLayout.HitTestTextRange(start, length));
+                    if (_initialHandleType == SelectionHandleType.Start)
+                    {
+                        // If handle was previously the selection end, set new selection end to the previous selection start.
+                        bool hasPositionSwapped = position > _saveSelectionEnd;
+                        var otherPosition = _saveSelectionEnd;
 
-                if (rects.Count > 0)
-                {
-                    var first = rects[0];
-                    var last = rects[rects.Count -1];
+                        if (position == otherPosition)
+                        {
+                            position = hasPositionSwapped ? Math.Min(position + 1, (textbox.Text?.Length - 1) ?? 0)
+                                : Math.Max(position - 1, 0);
+                        }
 
-                    if (handle.SelectionHandleType == SelectionHandleType.Start)
-                        handle?.SetTopLeft(ToLayer(first.BottomLeft));
-                    else
-                        handle?.SetTopLeft(ToLayer(last.BottomRight));
+                        textbox.SetCurrentValue(TextBox.SelectionStartProperty, hasPositionSwapped ? otherPosition : position);
+                        textbox.SetCurrentValue(TextBox.SelectionEndProperty, hasPositionSwapped ? position : otherPosition);
 
-                    if (otherHandle.SelectionHandleType == SelectionHandleType.Start)
-                        otherHandle?.SetTopLeft(ToLayer(first.BottomLeft));
+                        otherHandle.SelectionHandleType = hasPositionSwapped ? SelectionHandleType.Start : SelectionHandleType.End;
+                    }
                     else
-                        otherHandle?.SetTopLeft(ToLayer(last.BottomRight));
+                    {
+                        // If handle was previously the selection start, set new selection start to the previous selection end.
+                        bool hasPositionSwapped = position < _savedSelectionStart;
+                        var otherPosition = _savedSelectionStart;
+
+                        if (position == otherPosition)
+                        {
+                            position = !hasPositionSwapped ? Math.Min(position + 1, (textbox.Text?.Length - 1) ?? 0)
+                                : Math.Max(position - 1, 0);
+                        }
+
+                        textbox.SetCurrentValue(TextBox.SelectionStartProperty, hasPositionSwapped ? position : otherPosition);
+                        textbox.SetCurrentValue(TextBox.SelectionEndProperty, hasPositionSwapped ? otherPosition : position);
+
+                        otherHandle.SelectionHandleType = hasPositionSwapped ? SelectionHandleType.End : SelectionHandleType.Start;
+                    }
                 }
 
-                _presenter?.MoveCaretToTextPosition(position);
+                presenter.MoveCaretToTextPosition(position);
+                var caretBound = presenter.GetCursorRectangle();
+                handle.SetTopLeft(ToLayer(handle.SelectionHandleType == SelectionHandleType.Start ? caretBound.BottomLeft : caretBound.BottomLeft));
+
+                MoveHandlesToSelection();
             }
 
-            EnsureVisible();
+            int GetTextPosition(TextSelectionHandle handle)
+            {
+                var indicatorPosition = GetSearchPoint(handle);
+                var point = ToPresenter(indicatorPosition);
+                var hit = presenter.TextLayout.HitTestPoint(point);
+                var position = hit.CharacterHit.FirstCharacterIndex + hit.CharacterHit.TrailingLength;
+                return position;
+            }
         }
 
         private Point ToLayer(Point point)
@@ -208,63 +348,88 @@ namespace Avalonia.Controls.Primitives
 
         private Point ToPresenter(Point point)
         {
-            return (_presenter is { } p) ? (p.VisualRoot as Visual)?.TranslatePoint(point, p) ?? point : point;
+            return (_presenter is { } presenter) ? (presenter.VisualRoot as Visual)?.TranslatePoint(point, presenter) ?? point : point;
         }
 
         private Point ToTextBox(Point point)
         {
-            return (_textBox is { } p) ? (p.VisualRoot as Visual)?.TranslatePoint(point, p) ?? point : point;
+            return (_textBox is { } textbox) ? (textbox.VisualRoot as Visual)?.TranslatePoint(point, textbox) ?? point : point;
         }
 
         public void MoveHandlesToSelection()
         {
-            if (_presenter == null
-                || _textBox == null
-                || _startHandle.IsDragging
-                || _endHandle.IsDragging
-                || _textBox.ContextFlyout?.IsOpen == true
-                || _textBox.ContextMenu?.IsOpen == true)
+            if (_presenter == null)
             {
                 return;
             }
 
-            var hasSelection = _textBox.SelectionStart != _textBox.SelectionEnd;
+            var selectionStart = _presenter.SelectionStart;
+            var selectionEnd = _presenter.SelectionEnd;
+            var hasSelection = selectionStart != selectionEnd;
 
-            var points = _presenter.GetCaretPoints();
+            if (!_caretHandle.IsDragging)
+            {
+                var points = _presenter.GetCaretPoints();
 
-            _caretHandle.SetTopLeft(ToLayer(points.Item2));
+                _caretHandle.SetTopLeft(ToLayer(points.Item2));
+            }
 
             if (hasSelection)
             {
-                var selectionStart = _textBox.SelectionStart;
-                var selectionEnd = _textBox.SelectionEnd;
                 var start = Math.Min(selectionStart, selectionEnd);
-                var length = Math.Max(selectionStart, selectionEnd) - start;
+                var end = Math.Max(selectionStart, selectionEnd);
 
-                var rects = new List<Rect>(_presenter.TextLayout.HitTestTextRange(start, length));
+                var startPoint = GetPosition(start, true);
+                var endPoint = GetPosition(end - 1, false);
 
-                if (rects.Count > 0)
+                if (!_handle1.IsDragging)
                 {
-                    var first = rects[0];
-                    var last = rects[rects.Count - 1];
+                    var pos = _handle1.SelectionHandleType == SelectionHandleType.Start ? startPoint : endPoint;
+                    if (pos.isRtl != _handle1.IsRtl)
+                        _handle1.NeedsIndicatorUpdate = true;
+                    _handle1.IsRtl = pos.isRtl;
+                    _handle1.SetTopLeft(ToLayer(pos.position));
+                }
 
-                    if (!_startHandle.IsDragging)
-                    {
-                        _startHandle.SetTopLeft(ToLayer(first.BottomLeft));
-                        _startHandle.SelectionHandleType = selectionStart < selectionEnd ?
-                            SelectionHandleType.Start :
-                            SelectionHandleType.End;
-                    }
+                if (!_handle2.IsDragging)
+                {
+                    var pos = _handle2.SelectionHandleType == SelectionHandleType.Start ? startPoint : endPoint;
+                    if (pos.isRtl != _handle2.IsRtl)
+                        _handle2.NeedsIndicatorUpdate = true;
+                    _handle2.IsRtl = pos.isRtl;
+                    _handle2.SetTopLeft(ToLayer(pos.position));
+                }
+
+                (Point position, bool isRtl) GetPosition(int index, bool start)
+                {
+                    var rect = new List<Rect>(_presenter!.TextLayout.HitTestTextRange(index, 1)).FirstOrDefault();
 
-                    if (!_endHandle.IsDragging)
+                    var lineIndex = _presenter.TextLayout.GetLineIndexFromCharacterIndex(index, false);
+                    var textLine = _presenter.TextLayout.TextLines[lineIndex];
+                    var lineStart = textLine.FirstTextSourceIndex;
+                    var characterLineIndex = Math.Max(0, index - lineStart);
+                    TextRun? run = null;
+                    int searchLength = 0;
+
+                    for (var i = 0; i < textLine.TextRuns.Count; i++)
                     {
-                        _endHandle.SetTopLeft(ToLayer(last.BottomRight));
-                        _endHandle.SelectionHandleType = selectionStart > selectionEnd ?
-                            SelectionHandleType.Start :
-                            SelectionHandleType.End;
+                        run = textLine.TextRuns[i];
+
+                        searchLength += run.Length;
+                        if (searchLength > characterLineIndex)
+                            break;
                     }
+
+                    bool isRtl;
+                    var reversed = isRtl = !((run as ShapedTextRun)?.ShapedBuffer.IsLeftToRight ?? true);
+                    if (!start)
+                        reversed = !reversed;
+
+                    return (reversed ? rect.BottomRight : rect.BottomLeft, isRtl);
                 }
             }
+
+            EnsureVisible();
         }
 
         internal void SetPresenter(TextPresenter? textPresenter)
@@ -272,131 +437,212 @@ namespace Avalonia.Controls.Primitives
             if (_presenter == textPresenter)
                 return;
 
-            if (_textBox != null)
+            if (_presenter != null)
             {
-                _textBox.RemoveHandler(TextBox.TextChangingEvent, TextChanged);
-                _textBox.RemoveHandler(KeyDownEvent, TextBoxKeyDown);
-
-                _textBox.PropertyChanged -= TextBoxPropertyChanged;
-                _textBox.EffectiveViewportChanged -= TextBoxEffectiveViewportChanged;
-                _textBox.SizeChanged -= TextBox_SizeChanged;
+                _layoutListener.Detach();
+                _presenter.RemoveHandler(KeyDownEvent, PresenterKeyDown);
+                _presenter.RemoveHandler(TappedEvent, PresenterTapped);
+                _presenter.RemoveHandler(PointerPressedEvent, PresenterPressed);
+                _presenter.RemoveHandler(GotFocusEvent, PresenterFocused);
 
+                if (_textBox != null)
+                {
+                    _textBox.PropertyChanged -= TextBox_PropertyChanged;
+                    _textBox.RemoveHandler(ScrollGestureEvent, TextBoxScrolling);
+                }
                 _textBox = null;
+
+                _presenter = null;
             }
 
             _presenter = textPresenter;
             if (_presenter != null)
             {
+                _layoutListener.Attach(_presenter);
+                _presenter.AddHandler(KeyDownEvent, PresenterKeyDown, handledEventsToo: true);
+                _presenter.AddHandler(TappedEvent, PresenterTapped);
+                _presenter.AddHandler(PointerPressedEvent, PresenterPressed, handledEventsToo: true);
+                _presenter.AddHandler(GotFocusEvent, PresenterFocused, handledEventsToo: true);
+
                 _textBox = _presenter.FindAncestorOfType<TextBox>();
 
                 if (_textBox != null)
                 {
-                    _textBox.AddHandler(TextBox.TextChangingEvent, TextChanged, handledEventsToo: true);
-                    _textBox.AddHandler(KeyDownEvent, TextBoxKeyDown, handledEventsToo: true);
-
-                    _textBox.PropertyChanged += TextBoxPropertyChanged;
-                    _textBox.EffectiveViewportChanged += TextBoxEffectiveViewportChanged;
-                    _textBox.SizeChanged += TextBox_SizeChanged;
+                    _textBox.PropertyChanged += TextBox_PropertyChanged;
+                    _textBox.AddHandler(ScrollGestureEvent, TextBoxScrolling, handledEventsToo: true);
                 }
             }
         }
 
-        private void TextBox_SizeChanged(object? sender, SizeChangedEventArgs e)
+        private void TextBoxScrolling(object? sender, ScrollGestureEventArgs e)
         {
-            InvalidateMeasure();
+            CloseFlyout();
         }
 
-        private void TextBoxEffectiveViewportChanged(object? sender, EffectiveViewportChangedEventArgs e)
+        private void PresenterPressed(object? sender, PointerPressedEventArgs e)
         {
-            if (ShowHandles)
+            _isInTouchMode = e.Pointer.Type != PointerType.Mouse;
+        }
+
+        private void PresenterFocused(object? sender, FocusChangedEventArgs e)
+        {
+            if (_presenter != null && _presenter.SelectionStart != _presenter.SelectionEnd)
             {
-                MoveHandlesToSelection();
+                ShowHandles = true;
                 EnsureVisible();
             }
         }
 
-        private void Caret_Holding(object? sender, HoldingRoutedEventArgs e)
+        private void PresenterTapped(object? sender, TappedEventArgs e)
         {
-            if (ShowContextMenu())
-                e.Handled = true;
+            _isInTouchMode = e.Pointer.Type != PointerType.Mouse;
+
+            if (_isInTouchMode)
+                MoveHandlesToSelection();
+            else
+            {
+                ShowHandles = false;
+                _showDisposable?.Dispose();
+                _showDisposable = null;
+            }
         }
 
-        internal bool ShowContextMenu()
+        private void Presenter_SizeChanged(object? sender, SizeChangedEventArgs e)
         {
-            if (_textBox != null && _canShowContextMenu)
+            InvalidateMeasure();
+        }
+
+        internal bool ShowFlyout()
+        {
+            if (_textBox != null)
             {
                 if (_textBox.ContextFlyout is PopupFlyoutBase flyout)
                 {
                     var verticalOffset = (double.IsNaN(_textBox.LineHeight) ? _textBox.FontSize : _textBox.LineHeight) +
                                          ContextMenuPadding;
 
-                    TextSelectionHandle? handle = null;
+                    Point? topleft = default;
 
                     if (_textBox.SelectionStart != _textBox.SelectionEnd)
                     {
-                        if (_startHandle.IsEffectivelyVisible)
-                            handle = _startHandle;
-                        else if (_endHandle.IsEffectivelyVisible)
-                            handle = _endHandle;
+                        if (_handle1.IsEffectivelyVisible && _handle2.IsEffectivelyVisible)
+                        {
+                            var p1 = _handle1.IndicatorPosition;
+                            var p2 = _handle2.IndicatorPosition;
+
+                            topleft = new Point((p1.X + p2.X) / 2, Math.Min(p1.Y, p2.Y));
+                        }
+                        else
+                        {
+                            var visibleHandle = _handle1.IsEffectivelyVisible ? _handle1: _handle2.IsEffectivelyVisible ? _handle2 : null;
+
+                            topleft = visibleHandle?.IndicatorPosition;
+                        }
                     }
                     else
                     {
                         if (_caretHandle.IsEffectivelyVisible)
                         {
-                            handle = _caretHandle;
+                            topleft = _caretHandle.IndicatorPosition;
                         }
                     }
 
-                    if (handle != null)
+                    if (topleft != null)
                     {
-                        var topLeft = ToTextBox(handle.GetTopLeft());
-                        flyout.VerticalOffset = topLeft.Y - verticalOffset;
-                        flyout.HorizontalOffset = topLeft.X;
-                        flyout.Placement = PlacementMode.TopEdgeAlignedLeft;
+                        var oldPlacement = flyout.Placement;
+                        var oldCallback = flyout.CustomPopupPlacementCallback;
+                        var oldShowMode = flyout.ShowMode;
+                        var point = ToTextBox(topleft.Value);
+                        point = point.WithY(Math.Max(0, point.Y));
+
+
+                        flyout.CustomPopupPlacementCallback = (x) => Place(x);
+                        flyout.Placement = PlacementMode.Custom;
+                        flyout.ShowMode = FlyoutShowMode.Transient;
+
                         _textBox.RaiseEvent(new ContextRequestedEventArgs());
 
+                        flyout.Placement = oldPlacement;
+                        flyout.CustomPopupPlacementCallback = oldCallback;
+                        flyout.ShowMode = oldShowMode;
+
+                        void Place(CustomPopupPlacement parameters)
+                        {
+                            parameters.Anchor = PopupAnchor.TopLeft;
+                            var offset = parameters.Offset;
+                            parameters.Offset = offset.WithX(point.X)
+                                .WithY(point.Y - verticalOffset);
+                        }
                         return true;
                     }
                 }
-                else
-                {
-                    _textBox.RaiseEvent(new ContextRequestedEventArgs());
-                }
             }
 
-            _canShowContextMenu = true;
-
             return false;
         }
 
-        internal void Show()
+        private void TextBox_PropertyChanged(object? sender, AvaloniaPropertyChangedEventArgs e)
         {
-            ShowHandles = true;
-
-            MoveHandlesToSelection();
-            EnsureVisible();
-        }
-
-        private void TextBoxPropertyChanged(object? sender, AvaloniaPropertyChangedEventArgs e)
-        {
-            if (ShowHandles && (e.Property == TextBox.SelectionStartProperty ||
-                                e.Property == TextBox.SelectionEndProperty))
+            if (e.Property == TextPresenter.TextProperty)
+            {
+                ShowHandles = false;
+                CloseFlyout();
+            }
+            else if (e.Property == TextBox.SelectionStartProperty || e.Property == TextBox.SelectionEndProperty
+                || e.Property == TextBox.CaretIndexProperty)
             {
                 MoveHandlesToSelection();
-                EnsureVisible();
             }
         }
 
-        private void TextBoxKeyDown(object? sender, KeyEventArgs e)
+        private void PresenterKeyDown(object? sender, KeyEventArgs e)
         {
             ShowHandles = false;
+            _isInTouchMode = false;
         }
 
-        private void TextChanged(object? sender, TextChangingEventArgs e)
+        // Listener to layout changes for presenter.
+        private class PresenterVisualListener
         {
-            ShowHandles = false;
-            if (_textBox?.ContextFlyout is { } flyout && flyout.IsOpen)
-                flyout.Hide();
+            private TextPresenter? _presenter;
+
+            public event EventHandler? Invalidated;
+
+            public void Attach(TextPresenter presenter)
+            {
+                if (_presenter != null)
+                    throw new InvalidOperationException("Listener is already attached to a TextPresenter");
+
+                _presenter = presenter;
+                presenter.SizeChanged += Presenter_SizeChanged;
+                presenter.EffectiveViewportChanged += Visual_EffectiveViewportChanged;
+            }
+
+            private void Visual_EffectiveViewportChanged(object? sender, Layout.EffectiveViewportChangedEventArgs e)
+            {
+                OnInvalidated();
+            }
+
+            private void Presenter_SizeChanged(object? sender, SizeChangedEventArgs e)
+            {
+                OnInvalidated();
+            }
+
+            public void Detach()
+            {
+                if (_presenter is { } presenter)
+                {
+                    presenter.SizeChanged -= Presenter_SizeChanged;
+                    presenter.EffectiveViewportChanged -= Visual_EffectiveViewportChanged;
+                }
+
+                _presenter = null;
+            }
+
+            private void OnInvalidated()
+            {
+                Invalidated?.Invoke(this, EventArgs.Empty);
+            }
         }
     }
 }
diff --git a/src/Avalonia.Controls/Primitives/TextSelectionHandle.cs b/src/Avalonia.Controls/Primitives/TextSelectionHandle.cs
index 6518b96bce..b155c3f5ce 100644
--- a/src/Avalonia.Controls/Primitives/TextSelectionHandle.cs
+++ b/src/Avalonia.Controls/Primitives/TextSelectionHandle.cs
@@ -1,26 +1,53 @@
 using System;
+using Avalonia.Controls.Metadata;
 using Avalonia.Input;
 using Avalonia.Interactivity;
-using Avalonia.Media;
 
 namespace Avalonia.Controls.Primitives
 {
     /// <summary>
     /// A controls that enables easy control over text selection using touch based input
     /// </summary>
+    [TemplatePart("PART_Indicator", typeof(Border))]
     public class TextSelectionHandle : Thumb
     {
-        internal SelectionHandleType SelectionHandleType { get; set; }
+        internal SelectionHandleType SelectionHandleType
+        {
+            get => field;
+            set
+            {
+                field = value;
+                UpdateHandleClasses();
+            }
+        }
 
-        private Point _startPosition;
+        internal bool IsRtl
+        {
+            get => field;
+            set
+            {
+                field = value;
+                UpdateHandleClasses();
+            }
+        }
 
-        internal Point IndicatorPosition => IsDragging ? _startPosition.WithX(_startPosition.X) + _delta : Bounds.Position.WithX(Bounds.Position.X).WithY(Bounds.Y);
+        internal Point IndicatorPosition
+        {
+            get
+            {
+                var topLeft = GetTopLeft();
+                return topLeft.WithX(topLeft.X + GetIndicatorOffset());
+            }
+        }
 
         internal bool IsDragging { get; private set; }
+        internal bool NeedsIndicatorUpdate { get; set; }
 
+        private Point _startPosition;
         private Vector _delta;
         private Point? _lastPoint;
-        private TranslateTransform? _transform;
+        private Border? _indicator;
+        private Point? _lastRequestedPosition;
 
         static TextSelectionHandle()
         {
@@ -29,29 +56,50 @@ namespace Avalonia.Controls.Primitives
             DragCompletedEvent.AddClassHandler<TextSelectionHandle>((x, e) => x.OnDragCompleted(e), RoutingStrategies.Bubble);
         }
 
-        protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
-            base.OnAttachedToVisualTree(e);
+            base.OnApplyTemplate(e);
 
-            if (_transform == null)
+            if (_indicator != null)
             {
-                _transform = new TranslateTransform();
+                _indicator.LayoutUpdated -= Indicator_LayoutUpdated;
             }
 
-            RenderTransform = _transform;
+            _indicator = e.NameScope.Get<Border>("PART_Indicator");
+
+            if (_indicator != null)
+            {
+                _indicator.LayoutUpdated += Indicator_LayoutUpdated;
+            }
+
+            UpdateHandleClasses();
+        }
+
+        protected override void OnSizeChanged(SizeChangedEventArgs e)
+        {
+            base.OnSizeChanged(e);
+
+            if (_lastRequestedPosition.HasValue)
+            {
+                SetTopLeft(_lastRequestedPosition.Value);
+                _lastRequestedPosition = null;
+                NeedsIndicatorUpdate = false;
+            }
         }
 
         protected override void OnLoaded(RoutedEventArgs args)
         {
             base.OnLoaded(args);
 
-            InvalidateMeasure();
+            UpdateHandleClasses();
+
+            InvalidateVisual();
         }
         protected override void OnDragStarted(VectorEventArgs e)
         {
             base.OnDragStarted(e);
 
-            _startPosition = Bounds.Position;
+            _startPosition = GetTopLeft();
             _delta = default;
             IsDragging = true;
         }
@@ -59,52 +107,50 @@ namespace Avalonia.Controls.Primitives
         protected override void OnDragDelta(VectorEventArgs e)
         {
             base.OnDragDelta(e);
+            var newDelta = e.Vector;
 
-            _delta = e.Vector;
-            UpdateTextSelectionHandlePosition();
+            if (!e.Handled && Math.Abs((newDelta - _delta).Length) > 0)
+            {
+                _delta = newDelta;
+                var point = _startPosition + _delta;
+                Canvas.SetTop(this, point.Y);
+                Canvas.SetLeft(this, point.X);
+            }
         }
 
         protected override void OnDragCompleted(VectorEventArgs e)
         {
-            base.OnDragCompleted(e);
             IsDragging = false;
-
             _startPosition = default;
-        }
+            base.OnDragCompleted(e);
 
-        private void UpdateTextSelectionHandlePosition()
-        {
-            SetTopLeft(IndicatorPosition);
         }
 
         protected override void ArrangeCore(Rect finalRect)
         {
+            UpdateHandleClasses();
+
             base.ArrangeCore(finalRect);
+        }
 
-            if (_transform != null)
+        private void Indicator_LayoutUpdated(object? sender, EventArgs e)
+        {
+            if (NeedsIndicatorUpdate && _lastRequestedPosition is not null)
             {
-                if (SelectionHandleType == SelectionHandleType.Caret)
-                {
-                    HasMirrorTransform = true;
-                    _transform.X = Bounds.Width / 2 * -1;
-                }
-                else if (SelectionHandleType == SelectionHandleType.Start)
-                {
-                    HasMirrorTransform = true;
-                    _transform.X = Bounds.Width * -1;
-                }
-                else
-                {
-                    HasMirrorTransform = false;
-                    _transform.X = 0;
-                }
+                SetTopLeft(_lastRequestedPosition.Value);
+
+                NeedsIndicatorUpdate = !(_indicator?.IsArrangeValid ?? true);
             }
         }
 
         internal void SetTopLeft(Point point)
         {
+            if (_indicator == null || NeedsIndicatorUpdate)
+            {
+                _lastRequestedPosition = point;
+            }
             Canvas.SetTop(this, point.Y);
-            Canvas.SetLeft(this, point.X);
+            Canvas.SetLeft(this, point.X - GetIndicatorOffset());
         }
 
         internal Point GetTopLeft()
@@ -134,6 +180,9 @@ namespace Avalonia.Controls.Primitives
 
         protected override void OnPointerMoved(PointerEventArgs e)
         {
+            if (e.Pointer.Captured != this)
+                return;
+
             VectorEventArgs ev;
 
             if (!_lastPoint.HasValue)
@@ -163,8 +212,9 @@ namespace Avalonia.Controls.Primitives
 
         protected override void OnPointerPressed(PointerPressedEventArgs e)
         {
-            e.Handled = true;
             PseudoClasses.Add(":pressed");
+            e.Pointer.Capture(this);
+            var point = e.GetPosition(this);
         }
 
         protected override void OnPointerReleased(PointerReleasedEventArgs e)
@@ -184,6 +234,34 @@ namespace Avalonia.Controls.Primitives
             }
 
             PseudoClasses.Remove(":pressed");
+            e.Pointer.Capture(null);
+        }
+
+        internal double GetIndicatorOffset()
+        {
+            return _indicator?.Bounds.Center.X ?? SelectionHandleType switch
+            {
+                SelectionHandleType.Caret => Bounds.Width / 2,
+                SelectionHandleType.Start => IsRtl ? 0 : Bounds.Width,
+                SelectionHandleType.End => IsRtl ? Bounds.Width : 0,
+                _ => throw new NotImplementedException(),
+            };
+        }
+
+        private void UpdateHandleClasses()
+        {
+            PseudoClasses.Remove(":caret");
+            PseudoClasses.Remove(":start");
+            PseudoClasses.Remove(":end");
+
+            PseudoClasses.Add(":" + (SelectionHandleType switch
+            {
+                SelectionHandleType.Caret => "caret",
+                SelectionHandleType.Start => IsRtl ? "end" : "start",
+                SelectionHandleType.End => IsRtl ? "start" : "end",
+                _ => throw new NotImplementedException(),
+            }));
+            InvalidateVisual();
         }
     }
 }
diff --git a/src/Avalonia.Controls/Primitives/TextSelectorLayer.cs b/src/Avalonia.Controls/Primitives/TextSelectorLayer.cs
index d6b080e588..87cd1fe419 100644
--- a/src/Avalonia.Controls/Primitives/TextSelectorLayer.cs
+++ b/src/Avalonia.Controls/Primitives/TextSelectorLayer.cs
@@ -11,7 +11,7 @@ namespace Avalonia.Controls.Primitives
 
         public static TextSelectorLayer? GetTextSelectorLayer(Visual visual)
         {
-            foreach (var v in visual.GetVisualAncestors())
+            foreach (var v in visual.GetSelfAndVisualAncestors())
                 if (v is VisualLayerManager { TextSelectorLayer: { } textSelectorLayer })
                     return textSelectorLayer;
 
diff --git a/src/Avalonia.Controls/Primitives/VisualLayerManager.cs b/src/Avalonia.Controls/Primitives/VisualLayerManager.cs
index eb912d2cf8..fd5c55ef62 100644
--- a/src/Avalonia.Controls/Primitives/VisualLayerManager.cs
+++ b/src/Avalonia.Controls/Primitives/VisualLayerManager.cs
@@ -11,8 +11,8 @@ namespace Avalonia.Controls.Primitives
         private const int AdornerZIndex = int.MaxValue - 100;
         private const int OverlayZIndex = int.MaxValue - 98;
         private const int LightDismissOverlayZIndex = int.MaxValue - 97;
-        private const int PopupOverlayZIndex = int.MaxValue - 96;
-        private const int TextSelectorLayerZIndex = int.MaxValue - 95;
+        private const int TextSelectorLayerZIndex = int.MaxValue - 96;
+        private const int PopupOverlayZIndex = int.MaxValue - 95;
 
         private ILogicalRoot? _logicalRoot;
         private readonly List<Control> _layers = new();
diff --git a/src/Avalonia.Controls/TabItem.cs b/src/Avalonia.Controls/TabItem.cs
index 6a116b1e28..5dc8aff6fa 100644
--- a/src/Avalonia.Controls/TabItem.cs
+++ b/src/Avalonia.Controls/TabItem.cs
@@ -146,6 +146,25 @@ namespace Avalonia.Controls
 
         protected bool UpdateSelectionFromEvent(RoutedEventArgs e) => SelectingItemsControl.ItemsControlFromItemContainer(this)?.UpdateSelectionFromEvent(this, e) ?? false;
 
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+            if (change.Property == ForegroundProperty || change.Property == IconProperty)
+                UpdateIconForeground();
+        }
+
+        private void UpdateIconForeground()
+        {
+            if (Icon is IconElement icon)
+            {
+                var fg = Foreground;
+                if (fg != null)
+                    icon.SetValue(ForegroundProperty, fg);
+                else
+                    icon.ClearValue(ForegroundProperty);
+            }
+        }
+
         private void UpdateHeader(AvaloniaPropertyChangedEventArgs obj)
         {
             if (Header == null)
diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index eadb54b58a..dbf56834fc 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -1,24 +1,25 @@
-using Avalonia.Input.Platform;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-using Avalonia.Reactive;
+using Avalonia.Automation.Peers;
+using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Utils;
+using Avalonia.Data;
 using Avalonia.Input;
+using Avalonia.Input.Platform;
 using Avalonia.Interactivity;
-using Avalonia.Media;
-using Avalonia.Metadata;
-using Avalonia.Data;
 using Avalonia.Layout;
-using Avalonia.Utilities;
-using Avalonia.Controls.Metadata;
+using Avalonia.Media;
 using Avalonia.Media.TextFormatting;
-using Avalonia.Automation.Peers;
 using Avalonia.Media.TextFormatting.Unicode;
+using Avalonia.Metadata;
+using Avalonia.Platform;
+using Avalonia.Reactive;
 using Avalonia.Threading;
+using Avalonia.Utilities;
 
 namespace Avalonia.Controls
 {
@@ -28,8 +29,14 @@ namespace Avalonia.Controls
     [TemplatePart("PART_TextPresenter", typeof(TextPresenter), IsRequired = true)]
     [TemplatePart("PART_ScrollViewer", typeof(ScrollViewer))]
     [PseudoClasses(":empty")]
+    [PseudoClasses(":touch-mode")]
     public class TextBox : TemplatedControl, UndoRedoHelper<TextBox.UndoRedoState>.IUndoRedoHost
     {
+        /// <summary>
+        /// The radius for touch input. Used to determine if selection should change from moving a touch pointer.
+        /// </summary>
+        private readonly Lazy<int> _touchRadius = new(() => (int)((AvaloniaLocator.Current?.GetService<IPlatformSettings>()?.GetTapSize(PointerType.Touch).Height ?? 10) / 2) + 5);
+
         /// <summary>
         /// Gets a platform-specific <see cref="KeyGesture"/> for the Cut action
         /// </summary>
@@ -368,9 +375,13 @@ namespace Avalonia.Controls
         private int _wordSelectionStart = -1;
         private int _selectedTextChangesMadeSinceLastUndoSnapshot;
         private bool _hasDoneSnapshotOnce;
-        private static bool _isHolding;
         private int _currentClickCount;
         private bool _isDoubleTapped;
+        private bool _isInTouchMode;
+        private Point _lastPoint;
+        private bool _isInTouchSelectionMode;
+        private bool _isInTouchCaretMode;
+        private bool _hasTouchSelection;
         private const int _maxCharsBeforeUndoSnapshot = 7;
 
         static TextBox()
@@ -467,7 +478,7 @@ namespace Avalonia.Controls
             SetCurrentValue(SelectionStartProperty, newValue);
             SetCurrentValue(SelectionEndProperty, newValue);
 
-           _presenter?.SetCurrentValue(TextPresenter.CaretIndexProperty, newValue);
+            _presenter?.SetCurrentValue(TextPresenter.CaretIndexProperty, newValue);
         }
 
         /// <summary>
@@ -953,18 +964,8 @@ namespace Avalonia.Controls
         {
             _presenter = e.NameScope.Get<TextPresenter>("PART_TextPresenter");
 
-            if (_scrollViewer != null)
-            {
-                _scrollViewer.ScrollChanged -= ScrollViewer_ScrollChanged;
-            }
-
             _scrollViewer = e.NameScope.Find<ScrollViewer>("PART_ScrollViewer");
 
-            if (_scrollViewer != null)
-            {
-                _scrollViewer.ScrollChanged += ScrollViewer_ScrollChanged;
-            }
-
             _imClient.SetPresenter(_presenter, this);
 
             if (IsFocused)
@@ -973,11 +974,6 @@ namespace Avalonia.Controls
             }
         }
 
-        private void ScrollViewer_ScrollChanged(object? sender, ScrollChangedEventArgs e)
-        {
-            _presenter?.TextSelectionHandleCanvas?.MoveHandlesToSelection();
-        }
-
         protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
         {
             base.OnAttachedToVisualTree(e);
@@ -1092,7 +1088,7 @@ namespace Avalonia.Controls
         {
             base.OnGotFocus(e);
 
-            if(_presenter != null)
+            if (_presenter != null)
             {
                 _presenter.ShowSelectionHighlight = true;
             }
@@ -1112,6 +1108,9 @@ namespace Avalonia.Controls
             _imClient.SetPresenter(_presenter, this);
 
             _presenter?.ShowCaret();
+
+            if (SelectionStart != SelectionEnd)
+                _presenter?.TextSelectionHandleCanvas?.Show();
         }
 
         protected override void OnLostFocus(FocusChangedEventArgs e)
@@ -1127,6 +1126,7 @@ namespace Avalonia.Controls
                 }
 
                 SetCurrentValue(RevealPasswordProperty, false);
+                _presenter?.RemoveTextSelectionCanvas();
             }
 
             UpdateCommandStates();
@@ -1670,6 +1670,78 @@ namespace Avalonia.Controls
             }
         }
 
+        protected override void OnHolding(HoldingRoutedEventArgs e)
+        {
+            base.OnHolding(e);
+
+            if (_presenter == null || e.HoldingState != HoldingState.Started)
+            {
+                _isInTouchSelectionMode = e.HoldingState == HoldingState.Canceled;
+                _hasTouchSelection = false;
+                return;
+            }
+
+            var text = Text;
+
+            using var _ = _imClient.BeginChange();
+
+            if (text != null)
+            {
+                var position = e.PointerEventArgs.GetPosition(_presenter);
+                var selectionStart = SelectionStart;
+                var selectionEnd = SelectionEnd;
+                _presenter.MoveCaretToPoint(position);
+                var caretIndex = _presenter.CaretIndex;
+                var isInSelection = selectionStart != selectionEnd &&
+                    caretIndex >= selectionStart && caretIndex <= selectionEnd;
+
+                if (isInSelection)
+                {
+                    _presenter.RaiseEvent(new ContextRequestedEventArgs(e.PointerEventArgs));
+                }
+                else
+                {
+                    // We select the current held word, or the whole hidden content
+                    if (IsPasswordBox && !RevealPassword)
+                    {
+                        _wordSelectionStart = -1;
+
+                        SelectAll();
+                    }
+                    else
+                    {
+                        SelectWord(text, caretIndex, caretIndex, caretIndex);
+                    }
+
+                    _presenter?.EnsureTextSelectionLayer();
+
+                    if (SelectionStart != SelectionEnd)
+                    {
+                        _presenter?.TextSelectionHandleCanvas?.Show(true);
+                    }
+                    else
+                    {
+                        _presenter?.RaiseEvent(new ContextRequestedEventArgs(e.PointerEventArgs));
+                    }
+                }
+
+                _hasTouchSelection = true;
+
+                e.Handled = true;
+            }
+        }
+
+        protected override void OnTapped(TappedEventArgs e)
+        {
+            base.OnTapped(e);
+
+            if (e.Pointer.Type != PointerType.Mouse)
+            {
+                _presenter?.EnsureTextSelectionLayer();
+                _presenter?.TextSelectionHandleCanvas?.Show();
+            }
+        }
+
         protected override void OnPointerPressed(PointerPressedEventArgs e)
         {
             if (_presenter == null)
@@ -1682,112 +1754,184 @@ namespace Avalonia.Controls
 
             using var _ = _imClient.BeginChange();
 
-            if (text != null && (e.Pointer.Type == PointerType.Mouse || e.ClickCount >= 2) && clickInfo.Properties.IsLeftButtonPressed &&
-                !(clickInfo.Pointer?.Captured is Border))
+            _isInTouchMode = false;
+            _isInTouchSelectionMode = false;
+            _isDoubleTapped = e.ClickCount == 2;
+            if (text != null && clickInfo.Pointer?.Captured is not Border)
             {
-                _currentClickCount = e.ClickCount;
-                var point = e.GetPosition(_presenter);
+                if (e.Pointer.Type == PointerType.Mouse && clickInfo.Properties.IsLeftButtonPressed)
+                {
+                    _presenter.TextSelectionHandleCanvas?.Hide();
+                    _currentClickCount = e.ClickCount;
+                    var point = e.GetPosition(_presenter);
 
-                _presenter.MoveCaretToPoint(point);
+                    _presenter.MoveCaretToPoint(point);
 
-                var caretIndex = _presenter.CaretIndex;
-                var clickToSelect = e.KeyModifiers.HasFlag(KeyModifiers.Shift);
-                var selectionStart = SelectionStart;
-                var selectionEnd = SelectionEnd;
+                    var caretIndex = _presenter.CaretIndex;
+                    var clickToSelect = e.KeyModifiers.HasFlag(KeyModifiers.Shift);
+                    var selectionStart = SelectionStart;
+                    var selectionEnd = SelectionEnd;
 
-                switch (e.ClickCount)
-                {
-                    case 1:
-                        if (clickToSelect)
-                        {
-                            if (_wordSelectionStart >= 0)
+                    switch (e.ClickCount)
+                    {
+                        case 1:
+                            if (clickToSelect)
                             {
-                                UpdateWordSelectionRange(caretIndex, ref selectionStart, ref selectionEnd);
+                                if (_wordSelectionStart >= 0)
+                                {
+                                    UpdateWordSelectionRange(caretIndex, ref selectionStart, ref selectionEnd);
 
-                                SetCurrentValue(SelectionStartProperty, selectionStart);
-                                SetCurrentValue(SelectionEndProperty, selectionEnd);
+                                    SetCurrentValue(SelectionStartProperty, selectionStart);
+                                    SetCurrentValue(SelectionEndProperty, selectionEnd);
+                                }
+                                else
+                                {
+                                    SetCurrentValue(SelectionEndProperty, caretIndex);
+                                }
                             }
                             else
                             {
+                                SetCurrentValue(SelectionStartProperty, caretIndex);
                                 SetCurrentValue(SelectionEndProperty, caretIndex);
+                                _wordSelectionStart = -1;
                             }
-                        }
-                        else
-                        {
-                            SetCurrentValue(SelectionStartProperty, caretIndex);
-                            SetCurrentValue(SelectionEndProperty, caretIndex);
-                            _wordSelectionStart = -1;
-                        }
-
-                        break;
-                    case 2:
-                        if (IsPasswordBox && !RevealPassword)
-                        {
-                            // double-clicking in a cloaked single-line password box selects all text
-                            // see https://github.com/AvaloniaUI/Avalonia/issues/14956
-                            goto case 3;
-                        }
 
-                        if (!StringUtils.IsStartOfWord(text, caretIndex))
-                        {
-                            selectionStart = StringUtils.PreviousWord(text, caretIndex);
-                        }
+                            break;
+                        case 2:
+                            SelectWord(text, caretIndex, selectionStart, selectionEnd);
 
-                        if (!StringUtils.IsEndOfWord(text, caretIndex))
-                        {
-                            selectionEnd = StringUtils.NextWord(text, caretIndex);
-                        }
+                            break;
+                        case 3:
+                            _wordSelectionStart = -1;
 
-                        if (selectionStart != selectionEnd)
-                        {
-                            _wordSelectionStart = selectionStart;
-                        }
+                            SelectAll();
+                            break;
+                    }
+                }
+                else if (e.Pointer.Type != PointerType.Mouse)
+                {
+                    _isInTouchMode = true;
+                    _lastPoint = e.GetCurrentPoint(_presenter).Position;
 
-                        SetCurrentValue(SelectionStartProperty, selectionStart);
-                        SetCurrentValue(SelectionEndProperty, selectionEnd);
+                    if (_isDoubleTapped)
+                    {
+                        _presenter.MoveCaretToPoint(_lastPoint);
+                        var caretIndex = _presenter.CaretIndex;
 
-                        break;
-                    case 3:
-                        _wordSelectionStart = -1;
+                        var selectionStart = SelectionStart;
+                        var selectionEnd = SelectionEnd;
 
-                        SelectAll();
-                        break;
+                        SelectWord(text, caretIndex, selectionStart, selectionEnd);
+                        _presenter?.EnsureTextSelectionLayer();
+                        _presenter?.TextSelectionHandleCanvas?.Show();
+                    }
                 }
             }
 
-            _isDoubleTapped = e.ClickCount == 2;
+            UpdatePseudoclasses();
+
             e.Pointer.Capture(_presenter);
             e.Handled = true;
         }
 
+        private void SelectWord(string text, int caretIndex, int selectionStart, int selectionEnd)
+        {
+            if (IsPasswordBox && !RevealPassword)
+            {
+                // double-clicking in a cloaked single-line password box selects all text
+                // see https://github.com/AvaloniaUI/Avalonia/issues/14956
+                _wordSelectionStart = -1;
+
+                SelectAll();
+            }
+
+            if (!StringUtils.IsStartOfWord(text, caretIndex))
+            {
+                selectionStart = StringUtils.PreviousWord(text, caretIndex);
+            }
+
+            if (!StringUtils.IsEndOfWord(text, caretIndex))
+            {
+                selectionEnd = StringUtils.NextWord(text, caretIndex);
+            }
+
+            if (selectionStart != selectionEnd)
+            {
+                _wordSelectionStart = selectionStart;
+            }
+
+            SetCurrentValue(SelectionStartProperty, selectionStart);
+            SetCurrentValue(SelectionEndProperty, selectionEnd);
+        }
+
         protected override void OnPointerMoved(PointerEventArgs e)
         {
-            if (_presenter == null || _isHolding)
+            if (_presenter == null || e.Pointer.Captured != _presenter)
             {
                 return;
             }
             using var _ = _imClient.BeginChange();
+            var point = e.GetPosition(_presenter);
 
-            // selection should not change during pointer move if the user right clicks
-            if (e.Pointer.Captured == _presenter && e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
+            if (e.Pointer.Type == PointerType.Mouse)
             {
-                var point = e.GetPosition(_presenter);
+                // selection should not change during pointer move if the user right clicks
+                if (e.Pointer.Captured == _presenter && e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
+                {
+                    point = new Point(
+                        MathUtilities.Clamp(point.X, 0, Math.Max(_presenter.Bounds.Width - 1, 0)),
+                        MathUtilities.Clamp(point.Y, 0, Math.Max(_presenter.Bounds.Height - 1, 0)));
 
-                point = new Point(
-                    MathUtilities.Clamp(point.X, 0, Math.Max(_presenter.Bounds.Width - 1, 0)),
-                    MathUtilities.Clamp(point.Y, 0, Math.Max(_presenter.Bounds.Height - 1, 0)));
+                    var previousIndex = _presenter.CaretIndex;
 
-                var previousIndex = _presenter.CaretIndex;
+                    _presenter.MoveCaretToPoint(point);
 
-                _presenter.MoveCaretToPoint(point);
+                    var caretIndex = _presenter.CaretIndex;
 
-                var caretIndex = _presenter.CaretIndex;
+                    if (Math.Abs(caretIndex - previousIndex) == 1)
+                        e.PreventGestureRecognition();
 
-                if (Math.Abs(caretIndex - previousIndex) == 1)
-                    e.PreventGestureRecognition();
+                    if (e.Pointer.Type == PointerType.Mouse || _isDoubleTapped)
+                    {
+                        var selectionStart = SelectionStart;
+                        var selectionEnd = SelectionEnd;
 
-                if (e.Pointer.Type == PointerType.Mouse || _isDoubleTapped)
+                        if (_wordSelectionStart >= 0)
+                        {
+                            UpdateWordSelectionRange(caretIndex, ref selectionStart, ref selectionEnd);
+
+                            SetCurrentValue(SelectionStartProperty, selectionStart);
+                            SetCurrentValue(SelectionEndProperty, selectionEnd);
+                        }
+                        else
+                        {
+                            SetCurrentValue(SelectionEndProperty, caretIndex);
+                        }
+                    }
+                    else
+                    {
+                        SetCurrentValue(SelectionStartProperty, caretIndex);
+                        SetCurrentValue(SelectionEndProperty, caretIndex);
+                    }
+                }
+            }
+            else if (_isInTouchMode)
+            {
+                if (_isInTouchSelectionMode)
                 {
+                    point = new Point(
+                        MathUtilities.Clamp(point.X, 0, Math.Max(_presenter.Bounds.Width - 1, 0)),
+                        MathUtilities.Clamp(point.Y, 0, Math.Max(_presenter.Bounds.Height - 1, 0)));
+
+                    var previousIndex = _presenter.CaretIndex;
+
+                    _presenter.MoveCaretToPoint(point);
+
+                    var caretIndex = _presenter.CaretIndex;
+
+                    if (Math.Abs(caretIndex - previousIndex) == 1)
+                        e.PreventGestureRecognition();
+
                     var selectionStart = SelectionStart;
                     var selectionEnd = SelectionEnd;
 
@@ -1805,8 +1949,28 @@ namespace Avalonia.Controls
                 }
                 else
                 {
-                    SetCurrentValue(SelectionStartProperty, caretIndex);
-                    SetCurrentValue(SelectionEndProperty, caretIndex);
+                    if (!_isInTouchCaretMode)
+                    {
+
+                        var touchRect = new Rect(_lastPoint.X, _lastPoint.Y, 0, 0).Inflate(_touchRadius.Value);
+                        var isInRect = touchRect.X < point.X &&
+                           touchRect.Y < point.Y &&
+                           touchRect.Right > point.X &&
+                           touchRect.Bottom > point.Y;
+                        if (!isInRect)
+                        {
+                            _isInTouchCaretMode = true;
+                        }
+                    }
+
+                    if (_isInTouchCaretMode)
+                    {
+                        e.PreventGestureRecognition();
+                        _presenter.MoveCaretToPoint(point);
+                        var caretIndex = _presenter.CaretIndex;
+                        SetCurrentValue(SelectionStartProperty, caretIndex);
+                        SetCurrentValue(SelectionEndProperty, caretIndex);
+                    }
                 }
             }
         }
@@ -1851,52 +2015,22 @@ namespace Avalonia.Controls
 
             using var _ = _imClient.BeginChange();
 
-            if (e.Pointer.Type != PointerType.Mouse && !_isDoubleTapped)
+            if (e.Pointer.Type != PointerType.Mouse && !_isInTouchSelectionMode)
             {
-                var text = Text;
-                var clickInfo = e.GetCurrentPoint(this);
-                if (text != null && !(clickInfo.Pointer?.Captured is Border))
+                if (!_isDoubleTapped && !_hasTouchSelection)
                 {
                     var point = e.GetPosition(_presenter);
 
                     _presenter.MoveCaretToPoint(point);
 
                     var caretIndex = _presenter.CaretIndex;
-                    var clickToSelect = e.KeyModifiers.HasFlag(KeyModifiers.Shift);
-                    var selectionStart = SelectionStart;
-                    var selectionEnd = SelectionEnd;
-
-                    if (clickToSelect)
-                    {
-                        if (_wordSelectionStart >= 0)
-                        {
-                            UpdateWordSelectionRange(caretIndex, ref selectionStart, ref selectionEnd);
-
-                            SetCurrentValue(SelectionStartProperty, selectionStart);
-                            SetCurrentValue(SelectionEndProperty, selectionEnd);
-                        }
-                        else
-                        {
-                            SetCurrentValue(SelectionEndProperty, caretIndex);
-                        }
-                    }
-                    else
-                    {
-                        SetCurrentValue(SelectionStartProperty, caretIndex);
-                        SetCurrentValue(SelectionEndProperty, caretIndex);
-                        _wordSelectionStart = -1;
-                    }
-
-                    _presenter.TextSelectionHandleCanvas?.MoveHandlesToSelection();
+                    SetCurrentValue(CaretIndexProperty, caretIndex);
+                    SetCurrentValue(SelectionEndProperty, caretIndex);
+                    SetCurrentValue(SelectionStartProperty, caretIndex);
                 }
             }
 
-            // Don't update selection if the pointer was held
-            if (_isHolding)
-            {
-                _isHolding = false;
-            }
-            else if (e.InitialPressMouseButton == MouseButton.Right)
+            if (e.InitialPressMouseButton == MouseButton.Right)
             {
                 var point = e.GetPosition(_presenter);
 
@@ -1917,28 +2051,9 @@ namespace Avalonia.Controls
                     SetCurrentValue(SelectionStartProperty, caretIndex);
                 }
             }
-            else if (e.Pointer.Type == PointerType.Touch)
-            {
-                if (_currentClickCount == 1)
-                {
-                    var point = e.GetPosition(_presenter);
-
-                    _presenter.MoveCaretToPoint(point);
-
-                    var caretIndex = _presenter.CaretIndex;
-                    SetCurrentValue(SelectionStartProperty, caretIndex);
-                    SetCurrentValue(SelectionEndProperty, caretIndex);
-                }
-
-                _presenter.TextSelectionHandleCanvas?.Show();
-
-                if (SelectionStart != SelectionEnd)
-                {
-                    _presenter.TextSelectionHandleCanvas?.ShowContextMenu();
-                }
-            }
-
-            e.Pointer.Capture(null);
+            _isInTouchSelectionMode = false;
+            _isInTouchCaretMode = false;
+            _hasTouchSelection = false;
         }
 
         protected override AutomationPeer OnCreateAutomationPeer()
@@ -2367,6 +2482,7 @@ namespace Avalonia.Controls
         private void UpdatePseudoclasses()
         {
             PseudoClasses.Set(":empty", string.IsNullOrEmpty(Text));
+            PseudoClasses.Set(":touch-mode", _isInTouchMode);
         }
 
         private bool IsPasswordBox => PasswordChar != default(char);
diff --git a/src/Avalonia.Controls/TextBoxTextInputMethodClient.cs b/src/Avalonia.Controls/TextBoxTextInputMethodClient.cs
index c61a220990..d94d36ef1d 100644
--- a/src/Avalonia.Controls/TextBoxTextInputMethodClient.cs
+++ b/src/Avalonia.Controls/TextBoxTextInputMethodClient.cs
@@ -133,6 +133,7 @@ namespace Avalonia.Controls
 
             if (oldPresenter != null)
             {
+                oldPresenter.CurrentImClient = null;
                 oldPresenter.ClearValue(TextPresenter.PreeditTextProperty);
 
                 oldPresenter.CaretBoundsChanged -= (s, e) => RaiseCursorRectangleChanged();
@@ -142,6 +143,8 @@ namespace Avalonia.Controls
 
             if (_presenter != null)
             {
+
+                _presenter.CurrentImClient = this;
                 _presenter.CaretBoundsChanged += (s, e) => RaiseCursorRectangleChanged();
             }
 
diff --git a/src/Avalonia.Controls/TopLevel.cs b/src/Avalonia.Controls/TopLevel.cs
index ceb9590564..44b82c886f 100644
--- a/src/Avalonia.Controls/TopLevel.cs
+++ b/src/Avalonia.Controls/TopLevel.cs
@@ -212,10 +212,10 @@ namespace Avalonia.Controls
             LogicalChildren.Add(hostVisual);
 
             _source = new PresentationSource(hostVisual, this,
-                impl, dependencyResolver, () => ClientSize);
+                impl, dependencyResolver);
             _source.Renderer.SceneInvalidated += SceneInvalidated;
 
-            _scaling = ValidateScaling(impl.RenderScaling);
+            _scaling = LayoutHelper.ValidateScaling(impl.RenderScaling);
             _actualTransparencyLevel = PlatformImpl.TransparencyLevel;
 
 
@@ -234,7 +234,7 @@ namespace Avalonia.Controls
             impl.Closed = HandleClosed;
             impl.Paint = HandlePaint;
             impl.Resized = HandleResized;
-            impl.ScalingChanged = HandleScalingChanged;
+            impl.ScalingChanged += HandleScalingChanged;
             impl.TransparencyLevelChanged = HandleTransparencyLevelChanged;
 
             CreatePlatformImplBinding(TransparencyLevelHintProperty, hint => PlatformImpl.SetTransparencyLevelHint(hint ?? Array.Empty<WindowTransparencyLevel>()));
@@ -709,7 +709,7 @@ namespace Avalonia.Controls
         /// <param name="scaling">The window scaling.</param>
         private void HandleScalingChanged(double scaling)
         {
-            _scaling = ValidateScaling(scaling);
+            _scaling = LayoutHelper.ValidateScaling(scaling);
             LayoutHelper.InvalidateSelfAndChildrenMeasure(this);
             Dispatcher.UIThread.Send(_ => ScalingChanged?.Invoke(this, EventArgs.Empty));
 
@@ -833,23 +833,5 @@ namespace Avalonia.Controls
         {
             // Do nothing becuase TopLevel should't apply MirrorTransform on himself.
         }
-
-        private double ValidateScaling(double scaling)
-        {
-            if (MathUtilities.IsNegativeOrNonFinite(scaling) || MathUtilities.IsZero(scaling))
-            {
-                throw new InvalidOperationException(
-                    $"Invalid {nameof(ITopLevelImpl.RenderScaling)} value {scaling} returned from {PlatformImpl?.GetType()}");
-            }
-
-            if (MathUtilities.IsOne(scaling))
-            {
-                // Ensure we've got exactly 1.0 and not an approximation,
-                // so we don't have to use MathUtilities.IsOne in various layout hot paths.
-                return 1.0;
-            }
-
-            return scaling;
-        }
     }
 }
diff --git a/src/Avalonia.Controls/TopLevelHost.cs b/src/Avalonia.Controls/TopLevelHost.cs
index d2d3ddf8fa..afc4d59e7b 100644
--- a/src/Avalonia.Controls/TopLevelHost.cs
+++ b/src/Avalonia.Controls/TopLevelHost.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using Avalonia.Automation.Peers;
 using Avalonia.Controls.Chrome;
 using Avalonia.Input;
+using Avalonia.Layout;
 using Avalonia.LogicalTree;
 using Avalonia.Reactive;
 
@@ -14,6 +15,8 @@ namespace Avalonia.Controls;
 /// </summary>
 internal partial class TopLevelHost : Control
 {
+    private Thickness _decorationInset;
+
     static TopLevelHost()
     {
         KeyboardNavigation.TabNavigationProperty.OverrideDefaultValue<TopLevelHost>(KeyboardNavigationMode.Cycle);
@@ -25,5 +28,95 @@ internal partial class TopLevelHost : Control
         VisualChildren.Add(tl);
     }
 
+    /// <summary>
+    /// Gets or sets the decoration inset applied to the TopLevel child in forced decoration mode.
+    /// When non-zero, the TopLevel is measured and arranged within the inset area while
+    /// decoration layers use the full available size.
+    /// </summary>
+    internal Thickness DecorationInset
+    {
+        get => _decorationInset;
+        set
+        {
+            if (_decorationInset == value)
+                return;
+            _decorationInset = value;
+            InvalidateMeasure();
+        }
+    }
+
+    protected override Size MeasureOverride(Size availableSize)
+    {
+        var inset = _decorationInset;
+        var hasInset = inset != default;
+        var desiredSize = default(Size);
+
+        var children = VisualChildren;
+        var childrenCount = children.Count;
+
+        for (var i = 0; i < childrenCount; i++)
+        {
+            if (children[i] is Layoutable l)
+            {
+                if (hasInset && ReferenceEquals(l, _topLevel))
+                {
+                    // In forced mode, measure the TopLevel with reduced size
+                    var contentSize = new Size(
+                        Math.Max(0, availableSize.Width - inset.Left - inset.Right),
+                        Math.Max(0, availableSize.Height - inset.Top - inset.Bottom));
+                    l.Measure(contentSize);
+
+                    // Add inset back so TopLevelHost's desired size represents the full frame.
+                    // This ensures ArrangeOverride receives the full frame size and can correctly
+                    // position the TopLevel within the inset area.
+                    desiredSize = new Size(
+                        Math.Max(desiredSize.Width, l.DesiredSize.Width + inset.Left + inset.Right),
+                        Math.Max(desiredSize.Height, l.DesiredSize.Height + inset.Top + inset.Bottom));
+                }
+                else
+                {
+                    l.Measure(availableSize);
+
+                    desiredSize = new Size(
+                        Math.Max(desiredSize.Width, l.DesiredSize.Width),
+                        Math.Max(desiredSize.Height, l.DesiredSize.Height));
+                }
+            }
+        }
+
+        return desiredSize;
+    }
+
+    protected override Size ArrangeOverride(Size finalSize)
+    {
+        var inset = _decorationInset;
+        var hasInset = inset != default;
+
+        var children = VisualChildren;
+        var childrenCount = children.Count;
+
+        for (var i = 0; i < childrenCount; i++)
+        {
+            if (children[i] is Layoutable l)
+            {
+                if (hasInset && ReferenceEquals(l, _topLevel))
+                {
+                    // In forced mode, arrange the TopLevel within the inset area
+                    var contentSize = new Size(
+                        Math.Max(0, finalSize.Width - inset.Left - inset.Right),
+                        Math.Max(0, finalSize.Height - inset.Top - inset.Bottom));
+                    
+                    l.Arrange(new Rect(inset.Left, inset.Top, contentSize.Width, contentSize.Height));
+                }
+                else
+                {
+                    l.Arrange(new Rect(finalSize));
+                }
+            }
+        }
+
+        return finalSize;
+    }
+
     protected override bool BypassFlowDirectionPolicies => true;
 }
diff --git a/src/Avalonia.Controls/Window.cs b/src/Avalonia.Controls/Window.cs
index e7a4ce953e..0797f39733 100644
--- a/src/Avalonia.Controls/Window.cs
+++ b/src/Avalonia.Controls/Window.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
@@ -97,6 +98,7 @@ namespace Avalonia.Controls
         private Thickness _offScreenMargin;
         private bool _canHandleResized = false;
         private Size _arrangeBounds;
+        private bool _isForcedDecorationMode;
 
         /// <summary>
         /// Defines the <see cref="SizeToContent"/> property.
@@ -157,10 +159,12 @@ namespace Avalonia.Controls
             AvaloniaProperty.Register<Window, WindowClosingBehavior>(nameof(ClosingBehavior));
 
         /// <summary>
-        /// Represents the current window state (normal, minimized, maximized)
+        /// Represents the currently effective window state (normal, minimized, maximized)
         /// </summary>
-        public static readonly StyledProperty<WindowState> WindowStateProperty =
-            AvaloniaProperty.Register<Window, WindowState>(nameof(WindowState));
+        public static readonly DirectProperty<Window, WindowState> WindowStateProperty =
+            AvaloniaProperty.RegisterDirect<Window, WindowState>(
+                nameof(WindowState), o => o.WindowState,
+                (o, v) => o.WindowState = v);
 
         /// <summary>
         /// Defines the <see cref="Title"/> property.
@@ -216,6 +220,7 @@ namespace Avalonia.Controls
         private bool _positionWasSet;
         private bool _wasShownBefore;
         private IDisposable? _modalSubscription;
+        private PlatformAllowedWindowActions _allowedWindowActions = PlatformAllowedWindowActions.All;
 
         /// <summary>
         /// Initializes static members of the <see cref="Window"/> class.
@@ -246,7 +251,13 @@ namespace Avalonia.Controls
             impl.WindowStateChanged = HandleWindowStateChanged;
             _maxPlatformClientSize = PlatformImpl?.MaxAutoSizeHint ?? default(Size);
             impl.ExtendClientAreaToDecorationsChanged = ExtendClientAreaToDecorationsChanged;
-            this.GetObservable(ClientSizeProperty).Skip(1).Subscribe(x => PlatformImpl?.Resize(x, WindowResizeReason.Application));
+            impl.AllowedWindowActionsChanged = OnAllowedWindowActionsChanged;
+            _allowedWindowActions = impl.AllowedWindowActions;
+            this.GetObservable(ClientSizeProperty).Skip(1).Subscribe(x =>
+            {
+                ResizePlatformImpl(x, WindowResizeReason.Application);
+            });
+            ScalingChanged += OnScalingChangedUpdateDecorations;
 
             CreatePlatformImplBinding(TitleProperty, title => PlatformImpl!.SetTitle(title));
             CreatePlatformImplBinding(IconProperty, SetEffectiveIcon);
@@ -254,8 +265,7 @@ namespace Avalonia.Controls
             CreatePlatformImplBinding(CanMinimizeProperty, canMinimize => PlatformImpl!.SetCanMinimize(canMinimize));
             CreatePlatformImplBinding(CanMaximizeProperty, canMaximize => PlatformImpl!.SetCanMaximize(canMaximize));
             CreatePlatformImplBinding(ShowInTaskbarProperty, show => PlatformImpl!.ShowTaskbarIcon(show));
-
-            CreatePlatformImplBinding(WindowStateProperty, state => PlatformImpl!.WindowState = state);
+            
             CreatePlatformImplBinding(ExtendClientAreaToDecorationsHintProperty, hint => PlatformImpl!.SetExtendClientAreaToDecorationsHint(hint));
             CreatePlatformImplBinding(ExtendClientAreaTitleBarHeightHintProperty, height => PlatformImpl!.SetExtendClientAreaTitleBarHeightHint(height));
 
@@ -402,13 +412,45 @@ namespace Avalonia.Controls
             set => SetValue(ClosingBehaviorProperty, value);
         }
 
+        private WindowState _lastWindowState;
         /// <summary>
-        /// Gets or sets the minimized/maximized state of the window.
+        /// Represents the currently effective window state (normal, minimized, maximized)
         /// </summary>
         public WindowState WindowState
         {
-            get => GetValue(WindowStateProperty);
-            set => SetValue(WindowStateProperty, value);
+            get => PlatformImpl?.WindowStateGetterIsUsable == true ?
+                PlatformImpl.WindowState :
+                _lastWindowState;
+            set
+            {
+                if (PlatformImpl != null)
+                {
+                    if (PlatformImpl.WindowStateGetterIsUsable)
+                    {
+                        // Attempt to set the window state to desired value, if it succeeds the platform will
+                        // trigger WindowStateChanged callback which will trigger SetAndRaise for the WindowState property
+                        PlatformImpl.WindowState = value;
+                        
+                        // If the request was refused - trigger a synthetic property change notification
+                        // for data bindings and user state to fix itself.
+                        if (PlatformImpl.WindowState != value)
+                        {
+                            // Since it's a force notify, we aren't checking for the old value and sometimes
+                            // trigger notification with oldValue = newValue.
+                            var oldValue = _lastWindowState;
+                            _lastWindowState = PlatformImpl.WindowState;
+                            RaisePropertyChanged(WindowStateProperty, oldValue, _lastWindowState);
+                        }
+                    }
+                    else 
+                    {
+                        // Legacy behavior - update the property and hope for the best that the platform
+                        // will update it back to match the actual window state
+                        SetAndRaise(WindowStateProperty, ref _lastWindowState, value);
+                        PlatformImpl.WindowState = _lastWindowState;
+                    }
+                }
+            }
         }
 
         /// <summary>
@@ -446,6 +488,11 @@ namespace Avalonia.Controls
             set => SetValue(CanMaximizeProperty, value);
         }
 
+        /// <summary>
+        /// Gets the window actions currently allowed by the underlying platform.
+        /// </summary>
+        internal PlatformAllowedWindowActions AllowedWindowActions => _allowedWindowActions;
+
         /// <summary>
         /// Gets or sets the icon of the window.
         /// </summary>
@@ -616,7 +663,10 @@ namespace Avalonia.Controls
 
         private void HandleWindowStateChanged(WindowState state)
         {
-            WindowState = state;
+            // Check if platform impl doesn't lie about get_WindowState being usable
+            Debug.Assert(PlatformImpl is not { WindowStateGetterIsUsable: true } || PlatformImpl.WindowState == state);
+            
+            SetAndRaise(WindowStateProperty, ref _lastWindowState, state);
 
             if (state == WindowState.Minimized)
             {
@@ -631,7 +681,15 @@ namespace Avalonia.Controls
             UpdateDrawnDecorationParts();
         }
 
-        protected virtual void ExtendClientAreaToDecorationsChanged(bool isExtended)
+        internal event Action<PlatformAllowedWindowActions>? AllowedWindowActionsChanged;
+
+        private void OnAllowedWindowActionsChanged(PlatformAllowedWindowActions actions)
+        {
+            _allowedWindowActions = actions;
+            AllowedWindowActionsChanged?.Invoke(actions);
+        }
+
+        private void ExtendClientAreaToDecorationsChanged(bool isExtended)
         {
             IsExtendedIntoWindowDecorations = isExtended;
             OffScreenMargin = PlatformImpl?.OffScreenMargin ?? default;
@@ -642,6 +700,10 @@ namespace Avalonia.Controls
         private void UpdateDrawnDecorations()
         {
             var parts = ComputeDecorationParts();
+            
+            // Detect forced mode: platform needs managed decorations but app hasn't opted in
+            _isForcedDecorationMode = parts != null && !IsExtendedIntoWindowDecorations;
+
             TopLevelHost.UpdateDrawnDecorations(parts, WindowState);
 
             if (parts != null)
@@ -650,6 +712,8 @@ namespace Avalonia.Controls
                 var decorations = TopLevelHost.Decorations;
                 if (decorations != null)
                 {
+                    decorations.RenderScaling = RenderScaling;
+
                     var hint = ExtendClientAreaTitleBarHeightHint;
                     if (hint >= 0)
                         decorations.TitleBarHeightOverride = hint;
@@ -659,6 +723,13 @@ namespace Avalonia.Controls
             UpdateDrawnDecorationMargins();
         }
 
+        private void OnScalingChangedUpdateDecorations(object? sender, EventArgs e)
+        {
+            var decorations = TopLevelHost.Decorations;
+            if (decorations != null)
+                decorations.RenderScaling = RenderScaling;
+        }
+
         /// <summary>
         /// Updates decoration parts based on current window state without
         /// re-creating the decorations instance.
@@ -716,7 +787,9 @@ namespace Avalonia.Controls
             var decorations = TopLevelHost.Decorations;
             if (decorations == null)
             {
+                // Only use platform margins if drawn decorations are not active
                 WindowDecorationMargin = PlatformImpl?.ExtendedMargins ?? default;
+                TopLevelHost.DecorationInset = default;
                 return;
             }
 
@@ -727,11 +800,25 @@ namespace Avalonia.Controls
                 ? decorations.FrameThickness : default;
             var shadow = parts.HasFlag(Chrome.DrawnWindowDecorationParts.Shadow)
                 ? decorations.ShadowThickness : default;
-            WindowDecorationMargin = new Thickness(
+            var margin = new Thickness(
                 frame.Left + shadow.Left,
                 titleBarHeight + frame.Top + shadow.Top,
                 frame.Right + shadow.Right,
                 frame.Bottom + shadow.Bottom);
+
+            if (_isForcedDecorationMode)
+            {
+                // In forced mode, app is unaware of decorations.
+                // TopLevelHost insets the Window child; WindowDecorationMargin stays zero.
+                WindowDecorationMargin = default;
+                TopLevelHost.DecorationInset = margin;
+            }
+            else
+            {
+                // In extended mode, app handles the margin itself.
+                WindowDecorationMargin = margin;
+                TopLevelHost.DecorationInset = default;
+            }
         }
 
         private void OnTitleBarHeightHintChanged()
@@ -896,6 +983,15 @@ namespace Avalonia.Controls
                 // Enable drawn decorations before layout so margins are computed
                 UpdateDrawnDecorations();
                 
+                // In forced mode, adjust ClientSize to reflect usable content area
+                if (_isForcedDecorationMode)
+                {
+                    var inset = TopLevelHost.DecorationInset;
+                    ClientSize = new Size(
+                        Math.Max(0, ClientSize.Width - inset.Left - inset.Right),
+                        Math.Max(0, ClientSize.Height - inset.Top - inset.Bottom));
+                }
+                
                 _shown = true;
                 IsVisible = true;
 
@@ -941,10 +1037,18 @@ namespace Avalonia.Controls
 
                 DesktopScalingOverride = null;
 
-                if (clientSizeChanged || ClientSize != PlatformImpl?.ClientSize)
+                // In forced mode, compare against adjusted platform size
+                var platformClientSize = PlatformImpl?.ClientSize ?? default;
+                var comparableClientSize = _isForcedDecorationMode
+                    ? new Size(
+                        Math.Max(0, platformClientSize.Width - TopLevelHost.DecorationInset.Left - TopLevelHost.DecorationInset.Right),
+                        Math.Max(0, platformClientSize.Height - TopLevelHost.DecorationInset.Top - TopLevelHost.DecorationInset.Bottom))
+                    : platformClientSize;
+
+                if (clientSizeChanged || ClientSize != comparableClientSize)
                 {
                     // Previously it was called before ExecuteInitialLayoutPass
-                    PlatformImpl?.Resize(ClientSize, WindowResizeReason.Layout);
+                    ResizePlatformImpl(ClientSize, WindowResizeReason.Layout);
 
                     // we do not want PlatformImpl?.Resize to trigger HandleResized yet because it will set Width and Height.
                     // So perform some important actions from HandleResized
@@ -1000,6 +1104,22 @@ namespace Avalonia.Controls
             }
         }
 
+        private void ResizePlatformImpl(Size size, WindowResizeReason reason)
+        {
+            // In forced mode, add decoration inset so platform gets full frame size
+            if (_isForcedDecorationMode)
+            {
+                var inset = TopLevelHost.DecorationInset;
+                size = new Size(
+                    size.Width + inset.Left + inset.Right,
+                    size.Height + inset.Top + inset.Bottom);
+                if (PlatformImpl?.ClientSize != size)
+                    PlatformImpl?.Resize(size, reason);
+            }
+            else
+                PlatformImpl?.Resize(size, reason);
+        }
+
         /// <summary>
         /// Shows the window as a dialog.
         /// </summary>
@@ -1235,6 +1355,14 @@ namespace Avalonia.Controls
         {
             var sizeToContent = SizeToContent;
             var clientSize = ClientSize;
+            if (_isForcedDecorationMode)
+            {
+                clientSize = PlatformImpl?.ClientSize ?? clientSize;
+                var inset = TopLevelHost.DecorationInset;
+                clientSize = new Size(
+                    Math.Max(0, clientSize.Width - inset.Left - inset.Right),
+                    Math.Max(0, clientSize.Height - inset.Top - inset.Bottom));
+            }
             var maxAutoSize = PlatformImpl?.MaxAutoSizeHint ?? Size.Infinity;
             var useAutoWidth = sizeToContent.HasAllFlags(SizeToContent.Width);
             var useAutoHeight = sizeToContent.HasAllFlags(SizeToContent.Height);
@@ -1295,7 +1423,9 @@ namespace Avalonia.Controls
         {
             _arrangeBounds = size;
             if (_canHandleResized)
-                PlatformImpl?.Resize(size, WindowResizeReason.Layout);
+            {
+                ResizePlatformImpl(size, WindowResizeReason.Layout);
+            }
             return ClientSize;
         }
 
@@ -1313,6 +1443,16 @@ namespace Avalonia.Controls
         /// <inheritdoc/>
         internal override void HandleResized(Size clientSize, WindowResizeReason reason)
         {
+            // In forced decoration mode, the platform's clientSize includes decoration area.
+            // Subtract the decoration inset so Window.ClientSize reflects the usable content area.
+            if (_isForcedDecorationMode)
+            {
+                var inset = TopLevelHost.DecorationInset;
+                clientSize = new Size(
+                    Math.Max(0, clientSize.Width - inset.Left - inset.Right),
+                    Math.Max(0, clientSize.Height - inset.Top - inset.Bottom));
+            }
+
             if (_canHandleResized && (ClientSize != clientSize || double.IsNaN(Width) || double.IsNaN(Height)))
             {
                 var sizeToContent = SizeToContent;
diff --git a/src/Avalonia.Controls/WindowBase.cs b/src/Avalonia.Controls/WindowBase.cs
index 07966600e6..894b7ca6e6 100644
--- a/src/Avalonia.Controls/WindowBase.cs
+++ b/src/Avalonia.Controls/WindowBase.cs
@@ -304,7 +304,7 @@ namespace Avalonia.Controls
         {
             var constraint = ArrangeSetBounds(finalRect.Size);
             var arrangeSize = ArrangeOverride(constraint);
-            Bounds = new Rect(arrangeSize);
+            Bounds = new Rect(finalRect.Position, arrangeSize);
         }
 
         /// <summary>
diff --git a/src/Avalonia.DesignerSupport/Remote/PreviewerWindowImpl.cs b/src/Avalonia.DesignerSupport/Remote/PreviewerWindowImpl.cs
index e714b62511..35d0a0cb80 100644
--- a/src/Avalonia.DesignerSupport/Remote/PreviewerWindowImpl.cs
+++ b/src/Avalonia.DesignerSupport/Remote/PreviewerWindowImpl.cs
@@ -44,6 +44,7 @@ namespace Avalonia.DesignerSupport.Remote
         public Action Activated { get; set; }
         public Func<WindowCloseReason, bool> Closing { get; set; }
         public WindowState WindowState { get; set; }
+        public bool WindowStateGetterIsUsable => false;
         public Action<WindowState> WindowStateChanged { get; set; }
         public Size MaxAutoSizeHint { get; } = new Size(4096, 4096);
 
diff --git a/src/Avalonia.DesignerSupport/Remote/Stubs.cs b/src/Avalonia.DesignerSupport/Remote/Stubs.cs
index d9c8e333cb..8149e5ad71 100644
--- a/src/Avalonia.DesignerSupport/Remote/Stubs.cs
+++ b/src/Avalonia.DesignerSupport/Remote/Stubs.cs
@@ -44,6 +44,7 @@ namespace Avalonia.DesignerSupport.Remote
         public PixelPoint Position { get; set; }
         public Action<PixelPoint>? PositionChanged { get; set; }
         public WindowState WindowState { get; set; }
+        public bool WindowStateGetterIsUsable => false;
         public Action<WindowState>? WindowStateChanged { get; set; }
 
         public Action<WindowTransparencyLevel>? TransparencyLevelChanged { get; set; }
diff --git a/src/Avalonia.FreeDesktop.AtSpi/AtSpiServer.cs b/src/Avalonia.FreeDesktop.AtSpi/AtSpiServer.cs
index 16d36eb590..06b9b7aa3f 100644
--- a/src/Avalonia.FreeDesktop.AtSpi/AtSpiServer.cs
+++ b/src/Avalonia.FreeDesktop.AtSpi/AtSpiServer.cs
@@ -61,7 +61,7 @@ namespace Avalonia.FreeDesktop.AtSpi
                 _isEmbedded = false;
             }
 
-            _syncContext = new AvaloniaSynchronizationContext(DispatcherPriority.Normal);
+            _syncContext = new AvaloniaSynchronizationContext(Dispatcher.UIThread, DispatcherPriority.Default);
 
             var address = await GetAccessibilityBusAddressAsync();
 
diff --git a/src/Avalonia.MicroCom/Avalonia.MicroCom.csproj b/src/Avalonia.MicroCom/Avalonia.MicroCom.csproj
index 17fa827202..4f3d98c88e 100644
--- a/src/Avalonia.MicroCom/Avalonia.MicroCom.csproj
+++ b/src/Avalonia.MicroCom/Avalonia.MicroCom.csproj
@@ -2,13 +2,14 @@
   <PropertyGroup>
     <TargetFrameworks>$(AvsCurrentTargetFramework);$(AvsLegacyTargetFrameworks)</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <UseMicroCom>true</UseMicroCom>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="MicroCom.Runtime" />
     <ProjectReference Include="..\Avalonia.Build.Tasks\Avalonia.Build.Tasks.csproj"
                       ReferenceOutputAssembly="false"
                       PrivateAssets="all" />
   </ItemGroup>
+  <Import Project="..\..\build\MicroCOM.props" />
   <Import Project="..\..\build\BuildTargets.targets" />
   <Import Project="..\..\build\TrimmingEnable.props" />
   <Import Project="..\..\build\NullableEnable.props" />
diff --git a/src/Avalonia.Native/Avalonia.Native.csproj b/src/Avalonia.Native/Avalonia.Native.csproj
index 9f79fad8ff..fb38606254 100644
--- a/src/Avalonia.Native/Avalonia.Native.csproj
+++ b/src/Avalonia.Native/Avalonia.Native.csproj
@@ -7,6 +7,7 @@
     <IsPackable Condition="'$(ForcePackAvaloniaNative)' == 'True'">True</IsPackable>
     <TargetFrameworks>$(AvsCurrentTargetFramework);$(AvsLegacyTargetFrameworks)</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <UseMicroComGeneratorMSBuild>true</UseMicroComGeneratorMSBuild>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(PackAvaloniaNative)' == 'true'">
@@ -21,10 +22,10 @@
   <ItemGroup>
     <ProjectReference Include="..\..\packages\Avalonia\Avalonia.csproj" />
     <ProjectReference Include="..\Avalonia.Dialogs\Avalonia.Dialogs.csproj" />
-    <PackageReference Include="MicroCom.CodeGenerator.MSBuild" PrivateAssets="all" />
     <MicroComIdl Include="avn.idl" CSharpInteropPath="Interop.Generated.cs" />
   </ItemGroup>
 
+  <Import Project="..\..\build\MicroCOM.props" />
   <Import Project="..\..\build\DevAnalyzers.props" />
   <Import Project="..\..\build\TrimmingEnable.props" />
   <Import Project="..\..\build\NullableEnable.props" />
diff --git a/src/Avalonia.Native/AvaloniaNativeDragSource.cs b/src/Avalonia.Native/AvaloniaNativeDragSource.cs
index 662d79d1b8..5927397ab5 100644
--- a/src/Avalonia.Native/AvaloniaNativeDragSource.cs
+++ b/src/Avalonia.Native/AvaloniaNativeDragSource.cs
@@ -33,7 +33,7 @@ namespace Avalonia.Native
         }
 
         public Task<DragDropEffects> DoDragDropAsync(
-            PointerEventArgs triggerEvent,
+            PointerPressedEventArgs triggerEvent,
             IDataTransfer dataTransfer,
             DragDropEffects allowedEffects)
         {
diff --git a/src/Avalonia.Native/AvaloniaNativeGlPlatformGraphics.cs b/src/Avalonia.Native/AvaloniaNativeGlPlatformGraphics.cs
index 91e4dd2680..9efe33689f 100644
--- a/src/Avalonia.Native/AvaloniaNativeGlPlatformGraphics.cs
+++ b/src/Avalonia.Native/AvaloniaNativeGlPlatformGraphics.cs
@@ -173,7 +173,7 @@ namespace Avalonia.Native
             _context = context;
         }
 
-        public bool IsCorrupted => false;
+        public PlatformRenderTargetState State => PlatformRenderTargetState.Ready;
 
         public IGlPlatformSurfaceRenderingSession BeginDraw(IRenderTarget.RenderTargetSceneInfo sceneInfo)
         {
diff --git a/src/Avalonia.Native/AvnAutomationPeer.cs b/src/Avalonia.Native/AvnAutomationPeer.cs
index 25905da02a..3822864edc 100644
--- a/src/Avalonia.Native/AvnAutomationPeer.cs
+++ b/src/Avalonia.Native/AvnAutomationPeer.cs
@@ -19,6 +19,11 @@ namespace Avalonia.Native
             { AutomationElementIdentifiers.ClassNameProperty, AvnAutomationProperty.AutomationPeer_ClassName },
             { AutomationElementIdentifiers.NameProperty, AvnAutomationProperty.AutomationPeer_Name },
             { RangeValuePatternIdentifiers.ValueProperty, AvnAutomationProperty.RangeValueProvider_Value },
+            { ValuePatternIdentifiers.ValueProperty, AvnAutomationProperty.ValueProvider_Value },
+            { TogglePatternIdentifiers.ToggleStateProperty, AvnAutomationProperty.ToggleProvider_ToggleState },
+            { ExpandCollapsePatternIdentifiers.ExpandCollapseStateProperty, AvnAutomationProperty.ExpandCollapseProvider_ExpandCollapseState },
+            { SelectionItemPatternIdentifiers.IsSelectedProperty, AvnAutomationProperty.SelectionItemProvider_IsSelected },
+            { SelectionPatternIdentifiers.SelectionProperty, AvnAutomationProperty.SelectionProvider_Selection },
         };
 
         private static readonly ConditionalWeakTable<AutomationPeer, AvnAutomationPeer> s_wrappers = new();
diff --git a/src/Avalonia.Native/WindowImpl.cs b/src/Avalonia.Native/WindowImpl.cs
index f23b6cbc62..76f47150db 100644
--- a/src/Avalonia.Native/WindowImpl.cs
+++ b/src/Avalonia.Native/WindowImpl.cs
@@ -114,6 +114,7 @@ namespace Avalonia.Native
             set => _native.SetWindowState((AvnWindowState)value);
         }
 
+        public bool WindowStateGetterIsUsable => false;
         public Action<WindowState>? WindowStateChanged { get; set; }
 
         public Action<bool>? ExtendClientAreaToDecorationsChanged { get; set; }
diff --git a/src/Avalonia.Native/avn.idl b/src/Avalonia.Native/avn.idl
index 0ab5189ffd..b9b5977632 100644
--- a/src/Avalonia.Native/avn.idl
+++ b/src/Avalonia.Native/avn.idl
@@ -403,6 +403,11 @@ enum AvnAutomationProperty
     AutomationPeer_ClassName,
     AutomationPeer_Name,
     RangeValueProvider_Value,
+    ValueProvider_Value,
+    ToggleProvider_ToggleState,
+    ExpandCollapseProvider_ExpandCollapseState,
+    SelectionItemProvider_IsSelected,
+    SelectionProvider_Selection,
 }
 
 struct AvnSize
@@ -1004,14 +1009,14 @@ interface IAvnClipboard : IUnknown
 interface IAvnClipboardDataSource : IUnknown
 {
     int GetItemCount();
-    IAvnClipboardDataItem* GetItem(int index);
+    HRESULT GetItem(int index, IAvnClipboardDataItem**ppv);
 }
 
 [uuid(e40f36d9-69f4-45fd-9ca2-6e64e80feb6d)]
 interface IAvnClipboardDataItem : IUnknown
 {
-    IAvnStringArray* ProvideFormats();
-    IAvnClipboardDataValue* GetValue([const] char* format);
+    HRESULT ProvideFormats(IAvnStringArray** ppv);
+    HRESULT GetValue([const] char* format, IAvnClipboardDataValue** ppv);
 }
 
 [uuid(e97f24f6-1c84-4d95-8ffe-5b2c72e016ed)]
diff --git a/src/Avalonia.OpenGL/Egl/EglGlPlatformSurfaceBase.cs b/src/Avalonia.OpenGL/Egl/EglGlPlatformSurfaceBase.cs
index ef4ae257bd..8ee06266d8 100644
--- a/src/Avalonia.OpenGL/Egl/EglGlPlatformSurfaceBase.cs
+++ b/src/Avalonia.OpenGL/Egl/EglGlPlatformSurfaceBase.cs
@@ -110,6 +110,9 @@ namespace Avalonia.OpenGL.Egl
             public bool IsYFlipped { get; }
         }
 
+        public virtual PlatformRenderTargetState State =>
+            IsCorrupted ? PlatformRenderTargetState.Corrupted : PlatformRenderTargetState.Ready;
+        
         public virtual bool IsCorrupted => Context.IsLost;
     }
 }
diff --git a/src/Avalonia.OpenGL/Surfaces/IGlPlatformSurfaceRenderTarget.cs b/src/Avalonia.OpenGL/Surfaces/IGlPlatformSurfaceRenderTarget.cs
index da35de6649..86c733c5fa 100644
--- a/src/Avalonia.OpenGL/Surfaces/IGlPlatformSurfaceRenderTarget.cs
+++ b/src/Avalonia.OpenGL/Surfaces/IGlPlatformSurfaceRenderTarget.cs
@@ -8,7 +8,6 @@ namespace Avalonia.OpenGL.Surfaces
     [PrivateApi]
     public interface IGlPlatformSurfaceRenderTarget : IDisposable, IPlatformRenderSurfaceRenderTarget
     {
-        bool IsCorrupted { get; }
         IGlPlatformSurfaceRenderingSession BeginDraw(IRenderTarget.RenderTargetSceneInfo sceneInfo);
     }
 }
diff --git a/src/Avalonia.Themes.Fluent/Controls/AutoCompleteBox.xaml b/src/Avalonia.Themes.Fluent/Controls/AutoCompleteBox.xaml
index 92c46ecd41..bd9c84af17 100644
--- a/src/Avalonia.Themes.Fluent/Controls/AutoCompleteBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/AutoCompleteBox.xaml
@@ -25,6 +25,7 @@
       <Setter Property="VerticalAlignment" Value="Top" />
       <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}" />
       <Setter Property="Background" Value="{DynamicResource TextControlBackground}" />
+      <Setter Property="PlaceholderForeground" Value="{DynamicResource TextControlPlaceholderForeground}" />
       <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrush}" />
       <Setter Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThickness}" />
       <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
diff --git a/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml b/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml
index 3a8db8ae36..395e2d514f 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml
@@ -63,6 +63,7 @@
   <ControlTheme x:Key="{x:Type CalendarDatePicker}" TargetType="CalendarDatePicker">
     <Setter Property="Background" Value="{DynamicResource CalendarDatePickerBackground}" />
     <Setter Property="Foreground" Value="{DynamicResource CalendarDatePickerForeground}" />
+    <Setter Property="PlaceholderForeground" Value="{DynamicResource TextControlPlaceholderForeground}" />
     <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderBrush}" />
     <Setter Property="BorderThickness" Value="{DynamicResource CalendarDatePickerBorderThemeThickness}" />
     <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
diff --git a/src/Avalonia.Themes.Fluent/Controls/CommandBar.xaml b/src/Avalonia.Themes.Fluent/Controls/CommandBar.xaml
index 45ad19cb93..b76acab856 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CommandBar.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CommandBar.xaml
@@ -5,29 +5,29 @@
     <Border Padding="20" Width="600">
       <StackPanel Spacing="12">
         <CommandBar>
-          <AppBarButton Label="New">
-            <AppBarButton.Icon>
+          <CommandBarButton Label="New">
+            <CommandBarButton.Icon>
               <PathIcon Data="M19,13H13V19H11V13H5V11H11V5H13V11H19V13Z" />
-            </AppBarButton.Icon>
-          </AppBarButton>
-          <AppBarButton Label="Save">
-            <AppBarButton.Icon>
+            </CommandBarButton.Icon>
+          </CommandBarButton>
+          <CommandBarButton Label="Save">
+            <CommandBarButton.Icon>
               <PathIcon Data="M15,9H5V5H15M12,19A3,3 0 0,1 9,16A3,3 0 0,1 12,13A3,3 0 0,1 15,16A3,3 0 0,1 12,19M17,3H5C3.89,3 3,3.9 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V7L17,3Z" />
-            </AppBarButton.Icon>
-          </AppBarButton>
-          <AppBarSeparator />
-          <AppBarToggleButton Label="Bold">
-            <AppBarToggleButton.Icon>
+            </CommandBarButton.Icon>
+          </CommandBarButton>
+          <CommandBarSeparator />
+          <CommandBarToggleButton Label="Bold">
+            <CommandBarToggleButton.Icon>
               <PathIcon Data="M15.6,10.79C17.04,10.07 18,8.64 18,7C18,4.79 16.21,3 14,3H7V21H14.73C16.78,21 18.5,19.37 18.5,17.32C18.5,15.82 17.72,14.53 16.5,13.77C16.2,13.59 15.9,13.44 15.6,13.32V10.79M10,6.5H13C13.83,6.5 14.5,7.17 14.5,8C14.5,8.83 13.83,9.5 13,9.5H10V6.5M13.5,17.5H10V14H13.5C14.33,14 15,14.67 15,15.5C15,16.33 14.33,17.5 13.5,17.5Z" />
-            </AppBarToggleButton.Icon>
-          </AppBarToggleButton>
+            </CommandBarToggleButton.Icon>
+          </CommandBarToggleButton>
         </CommandBar>
       </StackPanel>
     </Border>
   </Design.PreviewWith>
 
-  <!-- AppBarButton ControlTheme -->
-  <ControlTheme x:Key="{x:Type AppBarButton}" TargetType="AppBarButton">
+  <!-- CommandBarButton ControlTheme -->
+  <ControlTheme x:Key="{x:Type CommandBarButton}" TargetType="CommandBarButton">
     <Setter Property="Background" Value="Transparent" />
     <Setter Property="BorderBrush" Value="Transparent" />
     <Setter Property="BorderThickness" Value="0" />
@@ -108,8 +108,8 @@
     </Style>
   </ControlTheme>
 
-  <!-- AppBarToggleButton ControlTheme -->
-  <ControlTheme x:Key="{x:Type AppBarToggleButton}" TargetType="AppBarToggleButton">
+  <!-- CommandBarToggleButton ControlTheme -->
+  <ControlTheme x:Key="{x:Type CommandBarToggleButton}" TargetType="CommandBarToggleButton">
     <Setter Property="Background" Value="Transparent" />
     <Setter Property="BorderBrush" Value="Transparent" />
     <Setter Property="BorderThickness" Value="0" />
@@ -195,8 +195,8 @@
     </Style>
   </ControlTheme>
 
-  <!-- AppBarSeparator ControlTheme -->
-  <ControlTheme x:Key="{x:Type AppBarSeparator}" TargetType="AppBarSeparator">
+  <!-- CommandBarSeparator ControlTheme -->
+  <ControlTheme x:Key="{x:Type CommandBarSeparator}" TargetType="CommandBarSeparator">
     <Setter Property="Width" Value="1" />
     <Setter Property="MinHeight" Value="24" />
     <Setter Property="Margin" Value="8,4" />
@@ -237,7 +237,7 @@
                 Padding="{TemplateBinding Padding}"
                 MinHeight="{TemplateBinding MinHeight}">
           <Panel>
-            <DockPanel>
+            <DockPanel KeyboardNavigation.TabNavigation="Cycle">
               <!-- Overflow button (docked right) -->
               <Button x:Name="PART_OverflowButton"
                       DockPanel.Dock="Right"
@@ -286,7 +286,8 @@
                       CornerRadius="{DynamicResource OverlayCornerRadius}"
                       Padding="4"
                       MinWidth="160">
-                <ItemsControl ItemsSource="{Binding OverflowItems, RelativeSource={RelativeSource TemplatedParent}}">
+                <ItemsControl x:Name="PART_OverflowPresenter"
+                              ItemsSource="{Binding OverflowItems, RelativeSource={RelativeSource TemplatedParent}}">
                   <ItemsControl.ItemsPanel>
                     <ItemsPanelTemplate>
                       <StackPanel Spacing="2" />
diff --git a/src/Avalonia.Themes.Fluent/Controls/DrawerPage.xaml b/src/Avalonia.Themes.Fluent/Controls/DrawerPage.xaml
index 985814c967..612db8d69c 100644
--- a/src/Avalonia.Themes.Fluent/Controls/DrawerPage.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/DrawerPage.xaml
@@ -57,11 +57,13 @@
               <ContentPresenter Name="PART_DrawerHeader"
                                 DockPanel.Dock="Top"
                                 Content="{TemplateBinding DrawerHeader}"
+                                ContentTemplate="{TemplateBinding DrawerHeaderTemplate}"
                                 Background="{TemplateBinding DrawerHeaderBackground}"
                                 IsVisible="{TemplateBinding DrawerHeader, Converter={x:Static ObjectConverters.IsNotNull}}" />
               <ContentPresenter Name="PART_DrawerFooter"
                                 DockPanel.Dock="Bottom"
                                 Content="{TemplateBinding DrawerFooter}"
+                                ContentTemplate="{TemplateBinding DrawerFooterTemplate}"
                                 Background="{TemplateBinding DrawerFooterBackground}"
                                 IsVisible="{TemplateBinding DrawerFooter, Converter={x:Static ObjectConverters.IsNotNull}}" />
               <ContentPresenter Name="PART_DrawerPresenter"
@@ -198,6 +200,22 @@
       <Setter Property="IsVisible" Value="True" />
     </Style>
 
+    <!-- Bottom placement + compact modes: pane compact strip provides toggle, hide bottom bar -->
+    <Style Selector="^:placement-bottom[DisplayMode=CompactOverlay] /template/ Border#PART_BottomBar">
+      <Setter Property="IsVisible" Value="False" />
+    </Style>
+    <Style Selector="^:placement-bottom[DisplayMode=CompactInline] /template/ Border#PART_BottomBar">
+      <Setter Property="IsVisible" Value="False" />
+    </Style>
+
+    <!-- Horizontal pane (Bottom/Top): compact toggle must dock Left so drawer content can fill the rest -->
+    <Style Selector="^:placement-bottom /template/ ToggleButton#PART_CompactPaneToggle">
+      <Setter Property="DockPanel.Dock" Value="Left" />
+    </Style>
+    <Style Selector="^:placement-top /template/ ToggleButton#PART_CompactPaneToggle">
+      <Setter Property="DockPanel.Dock" Value="Left" />
+    </Style>
+
     <Style Selector="^[DrawerBehavior=Locked] /template/ Border#PART_TopBar">
       <Setter Property="IsVisible" Value="False" />
     </Style>
diff --git a/src/Avalonia.Themes.Fluent/Controls/NavigationPage.xaml b/src/Avalonia.Themes.Fluent/Controls/NavigationPage.xaml
index 8c2172a787..3642f5fc22 100644
--- a/src/Avalonia.Themes.Fluent/Controls/NavigationPage.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/NavigationPage.xaml
@@ -140,6 +140,7 @@
                                 FontSize="20"
                                 Foreground="{DynamicResource NavigationBarForeground}"
                                 Content="{Binding CurrentPage?.Header, RelativeSource={RelativeSource TemplatedParent}, FallbackValue={x:Null}}"
+                                ContentTemplate="{Binding CurrentPage?.HeaderTemplate, RelativeSource={RelativeSource TemplatedParent}, FallbackValue={x:Null}}"
                                 VerticalAlignment="Center"
                                 HorizontalAlignment="Stretch"
                                 HorizontalContentAlignment="Stretch"
@@ -158,11 +159,11 @@
                     <Setter Property="Padding" Value="0" />
                     <Setter Property="VerticalAlignment" Value="Stretch" />
                   </Style>
-                  <Style Selector="AppBarButton">
+                  <Style Selector="CommandBarButton">
                     <Setter Property="MinHeight" Value="0" />
                     <Setter Property="Padding" Value="8,0" />
                   </Style>
-                  <Style Selector="AppBarToggleButton">
+                  <Style Selector="CommandBarToggleButton">
                     <Setter Property="MinHeight" Value="0" />
                     <Setter Property="Padding" Value="8,0" />
                   </Style>
diff --git a/src/Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml b/src/Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml
index b6c19484e9..bcd486534d 100644
--- a/src/Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml
@@ -52,6 +52,7 @@
   <ControlTheme x:Key="{x:Type NumericUpDown}" TargetType="NumericUpDown">
     <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}" />
     <Setter Property="Background" Value="{DynamicResource TextControlBackground}" />
+    <Setter Property="PlaceholderForeground" Value="{DynamicResource TextControlPlaceholderForeground}" />
     <Setter Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThickness}" />
     <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrush}" />
     <Setter Property="MinHeight" Value="{DynamicResource TextControlThemeMinHeight}" />
diff --git a/src/Avalonia.Themes.Fluent/Controls/PipsPager.xaml b/src/Avalonia.Themes.Fluent/Controls/PipsPager.xaml
index 6d20216a48..a331b63977 100644
--- a/src/Avalonia.Themes.Fluent/Controls/PipsPager.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/PipsPager.xaml
@@ -13,12 +13,12 @@
   <StreamGeometry x:Key="PipsPagerPreviousPageButtonVerticalData">M 2.29,8.12 L 7.00,3.41 C 7.27,3.14 7.71,3.14 7.98,3.41 L 12.69,8.12 C 13.14,8.57 12.82,9.33 12.19,9.33 L 2.79,9.33 C 2.16,9.33 1.84,8.57 2.29,8.12 Z</StreamGeometry>
   <StreamGeometry x:Key="PipsPagerNextPageButtonVerticalData">M 2.29,3.88 L 7.00,8.59 C 7.27,8.86 7.71,8.86 7.98,8.59 L 12.69,3.88 C 13.14,3.43 12.82,2.67 12.19,2.67 L 2.79,2.67 C 2.16,2.67 1.84,3.43 2.29,3.88 Z</StreamGeometry>
 
-  <!-- Base navigation button theme (for custom button styles to inherit from) -->
+  <!-- Base navigation button theme (for custom button themes to inherit from) -->
   <ControlTheme x:Key="PipsPagerNavigationButtonTheme" TargetType="Button">
-    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="Background" Value="{DynamicResource PipsPagerNavigationButtonBackground}" />
     <Setter Property="Foreground" Value="{DynamicResource PipsPagerNavigationButtonForeground}" />
-    <Setter Property="BorderBrush" Value="Transparent" />
-    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="BorderBrush" Value="{DynamicResource PipsPagerNavigationButtonBorderBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
     <Setter Property="Width" Value="24" />
     <Setter Property="Height" Value="24" />
     <Setter Property="Padding" Value="0" />
@@ -41,16 +41,20 @@
     </Setter>
 
     <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-      <Setter Property="Background" Value="Transparent" />
+      <Setter Property="Background" Value="{DynamicResource PipsPagerNavigationButtonBackgroundPointerOver}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource PipsPagerNavigationButtonBorderBrushPointerOver}" />
       <Setter Property="Foreground" Value="{DynamicResource PipsPagerNavigationButtonForegroundPointerOver}" />
     </Style>
 
     <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
-      <Setter Property="Background" Value="Transparent" />
+      <Setter Property="Background" Value="{DynamicResource PipsPagerNavigationButtonBackgroundPressed}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource PipsPagerNavigationButtonBorderBrushPressed}" />
       <Setter Property="Foreground" Value="{DynamicResource PipsPagerNavigationButtonForegroundPressed}" />
     </Style>
 
     <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource PipsPagerNavigationButtonBackgroundDisabled}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource PipsPagerNavigationButtonBorderBrushDisabled}" />
       <Setter Property="Foreground" Value="{DynamicResource PipsPagerNavigationButtonForegroundDisabled}" />
     </Style>
   </ControlTheme>
@@ -73,6 +77,21 @@
     <Setter Property="Template">
       <ControlTemplate>
         <Grid Background="Transparent">
+          <Ellipse Name="PipBackground"
+                   Width="10"
+                   Height="10"
+                   HorizontalAlignment="Center"
+                   VerticalAlignment="Center"
+                   Fill="{DynamicResource PipsPagerSelectionIndicatorBackground}"
+                   Stroke="{DynamicResource PipsPagerSelectionIndicatorBorderBrush}"
+                   StrokeThickness="1">
+            <Ellipse.Transitions>
+              <Transitions>
+                <BrushTransition Property="Fill" Duration="0:0:0.167" />
+                <BrushTransition Property="Stroke" Duration="0:0:0.167" />
+              </Transitions>
+            </Ellipse.Transitions>
+          </Ellipse>
           <Ellipse Name="Pip"
                    Width="4"
                    Height="4"
@@ -96,25 +115,45 @@
       <Setter Property="Height" Value="6" />
       <Setter Property="Fill" Value="{DynamicResource PipsPagerSelectionIndicatorForegroundPointerOver}" />
     </Style>
+    <Style Selector="^:pointerover /template/ Ellipse#PipBackground">
+      <Setter Property="Fill" Value="{DynamicResource PipsPagerSelectionIndicatorBackgroundPointerOver}" />
+      <Setter Property="Stroke" Value="{DynamicResource PipsPagerSelectionIndicatorBorderBrushPointerOver}" />
+    </Style>
     <Style Selector="^:pressed /template/ Ellipse#Pip">
       <Setter Property="Width" Value="4" />
       <Setter Property="Height" Value="4" />
       <Setter Property="Fill" Value="{DynamicResource PipsPagerSelectionIndicatorForegroundPressed}" />
     </Style>
+    <Style Selector="^:pressed /template/ Ellipse#PipBackground">
+      <Setter Property="Fill" Value="{DynamicResource PipsPagerSelectionIndicatorBackgroundPressed}" />
+      <Setter Property="Stroke" Value="{DynamicResource PipsPagerSelectionIndicatorBorderBrushPressed}" />
+    </Style>
 
     <Style Selector="^:selected /template/ Ellipse#Pip">
       <Setter Property="Width" Value="6" />
       <Setter Property="Height" Value="6" />
       <Setter Property="Fill" Value="{DynamicResource PipsPagerSelectionIndicatorForegroundSelected}" />
     </Style>
+    <Style Selector="^:selected /template/ Ellipse#PipBackground">
+      <Setter Property="Fill" Value="{DynamicResource PipsPagerSelectionIndicatorBackgroundSelected}" />
+      <Setter Property="Stroke" Value="{DynamicResource PipsPagerSelectionIndicatorBorderBrushSelected}" />
+    </Style>
     <Style Selector="^:selected:pointerover /template/ Ellipse#Pip">
       <Setter Property="Width" Value="6" />
       <Setter Property="Height" Value="6" />
       <Setter Property="Fill" Value="{DynamicResource PipsPagerSelectionIndicatorForegroundPointerOver}" />
     </Style>
+    <Style Selector="^:selected:pointerover /template/ Ellipse#PipBackground">
+      <Setter Property="Fill" Value="{DynamicResource PipsPagerSelectionIndicatorBackgroundPointerOver}" />
+      <Setter Property="Stroke" Value="{DynamicResource PipsPagerSelectionIndicatorBorderBrushPointerOver}" />
+    </Style>
     <Style Selector="^:disabled /template/ Ellipse#Pip">
       <Setter Property="Fill" Value="{DynamicResource PipsPagerSelectionIndicatorForegroundDisabled}" />
     </Style>
+    <Style Selector="^:disabled /template/ Ellipse#PipBackground">
+      <Setter Property="Fill" Value="{DynamicResource PipsPagerSelectionIndicatorBackgroundDisabled}" />
+      <Setter Property="Stroke" Value="{DynamicResource PipsPagerSelectionIndicatorBorderBrushDisabled}" />
+    </Style>
   </ControlTheme>
 
   <ControlTheme x:Key="{x:Type PipsPager}" TargetType="PipsPager">
@@ -122,8 +161,8 @@
     <Setter Property="HorizontalAlignment" Value="Left" />
     <Setter Property="VerticalAlignment" Value="Top" />
     <Setter Property="IsTabStop" Value="False" />
-    <Setter Property="PreviousButtonStyle" Value="{StaticResource PipsPagerPreviousButtonTheme}" />
-    <Setter Property="NextButtonStyle" Value="{StaticResource PipsPagerNextButtonTheme}" />
+    <Setter Property="PreviousButtonTheme" Value="{StaticResource PipsPagerPreviousButtonTheme}" />
+    <Setter Property="NextButtonTheme" Value="{StaticResource PipsPagerNextButtonTheme}" />
     <Setter Property="Template">
       <ControlTemplate>
         <StackPanel Name="PART_RootPanel"
@@ -131,7 +170,7 @@
                     Background="{TemplateBinding Background}"
                     ClipToBounds="False">
           <Button Name="PART_PreviousButton"
-                  Theme="{TemplateBinding PreviousButtonStyle}"
+                  Theme="{TemplateBinding PreviousButtonTheme}"
                   IsVisible="{TemplateBinding IsPreviousButtonVisible}"
                   VerticalAlignment="Center"
                   HorizontalAlignment="Center">
@@ -168,7 +207,7 @@
           </ListBox>
 
           <Button Name="PART_NextButton"
-                  Theme="{TemplateBinding NextButtonStyle}"
+                  Theme="{TemplateBinding NextButtonTheme}"
                   IsVisible="{TemplateBinding IsNextButtonVisible}"
                   VerticalAlignment="Center"
                   HorizontalAlignment="Center">
@@ -309,4 +348,4 @@
       <SolidColorBrush x:Key="PipsPagerNavigationButtonForegroundDisabled" Color="#3FFFFFFF" />
     </ResourceDictionary>
   </ResourceDictionary.ThemeDictionaries>
-</ResourceDictionary>
\ No newline at end of file
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml b/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
index 5cd5f84204..da70caa5c6 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
@@ -113,17 +113,17 @@
         <DataValidationErrors>
           <Panel>
             <Border
-              Name="PART_BorderElement"
-              Background="{TemplateBinding Background}"
-              BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}"
-              CornerRadius="{TemplateBinding CornerRadius}"
-              MinWidth="{TemplateBinding MinWidth}"
-              MinHeight="{TemplateBinding MinHeight}">
+            Name="PART_BorderElement"
+            Background="{TemplateBinding Background}"
+            BorderBrush="{TemplateBinding BorderBrush}"
+            BorderThickness="{TemplateBinding BorderThickness}"
+            CornerRadius="{TemplateBinding CornerRadius}"
+            MinWidth="{TemplateBinding MinWidth}"
+            MinHeight="{TemplateBinding MinHeight}">
             </Border>
 
             <Border
-              Margin="{TemplateBinding BorderThickness}">
+            Margin="{TemplateBinding BorderThickness}">
               <Grid ColumnDefinitions="Auto,*,Auto" >
                 <ContentPresenter Grid.Column="0"
                                   Grid.ColumnSpan="1"
@@ -147,13 +147,13 @@
                                 BringIntoViewOnFocusChange="{TemplateBinding (ScrollViewer.BringIntoViewOnFocusChange)}">
                     <Panel>
                       <TextBlock Name="PART_Placeholder"
-                              Foreground="{TemplateBinding PlaceholderForeground}"
-                              Opacity="{DynamicResource TextControlPlaceholderOpacity}"
-                              Text="{TemplateBinding PlaceholderText}"
-                              TextAlignment="{TemplateBinding TextAlignment}"
-                              TextWrapping="{TemplateBinding TextWrapping}"
-                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                                 Foreground="{TemplateBinding PlaceholderForeground}"
+                                 Opacity="{DynamicResource TextControlPlaceholderOpacity}"
+                                 Text="{TemplateBinding PlaceholderText}"
+                                 TextAlignment="{TemplateBinding TextAlignment}"
+                                 TextWrapping="{TemplateBinding TextWrapping}"
+                                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
                         <TextBlock.IsVisible>
                           <MultiBinding Converter="{x:Static BoolConverters.And}">
                             <Binding ElementName="PART_TextPresenter" Path="PreeditText" Converter="{x:Static StringConverters.IsNullOrEmpty}"/>
@@ -163,22 +163,22 @@
                       </TextBlock>
 
                       <TextPresenter Name="PART_TextPresenter"
-                                    Text="{TemplateBinding Text, Mode=TwoWay}"
-                                    CaretBlinkInterval="{TemplateBinding CaretBlinkInterval}"
-                                    CaretIndex="{TemplateBinding CaretIndex}"
-                                    SelectionStart="{TemplateBinding SelectionStart}"
-                                    SelectionEnd="{TemplateBinding SelectionEnd}"
-                                    TextAlignment="{TemplateBinding TextAlignment}"
-                                    TextWrapping="{TemplateBinding TextWrapping}"
-                                    LineHeight="{TemplateBinding LineHeight}"
-                                    LetterSpacing="{TemplateBinding LetterSpacing}"
-                                    PasswordChar="{TemplateBinding PasswordChar}"
-                                    RevealPassword="{TemplateBinding RevealPassword}"
-                                    SelectionBrush="{TemplateBinding SelectionBrush}"
-                                    SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
-                                    CaretBrush="{TemplateBinding CaretBrush}"
-                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                                     Text="{TemplateBinding Text, Mode=TwoWay}"
+                                     CaretBlinkInterval="{TemplateBinding CaretBlinkInterval}"
+                                     CaretIndex="{TemplateBinding CaretIndex}"
+                                     SelectionStart="{TemplateBinding SelectionStart}"
+                                     SelectionEnd="{TemplateBinding SelectionEnd}"
+                                     TextAlignment="{TemplateBinding TextAlignment}"
+                                     TextWrapping="{TemplateBinding TextWrapping}"
+                                     LineHeight="{TemplateBinding LineHeight}"
+                                     LetterSpacing="{TemplateBinding LetterSpacing}"
+                                     PasswordChar="{TemplateBinding PasswordChar}"
+                                     RevealPassword="{TemplateBinding RevealPassword}"
+                                     SelectionBrush="{TemplateBinding SelectionBrush}"
+                                     SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
+                                     CaretBrush="{TemplateBinding CaretBrush}"
+                                     HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                     VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
                     </Panel>
                     <ScrollViewer.Styles>
                       <Style Selector="ScrollContentPresenter#PART_ContentPresenter">
@@ -198,6 +198,10 @@
       </ControlTemplate>
     </Setter>
 
+    <Style Selector="^:touch-mode">
+      <Setter Property="ContextFlyout" Value="{StaticResource HorizontalTextBoxContextFlyout}" />
+    </Style>
+
     <!-- Disabled State -->
     <Style Selector="^:disabled">
       <Setter Property="Foreground" Value="{DynamicResource TextControlForegroundDisabled}" />
diff --git a/src/Avalonia.Themes.Fluent/Controls/TextSelectionHandle.xaml b/src/Avalonia.Themes.Fluent/Controls/TextSelectionHandle.xaml
index 84bc104036..42020b14f7 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TextSelectionHandle.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TextSelectionHandle.xaml
@@ -1,24 +1,74 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Design.PreviewWith>
+    <Grid>
+      <Border>
+        <Image Stretch="Uniform" HorizontalAlignment="Left"
+               Cursor="Arrow"
+               Name="PART_HandlePathIcon"
+               Height="{DynamicResource TextSelectHandleSize}"
+               Source="{DynamicResource TextSelectionHandleDrawing}">
+        </Image>
+      </Border>
+    </Grid>
+  </Design.PreviewWith>
   <x:Double x:Key="TextSelectHandleSize">32</x:Double>
-  <GeometryGroup x:Key="TextSelectionHandlePath" FillRule="NonZero">
-    <RectangleGeometry Rect="0,0,16,16"/>
-    <EllipseGeometry Center="16,16"
-                     RadiusX="16"
-                     RadiusY="16"/>
+
+  <DrawingImage x:Key="TextSelectionHandleDrawing">
+    <DrawingImage.Drawing>
+      <GeometryDrawing Geometry="{DynamicResource TextSelectionHandlePath}"
+                       Brush="{DynamicResource TextControlSelectionHighlightColor}"
+                       >
+        <GeometryDrawing.Pen>
+          <Pen Thickness="0.5" Brush="{DynamicResource SystemControlForegroundBaseHighBrush}" LineJoin="Round"/>
+        </GeometryDrawing.Pen>
+      </GeometryDrawing>
+    </DrawingImage.Drawing>
+  </DrawingImage>
+
+  <DrawingImage x:Key="TextCaretHandleDrawing">
+    <DrawingImage.Drawing>
+      <GeometryDrawing Geometry="{DynamicResource TextCaretHandlePath}"
+                       Brush="{DynamicResource TextControlSelectionHighlightColor}"
+                       >
+        <GeometryDrawing.Pen>
+          <Pen Thickness="0.5" Brush="{DynamicResource SystemControlForegroundBaseHighBrush}" LineJoin="Round"/>
+        </GeometryDrawing.Pen>
+      </GeometryDrawing>
+    </DrawingImage.Drawing>
+  </DrawingImage>
+
+  <GeometryGroup x:Key="TextSelectionHandlePath">
+    <CombinedGeometry>
+      <CombinedGeometry.Geometry1>
+        <RectangleGeometry Rect="0,0,16,16"/>
+      </CombinedGeometry.Geometry1>
+      <CombinedGeometry.Geometry2>
+        <EllipseGeometry Center="16,16"
+                         RadiusX="16"
+                         RadiusY="16"/>
+      </CombinedGeometry.Geometry2>
+    </CombinedGeometry>
   </GeometryGroup>
-  <GeometryGroup x:Key="TextCaretHandlePath" FillRule="NonZero">
-    <RectangleGeometry Rect="0,0,16,16">
-      <RectangleGeometry.Transform>
-        <TransformGroup >
-          <RotateTransform CenterX="16"
-                           Angle="-45"/>
-        </TransformGroup>
-      </RectangleGeometry.Transform>
-    </RectangleGeometry>
-    <EllipseGeometry Center="16,22.7"
-                     RadiusX="16"
-                     RadiusY="16"/>
+
+  <GeometryGroup x:Key="TextCaretHandlePath">
+    <CombinedGeometry>
+      <CombinedGeometry.Geometry1>
+        <RectangleGeometry Rect="0,0,16,16">
+          <RectangleGeometry.Transform>
+            <TransformGroup >
+              <RotateTransform CenterX="16"
+                               Angle="-45"/>
+            </TransformGroup>
+          </RectangleGeometry.Transform>
+        </RectangleGeometry>
+      </CombinedGeometry.Geometry1>
+      <CombinedGeometry.Geometry2>
+        <EllipseGeometry Center="16,22.7"
+                         RadiusX="16"
+                         RadiusY="16"/>
+      </CombinedGeometry.Geometry2>
+    </CombinedGeometry>
   </GeometryGroup>
   <ControlTheme x:Key="{x:Type TextSelectionHandle}"
                 TargetType="TextSelectionHandle">
@@ -30,20 +80,39 @@
       <Setter.Value>
         <ControlTemplate>
           <Grid>
-            <PathIcon
-              Cursor="Arrow"
-              Name="PART_HandlePathIcon"
-              HorizontalAlignment="Stretch"
-              Height="{DynamicResource TextSelectHandleSize}"
-              Foreground="{TemplateBinding Background}"
-              Data="{DynamicResource TextSelectionHandlePath}"
-              />
+            <Border Padding="0,0,0,10" IsHitTestVisible="True" Background="Transparent">
+              <Image Stretch="Uniform"
+                     Cursor="Arrow"
+                     Name="PART_HandlePathIcon"
+                     Height="{DynamicResource TextSelectHandleSize}"
+                     Source="{DynamicResource TextSelectionHandleDrawing}"/>
+            </Border>
+            <Border Background="Transparent"
+                    Name="PART_Indicator"
+                    HorizontalAlignment="Center"
+                    Width="1" 
+                    VerticalAlignment="Top" 
+                    Height="5"/>
           </Grid>
         </ControlTemplate>
       </Setter.Value>
     </Setter>
-    <Style Selector="^.caret /template/ PathIcon#PART_HandlePathIcon">
-      <Setter Property="Data" Value="{DynamicResource TextCaretHandlePath}" />
+    <Style Selector="^:caret /template/ Image#PART_HandlePathIcon">
+      <Setter Property="Source" Value="{DynamicResource TextCaretHandleDrawing}" />
+    </Style>
+    <Style Selector="^:start /template/ Image#PART_HandlePathIcon">
+      <Setter Property="RenderTransform">
+        <ScaleTransform ScaleX="-1" ScaleY="1"/>
+      </Setter>
+    </Style>
+    <Style Selector="^:caret /template/ Border#PART_Indicator">
+      <Setter Property="HorizontalAlignment" Value="Center" />
+    </Style>
+    <Style Selector="^:end /template/ Border#PART_Indicator">
+      <Setter Property="HorizontalAlignment" Value="Left" />
+    </Style>
+    <Style Selector="^:start /template/ Border#PART_Indicator">
+      <Setter Property="HorizontalAlignment" Value="Right" />
     </Style>
   </ControlTheme>
 </ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/WindowDrawnDecorations.xaml b/src/Avalonia.Themes.Fluent/Controls/WindowDrawnDecorations.xaml
index b2d66fdbbd..3ccda42ce3 100644
--- a/src/Avalonia.Themes.Fluent/Controls/WindowDrawnDecorations.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/WindowDrawnDecorations.xaml
@@ -196,6 +196,20 @@
       <Setter Property="Opacity" Value="0.2"/>
     </Style>
 
+    <!-- Hide caption buttons when the platform does not support the action -->
+    <Style Selector="^:not(:has-minimize) /template/ Button#PART_MinimizeButton">
+      <Setter Property="IsVisible" Value="False"/>
+    </Style>
+    <Style Selector="^:not(:has-maximize) /template/ Button#PART_MaximizeButton">
+      <Setter Property="IsVisible" Value="False"/>
+    </Style>
+    <Style Selector="^:not(:has-fullscreen) /template/ Button#PART_FullScreenButton">
+      <Setter Property="IsVisible" Value="False"/>
+    </Style>
+    <Style Selector="^:not(:has-fullscreen) /template/ Button#PART_PopoverFullScreenButton">
+      <Setter Property="IsVisible" Value="False"/>
+    </Style>
+
     <!-- Fullscreen: hide overlay and titlebar (popover takes over) -->
     <Style Selector="^:fullscreen /template/ Panel#PART_TitleTextPanel">
       <Setter Property="IsVisible" Value="False" />
diff --git a/src/Avalonia.Themes.Simple/Controls/AutoCompleteBox.xaml b/src/Avalonia.Themes.Simple/Controls/AutoCompleteBox.xaml
index ec0eccc8c4..7a1c98b598 100644
--- a/src/Avalonia.Themes.Simple/Controls/AutoCompleteBox.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/AutoCompleteBox.xaml
@@ -4,6 +4,7 @@
   <ControlTheme x:Key="{x:Type AutoCompleteBox}"
                 TargetType="AutoCompleteBox">
     <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
+    <Setter Property="PlaceholderForeground" Value="{DynamicResource ThemeForegroundLowBrush}" />
     <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
     <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}" />
     <Setter Property="Padding" Value="4" />
diff --git a/src/Avalonia.Themes.Simple/Controls/CalendarDatePicker.xaml b/src/Avalonia.Themes.Simple/Controls/CalendarDatePicker.xaml
index a38f6f912d..9eba0a413b 100644
--- a/src/Avalonia.Themes.Simple/Controls/CalendarDatePicker.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/CalendarDatePicker.xaml
@@ -12,6 +12,7 @@
   <ControlTheme x:Key="{x:Type CalendarDatePicker}"
                 TargetType="CalendarDatePicker">
     <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
+    <Setter Property="PlaceholderForeground" Value="{DynamicResource ThemeForegroundLowBrush}" />
     <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
     <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}" />
     <Setter Property="Padding" Value="4" />
diff --git a/src/Avalonia.Themes.Simple/Controls/ComboBox.xaml b/src/Avalonia.Themes.Simple/Controls/ComboBox.xaml
index 5a6266af6e..be4725d08c 100644
--- a/src/Avalonia.Themes.Simple/Controls/ComboBox.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/ComboBox.xaml
@@ -50,6 +50,7 @@
                      Foreground="{TemplateBinding Foreground}"
                      Background="Transparent"
                      Text="{TemplateBinding Text, Mode=TwoWay}"
+                     PlaceholderText="{TemplateBinding PlaceholderText}"
                      BorderThickness="0"
                      IsVisible="{TemplateBinding IsEditable}">
               <TextBox.Resources>
diff --git a/src/Avalonia.Themes.Simple/Controls/CommandBar.xaml b/src/Avalonia.Themes.Simple/Controls/CommandBar.xaml
index f1384dc892..dd073c0f38 100644
--- a/src/Avalonia.Themes.Simple/Controls/CommandBar.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/CommandBar.xaml
@@ -5,23 +5,23 @@
     <Border Padding="20" Width="500">
       <StackPanel Spacing="8">
         <CommandBar>
-          <AppBarButton Label="New">
-            <AppBarButton.Icon>
+          <CommandBarButton Label="New">
+            <CommandBarButton.Icon>
               <PathIcon Data="M19,13H13V19H11V13H5V11H11V5H13V11H19V13Z" />
-            </AppBarButton.Icon>
-          </AppBarButton>
-          <AppBarButton Label="Save">
-            <AppBarButton.Icon>
+            </CommandBarButton.Icon>
+          </CommandBarButton>
+          <CommandBarButton Label="Save">
+            <CommandBarButton.Icon>
               <PathIcon Data="M15,9H5V5H15M12,19A3,3 0 0,1 9,16A3,3 0 0,1 12,13A3,3 0 0,1 15,16A3,3 0 0,1 12,19M17,3H5C3.89,3 3,3.9 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V7L17,3Z" />
-            </AppBarButton.Icon>
-          </AppBarButton>
+            </CommandBarButton.Icon>
+          </CommandBarButton>
         </CommandBar>
       </StackPanel>
     </Border>
   </Design.PreviewWith>
 
-  <!-- AppBarButton ControlTheme -->
-  <ControlTheme x:Key="{x:Type AppBarButton}" TargetType="AppBarButton">
+  <!-- CommandBarButton ControlTheme -->
+  <ControlTheme x:Key="{x:Type CommandBarButton}" TargetType="CommandBarButton">
     <Setter Property="Background" Value="Transparent" />
     <Setter Property="BorderBrush" Value="Transparent" />
     <Setter Property="BorderThickness" Value="0" />
@@ -102,8 +102,8 @@
     </Style>
   </ControlTheme>
 
-  <!-- AppBarToggleButton ControlTheme -->
-  <ControlTheme x:Key="{x:Type AppBarToggleButton}" TargetType="AppBarToggleButton">
+  <!-- CommandBarToggleButton ControlTheme -->
+  <ControlTheme x:Key="{x:Type CommandBarToggleButton}" TargetType="CommandBarToggleButton">
     <Setter Property="Background" Value="Transparent" />
     <Setter Property="BorderBrush" Value="Transparent" />
     <Setter Property="BorderThickness" Value="0" />
@@ -190,8 +190,8 @@
     </Style>
   </ControlTheme>
 
-  <!-- AppBarSeparator ControlTheme -->
-  <ControlTheme x:Key="{x:Type AppBarSeparator}" TargetType="AppBarSeparator">
+  <!-- CommandBarSeparator ControlTheme -->
+  <ControlTheme x:Key="{x:Type CommandBarSeparator}" TargetType="CommandBarSeparator">
     <Setter Property="Width" Value="1" />
     <Setter Property="MinHeight" Value="24" />
     <Setter Property="Margin" Value="8,4" />
@@ -234,7 +234,7 @@
                 Padding="{TemplateBinding Padding}"
                 MinHeight="{TemplateBinding MinHeight}">
           <Panel>
-            <DockPanel>
+            <DockPanel KeyboardNavigation.TabNavigation="Cycle">
               <!-- Overflow button (docked right) -->
               <Button x:Name="PART_OverflowButton"
                       DockPanel.Dock="Right"
@@ -281,7 +281,8 @@
                       BorderThickness="{DynamicResource ThemeBorderThickness}"
                       Padding="4"
                       MinWidth="160">
-                <ItemsControl ItemsSource="{Binding OverflowItems, RelativeSource={RelativeSource TemplatedParent}}">
+                <ItemsControl x:Name="PART_OverflowPresenter"
+                              ItemsSource="{Binding OverflowItems, RelativeSource={RelativeSource TemplatedParent}}">
                   <ItemsControl.ItemsPanel>
                     <ItemsPanelTemplate>
                       <StackPanel Spacing="2" />
diff --git a/src/Avalonia.Themes.Simple/Controls/DrawerPage.xaml b/src/Avalonia.Themes.Simple/Controls/DrawerPage.xaml
index 9acf4c4d43..42445ff4c3 100644
--- a/src/Avalonia.Themes.Simple/Controls/DrawerPage.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/DrawerPage.xaml
@@ -56,11 +56,13 @@
               <ContentPresenter Name="PART_DrawerHeader"
                                 DockPanel.Dock="Top"
                                 Content="{TemplateBinding DrawerHeader}"
+                                ContentTemplate="{TemplateBinding DrawerHeaderTemplate}"
                                 Background="{TemplateBinding DrawerHeaderBackground}"
                                 IsVisible="{TemplateBinding DrawerHeader, Converter={x:Static ObjectConverters.IsNotNull}}" />
               <ContentPresenter Name="PART_DrawerFooter"
                                 DockPanel.Dock="Bottom"
                                 Content="{TemplateBinding DrawerFooter}"
+                                ContentTemplate="{TemplateBinding DrawerFooterTemplate}"
                                 Background="{TemplateBinding DrawerFooterBackground}"
                                 IsVisible="{TemplateBinding DrawerFooter, Converter={x:Static ObjectConverters.IsNotNull}}" />
               <ContentPresenter Name="PART_DrawerPresenter"
@@ -181,6 +183,22 @@
       <Setter Property="IsVisible" Value="True" />
     </Style>
 
+    <!-- Bottom placement + compact modes: pane compact strip provides toggle, hide bottom bar -->
+    <Style Selector="^:placement-bottom[DisplayMode=CompactOverlay] /template/ Border#PART_BottomBar">
+      <Setter Property="IsVisible" Value="False" />
+    </Style>
+    <Style Selector="^:placement-bottom[DisplayMode=CompactInline] /template/ Border#PART_BottomBar">
+      <Setter Property="IsVisible" Value="False" />
+    </Style>
+
+    <!-- Horizontal pane (Bottom/Top): compact toggle must dock Left so drawer content can fill the rest -->
+    <Style Selector="^:placement-bottom /template/ ToggleButton#PART_CompactPaneToggle">
+      <Setter Property="DockPanel.Dock" Value="Left" />
+    </Style>
+    <Style Selector="^:placement-top /template/ ToggleButton#PART_CompactPaneToggle">
+      <Setter Property="DockPanel.Dock" Value="Left" />
+    </Style>
+
     <Style Selector="^[DrawerBehavior=Locked] /template/ Border#PART_TopBar">
       <Setter Property="IsVisible" Value="False" />
     </Style>
diff --git a/src/Avalonia.Themes.Simple/Controls/NavigationPage.xaml b/src/Avalonia.Themes.Simple/Controls/NavigationPage.xaml
index 66325a9ba7..88d5a9a2df 100644
--- a/src/Avalonia.Themes.Simple/Controls/NavigationPage.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/NavigationPage.xaml
@@ -134,6 +134,7 @@
                                 FontSize="18"
                                 Foreground="{DynamicResource NavigationBarForeground}"
                                 Content="{Binding CurrentPage?.Header, RelativeSource={RelativeSource TemplatedParent}, FallbackValue={x:Null}}"
+                                ContentTemplate="{Binding CurrentPage?.HeaderTemplate, RelativeSource={RelativeSource TemplatedParent}, FallbackValue={x:Null}}"
                                 VerticalAlignment="Center"
                                 HorizontalAlignment="Stretch"
                                 HorizontalContentAlignment="Stretch"
diff --git a/src/Avalonia.Themes.Simple/Controls/NumericUpDown.xaml b/src/Avalonia.Themes.Simple/Controls/NumericUpDown.xaml
index 14cb0de6af..dbd01456bd 100644
--- a/src/Avalonia.Themes.Simple/Controls/NumericUpDown.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/NumericUpDown.xaml
@@ -4,6 +4,7 @@
   <ControlTheme x:Key="{x:Type NumericUpDown}"
                 TargetType="NumericUpDown">
     <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
+    <Setter Property="PlaceholderForeground" Value="{DynamicResource ThemeForegroundLowBrush}" />
     <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
     <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}" />
     <Setter Property="Padding" Value="4" />
diff --git a/src/Avalonia.Themes.Simple/Controls/PipsPager.xaml b/src/Avalonia.Themes.Simple/Controls/PipsPager.xaml
index 388fc0e4d6..cfc5dd67be 100644
--- a/src/Avalonia.Themes.Simple/Controls/PipsPager.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/PipsPager.xaml
@@ -10,6 +10,8 @@
     <Setter Property="BorderBrush" Value="Transparent" />
     <Setter Property="BorderThickness" Value="0" />
     <Setter Property="IsTabStop" Value="False" />
+    <Setter Property="PreviousButtonTheme" Value="{StaticResource {x:Type Button}}" />
+    <Setter Property="NextButtonTheme" Value="{StaticResource {x:Type Button}}" />
     <Setter Property="Template">
       <ControlTemplate>
         <StackPanel Name="PART_RootPanel" 
@@ -19,6 +21,7 @@
                     ClipToBounds="False">
             
             <Button Name="PART_PreviousButton"
+                    Theme="{TemplateBinding PreviousButtonTheme}"
                     Width="24"
                     Height="24"
                     Padding="0"
@@ -99,6 +102,7 @@
             </ListBox>
 
             <Button Name="PART_NextButton"
+                    Theme="{TemplateBinding NextButtonTheme}"
                     Width="24"
                     Height="24"
                     Padding="0"
diff --git a/src/Avalonia.Themes.Simple/Controls/TextSelectionHandle.xaml b/src/Avalonia.Themes.Simple/Controls/TextSelectionHandle.xaml
index c9ca5ebc63..4d8c4b0d90 100644
--- a/src/Avalonia.Themes.Simple/Controls/TextSelectionHandle.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/TextSelectionHandle.xaml
@@ -1,6 +1,63 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <x:Double x:Key="TextSelectHandleSize">32</x:Double>
+  <x:Double x:Key="TextSelectHandleSize">24</x:Double>
+  <DrawingImage x:Key="TextSelectionHandleDrawing">
+    <DrawingImage.Drawing>
+      <GeometryDrawing Geometry="{DynamicResource TextSelectionHandlePath}"
+                       Brush="{DynamicResource HighlightBrush}"
+                       >
+        <GeometryDrawing.Pen>
+          <Pen Thickness="0.5" Brush="{DynamicResource ThemeForegroundBrush}" LineJoin="Round"/>
+        </GeometryDrawing.Pen>
+      </GeometryDrawing>
+    </DrawingImage.Drawing>
+  </DrawingImage>
+
+  <DrawingImage x:Key="TextCaretHandleDrawing">
+    <DrawingImage.Drawing>
+      <GeometryDrawing Geometry="{DynamicResource TextCaretHandlePath}"
+                       Brush="{DynamicResource HighlightBrush}"
+                       >
+        <GeometryDrawing.Pen>
+          <Pen Thickness="0.5" Brush="{DynamicResource ThemeForegroundBrush}" LineJoin="Round"/>
+        </GeometryDrawing.Pen>
+      </GeometryDrawing>
+    </DrawingImage.Drawing>
+  </DrawingImage>
+
+  <GeometryGroup x:Key="TextSelectionHandlePath">
+    <CombinedGeometry>
+      <CombinedGeometry.Geometry1>
+        <RectangleGeometry Rect="0,0,16,16"/>
+      </CombinedGeometry.Geometry1>
+      <CombinedGeometry.Geometry2>
+        <EllipseGeometry Center="16,16"
+                         RadiusX="16"
+                         RadiusY="16"/>
+      </CombinedGeometry.Geometry2>
+    </CombinedGeometry>
+  </GeometryGroup>
+
+  <GeometryGroup x:Key="TextCaretHandlePath">
+    <CombinedGeometry>
+      <CombinedGeometry.Geometry1>
+        <RectangleGeometry Rect="0,0,16,16">
+          <RectangleGeometry.Transform>
+            <TransformGroup >
+              <RotateTransform CenterX="16"
+                               Angle="-45"/>
+            </TransformGroup>
+          </RectangleGeometry.Transform>
+        </RectangleGeometry>
+      </CombinedGeometry.Geometry1>
+      <CombinedGeometry.Geometry2>
+        <EllipseGeometry Center="16,22.7"
+                         RadiusX="16"
+                         RadiusY="16"/>
+      </CombinedGeometry.Geometry2>
+    </CombinedGeometry>
+  </GeometryGroup>
+
   <ControlTheme x:Key="{x:Type TextSelectionHandle}"
                 TargetType="TextSelectionHandle">
     <Setter Property="Background"
@@ -11,42 +68,39 @@
       <Setter.Value>
         <ControlTemplate>
           <Grid>
-            <PathIcon
-              Cursor="Arrow"
-              Name="PART_HandlePathIcon"
-              HorizontalAlignment="Stretch"
-              Height="{DynamicResource TextSelectHandleSize}"
-              Foreground="{TemplateBinding Background}"
-              >
-              <PathIcon.Data>
-                <GeometryGroup FillRule="NonZero">
-                  <RectangleGeometry Rect="0,0,16,16"/>
-                  <EllipseGeometry Center="16,16"
-                                   RadiusX="16"
-                                   RadiusY="16"/>
-                </GeometryGroup>
-              </PathIcon.Data>
-            </PathIcon>
+            <Border Padding="0,0,0,10" IsHitTestVisible="True" Background="Transparent">
+              <Image Stretch="Uniform"
+                     Cursor="Arrow"
+                     Name="PART_HandlePathIcon"
+                     Height="{DynamicResource TextSelectHandleSize}"
+                     Source="{DynamicResource TextSelectionHandleDrawing}"/>
+            </Border>
+            <Border Background="Transparent"
+                    Name="PART_Indicator"
+                    HorizontalAlignment="Center"
+                    Width="1"
+                    VerticalAlignment="Top"
+                    Height="5"/>
           </Grid>
         </ControlTemplate>
       </Setter.Value>
     </Setter>
-    <Style Selector="^.caret /template/ PathIcon#PART_HandlePathIcon">
-      <Setter Property="Data">
-        <GeometryGroup FillRule="NonZero">
-          <RectangleGeometry Rect="0,0,16,16">
-            <RectangleGeometry.Transform>
-              <TransformGroup >
-                <RotateTransform CenterX="16"
-                                 Angle="-45"/>
-              </TransformGroup>
-            </RectangleGeometry.Transform>
-          </RectangleGeometry>
-          <EllipseGeometry Center="16,22.7"
-                           RadiusX="16"
-                           RadiusY="16"/>
-        </GeometryGroup>
+    <Style Selector="^:caret /template/ Image#PART_HandlePathIcon">
+      <Setter Property="Source" Value="{DynamicResource TextCaretHandleDrawing}" />
+    </Style>
+    <Style Selector="^:start /template/ Image#PART_HandlePathIcon">
+      <Setter Property="RenderTransform">
+        <ScaleTransform ScaleX="-1" ScaleY="1"/>
       </Setter>
     </Style>
+    <Style Selector="^:caret /template/ Border#PART_Indicator">
+      <Setter Property="HorizontalAlignment" Value="Center" />
+    </Style>
+    <Style Selector="^:end /template/ Border#PART_Indicator">
+      <Setter Property="HorizontalAlignment" Value="Left" />
+    </Style>
+    <Style Selector="^:start /template/ Border#PART_Indicator">
+      <Setter Property="HorizontalAlignment" Value="Right" />
+    </Style>
   </ControlTheme>
 </ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/WindowDrawnDecorations.xaml b/src/Avalonia.Themes.Simple/Controls/WindowDrawnDecorations.xaml
index d4e938b58c..d2029df819 100644
--- a/src/Avalonia.Themes.Simple/Controls/WindowDrawnDecorations.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/WindowDrawnDecorations.xaml
@@ -202,6 +202,20 @@
       <Setter Property="Opacity" Value="0.2"/>
     </Style>
 
+    <!-- Hide caption buttons when the platform does not support the action -->
+    <Style Selector="^:not(:has-minimize) /template/ Button#PART_MinimizeButton">
+      <Setter Property="IsVisible" Value="False"/>
+    </Style>
+    <Style Selector="^:not(:has-maximize) /template/ Button#PART_MaximizeButton">
+      <Setter Property="IsVisible" Value="False"/>
+    </Style>
+    <Style Selector="^:not(:has-fullscreen) /template/ Button#PART_FullScreenButton">
+      <Setter Property="IsVisible" Value="False"/>
+    </Style>
+    <Style Selector="^:not(:has-fullscreen) /template/ Button#PART_PopoverFullScreenButton">
+      <Setter Property="IsVisible" Value="False"/>
+    </Style>
+
     <!-- Fullscreen: hide overlay and titlebar (popover takes over) -->
     <Style Selector="^:fullscreen /template/ Panel#PART_TitleTextPanel">
       <Setter Property="IsVisible" Value="False" />
diff --git a/src/Avalonia.Vulkan/VulkanKhrSurfaceRenderTarget.cs b/src/Avalonia.Vulkan/VulkanKhrSurfaceRenderTarget.cs
index a24b9eea7a..64aaa5ad30 100644
--- a/src/Avalonia.Vulkan/VulkanKhrSurfaceRenderTarget.cs
+++ b/src/Avalonia.Vulkan/VulkanKhrSurfaceRenderTarget.cs
@@ -1,4 +1,5 @@
 using System;
+using Avalonia.Platform;
 using Avalonia.Vulkan.Interop;
 using Avalonia.Vulkan.UnmanagedInterop;
 
@@ -26,6 +27,8 @@ internal class VulkanKhrRenderTarget : IVulkanRenderTarget
         Format = IsRgba ? VkFormat.VK_FORMAT_R8G8B8A8_UNORM : VkFormat.VK_FORMAT_B8G8R8A8_UNORM;
     }
 
+    public PlatformRenderTargetState State => PlatformRenderTargetState.Ready;
+    
     private void CreateImage()
     {
         _image = new VulkanImage(_context, _display.CommandBufferPool, Format, _display.Size);
diff --git a/src/Avalonia.X11/Glx/GlxGlPlatformSurface.cs b/src/Avalonia.X11/Glx/GlxGlPlatformSurface.cs
index 81d7a4e9bc..b91c7ac6c9 100644
--- a/src/Avalonia.X11/Glx/GlxGlPlatformSurface.cs
+++ b/src/Avalonia.X11/Glx/GlxGlPlatformSurface.cs
@@ -39,7 +39,7 @@ namespace Avalonia.X11.Glx
                 // No-op
             }
             
-            public bool IsCorrupted => false;
+            public PlatformRenderTargetState State => PlatformRenderTargetState.Ready;
             public IGlPlatformSurfaceRenderingSession BeginDraw(IRenderTarget.RenderTargetSceneInfo sceneInfo)
             {
                 var size = sceneInfo.Size;
diff --git a/src/Avalonia.X11/X11Atoms.cs b/src/Avalonia.X11/X11Atoms.cs
index 64b00c411b..afe3121cfc 100644
--- a/src/Avalonia.X11/X11Atoms.cs
+++ b/src/Avalonia.X11/X11Atoms.cs
@@ -144,6 +144,10 @@ namespace Avalonia.X11
         public IntPtr _NET_WM_WINDOW_TYPE;
         public IntPtr _NET_WM_STATE;
         public IntPtr _NET_WM_ALLOWED_ACTIONS;
+        public IntPtr _NET_WM_ACTION_MAXIMIZE_VERT;
+        public IntPtr _NET_WM_ACTION_MAXIMIZE_HORZ;
+        public IntPtr _NET_WM_ACTION_FULLSCREEN;
+        public IntPtr _NET_WM_ACTION_MINIMIZE;
         public IntPtr _NET_WM_STRUT;
         public IntPtr _NET_WM_STRUT_PARTIAL;
         public IntPtr _NET_WM_ICON_GEOMETRY;
diff --git a/src/Avalonia.X11/X11Globals.cs b/src/Avalonia.X11/X11Globals.cs
index b9e4058b2d..73ea2306b4 100644
--- a/src/Avalonia.X11/X11Globals.cs
+++ b/src/Avalonia.X11/X11Globals.cs
@@ -17,6 +17,7 @@ namespace Avalonia.X11
         private IntPtr _compositionAtomOwner;
         private bool _isCompositionEnabled;
         private WindowActivationTrackingMode _activationTrackingMode;
+        private IntPtr[]? _netSupported;
 
         public event Action? WindowManagerChanged;
         public event Action? CompositionChanged;
@@ -24,6 +25,7 @@ namespace Avalonia.X11
         public event Action? NetActiveWindowPropertyChanged;
         public event Action? RootGeometryChangedChanged;
         public event Action? WindowActivationTrackingModeChanged;
+        public event Action? NetSupportedChanged;
         
         public enum WindowActivationTrackingMode
         {
@@ -105,6 +107,16 @@ namespace Avalonia.X11
             }
         }
 
+        public IntPtr[]? NetSupported
+        {
+            get => _netSupported;
+            private set
+            {
+                _netSupported = value;
+                NetSupportedChanged?.Invoke();
+            }
+        }
+
         private IntPtr GetSupportingWmCheck(IntPtr window)
         {
             XGetWindowProperty(_x11.Display, _rootWindow, _x11.Atoms._NET_SUPPORTING_WM_CHECK,
@@ -187,17 +199,15 @@ namespace Avalonia.X11
             }
         }
 
-        private WindowActivationTrackingMode GetWindowActivityTrackingMode(IntPtr wm)
+        private WindowActivationTrackingMode GetWindowActivityTrackingMode(IntPtr wm, IntPtr[]? supportedFeatures)
         {
             if (Environment.GetEnvironmentVariable("AVALONIA_DEBUG_FORCE_X11_ACTIVATION_TRACKING_MODE") is
                     { } forcedModeString
                 && Enum.TryParse<WindowActivationTrackingMode>(forcedModeString, true, out var forcedMode))
                 return forcedMode;
             
-            if (wm == IntPtr.Zero)
+            if (wm == IntPtr.Zero || supportedFeatures == null)
                 return WindowActivationTrackingMode.FocusEvents;
-            var supportedFeatures = XGetWindowPropertyAsIntPtrArray(_x11.Display, _x11.RootWindow,
-                _x11.Atoms._NET_SUPPORTED, _x11.Atoms.ATOM) ?? [];
 
             if (supportedFeatures.Contains(_x11.Atoms._NET_WM_STATE_FOCUSED))
                 return WindowActivationTrackingMode._NET_WM_STATE_FOCUSED;
@@ -211,8 +221,13 @@ namespace Avalonia.X11
         private void OnNewWindowManager()
         {
             var wm = GetActiveWm();
+            var supportedFeatures = wm != IntPtr.Zero
+                ? XGetWindowPropertyAsIntPtrArray(_x11.Display, _x11.RootWindow,
+                    _x11.Atoms._NET_SUPPORTED, _x11.Atoms.ATOM)
+                : null;
             WmName = GetWmName(wm);
-            ActivationTrackingMode = GetWindowActivityTrackingMode(wm);
+            ActivationTrackingMode = GetWindowActivityTrackingMode(wm, supportedFeatures);
+            NetSupported = supportedFeatures;
         }
         
         private void OnRootWindowEvent(ref XEvent ev)
diff --git a/src/Avalonia.X11/X11Platform.cs b/src/Avalonia.X11/X11Platform.cs
index 566b0d907a..a3f98265f4 100644
--- a/src/Avalonia.X11/X11Platform.cs
+++ b/src/Avalonia.X11/X11Platform.cs
@@ -482,13 +482,32 @@ namespace Avalonia
             , Message = "Experimental, used mostly for testing"
             #endif
             )]
-        public bool? EnableDrawnDecorations
-        {
-            get => EnableDrawnDecorationsInternal;
-            set => EnableDrawnDecorationsInternal = value;
-        }
+        public bool? EnableDrawnDecorations { get; set; }
+        
+        internal bool EnableDrawnDecorationsInternal =>
+#pragma warning disable AVALONIA_X11_CSD
+            EnableDrawnDecorations == true || ForceDrawnDecorationsInternal;
+#pragma warning restore AVALONIA_X11_CSD
+
+
+        /// <summary>
+        /// Forces client-side drawn window decorations on X11 for all windows,
+        /// even when the app has not opted in via ExtendClientAreaToDecorationsHint.
+        /// In this mode, Window.ClientSize reflects the usable content area
+        /// (platform client size minus decoration margins) and the app is unaware
+        /// of the decorations.
+        /// Implies EnableDrawnDecorations = true.
+        /// </summary>
+        [Experimental("AVALONIA_X11_FORCE_CSD"
+            #if NET10_0_OR_GREATER
+            , Message = "Experimental, used mostly for testing"
+            #endif
+            )]
+        public bool ForceDrawnDecorations { get; set; }
 
-        internal bool? EnableDrawnDecorationsInternal { get; set; }
+#pragma warning disable AVALONIA_X11_FORCE_CSD
+        internal bool ForceDrawnDecorationsInternal => ForceDrawnDecorations;
+#pragma warning restore AVALONIA_X11_FORCE_CSD
 
         /// <summary>
         /// If Avalonia is in control of a run loop, we propagate exceptions by stopping the run loop frame
diff --git a/src/Avalonia.X11/X11Window.cs b/src/Avalonia.X11/X11Window.cs
index bf20600a18..661c720f40 100644
--- a/src/Avalonia.X11/X11Window.cs
+++ b/src/Avalonia.X11/X11Window.cs
@@ -228,6 +228,7 @@ namespace Avalonia.X11
             surfaces.Add(new SurfacePlatformHandle(this));
 
             Surfaces = surfaces.ToArray();
+            UpdateEffectiveSystemDecorations();
             UpdateMotifHints();
             UpdateSizeHints(null);
 
@@ -239,6 +240,8 @@ namespace Avalonia.X11
             _activationTracker = new(_platform, this);
             _activationTracker.ActivationChanged += HandleActivation;
 
+            _platform.Globals.NetSupportedChanged += OnNetSupportedChanged;
+
             CreateIC();
 
             XFlush(_x11.Display);
@@ -511,7 +514,34 @@ namespace Avalonia.X11
         public Action<PixelPoint>? PositionChanged { get; set; }
         public Action? LostFocus { get; set; }
 
+        public PlatformAllowedWindowActions AllowedWindowActions => GetAllowedActions(_platform.Globals.NetSupported);
+
+        public Action<PlatformAllowedWindowActions>? AllowedWindowActionsChanged { get; set; }
+
         public Compositor Compositor => _platform.Compositor;
+
+        private PlatformAllowedWindowActions GetAllowedActions(IntPtr[]? netSupported)
+        {
+            if (netSupported == null)
+                return PlatformAllowedWindowActions.All;
+
+            var actions = PlatformAllowedWindowActions.None;
+
+            if (netSupported.Contains(_x11.Atoms._NET_WM_ACTION_MAXIMIZE_VERT)
+                && netSupported.Contains(_x11.Atoms._NET_WM_ACTION_MAXIMIZE_HORZ))
+                actions |= PlatformAllowedWindowActions.Maximize;
+
+            if (netSupported.Contains(_x11.Atoms._NET_WM_ACTION_FULLSCREEN))
+                actions |= PlatformAllowedWindowActions.Fullscreen;
+
+            if (netSupported.Contains(_x11.Atoms._NET_WM_ACTION_MINIMIZE))
+                actions |= PlatformAllowedWindowActions.Minimize;
+
+            return actions;
+        }
+
+        private void OnNetSupportedChanged() =>
+            AllowedWindowActionsChanged?.Invoke(AllowedWindowActions);
         
         private void OnEvent(ref XEvent ev)
         {
@@ -744,6 +774,8 @@ namespace Avalonia.X11
             return false;
         }
 
+        public bool WindowStateGetterIsUsable => true;
+
         private WindowState _lastWindowState;
         public WindowState WindowState
         {
@@ -752,7 +784,6 @@ namespace Avalonia.X11
             {
                 if(_lastWindowState == value)
                     return;
-                _lastWindowState = value;
                 if (value == WindowState.Minimized)
                 {
                     XIconifyWindow(_x11.Display, _handle, _x11.DefaultScreen);
@@ -780,7 +811,6 @@ namespace Avalonia.X11
                     SendNetWMMessage(_x11.Atoms._NET_ACTIVE_WINDOW, (IntPtr)1, _x11.LastActivityTimestamp,
                         IntPtr.Zero);
                 }
-                WindowStateChanged?.Invoke(value);
             }
         }
 
@@ -795,42 +825,44 @@ namespace Avalonia.X11
 
             if (property == _x11.Atoms._NET_WM_STATE)
             {
-                WindowState state = WindowState.Normal;
                 var atoms = hasValue
                     ? XGetWindowPropertyAsIntPtrArray(_x11.Display, _handle, _x11.Atoms._NET_WM_STATE,
                           (IntPtr)Atom.XA_ATOM)
                       ?? []
                     : [];
                 int maximized = 0;
+                bool hasMinimized = false, hasFullscreen = false;
                 foreach (var atom in atoms)
                 {
-                    if (atom == _x11.Atoms._NET_WM_STATE_HIDDEN)
-                    {
-                        state = WindowState.Minimized;
-                        break;
-                    }
-
-                    if(atom == _x11.Atoms._NET_WM_STATE_FULLSCREEN)
-                    {
-                        state = WindowState.FullScreen;
-                        break;
-                    }
+                    if (atom == _x11.Atoms._NET_WM_STATE_HIDDEN) 
+                        hasMinimized = true;
 
                     if (atom == _x11.Atoms._NET_WM_STATE_MAXIMIZED_HORZ ||
-                        atom == _x11.Atoms._NET_WM_STATE_MAXIMIZED_VERT)
-                    {
+                        atom == _x11.Atoms._NET_WM_STATE_MAXIMIZED_VERT) 
                         maximized++;
-                        if (maximized == 2)
-                        {
-                            state = WindowState.Maximized;
-                            break;
-                        }
-                    }
+                    
+                    if(atom == _x11.Atoms._NET_WM_STATE_FULLSCREEN) 
+                        hasFullscreen = true;
                 }
+
+                var state = hasMinimized ? WindowState.Minimized
+                    : hasFullscreen ? WindowState.FullScreen
+                    : maximized == 2 ? WindowState.Maximized
+                    : WindowState.Normal;
+                
                 if (_lastWindowState != state)
                 {
                     _lastWindowState = state;
                     WindowStateChanged?.Invoke(state);
+
+                    XGetGeometry(_x11.Display, _handle, out var _, out var _, out var _, out var width, out var height,
+                        out var _, out var _);
+                    var newSize = new PixelSize(width, height);
+                    if (newSize != _realSize)
+                    {
+                        _realSize = newSize;
+                        Resized?.Invoke(ClientSize, WindowResizeReason.Unspecified);
+                    }
                 }
 
                 _activationTracker?.OnNetWmStateChanged(atoms);
@@ -923,7 +955,7 @@ namespace Avalonia.X11
                 mouse.Position = mouse.Position / RenderScaling;
                 
                 // Chrome hit-test for drawn decorations
-                if (_extendClientAreaToDecorations 
+                if (UseManagedDecorations
                     && mouse.Type == RawPointerEventType.LeftButtonDown
                     && _inputRoot is { } inputRoot)
                 {
@@ -1129,6 +1161,7 @@ namespace Avalonia.X11
             }
 
             _platform.X11Screens.Changed -= OnScreensChanged;
+            _platform.Globals.NetSupportedChanged -= OnNetSupportedChanged;
             
             if (_useRenderWindow && _renderHandle != IntPtr.Zero)
             {                
@@ -1184,8 +1217,8 @@ namespace Avalonia.X11
 
         private void UpdateEffectiveSystemDecorations()
         {
-            // When extending client area, always hide WM decorations (we draw our own)
-            var effective = _extendClientAreaToDecorations
+            // When extending client area or forcing drawn decorations, always hide WM decorations (we draw our own)
+            var effective = UseManagedDecorations
                 ? WindowDecorations.None
                 : (_requestedWindowDecorations == WindowDecorations.Full
                     ? WindowDecorations.Full
@@ -1506,17 +1539,18 @@ namespace Avalonia.X11
             }
         }
 
-        private bool _extendClientAreaToDecorations;
+        private bool _extendingClientAreaToDecorations;
+        private bool UseManagedDecorations => _extendingClientAreaToDecorations || _platform.Options.ForceDrawnDecorationsInternal;
 
         public void SetExtendClientAreaToDecorationsHint(bool extendIntoClientAreaHint)
         {
-            if (_platform.Options.EnableDrawnDecorationsInternal != true)
+            if (!_platform.Options.EnableDrawnDecorationsInternal)
                 return;
 
-            if (_extendClientAreaToDecorations == extendIntoClientAreaHint)
+            if (_extendingClientAreaToDecorations == extendIntoClientAreaHint)
                 return;
 
-            _extendClientAreaToDecorations = extendIntoClientAreaHint;
+            _extendingClientAreaToDecorations = extendIntoClientAreaHint;
             UpdateEffectiveSystemDecorations();
 
             IsClientAreaExtendedToDecorations = extendIntoClientAreaHint;
@@ -1603,10 +1637,10 @@ namespace Avalonia.X11
 
         public AcrylicPlatformCompensationLevels AcrylicCompensationLevels { get; } = new AcrylicPlatformCompensationLevels(1, 0.8, 0.8);
 
-        public bool NeedsManagedDecorations => _extendClientAreaToDecorations;
+        public bool NeedsManagedDecorations => UseManagedDecorations;
 
         public PlatformRequestedDrawnDecoration RequestedDrawnDecorations =>
-            _extendClientAreaToDecorations
+            UseManagedDecorations
                 ? PlatformRequestedDrawnDecoration.Border
                   | PlatformRequestedDrawnDecoration.ResizeGrips
                   | PlatformRequestedDrawnDecoration.TitleBar
diff --git a/src/Avalonia.X11/X11WindowModes/DefaultWindowMode.cs b/src/Avalonia.X11/X11WindowModes/DefaultWindowMode.cs
index d155a7f2c1..af7b56788d 100644
--- a/src/Avalonia.X11/X11WindowModes/DefaultWindowMode.cs
+++ b/src/Avalonia.X11/X11WindowModes/DefaultWindowMode.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 
 namespace Avalonia.X11;
 
@@ -9,7 +10,7 @@ partial class X11Window
     {
         public override void Activate()
         {
-            if (X11.Atoms._NET_ACTIVE_WINDOW != IntPtr.Zero)
+            if (Platform.Globals.NetSupported?.Contains(X11.Atoms._NET_ACTIVE_WINDOW) == true)
             {
                 Window.SendNetWMMessage(X11.Atoms._NET_ACTIVE_WINDOW, (IntPtr)1, X11.LastActivityTimestamp,
                     IntPtr.Zero);
@@ -31,6 +32,14 @@ partial class X11Window
         public override void Show(bool activate, bool isDialog)
         {            
             Window._wasMappedAtLeastOnce = true;
+
+            if (!activate)
+            {
+                var time = IntPtr.Zero;
+                XChangeProperty(X11.Display, Handle, X11.Atoms._NET_WM_USER_TIME, X11.Atoms.CARDINAL, 32,
+                    PropertyMode.Replace, ref time, 1);
+            }
+
             XMapWindow(X11.Display, Handle);
             XFlush(X11.Display);
             base.Show(activate, isDialog);
@@ -50,4 +59,4 @@ partial class X11Window
             (int)(point.X * Window.RenderScaling + (Window._position ?? default).X),
             (int)(point.Y * Window.RenderScaling + (Window._position ?? default).Y));
     }
-}
\ No newline at end of file
+}
diff --git a/src/Headless/Avalonia.Headless/HeadlessPlatformRenderInterface.cs b/src/Headless/Avalonia.Headless/HeadlessPlatformRenderInterface.cs
index b83cf8b526..1c152d0fe4 100644
--- a/src/Headless/Avalonia.Headless/HeadlessPlatformRenderInterface.cs
+++ b/src/Headless/Avalonia.Headless/HeadlessPlatformRenderInterface.cs
@@ -608,8 +608,6 @@ namespace Avalonia.Headless
                 properties = default;
                 return new HeadlessDrawingContextStub();
             }
-
-            public bool IsCorrupted => false;
         }
 
         public void Dispose()
diff --git a/src/Headless/Avalonia.Headless/HeadlessWindowImpl.cs b/src/Headless/Avalonia.Headless/HeadlessWindowImpl.cs
index 999a20644f..f2a7bf3575 100644
--- a/src/Headless/Avalonia.Headless/HeadlessWindowImpl.cs
+++ b/src/Headless/Avalonia.Headless/HeadlessWindowImpl.cs
@@ -141,6 +141,7 @@ namespace Avalonia.Headless
         }
 
         public WindowState WindowState { get; set; }
+        public bool WindowStateGetterIsUsable => false;
         public Action<WindowState>? WindowStateChanged { get; set; }
         public void SetTitle(string? title)
         {
diff --git a/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmOutput.cs b/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmOutput.cs
index cf0bf1e49a..dabf1b6bfd 100644
--- a/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmOutput.cs
+++ b/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmOutput.cs
@@ -407,7 +407,7 @@ namespace Avalonia.LinuxFramebuffer.Output
                 _parent = parent;
             }
 
-            public bool IsCorrupted => false;
+            public PlatformRenderTargetState State => PlatformRenderTargetState.Ready;
 
             public void Dispose()
             {
diff --git a/src/Skia/Avalonia.Skia/FramebufferRenderTarget.cs b/src/Skia/Avalonia.Skia/FramebufferRenderTarget.cs
index 5491df93b8..828de2843f 100644
--- a/src/Skia/Avalonia.Skia/FramebufferRenderTarget.cs
+++ b/src/Skia/Avalonia.Skia/FramebufferRenderTarget.cs
@@ -47,8 +47,8 @@ namespace Avalonia.Skia
             IsSuitableForDirectRendering = true
         };
 
-
-
+        public PlatformRenderTargetState PlatformRenderTargetState =>
+            _renderTarget?.State ?? PlatformRenderTargetState.Disposed;
 
         /// <inheritdoc />
         public IDrawingContextImpl CreateDrawingContext(IRenderTarget.RenderTargetSceneInfo sceneInfo,
@@ -86,10 +86,7 @@ namespace Avalonia.Skia
             
             return new DrawingContextImpl(createInfo, _preFramebufferCopyHandler, canvas, framebuffer);
         }
-
-        public bool IsCorrupted => false;
-
-        public bool IsReady => _renderTarget is not IPlatformRenderSurfaceRenderTarget prs || prs.IsReady;
+        
 
         /// <summary>
         /// Check if two images info are compatible.
diff --git a/src/Skia/Avalonia.Skia/Gpu/ISkiaGpuRenderTarget.cs b/src/Skia/Avalonia.Skia/Gpu/ISkiaGpuRenderTarget.cs
index 65b6b5a8df..bd8061cf98 100644
--- a/src/Skia/Avalonia.Skia/Gpu/ISkiaGpuRenderTarget.cs
+++ b/src/Skia/Avalonia.Skia/Gpu/ISkiaGpuRenderTarget.cs
@@ -15,8 +15,6 @@ namespace Avalonia.Skia
         /// <returns>A render session instance.</returns>
         ISkiaGpuRenderSession BeginRenderingSession(IRenderTarget.RenderTargetSceneInfo sceneInfo);
         
-        bool IsCorrupted { get; }
-        
-        bool IsReady => true;
+        PlatformRenderTargetState State => PlatformRenderTargetState.Ready;
     }
 }
diff --git a/src/Skia/Avalonia.Skia/Gpu/Metal/SkiaMetalGpu.cs b/src/Skia/Avalonia.Skia/Gpu/Metal/SkiaMetalGpu.cs
index 640b415d6f..402d83fd10 100644
--- a/src/Skia/Avalonia.Skia/Gpu/Metal/SkiaMetalGpu.cs
+++ b/src/Skia/Avalonia.Skia/Gpu/Metal/SkiaMetalGpu.cs
@@ -108,9 +108,7 @@ internal class SkiaMetalGpu : ISkiaGpu
             return new SkiaMetalRenderSession(_gpu, surface, session, backendTarget);
         }
 
-        public bool IsCorrupted => false;
-
-        public bool IsReady => _target?.IsReady ?? false;
+        public PlatformRenderTargetState State => _target?.State ?? PlatformRenderTargetState.Disposed;
     }
     
     internal class SkiaMetalRenderSession : ISkiaGpuRenderSession
diff --git a/src/Skia/Avalonia.Skia/Gpu/OpenGl/GlRenderTarget.cs b/src/Skia/Avalonia.Skia/Gpu/OpenGl/GlRenderTarget.cs
index f5c164be45..69e2f0563e 100644
--- a/src/Skia/Avalonia.Skia/Gpu/OpenGl/GlRenderTarget.cs
+++ b/src/Skia/Avalonia.Skia/Gpu/OpenGl/GlRenderTarget.cs
@@ -21,9 +21,7 @@ namespace Avalonia.Skia
 
         public void Dispose() => _surface.Dispose();
 
-        public bool IsCorrupted => _surface.IsCorrupted;
-
-        public bool IsReady => _surface.IsReady;
+        public PlatformRenderTargetState State => _surface.State;
 
         class GlGpuSession : ISkiaGpuRenderSession
         {
diff --git a/src/Skia/Avalonia.Skia/Gpu/SkiaGpuRenderTarget.cs b/src/Skia/Avalonia.Skia/Gpu/SkiaGpuRenderTarget.cs
index 13bd946b74..d748018824 100644
--- a/src/Skia/Avalonia.Skia/Gpu/SkiaGpuRenderTarget.cs
+++ b/src/Skia/Avalonia.Skia/Gpu/SkiaGpuRenderTarget.cs
@@ -43,9 +43,8 @@ namespace Avalonia.Skia
 
             return new DrawingContextImpl(nfo, session);
         }
-
-        public bool IsCorrupted => _renderTarget.IsCorrupted;
-        public bool IsReady => _renderTarget.IsReady;
+        
+        public PlatformRenderTargetState PlatformRenderTargetState => _renderTarget.State;
         public RenderTargetProperties Properties { get; }
 
 
diff --git a/src/Skia/Avalonia.Skia/Gpu/Vulkan/VulkanSkiaRenderTarget.cs b/src/Skia/Avalonia.Skia/Gpu/Vulkan/VulkanSkiaRenderTarget.cs
index 6b04fcd8c0..dc229e16e8 100644
--- a/src/Skia/Avalonia.Skia/Gpu/Vulkan/VulkanSkiaRenderTarget.cs
+++ b/src/Skia/Avalonia.Skia/Gpu/Vulkan/VulkanSkiaRenderTarget.cs
@@ -74,9 +74,7 @@ class VulkanSkiaRenderTarget : ISkiaGpuRenderTarget
         }
     }
    
-    public bool IsCorrupted => false;
-
-    public bool IsReady => _target.IsReady;
+    public PlatformRenderTargetState State => _target.State;
 
 
     internal class VulkanSkiaRenderSession : ISkiaGpuRenderSession
diff --git a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
index f2e75c8f6b..29ccafd02e 100644
--- a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
+++ b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
@@ -3,6 +3,7 @@
     <TargetFrameworks>$(AvsCurrentTargetFramework);$(AvsLegacyTargetFrameworks)</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <EnableRuntimeMarshalling>true</EnableRuntimeMarshalling>
+    <UseMicroComGeneratorMSBuild>true</UseMicroComGeneratorMSBuild>
   </PropertyGroup>
   <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">
     <PackageReference Include="System.Numerics.Vectors" />
@@ -17,13 +18,13 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\packages\Avalonia\Avalonia.csproj" />
     <PackageReference Include="Avalonia.Angle.Windows.Natives" />
-    <PackageReference Include="MicroCom.CodeGenerator.MSBuild" PrivateAssets="all" />
     <MicroComIdl Include="WinRT\winrt.idl" CSharpInteropPath="WinRT\WinRT.Generated.cs" />
     <MicroComIdl Include="Win32Com\win32.idl" CSharpInteropPath="Win32Com\Win32.Generated.cs" />
     <MicroComIdl Include="DirectX\directx.idl" CSharpInteropPath="DirectX\directx.Generated.cs" />
     <MicroComIdl Include="DComposition\dcomp.idl" CSharpInteropPath="DComposition\DComp.Generated.cs" />
     <ProjectReference Include="..\Avalonia.Win32.Automation\Avalonia.Win32.Automation.csproj" />
   </ItemGroup>
+  <Import Project="..\..\..\build\MicroCOM.props" />
   <Import Project="..\..\..\build\NullableEnable.props" />
   <Import Project="..\..\..\build\DevAnalyzers.props" />
   <Import Project="..\..\..\build\SourceGenerators.props" />
diff --git a/src/Windows/Avalonia.Win32/DComposition/DirectCompositedWindowSurface.cs b/src/Windows/Avalonia.Win32/DComposition/DirectCompositedWindowSurface.cs
index d0651e08ee..9c6f5707bf 100644
--- a/src/Windows/Avalonia.Win32/DComposition/DirectCompositedWindowSurface.cs
+++ b/src/Windows/Avalonia.Win32/DComposition/DirectCompositedWindowSurface.cs
@@ -78,11 +78,11 @@ internal class DirectCompositedWindowRenderTarget : IDirect3D11TextureRenderTarg
         _d3dDevice.Dispose();
     }
 
-    public bool IsCorrupted => _context.IsLost || _lost;
-
+    public PlatformRenderTargetState State => _context.IsLost || _lost ? PlatformRenderTargetState.Corrupted : PlatformRenderTargetState.Ready;
+    
     public unsafe IDirect3D11TextureRenderTargetRenderSession BeginDraw()
     {
-        if (IsCorrupted)
+        if (State.IsCorrupted)
             throw new RenderTargetCorruptedException();
         var transaction = _window.BeginTransaction();
         bool needsEndDraw = false;
diff --git a/src/Windows/Avalonia.Win32/DirectX/IDirect3D11TexturePlatformSurface.cs b/src/Windows/Avalonia.Win32/DirectX/IDirect3D11TexturePlatformSurface.cs
index fb1a6a27e7..ce077d6ce0 100644
--- a/src/Windows/Avalonia.Win32/DirectX/IDirect3D11TexturePlatformSurface.cs
+++ b/src/Windows/Avalonia.Win32/DirectX/IDirect3D11TexturePlatformSurface.cs
@@ -1,5 +1,6 @@
 using System;
 using Avalonia.OpenGL;
+using Avalonia.OpenGL.Surfaces;
 using Avalonia.Platform;
 using Avalonia.Platform.Surfaces;
 
@@ -12,9 +13,8 @@ public interface IDirect3D11TexturePlatformSurface : IPlatformRenderSurface
 
 
 
-public interface IDirect3D11TextureRenderTarget : IDisposable
+public interface IDirect3D11TextureRenderTarget : IPlatformRenderSurfaceRenderTarget, IDisposable
 {
-    bool IsCorrupted { get; }
     IDirect3D11TextureRenderTargetRenderSession BeginDraw();
 }
 
diff --git a/src/Windows/Avalonia.Win32/DragSource.cs b/src/Windows/Avalonia.Win32/DragSource.cs
index f1cdfa440a..9ca295a904 100644
--- a/src/Windows/Avalonia.Win32/DragSource.cs
+++ b/src/Windows/Avalonia.Win32/DragSource.cs
@@ -10,7 +10,7 @@ namespace Avalonia.Win32
     internal sealed class DragSource : IPlatformDragSource
     {
         public Task<DragDropEffects> DoDragDropAsync(
-            PointerEventArgs triggerEvent,
+            PointerPressedEventArgs triggerEvent,
             IDataTransfer dataTransfer,
             DragDropEffects allowedEffects)
         {
diff --git a/src/Windows/Avalonia.Win32/Input/KeyInterop.cs b/src/Windows/Avalonia.Win32/Input/KeyInterop.cs
index 834feb861e..f13694e4fb 100644
--- a/src/Windows/Avalonia.Win32/Input/KeyInterop.cs
+++ b/src/Windows/Avalonia.Win32/Input/KeyInterop.cs
@@ -493,6 +493,24 @@ namespace Avalonia.Win32.Input
                     PhysicalKey.None;
         }
 
+        /// <summary>
+        /// Gets a key symbol from a Windows virtual-key using MapVirtualKey.
+        /// Unlike <see cref="GetKeySymbol"/>, this does not call ToUnicodeEx and is safe to use
+        /// during WM_SYSKEYDOWN/UP where ToUnicodeEx would corrupt keyboard state.
+        /// </summary>
+        /// <param name="virtualKey">The Windows virtual-key.</param>
+        /// <returns>A key symbol, or null if none matched.</returns>
+        public static string? GetKeySymbolFromVirtualKey(int virtualKey)
+        {
+            var ch = MapVirtualKey((uint)virtualKey, (uint)MapVirtualKeyMapTypes.MAPVK_VK_TO_CHAR);
+            if (ch == 0)
+                return null;
+
+            // Bit 31 is set for dead keys — strip it to get the base character.
+            var c = (char)(ch & 0x7FFFFFFF);
+            return KeySymbolHelper.IsAllowedAsciiKeySymbol(c) ? c.ToString() : null;
+        }
+
         /// <summary>
         /// Gets a key symbol from a Windows virtual-key and key data.
         /// </summary>
diff --git a/src/Windows/Avalonia.Win32/OpenGl/Angle/AngleD3DTextureFeature.cs b/src/Windows/Avalonia.Win32/OpenGl/Angle/AngleD3DTextureFeature.cs
index 0dc8ec453e..60882fb62e 100644
--- a/src/Windows/Avalonia.Win32/OpenGl/Angle/AngleD3DTextureFeature.cs
+++ b/src/Windows/Avalonia.Win32/OpenGl/Angle/AngleD3DTextureFeature.cs
@@ -83,7 +83,8 @@ internal class AngleD3DTextureFeature  : IGlPlatformSurfaceRenderTargetFactory
             base.Dispose();
         }
 
-        public override bool IsCorrupted => _target.IsCorrupted || base.IsCorrupted;
+        public override PlatformRenderTargetState State =>
+            base.IsCorrupted ? PlatformRenderTargetState.Corrupted : _target.State;
     }
     
     public IGlPlatformSurfaceRenderTarget CreateRenderTarget(IGlContext context, IPlatformRenderSurface surface)
diff --git a/src/Windows/Avalonia.Win32/OpenGl/WglGlPlatformSurface.cs b/src/Windows/Avalonia.Win32/OpenGl/WglGlPlatformSurface.cs
index f54ca9b62c..39a7da74ca 100644
--- a/src/Windows/Avalonia.Win32/OpenGl/WglGlPlatformSurface.cs
+++ b/src/Windows/Avalonia.Win32/OpenGl/WglGlPlatformSurface.cs
@@ -37,7 +37,7 @@ namespace Avalonia.Win32.OpenGl
                 _hdc = context.CreateConfiguredDeviceContext(info.Handle);
             }
 
-            public bool IsCorrupted => false;
+            public PlatformRenderTargetState State => PlatformRenderTargetState.Ready;
 
             public void Dispose()
             {
diff --git a/src/Windows/Avalonia.Win32/WinRT/Composition/WinUIEffectBase.cs b/src/Windows/Avalonia.Win32/WinRT/Composition/WinUIEffectBase.cs
index 10dbcfcc6b..f896448d68 100644
--- a/src/Windows/Avalonia.Win32/WinRT/Composition/WinUIEffectBase.cs
+++ b/src/Windows/Avalonia.Win32/WinRT/Composition/WinUIEffectBase.cs
@@ -41,15 +41,16 @@ namespace Avalonia.Win32.WinRT.Composition
         }
 
         public uint SourceCount => (uint)(_sources?.Length ?? 0);
-
-        public override void OnUnreferencedFromNative()
+        
+        protected override void Destroyed()
         {
-            if (_sources == null)
-                return;
-            
-            /*foreach(var s in _sources)
-                s.Dispose();*/
-            _sources = null;
+            if (_sources != null)
+            {
+                foreach (var source in _sources)
+                    source.Dispose();
+            }
+
+            base.Destroyed();
         }
     }
     
diff --git a/src/Windows/Avalonia.Win32/WinRT/Composition/WinUiCompositedWindowSurface.cs b/src/Windows/Avalonia.Win32/WinRT/Composition/WinUiCompositedWindowSurface.cs
index 2addbc6524..96e5fae00b 100644
--- a/src/Windows/Avalonia.Win32/WinRT/Composition/WinUiCompositedWindowSurface.cs
+++ b/src/Windows/Avalonia.Win32/WinRT/Composition/WinUiCompositedWindowSurface.cs
@@ -114,11 +114,12 @@ namespace Avalonia.Win32.WinRT.Composition
             _d3dDevice.Dispose();
         }
 
-        public bool IsCorrupted => _context.IsLost || _lost;
+        public PlatformRenderTargetState State =>
+            _context.IsLost || _lost ? PlatformRenderTargetState.Corrupted : PlatformRenderTargetState.Ready;
 
         public unsafe IDirect3D11TextureRenderTargetRenderSession BeginDraw()
         {
-            if (IsCorrupted)
+            if (State.IsCorrupted)
                 throw new RenderTargetCorruptedException();
             var transaction = _window.BeginTransaction();
             bool needsEndDraw = false;
diff --git a/src/Windows/Avalonia.Win32/WinRT/Composition/WinUiCompositionUtils.cs b/src/Windows/Avalonia.Win32/WinRT/Composition/WinUiCompositionUtils.cs
index 29c1e1fe27..2eea4d6820 100644
--- a/src/Windows/Avalonia.Win32/WinRT/Composition/WinUiCompositionUtils.cs
+++ b/src/Windows/Avalonia.Win32/WinRT/Composition/WinUiCompositionUtils.cs
@@ -83,12 +83,21 @@ internal static class WinUiCompositionUtils
         using var backDropParameter =
             backDropParameterFactory.Create(backdropString.Handle);
         using var backDropParameterAsSource = backDropParameter.QueryInterface<IGraphicsEffectSource>();
-        var blurEffect = new WinUIGaussianBlurEffect(backDropParameterAsSource);
+        using var blurEffect = new WinUIGaussianBlurEffect(backDropParameterAsSource);
+        
+        // WinRT has broken reference counting for effects returned from GetSource. It will Release returned ref
+        // and attempt to use it afterward. This usually works because the wrapper effect DOES hold a reference
+        // to the COM object, so invalid memory access succeeds.
+        // In our case MicroCOM will rightfully release native memory once the latest native reference is gone.
+        // Another problem is WinUIEffectBase destroying its sources when it's no longer referenced by anything.
+        // So we need to force-keep a native pointer until we are done.
+        using var blurLease = MicroComRuntime.LeaseNativePointerForCall<IGraphicsEffectSource>(blurEffect);
+        
         using var blurEffectFactory = compositor.CreateEffectFactory(blurEffect);
         using var compositionEffectBrush = blurEffectFactory.CreateBrush();
         using var backdropBrush = CreateBackdropBrush(compositor);
 
-        var saturateEffect = new SaturationEffect(blurEffect);
+        using var saturateEffect = new SaturationEffect(blurEffect);
         using var satEffectFactory = compositor.CreateEffectFactory(saturateEffect);
         using var sat = satEffectFactory.CreateBrush();
         compositionEffectBrush.SetSourceParameter(backdropString.Handle, backdropBrush);
diff --git a/src/Windows/Avalonia.Win32/WinRT/WinRTInspectable.cs b/src/Windows/Avalonia.Win32/WinRT/WinRTInspectable.cs
index 602375758e..e79f445a8a 100644
--- a/src/Windows/Avalonia.Win32/WinRT/WinRTInspectable.cs
+++ b/src/Windows/Avalonia.Win32/WinRT/WinRTInspectable.cs
@@ -8,13 +8,8 @@ using MicroCom.Runtime;
 namespace Avalonia.Win32.WinRT
 {
     [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.Interfaces)]
-    internal class WinRTInspectable : IInspectable, IMicroComShadowContainer
+    internal class WinRTInspectable : Avalonia.MicroCom.CallbackBase, IInspectable
     {
-        public virtual void Dispose()
-        {
-            
-        }
-
         public unsafe void GetIids(ulong* iidCount, Guid** iids)
         {
             var interfaces = GetType().GetInterfaces().Where(typeof(IUnknown).IsAssignableFrom)
@@ -28,13 +23,5 @@ namespace Avalonia.Win32.WinRT
 
         public IntPtr RuntimeClassName => NativeWinRTMethods.WindowsCreateString(GetType().FullName!);
         public TrustLevel TrustLevel => TrustLevel.BaseTrust;
-        public MicroComShadow? Shadow { get; set; }
-        public virtual void OnReferencedFromNative()
-        {
-        }
-
-        public virtual void OnUnreferencedFromNative()
-        {
-        }
     }
 }
diff --git a/src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs b/src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs
index 82aaac226c..2eba69960b 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs
@@ -1446,8 +1446,11 @@ namespace Avalonia.Win32
             var physicalKey = KeyInterop.PhysicalKeyFromVirtualKey(virtualKey, keyData);
 
             // Avoid calling GetKeySymbol() for WM_SYSKEYDOWN/UP:
-            // it ultimately calls User32!ToUnicodeEx, which messes up the keyboard state in this case.
-            var keySymbol = useKeySymbol ? KeyInterop.GetKeySymbol(virtualKey, keyData) : null;
+            // it ultimately calls ToUnicodeEx, which corrupts keyboard state for system key events.
+            // Use MapVirtualKey-based fallback instead — it's layout-aware without touching keyboard state.
+            var keySymbol = useKeySymbol
+                ? KeyInterop.GetKeySymbol(virtualKey, keyData)
+                : KeyInterop.GetKeySymbolFromVirtualKey(virtualKey);
 
             if (key == Key.None && physicalKey == PhysicalKey.None && string.IsNullOrWhiteSpace(keySymbol))
                 return null;
diff --git a/src/Windows/Avalonia.Win32/WindowImpl.cs b/src/Windows/Avalonia.Win32/WindowImpl.cs
index 92564d296d..9233cc2809 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.cs
@@ -208,6 +208,7 @@ namespace Avalonia.Win32
 
         public Action<PixelPoint>? PositionChanged { get; set; }
 
+        public bool WindowStateGetterIsUsable => false;
         public Action<WindowState>? WindowStateChanged { get; set; }
 
         public Action? LostFocus { get; set; }
@@ -1187,6 +1188,7 @@ namespace Avalonia.Win32
         {
             if (!_shown)
             {
+                ExtendClientAreaToDecorationsChanged?.Invoke(_isClientAreaExtended);
                 return;
             }
 
diff --git a/src/iOS/Avalonia.iOS/DispatcherImpl.cs b/src/iOS/Avalonia.iOS/DispatcherImpl.cs
index b39ba1a85a..1bf4503af8 100644
--- a/src/iOS/Avalonia.iOS/DispatcherImpl.cs
+++ b/src/iOS/Avalonia.iOS/DispatcherImpl.cs
@@ -22,7 +22,8 @@ internal class DispatcherImpl : IDispatcherImplWithExplicitBackgroundProcessing
     private readonly IntPtr _mainLoop;
     private readonly IntPtr _mainQueue;
     private Thread? _loopThread;
-    private bool _backgroundProcessingRequested, _signaled;
+    private bool _backgroundProcessingRequested;
+    private int _signaled;
 
     private unsafe DispatcherImpl()
     {
@@ -60,15 +61,12 @@ internal class DispatcherImpl : IDispatcherImplWithExplicitBackgroundProcessing
 
     public unsafe void Signal()
     {
-        lock (_sync)
+        if (Interlocked.CompareExchange(ref _signaled, 1, 0) != 0)
         {
-            if (_signaled)
-                return;
-            _signaled = true;
-
-            Interop.dispatch_async_f(_mainQueue, IntPtr.Zero, &CheckSignaled);
-            Interop.CFRunLoopWakeUp(_mainLoop);
+            return;
         }
+        Interop.dispatch_async_f(_mainQueue, IntPtr.Zero, &CheckSignaled);
+        Interop.CFRunLoopWakeUp(_mainLoop);
     }
 
     public void UpdateTimer(long? dueTimeInMs)
@@ -91,14 +89,7 @@ internal class DispatcherImpl : IDispatcherImplWithExplicitBackgroundProcessing
 
     private void CheckSignaled()
     {
-        bool signaled;
-        lock (_sync)
-        {
-            signaled = _signaled;
-            _signaled = false;
-        }
-
-        if (signaled)
+        if (Interlocked.Exchange(ref _signaled, 0) != 0)
         {
             Signaled?.Invoke();
         }
diff --git a/src/iOS/Avalonia.iOS/InputHandler.cs b/src/iOS/Avalonia.iOS/InputHandler.cs
index bd66d5a51e..06542cbb0d 100644
--- a/src/iOS/Avalonia.iOS/InputHandler.cs
+++ b/src/iOS/Avalonia.iOS/InputHandler.cs
@@ -308,7 +308,7 @@ internal sealed class InputHandler
         
         _tl.Input?.Invoke(new RawMouseWheelEventArgs(
             _mouseDevice, 
-            (ulong)(DateTimeOffset.UtcNow.ToUnixTimeMilliseconds()), 
+            (ulong)Environment.TickCount64, 
             Root,
             _cachedScrollLocation ?? new Point(0, 0),
             new Vector(deltaX, deltaY),
@@ -372,7 +372,7 @@ internal sealed class InputHandler
         // until the inertia stops.
         _tl.Input?.Invoke(new RawMouseWheelEventArgs(
             _mouseDevice, 
-            (ulong)(DateTimeOffset.UtcNow.ToUnixTimeMilliseconds()), 
+            (ulong)Environment.TickCount64, 
             Root,
             _cachedScrollLocation.Value,
             new Vector(_momentumVelocityX, _momentumVelocityY),
diff --git a/src/iOS/Avalonia.iOS/TextInputResponder.cs b/src/iOS/Avalonia.iOS/TextInputResponder.cs
index 678fac8766..b2c1d1700c 100644
--- a/src/iOS/Avalonia.iOS/TextInputResponder.cs
+++ b/src/iOS/Avalonia.iOS/TextInputResponder.cs
@@ -84,6 +84,7 @@ partial class AvaloniaView
         private int _inSurroundingTextUpdateEvent;
         private readonly UITextPosition _beginningOfDocument = new AvaloniaTextPosition(0);
         private readonly UITextInputStringTokenizer _tokenizer;
+        private readonly NSString _textInputContextIdentifier = new NSString(Guid.NewGuid().ToString());
         private bool _isInUpdate;
 
         public TextInputMethodClient? Client => _client;
@@ -95,7 +96,7 @@ partial class AvaloniaView
         public override UIEditingInteractionConfiguration EditingInteractionConfiguration =>
             UIEditingInteractionConfiguration.Default;
 
-        public override NSString TextInputContextIdentifier => new NSString(Guid.NewGuid().ToString());
+        public override NSString TextInputContextIdentifier => _textInputContextIdentifier;
 
         public override UITextInputMode TextInputMode
         {
diff --git a/src/tools/DevGenerators/CompositionGenerator/Generator.cs b/src/tools/DevGenerators/CompositionGenerator/Generator.cs
index 4210dfc308..b6b7eccb78 100644
--- a/src/tools/DevGenerators/CompositionGenerator/Generator.cs
+++ b/src/tools/DevGenerators/CompositionGenerator/Generator.cs
@@ -426,6 +426,7 @@ return;
         {
             "bool",
             "float",
+            "double",
             "Vector2",
             "Vector3",
             "Vector4",
@@ -435,6 +436,7 @@ return;
             "Quaternion",
             "Color",
             "Avalonia.Media.Color",
+            "Vector",
             "Vector3D"
         };
 
diff --git a/src/tools/DevGenerators/X11AtomsGenerator.cs b/src/tools/DevGenerators/X11AtomsGenerator.cs
index 920b3477dc..e91016af3e 100644
--- a/src/tools/DevGenerators/X11AtomsGenerator.cs
+++ b/src/tools/DevGenerators/X11AtomsGenerator.cs
@@ -72,7 +72,7 @@ public class X11AtomsGenerator : IIncrementalGenerator
                     classBuilder.Pad(3).Append("\"").Append(writeableFields[c].Name).AppendLine("\",");
                 classBuilder.Pad(2).AppendLine("};");
                 
-                classBuilder.Pad(2).AppendLine("XInternAtoms(display, atomNames, atomNames.Length, true, atoms);");
+                classBuilder.Pad(2).AppendLine("XInternAtoms(display, atomNames, atomNames.Length, false, atoms);");
 
                 for (int c = 0; c < writeableFields.Count; c++)
                     classBuilder.Pad(2).Append("InitAtom(ref ").Append(writeableFields[c].Name).Append(", \"")
diff --git a/tests/Avalonia.Base.UnitTests/Animation/AnimationIterationTests.cs b/tests/Avalonia.Base.UnitTests/Animation/AnimationIterationTests.cs
index 752c1b166b..b32cb5a7d1 100644
--- a/tests/Avalonia.Base.UnitTests/Animation/AnimationIterationTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Animation/AnimationIterationTests.cs
@@ -95,7 +95,7 @@ namespace Avalonia.Base.UnitTests.Animation
         }
         
         [Fact]
-        public void Pause_Animation_When_IsEffectivelyVisible_Is_False()
+        public void OnlyIfVisible_Pauses_Animation_When_IsEffectivelyVisible_Is_False()
         {
             var keyframe1 = new KeyFrame()
             {
@@ -117,6 +117,9 @@ namespace Avalonia.Base.UnitTests.Animation
                 Delay = TimeSpan.FromSeconds(3),
                 DelayBetweenIterations = TimeSpan.FromSeconds(3),
                 IterationCount = new IterationCount(2),
+                // Explicit opt-in: RunAsync (manual) with Auto resolves to Always,
+                // but this test specifically exercises the pause-on-invisible feature.
+                PlaybackBehavior = PlaybackBehavior.OnlyIfVisible,
                 Children = { keyframe1, keyframe2, keyframe3 }
             };
 
@@ -158,7 +161,7 @@ namespace Avalonia.Base.UnitTests.Animation
         }
         
         [Fact]
-        public void Pause_Animation_When_IsEffectivelyVisible_Is_False_Nested()
+        public void OnlyIfVisible_Pauses_Animation_When_IsEffectivelyVisible_Is_False_Nested()
         {
             var keyframe1 = new KeyFrame()
             {
@@ -180,6 +183,9 @@ namespace Avalonia.Base.UnitTests.Animation
                 Delay = TimeSpan.FromSeconds(3),
                 DelayBetweenIterations = TimeSpan.FromSeconds(3),
                 IterationCount = new IterationCount(2),
+                // Explicit opt-in: RunAsync (manual) with Auto resolves to Always,
+                // but this test specifically exercises the pause-on-invisible feature.
+                PlaybackBehavior = PlaybackBehavior.OnlyIfVisible,
                 Children = { keyframe1, keyframe2, keyframe3 }
             };
 
@@ -262,7 +268,7 @@ namespace Avalonia.Base.UnitTests.Animation
         }
 
         [Fact]
-        public void Pause_Animation_When_Control_Starts_Invisible()
+        public void OnlyIfVisible_Pauses_Animation_When_Control_Starts_Invisible()
         {
             var keyframe1 = new KeyFrame()
             {
@@ -276,6 +282,9 @@ namespace Avalonia.Base.UnitTests.Animation
             {
                 Duration = TimeSpan.FromSeconds(3),
                 IterationCount = new IterationCount(1),
+                // Explicit opt-in: RunAsync (manual) with Auto resolves to Always,
+                // but this test specifically exercises the pause-on-invisible feature.
+                PlaybackBehavior = PlaybackBehavior.OnlyIfVisible,
                 Children = { keyframe2, keyframe1 }
             };
 
@@ -960,6 +969,339 @@ namespace Avalonia.Base.UnitTests.Animation
             }
         }
 
+        [Fact]
+        public void Animation_Can_Set_IsVisible_True_On_Invisible_Control()
+        {
+            // Reproduces a bug where an expand animation tries to make a collapsed
+            // (invisible) control visible at Cue 0.0, but the animation system pauses
+            // animations on invisible controls, creating a deadlock where the animation
+            // can't run to set IsVisible=true because the control is already invisible.
+            var animation = new Animation()
+            {
+                Duration = TimeSpan.FromSeconds(0.3),
+                FillMode = FillMode.Forward,
+                Children =
+                {
+                    new KeyFrame()
+                    {
+                        Cue = new Cue(0.0),
+                        Setters = { new Setter(Visual.IsVisibleProperty, true) }
+                    },
+                    new KeyFrame()
+                    {
+                        Cue = new Cue(1.0),
+                        Setters = { new Setter(Visual.IsVisibleProperty, true) }
+                    }
+                }
+            };
+
+            // Control starts invisible (collapsed state).
+            var border = new Border() { IsVisible = false };
+
+            var clock = new TestClock();
+            var animationRun = animation.RunAsync(border, clock, TestContext.Current.CancellationToken);
+
+            // Kick off the animation.
+            clock.Step(TimeSpan.Zero);
+
+            // The Cue 0.0 keyframe should have set IsVisible = true,
+            // even though the control started invisible.
+            Assert.True(border.IsVisible);
+
+            // Animation should progress to completion.
+            clock.Step(TimeSpan.FromSeconds(0.3));
+            Assert.True(animationRun.IsCompleted);
+        }
+
+        [Fact]
+        public void Width_Animation_Resumes_After_IsVisible_Set_True_On_Invisible_Control()
+        {
+            // Tests the expand scenario with OnlyIfVisible: the control starts invisible
+            // and the animation is paused. Once IsVisible is set to true externally,
+            // the animation resumes and completes.
+            var animation = new Animation()
+            {
+                Duration = TimeSpan.FromSeconds(0.3),
+                Easing = new LinearEasing(),
+                FillMode = FillMode.Forward,
+                PlaybackBehavior = PlaybackBehavior.OnlyIfVisible,
+                Children =
+                {
+                    new KeyFrame()
+                    {
+                        Cue = new Cue(0.0),
+                        Setters = { new Setter(Layoutable.WidthProperty, 0d) }
+                    },
+                    new KeyFrame()
+                    {
+                        Cue = new Cue(1.0),
+                        Setters = { new Setter(Layoutable.WidthProperty, 100d) }
+                    }
+                }
+            };
+
+            // Control starts invisible (collapsed state).
+            var border = new Border() { Width = 0d, IsVisible = false };
+
+            var clock = new TestClock();
+            var animationRun = animation.RunAsync(border, clock, TestContext.Current.CancellationToken);
+
+            // Animation is paused because control is invisible.
+            clock.Step(TimeSpan.Zero);
+            Assert.Equal(0d, border.Width);
+            Assert.False(animationRun.IsCompleted);
+
+            // Simulate what the expand handler does: set IsVisible = true externally.
+            border.IsVisible = true;
+
+            // The animation should now resume and complete.
+            clock.Step(TimeSpan.FromSeconds(0.3));
+            Assert.True(animationRun.IsCompleted);
+            Assert.Equal(100d, border.Width);
+        }
+
+        [Fact]
+        public void Animation_Can_Set_IsVisible_False_At_End_Without_Pausing_Itself()
+        {
+            // An animation that sets IsVisible=false at Cue 1.0 should complete normally.
+            // The visibility change at the final keyframe should not cause the animation
+            // to pause before it can report completion.
+            var animation = new Animation()
+            {
+                Duration = TimeSpan.FromSeconds(0.3),
+                FillMode = FillMode.Forward,
+                Children =
+                {
+                    new KeyFrame()
+                    {
+                        Cue = new Cue(0.0),
+                        Setters = { new Setter(Visual.IsVisibleProperty, true) }
+                    },
+                    new KeyFrame()
+                    {
+                        Cue = new Cue(1.0),
+                        Setters = { new Setter(Visual.IsVisibleProperty, false) }
+                    }
+                }
+            };
+
+            // Control starts visible (expanded state).
+            var border = new Border() { IsVisible = true };
+
+            var clock = new TestClock();
+            var animationRun = animation.RunAsync(border, clock, TestContext.Current.CancellationToken);
+
+            clock.Step(TimeSpan.Zero);
+            Assert.True(border.IsVisible);
+
+            // Step to the end: animation sets IsVisible=false.
+            clock.Step(TimeSpan.FromSeconds(0.3));
+
+            // Animation should have completed and the final value should hold.
+            Assert.True(animationRun.IsCompleted);
+            Assert.False(border.IsVisible);
+        }
+
+        [Fact]
+        public async Task Cancelling_Expand_Animation_Mid_Flight_Then_Collapsing_Works()
+        {
+            // Reproduces the scenario where a user rapidly toggles expand/collapse:
+            // the first animation is cancelled and a new one starts in the opposite direction.
+            // Uses single-property animations to isolate the visibility behavior.
+            var expandAnimation = new Animation()
+            {
+                Duration = TimeSpan.FromSeconds(0.3),
+                FillMode = FillMode.Forward,
+                Children =
+                {
+                    new KeyFrame()
+                    {
+                        Cue = new Cue(0.0),
+                        Setters = { new Setter(Visual.IsVisibleProperty, true) }
+                    },
+                    new KeyFrame()
+                    {
+                        Cue = new Cue(1.0),
+                        Setters = { new Setter(Visual.IsVisibleProperty, true) }
+                    }
+                }
+            };
+
+            var collapseAnimation = new Animation()
+            {
+                Duration = TimeSpan.FromSeconds(0.3),
+                FillMode = FillMode.Forward,
+                Children =
+                {
+                    new KeyFrame()
+                    {
+                        Cue = new Cue(0.0),
+                        Setters = { new Setter(Visual.IsVisibleProperty, true) }
+                    },
+                    new KeyFrame()
+                    {
+                        Cue = new Cue(1.0),
+                        Setters = { new Setter(Visual.IsVisibleProperty, false) }
+                    }
+                }
+            };
+
+            var border = new Border() { IsVisible = false };
+
+            // Start expand.
+            var cts1 = new CancellationTokenSource();
+            var clock1 = new TestClock();
+            var expandRun = expandAnimation.RunAsync(border, clock1, cts1.Token);
+
+            clock1.Step(TimeSpan.Zero);
+            Assert.True(border.IsVisible);
+
+            // Partially through expand, cancel and start collapse.
+            clock1.Step(TimeSpan.FromSeconds(0.15));
+            cts1.Cancel();
+            await expandRun;
+
+            var cts2 = new CancellationTokenSource();
+            var clock2 = new TestClock();
+            var collapseRun = collapseAnimation.RunAsync(border, clock2, cts2.Token);
+
+            clock2.Step(TimeSpan.Zero);
+            clock2.Step(TimeSpan.FromSeconds(0.3));
+
+            Assert.True(collapseRun.IsCompleted);
+            Assert.False(border.IsVisible);
+        }
+
+        [Fact]
+        public void Auto_Pauses_On_Invisible_When_Started_From_Style()
+        {
+            // When started via Apply (the style path), Auto resolves to OnlyIfVisible.
+            // The animation should pause when the control becomes invisible.
+            var keyframe1 = new KeyFrame()
+            {
+                Setters = { new Setter(Layoutable.WidthProperty, 100d) }, Cue = new Cue(0d)
+            };
+            var keyframe2 = new KeyFrame()
+            {
+                Setters = { new Setter(Layoutable.WidthProperty, 200d) }, Cue = new Cue(1d)
+            };
+
+            var animation = new Animation()
+            {
+                Duration = TimeSpan.FromSeconds(3),
+                IterationCount = new IterationCount(1),
+                Children = { keyframe1, keyframe2 }
+            };
+
+            var border = new Border() { Height = 100d, Width = 50d };
+
+            var clock = new TestClock();
+            var completed = false;
+
+            // Apply (not RunAsync), this is the style-applied path.
+            var disposable = animation.Apply(border, clock, Observable.Return(true), () => completed = true);
+
+            clock.Step(TimeSpan.Zero);
+            Assert.Equal(100d, border.Width);
+
+            // Hide the control, animation should pause under Auto.
+            border.IsVisible = false;
+
+            clock.Step(TimeSpan.FromSeconds(1.5));
+            // Width should not have advanced while invisible.
+            Assert.Equal(100d, border.Width);
+
+            // Show the control, animation resumes.
+            border.IsVisible = true;
+
+            clock.Step(TimeSpan.FromSeconds(4.5));
+            Assert.True(completed);
+
+            disposable.Dispose();
+        }
+
+        [Fact]
+        public void Auto_Does_Not_Pause_On_Invisible_When_Started_Manually()
+        {
+            // When started via RunAsync (manual), Auto resolves to Always.
+            // The animation should NOT pause when the control becomes invisible.
+            var keyframe1 = new KeyFrame()
+            {
+                Setters = { new Setter(Layoutable.WidthProperty, 100d) }, Cue = new Cue(0d)
+            };
+            var keyframe2 = new KeyFrame()
+            {
+                Setters = { new Setter(Layoutable.WidthProperty, 200d) }, Cue = new Cue(1d)
+            };
+
+            var animation = new Animation()
+            {
+                Duration = TimeSpan.FromSeconds(3),
+                IterationCount = new IterationCount(1),
+                Easing = new LinearEasing(),
+                FillMode = FillMode.Forward,
+                Children = { keyframe1, keyframe2 }
+            };
+
+            var border = new Border() { Height = 100d, Width = 50d };
+
+            var clock = new TestClock();
+            var animationRun = animation.RunAsync(border, clock, TestContext.Current.CancellationToken);
+
+            clock.Step(TimeSpan.Zero);
+            Assert.Equal(100d, border.Width);
+
+            // Hide the control, animation should keep running under Auto + manual.
+            border.IsVisible = false;
+
+            // Width should advance while invisible (not paused).
+            clock.Step(TimeSpan.FromSeconds(1.5));
+            Assert.Equal(150d, border.Width);
+            Assert.False(animationRun.IsCompleted);
+
+            clock.Step(TimeSpan.FromSeconds(3));
+            Assert.True(animationRun.IsCompleted);
+            Assert.Equal(200d, border.Width);
+        }
+
+        [Fact]
+        public void FillMode_Applies_Final_Value_When_Visual_Detached_During_Animation()
+        {
+            var keyframe1 = new KeyFrame
+            {
+                Setters = { new Setter(Layoutable.WidthProperty, 100d) },
+                Cue = new Cue(0d)
+            };
+            var keyframe2 = new KeyFrame
+            {
+                Setters = { new Setter(Layoutable.WidthProperty, 300d) },
+                Cue = new Cue(1d)
+            };
+
+            var animation = new Animation
+            {
+                Duration = TimeSpan.FromSeconds(5),
+                IterationCount = new IterationCount(1),
+                FillMode = FillMode.Forward,
+                Children = { keyframe1, keyframe2 }
+            };
+
+            var border = new Border { Height = 100d, Width = 50d };
+            var root = new TestRoot(border);
+            var clock = new TestClock();
+            var animationRun = animation.RunAsync(border, clock, TestContext.Current.CancellationToken);
+
+            clock.Step(TimeSpan.Zero);
+            Assert.Equal(100d, border.Width);
+
+            // Detach from visual tree immediately
+            root.Child = null;
+
+            // The final value should be applied
+            Assert.True(animationRun.IsCompleted);
+            Assert.Equal(300d, border.Width);
+        }
+
         private sealed class FakeAnimator : InterpolatingAnimator<double>
         {
             public double LastProgress { get; set; } = double.NaN;
diff --git a/tests/Avalonia.Base.UnitTests/Composition/CompositionAnimationParserTests.cs b/tests/Avalonia.Base.UnitTests/Composition/CompositionAnimationParserTests.cs
index fc6ea969d8..5457138406 100644
--- a/tests/Avalonia.Base.UnitTests/Composition/CompositionAnimationParserTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Composition/CompositionAnimationParserTests.cs
@@ -28,12 +28,10 @@ public class CompositionAnimationParserTests
         };
         var res = expr.Evaluate(ref ctx);
         double doubleRes;
-        if (res.Type == VariantType.Scalar)
-            doubleRes = res.Scalar;
-        else if (res.Type == VariantType.Double)
+        if (res.Type == VariantType.Double)
             doubleRes = res.Double;
         else
             throw new Exception("Invalid result type: " + res.Type);
         Assert.Equal(value, doubleRes);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Avalonia.Base.UnitTests/Composition/CompositionAnimationTests.cs b/tests/Avalonia.Base.UnitTests/Composition/CompositionAnimationTests.cs
index 21ac9c1ae1..9faca90841 100644
--- a/tests/Avalonia.Base.UnitTests/Composition/CompositionAnimationTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Composition/CompositionAnimationTests.cs
@@ -1,10 +1,9 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Reflection;
 using System.Threading.Tasks;
 using Avalonia.Animation.Easings;
-using Avalonia.Base.UnitTests.Rendering;
+using Avalonia.Controls;
 using Avalonia.Rendering;
 using Avalonia.Rendering.Composition;
 using Avalonia.Rendering.Composition.Expressions;
@@ -81,7 +80,7 @@ public class CompositionAnimationTests : ScopedTestBase
 
         public void Post(Action action, DispatcherPriority priority = default) => throw new NotSupportedException();
     }
-    
+
     [AnimationDataProvider]
     [Theory]
     public void GenericCheck(AnimationData data)
@@ -100,11 +99,11 @@ public class CompositionAnimationTests : ScopedTestBase
         foreach (var check in data.Checks)
         {
             currentValue = instance.Evaluate(TimeSpan.FromSeconds(check.time), currentValue);
-            Assert.Equal(check.value, currentValue.Scalar);
+            Assert.Equal(check.value, currentValue.Double);
         }
-        
+
     }
-    
+
     public class AnimationData
     {
         public AnimationData(string name)
@@ -112,7 +111,7 @@ public class CompositionAnimationTests : ScopedTestBase
             Name = name;
         }
 
-        public string Name { get;  }
+        public string Name { get; }
         public List<(float key, float value)> Frames { get; set; } = new();
         public List<(float time, float value)> Checks { get; set; } = new();
         public float StartingValue { get; set; }
@@ -122,4 +121,124 @@ public class CompositionAnimationTests : ScopedTestBase
             return Name;
         }
     }
+
+    [Theory]
+    [InlineData("Color")]
+    [InlineData("Offset")]
+
+    public void GetCompositionProperty_ReturnsRegisteredProperties(string propName)
+    {
+        using var scope = AvaloniaLocator.EnterScope();
+        var compositor = new Compositor(RenderLoop.FromTimer(new CompositorTestServices.ManualRenderTimer()), null);
+        var target = compositor.CreateSolidColorVisual();
+
+        var property = target.Server.GetCompositionProperty(propName);
+
+        Assert.NotNull(property);
+        Assert.Equal(propName, property.Name);
+        Assert.NotNull(property.GetVariant);
+    }
+
+    [Fact]
+    public void ExpressionAnimation_Operations_WorksCorrectly()
+    {
+        using var scope = AvaloniaLocator.EnterScope();
+        var compositor = new Compositor(RenderLoop.FromTimer(new CompositorTestServices.ManualRenderTimer()), null);
+        var target = compositor.CreateSolidColorVisual();
+        target.Server.Offset = new Vector3D(100, 200, 0);
+
+        var ani = compositor.CreateExpressionAnimation("this.Target.Offset.X * 0.5 + 10");
+        var instance = ani.CreateInstance(target.Server, null);
+        instance.Initialize(TimeSpan.Zero, ExpressionVariant.Create(0f),
+            ServerCompositionVisual.s_IdOfRotationAngleProperty);
+
+        var result = instance.Evaluate(TimeSpan.Zero, ExpressionVariant.Create(0f));
+
+        Assert.Equal(VariantType.Double, result.Type);
+        Assert.Equal(60.0, result.Double);
+    }
+
+
+    [Fact]
+    public void ExpressionAnimation_Tracks_ReferenceParameter()
+    {
+        using var scope = AvaloniaLocator.EnterScope();
+        var compositor = new Compositor(RenderLoop.FromTimer(new CompositorTestServices.ManualRenderTimer()), null);
+        var target = compositor.CreateSolidColorVisual();
+        var obj = compositor.CreateSolidColorVisual();
+        obj.Server.Offset = new Vector3D(100, 200, 0);
+
+        var ani = compositor.CreateExpressionAnimation("obj.Offset.X * 0.5 + 10");
+        ani.SetReferenceParameter("obj", obj);
+        var instance = ani.CreateInstance(target.Server, null);
+
+        target.Server.Activate();
+
+        // Invoke OnSetAnimatedValue manually to create ServerObjectAnimationInstance.
+        target.Server.GetOrCreateAnimations();
+        var tmp = 0f;
+        target.Server.Animations!.OnSetAnimatedValue(ServerCompositionVisual.s_IdOfRotationAngleProperty, ref tmp, TimeSpan.Zero, instance);
+
+        var initialResult = instance.Evaluate(TimeSpan.Zero, ExpressionVariant.Create(0f));
+        Assert.Equal(60.0, initialResult.Double);
+
+        obj.Server.Offset = new Vector3D(200, 300, 0);
+        var updatedResult = instance.Evaluate(TimeSpan.Zero, ExpressionVariant.Create(0f));
+        Assert.Equal(110.0, updatedResult.Double);
+    }
+
+    [Fact]
+    public void ExpressionAnimation_Tracks_Target()
+    {
+        using var scope = AvaloniaLocator.EnterScope();
+        var compositor = new Compositor(RenderLoop.FromTimer(new CompositorTestServices.ManualRenderTimer()), null);
+        var target = compositor.CreateSolidColorVisual();
+
+        target.Server.Offset = new Vector3D(100, 200, 0);
+
+        var ani = compositor.CreateExpressionAnimation("this.Target.Offset.X * 0.5 + 10");
+        var instance = ani.CreateInstance(target.Server, null);
+
+        target.Server.Activate();
+
+        // Invoke OnSetAnimatedValue manually to create ServerObjectAnimationInstance.
+        target.Server.GetOrCreateAnimations();
+        var tmp = 0f;
+        target.Server.Animations!.OnSetAnimatedValue(ServerCompositionVisual.s_IdOfRotationAngleProperty, ref tmp, TimeSpan.Zero, instance);
+
+        var initialResult = instance.Evaluate(TimeSpan.Zero, ExpressionVariant.Create(0f));
+        Assert.Equal(60, initialResult.Double);
+
+        target.Server.Offset = new Vector3D(200, 300, 0);
+        var updatedResult = instance.Evaluate(TimeSpan.Zero, ExpressionVariant.Create(0f));
+        Assert.Equal(110.0, updatedResult.Double);
+    }
+
+    [Fact]
+    public void ExpressionAnimation_Requeues_Target_When_Another_Animation_Is_Invalidated_During_Evaluation()
+    {
+        using var services = new CompositorTestServices();
+        var border = new Border
+        {
+            Width = 10,
+            Height = 10
+        };
+
+        services.TopLevel.Content = border;
+        services.RunJobs();
+
+        var visual = ElementComposition.GetElementVisual(border)!;
+        var opacityAnimation = visual.Compositor.CreateExpressionAnimation("this.Target.RotationAngle * 0.1");
+        var rotationAnimation = visual.Compositor.CreateExpressionAnimation("this.Target.Offset.X * 0.5");
+
+        visual.StartAnimation("Opacity", opacityAnimation);
+        visual.StartAnimation("RotationAngle", rotationAnimation);
+
+        services.RunJobs();
+        visual.Offset = new Vector3D(100, 0, 0);
+        services.RunJobs();
+
+        Assert.Equal(50, visual.Server.RotationAngle);
+        Assert.Equal(5, visual.Server.Opacity);
+    }
 }
diff --git a/tests/Avalonia.Base.UnitTests/Input/AccessKeyHandlerTests.cs b/tests/Avalonia.Base.UnitTests/Input/AccessKeyHandlerTests.cs
index 9443e22855..166b777ba1 100644
--- a/tests/Avalonia.Base.UnitTests/Input/AccessKeyHandlerTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Input/AccessKeyHandlerTests.cs
@@ -233,6 +233,33 @@ namespace Avalonia.Base.UnitTests.Input
             }
         }
 
+        [Fact]
+        public void Should_Raise_AccessKey_For_System_Key_Event_With_KeySymbol()
+        {
+            // Regression test for #20961: on Windows, WM_SYSKEYDOWN (Alt+key) previously
+            // left KeySymbol null, breaking access keys. MapVirtualKey now provides KeySymbol.
+            using (UnitTestApplication.Start(TestServices.RealFocus))
+            {
+                var button = new Button();
+                var root = new TestRoot(button);
+                var target = new AccessKeyHandler();
+                var raised = 0;
+
+                KeyboardDevice.Instance?.SetFocusedElement(button, NavigationMethod.Unspecified, KeyModifiers.None);
+
+                target.SetOwner(root);
+                target.Register("F", button);
+                button.AddHandler(AccessKeyHandler.AccessKeyEvent, (s, e) => ++raised);
+
+                KeyDown(root, Key.LeftAlt);
+                Assert.Equal(0, raised);
+
+                // MapVirtualKey provides lowercase KeySymbol for system key events
+                KeyDown(root, Key.F, "f", KeyModifiers.Alt);
+                Assert.Equal(1, raised);
+            }
+        }
+
         [Fact]
         public void Should_Open_MainMenu_On_Alt_KeyUp()
         {
diff --git a/tests/Avalonia.Base.UnitTests/Input/InputElement_Focus.cs b/tests/Avalonia.Base.UnitTests/Input/InputElement_Focus.cs
index a09eccc1a3..9e835b2427 100644
--- a/tests/Avalonia.Base.UnitTests/Input/InputElement_Focus.cs
+++ b/tests/Avalonia.Base.UnitTests/Input/InputElement_Focus.cs
@@ -24,7 +24,7 @@ namespace Avalonia.Base.UnitTests.Input
                 Assert.Same(target, root.FocusManager.GetFocusedElement());
             }
         }
-        
+
         [Fact]
         public void Invisible_Controls_Should_Not_Receive_Focus()
         {
@@ -34,20 +34,20 @@ namespace Avalonia.Base.UnitTests.Input
             {
                 var root = new TestRoot
                 {
-                    Child = target = new Button() { IsVisible = false}
+                    Child = target = new Button() { IsVisible = false }
                 };
-                
+
                 Assert.Null(root.FocusManager.GetFocusedElement());
 
                 target.Focus();
-                
+
                 Assert.False(target.IsFocused);
                 Assert.False(target.IsKeyboardFocusWithin);
 
                 Assert.Null(root.FocusManager.GetFocusedElement());
             }
         }
-        
+
         [Fact]
         public void Effectively_Invisible_Controls_Should_Not_Receive_Focus()
         {
@@ -64,11 +64,11 @@ namespace Avalonia.Base.UnitTests.Input
                         Children = { target }
                     }
                 };
-                
+
                 Assert.Null(root.FocusManager.GetFocusedElement());
 
                 target.Focus();
-                
+
                 Assert.False(target.IsFocused);
                 Assert.False(target.IsKeyboardFocusWithin);
 
@@ -87,7 +87,7 @@ namespace Avalonia.Base.UnitTests.Input
                 var root = new TestRoot
                 {
                     Child = new StackPanel
-                    { 
+                    {
                         Children =
                         {
                             (first = new Button()),
@@ -365,7 +365,7 @@ namespace Avalonia.Base.UnitTests.Input
                 Assert.False(target2.Classes.Contains(":focus-visible"));
             }
         }
-        
+
         [Fact]
         public void Control_FocusWithin_PseudoClass_Should_Be_Applied()
         {
@@ -398,7 +398,7 @@ namespace Avalonia.Base.UnitTests.Input
                 Assert.True(root.IsKeyboardFocusWithin);
             }
         }
-        
+
         [Fact]
         public void Control_FocusWithin_PseudoClass_Should_Be_Applied_and_Removed()
         {
@@ -419,7 +419,7 @@ namespace Avalonia.Base.UnitTests.Input
                         }
                     }
                 };
-                
+
                 target1.ApplyTemplate();
                 target2.ApplyTemplate();
 
@@ -433,9 +433,9 @@ namespace Avalonia.Base.UnitTests.Input
                 Assert.True(root.Child.IsKeyboardFocusWithin);
                 Assert.True(root.Classes.Contains(":focus-within"));
                 Assert.True(root.IsKeyboardFocusWithin);
-                
+
                 target2.Focus();
-                
+
                 Assert.False(target1.IsFocused);
                 Assert.False(target1.Classes.Contains(":focus-within"));
                 Assert.False(target1.IsKeyboardFocusWithin);
@@ -445,7 +445,7 @@ namespace Avalonia.Base.UnitTests.Input
                 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);
@@ -453,7 +453,7 @@ namespace Avalonia.Base.UnitTests.Input
                 Assert.True(panel2.IsKeyboardFocusWithin);
             }
         }
-        
+
         [Fact]
         public void Control_FocusWithin_Pseudoclass_Should_Be_Removed_When_Removed_From_Tree()
         {
@@ -487,11 +487,11 @@ namespace Avalonia.Base.UnitTests.Input
 
                 var keyboardDevice = KeyboardDevice.Instance!;
                 Assert.Equal(keyboardDevice.FocusedElement, target1);
-                
+
                 root.Child = null;
-                
+
                 Assert.Null(keyboardDevice.FocusedElement);
-                
+
                 Assert.False(target1.IsFocused);
                 Assert.False(target1.Classes.Contains(":focus-within"));
                 Assert.False(target1.IsKeyboardFocusWithin);
@@ -499,7 +499,7 @@ namespace Avalonia.Base.UnitTests.Input
                 Assert.False(root.IsKeyboardFocusWithin);
             }
         }
-        
+
         [Fact]
         public void Control_FocusWithin_Pseudoclass_Should_Be_Removed_Focus_Moves_To_Different_Root()
         {
@@ -507,7 +507,7 @@ namespace Avalonia.Base.UnitTests.Input
             {
                 var target1 = new Decorator { Focusable = true };
                 var target2 = new Decorator { Focusable = true };
-                
+
                 var root1 = new TestRoot
                 {
                     Child = new StackPanel
@@ -518,7 +518,7 @@ namespace Avalonia.Base.UnitTests.Input
                         }
                     }
                 };
-                
+
                 var root2 = new TestRoot
                 {
                     Child = new StackPanel
@@ -543,9 +543,9 @@ namespace Avalonia.Base.UnitTests.Input
                 Assert.True(root1.IsKeyboardFocusWithin);
 
                 Assert.Equal(KeyboardDevice.Instance!.FocusedElement, target1);
-                
+
                 target2.Focus();
-                
+
                 Assert.False(target1.IsFocused);
                 Assert.False(target1.Classes.Contains(":focus-within"));
                 Assert.False(target1.IsKeyboardFocusWithin);
@@ -553,7 +553,7 @@ namespace Avalonia.Base.UnitTests.Input
                 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);
@@ -1031,7 +1031,7 @@ namespace Avalonia.Base.UnitTests.Input
                     [XYFocus.UpProperty] = target3,
                     [XYFocus.DownProperty] = target4,
                 };
-                var container =  new Canvas
+                var container = new Canvas
                 {
                     Children =
                     {
@@ -1064,6 +1064,129 @@ namespace Avalonia.Base.UnitTests.Input
             }
         }
 
+        [Fact]
+        public void Focus_In_Scope_Should_Not_Change_When_Focus_Canceled()
+        {
+            using var app = UnitTestApplication.Start(TestServices.RealFocus);
+            var first = new Button { Name = "First" };
+            var second = new Button { Name = "Second" };
+
+            var root = new TestRoot
+            {
+                Child = new StackPanel
+                {
+                    Children =
+                    {
+                        first,
+                        second
+                    }
+                }
+            };
+
+            var focusManager = (FocusManager)root.FocusManager;
+
+            // Focus the first element
+            first.Focus();
+            Assert.Same(first, focusManager.GetFocusedElement(root));
+
+            // Cancel focus change
+            second.GettingFocus += (_, e) => e.TryCancel();
+
+            // Move the focus to the second element: it should fail
+            var focusResult = focusManager.Focus(second);
+            Assert.False(focusResult);
+            Assert.Same(first, KeyboardDevice.Instance?.FocusedElement);
+
+            // FocusedElement for the scope should remain the same
+            var newFocusedElementInScope = focusManager.GetFocusedElement(root);
+            Assert.Same(first, newFocusedElementInScope);
+        }
+
+        [Fact]
+        public void Focus_In_Scope_Should_Match_Redirected_Element_When_Focus_Redirected()
+        {
+            using var app = UnitTestApplication.Start(TestServices.RealFocus);
+            var first = new Button { Name = "First" };
+            var second = new Button { Name = "Second" };
+            var third = new Button { Name = "Third" };
+
+            var root = new TestRoot
+            {
+                Child = new StackPanel
+                {
+                    Children =
+                    {
+                        first,
+                        second,
+                        third
+                    }
+                }
+            };
+
+            var focusManager = (FocusManager)root.FocusManager;
+
+            // Focus the first element
+            first.Focus();
+            Assert.Same(first, focusManager.GetFocusedElement(root));
+
+            // Redirect focus change
+            second.GettingFocus += (_, e) => e.TrySetNewFocusedElement(third);
+
+            // Move the focus to the second element: it should fail
+            var focusResult = focusManager.Focus(second);
+            Assert.False(focusResult);
+            Assert.Same(third, KeyboardDevice.Instance?.FocusedElement);
+
+            // FocusedElement for the scope should have moved to the redirected element
+            var newFocusedElementInScope = focusManager.GetFocusedElement(root);
+            Assert.Same(third, newFocusedElementInScope);
+        }
+
+        [Fact]
+        public void Focus_Should_Return_To_First_Window_When_Second_Is_Closed()
+        {
+            using var app = UnitTestApplication.Start(
+                TestServices.StyledWindow.With(keyboardDevice: () => new KeyboardDevice()));
+            var first = new Button { Name = "FirstButton" };
+            var second = new Button { Name = "SecondButton" };
+
+            var window1 = new Window
+            {
+                Content = first
+            };
+
+            var window2 = new Window
+            {
+                Content = second
+            };
+
+            window1.Show();
+
+            // Focus the first button in the first window
+            first.Focus();
+            Assert.Same(first, KeyboardDevice.Instance?.FocusedElement);
+            Assert.Same(first, window1.FocusManager.GetFocusedElement());
+
+            window2.Show();
+
+            // Focus the second button in the second window
+            second.Focus();
+            Assert.Same(second, KeyboardDevice.Instance?.FocusedElement);
+            Assert.Same(second, window2.FocusManager.GetFocusedElement());
+
+            // Close the second window, focus should be lost
+            window2.Close();
+            Assert.Null(KeyboardDevice.Instance?.FocusedElement);
+            Assert.Null(window2.FocusManager.GetFocusedElement());
+
+            // Activate the first window again
+            window1.PlatformImpl?.Activated?.Invoke();
+
+            // Focus should have moved back to the first button in the first window
+            Assert.Same(first, KeyboardDevice.Instance?.FocusedElement);
+            Assert.Same(first, window1.FocusManager.GetFocusedElement());
+        }
+
         private class TestFocusScope : Panel, IFocusScope
         {
         }
diff --git a/tests/Avalonia.Base.UnitTests/Input/MouseDeviceTests.cs b/tests/Avalonia.Base.UnitTests/Input/MouseDeviceTests.cs
index 6380f71935..1ec6ec2be5 100644
--- a/tests/Avalonia.Base.UnitTests/Input/MouseDeviceTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Input/MouseDeviceTests.cs
@@ -4,7 +4,6 @@ using Avalonia.Input.Raw;
 using Avalonia.Media;
 using Avalonia.Platform;
 using Avalonia.Rendering;
-using Avalonia.Threading;
 using Avalonia.UnitTests;
 using Moq;
 using Xunit;
@@ -18,7 +17,7 @@ namespace Avalonia.Base.UnitTests.Input
         {
             using var scope = AvaloniaLocator.EnterScope();
             var settingsMock = new Mock<IPlatformSettings>();
-            
+
             AvaloniaLocator.CurrentMutable.BindToSelf(this)
                 .Bind<IPlatformSettings>().ToConstant(settingsMock.Object);
 
@@ -32,7 +31,7 @@ namespace Avalonia.Base.UnitTests.Input
 
             var control = new Control();
             var root = CreateInputRoot(impl.Object, control, renderer.Object);
-           
+
             MouseButton button = default;
 
             root.PointerReleased += (s, e) => button = e.InitialPressMouseButton;
@@ -50,10 +49,10 @@ namespace Avalonia.Base.UnitTests.Input
             impl.Object.Input!(up);
 
             Assert.Equal(MouseButton.Left, button);
-           
+
             impl.Object.Input!(up);
 
-            Assert.Equal(MouseButton.None, button);        
+            Assert.Equal(MouseButton.None, button);
         }
 
         [Fact]
@@ -85,7 +84,7 @@ namespace Avalonia.Base.UnitTests.Input
             impl.Object.Input!(CreateRawPointerMovedArgs(device, root));
 
             Assert.NotNull(result);
-           
+
             result.Capture(control);
             Assert.Same(control, result.Captured);
 
@@ -115,8 +114,8 @@ namespace Avalonia.Base.UnitTests.Input
                     })
                 }
             }, renderer.Object);
-           
-           
+
+
             Point? result = null;
             root.PointerMoved += (_, a) =>
             {
@@ -128,5 +127,93 @@ namespace Avalonia.Base.UnitTests.Input
 
             Assert.Equal(new Point(1, 11), result);
         }
+
+        [Fact]
+        public void Mouse_Pointer_Should_Set_Focus_On_Pointer_Pressed()
+        {
+            using var scope = AvaloniaLocator.EnterScope();
+            var settingsMock = new Mock<IPlatformSettings>();
+
+            AvaloniaLocator.CurrentMutable.BindToSelf(this)
+                .Bind<IPlatformSettings>().ToConstant(settingsMock.Object);
+
+            using var app = UnitTestApplication.Start(
+               TestServices.RealFocus);
+
+            var renderer = new Mock<IHitTester>();
+            var impl = CreateTopLevelImplMock();
+
+            var control = new Button()
+            {
+                Focusable = true
+            };
+            var root = CreateInputRoot(impl.Object, control, renderer.Object);
+
+            var device = new MouseDevice();
+
+            var down = CreateRawPointerArgs(device, root, RawPointerEventType.LeftButtonDown);
+            var up = CreateRawPointerArgs(device, root, RawPointerEventType.LeftButtonUp);
+
+            SetHit(renderer, control);
+
+            Assert.False(control.IsFocused);
+
+            impl.Object.Input!(down);
+
+            Assert.True(control.IsFocused);
+            impl.Object.Input!(up);
+
+            Assert.True(control.IsFocused);
+        }
+
+        [Fact]
+        public void Control_Should_Not_Gain_Focus_On_Mouse_Release()
+        {
+            using var scope = AvaloniaLocator.EnterScope();
+            var settingsMock = new Mock<IPlatformSettings>();
+
+            AvaloniaLocator.CurrentMutable.BindToSelf(this)
+                .Bind<IPlatformSettings>().ToConstant(settingsMock.Object);
+
+            using var app = UnitTestApplication.Start(
+               TestServices.RealFocus);
+
+            var renderer = new Mock<IHitTester>();
+            var impl = CreateTopLevelImplMock();
+
+            var control1 = new Button()
+            {
+                Focusable = true
+            };
+
+            var control2 = new Button()
+            {
+                Focusable = true
+            };
+            var stack = new StackPanel()
+            {
+                Children = { control1, control2 }
+            };
+            var root = CreateInputRoot(impl.Object, stack, renderer.Object);
+
+            var device = new MouseDevice();
+
+            var down = CreateRawPointerArgs(device, root, RawPointerEventType.LeftButtonDown);
+            var up = CreateRawPointerArgs(device, root, RawPointerEventType.LeftButtonUp);
+
+            SetHit(renderer, control1);
+
+            Assert.False(control1.IsFocused);
+
+            impl.Object.Input!(down);
+
+            Assert.True(control1.IsFocused);
+
+            control2.Focus();
+
+            impl.Object.Input!(up);
+
+            Assert.False(control1.IsFocused);
+        }
     }
 }
diff --git a/tests/Avalonia.Base.UnitTests/Input/PointerTestsBase.cs b/tests/Avalonia.Base.UnitTests/Input/PointerTestsBase.cs
index c75ff56d82..1675dc9e62 100644
--- a/tests/Avalonia.Base.UnitTests/Input/PointerTestsBase.cs
+++ b/tests/Avalonia.Base.UnitTests/Input/PointerTestsBase.cs
@@ -7,9 +7,7 @@ using Avalonia.Input;
 using Avalonia.Input.Raw;
 using Avalonia.Platform;
 using Avalonia.Rendering;
-using Avalonia.Rendering.Composition;
 using Avalonia.UnitTests;
-using Avalonia.VisualTree;
 using Moq;
 
 namespace Avalonia.Base.UnitTests.Input;
diff --git a/tests/Avalonia.Base.UnitTests/Input/TouchDeviceTests.cs b/tests/Avalonia.Base.UnitTests/Input/TouchDeviceTests.cs
index 97f83b1a69..600856c643 100644
--- a/tests/Avalonia.Base.UnitTests/Input/TouchDeviceTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Input/TouchDeviceTests.cs
@@ -1,14 +1,16 @@
 using System;
+using Avalonia.Base.UnitTests.Input;
+using Avalonia.Controls;
 using Avalonia.Input.Raw;
 using Avalonia.Platform;
-using Avalonia.Threading;
+using Avalonia.Rendering;
 using Avalonia.UnitTests;
 using Moq;
 using Xunit;
 
 namespace Avalonia.Input.UnitTests
 {
-    public class TouchDeviceTests
+    public class TouchDeviceTests : PointerTestsBase
     {
         [Fact]
         public void Tapped_Event_Is_Fired_With_Touch()
@@ -141,6 +143,36 @@ namespace Avalonia.Input.UnitTests
             Assert.Equal(0, doubleTappedExecutedTimes);
         }
 
+        [Fact]
+        public void Touch_Pointer_Should_Set_Focus_On_Pointer_Released()
+        {
+            using var scope = AvaloniaLocator.EnterScope();
+            using var app = UnitTestApplication.Start(
+               TestServices.RealFocus);
+
+            var impl = CreateTopLevelImplMock();
+
+            var renderer = new Mock<IHitTester>();
+            var root = new TestTopLevel(impl.Object)
+            {
+                HitTesterOverride = renderer.Object,
+            };
+            var host = root.TopLevelHost;
+
+            host.Focusable = true;
+            var touchDevice = new TouchDevice();
+            var inputManager = InputManager.Instance!;
+
+            Assert.False(host.IsFocused);
+
+            Press(InputManager.Instance!, touchDevice, root.InputRoot);
+
+            Assert.False(host.IsFocused);
+            Release(InputManager.Instance!, touchDevice, root.InputRoot);
+
+            Assert.True(host.IsFocused);
+        }
+
         [Fact]
         public void Click_Counting_Should_Work_Correctly_With_Few_Touch_Contacts()
         {
@@ -241,14 +273,12 @@ namespace Avalonia.Input.UnitTests
 
         private static void TapOnce(IInputManager inputManager, TouchDevice device, IInputRoot root, ulong timestamp = 0, long touchPointId = 0)
         {
-            inputManager.ProcessInput(new RawPointerEventArgs(device, timestamp,
-                                               root,
-                                               RawPointerEventType.TouchBegin,
-                                               new Point(0, 0),
-                                               RawInputModifiers.None)
-            {
-                RawPointerId = touchPointId
-            });
+            Press(inputManager, device, root, timestamp, touchPointId);
+            Release(inputManager, device, root, timestamp, touchPointId);
+        }
+
+        private static void Release(IInputManager inputManager, TouchDevice device, IInputRoot root, ulong timestamp = 0, long touchPointId = 0)
+        {
             inputManager.ProcessInput(new RawPointerEventArgs(device, timestamp,
                                                 root,
                                                 RawPointerEventType.TouchEnd,
@@ -258,5 +288,22 @@ namespace Avalonia.Input.UnitTests
                 RawPointerId = touchPointId
             });
         }
+
+        private static void Press(IInputManager inputManager, TouchDevice device, IInputRoot root, ulong timestamp = 0, long touchPointId = 0)
+        {
+            inputManager.ProcessInput(new RawPointerEventArgs(device, timestamp,
+                                               root,
+                                               RawPointerEventType.TouchBegin,
+                                               new Point(0, 0),
+                                               RawInputModifiers.None)
+            {
+                RawPointerId = touchPointId
+            });
+        }
+
+        private class TestTopLevel(ITopLevelImpl impl) : TopLevel(impl)
+        {
+
+        }
     }
 }
diff --git a/tests/Avalonia.Base.UnitTests/Layout/LayoutHelperTests.cs b/tests/Avalonia.Base.UnitTests/Layout/LayoutHelperTests.cs
index 3df31939d1..af71e7206d 100644
--- a/tests/Avalonia.Base.UnitTests/Layout/LayoutHelperTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Layout/LayoutHelperTests.cs
@@ -24,5 +24,31 @@ namespace Avalonia.Base.UnitTests.Layout
             var actualValue = LayoutHelper.RoundLayoutValue(value, dpiScale);
             Assert.Equal(expectedValue, actualValue);
         }
+
+        [Fact]
+        public void ValidateScaling_Returns_Exact_One_For_Approximate_One()
+        {
+            var result = LayoutHelper.ValidateScaling(1.000000000000001);
+            Assert.Equal(1.0, result);
+        }
+
+        [Fact]
+        public void ValidateScaling_Returns_Valid_Scaling_Value()
+        {
+            const double scaling = 1.5;
+            var result = LayoutHelper.ValidateScaling(scaling);
+            Assert.Equal(scaling, result);
+        }
+
+        [Theory]
+        [InlineData(0.0)]
+        [InlineData(-1.5)]
+        [InlineData(double.NaN)]
+        [InlineData(double.PositiveInfinity)]
+        [InlineData(double.NegativeInfinity)]
+        public void ValidateScaling_Throws_For_Invalid_Values(double scaling)
+        {
+            Assert.Throws<InvalidOperationException>(() => LayoutHelper.ValidateScaling(scaling));
+        }
     }
 }
diff --git a/tests/Avalonia.Base.UnitTests/Layout/LayoutableTests_LayoutRounding.cs b/tests/Avalonia.Base.UnitTests/Layout/LayoutableTests_LayoutRounding.cs
index 866d7cbb75..5a6efdc012 100644
--- a/tests/Avalonia.Base.UnitTests/Layout/LayoutableTests_LayoutRounding.cs
+++ b/tests/Avalonia.Base.UnitTests/Layout/LayoutableTests_LayoutRounding.cs
@@ -112,7 +112,7 @@ namespace Avalonia.Base.UnitTests.Layout
         {
             if (!expected.NearlyEquals(actual))
             {
-                throw EqualException.ForMismatchedValues(expected, actual);
+                throw EqualException.ForMismatchedValues(expected.ToString(), actual.ToString());
             }
         }
 
@@ -120,7 +120,7 @@ namespace Avalonia.Base.UnitTests.Layout
         {
             if (!expected.NearlyEquals(actual))
             {
-                throw EqualException.ForMismatchedValues(expected, actual);
+                throw EqualException.ForMismatchedValues(expected.ToString(), actual.ToString());
             }
         }
 
diff --git a/tests/Avalonia.Controls.UnitTests/ComboBoxTests.cs b/tests/Avalonia.Controls.UnitTests/ComboBoxTests.cs
index ca1fa66d91..578484557f 100644
--- a/tests/Avalonia.Controls.UnitTests/ComboBoxTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ComboBoxTests.cs
@@ -392,6 +392,28 @@ namespace Avalonia.Controls.UnitTests
             
         }
 
+        [Fact]
+        public void Text_Validation()
+        {
+            using (UnitTestApplication.Start(TestServices.MockThreadingInterface))
+            {
+                var target = new ComboBox
+                {
+                    Template = GetTemplate(),
+                };
+
+                target.ApplyTemplate();
+                target.Presenter!.ApplyTemplate();
+                
+                var exception = new System.InvalidCastException("failed validation");
+                var textObservable = new BehaviorSubject<BindingNotification>(new BindingNotification(exception, BindingErrorType.DataValidationError));
+                target.Bind(ComboBox.TextProperty, textObservable);
+
+                Assert.True(DataValidationErrors.GetHasErrors(target));
+                Assert.Equal([exception], DataValidationErrors.GetErrors(target));
+            }
+        }
+
         [Fact]
         public void Close_Window_On_Alt_F4_When_ComboBox_Is_Focus()
         {
diff --git a/tests/Avalonia.Controls.UnitTests/CommandBarTests.cs b/tests/Avalonia.Controls.UnitTests/CommandBarTests.cs
index 8bd4401d10..371cbe4d6d 100644
--- a/tests/Avalonia.Controls.UnitTests/CommandBarTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/CommandBarTests.cs
@@ -1,32 +1,39 @@
+using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
+using System.Linq;
 using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Input;
+using Avalonia.LogicalTree;
+using Avalonia.Threading;
 using Avalonia.UnitTests;
+using Avalonia.VisualTree;
 using Xunit;
 
 namespace Avalonia.Controls.UnitTests;
 
-public class AppBarButtonTests : ScopedTestBase
+public class CommandBarButtonTests : ScopedTestBase
 {
     [Fact]
     public void Label_DefaultIsNull()
-        => Assert.Null(new AppBarButton().Label);
+        => Assert.Null(new CommandBarButton().Label);
 
     [Fact]
     public void Label_RoundTrip()
     {
-        var btn = new AppBarButton { Label = "Save" };
+        var btn = new CommandBarButton { Label = "Save" };
         Assert.Equal("Save", btn.Label);
     }
 
     [Fact]
     public void Icon_DefaultIsNull()
-        => Assert.Null(new AppBarButton().Icon);
+        => Assert.Null(new CommandBarButton().Icon);
 
     [Fact]
     public void Icon_RoundTrip()
     {
-        var btn = new AppBarButton();
+        var btn = new CommandBarButton();
         var icon = new object();
         btn.Icon = icon;
         Assert.Same(icon, btn.Icon);
@@ -34,72 +41,72 @@ public class AppBarButtonTests : ScopedTestBase
 
     [Fact]
     public void IsCompact_DefaultIsFalse()
-        => Assert.False(new AppBarButton().IsCompact);
+        => Assert.False(new CommandBarButton().IsCompact);
 
     [Fact]
     public void IsCompact_RoundTrip()
     {
-        var btn = new AppBarButton { IsCompact = true };
+        var btn = new CommandBarButton { IsCompact = true };
         Assert.True(btn.IsCompact);
     }
 
     [Fact]
     public void DynamicOverflowOrder_DefaultIsZero()
-        => Assert.Equal(0, new AppBarButton().DynamicOverflowOrder);
+        => Assert.Equal(0, new CommandBarButton().DynamicOverflowOrder);
 
     [Fact]
     public void DynamicOverflowOrder_RoundTrip()
     {
-        var btn = new AppBarButton { DynamicOverflowOrder = 3 };
+        var btn = new CommandBarButton { DynamicOverflowOrder = 3 };
         Assert.Equal(3, btn.DynamicOverflowOrder);
     }
 
     [Fact]
     public void LabelPosition_DefaultIsBottom()
-        => Assert.Equal(CommandBarDefaultLabelPosition.Bottom, new AppBarButton().LabelPosition);
+        => Assert.Equal(CommandBarDefaultLabelPosition.Bottom, new CommandBarButton().LabelPosition);
 
     [Fact]
     public void LabelPosition_RoundTrip()
     {
-        var btn = new AppBarButton { LabelPosition = CommandBarDefaultLabelPosition.Right };
+        var btn = new CommandBarButton { LabelPosition = CommandBarDefaultLabelPosition.Right };
         Assert.Equal(CommandBarDefaultLabelPosition.Right, btn.LabelPosition);
     }
 
     [Fact]
     public void IsInOverflow_DefaultIsFalse()
-        => Assert.False(new AppBarButton().IsInOverflow);
+        => Assert.False(new CommandBarButton().IsInOverflow);
 
     [Fact]
     public void IsInOverflow_RoundTrip()
     {
-        var btn = new AppBarButton { IsInOverflow = true };
+        var btn = new CommandBarButton { IsInOverflow = true };
         Assert.True(btn.IsInOverflow);
     }
 
     [Fact]
     public void ImplementsICommandBarElement()
-        => Assert.IsAssignableFrom<ICommandBarElement>(new AppBarButton());
+        => Assert.IsAssignableFrom<ICommandBarElement>(new CommandBarButton());
 
     [Fact]
     public void ICommandBarElement_IsCompact_ReadWrite()
     {
-        ICommandBarElement elem = new AppBarButton();
+        ICommandBarElement elem = new CommandBarButton();
         elem.IsCompact = true;
         Assert.True(elem.IsCompact);
     }
 
     [Fact]
     public void Command_DefaultIsNull()
-        => Assert.Null(new AppBarButton().Command);
+        => Assert.Null(new CommandBarButton().Command);
 
     [Fact]
     public void CommandParameter_DefaultIsNull()
-        => Assert.Null(new AppBarButton().CommandParameter);
+        => Assert.Null(new CommandBarButton().CommandParameter);
 
     [Fact]
     public void Command_RoundTrip()
     {
-        var btn = new AppBarButton();
+        var btn = new CommandBarButton();
         var cmd = new DelegateCommand(_ => { });
         btn.Command = cmd;
         Assert.Same(cmd, btn.Command);
@@ -108,85 +115,85 @@ public class AppBarButtonTests : ScopedTestBase
     [Fact]
     public void CommandParameter_RoundTrip()
     {
-        var btn = new AppBarButton { CommandParameter = "param" };
+        var btn = new CommandBarButton { CommandParameter = "param" };
         Assert.Equal("param", btn.CommandParameter);
     }
 }
 
-public class AppBarToggleButtonTests : ScopedTestBase
+public class CommandBarToggleButtonTests : ScopedTestBase
 {
     [Fact]
     public void Label_DefaultIsNull()
-        => Assert.Null(new AppBarToggleButton().Label);
+        => Assert.Null(new CommandBarToggleButton().Label);
 
     [Fact]
     public void Label_RoundTrip()
     {
-        var btn = new AppBarToggleButton { Label = "Bold" };
+        var btn = new CommandBarToggleButton { Label = "Bold" };
         Assert.Equal("Bold", btn.Label);
     }
 
     [Fact]
     public void Icon_DefaultIsNull()
-        => Assert.Null(new AppBarToggleButton().Icon);
+        => Assert.Null(new CommandBarToggleButton().Icon);
 
     [Fact]
     public void IsCompact_DefaultIsFalse()
-        => Assert.False(new AppBarToggleButton().IsCompact);
+        => Assert.False(new CommandBarToggleButton().IsCompact);
 
     [Fact]
     public void IsCompact_RoundTrip()
     {
-        var btn = new AppBarToggleButton { IsCompact = true };
+        var btn = new CommandBarToggleButton { IsCompact = true };
         Assert.True(btn.IsCompact);
     }
 
     [Fact]
     public void DynamicOverflowOrder_DefaultIsZero()
-        => Assert.Equal(0, new AppBarToggleButton().DynamicOverflowOrder);
+        => Assert.Equal(0, new CommandBarToggleButton().DynamicOverflowOrder);
 
     [Fact]
     public void DynamicOverflowOrder_RoundTrip()
     {
-        var btn = new AppBarToggleButton { DynamicOverflowOrder = 5 };
+        var btn = new CommandBarToggleButton { DynamicOverflowOrder = 5 };
         Assert.Equal(5, btn.DynamicOverflowOrder);
     }
 
     [Fact]
     public void LabelPosition_DefaultIsBottom()
-        => Assert.Equal(CommandBarDefaultLabelPosition.Bottom, new AppBarToggleButton().LabelPosition);
+        => Assert.Equal(CommandBarDefaultLabelPosition.Bottom, new CommandBarToggleButton().LabelPosition);
 
     [Fact]
     public void LabelPosition_RoundTrip()
     {
-        var btn = new AppBarToggleButton { LabelPosition = CommandBarDefaultLabelPosition.Collapsed };
+        var btn = new CommandBarToggleButton { LabelPosition = CommandBarDefaultLabelPosition.Collapsed };
         Assert.Equal(CommandBarDefaultLabelPosition.Collapsed, btn.LabelPosition);
     }
 
     [Fact]
     public void IsInOverflow_DefaultIsFalse()
-        => Assert.False(new AppBarToggleButton().IsInOverflow);
+        => Assert.False(new CommandBarToggleButton().IsInOverflow);
 
     [Fact]
     public void ImplementsICommandBarElement()
-        => Assert.IsAssignableFrom<ICommandBarElement>(new AppBarToggleButton());
+        => Assert.IsAssignableFrom<ICommandBarElement>(new CommandBarToggleButton());
 
     [Fact]
     public void ICommandBarElement_IsCompact_ReadWrite()
     {
-        ICommandBarElement elem = new AppBarToggleButton();
+        ICommandBarElement elem = new CommandBarToggleButton();
         elem.IsCompact = true;
         Assert.True(elem.IsCompact);
     }
 
     [Fact]
     public void Command_DefaultIsNull()
-        => Assert.Null(new AppBarToggleButton().Command);
+        => Assert.Null(new CommandBarToggleButton().Command);
 
     [Fact]
     public void Command_RoundTrip()
     {
-        var btn = new AppBarToggleButton();
+        var btn = new CommandBarToggleButton();
         var cmd = new DelegateCommand(_ => { });
         btn.Command = cmd;
         Assert.Same(cmd, btn.Command);
@@ -195,43 +202,47 @@ public class AppBarToggleButtonTests : ScopedTestBase
     [Fact]
     public void CommandParameter_RoundTrip()
     {
-        var btn = new AppBarToggleButton { CommandParameter = 42 };
+        var btn = new CommandBarToggleButton { CommandParameter = 42 };
         Assert.Equal(42, btn.CommandParameter);
     }
 }
 
-public class AppBarSeparatorTests : ScopedTestBase
+public class CommandBarSeparatorTests : ScopedTestBase
 {
     [Fact]
     public void IsCompact_DefaultIsFalse()
-        => Assert.False(new AppBarSeparator().IsCompact);
+        => Assert.False(new CommandBarSeparator().IsCompact);
 
     [Fact]
     public void IsCompact_RoundTrip()
     {
-        var sep = new AppBarSeparator { IsCompact = true };
+        var sep = new CommandBarSeparator { IsCompact = true };
         Assert.True(sep.IsCompact);
     }
 
     [Fact]
     public void IsInOverflow_DefaultIsFalse()
-        => Assert.False(new AppBarSeparator().IsInOverflow);
+        => Assert.False(new CommandBarSeparator().IsInOverflow);
 
     [Fact]
     public void IsInOverflow_RoundTrip()
     {
-        var sep = new AppBarSeparator { IsInOverflow = true };
+        var sep = new CommandBarSeparator { IsInOverflow = true };
         Assert.True(sep.IsInOverflow);
     }
 
     [Fact]
     public void ImplementsICommandBarElement()
-        => Assert.IsAssignableFrom<ICommandBarElement>(new AppBarSeparator());
+        => Assert.IsAssignableFrom<ICommandBarElement>(new CommandBarSeparator());
+
+    [Fact]
+    public void DerivesFromSeparator()
+        => Assert.IsAssignableFrom<Separator>(new CommandBarSeparator());
 
     [Fact]
     public void ICommandBarElement_IsCompact_ReadWrite()
     {
-        ICommandBarElement elem = new AppBarSeparator();
+        ICommandBarElement elem = new CommandBarSeparator();
         elem.IsCompact = true;
         Assert.True(elem.IsCompact);
     }
@@ -517,7 +528,7 @@ public class CommandBarCollectionTests : ScopedTestBase
     public void PrimaryCommands_Added_AppearInVisiblePrimary_WhenDynamicOverflowDisabled()
     {
         var cb = new CommandBar();
-        var btn = new AppBarButton { Label = "Save" };
+        var btn = new CommandBarButton { Label = "Save" };
         cb.PrimaryCommands!.Add(btn);
         Assert.Contains(btn, cb.VisiblePrimaryCommands);
     }
@@ -530,7 +541,7 @@ public class CommandBarCollectionTests : ScopedTestBase
 
         ((INotifyCollectionChanged)cb.VisiblePrimaryCommands).CollectionChanged += (_, _) => notifications++;
 
-        cb.PrimaryCommands!.Add(new AppBarButton { Label = "Save" });
+        cb.PrimaryCommands!.Add(new CommandBarButton { Label = "Save" });
 
         Assert.Equal(2, notifications);
     }
@@ -539,7 +550,7 @@ public class CommandBarCollectionTests : ScopedTestBase
     public void PrimaryCommands_Removed_DisappearsFromVisiblePrimary()
     {
         var cb = new CommandBar();
-        var btn = new AppBarButton { Label = "Save" };
+        var btn = new CommandBarButton { Label = "Save" };
         cb.PrimaryCommands!.Add(btn);
         cb.PrimaryCommands!.Remove(btn);
         Assert.DoesNotContain(btn, cb.VisiblePrimaryCommands);
@@ -549,7 +560,7 @@ public class CommandBarCollectionTests : ScopedTestBase
     public void SecondaryCommands_Added_AppearInOverflowItems()
     {
         var cb = new CommandBar();
-        var btn = new AppBarButton { Label = "Settings" };
+        var btn = new CommandBarButton { Label = "Settings" };
         cb.SecondaryCommands!.Add(btn);
         Assert.Contains(btn, cb.OverflowItems);
     }
@@ -562,7 +573,7 @@ public class CommandBarCollectionTests : ScopedTestBase
 
         ((INotifyCollectionChanged)cb.OverflowItems).CollectionChanged += (_, _) => notifications++;
 
-        cb.SecondaryCommands!.Add(new AppBarButton { Label = "Settings" });
+        cb.SecondaryCommands!.Add(new CommandBarButton { Label = "Settings" });
 
         Assert.Equal(2, notifications);
     }
@@ -571,7 +582,7 @@ public class CommandBarCollectionTests : ScopedTestBase
     public void SecondaryCommands_Removed_DisappearsFromOverflowItems()
     {
         var cb = new CommandBar();
-        var btn = new AppBarButton { Label = "Settings" };
+        var btn = new CommandBarButton { Label = "Settings" };
         cb.SecondaryCommands!.Add(btn);
         cb.SecondaryCommands!.Remove(btn);
         Assert.DoesNotContain(btn, cb.OverflowItems);
@@ -581,7 +592,7 @@ public class CommandBarCollectionTests : ScopedTestBase
     public void HasSecondaryCommands_TrueWhenSecondaryAdded()
     {
         var cb = new CommandBar();
-        cb.SecondaryCommands!.Add(new AppBarButton { Label = "Options" });
+        cb.SecondaryCommands!.Add(new CommandBarButton { Label = "Options" });
         Assert.True(cb.HasSecondaryCommands);
     }
 
@@ -589,7 +600,7 @@ public class CommandBarCollectionTests : ScopedTestBase
     public void HasSecondaryCommands_FalseAfterSecondaryCleared()
     {
         var cb = new CommandBar();
-        var btn = new AppBarButton { Label = "Options" };
+        var btn = new CommandBarButton { Label = "Options" };
         cb.SecondaryCommands!.Add(btn);
         cb.SecondaryCommands!.Remove(btn);
         Assert.False(cb.HasSecondaryCommands);
@@ -599,8 +610,8 @@ public class CommandBarCollectionTests : ScopedTestBase
     public void OverflowItems_CountMatchesSecondaryCommandCount()
     {
         var cb = new CommandBar();
-        cb.SecondaryCommands!.Add(new AppBarButton());
-        cb.SecondaryCommands!.Add(new AppBarButton());
+        cb.SecondaryCommands!.Add(new CommandBarButton());
+        cb.SecondaryCommands!.Add(new CommandBarButton());
         Assert.Equal(2, cb.OverflowItems.Count);
     }
 
@@ -608,8 +619,8 @@ public class CommandBarCollectionTests : ScopedTestBase
     public void VisiblePrimaryCommands_CountMatchesPrimary_WhenDynamicOverflowDisabled()
     {
         var cb = new CommandBar();
-        cb.PrimaryCommands!.Add(new AppBarButton());
-        cb.PrimaryCommands!.Add(new AppBarButton());
+        cb.PrimaryCommands!.Add(new CommandBarButton());
+        cb.PrimaryCommands!.Add(new CommandBarButton());
         Assert.Equal(2, cb.VisiblePrimaryCommands.Count);
     }
 
@@ -617,9 +628,9 @@ public class CommandBarCollectionTests : ScopedTestBase
     public void MultiplePrimaryCommands_AllVisibleInOrder()
     {
         var cb = new CommandBar();
-        var btn1 = new AppBarButton { Label = "A" };
-        var btn2 = new AppBarButton { Label = "B" };
-        var btn3 = new AppBarButton { Label = "C" };
+        var btn1 = new CommandBarButton { Label = "A" };
+        var btn2 = new CommandBarButton { Label = "B" };
+        var btn3 = new CommandBarButton { Label = "C" };
         cb.PrimaryCommands!.Add(btn1);
         cb.PrimaryCommands!.Add(btn2);
         cb.PrimaryCommands!.Add(btn3);
@@ -627,19 +638,19 @@ public class CommandBarCollectionTests : ScopedTestBase
     }
 
     [Fact]
-    public void AppBarSeparator_CanBeAddedToPrimaryCommands()
+    public void CommandBarSeparator_CanBeAddedToPrimaryCommands()
     {
         var cb = new CommandBar();
-        var sep = new AppBarSeparator();
+        var sep = new CommandBarSeparator();
         cb.PrimaryCommands!.Add(sep);
         Assert.Contains(sep, cb.VisiblePrimaryCommands);
     }
 
     [Fact]
-    public void AppBarToggleButton_CanBeAddedToPrimaryCommands()
+    public void CommandBarToggleButton_CanBeAddedToPrimaryCommands()
     {
         var cb = new CommandBar();
-        var toggle = new AppBarToggleButton { Label = "Bold" };
+        var toggle = new CommandBarToggleButton { Label = "Bold" };
         cb.PrimaryCommands!.Add(toggle);
         Assert.Contains(toggle, cb.VisiblePrimaryCommands);
     }
@@ -651,7 +662,7 @@ public class CommandBarLabelPositionTests : ScopedTestBase
     public void DefaultLabelPosition_Collapsed_SetsIsCompactOnExistingPrimaryButton()
     {
         var cb = new CommandBar();
-        var btn = new AppBarButton();
+        var btn = new CommandBarButton();
         cb.PrimaryCommands!.Add(btn);
 
         cb.DefaultLabelPosition = CommandBarDefaultLabelPosition.Collapsed;
@@ -663,7 +674,7 @@ public class CommandBarLabelPositionTests : ScopedTestBase
     public void DefaultLabelPosition_Bottom_ClearsIsCompactOnPrimaryButton()
     {
         var cb = new CommandBar();
-        var btn = new AppBarButton();
+        var btn = new CommandBarButton();
         cb.PrimaryCommands!.Add(btn);
         cb.DefaultLabelPosition = CommandBarDefaultLabelPosition.Collapsed;
 
@@ -676,7 +687,7 @@ public class CommandBarLabelPositionTests : ScopedTestBase
     public void DefaultLabelPosition_Right_SetsLabelPositionOnPrimaryButton()
     {
         var cb = new CommandBar();
-        var btn = new AppBarButton();
+        var btn = new CommandBarButton();
         cb.PrimaryCommands!.Add(btn);
 
         cb.DefaultLabelPosition = CommandBarDefaultLabelPosition.Right;
@@ -688,7 +699,7 @@ public class CommandBarLabelPositionTests : ScopedTestBase
     public void DefaultLabelPosition_Collapsed_SetsLabelPositionOnPrimaryButton()
     {
         var cb = new CommandBar();
-        var btn = new AppBarButton();
+        var btn = new CommandBarButton();
         cb.PrimaryCommands!.Add(btn);
 
         cb.DefaultLabelPosition = CommandBarDefaultLabelPosition.Collapsed;
@@ -700,7 +711,7 @@ public class CommandBarLabelPositionTests : ScopedTestBase
     public void DefaultLabelPosition_Collapsed_PropagatesIsCompactToToggleButton()
     {
         var cb = new CommandBar();
-        var toggle = new AppBarToggleButton();
+        var toggle = new CommandBarToggleButton();
         cb.PrimaryCommands!.Add(toggle);
 
         cb.DefaultLabelPosition = CommandBarDefaultLabelPosition.Collapsed;
@@ -713,7 +724,7 @@ public class CommandBarLabelPositionTests : ScopedTestBase
     public void DefaultLabelPosition_Right_PropagatesLabelPositionToToggleButton()
     {
         var cb = new CommandBar();
-        var toggle = new AppBarToggleButton();
+        var toggle = new CommandBarToggleButton();
         cb.PrimaryCommands!.Add(toggle);
 
         cb.DefaultLabelPosition = CommandBarDefaultLabelPosition.Right;
@@ -725,7 +736,7 @@ public class CommandBarLabelPositionTests : ScopedTestBase
     public void DefaultLabelPosition_Collapsed_SetsIsCompactOnSeparator()
     {
         var cb = new CommandBar();
-        var sep = new AppBarSeparator();
+        var sep = new CommandBarSeparator();
         cb.PrimaryCommands!.Add(sep);
 
         cb.DefaultLabelPosition = CommandBarDefaultLabelPosition.Collapsed;
@@ -738,7 +749,7 @@ public class CommandBarLabelPositionTests : ScopedTestBase
     {
         var cb = new CommandBar { DefaultLabelPosition = CommandBarDefaultLabelPosition.Collapsed };
 
-        var btn = new AppBarButton();
+        var btn = new CommandBarButton();
         cb.PrimaryCommands!.Add(btn);
 
         Assert.True(btn.IsCompact);
@@ -750,7 +761,7 @@ public class CommandBarLabelPositionTests : ScopedTestBase
     {
         var cb = new CommandBar { DefaultLabelPosition = CommandBarDefaultLabelPosition.Right };
 
-        var btn = new AppBarButton();
+        var btn = new CommandBarButton();
         cb.PrimaryCommands!.Add(btn);
 
         Assert.Equal(CommandBarDefaultLabelPosition.Right, btn.LabelPosition);
@@ -760,7 +771,7 @@ public class CommandBarLabelPositionTests : ScopedTestBase
     public void DefaultLabelPosition_Collapsed_AppliesToSecondaryCommands()
     {
         var cb = new CommandBar();
-        var btn = new AppBarButton();
+        var btn = new CommandBarButton();
         cb.SecondaryCommands!.Add(btn);
 
         cb.DefaultLabelPosition = CommandBarDefaultLabelPosition.Collapsed;
@@ -772,7 +783,7 @@ public class CommandBarLabelPositionTests : ScopedTestBase
     public void DefaultLabelPosition_DoesNotClearLabelText()
     {
         var cb = new CommandBar();
-        var btn = new AppBarButton { Label = "Save" };
+        var btn = new CommandBarButton { Label = "Save" };
         cb.PrimaryCommands!.Add(btn);
 
         cb.DefaultLabelPosition = CommandBarDefaultLabelPosition.Collapsed;
@@ -801,7 +812,7 @@ public class CommandBarOverflowButtonTests : ScopedTestBase
     public void OverflowButtonVisibility_Auto_TrueWhenHasSecondaryCommands()
     {
         var cb = new CommandBar();
-        cb.SecondaryCommands!.Add(new AppBarButton());
+        cb.SecondaryCommands!.Add(new CommandBarButton());
         Assert.True(cb.IsOverflowButtonVisible);
     }
 
@@ -823,7 +834,7 @@ public class CommandBarOverflowButtonTests : ScopedTestBase
     public void OverflowButtonVisibility_Collapsed_RemainsFalseEvenWithSecondary()
     {
         var cb = new CommandBar { OverflowButtonVisibility = CommandBarOverflowButtonVisibility.Collapsed };
-        cb.SecondaryCommands!.Add(new AppBarButton());
+        cb.SecondaryCommands!.Add(new CommandBarButton());
         Assert.False(cb.IsOverflowButtonVisible);
     }
 
@@ -831,7 +842,7 @@ public class CommandBarOverflowButtonTests : ScopedTestBase
     public void OverflowButtonVisibility_Auto_FalseAfterSecondaryRemoved()
     {
         var cb = new CommandBar();
-        var btn = new AppBarButton();
+        var btn = new CommandBarButton();
         cb.SecondaryCommands!.Add(btn);
         Assert.True(cb.IsOverflowButtonVisible);
 
@@ -863,13 +874,17 @@ public class CommandBarItemWidthTests : ScopedTestBase
     public void ItemWidthBottom_Controls_HowManyButtonsFit()
     {
         var cb = CreateWithWidth(300);
-        cb.SecondaryCommands!.Add(new AppBarButton()); // forces overflow button
+        var secondary = new CommandBarButton();
+        cb.SecondaryCommands!.Add(secondary); // forces overflow button
         for (int i = 0; i < 4; i++)
-            cb.PrimaryCommands!.Add(new AppBarButton());
+            cb.PrimaryCommands!.Add(new CommandBarButton());
         cb.IsDynamicOverflowEnabled = true;
 
         Assert.Equal(3, cb.VisiblePrimaryCommands.Count);
-        Assert.Equal(1, cb.OverflowItems.Count - 1); // -1 for the secondary command
+        Assert.Equal(3, cb.OverflowItems.Count);
+        Assert.IsType<CommandBarButton>(cb.OverflowItems[0]);
+        Assert.IsType<CommandBarSeparator>(cb.OverflowItems[1]);
+        Assert.Same(secondary, cb.OverflowItems[2]);
     }
 
     [Fact]
@@ -877,9 +892,9 @@ public class CommandBarItemWidthTests : ScopedTestBase
     {
         var cb = CreateWithWidth(300);
         cb.ItemWidthBottom = 35;
-        cb.SecondaryCommands!.Add(new AppBarButton());
+        cb.SecondaryCommands!.Add(new CommandBarButton());
         for (int i = 0; i < 4; i++)
-            cb.PrimaryCommands!.Add(new AppBarButton());
+            cb.PrimaryCommands!.Add(new CommandBarButton());
         cb.IsDynamicOverflowEnabled = true;
 
         Assert.Equal(4, cb.VisiblePrimaryCommands.Count);
@@ -890,9 +905,9 @@ public class CommandBarItemWidthTests : ScopedTestBase
     {
         var cb = CreateWithWidth(300);
         cb.ItemWidthBottom = 260;
-        cb.SecondaryCommands!.Add(new AppBarButton());
+        cb.SecondaryCommands!.Add(new CommandBarButton());
         for (int i = 0; i < 3; i++)
-            cb.PrimaryCommands!.Add(new AppBarButton());
+            cb.PrimaryCommands!.Add(new CommandBarButton());
         cb.IsDynamicOverflowEnabled = true;
 
         Assert.Equal(1, cb.VisiblePrimaryCommands.Count);
@@ -903,9 +918,9 @@ public class CommandBarItemWidthTests : ScopedTestBase
     {
         var cb = CreateWithWidth(300);
         cb.DefaultLabelPosition = CommandBarDefaultLabelPosition.Right;
-        cb.SecondaryCommands!.Add(new AppBarButton());
+        cb.SecondaryCommands!.Add(new CommandBarButton());
         for (int i = 0; i < 4; i++)
-            cb.PrimaryCommands!.Add(new AppBarButton());
+            cb.PrimaryCommands!.Add(new CommandBarButton());
         cb.IsDynamicOverflowEnabled = true;
 
         Assert.Equal(2, cb.VisiblePrimaryCommands.Count);
@@ -917,9 +932,9 @@ public class CommandBarItemWidthTests : ScopedTestBase
         var cb = CreateWithWidth(300);
         cb.DefaultLabelPosition = CommandBarDefaultLabelPosition.Right;
         cb.ItemWidthRight = 252; // exactly 1 fits: 252/252=1
-        cb.SecondaryCommands!.Add(new AppBarButton());
+        cb.SecondaryCommands!.Add(new CommandBarButton());
         for (int i = 0; i < 3; i++)
-            cb.PrimaryCommands!.Add(new AppBarButton());
+            cb.PrimaryCommands!.Add(new CommandBarButton());
         cb.IsDynamicOverflowEnabled = true;
 
         Assert.Equal(1, cb.VisiblePrimaryCommands.Count);
@@ -930,9 +945,9 @@ public class CommandBarItemWidthTests : ScopedTestBase
     {
         var cb = CreateWithWidth(300);
         cb.DefaultLabelPosition = CommandBarDefaultLabelPosition.Collapsed;
-        cb.SecondaryCommands!.Add(new AppBarButton());
+        cb.SecondaryCommands!.Add(new CommandBarButton());
         for (int i = 0; i < 4; i++)
-            cb.PrimaryCommands!.Add(new AppBarButton());
+            cb.PrimaryCommands!.Add(new CommandBarButton());
         cb.IsDynamicOverflowEnabled = true;
 
         Assert.Equal(4, cb.VisiblePrimaryCommands.Count);
@@ -945,9 +960,9 @@ public class CommandBarItemWidthTests : ScopedTestBase
         cb.ItemWidthBottom    = 70;
         cb.ItemWidthRight     = 102;
         cb.ItemWidthCollapsed = 42;
-        cb.SecondaryCommands!.Add(new AppBarButton());
+        cb.SecondaryCommands!.Add(new CommandBarButton());
         for (int i = 0; i < 4; i++)
-            cb.PrimaryCommands!.Add(new AppBarButton());
+            cb.PrimaryCommands!.Add(new CommandBarButton());
 
         cb.DefaultLabelPosition    = CommandBarDefaultLabelPosition.Bottom;
         cb.IsDynamicOverflowEnabled = true;
@@ -969,6 +984,525 @@ public class CommandBarItemWidthTests : ScopedTestBase
     }
 }
 
+public class CommandBarOverflowKeyboardTests : ScopedTestBase
+{
+    private readonly IDisposable _app;
+
+    public CommandBarOverflowKeyboardTests()
+    {
+        _app = UnitTestApplication.Start(TestServices.FocusableWindow);
+    }
+
+    public override void Dispose()
+    {
+        _app.Dispose();
+        base.Dispose();
+    }
+
+    [Fact]
+    public void Escape_WhenOverflowOpen_ClosesOverflow()
+    {
+        var cb = new CommandBar();
+        cb.SecondaryCommands.Add(new CommandBarButton { Label = "Action" });
+        var root = new TestRoot(useGlobalStyles: true, child: cb);
+        root.LayoutManager.ExecuteInitialLayoutPass();
+        cb.IsOpen = true;
+
+        RaiseKeyOnOverflowPresenter(cb, Key.Escape);
+
+        Assert.False(cb.IsOpen);
+    }
+
+    [Fact]
+    public void Escape_WhenOverflowClosed_DoesNothing()
+    {
+        var cb = new CommandBar();
+        cb.SecondaryCommands.Add(new CommandBarButton { Label = "Action" });
+        var root = new TestRoot(useGlobalStyles: true, child: cb);
+        root.LayoutManager.ExecuteInitialLayoutPass();
+
+        RaiseKeyOnOverflowPresenter(cb, Key.Escape);
+
+        Assert.False(cb.IsOpen);
+    }
+
+    [Theory]
+    [InlineData(Key.Down)]
+    [InlineData(Key.Up)]
+    [InlineData(Key.Home)]
+    [InlineData(Key.End)]
+    public void NavigationKeys_AreHandled_WhenOverflowHasItems(Key key)
+    {
+        var cb = new CommandBar();
+        cb.SecondaryCommands.Add(new CommandBarButton { Label = "A" });
+        cb.SecondaryCommands.Add(new CommandBarButton { Label = "B" });
+        var root = new TestRoot(useGlobalStyles: true, child: cb);
+        root.LayoutManager.ExecuteInitialLayoutPass();
+        cb.IsOpen = true;
+
+        var e = new KeyEventArgs { RoutedEvent = InputElement.KeyDownEvent, Key = key };
+        GetOverflowPresenter(cb).RaiseEvent(e);
+
+        Assert.True(e.Handled);
+    }
+
+    [Fact]
+    public void NavigationKeys_AreHandled_WhenAllItemsAreSeparators()
+    {
+        var cb = new CommandBar();
+        cb.SecondaryCommands.Add(new CommandBarSeparator());
+        var root = new TestRoot(useGlobalStyles: true, child: cb);
+        root.LayoutManager.ExecuteInitialLayoutPass();
+        cb.IsOpen = true;
+
+        var e = new KeyEventArgs { RoutedEvent = InputElement.KeyDownEvent, Key = Key.Down };
+        GetOverflowPresenter(cb).RaiseEvent(e);
+
+        Assert.True(e.Handled);
+    }
+
+    [Fact]
+    public void NavigationKeys_AreHandled_WhenAllItemsAreDisabled()
+    {
+        var cb = new CommandBar();
+        cb.SecondaryCommands.Add(new CommandBarButton { Label = "A", IsEnabled = false });
+        var root = new TestRoot(useGlobalStyles: true, child: cb);
+        root.LayoutManager.ExecuteInitialLayoutPass();
+        cb.IsOpen = true;
+
+        var e = new KeyEventArgs { RoutedEvent = InputElement.KeyDownEvent, Key = Key.Down };
+        GetOverflowPresenter(cb).RaiseEvent(e);
+
+        Assert.True(e.Handled);
+    }
+
+    [Fact]
+    public void NavigationKeys_AreHandled_WhenAllItemsAreNonFocusable()
+    {
+        var cb = new CommandBar();
+        cb.SecondaryCommands.Add(new CommandBarButton { Label = "A", Focusable = false });
+        var root = new TestRoot(useGlobalStyles: true, child: cb);
+        root.LayoutManager.ExecuteInitialLayoutPass();
+        cb.IsOpen = true;
+
+        var e = new KeyEventArgs { RoutedEvent = InputElement.KeyDownEvent, Key = Key.Down };
+        GetOverflowPresenter(cb).RaiseEvent(e);
+
+        Assert.True(e.Handled);
+    }
+
+    [Fact]
+    public void KeyboardOpen_FocusesFirstOverflowItem_AsFocusVisible()
+    {
+        var first = new CommandBarButton { Label = "A" };
+        var cb = new CommandBar();
+        cb.SecondaryCommands.Add(first);
+        var window = CreateWindow(cb);
+
+        Assert.True(GetOverflowButton(cb).Focus(NavigationMethod.Tab));
+
+        cb.IsOpen = true;
+        Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded, TestContext.Current.CancellationToken);
+
+        Assert.True(first.IsFocused);
+        Assert.True(first.Classes.Contains(":focus-visible"));
+    }
+
+    [Fact]
+    public void PointerOpen_AfterKeyboardFocus_DoesNotMakeFirstOverflowItemFocusVisible()
+    {
+        var first = new CommandBarButton { Label = "A" };
+        var cb = new CommandBar();
+        cb.SecondaryCommands.Add(first);
+        var window = CreateWindow(cb);
+
+        var overflowButton = GetOverflowButton(cb);
+        Assert.True(overflowButton.Focus(NavigationMethod.Tab));
+        RaisePointerPressed(overflowButton);
+
+        cb.IsOpen = true;
+        Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded, TestContext.Current.CancellationToken);
+
+        Assert.True(first.IsFocused);
+        Assert.False(first.Classes.Contains(":focus-visible"));
+    }
+
+    [Fact]
+    public void KeyboardOpen_AfterPointerFocus_MakesFirstOverflowItemFocusVisible()
+    {
+        var first = new CommandBarButton { Label = "A" };
+        var cb = new CommandBar();
+        cb.SecondaryCommands.Add(first);
+        var window = CreateWindow(cb);
+
+        var overflowButton = GetOverflowButton(cb);
+        Assert.True(overflowButton.Focus(NavigationMethod.Pointer));
+        overflowButton.RaiseEvent(new KeyEventArgs
+        {
+            RoutedEvent = InputElement.KeyDownEvent,
+            Key = Key.Space,
+        });
+
+        cb.IsOpen = true;
+        Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded, TestContext.Current.CancellationToken);
+
+        Assert.True(first.IsFocused);
+        Assert.True(first.Classes.Contains(":focus-visible"));
+    }
+
+    private static ItemsControl GetOverflowPresenter(CommandBar cb)
+    {
+        var popup = cb.GetVisualDescendants()
+            .OfType<Popup>()
+            .First(p => p.Name == "PART_OverflowPopup");
+
+        return popup.GetLogicalDescendants()
+            .OfType<ItemsControl>()
+            .First(x => x.Name == "PART_OverflowPresenter");
+    }
+
+    private static void RaiseKeyOnOverflowPresenter(CommandBar cb, Key key)
+    {
+        GetOverflowPresenter(cb).RaiseEvent(new KeyEventArgs
+        {
+            RoutedEvent = InputElement.KeyDownEvent,
+            Key = key,
+        });
+    }
+
+    private static Button GetOverflowButton(CommandBar cb)
+    {
+        return cb.GetVisualDescendants()
+            .OfType<Button>()
+            .First(x => x.Name == "PART_OverflowButton");
+    }
+
+    private static Window CreateWindow(Control content)
+    {
+        var window = new Window { Content = content };
+        window.Show();
+        window.ApplyStyling();
+        window.ApplyTemplate();
+        return window;
+    }
+
+    private static void RaisePointerPressed(Button target)
+    {
+        var pointer = new Pointer(Pointer.GetNextFreeId(), PointerType.Mouse, true);
+        target.RaiseEvent(new PointerPressedEventArgs(
+            target,
+            pointer,
+            target,
+            default,
+            timestamp: 1,
+            new PointerPointProperties(RawInputModifiers.LeftMouseButton, PointerUpdateKind.LeftButtonPressed),
+            KeyModifiers.None));
+    }
+}
+
+public class CommandBarSeparatorOverflowTests : ScopedTestBase
+{
+    private static CommandBar CreateWithWidth(double width)
+    {
+        var cb = new CommandBar();
+        cb.Measure(new Size(width, double.PositiveInfinity));
+        return cb;
+    }
+
+    [Fact]
+    public void TrailingSeparator_IsNotLastVisibleItem()
+    {
+        // [Btn, Btn, Sep, Btn] with room for 2 buttons: Sep should NOT trail.
+        var cb = CreateWithWidth(300);
+        cb.SecondaryCommands!.Add(new CommandBarButton());
+        cb.PrimaryCommands!.Add(new CommandBarButton());
+        cb.PrimaryCommands.Add(new CommandBarButton());
+        cb.PrimaryCommands.Add(new CommandBarSeparator());
+        cb.PrimaryCommands.Add(new CommandBarButton());
+        cb.IsDynamicOverflowEnabled = true;
+
+        Assert.IsNotType<CommandBarSeparator>(cb.VisiblePrimaryCommands[^1]);
+    }
+
+    [Fact]
+    public void TrailingSeparator_MovedToOverflow()
+    {
+        // [Btn, Sep, Btn, Btn] with room for 1 button: Sep after the single visible button should overflow.
+        var cb = CreateWithWidth(300);
+        cb.ItemWidthBottom = 260;
+        cb.SecondaryCommands!.Add(new CommandBarButton());
+        cb.PrimaryCommands!.Add(new CommandBarButton());
+        cb.PrimaryCommands.Add(new CommandBarSeparator());
+        cb.PrimaryCommands.Add(new CommandBarButton());
+        cb.PrimaryCommands.Add(new CommandBarButton());
+        cb.IsDynamicOverflowEnabled = true;
+
+        Assert.Equal(1, cb.VisiblePrimaryCommands.Count);
+        Assert.IsType<CommandBarButton>(cb.VisiblePrimaryCommands[0]);
+    }
+
+    [Fact]
+    public void MultipleSeparators_AllTrailingOnesStripped()
+    {
+        // [Btn, Sep, Sep, Btn] with room for 1: both trailing separators should be stripped.
+        var cb = CreateWithWidth(300);
+        cb.ItemWidthBottom = 260;
+        cb.SecondaryCommands!.Add(new CommandBarButton());
+        cb.PrimaryCommands!.Add(new CommandBarButton());
+        cb.PrimaryCommands.Add(new CommandBarSeparator());
+        cb.PrimaryCommands.Add(new CommandBarSeparator());
+        cb.PrimaryCommands.Add(new CommandBarButton());
+        cb.IsDynamicOverflowEnabled = true;
+
+        Assert.Equal(1, cb.VisiblePrimaryCommands.Count);
+        Assert.IsType<CommandBarButton>(cb.VisiblePrimaryCommands[0]);
+    }
+
+    [Fact]
+    public void MidSeparator_StaysVisible_WhenButtonsOnBothSides()
+    {
+        // [Btn, Sep, Btn] with room for all: separator stays.
+        var cb = CreateWithWidth(300);
+        cb.PrimaryCommands!.Add(new CommandBarButton());
+        cb.PrimaryCommands.Add(new CommandBarSeparator());
+        cb.PrimaryCommands.Add(new CommandBarButton());
+        cb.IsDynamicOverflowEnabled = true;
+
+        Assert.Equal(3, cb.VisiblePrimaryCommands.Count);
+        Assert.IsType<CommandBarSeparator>(cb.VisiblePrimaryCommands[1]);
+    }
+
+    [Fact]
+    public void AllButtonsOverflow_SeparatorsAlsoOverflow()
+    {
+        // [Sep, Btn, Btn] with room for 0: everything overflows.
+        var cb = CreateWithWidth(50);
+        cb.SecondaryCommands!.Add(new CommandBarButton());
+        cb.PrimaryCommands!.Add(new CommandBarSeparator());
+        cb.PrimaryCommands.Add(new CommandBarButton());
+        cb.PrimaryCommands.Add(new CommandBarButton());
+        cb.IsDynamicOverflowEnabled = true;
+
+        Assert.Empty(cb.VisiblePrimaryCommands);
+    }
+
+    [Fact]
+    public void LeadingSeparator_IsStrippedFromVisible()
+    {
+        // [Sep, Btn, Btn, Btn] with room for 2: leading Sep should be stripped.
+        var cb = CreateWithWidth(300);
+        cb.SecondaryCommands!.Add(new CommandBarButton());
+        cb.PrimaryCommands!.Add(new CommandBarSeparator());
+        cb.PrimaryCommands.Add(new CommandBarButton());
+        cb.PrimaryCommands.Add(new CommandBarButton());
+        cb.PrimaryCommands.Add(new CommandBarButton());
+        cb.IsDynamicOverflowEnabled = true;
+
+        Assert.IsNotType<CommandBarSeparator>(cb.VisiblePrimaryCommands[0]);
+    }
+
+    [Fact]
+    public void ConsecutiveSeparators_CollapsedToOne()
+    {
+        // [Btn, Sep, Sep, Btn] all fit: only one separator should remain.
+        var cb = CreateWithWidth(300);
+        cb.PrimaryCommands!.Add(new CommandBarButton());
+        cb.PrimaryCommands.Add(new CommandBarSeparator());
+        cb.PrimaryCommands.Add(new CommandBarSeparator());
+        cb.PrimaryCommands.Add(new CommandBarButton());
+        cb.IsDynamicOverflowEnabled = true;
+
+        int sepCount = CountSeparators(cb.VisiblePrimaryCommands);
+        Assert.Equal(1, sepCount);
+    }
+
+    [Fact]
+    public void OrphanedMidSeparator_RemovedWhenNeighborOverflows()
+    {
+        // [Btn1, Sep, Btn2, Sep, Btn3] with room for 2: Btn3 overflows,
+        // second Sep becomes trailing and is removed. First Sep stays.
+        var cb = CreateWithWidth(300);
+        cb.ItemWidthBottom = 100;
+        cb.SecondaryCommands!.Add(new CommandBarButton());
+        cb.PrimaryCommands!.Add(new CommandBarButton());
+        cb.PrimaryCommands.Add(new CommandBarSeparator());
+        cb.PrimaryCommands.Add(new CommandBarButton());
+        cb.PrimaryCommands.Add(new CommandBarSeparator());
+        cb.PrimaryCommands.Add(new CommandBarButton());
+        cb.IsDynamicOverflowEnabled = true;
+
+        Assert.IsNotType<CommandBarSeparator>(cb.VisiblePrimaryCommands[^1]);
+        Assert.Equal(1, CountSeparators(cb.VisiblePrimaryCommands));
+    }
+
+    [Fact]
+    public void SeparatorBetweenOverflowedButtons_IsRemoved()
+    {
+        // [Btn1, Btn2, Sep, Btn3, Btn4] with room for 2: Btn3 and Btn4 overflow,
+        // Sep has no non-separator after it in visible set, so it is removed.
+        var cb = CreateWithWidth(300);
+        cb.ItemWidthBottom = 100;
+        cb.SecondaryCommands!.Add(new CommandBarButton());
+        cb.PrimaryCommands!.Add(new CommandBarButton());
+        cb.PrimaryCommands.Add(new CommandBarButton());
+        cb.PrimaryCommands.Add(new CommandBarSeparator());
+        cb.PrimaryCommands.Add(new CommandBarButton());
+        cb.PrimaryCommands.Add(new CommandBarButton());
+        cb.IsDynamicOverflowEnabled = true;
+
+        Assert.Equal(0, CountSeparators(cb.VisiblePrimaryCommands));
+    }
+
+    [Fact]
+    public void MultipleSeparatorGroups_OnlyValidOnesRemain()
+    {
+        // [Btn, Sep, Btn, Sep, Btn, Sep, Btn] with room for 3:
+        // last Btn overflows, last Sep becomes trailing, the rest stay.
+        var cb = CreateWithWidth(300);
+        cb.SecondaryCommands!.Add(new CommandBarButton());
+        cb.PrimaryCommands!.Add(new CommandBarButton());
+        cb.PrimaryCommands.Add(new CommandBarSeparator());
+        cb.PrimaryCommands.Add(new CommandBarButton());
+        cb.PrimaryCommands.Add(new CommandBarSeparator());
+        cb.PrimaryCommands.Add(new CommandBarButton());
+        cb.PrimaryCommands.Add(new CommandBarSeparator());
+        cb.PrimaryCommands.Add(new CommandBarButton());
+        cb.IsDynamicOverflowEnabled = true;
+
+        Assert.IsNotType<CommandBarSeparator>(cb.VisiblePrimaryCommands[^1]);
+        Assert.IsNotType<CommandBarSeparator>(cb.VisiblePrimaryCommands[0]);
+    }
+
+    [Fact]
+    public void OnlySeparators_AllOverflow()
+    {
+        // [Sep, Sep, Sep] with no buttons: all should overflow.
+        var cb = CreateWithWidth(300);
+        cb.SecondaryCommands!.Add(new CommandBarButton());
+        cb.PrimaryCommands!.Add(new CommandBarSeparator());
+        cb.PrimaryCommands.Add(new CommandBarSeparator());
+        cb.PrimaryCommands.Add(new CommandBarSeparator());
+        cb.IsDynamicOverflowEnabled = true;
+
+        Assert.Empty(cb.VisiblePrimaryCommands);
+    }
+
+    [Fact]
+    public void PrimarySeparator_IsRemovedInsteadOfBecomingFirstOverflowItem()
+    {
+        var cb = CreateWithWidth(300);
+        cb.ItemWidthBottom = 260;
+
+        var leadingSeparator = new CommandBarSeparator();
+        var firstButton = new CommandBarButton();
+        var overflowedButton = new CommandBarButton();
+
+        cb.PrimaryCommands!.Add(leadingSeparator);
+        cb.PrimaryCommands.Add(firstButton);
+        cb.PrimaryCommands.Add(overflowedButton);
+        cb.IsDynamicOverflowEnabled = true;
+
+        Assert.Single(cb.OverflowItems);
+        Assert.Same(overflowedButton, cb.OverflowItems[0]);
+        Assert.DoesNotContain(leadingSeparator, cb.OverflowItems);
+    }
+
+    [Fact]
+    public void OverflowedPrimaryCommands_PrecedeSecondaryCommands_WithSyntheticSeparator()
+    {
+        var cb = CreateWithWidth(300);
+        cb.ItemWidthBottom = 260;
+
+        var visiblePrimary = new CommandBarButton();
+        var originalPrimarySeparator = new CommandBarSeparator();
+        var overflowedPrimaryOne = new CommandBarButton();
+        var overflowedPrimaryTwo = new CommandBarButton();
+        var secondary = new CommandBarButton();
+
+        cb.PrimaryCommands!.Add(visiblePrimary);
+        cb.PrimaryCommands.Add(originalPrimarySeparator);
+        cb.PrimaryCommands.Add(overflowedPrimaryOne);
+        cb.PrimaryCommands.Add(overflowedPrimaryTwo);
+        cb.SecondaryCommands!.Add(secondary);
+        cb.IsDynamicOverflowEnabled = true;
+
+        Assert.Equal(4, cb.OverflowItems.Count);
+        Assert.Same(overflowedPrimaryOne, cb.OverflowItems[0]);
+        Assert.Same(overflowedPrimaryTwo, cb.OverflowItems[1]);
+        Assert.IsType<CommandBarSeparator>(cb.OverflowItems[2]);
+        Assert.NotSame(originalPrimarySeparator, cb.OverflowItems[2]);
+        Assert.Same(secondary, cb.OverflowItems[3]);
+        Assert.DoesNotContain(originalPrimarySeparator, cb.OverflowItems);
+    }
+
+    [Fact]
+    public void HiddenSecondaryCommands_DoNotGetSyntheticOverflowSeparator()
+    {
+        var cb = CreateWithWidth(300);
+        cb.ItemWidthBottom = 260;
+
+        var visiblePrimary = new CommandBarButton();
+        var overflowedPrimary = new CommandBarButton();
+        var hiddenSecondary = new CommandBarButton { IsVisible = false };
+
+        cb.PrimaryCommands!.Add(visiblePrimary);
+        cb.PrimaryCommands.Add(overflowedPrimary);
+        cb.SecondaryCommands!.Add(hiddenSecondary);
+        cb.IsDynamicOverflowEnabled = true;
+
+        Assert.Equal(2, cb.OverflowItems.Count);
+        Assert.Same(overflowedPrimary, cb.OverflowItems[0]);
+        Assert.Same(hiddenSecondary, cb.OverflowItems[1]);
+        Assert.DoesNotContain(cb.OverflowItems, x => x is CommandBarSeparator);
+    }
+
+    [Fact]
+    public void TogglingSecondaryVisibility_RebuildsSyntheticOverflowSeparator()
+    {
+        var cb = CreateWithWidth(300);
+        cb.ItemWidthBottom = 260;
+
+        var visiblePrimary = new CommandBarButton();
+        var overflowedPrimary = new CommandBarButton();
+        var secondary = new CommandBarButton();
+
+        cb.PrimaryCommands!.Add(visiblePrimary);
+        cb.PrimaryCommands.Add(overflowedPrimary);
+        cb.SecondaryCommands!.Add(secondary);
+        cb.IsDynamicOverflowEnabled = true;
+
+        Assert.Equal(3, cb.OverflowItems.Count);
+        Assert.Same(overflowedPrimary, cb.OverflowItems[0]);
+        Assert.IsType<CommandBarSeparator>(cb.OverflowItems[1]);
+        Assert.Same(secondary, cb.OverflowItems[2]);
+
+        secondary.IsVisible = false;
+
+        Assert.Equal(2, cb.OverflowItems.Count);
+        Assert.Same(overflowedPrimary, cb.OverflowItems[0]);
+        Assert.Same(secondary, cb.OverflowItems[1]);
+        Assert.DoesNotContain(cb.OverflowItems, x => x is CommandBarSeparator);
+
+        secondary.IsVisible = true;
+
+        Assert.Equal(3, cb.OverflowItems.Count);
+        Assert.Same(overflowedPrimary, cb.OverflowItems[0]);
+        Assert.IsType<CommandBarSeparator>(cb.OverflowItems[1]);
+        Assert.Same(secondary, cb.OverflowItems[2]);
+    }
+
+    private static int CountSeparators(IReadOnlyList<ICommandBarElement> items)
+    {
+        int count = 0;
+        for (var i = 0; i < items.Count; i++)
+        {
+            if (items[i] is CommandBarSeparator)
+                count++;
+        }
+        return count;
+    }
+}
+
 file sealed class DelegateCommand : System.Windows.Input.ICommand
 {
     private readonly System.Action<object?> _execute;
diff --git a/tests/Avalonia.Controls.UnitTests/DesignTests.cs b/tests/Avalonia.Controls.UnitTests/DesignTests.cs
index 6845e4d369..b874604e96 100644
--- a/tests/Avalonia.Controls.UnitTests/DesignTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/DesignTests.cs
@@ -79,11 +79,14 @@ public class DesignTests : ScopedTestBase
     }
 
     [Fact]
-    public void Should_Apply_Design_Mode_Properties()
+    public void Should_Apply_Design_Mode_Properties_From_Control_To_Window()
     {
         using var _ = UnitTestApplication.Start(TestServices.StyledWindow);
 
+        // Use-case: User previews a control, which is wrapped by the window.
+        var window = new Window();
         var control = new ContentControl();
+        window.Content = control;
 
         Design.SetWidth(control, 200);
         Design.SetHeight(control, 150);
@@ -94,12 +97,12 @@ public class DesignTests : ScopedTestBase
                 Setters = { new Setter(TemplatedControl.BackgroundProperty, Brushes.Yellow) }
             });
 
-        Design.ApplyDesignModeProperties(control, control);
+        Design.ApplyDesignModeProperties(window, control);
 
-        Assert.Equal(200, control.Width);
-        Assert.Equal(150, control.Height);
-        Assert.Equal("TestDataContext", control.DataContext);
-        Assert.Contains(control.Styles,
+        Assert.Equal(200, window.Width);
+        Assert.Equal(150, window.Height);
+        Assert.Equal("TestDataContext", window.DataContext);
+        Assert.Contains(window.Styles,
             s => ((Style)s).Setters.OfType<Setter>().First().Property == TemplatedControl.BackgroundProperty);
     }
 
diff --git a/tests/Avalonia.Controls.UnitTests/DrawerPageTests.cs b/tests/Avalonia.Controls.UnitTests/DrawerPageTests.cs
index 87fb421a72..e506c0bbc9 100644
--- a/tests/Avalonia.Controls.UnitTests/DrawerPageTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/DrawerPageTests.cs
@@ -8,6 +8,7 @@ using Avalonia.Interactivity;
 using Avalonia.Layout;
 using Avalonia.LogicalTree;
 using Avalonia.Media;
+using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Templates;
 using Avalonia.Threading;
 using Avalonia.UnitTests;
@@ -1183,6 +1184,192 @@ public class DrawerPageTests
         }
     }
 
+    public class HeaderFooterTemplateTests : ScopedTestBase
+    {
+        // Wires PART_DrawerHeader and PART_DrawerFooter to the drawer's properties.
+        // Other parts omitted; OnApplyTemplate uses Find (nullable) so they are safe to skip.
+        private static IControlTemplate MinimalPaneTemplate() =>
+            new FuncControlTemplate<DrawerPage>((dp, scope) =>
+            {
+                var header = new ContentPresenter { Name = "PART_DrawerHeader" }.RegisterInNameScope(scope);
+                header.Bind(ContentPresenter.ContentProperty, dp.GetObservable(DrawerPage.DrawerHeaderProperty));
+                header.Bind(ContentPresenter.ContentTemplateProperty, dp.GetObservable(DrawerPage.DrawerHeaderTemplateProperty));
+
+                var footer = new ContentPresenter { Name = "PART_DrawerFooter" }.RegisterInNameScope(scope);
+                footer.Bind(ContentPresenter.ContentProperty, dp.GetObservable(DrawerPage.DrawerFooterProperty));
+                footer.Bind(ContentPresenter.ContentTemplateProperty, dp.GetObservable(DrawerPage.DrawerFooterTemplateProperty));
+
+                return new StackPanel { Children = { header, footer } };
+            });
+
+        private static (DrawerPage dp, ContentPresenter header, ContentPresenter footer, TestRoot root) Create(
+            object? drawerHeader = null,
+            IDataTemplate? headerTemplate = null,
+            object? drawerFooter = null,
+            IDataTemplate? footerTemplate = null)
+        {
+            var dp = new DrawerPage
+            {
+                Template = MinimalPaneTemplate(),
+                DrawerHeader = drawerHeader,
+                DrawerHeaderTemplate = headerTemplate,
+                DrawerFooter = drawerFooter,
+                DrawerFooterTemplate = footerTemplate,
+            };
+            var root = new TestRoot { Child = dp };
+            dp.ApplyTemplate();
+
+            var header = dp.GetVisualDescendants().OfType<ContentPresenter>().First(x => x.Name == "PART_DrawerHeader");
+            var footer = dp.GetVisualDescendants().OfType<ContentPresenter>().First(x => x.Name == "PART_DrawerFooter");
+
+            return (dp, header, footer, root);
+        }
+
+        [Fact]
+        public void DrawerHeaderTemplate_IsForwardedToContentPresenter()
+        {
+            var template = new FuncDataTemplate<string>((_, _) => new TextBlock());
+            var (_, header, _, _) = Create(drawerHeader: "App", headerTemplate: template);
+
+            Assert.Same(template, header.ContentTemplate);
+        }
+
+        [Fact]
+        public void DrawerFooterTemplate_IsForwardedToContentPresenter()
+        {
+            var template = new FuncDataTemplate<string>((_, _) => new TextBlock());
+            var (_, _, footer, _) = Create(drawerFooter: "v1.0", footerTemplate: template);
+
+            Assert.Same(template, footer.ContentTemplate);
+        }
+
+        [Fact]
+        public void DrawerHeaderTemplate_RendersControlProducedByFactory()
+        {
+            var (_, header, _, _) = Create(
+                drawerHeader: "App",
+                headerTemplate: new FuncDataTemplate<string>((_, _) => new Canvas()));
+
+            header.UpdateChild();
+
+            Assert.IsType<Canvas>(header.Child);
+        }
+
+        [Fact]
+        public void DrawerFooterTemplate_RendersControlProducedByFactory()
+        {
+            var (_, _, footer, _) = Create(
+                drawerFooter: "v1.0",
+                footerTemplate: new FuncDataTemplate<string>((_, _) => new Canvas()));
+
+            footer.UpdateChild();
+
+            Assert.IsType<Canvas>(footer.Child);
+        }
+
+        [Fact]
+        public void DrawerHeaderTemplate_ReceivesDrawerHeaderAsData()
+        {
+            object? receivedData = null;
+            var (_, header, _, _) = Create(
+                drawerHeader: "MyTitle",
+                headerTemplate: new FuncDataTemplate<string>((data, _) =>
+                {
+                    receivedData = data;
+                    return new TextBlock { Text = data };
+                }));
+
+            header.UpdateChild();
+
+            Assert.Equal("MyTitle", receivedData);
+        }
+
+        [Fact]
+        public void DrawerFooterTemplate_ReceivesDrawerFooterAsData()
+        {
+            object? receivedData = null;
+            var (_, _, footer, _) = Create(
+                drawerFooter: "v2.0",
+                footerTemplate: new FuncDataTemplate<string>((data, _) =>
+                {
+                    receivedData = data;
+                    return new TextBlock { Text = data };
+                }));
+
+            footer.UpdateChild();
+
+            Assert.Equal("v2.0", receivedData);
+        }
+
+        [Fact]
+        public void DrawerHeaderTemplate_SwapTemplate_UpdatesContentPresenter()
+        {
+            var second = new FuncDataTemplate<string>((_, _) => new Border());
+            var (dp, header, _, _) = Create(
+                drawerHeader: "App",
+                headerTemplate: new FuncDataTemplate<string>((_, _) => new Canvas()));
+
+            header.UpdateChild();
+            Assert.IsType<Canvas>(header.Child);
+
+            dp.DrawerHeaderTemplate = second;
+            header.UpdateChild();
+
+            Assert.IsType<Border>(header.Child);
+        }
+
+        [Fact]
+        public void DrawerFooterTemplate_SwapTemplate_UpdatesContentPresenter()
+        {
+            var second = new FuncDataTemplate<string>((_, _) => new Border());
+            var (dp, _, footer, _) = Create(
+                drawerFooter: "v1.0",
+                footerTemplate: new FuncDataTemplate<string>((_, _) => new Canvas()));
+
+            footer.UpdateChild();
+            Assert.IsType<Canvas>(footer.Child);
+
+            dp.DrawerFooterTemplate = second;
+            footer.UpdateChild();
+
+            Assert.IsType<Border>(footer.Child);
+        }
+
+        [Fact]
+        public void DrawerHeaderTemplate_ClearingTemplate_FallsBackToDirectContent()
+        {
+            var directControl = new TextBlock { Text = "Direct" };
+            var (dp, header, _, _) = Create(
+                drawerHeader: directControl,
+                headerTemplate: new FuncDataTemplate<object>((_, _) => new Canvas()));
+
+            header.UpdateChild();
+            Assert.IsType<Canvas>(header.Child);
+
+            dp.DrawerHeaderTemplate = null;
+            header.UpdateChild();
+
+            Assert.Same(directControl, header.Child);
+        }
+
+        [Fact]
+        public void DrawerFooterTemplate_ClearingTemplate_FallsBackToDirectContent()
+        {
+            var directControl = new TextBlock { Text = "Direct" };
+            var (dp, _, footer, _) = Create(
+                drawerFooter: directControl,
+                footerTemplate: new FuncDataTemplate<object>((_, _) => new Canvas()));
+
+            footer.UpdateChild();
+            Assert.IsType<Canvas>(footer.Child);
+
+            dp.DrawerFooterTemplate = null;
+            footer.UpdateChild();
+
+            Assert.Same(directControl, footer.Child);
+        }
+    }
+
     public class SwipeGestureTests : ScopedTestBase
     {
         [Fact]
@@ -1321,7 +1508,7 @@ public class DrawerPageTests
             Assert.True(nav.IsBackButtonEffectivelyVisible);
 
             root.Child = null;
-            Assert.False(nav.IsBackButtonEffectivelyVisible ?? false);
+            Assert.False(nav.IsBackButtonEffectivelyVisible);
 
             root.Child = dp;
             Assert.True(nav.IsBackButtonEffectivelyVisible);
diff --git a/tests/Avalonia.Controls.UnitTests/NavigationPageTests.cs b/tests/Avalonia.Controls.UnitTests/NavigationPageTests.cs
index e61b449a91..78fe1a69d5 100644
--- a/tests/Avalonia.Controls.UnitTests/NavigationPageTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/NavigationPageTests.cs
@@ -429,7 +429,7 @@ public class NavigationPageTests
         {
             var nav = new NavigationPage();
             await nav.PushAsync(new ContentPage());
-            Assert.Equal(false, nav.IsBackButtonEffectivelyVisible);
+            Assert.False(nav.IsBackButtonEffectivelyVisible);
         }
 
         [Fact]
@@ -438,7 +438,7 @@ public class NavigationPageTests
             var nav = new NavigationPage();
             await nav.PushAsync(new ContentPage());
             await nav.PushAsync(new ContentPage());
-            Assert.Equal(true, nav.IsBackButtonEffectivelyVisible);
+            Assert.True(nav.IsBackButtonEffectivelyVisible);
         }
 
         [Fact]
@@ -447,7 +447,7 @@ public class NavigationPageTests
             var nav = new NavigationPage { IsBackButtonVisible = false };
             await nav.PushAsync(new ContentPage());
             await nav.PushAsync(new ContentPage());
-            Assert.Equal(false, nav.IsBackButtonEffectivelyVisible);
+            Assert.False(nav.IsBackButtonEffectivelyVisible);
         }
 
         [Fact]
@@ -458,7 +458,7 @@ public class NavigationPageTests
             var top = new ContentPage();
             NavigationPage.SetHasBackButton(top, false);
             await nav.PushAsync(top);
-            Assert.Equal(false, nav.IsBackButtonEffectivelyVisible);
+            Assert.False(nav.IsBackButtonEffectivelyVisible);
         }
 
         [Fact]
@@ -468,7 +468,25 @@ public class NavigationPageTests
             await nav.PushAsync(new ContentPage());
             await nav.PushAsync(new ContentPage());
             nav.IsBackButtonVisible = true;
-            Assert.Equal(true, nav.IsBackButtonEffectivelyVisible);
+            Assert.True(nav.IsBackButtonEffectivelyVisible);
+        }
+
+        [Fact]
+        public async Task BackButtonVisible_UpdatesWhenCurrentPageHasBackButtonChanges()
+        {
+            var nav = new NavigationPage();
+            await nav.PushAsync(new ContentPage());
+
+            var top = new ContentPage();
+            await nav.PushAsync(top);
+
+            Assert.True(nav.IsBackButtonEffectivelyVisible);
+
+            NavigationPage.SetHasBackButton(top, false);
+            Assert.False(nav.IsBackButtonEffectivelyVisible);
+
+            NavigationPage.SetHasBackButton(top, true);
+            Assert.True(nav.IsBackButtonEffectivelyVisible);
         }
     }
 
diff --git a/tests/Avalonia.Controls.UnitTests/PipsPagerTests.cs b/tests/Avalonia.Controls.UnitTests/PipsPagerTests.cs
index ffc0469ce3..7445caeb3a 100644
--- a/tests/Avalonia.Controls.UnitTests/PipsPagerTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/PipsPagerTests.cs
@@ -5,6 +5,8 @@ using Avalonia.Interactivity;
 using Avalonia.Layout;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
+using Avalonia.Styling;
+using Avalonia.Themes.Simple;
 using System.Linq;
 using Xunit;
 
@@ -201,6 +203,44 @@ namespace Avalonia.Controls.UnitTests
             Assert.True(target.IsNextButtonVisible);
         }
 
+        [Fact]
+        public void SimpleTheme_Should_Forward_Custom_Button_Themes()
+        {
+            using var unittestApplication = UnitTestApplication.Start(TestServices.StyledWindow);
+
+            var previousTheme = new ControlTheme(typeof(Button));
+            var nextTheme = new ControlTheme(typeof(Button));
+            var simpleTheme = new SimpleTheme();
+
+            var target = new PipsPager
+            {
+                NumberOfPages = 5,
+                PreviousButtonTheme = previousTheme,
+                NextButtonTheme = nextTheme
+            };
+
+            var root = new TestRoot
+            {
+                Child = target,
+                Styles =
+                {
+                    simpleTheme
+                }
+            };
+
+            Assert.True(simpleTheme.TryGetResource(typeof(PipsPager), ThemeVariant.Default, out var theme));
+            target.Theme = Assert.IsType<ControlTheme>(theme);
+
+            target.ApplyTemplate();
+            root.LayoutManager.ExecuteInitialLayoutPass();
+
+            var previousButton = target.GetVisualDescendants().OfType<Button>().First(b => b.Name == "PART_PreviousButton");
+            var nextButton = target.GetVisualDescendants().OfType<Button>().First(b => b.Name == "PART_NextButton");
+
+            Assert.Same(previousTheme, previousButton.Theme);
+            Assert.Same(nextTheme, nextButton.Theme);
+        }
+
         [Fact]
         public void Rapid_Page_Changes_Should_Maintain_Integrity()
         {
diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/TextPresenter_Tests.cs b/tests/Avalonia.Controls.UnitTests/Presenters/TextPresenter_Tests.cs
index f911e0cf2f..db2b2abfed 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/TextPresenter_Tests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/TextPresenter_Tests.cs
@@ -75,5 +75,30 @@ namespace Avalonia.Controls.UnitTests.Presenters
                 Assert.Equal(fontStretch, presenter.TextLayout.TextLines[0].TextRuns[0].Properties!.Typeface.Stretch);
             }
         }
+
+        [Fact]
+        public void Measure_And_Arrange_Should_Use_WidthIncludingTrailingWhitespace_For_Bounds()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var presenter = new TextPresenter
+                {
+                    Text = "fy",
+                    FontStyle = FontStyle.Italic,
+                    FontSize = 48,
+                    UseLayoutRounding = false
+                };
+
+                presenter.Measure(Size.Infinity);
+
+                var expectedSize = new Size(presenter.TextLayout.WidthIncludingTrailingWhitespace, presenter.TextLayout.Height);
+
+                Assert.Equal(expectedSize, presenter.DesiredSize);
+
+                presenter.Arrange(new Rect(default, presenter.DesiredSize));
+
+                Assert.Equal(new Rect(default, expectedSize), presenter.Bounds);
+            }
+        }
     }
 }
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/VisualLayerManagerTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/VisualLayerManagerTests.cs
index 70c7d946f9..6c195f4a3b 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/VisualLayerManagerTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/VisualLayerManagerTests.cs
@@ -33,5 +33,83 @@ namespace Avalonia.Controls.UnitTests.Primitives
             Assert.NotNull(mainAdornerLayer);
             Assert.NotSame(overlayAdornerLayer, mainAdornerLayer);
         }
+        
+        [Fact]
+        public void GetAdornerLayer_Returns_Same_AdornerLayer_For_VisualLayerManager()
+        {
+            var vlm = new VisualLayerManager();
+            var root = new TestRoot { Child = vlm };
+
+            root.Measure(new Size(100, 100));
+            root.Arrange(new Rect(0, 0, 100, 100));
+
+            var adornerLayer = vlm.AdornerLayer;
+            Assert.NotNull(adornerLayer);
+            
+            // The adorner layer for a control inside the OverlayLayer
+            // should be the dedicated one, not the main VLM adorner layer.
+            var target = AdornerLayer.GetAdornerLayer(vlm);
+            Assert.NotNull(target);
+            Assert.Same(adornerLayer, target);
+        }
+        
+        [Fact]
+        public void GetAdornerLayer_Returns_Same_AdornerLayer_For_Child()
+        {
+            var button = new Button();
+            var vlm = new VisualLayerManager() { Child = button };
+            var root = new TestRoot { Child = vlm };
+
+            root.Measure(new Size(100, 100));
+            root.Arrange(new Rect(0, 0, 100, 100));
+
+            var adornerLayer = vlm.AdornerLayer;
+            Assert.NotNull(adornerLayer);
+            
+            // The adorner layer for a control inside the OverlayLayer
+            // should be the dedicated one, not the main VLM adorner layer.
+            var target = AdornerLayer.GetAdornerLayer(button);
+            Assert.NotNull(target);
+            Assert.Same(adornerLayer, target);
+        }
+        
+        [Fact]
+        public void GetOverlayLayer_Returns_Same_OverlayLayer_For_VisualLayerManager()
+        {
+            var vlm = new VisualLayerManager() { EnableOverlayLayer = true };
+            var root = new TestRoot { Child = vlm };
+
+            root.Measure(new Size(100, 100));
+            root.Arrange(new Rect(0, 0, 100, 100));
+
+            var overlayLayer = vlm.OverlayLayer;
+            Assert.NotNull(overlayLayer);
+            
+            // The adorner layer for a control inside the OverlayLayer
+            // should be the dedicated one, not the main VLM adorner layer.
+            var target = OverlayLayer.GetOverlayLayer(vlm);
+            Assert.NotNull(target);
+            Assert.Same(overlayLayer, target);
+        }
+        
+        [Fact]
+        public void GetOverlayLayer_Returns_Same_OverlayLayer_For_Child()
+        {
+            var button = new Button();
+            var vlm = new VisualLayerManager() { EnableOverlayLayer = true, Child = button };
+            var root = new TestRoot { Child = vlm };
+
+            root.Measure(new Size(100, 100));
+            root.Arrange(new Rect(0, 0, 100, 100));
+
+            var overlayLayer = vlm.OverlayLayer;
+            Assert.NotNull(overlayLayer);
+            
+            // The adorner layer for a control inside the OverlayLayer
+            // should be the dedicated one, not the main VLM adorner layer.
+            var target = OverlayLayer.GetOverlayLayer(button);
+            Assert.NotNull(target);
+            Assert.Same(overlayLayer, target);
+        }
     }
 }
diff --git a/tests/Avalonia.Controls.UnitTests/TextBlockTests.cs b/tests/Avalonia.Controls.UnitTests/TextBlockTests.cs
index 2df686bbe8..9a3b0e205d 100644
--- a/tests/Avalonia.Controls.UnitTests/TextBlockTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TextBlockTests.cs
@@ -561,6 +561,33 @@ namespace Avalonia.Controls.UnitTests
             Assert.Equal(new Rect(0, 0, 32.45454545454545, 19.022727272727273), target.Bounds);
         }
 
+        [Fact]
+        public void Measure_And_Arrange_Should_Use_WidthIncludingTrailingWhitespace_For_Bounds()
+        {
+            using var app = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
+
+            var target = new TextBlock
+            {
+                Text = "fy",
+                FontStyle = FontStyle.Italic,
+                FontSize = 48,
+                UseLayoutRounding = false,
+                Padding = new Thickness(3, 2, 5, 4)
+            };
+
+            target.Measure(Size.Infinity);
+
+            var expectedSize =
+                new Size(target.TextLayout.WidthIncludingTrailingWhitespace, target.TextLayout.Height)
+                    .Inflate(target.Padding);
+
+            Assert.Equal(expectedSize, target.DesiredSize);
+
+            target.Arrange(new Rect(default, target.DesiredSize));
+
+            Assert.Equal(new Rect(default, expectedSize), target.Bounds);
+        }
+
         private class TestTextBlock : TextBlock
         {
             public Size Constraint => _constraint;
diff --git a/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs b/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
index fa578a7afe..9d7b8a6118 100644
--- a/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
@@ -1537,11 +1537,11 @@ namespace Avalonia.Controls.UnitTests
         }
 
         [Theory]
-        [InlineData(2,4)]
-        [InlineData(0,4)]
-        [InlineData(2,6)]
-        [InlineData(0,6)]
-        [InlineData(3,4)]
+        [InlineData(2, 4)]
+        [InlineData(0, 4)]
+        [InlineData(2, 6)]
+        [InlineData(0, 6)]
+        [InlineData(3, 4)]
         public void When_Selection_From_Left_To_Right_Pressing_Right_Should_Remove_Selection_Moving_Caret_To_End_Of_Previous_Selection(int selectionStart, int selectionEnd)
         {
             using (UnitTestApplication.Start(Services))
@@ -1566,11 +1566,11 @@ namespace Avalonia.Controls.UnitTests
         }
 
         [Theory]
-        [InlineData(2,4)]
-        [InlineData(0,4)]
-        [InlineData(2,6)]
-        [InlineData(0,6)]
-        [InlineData(3,4)]
+        [InlineData(2, 4)]
+        [InlineData(0, 4)]
+        [InlineData(2, 6)]
+        [InlineData(0, 6)]
+        [InlineData(3, 4)]
         public void When_Selection_From_Left_To_Right_Pressing_Left_Should_Remove_Selection_Moving_Caret_To_Start_Of_Previous_Selection(int selectionStart, int selectionEnd)
         {
             using (UnitTestApplication.Start(Services))
@@ -1595,11 +1595,11 @@ namespace Avalonia.Controls.UnitTests
         }
 
         [Theory]
-        [InlineData(4,2)]
-        [InlineData(4,0)]
-        [InlineData(6,2)]
-        [InlineData(6,0)]
-        [InlineData(4,3)]
+        [InlineData(4, 2)]
+        [InlineData(4, 0)]
+        [InlineData(6, 2)]
+        [InlineData(6, 0)]
+        [InlineData(4, 3)]
         public void When_Selection_From_Right_To_Left_Pressing_Right_Should_Remove_Selection_Moving_Caret_To_Start_Of_Previous_Selection(int selectionStart, int selectionEnd)
         {
             using (UnitTestApplication.Start(Services))
@@ -1624,11 +1624,11 @@ namespace Avalonia.Controls.UnitTests
         }
 
         [Theory]
-        [InlineData(4,2)]
-        [InlineData(4,0)]
-        [InlineData(6,2)]
-        [InlineData(6,0)]
-        [InlineData(4,3)]
+        [InlineData(4, 2)]
+        [InlineData(4, 0)]
+        [InlineData(6, 2)]
+        [InlineData(6, 0)]
+        [InlineData(4, 3)]
         public void When_Selection_From_Right_To_Left_Pressing_Left_Should_Remove_Selection_Moving_Caret_To_End_Of_Previous_Selection(int selectionStart, int selectionEnd)
         {
             using (UnitTestApplication.Start(Services))
@@ -1707,11 +1707,11 @@ namespace Avalonia.Controls.UnitTests
         }
 
         [Theory]
-        [InlineData(2,4)]
-        [InlineData(0,4)]
-        [InlineData(2,6)]
-        [InlineData(0,6)]
-        [InlineData(3,4)]
+        [InlineData(2, 4)]
+        [InlineData(0, 4)]
+        [InlineData(2, 6)]
+        [InlineData(0, 6)]
+        [InlineData(3, 4)]
         public void When_Selection_From_Left_To_Right_Pressing_Up_Should_Remove_Selection_Moving_Caret_To_Start_Of_Previous_Selection(int selectionStart, int selectionEnd)
         {
             using (UnitTestApplication.Start(Services))
@@ -1736,11 +1736,11 @@ namespace Avalonia.Controls.UnitTests
         }
 
         [Theory]
-        [InlineData(4,2)]
-        [InlineData(4,0)]
-        [InlineData(6,2)]
-        [InlineData(6,0)]
-        [InlineData(4,3)]
+        [InlineData(4, 2)]
+        [InlineData(4, 0)]
+        [InlineData(6, 2)]
+        [InlineData(6, 0)]
+        [InlineData(4, 3)]
         public void When_Selection_From_Right_To_Left_Pressing_Up_Should_Remove_Selection_Moving_Caret_To_End_Of_Previous_Selection(int selectionStart, int selectionEnd)
         {
             using (UnitTestApplication.Start(Services))
@@ -1792,11 +1792,11 @@ namespace Avalonia.Controls.UnitTests
         }
 
         [Theory]
-        [InlineData(2,4)]
-        [InlineData(0,4)]
-        [InlineData(2,6)]
-        [InlineData(0,6)]
-        [InlineData(3,4)]
+        [InlineData(2, 4)]
+        [InlineData(0, 4)]
+        [InlineData(2, 6)]
+        [InlineData(0, 6)]
+        [InlineData(3, 4)]
         public void When_Selection_From_Left_To_Right_Pressing_Down_Should_Remove_Selection_Moving_Caret_To_End_Of_Previous_Selection(int selectionStart, int selectionEnd)
         {
             using (UnitTestApplication.Start(Services))
@@ -1821,11 +1821,11 @@ namespace Avalonia.Controls.UnitTests
         }
 
         [Theory]
-        [InlineData(4,2)]
-        [InlineData(4,0)]
-        [InlineData(6,2)]
-        [InlineData(6,0)]
-        [InlineData(4,3)]
+        [InlineData(4, 2)]
+        [InlineData(4, 0)]
+        [InlineData(6, 2)]
+        [InlineData(6, 0)]
+        [InlineData(4, 3)]
         public void When_Selection_From_Right_To_Left_Pressing_Down_Should_Remove_Selection_Moving_Caret_To_Start_Of_Previous_Selection(int selectionStart, int selectionEnd)
         {
             using (UnitTestApplication.Start(Services))
diff --git a/tests/Avalonia.Controls.UnitTests/TextBoxTests_Input.cs b/tests/Avalonia.Controls.UnitTests/TextBoxTests_Input.cs
new file mode 100644
index 0000000000..e19bc5ca9a
--- /dev/null
+++ b/tests/Avalonia.Controls.UnitTests/TextBoxTests_Input.cs
@@ -0,0 +1,278 @@
+#nullable enable
+
+using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Templates;
+using Avalonia.Data;
+using Avalonia.Harfbuzz;
+using Avalonia.Headless;
+using Avalonia.Input;
+using Avalonia.Input.Platform;
+using Avalonia.Platform;
+using Avalonia.Threading;
+using Avalonia.UnitTests;
+using Moq;
+using Xunit;
+
+namespace Avalonia.Controls.UnitTests
+{
+    public class TextBoxTests_Input : ScopedTestBase
+    {
+        [Fact]
+        public void Touch_Tap_Moves_Caret()
+        {
+            using (UnitTestApplication.Start(Services))
+            {
+                var target = new TextBox
+                {
+                    Template = CreateTemplate(),
+                    Text = "12 12345678"
+                };
+
+                var root = new TestRoot()
+                {
+                    Child = target
+                };
+
+                target.ApplyTemplate();
+
+                root.LayoutManager.ExecuteInitialLayoutPass();
+
+                var touch = new TouchTestHelper();
+
+                Assert.Equal(target.CaretIndex, 0);
+
+                // Move to index 8
+                touch.Down(target, new Point(50, 0));
+                touch.Up(target, new Point(50, 0));
+
+                Assert.Equal(target.CaretIndex, 8);
+            }
+        }
+
+        [Fact]
+        public void Touch_Double_Tap_Selects_Word()
+        {
+            using (UnitTestApplication.Start(Services))
+            {
+                var target = new TextBox
+                {
+                    Template = CreateTemplate(),
+                    Text = "12 12345678"
+                };
+
+                var root = new TestRoot()
+                {
+                    Child = target
+                };
+
+                target.ApplyTemplate();
+
+
+                root.LayoutManager.ExecuteInitialLayoutPass();
+
+                var touch = new TouchTestHelper();
+
+                Assert.Equal(target.CaretIndex, 0);
+
+                // Move to index 8
+                touch.Down(target, new Point(50, 0));
+                touch.Up(target, new Point(50, 0));
+
+                // Double tap
+                touch.Down(target, new Point(50, 0));
+                touch.Up(target, new Point(50, 0));
+
+                Assert.Equal(target.SelectionStart, 3);
+                Assert.Equal(target.SelectionEnd, 11);
+                Assert.Equal(target.CaretIndex, 8);
+            }
+        }
+
+        [Fact]
+        public void Touch_Hold_Selects_Word()
+        {
+            using (UnitTestApplication.Start(Services))
+            {
+                var target = new TextBox
+                {
+                    Template = CreateTemplate(),
+                    Text = "12 12345678"
+                };
+
+                var root = new TestRoot()
+                {
+                    Child = target
+                };
+
+                target.ApplyTemplate();
+
+                root.LayoutManager.ExecuteInitialLayoutPass();
+
+                var touch = new TouchTestHelper();
+
+                Assert.Equal(target.CaretIndex, 0);
+
+                // Move to index 8
+                touch.Down(target, new Point(50, 0));
+
+                var timer = Assert.Single(Dispatcher.SnapshotTimersForUnitTests());
+                timer.ForceFire();
+                touch.Up(target, new Point(50, 0));
+
+                Assert.Equal(target.SelectionStart, 3);
+                Assert.Equal(target.SelectionEnd, 11);
+                Assert.Equal(target.CaretIndex, 8);
+            }
+        }
+
+        [Fact]
+        public void Touch_Hold_On_Selection_Requests_Context()
+        {
+            using (UnitTestApplication.Start(Services))
+            {
+                var target = new TextBox
+                {
+                    Template = CreateTemplate(),
+                    Text = "12 12345678"
+                };
+
+                var root = new TestRoot()
+                {
+                    Child = target
+                };
+
+                target.ApplyTemplate();
+                bool requested = false;
+
+                target.SelectionStart = 3;
+                target.SelectionEnd = 11;
+
+                target.ContextRequested += Target_ContextRequested;
+
+                root.LayoutManager.ExecuteInitialLayoutPass();
+
+                var touch = new TouchTestHelper();
+
+                Assert.Equal(target.CaretIndex, 0);
+
+                // Move to index 8
+                touch.Down(target, new Point(50, 0));
+
+                var timer = Assert.Single(Dispatcher.SnapshotTimersForUnitTests());
+                timer.ForceFire();
+                touch.Up(target, new Point(50, 0));
+
+                Assert.True(requested);
+
+                void Target_ContextRequested(object? sender, ContextRequestedEventArgs e)
+                {
+                    requested = true;
+                }
+            }
+        }
+
+        private static TestServices Services => TestServices.MockThreadingInterface.With(
+            standardCursorFactory: Mock.Of<ICursorFactory>(),
+            renderInterface: new HeadlessPlatformRenderInterface(),
+            textShaperImpl: new HarfBuzzTextShaper(),
+            fontManagerImpl: new TestFontManager(),
+            assetLoader: new StandardAssetLoader());
+
+        internal static IControlTemplate CreateTemplate()
+        {
+            return new FuncControlTemplate<TextBox>((control, scope) =>
+            new ScrollViewer
+            {
+                Name = "PART_ScrollViewer",
+                Template = new FuncControlTemplate<ScrollViewer>(ScrollViewerTests.CreateTemplate),
+                Content = new TextPresenter
+                {
+                    Name = "PART_TextPresenter",
+                    [!!TextPresenter.TextProperty] = new Binding
+                    {
+                        Path = nameof(TextPresenter.Text),
+                        Mode = BindingMode.TwoWay,
+                        Priority = BindingPriority.Template,
+                        RelativeSource = new RelativeSource(RelativeSourceMode.TemplatedParent),
+                    },
+                    [!!TextPresenter.CaretIndexProperty] = new Binding
+                    {
+                        Path = nameof(TextPresenter.CaretIndex),
+                        Mode = BindingMode.TwoWay,
+                        Priority = BindingPriority.Template,
+                        RelativeSource = new RelativeSource(RelativeSourceMode.TemplatedParent),
+                    }
+                }.RegisterInNameScope(scope)
+            }.RegisterInNameScope(scope));
+        }
+
+        private static void RaiseKeyEvent(TextBox textBox, Key key, KeyModifiers inputModifiers)
+        {
+            textBox.RaiseEvent(new KeyEventArgs
+            {
+                RoutedEvent = InputElement.KeyDownEvent,
+                KeyModifiers = inputModifiers,
+                Key = key
+            });
+        }
+
+        private static void RaiseTextEvent(TextBox textBox, string text)
+        {
+            textBox.RaiseEvent(new TextInputEventArgs
+            {
+                RoutedEvent = InputElement.TextInputEvent,
+                Text = text
+            });
+        }
+
+        private class Class1 : NotifyingBase
+        {
+            private int _foo;
+            private string? _bar;
+
+            public int Foo
+            {
+                get { return _foo; }
+                set { _foo = value; RaisePropertyChanged(); }
+            }
+
+            public string? Bar
+            {
+                get { return _bar; }
+                set { _bar = value; RaisePropertyChanged(); }
+            }
+        }
+
+        private class TestTopLevel(ITopLevelImpl impl) : TopLevel(impl)
+        {
+        }
+
+        private static Mock<ITopLevelImpl> CreateMockTopLevelImpl()
+        {
+            var clipboard = new Mock<ITopLevelImpl>();
+            clipboard.Setup(x => x.Compositor).Returns(RendererMocks.CreateDummyCompositor());
+            clipboard.Setup(r => r.TryGetFeature(typeof(IClipboard)))
+                .Returns(new Clipboard(new HeadlessClipboardImplStub()));
+            clipboard.SetupGet(x => x.RenderScaling).Returns(1);
+            return clipboard;
+        }
+
+        private static FuncControlTemplate<TestTopLevel> CreateTopLevelTemplate()
+        {
+            return new FuncControlTemplate<TestTopLevel>((x, scope) =>
+                new ContentPresenter
+                {
+                    Name = "PART_ContentPresenter",
+                    [!ContentPresenter.ContentProperty] = x[!ContentControl.ContentProperty],
+                }.RegisterInNameScope(scope));
+        }
+
+        private class TestContextMenu : ContextMenu
+        {
+            public TestContextMenu()
+            {
+                IsOpen = true;
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Controls.UnitTests/WindowTests.cs b/tests/Avalonia.Controls.UnitTests/WindowTests.cs
index 59a84462ef..3b2386b1d5 100644
--- a/tests/Avalonia.Controls.UnitTests/WindowTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/WindowTests.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
+using System.Reactive.Linq;
 using System.Threading.Tasks;
+using Avalonia.Controls.Platform;
 using Avalonia.Media;
 using Avalonia.Platform;
 using Avalonia.Threading;
@@ -708,6 +710,35 @@ namespace Avalonia.Controls.UnitTests
             Assert.False(visualRoot.HasMirrorTransform);
         }
 
+        [Fact]
+        public void Extending_Client_Area_To_Decorations_When_Attached_To_Visual_Tree_Works()
+        {
+            var extended = false;
+
+            var windowImpl = MockWindowingPlatform.CreateWindowMock();
+            windowImpl.Setup(w => w.NeedsManagedDecorations).Returns(() => extended);
+            windowImpl.Setup(w => w.RequestedDrawnDecorations).Returns(PlatformRequestedDrawnDecoration.TitleBar);
+
+            using var app = UnitTestApplication.Start(TestServices.StyledWindow.With(
+                windowingPlatform: new MockWindowingPlatform(() => windowImpl.Object)));
+
+            var border = new Border();
+
+            var window = new Window
+            {
+                Content = border
+            };
+
+            border.AttachedToVisualTree +=
+                (_, _) =>
+                {
+                    extended = true;
+                    windowImpl.Object.ExtendClientAreaToDecorationsChanged?.Invoke(true);
+                };
+
+            window.Show();
+        }
+
         public class SizingTests : ScopedTestBase
         {
             [Fact]
@@ -1163,6 +1194,236 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
+        public class ForcedDecorationSizingTests : ScopedTestBase
+        {
+            /// <summary>
+            /// Creates a mock IWindowImpl that simulates forced CSD mode:
+            /// NeedsManagedDecorations = true, RequestedDrawnDecorations includes TitleBar + Border,
+            /// but IsClientAreaExtendedToDecorations = false.
+            /// </summary>
+            private static Mock<IWindowImpl> CreateForcedCsdWindowMock(
+                double initialWidth = 800, double initialHeight = 600)
+            {
+                var windowImpl = MockWindowingPlatform.CreateWindowMock(initialWidth, initialHeight);
+
+                windowImpl.Setup(x => x.NeedsManagedDecorations).Returns(true);
+                windowImpl.Setup(x => x.RequestedDrawnDecorations).Returns(
+                    PlatformRequestedDrawnDecoration.TitleBar | PlatformRequestedDrawnDecoration.Border);
+
+                return windowImpl;
+            }
+
+            [Fact]
+            public void ClientSize_Should_Exclude_Decoration_Inset()
+            {
+                using (UnitTestApplication.Start(TestServices.StyledWindow))
+                {
+                    var windowImpl = CreateForcedCsdWindowMock();
+                    var target = new Window(windowImpl.Object)
+                    {
+                        SizeToContent = SizeToContent.Manual,
+                    };
+
+                    // Verify mock setup
+                    Assert.True(windowImpl.Object.NeedsManagedDecorations);
+                    
+                    target.Show();
+
+                    var host = target.TopLevelHost;
+                    var decorations = host.Decorations;
+
+                    // Debug: verify decorations were created
+                    Assert.NotNull(decorations);
+                    Assert.True(decorations!.TitleBarHeight > 0, 
+                        $"TitleBarHeight was {decorations.TitleBarHeight}");
+                    
+                    var inset = host.DecorationInset;
+                    Assert.NotEqual(default, inset);
+
+                    var expectedClientSize = new Size(
+                        800 - inset.Left - inset.Right,
+                        600 - inset.Top - inset.Bottom);
+                    Assert.Equal(expectedClientSize, target.ClientSize);
+                }
+            }
+
+            [Fact]
+            public void WindowDecorationMargin_Should_Be_Zero_In_Forced_Mode()
+            {
+                using (UnitTestApplication.Start(TestServices.StyledWindow))
+                {
+                    var windowImpl = CreateForcedCsdWindowMock();
+                    var target = new Window(windowImpl.Object)
+                    {
+                        SizeToContent = SizeToContent.Manual,
+                    };
+
+                    target.Show();
+
+                    Assert.Equal(default(Thickness), target.WindowDecorationMargin);
+                }
+            }
+
+            [Fact]
+            public void HandleResized_Should_Subtract_Inset_From_Platform_Size()
+            {
+                using (UnitTestApplication.Start(TestServices.StyledWindow))
+                {
+                    var windowImpl = CreateForcedCsdWindowMock();
+                    var target = new Window(windowImpl.Object)
+                    {
+                        SizeToContent = SizeToContent.Manual,
+                    };
+
+                    target.Show();
+
+                    var inset = target.TopLevelHost.DecorationInset;
+
+                    // Simulate a platform resize (e.g. user resize)
+                    target.PlatformImpl!.Resized!.Invoke(new Size(1000, 700), WindowResizeReason.User);
+
+                    var expectedClientSize = new Size(
+                        1000 - inset.Left - inset.Right,
+                        700 - inset.Top - inset.Bottom);
+                    Assert.Equal(expectedClientSize, target.ClientSize);
+                }
+            }
+
+            [Fact]
+            public void Setting_Width_Should_Resize_WindowImpl_With_Inset_Added()
+            {
+                using (UnitTestApplication.Start(TestServices.StyledWindow))
+                {
+                    var windowImpl = CreateForcedCsdWindowMock();
+                    var target = new Window(windowImpl.Object)
+                    {
+                        Width = 400,
+                        Height = 300,
+                        SizeToContent = SizeToContent.Manual,
+                    };
+
+                    target.Show();
+
+                    var inset = target.TopLevelHost.DecorationInset;
+
+                    target.Width = 500;
+                    target.LayoutManager.ExecuteLayoutPass();
+
+                    // Platform should receive full frame size (content + inset)
+                    var expectedPlatformSize = new Size(
+                        500 + inset.Left + inset.Right,
+                        300 + inset.Top + inset.Bottom);
+                    windowImpl.Verify(x => x.Resize(expectedPlatformSize, WindowResizeReason.Layout));
+                }
+            }
+
+            [Fact]
+            public void Child_Should_Be_Measured_With_Content_Size()
+            {
+                using (UnitTestApplication.Start(TestServices.StyledWindow))
+                {
+                    var windowImpl = CreateForcedCsdWindowMock();
+                    var child = new ChildControl();
+                    var target = new Window(windowImpl.Object)
+                    {
+                        Width = 400,
+                        Height = 300,
+                        SizeToContent = SizeToContent.Manual,
+                        Content = child,
+                    };
+
+                    target.Show();
+
+                    Assert.Equal(1, child.MeasureSizes.Count);
+                    Assert.Equal(new Size(400, 300), child.MeasureSizes[0]);
+                }
+            }
+
+            [Fact]
+            public void Width_Height_Should_Not_Be_NaN_After_Show()
+            {
+                using (UnitTestApplication.Start(TestServices.StyledWindow))
+                {
+                    var windowImpl = CreateForcedCsdWindowMock();
+                    var target = new Window(windowImpl.Object)
+                    {
+                        SizeToContent = SizeToContent.Manual,
+                    };
+
+                    target.Show();
+
+                    Assert.False(double.IsNaN(target.Width));
+                    Assert.False(double.IsNaN(target.Height));
+
+                    var inset = target.TopLevelHost.DecorationInset;
+                    Assert.Equal(800 - inset.Left - inset.Right, target.Width);
+                    Assert.Equal(600 - inset.Top - inset.Bottom, target.Height);
+                }
+            }
+
+            [Fact]
+            public void SizeToContent_Should_Work_In_Forced_Mode()
+            {
+                using (UnitTestApplication.Start(TestServices.StyledWindow))
+                {
+                    var windowImpl = CreateForcedCsdWindowMock();
+                    var child = new Canvas
+                    {
+                        Width = 400,
+                        Height = 300,
+                    };
+
+                    var target = new Window(windowImpl.Object)
+                    {
+                        SizeToContent = SizeToContent.WidthAndHeight,
+                        Content = child,
+                    };
+
+                    target.Show();
+
+                    Assert.Equal(400, target.Width);
+                    Assert.Equal(300, target.Height);
+                    Assert.Equal(SizeToContent.WidthAndHeight, target.SizeToContent);
+                }
+            }
+
+            [Fact]
+            public void User_Resize_Should_Reset_SizeToContent()
+            {
+                using (UnitTestApplication.Start(TestServices.StyledWindow))
+                {
+                    var windowImpl = CreateForcedCsdWindowMock();
+                    var child = new Canvas
+                    {
+                        Width = 400,
+                        Height = 300,
+                    };
+
+                    var target = new Window(windowImpl.Object)
+                    {
+                        SizeToContent = SizeToContent.WidthAndHeight,
+                        Content = child,
+                    };
+
+                    target.Show();
+                    Assert.Equal(400, target.Width);
+                    Assert.Equal(300, target.Height);
+
+                    var inset = target.TopLevelHost.DecorationInset;
+                    // Platform fires resize with full frame size
+                    var newPlatformWidth = 500 + inset.Left + inset.Right;
+                    var newPlatformHeight = 300 + inset.Top + inset.Bottom;
+                    windowImpl.Object.Resized?.Invoke(
+                        new Size(newPlatformWidth, newPlatformHeight),
+                        WindowResizeReason.User);
+
+                    Assert.Equal(500, target.Width);
+                    Assert.Equal(300, target.Height);
+                    Assert.Equal(SizeToContent.Height, target.SizeToContent);
+                }
+            }
+        }
+
         private static Mock<IWindowImpl> CreateImpl()
         {
             var screen1 = new MockScreen(1.75, new PixelRect(new PixelSize(1920, 1080)), new PixelRect(new PixelSize(1920, 966)), true);
@@ -1208,6 +1469,127 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
+        [Fact]
+        public void WindowState_UsableGetter_Setter_Updates_Only_After_Platform_Callback()
+        {
+            var windowImpl = MockWindowingPlatform.CreateWindowMock();
+
+            // Simulate a platform where the getter is usable and the setter is accepted
+            var platformState = WindowState.Normal;
+            windowImpl.Setup(x => x.WindowStateGetterIsUsable).Returns(true);
+            windowImpl.Setup(x => x.WindowState).Returns(() => platformState);
+            windowImpl.SetupSet(x => x.WindowState = It.IsAny<WindowState>())
+                .Callback<WindowState>(v =>
+                {
+                    platformState = v;
+                    // Platform accepts the state and fires the callback
+                    windowImpl.Object.WindowStateChanged?.Invoke(v);
+                });
+
+            var windowingPlatform = new MockWindowingPlatform(() => windowImpl.Object);
+            using (UnitTestApplication.Start(new TestServices(windowingPlatform: windowingPlatform)))
+            {
+                var target = new Window();
+                target.Show();
+
+                var raised = new List<WindowState>();
+                target.GetObservable(Window.WindowStateProperty).Skip(1).Subscribe(s => raised.Add(s));
+
+                // Set to Maximized - platform accepts and fires callback
+                target.WindowState = WindowState.Maximized;
+                Assert.Equal(WindowState.Maximized, target.WindowState);
+                Assert.Contains(WindowState.Maximized, raised);
+
+                // Set to FullScreen - platform accepts and fires callback
+                raised.Clear();
+                target.WindowState = WindowState.FullScreen;
+                Assert.Equal(WindowState.FullScreen, target.WindowState);
+                Assert.Contains(WindowState.FullScreen, raised);
+            }
+        }
+
+        [Fact]
+        public void WindowState_UsableGetter_Setter_Raises_Synthetic_Notification_When_Platform_Refuses()
+        {
+            var windowImpl = MockWindowingPlatform.CreateWindowMock();
+
+            // Simulate a platform where the getter is usable but refuses state change requests.
+            // Start in Maximized state, then refuse a request to go Normal.
+            var platformState = WindowState.Normal;
+            windowImpl.Setup(x => x.WindowStateGetterIsUsable).Returns(true);
+            windowImpl.Setup(x => x.WindowState).Returns(() => platformState);
+            windowImpl.SetupSet(x => x.WindowState = It.IsAny<WindowState>())
+                .Callback<WindowState>(v =>
+                {
+                    // Platform accepts Maximized but refuses everything else
+                    if (v == WindowState.Maximized)
+                    {
+                        platformState = v;
+                        windowImpl.Object.WindowStateChanged?.Invoke(v);
+                    }
+                    // else: platform refuses, does not change state
+                });
+
+            var windowingPlatform = new MockWindowingPlatform(() => windowImpl.Object);
+            using (UnitTestApplication.Start(new TestServices(windowingPlatform: windowingPlatform)))
+            {
+                var target = new Window();
+                target.Show();
+
+                // First, go to Maximized (accepted by platform)
+                target.WindowState = WindowState.Maximized;
+                Assert.Equal(WindowState.Maximized, target.WindowState);
+
+                var raised = new List<AvaloniaPropertyChangedEventArgs>();
+                target.PropertyChanged += (_, e) =>
+                {
+                    if (e.Property == Window.WindowStateProperty)
+                        raised.Add(e);
+                };
+
+                // Now try to go to FullScreen - platform refuses, stays Maximized
+                target.WindowState = WindowState.FullScreen;
+
+                // The getter should still return Maximized because the platform refused
+                Assert.Equal(WindowState.Maximized, target.WindowState);
+
+                // A synthetic notification should have been raised so data bindings can recover
+                Assert.NotEmpty(raised);
+                Assert.Equal(WindowState.Maximized, raised[^1].GetNewValue<WindowState>());
+            }
+        }
+
+        [Fact]
+        public void WindowState_NonUsableGetter_Setter_Updates_Immediately()
+        {
+            var windowImpl = MockWindowingPlatform.CreateWindowMock();
+
+            // Legacy behavior: WindowStateGetterIsUsable = false
+            windowImpl.Setup(x => x.WindowStateGetterIsUsable).Returns(false);
+
+            var windowingPlatform = new MockWindowingPlatform(() => windowImpl.Object);
+            using (UnitTestApplication.Start(new TestServices(windowingPlatform: windowingPlatform)))
+            {
+                var target = new Window();
+                target.Show();
+
+                var raised = new List<WindowState>();
+                target.GetObservable(Window.WindowStateProperty).Skip(1).Subscribe(s => raised.Add(s));
+
+                // Set to Maximized - should update immediately regardless of platform behavior
+                target.WindowState = WindowState.Maximized;
+
+                Assert.Equal(WindowState.Maximized, target.WindowState);
+                Assert.Contains(WindowState.Maximized, raised);
+
+                // Verify the setter was forwarded to the platform impl
+                windowImpl.VerifySet(x => x.WindowState = WindowState.Maximized);
+
+                // Platform getter should never be called in legacy mode
+                windowImpl.VerifyGet(x => x.WindowState, Times.Never());
+            }
+        }
+
         private class TopmostWindow : Window
         {
             static TopmostWindow()
diff --git a/tests/Avalonia.IntegrationTests.Appium/WindowTests.cs b/tests/Avalonia.IntegrationTests.Appium/WindowTests.cs
index b6cbf38adf..aa1c675e82 100644
--- a/tests/Avalonia.IntegrationTests.Appium/WindowTests.cs
+++ b/tests/Avalonia.IntegrationTests.Appium/WindowTests.cs
@@ -459,17 +459,13 @@ namespace Avalonia.IntegrationTests.Appium
                 // WindowStartupLocation needs to be calculated before the window is shown, meaning that
                 // the position of a centered window can be off by a bit. From initial testing, looks
                 // like this shouldn't be more than 10 pixels.
-                if (Math.Abs(expected.X - actual.X) > 10)
-                    throw EqualException.ForMismatchedValues(expected, actual);
-                if (Math.Abs(expected.Y - actual.Y) > 10)
-                    throw EqualException.ForMismatchedValues(expected, actual);
+                Assert.Equal(expected.X, actual.X, 10.0);
+                Assert.Equal(expected.Y, actual.Y, 10.0);
             }
             else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
             {
-                if (Math.Abs(expected.X - actual.X) > 15)
-                    throw EqualException.ForMismatchedValues(expected, actual);
-                if (Math.Abs(expected.Y - actual.Y) > 15)
-                    throw EqualException.ForMismatchedValues(expected, actual);
+                Assert.Equal(expected.X, actual.X, 15.0);
+                Assert.Equal(expected.Y, actual.Y, 15.0);
             }
             else
             {
diff --git a/tests/Avalonia.RenderTests/Controls/CommandBarTests.cs b/tests/Avalonia.RenderTests/Controls/CommandBarTests.cs
index a518851027..ebef5ce419 100644
--- a/tests/Avalonia.RenderTests/Controls/CommandBarTests.cs
+++ b/tests/Avalonia.RenderTests/Controls/CommandBarTests.cs
@@ -37,7 +37,7 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
                     Background = Brushes.LightGray,
                     PrimaryCommands =
                     {
-                        new AppBarButton
+                        new CommandBarButton
                         {
                             Label = "New",
                             Icon = new Path
@@ -49,7 +49,7 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
                                 Stretch = Stretch.Uniform
                             }
                         },
-                        new AppBarButton
+                        new CommandBarButton
                         {
                             Label = "Save",
                             Icon = new Path
@@ -61,8 +61,8 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
                                 Stretch = Stretch.Uniform
                             }
                         },
-                        new AppBarSeparator(),
-                        new AppBarToggleButton
+                        new CommandBarSeparator(),
+                        new CommandBarToggleButton
                         {
                             Label = "Bold",
                             Icon = new Path
@@ -98,7 +98,7 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
                     OverflowButtonVisibility = CommandBarOverflowButtonVisibility.Collapsed,
                     PrimaryCommands =
                     {
-                        new AppBarButton
+                        new CommandBarButton
                         {
                             Icon = new Path
                             {
@@ -109,7 +109,7 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
                                 Stretch = Stretch.Uniform
                             }
                         },
-                        new AppBarButton
+                        new CommandBarButton
                         {
                             Icon = new Path
                             {
@@ -120,8 +120,8 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
                                 Stretch = Stretch.Uniform
                             }
                         },
-                        new AppBarSeparator(),
-                        new AppBarToggleButton
+                        new CommandBarSeparator(),
+                        new CommandBarToggleButton
                         {
                             IsChecked = true,
                             Icon = new Path
diff --git a/tests/Avalonia.RenderTests/Controls/ContentPageTests.cs b/tests/Avalonia.RenderTests/Controls/ContentPageTests.cs
index 07ba5b6505..1d3c30c8e5 100644
--- a/tests/Avalonia.RenderTests/Controls/ContentPageTests.cs
+++ b/tests/Avalonia.RenderTests/Controls/ContentPageTests.cs
@@ -71,7 +71,7 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
                         Background = Brushes.LightGray,
                         PrimaryCommands =
                         {
-                            new AppBarButton
+                            new CommandBarButton
                             {
                                 Label = "Save",
                                 Icon = new Path
@@ -83,8 +83,8 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
                                     Stretch = Stretch.Uniform
                                 }
                             },
-                            new AppBarSeparator(),
-                            new AppBarToggleButton
+                            new CommandBarSeparator(),
+                            new CommandBarToggleButton
                             {
                                 Label = "Bold",
                                 Icon = new Path
@@ -105,7 +105,7 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
                         OverflowButtonVisibility = CommandBarOverflowButtonVisibility.Collapsed,
                         PrimaryCommands =
                         {
-                            new AppBarButton
+                            new CommandBarButton
                             {
                                 Icon = new Path
                                 {
diff --git a/tests/Avalonia.RenderTests/Controls/DrawerPageTests.cs b/tests/Avalonia.RenderTests/Controls/DrawerPageTests.cs
index a26bc14e83..961b959c17 100644
--- a/tests/Avalonia.RenderTests/Controls/DrawerPageTests.cs
+++ b/tests/Avalonia.RenderTests/Controls/DrawerPageTests.cs
@@ -139,7 +139,7 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
         }
 
         [Fact]
-        public async Task DrawerPage_CompactOverlay_Closed_ShowsRail()
+        public async Task DrawerPage_LeftPlacement_CompactOverlay_Closed_ShowsRail()
         {
             var target = new Decorator
             {
@@ -181,7 +181,7 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
         }
 
         [Fact]
-        public async Task DrawerPage_CompactOverlay_Open_PaneOverlaysContent()
+        public async Task DrawerPage_LeftPlacement_CompactOverlay_Open_PaneOverlaysContent()
         {
             var target = new Decorator
             {
@@ -222,7 +222,7 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
         }
 
         [Fact]
-        public async Task DrawerPage_CompactInline_Closed_ShowsRail()
+        public async Task DrawerPage_LeftPlacement_CompactInline_Closed_ShowsRail()
         {
             var target = new Decorator
             {
@@ -264,7 +264,7 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
         }
 
         [Fact]
-        public async Task DrawerPage_CompactInline_Open_PanePushesContent()
+        public async Task DrawerPage_LeftPlacement_CompactInline_Open_PanePushesContent()
         {
             var target = new Decorator
             {
@@ -460,5 +460,255 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
             await RenderToFile(target);
             CompareImages(skipImmediate: true);
         }
+
+        [Fact]
+        public async Task DrawerPage_RightPlacement_CompactOverlay_Closed_ShowsRail()
+        {
+            var target = new Decorator
+            {
+                Width = 500,
+                Height = 350,
+                Child = new DrawerPage
+                {
+                    Background = Brushes.White,
+                    DrawerLength = 200,
+                    DrawerLayoutBehavior = DrawerLayoutBehavior.CompactOverlay,
+                    CompactDrawerLength = 48,
+                    DrawerPlacement = DrawerPlacement.Right,
+                    DrawerBackground = new SolidColorBrush(Color.Parse("#E8EAF6")),
+                    Drawer = new StackPanel
+                    {
+                        Margin = new Thickness(0, 4),
+                        Children =
+                        {
+                            new Border { Width = 24, Height = 24, Background = new SolidColorBrush(Color.Parse("#3949AB")), HorizontalAlignment = HorizontalAlignment.Center, Margin = new Thickness(0, 8) },
+                            new Border { Width = 24, Height = 24, Background = new SolidColorBrush(Color.Parse("#E53935")), HorizontalAlignment = HorizontalAlignment.Center, Margin = new Thickness(0, 4) },
+                            new Border { Width = 24, Height = 24, Background = new SolidColorBrush(Color.Parse("#43A047")), HorizontalAlignment = HorizontalAlignment.Center, Margin = new Thickness(0, 4) },
+                        }
+                    },
+                    Content = new Border
+                    {
+                        Width = 120,
+                        Height = 80,
+                        Background = new SolidColorBrush(Color.Parse("#DCEEFB")),
+                        HorizontalAlignment = HorizontalAlignment.Center,
+                        VerticalAlignment = VerticalAlignment.Center
+                    }
+                }
+            };
+
+            target.Styles.Add(new SimpleTheme());
+            await RenderToFile(target);
+            CompareImages(skipImmediate: true);
+        }
+
+        [Fact]
+        public async Task DrawerPage_RightPlacement_CompactInline_Closed_ShowsRail()
+        {
+            var target = new Decorator
+            {
+                Width = 500,
+                Height = 350,
+                Child = new DrawerPage
+                {
+                    Background = Brushes.White,
+                    DrawerLength = 200,
+                    DrawerLayoutBehavior = DrawerLayoutBehavior.CompactInline,
+                    CompactDrawerLength = 48,
+                    DrawerPlacement = DrawerPlacement.Right,
+                    DrawerBackground = new SolidColorBrush(Color.Parse("#E8F5E9")),
+                    Drawer = new StackPanel
+                    {
+                        Margin = new Thickness(0, 4),
+                        Children =
+                        {
+                            new Border { Width = 24, Height = 24, Background = new SolidColorBrush(Color.Parse("#2E7D32")), HorizontalAlignment = HorizontalAlignment.Center, Margin = new Thickness(0, 8) },
+                            new Border { Width = 24, Height = 24, Background = new SolidColorBrush(Color.Parse("#E53935")), HorizontalAlignment = HorizontalAlignment.Center, Margin = new Thickness(0, 4) },
+                            new Border { Width = 24, Height = 24, Background = new SolidColorBrush(Color.Parse("#FB8C00")), HorizontalAlignment = HorizontalAlignment.Center, Margin = new Thickness(0, 4) },
+                        }
+                    },
+                    Content = new Border
+                    {
+                        Width = 120,
+                        Height = 80,
+                        Background = new SolidColorBrush(Color.Parse("#DCEEFB")),
+                        HorizontalAlignment = HorizontalAlignment.Center,
+                        VerticalAlignment = VerticalAlignment.Center
+                    }
+                }
+            };
+
+            target.Styles.Add(new SimpleTheme());
+            await RenderToFile(target);
+            CompareImages(skipImmediate: true);
+        }
+
+        [Fact]
+        public async Task DrawerPage_TopPlacement_CompactOverlay_Closed_ShowsRail()
+        {
+            var target = new Decorator
+            {
+                Width = 500,
+                Height = 350,
+                Child = new DrawerPage
+                {
+                    Background = Brushes.White,
+                    DrawerLength = 200,
+                    DrawerLayoutBehavior = DrawerLayoutBehavior.CompactOverlay,
+                    CompactDrawerLength = 48,
+                    DrawerPlacement = DrawerPlacement.Top,
+                    DrawerBackground = new SolidColorBrush(Color.Parse("#E8EAF6")),
+                    Drawer = new StackPanel
+                    {
+                        Orientation = Orientation.Horizontal,
+                        Margin = new Thickness(4, 0),
+                        Children =
+                        {
+                            new Border { Width = 24, Height = 24, Background = new SolidColorBrush(Color.Parse("#3949AB")), Margin = new Thickness(8, 0) },
+                            new Border { Width = 24, Height = 24, Background = new SolidColorBrush(Color.Parse("#E53935")), Margin = new Thickness(4, 0) },
+                            new Border { Width = 24, Height = 24, Background = new SolidColorBrush(Color.Parse("#43A047")), Margin = new Thickness(4, 0) },
+                        }
+                    },
+                    Content = new Border
+                    {
+                        Width = 120,
+                        Height = 80,
+                        Background = new SolidColorBrush(Color.Parse("#DCEEFB")),
+                        HorizontalAlignment = HorizontalAlignment.Center,
+                        VerticalAlignment = VerticalAlignment.Center
+                    }
+                }
+            };
+
+            target.Styles.Add(new SimpleTheme());
+            await RenderToFile(target);
+            CompareImages(skipImmediate: true);
+        }
+
+        [Fact]
+        public async Task DrawerPage_TopPlacement_CompactInline_Closed_ShowsRail()
+        {
+            var target = new Decorator
+            {
+                Width = 500,
+                Height = 350,
+                Child = new DrawerPage
+                {
+                    Background = Brushes.White,
+                    DrawerLength = 200,
+                    DrawerLayoutBehavior = DrawerLayoutBehavior.CompactInline,
+                    CompactDrawerLength = 48,
+                    DrawerPlacement = DrawerPlacement.Top,
+                    DrawerBackground = new SolidColorBrush(Color.Parse("#E8F5E9")),
+                    Drawer = new StackPanel
+                    {
+                        Orientation = Orientation.Horizontal,
+                        Margin = new Thickness(4, 0),
+                        Children =
+                        {
+                            new Border { Width = 24, Height = 24, Background = new SolidColorBrush(Color.Parse("#2E7D32")), Margin = new Thickness(8, 0) },
+                            new Border { Width = 24, Height = 24, Background = new SolidColorBrush(Color.Parse("#E53935")), Margin = new Thickness(4, 0) },
+                            new Border { Width = 24, Height = 24, Background = new SolidColorBrush(Color.Parse("#FB8C00")), Margin = new Thickness(4, 0) },
+                        }
+                    },
+                    Content = new Border
+                    {
+                        Width = 120,
+                        Height = 80,
+                        Background = new SolidColorBrush(Color.Parse("#DCEEFB")),
+                        HorizontalAlignment = HorizontalAlignment.Center,
+                        VerticalAlignment = VerticalAlignment.Center
+                    }
+                }
+            };
+
+            target.Styles.Add(new SimpleTheme());
+            await RenderToFile(target);
+            CompareImages(skipImmediate: true);
+        }
+
+        [Fact]
+        public async Task DrawerPage_BottomPlacement_CompactOverlay_Closed_ShowsRail()
+        {
+            var target = new Decorator
+            {
+                Width = 500,
+                Height = 350,
+                Child = new DrawerPage
+                {
+                    Background = Brushes.White,
+                    DrawerLength = 200,
+                    DrawerLayoutBehavior = DrawerLayoutBehavior.CompactOverlay,
+                    CompactDrawerLength = 48,
+                    DrawerPlacement = DrawerPlacement.Bottom,
+                    DrawerBackground = new SolidColorBrush(Color.Parse("#E8EAF6")),
+                    Drawer = new StackPanel
+                    {
+                        Orientation = Orientation.Horizontal,
+                        Margin = new Thickness(4, 0),
+                        Children =
+                        {
+                            new Border { Width = 24, Height = 24, Background = new SolidColorBrush(Color.Parse("#3949AB")), Margin = new Thickness(8, 0) },
+                            new Border { Width = 24, Height = 24, Background = new SolidColorBrush(Color.Parse("#E53935")), Margin = new Thickness(4, 0) },
+                            new Border { Width = 24, Height = 24, Background = new SolidColorBrush(Color.Parse("#43A047")), Margin = new Thickness(4, 0) },
+                        }
+                    },
+                    Content = new Border
+                    {
+                        Width = 120,
+                        Height = 80,
+                        Background = new SolidColorBrush(Color.Parse("#DCEEFB")),
+                        HorizontalAlignment = HorizontalAlignment.Center,
+                        VerticalAlignment = VerticalAlignment.Center
+                    }
+                }
+            };
+
+            target.Styles.Add(new SimpleTheme());
+            await RenderToFile(target);
+            CompareImages(skipImmediate: true);
+        }
+
+        [Fact]
+        public async Task DrawerPage_BottomPlacement_CompactInline_Closed_ShowsRail()
+        {
+            var target = new Decorator
+            {
+                Width = 500,
+                Height = 350,
+                Child = new DrawerPage
+                {
+                    Background = Brushes.White,
+                    DrawerLength = 200,
+                    DrawerLayoutBehavior = DrawerLayoutBehavior.CompactInline,
+                    CompactDrawerLength = 48,
+                    DrawerPlacement = DrawerPlacement.Bottom,
+                    DrawerBackground = new SolidColorBrush(Color.Parse("#E8F5E9")),
+                    Drawer = new StackPanel
+                    {
+                        Orientation = Orientation.Horizontal,
+                        Margin = new Thickness(4, 0),
+                        Children =
+                        {
+                            new Border { Width = 24, Height = 24, Background = new SolidColorBrush(Color.Parse("#2E7D32")), Margin = new Thickness(8, 0) },
+                            new Border { Width = 24, Height = 24, Background = new SolidColorBrush(Color.Parse("#E53935")), Margin = new Thickness(4, 0) },
+                            new Border { Width = 24, Height = 24, Background = new SolidColorBrush(Color.Parse("#FB8C00")), Margin = new Thickness(4, 0) },
+                        }
+                    },
+                    Content = new Border
+                    {
+                        Width = 120,
+                        Height = 80,
+                        Background = new SolidColorBrush(Color.Parse("#DCEEFB")),
+                        HorizontalAlignment = HorizontalAlignment.Center,
+                        VerticalAlignment = VerticalAlignment.Center
+                    }
+                }
+            };
+
+            target.Styles.Add(new SimpleTheme());
+            await RenderToFile(target);
+            CompareImages(skipImmediate: true);
+        }
     }
 }
diff --git a/tests/Avalonia.RenderTests/Controls/PipsPagerTests.cs b/tests/Avalonia.RenderTests/Controls/PipsPagerTests.cs
index 1516b8d365..b7462941ea 100644
--- a/tests/Avalonia.RenderTests/Controls/PipsPagerTests.cs
+++ b/tests/Avalonia.RenderTests/Controls/PipsPagerTests.cs
@@ -1,24 +1,28 @@
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Shapes;
 using Avalonia.Controls.Templates;
 using Avalonia.Data;
 using Avalonia.Layout;
 using Avalonia.Media;
-using Avalonia.Controls.Shapes;
 using Avalonia.Styling;
 using Avalonia.Threading;
 using Xunit;
 
+#if AVALONIA_SKIA
 namespace Avalonia.Skia.RenderTests
+#else
+namespace Avalonia.Direct2D1.RenderTests.Controls
+#endif
 {
     public class PipsPagerTests : TestBase
     {
         public PipsPagerTests()
-            : base(@"Controls/PipsPager")
+            : base(@"Controls\PipsPager")
         {
         }
-        
+
         private static IControlTemplate CreatePipsPagerTemplate()
         {
             return new FuncControlTemplate<PipsPager>((control, scope) =>
@@ -26,7 +30,7 @@ namespace Avalonia.Skia.RenderTests
                 var stackPanel = new StackPanel
                 {
                     Name = "PART_RootPanel",
-                    Spacing = 5,
+                    Spacing = 4,
                     [!StackPanel.OrientationProperty] = control[!PipsPager.OrientationProperty],
                     HorizontalAlignment = HorizontalAlignment.Center,
                     VerticalAlignment = VerticalAlignment.Center
@@ -48,7 +52,7 @@ namespace Avalonia.Skia.RenderTests
                 var prevButton = new Button
                 {
                     Name = "PART_PreviousButton",
-                    Content = "<", 
+                    Content = "<",
                     Template = buttonTemplate,
                     Width = 20,
                     Height = 20,
@@ -65,8 +69,7 @@ namespace Avalonia.Skia.RenderTests
                     [!Button.IsVisibleProperty] = control[!PipsPager.IsNextButtonVisibleProperty]
                 }.RegisterInNameScope(scope);
 
-                // Simple ListBox Template (ItemsPresenter)
-                var listBoxTemplate = new FuncControlTemplate<ListBox>((lb, s) => 
+                var listBoxTemplate = new FuncControlTemplate<ListBox>((lb, s) =>
                     new ItemsPresenter
                     {
                         Name = "PART_ItemsPresenter",
@@ -79,26 +82,24 @@ namespace Avalonia.Skia.RenderTests
                     Template = listBoxTemplate,
                     [!ListBox.ItemsSourceProperty] = new Binding("TemplateSettings.Pips") { Source = control },
                     [!ListBox.SelectedIndexProperty] = control[!PipsPager.SelectedPageIndexProperty],
-                    ItemsPanel = new FuncTemplate<Panel?>(() => new StackPanel 
-                    { 
+                    ItemsPanel = new FuncTemplate<Panel?>(() => new StackPanel
+                    {
                         Spacing = 2,
-                        [!StackPanel.OrientationProperty] = control[!PipsPager.OrientationProperty] 
+                        [!StackPanel.OrientationProperty] = control[!PipsPager.OrientationProperty]
                     })
                 }.RegisterInNameScope(scope);
 
-                // Default Item Style
                 var itemStyle = new Style(x => x.OfType<ListBoxItem>());
-                itemStyle.Setters.Add(new Setter(ListBoxItem.TemplateProperty, new FuncControlTemplate<ListBoxItem>((item, s) => 
-                     new Ellipse { Name="Pip", Width = 10, Height = 10 }.RegisterInNameScope(s))));
-                
-                // Default Pip Fill Style
+                itemStyle.Setters.Add(new Setter(ListBoxItem.TemplateProperty,
+                    new FuncControlTemplate<ListBoxItem>((item, s) =>
+                        new Rectangle { Name = "Pip", Width = 10, Height = 10 }.RegisterInNameScope(s))));
+
                 var defaultPipStyle = new Style(x => x.OfType<ListBoxItem>().Template().Name("Pip"));
-                defaultPipStyle.Setters.Add(new Setter(Ellipse.FillProperty, Brushes.Gray));
-                
-                // Selected Item Style
+                defaultPipStyle.Setters.Add(new Setter(Rectangle.FillProperty, Brushes.Gray));
+
                 var selectedStyle = new Style(x => x.OfType<ListBoxItem>().Class(":selected").Template().Name("Pip"));
-                selectedStyle.Setters.Add(new Setter(Ellipse.FillProperty, Brushes.Red));
-                
+                selectedStyle.Setters.Add(new Setter(Rectangle.FillProperty, Brushes.Red));
+
                 pipsList.Styles.Add(itemStyle);
                 pipsList.Styles.Add(defaultPipStyle);
                 pipsList.Styles.Add(selectedStyle);
@@ -135,7 +136,7 @@ namespace Avalonia.Skia.RenderTests
             Dispatcher.UIThread.RunJobs(null, TestContext.Current.CancellationToken);
 
             await RenderToFile(target);
-            CompareImages();
+            CompareImages(skipImmediate: true);
         }
 
         [Fact]
@@ -162,7 +163,7 @@ namespace Avalonia.Skia.RenderTests
             Dispatcher.UIThread.RunJobs(null, TestContext.Current.CancellationToken);
 
             await RenderToFile(target);
-            CompareImages();
+            CompareImages(skipImmediate: true);
         }
     }
 }
diff --git a/tests/Avalonia.UnitTests/TouchTestHelper.cs b/tests/Avalonia.UnitTests/TouchTestHelper.cs
index 3ec49fa321..7a13425997 100644
--- a/tests/Avalonia.UnitTests/TouchTestHelper.cs
+++ b/tests/Avalonia.UnitTests/TouchTestHelper.cs
@@ -7,6 +7,7 @@ namespace Avalonia.UnitTests
     {
         private readonly Pointer _pointer = new Pointer(Pointer.GetNextFreeId(), PointerType.Touch, true);
         private ulong _nextStamp = 1;
+        private int _clickCount = 0;
         private ulong Timestamp() => _nextStamp++;
         public IInputElement? Captured => _pointer.Captured;
 
@@ -20,7 +21,7 @@ namespace Avalonia.UnitTests
             _pointer.Capture((IInputElement)target);
             source.RaiseEvent(new PointerPressedEventArgs(source, _pointer, (Visual)source, position, Timestamp(),
                 new(RawInputModifiers.LeftMouseButton, PointerUpdateKind.LeftButtonPressed),
-                modifiers));
+                modifiers, ++_clickCount));
         }
 
         public void Move(Interactive target, in Point position, KeyModifiers modifiers = default) => Move(target, target, position, modifiers);
diff --git a/tests/BuildTests/BuildTests.sln b/tests/BuildTests/BuildTests.sln
deleted file mode 100644
index f049ba4ba2..0000000000
--- a/tests/BuildTests/BuildTests.sln
+++ /dev/null
@@ -1,75 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.3.32811.315
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BuildTests", "BuildTests\BuildTests.csproj", "{EBFA8512-1EA5-4D8C-B4AC-AB5B48A6D568}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BuildTests.Desktop", "BuildTests.Desktop\BuildTests.Desktop.csproj", "{ABC31E74-02FF-46EB-B3B2-4E6AE43B456C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BuildTests.Browser", "BuildTests.Browser\BuildTests.Browser.csproj", "{1C1A049E-235C-4CD0-B6FA-D53AC418F4DA}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BuildTests.iOS", "BuildTests.iOS\BuildTests.iOS.csproj", "{EBD9022F-BC83-4846-9A11-6F7F3772DC64}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BuildTests.Android", "BuildTests.Android\BuildTests.Android.csproj", "{7AD1DAC8-7FBE-49D5-8614-7321233DB82E}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3DA99C4E-89E3-4049-9C22-0A7EC60D83D8}"
-	ProjectSection(SolutionItems) = preProject
-		Directory.Packages.props = Directory.Packages.props
-		Directory.Build.props = Directory.Build.props
-		Directory.Build.targets = Directory.Build.targets
-		IncludeBuildTestsAvaloniaItems.props = IncludeBuildTestsAvaloniaItems.props
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildTests.NativeAot", "BuildTests.NativeAot\BuildTests.NativeAot.csproj", "{767D97D5-4E74-4B54-ACFB-D2D845A2AB85}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildTests.WpfHybrid", "BuildTests.WpfHybrid\BuildTests.WpfHybrid.csproj", "{B84C58C1-AE11-4C10-8E18-8482085486F1}"
-EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "BuildTests.FSharp", "BuildTests.FSharp\BuildTests.FSharp.fsproj", "{7040B498-C281-490A-98D4-39FCDADAFDBF}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{EBFA8512-1EA5-4D8C-B4AC-AB5B48A6D568}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EBFA8512-1EA5-4D8C-B4AC-AB5B48A6D568}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EBFA8512-1EA5-4D8C-B4AC-AB5B48A6D568}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EBFA8512-1EA5-4D8C-B4AC-AB5B48A6D568}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ABC31E74-02FF-46EB-B3B2-4E6AE43B456C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ABC31E74-02FF-46EB-B3B2-4E6AE43B456C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ABC31E74-02FF-46EB-B3B2-4E6AE43B456C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ABC31E74-02FF-46EB-B3B2-4E6AE43B456C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1C1A049E-235C-4CD0-B6FA-D53AC418F4DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1C1A049E-235C-4CD0-B6FA-D53AC418F4DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1C1A049E-235C-4CD0-B6FA-D53AC418F4DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1C1A049E-235C-4CD0-B6FA-D53AC418F4DA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EBD9022F-BC83-4846-9A11-6F7F3772DC64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EBD9022F-BC83-4846-9A11-6F7F3772DC64}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EBD9022F-BC83-4846-9A11-6F7F3772DC64}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EBD9022F-BC83-4846-9A11-6F7F3772DC64}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7AD1DAC8-7FBE-49D5-8614-7321233DB82E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7AD1DAC8-7FBE-49D5-8614-7321233DB82E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7AD1DAC8-7FBE-49D5-8614-7321233DB82E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7AD1DAC8-7FBE-49D5-8614-7321233DB82E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{767D97D5-4E74-4B54-ACFB-D2D845A2AB85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{767D97D5-4E74-4B54-ACFB-D2D845A2AB85}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{767D97D5-4E74-4B54-ACFB-D2D845A2AB85}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{767D97D5-4E74-4B54-ACFB-D2D845A2AB85}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B84C58C1-AE11-4C10-8E18-8482085486F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B84C58C1-AE11-4C10-8E18-8482085486F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B84C58C1-AE11-4C10-8E18-8482085486F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B84C58C1-AE11-4C10-8E18-8482085486F1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7040B498-C281-490A-98D4-39FCDADAFDBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7040B498-C281-490A-98D4-39FCDADAFDBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7040B498-C281-490A-98D4-39FCDADAFDBF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7040B498-C281-490A-98D4-39FCDADAFDBF}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {83CB65B8-011F-4ED7-BCD3-A6CFA935EF7E}
-	EndGlobalSection
-EndGlobal
diff --git a/tests/BuildTests/BuildTests.slnx b/tests/BuildTests/BuildTests.slnx
new file mode 100644
index 0000000000..d2dfb5a6d1
--- /dev/null
+++ b/tests/BuildTests/BuildTests.slnx
@@ -0,0 +1,16 @@
+<Solution>
+  <Folder Name="/Solution Items/">
+    <File Path="Directory.Build.props" />
+    <File Path="Directory.Build.targets" />
+    <File Path="Directory.Packages.props" />
+    <File Path="IncludeBuildTestsAvaloniaItems.props" />
+  </Folder>
+  <Project Path="BuildTests.Android/BuildTests.Android.csproj" />
+  <Project Path="BuildTests.Browser/BuildTests.Browser.csproj" />
+  <Project Path="BuildTests.Desktop/BuildTests.Desktop.csproj" />
+  <Project Path="BuildTests.FSharp/BuildTests.FSharp.fsproj" />
+  <Project Path="BuildTests.iOS/BuildTests.iOS.csproj" />
+  <Project Path="BuildTests.NativeAot/BuildTests.NativeAot.csproj" />
+  <Project Path="BuildTests.WpfHybrid/BuildTests.WpfHybrid.csproj" />
+  <Project Path="BuildTests/BuildTests.csproj" />
+</Solution>
diff --git a/tests/TestFiles/Skia/Controls/DrawerPage/DrawerPage_BottomPlacement_CompactInline_Closed_ShowsRail.expected.png b/tests/TestFiles/Skia/Controls/DrawerPage/DrawerPage_BottomPlacement_CompactInline_Closed_ShowsRail.expected.png
new file mode 100644
index 0000000000..676905c809
Binary files /dev/null and b/tests/TestFiles/Skia/Controls/DrawerPage/DrawerPage_BottomPlacement_CompactInline_Closed_ShowsRail.expected.png differ
diff --git a/tests/TestFiles/Skia/Controls/DrawerPage/DrawerPage_BottomPlacement_CompactOverlay_Closed_ShowsRail.expected.png b/tests/TestFiles/Skia/Controls/DrawerPage/DrawerPage_BottomPlacement_CompactOverlay_Closed_ShowsRail.expected.png
new file mode 100644
index 0000000000..62f2b83f84
Binary files /dev/null and b/tests/TestFiles/Skia/Controls/DrawerPage/DrawerPage_BottomPlacement_CompactOverlay_Closed_ShowsRail.expected.png differ
diff --git a/tests/TestFiles/Skia/Controls/DrawerPage/DrawerPage_CompactInline_Closed_ShowsRail.expected.png b/tests/TestFiles/Skia/Controls/DrawerPage/DrawerPage_LeftPlacement_CompactInline_Closed_ShowsRail.expected.png
similarity index 100%
rename from tests/TestFiles/Skia/Controls/DrawerPage/DrawerPage_CompactInline_Closed_ShowsRail.expected.png
rename to tests/TestFiles/Skia/Controls/DrawerPage/DrawerPage_LeftPlacement_CompactInline_Closed_ShowsRail.expected.png
diff --git a/tests/TestFiles/Skia/Controls/DrawerPage/DrawerPage_CompactInline_Open_PanePushesContent.expected.png b/tests/TestFiles/Skia/Controls/DrawerPage/DrawerPage_LeftPlacement_CompactInline_Open_PanePushesContent.expected.png
similarity index 100%
rename from tests/TestFiles/Skia/Controls/DrawerPage/DrawerPage_CompactInline_Open_PanePushesContent.expected.png
rename to tests/TestFiles/Skia/Controls/DrawerPage/DrawerPage_LeftPlacement_CompactInline_Open_PanePushesContent.expected.png
diff --git a/tests/TestFiles/Skia/Controls/DrawerPage/DrawerPage_CompactOverlay_Closed_ShowsRail.expected.png b/tests/TestFiles/Skia/Controls/DrawerPage/DrawerPage_LeftPlacement_CompactOverlay_Closed_ShowsRail.expected.png
similarity index 100%
rename from tests/TestFiles/Skia/Controls/DrawerPage/DrawerPage_CompactOverlay_Closed_ShowsRail.expected.png
rename to tests/TestFiles/Skia/Controls/DrawerPage/DrawerPage_LeftPlacement_CompactOverlay_Closed_ShowsRail.expected.png
diff --git a/tests/TestFiles/Skia/Controls/DrawerPage/DrawerPage_CompactOverlay_Open_PaneOverlaysContent.expected.png b/tests/TestFiles/Skia/Controls/DrawerPage/DrawerPage_LeftPlacement_CompactOverlay_Open_PaneOverlaysContent.expected.png
similarity index 100%
rename from tests/TestFiles/Skia/Controls/DrawerPage/DrawerPage_CompactOverlay_Open_PaneOverlaysContent.expected.png
rename to tests/TestFiles/Skia/Controls/DrawerPage/DrawerPage_LeftPlacement_CompactOverlay_Open_PaneOverlaysContent.expected.png
diff --git a/tests/TestFiles/Skia/Controls/DrawerPage/DrawerPage_RightPlacement_CompactInline_Closed_ShowsRail.expected.png b/tests/TestFiles/Skia/Controls/DrawerPage/DrawerPage_RightPlacement_CompactInline_Closed_ShowsRail.expected.png
new file mode 100644
index 0000000000..d180c53f29
Binary files /dev/null and b/tests/TestFiles/Skia/Controls/DrawerPage/DrawerPage_RightPlacement_CompactInline_Closed_ShowsRail.expected.png differ
diff --git a/tests/TestFiles/Skia/Controls/DrawerPage/DrawerPage_RightPlacement_CompactOverlay_Closed_ShowsRail.expected.png b/tests/TestFiles/Skia/Controls/DrawerPage/DrawerPage_RightPlacement_CompactOverlay_Closed_ShowsRail.expected.png
new file mode 100644
index 0000000000..729a39028f
Binary files /dev/null and b/tests/TestFiles/Skia/Controls/DrawerPage/DrawerPage_RightPlacement_CompactOverlay_Closed_ShowsRail.expected.png differ
diff --git a/tests/TestFiles/Skia/Controls/DrawerPage/DrawerPage_TopPlacement_CompactInline_Closed_ShowsRail.expected.png b/tests/TestFiles/Skia/Controls/DrawerPage/DrawerPage_TopPlacement_CompactInline_Closed_ShowsRail.expected.png
new file mode 100644
index 0000000000..079e54a59d
Binary files /dev/null and b/tests/TestFiles/Skia/Controls/DrawerPage/DrawerPage_TopPlacement_CompactInline_Closed_ShowsRail.expected.png differ
diff --git a/tests/TestFiles/Skia/Controls/DrawerPage/DrawerPage_TopPlacement_CompactOverlay_Closed_ShowsRail.expected.png b/tests/TestFiles/Skia/Controls/DrawerPage/DrawerPage_TopPlacement_CompactOverlay_Closed_ShowsRail.expected.png
new file mode 100644
index 0000000000..70994e4623
Binary files /dev/null and b/tests/TestFiles/Skia/Controls/DrawerPage/DrawerPage_TopPlacement_CompactOverlay_Closed_ShowsRail.expected.png differ
diff --git a/tests/TestFiles/Skia/Controls/PipsPager/PipsPager_Default.expected.png b/tests/TestFiles/Skia/Controls/PipsPager/PipsPager_Default.expected.png
index efbcef3da6..6780457591 100644
Binary files a/tests/TestFiles/Skia/Controls/PipsPager/PipsPager_Default.expected.png and b/tests/TestFiles/Skia/Controls/PipsPager/PipsPager_Default.expected.png differ
diff --git a/tests/TestFiles/Skia/Controls/PipsPager/PipsPager_Preselected_Index.expected.png b/tests/TestFiles/Skia/Controls/PipsPager/PipsPager_Preselected_Index.expected.png
index 2dfb014c9f..fefe822f1a 100644
Binary files a/tests/TestFiles/Skia/Controls/PipsPager/PipsPager_Preselected_Index.expected.png and b/tests/TestFiles/Skia/Controls/PipsPager/PipsPager_Preselected_Index.expected.png differ