From 79332f208baea480ed6c8a0f94ce7660607377b9 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Tue, 15 Nov 2022 01:49:15 -0500
Subject: [PATCH 1/9] Fix wrong type parameter for the command accessor

---
 .../CompiledBindings/CommandAccessorPlugin.cs                 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/CommandAccessorPlugin.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/CommandAccessorPlugin.cs
index 970cc767f7..8339fe8e38 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/CommandAccessorPlugin.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/CommandAccessorPlugin.cs
@@ -124,7 +124,7 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions.CompiledBindings
             {
                 if (_dependsOnProperties is { Count: > 0 } && _reference.TryGetTarget(out var o) && o is INotifyPropertyChanged inpc)
                 {
-                    WeakEventHandlerManager.Unsubscribe<PropertyChangedEventArgs, InpcPropertyAccessor>(
+                    WeakEventHandlerManager.Unsubscribe<PropertyChangedEventArgs, CommandAccessor>(
                         inpc,
                         nameof(INotifyPropertyChanged.PropertyChanged),
                         OnNotifyPropertyChanged);
@@ -145,7 +145,7 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions.CompiledBindings
             {
                 if (_dependsOnProperties is { Count:>0 } && _reference.TryGetTarget(out var o) && o is INotifyPropertyChanged inpc)
                 {
-                    WeakEventHandlerManager.Subscribe<INotifyPropertyChanged, PropertyChangedEventArgs, InpcPropertyAccessor>(
+                    WeakEventHandlerManager.Subscribe<INotifyPropertyChanged, PropertyChangedEventArgs, CommandAccessor>(
                         inpc,
                         nameof(INotifyPropertyChanged.PropertyChanged),
                         OnNotifyPropertyChanged);

From 3c73f9dc0fac37540f5eae8731a6afb8c0801d58 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Tue, 15 Nov 2022 01:49:28 -0500
Subject: [PATCH 2/9] Fix CanExecute for compiled binding commands

---
 src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github b/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github
index 880ba5742e..cd3682c615 160000
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github
@@ -1 +1 @@
-Subproject commit 880ba5742e52b67afda048c4023cf7e3c3c16a46
+Subproject commit cd3682c61577a3518de765f7938295d98ff9808c

From fa0cea97fefe70c5526122dc2b74fa45749c2d41 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Tue, 15 Nov 2022 02:01:56 -0500
Subject: [PATCH 3/9] Enable compiled bindings by default and fix all the
 usages + adjust some namespaces

---
 build/BuildTargets.targets                    |  1 +
 samples/BindingDemo/MainWindow.xaml           |  6 +--
 samples/BindingDemo/TestItemView.xaml         |  6 ++-
 samples/ControlCatalog/App.xaml               |  1 -
 samples/ControlCatalog/ControlCatalog.csproj  | 15 -------
 samples/ControlCatalog/DecoratedWindow.xaml   | 11 +++--
 samples/ControlCatalog/MainView.xaml          |  8 ++--
 samples/ControlCatalog/MainWindow.xaml        | 11 ++---
 samples/ControlCatalog/Models/StateData.cs    | 20 +++++++++
 .../Pages/AutoCompleteBoxPage.xaml            |  6 +--
 .../Pages/AutoCompleteBoxPage.xaml.cs         | 20 +--------
 samples/ControlCatalog/Pages/BorderPage.xaml  |  1 -
 .../Pages/ButtonSpinnerPage.xaml              |  2 +-
 .../Pages/CalendarDatePickerPage.xaml         |  2 +-
 .../ControlCatalog/Pages/ColorPickerPage.xaml |  4 +-
 .../ControlCatalog/Pages/ComboBoxPage.xaml    |  8 ++--
 .../Pages/CompositionPage.axaml               |  4 +-
 .../Pages/ContextFlyoutPage.xaml              |  6 ++-
 .../ControlCatalog/Pages/ContextMenuPage.xaml |  6 ++-
 samples/ControlCatalog/Pages/CursorPage.xaml  |  6 ++-
 .../ControlCatalog/Pages/DataGridPage.xaml    | 30 ++++++-------
 .../Pages/DateTimePickerPage.xaml             |  2 +-
 .../ControlCatalog/Pages/ExpanderPage.xaml    |  4 +-
 .../Pages/ItemsRepeaterPage.xaml              |  8 ++--
 .../Pages/ItemsRepeaterPage.xaml.cs           |  4 +-
 samples/ControlCatalog/Pages/LabelsPage.axaml |  4 +-
 samples/ControlCatalog/Pages/ListBoxPage.xaml |  4 +-
 samples/ControlCatalog/Pages/MenuPage.xaml    |  8 ++--
 .../Pages/NotificationsPage.xaml              |  4 +-
 .../Pages/NumericUpDownPage.xaml              | 11 +++--
 .../Pages/NumericUpDownPage.xaml.cs           |  3 ++
 samples/ControlCatalog/Pages/OpenGlPage.xaml  |  2 +-
 .../Pages/PlatformInfoPage.xaml               |  4 +-
 .../ControlCatalog/Pages/ProgressBarPage.xaml |  2 +-
 .../Pages/ScrollViewerPage.xaml               |  4 +-
 samples/ControlCatalog/Pages/SliderPage.xaml  |  2 +-
 .../ControlCatalog/Pages/SplitViewPage.xaml   |  6 ++-
 .../ControlCatalog/Pages/TabControlPage.xaml  | 10 +++--
 .../Pages/TabControlPage.xaml.cs              | 32 +++-----------
 .../ControlCatalog/Pages/TabStripPage.xaml    | 10 +++--
 .../ControlCatalog/Pages/TabStripPage.xaml.cs | 40 +++++++----------
 samples/ControlCatalog/Pages/TextBoxPage.xaml |  2 +-
 .../TransitioningContentControlPage.axaml     |  3 +-
 .../ControlCatalog/Pages/TreeViewPage.xaml    |  4 +-
 samples/ControlCatalog/Pages/ViewboxPage.xaml |  2 +-
 .../Pages/WindowCustomizationsPage.xaml       |  4 +-
 .../ViewModels/CursorPageViewModel.cs         | 20 ++++-----
 .../ViewModels/ItemsRepeaterPageViewModel.cs  | 44 +++++++++----------
 .../ViewModels/TabControlPageViewModel.cs     | 26 +++++++++++
 .../Views/CustomNotificationView.xaml         |  4 +-
 samples/IntegrationTestApp/MainWindow.axaml   |  4 +-
 .../IntegrationTestApp/ShowWindowTest.axaml   |  1 +
 samples/MobileSandbox/App.xaml                |  1 -
 samples/MobileSandbox/MainView.xaml           |  4 +-
 .../Views/CustomNotificationView.xaml         |  8 ++--
 samples/RenderDemo/MainWindow.xaml            |  6 ++-
 samples/RenderDemo/Pages/AnimationsPage.xaml  |  4 +-
 .../RenderDemo/Pages/CustomAnimatorPage.xaml  |  2 +-
 samples/RenderDemo/Pages/GlyphRunPage.xaml    |  2 +-
 samples/RenderDemo/Pages/LineBoundsPage.xaml  |  2 +-
 .../RenderDemo/Pages/Transform3DPage.axaml    |  4 +-
 samples/RenderDemo/Pages/TransitionsPage.xaml |  2 +
 .../HamburgerMenu/HamburgerMenu.xaml          |  6 +--
 samples/VirtualizationDemo/MainWindow.xaml    |  4 +-
 .../Themes/Fluent/ColorPicker.xaml            |  5 +--
 .../Themes/Fluent/ColorPreviewer.xaml         |  3 +-
 .../Themes/Fluent/ColorSlider.xaml            |  3 +-
 .../Themes/Fluent/ColorSpectrum.xaml          |  3 +-
 .../Themes/Fluent/ColorView.xaml              |  5 +--
 .../Themes/Fluent/Fluent.xaml                 |  3 +-
 .../Themes/Simple/ColorPicker.xaml            |  5 +--
 .../Themes/Simple/ColorPreviewer.xaml         |  3 +-
 .../Themes/Simple/ColorSlider.xaml            |  3 +-
 .../Themes/Simple/ColorSpectrum.xaml          |  3 +-
 .../Themes/Simple/ColorView.xaml              |  5 +--
 .../Themes/Simple/Simple.xaml                 |  3 +-
 .../Themes/Fluent.xaml                        |  6 +--
 .../Themes/Simple.xaml                        |  5 ++-
 .../Diagnostics/Controls/FilterTextBox.axaml  |  1 -
 .../Controls/ThicknessEditor.axaml            |  2 +-
 .../Diagnostics/ViewModels/MainViewModel.cs   |  4 +-
 .../Diagnostics/Views/ConsoleView.xaml        |  4 +-
 .../Diagnostics/Views/ControlDetailsView.xaml | 28 +++++++-----
 .../Diagnostics/Views/EventsPageView.xaml     | 10 ++---
 .../Views/LayoutExplorerView.axaml            |  7 +--
 .../Diagnostics/Views/MainView.xaml           |  8 ++--
 .../Diagnostics/Views/MainWindow.xaml         |  8 ++--
 .../Diagnostics/Views/TreePageView.xaml       |  7 +--
 src/Avalonia.Dialogs/AboutAvaloniaDialog.xaml |  4 +-
 src/Avalonia.Dialogs/InternalViewModelBase.cs |  7 +--
 .../ManagedFileChooserFilterViewModel.cs      |  3 +-
 .../ManagedFileChooserItemViewModel.cs        |  3 +-
 .../ManagedFileChooserNavigationItem.cs       |  2 +-
 .../ManagedFileChooserViewModel.cs            |  3 +-
 .../Controls/ButtonSpinner.xaml               |  5 +--
 .../Controls/CalendarDatePicker.xaml          |  3 +-
 .../Controls/CalendarItem.xaml                |  8 ++--
 .../Controls/ComboBox.xaml                    |  2 +-
 .../Controls/DataValidationErrors.xaml        |  5 +--
 .../Controls/DatePicker.xaml                  |  3 +-
 .../Controls/DateTimePickerShared.xaml        |  4 +-
 .../Controls/DropDownButton.xaml              |  3 +-
 .../Controls/Expander.xaml                    |  3 +-
 .../Controls/ManagedFileChooser.xaml          |  7 +--
 .../Controls/MenuItem.xaml                    |  5 +--
 .../Controls/MenuScrollViewer.xaml            |  2 +-
 .../Controls/NativeMenuBar.xaml               | 20 ++++-----
 .../Controls/ProgressBar.xaml                 |  3 +-
 .../Controls/ScrollViewer.xaml                |  3 +-
 .../Controls/Slider.xaml                      |  2 +-
 .../Controls/SplitButton.xaml                 |  1 -
 .../Controls/TabItem.xaml                     |  3 +-
 .../Controls/TabStripItem.xaml                |  3 +-
 .../Controls/TextBox.xaml                     |  5 +--
 .../Controls/TimePicker.xaml                  |  3 +-
 .../Controls/ToggleSwitch.xaml                |  3 +-
 .../Controls/ToolTip.xaml                     |  3 +-
 .../Controls/TreeViewItem.xaml                |  2 +-
 .../Controls/WindowNotificationManager.xaml   |  1 -
 src/Avalonia.Themes.Fluent/FluentDark.xaml    |  2 +-
 src/Avalonia.Themes.Fluent/FluentLight.xaml   |  2 +-
 .../Controls/ButtonSpinner.xaml               |  3 +-
 .../Controls/CalendarDatePicker.xaml          |  3 +-
 .../Controls/CalendarItem.xaml                |  2 +-
 .../Controls/DatePicker.xaml                  |  3 +-
 .../Controls/DateTimePickerShared.xaml        |  4 +-
 .../Controls/ManagedFileChooser.xaml          |  4 +-
 .../Controls/NativeMenuBar.xaml               | 17 +++----
 .../Controls/ProgressBar.xaml                 |  2 +-
 .../Controls/SplitButton.xaml                 |  1 -
 .../Controls/SplitView.xaml                   |  6 +--
 .../Controls/TimePicker.xaml                  |  3 +-
 .../Controls/TreeViewItem.xaml                |  2 +-
 .../MainWindow.xaml                           |  1 -
 134 files changed, 412 insertions(+), 398 deletions(-)
 create mode 100644 samples/ControlCatalog/Models/StateData.cs
 create mode 100644 samples/ControlCatalog/ViewModels/TabControlPageViewModel.cs

diff --git a/build/BuildTargets.targets b/build/BuildTargets.targets
index a5543cd050..481dbf06b2 100644
--- a/build/BuildTargets.targets
+++ b/build/BuildTargets.targets
@@ -3,6 +3,7 @@
     <AvaloniaBuildTasksLocation>$(MSBuildThisFileDirectory)\..\src\Avalonia.Build.Tasks\bin\$(Configuration)\netstandard2.0\Avalonia.Build.Tasks.dll</AvaloniaBuildTasksLocation>
     <AvaloniaUseExternalMSBuild>true</AvaloniaUseExternalMSBuild>
     <AvaloniaXamlIlVerifyIl>true</AvaloniaXamlIlVerifyIl>
+    <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
   </PropertyGroup>
   <Import Project="$(MSBuildThisFileDirectory)\..\packages\Avalonia\AvaloniaBuildTasks.props"/>
   <Import Project="$(MSBuildThisFileDirectory)\..\packages\Avalonia\AvaloniaBuildTasks.targets"/>
diff --git a/samples/BindingDemo/MainWindow.xaml b/samples/BindingDemo/MainWindow.xaml
index b583503327..08ac0426ea 100644
--- a/samples/BindingDemo/MainWindow.xaml
+++ b/samples/BindingDemo/MainWindow.xaml
@@ -1,8 +1,8 @@
 <Window xmlns="https://github.com/avaloniaui"
         xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
         x:Class="BindingDemo.MainWindow"
-        xmlns:vm="clr-namespace:BindingDemo.ViewModels" 
-        xmlns:local="clr-namespace:BindingDemo"
+        xmlns:vm="using:BindingDemo.ViewModels" 
+        xmlns:local="using:BindingDemo"
         Title="AvaloniaUI Bindings Test"
         Width="800"
         Height="600"
@@ -81,7 +81,7 @@
           <TextBlock FontSize="16" Text="Multiple"/>
           <ListBox Items="{Binding Items}" SelectionMode="Multiple" Selection="{Binding Selection}"/>
         </StackPanel>
-        <ContentControl Content="{Binding SelectedItems[0]}">
+        <ContentControl Content="{ReflectionBinding Selection.SelectedItems[0]}">
           <ContentControl.DataTemplates>
             <DataTemplate DataType="vm:TestItem">
               <local:TestItemView></local:TestItemView>
diff --git a/samples/BindingDemo/TestItemView.xaml b/samples/BindingDemo/TestItemView.xaml
index 46c34c6507..6edade34b2 100644
--- a/samples/BindingDemo/TestItemView.xaml
+++ b/samples/BindingDemo/TestItemView.xaml
@@ -1,8 +1,10 @@
 <UserControl xmlns="https://github.com/avaloniaui"
         xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
-        x:Class="BindingDemo.TestItemView">
+        xmlns:viewModels="using:BindingDemo.ViewModels"
+        x:Class="BindingDemo.TestItemView"
+        x:DataType="viewModels:TestItem">
   <StackPanel>
     <TextBlock Classes="h1" Text="{Binding StringValue}"/>
     <TextBox Text="{Binding Detail}" AcceptsReturn="True"/>
   </StackPanel>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/samples/ControlCatalog/App.xaml b/samples/ControlCatalog/App.xaml
index b228e72f72..5570ada27b 100644
--- a/samples/ControlCatalog/App.xaml
+++ b/samples/ControlCatalog/App.xaml
@@ -2,7 +2,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:vm="using:ControlCatalog.ViewModels"
              x:DataType="vm:ApplicationViewModel"
-             x:CompileBindings="True"
              Name="Avalonia ControlCatalog"
              x:Class="ControlCatalog.App">
   <Application.Resources>
diff --git a/samples/ControlCatalog/ControlCatalog.csproj b/samples/ControlCatalog/ControlCatalog.csproj
index 2654574a3e..6b550a30be 100644
--- a/samples/ControlCatalog/ControlCatalog.csproj
+++ b/samples/ControlCatalog/ControlCatalog.csproj
@@ -14,9 +14,6 @@
     <AvaloniaResource Include="Assets\*" />
     <AvaloniaResource Include="Assets\Fonts\*" />
   </ItemGroup>
-  <ItemGroup>
-    <None Remove="Pages\NativeEmbedPage.xaml" />
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Assets\Fonts\SourceSansPro-Bold.ttf" />
     <EmbeddedResource Include="Assets\Fonts\SourceSansPro-BoldItalic.ttf" />
@@ -35,17 +32,5 @@
     <ProjectReference Include="..\SampleControls\ControlSamples.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <AvaloniaResource Update="Pages\NativeEmbedPage.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </AvaloniaResource>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Update="Pages\NativeEmbedPage.xaml.cs">
-      <DependentUpon>%(Filename)</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
   <Import Project="..\..\build\BuildTargets.targets" />
 </Project>
diff --git a/samples/ControlCatalog/DecoratedWindow.xaml b/samples/ControlCatalog/DecoratedWindow.xaml
index c778b31c42..997ae54f41 100644
--- a/samples/ControlCatalog/DecoratedWindow.xaml
+++ b/samples/ControlCatalog/DecoratedWindow.xaml
@@ -2,7 +2,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         x:Class="ControlCatalog.DecoratedWindow"
         Title="Avalonia Control Gallery"
-        xmlns:local="clr-namespace:ControlCatalog" SystemDecorations="None" Name="Window">
+        SystemDecorations="None" Name="Window">
         <NativeMenu.Menu>
     <NativeMenu>
       <NativeMenuItem Header="Decorated">
@@ -43,8 +43,13 @@
                 <StackPanel>
                     <TextBlock>Hello world!</TextBlock>
 
-                    <CheckBox IsChecked="{Binding ElementName=Window, Path=HasSystemDecorations}">Decorated</CheckBox>
-
+                    <ComboBox SelectedItem="{Binding ElementName=Window, Path=SystemDecorations}">
+                      <ComboBox.Items>
+                        <SystemDecorations>None</SystemDecorations>
+                        <SystemDecorations>BorderOnly</SystemDecorations>
+                        <SystemDecorations>Full</SystemDecorations>
+                      </ComboBox.Items>
+                    </ComboBox>
                     <CheckBox IsChecked="{Binding ElementName=Window, Path=CanResize}">CanResize</CheckBox>
                 </StackPanel>
             </Border>
diff --git a/samples/ControlCatalog/MainView.xaml b/samples/ControlCatalog/MainView.xaml
index 0d7a1ea4d7..b5a09b5fbd 100644
--- a/samples/ControlCatalog/MainView.xaml
+++ b/samples/ControlCatalog/MainView.xaml
@@ -1,9 +1,11 @@
 <UserControl x:Class="ControlCatalog.MainView"
              xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:ControlSamples;assembly=ControlSamples"
-             xmlns:models="clr-namespace:ControlCatalog.Models"
-             xmlns:pages="clr-namespace:ControlCatalog.Pages">
+             xmlns:controls="using:ControlSamples"
+             xmlns:models="using:ControlCatalog.Models"
+             xmlns:pages="using:ControlCatalog.Pages"
+             xmlns:viewModels="using:ControlCatalog.ViewModels"
+             x:DataType="viewModels:MainWindowViewModel">
   <Grid>
     <Grid.Styles>
       <Style Selector="TextBlock.h2">
diff --git a/samples/ControlCatalog/MainWindow.xaml b/samples/ControlCatalog/MainWindow.xaml
index d5513904c0..0138104884 100644
--- a/samples/ControlCatalog/MainWindow.xaml
+++ b/samples/ControlCatalog/MainWindow.xaml
@@ -1,19 +1,20 @@
 <Window xmlns="https://github.com/avaloniaui" MinWidth="500" MinHeight="300"
         Width="1024" Height="800"
-        xmlns:pages="clr-namespace:ControlCatalog.Pages"
+        xmlns:pages="using:ControlCatalog.Pages"
         Title="Avalonia Control Gallery"
         Icon="/Assets/test_icon.ico"
-        xmlns:local="clr-namespace:ControlCatalog"
+        xmlns:local="using:ControlCatalog"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:vm="clr-namespace:ControlCatalog.ViewModels"
-        xmlns:v="clr-namespace:ControlCatalog.Views"
+        xmlns:vm="using:ControlCatalog.ViewModels"
+        xmlns:v="using:ControlCatalog.Views"
         ExtendClientAreaToDecorationsHint="{Binding ExtendClientAreaEnabled}"
         ExtendClientAreaChromeHints="{Binding ChromeHints}"
         ExtendClientAreaTitleBarHeightHint="{Binding TitleBarHeight}"
         TransparencyLevelHint="{Binding TransparencyLevel}"        
         x:Name="MainWindow"
         Background="Transparent"
-        x:Class="ControlCatalog.MainWindow" WindowState="{Binding WindowState, Mode=TwoWay}">
+        x:Class="ControlCatalog.MainWindow" WindowState="{Binding WindowState, Mode=TwoWay}"
+        x:DataType="vm:MainWindowViewModel">
   <NativeMenu.Menu>
     <NativeMenu>
       <NativeMenuItem Header="File">
diff --git a/samples/ControlCatalog/Models/StateData.cs b/samples/ControlCatalog/Models/StateData.cs
new file mode 100644
index 0000000000..bd6d186252
--- /dev/null
+++ b/samples/ControlCatalog/Models/StateData.cs
@@ -0,0 +1,20 @@
+namespace ControlCatalog.Models;
+
+public class StateData
+{
+    public string Name { get; private set; }
+    public string Abbreviation { get; private set; }
+    public string Capital { get; private set; }
+
+    public StateData(string name, string abbreviatoin, string capital)
+    {
+        Name = name;
+        Abbreviation = abbreviatoin;
+        Capital = capital;
+    }
+
+    public override string ToString()
+    {
+        return Name;
+    }
+}
\ No newline at end of file
diff --git a/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml b/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml
index faa12bc8da..a492808f1d 100644
--- a/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml
+++ b/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml
@@ -2,8 +2,8 @@
              xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:sys="clr-namespace:System;assembly=netstandard"
+             xmlns:sys="using:System"
+             xmlns:models="using:ControlCatalog.Models"
              d:DesignHeight="600"
              d:DesignWidth="400">
   <StackPanel Orientation="Vertical"
@@ -45,7 +45,7 @@
 
       <StackPanel>
         <TextBlock Text="ValueMemberBinding" />
-        <AutoCompleteBox ValueMemberBinding="{Binding Capital}" />
+        <AutoCompleteBox ValueMemberBinding="{Binding Capital, x:DataType=models:StateData}" />
       </StackPanel>
       <StackPanel>
         <TextBlock Text="Multi-Binding" />
diff --git a/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml.cs b/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml.cs
index bc18327f12..8d9cd74ea7 100644
--- a/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml.cs
@@ -8,30 +8,12 @@ using System.Threading;
 using System.Threading.Tasks;
 using Avalonia.Data.Converters;
 using Avalonia.Data;
+using ControlCatalog.Models;
 
 namespace ControlCatalog.Pages
 {
     public class AutoCompleteBoxPage : UserControl
     {
-        public class StateData
-        {
-            public string Name { get; private set; }
-            public string Abbreviation { get; private set; }
-            public string Capital { get; private set; }
-
-            public StateData(string name, string abbreviatoin, string capital)
-            {
-                Name = name;
-                Abbreviation = abbreviatoin;
-                Capital = capital;
-            }
-
-            public override string ToString()
-            {
-                return Name;
-            }
-        }
-
         private StateData[] BuildAllStates()
         {
             return new StateData[]
diff --git a/samples/ControlCatalog/Pages/BorderPage.xaml b/samples/ControlCatalog/Pages/BorderPage.xaml
index bfc4f86698..7ec7e81e80 100644
--- a/samples/ControlCatalog/Pages/BorderPage.xaml
+++ b/samples/ControlCatalog/Pages/BorderPage.xaml
@@ -1,7 +1,6 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              d:DesignHeight="800"
              d:DesignWidth="400"
              x:Class="ControlCatalog.Pages.BorderPage">
diff --git a/samples/ControlCatalog/Pages/ButtonSpinnerPage.xaml b/samples/ControlCatalog/Pages/ButtonSpinnerPage.xaml
index 323d6d36e9..900e304559 100644
--- a/samples/ControlCatalog/Pages/ButtonSpinnerPage.xaml
+++ b/samples/ControlCatalog/Pages/ButtonSpinnerPage.xaml
@@ -1,7 +1,7 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              x:Class="ControlCatalog.Pages.ButtonSpinnerPage"
-             xmlns:sys="clr-namespace:System;assembly=netstandard">
+             xmlns:sys="using:System">
 
   <StackPanel Orientation="Vertical" Spacing="4">
     <TextBlock Classes="h2">The ButtonSpinner control allows you to add button spinners to any element and then respond to the Spin event to manipulate that element.</TextBlock>
diff --git a/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml b/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml
index aef96802f4..7a22c0ddab 100644
--- a/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml
+++ b/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml
@@ -1,6 +1,6 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:vm="clr-namespace:ControlCatalog.ViewModels"
+             xmlns:vm="using:ControlCatalog.ViewModels"
              x:DataType="vm:MainWindowViewModel"
              x:Class="ControlCatalog.Pages.CalendarDatePickerPage">
   <StackPanel Orientation="Vertical" Spacing="4">
diff --git a/samples/ControlCatalog/Pages/ColorPickerPage.xaml b/samples/ControlCatalog/Pages/ColorPickerPage.xaml
index c0bb95ae92..649256ba83 100644
--- a/samples/ControlCatalog/Pages/ColorPickerPage.xaml
+++ b/samples/ControlCatalog/Pages/ColorPickerPage.xaml
@@ -2,9 +2,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:controls="clr-namespace:Avalonia.Controls;assembly=Avalonia.Controls.ColorPicker"
-             xmlns:primitives="clr-namespace:Avalonia.Controls.Primitives;assembly=Avalonia.Controls"
-             xmlns:pc="clr-namespace:Avalonia.Controls.Primitives.Converters;assembly=Avalonia.Controls.ColorPicker"
+             xmlns:controls="using:Avalonia.Controls"
              mc:Ignorable="d"
              d:DesignWidth="800"
              d:DesignHeight="450"
diff --git a/samples/ControlCatalog/Pages/ComboBoxPage.xaml b/samples/ControlCatalog/Pages/ComboBoxPage.xaml
index 9f2fbb88f3..748a46c447 100644
--- a/samples/ControlCatalog/Pages/ComboBoxPage.xaml
+++ b/samples/ControlCatalog/Pages/ComboBoxPage.xaml
@@ -3,7 +3,9 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:col="using:System.Collections"
-    xmlns:sys="using:System">
+    xmlns:sys="using:System"
+    xmlns:viewModels="using:ControlCatalog.ViewModels"
+    x:DataType="viewModels:ComboBoxPageViewModel">
     <StackPanel Orientation="Vertical" Spacing="4">
         <TextBlock Classes="h2">A drop-down list.</TextBlock>
 
@@ -39,7 +41,7 @@
                         </col:ArrayList>
                     </ComboBox.Items>
                     <ComboBox.ItemTemplate>
-                        <DataTemplate>
+                        <DataTemplate x:DataType="sys:String">
                             <Panel>
                                 <TextBlock Text="{Binding}" />
                                 <TextBlock IsVisible="{Binding Converter={x:Static ObjectConverters.IsNull}}" Text="Null object" />
@@ -71,7 +73,7 @@
                     SelectedIndex="0"
                     WrapSelection="{Binding WrapSelection}">
                     <ComboBox.ItemTemplate>
-                        <DataTemplate>
+                        <DataTemplate x:DataType="FontFamily">
                             <TextBlock FontFamily="{Binding}" Text="{Binding Name}" />
                         </DataTemplate>
                     </ComboBox.ItemTemplate>
diff --git a/samples/ControlCatalog/Pages/CompositionPage.axaml b/samples/ControlCatalog/Pages/CompositionPage.axaml
index 22c5c88941..403f45b8eb 100644
--- a/samples/ControlCatalog/Pages/CompositionPage.axaml
+++ b/samples/ControlCatalog/Pages/CompositionPage.axaml
@@ -1,6 +1,6 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:pages="clr-namespace:ControlCatalog.Pages"
+             xmlns:pages="using:ControlCatalog.Pages"
              x:Class="ControlCatalog.Pages.CompositionPage">
     <StackPanel>
         <TextBlock Classes="h1">Implicit animations</TextBlock>
@@ -42,4 +42,4 @@
 
      
     </StackPanel>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/ContextFlyoutPage.xaml b/samples/ControlCatalog/Pages/ContextFlyoutPage.xaml
index 871efa5b7a..6ef6a202b6 100644
--- a/samples/ControlCatalog/Pages/ContextFlyoutPage.xaml
+++ b/samples/ControlCatalog/Pages/ContextFlyoutPage.xaml
@@ -3,9 +3,11 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:viewModels="using:ControlCatalog.ViewModels"
              d:DesignHeight="450"
              d:DesignWidth="800"
-             mc:Ignorable="d">
+             mc:Ignorable="d"
+             x:DataType="viewModels:ContextPageViewModel">
   <UserControl.Styles>
     <Style Selector="FlyoutPresenter.NoPadding">
       <Setter Property="Padding" Value="0" />
@@ -57,7 +59,7 @@
       </Border>
       <Border Classes="context-target">
         <Border.Styles>
-          <Style Selector="MenuFlyoutPresenter MenuItem">
+          <Style Selector="MenuFlyoutPresenter MenuItem" x:DataType="viewModels:MenuItemViewModel">
             <Setter Property="Header" Value="{Binding Header}"/>
             <Setter Property="Items" Value="{Binding Items}"/>
             <Setter Property="Command" Value="{Binding Command}"/>
diff --git a/samples/ControlCatalog/Pages/ContextMenuPage.xaml b/samples/ControlCatalog/Pages/ContextMenuPage.xaml
index 1e120aab6d..962f0308f7 100644
--- a/samples/ControlCatalog/Pages/ContextMenuPage.xaml
+++ b/samples/ControlCatalog/Pages/ContextMenuPage.xaml
@@ -1,6 +1,8 @@
 <UserControl x:Class="ControlCatalog.Pages.ContextMenuPage"
              xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:viewModels="using:ControlCatalog.ViewModels"
+             x:DataType="viewModels:ContextPageViewModel">
   <StackPanel Orientation="Vertical" Spacing="4">
     <TextBlock Classes="h2">A right click menu that can be applied to any control.</TextBlock>
 
@@ -47,7 +49,7 @@
       </Border>
       <Border>
         <Border.Styles>
-          <Style Selector="ContextMenu MenuItem">
+          <Style Selector="ContextMenu MenuItem" x:DataType="viewModels:MenuItemViewModel">
             <Setter Property="Header" Value="{Binding Header}"/>
             <Setter Property="Items" Value="{Binding Items}"/>
             <Setter Property="Command" Value="{Binding Command}"/>
diff --git a/samples/ControlCatalog/Pages/CursorPage.xaml b/samples/ControlCatalog/Pages/CursorPage.xaml
index 25abc426a9..30bad06d72 100644
--- a/samples/ControlCatalog/Pages/CursorPage.xaml
+++ b/samples/ControlCatalog/Pages/CursorPage.xaml
@@ -1,6 +1,8 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             x:Class="ControlCatalog.Pages.CursorPage">
+             xmlns:viewModels="using:ControlCatalog.ViewModels"
+             x:Class="ControlCatalog.Pages.CursorPage"
+             x:DataType="viewModels:CursorPageViewModel">
   <Grid ColumnDefinitions="*,*" RowDefinitions="Auto,*">
     <StackPanel Grid.ColumnSpan="2" Orientation="Vertical" Spacing="4">
       <TextBlock Classes="h2">Defines a cursor (mouse pointer)</TextBlock>
@@ -9,7 +11,7 @@
     <ListBox Grid.Row="1" Items="{Binding StandardCursors}" Margin="0 8 8 8">
       <ListBox.Styles>
         <Style Selector="ListBoxItem">
-          <Setter Property="Cursor" Value="{Binding Cursor}"/>
+          <Setter Property="Cursor" Value="{Binding Cursor}" x:DataType="viewModels:StandardCursorModel"/>
         </Style>
       </ListBox.Styles>
       <ListBox.ItemTemplate>
diff --git a/samples/ControlCatalog/Pages/DataGridPage.xaml b/samples/ControlCatalog/Pages/DataGridPage.xaml
index 27272a9ff7..f1fcd8035a 100644
--- a/samples/ControlCatalog/Pages/DataGridPage.xaml
+++ b/samples/ControlCatalog/Pages/DataGridPage.xaml
@@ -4,13 +4,13 @@
              x:Class="ControlCatalog.Pages.DataGridPage">
   <UserControl.Resources>
     <local:GDPValueConverter x:Key="GDPConverter" />
-    <DataTemplate x:Key="Demo.DataTemplates.CountryHeader">
+    <DataTemplate x:Key="Demo.DataTemplates.CountryHeader" x:DataType="local:Country">
       <StackPanel Orientation="Horizontal" Spacing="5">
         <PathIcon Height="12" Data="M 255 116 A 1 1 0 0 0 254 117 L 254 130 A 1 1 0 0 0 255 131 A 1 1 0 0 0 256 130 L 256 123.87109 C 256.1125 123.90694 256.2187 123.94195 256.33984 123.97852 C 257.18636 124.23404 258.19155 124.5 259 124.5 C 259.80845 124.5 260.52133 124.2168 261.17773 123.9668 C 261.83414 123.7168 262.43408 123.5 263 123.5 C 263.56592 123.5 264.5612 123.73404 265.37109 123.97852 C 266.18098 124.22299 266.82227 124.4668 266.82227 124.4668 A 0.50005 0.50005 0 0 0 267.5 124 L 267.5 118 A 0.50005 0.50005 0 0 0 267.17773 117.5332 C 267.17773 117.5332 266.50667 117.27701 265.66016 117.02148 C 264.81364 116.76596 263.80845 116.5 263 116.5 C 262.19155 116.5 261.47867 116.7832 260.82227 117.0332 C 260.16586 117.2832 259.56592 117.5 259 117.5 C 258.43408 117.5 257.4388 117.26596 256.62891 117.02148 C 256.39123 116.94974 256.17716 116.87994 255.98047 116.81445 A 1 1 0 0 0 255 116 z M 263 117.5 C 263.56592 117.5 264.5612 117.73404 265.37109 117.97852 C 266.00097 118.16865 266.29646 118.28239 266.5 118.35742 L 266.5 120.29297 C 266.25708 120.21012 265.97978 120.11797 265.66016 120.02148 C 264.81364 119.76596 263.80845 119.5 263 119.5 C 262.19155 119.5 261.47867 119.7832 260.82227 120.0332 C 260.16586 120.2832 259.56592 120.5 259 120.5 C 258.43408 120.5 257.4388 120.26596 256.62891 120.02148 C 256.39971 119.9523 256.19148 119.88388 256 119.82031 L 256 117.87109 C 256.1125 117.90694 256.2187 117.94195 256.33984 117.97852 C 257.18636 118.23404 258.19155 118.5 259 118.5 C 259.80845 118.5 260.52133 118.2168 261.17773 117.9668 C 261.83414 117.7168 262.43408 117.5 263 117.5 z M 263 120.5 C 263.56592 120.5 264.5612 120.73404 265.37109 120.97852 C 265.8714 121.12954 266.2398 121.25641 266.5 121.34961 L 266.5 123.30469 C 266.22286 123.20649 266.12863 123.1629 265.66016 123.02148 C 264.81364 122.76596 263.80845 122.5 263 122.5 C 262.19155 122.5 261.47867 122.7832 260.82227 123.0332 C 260.16586 123.2832 259.56592 123.5 259 123.5 C 258.43408 123.5 257.4388 123.26596 256.62891 123.02148 C 256.39971 122.9523 256.19148 122.88388 256 122.82031 L 256 120.87109 C 256.1125 120.90694 256.2187 120.94195 256.33984 120.97852 C 257.18636 121.23404 258.19155 121.5 259 121.5 C 259.80845 121.5 260.52133 121.2168 261.17773 120.9668 C 261.83414 120.7168 262.43408 120.5 263 120.5 z" />
         <TextBlock Text="{Binding}"/>
       </StackPanel>
     </DataTemplate>
-    <ControlTheme x:Key="GdpCell" TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
+    <ControlTheme x:Key="GdpCell" TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}" x:DataType="local:Country">
       <Setter Property="Background" Value="{Binding Path=GDP, Mode=OneWay, Converter={StaticResource GDPConverter}}" />
     </ControlTheme>
   </UserControl.Resources>
@@ -49,15 +49,15 @@
                     AlternatingRowBackground="#1fff">
             <DataGrid.Columns>
               <!-- Using HeaderTemplate -->
-              <DataGridTextColumn Header="Country" HeaderTemplate="{StaticResource Demo.DataTemplates.CountryHeader}" Binding="{Binding Name}" Width="6*" />
-              <!-- CompiledBinding example of usage. -->
+              <DataGridTextColumn Header="Country" HeaderTemplate="{StaticResource Demo.DataTemplates.CountryHeader}" Binding="{Binding Name}"  Width="6*" x:DataType="local:Country" />
               <DataGridTextColumn Header="Region" Binding="{CompiledBinding Region}" Width="4*" x:DataType="local:Country" />
-              <DataGridTextColumn Header="Population" Binding="{Binding Population}" Width="3*" />
-              <DataGridTextColumn Header="Area" Binding="{Binding Area}" Width="3*" />
+              <DataGridTextColumn Header="Population" Binding="{Binding Population}" Width="3*" x:DataType="local:Country" />
+              <DataGridTextColumn Header="Area" Binding="{Binding Area}" Width="3*" x:DataType="local:Country" />
               <DataGridTextColumn Header="GDP" Binding="{Binding GDP}" Width="3*"
                                   CellTheme="{StaticResource GdpCell}"
                                   MinWidth="200"
-                                  IsVisible="{Binding #ShowGDP.IsChecked}"/>
+                                  IsVisible="{Binding #ShowGDP.IsChecked}"
+                                  x:DataType="local:Country" />
             </DataGrid.Columns>
           </DataGrid>
         </DockPanel>
@@ -65,11 +65,11 @@
       <TabItem Header="Grouping">
         <DataGrid Name="dataGridGrouping" Margin="12">
           <DataGrid.Columns>
-            <DataGridTextColumn Header="Country" Binding="{Binding Name}" Width="6*" />
-            <DataGridTextColumn Header="Region" Binding="{Binding Region}" Width="4*" />
-            <DataGridTextColumn DisplayIndex="3" Header="Population" Binding="{Binding Population}" Width="3*" />
-            <DataGridTextColumn DisplayIndex="2" Header="Area" Binding="{Binding Area}" Width="3*" />
-            <DataGridTextColumn Header="GDP" Binding="{Binding GDP}" Width="3*" />
+            <DataGridTextColumn Header="Country" Binding="{Binding Name}" Width="6*" x:DataType="local:Country" />
+            <DataGridTextColumn Header="Region" Binding="{Binding Region}" Width="4*" x:DataType="local:Country" />
+            <DataGridTextColumn DisplayIndex="3" Header="Population" Binding="{Binding Population}" Width="3*" x:DataType="local:Country" />
+            <DataGridTextColumn DisplayIndex="2" Header="Area" Binding="{Binding Area}" Width="3*" x:DataType="local:Country" />
+            <DataGridTextColumn Header="GDP" Binding="{Binding GDP}" Width="3*" x:DataType="local:Country" />
           </DataGrid.Columns>
         </DataGrid>
       </TabItem>
@@ -77,9 +77,9 @@
         <Grid RowDefinitions="*,Auto">
           <DataGrid Name="dataGridEdit" Margin="12" Grid.Row="0">
             <DataGrid.Columns>
-              <DataGridTextColumn Header="First Name" Binding="{Binding FirstName}" Width="2*" FontSize="{Binding #FontSizeSlider.Value, Mode=OneWay}" />
-              <DataGridTextColumn Header="Last" Binding="{Binding LastName}" Width="2*" FontSize="{Binding #FontSizeSlider.Value, Mode=OneWay}" />
-              <DataGridCheckBoxColumn Header="Is Banned" Binding="{Binding IsBanned}" Width="*" IsThreeState="{Binding #IsThreeStateCheckBox.IsChecked, Mode=OneWay}" />
+              <DataGridTextColumn Header="First Name" Binding="{Binding FirstName}" Width="2*" FontSize="{Binding #FontSizeSlider.Value, Mode=OneWay}" x:DataType="local:Person" />
+              <DataGridTextColumn Header="Last" Binding="{Binding LastName}" Width="2*" FontSize="{Binding #FontSizeSlider.Value, Mode=OneWay}" x:DataType="local:Person" />
+              <DataGridCheckBoxColumn Header="Is Banned" Binding="{Binding IsBanned}" Width="*" IsThreeState="{Binding #IsThreeStateCheckBox.IsChecked, Mode=OneWay}" x:DataType="local:Person" />
               <DataGridTemplateColumn Header="Age" >
                 <DataGridTemplateColumn.CellTemplate>
                   <DataTemplate DataType="local:Person">
diff --git a/samples/ControlCatalog/Pages/DateTimePickerPage.xaml b/samples/ControlCatalog/Pages/DateTimePickerPage.xaml
index 6217d39b21..47753f56b6 100644
--- a/samples/ControlCatalog/Pages/DateTimePickerPage.xaml
+++ b/samples/ControlCatalog/Pages/DateTimePickerPage.xaml
@@ -2,7 +2,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:sys="clr-namespace:System;assembly=netstandard"
+             xmlns:sys="using:System"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="ControlCatalog.Pages.DateTimePickerPage">
   <StackPanel Orientation="Vertical" Spacing="4" HorizontalAlignment="Stretch">
diff --git a/samples/ControlCatalog/Pages/ExpanderPage.xaml b/samples/ControlCatalog/Pages/ExpanderPage.xaml
index 8c8702c665..f0a80fd7ab 100644
--- a/samples/ControlCatalog/Pages/ExpanderPage.xaml
+++ b/samples/ControlCatalog/Pages/ExpanderPage.xaml
@@ -1,6 +1,8 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             x:Class="ControlCatalog.Pages.ExpanderPage">
+             xmlns:viewModels="using:ControlCatalog.ViewModels"
+             x:Class="ControlCatalog.Pages.ExpanderPage"
+             x:DataType="viewModels:ExpanderPageViewModel">
   <StackPanel Orientation="Vertical" Spacing="4">
     <TextBlock Classes="h2">Expands to show nested content</TextBlock>
 
diff --git a/samples/ControlCatalog/Pages/ItemsRepeaterPage.xaml b/samples/ControlCatalog/Pages/ItemsRepeaterPage.xaml
index 1d42b92096..5ca4ca9bdd 100644
--- a/samples/ControlCatalog/Pages/ItemsRepeaterPage.xaml
+++ b/samples/ControlCatalog/Pages/ItemsRepeaterPage.xaml
@@ -1,6 +1,8 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             x:Class="ControlCatalog.Pages.ItemsRepeaterPage">
+             xmlns:viewModels="using:ControlCatalog.ViewModels"
+             x:Class="ControlCatalog.Pages.ItemsRepeaterPage"
+             x:DataType="viewModels:ItemsRepeaterPageViewModel">
   <UserControl.Styles>
     <Style Selector="ItemsRepeater TextBlock.oddTemplate">
       <Setter Property="Background" Value="Yellow" />
@@ -21,12 +23,12 @@
   </UserControl.Styles>
   <UserControl.Resources>
     <RecyclePool x:Key="RecyclePool" />
-    <DataTemplate x:Key="odd">
+    <DataTemplate x:Key="odd" x:DataType="viewModels:ItemsRepeaterPageViewModelItem">
       <TextBlock Classes="oddTemplate"
                  Height="{Binding Height}"
                  Text="{Binding Text}"/>
     </DataTemplate>
-    <DataTemplate x:Key="even">
+    <DataTemplate x:Key="even" x:DataType="viewModels:ItemsRepeaterPageViewModelItem">
       <TextBlock Classes="evenTemplate"
                  Height="{Binding Height}"
                  Text="{Binding Text}"/>
diff --git a/samples/ControlCatalog/Pages/ItemsRepeaterPage.xaml.cs b/samples/ControlCatalog/Pages/ItemsRepeaterPage.xaml.cs
index 0fd2176acd..70ce6107ad 100644
--- a/samples/ControlCatalog/Pages/ItemsRepeaterPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ItemsRepeaterPage.xaml.cs
@@ -44,7 +44,7 @@ namespace ControlCatalog.Pages
 
         public void OnSelectTemplateKey(object sender, SelectTemplateEventArgs e)
         {
-            if (e.DataContext is ItemsRepeaterPageViewModel.Item item)
+            if (e.DataContext is ItemsRepeaterPageViewModelItem item)
             {
                 e.TemplateKey = (item.Index % 2 == 0) ? "even" : "odd";
             }
@@ -125,7 +125,7 @@ namespace ControlCatalog.Pages
 
         private void RepeaterClick(object? sender, PointerPressedEventArgs e)
         {
-            if ((e.Source as TextBlock)?.DataContext is ItemsRepeaterPageViewModel.Item item)
+            if ((e.Source as TextBlock)?.DataContext is ItemsRepeaterPageViewModelItem item)
             {
                 _viewModel.SelectedItem = item;
                 _selectedIndex = _viewModel.Items.IndexOf(item);
diff --git a/samples/ControlCatalog/Pages/LabelsPage.axaml b/samples/ControlCatalog/Pages/LabelsPage.axaml
index 961e7ba7e6..5bfb2ee10e 100644
--- a/samples/ControlCatalog/Pages/LabelsPage.axaml
+++ b/samples/ControlCatalog/Pages/LabelsPage.axaml
@@ -2,9 +2,11 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:models="using:ControlCatalog.Models"
              mc:Ignorable="d" d:DesignWidth="400" d:DesignHeight="250"
              x:Class="ControlCatalog.Pages.LabelsPage"
-             x:Name="_labelsPage">
+             x:Name="_labelsPage"
+             x:DataType="models:Person">
     <UserControl.Styles>
         <Style Selector="Label">
             <Setter Property="VerticalAlignment" Value="Center"/>
diff --git a/samples/ControlCatalog/Pages/ListBoxPage.xaml b/samples/ControlCatalog/Pages/ListBoxPage.xaml
index 433592345a..04129cb82d 100644
--- a/samples/ControlCatalog/Pages/ListBoxPage.xaml
+++ b/samples/ControlCatalog/Pages/ListBoxPage.xaml
@@ -1,6 +1,8 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             x:Class="ControlCatalog.Pages.ListBoxPage">
+             xmlns:viewModels="using:ControlCatalog.ViewModels"
+             x:Class="ControlCatalog.Pages.ListBoxPage"
+             x:DataType="viewModels:ListBoxPageViewModel">
   <DockPanel>
     <DockPanel.Styles>
       <Style Selector="ListBox ListBoxItem:nth-child(5n+3)">
diff --git a/samples/ControlCatalog/Pages/MenuPage.xaml b/samples/ControlCatalog/Pages/MenuPage.xaml
index 0e5b49914f..6eb109874f 100644
--- a/samples/ControlCatalog/Pages/MenuPage.xaml
+++ b/samples/ControlCatalog/Pages/MenuPage.xaml
@@ -1,6 +1,8 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             x:Class="ControlCatalog.Pages.MenuPage">
+             xmlns:viewModels="using:ControlCatalog.ViewModels"
+             x:Class="ControlCatalog.Pages.MenuPage"
+             x:DataType="viewModels:MenuPageViewModel">
   <StackPanel Orientation="Vertical" Spacing="4">
     <TextBlock Classes="h2">Exported menu fallback</TextBlock>
     <TextBlock>(Should be only visible on platforms without desktop-global menu bar)</TextBlock>
@@ -45,7 +47,7 @@
                 <TextBlock Classes="h3" Margin="4 8">Dyanamically generated</TextBlock>
                 <Menu Items="{Binding MenuItems}">
                     <Menu.Styles>
-                        <Style Selector="MenuItem">
+                        <Style Selector="MenuItem" x:DataType="viewModels:MenuItemViewModel">
                             <Setter Property="Header" Value="{Binding Header}"/>
                             <Setter Property="Items" Value="{Binding Items}"/>
                             <Setter Property="Command" Value="{Binding Command}"/>
@@ -68,7 +70,7 @@
                         <Separator/>
                         <MenuItem Header="_Recent" Items="{Binding RecentItems}">
                             <MenuItem.Styles>
-                                <Style Selector="MenuItem">
+                                <Style Selector="MenuItem" x:DataType="viewModels:MenuItemViewModel">
                                     <Setter Property="Header" Value="{Binding Header}"/>
                                 </Style>
                             </MenuItem.Styles>
diff --git a/samples/ControlCatalog/Pages/NotificationsPage.xaml b/samples/ControlCatalog/Pages/NotificationsPage.xaml
index d48b338fe8..46c1fe52de 100644
--- a/samples/ControlCatalog/Pages/NotificationsPage.xaml
+++ b/samples/ControlCatalog/Pages/NotificationsPage.xaml
@@ -1,6 +1,8 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             x:Class="ControlCatalog.Pages.NotificationsPage">
+             xmlns:viewModels="using:ControlCatalog.ViewModels"
+             x:Class="ControlCatalog.Pages.NotificationsPage"
+             x:DataType="viewModels:NotificationViewModel">
   <StackPanel Orientation="Vertical" Spacing="4" HorizontalAlignment="Left">
         <Button Content="Show Standard Managed Notification" Command="{Binding ShowManagedNotificationCommand}" />
         <Button Content="Show Custom Managed Notification" Command="{Binding ShowCustomManagedNotificationCommand}" />
diff --git a/samples/ControlCatalog/Pages/NumericUpDownPage.xaml b/samples/ControlCatalog/Pages/NumericUpDownPage.xaml
index 045ba4a059..e76787f184 100644
--- a/samples/ControlCatalog/Pages/NumericUpDownPage.xaml
+++ b/samples/ControlCatalog/Pages/NumericUpDownPage.xaml
@@ -1,8 +1,10 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:sys="clr-namespace:System;assembly=netstandard"
-             xmlns:converter="clr-namespace:ControlCatalog.Converter"
-             x:Class="ControlCatalog.Pages.NumericUpDownPage">
+             xmlns:sys="using:System"
+             xmlns:converter="using:ControlCatalog.Converter"
+             xmlns:pages="using:ControlCatalog.Pages"
+             x:Class="ControlCatalog.Pages.NumericUpDownPage"
+             x:DataType="pages:NumbersPageViewModel">
   <StackPanel Orientation="Vertical" Spacing="4"
               MaxWidth="800">
     <TextBlock Margin="2" Classes="h2" TextWrapping="Wrap">Numeric up-down control provides a TextBox with button spinners that allow incrementing and decrementing numeric values by using the spinner buttons, keyboard up/down arrows, or mouse wheel.</TextBlock>
@@ -43,7 +45,7 @@
                   VerticalAlignment="Center" Margin="2"/>
 
         <TextBlock Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" Margin="2">CultureInfo:</TextBlock>
-        <ComboBox Grid.Row="2" Grid.Column="1" Items="{Binding Cultures}" SelectedItem="{Binding #upDown.CultureInfo}"
+        <ComboBox x:Name="CultureSelector" Grid.Row="2" Grid.Column="1" Items="{Binding Cultures}"
                   VerticalAlignment="Center" Margin="2"/>
 
         <TextBlock Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" Margin="2">Watermark:</TextBlock>
@@ -77,6 +79,7 @@
       <StackPanel Orientation="Vertical" Margin="10">
         <Label Target="upDown" FontSize="14" FontWeight="Bold" VerticalAlignment="Center">Usage of decimal NumericUpDown:</Label>
         <NumericUpDown Name="upDown" Minimum="0" Maximum="10" Increment="0.5"
+                       NumberFormat="{Binding #CultureSelector.SelectedItem, Converter={x:Static pages:NumericUpDownPage.CultureConverter}}"
                        VerticalAlignment="Center" Value="{Binding DecimalValue}"
                        Watermark="Enter text" FormatString="{Binding SelectedFormat.Value}"/>
       </StackPanel>
diff --git a/samples/ControlCatalog/Pages/NumericUpDownPage.xaml.cs b/samples/ControlCatalog/Pages/NumericUpDownPage.xaml.cs
index edd4921632..8785eac354 100644
--- a/samples/ControlCatalog/Pages/NumericUpDownPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/NumericUpDownPage.xaml.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using Avalonia.Controls;
+using Avalonia.Data.Converters;
 using Avalonia.Markup.Xaml;
 using MiniMvvm;
 
@@ -22,6 +23,8 @@ namespace ControlCatalog.Pages
             AvaloniaXamlLoader.Load(this);
         }
 
+        public static IValueConverter CultureConverter =
+            new FuncValueConverter<CultureInfo, NumberFormatInfo>(c => (c ?? CultureInfo.CurrentCulture).NumberFormat);
     }
 
     public class NumbersPageViewModel : ViewModelBase
diff --git a/samples/ControlCatalog/Pages/OpenGlPage.xaml b/samples/ControlCatalog/Pages/OpenGlPage.xaml
index 0eb09004ba..2a97956e30 100644
--- a/samples/ControlCatalog/Pages/OpenGlPage.xaml
+++ b/samples/ControlCatalog/Pages/OpenGlPage.xaml
@@ -1,7 +1,7 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              x:Class="ControlCatalog.Pages.OpenGlPage"
-             xmlns:pages="clr-namespace:ControlCatalog.Pages">
+             xmlns:pages="using:ControlCatalog.Pages">
   <Grid>
     <pages:OpenGlPageControl x:Name="GL"/>
     <StackPanel>
diff --git a/samples/ControlCatalog/Pages/PlatformInfoPage.xaml b/samples/ControlCatalog/Pages/PlatformInfoPage.xaml
index a60f54d10e..f02741d2da 100644
--- a/samples/ControlCatalog/Pages/PlatformInfoPage.xaml
+++ b/samples/ControlCatalog/Pages/PlatformInfoPage.xaml
@@ -3,9 +3,11 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:viewModels="using:ControlCatalog.ViewModels"
              d:DesignHeight="800"
              d:DesignWidth="400"
-             mc:Ignorable="d">
+             mc:Ignorable="d"
+             x:DataType="viewModels:PlatformInformationViewModel">
   <StackPanel Spacing="20">
     <TextBlock Text="{Binding PlatformInfo}" />
 
diff --git a/samples/ControlCatalog/Pages/ProgressBarPage.xaml b/samples/ControlCatalog/Pages/ProgressBarPage.xaml
index 8e73f1d0f5..dcddcd5965 100644
--- a/samples/ControlCatalog/Pages/ProgressBarPage.xaml
+++ b/samples/ControlCatalog/Pages/ProgressBarPage.xaml
@@ -31,7 +31,7 @@
 
       <StackPanel Spacing="10">
         <ProgressBar VerticalAlignment="Center" IsIndeterminate="True" 
-                     Minimum="{Binding #minimum.Value}" Maximum="{Binding #maximum.value}"/>
+                     Minimum="{Binding #minimum.Value}" Maximum="{Binding #maximum.Value}"/>
         <ProgressBar VerticalAlignment="Center" Value="5" Maximum="10" />
         <ProgressBar VerticalAlignment="Center" Value="50" />
         <ProgressBar VerticalAlignment="Center" Value="50" Minimum="25" Maximum="75" />
diff --git a/samples/ControlCatalog/Pages/ScrollViewerPage.xaml b/samples/ControlCatalog/Pages/ScrollViewerPage.xaml
index 1b3771ccb5..1903e50ed7 100644
--- a/samples/ControlCatalog/Pages/ScrollViewerPage.xaml
+++ b/samples/ControlCatalog/Pages/ScrollViewerPage.xaml
@@ -1,6 +1,8 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             x:Class="ControlCatalog.Pages.ScrollViewerPage">
+             xmlns:pages="using:ControlCatalog.Pages"
+             x:Class="ControlCatalog.Pages.ScrollViewerPage"
+             x:DataType="pages:ScrollViewerPageViewModel">
   <StackPanel Orientation="Vertical" Spacing="4">
     <TextBlock Classes="h2">Allows for horizontal and vertical content scrolling.</TextBlock>
 
diff --git a/samples/ControlCatalog/Pages/SliderPage.xaml b/samples/ControlCatalog/Pages/SliderPage.xaml
index b2375922c2..9aa4322ad5 100644
--- a/samples/ControlCatalog/Pages/SliderPage.xaml
+++ b/samples/ControlCatalog/Pages/SliderPage.xaml
@@ -1,6 +1,6 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:sys="clr-namespace:System;assembly=netstandard"
+             xmlns:sys="using:System"
              x:Class="ControlCatalog.Pages.SliderPage">
   <StackPanel Orientation="Vertical" Spacing="4">
     <TextBlock Classes="h2">A control that lets the user select from a range of values by moving a Thumb control along a Track.</TextBlock>
diff --git a/samples/ControlCatalog/Pages/SplitViewPage.xaml b/samples/ControlCatalog/Pages/SplitViewPage.xaml
index 6902b27715..61bfb490b8 100644
--- a/samples/ControlCatalog/Pages/SplitViewPage.xaml
+++ b/samples/ControlCatalog/Pages/SplitViewPage.xaml
@@ -2,8 +2,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:ControlCatalog.ViewModels"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="ControlCatalog.Pages.SplitViewPage">
+             x:Class="ControlCatalog.Pages.SplitViewPage"
+             x:DataType="viewModels:SplitViewPageViewModel">
 
   <Border>
 
@@ -51,7 +53,7 @@
         <!--{Binding SelectedItem.Tag, ElementName=PaneBackgroundSelector}-->
         <SplitView Name="SplitView"
                       PanePlacement="{Binding PanePlacement}"
-                      PaneBackground="{Binding SelectedItem.Tag, ElementName=PaneBackgroundSelector}"
+                      PaneBackground="{Binding ((Control)SelectedItem).Tag, ElementName=PaneBackgroundSelector, FallbackValue={x:Null}}"
                       OpenPaneLength="{Binding Value, ElementName=OpenPaneLengthSlider}"
                       CompactPaneLength="{Binding Value, ElementName=CompactPaneLengthSlider}"
                       DisplayMode="{Binding CurrentDisplayMode}">
diff --git a/samples/ControlCatalog/Pages/TabControlPage.xaml b/samples/ControlCatalog/Pages/TabControlPage.xaml
index cba6fcd0ad..a830ce69ac 100644
--- a/samples/ControlCatalog/Pages/TabControlPage.xaml
+++ b/samples/ControlCatalog/Pages/TabControlPage.xaml
@@ -1,7 +1,9 @@
 <UserControl
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:Class="ControlCatalog.Pages.TabControlPage"
-    xmlns="https://github.com/avaloniaui">
+    xmlns="https://github.com/avaloniaui"
+    xmlns:viewModels="using:ControlCatalog.ViewModels"
+    x:DataType="viewModels:TabControlPageViewModel">
     <DockPanel>
         <TextBlock 
             DockPanel.Dock="Top" 
@@ -53,14 +55,14 @@
                     Margin="0 16"
                     TabStripPlacement="{Binding TabPlacement}">
                     <TabControl.ItemTemplate>
-                        <DataTemplate>
+                        <DataTemplate x:DataType="viewModels:TabControlPageViewModelItem">
                             <TextBlock
                                 Text="{Binding Header}">
                             </TextBlock>
                         </DataTemplate>
                     </TabControl.ItemTemplate>
                     <TabControl.ContentTemplate>
-                        <DataTemplate>
+                        <DataTemplate x:DataType="viewModels:TabControlPageViewModelItem">
                             <StackPanel Orientation="Vertical" Spacing="8">
                                 <TextBlock Text="{Binding Text}"/>
                                 <Image Source="{Binding Image}" Width="300"/>
@@ -68,7 +70,7 @@
                         </DataTemplate>
                     </TabControl.ContentTemplate>
                     <TabControl.Styles>
-                        <Style Selector="TabItem">
+                        <Style Selector="TabItem" x:DataType="viewModels:TabControlPageViewModelItem">
                             <Setter Property="IsEnabled" Value="{Binding IsEnabled}"/>
                         </Style>
                     </TabControl.Styles>
diff --git a/samples/ControlCatalog/Pages/TabControlPage.xaml.cs b/samples/ControlCatalog/Pages/TabControlPage.xaml.cs
index bd0214c72e..74e9928b24 100644
--- a/samples/ControlCatalog/Pages/TabControlPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/TabControlPage.xaml.cs
@@ -5,8 +5,7 @@ using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 using Avalonia.Media.Imaging;
 using Avalonia.Platform;
-
-using MiniMvvm;
+using ControlCatalog.ViewModels;
 
 namespace ControlCatalog.Pages
 {
@@ -18,23 +17,23 @@ namespace ControlCatalog.Pages
         {
             InitializeComponent();
 
-            DataContext = new PageViewModel
+            DataContext = new TabControlPageViewModel
             {
                 Tabs = new[]
                 {
-                    new TabItemViewModel
+                    new TabControlPageViewModelItem
                     {
                         Header = "Arch",
                         Text = "This is the first templated tab page.",
                         Image = LoadBitmap("avares://ControlCatalog/Assets/delicate-arch-896885_640.jpg"),
                     },
-                    new TabItemViewModel
+                    new TabControlPageViewModelItem
                     {
                         Header = "Leaf",
                         Text = "This is the second templated tab page.",
                         Image = LoadBitmap("avares://ControlCatalog/Assets/maple-leaf-888807_640.jpg"),
                     },
-                    new TabItemViewModel
+                    new TabControlPageViewModelItem
                     {
                         Header = "Disabled",
                         Text = "You should not see this.",
@@ -55,26 +54,5 @@ namespace ControlCatalog.Pages
             var assets = AvaloniaLocator.Current!.GetService<IAssetLoader>()!;
             return new Bitmap(assets.Open(new Uri(uri)));
         }
-
-        private class PageViewModel : ViewModelBase
-        {
-            private Dock _tabPlacement;
-
-            public TabItemViewModel[]? Tabs { get; set; }
-
-            public Dock TabPlacement
-            {
-                get { return _tabPlacement; }
-                set { this.RaiseAndSetIfChanged(ref _tabPlacement, value); }
-            }
-        }
-
-        private class TabItemViewModel
-        {
-            public string? Header { get; set; }
-            public string? Text { get; set; }
-            public IBitmap? Image { get; set; }
-            public bool IsEnabled { get; set; } = true;
-        }
     }
 }
diff --git a/samples/ControlCatalog/Pages/TabStripPage.xaml b/samples/ControlCatalog/Pages/TabStripPage.xaml
index 163665ef92..533590b48d 100644
--- a/samples/ControlCatalog/Pages/TabStripPage.xaml
+++ b/samples/ControlCatalog/Pages/TabStripPage.xaml
@@ -1,6 +1,8 @@
 <UserControl xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              x:Class="ControlCatalog.Pages.TabStripPage"
-             xmlns="https://github.com/avaloniaui">
+             xmlns="https://github.com/avaloniaui"
+             xmlns:viewModels="using:ControlCatalog.ViewModels"
+             x:DataType="viewModels:TabControlPageViewModel">
     <StackPanel Orientation="Vertical" Spacing="4">
         <TextBlock Classes="h2">A control which displays a selectable strip of tabs</TextBlock>
 
@@ -16,14 +18,14 @@
         <Separator Margin="0 16"/>
 
         <TextBlock Classes="h1">Dynamically generated</TextBlock>
-        <TabStrip Items="{Binding}">
+        <TabStrip Items="{Binding Tabs}">
             <TabStrip.Styles>
-                <Style Selector="TabStripItem">
+                <Style Selector="TabStripItem" x:DataType="viewModels:TabControlPageViewModelItem">
                     <Setter Property="IsEnabled" Value="{Binding IsEnabled}"/>
                 </Style>
             </TabStrip.Styles>
             <TabStrip.ItemTemplate>
-                <DataTemplate>
+                <DataTemplate x:DataType="viewModels:TabControlPageViewModelItem">
                     <TextBlock Text="{Binding Header}"/>
                 </DataTemplate>
             </TabStrip.ItemTemplate>
diff --git a/samples/ControlCatalog/Pages/TabStripPage.xaml.cs b/samples/ControlCatalog/Pages/TabStripPage.xaml.cs
index 6d7135a90f..20fae13bbf 100644
--- a/samples/ControlCatalog/Pages/TabStripPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/TabStripPage.xaml.cs
@@ -1,9 +1,6 @@
-using System;
-using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
-using Avalonia.Media.Imaging;
-using Avalonia.Platform;
+using ControlCatalog.ViewModels;
 
 namespace ControlCatalog.Pages
 {
@@ -13,21 +10,24 @@ namespace ControlCatalog.Pages
         {
             InitializeComponent();
 
-            DataContext = new[]
+            DataContext = new TabControlPageViewModel
             {
-                new TabStripItemViewModel
+                Tabs = new []
                 {
-                    Header = "Item 1",
-                },
-                new TabStripItemViewModel
-                {
-                    Header = "Item 2",
-                },
-                new TabStripItemViewModel
-                {
-                    Header = "Disabled",
-                    IsEnabled = false,
-                },
+                    new TabControlPageViewModelItem()
+                    {
+                        Header = "Item 1",
+                    },
+                    new TabControlPageViewModelItem
+                    {
+                        Header = "Item 2",
+                    },
+                    new TabControlPageViewModelItem
+                    {
+                        Header = "Disabled",
+                        IsEnabled = false,
+                    },
+                }
             };
         }
 
@@ -35,11 +35,5 @@ namespace ControlCatalog.Pages
         {
             AvaloniaXamlLoader.Load(this);
         }
-
-        private class TabStripItemViewModel
-        {
-            public string? Header { get; set; }
-            public bool IsEnabled { get; set; } = true;
-        }
     }
 }
diff --git a/samples/ControlCatalog/Pages/TextBoxPage.xaml b/samples/ControlCatalog/Pages/TextBoxPage.xaml
index e3d0c5e4e2..6a4d9b7d0e 100644
--- a/samples/ControlCatalog/Pages/TextBoxPage.xaml
+++ b/samples/ControlCatalog/Pages/TextBoxPage.xaml
@@ -1,7 +1,7 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              x:Class="ControlCatalog.Pages.TextBoxPage"
-             xmlns:sys="clr-namespace:System;assembly=netstandard">
+             xmlns:sys="using:System">
   <StackPanel Orientation="Vertical" Spacing="4">
     <Label Classes="h2">A control into which the user can input text</Label>
 
diff --git a/samples/ControlCatalog/Pages/TransitioningContentControlPage.axaml b/samples/ControlCatalog/Pages/TransitioningContentControlPage.axaml
index a410577d27..42042652e3 100644
--- a/samples/ControlCatalog/Pages/TransitioningContentControlPage.axaml
+++ b/samples/ControlCatalog/Pages/TransitioningContentControlPage.axaml
@@ -3,11 +3,10 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:vm="using:ControlCatalog.ViewModels"
-             xmlns:converter="clr-namespace:ControlCatalog.Converter"
+             xmlns:converter="using:ControlCatalog.Converter"
              xmlns:system="using:System"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:DataType="vm:TransitioningContentControlPageViewModel"
-             x:CompileBindings="True"
              x:Class="ControlCatalog.Pages.TransitioningContentControlPage">
 
     <UserControl.DataContext>
diff --git a/samples/ControlCatalog/Pages/TreeViewPage.xaml b/samples/ControlCatalog/Pages/TreeViewPage.xaml
index 31f4d73581..1665a59c0a 100644
--- a/samples/ControlCatalog/Pages/TreeViewPage.xaml
+++ b/samples/ControlCatalog/Pages/TreeViewPage.xaml
@@ -1,6 +1,8 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             x:Class="ControlCatalog.Pages.TreeViewPage">
+             xmlns:viewModels="using:ControlCatalog.ViewModels"
+             x:Class="ControlCatalog.Pages.TreeViewPage"
+             x:DataType="viewModels:TreeViewPageViewModel">
   <StackPanel Orientation="Vertical" Spacing="4">
     <TextBlock Classes="h2">Displays a hierachical tree of data.</TextBlock>
 
diff --git a/samples/ControlCatalog/Pages/ViewboxPage.xaml b/samples/ControlCatalog/Pages/ViewboxPage.xaml
index e7e3007d35..a31a52d238 100644
--- a/samples/ControlCatalog/Pages/ViewboxPage.xaml
+++ b/samples/ControlCatalog/Pages/ViewboxPage.xaml
@@ -1,6 +1,6 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:collections="clr-namespace:System.Collections;assembly=netstandard"
+             xmlns:collections="using:System.Collections"
              x:Class="ControlCatalog.Pages.ViewboxPage">
 
     <Grid RowDefinitions="Auto,*,*">
diff --git a/samples/ControlCatalog/Pages/WindowCustomizationsPage.xaml b/samples/ControlCatalog/Pages/WindowCustomizationsPage.xaml
index caab42e98c..f1403905c4 100644
--- a/samples/ControlCatalog/Pages/WindowCustomizationsPage.xaml
+++ b/samples/ControlCatalog/Pages/WindowCustomizationsPage.xaml
@@ -2,8 +2,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:ControlCatalog.ViewModels"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="ControlCatalog.Pages.WindowCustomizationsPage">
+             x:Class="ControlCatalog.Pages.WindowCustomizationsPage"
+             x:DataType="viewModels:MainWindowViewModel">
   <StackPanel Spacing="10"  Margin="25">
     <CheckBox Content="Extend Client Area to Decorations" IsChecked="{Binding ExtendClientAreaEnabled}" />
     <CheckBox Content="Title Bar" IsChecked="{Binding SystemTitleBarEnabled}" />    
diff --git a/samples/ControlCatalog/ViewModels/CursorPageViewModel.cs b/samples/ControlCatalog/ViewModels/CursorPageViewModel.cs
index d73ab810eb..8a3f0ba947 100644
--- a/samples/ControlCatalog/ViewModels/CursorPageViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/CursorPageViewModel.cs
@@ -27,18 +27,18 @@ namespace ControlCatalog.ViewModels
         public IEnumerable<StandardCursorModel> StandardCursors { get; }
         
         public Cursor CustomCursor { get; }
-
-        public class StandardCursorModel
+    }
+    
+    public class StandardCursorModel
+    {
+        public StandardCursorModel(StandardCursorType type)
         {
-            public StandardCursorModel(StandardCursorType type)
-            {
-                Type = type;
-                Cursor = new Cursor(type);
-            }
+            Type = type;
+            Cursor = new Cursor(type);
+        }
 
-            public StandardCursorType Type { get; }
+        public StandardCursorType Type { get; }
             
-            public Cursor Cursor { get; }
-        }
+        public Cursor Cursor { get; }
     }
 }
diff --git a/samples/ControlCatalog/ViewModels/ItemsRepeaterPageViewModel.cs b/samples/ControlCatalog/ViewModels/ItemsRepeaterPageViewModel.cs
index 3973c73662..8f8a959867 100644
--- a/samples/ControlCatalog/ViewModels/ItemsRepeaterPageViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/ItemsRepeaterPageViewModel.cs
@@ -10,25 +10,25 @@ namespace ControlCatalog.ViewModels
     {
         private int _newItemIndex = 1;
         private int _newGenerationIndex = 0;
-        private ObservableCollection<Item> _items;
+        private ObservableCollection<ItemsRepeaterPageViewModelItem> _items;
 
         public ItemsRepeaterPageViewModel()
         {
             _items = CreateItems();
         }
 
-        public ObservableCollection<Item> Items
+        public ObservableCollection<ItemsRepeaterPageViewModelItem> Items
         {
             get => _items;
             set => this.RaiseAndSetIfChanged(ref _items, value);
         }
 
-        public Item? SelectedItem { get; set; }
+        public ItemsRepeaterPageViewModelItem? SelectedItem { get; set; }
 
         public void AddItem()
         {
             var index = SelectedItem != null ? Items.IndexOf(SelectedItem) : -1;
-            Items.Insert(index + 1, new Item(index + 1, $"New Item {_newItemIndex++}"));
+            Items.Insert(index + 1, new ItemsRepeaterPageViewModelItem(index + 1, $"New Item {_newItemIndex++}"));
         }
 
         public void RemoveItem()
@@ -59,33 +59,33 @@ namespace ControlCatalog.ViewModels
             Items = CreateItems();
         }
 
-        private ObservableCollection<Item> CreateItems()
+        private ObservableCollection<ItemsRepeaterPageViewModelItem> CreateItems()
         {
             var suffix = _newGenerationIndex == 0 ? string.Empty : $"[{_newGenerationIndex.ToString()}]";
 
             _newGenerationIndex++;
 
-            return new ObservableCollection<Item>(
-                Enumerable.Range(1, 100000).Select(i => new Item(i, $"Item {i.ToString()} {suffix}")));
+            return new ObservableCollection<ItemsRepeaterPageViewModelItem>(
+                Enumerable.Range(1, 100000).Select(i => new ItemsRepeaterPageViewModelItem(i, $"Item {i.ToString()} {suffix}")));
         }
+    }
+    
+    public class ItemsRepeaterPageViewModelItem : ViewModelBase
+    {
+        private double _height = double.NaN;
 
-        public class Item : ViewModelBase
+        public ItemsRepeaterPageViewModelItem(int index, string text)
         {
-            private double _height = double.NaN;
-
-            public Item(int index, string text)
-            {
-                Index = index;
-                Text = text;
-            }
-            public int Index { get; }
-            public string Text { get; }
+            Index = index;
+            Text = text;
+        }
+        public int Index { get; }
+        public string Text { get; }
             
-            public double Height 
-            {
-                get => _height;
-                set => this.RaiseAndSetIfChanged(ref _height, value);
-            }
+        public double Height 
+        {
+            get => _height;
+            set => this.RaiseAndSetIfChanged(ref _height, value);
         }
     }
 }
diff --git a/samples/ControlCatalog/ViewModels/TabControlPageViewModel.cs b/samples/ControlCatalog/ViewModels/TabControlPageViewModel.cs
new file mode 100644
index 0000000000..b0e560b001
--- /dev/null
+++ b/samples/ControlCatalog/ViewModels/TabControlPageViewModel.cs
@@ -0,0 +1,26 @@
+using Avalonia.Controls;
+using Avalonia.Media.Imaging;
+using MiniMvvm;
+
+namespace ControlCatalog.ViewModels;
+
+public class TabControlPageViewModel : ViewModelBase
+{
+    private Dock _tabPlacement;
+
+    public TabControlPageViewModelItem[]? Tabs { get; set; }
+
+    public Dock TabPlacement
+    {
+        get { return _tabPlacement; }
+        set { this.RaiseAndSetIfChanged(ref _tabPlacement, value); }
+    }
+}
+
+public class TabControlPageViewModelItem
+{
+    public string? Header { get; set; }
+    public string? Text { get; set; }
+    public IBitmap? Image { get; set; }
+    public bool IsEnabled { get; set; } = true;
+}
diff --git a/samples/ControlCatalog/Views/CustomNotificationView.xaml b/samples/ControlCatalog/Views/CustomNotificationView.xaml
index 5b99ed8e4d..f06ea029a8 100644
--- a/samples/ControlCatalog/Views/CustomNotificationView.xaml
+++ b/samples/ControlCatalog/Views/CustomNotificationView.xaml
@@ -1,6 +1,8 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             x:Class="ControlCatalog.Views.CustomNotificationView">
+             xmlns:viewModels="using:ControlCatalog.ViewModels"
+             x:Class="ControlCatalog.Views.CustomNotificationView"
+             x:DataType="viewModels:NotificationViewModel">
     <Border Padding="12" MinHeight="20" Background="DodgerBlue">
         <Grid ColumnDefinitions="Auto,*">
             <Panel Margin="0,0,12,0" Width="25" Height="25" VerticalAlignment="Top">
diff --git a/samples/IntegrationTestApp/MainWindow.axaml b/samples/IntegrationTestApp/MainWindow.axaml
index 76ecfcc622..493a3c6567 100644
--- a/samples/IntegrationTestApp/MainWindow.axaml
+++ b/samples/IntegrationTestApp/MainWindow.axaml
@@ -2,10 +2,12 @@
         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:integrationTestApp="using:IntegrationTestApp"
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
         x:Class="IntegrationTestApp.MainWindow"
         Name="MainWindow"
-        Title="IntegrationTestApp">
+        Title="IntegrationTestApp"
+        x:DataType="integrationTestApp:MainWindow">
   <NativeMenu.Menu>
     <NativeMenu>
       <NativeMenuItem Header="File">
diff --git a/samples/IntegrationTestApp/ShowWindowTest.axaml b/samples/IntegrationTestApp/ShowWindowTest.axaml
index 17c359df51..68d1f3cf2f 100644
--- a/samples/IntegrationTestApp/ShowWindowTest.axaml
+++ b/samples/IntegrationTestApp/ShowWindowTest.axaml
@@ -2,6 +2,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         x:Class="IntegrationTestApp.ShowWindowTest"
         Name="SecondaryWindow"
+        x:DataType="Window"
         Title="Show Window Test">
   <Grid ColumnDefinitions="Auto,Auto" RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto">
     <Label Grid.Column="0" Grid.Row="1">Client Size</Label>
diff --git a/samples/MobileSandbox/App.xaml b/samples/MobileSandbox/App.xaml
index f3210e8941..85c97c9dbe 100644
--- a/samples/MobileSandbox/App.xaml
+++ b/samples/MobileSandbox/App.xaml
@@ -1,6 +1,5 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             x:CompileBindings="True"
              Name="Mobile Sandbox"
              x:Class="MobileSandbox.App">
   <Application.Styles>
diff --git a/samples/MobileSandbox/MainView.xaml b/samples/MobileSandbox/MainView.xaml
index 5f9f41f3a9..1eab13aa75 100644
--- a/samples/MobileSandbox/MainView.xaml
+++ b/samples/MobileSandbox/MainView.xaml
@@ -1,6 +1,8 @@
 <UserControl x:Class="MobileSandbox.MainView"
              xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mobileSandbox="using:MobileSandbox"
+             x:DataType="mobileSandbox:MainView">
   <StackPanel Margin="100 50" Spacing="50">
     <TextBlock Text="Login" Foreground="White" />
     <TextBox Watermark="Text" />
diff --git a/samples/MobileSandbox/Views/CustomNotificationView.xaml b/samples/MobileSandbox/Views/CustomNotificationView.xaml
index 29033ca5df..f07116583c 100644
--- a/samples/MobileSandbox/Views/CustomNotificationView.xaml
+++ b/samples/MobileSandbox/Views/CustomNotificationView.xaml
@@ -7,12 +7,12 @@
                 <TextBlock Text="&#xE115;" FontFamily="Segoe UI Symbol" FontSize="20" TextAlignment="Center" VerticalAlignment="Center"/>
             </Panel>
             <DockPanel Grid.Column="1">
-                <TextBlock DockPanel.Dock="Top" Text="{Binding Title}" FontWeight="Medium" />
+                <TextBlock DockPanel.Dock="Top" Text="{ReflectionBinding Title}" FontWeight="Medium" />
                 <StackPanel Spacing="20" DockPanel.Dock="Bottom" Margin="0,8,0,0" Orientation="Horizontal">
-                    <Button Content="No" DockPanel.Dock="Right" NotificationCard.CloseOnClick="True" Command="{Binding NoCommand}"  Margin="0,0,8,0" />
-                    <Button Content="Yes" DockPanel.Dock="Right" NotificationCard.CloseOnClick="True" Command="{Binding YesCommand}" />
+                    <Button Content="No" DockPanel.Dock="Right" NotificationCard.CloseOnClick="True" Command="{ReflectionBinding NoCommand}"  Margin="0,0,8,0" />
+                    <Button Content="Yes" DockPanel.Dock="Right" NotificationCard.CloseOnClick="True" Command="{ReflectionBinding YesCommand}" />
                 </StackPanel>
-                <TextBlock Text="{Binding Message}" TextWrapping="Wrap" Opacity=".8" Margin="0,8,0,0"/>
+                <TextBlock Text="{ReflectionBinding Message}" TextWrapping="Wrap" Opacity=".8" Margin="0,8,0,0"/>
             </DockPanel>
         </Grid>
     </Border>
diff --git a/samples/RenderDemo/MainWindow.xaml b/samples/RenderDemo/MainWindow.xaml
index 823a0fbbef..20cc6c43e1 100644
--- a/samples/RenderDemo/MainWindow.xaml
+++ b/samples/RenderDemo/MainWindow.xaml
@@ -1,9 +1,11 @@
 <Window x:Class="RenderDemo.MainWindow"
         xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:controls="clr-namespace:ControlSamples;assembly=ControlSamples"
-        xmlns:pages="clr-namespace:RenderDemo.Pages"
+        xmlns:controls="using:ControlSamples"
+        xmlns:pages="using:RenderDemo.Pages"
+        xmlns:viewModels="using:RenderDemo.ViewModels"
         Title="AvaloniaUI Rendering Test"
+        x:DataType="viewModels:MainWindowViewModel"
         Width="{Binding Width, Mode=TwoWay}"
         Height="{Binding Height, Mode=TwoWay}">
   <controls:HamburgerMenu ExpandedModeThresholdWidth="760">
diff --git a/samples/RenderDemo/Pages/AnimationsPage.xaml b/samples/RenderDemo/Pages/AnimationsPage.xaml
index 9043bac33e..3f89a9d5f7 100644
--- a/samples/RenderDemo/Pages/AnimationsPage.xaml
+++ b/samples/RenderDemo/Pages/AnimationsPage.xaml
@@ -1,7 +1,9 @@
 <UserControl 
   xmlns="https://github.com/avaloniaui" 
-  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+  xmlns:viewModels="using:RenderDemo.ViewModels"
   x:Class="RenderDemo.Pages.AnimationsPage"
+  x:DataType="viewModels:AnimationsPageViewModel"
   MaxWidth="600">
   <UserControl.Styles>
     <Styles>
diff --git a/samples/RenderDemo/Pages/CustomAnimatorPage.xaml b/samples/RenderDemo/Pages/CustomAnimatorPage.xaml
index b386636cae..0c625b6a77 100644
--- a/samples/RenderDemo/Pages/CustomAnimatorPage.xaml
+++ b/samples/RenderDemo/Pages/CustomAnimatorPage.xaml
@@ -1,7 +1,7 @@
 <UserControl 
   xmlns="https://github.com/avaloniaui" 
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
-  xmlns:pages="clr-namespace:RenderDemo.Pages"
+  xmlns:pages="using:RenderDemo.Pages"
   x:Class="RenderDemo.Pages.CustomAnimatorPage"
   MaxWidth="600">
   <Grid>
diff --git a/samples/RenderDemo/Pages/GlyphRunPage.xaml b/samples/RenderDemo/Pages/GlyphRunPage.xaml
index 7db58e5286..e267b458bd 100644
--- a/samples/RenderDemo/Pages/GlyphRunPage.xaml
+++ b/samples/RenderDemo/Pages/GlyphRunPage.xaml
@@ -2,7 +2,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:local="clr-namespace:RenderDemo.Pages"
+             xmlns:local="using:RenderDemo.Pages"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="RenderDemo.Pages.GlyphRunPage">
   <Grid
diff --git a/samples/RenderDemo/Pages/LineBoundsPage.xaml b/samples/RenderDemo/Pages/LineBoundsPage.xaml
index 07d658630a..69193da345 100644
--- a/samples/RenderDemo/Pages/LineBoundsPage.xaml
+++ b/samples/RenderDemo/Pages/LineBoundsPage.xaml
@@ -3,7 +3,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             xmlns:controls="clr-namespace:RenderDemo.Controls"
+             xmlns:controls="using:RenderDemo.Controls"
              x:Class="RenderDemo.Pages.LineBoundsPage">
   <controls:LineBoundsDemoControl />
 </UserControl>
diff --git a/samples/RenderDemo/Pages/Transform3DPage.axaml b/samples/RenderDemo/Pages/Transform3DPage.axaml
index 30ed35bbac..7f3636648c 100644
--- a/samples/RenderDemo/Pages/Transform3DPage.axaml
+++ b/samples/RenderDemo/Pages/Transform3DPage.axaml
@@ -2,8 +2,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:RenderDemo.ViewModels"
              mc:Ignorable="d" d:DesignWidth="600" d:DesignHeight="700"
-             x:Class="RenderDemo.Pages.Transform3DPage">
+             x:Class="RenderDemo.Pages.Transform3DPage"
+             x:DataType="viewModels:Transform3DPageViewModel">
     <UserControl.Styles>
         <Styles>
             <Styles.Resources>
diff --git a/samples/RenderDemo/Pages/TransitionsPage.xaml b/samples/RenderDemo/Pages/TransitionsPage.xaml
index 71b6ea0713..006c2eb20b 100644
--- a/samples/RenderDemo/Pages/TransitionsPage.xaml
+++ b/samples/RenderDemo/Pages/TransitionsPage.xaml
@@ -1,7 +1,9 @@
 <UserControl 
   xmlns="https://github.com/avaloniaui" 
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+  xmlns:viewModels="using:RenderDemo.ViewModels"
   x:Class="RenderDemo.Pages.TransitionsPage"
+  x:DataType="viewModels:AnimationsPageViewModel"
   MaxWidth="600">
   <UserControl.Styles>
     <Styles>
diff --git a/samples/SampleControls/HamburgerMenu/HamburgerMenu.xaml b/samples/SampleControls/HamburgerMenu/HamburgerMenu.xaml
index fbc51414e3..f36b79224a 100644
--- a/samples/SampleControls/HamburgerMenu/HamburgerMenu.xaml
+++ b/samples/SampleControls/HamburgerMenu/HamburgerMenu.xaml
@@ -194,7 +194,7 @@
                              VerticalAlignment="Center"
                              Classes="h1"
                              Margin="{StaticResource HeaderMarginExpandedPane}"
-                             Text="{Binding $parent[TabControl].SelectedItem.Header, FallbackValue=''}">
+                             Text="{Binding $parent[TabControl].SelectedItem.(TabItem.Header), FallbackValue=''}">
                     <TextBlock.Transitions>
                       <Transitions>
                         <ThicknessTransition Easing="{StaticResource SplitViewPaneAnimationEasing}"
@@ -250,10 +250,10 @@
       <Setter Property="PaneBackground" Value="{TemplateBinding PaneBackground}" />
     </Style>
     <Style Selector="^ /template/ SplitView[DisplayMode=Overlay]">
-      <Setter Property="Background" Value="{Binding $parent[TabControl].ContentBackground}" />
+      <Setter Property="Background" Value="{Binding $parent[catalog:HamburgerMenu].ContentBackground}" />
     </Style>
     <Style Selector="^ /template/ SplitView[DisplayMode=Inline] Border#BackgroundBorder">
-      <Setter Property="Background" Value="{Binding $parent[TabControl].ContentBackground}" />
+      <Setter Property="Background" Value="{Binding $parent[catalog:HamburgerMenu].ContentBackground}" />
       <Setter Property="BoxShadow" Value="{StaticResource NavigationContentShadow}" />
     </Style>
     <Style Selector="^ /template/ SplitView[DisplayMode=Inline][IsPaneOpen=True] Border#BackgroundBorder">
diff --git a/samples/VirtualizationDemo/MainWindow.xaml b/samples/VirtualizationDemo/MainWindow.xaml
index 4bd657bf93..4e8a5c386b 100644
--- a/samples/VirtualizationDemo/MainWindow.xaml
+++ b/samples/VirtualizationDemo/MainWindow.xaml
@@ -1,9 +1,11 @@
 <Window xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:viewModels="using:VirtualizationDemo.ViewModels"
         x:Class="VirtualizationDemo.MainWindow"
         Title="AvaloniaUI Virtualization Test"
         Width="800"
-        Height="600">
+        Height="600"
+        x:DataType="viewModels:MainWindowViewModel">
     <DockPanel LastChildFill="True" Margin="16">
         <StackPanel DockPanel.Dock="Right" 
                     Margin="16 0 0 0" 
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPicker.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPicker.xaml
index 1bcd17393d..9d2a994e5b 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPicker.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPicker.xaml
@@ -1,10 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:controls="using:Avalonia.Controls"
-                    xmlns:converters="using:Avalonia.Controls.Converters"
-                    xmlns:primitives="using:Avalonia.Controls.Primitives"
-                    xmlns:pc="clr-namespace:Avalonia.Controls.Primitives.Converters;assembly=Avalonia.Controls.ColorPicker"
-                    x:CompileBindings="True">
+                    xmlns:primitives="using:Avalonia.Controls.Primitives">
 
   <ResourceDictionary.MergedDictionaries>
     <ResourceInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml" />
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPreviewer.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPreviewer.xaml
index 1c4a44d081..3a88d25ef1 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPreviewer.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPreviewer.xaml
@@ -1,7 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:pc="using:Avalonia.Controls.Primitives.Converters"
-                    x:CompileBindings="True">
+                    xmlns:pc="using:Avalonia.Controls.Primitives.Converters">
 
   <pc:AccentColorConverter x:Key="AccentColorConverter" />
   <x:Double x:Key="ColorPreviewerAccentSectionWidth">80</x:Double>
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorSlider.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorSlider.xaml
index fe749827a7..7e25bd8051 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorSlider.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorSlider.xaml
@@ -1,6 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    x:CompileBindings="True">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
   <ControlTheme x:Key="ColorSliderThumbTheme"
                 TargetType="Thumb">
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorSpectrum.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorSpectrum.xaml
index 05d8eda9f7..ebbb006fd1 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorSpectrum.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorSpectrum.xaml
@@ -1,7 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:controls="using:Avalonia.Controls"
-                    x:CompileBindings="True">
+                    xmlns:controls="using:Avalonia.Controls">
 
   <ControlTheme x:Key="{x:Type ColorSpectrum}"
                 TargetType="ColorSpectrum">
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml
index b3c6d1a430..f9c4f9b57a 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml
@@ -3,9 +3,8 @@
                     xmlns:controls="using:Avalonia.Controls"
                     xmlns:converters="using:Avalonia.Controls.Converters"
                     xmlns:primitives="using:Avalonia.Controls.Primitives"
-                    xmlns:pc="clr-namespace:Avalonia.Controls.Primitives.Converters;assembly=Avalonia.Controls.ColorPicker"
-                    xmlns:globalization="clr-namespace:System.Globalization;assembly=mscorlib"
-                    x:CompileBindings="True">
+                    xmlns:pc="using:Avalonia.Controls.Primitives.Converters"
+                    xmlns:globalization="using:System.Globalization">
 
   <pc:ContrastBrushConverter x:Key="ContrastBrushConverter" />
   <converters:ColorToDisplayNameConverter x:Key="ColorToDisplayNameConverter" />
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/Fluent.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/Fluent.xaml
index b0f6d89b32..85f4e417e6 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/Fluent.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/Fluent.xaml
@@ -1,7 +1,6 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:converters="using:Avalonia.Controls.Converters"
-        x:CompileBindings="True">
+        xmlns:converters="using:Avalonia.Controls.Converters">
 
   <Styles.Resources>
     <ResourceDictionary>
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorPicker.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorPicker.xaml
index fdee64dfd2..626ddd4b43 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorPicker.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorPicker.xaml
@@ -1,10 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:controls="using:Avalonia.Controls"
-                    xmlns:converters="using:Avalonia.Controls.Converters"
-                    xmlns:primitives="using:Avalonia.Controls.Primitives"
-                    xmlns:pc="clr-namespace:Avalonia.Controls.Primitives.Converters;assembly=Avalonia.Controls.ColorPicker"
-                    x:CompileBindings="True">
+                    xmlns:primitives="using:Avalonia.Controls.Primitives">
 
   <ResourceDictionary.MergedDictionaries>
     <ResourceInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Simple/ColorView.xaml" />
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorPreviewer.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorPreviewer.xaml
index e067fe4ab5..0e51a0519a 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorPreviewer.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorPreviewer.xaml
@@ -1,7 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:pc="using:Avalonia.Controls.Primitives.Converters"
-                    x:CompileBindings="True">
+                    xmlns:pc="using:Avalonia.Controls.Primitives.Converters">
 
   <pc:AccentColorConverter x:Key="AccentColorConverter" />
   <x:Double x:Key="ColorPreviewerAccentSectionWidth">80</x:Double>
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorSlider.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorSlider.xaml
index e1142f71df..e9d12499f9 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorSlider.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorSlider.xaml
@@ -1,6 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    x:CompileBindings="True">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
   <ControlTheme x:Key="ColorSliderThumbTheme"
                 TargetType="Thumb">
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorSpectrum.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorSpectrum.xaml
index 77eff3a69f..a7ad56d8b4 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorSpectrum.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorSpectrum.xaml
@@ -1,7 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:controls="using:Avalonia.Controls"
-                    x:CompileBindings="True">
+                    xmlns:controls="using:Avalonia.Controls">
 
   <ControlTheme x:Key="{x:Type ColorSpectrum}"
                 TargetType="ColorSpectrum">
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorView.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorView.xaml
index 860dbe11d0..554bca3b63 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorView.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorView.xaml
@@ -3,9 +3,8 @@
                     xmlns:controls="using:Avalonia.Controls"
                     xmlns:converters="using:Avalonia.Controls.Converters"
                     xmlns:primitives="using:Avalonia.Controls.Primitives"
-                    xmlns:pc="clr-namespace:Avalonia.Controls.Primitives.Converters;assembly=Avalonia.Controls.ColorPicker"
-                    xmlns:globalization="clr-namespace:System.Globalization;assembly=mscorlib"
-                    x:CompileBindings="True">
+                    xmlns:pc="using:Avalonia.Controls.Primitives.Converters"
+                    xmlns:globalization="using:System.Globalization">
 
   <pc:ContrastBrushConverter x:Key="ContrastBrushConverter" />
   <converters:ColorToDisplayNameConverter x:Key="ColorToDisplayNameConverter" />
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Simple/Simple.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Simple/Simple.xaml
index bb362f4257..7aefa23706 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Simple/Simple.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Simple/Simple.xaml
@@ -1,7 +1,6 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:converters="using:Avalonia.Controls.Converters"
-        x:CompileBindings="True">
+        xmlns:converters="using:Avalonia.Controls.Converters">
 
   <Styles.Resources>
     <ResourceDictionary>
diff --git a/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml b/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
index b4bae02b9b..3d98722da5 100644
--- a/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
+++ b/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
@@ -1,5 +1,5 @@
 <Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        x:CompileBindings="True">
+        xmlns:collections="using:Avalonia.Collections">
   <Styles.Resources>
     <x:Double x:Key="ListAccentLowOpacity">0.6</x:Double>
     <x:Double x:Key="ListAccentMediumOpacity">0.8</x:Double>
@@ -402,7 +402,7 @@
       <Setter Property="FontSize" Value="15" />
       <Setter Property="MinHeight" Value="32" />
       <Setter Property="Template">
-        <ControlTemplate>
+        <ControlTemplate x:DataType="collections:DataGridCollectionViewGroup">
           <DataGridFrozenGrid Name="PART_Root"
                               Background="{TemplateBinding Background}"
                               MinHeight="{TemplateBinding MinHeight}"
@@ -433,7 +433,7 @@
                          IsVisible="{TemplateBinding IsPropertyNameVisible}"
                          Foreground="{TemplateBinding Foreground}" />
               <TextBlock Margin="4,0,0,0"
-                         Text="{ReflectionBinding Key}"
+                         Text="{Binding Key}"
                          Foreground="{TemplateBinding Foreground}" />
               <TextBlock Name="PART_ItemCountElement"
                          Margin="4,0,0,0"
diff --git a/src/Avalonia.Controls.DataGrid/Themes/Simple.xaml b/src/Avalonia.Controls.DataGrid/Themes/Simple.xaml
index b43addff86..e3b5c9eb39 100644
--- a/src/Avalonia.Controls.DataGrid/Themes/Simple.xaml
+++ b/src/Avalonia.Controls.DataGrid/Themes/Simple.xaml
@@ -1,5 +1,6 @@
 <Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:collections="using:Avalonia.Collections">
   <Styles.Resources>
     <Thickness x:Key="DataGridTextColumnCellTextBlockMargin">4</Thickness>
     <ControlTheme x:Key="DataGridCellTextBlockTheme"
@@ -253,7 +254,7 @@
       <Setter Property="Background" Value="{DynamicResource ThemeControlMidHighBrush}" />
       <Setter Property="Height" Value="20" />
       <Setter Property="Template">
-        <ControlTemplate>
+        <ControlTemplate x:DataType="collections:DataGridCollectionViewGroup">
           <DataGridFrozenGrid Name="Root"
                               ColumnDefinitions="Auto,Auto,Auto,Auto"
                               RowDefinitions="Auto,*,Auto">
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Controls/FilterTextBox.axaml b/src/Avalonia.Diagnostics/Diagnostics/Controls/FilterTextBox.axaml
index a1a2ab34bf..3bfe511fbc 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Controls/FilterTextBox.axaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Controls/FilterTextBox.axaml
@@ -1,7 +1,6 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:controls="using:Avalonia.Diagnostics.Controls"
-        x:CompileBindings="True"
         x:DataType="controls:FilterTextBox">
 
   <Design.PreviewWith>
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Controls/ThicknessEditor.axaml b/src/Avalonia.Diagnostics/Diagnostics/Controls/ThicknessEditor.axaml
index c202d13778..3e0ddc4b4d 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Controls/ThicknessEditor.axaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Controls/ThicknessEditor.axaml
@@ -1,6 +1,6 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:controls="clr-namespace:Avalonia.Diagnostics.Controls">
+        xmlns:controls="using:Avalonia.Diagnostics.Controls">
 
     <Styles.Resources>
         <SolidColorBrush x:Key="HighlightBorderBrush" Color="CornflowerBlue" />
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/MainViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/MainViewModel.cs
index a0514cdd76..6b21b3f72b 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/MainViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/MainViewModel.cs
@@ -292,7 +292,7 @@ namespace Avalonia.Diagnostics.ViewModels
         
         [DependsOn(nameof(TreePageViewModel.SelectedNode))]
         [DependsOn(nameof(Content))]
-        bool CanShot(object? parameter)
+        public bool CanShot(object? parameter)
         {
             return Content is TreePageViewModel tree
                 && tree.SelectedNode != null
@@ -300,7 +300,7 @@ namespace Avalonia.Diagnostics.ViewModels
                 && visual.VisualRoot != null;
         }
 
-        async void Shot(object? parameter)
+        public async void Shot(object? parameter)
         {
             if ((Content as TreePageViewModel)?.SelectedNode?.Visual is IControl control
                 && _screenshotHandler is { }
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/ConsoleView.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/ConsoleView.xaml
index 7dec878e69..c0ba508179 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/ConsoleView.xaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/ConsoleView.xaml
@@ -1,6 +1,8 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             x:Class="Avalonia.Diagnostics.Views.ConsoleView">
+             xmlns:viewModels="using:Avalonia.Diagnostics.ViewModels"
+             x:Class="Avalonia.Diagnostics.Views.ConsoleView"
+             x:DataType="viewModels:ConsoleViewModel">
   <UserControl.Styles>
     <Style Selector="TextBox.console">
       <Setter Property="FontFamily" Value="/Assets/Fonts/SourceSansPro-Regular.ttf"/>
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml
index bf595d82a3..2a69798c6c 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml
@@ -1,12 +1,13 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:conv="clr-namespace:Avalonia.Diagnostics.Converters"
-             xmlns:local="clr-namespace:Avalonia.Diagnostics.Views"
-             xmlns:controls="clr-namespace:Avalonia.Diagnostics.Controls"
-             xmlns:vm="clr-namespace:Avalonia.Diagnostics.ViewModels"
+             xmlns:conv="using:Avalonia.Diagnostics.Converters"
+             xmlns:local="using:Avalonia.Diagnostics.Views"
+             xmlns:controls="using:Avalonia.Diagnostics.Controls"
+             xmlns:vm="using:Avalonia.Diagnostics.ViewModels"
              xmlns:lb="using:Avalonia.Diagnostics.Behaviors"
              x:Class="Avalonia.Diagnostics.Views.ControlDetailsView"
-             x:Name="Main">
+             x:Name="Main"
+             x:DataType="vm:ControlDetailsViewModel">
 
   <UserControl.Resources>
     <conv:BoolToOpacityConverter x:Key="BoolToOpacity" Opacity="0.6"/>
@@ -58,21 +59,24 @@
                 CanUserResizeColumns="true"
                 DoubleTapped="PropertiesGrid_OnDoubleTapped">
         <DataGrid.Columns>
-          <DataGridTextColumn Header="Property" Binding="{Binding Name}" IsReadOnly="True" />
-          <DataGridTextColumn Header="Value" Binding="{Binding Value}" />
+          <DataGridTextColumn Header="Property" Binding="{Binding Name}" IsReadOnly="True" x:DataType="vm:PropertyViewModel" />
+          <DataGridTextColumn Header="Value" Binding="{Binding Value}" x:DataType="vm:PropertyViewModel" />
           <DataGridTextColumn Header="Type" Binding="{Binding Type}"
                               IsReadOnly="True"
-                              IsVisible="{Binding !$parent[UserControl;2].DataContext.ShowDetailsPropertyType}"
+                              IsVisible="{Binding !$parent[UserControl;2].((vm:MainViewModel)DataContext).ShowDetailsPropertyType}"
+                              x:DataType="vm:PropertyViewModel"
                               />
           <DataGridTextColumn Header="Assigned Type" Binding="{Binding AssignedType, Converter={StaticResource GetTypeName}}"
                               IsReadOnly="True"
-                              IsVisible="{Binding $parent[UserControl;2].DataContext.ShowDetailsPropertyType}"
+                              IsVisible="{Binding $parent[UserControl;2].((vm:MainViewModel)DataContext).ShowDetailsPropertyType}"
+                              x:DataType="vm:PropertyViewModel"
                               />
           <DataGridTextColumn Header="Property Type" Binding="{Binding PropertyType, Converter={StaticResource GetTypeName}}"
                               IsReadOnly="True"
-                              IsVisible="{Binding $parent[UserControl;2].DataContext.ShowDetailsPropertyType}"
+                              IsVisible="{Binding $parent[UserControl;2].((vm:MainViewModel)DataContext).ShowDetailsPropertyType}"
+                              x:DataType="vm:PropertyViewModel"
                               />
-          <DataGridTextColumn Header="Priority" Binding="{Binding Priority}" IsReadOnly="True" />
+          <DataGridTextColumn Header="Priority" Binding="{Binding Priority}" IsReadOnly="True" x:DataType="vm:PropertyViewModel" />
         </DataGrid.Columns>
 
         <DataGrid.Styles>
@@ -124,7 +128,7 @@
                     <MultiBinding Converter="{x:Static BoolConverters.And}">
                       <MultiBinding Converter="{x:Static BoolConverters.Or}" >
                         <Binding Path="IsActive" />
-                        <Binding Path="#Main.DataContext.ShowInactiveStyles" />
+                        <Binding Path="#Main.((vm:ControlDetailsViewModel)DataContext).ShowInactiveStyles" />
                       </MultiBinding>
                       <Binding Path="IsVisible" />
                     </MultiBinding>
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/EventsPageView.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/EventsPageView.xaml
index a9c2688a18..cd2e92914a 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/EventsPageView.xaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/EventsPageView.xaml
@@ -1,10 +1,10 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:vm="clr-namespace:Avalonia.Diagnostics.ViewModels"
-             xmlns:conv="clr-namespace:Avalonia.Diagnostics.Converters"
-             xmlns:controls="clr-namespace:Avalonia.Diagnostics.Controls"
+             xmlns:vm="using:Avalonia.Diagnostics.ViewModels"
+             xmlns:controls="using:Avalonia.Diagnostics.Controls"
              x:Class="Avalonia.Diagnostics.Views.EventsPageView"
-             Margin="2">
+             Margin="2"
+             x:DataType="vm:EventsPageViewModel">
   <UserControl.Styles>
     <Style Selector="TextBlock.nav" >
       <Setter Property="TextDecorations">
@@ -52,7 +52,7 @@
           </TreeDataTemplate>
         </TreeView.DataTemplates>
         <TreeView.Styles>
-          <Style Selector="TreeViewItem">
+          <Style Selector="TreeViewItem" x:DataType="vm:EventTreeNodeBase">
             <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}" />
             <Setter Property="IsVisible" Value="{Binding IsVisible}" />
           </Style>
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/LayoutExplorerView.axaml b/src/Avalonia.Diagnostics/Diagnostics/Views/LayoutExplorerView.axaml
index c404a5c382..0d2e739b2b 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/LayoutExplorerView.axaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/LayoutExplorerView.axaml
@@ -1,9 +1,10 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              x:Class="Avalonia.Diagnostics.Views.LayoutExplorerView"
-             xmlns:local="clr-namespace:Avalonia.Diagnostics.Views"
-             xmlns:controls="clr-namespace:Avalonia.Diagnostics.Controls"
-             xmlns:converters="clr-namespace:Avalonia.Diagnostics.Converters">
+             xmlns:controls="using:Avalonia.Diagnostics.Controls"
+             xmlns:converters="using:Avalonia.Diagnostics.Converters"
+             xmlns:viewModels="using:Avalonia.Diagnostics.ViewModels"
+             x:DataType="viewModels:ControlLayoutViewModel">
 
     <UserControl.Resources>
         <SolidColorBrush x:Key="SizeGuidelineBrush" Color="#333333" />
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/MainView.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/MainView.xaml
index a6da929da3..97e21079c1 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/MainView.xaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/MainView.xaml
@@ -1,7 +1,9 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:views="clr-namespace:Avalonia.Diagnostics.Views"
-             x:Class="Avalonia.Diagnostics.Views.MainView">
+             xmlns:views="using:Avalonia.Diagnostics.Views"
+             xmlns:viewModels="using:Avalonia.Diagnostics.ViewModels"
+             x:Class="Avalonia.Diagnostics.Views.MainView"
+             x:DataType="viewModels:MainViewModel">
   <Grid Name="rootGrid" RowDefinitions="Auto,Auto,*,Auto,0,Auto">
     <Menu>
       <MenuItem Header="_File">
@@ -38,7 +40,7 @@
         </MenuItem>
       </MenuItem>
       <MenuItem Header="_View">
-        <MenuItem Header="_Console" Command="{Binding $parent[UserControl].ToggleConsole}">
+        <MenuItem Header="_Console" Command="{Binding $parent[views:MainView].ToggleConsole}">
           <MenuItem.Icon>
             <CheckBox BorderThickness="0"
                       IsChecked="{Binding Console.IsVisible}"
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml
index d2b31fdb20..6c1da3ec00 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml
@@ -1,9 +1,11 @@
 <Window xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:views="clr-namespace:Avalonia.Diagnostics.Views"
-        xmlns:diag="clr-namespace:Avalonia.Diagnostics"
+        xmlns:views="using:Avalonia.Diagnostics.Views"
+        xmlns:diag="using:Avalonia.Diagnostics"
+        xmlns:viewModels="using:Avalonia.Diagnostics.ViewModels"
         Title="Avalonia DevTools"
-        x:Class="Avalonia.Diagnostics.Views.MainWindow">
+        x:Class="Avalonia.Diagnostics.Views.MainWindow"
+        x:DataType="viewModels:MainViewModel">
   <Window.DataTemplates>
     <diag:ViewLocator/>
   </Window.DataTemplates>
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/TreePageView.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/TreePageView.xaml
index bb661f7f4c..36bb880a14 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/TreePageView.xaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/TreePageView.xaml
@@ -1,7 +1,8 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:vm="clr-namespace:Avalonia.Diagnostics.ViewModels"
-             x:Class="Avalonia.Diagnostics.Views.TreePageView">
+             xmlns:vm="using:Avalonia.Diagnostics.ViewModels"
+             x:Class="Avalonia.Diagnostics.Views.TreePageView"
+             x:DataType="vm:TreePageViewModel">
   <Grid ColumnDefinitions="0.35*,4,0.65*">
     <TreeView Name="tree"
               BorderThickness="0"
@@ -18,7 +19,7 @@
         </TreeDataTemplate>
       </TreeView.DataTemplates>
       <TreeView.Styles>
-        <Style Selector="TreeViewItem">
+        <Style Selector="TreeViewItem" x:DataType="vm:TreeNode">
           <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}"/>
           <Setter Property="Background" Value="Transparent" />
         </Style>
diff --git a/src/Avalonia.Dialogs/AboutAvaloniaDialog.xaml b/src/Avalonia.Dialogs/AboutAvaloniaDialog.xaml
index 65df347ee2..22362fa5f5 100644
--- a/src/Avalonia.Dialogs/AboutAvaloniaDialog.xaml
+++ b/src/Avalonia.Dialogs/AboutAvaloniaDialog.xaml
@@ -1,5 +1,6 @@
 <Window xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:dialogs="using:Avalonia.Dialogs"
         MaxWidth="400"
         MaxHeight="475"
         MinWidth="430"
@@ -7,7 +8,8 @@
         Title="About Avalonia"
         Background="Purple"
         FontFamily="/Assets/Roboto-Light.ttf#Roboto"
-        x:Class="Avalonia.Dialogs.AboutAvaloniaDialog">
+        x:Class="Avalonia.Dialogs.AboutAvaloniaDialog"
+        x:DataType="dialogs:AboutAvaloniaDialog">
   <Window.Styles>
     <Style>
       <Style.Resources>
diff --git a/src/Avalonia.Dialogs/InternalViewModelBase.cs b/src/Avalonia.Dialogs/InternalViewModelBase.cs
index 520bc15bfe..2c73358bb8 100644
--- a/src/Avalonia.Dialogs/InternalViewModelBase.cs
+++ b/src/Avalonia.Dialogs/InternalViewModelBase.cs
@@ -1,15 +1,13 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
-using JetBrains.Annotations;
 
-namespace Avalonia.Dialogs
+namespace Avalonia.Dialogs.Internal
 {
-    internal class InternalViewModelBase : INotifyPropertyChanged
+    public class InternalViewModelBase : INotifyPropertyChanged
     {
         public event PropertyChangedEventHandler PropertyChanged;
 
-        [NotifyPropertyChangedInvocator]
         protected bool RaiseAndSetIfChanged<T>(ref T field, T value, [CallerMemberName] string propertyName = null)
         {
             if (!EqualityComparer<T>.Default.Equals(field, value))
@@ -22,7 +20,6 @@ namespace Avalonia.Dialogs
             return false;
         }
 
-        [NotifyPropertyChangedInvocator]
         protected void RaisePropertyChanged([CallerMemberName] string propertyName = null)
         {
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
diff --git a/src/Avalonia.Dialogs/ManagedFileChooserFilterViewModel.cs b/src/Avalonia.Dialogs/ManagedFileChooserFilterViewModel.cs
index 062daef225..ed594f78dc 100644
--- a/src/Avalonia.Dialogs/ManagedFileChooserFilterViewModel.cs
+++ b/src/Avalonia.Dialogs/ManagedFileChooserFilterViewModel.cs
@@ -1,10 +1,11 @@
 using System.Linq;
 using System.Text.RegularExpressions;
+using Avalonia.Dialogs.Internal;
 using Avalonia.Platform.Storage;
 
 namespace Avalonia.Dialogs
 {
-    internal class ManagedFileChooserFilterViewModel : InternalViewModelBase
+    public class ManagedFileChooserFilterViewModel : InternalViewModelBase
     {
         private readonly Regex[] _patterns;
         public string Name { get; }
diff --git a/src/Avalonia.Dialogs/ManagedFileChooserItemViewModel.cs b/src/Avalonia.Dialogs/ManagedFileChooserItemViewModel.cs
index 2801930028..eabe270a44 100644
--- a/src/Avalonia.Dialogs/ManagedFileChooserItemViewModel.cs
+++ b/src/Avalonia.Dialogs/ManagedFileChooserItemViewModel.cs
@@ -1,8 +1,9 @@
 using System;
+using Avalonia.Dialogs.Internal;
 
 namespace Avalonia.Dialogs
 {
-    internal class ManagedFileChooserItemViewModel : InternalViewModelBase
+    public class ManagedFileChooserItemViewModel : InternalViewModelBase
     {
         private string _displayName;
         private string _path;
diff --git a/src/Avalonia.Dialogs/ManagedFileChooserNavigationItem.cs b/src/Avalonia.Dialogs/ManagedFileChooserNavigationItem.cs
index 8dac14bf8b..350ce84c3a 100644
--- a/src/Avalonia.Dialogs/ManagedFileChooserNavigationItem.cs
+++ b/src/Avalonia.Dialogs/ManagedFileChooserNavigationItem.cs
@@ -1,6 +1,6 @@
 namespace Avalonia.Dialogs
 {
-    internal class ManagedFileChooserNavigationItem
+    public class ManagedFileChooserNavigationItem
     {
         public string DisplayName { get; set; }
         public string Path { get; set; }
diff --git a/src/Avalonia.Dialogs/ManagedFileChooserViewModel.cs b/src/Avalonia.Dialogs/ManagedFileChooserViewModel.cs
index 986f43b1a1..164019d18c 100644
--- a/src/Avalonia.Dialogs/ManagedFileChooserViewModel.cs
+++ b/src/Avalonia.Dialogs/ManagedFileChooserViewModel.cs
@@ -8,12 +8,13 @@ using System.Runtime.InteropServices;
 using Avalonia.Collections;
 using Avalonia.Controls;
 using Avalonia.Controls.Platform;
+using Avalonia.Dialogs.Internal;
 using Avalonia.Platform.Storage;
 using Avalonia.Threading;
 
 namespace Avalonia.Dialogs
 {
-    internal class ManagedFileChooserViewModel : InternalViewModelBase
+    public class ManagedFileChooserViewModel : InternalViewModelBase
     {
         private readonly ManagedFileDialogOptions _options;
         public event Action CancelRequested;
diff --git a/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml b/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml
index c6980bf97d..d95e7dd1ef 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml
@@ -1,8 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:sys="clr-namespace:System;assembly=netstandard"
-                    xmlns:converters="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls"
-                    x:CompileBindings="True">
+                    xmlns:sys="using:System"
+                    xmlns:converters="using:Avalonia.Controls.Converters">
   <Design.PreviewWith>
     <Border Padding="20">
       <StackPanel Spacing="20">
diff --git a/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml b/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml
index 54f6a200b8..2a3496b648 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml
@@ -1,7 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:sys="clr-namespace:System;assembly=netstandard"
-                    x:CompileBindings="True">
+                    xmlns:sys="using:System">
   <Design.PreviewWith>
     <Border Margin="20, 20, 20, 200">
       <CalendarDatePicker Width="200" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" />
diff --git a/src/Avalonia.Themes.Fluent/Controls/CalendarItem.xaml b/src/Avalonia.Themes.Fluent/Controls/CalendarItem.xaml
index 1d9ef6d5a9..7276742e7d 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CalendarItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CalendarItem.xaml
@@ -6,9 +6,7 @@
 -->
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:sys="clr-namespace:System;assembly=netstandard"
-        x:CompileBindings="True"
-        x:DataType="CalendarItem">
+        xmlns:sys="using:System">
   <Design.PreviewWith>
     <Border Padding="20">
       <Calendar DisplayDate="2000-01-01">
@@ -58,7 +56,7 @@
   <ControlTheme x:Key="{x:Type CalendarItem}" TargetType="CalendarItem">
     <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
     <Setter Property="DayTitleTemplate">
-      <Template>
+      <Template x:DataType="x:String">
         <TextBlock Text="{Binding}"
                    HorizontalAlignment="Center"
                    VerticalAlignment="Center"
@@ -112,7 +110,7 @@
               </Button>
             </Grid>
             <!--Border below is used only for MonthView but it can't be moved inside of Grid because CalendarItem expects it to be empty and it will cause side-effects-->
-            <Border Name="BackgroundLayer" Background="{TemplateBinding BorderBrush}" Margin="0,38,0,0" IsVisible="{ReflectionBinding #MonthView.IsVisible}" Grid.Row="1" />
+            <Border Name="BackgroundLayer" Background="{TemplateBinding BorderBrush}" Margin="0,38,0,0" IsVisible="{Binding #PART_MonthView.IsVisible}" Grid.Row="1" />
             <Grid Name="PART_MonthView" Grid.Row="1" IsVisible="False" MinHeight="290">
               <Grid.RowDefinitions>
                 <!--This should always be the week day names??-->
diff --git a/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml b/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml
index 4aa0ddc23a..24d9d21df8 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:sys="clr-namespace:System;assembly=netstandard">
+                    xmlns:sys="using:System">
   <Design.PreviewWith>
     <Border Padding="20">
       <StackPanel Spacing="10">
diff --git a/src/Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml b/src/Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml
index a4055519b6..7d45d0444f 100644
--- a/src/Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml
@@ -1,8 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:sys="using:System"
-                    x:CompileBindings="True"
-                    x:DataType="DataValidationErrors">
+                    xmlns:collections="using:System.Collections">
   <Design.PreviewWith>
     <Border Padding="20">
       <StackPanel Spacing="20">
@@ -99,7 +98,7 @@
             </Style>
           </Panel.Styles>
           <ToolTip.Tip>
-            <ItemsControl Items="{ReflectionBinding}" />
+            <ItemsControl Items="{Binding}" x:DataType="collections:IEnumerable" />
           </ToolTip.Tip>
           <Path Width="14"
                 Height="14"
diff --git a/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml b/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml
index 1585dada90..28ec553660 100644
--- a/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml
@@ -7,8 +7,7 @@
 
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:sys="clr-namespace:System;assembly=netstandard"
-        x:CompileBindings="True">
+        xmlns:sys="using:System">
   <Design.PreviewWith>
     <Border Padding="20" Height="500">
       <StackPanel Spacing="20" VerticalAlignment="Center">
diff --git a/src/Avalonia.Themes.Fluent/Controls/DateTimePickerShared.xaml b/src/Avalonia.Themes.Fluent/Controls/DateTimePickerShared.xaml
index 7500ac7bca..9d21e6e758 100644
--- a/src/Avalonia.Themes.Fluent/Controls/DateTimePickerShared.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/DateTimePickerShared.xaml
@@ -6,9 +6,7 @@
 -->
 
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:sys="clr-namespace:System;assembly=netstandard"
-        x:CompileBindings="True">
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Design.PreviewWith>
     <Border Padding="20" Width="200">
       <StackPanel Spacing="20">
diff --git a/src/Avalonia.Themes.Fluent/Controls/DropDownButton.xaml b/src/Avalonia.Themes.Fluent/Controls/DropDownButton.xaml
index 96fd575f4f..421ba0bb18 100644
--- a/src/Avalonia.Themes.Fluent/Controls/DropDownButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/DropDownButton.xaml
@@ -1,6 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    x:CompileBindings="True">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Design.PreviewWith>
       <Border Padding="20">
         <StackPanel Spacing="20">
diff --git a/src/Avalonia.Themes.Fluent/Controls/Expander.xaml b/src/Avalonia.Themes.Fluent/Controls/Expander.xaml
index df9de331ee..3cf819c4b8 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Expander.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Expander.xaml
@@ -1,6 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    x:CompileBindings="True">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
   <Design.PreviewWith>
     <Border Padding="20">
diff --git a/src/Avalonia.Themes.Fluent/Controls/ManagedFileChooser.xaml b/src/Avalonia.Themes.Fluent/Controls/ManagedFileChooser.xaml
index d0280b16a2..cca7d3d1cd 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ManagedFileChooser.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ManagedFileChooser.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:dialogs="clr-namespace:Avalonia.Dialogs;assembly=Avalonia.Dialogs">
+        xmlns:dialogs="using:Avalonia.Dialogs">
   <Design.PreviewWith>
     <Border Padding="20" Width="800" Height="500">
       <dialogs:ManagedFileChooser/>
@@ -131,7 +131,8 @@
         </dialogs:ResourceSelectorConverter>
       </ResourceDictionary>
     </ControlTheme.Resources>
-    <Setter Property="Template">
+    <Setter Property="Template"
+            x:DataType="dialogs:ManagedFileChooserViewModel">
       <ControlTemplate>
         <DockPanel>
           <ListBox x:Name="PART_QuickLinks" DockPanel.Dock="Left" Items="{Binding QuickLinks}" SelectedIndex="{Binding QuickLinksSelectedIndex}" Focusable="False">
@@ -222,7 +223,7 @@
                 Background="Transparent"
                 ScrollViewer.HorizontalScrollBarVisibility="Disabled">
               <ListBox.ItemTemplate>
-                <DataTemplate>
+                <DataTemplate x:DataType="dialogs:ManagedFileChooserItemViewModel">
                   <Grid Background="Transparent">
                     <Grid.ColumnDefinitions>
                       <ColumnDefinition SharedSizeGroup="Icon" />
diff --git a/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml b/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
index ed29addbc2..4060d7efbe 100644
--- a/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
@@ -1,9 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:conv="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls"
-                    xmlns:sys="clr-namespace:System;assembly=netstandard"
-                    x:DataType="MenuItem"
-                    x:CompileBindings="True">
+                    xmlns:conv="using:Avalonia.Controls.Converters">
   <Design.PreviewWith>
     <Border Padding="20" Width="320">
       <StackPanel Spacing="20" HorizontalAlignment="Left">
diff --git a/src/Avalonia.Themes.Fluent/Controls/MenuScrollViewer.xaml b/src/Avalonia.Themes.Fluent/Controls/MenuScrollViewer.xaml
index bc71d88a0d..e8508935d2 100644
--- a/src/Avalonia.Themes.Fluent/Controls/MenuScrollViewer.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/MenuScrollViewer.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:converters="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls">
+                    xmlns:converters="using:Avalonia.Controls.Converters">
 
   <Design.PreviewWith>
     <ScrollViewer Theme="{DynamicResource FluentMenuScrollViewer}" Width="200" Height="200">
diff --git a/src/Avalonia.Themes.Fluent/Controls/NativeMenuBar.xaml b/src/Avalonia.Themes.Fluent/Controls/NativeMenuBar.xaml
index d3eaeafd01..1eb0493b08 100644
--- a/src/Avalonia.Themes.Fluent/Controls/NativeMenuBar.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/NativeMenuBar.xaml
@@ -1,7 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Avalonia.Themes.Fluent"
-                    x:CompileBindings="True">
+                    xmlns:local="using:Avalonia.Themes.Fluent">
   <local:InverseBooleanValueConverter x:Key="AvaloniaThemesFluentNativeMenuBarInverseBooleanValueConverter" Default="True"/>
   <local:IBitmapToImageConverter x:Key="AvaloniaThemesFluentNativeMenuBarIBitmapToImageConverter"/>
   <ControlTheme x:Key="{x:Type NativeMenuBar}" TargetType="NativeMenuBar">
@@ -11,16 +10,17 @@
           IsVisible="{Binding $parent[TopLevel].(NativeMenu.IsNativeMenuExported), Converter={StaticResource AvaloniaThemesFluentNativeMenuBarInverseBooleanValueConverter}}"
           Items="{Binding $parent[TopLevel].(NativeMenu.Menu).Items}">
           <Menu.Styles>
-            <Style x:CompileBindings="False" Selector="MenuItem">
-              <Setter Property="Header" Value="{Binding Header}"/>
-              <Setter Property="IsEnabled" Value="{Binding IsEnabled}"/>
-              <Setter Property="InputGesture" Value="{Binding Gesture}"/>
-              <Setter Property="Items" Value="{Binding Menu.Items}"/>
-              <Setter Property="Command" Value="{Binding Command}"/>
-              <Setter Property="CommandParameter" Value="{Binding CommandParameter}"/>
+            <!-- Don't use x:DataType and compiled bindings here, as it might crash https://github.com/AvaloniaUI/Avalonia/pull/7954  -->
+            <Style Selector="MenuItem">
+              <Setter Property="Header" Value="{ReflectionBinding Header}"/>
+              <Setter Property="IsEnabled" Value="{ReflectionBinding IsEnabled}"/>
+              <Setter Property="InputGesture" Value="{ReflectionBinding Gesture}"/>
+              <Setter Property="Items" Value="{ReflectionBinding Menu.Items}"/>
+              <Setter Property="Command" Value="{ReflectionBinding Command}"/>
+              <Setter Property="CommandParameter" Value="{ReflectionBinding CommandParameter}"/>
               <Setter Property="(NativeMenuBar.EnableMenuItemClickForwarding)" Value="True"/>
               <!--NativeMenuItem is IBitmap and MenuItem is Image-->
-              <Setter Property="Icon" Value="{Binding Icon , Converter={StaticResource AvaloniaThemesFluentNativeMenuBarIBitmapToImageConverter}}"/>
+              <Setter Property="Icon" Value="{ReflectionBinding Icon , Converter={StaticResource AvaloniaThemesFluentNativeMenuBarIBitmapToImageConverter}}"/>
             </Style>
           </Menu.Styles>
         </Menu>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ProgressBar.xaml b/src/Avalonia.Themes.Fluent/Controls/ProgressBar.xaml
index dc591ede12..253d85852e 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ProgressBar.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ProgressBar.xaml
@@ -1,7 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:converters="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls"
-                    x:CompileBindings="True">
+                    xmlns:converters="using:Avalonia.Controls.Converters">
   <Design.PreviewWith>
     <Border Padding="20">
       <StackPanel Orientation="Horizontal" Spacing="10">
diff --git a/src/Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml b/src/Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml
index 2c727b4435..71df4d419f 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml
@@ -1,7 +1,6 @@
 <ResourceDictionary
   xmlns="https://github.com/avaloniaui"
-  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-  xmlns:converters="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls">
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Design.PreviewWith>
     <ScrollViewer Width="200" Height="200"
                   HorizontalScrollBarVisibility="Auto">
diff --git a/src/Avalonia.Themes.Fluent/Controls/Slider.xaml b/src/Avalonia.Themes.Fluent/Controls/Slider.xaml
index f2351dd5be..1e3f51f7ef 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Slider.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Slider.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:sys="clr-namespace:System;assembly=netstandard">
+                    xmlns:sys="using:System">
   <Design.PreviewWith>
     <Border Margin="20" Width="400" Height="600">
       <DockPanel LastChildFill="True">
diff --git a/src/Avalonia.Themes.Fluent/Controls/SplitButton.xaml b/src/Avalonia.Themes.Fluent/Controls/SplitButton.xaml
index 9a93b2625b..1a7e72462a 100644
--- a/src/Avalonia.Themes.Fluent/Controls/SplitButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/SplitButton.xaml
@@ -1,6 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        x:CompileBindings="True"
         xmlns:converters="using:Avalonia.Controls.Converters">
   <Design.PreviewWith>
     <Border Padding="60">
diff --git a/src/Avalonia.Themes.Fluent/Controls/TabItem.xaml b/src/Avalonia.Themes.Fluent/Controls/TabItem.xaml
index c8376480d0..b11ad4e03a 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TabItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TabItem.xaml
@@ -1,7 +1,6 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    x:CompileBindings="True">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Design.PreviewWith>
     <Border Padding="20">
       <StackPanel Spacing="20">
diff --git a/src/Avalonia.Themes.Fluent/Controls/TabStripItem.xaml b/src/Avalonia.Themes.Fluent/Controls/TabStripItem.xaml
index fab8ba87aa..d5440025ae 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TabStripItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TabStripItem.xaml
@@ -1,7 +1,6 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    x:CompileBindings="True">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Design.PreviewWith>
     <Border Padding="20">
       <StackPanel Spacing="20">
diff --git a/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml b/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
index 224264b51d..c6da9f72a3 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
@@ -1,6 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    x:CompileBindings="True">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Design.PreviewWith>
     <Border Padding="20">
       <StackPanel Spacing="20">
@@ -240,7 +239,7 @@
             <Panel>
               <PathIcon Data="{StaticResource PasswordBoxRevealButtonData}"
                         Height="8" Width="12"
-                        IsVisible="{Binding $parent[ToggleButton].!IsChecked}"/>
+                        IsVisible="{Binding !$parent[ToggleButton].IsChecked}"/>
               <PathIcon Data="{StaticResource PasswordBoxHideButtonData}"
                         Height="12" Width="12"
                         IsVisible="{Binding $parent[ToggleButton].IsChecked}"/>
diff --git a/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml b/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml
index 2414ce096e..71ff0eaebc 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml
@@ -7,8 +7,7 @@
 
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:sys="clr-namespace:System;assembly=netstandard"
-        x:CompileBindings="True">
+        xmlns:sys="using:System">
   <Design.PreviewWith>
     <Border Padding="20" Height="500">
       <StackPanel Spacing="20" VerticalAlignment="Center">
diff --git a/src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml b/src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml
index 90993fcc64..c88839f7d2 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml
@@ -1,7 +1,6 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sys="clr-namespace:System;assembly=netstandard">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Design.PreviewWith>
     <StackPanel Margin="20" Width="250" Spacing="24">
       <StackPanel Spacing="12" >
diff --git a/src/Avalonia.Themes.Fluent/Controls/ToolTip.xaml b/src/Avalonia.Themes.Fluent/Controls/ToolTip.xaml
index bc9dceb545..8b086a8d10 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ToolTip.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ToolTip.xaml
@@ -1,7 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:sys="clr-namespace:System;assembly=netstandard"
-                    x:CompileBindings="True">
+                    xmlns:sys="using:System">
   <Design.PreviewWith>
     <Border Padding="20">
       <StackPanel Spacing="20">
diff --git a/src/Avalonia.Themes.Fluent/Controls/TreeViewItem.xaml b/src/Avalonia.Themes.Fluent/Controls/TreeViewItem.xaml
index 83abe7848c..9171791a0f 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TreeViewItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TreeViewItem.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:converters="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls">
+        xmlns:converters="using:Avalonia.Controls.Converters">
 
   <Design.PreviewWith>
     <Border Padding="20"
diff --git a/src/Avalonia.Themes.Fluent/Controls/WindowNotificationManager.xaml b/src/Avalonia.Themes.Fluent/Controls/WindowNotificationManager.xaml
index 77f49941f0..e4cd0b25a6 100644
--- a/src/Avalonia.Themes.Fluent/Controls/WindowNotificationManager.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/WindowNotificationManager.xaml
@@ -1,6 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    x:CompileBindings="True"
                     x:DataType="WindowNotificationManager">
   <ControlTheme x:Key="{x:Type WindowNotificationManager}" TargetType="WindowNotificationManager">
     <Setter Property="Margin" Value="0 0" />
diff --git a/src/Avalonia.Themes.Fluent/FluentDark.xaml b/src/Avalonia.Themes.Fluent/FluentDark.xaml
index 50b12efd78..aad71b18fa 100644
--- a/src/Avalonia.Themes.Fluent/FluentDark.xaml
+++ b/src/Avalonia.Themes.Fluent/FluentDark.xaml
@@ -1,6 +1,6 @@
 <Styles xmlns="https://github.com/avaloniaui"
        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-       xmlns:sys="clr-namespace:System;assembly=netstandard">
+       xmlns:sys="using:System">
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/AccentColors.xaml" />
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/BaseDark.xaml" />
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/Base.xaml" />
diff --git a/src/Avalonia.Themes.Fluent/FluentLight.xaml b/src/Avalonia.Themes.Fluent/FluentLight.xaml
index feb043c5f3..907efe7ee6 100644
--- a/src/Avalonia.Themes.Fluent/FluentLight.xaml
+++ b/src/Avalonia.Themes.Fluent/FluentLight.xaml
@@ -1,6 +1,6 @@
 <Styles xmlns="https://github.com/avaloniaui"
        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-       xmlns:sys="clr-namespace:System;assembly=netstandard">
+       xmlns:sys="using:System">
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/AccentColors.xaml" />
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/BaseLight.xaml" />
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/Base.xaml" />  
diff --git a/src/Avalonia.Themes.Simple/Controls/ButtonSpinner.xaml b/src/Avalonia.Themes.Simple/Controls/ButtonSpinner.xaml
index 9798e5290b..57d6eabea4 100644
--- a/src/Avalonia.Themes.Simple/Controls/ButtonSpinner.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/ButtonSpinner.xaml
@@ -1,6 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    x:CompileBindings="True">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
   <ControlTheme x:Key="SimpleButtonSpinnerRepeatButton"
                 BasedOn="{StaticResource {x:Type RepeatButton}}"
diff --git a/src/Avalonia.Themes.Simple/Controls/CalendarDatePicker.xaml b/src/Avalonia.Themes.Simple/Controls/CalendarDatePicker.xaml
index 724c317beb..a7c7b5f620 100644
--- a/src/Avalonia.Themes.Simple/Controls/CalendarDatePicker.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/CalendarDatePicker.xaml
@@ -7,8 +7,7 @@
 
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:sys="using:System"
-                    x:CompileBindings="True">
+                    xmlns:sys="using:System">
   <ControlTheme x:Key="{x:Type CalendarDatePicker}"
                 TargetType="CalendarDatePicker">
     <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
diff --git a/src/Avalonia.Themes.Simple/Controls/CalendarItem.xaml b/src/Avalonia.Themes.Simple/Controls/CalendarItem.xaml
index 2a9ae7cf8d..f022746bf5 100644
--- a/src/Avalonia.Themes.Simple/Controls/CalendarItem.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/CalendarItem.xaml
@@ -162,7 +162,7 @@
       </ControlTemplate>
     </Setter>
     <Setter Property="DayTitleTemplate">
-      <Template>
+      <Template x:DataType="x:String">
         <TextBlock Margin="0,4,0,4"
                    HorizontalAlignment="Center"
                    VerticalAlignment="Center"
diff --git a/src/Avalonia.Themes.Simple/Controls/DatePicker.xaml b/src/Avalonia.Themes.Simple/Controls/DatePicker.xaml
index 30b7dc9ffa..5c57240aea 100644
--- a/src/Avalonia.Themes.Simple/Controls/DatePicker.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/DatePicker.xaml
@@ -7,8 +7,7 @@
 
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:sys="clr-namespace:System;assembly=netstandard"
-                    x:CompileBindings="True">
+                    xmlns:sys="using:System">
   <Design.PreviewWith>
     <Border Height="500"
             Padding="20">
diff --git a/src/Avalonia.Themes.Simple/Controls/DateTimePickerShared.xaml b/src/Avalonia.Themes.Simple/Controls/DateTimePickerShared.xaml
index 8639a2baa2..5f1dea692f 100644
--- a/src/Avalonia.Themes.Simple/Controls/DateTimePickerShared.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/DateTimePickerShared.xaml
@@ -6,9 +6,7 @@
 -->
 
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:sys="clr-namespace:System;assembly=netstandard"
-                    x:CompileBindings="True">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Design.PreviewWith>
     <Border Width="200"
             Padding="20">
diff --git a/src/Avalonia.Themes.Simple/Controls/ManagedFileChooser.xaml b/src/Avalonia.Themes.Simple/Controls/ManagedFileChooser.xaml
index 3416b5406e..f9cf162037 100644
--- a/src/Avalonia.Themes.Simple/Controls/ManagedFileChooser.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/ManagedFileChooser.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:dialogs="clr-namespace:Avalonia.Dialogs;assembly=Avalonia.Dialogs">
+                    xmlns:dialogs="using:Avalonia.Dialogs">
   <DrawingGroup x:Key="LevelUp">
     <GeometryDrawing Brush="#00FFFFFF" Geometry="F1M16,16L0,16 0,0 16,0z" />
     <GeometryDrawing Brush="#FFF6F6F6"
@@ -41,7 +41,7 @@
   <ControlTheme x:Key="{x:Type dialogs:ManagedFileChooser}"
                 TargetType="dialogs:ManagedFileChooser">
     <Setter Property="Template">
-      <ControlTemplate>
+      <ControlTemplate x:DataType="dialogs:ManagedFileChooserViewModel">
         <DockPanel>
           <DockPanel Margin="0,0,0,5"
                      DockPanel.Dock="Top">
diff --git a/src/Avalonia.Themes.Simple/Controls/NativeMenuBar.xaml b/src/Avalonia.Themes.Simple/Controls/NativeMenuBar.xaml
index 8c51ec8609..160acd5872 100644
--- a/src/Avalonia.Themes.Simple/Controls/NativeMenuBar.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/NativeMenuBar.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:default="clr-namespace:Avalonia.Themes.Simple">
+                    xmlns:default="using:Avalonia.Themes.Simple">
   <default:InverseBooleanValueConverter x:Key="AvaloniaThemesSimpleNativeMenuBarInverseBooleanValueConverter"
                                         Default="True" />
   <default:IBitmapToImageConverter x:Key="AvaloniaThemesSimpleNativeMenuBarIBitmapToImageConverter" />
@@ -11,16 +11,17 @@
         <Menu IsVisible="{Binding $parent[TopLevel].(NativeMenu.IsNativeMenuExported), Converter={StaticResource AvaloniaThemesSimpleNativeMenuBarInverseBooleanValueConverter}}"
               Items="{Binding $parent[TopLevel].(NativeMenu.Menu).Items}">
           <Menu.Styles>
+            <!-- Don't use x:DataType and compiled bindings here, as it might crash https://github.com/AvaloniaUI/Avalonia/pull/7954  -->
             <Style Selector="MenuItem">
-              <Setter Property="Header" Value="{Binding Header}" />
-              <Setter Property="IsEnabled" Value="{Binding IsEnabled}" />
-              <Setter Property="InputGesture" Value="{Binding Gesture}" />
-              <Setter Property="Items" Value="{Binding Menu.Items}" />
-              <Setter Property="Command" Value="{Binding Command}" />
-              <Setter Property="CommandParameter" Value="{Binding CommandParameter}" />
+              <Setter Property="Header" Value="{ReflectionBinding Header}" />
+              <Setter Property="IsEnabled" Value="{ReflectionBinding IsEnabled}" />
+              <Setter Property="InputGesture" Value="{ReflectionBinding Gesture}" />
+              <Setter Property="Items" Value="{ReflectionBinding Menu.Items}" />
+              <Setter Property="Command" Value="{ReflectionBinding Command}" />
+              <Setter Property="CommandParameter" Value="{ReflectionBinding CommandParameter}" />
               <Setter Property="(NativeMenuBar.EnableMenuItemClickForwarding)" Value="True" />
               <!--  NativeMenuItem is IBitmap and MenuItem is Image  -->
-              <Setter Property="Icon" Value="{Binding Icon, Converter={StaticResource AvaloniaThemesSimpleNativeMenuBarIBitmapToImageConverter}}" />
+              <Setter Property="Icon" Value="{ReflectionBinding Icon, Converter={StaticResource AvaloniaThemesSimpleNativeMenuBarIBitmapToImageConverter}}" />
             </Style>
           </Menu.Styles>
         </Menu>
diff --git a/src/Avalonia.Themes.Simple/Controls/ProgressBar.xaml b/src/Avalonia.Themes.Simple/Controls/ProgressBar.xaml
index 5adb5bde7e..3eb158d5b6 100644
--- a/src/Avalonia.Themes.Simple/Controls/ProgressBar.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/ProgressBar.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:converters="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls">
+                    xmlns:converters="using:Avalonia.Controls.Converters">
   <Design.PreviewWith>
     <Border Padding="20">
       <StackPanel Spacing="10">
diff --git a/src/Avalonia.Themes.Simple/Controls/SplitButton.xaml b/src/Avalonia.Themes.Simple/Controls/SplitButton.xaml
index f0d22aac97..3c621a981d 100644
--- a/src/Avalonia.Themes.Simple/Controls/SplitButton.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/SplitButton.xaml
@@ -1,6 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    x:CompileBindings="True"
                     xmlns:converters="using:Avalonia.Controls.Converters">
 
   <!-- This style is heavily based on the Fluent v1 style.
diff --git a/src/Avalonia.Themes.Simple/Controls/SplitView.xaml b/src/Avalonia.Themes.Simple/Controls/SplitView.xaml
index b0e4d0b096..d6f293a730 100644
--- a/src/Avalonia.Themes.Simple/Controls/SplitView.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/SplitView.xaml
@@ -34,8 +34,7 @@
     <!-- Left -->
     <Style Selector="^:left">
       <Setter Property="Template">
-        <ControlTemplate x:CompileBindings="True"
-                         TargetType="SplitView">
+        <ControlTemplate TargetType="SplitView">
           <Grid Name="Container"
                 Background="{TemplateBinding Background}">
             <Grid.ColumnDefinitions>
@@ -118,8 +117,7 @@
     <!-- Right -->
     <Style Selector="^:right">
       <Setter Property="Template">
-        <ControlTemplate TargetType="SplitView"
-                         x:CompileBindings="True">
+        <ControlTemplate TargetType="SplitView">
           <Grid Name="Container" Background="{TemplateBinding Background}">
             <Grid.ColumnDefinitions>
               <ColumnDefinition Width="*" />
diff --git a/src/Avalonia.Themes.Simple/Controls/TimePicker.xaml b/src/Avalonia.Themes.Simple/Controls/TimePicker.xaml
index ef37230a1f..58066bb9a5 100644
--- a/src/Avalonia.Themes.Simple/Controls/TimePicker.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/TimePicker.xaml
@@ -7,8 +7,7 @@
 
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:sys="clr-namespace:System;assembly=netstandard"
-                    x:CompileBindings="True">
+                    xmlns:sys="using:System">
   <Design.PreviewWith>
     <Border Height="500"
             Padding="20">
diff --git a/src/Avalonia.Themes.Simple/Controls/TreeViewItem.xaml b/src/Avalonia.Themes.Simple/Controls/TreeViewItem.xaml
index 8b3452244c..6ca3262419 100644
--- a/src/Avalonia.Themes.Simple/Controls/TreeViewItem.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/TreeViewItem.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:converters="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls">
+                    xmlns:converters="using:Avalonia.Controls.Converters">
   <converters:MarginMultiplierConverter x:Key="LeftMarginConverter"
                                         Indent="16"
                                         Left="True" />
diff --git a/tests/Avalonia.DesignerSupport.TestApp/MainWindow.xaml b/tests/Avalonia.DesignerSupport.TestApp/MainWindow.xaml
index f90e5beaa6..c113c2a9f7 100644
--- a/tests/Avalonia.DesignerSupport.TestApp/MainWindow.xaml
+++ b/tests/Avalonia.DesignerSupport.TestApp/MainWindow.xaml
@@ -1,5 +1,4 @@
 <Window xmlns="https://github.com/avaloniaui"
-        xmlns:pages="clr-namespace:ControlCatalog.Pages;assembly=ControlCatalog"
         Title="TESTAPP"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         x:Class="Avalonia.DesignerSupport.TestApp.MainWindow">

From 50efce1bf4334ba9c8ce03805ca93ed74859ab0d Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Tue, 15 Nov 2022 02:02:05 -0500
Subject: [PATCH 4/9] Fix selectors with template bindings

---
 .../AvaloniaXamlIlSelectorTransformer.cs             | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSelectorTransformer.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSelectorTransformer.cs
index 467dced080..ba0da4fbe0 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSelectorTransformer.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSelectorTransformer.cs
@@ -208,17 +208,9 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
                 if (node is XamlIlCombinatorSelector
                     {
                         SelectorType: XamlIlCombinatorSelector.CombinatorSelectorType.Template
-                    } templateSelector)
+                    })
                 {
-                    if (templateSelector.Previous is XamlIlNestingSelector nestingSelector)
-                    {
-                        return nestingSelector.TargetType;
-                    }
-                    if (templateSelector.Previous is XamlIlTypeSelector typeSelector)
-                    {
-                        return typeSelector.TargetType;
-                    }
-                    return null;
+                    return node.Previous.TargetType;
                 }
                 node = node.Previous;
             }

From de4415274e59b2e3181664212071d134ec9b58a8 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Tue, 15 Nov 2022 02:02:19 -0500
Subject: [PATCH 5/9] Fix devtools not making screenshots

---
 .../Screenshots/FilePickerHandler.cs          | 31 ++++++++-----------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/src/Avalonia.Diagnostics/Diagnostics/Screenshots/FilePickerHandler.cs b/src/Avalonia.Diagnostics/Diagnostics/Screenshots/FilePickerHandler.cs
index a4b56fcea1..501746ffb0 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Screenshots/FilePickerHandler.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/Screenshots/FilePickerHandler.cs
@@ -1,4 +1,5 @@
-using System.IO;
+using System;
+using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using Avalonia.Controls;
@@ -57,31 +58,25 @@ namespace Avalonia.Diagnostics.Screenshots
             return window!;
         }
 
-        protected async override Task<Stream?> GetStream(IControl control)
+        protected override async Task<Stream?> GetStream(IControl control)
         {
-            Stream? output = default;
             var result = await GetWindow(control).StorageProvider.SaveFilePickerAsync(new FilePickerSaveOptions
             {
                 SuggestedStartLocation = new BclStorageFolder(new DirectoryInfo(ScreenshotsRoot)),
                 Title = Title,
-                FileTypeChoices = new FilePickerFileType[] { new FilePickerFileType("PNG") { Patterns = new string[] { "*.png" } } }
+                FileTypeChoices = new FilePickerFileType[] { new FilePickerFileType("PNG") { Patterns = new string[] { "*.png" } } },
+                DefaultExtension = ".png"
             });
-
-            if (result!=null && !string.IsNullOrWhiteSpace(result.Name))
+            if (result is null)
+            {
+                return null;
+            }
+            if (!result.CanOpenWrite)
             {
-                var folder = Path.GetDirectoryName(result.Name);
-                // Directory information for path, or null if path denotes a root directory or is
-                // null. Returns System.String.Empty if path does not contain directory information.
-                if (!string.IsNullOrWhiteSpace(folder))
-                {
-                    if (!Directory.Exists(folder))
-                    {
-                        Directory.CreateDirectory(folder);
-                    }
-                    output = new FileStream(result.Name, FileMode.Create);
-                }
+                throw new InvalidOperationException("ReadOnly file was opened");
             }
-            return output;
+
+            return await result.OpenWriteAsync();
         }
     }
 }

From cb753b3a2b09762e13eb262c6012e121fa123107 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Tue, 15 Nov 2022 18:12:03 -0500
Subject: [PATCH 6/9] Move dialog details of implementation to the internal
 folder

---
 .../{ => Internal}/ChildFitter.cs                 |  4 +---
 .../{ => Internal}/FileSizeStringConverter.cs     |  6 ++----
 .../{ => Internal}/InternalViewModelBase.cs       |  0
 .../ManagedFileChooserFilterViewModel.cs          |  3 +--
 .../{ => Internal}/ManagedFileChooserItemType.cs  |  2 +-
 .../ManagedFileChooserItemViewModel.cs            |  3 +--
 .../ManagedFileChooserNavigationItem.cs           |  2 +-
 .../{ => Internal}/ManagedFileChooserSources.cs   |  5 +----
 .../{ => Internal}/ManagedFileChooserViewModel.cs |  3 +--
 .../{ => Internal}/ResourceSelectorConverter.cs   |  2 +-
 src/Avalonia.Dialogs/ManagedFileChooser.cs        |  1 +
 src/Avalonia.Dialogs/ManagedStorageProvider.cs    |  1 +
 .../Controls/ManagedFileChooser.xaml              | 13 +++++++------
 .../Controls/ManagedFileChooser.xaml              | 15 ++++++++-------
 14 files changed, 27 insertions(+), 33 deletions(-)
 rename src/Avalonia.Dialogs/{ => Internal}/ChildFitter.cs (85%)
 rename src/Avalonia.Dialogs/{ => Internal}/FileSizeStringConverter.cs (88%)
 rename src/Avalonia.Dialogs/{ => Internal}/InternalViewModelBase.cs (100%)
 rename src/Avalonia.Dialogs/{ => Internal}/ManagedFileChooserFilterViewModel.cs (93%)
 rename src/Avalonia.Dialogs/{ => Internal}/ManagedFileChooserItemType.cs (74%)
 rename src/Avalonia.Dialogs/{ => Internal}/ManagedFileChooserItemViewModel.cs (97%)
 rename src/Avalonia.Dialogs/{ => Internal}/ManagedFileChooserNavigationItem.cs (84%)
 rename src/Avalonia.Dialogs/{ => Internal}/ManagedFileChooserSources.cs (96%)
 rename src/Avalonia.Dialogs/{ => Internal}/ManagedFileChooserViewModel.cs (99%)
 rename src/Avalonia.Dialogs/{ => Internal}/ResourceSelectorConverter.cs (94%)

diff --git a/src/Avalonia.Dialogs/ChildFitter.cs b/src/Avalonia.Dialogs/Internal/ChildFitter.cs
similarity index 85%
rename from src/Avalonia.Dialogs/ChildFitter.cs
rename to src/Avalonia.Dialogs/Internal/ChildFitter.cs
index 4a6db62b32..10cc106d33 100644
--- a/src/Avalonia.Dialogs/ChildFitter.cs
+++ b/src/Avalonia.Dialogs/Internal/ChildFitter.cs
@@ -1,8 +1,6 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Layout;
 
-namespace Avalonia.Dialogs
+namespace Avalonia.Dialogs.Internal
 {
     public class ChildFitter : Decorator
     {
diff --git a/src/Avalonia.Dialogs/FileSizeStringConverter.cs b/src/Avalonia.Dialogs/Internal/FileSizeStringConverter.cs
similarity index 88%
rename from src/Avalonia.Dialogs/FileSizeStringConverter.cs
rename to src/Avalonia.Dialogs/Internal/FileSizeStringConverter.cs
index 144f50fd9c..0060c5e8b2 100644
--- a/src/Avalonia.Dialogs/FileSizeStringConverter.cs
+++ b/src/Avalonia.Dialogs/Internal/FileSizeStringConverter.cs
@@ -1,10 +1,8 @@
-using Avalonia.Data.Converters;
 using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Text;
+using Avalonia.Data.Converters;
 
-namespace Avalonia.Dialogs
+namespace Avalonia.Dialogs.Internal
 {
     public class FileSizeStringConverter : IValueConverter
     {
diff --git a/src/Avalonia.Dialogs/InternalViewModelBase.cs b/src/Avalonia.Dialogs/Internal/InternalViewModelBase.cs
similarity index 100%
rename from src/Avalonia.Dialogs/InternalViewModelBase.cs
rename to src/Avalonia.Dialogs/Internal/InternalViewModelBase.cs
diff --git a/src/Avalonia.Dialogs/ManagedFileChooserFilterViewModel.cs b/src/Avalonia.Dialogs/Internal/ManagedFileChooserFilterViewModel.cs
similarity index 93%
rename from src/Avalonia.Dialogs/ManagedFileChooserFilterViewModel.cs
rename to src/Avalonia.Dialogs/Internal/ManagedFileChooserFilterViewModel.cs
index ed594f78dc..534a25ba06 100644
--- a/src/Avalonia.Dialogs/ManagedFileChooserFilterViewModel.cs
+++ b/src/Avalonia.Dialogs/Internal/ManagedFileChooserFilterViewModel.cs
@@ -1,9 +1,8 @@
 using System.Linq;
 using System.Text.RegularExpressions;
-using Avalonia.Dialogs.Internal;
 using Avalonia.Platform.Storage;
 
-namespace Avalonia.Dialogs
+namespace Avalonia.Dialogs.Internal
 {
     public class ManagedFileChooserFilterViewModel : InternalViewModelBase
     {
diff --git a/src/Avalonia.Dialogs/ManagedFileChooserItemType.cs b/src/Avalonia.Dialogs/Internal/ManagedFileChooserItemType.cs
similarity index 74%
rename from src/Avalonia.Dialogs/ManagedFileChooserItemType.cs
rename to src/Avalonia.Dialogs/Internal/ManagedFileChooserItemType.cs
index 835e64a59a..aead2f19c7 100644
--- a/src/Avalonia.Dialogs/ManagedFileChooserItemType.cs
+++ b/src/Avalonia.Dialogs/Internal/ManagedFileChooserItemType.cs
@@ -1,4 +1,4 @@
-namespace Avalonia.Dialogs
+namespace Avalonia.Dialogs.Internal
 {
     public enum ManagedFileChooserItemType
     {
diff --git a/src/Avalonia.Dialogs/ManagedFileChooserItemViewModel.cs b/src/Avalonia.Dialogs/Internal/ManagedFileChooserItemViewModel.cs
similarity index 97%
rename from src/Avalonia.Dialogs/ManagedFileChooserItemViewModel.cs
rename to src/Avalonia.Dialogs/Internal/ManagedFileChooserItemViewModel.cs
index eabe270a44..69a4768f2b 100644
--- a/src/Avalonia.Dialogs/ManagedFileChooserItemViewModel.cs
+++ b/src/Avalonia.Dialogs/Internal/ManagedFileChooserItemViewModel.cs
@@ -1,7 +1,6 @@
 using System;
-using Avalonia.Dialogs.Internal;
 
-namespace Avalonia.Dialogs
+namespace Avalonia.Dialogs.Internal
 {
     public class ManagedFileChooserItemViewModel : InternalViewModelBase
     {
diff --git a/src/Avalonia.Dialogs/ManagedFileChooserNavigationItem.cs b/src/Avalonia.Dialogs/Internal/ManagedFileChooserNavigationItem.cs
similarity index 84%
rename from src/Avalonia.Dialogs/ManagedFileChooserNavigationItem.cs
rename to src/Avalonia.Dialogs/Internal/ManagedFileChooserNavigationItem.cs
index 350ce84c3a..6c578367fb 100644
--- a/src/Avalonia.Dialogs/ManagedFileChooserNavigationItem.cs
+++ b/src/Avalonia.Dialogs/Internal/ManagedFileChooserNavigationItem.cs
@@ -1,4 +1,4 @@
-namespace Avalonia.Dialogs
+namespace Avalonia.Dialogs.Internal
 {
     public class ManagedFileChooserNavigationItem
     {
diff --git a/src/Avalonia.Dialogs/ManagedFileChooserSources.cs b/src/Avalonia.Dialogs/Internal/ManagedFileChooserSources.cs
similarity index 96%
rename from src/Avalonia.Dialogs/ManagedFileChooserSources.cs
rename to src/Avalonia.Dialogs/Internal/ManagedFileChooserSources.cs
index a76a84ba5a..2635cbe10e 100644
--- a/src/Avalonia.Dialogs/ManagedFileChooserSources.cs
+++ b/src/Avalonia.Dialogs/Internal/ManagedFileChooserSources.cs
@@ -2,13 +2,10 @@ using System;
 using System.Collections.ObjectModel;
 using System.IO;
 using System.Linq;
-using System.Reactive.Linq;
-using System.Runtime.InteropServices;
 using Avalonia.Controls.Platform;
-using Avalonia.Threading;
 using Avalonia.Utilities;
 
-namespace Avalonia.Dialogs
+namespace Avalonia.Dialogs.Internal
 {
     internal class ManagedFileChooserSources
     {
diff --git a/src/Avalonia.Dialogs/ManagedFileChooserViewModel.cs b/src/Avalonia.Dialogs/Internal/ManagedFileChooserViewModel.cs
similarity index 99%
rename from src/Avalonia.Dialogs/ManagedFileChooserViewModel.cs
rename to src/Avalonia.Dialogs/Internal/ManagedFileChooserViewModel.cs
index 164019d18c..31b7928d0d 100644
--- a/src/Avalonia.Dialogs/ManagedFileChooserViewModel.cs
+++ b/src/Avalonia.Dialogs/Internal/ManagedFileChooserViewModel.cs
@@ -8,11 +8,10 @@ using System.Runtime.InteropServices;
 using Avalonia.Collections;
 using Avalonia.Controls;
 using Avalonia.Controls.Platform;
-using Avalonia.Dialogs.Internal;
 using Avalonia.Platform.Storage;
 using Avalonia.Threading;
 
-namespace Avalonia.Dialogs
+namespace Avalonia.Dialogs.Internal
 {
     public class ManagedFileChooserViewModel : InternalViewModelBase
     {
diff --git a/src/Avalonia.Dialogs/ResourceSelectorConverter.cs b/src/Avalonia.Dialogs/Internal/ResourceSelectorConverter.cs
similarity index 94%
rename from src/Avalonia.Dialogs/ResourceSelectorConverter.cs
rename to src/Avalonia.Dialogs/Internal/ResourceSelectorConverter.cs
index c8226b98e4..a492dfed3a 100644
--- a/src/Avalonia.Dialogs/ResourceSelectorConverter.cs
+++ b/src/Avalonia.Dialogs/Internal/ResourceSelectorConverter.cs
@@ -3,7 +3,7 @@ using System.Globalization;
 using Avalonia.Controls;
 using Avalonia.Data.Converters;
 
-namespace Avalonia.Dialogs
+namespace Avalonia.Dialogs.Internal
 {
     public class ResourceSelectorConverter : ResourceDictionary, IValueConverter
     {
diff --git a/src/Avalonia.Dialogs/ManagedFileChooser.cs b/src/Avalonia.Dialogs/ManagedFileChooser.cs
index 12436680b3..915f1e9508 100644
--- a/src/Avalonia.Dialogs/ManagedFileChooser.cs
+++ b/src/Avalonia.Dialogs/ManagedFileChooser.cs
@@ -4,6 +4,7 @@ using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
+using Avalonia.Dialogs.Internal;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.LogicalTree;
diff --git a/src/Avalonia.Dialogs/ManagedStorageProvider.cs b/src/Avalonia.Dialogs/ManagedStorageProvider.cs
index 37d2781692..2c88251cca 100644
--- a/src/Avalonia.Dialogs/ManagedStorageProvider.cs
+++ b/src/Avalonia.Dialogs/ManagedStorageProvider.cs
@@ -5,6 +5,7 @@ using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using Avalonia.Controls;
+using Avalonia.Dialogs.Internal;
 using Avalonia.Platform.Storage;
 using Avalonia.Platform.Storage.FileIO;
 
diff --git a/src/Avalonia.Themes.Fluent/Controls/ManagedFileChooser.xaml b/src/Avalonia.Themes.Fluent/Controls/ManagedFileChooser.xaml
index cca7d3d1cd..d1707d0af2 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ManagedFileChooser.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ManagedFileChooser.xaml
@@ -1,6 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:dialogs="using:Avalonia.Dialogs">
+        xmlns:dialogs="using:Avalonia.Dialogs"
+        xmlns:internal="using:Avalonia.Dialogs.Internal">
   <Design.PreviewWith>
     <Border Padding="20" Width="800" Height="500">
       <dialogs:ManagedFileChooser/>
@@ -23,7 +24,7 @@
           <GeometryDrawing Brush="#FF00529C" Geometry="F1M8,11L5,8 2,11 2,13 4,11 4,15 6,15 6,11 8,13z" />
           <GeometryDrawing Brush="#FFF0EFF1" Geometry="F1M8.0001,1.9996L7.5001,3.0006 14.0001,3.0006 14.0001,1.9996z" />
         </DrawingGroup>
-        <dialogs:ResourceSelectorConverter x:Key="Icons">
+        <internal:ResourceSelectorConverter x:Key="Icons">
           <DrawingGroup x:Key="Icon_Folder">
             <GeometryDrawing Geometry="M 0 0 L 16 16"/>
             <GeometryDrawing Geometry="M 0 3 C 0,1 0,1 2,1 L 5 1 C 5.5,1 6,1 6.5,1.5 L 8 3 L 14 3 C 16,3 16,3 16,5
@@ -128,11 +129,11 @@
             </GeometryDrawing>
             <GeometryDrawing Geometry="M 3.23483495705 9.76516504295 A 0.375,0.375 180 1 0 3.76516504295,9.23483495705 A 0.4375,0.4375 135 0 1 3.23483495705,9.76516504295 Z" Brush="#FF00B300"/>
           </DrawingGroup>
-        </dialogs:ResourceSelectorConverter>
+        </internal:ResourceSelectorConverter>
       </ResourceDictionary>
     </ControlTheme.Resources>
     <Setter Property="Template"
-            x:DataType="dialogs:ManagedFileChooserViewModel">
+            x:DataType="internal:ManagedFileChooserViewModel">
       <ControlTemplate>
         <DockPanel>
           <ListBox x:Name="PART_QuickLinks" DockPanel.Dock="Left" Items="{Binding QuickLinks}" SelectedIndex="{Binding QuickLinksSelectedIndex}" Focusable="False">
@@ -223,7 +224,7 @@
                 Background="Transparent"
                 ScrollViewer.HorizontalScrollBarVisibility="Disabled">
               <ListBox.ItemTemplate>
-                <DataTemplate x:DataType="dialogs:ManagedFileChooserItemViewModel">
+                <DataTemplate x:DataType="internal:ManagedFileChooserItemViewModel">
                   <Grid Background="Transparent">
                     <Grid.ColumnDefinitions>
                       <ColumnDefinition SharedSizeGroup="Icon" />
@@ -248,7 +249,7 @@
                       <TextBlock.Text>
                         <Binding Path="Size">
                           <Binding.Converter>
-                            <dialogs:FileSizeStringConverter/>
+                            <internal:FileSizeStringConverter/>
                           </Binding.Converter>
                         </Binding>
                       </TextBlock.Text>
diff --git a/src/Avalonia.Themes.Simple/Controls/ManagedFileChooser.xaml b/src/Avalonia.Themes.Simple/Controls/ManagedFileChooser.xaml
index f9cf162037..61dae9b445 100644
--- a/src/Avalonia.Themes.Simple/Controls/ManagedFileChooser.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/ManagedFileChooser.xaml
@@ -1,6 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:dialogs="using:Avalonia.Dialogs">
+                    xmlns:dialogs="using:Avalonia.Dialogs"
+                    xmlns:internal="using:Avalonia.Dialogs.Internal">
   <DrawingGroup x:Key="LevelUp">
     <GeometryDrawing Brush="#00FFFFFF" Geometry="F1M16,16L0,16 0,0 16,0z" />
     <GeometryDrawing Brush="#FFF6F6F6"
@@ -10,7 +11,7 @@
     <GeometryDrawing Brush="#FF00529C" Geometry="F1M8,11L5,8 2,11 2,13 4,11 4,15 6,15 6,11 8,13z" />
     <GeometryDrawing Brush="#FFF0EFF1" Geometry="F1M8.0001,1.9996L7.5001,3.0006 14.0001,3.0006 14.0001,1.9996z" />
   </DrawingGroup>
-  <dialogs:ResourceSelectorConverter x:Key="Icons">
+  <internal:ResourceSelectorConverter x:Key="Icons">
     <DrawingGroup x:Key="Icon_Folder">
       <GeometryDrawing Brush="#00FFFFFF" Geometry="F1M0,0L16,0 16,16 0,16z" />
       <GeometryDrawing Brush="#FFF6F6F6"
@@ -36,23 +37,23 @@
       <GeometryDrawing Brush="#FF424242"
                        Geometry="F1M13,7L12,7 12,8 13,8z M11,7L10,7 10,8 11,8z M2,10L14,10 14,6.5C14,6.224,13.775,6,13.5,6L2.5,6C2.224,6,2,6.224,2,6.5z M15,11L1,11 1,6.5C1,5.673,1.673,5,2.5,5L13.5,5C14.327,5,15,5.673,15,6.5z" />
     </DrawingGroup>
-  </dialogs:ResourceSelectorConverter>
+  </internal:ResourceSelectorConverter>
 
   <ControlTheme x:Key="{x:Type dialogs:ManagedFileChooser}"
                 TargetType="dialogs:ManagedFileChooser">
     <Setter Property="Template">
-      <ControlTemplate x:DataType="dialogs:ManagedFileChooserViewModel">
+      <ControlTemplate x:DataType="internal:ManagedFileChooserViewModel">
         <DockPanel>
           <DockPanel Margin="0,0,0,5"
                      DockPanel.Dock="Top">
-            <dialogs:ChildFitter Width="{Binding ElementName=Location, Path=Bounds.Height}"
+            <internal:ChildFitter Width="{Binding ElementName=Location, Path=Bounds.Height}"
                                  DockPanel.Dock="Right">
               <Button Command="{Binding GoUp}">
                 <Image Stretch="Fill">
                   <DrawingImage Drawing="{StaticResource LevelUp}" />
                 </Image>
               </Button>
-            </dialogs:ChildFitter>
+            </internal:ChildFitter>
             <TextBox x:Name="Location"
                      Margin="0,0,5,0"
                      Text="{Binding Location}">
@@ -179,7 +180,7 @@
                       <TextBlock.Text>
                         <Binding Path="Size">
                           <Binding.Converter>
-                            <dialogs:FileSizeStringConverter />
+                            <internal:FileSizeStringConverter />
                           </Binding.Converter>
                         </Binding>
                       </TextBlock.Text>

From 8e1a878e83b63af32cf0e87bc9dc220ff16b4ef0 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Tue, 15 Nov 2022 18:59:49 -0500
Subject: [PATCH 7/9] Some devtools fixes

---
 .../Diagnostics/Screenshots/BaseRenderToStreamHandler.cs       | 3 +--
 .../Diagnostics/ViewModels/TreePageViewModel.cs                | 2 +-
 .../Diagnostics/Views/ControlDetailsView.xaml.cs               | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Avalonia.Diagnostics/Diagnostics/Screenshots/BaseRenderToStreamHandler.cs b/src/Avalonia.Diagnostics/Diagnostics/Screenshots/BaseRenderToStreamHandler.cs
index c111b045d3..e80f176258 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Screenshots/BaseRenderToStreamHandler.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/Screenshots/BaseRenderToStreamHandler.cs
@@ -8,9 +8,8 @@ namespace Avalonia.Diagnostics.Screenshots
     /// </summary>
     public abstract class BaseRenderToStreamHandler : IScreenshotHandler
     {
-
         /// <summary>
-        /// Get stream
+        /// Get stream to write a screenshot to.
         /// </summary>
         /// <param name="control"></param>
         /// <returns>stream to render the control</returns>
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreePageViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreePageViewModel.cs
index 0cb2e388f7..ff3361dc41 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreePageViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreePageViewModel.cs
@@ -32,7 +32,7 @@ namespace Avalonia.Diagnostics.ViewModels
         public TreeNode? SelectedNode
         {
             get => _selectedNode;
-            private set
+            set
             {
                 if (RaiseAndSetIfChanged(ref _selectedNode, value))
                 {
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml.cs b/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml.cs
index 7e8ffa76cd..ecf907b980 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml.cs
@@ -30,7 +30,7 @@ namespace Avalonia.Diagnostics.Views
             
         }
 
-        private void PropertyNamePressed(object sender, PointerPressedEventArgs e)
+        public void PropertyNamePressed(object sender, PointerPressedEventArgs e)
         {
             var mainVm = (ControlDetailsViewModel?) DataContext;
 

From 0992c3e6d44a196a855ed8944dda10845c7420e6 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Tue, 15 Nov 2022 23:18:50 -0500
Subject: [PATCH 8/9] Rename AvaloniaDialogsInternalViewModelBase

---
 ...ModelBase.cs => AvaloniaDialogsInternalViewModelBase.cs} | 6 +++---
 .../Internal/ManagedFileChooserFilterViewModel.cs           | 2 +-
 .../Internal/ManagedFileChooserItemViewModel.cs             | 2 +-
 .../Internal/ManagedFileChooserViewModel.cs                 | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename src/Avalonia.Dialogs/Internal/{InternalViewModelBase.cs => AvaloniaDialogsInternalViewModelBase.cs} (67%)

diff --git a/src/Avalonia.Dialogs/Internal/InternalViewModelBase.cs b/src/Avalonia.Dialogs/Internal/AvaloniaDialogsInternalViewModelBase.cs
similarity index 67%
rename from src/Avalonia.Dialogs/Internal/InternalViewModelBase.cs
rename to src/Avalonia.Dialogs/Internal/AvaloniaDialogsInternalViewModelBase.cs
index 2c73358bb8..474f8ebd58 100644
--- a/src/Avalonia.Dialogs/Internal/InternalViewModelBase.cs
+++ b/src/Avalonia.Dialogs/Internal/AvaloniaDialogsInternalViewModelBase.cs
@@ -4,11 +4,11 @@ using System.Runtime.CompilerServices;
 
 namespace Avalonia.Dialogs.Internal
 {
-    public class InternalViewModelBase : INotifyPropertyChanged
+    public class AvaloniaDialogsInternalViewModelBase : INotifyPropertyChanged
     {
         public event PropertyChangedEventHandler PropertyChanged;
 
-        protected bool RaiseAndSetIfChanged<T>(ref T field, T value, [CallerMemberName] string propertyName = null)
+        internal protected bool RaiseAndSetIfChanged<T>(ref T field, T value, [CallerMemberName] string propertyName = null)
         {
             if (!EqualityComparer<T>.Default.Equals(field, value))
             {
@@ -20,7 +20,7 @@ namespace Avalonia.Dialogs.Internal
             return false;
         }
 
-        protected void RaisePropertyChanged([CallerMemberName] string propertyName = null)
+        internal protected void RaisePropertyChanged([CallerMemberName] string propertyName = null)
         {
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
diff --git a/src/Avalonia.Dialogs/Internal/ManagedFileChooserFilterViewModel.cs b/src/Avalonia.Dialogs/Internal/ManagedFileChooserFilterViewModel.cs
index 534a25ba06..8389a25386 100644
--- a/src/Avalonia.Dialogs/Internal/ManagedFileChooserFilterViewModel.cs
+++ b/src/Avalonia.Dialogs/Internal/ManagedFileChooserFilterViewModel.cs
@@ -4,7 +4,7 @@ using Avalonia.Platform.Storage;
 
 namespace Avalonia.Dialogs.Internal
 {
-    public class ManagedFileChooserFilterViewModel : InternalViewModelBase
+    public class ManagedFileChooserFilterViewModel : AvaloniaDialogsInternalViewModelBase
     {
         private readonly Regex[] _patterns;
         public string Name { get; }
diff --git a/src/Avalonia.Dialogs/Internal/ManagedFileChooserItemViewModel.cs b/src/Avalonia.Dialogs/Internal/ManagedFileChooserItemViewModel.cs
index 69a4768f2b..be1c2f6bed 100644
--- a/src/Avalonia.Dialogs/Internal/ManagedFileChooserItemViewModel.cs
+++ b/src/Avalonia.Dialogs/Internal/ManagedFileChooserItemViewModel.cs
@@ -2,7 +2,7 @@ using System;
 
 namespace Avalonia.Dialogs.Internal
 {
-    public class ManagedFileChooserItemViewModel : InternalViewModelBase
+    public class ManagedFileChooserItemViewModel : AvaloniaDialogsInternalViewModelBase
     {
         private string _displayName;
         private string _path;
diff --git a/src/Avalonia.Dialogs/Internal/ManagedFileChooserViewModel.cs b/src/Avalonia.Dialogs/Internal/ManagedFileChooserViewModel.cs
index 31b7928d0d..7d0072c6ea 100644
--- a/src/Avalonia.Dialogs/Internal/ManagedFileChooserViewModel.cs
+++ b/src/Avalonia.Dialogs/Internal/ManagedFileChooserViewModel.cs
@@ -13,7 +13,7 @@ using Avalonia.Threading;
 
 namespace Avalonia.Dialogs.Internal
 {
-    public class ManagedFileChooserViewModel : InternalViewModelBase
+    public class ManagedFileChooserViewModel : AvaloniaDialogsInternalViewModelBase
     {
         private readonly ManagedFileDialogOptions _options;
         public event Action CancelRequested;

From b0618d1057452d06c9be381b2b8ed78990d79846 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Wed, 16 Nov 2022 02:47:06 -0500
Subject: [PATCH 9/9] Try to fix unit test

---
 samples/ControlCatalog/MainWindow.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/ControlCatalog/MainWindow.xaml b/samples/ControlCatalog/MainWindow.xaml
index 0138104884..cebb3e0916 100644
--- a/samples/ControlCatalog/MainWindow.xaml
+++ b/samples/ControlCatalog/MainWindow.xaml
@@ -5,7 +5,7 @@
         Icon="/Assets/test_icon.ico"
         xmlns:local="using:ControlCatalog"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:vm="using:ControlCatalog.ViewModels"
+        xmlns:vm="clr-namespace:ControlCatalog.ViewModels;assembly=ControlCatalog"
         xmlns:v="using:ControlCatalog.Views"
         ExtendClientAreaToDecorationsHint="{Binding ExtendClientAreaEnabled}"
         ExtendClientAreaChromeHints="{Binding ChromeHints}"