diff --git a/Directory.Packages.props b/Directory.Packages.props
index 8437ae2..76a4c58 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -6,31 +6,32 @@
   <ItemGroup>
     <PackageVersion Include="Aura.UI" Version="0.1.5-dev-04" />
     <PackageVersion Include="Aura.UI.FluentTheme" Version="0.1.5-dev-04" />
-    <PackageVersion Include="Avalonia" Version="11.3.12" />
-    <PackageVersion Include="Avalonia.Android" Version="11.3.12" />
-    <PackageVersion Include="Avalonia.Browser" Version="11.3.12" />
-    <PackageVersion Include="Avalonia.Desktop" Version="11.3.12" />
-    <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.12" />
-    <PackageVersion Include="Avalonia.Fonts.Inter" Version="11.3.12" />
-    <PackageVersion Include="Avalonia.iOS" Version="11.3.12" />
-    <PackageVersion Include="Avalonia.Themes.Fluent" Version="11.3.12" />
-    <PackageVersion Include="ReactiveUI.Avalonia" Version="11.4.7" />
-    <PackageVersion Include="ReactiveUI" Version="23.1.8" />
-    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
-    <PackageVersion Include="coverlet.collector" Version="8.0.0" />
-    <PackageVersion Include="DialogHost.Avalonia" Version="0.10.4" />
-    <PackageVersion Include="FluentAvaloniaUI" Version="2.5.0" />
+    <PackageVersion Include="Avalonia" Version="12.0.1" />
+    <PackageVersion Include="Avalonia.Android" Version="12.0.1" />
+    <PackageVersion Include="Avalonia.Browser" Version="12.0.1" />
+    <PackageVersion Include="Avalonia.Desktop" Version="12.0.1" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.14" />
+    <PackageVersion Include="Avalonia.Fonts.Inter" Version="12.0.1" />
+    <PackageVersion Include="Avalonia.iOS" Version="12.0.1" />
+    <PackageVersion Include="Avalonia.Themes.Fluent" Version="12.0.1" />
+    <PackageVersion Include="Dragonhouse.Avalonia.MessageBox" Version="1.0.0" />
+    <PackageVersion Include="ReactiveUI.Avalonia" Version="12.0.1" />
+    <PackageVersion Include="ReactiveUI" Version="23.2.1" />
+    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.2" />
+    <PackageVersion Include="coverlet.collector" Version="10.0.0" />
+    <PackageVersion Include="DialogHost.Avalonia" Version="0.12.1" />
+    <PackageVersion Include="FluentAvaloniaUI" Version="3.0.0-preview1" />
     <PackageVersion Include="HanumanInstitute.MvvmDialogs" Version="2.2.0" />
     <PackageVersion Include="HanumanInstitute.MvvmDialogs.Avalonia" Version="2.2.0" />
     <PackageVersion Include="HanumanInstitute.MvvmDialogs.Avalonia.MessageBox" Version="2.2.0" />
     <PackageVersion Include="HanumanInstitute.MvvmDialogs.Wpf" Version="2.2.0" />
     <PackageVersion Include="JetBrains.dotMemoryUnit" Version="3.2.20220510" />
-    <PackageVersion Include="MessageBox.Avalonia" Version="3.3.1.1" />
-    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.3" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.3" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.3" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="10.0.3" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
+    <PackageVersion Include="MessageBox.Avalonia" Version="12.0.0" />
+    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.6" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="10.0.7" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.4.0" />
     <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.142" />
     <PackageVersion Include="Moq" Version="4.20.72" />
     <PackageVersion Include="NUnit" Version="4.5.0" />
@@ -40,10 +41,11 @@
     <PackageVersion Include="Ookii.Dialogs.Wpf" Version="5.0.1" />
     <PackageVersion Include="ReactiveUI.Fody" Version="19.5.41" />
     <PackageVersion Include="ReactiveUI.Drawing" Version="23.1.8" />
+    <PackageVersion Include="ReactiveUI.SourceGenerators" Version="2.6.1" />
     <PackageVersion Include="System.Linq.Async" Version="7.0.0" />
     <PackageVersion Include="Splat" Version="19.3.1" />
     <PackageVersion Include="Splat.DependencyInjection.SourceGenerator" Version="2.2.2" />
-    <PackageVersion Include="System.Linq.AsyncEnumerable" Version="10.0.3" />
+    <PackageVersion Include="System.Linq.AsyncEnumerable" Version="10.0.7" />
     <PackageVersion Include="TestStack.White.ScreenObjects" Version="0.13.3" />
     <PackageVersion Include="xunit.v3" Version="3.2.2" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
diff --git a/MvvmDialogs.sln b/MvvmDialogs.sln
index 1c3dc06..011eea5 100644
--- a/MvvmDialogs.sln
+++ b/MvvmDialogs.sln
@@ -35,8 +35,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MvvmDialogs.Wpf", "src\Mvvm
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Avalonia", "Avalonia", "{0CAFC532-721B-4CD0-B4CA-AF10F07BFD76}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Demo.ActivateNonModalDialog", "samples\Avalonia\Demo.ActivateNonModalDialog\Demo.ActivateNonModalDialog.csproj", "{696E93F8-4AAE-4230-9B6A-5BA53A69249D}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Demo.CloseNonModalDialog", "samples\Avalonia\Demo.CloseNonModalDialog\Demo.CloseNonModalDialog.csproj", "{26E80F33-67D7-4F29-87E4-DFA45FBCF6B3}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Demo.MessageBox", "samples\Avalonia\Demo.MessageBox\Demo.MessageBox.csproj", "{ADB64CA1-52F9-47B9-AC03-975D2C9E4022}"
@@ -109,6 +107,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Directory.Packages.props = Directory.Packages.props
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Demo.ActivateNonModalDialog.MvvmToolkit", "samples\Avalonia\Demo.ActivateNonModalDialog.MvvmToolkit\Demo.ActivateNonModalDialog.MvvmToolkit.csproj", "{84D06F7E-6381-7653-27C1-4FF4A0232C92}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -363,26 +363,6 @@ Global
 		{32D9C89C-9D88-40F9-A05D-CD95F05F38D0}.Release|x64.Build.0 = Release|Any CPU
 		{32D9C89C-9D88-40F9-A05D-CD95F05F38D0}.Release|x86.ActiveCfg = Release|Any CPU
 		{32D9C89C-9D88-40F9-A05D-CD95F05F38D0}.Release|x86.Build.0 = Release|Any CPU
-		{696E93F8-4AAE-4230-9B6A-5BA53A69249D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{696E93F8-4AAE-4230-9B6A-5BA53A69249D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{696E93F8-4AAE-4230-9B6A-5BA53A69249D}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{696E93F8-4AAE-4230-9B6A-5BA53A69249D}.Debug|ARM.Build.0 = Debug|Any CPU
-		{696E93F8-4AAE-4230-9B6A-5BA53A69249D}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{696E93F8-4AAE-4230-9B6A-5BA53A69249D}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{696E93F8-4AAE-4230-9B6A-5BA53A69249D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{696E93F8-4AAE-4230-9B6A-5BA53A69249D}.Debug|x64.Build.0 = Debug|Any CPU
-		{696E93F8-4AAE-4230-9B6A-5BA53A69249D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{696E93F8-4AAE-4230-9B6A-5BA53A69249D}.Debug|x86.Build.0 = Debug|Any CPU
-		{696E93F8-4AAE-4230-9B6A-5BA53A69249D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{696E93F8-4AAE-4230-9B6A-5BA53A69249D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{696E93F8-4AAE-4230-9B6A-5BA53A69249D}.Release|ARM.ActiveCfg = Release|Any CPU
-		{696E93F8-4AAE-4230-9B6A-5BA53A69249D}.Release|ARM.Build.0 = Release|Any CPU
-		{696E93F8-4AAE-4230-9B6A-5BA53A69249D}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{696E93F8-4AAE-4230-9B6A-5BA53A69249D}.Release|ARM64.Build.0 = Release|Any CPU
-		{696E93F8-4AAE-4230-9B6A-5BA53A69249D}.Release|x64.ActiveCfg = Release|Any CPU
-		{696E93F8-4AAE-4230-9B6A-5BA53A69249D}.Release|x64.Build.0 = Release|Any CPU
-		{696E93F8-4AAE-4230-9B6A-5BA53A69249D}.Release|x86.ActiveCfg = Release|Any CPU
-		{696E93F8-4AAE-4230-9B6A-5BA53A69249D}.Release|x86.Build.0 = Release|Any CPU
 		{26E80F33-67D7-4F29-87E4-DFA45FBCF6B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{26E80F33-67D7-4F29-87E4-DFA45FBCF6B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{26E80F33-67D7-4F29-87E4-DFA45FBCF6B3}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -865,6 +845,7 @@ Global
 		{24D92E73-9429-48AD-A805-25CE7AF84D50}.Release|x86.Build.0 = Release|Any CPU
 		{497C1B3B-3326-45DB-BC0B-76C3EDAA26E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{497C1B3B-3326-45DB-BC0B-76C3EDAA26E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{497C1B3B-3326-45DB-BC0B-76C3EDAA26E0}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
 		{497C1B3B-3326-45DB-BC0B-76C3EDAA26E0}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{497C1B3B-3326-45DB-BC0B-76C3EDAA26E0}.Debug|ARM.Build.0 = Debug|Any CPU
 		{497C1B3B-3326-45DB-BC0B-76C3EDAA26E0}.Debug|ARM64.ActiveCfg = Debug|Any CPU
@@ -1023,6 +1004,26 @@ Global
 		{86D96E8C-F62A-4563-AFEF-1907F9280D7D}.Release|x64.Build.0 = Release|Any CPU
 		{86D96E8C-F62A-4563-AFEF-1907F9280D7D}.Release|x86.ActiveCfg = Release|Any CPU
 		{86D96E8C-F62A-4563-AFEF-1907F9280D7D}.Release|x86.Build.0 = Release|Any CPU
+		{84D06F7E-6381-7653-27C1-4FF4A0232C92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{84D06F7E-6381-7653-27C1-4FF4A0232C92}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{84D06F7E-6381-7653-27C1-4FF4A0232C92}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{84D06F7E-6381-7653-27C1-4FF4A0232C92}.Debug|ARM.Build.0 = Debug|Any CPU
+		{84D06F7E-6381-7653-27C1-4FF4A0232C92}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{84D06F7E-6381-7653-27C1-4FF4A0232C92}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{84D06F7E-6381-7653-27C1-4FF4A0232C92}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{84D06F7E-6381-7653-27C1-4FF4A0232C92}.Debug|x64.Build.0 = Debug|Any CPU
+		{84D06F7E-6381-7653-27C1-4FF4A0232C92}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{84D06F7E-6381-7653-27C1-4FF4A0232C92}.Debug|x86.Build.0 = Debug|Any CPU
+		{84D06F7E-6381-7653-27C1-4FF4A0232C92}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{84D06F7E-6381-7653-27C1-4FF4A0232C92}.Release|Any CPU.Build.0 = Release|Any CPU
+		{84D06F7E-6381-7653-27C1-4FF4A0232C92}.Release|ARM.ActiveCfg = Release|Any CPU
+		{84D06F7E-6381-7653-27C1-4FF4A0232C92}.Release|ARM.Build.0 = Release|Any CPU
+		{84D06F7E-6381-7653-27C1-4FF4A0232C92}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{84D06F7E-6381-7653-27C1-4FF4A0232C92}.Release|ARM64.Build.0 = Release|Any CPU
+		{84D06F7E-6381-7653-27C1-4FF4A0232C92}.Release|x64.ActiveCfg = Release|Any CPU
+		{84D06F7E-6381-7653-27C1-4FF4A0232C92}.Release|x64.Build.0 = Release|Any CPU
+		{84D06F7E-6381-7653-27C1-4FF4A0232C92}.Release|x86.ActiveCfg = Release|Any CPU
+		{84D06F7E-6381-7653-27C1-4FF4A0232C92}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1042,7 +1043,6 @@ Global
 		{E14F830F-2A00-46D0-B25B-B3D675E86B02} = {958591BB-32C1-48C4-B5FA-11A2C5686814}
 		{32D9C89C-9D88-40F9-A05D-CD95F05F38D0} = {958591BB-32C1-48C4-B5FA-11A2C5686814}
 		{0CAFC532-721B-4CD0-B4CA-AF10F07BFD76} = {62592C78-61AA-44B4-A7C3-EAC678A568A2}
-		{696E93F8-4AAE-4230-9B6A-5BA53A69249D} = {0CAFC532-721B-4CD0-B4CA-AF10F07BFD76}
 		{26E80F33-67D7-4F29-87E4-DFA45FBCF6B3} = {0CAFC532-721B-4CD0-B4CA-AF10F07BFD76}
 		{ADB64CA1-52F9-47B9-AC03-975D2C9E4022} = {0CAFC532-721B-4CD0-B4CA-AF10F07BFD76}
 		{89BFF856-E543-4EB5-B443-78B30D818D57} = {0CAFC532-721B-4CD0-B4CA-AF10F07BFD76}
@@ -1076,6 +1076,7 @@ Global
 		{3D577143-DEEA-42A4-B261-9A0846E537EF} = {0A8EF671-0277-4F7A-B03D-C6E227020E86}
 		{C9971FF8-3695-457F-8A78-CBDD098617D7} = {958591BB-32C1-48C4-B5FA-11A2C5686814}
 		{86D96E8C-F62A-4563-AFEF-1907F9280D7D} = {0CAFC532-721B-4CD0-B4CA-AF10F07BFD76}
+		{84D06F7E-6381-7653-27C1-4FF4A0232C92} = {0CAFC532-721B-4CD0-B4CA-AF10F07BFD76}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {983A22B3-AE5B-4B67-A798-F6A6697B82A8}
diff --git a/samples/Avalonia/CrossPlatform/Demo.CrossPlatform.Android/Demo.CrossPlatform.Android.csproj b/samples/Avalonia/CrossPlatform/Demo.CrossPlatform.Android/Demo.CrossPlatform.Android.csproj
index 1fbef4e..7c81a20 100644
--- a/samples/Avalonia/CrossPlatform/Demo.CrossPlatform.Android/Demo.CrossPlatform.Android.csproj
+++ b/samples/Avalonia/CrossPlatform/Demo.CrossPlatform.Android/Demo.CrossPlatform.Android.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net10.0-android36.0</TargetFramework>
-    <SupportedOSPlatformVersion>21.0</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion>23.0</SupportedOSPlatformVersion>
     <Nullable>enable</Nullable>
     <ApplicationId>com.CompanyName.Avalonia11</ApplicationId>
     <ApplicationVersion>1</ApplicationVersion>
diff --git a/samples/Avalonia/CrossPlatform/Demo.CrossPlatform.Android/MainActivity.cs b/samples/Avalonia/CrossPlatform/Demo.CrossPlatform.Android/MainActivity.cs
index d860710..40bbc67 100644
--- a/samples/Avalonia/CrossPlatform/Demo.CrossPlatform.Android/MainActivity.cs
+++ b/samples/Avalonia/CrossPlatform/Demo.CrossPlatform.Android/MainActivity.cs
@@ -1,22 +1,33 @@
-using Android.App;
+using System;
+using Android.App;
 using Android.Content.PM;
+using Android.Runtime;
 using Avalonia;
 using Avalonia.Android;
 using ReactiveUI.Avalonia;
 
 namespace Demo.CrossPlatform.Android;
 
-[Activity(
-    Label = "Avalonia11.Android",
-    Theme = "@style/MyTheme.NoActionBar",
-    Icon = "@drawable/icon",
-    MainLauncher = true,
-    ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize | ConfigChanges.UiMode)]
-public class MainActivity : AvaloniaMainActivity<App>
+[Application]
+public class MainApplication : AvaloniaAndroidApplication<App>
 {
+    protected MainApplication(IntPtr javaReference, JniHandleOwnership transfer) : base(javaReference, transfer)
+    {
+    }
     protected override AppBuilder CustomizeAppBuilder(AppBuilder builder)
     {
         return base.CustomizeAppBuilder(builder)
             .UseReactiveUI(rxui => { });
     }
 }
+
+[Activity(
+    Label = "Avalonia12.Android",
+    Theme = "@style/MyTheme.NoActionBar",
+    Icon = "@drawable/icon",
+    MainLauncher = true,
+    ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize | ConfigChanges.UiMode)]
+public class MainActivity : AvaloniaMainActivity
+{
+
+}
diff --git a/samples/Avalonia/CrossPlatform/Demo.CrossPlatform.Desktop/Demo.CrossPlatform.Desktop.csproj b/samples/Avalonia/CrossPlatform/Demo.CrossPlatform.Desktop/Demo.CrossPlatform.Desktop.csproj
index 384b381..b47b2e4 100644
--- a/samples/Avalonia/CrossPlatform/Demo.CrossPlatform.Desktop/Demo.CrossPlatform.Desktop.csproj
+++ b/samples/Avalonia/CrossPlatform/Demo.CrossPlatform.Desktop/Demo.CrossPlatform.Desktop.csproj
@@ -13,9 +13,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia.Desktop"/>
+    <PackageReference Include="Avalonia.Desktop" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics"/>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/Avalonia/CrossPlatform/Demo.CrossPlatform.iOS/AppDelegate.cs b/samples/Avalonia/CrossPlatform/Demo.CrossPlatform.iOS/AppDelegate.cs
index 36eebaa..df66511 100644
--- a/samples/Avalonia/CrossPlatform/Demo.CrossPlatform.iOS/AppDelegate.cs
+++ b/samples/Avalonia/CrossPlatform/Demo.CrossPlatform.iOS/AppDelegate.cs
@@ -1,7 +1,7 @@
 using Avalonia;
 using Avalonia.iOS;
-using Avalonia.ReactiveUI;
 using Foundation;
+using ReactiveUI.Avalonia;
 
 namespace Demo.CrossPlatform.iOS;
 
@@ -13,6 +13,6 @@ public partial class AppDelegate : AvaloniaAppDelegate<App>
 {
     protected override AppBuilder CustomizeAppBuilder(AppBuilder builder)
     {
-        return builder.UseReactiveUI();
+        return builder.UseReactiveUI(rxgui => { });
     }
 }
diff --git a/samples/Avalonia/CrossPlatform/Demo.CrossPlatform.iOS/Demo.CrossPlatform.iOS.csproj b/samples/Avalonia/CrossPlatform/Demo.CrossPlatform.iOS/Demo.CrossPlatform.iOS.csproj
index fdd5bdc..1e8df8c 100644
--- a/samples/Avalonia/CrossPlatform/Demo.CrossPlatform.iOS/Demo.CrossPlatform.iOS.csproj
+++ b/samples/Avalonia/CrossPlatform/Demo.CrossPlatform.iOS/Demo.CrossPlatform.iOS.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net10.0-ios18.0</TargetFramework>
+    <TargetFramework>net10.0-ios26.0</TargetFramework>
     <SupportedOSPlatformVersion>13.0</SupportedOSPlatformVersion>
     <ProvisioningType>manual</ProvisioningType>
     <Nullable>enable</Nullable>
diff --git a/samples/Avalonia/CrossPlatform/Demo.CrossPlatform/App.axaml.cs b/samples/Avalonia/CrossPlatform/Demo.CrossPlatform/App.axaml.cs
index 1a6ffb8..3dbca27 100644
--- a/samples/Avalonia/CrossPlatform/Demo.CrossPlatform/App.axaml.cs
+++ b/samples/Avalonia/CrossPlatform/Demo.CrossPlatform/App.axaml.cs
@@ -1,4 +1,5 @@
-using Avalonia.Markup.Xaml;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Markup.Xaml;
 using Demo.CrossPlatform.Services;
 using Demo.CrossPlatform.ViewModels;
 using HanumanInstitute.MvvmDialogs;
@@ -34,7 +35,6 @@ public override void Initialize()
     public override void OnFrameworkInitializationCompleted()
     {
         DialogService.Show(null, MainViewModel);
-
         base.OnFrameworkInitializationCompleted();
     }
 
diff --git a/samples/Avalonia/CrossPlatform/Demo.CrossPlatform/Demo.CrossPlatform.csproj b/samples/Avalonia/CrossPlatform/Demo.CrossPlatform/Demo.CrossPlatform.csproj
index d04f1a7..341b3bb 100644
--- a/samples/Avalonia/CrossPlatform/Demo.CrossPlatform/Demo.CrossPlatform.csproj
+++ b/samples/Avalonia/CrossPlatform/Demo.CrossPlatform/Demo.CrossPlatform.csproj
@@ -11,13 +11,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia"/>
-    <PackageReference Include="Avalonia.Themes.Fluent"/>
+    <PackageReference Include="Avalonia" />
+    <PackageReference Include="Avalonia.Themes.Fluent" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug"/>
-    <PackageReference Include="ReactiveUI.Fody"/>
-    <PackageReference Include="ReactiveUI.Avalonia"/>
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" />
+    <PackageReference Include="ReactiveUI.Avalonia" />
+    <PackageReference Include="ReactiveUI.SourceGenerators">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Splat.DependencyInjection.SourceGenerator">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/samples/Avalonia/CrossPlatform/Demo.CrossPlatform/Services/StorageService.cs b/samples/Avalonia/CrossPlatform/Demo.CrossPlatform/Services/StorageService.cs
index 37763c3..386023a 100644
--- a/samples/Avalonia/CrossPlatform/Demo.CrossPlatform/Services/StorageService.cs
+++ b/samples/Avalonia/CrossPlatform/Demo.CrossPlatform/Services/StorageService.cs
@@ -32,8 +32,7 @@ public class StorageService : IStorageService
         }
         if (app?.ApplicationLifetime is ISingleViewApplicationLifetime viewApp)
         {
-            var visualRoot = viewApp.MainView?.GetVisualRoot();
-            return visualRoot as TopLevel;
+            return TopLevel.GetTopLevel(viewApp.MainView);
         }
         return null;
     }
diff --git a/samples/Avalonia/CrossPlatform/Demo.CrossPlatform/ViewModels/ConfirmCloseViewModel.cs b/samples/Avalonia/CrossPlatform/Demo.CrossPlatform/ViewModels/ConfirmCloseViewModel.cs
index eaf7f59..46f06c6 100644
--- a/samples/Avalonia/CrossPlatform/Demo.CrossPlatform/ViewModels/ConfirmCloseViewModel.cs
+++ b/samples/Avalonia/CrossPlatform/Demo.CrossPlatform/ViewModels/ConfirmCloseViewModel.cs
@@ -3,11 +3,11 @@
 using HanumanInstitute.MvvmDialogs;
 using HanumanInstitute.MvvmDialogs.FrameworkDialogs;
 using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
+using ReactiveUI.SourceGenerators;
 
 namespace Demo.CrossPlatform.ViewModels;
 
-public class ConfirmCloseViewModel : ViewModelBase, IModalDialogViewModel, IViewClosing, IViewLoaded, ICloseable
+public partial class ConfirmCloseViewModel : ViewModelBase, IModalDialogViewModel, IViewClosing, IViewLoaded, ICloseable
 {
     private readonly IDialogService _dialogService;
     public event EventHandler? RequestClose;
@@ -20,7 +20,7 @@ public ConfirmCloseViewModel(IDialogService dialogService)
     }
 
     [Reactive]
-    public string Text { get; set; } = string.Empty;
+    public partial string Text { get; set; } = string.Empty;
 
     public RxCommandUnit Close { get; }
 
diff --git a/samples/Avalonia/CrossPlatform/Demo.CrossPlatform/ViewModels/MainViewModel.cs b/samples/Avalonia/CrossPlatform/Demo.CrossPlatform/ViewModels/MainViewModel.cs
index b9067de..f96caf1 100644
--- a/samples/Avalonia/CrossPlatform/Demo.CrossPlatform/ViewModels/MainViewModel.cs
+++ b/samples/Avalonia/CrossPlatform/Demo.CrossPlatform/ViewModels/MainViewModel.cs
@@ -8,11 +8,11 @@
 using HanumanInstitute.MvvmDialogs.FileSystem;
 using HanumanInstitute.MvvmDialogs.FrameworkDialogs;
 using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
+using ReactiveUI.SourceGenerators;
 
 namespace Demo.CrossPlatform.ViewModels;
 
-public class MainViewModel : ViewModelBase
+public partial class MainViewModel : ViewModelBase
 {
     private readonly IDialogService _dialogService;
     private readonly IStorageService _storage;
@@ -39,7 +39,7 @@ public MainViewModel(IDialogService dialogService, IStorageService storage)
     }
 
     [Reactive]
-    public string? Output { get; set; }
+    public partial string? Output { get; set; }
 
     private CurrentTimeViewModel? _dialogViewModel;
     protected CurrentTimeViewModel? DialogViewModel
diff --git a/samples/Avalonia/CrossPlatform/Demo.CrossPlatform/Views/ConfirmCloseView.axaml b/samples/Avalonia/CrossPlatform/Demo.CrossPlatform/Views/ConfirmCloseView.axaml
index 9e9b982..e0b6874 100644
--- a/samples/Avalonia/CrossPlatform/Demo.CrossPlatform/Views/ConfirmCloseView.axaml
+++ b/samples/Avalonia/CrossPlatform/Demo.CrossPlatform/Views/ConfirmCloseView.axaml
@@ -3,9 +3,10 @@
              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:Demo.CrossPlatform.ViewModels"
              xmlns:local="clr-namespace:Demo.CrossPlatform"
              mc:Ignorable="d"
-             d:DataContext="{x:Static local:App.ConfirmCloseViewModel}">
+             d:DataContext="{x:Static local:App.ConfirmCloseViewModel}" x:DataType="viewmodels:ConfirmCloseViewModel">
     <Grid>
         <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center"
                    Text="{Binding Text}" />
diff --git a/samples/Avalonia/CrossPlatform/Demo.CrossPlatform/Views/ConfirmCloseWindow.axaml.cs b/samples/Avalonia/CrossPlatform/Demo.CrossPlatform/Views/ConfirmCloseWindow.axaml.cs
index 34d8d3a..6edc425 100644
--- a/samples/Avalonia/CrossPlatform/Demo.CrossPlatform/Views/ConfirmCloseWindow.axaml.cs
+++ b/samples/Avalonia/CrossPlatform/Demo.CrossPlatform/Views/ConfirmCloseWindow.axaml.cs
@@ -8,9 +8,6 @@ public partial class ConfirmCloseWindow : Window
     public ConfirmCloseWindow()
     {
         InitializeComponent();
-#if DEBUG
-        this.AttachDevTools();
-#endif
     }
 
     private void InitializeComponent()
diff --git a/samples/Avalonia/CrossPlatform/Demo.CrossPlatform/Views/CurrentTimeView.axaml b/samples/Avalonia/CrossPlatform/Demo.CrossPlatform/Views/CurrentTimeView.axaml
index 1d18d4a..6640d81 100644
--- a/samples/Avalonia/CrossPlatform/Demo.CrossPlatform/Views/CurrentTimeView.axaml
+++ b/samples/Avalonia/CrossPlatform/Demo.CrossPlatform/Views/CurrentTimeView.axaml
@@ -3,9 +3,9 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:local="clr-namespace:Demo.CrossPlatform"
+             xmlns:local="clr-namespace:Demo.CrossPlatform" xmlns:viewmodels="using:Demo.CrossPlatform.ViewModels"
              mc:Ignorable="d"
-             d:DataContext="{x:Static local:App.CurrentTimeViewModel}">
+             d:DataContext="{x:Static local:App.CurrentTimeViewModel}" x:DataType="viewmodels:CurrentTimeViewModel">
     <Grid>
         <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center"
                    Text="{Binding CurrentTime, StringFormat=Current time is {0:HH:mm:ss}}" />
diff --git a/samples/Avalonia/CrossPlatform/Demo.CrossPlatform/Views/CurrentTimeWindow.axaml.cs b/samples/Avalonia/CrossPlatform/Demo.CrossPlatform/Views/CurrentTimeWindow.axaml.cs
index 8c15feb..a42fa91 100644
--- a/samples/Avalonia/CrossPlatform/Demo.CrossPlatform/Views/CurrentTimeWindow.axaml.cs
+++ b/samples/Avalonia/CrossPlatform/Demo.CrossPlatform/Views/CurrentTimeWindow.axaml.cs
@@ -8,9 +8,6 @@ public partial class CurrentTimeWindow : Window
     public CurrentTimeWindow()
     {
         InitializeComponent();
-#if DEBUG
-        this.AttachDevTools();
-#endif
     }
 
     private void InitializeComponent()
diff --git a/samples/Avalonia/CrossPlatform/Demo.CrossPlatform/Views/MainView.axaml b/samples/Avalonia/CrossPlatform/Demo.CrossPlatform/Views/MainView.axaml
index e6837c4..f2b1ad7 100644
--- a/samples/Avalonia/CrossPlatform/Demo.CrossPlatform/Views/MainView.axaml
+++ b/samples/Avalonia/CrossPlatform/Demo.CrossPlatform/Views/MainView.axaml
@@ -3,10 +3,10 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:viewModels="clr-namespace:Demo.CrossPlatform.ViewModels"
-             xmlns:local="clr-namespace:Demo.CrossPlatform"
+             xmlns:local="clr-namespace:Demo.CrossPlatform" xmlns:viewmodels="using:Demo.CrossPlatform.ViewModels"
              mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450"
              x:Class="Demo.CrossPlatform.Views.MainView"
-             d:DataContext="{x:Static local:App.MainViewModel}">
+             d:DataContext="{x:Static local:App.MainViewModel}" x:DataType="viewmodels:MainViewModel">
 
     <Grid ColumnDefinitions="250,*">
         <ScrollViewer HorizontalScrollBarVisibility="Hidden">
diff --git a/samples/Avalonia/Demo.ActivateNonModalDialog.MvvmToolkit/App.axaml.cs b/samples/Avalonia/Demo.ActivateNonModalDialog.MvvmToolkit/App.axaml.cs
index 48743b0..5847276 100755
--- a/samples/Avalonia/Demo.ActivateNonModalDialog.MvvmToolkit/App.axaml.cs
+++ b/samples/Avalonia/Demo.ActivateNonModalDialog.MvvmToolkit/App.axaml.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Avalonia;
 using Avalonia.Markup.Xaml;
 using HanumanInstitute.MvvmDialogs;
diff --git a/samples/Avalonia/Demo.ActivateNonModalDialog.MvvmToolkit/CurrentTimeDialog.axaml b/samples/Avalonia/Demo.ActivateNonModalDialog.MvvmToolkit/CurrentTimeDialog.axaml
index 621bc02..50da6ad 100755
--- a/samples/Avalonia/Demo.ActivateNonModalDialog.MvvmToolkit/CurrentTimeDialog.axaml
+++ b/samples/Avalonia/Demo.ActivateNonModalDialog.MvvmToolkit/CurrentTimeDialog.axaml
@@ -12,7 +12,7 @@
     Width="200"
     Height="100"
     CanResize="False"
-    d:DataContext="{x:Static local:App.CurrentTimeDialog}">
+    d:DataContext="{x:Static local:App.CurrentTimeDialog}" x:DataType="local:CurrentTimeDialogViewModel">
 
     <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center"
                Text="{Binding CurrentTime, StringFormat=Current time is {0:HH:mm:ss}}" />
diff --git a/samples/Avalonia/Demo.ActivateNonModalDialog.MvvmToolkit/CurrentTimeDialog.axaml.cs b/samples/Avalonia/Demo.ActivateNonModalDialog.MvvmToolkit/CurrentTimeDialog.axaml.cs
index 96120db..0ea06ef 100755
--- a/samples/Avalonia/Demo.ActivateNonModalDialog.MvvmToolkit/CurrentTimeDialog.axaml.cs
+++ b/samples/Avalonia/Demo.ActivateNonModalDialog.MvvmToolkit/CurrentTimeDialog.axaml.cs
@@ -9,9 +9,6 @@ public partial class CurrentTimeDialog : Window
     public CurrentTimeDialog()
     {
         InitializeComponent();
-#if DEBUG
-        this.AttachDevTools();
-#endif
     }
 
     private void InitializeComponent() => AvaloniaXamlLoader.Load(this);
diff --git a/samples/Avalonia/Demo.ActivateNonModalDialog.MvvmToolkit/Demo.ActivateNonModalDialog.MvvmToolkit.csproj b/samples/Avalonia/Demo.ActivateNonModalDialog.MvvmToolkit/Demo.ActivateNonModalDialog.MvvmToolkit.csproj
index 9a90e86..ffd115f 100755
--- a/samples/Avalonia/Demo.ActivateNonModalDialog.MvvmToolkit/Demo.ActivateNonModalDialog.MvvmToolkit.csproj
+++ b/samples/Avalonia/Demo.ActivateNonModalDialog.MvvmToolkit/Demo.ActivateNonModalDialog.MvvmToolkit.csproj
@@ -9,13 +9,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia"/>
-    <PackageReference Include="Avalonia.Desktop"/>
+    <PackageReference Include="Avalonia" />
+    <PackageReference Include="Avalonia.Desktop" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics"/>
-    <PackageReference Include="Avalonia.Themes.Fluent"/>
+    <PackageReference Include="Avalonia.Themes.Fluent" />
     <PackageReference Include="CommunityToolkit.Mvvm" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug"/>
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\src\MvvmDialogs.Avalonia\MvvmDialogs.Avalonia.csproj" />
diff --git a/samples/Avalonia/Demo.ActivateNonModalDialog.MvvmToolkit/MainWindow.axaml b/samples/Avalonia/Demo.ActivateNonModalDialog.MvvmToolkit/MainWindow.axaml
index 90d3e8e..b2e2132 100755
--- a/samples/Avalonia/Demo.ActivateNonModalDialog.MvvmToolkit/MainWindow.axaml
+++ b/samples/Avalonia/Demo.ActivateNonModalDialog.MvvmToolkit/MainWindow.axaml
@@ -10,7 +10,7 @@
     Title="Demo - Activate Non-Modal Dialog"
     Width="300"
     Height="200"
-    d:DataContext="{x:Static local:App.MainWindow}">
+    d:DataContext="{x:Static local:App.MainWindow}" x:DataType="local:MainWindowViewModel">
 
     <UniformGrid Rows="2">
         <Button
diff --git a/samples/Avalonia/Demo.ActivateNonModalDialog.MvvmToolkit/MainWindow.axaml.cs b/samples/Avalonia/Demo.ActivateNonModalDialog.MvvmToolkit/MainWindow.axaml.cs
index 6e16b27..379066b 100755
--- a/samples/Avalonia/Demo.ActivateNonModalDialog.MvvmToolkit/MainWindow.axaml.cs
+++ b/samples/Avalonia/Demo.ActivateNonModalDialog.MvvmToolkit/MainWindow.axaml.cs
@@ -9,9 +9,6 @@ public partial class MainWindow : Window
     public MainWindow()
     {
         InitializeComponent();
-#if DEBUG
-        this.AttachDevTools();
-#endif
     }
 
     private void InitializeComponent() => AvaloniaXamlLoader.Load(this);
diff --git a/samples/Avalonia/Demo.CloseNonModalDialog/App.axaml.cs b/samples/Avalonia/Demo.CloseNonModalDialog/App.axaml.cs
index 5460310..d8cb026 100755
--- a/samples/Avalonia/Demo.CloseNonModalDialog/App.axaml.cs
+++ b/samples/Avalonia/Demo.CloseNonModalDialog/App.axaml.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
diff --git a/samples/Avalonia/Demo.CloseNonModalDialog/CurrentTimeDialog.axaml b/samples/Avalonia/Demo.CloseNonModalDialog/CurrentTimeDialog.axaml
index aef00af..ef4f66e 100755
--- a/samples/Avalonia/Demo.CloseNonModalDialog/CurrentTimeDialog.axaml
+++ b/samples/Avalonia/Demo.CloseNonModalDialog/CurrentTimeDialog.axaml
@@ -12,8 +12,11 @@
     Width="200"
     Height="100"
     CanResize="False"
-    d:DataContext="{x:Static local:App.CurrentTimeDialog}">
+    d:DataContext="{x:Static local:App.CurrentTimeDialog}"
+    x:DataType="local:CurrentTimeDialogViewModel">
 
-    <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center"
+    <Grid>
+        <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center"
                Text="{Binding CurrentTime, StringFormat=Current time is {0:HH:mm:ss}}" />
+    </Grid>
 </Window>
diff --git a/samples/Avalonia/Demo.CloseNonModalDialog/CurrentTimeDialog.axaml.cs b/samples/Avalonia/Demo.CloseNonModalDialog/CurrentTimeDialog.axaml.cs
index d66f5d0..e857dd6 100755
--- a/samples/Avalonia/Demo.CloseNonModalDialog/CurrentTimeDialog.axaml.cs
+++ b/samples/Avalonia/Demo.CloseNonModalDialog/CurrentTimeDialog.axaml.cs
@@ -9,9 +9,6 @@ public partial class CurrentTimeDialog : Window
     public CurrentTimeDialog()
     {
         InitializeComponent();
-#if DEBUG
-        this.AttachDevTools();
-#endif
     }
 
     private void InitializeComponent() => AvaloniaXamlLoader.Load(this);
diff --git a/samples/Avalonia/Demo.CloseNonModalDialog/Demo.CloseNonModalDialog.csproj b/samples/Avalonia/Demo.CloseNonModalDialog/Demo.CloseNonModalDialog.csproj
index 3321b60..ca767f4 100755
--- a/samples/Avalonia/Demo.CloseNonModalDialog/Demo.CloseNonModalDialog.csproj
+++ b/samples/Avalonia/Demo.CloseNonModalDialog/Demo.CloseNonModalDialog.csproj
@@ -8,13 +8,12 @@
     <RootNamespace>Demo.Avalonia.CloseNonModalDialog</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia"/>
-    <PackageReference Include="Avalonia.Desktop"/>
+    <PackageReference Include="Avalonia" />
+    <PackageReference Include="Avalonia.Desktop" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics"/>
-    <PackageReference Include="Avalonia.Themes.Fluent"/>
-    <PackageReference Include="ReactiveUI.Avalonia"/>
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug"/>
+    <PackageReference Include="Avalonia.Themes.Fluent" />
+    <PackageReference Include="ReactiveUI.Avalonia" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" />
     <PackageReference Include="Splat.DependencyInjection.SourceGenerator">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/samples/Avalonia/Demo.CloseNonModalDialog/MainWindow.axaml b/samples/Avalonia/Demo.CloseNonModalDialog/MainWindow.axaml
index f3af839..260c223 100755
--- a/samples/Avalonia/Demo.CloseNonModalDialog/MainWindow.axaml
+++ b/samples/Avalonia/Demo.CloseNonModalDialog/MainWindow.axaml
@@ -10,7 +10,7 @@
     Title="Demo - Activate Non-Modal Dialog"
     Width="300"
     Height="200"
-    d:DataContext="{x:Static local:App.MainWindow}">
+    d:DataContext="{x:Static local:App.MainWindow}" x:DataType="local:MainWindowViewModel">
 
     <UniformGrid Rows="2">
         <Button
diff --git a/samples/Avalonia/Demo.CloseNonModalDialog/MainWindow.axaml.cs b/samples/Avalonia/Demo.CloseNonModalDialog/MainWindow.axaml.cs
index dd5a74e..4d4fbe5 100755
--- a/samples/Avalonia/Demo.CloseNonModalDialog/MainWindow.axaml.cs
+++ b/samples/Avalonia/Demo.CloseNonModalDialog/MainWindow.axaml.cs
@@ -9,9 +9,6 @@ public partial class MainWindow : Window
     public MainWindow()
     {
         InitializeComponent();
-#if DEBUG
-        this.AttachDevTools();
-#endif
     }
 
     private void InitializeComponent() => AvaloniaXamlLoader.Load(this);
diff --git a/samples/Avalonia/Demo.CustomOpenFolderDialog/Demo.CustomOpenFolderDialog.csproj b/samples/Avalonia/Demo.CustomOpenFolderDialog/Demo.CustomOpenFolderDialog.csproj
index e6fcc0d..633ee86 100755
--- a/samples/Avalonia/Demo.CustomOpenFolderDialog/Demo.CustomOpenFolderDialog.csproj
+++ b/samples/Avalonia/Demo.CustomOpenFolderDialog/Demo.CustomOpenFolderDialog.csproj
@@ -18,14 +18,13 @@
     <None Remove=".gitignore" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia"/>
-    <PackageReference Include="Avalonia.Desktop"/>
+    <PackageReference Include="Avalonia" />
+    <PackageReference Include="Avalonia.Desktop" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics"/>
-    <PackageReference Include="Avalonia.Themes.Fluent"/>
-    <PackageReference Include="ReactiveUI.Avalonia"/>
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug"/>
-    <PackageReference Include="Ookii.Dialogs.WinForms"/>
+    <PackageReference Include="Avalonia.Themes.Fluent" />
+    <PackageReference Include="ReactiveUI.Avalonia" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" />
+    <PackageReference Include="Ookii.Dialogs.WinForms" />
     <PackageReference Include="Splat.DependencyInjection.SourceGenerator">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/samples/Avalonia/Demo.CustomOpenFolderDialog/MainWindow.axaml b/samples/Avalonia/Demo.CustomOpenFolderDialog/MainWindow.axaml
index c41416f..6df32a5 100755
--- a/samples/Avalonia/Demo.CustomOpenFolderDialog/MainWindow.axaml
+++ b/samples/Avalonia/Demo.CustomOpenFolderDialog/MainWindow.axaml
@@ -9,7 +9,7 @@
     Title="Demo - Custom Folder Browser Dialog"
     Width="300"
     Height="200"
-    d:DataContext="{x:Static local:App.MainWindow}">
+    d:DataContext="{x:Static local:App.MainWindow}" x:DataType="local:MainWindowViewModel">
 
     <Grid VerticalAlignment="Center">
         <Grid.ColumnDefinitions>
diff --git a/samples/Avalonia/Demo.CustomOpenFolderDialog/MainWindow.axaml.cs b/samples/Avalonia/Demo.CustomOpenFolderDialog/MainWindow.axaml.cs
index ffbb4a3..9c24900 100755
--- a/samples/Avalonia/Demo.CustomOpenFolderDialog/MainWindow.axaml.cs
+++ b/samples/Avalonia/Demo.CustomOpenFolderDialog/MainWindow.axaml.cs
@@ -1,4 +1,4 @@
-using Avalonia;
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
@@ -9,9 +9,6 @@ public partial class MainWindow : Window
     public MainWindow()
     {
         InitializeComponent();
-#if DEBUG
-        this.AttachDevTools();
-#endif
     }
 
     private void InitializeComponent()
diff --git a/samples/Avalonia/Demo.DialogHost/App.axaml.cs b/samples/Avalonia/Demo.DialogHost/App.axaml.cs
index 43e91aa..51c54d2 100755
--- a/samples/Avalonia/Demo.DialogHost/App.axaml.cs
+++ b/samples/Avalonia/Demo.DialogHost/App.axaml.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Avalonia;
 using Avalonia.Markup.Xaml;
 using HanumanInstitute.MvvmDialogs;
diff --git a/samples/Avalonia/Demo.DialogHost/AskTextBoxView.axaml b/samples/Avalonia/Demo.DialogHost/AskTextBoxView.axaml
index 35e2c3f..e5d47f5 100644
--- a/samples/Avalonia/Demo.DialogHost/AskTextBoxView.axaml
+++ b/samples/Avalonia/Demo.DialogHost/AskTextBoxView.axaml
@@ -6,7 +6,7 @@
              xmlns:dialogHost="clr-namespace:DialogHostAvalonia;assembly=DialogHost.Avalonia"
              mc:Ignorable="d" d:DesignWidth="300" d:DesignHeight="130"
              x:Class="Demo.Avalonia.DialogHost.AskTextBoxView" Padding="10"
-             d:DataContext="{x:Static local:App.AskTextBox}">
+             d:DataContext="{x:Static local:App.AskTextBox}" x:DataType="local:AskTextBoxViewModel">
     <StackPanel Orientation="Vertical">
         <TextBlock Text="{Binding Title}" />
         <TextBox Height="24" Margin="0,10,0,20" Text="{Binding Text}" />
diff --git a/samples/Avalonia/Demo.DialogHost/AskTextBoxViewModel.cs b/samples/Avalonia/Demo.DialogHost/AskTextBoxViewModel.cs
index 4b06aed..69070c0 100644
--- a/samples/Avalonia/Demo.DialogHost/AskTextBoxViewModel.cs
+++ b/samples/Avalonia/Demo.DialogHost/AskTextBoxViewModel.cs
@@ -2,20 +2,20 @@
 using System.Reactive;
 using HanumanInstitute.MvvmDialogs;
 using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
+using ReactiveUI.SourceGenerators;
 
 namespace Demo.Avalonia.DialogHost;
 
-public class AskTextBoxViewModel : ViewModelBase, IModalDialogViewModel, ICloseable
+public partial class AskTextBoxViewModel : ViewModelBase, IModalDialogViewModel, ICloseable
 {
     public event EventHandler? RequestClose;
     public bool? DialogResult { get; set; }
 
     [Reactive]
-    public string Title { get; set; } = "Title";
+    public partial string Title { get; set; } = "Title";
 
     [Reactive]
-    public string Text { get; set; } = string.Empty;
+    public partial string Text { get; set; } = string.Empty;
 
     public ReactiveCommand<Unit, Unit> Ok => _ok ??= ReactiveCommand.Create(OkImpl);
     private ReactiveCommand<Unit, Unit>? _ok;
diff --git a/samples/Avalonia/Demo.DialogHost/CurrentTimeView.axaml b/samples/Avalonia/Demo.DialogHost/CurrentTimeView.axaml
index 1a854cd..4559f03 100755
--- a/samples/Avalonia/Demo.DialogHost/CurrentTimeView.axaml
+++ b/samples/Avalonia/Demo.DialogHost/CurrentTimeView.axaml
@@ -9,7 +9,7 @@
     mc:Ignorable="d"
     Width="200"
     Height="100"
-    d:DataContext="{x:Static local:App.CurrentTime}">
+    d:DataContext="{x:Static local:App.CurrentTime}" x:DataType="local:CurrentTimeViewModel">
     <Grid>
         <TextBlock
             HorizontalAlignment="Center"
diff --git a/samples/Avalonia/Demo.DialogHost/Demo.DialogHost.csproj b/samples/Avalonia/Demo.DialogHost/Demo.DialogHost.csproj
index e386d4d..14b8be0 100755
--- a/samples/Avalonia/Demo.DialogHost/Demo.DialogHost.csproj
+++ b/samples/Avalonia/Demo.DialogHost/Demo.DialogHost.csproj
@@ -21,14 +21,16 @@
     <None Remove=".gitignore" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia"/>
-    <PackageReference Include="Avalonia.Desktop"/>
+    <PackageReference Include="Avalonia" />
+    <PackageReference Include="Avalonia.Desktop" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics"/>
-    <PackageReference Include="Avalonia.Themes.Fluent"/>
-    <PackageReference Include="ReactiveUI.Avalonia"/>
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug"/>
-    <PackageReference Include="ReactiveUI.Fody"/>
+    <PackageReference Include="Avalonia.Themes.Fluent" />
+    <PackageReference Include="ReactiveUI.Avalonia" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" />
+    <PackageReference Include="ReactiveUI.SourceGenerators">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Splat.DependencyInjection.SourceGenerator">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/samples/Avalonia/Demo.DialogHost/MainView.axaml b/samples/Avalonia/Demo.DialogHost/MainView.axaml
index b8b2462..b9161dd 100755
--- a/samples/Avalonia/Demo.DialogHost/MainView.axaml
+++ b/samples/Avalonia/Demo.DialogHost/MainView.axaml
@@ -10,7 +10,7 @@
         Title="Demo - DialogHost"
         Width="440"
         Height="300"
-        d:DataContext="{x:Static local:App.Main}">
+        d:DataContext="{x:Static local:App.Main}" x:DataType="local:MainViewModel">
     <UniformGrid Rows="3">
         <Button
             Command="{Binding ShowViewModel}">
diff --git a/samples/Avalonia/Demo.DialogHost/MainView.axaml.cs b/samples/Avalonia/Demo.DialogHost/MainView.axaml.cs
index fc35e63..0090e5d 100755
--- a/samples/Avalonia/Demo.DialogHost/MainView.axaml.cs
+++ b/samples/Avalonia/Demo.DialogHost/MainView.axaml.cs
@@ -9,9 +9,6 @@ public partial class MainView : Window
     public MainView()
     {
         InitializeComponent();
-#if DEBUG
-        this.AttachDevTools();
-#endif
     }
 
     private void InitializeComponent()
diff --git a/samples/Avalonia/Demo.DialogHost/MainViewModel.cs b/samples/Avalonia/Demo.DialogHost/MainViewModel.cs
index 5dfcc83..6d5029d 100755
--- a/samples/Avalonia/Demo.DialogHost/MainViewModel.cs
+++ b/samples/Avalonia/Demo.DialogHost/MainViewModel.cs
@@ -3,11 +3,11 @@
 using HanumanInstitute.MvvmDialogs;
 using HanumanInstitute.MvvmDialogs.Avalonia.DialogHost;
 using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
+using ReactiveUI.SourceGenerators;
 
 namespace Demo.Avalonia.DialogHost;
 
-public class MainViewModel : ViewModelBase
+public partial class MainViewModel : ViewModelBase
 {
     private readonly IDialogService _dialogService;
 
@@ -29,7 +29,7 @@ public MainViewModel(IDialogService dialogService)
     public ReactiveCommand<Unit, Unit> ConfirmClose { get; }
 
     [Reactive]
-    public string? TextOutput { get; set; }
+    public partial string? TextOutput { get; set; }
 
     private async Task ShowViewModelImplAsync()
     {
diff --git a/samples/Avalonia/Demo.FluentContentDialog/App.axaml.cs b/samples/Avalonia/Demo.FluentContentDialog/App.axaml.cs
index 70987b1..d013bec 100755
--- a/samples/Avalonia/Demo.FluentContentDialog/App.axaml.cs
+++ b/samples/Avalonia/Demo.FluentContentDialog/App.axaml.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
diff --git a/samples/Avalonia/Demo.FluentContentDialog/AskTextBoxView.axaml b/samples/Avalonia/Demo.FluentContentDialog/AskTextBoxView.axaml
index c6d6b2c..12b3db7 100644
--- a/samples/Avalonia/Demo.FluentContentDialog/AskTextBoxView.axaml
+++ b/samples/Avalonia/Demo.FluentContentDialog/AskTextBoxView.axaml
@@ -5,7 +5,7 @@
              xmlns:local="clr-namespace:Demo.Avalonia.FluentContentDialog"
              mc:Ignorable="d" d:DesignWidth="300" d:DesignHeight="130"
              x:Class="Demo.Avalonia.FluentContentDialog.AskTextBoxView" Padding="10"
-             d:DataContext="{x:Static local:App.AskTextBox}">
+             d:DataContext="{x:Static local:App.AskTextBox}" x:DataType="local:AskTextBoxViewModel">
     <StackPanel Orientation="Vertical">
         <TextBlock Text="{Binding Title}" />
         <TextBox Height="24" Margin="0,10,0,20" Text="{Binding Text}" />
diff --git a/samples/Avalonia/Demo.FluentContentDialog/AskTextBoxViewModel.cs b/samples/Avalonia/Demo.FluentContentDialog/AskTextBoxViewModel.cs
index 4314f5a..08f0e92 100644
--- a/samples/Avalonia/Demo.FluentContentDialog/AskTextBoxViewModel.cs
+++ b/samples/Avalonia/Demo.FluentContentDialog/AskTextBoxViewModel.cs
@@ -1,12 +1,13 @@
-using ReactiveUI.Fody.Helpers;
+using ReactiveUI;
+using ReactiveUI.SourceGenerators;
 
 namespace Demo.Avalonia.FluentContentDialog;
 
-public class AskTextBoxViewModel : ViewModelBase
+public partial class AskTextBoxViewModel : ViewModelBase
 {
     [Reactive]
-    public string Title { get; set; } = "Title";
+    public partial string Title { get; set; } = "Title";
 
     [Reactive]
-    public string Text { get; set; } = string.Empty;
+    public partial string Text { get; set; } = string.Empty;
 }
diff --git a/samples/Avalonia/Demo.FluentContentDialog/CurrentTimeView.axaml b/samples/Avalonia/Demo.FluentContentDialog/CurrentTimeView.axaml
index 8b37561..855d850 100755
--- a/samples/Avalonia/Demo.FluentContentDialog/CurrentTimeView.axaml
+++ b/samples/Avalonia/Demo.FluentContentDialog/CurrentTimeView.axaml
@@ -9,7 +9,7 @@
     mc:Ignorable="d"
     Width="200"
     Height="100"
-    d:DataContext="{x:Static local:App.CurrentTime}">
+    d:DataContext="{x:Static local:App.CurrentTime}" x:DataType="local:CurrentTimeViewModel">
     <Grid>
         <TextBlock
             HorizontalAlignment="Center"
diff --git a/samples/Avalonia/Demo.FluentContentDialog/Demo.FluentContentDialog.csproj b/samples/Avalonia/Demo.FluentContentDialog/Demo.FluentContentDialog.csproj
index 8344eeb..7add096 100755
--- a/samples/Avalonia/Demo.FluentContentDialog/Demo.FluentContentDialog.csproj
+++ b/samples/Avalonia/Demo.FluentContentDialog/Demo.FluentContentDialog.csproj
@@ -11,14 +11,16 @@
     <None Remove=".gitignore" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia"/>
-    <PackageReference Include="Avalonia.Desktop"/>
+    <PackageReference Include="Avalonia" />
+    <PackageReference Include="Avalonia.Desktop" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics"/>
-    <PackageReference Include="FluentAvaloniaUI"/>
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug"/>
-    <PackageReference Include="ReactiveUI.Avalonia"/>
-    <PackageReference Include="ReactiveUI.Fody"/>
+    <PackageReference Include="FluentAvaloniaUI" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" />
+    <PackageReference Include="ReactiveUI.Avalonia" />
+    <PackageReference Include="ReactiveUI.SourceGenerators">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Splat.DependencyInjection.SourceGenerator">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/samples/Avalonia/Demo.FluentContentDialog/MainView.axaml b/samples/Avalonia/Demo.FluentContentDialog/MainView.axaml
index 68ce3d2..a45ef2d 100755
--- a/samples/Avalonia/Demo.FluentContentDialog/MainView.axaml
+++ b/samples/Avalonia/Demo.FluentContentDialog/MainView.axaml
@@ -5,7 +5,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:fluentContentDialog="clr-namespace:Demo.Avalonia.FluentContentDialog"
-    mc:Ignorable="d"
+    mc:Ignorable="d" x:DataType="fluentContentDialog:MainViewModel"
     WindowStartupLocation="CenterScreen"
     Title="Demo - Message Box"
     Width="400"
diff --git a/samples/Avalonia/Demo.FluentContentDialog/MainView.axaml.cs b/samples/Avalonia/Demo.FluentContentDialog/MainView.axaml.cs
index 41e23bb..02a4f17 100755
--- a/samples/Avalonia/Demo.FluentContentDialog/MainView.axaml.cs
+++ b/samples/Avalonia/Demo.FluentContentDialog/MainView.axaml.cs
@@ -9,9 +9,6 @@ public partial class MainView : Window
     public MainView()
     {
         InitializeComponent();
-#if DEBUG
-        this.AttachDevTools();
-#endif
     }
 
     private void InitializeComponent() => AvaloniaXamlLoader.Load(this);
diff --git a/samples/Avalonia/Demo.FluentContentDialog/MainViewModel.cs b/samples/Avalonia/Demo.FluentContentDialog/MainViewModel.cs
index 9dc7fb7..e39b90d 100755
--- a/samples/Avalonia/Demo.FluentContentDialog/MainViewModel.cs
+++ b/samples/Avalonia/Demo.FluentContentDialog/MainViewModel.cs
@@ -4,11 +4,11 @@
 using HanumanInstitute.MvvmDialogs;
 using HanumanInstitute.MvvmDialogs.Avalonia.Fluent;
 using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
+using ReactiveUI.SourceGenerators;
 
 namespace Demo.Avalonia.FluentContentDialog;
 
-public class MainViewModel : ViewModelBase
+public partial class MainViewModel : ViewModelBase
 {
     private readonly IDialogService _dialogService;
     public ReactiveCommand<Unit, Unit> ShowMessageBox { get; }
@@ -27,7 +27,7 @@ public MainViewModel(IDialogService dialogService)
     }
 
     [Reactive]
-    public string? TextOutput { get; set; }
+    public partial string? TextOutput { get; set; }
 
     private async Task ShowMessageBoxImplAsync()
     {
@@ -37,11 +37,11 @@ private async Task ShowMessageBoxImplAsync()
             Title = "This Is The Caption",
             PrimaryButtonText = "OK",
             SecondaryButtonText = "Cancel",
-            DefaultButton = ContentDialogButton.Secondary
+            DefaultButton = FAContentDialogButton.Secondary
         };
         var result = await _dialogService.ShowContentDialogAsync(this, settings);
 
-        UpdateResult(result == ContentDialogResult.Primary);
+        UpdateResult(result == FAContentDialogResult.Primary);
     }
 
     private void UpdateResult(bool? result) =>
@@ -57,10 +57,10 @@ private async Task AskTextImplAsync()
             Title = "Please enter some text",
             PrimaryButtonText = "OK",
             SecondaryButtonText = "Cancel",
-            DefaultButton = ContentDialogButton.Primary
+            DefaultButton = FAContentDialogButton.Primary
         };
         var result = await _dialogService.ShowContentDialogAsync(this, settings);
-        if (result == ContentDialogResult.Primary)
+        if (result == FAContentDialogResult.Primary)
         {
             TextOutput = vm.Text;
         }
diff --git a/samples/Avalonia/Demo.FluentMessageBoxContentDialog/App.axaml.cs b/samples/Avalonia/Demo.FluentMessageBoxContentDialog/App.axaml.cs
index ba9e913..3f19f35 100755
--- a/samples/Avalonia/Demo.FluentMessageBoxContentDialog/App.axaml.cs
+++ b/samples/Avalonia/Demo.FluentMessageBoxContentDialog/App.axaml.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
diff --git a/samples/Avalonia/Demo.FluentMessageBoxContentDialog/Demo.FluentMessageBoxContentDialog.csproj b/samples/Avalonia/Demo.FluentMessageBoxContentDialog/Demo.FluentMessageBoxContentDialog.csproj
index c7e1785..25a6ac1 100755
--- a/samples/Avalonia/Demo.FluentMessageBoxContentDialog/Demo.FluentMessageBoxContentDialog.csproj
+++ b/samples/Avalonia/Demo.FluentMessageBoxContentDialog/Demo.FluentMessageBoxContentDialog.csproj
@@ -11,12 +11,11 @@
     <None Remove=".gitignore" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia"/>
-    <PackageReference Include="Avalonia.Desktop"/>
-    <PackageReference Include="ReactiveUI.Avalonia"/>
+    <PackageReference Include="Avalonia" />
+    <PackageReference Include="Avalonia.Desktop" />
+    <PackageReference Include="ReactiveUI.Avalonia" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics"/>
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug"/>
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" />
     <PackageReference Include="Splat.DependencyInjection.SourceGenerator">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/samples/Avalonia/Demo.FluentMessageBoxContentDialog/MainWindow.axaml b/samples/Avalonia/Demo.FluentMessageBoxContentDialog/MainWindow.axaml
index 0a0e64b..d4f214e 100755
--- a/samples/Avalonia/Demo.FluentMessageBoxContentDialog/MainWindow.axaml
+++ b/samples/Avalonia/Demo.FluentMessageBoxContentDialog/MainWindow.axaml
@@ -4,7 +4,7 @@
     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:fluentContentDialog="clr-namespace:Demo.Avalonia.FluentMessageBoxContentDialog"
+    xmlns:fluentContentDialog="clr-namespace:Demo.Avalonia.FluentMessageBoxContentDialog" x:DataType="fluentContentDialog:MainWindowViewModel"
     mc:Ignorable="d"
     WindowStartupLocation="CenterScreen"
     Title="Demo - Message Box"
diff --git a/samples/Avalonia/Demo.FluentMessageBoxContentDialog/MainWindow.axaml.cs b/samples/Avalonia/Demo.FluentMessageBoxContentDialog/MainWindow.axaml.cs
index d432bc8..d180ecb 100755
--- a/samples/Avalonia/Demo.FluentMessageBoxContentDialog/MainWindow.axaml.cs
+++ b/samples/Avalonia/Demo.FluentMessageBoxContentDialog/MainWindow.axaml.cs
@@ -9,9 +9,6 @@ public partial class MainWindow : Window
     public MainWindow()
     {
         InitializeComponent();
-#if DEBUG
-        this.AttachDevTools();
-#endif
     }
 
     private void InitializeComponent() => AvaloniaXamlLoader.Load(this);
diff --git a/samples/Avalonia/Demo.FluentMessageBoxTaskDialog/App.axaml.cs b/samples/Avalonia/Demo.FluentMessageBoxTaskDialog/App.axaml.cs
index 266cb30..04fda7f 100755
--- a/samples/Avalonia/Demo.FluentMessageBoxTaskDialog/App.axaml.cs
+++ b/samples/Avalonia/Demo.FluentMessageBoxTaskDialog/App.axaml.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
diff --git a/samples/Avalonia/Demo.FluentMessageBoxTaskDialog/Demo.FluentMessageBoxTaskDialog.csproj b/samples/Avalonia/Demo.FluentMessageBoxTaskDialog/Demo.FluentMessageBoxTaskDialog.csproj
index ddbefe0..e87fbe5 100755
--- a/samples/Avalonia/Demo.FluentMessageBoxTaskDialog/Demo.FluentMessageBoxTaskDialog.csproj
+++ b/samples/Avalonia/Demo.FluentMessageBoxTaskDialog/Demo.FluentMessageBoxTaskDialog.csproj
@@ -11,11 +11,10 @@
     <None Remove=".gitignore" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia"/>
-    <PackageReference Include="Avalonia.Desktop"/>
-    <PackageReference Include="ReactiveUI.Avalonia"/>
+    <PackageReference Include="Avalonia" />
+    <PackageReference Include="Avalonia.Desktop" />
+    <PackageReference Include="ReactiveUI.Avalonia" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics"/>
     <PackageReference Include="FluentAvaloniaUI" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" />
     <PackageReference Include="Splat.DependencyInjection.SourceGenerator">
diff --git a/samples/Avalonia/Demo.FluentMessageBoxTaskDialog/MainWindow.axaml b/samples/Avalonia/Demo.FluentMessageBoxTaskDialog/MainWindow.axaml
index be84493..99fbdb4 100755
--- a/samples/Avalonia/Demo.FluentMessageBoxTaskDialog/MainWindow.axaml
+++ b/samples/Avalonia/Demo.FluentMessageBoxTaskDialog/MainWindow.axaml
@@ -4,7 +4,7 @@
     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:fluentContentDialog="clr-namespace:Demo.Avalonia.FluentMessageBoxTaskDialog"
+    xmlns:fluentContentDialog="clr-namespace:Demo.Avalonia.FluentMessageBoxTaskDialog" x:DataType="fluentContentDialog:MainWindowViewModel"
     mc:Ignorable="d"
     WindowStartupLocation="CenterScreen"
     Title="Demo - Message Box"
diff --git a/samples/Avalonia/Demo.FluentMessageBoxTaskDialog/MainWindow.axaml.cs b/samples/Avalonia/Demo.FluentMessageBoxTaskDialog/MainWindow.axaml.cs
index e224f52..81ca0bf 100755
--- a/samples/Avalonia/Demo.FluentMessageBoxTaskDialog/MainWindow.axaml.cs
+++ b/samples/Avalonia/Demo.FluentMessageBoxTaskDialog/MainWindow.axaml.cs
@@ -9,9 +9,6 @@ public partial class MainWindow : Window
     public MainWindow()
     {
         InitializeComponent();
-#if DEBUG
-        this.AttachDevTools();
-#endif
     }
 
     private void InitializeComponent() => AvaloniaXamlLoader.Load(this);
diff --git a/samples/Avalonia/Demo.FluentTaskDialog/App.axaml.cs b/samples/Avalonia/Demo.FluentTaskDialog/App.axaml.cs
index 0b832df..0f0f450 100755
--- a/samples/Avalonia/Demo.FluentTaskDialog/App.axaml.cs
+++ b/samples/Avalonia/Demo.FluentTaskDialog/App.axaml.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Avalonia;
 using Avalonia.Markup.Xaml;
 using HanumanInstitute.MvvmDialogs;
diff --git a/samples/Avalonia/Demo.FluentTaskDialog/AskTextBoxView.axaml b/samples/Avalonia/Demo.FluentTaskDialog/AskTextBoxView.axaml
index 63b3e48..c84c55f 100644
--- a/samples/Avalonia/Demo.FluentTaskDialog/AskTextBoxView.axaml
+++ b/samples/Avalonia/Demo.FluentTaskDialog/AskTextBoxView.axaml
@@ -5,7 +5,7 @@
              xmlns:local="clr-namespace:Demo.Avalonia.FluentTaskDialog"
              mc:Ignorable="d" d:DesignWidth="300" d:DesignHeight="130"
              x:Class="Demo.Avalonia.FluentTaskDialog.AskTextBoxView" Padding="10"
-             d:DataContext="{x:Static local:App.AskTextBox}">
+             d:DataContext="{x:Static local:App.AskTextBox}" x:DataType="local:AskTextBoxViewModel">
     <StackPanel Orientation="Vertical">
         <TextBlock Text="{Binding Title}" />
         <TextBox Height="24" Margin="0,10,0,20" Text="{Binding Text}" />
diff --git a/samples/Avalonia/Demo.FluentTaskDialog/AskTextBoxViewModel.cs b/samples/Avalonia/Demo.FluentTaskDialog/AskTextBoxViewModel.cs
index e15cd4e..0c8a282 100644
--- a/samples/Avalonia/Demo.FluentTaskDialog/AskTextBoxViewModel.cs
+++ b/samples/Avalonia/Demo.FluentTaskDialog/AskTextBoxViewModel.cs
@@ -1,12 +1,12 @@
-using ReactiveUI.Fody.Helpers;
+using ReactiveUI.SourceGenerators;
 
 namespace Demo.Avalonia.FluentTaskDialog;
 
-public class AskTextBoxViewModel : ViewModelBase
+public partial class AskTextBoxViewModel : ViewModelBase
 {
     [Reactive]
-    public string Title { get; set; } = "Title";
+    public partial string Title { get; set; } = "Title";
 
     [Reactive]
-    public string Text { get; set; } = string.Empty;
+    public partial string Text { get; set; } = string.Empty;
 }
diff --git a/samples/Avalonia/Demo.FluentTaskDialog/CurrentTimeView.axaml b/samples/Avalonia/Demo.FluentTaskDialog/CurrentTimeView.axaml
index e33e7c5..33f2f87 100755
--- a/samples/Avalonia/Demo.FluentTaskDialog/CurrentTimeView.axaml
+++ b/samples/Avalonia/Demo.FluentTaskDialog/CurrentTimeView.axaml
@@ -9,7 +9,7 @@
     mc:Ignorable="d"
     Width="200"
     Height="100"
-    d:DataContext="{x:Static local:App.CurrentTime}">
+    d:DataContext="{x:Static local:App.CurrentTime}" x:DataType="local:CurrentTimeViewModel">
     <Grid>
         <TextBlock
             HorizontalAlignment="Center"
diff --git a/samples/Avalonia/Demo.FluentTaskDialog/Demo.FluentTaskDialog.csproj b/samples/Avalonia/Demo.FluentTaskDialog/Demo.FluentTaskDialog.csproj
index 4d9c6e9..fbeccb7 100755
--- a/samples/Avalonia/Demo.FluentTaskDialog/Demo.FluentTaskDialog.csproj
+++ b/samples/Avalonia/Demo.FluentTaskDialog/Demo.FluentTaskDialog.csproj
@@ -11,14 +11,16 @@
     <None Remove=".gitignore" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia"/>
-    <PackageReference Include="Avalonia.Desktop"/>
-    <PackageReference Include="ReactiveUI.Avalonia"/>
+    <PackageReference Include="Avalonia" />
+    <PackageReference Include="Avalonia.Desktop" />
+    <PackageReference Include="ReactiveUI.Avalonia" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics"/>
-    <PackageReference Include="FluentAvaloniaUI"/>
+    <PackageReference Include="FluentAvaloniaUI" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" />
-    <PackageReference Include="ReactiveUI.Fody"/>
+    <PackageReference Include="ReactiveUI.SourceGenerators">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Splat.DependencyInjection.SourceGenerator">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/samples/Avalonia/Demo.FluentTaskDialog/MainView.axaml b/samples/Avalonia/Demo.FluentTaskDialog/MainView.axaml
index e3d292f..12f3135 100755
--- a/samples/Avalonia/Demo.FluentTaskDialog/MainView.axaml
+++ b/samples/Avalonia/Demo.FluentTaskDialog/MainView.axaml
@@ -10,7 +10,7 @@
     Title="Demo - Message Box"
     Width="400"
     Height="300"
-    d:DataContext="{x:Static local:App.Main}">
+    d:DataContext="{x:Static local:App.Main}" x:DataType="local:MainViewModel">
 
     <UniformGrid Rows="3">
         <Button
diff --git a/samples/Avalonia/Demo.FluentTaskDialog/MainView.axaml.cs b/samples/Avalonia/Demo.FluentTaskDialog/MainView.axaml.cs
index c55ce15..d624a4f 100755
--- a/samples/Avalonia/Demo.FluentTaskDialog/MainView.axaml.cs
+++ b/samples/Avalonia/Demo.FluentTaskDialog/MainView.axaml.cs
@@ -9,9 +9,6 @@ public partial class MainView : Window
     public MainView()
     {
         InitializeComponent();
-#if DEBUG
-        this.AttachDevTools();
-#endif
     }
 
     private void InitializeComponent() => AvaloniaXamlLoader.Load(this);
diff --git a/samples/Avalonia/Demo.FluentTaskDialog/MainViewModel.cs b/samples/Avalonia/Demo.FluentTaskDialog/MainViewModel.cs
index eb6dc74..4b81cea 100755
--- a/samples/Avalonia/Demo.FluentTaskDialog/MainViewModel.cs
+++ b/samples/Avalonia/Demo.FluentTaskDialog/MainViewModel.cs
@@ -5,11 +5,11 @@
 using HanumanInstitute.MvvmDialogs;
 using HanumanInstitute.MvvmDialogs.Avalonia.Fluent;
 using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
+using ReactiveUI.SourceGenerators;
 
 namespace Demo.Avalonia.FluentTaskDialog;
 
-public class MainViewModel : ViewModelBase
+public partial class MainViewModel : ViewModelBase
 {
     private readonly IDialogService _dialogService;
     public ReactiveCommand<Unit, Unit> ShowMessageBox { get; }
@@ -28,7 +28,7 @@ public MainViewModel(IDialogService dialogService)
     }
 
     [Reactive]
-    public string? TextOutput { get; set; }
+    public partial string? TextOutput { get; set; }
 
     private async Task ShowMessageBoxImplAsync()
     {
@@ -36,15 +36,15 @@ private async Task ShowMessageBoxImplAsync()
         {
             Content = "This is the text.",
             Title = "This Is The Caption",
-            Buttons = new List<TaskDialogButton>()
+            Buttons = new List<FATaskDialogButton>()
             {
-                TaskDialogButton.OKButton,
-                TaskDialogButton.CancelButton
+                FATaskDialogButton.OKButton,
+                FATaskDialogButton.CancelButton
             }
         };
         var result = await _dialogService.ShowTaskDialogAsync(this, settings);
 
-        UpdateResult(result == TaskDialogStandardResult.OK);
+        UpdateResult(result == FATaskDialogStandardResult.OK);
     }
 
     private void UpdateResult(bool? result) =>
@@ -58,14 +58,14 @@ private async Task AskTextImplAsync()
         {
             Content = vm,
             Title = "Please enter some text",
-            Buttons = new List<TaskDialogButton>()
+            Buttons = new List<FATaskDialogButton>()
             {
-                TaskDialogButton.OKButton,
-                TaskDialogButton.CancelButton
+                FATaskDialogButton.OKButton,
+                FATaskDialogButton.CancelButton
             }
         };
         var result = await _dialogService.ShowTaskDialogAsync(this, settings);
-        if (result == TaskDialogStandardResult.OK)
+        if (result == FATaskDialogStandardResult.OK)
         {
             TextOutput = vm.Text;
         }
@@ -77,9 +77,9 @@ private async Task ShowViewModelImplAsync()
         dialogViewModel.ConfirmClose = true;
         await _dialogService.ShowTaskDialogAsync(this, new TaskDialogSettings(dialogViewModel)
         {
-            Buttons = new List<TaskDialogButton>()
+            Buttons = new List<FATaskDialogButton>()
             {
-                TaskDialogButton.OKButton
+                FATaskDialogButton.OKButton
             }
 
         }).ConfigureAwait(true);
@@ -90,9 +90,9 @@ private async Task ShowControlImplAsync()
         var content = new MessageView();
         var result = await _dialogService.ShowTaskDialogAsync(this, new TaskDialogSettings(content)
         {
-            Buttons = new List<TaskDialogButton>()
+            Buttons = new List<FATaskDialogButton>()
             {
-                TaskDialogButton.OKButton
+                FATaskDialogButton.OKButton
             }
         }).ConfigureAwait(true);
         TextOutput = result.ToString();
diff --git a/samples/Avalonia/Demo.MessageBox/App.axaml.cs b/samples/Avalonia/Demo.MessageBox/App.axaml.cs
index 1eadf89..09c0d84 100755
--- a/samples/Avalonia/Demo.MessageBox/App.axaml.cs
+++ b/samples/Avalonia/Demo.MessageBox/App.axaml.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Avalonia;
 using Avalonia.Markup.Xaml;
 using HanumanInstitute.MvvmDialogs;
diff --git a/samples/Avalonia/Demo.MessageBox/Demo.MessageBox.csproj b/samples/Avalonia/Demo.MessageBox/Demo.MessageBox.csproj
index ed363b9..4d27dd1 100755
--- a/samples/Avalonia/Demo.MessageBox/Demo.MessageBox.csproj
+++ b/samples/Avalonia/Demo.MessageBox/Demo.MessageBox.csproj
@@ -13,13 +13,12 @@
     <None Remove=".gitignore" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia"/>
-    <PackageReference Include="Avalonia.Desktop"/>
-    <PackageReference Include="ReactiveUI.Avalonia"/>
+    <PackageReference Include="Avalonia" />
+    <PackageReference Include="Avalonia.Desktop" />
+    <PackageReference Include="ReactiveUI.Avalonia" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics"/>
-    <PackageReference Include="Avalonia.Themes.Fluent"/>
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug"/>
+    <PackageReference Include="Avalonia.Themes.Fluent" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" />
     <PackageReference Include="Splat.DependencyInjection.SourceGenerator">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/samples/Avalonia/Demo.MessageBox/MainWindow.axaml b/samples/Avalonia/Demo.MessageBox/MainWindow.axaml
index 7cd3bef..63fabd4 100755
--- a/samples/Avalonia/Demo.MessageBox/MainWindow.axaml
+++ b/samples/Avalonia/Demo.MessageBox/MainWindow.axaml
@@ -10,7 +10,7 @@
     Title="Demo - Message Box"
     Width="300"
     Height="200"
-    d:DataContext="{x:Static local:App.MainWindow}">
+    d:DataContext="{x:Static local:App.MainWindow}" x:DataType="local:MainWindowViewModel">
 
     <UniformGrid Columns="2" Rows="3">
         <Button
diff --git a/samples/Avalonia/Demo.MessageBox/MainWindow.axaml.cs b/samples/Avalonia/Demo.MessageBox/MainWindow.axaml.cs
index 646a32f..3523db5 100755
--- a/samples/Avalonia/Demo.MessageBox/MainWindow.axaml.cs
+++ b/samples/Avalonia/Demo.MessageBox/MainWindow.axaml.cs
@@ -9,9 +9,6 @@ public partial class MainWindow : Window
     public MainWindow()
     {
         InitializeComponent();
-#if DEBUG
-        this.AttachDevTools();
-#endif
     }
 
     private void InitializeComponent() => AvaloniaXamlLoader.Load(this);
diff --git a/samples/Avalonia/Demo.ModalCustomDialog/AddTextDialog.axaml b/samples/Avalonia/Demo.ModalCustomDialog/AddTextDialog.axaml
index 6d07413..2f0a106 100755
--- a/samples/Avalonia/Demo.ModalCustomDialog/AddTextDialog.axaml
+++ b/samples/Avalonia/Demo.ModalCustomDialog/AddTextDialog.axaml
@@ -10,7 +10,7 @@
     WindowStartupLocation="CenterOwner"
     SizeToContent="WidthAndHeight"
     CanResize="False"
-    d:DataContext="{x:Static local:App.AddTextDialog}">
+    d:DataContext="{x:Static local:App.AddTextDialog}" x:DataType="local:AddTextCustomDialogViewModel">
 
     <StackPanel>
         <TextBox Text="{Binding Text}" />
diff --git a/samples/Avalonia/Demo.ModalCustomDialog/AddTextDialog.axaml.cs b/samples/Avalonia/Demo.ModalCustomDialog/AddTextDialog.axaml.cs
index 34d36bf..aca8a14 100755
--- a/samples/Avalonia/Demo.ModalCustomDialog/AddTextDialog.axaml.cs
+++ b/samples/Avalonia/Demo.ModalCustomDialog/AddTextDialog.axaml.cs
@@ -9,9 +9,6 @@ public partial class AddTextDialog : Window
     public AddTextDialog()
     {
         InitializeComponent();
-#if DEBUG
-        this.AttachDevTools();
-#endif
     }
 
     private void InitializeComponent() => AvaloniaXamlLoader.Load(this);
diff --git a/samples/Avalonia/Demo.ModalCustomDialog/App.axaml.cs b/samples/Avalonia/Demo.ModalCustomDialog/App.axaml.cs
index 71113d3..297d6e4 100755
--- a/samples/Avalonia/Demo.ModalCustomDialog/App.axaml.cs
+++ b/samples/Avalonia/Demo.ModalCustomDialog/App.axaml.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Avalonia;
 using Avalonia.Markup.Xaml;
 using HanumanInstitute.MvvmDialogs;
diff --git a/samples/Avalonia/Demo.ModalCustomDialog/Demo.ModalCustomDialog.csproj b/samples/Avalonia/Demo.ModalCustomDialog/Demo.ModalCustomDialog.csproj
index f23cde8..b137f3e 100755
--- a/samples/Avalonia/Demo.ModalCustomDialog/Demo.ModalCustomDialog.csproj
+++ b/samples/Avalonia/Demo.ModalCustomDialog/Demo.ModalCustomDialog.csproj
@@ -11,13 +11,12 @@
     <None Remove=".gitignore" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia"/>
-    <PackageReference Include="Avalonia.Desktop"/>
-    <PackageReference Include="ReactiveUI.Avalonia"/>
+    <PackageReference Include="Avalonia" />
+    <PackageReference Include="Avalonia.Desktop" />
+    <PackageReference Include="ReactiveUI.Avalonia" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics"/>
-    <PackageReference Include="Avalonia.Themes.Fluent"/>
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug"/>
+    <PackageReference Include="Avalonia.Themes.Fluent" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" />
     <PackageReference Include="Splat.DependencyInjection.SourceGenerator">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/samples/Avalonia/Demo.ModalCustomDialog/MainWindow.axaml b/samples/Avalonia/Demo.ModalCustomDialog/MainWindow.axaml
index 4ead10f..bea3a9e 100755
--- a/samples/Avalonia/Demo.ModalCustomDialog/MainWindow.axaml
+++ b/samples/Avalonia/Demo.ModalCustomDialog/MainWindow.axaml
@@ -10,7 +10,7 @@
     Title="Demo - Modal Custom Dialog"
     Width="300"
     Height="200"
-    DataContext="{x:Static local:App.MainWindow}">
+    DataContext="{x:Static local:App.MainWindow}" x:DataType="local:MainWindowViewModel">
 
     <Grid>
         <Grid.RowDefinitions>
diff --git a/samples/Avalonia/Demo.ModalCustomDialog/MainWindow.axaml.cs b/samples/Avalonia/Demo.ModalCustomDialog/MainWindow.axaml.cs
index e7509b3..3d087a3 100755
--- a/samples/Avalonia/Demo.ModalCustomDialog/MainWindow.axaml.cs
+++ b/samples/Avalonia/Demo.ModalCustomDialog/MainWindow.axaml.cs
@@ -9,9 +9,6 @@ public partial class MainWindow : Window
     public MainWindow()
     {
         InitializeComponent();
-#if DEBUG
-        this.AttachDevTools();
-#endif
     }
 
     private void InitializeComponent() => AvaloniaXamlLoader.Load(this);
diff --git a/samples/Avalonia/Demo.ModalDialog/AddTextDialog.axaml b/samples/Avalonia/Demo.ModalDialog/AddTextDialog.axaml
index b24cc05..e566a3e 100755
--- a/samples/Avalonia/Demo.ModalDialog/AddTextDialog.axaml
+++ b/samples/Avalonia/Demo.ModalDialog/AddTextDialog.axaml
@@ -10,7 +10,7 @@
     WindowStartupLocation="CenterOwner"
     SizeToContent="WidthAndHeight"
     CanResize="False"
-    d:DataContext="{x:Static local:App.AddTextDialog}">
+    d:DataContext="{x:Static local:App.AddTextDialog}" x:DataType="local:AddTextDialogViewModel">
 
     <StackPanel>
         <TextBox Text="{Binding Text}" />
diff --git a/samples/Avalonia/Demo.ModalDialog/AddTextDialog.axaml.cs b/samples/Avalonia/Demo.ModalDialog/AddTextDialog.axaml.cs
index 4a28bf2..028a601 100755
--- a/samples/Avalonia/Demo.ModalDialog/AddTextDialog.axaml.cs
+++ b/samples/Avalonia/Demo.ModalDialog/AddTextDialog.axaml.cs
@@ -9,9 +9,6 @@ public partial class AddTextDialog : Window
     public AddTextDialog()
     {
         InitializeComponent();
-#if DEBUG
-        this.AttachDevTools();
-#endif
     }
 
     private void InitializeComponent() => AvaloniaXamlLoader.Load(this);
diff --git a/samples/Avalonia/Demo.ModalDialog/App.axaml.cs b/samples/Avalonia/Demo.ModalDialog/App.axaml.cs
index 6ee0a30..bfab741 100755
--- a/samples/Avalonia/Demo.ModalDialog/App.axaml.cs
+++ b/samples/Avalonia/Demo.ModalDialog/App.axaml.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Avalonia;
 using Avalonia.Markup.Xaml;
 using HanumanInstitute.MvvmDialogs;
diff --git a/samples/Avalonia/Demo.ModalDialog/Demo.ModalDialog.csproj b/samples/Avalonia/Demo.ModalDialog/Demo.ModalDialog.csproj
index c0413b3..0735706 100755
--- a/samples/Avalonia/Demo.ModalDialog/Demo.ModalDialog.csproj
+++ b/samples/Avalonia/Demo.ModalDialog/Demo.ModalDialog.csproj
@@ -12,13 +12,12 @@
     <None Remove=".gitignore" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia"/>
-    <PackageReference Include="Avalonia.Desktop"/>
-    <PackageReference Include="ReactiveUI.Avalonia"/>
+    <PackageReference Include="Avalonia" />
+    <PackageReference Include="Avalonia.Desktop" />
+    <PackageReference Include="ReactiveUI.Avalonia" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics"/>
-    <PackageReference Include="Avalonia.Themes.Fluent"/>
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug"/>
+    <PackageReference Include="Avalonia.Themes.Fluent" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" />
     <PackageReference Include="Splat.DependencyInjection.SourceGenerator">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/samples/Avalonia/Demo.ModalDialog/MainWindow.axaml b/samples/Avalonia/Demo.ModalDialog/MainWindow.axaml
index be82f10..3a5e843 100755
--- a/samples/Avalonia/Demo.ModalDialog/MainWindow.axaml
+++ b/samples/Avalonia/Demo.ModalDialog/MainWindow.axaml
@@ -10,7 +10,7 @@
     Title="Demo - Modal Dialog"
     Width="300"
     Height="200"
-    DataContext="{x:Static local:App.MainWindow}">
+    DataContext="{x:Static local:App.MainWindow}" x:DataType="local:MainWindowViewModel">
 
     <Grid>
         <Grid.RowDefinitions>
diff --git a/samples/Avalonia/Demo.ModalDialog/MainWindow.axaml.cs b/samples/Avalonia/Demo.ModalDialog/MainWindow.axaml.cs
index 371c2bf..27170c1 100755
--- a/samples/Avalonia/Demo.ModalDialog/MainWindow.axaml.cs
+++ b/samples/Avalonia/Demo.ModalDialog/MainWindow.axaml.cs
@@ -9,9 +9,6 @@ public partial class MainWindow : Window
     public MainWindow()
     {
         InitializeComponent();
-#if DEBUG
-        this.AttachDevTools();
-#endif
     }
 
     private void InitializeComponent()
diff --git a/samples/Avalonia/Demo.NonModalCustomDialog/App.axaml.cs b/samples/Avalonia/Demo.NonModalCustomDialog/App.axaml.cs
index 0dff985..f5b303e 100755
--- a/samples/Avalonia/Demo.NonModalCustomDialog/App.axaml.cs
+++ b/samples/Avalonia/Demo.NonModalCustomDialog/App.axaml.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Avalonia;
 using Avalonia.Markup.Xaml;
 using HanumanInstitute.MvvmDialogs;
diff --git a/samples/Avalonia/Demo.NonModalCustomDialog/CurrentTimeDialog.axaml b/samples/Avalonia/Demo.NonModalCustomDialog/CurrentTimeDialog.axaml
index 3e14f9b..815c2fc 100755
--- a/samples/Avalonia/Demo.NonModalCustomDialog/CurrentTimeDialog.axaml
+++ b/samples/Avalonia/Demo.NonModalCustomDialog/CurrentTimeDialog.axaml
@@ -12,7 +12,7 @@
     CanResize="False"
     Width="200"
     Height="100"
-    d:DataContext="{x:Static local:App.CurrentTimeDialog}">
+    d:DataContext="{x:Static local:App.CurrentTimeDialog}" x:DataType="local:CurrentTimeCustomDialogViewModel">
 
     <TextBlock
         HorizontalAlignment="Center"
diff --git a/samples/Avalonia/Demo.NonModalCustomDialog/CurrentTimeDialog.axaml.cs b/samples/Avalonia/Demo.NonModalCustomDialog/CurrentTimeDialog.axaml.cs
index 4d8b898..56cf491 100755
--- a/samples/Avalonia/Demo.NonModalCustomDialog/CurrentTimeDialog.axaml.cs
+++ b/samples/Avalonia/Demo.NonModalCustomDialog/CurrentTimeDialog.axaml.cs
@@ -9,9 +9,6 @@ public partial class CurrentTimeDialog : Window
     public CurrentTimeDialog()
     {
         InitializeComponent();
-#if DEBUG
-        this.AttachDevTools();
-#endif
     }
 
     private void InitializeComponent()
diff --git a/samples/Avalonia/Demo.NonModalCustomDialog/Demo.NonModalCustomDialog.csproj b/samples/Avalonia/Demo.NonModalCustomDialog/Demo.NonModalCustomDialog.csproj
index 022fe53..38c3e15 100755
--- a/samples/Avalonia/Demo.NonModalCustomDialog/Demo.NonModalCustomDialog.csproj
+++ b/samples/Avalonia/Demo.NonModalCustomDialog/Demo.NonModalCustomDialog.csproj
@@ -8,13 +8,12 @@
     <RootNamespace>Demo.Avalonia.NonModalCustomDialog</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia"/>
-    <PackageReference Include="Avalonia.Desktop"/>
-    <PackageReference Include="ReactiveUI.Avalonia"/>
+    <PackageReference Include="Avalonia" />
+    <PackageReference Include="Avalonia.Desktop" />
+    <PackageReference Include="ReactiveUI.Avalonia" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics"/>
-    <PackageReference Include="Avalonia.Themes.Fluent"/>
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug"/>
+    <PackageReference Include="Avalonia.Themes.Fluent" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" />
     <PackageReference Include="Splat.DependencyInjection.SourceGenerator">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/samples/Avalonia/Demo.NonModalCustomDialog/MainWindow.axaml b/samples/Avalonia/Demo.NonModalCustomDialog/MainWindow.axaml
index 8b365b8..cdfa418 100755
--- a/samples/Avalonia/Demo.NonModalCustomDialog/MainWindow.axaml
+++ b/samples/Avalonia/Demo.NonModalCustomDialog/MainWindow.axaml
@@ -9,7 +9,7 @@
     Title="Demo - Non-Modal Custom Dialog"
     Width="300"
     Height="200"
-    DataContext="{x:Static local:App.MainWindow}">
+    DataContext="{x:Static local:App.MainWindow}" x:DataType="local:MainWindowViewModel">
 
     <UniformGrid Rows="2">
         <Button
diff --git a/samples/Avalonia/Demo.NonModalCustomDialog/MainWindow.axaml.cs b/samples/Avalonia/Demo.NonModalCustomDialog/MainWindow.axaml.cs
index 21d6091..f99e13b 100755
--- a/samples/Avalonia/Demo.NonModalCustomDialog/MainWindow.axaml.cs
+++ b/samples/Avalonia/Demo.NonModalCustomDialog/MainWindow.axaml.cs
@@ -9,9 +9,6 @@ public partial class MainWindow : Window
     public MainWindow()
     {
         InitializeComponent();
-#if DEBUG
-        this.AttachDevTools();
-#endif
     }
 
     private void InitializeComponent()
diff --git a/samples/Avalonia/Demo.NonModalDialog/App.axaml.cs b/samples/Avalonia/Demo.NonModalDialog/App.axaml.cs
index c3fe3b5..86c2642 100755
--- a/samples/Avalonia/Demo.NonModalDialog/App.axaml.cs
+++ b/samples/Avalonia/Demo.NonModalDialog/App.axaml.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Avalonia;
 using Avalonia.Markup.Xaml;
 using HanumanInstitute.MvvmDialogs;
diff --git a/samples/Avalonia/Demo.NonModalDialog/CurrentTimeDialog.axaml b/samples/Avalonia/Demo.NonModalDialog/CurrentTimeDialog.axaml
index 44df664..456c91e 100755
--- a/samples/Avalonia/Demo.NonModalDialog/CurrentTimeDialog.axaml
+++ b/samples/Avalonia/Demo.NonModalDialog/CurrentTimeDialog.axaml
@@ -12,7 +12,7 @@
     CanResize="False"
     Width="200"
     Height="100"
-    d:DataContext="{x:Static local:App.CurrentTimeDialog}">
+    d:DataContext="{x:Static local:App.CurrentTimeDialog}" x:DataType="local:CurrentTimeDialogViewModel">
 
     <TextBlock
         HorizontalAlignment="Center"
diff --git a/samples/Avalonia/Demo.NonModalDialog/CurrentTimeDialog.axaml.cs b/samples/Avalonia/Demo.NonModalDialog/CurrentTimeDialog.axaml.cs
index 93028f6..3ecd927 100755
--- a/samples/Avalonia/Demo.NonModalDialog/CurrentTimeDialog.axaml.cs
+++ b/samples/Avalonia/Demo.NonModalDialog/CurrentTimeDialog.axaml.cs
@@ -9,9 +9,6 @@ public partial class CurrentTimeDialog : Window
     public CurrentTimeDialog()
     {
         InitializeComponent();
-#if DEBUG
-        this.AttachDevTools();
-#endif
     }
 
     private void InitializeComponent()
diff --git a/samples/Avalonia/Demo.NonModalDialog/Demo.NonModalDialog.csproj b/samples/Avalonia/Demo.NonModalDialog/Demo.NonModalDialog.csproj
index 7ba713b..ab29dd7 100755
--- a/samples/Avalonia/Demo.NonModalDialog/Demo.NonModalDialog.csproj
+++ b/samples/Avalonia/Demo.NonModalDialog/Demo.NonModalDialog.csproj
@@ -17,13 +17,12 @@
     <None Remove=".gitignore" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia"/>
-    <PackageReference Include="Avalonia.Desktop"/>
-    <PackageReference Include="ReactiveUI.Avalonia"/>
+    <PackageReference Include="Avalonia" />
+    <PackageReference Include="Avalonia.Desktop" />
+    <PackageReference Include="ReactiveUI.Avalonia" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" />
-    <PackageReference Include="Avalonia.Themes.Fluent"/>
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug"/>
+    <PackageReference Include="Avalonia.Themes.Fluent" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" />
     <PackageReference Include="Splat.DependencyInjection.SourceGenerator">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/samples/Avalonia/Demo.NonModalDialog/MainWindow.axaml b/samples/Avalonia/Demo.NonModalDialog/MainWindow.axaml
index 342b572..ce7da53 100755
--- a/samples/Avalonia/Demo.NonModalDialog/MainWindow.axaml
+++ b/samples/Avalonia/Demo.NonModalDialog/MainWindow.axaml
@@ -9,7 +9,7 @@
     Title="Demo - Non-Modal Dialog"
     Width="300"
     Height="200"
-    d:DataContext="{x:Static local:App.MainWindow}">
+    d:DataContext="{x:Static local:App.MainWindow}" x:DataType="local:MainWindowViewModel">
 
     <UniformGrid Rows="2">
         <Button
diff --git a/samples/Avalonia/Demo.NonModalDialog/MainWindow.axaml.cs b/samples/Avalonia/Demo.NonModalDialog/MainWindow.axaml.cs
index 5beaf8e..d414422 100755
--- a/samples/Avalonia/Demo.NonModalDialog/MainWindow.axaml.cs
+++ b/samples/Avalonia/Demo.NonModalDialog/MainWindow.axaml.cs
@@ -9,9 +9,6 @@ public partial class MainWindow : Window
     public MainWindow()
     {
         InitializeComponent();
-#if DEBUG
-        this.AttachDevTools();
-#endif
     }
 
     private void InitializeComponent()
diff --git a/samples/Avalonia/Demo.OpenFileDialog/App.axaml.cs b/samples/Avalonia/Demo.OpenFileDialog/App.axaml.cs
index e109f08..125219e 100755
--- a/samples/Avalonia/Demo.OpenFileDialog/App.axaml.cs
+++ b/samples/Avalonia/Demo.OpenFileDialog/App.axaml.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Avalonia;
 using Avalonia.Markup.Xaml;
 using HanumanInstitute.MvvmDialogs;
diff --git a/samples/Avalonia/Demo.OpenFileDialog/Demo.OpenFileDialog.csproj b/samples/Avalonia/Demo.OpenFileDialog/Demo.OpenFileDialog.csproj
index 05d02ab..0393647 100755
--- a/samples/Avalonia/Demo.OpenFileDialog/Demo.OpenFileDialog.csproj
+++ b/samples/Avalonia/Demo.OpenFileDialog/Demo.OpenFileDialog.csproj
@@ -17,13 +17,12 @@
     <None Remove=".gitignore" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia"/>
-    <PackageReference Include="Avalonia.Desktop"/>
-    <PackageReference Include="ReactiveUI.Avalonia"/>
+    <PackageReference Include="Avalonia" />
+    <PackageReference Include="Avalonia.Desktop" />
+    <PackageReference Include="ReactiveUI.Avalonia" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics"/>
-    <PackageReference Include="Avalonia.Themes.Fluent"/>
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug"/>
+    <PackageReference Include="Avalonia.Themes.Fluent" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" />
     <PackageReference Include="Splat.DependencyInjection.SourceGenerator">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/samples/Avalonia/Demo.OpenFileDialog/MainWindow.axaml b/samples/Avalonia/Demo.OpenFileDialog/MainWindow.axaml
index 4db5214..c6be475 100755
--- a/samples/Avalonia/Demo.OpenFileDialog/MainWindow.axaml
+++ b/samples/Avalonia/Demo.OpenFileDialog/MainWindow.axaml
@@ -9,7 +9,7 @@
     Title="Demo - Open File Dialog"
     Width="300"
     Height="200"
-    d:DataContext="{x:Static local:App.MainWindow}">
+    d:DataContext="{x:Static local:App.MainWindow}" x:DataType="local:MainWindowViewModel">
 
     <Grid VerticalAlignment="Stretch">
         <Grid.ColumnDefinitions>
diff --git a/samples/Avalonia/Demo.OpenFileDialog/MainWindow.axaml.cs b/samples/Avalonia/Demo.OpenFileDialog/MainWindow.axaml.cs
index 1d98f62..067a8ca 100755
--- a/samples/Avalonia/Demo.OpenFileDialog/MainWindow.axaml.cs
+++ b/samples/Avalonia/Demo.OpenFileDialog/MainWindow.axaml.cs
@@ -9,9 +9,6 @@ public partial class MainWindow : Window
     public MainWindow()
     {
         InitializeComponent();
-#if DEBUG
-        this.AttachDevTools();
-#endif
     }
 
     private void InitializeComponent()
diff --git a/samples/Avalonia/Demo.OpenFolderDialog/App.axaml.cs b/samples/Avalonia/Demo.OpenFolderDialog/App.axaml.cs
index d2410da..e0b60e4 100755
--- a/samples/Avalonia/Demo.OpenFolderDialog/App.axaml.cs
+++ b/samples/Avalonia/Demo.OpenFolderDialog/App.axaml.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Avalonia;
 using Avalonia.Markup.Xaml;
 using HanumanInstitute.MvvmDialogs;
diff --git a/samples/Avalonia/Demo.OpenFolderDialog/Demo.OpenFolderDialog.csproj b/samples/Avalonia/Demo.OpenFolderDialog/Demo.OpenFolderDialog.csproj
index 23edb1d..99315c3 100755
--- a/samples/Avalonia/Demo.OpenFolderDialog/Demo.OpenFolderDialog.csproj
+++ b/samples/Avalonia/Demo.OpenFolderDialog/Demo.OpenFolderDialog.csproj
@@ -11,13 +11,12 @@
     <None Remove=".gitignore" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia"/>
-    <PackageReference Include="Avalonia.Desktop"/>
-    <PackageReference Include="ReactiveUI.Avalonia"/>
+    <PackageReference Include="Avalonia" />
+    <PackageReference Include="Avalonia.Desktop" />
+    <PackageReference Include="ReactiveUI.Avalonia" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics"/>
-    <PackageReference Include="Avalonia.Themes.Fluent"/>
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug"/>
+    <PackageReference Include="Avalonia.Themes.Fluent" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" />
     <PackageReference Include="Splat.DependencyInjection.SourceGenerator">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/samples/Avalonia/Demo.OpenFolderDialog/MainWindow.axaml b/samples/Avalonia/Demo.OpenFolderDialog/MainWindow.axaml
index 1c51c73..ed78449 100755
--- a/samples/Avalonia/Demo.OpenFolderDialog/MainWindow.axaml
+++ b/samples/Avalonia/Demo.OpenFolderDialog/MainWindow.axaml
@@ -10,7 +10,7 @@
     Title="Demo - Folder Browser Dialog"
     Width="300"
     Height="200"
-    d:DataContext="{x:Static local:App.MainWindow}">
+    d:DataContext="{x:Static local:App.MainWindow}" x:DataType="local:MainWindowViewModel">
 
     <Grid VerticalAlignment="Center">
         <Grid.ColumnDefinitions>
diff --git a/samples/Avalonia/Demo.OpenFolderDialog/MainWindow.axaml.cs b/samples/Avalonia/Demo.OpenFolderDialog/MainWindow.axaml.cs
index 57abaa8..088eb84 100755
--- a/samples/Avalonia/Demo.OpenFolderDialog/MainWindow.axaml.cs
+++ b/samples/Avalonia/Demo.OpenFolderDialog/MainWindow.axaml.cs
@@ -9,9 +9,6 @@ public partial class MainWindow : Window
     public MainWindow()
     {
         InitializeComponent();
-#if DEBUG
-        this.AttachDevTools();
-#endif
     }
 
     private void InitializeComponent() => AvaloniaXamlLoader.Load(this);
diff --git a/samples/Avalonia/Demo.SaveFileDialog/App.axaml.cs b/samples/Avalonia/Demo.SaveFileDialog/App.axaml.cs
index 5bccb24..1609148 100755
--- a/samples/Avalonia/Demo.SaveFileDialog/App.axaml.cs
+++ b/samples/Avalonia/Demo.SaveFileDialog/App.axaml.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Avalonia;
 using Avalonia.Markup.Xaml;
 using HanumanInstitute.MvvmDialogs;
diff --git a/samples/Avalonia/Demo.SaveFileDialog/Demo.SaveFileDialog.csproj b/samples/Avalonia/Demo.SaveFileDialog/Demo.SaveFileDialog.csproj
index 5444c3c..ff499b3 100755
--- a/samples/Avalonia/Demo.SaveFileDialog/Demo.SaveFileDialog.csproj
+++ b/samples/Avalonia/Demo.SaveFileDialog/Demo.SaveFileDialog.csproj
@@ -17,13 +17,12 @@
     <None Remove=".gitignore" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia"/>
-    <PackageReference Include="Avalonia.Desktop"/>
-    <PackageReference Include="ReactiveUI.Avalonia"/>
+    <PackageReference Include="Avalonia" />
+    <PackageReference Include="Avalonia.Desktop" />
+    <PackageReference Include="ReactiveUI.Avalonia" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" />
-    <PackageReference Include="Avalonia.Themes.Fluent"/>
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug"/>
+    <PackageReference Include="Avalonia.Themes.Fluent" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" />
     <PackageReference Include="Splat.DependencyInjection.SourceGenerator">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/samples/Avalonia/Demo.SaveFileDialog/MainWindow.axaml b/samples/Avalonia/Demo.SaveFileDialog/MainWindow.axaml
index 25b41a4..a82d627 100755
--- a/samples/Avalonia/Demo.SaveFileDialog/MainWindow.axaml
+++ b/samples/Avalonia/Demo.SaveFileDialog/MainWindow.axaml
@@ -9,7 +9,7 @@
     Title="Demo - Save File Dialog"
     Width="300"
     Height="200"
-    d:DataContext="{x:Static local:App.MainWindow}">
+    d:DataContext="{x:Static local:App.MainWindow}" x:DataType="local:MainWindowViewModel">
 
     <Grid VerticalAlignment="Center">
         <Grid.ColumnDefinitions>
diff --git a/samples/Avalonia/Demo.SaveFileDialog/MainWindow.axaml.cs b/samples/Avalonia/Demo.SaveFileDialog/MainWindow.axaml.cs
index 8e48ad2..5ac2109 100755
--- a/samples/Avalonia/Demo.SaveFileDialog/MainWindow.axaml.cs
+++ b/samples/Avalonia/Demo.SaveFileDialog/MainWindow.axaml.cs
@@ -1,4 +1,4 @@
-using Avalonia;
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
@@ -9,9 +9,6 @@ public partial class MainWindow : Window
     public MainWindow()
     {
         InitializeComponent();
-#if DEBUG
-        this.AttachDevTools();
-#endif
     }
 
     private void InitializeComponent()
diff --git a/samples/Avalonia/Demo.StrongLocator/AddTextDialog.axaml b/samples/Avalonia/Demo.StrongLocator/AddTextDialog.axaml
index b5fb973..9e79104 100755
--- a/samples/Avalonia/Demo.StrongLocator/AddTextDialog.axaml
+++ b/samples/Avalonia/Demo.StrongLocator/AddTextDialog.axaml
@@ -10,7 +10,7 @@
     WindowStartupLocation="CenterOwner"
     SizeToContent="WidthAndHeight"
     CanResize="False"
-    d:DataContext="{x:Static local:App.AddTextDialog}">
+    d:DataContext="{x:Static local:App.AddTextDialog}" x:DataType="local:AddTextDialogViewModel">
 
     <StackPanel>
         <TextBox Text="{Binding Text}" />
diff --git a/samples/Avalonia/Demo.StrongLocator/AddTextDialog.axaml.cs b/samples/Avalonia/Demo.StrongLocator/AddTextDialog.axaml.cs
index b657bd5..25924f8 100755
--- a/samples/Avalonia/Demo.StrongLocator/AddTextDialog.axaml.cs
+++ b/samples/Avalonia/Demo.StrongLocator/AddTextDialog.axaml.cs
@@ -9,9 +9,6 @@ public partial class AddTextDialog : Window
     public AddTextDialog()
     {
         InitializeComponent();
-#if DEBUG
-        this.AttachDevTools();
-#endif
     }
 
     private void InitializeComponent() => AvaloniaXamlLoader.Load(this);
diff --git a/samples/Avalonia/Demo.StrongLocator/App.axaml.cs b/samples/Avalonia/Demo.StrongLocator/App.axaml.cs
index 0e37598..00948da 100755
--- a/samples/Avalonia/Demo.StrongLocator/App.axaml.cs
+++ b/samples/Avalonia/Demo.StrongLocator/App.axaml.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Avalonia;
 using Avalonia.Markup.Xaml;
 using HanumanInstitute.MvvmDialogs;
diff --git a/samples/Avalonia/Demo.StrongLocator/Demo.StrongLocator.csproj b/samples/Avalonia/Demo.StrongLocator/Demo.StrongLocator.csproj
index 4490997..85cad85 100755
--- a/samples/Avalonia/Demo.StrongLocator/Demo.StrongLocator.csproj
+++ b/samples/Avalonia/Demo.StrongLocator/Demo.StrongLocator.csproj
@@ -13,14 +13,13 @@
     <None Remove=".gitignore" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia"/>
-    <PackageReference Include="Avalonia.Desktop"/>
-    <PackageReference Include="ReactiveUI.Avalonia"/>
+    <PackageReference Include="Avalonia" />
+    <PackageReference Include="Avalonia.Desktop" />
+    <PackageReference Include="ReactiveUI.Avalonia" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics"/>
-    <PackageReference Include="Avalonia.Fonts.Inter"/>
-    <PackageReference Include="Avalonia.Themes.Fluent"/>
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug"/>
+    <PackageReference Include="Avalonia.Fonts.Inter" />
+    <PackageReference Include="Avalonia.Themes.Fluent" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" />
     <PackageReference Include="Splat.DependencyInjection.SourceGenerator">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/samples/Avalonia/Demo.StrongLocator/MainWindow.axaml b/samples/Avalonia/Demo.StrongLocator/MainWindow.axaml
index a37060f..aa6b8d2 100755
--- a/samples/Avalonia/Demo.StrongLocator/MainWindow.axaml
+++ b/samples/Avalonia/Demo.StrongLocator/MainWindow.axaml
@@ -10,7 +10,7 @@
     Title="Demo - Modal Dialog"
     Width="300"
     Height="200"
-    DataContext="{x:Static local:App.MainWindow}">
+    DataContext="{x:Static local:App.MainWindow}" x:DataType="local:MainWindowViewModel">
 
     <Grid>
         <Grid.RowDefinitions>
diff --git a/samples/Avalonia/Demo.StrongLocator/MainWindow.axaml.cs b/samples/Avalonia/Demo.StrongLocator/MainWindow.axaml.cs
index a990426..4003733 100755
--- a/samples/Avalonia/Demo.StrongLocator/MainWindow.axaml.cs
+++ b/samples/Avalonia/Demo.StrongLocator/MainWindow.axaml.cs
@@ -9,9 +9,6 @@ public partial class MainWindow : Window
     public MainWindow()
     {
         InitializeComponent();
-#if DEBUG
-        this.AttachDevTools();
-#endif
     }
 
     private void InitializeComponent()
diff --git a/samples/Avalonia/Demo.ViewEvents/Demo.ViewEvents.csproj b/samples/Avalonia/Demo.ViewEvents/Demo.ViewEvents.csproj
index 9553529..9769cf1 100755
--- a/samples/Avalonia/Demo.ViewEvents/Demo.ViewEvents.csproj
+++ b/samples/Avalonia/Demo.ViewEvents/Demo.ViewEvents.csproj
@@ -10,9 +10,8 @@
   <ItemGroup>
     <PackageReference Include="Avalonia" />
     <PackageReference Include="Avalonia.Desktop" />
-    <PackageReference Include="ReactiveUI.Avalonia"/>
+    <PackageReference Include="ReactiveUI.Avalonia" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" />
     <PackageReference Include="Avalonia.Themes.Fluent" />
     <PackageReference Include="FluentAvaloniaUI" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" />
diff --git a/samples/Avalonia/Demo.ViewEvents/MainWindow.axaml b/samples/Avalonia/Demo.ViewEvents/MainWindow.axaml
index f1bb21d..67d5cce 100755
--- a/samples/Avalonia/Demo.ViewEvents/MainWindow.axaml
+++ b/samples/Avalonia/Demo.ViewEvents/MainWindow.axaml
@@ -10,7 +10,7 @@
     Title="Demo - View Events"
     Width="300"
     Height="200"
-    d:DataContext="{x:Static local:App.MainWindow}">
+    d:DataContext="{x:Static local:App.MainWindow}" x:DataType="local:MainWindowViewModel">
 
     <Grid>
         <TextBlock Text="{Binding Text}" HorizontalAlignment="Center" VerticalAlignment="Center" />
diff --git a/samples/Avalonia/Demo.ViewEvents/MainWindow.axaml.cs b/samples/Avalonia/Demo.ViewEvents/MainWindow.axaml.cs
index 5e24240..a04dc13 100755
--- a/samples/Avalonia/Demo.ViewEvents/MainWindow.axaml.cs
+++ b/samples/Avalonia/Demo.ViewEvents/MainWindow.axaml.cs
@@ -9,9 +9,6 @@ public partial class MainWindow : Window
     public MainWindow()
     {
         InitializeComponent();
-#if DEBUG
-        this.AttachDevTools();
-#endif
     }
 
     private void InitializeComponent() => AvaloniaXamlLoader.Load(this);
diff --git a/samples/Avalonia/Demo.ViewEvents/MainWindowViewModel.cs b/samples/Avalonia/Demo.ViewEvents/MainWindowViewModel.cs
index d7b41a4..635339d 100755
--- a/samples/Avalonia/Demo.ViewEvents/MainWindowViewModel.cs
+++ b/samples/Avalonia/Demo.ViewEvents/MainWindowViewModel.cs
@@ -5,14 +5,9 @@
 
 namespace Demo.Avalonia.ViewEvents;
 
-public class MainWindowViewModel : ViewModelBase, IViewLoaded, IViewClosing, IViewClosed
+public class MainWindowViewModel(IDialogService dialogService) : ViewModelBase, IViewLoaded, IViewClosing, IViewClosed
 {
-    private readonly IDialogService _dialogService;
-
-    public MainWindowViewModel(IDialogService dialogService)
-    {
-        this._dialogService = dialogService;
-    }
+    private readonly IDialogService _dialogService = dialogService;
 
     public void OnLoaded()
     {
diff --git a/samples/Directory.Build.props b/samples/Directory.Build.props
index 5a86eb9..a48eb5b 100644
--- a/samples/Directory.Build.props
+++ b/samples/Directory.Build.props
@@ -4,4 +4,4 @@
     <Nullable>enable</Nullable>
     <Company>Hanuman Institute</Company>
   </PropertyGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index f152dfa..51110e9 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -11,8 +11,11 @@
     <NeutralLanguage>en-US</NeutralLanguage>
     <RepositoryUrl>https://github.com/mysteryx93/HanumanInstitute.MvvmDialogs</RepositoryUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <Description>Library simplifying the concept of opening dialogs from a view model when using MVVM in WPF</Description>
-    <PackageTags>wpf avalonia mvvm dialog window messagebox openfiledialog savefiledialog folderbrowserdialog messagedialog contentdialog fileopenpicker filesavepicker folderpicker android ios mobile xamarin</PackageTags>
+    <Description>Library simplifying the concept of opening dialogs from a view model when using
+      MVVM in WPF</Description>
+    <PackageTags>wpf avalonia mvvm dialog window messagebox openfiledialog savefiledialog
+      folderbrowserdialog messagedialog contentdialog fileopenpicker filesavepicker folderpicker
+      android ios mobile xamarin</PackageTags>
   </PropertyGroup>
 
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/MvvmDialogs.Avalonia.DialogHost/MvvmDialogs.Avalonia.DialogHost.csproj b/src/MvvmDialogs.Avalonia.DialogHost/MvvmDialogs.Avalonia.DialogHost.csproj
index b9f87b3..69e62e2 100644
--- a/src/MvvmDialogs.Avalonia.DialogHost/MvvmDialogs.Avalonia.DialogHost.csproj
+++ b/src/MvvmDialogs.Avalonia.DialogHost/MvvmDialogs.Avalonia.DialogHost.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-      <TargetFrameworks>net10.0;net8.0;netstandard2.0</TargetFrameworks>
+      <TargetFrameworks>net10.0;net8.0</TargetFrameworks>
       <LangVersion>default</LangVersion>
       <Nullable>enable</Nullable>
       <OutputType>Library</OutputType>
diff --git a/src/MvvmDialogs.Avalonia.Fluent/ContentDialogSettings.cs b/src/MvvmDialogs.Avalonia.Fluent/ContentDialogSettings.cs
index 348de23..ebe9140 100644
--- a/src/MvvmDialogs.Avalonia.Fluent/ContentDialogSettings.cs
+++ b/src/MvvmDialogs.Avalonia.Fluent/ContentDialogSettings.cs
@@ -39,7 +39,7 @@ public ContentDialogSettings(object? content)
     /// <summary>
     /// Gets or sets a value that indicates which button on the dialog is the default action.
     /// </summary>
-    public ContentDialogButton DefaultButton { get; set; } = ContentDialogButton.None;
+    public FAContentDialogButton DefaultButton { get; set; } = FAContentDialogButton.None;
     /// <summary>
     /// Gets or sets whether the dialog's primary button is enabled.
     /// </summary>
diff --git a/src/MvvmDialogs.Avalonia.Fluent/DialogServiceExtensions.cs b/src/MvvmDialogs.Avalonia.Fluent/DialogServiceExtensions.cs
index 94ef253..fa909c3 100644
--- a/src/MvvmDialogs.Avalonia.Fluent/DialogServiceExtensions.cs
+++ b/src/MvvmDialogs.Avalonia.Fluent/DialogServiceExtensions.cs
@@ -17,13 +17,13 @@ public static class DialogServiceExtensions
     /// <param name="settings">The settings for the content dialog.</param>
     /// <returns>The dialog button that was pressed.</returns>
     /// <exception cref="ViewNotRegisteredException">No view is registered with specified owner view model as data context.</exception>
-    public static async Task<ContentDialogResult> ShowContentDialogAsync(this IDialogService service, INotifyPropertyChanged ownerViewModel,
+    public static async Task<FAContentDialogResult> ShowContentDialogAsync(this IDialogService service, INotifyPropertyChanged ownerViewModel,
         ContentDialogSettings? settings = null)
     {
-        if (ownerViewModel == null) throw new ArgumentNullException(nameof(ownerViewModel));
+        ArgumentNullException.ThrowIfNull(ownerViewModel);
 
-        return (ContentDialogResult)(await service.DialogManager.ShowFrameworkDialogAsync(
-            ownerViewModel, settings ?? new ContentDialogSettings()).ConfigureAwait(true) ?? ContentDialogResult.None);
+        return (FAContentDialogResult)(await service.DialogManager.ShowFrameworkDialogAsync(
+            ownerViewModel, settings ?? new ContentDialogSettings()).ConfigureAwait(true) ?? FAContentDialogResult.None);
     }
 
     /// <summary>
@@ -34,12 +34,12 @@ public static async Task<ContentDialogResult> ShowContentDialogAsync(this IDialo
     /// <param name="settings">The settings for the task dialog.</param>
     /// <returns>The dialog return value.</returns>
     /// <exception cref="ViewNotRegisteredException">No view is registered with specified owner view model as data context.</exception>
-    public static async Task<TaskDialogStandardResult> ShowTaskDialogAsync(this IDialogService service, INotifyPropertyChanged ownerViewModel,
+    public static async Task<FATaskDialogStandardResult> ShowTaskDialogAsync(this IDialogService service, INotifyPropertyChanged ownerViewModel,
         TaskDialogSettings? settings = null)
     {
-        if (ownerViewModel == null) throw new ArgumentNullException(nameof(ownerViewModel));
+        ArgumentNullException.ThrowIfNull(ownerViewModel);
 
-        return (TaskDialogStandardResult)(await service.DialogManager.ShowFrameworkDialogAsync(
-            ownerViewModel, settings ?? new TaskDialogSettings()).ConfigureAwait(true) ?? TaskDialogStandardResult.None);
+        return (FATaskDialogStandardResult)(await service.DialogManager.ShowFrameworkDialogAsync(
+            ownerViewModel, settings ?? new TaskDialogSettings()).ConfigureAwait(true) ?? FATaskDialogStandardResult.None);
     }
 }
diff --git a/src/MvvmDialogs.Avalonia.Fluent/FluentContentView.cs b/src/MvvmDialogs.Avalonia.Fluent/FluentContentView.cs
index e76a523..df1cebc 100644
--- a/src/MvvmDialogs.Avalonia.Fluent/FluentContentView.cs
+++ b/src/MvvmDialogs.Avalonia.Fluent/FluentContentView.cs
@@ -25,7 +25,7 @@ public FluentContentView(ContentDialogSettings settings)
     /// <summary>
     /// Gets or sets the dialog result.
     /// </summary>
-    public ContentDialogResult DialogResult { get; set; } = ContentDialogResult.None;
+    public FAContentDialogResult DialogResult { get; set; } = FAContentDialogResult.None;
 
     /// <inheritdoc />
     public void Initialize(INotifyPropertyChanged viewModel, ViewDefinition viewDef)
@@ -40,7 +40,7 @@ public void InitializeExisting(INotifyPropertyChanged viewModel, object view)
     /// <summary>
     /// Gets a reference to the displayed ContentDialog.
     /// </summary>
-    public ContentDialog? Ref { get; private set; }
+    public FAContentDialog? Ref { get; private set; }
     /// <inheritdoc />
     public object RefObj => Ref!;
     /// <inheritdoc />
@@ -56,7 +56,7 @@ public void InitializeExisting(INotifyPropertyChanged viewModel, object view)
     /// <inheritdoc />
     public async Task ShowDialogAsync(IView owner)
     {
-        var dialog = new ContentDialog()
+        var dialog = new FAContentDialog()
         {
             Title = Settings.Title,
             Content = Settings.Content,
diff --git a/src/MvvmDialogs.Avalonia.Fluent/FluentDialogFactory.cs b/src/MvvmDialogs.Avalonia.Fluent/FluentDialogFactory.cs
index 8f81cca..8417609 100644
--- a/src/MvvmDialogs.Avalonia.Fluent/FluentDialogFactory.cs
+++ b/src/MvvmDialogs.Avalonia.Fluent/FluentDialogFactory.cs
@@ -34,9 +34,9 @@ public FluentDialogFactory(FluentMessageBoxType messageBoxType = FluentMessageBo
             _ => await base.ShowDialogAsync(owner, settings).ConfigureAwait(true)
         };
 
-    private async Task<ContentDialogResult> ShowContentDialogAsync(IView? owner, ContentDialogSettings settings)
+    private async Task<FAContentDialogResult> ShowContentDialogAsync(IView? owner, ContentDialogSettings settings)
     {
-        if (owner == null) { throw new ArgumentNullException(nameof(owner)); }
+        ArgumentNullException.ThrowIfNull(owner);
         var view = new FluentContentView(settings);
         if (view.ViewModel != null)
         {
@@ -49,7 +49,7 @@ private async Task<ContentDialogResult> ShowContentDialogAsync(IView? owner, Con
 
     private async Task<object?> ShowTaskDialogAsync(IView? owner, TaskDialogSettings settings)
     {
-        if (owner == null) { throw new ArgumentNullException(nameof(owner)); }
+        ArgumentNullException.ThrowIfNull(owner);
         var view = new FluentTaskView(settings);
         if (view.ViewModel != null)
         {
@@ -66,15 +66,15 @@ private async Task<ContentDialogResult> ShowContentDialogAsync(IView? owner, Con
         {
             Title = settings.Title,
             Content = settings.Content,
-            DefaultButton = ContentDialogButton.Primary
+            DefaultButton = FAContentDialogButton.Primary
         };
-        var yes = ContentDialogResult.Primary;
-        var no = ContentDialogResult.Secondary;
+        var yes = FAContentDialogResult.Primary;
+        var no = FAContentDialogResult.Secondary;
         if (settings.Button == MessageBoxButton.Ok)
         {
             apiSettings.CloseButtonText = "OK";
-            apiSettings.DefaultButton = ContentDialogButton.Close;
-            yes = ContentDialogResult.None;
+            apiSettings.DefaultButton = FAContentDialogButton.Close;
+            yes = FAContentDialogResult.None;
         }
         else if (settings.Button == MessageBoxButton.OkCancel)
         {
@@ -112,32 +112,32 @@ private async Task<ContentDialogResult> ShowContentDialogAsync(IView? owner, Con
         return result as bool?; // It can be TaskDialogStandardResult.None if we press Escape
     }
 
-    private static TaskDialogButton[] SyncButton(MessageBoxButton value, bool? defaultValue) =>
+    private static FATaskDialogButton[] SyncButton(MessageBoxButton value, bool? defaultValue) =>
         (value) switch
         {
-            MessageBoxButton.YesNo => new[]
-            {
+            MessageBoxButton.YesNo =>
+            [
                 GetButton("Yes", true, defaultValue),
                 GetButton("No", false, defaultValue)
-            },
-            MessageBoxButton.OkCancel => new[]
-            {
+            ],
+            MessageBoxButton.OkCancel =>
+            [
                 GetButton("OK", true, defaultValue),
                 GetButton("Cancel", null, defaultValue)
-            },
-            MessageBoxButton.YesNoCancel => new[]
-            {
+            ],
+            MessageBoxButton.YesNoCancel =>
+            [
                 GetButton("Yes", true, defaultValue),
                 GetButton("No", false, defaultValue),
                 GetButton("Cancel", null, defaultValue)
-            },
-            _ => new[]
-            {
+            ],
+            _ =>
+            [
                 GetButton("OK", true, true)
-            }
+            ]
         };
 
-    private static TaskDialogButton GetButton(string text, bool? value, bool? defaultValue) =>
+    private static FATaskDialogButton GetButton(string text, bool? value, bool? defaultValue) =>
         new(text, value)
         {
             IsDefault = defaultValue == value
diff --git a/src/MvvmDialogs.Avalonia.Fluent/FluentTaskView.cs b/src/MvvmDialogs.Avalonia.Fluent/FluentTaskView.cs
index cfe9ad6..67496f3 100644
--- a/src/MvvmDialogs.Avalonia.Fluent/FluentTaskView.cs
+++ b/src/MvvmDialogs.Avalonia.Fluent/FluentTaskView.cs
@@ -32,7 +32,7 @@ public void InitializeExisting(INotifyPropertyChanged viewModel, object view)
     /// <summary>
     /// Gets a reference to the displayed TaskDialog.
     /// </summary>
-    public TaskDialog? Ref { get; private set; }
+    public FATaskDialog? Ref { get; private set; }
     /// <inheritdoc />
     public object RefObj => Ref!;
     /// <inheritdoc />
@@ -48,7 +48,7 @@ public void InitializeExisting(INotifyPropertyChanged viewModel, object view)
     /// <inheritdoc />
     public async Task ShowDialogAsync(IView owner)
     {
-        var dialog = new TaskDialog()
+        var dialog = new FATaskDialog()
         {
             Title = Settings.Title,
             Header = Settings.Header,
diff --git a/src/MvvmDialogs.Avalonia.Fluent/TaskDialogSettings.cs b/src/MvvmDialogs.Avalonia.Fluent/TaskDialogSettings.cs
index 19354c7..8f4cb87 100644
--- a/src/MvvmDialogs.Avalonia.Fluent/TaskDialogSettings.cs
+++ b/src/MvvmDialogs.Avalonia.Fluent/TaskDialogSettings.cs
@@ -37,19 +37,19 @@ public TaskDialogSettings(object? content)
     /// <summary>
     /// Gets or sets the dialog Icon
     /// </summary>
-    public IconSource? IconSource { get; set; }
+    public FAIconSource? IconSource { get; set; }
     /// <summary>
     /// Gets the list of buttons that display at the bottom of the TaskDialog
     /// </summary>
-    public IList<TaskDialogButton> Buttons { get; set; } = new List<TaskDialogButton>();
+    public IList<FATaskDialogButton> Buttons { get; set; } = [];
     /// <summary>
     /// Gets the list of Commands displayed in the TaskDialog
     /// </summary>
-    public IList<TaskDialogCommand> Commands { get; set; } = new List<TaskDialogCommand>();
+    public IList<FATaskDialogCommand> Commands { get; set; } = [];
     /// <summary>
     /// Gets or sets the visibility of the Footer area
     /// </summary>
-    public TaskDialogFooterVisibility FooterVisibility { get; set; }
+    public FATaskDialogFooterVisibility FooterVisibility { get; set; }
     /// <summary>
     /// Gets or sets whether the footer is visible
     /// </summary>
diff --git a/src/MvvmDialogs.Avalonia.MessageBox/IMessageBoxApi.cs b/src/MvvmDialogs.Avalonia.MessageBox/IMessageBoxApi.cs
index cfaddf0..09be93d 100644
--- a/src/MvvmDialogs.Avalonia.MessageBox/IMessageBoxApi.cs
+++ b/src/MvvmDialogs.Avalonia.MessageBox/IMessageBoxApi.cs
@@ -1,5 +1,4 @@
-
-namespace HanumanInstitute.MvvmDialogs.Avalonia.MessageBox;
+namespace HanumanInstitute.MvvmDialogs.Avalonia.MessageBox;
 
 internal interface IMessageBoxApi
 {
diff --git a/src/MvvmDialogs.Avalonia.MessageBox/MvvmDialogs.Avalonia.MessageBox.csproj b/src/MvvmDialogs.Avalonia.MessageBox/MvvmDialogs.Avalonia.MessageBox.csproj
index 7e1f438..0bc0a80 100644
--- a/src/MvvmDialogs.Avalonia.MessageBox/MvvmDialogs.Avalonia.MessageBox.csproj
+++ b/src/MvvmDialogs.Avalonia.MessageBox/MvvmDialogs.Avalonia.MessageBox.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-      <TargetFrameworks>net10.0;net8.0;netstandard2.0</TargetFrameworks>
+      <TargetFrameworks>net10.0;net8.0</TargetFrameworks>
       <LangVersion>default</LangVersion>
       <Nullable>enable</Nullable>
       <OutputType>Library</OutputType>
@@ -20,7 +20,7 @@
 
     <ItemGroup>
       <PackageReference Include="Avalonia" />
-      <PackageReference Include="MessageBox.Avalonia"/>
+      <PackageReference Include="MessageBox.Avalonia" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/MvvmDialogs.Avalonia.MessageBox/Usings.cs b/src/MvvmDialogs.Avalonia.MessageBox/Usings.cs
index e1b790c..1df1791 100644
--- a/src/MvvmDialogs.Avalonia.MessageBox/Usings.cs
+++ b/src/MvvmDialogs.Avalonia.MessageBox/Usings.cs
@@ -1,4 +1,4 @@
-global using System;
+global using System;
 global using System.Threading.Tasks;
 global using Avalonia;
 global using Avalonia.Controls;
diff --git a/src/MvvmDialogs.Avalonia.Tests/MvvmDialogs.Avalonia.Tests.csproj b/src/MvvmDialogs.Avalonia.Tests/MvvmDialogs.Avalonia.Tests.csproj
index 493cd1b..7efa678 100644
--- a/src/MvvmDialogs.Avalonia.Tests/MvvmDialogs.Avalonia.Tests.csproj
+++ b/src/MvvmDialogs.Avalonia.Tests/MvvmDialogs.Avalonia.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net10.0;net472</TargetFrameworks>
+    <TargetFrameworks>net10.0;net8.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>disable</Nullable>
diff --git a/src/MvvmDialogs.Avalonia/DialogManager.cs b/src/MvvmDialogs.Avalonia/DialogManager.cs
index 7c08ef0..4122bca 100755
--- a/src/MvvmDialogs.Avalonia/DialogManager.cs
+++ b/src/MvvmDialogs.Avalonia/DialogManager.cs
@@ -13,7 +13,7 @@ namespace HanumanInstitute.MvvmDialogs.Avalonia;
 /// </summary>
 public class DialogManager : DialogManagerBase<ContentControl>
 {
-    private readonly INavigationManager? _navigationManager;
+    private readonly NavigationManager? _navigationManager;
     private readonly IDispatcher _dispatcher;
     private readonly bool _useNavigation;
 
@@ -101,7 +101,7 @@ protected override IView AsWrapper(ContentControl view) =>
         {
             Height = 1,
             Width = 1,
-            SystemDecorations = SystemDecorations.None,
+            WindowDecorations = WindowDecorations.None,
             ShowInTaskbar = false,
             CanResize = false,
             WindowStartupLocation = WindowStartupLocation.CenterScreen,
diff --git a/src/MvvmDialogs.Avalonia/MvvmDialogs.Avalonia.csproj b/src/MvvmDialogs.Avalonia/MvvmDialogs.Avalonia.csproj
index 81ed88b..ff0956d 100644
--- a/src/MvvmDialogs.Avalonia/MvvmDialogs.Avalonia.csproj
+++ b/src/MvvmDialogs.Avalonia/MvvmDialogs.Avalonia.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net10.0;net8.0;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net10.0;net8.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <AssemblyTitle>MVVM Dialogs for Avalonia</AssemblyTitle>
     <AssemblyOriginatorKeyFile>..\..\StrongName.snk</AssemblyOriginatorKeyFile>
diff --git a/src/MvvmDialogs.Avalonia/Navigation/NavigationManager.cs b/src/MvvmDialogs.Avalonia/Navigation/NavigationManager.cs
index 17a28a2..2309a3c 100644
--- a/src/MvvmDialogs.Avalonia/Navigation/NavigationManager.cs
+++ b/src/MvvmDialogs.Avalonia/Navigation/NavigationManager.cs
@@ -7,7 +7,11 @@
 namespace HanumanInstitute.MvvmDialogs.Avalonia.Navigation;
 
 /// <inheritdoc cref="INavigationManager"/>
-public class NavigationManager : INotifyPropertyChanged, INavigationManager
+/// <summary>
+/// Initializes a new instance of the NavigationManager class.
+/// </summary>
+/// <param name="closingHandler">A handler for the Closing event. Note that the Closing event is unsupported by the <see cref="ViewNavigationWrapper"/> and we thus support a single listener.</param>
+public class NavigationManager(ViewClosingHandler? closingHandler) : INotifyPropertyChanged, INavigationManager
 {
     /// <summary>
     /// Navigation history contains only ViewModels to avoid keeping all constructed user controls in memory. The Views can be reconstructed from the ViewModels.
@@ -15,16 +19,7 @@ public class NavigationManager : INotifyPropertyChanged, INavigationManager
     private readonly List<INotifyPropertyChanged> _history = new();
     private readonly ViewCache _viewCache = new();
     private readonly List<DialogTask> _dialogs = new();
-    private readonly ViewClosingHandler? _closingHandler;
-
-    /// <summary>
-    /// Initializes a new instance of the NavigationManager class.
-    /// </summary>
-    /// <param name="closingHandler">A handler for the Closing event. Note that the Closing event is unsupported by the <see cref="ViewNavigationWrapper"/> and we thus support a single listener.</param>
-    public NavigationManager(ViewClosingHandler? closingHandler)
-    {
-        _closingHandler = closingHandler;
-    }
+    private readonly ViewClosingHandler? _closingHandler = closingHandler;
 
     /// <summary>
     /// Returns the navigation history.
diff --git a/src/MvvmDialogs.Avalonia/Navigation/NavigationRoot.axaml b/src/MvvmDialogs.Avalonia/Navigation/NavigationRoot.axaml
index 7e6bcf1..001feba 100644
--- a/src/MvvmDialogs.Avalonia/Navigation/NavigationRoot.axaml
+++ b/src/MvvmDialogs.Avalonia/Navigation/NavigationRoot.axaml
@@ -5,7 +5,8 @@
              xmlns:mvvm="clr-namespace:HanumanInstitute.MvvmDialogs.Avalonia"
              xmlns:navigation="clr-namespace:HanumanInstitute.MvvmDialogs.Avalonia.Navigation"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="HanumanInstitute.MvvmDialogs.Avalonia.Navigation.NavigationRoot">
+             x:Class="HanumanInstitute.MvvmDialogs.Avalonia.Navigation.NavigationRoot"
+             x:DataType="navigation:NavigationManager">
     <Design.DataContext>
         <navigation:NavigationManager />
     </Design.DataContext>
diff --git a/src/MvvmDialogs.Avalonia/Navigation/NavigationRootWindow.axaml b/src/MvvmDialogs.Avalonia/Navigation/NavigationRootWindow.axaml
index 57763dd..2c00145 100644
--- a/src/MvvmDialogs.Avalonia/Navigation/NavigationRootWindow.axaml
+++ b/src/MvvmDialogs.Avalonia/Navigation/NavigationRootWindow.axaml
@@ -6,6 +6,7 @@
         xmlns:navigation="clr-namespace:HanumanInstitute.MvvmDialogs.Avalonia.Navigation"
         mc:Ignorable="d" Width="600" Height="450"
         x:Class="HanumanInstitute.MvvmDialogs.Avalonia.Navigation.NavigationRootWindow"
+        x:DataType="navigation:NavigationManager"
         Title="NavigationRootWindow">
     <Design.DataContext>
         <navigation:NavigationManager />
diff --git a/src/MvvmDialogs/MvvmDialogs.csproj b/src/MvvmDialogs/MvvmDialogs.csproj
index 9af22e0..c056b6d 100644
--- a/src/MvvmDialogs/MvvmDialogs.csproj
+++ b/src/MvvmDialogs/MvvmDialogs.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net10.0;net8.0;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net10.0;net8.0;net462</TargetFrameworks>
     <OutputType>Library</OutputType>
     <AssemblyTitle>MVVM Dialogs</AssemblyTitle>
     <SignAssembly>true</SignAssembly>