diff --git a/build/SourceLink.props b/build/SourceLink.props
index 1e007e01eb7..9f058488812 100644
--- a/build/SourceLink.props
+++ b/build/SourceLink.props
@@ -3,7 +3,6 @@
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <IncludeSymbols>false</IncludeSymbols>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
-    <DebugType>embedded</DebugType>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
   </PropertyGroup>
   
@@ -15,6 +14,10 @@
     <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
   </PropertyGroup>
   
+  <PropertyGroup>
+    <DebugType Condition="$(ContinuousIntegrationBuild) == 'true'">embedded</DebugType>
+  </PropertyGroup>
+  
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
   </ItemGroup>
diff --git a/samples/ControlCatalog/App.xaml b/samples/ControlCatalog/App.xaml
index 227b31bf202..d0e1bd885e4 100644
--- a/samples/ControlCatalog/App.xaml
+++ b/samples/ControlCatalog/App.xaml
@@ -3,6 +3,7 @@
              xmlns:vm="using:ControlCatalog.ViewModels"
              x:DataType="vm:ApplicationViewModel"
              x:CompileBindings="True"
+             Name="Avalonia ControlCatalog"
              x:Class="ControlCatalog.App">
   <Application.Styles>
     <Style Selector="TextBlock.h1, TextBlock.h2, TextBlock.h3">
diff --git a/samples/ControlCatalog/App.xaml.cs b/samples/ControlCatalog/App.xaml.cs
index 505f486a6dc..f6d382f99dc 100644
--- a/samples/ControlCatalog/App.xaml.cs
+++ b/samples/ControlCatalog/App.xaml.cs
@@ -5,6 +5,7 @@
 using Avalonia.Markup.Xaml;
 using Avalonia.Markup.Xaml.Styling;
 using Avalonia.Styling;
+using Avalonia.Themes.Default;
 using Avalonia.Themes.Fluent;
 using ControlCatalog.ViewModels;
 
@@ -29,6 +30,8 @@ public App()
 
         public static FluentTheme Fluent = new FluentTheme(new Uri("avares://ControlCatalog/Styles"));
 
+        public static SimpleTheme Default = new SimpleTheme(new Uri("avares://ControlCatalog/Styles"));
+
         public static Styles DefaultLight = new Styles
         {
             new StyleInclude(new Uri("resm:Styles?assembly=ControlCatalog"))
@@ -43,14 +46,7 @@ public App()
             {
                 Source = new Uri("avares://Avalonia.Themes.Fluent/Accents/BaseLight.xaml")
             },
-            new StyleInclude(new Uri("resm:Styles?assembly=ControlCatalog"))
-            {
-                Source = new Uri("avares://Avalonia.Themes.Default/Accents/BaseLight.xaml")
-            },
-            new StyleInclude(new Uri("resm:Styles?assembly=ControlCatalog"))
-            {
-                Source = new Uri("avares://Avalonia.Themes.Default/DefaultTheme.xaml")
-            }
+            Default
         };
 
         public static Styles DefaultDark = new Styles
@@ -67,14 +63,7 @@ public App()
             {
                 Source = new Uri("avares://Avalonia.Themes.Fluent/Accents/BaseDark.xaml")
             },
-            new StyleInclude(new Uri("resm:Styles?assembly=ControlCatalog"))
-            {
-                Source = new Uri("avares://Avalonia.Themes.Default/Accents/BaseDark.xaml")
-            },
-            new StyleInclude(new Uri("resm:Styles?assembly=ControlCatalog"))
-            {
-                Source = new Uri("avares://Avalonia.Themes.Default/DefaultTheme.xaml")
-            }
+            Default
         };
 
         public override void Initialize()
diff --git a/samples/ControlCatalog/MainView.xaml.cs b/samples/ControlCatalog/MainView.xaml.cs
index 05793558310..79cf07c8d9b 100644
--- a/samples/ControlCatalog/MainView.xaml.cs
+++ b/samples/ControlCatalog/MainView.xaml.cs
@@ -63,11 +63,13 @@ public MainView()
                     }
                     else if (theme == CatalogTheme.DefaultLight)
                     {
+                        App.Default.Mode = Avalonia.Themes.Default.SimpleThemeMode.Light;
                         Application.Current.Styles[0] = App.DefaultLight;
                         Application.Current.Styles[1] = App.DataGridDefault;
                     }
                     else if (theme == CatalogTheme.DefaultDark)
                     {
+                        App.Default.Mode = Avalonia.Themes.Default.SimpleThemeMode.Dark;
                         Application.Current.Styles[0] = App.DefaultDark;
                         Application.Current.Styles[1] = App.DataGridDefault;
                     }
diff --git a/samples/ControlCatalog/Models/Person.cs b/samples/ControlCatalog/Models/Person.cs
index 47f41bc584b..cd70fa39594 100644
--- a/samples/ControlCatalog/Models/Person.cs
+++ b/samples/ControlCatalog/Models/Person.cs
@@ -16,6 +16,7 @@ public class Person : INotifyDataErrorInfo, INotifyPropertyChanged
         string _firstName;
         string _lastName;
         bool _isBanned;
+        private int _age;
 
         public string FirstName
         {
@@ -59,6 +60,20 @@ public bool IsBanned
             }
         }
 
+        
+        /// <summary>
+        ///    Gets or sets the age of the person
+        /// </summary>
+        public int Age
+        {
+            get => _age;
+            set
+            {
+                _age = value;
+                OnPropertyChanged(nameof(Age));
+            }
+        }
+
         Dictionary<string, List<string>> _errorLookup = new Dictionary<string, List<string>>();
 
         void SetError(string propertyName, string error)
diff --git a/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml b/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml
index 3e50bf8a08a..2fe16ba8e32 100644
--- a/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml
+++ b/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml
@@ -1,5 +1,7 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:vm="clr-namespace:ControlCatalog.ViewModels"
+             x:DataType="vm:MainWindowViewModel"
              x:Class="ControlCatalog.Pages.CalendarDatePickerPage">
   <StackPanel Orientation="Vertical" Spacing="4">
     <TextBlock Classes="h2">A control for selecting dates with a calendar drop-down</TextBlock>
@@ -39,6 +41,9 @@
                 
         <TextBlock Text="Disabled"/>
         <CalendarDatePicker IsEnabled="False"/>
+        
+        <TextBlock Text="Validation Example"/>
+        <CalendarDatePicker SelectedDate="{CompiledBinding ValidatedDateExample, Mode=TwoWay}"/>
       </StackPanel>
 
     </StackPanel> 
diff --git a/samples/ControlCatalog/Pages/DataGridPage.xaml b/samples/ControlCatalog/Pages/DataGridPage.xaml
index 63e873d9b50..f7e3cf2441d 100644
--- a/samples/ControlCatalog/Pages/DataGridPage.xaml
+++ b/samples/ControlCatalog/Pages/DataGridPage.xaml
@@ -64,6 +64,18 @@
               <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}" />
+              <DataGridTemplateColumn Header="Age" >
+                <DataGridTemplateColumn.CellTemplate>
+                  <DataTemplate DataType="local:Person">
+                    <TextBlock Text="{Binding Age, StringFormat='{}{0} years'}" VerticalAlignment="Center" HorizontalAlignment="Center" />
+                  </DataTemplate>
+                </DataGridTemplateColumn.CellTemplate>
+                <DataGridTemplateColumn.CellEditingTemplate>
+                  <DataTemplate DataType="local:Person">
+                    <NumericUpDown Value="{Binding Age}" FormatString="N0" HorizontalAlignment="Stretch" Minimum="0" Maximum="120" TemplateApplied="NumericUpDown_OnTemplateApplied" />
+                  </DataTemplate>
+                </DataGridTemplateColumn.CellEditingTemplate>
+              </DataGridTemplateColumn>
             </DataGrid.Columns>
           </DataGrid>
           <Button Grid.Row="1" Name="btnAdd" Margin="12,0,12,12" Content="Add" HorizontalAlignment="Right" />
diff --git a/samples/ControlCatalog/Pages/DataGridPage.xaml.cs b/samples/ControlCatalog/Pages/DataGridPage.xaml.cs
index dc5cc49a902..c010d38eac6 100644
--- a/samples/ControlCatalog/Pages/DataGridPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/DataGridPage.xaml.cs
@@ -6,7 +6,9 @@
 using Avalonia.Markup.Xaml;
 using ControlCatalog.Models;
 using Avalonia.Collections;
+using Avalonia.Controls.Primitives;
 using Avalonia.Data;
+using Avalonia.Threading;
 
 namespace ControlCatalog.Pages
 {
@@ -48,9 +50,9 @@ public DataGridPage()
 
             var items = new List<Person>
             {
-                new Person { FirstName = "John", LastName = "Doe" },
-                new Person { FirstName = "Elizabeth", LastName = "Thomas", IsBanned = true },
-                new Person { FirstName = "Zack", LastName = "Ward" }
+                new Person { FirstName = "John", LastName = "Doe" , Age = 30},
+                new Person { FirstName = "Elizabeth", LastName = "Thomas", IsBanned = true , Age = 40 },
+                new Person { FirstName = "Zack", LastName = "Ward" , Age = 50 }
             };
             var collectionView3 = new DataGridCollectionView(items);
 
@@ -84,5 +86,19 @@ public int Compare(object x, object y)
                 return Comparer.Default.Compare(x, y);
             }
         }
+
+        private void NumericUpDown_OnTemplateApplied(object sender, TemplateAppliedEventArgs e)
+        {
+            // We want to focus the TextBox of the NumericUpDown. To do so we search for this control when the template
+            // is applied, but we postpone the action until the control is actually loaded. 
+            if (e.NameScope.Find<TextBox>("PART_TextBox") is {} textBox)
+            {
+                Dispatcher.UIThread.InvokeAsync(() =>
+                {
+                    textBox.Focus();
+                    textBox.SelectAll();
+                }, DispatcherPriority.Loaded);
+            }
+        }
     }
 }
diff --git a/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs b/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
index 4b3cfa9c9d0..2b0c30f3119 100644
--- a/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
@@ -5,6 +5,7 @@
 using Avalonia.Dialogs;
 using Avalonia.Platform;
 using System;
+using System.ComponentModel.DataAnnotations;
 using MiniMvvm;
 
 namespace ControlCatalog.ViewModels
@@ -164,5 +165,17 @@ public bool IsMenuItemChecked
         public MiniCommand ExitCommand { get; }
 
         public MiniCommand ToggleMenuItemCheckedCommand { get; }
+
+        private DateTime? _validatedDateExample;
+
+        /// <summary>
+        ///    A required DateTime which should demonstrate validation for the DateTimePicker
+        /// </summary>
+        [Required]
+        public DateTime? ValidatedDateExample
+        {
+            get => _validatedDateExample;
+            set => this.RaiseAndSetIfChanged(ref _validatedDateExample, value);
+        }
     }
 }
diff --git a/src/Avalonia.Animation/Animatable.cs b/src/Avalonia.Animation/Animatable.cs
index 4811028f853..50fc5ac73bf 100644
--- a/src/Avalonia.Animation/Animatable.cs
+++ b/src/Avalonia.Animation/Animatable.cs
@@ -157,7 +157,7 @@ _transitionState is object &&
                             state.Instance?.Dispose();
                             state.Instance = transition.Apply(
                                 this,
-                                Clock ?? AvaloniaLocator.Current.GetService<IGlobalClock>(),
+                                Clock ?? AvaloniaLocator.Current.GetRequiredService<IGlobalClock>(),
                                 oldValue,
                                 newValue);
                             return;
@@ -169,7 +169,7 @@ _transitionState is object &&
             base.OnPropertyChangedCore(change);
         }
 
-        private void TransitionsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        private void TransitionsCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
         {
             if (!_transitionsEnabled)
             {
@@ -179,14 +179,14 @@ private void TransitionsCollectionChanged(object sender, NotifyCollectionChanged
             switch (e.Action)
             {
                 case NotifyCollectionChangedAction.Add:
-                    AddTransitions(e.NewItems);
+                    AddTransitions(e.NewItems!);
                     break;
                 case NotifyCollectionChangedAction.Remove:
-                    RemoveTransitions(e.OldItems);
+                    RemoveTransitions(e.OldItems!);
                     break;
                 case NotifyCollectionChangedAction.Replace:
-                    RemoveTransitions(e.OldItems);
-                    AddTransitions(e.NewItems);
+                    RemoveTransitions(e.OldItems!);
+                    AddTransitions(e.NewItems!);
                     break;
                 case NotifyCollectionChangedAction.Reset:
                     throw new NotSupportedException("Transitions collection cannot be reset.");
@@ -204,7 +204,7 @@ private void AddTransitions(IList items)
 
             for (var i = 0; i < items.Count; ++i)
             {
-                var t = (ITransition)items[i];
+                var t = (ITransition)items[i]!;
 
                 _transitionState.Add(t, new TransitionState
                 {
@@ -222,7 +222,7 @@ private void RemoveTransitions(IList items)
 
             for (var i = 0; i < items.Count; ++i)
             {
-                var t = (ITransition)items[i];
+                var t = (ITransition)items[i]!;
 
                 if (_transitionState.TryGetValue(t, out var state))
                 {
diff --git a/src/Avalonia.Animation/Animation.cs b/src/Avalonia.Animation/Animation.cs
index a4515db5140..03b2d17e449 100644
--- a/src/Avalonia.Animation/Animation.cs
+++ b/src/Avalonia.Animation/Animation.cs
@@ -203,7 +203,7 @@ public string RepeatCount
         /// </summary>
         /// <param name="setter">The animation setter.</param>
         /// <returns>The property animator type.</returns>
-        public static Type GetAnimator(IAnimationSetter setter)
+        public static Type? GetAnimator(IAnimationSetter setter)
         {
             if (s_animators.TryGetValue(setter, out var type))
             {
@@ -254,7 +254,7 @@ public static void RegisterAnimator<TAnimator>(Func<AvaloniaProperty, bool> cond
             Animators.Insert(0, (condition, typeof(TAnimator)));
         }
 
-        private static Type GetAnimatorType(AvaloniaProperty property)
+        private static Type? GetAnimatorType(AvaloniaProperty property)
         {
             foreach (var (condition, type) in Animators)
             {
@@ -276,6 +276,11 @@ private static Type GetAnimatorType(AvaloniaProperty property)
             {
                 foreach (var setter in keyframe.Setters)
                 {
+                    if (setter.Property is null)
+                    {
+                        throw new InvalidOperationException("No Setter property assigned.");
+                    }
+
                     var handler = Animation.GetAnimator(setter) ?? GetAnimatorType(setter.Property);
 
                     if (handler == null)
@@ -305,7 +310,7 @@ private static Type GetAnimatorType(AvaloniaProperty property)
 
             foreach (var (handlerType, property) in handlerList)
             {
-                var newInstance = (IAnimator)Activator.CreateInstance(handlerType);
+                var newInstance = (IAnimator)Activator.CreateInstance(handlerType)!;
                 newInstance.Property = property;
                 newAnimatorInstances.Add(newInstance);
             }
@@ -321,32 +326,43 @@ private static Type GetAnimatorType(AvaloniaProperty property)
         }
 
         /// <inheritdoc/>
-        public IDisposable Apply(Animatable control, IClock clock, IObservable<bool> match, Action onComplete)
+        public IDisposable Apply(Animatable control, IClock? clock, IObservable<bool> match, Action? onComplete)
         {
             var (animators, subscriptions) = InterpretKeyframes(control);
             if (animators.Count == 1)
             {
-                subscriptions.Add(animators[0].Apply(this, control, clock, match, onComplete));
+                var subscription = animators[0].Apply(this, control, clock, match, onComplete);
+                
+                if (subscription is not null)
+                {
+                    subscriptions.Add(subscription);
+                }
             }
             else
             {
                 var completionTasks = onComplete != null ? new List<Task>() : null;
                 foreach (IAnimator animator in animators)
                 {
-                    Action animatorOnComplete = null;
+                    Action? animatorOnComplete = null;
                     if (onComplete != null)
                     {
-                        var tcs = new TaskCompletionSource<object>();
+                        var tcs = new TaskCompletionSource<object?>();
                         animatorOnComplete = () => tcs.SetResult(null);
-                        completionTasks.Add(tcs.Task);
+                        completionTasks!.Add(tcs.Task);
+                    }
+
+                    var subscription = animator.Apply(this, control, clock, match, animatorOnComplete);
+
+                    if (subscription is not null)
+                    {
+                        subscriptions.Add(subscription);
                     }
-                    subscriptions.Add(animator.Apply(this, control, clock, match, animatorOnComplete));
                 }
 
                 if (onComplete != null)
                 {
-                    Task.WhenAll(completionTasks).ContinueWith(
-                        (_, state) => ((Action)state).Invoke(),
+                    Task.WhenAll(completionTasks!).ContinueWith(
+                        (_, state) => ((Action)state!).Invoke(),
                         onComplete);
                 }
             }
@@ -354,25 +370,25 @@ public IDisposable Apply(Animatable control, IClock clock, IObservable<bool> mat
         }
 
         /// <inheritdoc/>
-        public Task RunAsync(Animatable control, IClock clock = null)
+        public Task RunAsync(Animatable control, IClock? clock = null)
         {
             return RunAsync(control, clock, default);
         }
 
         /// <inheritdoc/>
-        public Task RunAsync(Animatable control, IClock clock = null, CancellationToken cancellationToken = default)
+        public Task RunAsync(Animatable control, IClock? clock = null, CancellationToken cancellationToken = default)
         {
             if (cancellationToken.IsCancellationRequested)
             {
                 return Task.CompletedTask;
             }
 
-            var run = new TaskCompletionSource<object>();
+            var run = new TaskCompletionSource<object?>();
 
             if (this.IterationCount == IterationCount.Infinite)
                 run.SetException(new InvalidOperationException("Looping animations must not use the Run method."));
 
-            IDisposable subscriptions = null, cancellation = null;
+            IDisposable? subscriptions = null, cancellation = null;
             subscriptions = this.Apply(control, clock, Observable.Return(true), () =>
             {
                 run.TrySetResult(null);
diff --git a/src/Avalonia.Animation/AnimationInstance`1.cs b/src/Avalonia.Animation/AnimationInstance`1.cs
index cf796401500..52cd4b324f1 100644
--- a/src/Avalonia.Animation/AnimationInstance`1.cs
+++ b/src/Avalonia.Animation/AnimationInstance`1.cs
@@ -31,15 +31,15 @@ internal class AnimationInstance<T> : SingleSubscriberObservableBase<T>
         private TimeSpan _initialDelay;
         private TimeSpan _iterationDelay;
         private TimeSpan _duration;
-        private Easings.Easing _easeFunc;
-        private Action _onCompleteAction;
+        private Easings.Easing? _easeFunc;
+        private Action? _onCompleteAction;
         private Func<double, T, T> _interpolator;
-        private IDisposable _timerSub;
+        private IDisposable? _timerSub;
         private readonly IClock _baseClock;
-        private IClock _clock;
-        private EventHandler<AvaloniaPropertyChangedEventArgs> _propertyChangedDelegate;
+        private IClock? _clock;
+        private EventHandler<AvaloniaPropertyChangedEventArgs>? _propertyChangedDelegate;
 
-        public AnimationInstance(Animation animation, Animatable control, Animator<T> animator, IClock baseClock, Action OnComplete, Func<double, T, T> Interpolator)
+        public AnimationInstance(Animation animation, Animatable control, Animator<T> animator, IClock baseClock, Action? OnComplete, Func<double, T, T> Interpolator)
         {
             _animator = animator;
             _animation = animation;
@@ -47,6 +47,9 @@ public AnimationInstance(Animation animation, Animatable control, Animator<T> an
             _onCompleteAction = OnComplete;
             _interpolator = Interpolator;
             _baseClock = baseClock;
+            _lastInterpValue = default!;
+            _firstKFValue = default!;
+            _neutralValue = default!;
             FetchProperties();
         }
 
@@ -82,7 +85,7 @@ protected override void Unsubscribed()
 
             _targetControl.PropertyChanged -= _propertyChangedDelegate;
             _timerSub?.Dispose();
-            _clock.PlayState = PlayState.Stop;
+            _clock!.PlayState = PlayState.Stop;
         }
 
         protected override void Subscribed()
@@ -108,6 +111,8 @@ public void Step(TimeSpan frameTick)
 
         private void ApplyFinalFill()
         {
+            if (_animator.Property is null)
+                throw new InvalidOperationException("Animator has no property specified.");
             if (_fillMode == FillMode.Forward || _fillMode == FillMode.Both)
                 _targetControl.SetValue(_animator.Property, _lastInterpValue, BindingPriority.LocalValue);
         }
@@ -130,12 +135,12 @@ private void DoDelay()
 
         private void DoPlayStates()
         {
-            if (_clock.PlayState == PlayState.Stop || _baseClock.PlayState == PlayState.Stop)
+            if (_clock!.PlayState == PlayState.Stop || _baseClock.PlayState == PlayState.Stop)
                 DoComplete();
 
             if (!_gotFirstKFValue)
             {
-                _firstKFValue = (T)_animator.First().Value;
+                _firstKFValue = (T)_animator.First().Value!;
                 _gotFirstKFValue = true;
             }
         }
@@ -169,7 +174,7 @@ private void InternalStep(TimeSpan time)
                 // and snap the last iteration value to exact values.
                 if ((_currentIteration + 1) > _iterationCount)
                 {
-                    var easedTime = _easeFunc.Ease(_playbackReversed ? 0.0 : 1.0);
+                    var easedTime = _easeFunc!.Ease(_playbackReversed ? 0.0 : 1.0);
                     _lastInterpValue = _interpolator(easedTime, _neutralValue);
                     DoComplete();
                 }
@@ -203,7 +208,7 @@ private void InternalStep(TimeSpan time)
                         normalizedTime = 1 - normalizedTime;
 
                     // Ease and interpolate
-                    var easedTime = _easeFunc.Ease(normalizedTime);
+                    var easedTime = _easeFunc!.Ease(normalizedTime);
                     _lastInterpValue = _interpolator(easedTime, _neutralValue);
 
                     PublishNext(_lastInterpValue);
@@ -223,14 +228,14 @@ private void InternalStep(TimeSpan time)
 
         private void UpdateNeutralValue()
         {
-            var property = _animator.Property;
+            var property = _animator.Property ?? throw new InvalidOperationException("Animator has no property specified.");
             var baseValue = _targetControl.GetBaseValue(property, BindingPriority.LocalValue);
 
             _neutralValue = baseValue != AvaloniaProperty.UnsetValue ?
-                (T)baseValue : (T)_targetControl.GetValue(property);
+                (T)baseValue! : (T)_targetControl.GetValue(property)!;
         }
 
-        private void ControlPropertyChanged(object sender, AvaloniaPropertyChangedEventArgs e)
+        private void ControlPropertyChanged(object? sender, AvaloniaPropertyChangedEventArgs e)
         {
             if (e.Property == _animator.Property && e.Priority > BindingPriority.Animation)
             {
diff --git a/src/Avalonia.Animation/AnimatorKeyFrame.cs b/src/Avalonia.Animation/AnimatorKeyFrame.cs
index f6a0c12be45..8af31f2948e 100644
--- a/src/Avalonia.Animation/AnimatorKeyFrame.cs
+++ b/src/Avalonia.Animation/AnimatorKeyFrame.cs
@@ -12,22 +12,22 @@ namespace Avalonia.Animation
     /// </summary>
     public class AnimatorKeyFrame : AvaloniaObject
     {
-        public static readonly DirectProperty<AnimatorKeyFrame, object> ValueProperty =
-            AvaloniaProperty.RegisterDirect<AnimatorKeyFrame, object>(nameof(Value), k => k.Value, (k, v) => k.Value = v);
+        public static readonly DirectProperty<AnimatorKeyFrame, object?> ValueProperty =
+            AvaloniaProperty.RegisterDirect<AnimatorKeyFrame, object?>(nameof(Value), k => k.Value, (k, v) => k.Value = v);
 
         public AnimatorKeyFrame()
         {
 
         }
 
-        public AnimatorKeyFrame(Type animatorType, Cue cue)
+        public AnimatorKeyFrame(Type? animatorType, Cue cue)
         {
             AnimatorType = animatorType;
             Cue = cue;
             KeySpline = null;
         }
 
-        public AnimatorKeyFrame(Type animatorType, Cue cue, KeySpline keySpline)
+        public AnimatorKeyFrame(Type? animatorType, Cue cue, KeySpline? keySpline)
         {
             AnimatorType = animatorType;
             Cue = cue;
@@ -35,14 +35,14 @@ public AnimatorKeyFrame(Type animatorType, Cue cue, KeySpline keySpline)
         }
 
         internal bool isNeutral;
-        public Type AnimatorType { get; }
+        public Type? AnimatorType { get; }
         public Cue Cue { get; }
-        public KeySpline KeySpline { get; }
-        public AvaloniaProperty Property { get; private set; }
+        public KeySpline? KeySpline { get; }
+        public AvaloniaProperty? Property { get; private set; }
 
-        private object _value;
+        private object? _value;
 
-        public object Value
+        public object? Value
         {
             get => _value;
             set => SetAndRaise(ValueProperty, ref _value, value);
@@ -80,7 +80,7 @@ public T GetTypedValue<T>()
                 throw new InvalidCastException($"KeyFrame value doesnt match property type.");
             }
 
-            return (T)typeConv.ConvertTo(Value, typeof(T));
+            return (T)typeConv.ConvertTo(Value, typeof(T))!;
         }
     }
 }
diff --git a/src/Avalonia.Animation/Animators/Animator`1.cs b/src/Avalonia.Animation/Animators/Animator`1.cs
index 23afa76bf68..248ca61c1df 100644
--- a/src/Avalonia.Animation/Animators/Animator`1.cs
+++ b/src/Avalonia.Animation/Animators/Animator`1.cs
@@ -24,7 +24,7 @@ public abstract class Animator<T> : AvaloniaList<AnimatorKeyFrame>, IAnimator
         /// <summary>
         /// Gets or sets the target property for the keyframe.
         /// </summary>
-        public AvaloniaProperty Property { get; set; }
+        public AvaloniaProperty? Property { get; set; }
 
         public Animator()
         {
@@ -33,7 +33,7 @@ public Animator()
         }
 
         /// <inheritdoc/>
-        public virtual IDisposable Apply(Animation animation, Animatable control, IClock clock, IObservable<bool> match, Action onComplete)
+        public virtual IDisposable? Apply(Animation animation, Animatable control, IClock? clock, IObservable<bool> match, Action? onComplete)
         {
             if (!_isVerifiedAndConverted)
                 VerifyConvertKeyFrames();
@@ -106,13 +106,16 @@ private int FindClosestBeforeKeyFrame(double time)
 
         public virtual IDisposable BindAnimation(Animatable control, IObservable<T> instance)
         {
+            if (Property is null)
+                throw new InvalidOperationException("Animator has no property specified.");
+
             return control.Bind((AvaloniaProperty<T>)Property, instance, BindingPriority.Animation);
         }
 
         /// <summary>
         /// Runs the KeyFrames Animation.
         /// </summary>
-        internal IDisposable Run(Animation animation, Animatable control, IClock clock, Action onComplete)
+        internal IDisposable Run(Animation animation, Animatable control, IClock? clock, Action? onComplete)
         {
             var instance = new AnimationInstance<T>(
                 animation,
diff --git a/src/Avalonia.Animation/Avalonia.Animation.csproj b/src/Avalonia.Animation/Avalonia.Animation.csproj
index 465b922b72c..d81d14bbff2 100644
--- a/src/Avalonia.Animation/Avalonia.Animation.csproj
+++ b/src/Avalonia.Animation/Avalonia.Animation.csproj
@@ -2,9 +2,13 @@
   <PropertyGroup>
     <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
   </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\Avalonia.Base\Metadata\NullableAttributes.cs" Link="NullableAttributes.cs" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
   </ItemGroup>
   <Import Project="..\..\build\Rx.props" />
   <Import Project="..\..\build\ApiDiff.props" />
+  <Import Project="..\..\build\NullableEnable.props" />
 </Project>
diff --git a/src/Avalonia.Animation/Clock.cs b/src/Avalonia.Animation/Clock.cs
index 5c2b7ce0dde..5afd2ae7053 100644
--- a/src/Avalonia.Animation/Clock.cs
+++ b/src/Avalonia.Animation/Clock.cs
@@ -4,7 +4,7 @@ namespace Avalonia.Animation
 {
     public class Clock : ClockBase
     {
-        public static IClock GlobalClock => AvaloniaLocator.Current.GetService<IGlobalClock>();
+        public static IClock GlobalClock => AvaloniaLocator.Current.GetRequiredService<IGlobalClock>();
 
         private readonly IDisposable _parentSubscription;
 
diff --git a/src/Avalonia.Animation/Cue.cs b/src/Avalonia.Animation/Cue.cs
index 7da7a9382bf..6578148b072 100644
--- a/src/Avalonia.Animation/Cue.cs
+++ b/src/Avalonia.Animation/Cue.cs
@@ -30,7 +30,7 @@ public Cue(double value)
         /// <summary>
         /// Parses a string to a <see cref="Cue"/> object.
         /// </summary>
-        public static Cue Parse(string value, CultureInfo culture)
+        public static Cue Parse(string value, CultureInfo? culture)
         {
             string v = value;
 
@@ -72,14 +72,14 @@ public bool Equals(double other)
 
     public class CueTypeConverter : TypeConverter
     {
-        public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
+        public override bool CanConvertFrom(ITypeDescriptorContext? context, Type sourceType)
         {
             return sourceType == typeof(string);
         }
 
-        public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
+        public override object ConvertFrom(ITypeDescriptorContext? context, CultureInfo? culture, object value)
         {
             return Cue.Parse((string)value, culture);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Animation/DisposeAnimationInstanceSubject.cs b/src/Avalonia.Animation/DisposeAnimationInstanceSubject.cs
index 696f43d006c..7283eaeedfc 100644
--- a/src/Avalonia.Animation/DisposeAnimationInstanceSubject.cs
+++ b/src/Avalonia.Animation/DisposeAnimationInstanceSubject.cs
@@ -8,15 +8,15 @@ namespace Avalonia.Animation
     /// </summary>
     internal class DisposeAnimationInstanceSubject<T> : IObserver<bool>, IDisposable
     {
-        private IDisposable _lastInstance;
+        private IDisposable? _lastInstance;
         private bool _lastMatch;
         private Animator<T> _animator;
         private Animation _animation;
         private Animatable _control;
-        private Action _onComplete;
-        private IClock _clock;
+        private Action? _onComplete;
+        private IClock? _clock;
 
-        public DisposeAnimationInstanceSubject(Animator<T> animator, Animation animation, Animatable control, IClock clock, Action onComplete)
+        public DisposeAnimationInstanceSubject(Animator<T> animator, Animation animation, Animatable control, IClock? clock, Action? onComplete)
         {
             this._animator = animator;
             this._animation = animation;
diff --git a/src/Avalonia.Animation/Easing/Easing.cs b/src/Avalonia.Animation/Easing/Easing.cs
index e0064596524..2f4b93dab1b 100644
--- a/src/Avalonia.Animation/Easing/Easing.cs
+++ b/src/Avalonia.Animation/Easing/Easing.cs
@@ -15,7 +15,7 @@ public abstract class Easing : IEasing
         /// <inheritdoc/>
         public abstract double Ease(double progress);
 
-        static Dictionary<string, Type> _easingTypes;
+        static Dictionary<string, Type>? _easingTypes;
 
         static readonly Type s_thisType = typeof(Easing);
 
@@ -48,7 +48,7 @@ public static Easing Parse(string e)
             if (_easingTypes.ContainsKey(e))
             {
                 var type = _easingTypes[e];
-                return (Easing)Activator.CreateInstance(type);
+                return (Easing)Activator.CreateInstance(type)!;
             }
             else
             {
diff --git a/src/Avalonia.Animation/Easing/EasingTypeConverter.cs b/src/Avalonia.Animation/Easing/EasingTypeConverter.cs
index 6613f6d3933..3d67d54a6f5 100644
--- a/src/Avalonia.Animation/Easing/EasingTypeConverter.cs
+++ b/src/Avalonia.Animation/Easing/EasingTypeConverter.cs
@@ -6,12 +6,12 @@ namespace Avalonia.Animation.Easings
 {
     public class EasingTypeConverter : TypeConverter
     {
-        public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
+        public override bool CanConvertFrom(ITypeDescriptorContext? context, Type sourceType)
         {
             return sourceType == typeof(string);
         }
 
-        public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
+        public override object ConvertFrom(ITypeDescriptorContext? context, CultureInfo? culture, object value)
         {
             return Easing.Parse((string)value);
         }
diff --git a/src/Avalonia.Animation/IAnimation.cs b/src/Avalonia.Animation/IAnimation.cs
index d037834630d..436a765d277 100644
--- a/src/Avalonia.Animation/IAnimation.cs
+++ b/src/Avalonia.Animation/IAnimation.cs
@@ -12,7 +12,7 @@ public interface IAnimation
         /// <summary>
         /// Apply the animation to the specified control and run it when <paramref name="match" /> produces <c>true</c>.
         /// </summary>
-        IDisposable Apply(Animatable control, IClock clock, IObservable<bool> match, Action onComplete = null);
+        IDisposable Apply(Animatable control, IClock? clock, IObservable<bool> match, Action? onComplete = null);
 
         /// <summary>
         /// Run the animation on the specified control.
diff --git a/src/Avalonia.Animation/IAnimationSetter.cs b/src/Avalonia.Animation/IAnimationSetter.cs
index 2d223772869..6a1d3539e27 100644
--- a/src/Avalonia.Animation/IAnimationSetter.cs
+++ b/src/Avalonia.Animation/IAnimationSetter.cs
@@ -2,7 +2,7 @@ namespace Avalonia.Animation
 {
     public interface IAnimationSetter
     {
-        AvaloniaProperty Property { get; set; }
-        object Value { get; set; }
+        AvaloniaProperty? Property { get; set; }
+        object? Value { get; set; }
     }
 }
diff --git a/src/Avalonia.Animation/IAnimator.cs b/src/Avalonia.Animation/IAnimator.cs
index d0fb173c541..f64ac9f9130 100644
--- a/src/Avalonia.Animation/IAnimator.cs
+++ b/src/Avalonia.Animation/IAnimator.cs
@@ -11,11 +11,11 @@ public interface IAnimator : IList<AnimatorKeyFrame>
         /// <summary>
         /// The target property.
         /// </summary>
-        AvaloniaProperty Property {get; set;}
+        AvaloniaProperty? Property {get; set;}
 
         /// <summary>
         /// Applies the current KeyFrame group to the specified control.
         /// </summary>
-        IDisposable Apply(Animation animation, Animatable control, IClock clock, IObservable<bool> match, Action onComplete);
+        IDisposable? Apply(Animation animation, Animatable control, IClock? clock, IObservable<bool> match, Action? onComplete);
     }
 }
diff --git a/src/Avalonia.Animation/ITransition.cs b/src/Avalonia.Animation/ITransition.cs
index ade2ec8b9e5..241ca208d1f 100644
--- a/src/Avalonia.Animation/ITransition.cs
+++ b/src/Avalonia.Animation/ITransition.cs
@@ -10,7 +10,7 @@ public interface ITransition
         /// <summary>
         /// Applies the transition to the specified <see cref="Animatable"/>.
         /// </summary>
-        IDisposable Apply(Animatable control, IClock clock, object oldValue, object newValue);
+        IDisposable Apply(Animatable control, IClock clock, object? oldValue, object? newValue);
 
         /// <summary>
         /// Gets the property to be animated.
diff --git a/src/Avalonia.Animation/IterationCount.cs b/src/Avalonia.Animation/IterationCount.cs
index 94637186089..3b52cdab49f 100644
--- a/src/Avalonia.Animation/IterationCount.cs
+++ b/src/Avalonia.Animation/IterationCount.cs
@@ -97,7 +97,7 @@ public IterationCount(ulong value, IterationType type)
         /// </summary>
         /// <param name="o">The object with which to test equality.</param>
         /// <returns>True if the objects are equal, otherwise false.</returns>
-        public override bool Equals(object o)
+        public override bool Equals(object? o)
         {
             if (o == null)
             {
diff --git a/src/Avalonia.Animation/IterationCountTypeConverter.cs b/src/Avalonia.Animation/IterationCountTypeConverter.cs
index 1c63f8cdf11..f64972ff5c0 100644
--- a/src/Avalonia.Animation/IterationCountTypeConverter.cs
+++ b/src/Avalonia.Animation/IterationCountTypeConverter.cs
@@ -6,12 +6,12 @@ namespace Avalonia.Animation
 {
     public class IterationCountTypeConverter : TypeConverter
     {
-        public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
+        public override bool CanConvertFrom(ITypeDescriptorContext? context, Type sourceType)
         {
             return sourceType == typeof(string);
         }
 
-        public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
+        public override object ConvertFrom(ITypeDescriptorContext? context, CultureInfo? culture, object value)
         {
             return IterationCount.Parse((string)value);
         }
diff --git a/src/Avalonia.Animation/KeyFrame.cs b/src/Avalonia.Animation/KeyFrame.cs
index c2cc1aa0518..3ab7a70d90e 100644
--- a/src/Avalonia.Animation/KeyFrame.cs
+++ b/src/Avalonia.Animation/KeyFrame.cs
@@ -19,7 +19,7 @@ public class KeyFrame : AvaloniaObject
     {
         private TimeSpan _ktimeSpan;
         private Cue _kCue;
-        private KeySpline _kKeySpline;
+        private KeySpline? _kKeySpline;
 
         public KeyFrame()
         {
@@ -79,7 +79,7 @@ public Cue Cue
         /// Gets or sets the KeySpline of this <see cref="KeyFrame"/>.
         /// </summary>
         /// <value>The key spline.</value>
-        public KeySpline KeySpline
+        public KeySpline? KeySpline
         {
             get
             {
diff --git a/src/Avalonia.Animation/KeySplineTypeConverter.cs b/src/Avalonia.Animation/KeySplineTypeConverter.cs
index b026206e5f7..eecad3c3acd 100644
--- a/src/Avalonia.Animation/KeySplineTypeConverter.cs
+++ b/src/Avalonia.Animation/KeySplineTypeConverter.cs
@@ -12,12 +12,12 @@ namespace Avalonia.Animation
     /// </summary>
     public class KeySplineTypeConverter : TypeConverter
     {
-        public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
+        public override bool CanConvertFrom(ITypeDescriptorContext? context, Type sourceType)
         {
             return sourceType == typeof(string);
         }
 
-        public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
+        public override object ConvertFrom(ITypeDescriptorContext? context, CultureInfo? culture, object value)
         {
             return KeySpline.Parse((string)value, CultureInfo.InvariantCulture);
         }
diff --git a/src/Avalonia.Animation/Transition.cs b/src/Avalonia.Animation/Transition.cs
index 4115c95c0f5..d307f348c4c 100644
--- a/src/Avalonia.Animation/Transition.cs
+++ b/src/Avalonia.Animation/Transition.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 using Avalonia.Animation.Easings;
 
 namespace Avalonia.Animation
@@ -8,7 +9,7 @@ namespace Avalonia.Animation
     /// </summary>
     public abstract class Transition<T> : AvaloniaObject, ITransition
     {
-        private AvaloniaProperty _prop;
+        private AvaloniaProperty? _prop;
 
         /// <summary>
         /// Gets or sets the duration of the transition.
@@ -26,7 +27,8 @@ public abstract class Transition<T> : AvaloniaObject, ITransition
         public Easing Easing { get; set; } = new LinearEasing();
 
         /// <inheritdocs/>
-        public AvaloniaProperty Property
+        [DisallowNull]
+        public AvaloniaProperty? Property
         {
             get
             {
@@ -42,16 +44,25 @@ public AvaloniaProperty Property
             }
         }
 
+        AvaloniaProperty ITransition.Property
+        {
+            get => Property ?? throw new InvalidOperationException("Transition has no property specified.");
+            set => Property = value;
+        }
+
         /// <summary>
         /// Apply interpolation to the property.
         /// </summary>
         public abstract IObservable<T> DoTransition(IObservable<double> progress, T oldValue, T newValue);
 
         /// <inheritdocs/>
-        public virtual IDisposable Apply(Animatable control, IClock clock, object oldValue, object newValue)
+        public virtual IDisposable Apply(Animatable control, IClock clock, object? oldValue, object? newValue)
         {
-            var transition = DoTransition(new TransitionInstance(clock, Delay, Duration), (T)oldValue, (T)newValue);
+            if (Property is null)
+                throw new InvalidOperationException("Transition has no property specified.");
+
+            var transition = DoTransition(new TransitionInstance(clock, Delay, Duration), (T)oldValue!, (T)newValue!);
             return control.Bind<T>((AvaloniaProperty<T>)Property, transition, Data.BindingPriority.Animation);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Animation/TransitionInstance.cs b/src/Avalonia.Animation/TransitionInstance.cs
index b522d1961e5..9c9494ff878 100644
--- a/src/Avalonia.Animation/TransitionInstance.cs
+++ b/src/Avalonia.Animation/TransitionInstance.cs
@@ -10,11 +10,11 @@ namespace Avalonia.Animation
     /// </summary>
     internal class TransitionInstance : SingleSubscriberObservableBase<double>, IObserver<TimeSpan>
     {
-        private IDisposable _timerSubscription;
+        private IDisposable? _timerSubscription;
         private TimeSpan _delay;
         private TimeSpan _duration;
         private readonly IClock _baseClock;
-        private TransitionClock _clock;
+        private TransitionClock? _clock;
 
         public TransitionInstance(IClock clock, TimeSpan delay, TimeSpan duration)
         {
@@ -67,7 +67,7 @@ private void TimerTick(TimeSpan t)
         protected override void Unsubscribed()
         {
             _timerSubscription?.Dispose();
-            _clock.PlayState = PlayState.Stop;
+            _clock!.PlayState = PlayState.Stop;
         }
 
         protected override void Subscribed()
diff --git a/src/Avalonia.Base/Collections/NotifyCollectionChangedExtensions.cs b/src/Avalonia.Base/Collections/NotifyCollectionChangedExtensions.cs
index dcd32ddd76c..689fcc89a48 100644
--- a/src/Avalonia.Base/Collections/NotifyCollectionChangedExtensions.cs
+++ b/src/Avalonia.Base/Collections/NotifyCollectionChangedExtensions.cs
@@ -59,7 +59,7 @@ public static IDisposable WeakSubscribe(
         }
 
         private class WeakCollectionChangedObservable : LightweightObservableBase<NotifyCollectionChangedEventArgs>,
-            IWeakSubscriber<NotifyCollectionChangedEventArgs>
+            IWeakEventSubscriber<NotifyCollectionChangedEventArgs>
         {
             private WeakReference<INotifyCollectionChanged> _sourceReference;
 
@@ -68,31 +68,22 @@ public WeakCollectionChangedObservable(WeakReference<INotifyCollectionChanged> s
                 _sourceReference = source;
             }
 
-            public void OnEvent(object? sender, NotifyCollectionChangedEventArgs e)
+            public void OnEvent(object? sender,
+                WeakEvent ev,
+                NotifyCollectionChangedEventArgs e)
             {
                 PublishNext(e);
             }
-
             protected override void Initialize()
             {
                 if (_sourceReference.TryGetTarget(out var instance))
-                {
-                    WeakSubscriptionManager.Subscribe(
-                    instance,
-                    nameof(instance.CollectionChanged),
-                    this);
-                }
+                    WeakEvents.CollectionChanged.Subscribe(instance, this);
             }
 
             protected override void Deinitialize()
             {
                 if (_sourceReference.TryGetTarget(out var instance))
-                {
-                    WeakSubscriptionManager.Unsubscribe(
-                        instance,
-                        nameof(instance.CollectionChanged),
-                        this);
-                }
+                    WeakEvents.CollectionChanged.Unsubscribe(instance, this);
             }
         }
     }
diff --git a/src/Avalonia.Base/Data/Core/IndexerNodeBase.cs b/src/Avalonia.Base/Data/Core/IndexerNodeBase.cs
index e197e291039..a8088278967 100644
--- a/src/Avalonia.Base/Data/Core/IndexerNodeBase.cs
+++ b/src/Avalonia.Base/Data/Core/IndexerNodeBase.cs
@@ -23,18 +23,16 @@ protected override void StartListeningCore(WeakReference<object?> reference)
 
             if (incc != null)
             {
-                inputs.Add(WeakObservable.FromEventPattern<INotifyCollectionChanged, NotifyCollectionChangedEventArgs>(
-                    incc,
-                    nameof(incc.CollectionChanged))
+                inputs.Add(WeakObservable.FromEventPattern(
+                    incc, WeakEvents.CollectionChanged)
                     .Where(x => ShouldUpdate(x.Sender, x.EventArgs))
                     .Select(_ => GetValue(target)));
             }
 
             if (inpc != null)
             {
-                inputs.Add(WeakObservable.FromEventPattern<INotifyPropertyChanged, PropertyChangedEventArgs>(
-                    inpc,
-                    nameof(inpc.PropertyChanged))
+                inputs.Add(WeakObservable.FromEventPattern(
+                    inpc, WeakEvents.PropertyChanged)
                     .Where(x => ShouldUpdate(x.Sender, x.EventArgs))
                     .Select(_ => GetValue(target)));
             }
diff --git a/src/Avalonia.Base/Data/Core/Plugins/IndeiValidationPlugin.cs b/src/Avalonia.Base/Data/Core/Plugins/IndeiValidationPlugin.cs
index 9f827daf94c..1e7a0d5c8fa 100644
--- a/src/Avalonia.Base/Data/Core/Plugins/IndeiValidationPlugin.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/IndeiValidationPlugin.cs
@@ -11,6 +11,12 @@ namespace Avalonia.Data.Core.Plugins
     /// </summary>
     public class IndeiValidationPlugin : IDataValidationPlugin
     {
+        private static readonly WeakEvent<INotifyDataErrorInfo, DataErrorsChangedEventArgs>
+            ErrorsChangedWeakEvent = WeakEvent.Register<INotifyDataErrorInfo, DataErrorsChangedEventArgs>(
+                (s, h) => s.ErrorsChanged += h,
+                (s, h) => s.ErrorsChanged -= h
+            );
+
         /// <inheritdoc/>
         public bool Match(WeakReference<object?> reference, string memberName)
         {
@@ -25,7 +31,7 @@ public IPropertyAccessor Start(WeakReference<object?> reference, string name, IP
             return new Validator(reference, name, accessor);
         }
 
-        private class Validator : DataValidationBase, IWeakSubscriber<DataErrorsChangedEventArgs>
+        private class Validator : DataValidationBase, IWeakEventSubscriber<DataErrorsChangedEventArgs>
         {
             private readonly WeakReference<object?> _reference;
             private readonly string _name;
@@ -37,7 +43,7 @@ public Validator(WeakReference<object?> reference, string name, IPropertyAccesso
                 _name = name;
             }
 
-            void IWeakSubscriber<DataErrorsChangedEventArgs>.OnEvent(object? sender, DataErrorsChangedEventArgs e)
+            void IWeakEventSubscriber<DataErrorsChangedEventArgs>.OnEvent(object? notifyDataErrorInfo, WeakEvent ev, DataErrorsChangedEventArgs e)
             {
                 if (e.PropertyName == _name || string.IsNullOrEmpty(e.PropertyName))
                 {
@@ -51,10 +57,7 @@ protected override void SubscribeCore()
 
                 if (target != null)
                 {
-                    WeakSubscriptionManager.Subscribe(
-                        target,
-                        nameof(target.ErrorsChanged),
-                        this);
+                    ErrorsChangedWeakEvent.Subscribe(target, this);
                 }
 
                 base.SubscribeCore();
@@ -66,10 +69,7 @@ protected override void UnsubscribeCore()
 
                 if (target != null)
                 {
-                    WeakSubscriptionManager.Unsubscribe(
-                        target,
-                        nameof(target.ErrorsChanged),
-                        this);
+                    ErrorsChangedWeakEvent.Unsubscribe(target, this);
                 }
 
                 base.UnsubscribeCore();
diff --git a/src/Avalonia.Base/Data/Core/Plugins/InpcPropertyAccessorPlugin.cs b/src/Avalonia.Base/Data/Core/Plugins/InpcPropertyAccessorPlugin.cs
index fd532f3014d..33cecd10a7d 100644
--- a/src/Avalonia.Base/Data/Core/Plugins/InpcPropertyAccessorPlugin.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/InpcPropertyAccessorPlugin.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Reflection;
 using Avalonia.Utilities;
@@ -85,7 +86,7 @@ public class InpcPropertyAccessorPlugin : IPropertyAccessorPlugin
             return found;
         }
 
-        private class Accessor : PropertyAccessorBase, IWeakSubscriber<PropertyChangedEventArgs>
+        private class Accessor : PropertyAccessorBase, IWeakEventSubscriber<PropertyChangedEventArgs>
         {
             private readonly WeakReference<object?> _reference;
             private readonly PropertyInfo _property;
@@ -129,7 +130,8 @@ public override bool SetValue(object? value, BindingPriority priority)
                 return false;
             }
 
-            void IWeakSubscriber<PropertyChangedEventArgs>.OnEvent(object? sender, PropertyChangedEventArgs e)
+            void IWeakEventSubscriber<PropertyChangedEventArgs>.
+                OnEvent(object? notifyPropertyChanged, WeakEvent ev, PropertyChangedEventArgs e)
             {
                 if (e.PropertyName == _property.Name || string.IsNullOrEmpty(e.PropertyName))
                 {
@@ -148,13 +150,8 @@ protected override void UnsubscribeCore()
             {
                 var inpc = GetReferenceTarget() as INotifyPropertyChanged;
 
-                if (inpc != null)
-                {
-                    WeakSubscriptionManager.Unsubscribe(
-                        inpc,
-                        nameof(inpc.PropertyChanged),
-                        this);
-                }
+                if (inpc != null) 
+                    WeakEvents.PropertyChanged.Unsubscribe(inpc, this);
             }
 
             private object? GetReferenceTarget()
@@ -178,13 +175,8 @@ private void SubscribeToChanges()
             {
                 var inpc = GetReferenceTarget() as INotifyPropertyChanged;
 
-                if (inpc != null)
-                {
-                    WeakSubscriptionManager.Subscribe(
-                        inpc,
-                        nameof(inpc.PropertyChanged),
-                        this);
-                }
+                if (inpc != null) 
+                    WeakEvents.PropertyChanged.Subscribe(inpc, this);
             }
         }
     }
diff --git a/src/Avalonia.Base/Threading/AvaloniaSynchronizationContext.cs b/src/Avalonia.Base/Threading/AvaloniaSynchronizationContext.cs
index b991f9eb408..21649306cb0 100644
--- a/src/Avalonia.Base/Threading/AvaloniaSynchronizationContext.cs
+++ b/src/Avalonia.Base/Threading/AvaloniaSynchronizationContext.cs
@@ -30,7 +30,7 @@ public static void InstallIfNeeded()
         /// <inheritdoc/>
         public override void Post(SendOrPostCallback d, object? state)
         {
-           Dispatcher.UIThread.Post(() => d(state), DispatcherPriority.Send);
+           Dispatcher.UIThread.Post(() => d(state), DispatcherPriority.Background);
         }
 
         /// <inheritdoc/>
diff --git a/src/Avalonia.Base/Utilities/IWeakEventSubscriber.cs b/src/Avalonia.Base/Utilities/IWeakEventSubscriber.cs
new file mode 100644
index 00000000000..e48c0cb1117
--- /dev/null
+++ b/src/Avalonia.Base/Utilities/IWeakEventSubscriber.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace Avalonia.Utilities;
+
+/// <summary>
+/// Defines a listener to a event subscribed vis the <see cref="WeakEvent{TTarget, TEventArgs}"/>.
+/// </summary>
+/// <typeparam name="TEventArgs">The type of the event arguments.</typeparam>
+public interface IWeakEventSubscriber<in TEventArgs> where TEventArgs : EventArgs
+{
+    void OnEvent(object? sender, WeakEvent ev, TEventArgs e);
+}
\ No newline at end of file
diff --git a/src/Avalonia.Base/Utilities/WeakEvent.cs b/src/Avalonia.Base/Utilities/WeakEvent.cs
new file mode 100644
index 00000000000..0b32015a8af
--- /dev/null
+++ b/src/Avalonia.Base/Utilities/WeakEvent.cs
@@ -0,0 +1,187 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using Avalonia.Threading;
+
+namespace Avalonia.Utilities;
+
+/// <summary>
+/// Manages subscriptions to events using weak listeners.
+/// </summary>
+public class WeakEvent<TSender, TEventArgs> : WeakEvent where TEventArgs : EventArgs where TSender : class
+{
+    private readonly Func<TSender, EventHandler<TEventArgs>, Action> _subscribe;
+
+    readonly ConditionalWeakTable<object, Subscription> _subscriptions = new();
+
+    internal WeakEvent(
+        Action<TSender, EventHandler<TEventArgs>> subscribe,
+        Action<TSender, EventHandler<TEventArgs>> unsubscribe)
+    {
+        _subscribe = (t, s) =>
+        {
+            subscribe(t, s);
+            return () => unsubscribe(t, s);
+        };
+    }
+    
+    internal WeakEvent(Func<TSender, EventHandler<TEventArgs>, Action> subscribe)
+    {
+        _subscribe = subscribe;
+    }
+    
+    public void Subscribe(TSender target, IWeakEventSubscriber<TEventArgs> subscriber)
+    {
+        if (!_subscriptions.TryGetValue(target, out var subscription))
+            _subscriptions.Add(target, subscription = new Subscription(this, target));
+        subscription.Add(new WeakReference<IWeakEventSubscriber<TEventArgs>>(subscriber));
+    }
+
+    public void Unsubscribe(TSender target, IWeakEventSubscriber<TEventArgs> subscriber)
+    {
+        if (_subscriptions.TryGetValue(target, out var subscription)) 
+            subscription.Remove(subscriber);
+    }
+
+    private class Subscription
+    {
+        private readonly WeakEvent<TSender, TEventArgs> _ev;
+        private readonly TSender _target;
+        private readonly Action _compact;
+
+        private WeakReference<IWeakEventSubscriber<TEventArgs>>?[] _data =
+            new WeakReference<IWeakEventSubscriber<TEventArgs>>[16];
+        private int _count;
+        private readonly Action _unsubscribe;
+        private bool _compactScheduled;
+
+        public Subscription(WeakEvent<TSender, TEventArgs> ev, TSender target)
+        {
+            _ev = ev;
+            _target = target;
+            _compact = Compact;
+            _unsubscribe = ev._subscribe(target, OnEvent);
+        }
+
+        void Destroy()
+        {
+            _unsubscribe();
+            _ev._subscriptions.Remove(_target);
+        }
+
+        public void Add(WeakReference<IWeakEventSubscriber<TEventArgs>> s)
+        {
+            if (_count == _data.Length)
+            {
+                //Extend capacity
+                var extendedData = new WeakReference<IWeakEventSubscriber<TEventArgs>>?[_data.Length * 2];
+                Array.Copy(_data, extendedData, _data.Length);
+                _data = extendedData;
+            }
+
+            _data[_count] = s;
+            _count++;
+        }
+
+        public void Remove(IWeakEventSubscriber<TEventArgs> s)
+        {
+            var removed = false;
+
+            for (int c = 0; c < _count; ++c)
+            {
+                var reference = _data[c];
+
+                if (reference != null && reference.TryGetTarget(out var instance) && instance == s)
+                {
+                    _data[c] = null;
+                    removed = true;
+                }
+            }
+
+            if (removed)
+            {
+                ScheduleCompact();
+            }
+        }
+
+        void ScheduleCompact()
+        {
+            if(_compactScheduled)
+                return;
+            _compactScheduled = true;
+            Dispatcher.UIThread.Post(_compact, DispatcherPriority.Background);
+        }
+        
+        void Compact()
+        {
+            _compactScheduled = false;
+            int empty = -1;
+            for (var c = 0; c < _count; c++)
+            {
+                var r = _data[c];
+                //Mark current index as first empty
+                if (r == null && empty == -1)
+                    empty = c;
+                //If current element isn't null and we have an empty one
+                if (r != null && empty != -1)
+                {
+                    _data[c] = null;
+                    _data[empty] = r;
+                    empty++;
+                }
+            }
+
+            if (empty != -1)
+                _count = empty;
+            if (_count == 0)
+                Destroy();
+        }
+
+        void OnEvent(object? sender, TEventArgs eventArgs)
+        {
+            var needCompact = false;
+            for (var c = 0; c < _count; c++)
+            {
+                var r = _data[c];
+                if (r?.TryGetTarget(out var sub) == true)
+                    sub!.OnEvent(_target, _ev, eventArgs);
+                else
+                    needCompact = true;
+            }
+
+            if (needCompact)
+                ScheduleCompact();
+        }
+    }
+
+}
+
+public class WeakEvent
+{
+    public static WeakEvent<TSender, TEventArgs> Register<TSender, TEventArgs>(
+        Action<TSender, EventHandler<TEventArgs>> subscribe,
+        Action<TSender, EventHandler<TEventArgs>> unsubscribe) where TSender : class where TEventArgs : EventArgs
+    {
+        return new WeakEvent<TSender, TEventArgs>(subscribe, unsubscribe);
+    }
+    
+    public static WeakEvent<TSender, TEventArgs> Register<TSender, TEventArgs>(
+        Func<TSender, EventHandler<TEventArgs>, Action> subscribe) where TSender : class where TEventArgs : EventArgs
+    {
+        return new WeakEvent<TSender, TEventArgs>(subscribe);
+    }
+    
+    public static WeakEvent<TSender, EventArgs> Register<TSender>(
+        Action<TSender, EventHandler> subscribe,
+        Action<TSender, EventHandler> unsubscribe) where TSender : class
+    {
+        return Register<TSender, EventArgs>((s, h) =>
+        {
+            EventHandler handler = (_, e) => h(s, e);
+            subscribe(s, handler);
+            return () => unsubscribe(s, handler);
+        });
+    }
+}
\ No newline at end of file
diff --git a/src/Avalonia.Base/Utilities/WeakEvents.cs b/src/Avalonia.Base/Utilities/WeakEvents.cs
new file mode 100644
index 00000000000..d1b5e7f12d8
--- /dev/null
+++ b/src/Avalonia.Base/Utilities/WeakEvents.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Windows.Input;
+
+namespace Avalonia.Utilities;
+
+public class WeakEvents
+{
+    /// <summary>
+    /// Represents CollectionChanged event from <see cref="INotifyCollectionChanged"/>
+    /// </summary>
+    public static readonly WeakEvent<INotifyCollectionChanged, NotifyCollectionChangedEventArgs>
+        CollectionChanged = WeakEvent.Register<INotifyCollectionChanged, NotifyCollectionChangedEventArgs>(
+            (c, s) =>
+            {
+                NotifyCollectionChangedEventHandler handler = (_, e) => s(c, e);
+                c.CollectionChanged += handler;
+                return () => c.CollectionChanged -= handler;
+            });
+    
+    /// <summary>
+    /// Represents PropertyChanged event from <see cref="INotifyPropertyChanged"/>
+    /// </summary>
+    public static readonly WeakEvent<INotifyPropertyChanged, PropertyChangedEventArgs>
+        PropertyChanged = WeakEvent.Register<INotifyPropertyChanged, PropertyChangedEventArgs>(
+            (s, h) =>
+            {
+                PropertyChangedEventHandler handler = (_, e) => h(s, e);
+                s.PropertyChanged += handler;
+                return () => s.PropertyChanged -= handler;
+            });
+
+    /// <summary>
+    /// Represents CanExecuteChanged event from <see cref="ICommand"/>
+    /// </summary>
+    public static readonly WeakEvent<ICommand, EventArgs> CommandCanExecuteChanged =
+        WeakEvent.Register<ICommand>((s, h) => s.CanExecuteChanged += h,
+            (s, h) => s.CanExecuteChanged -= h);
+}
\ No newline at end of file
diff --git a/src/Avalonia.Base/Utilities/WeakObservable.cs b/src/Avalonia.Base/Utilities/WeakObservable.cs
index 52edc7ad1a2..6bf1d4082f6 100644
--- a/src/Avalonia.Base/Utilities/WeakObservable.cs
+++ b/src/Avalonia.Base/Utilities/WeakObservable.cs
@@ -18,6 +18,7 @@ public static class WeakObservable
         /// <param name="target">Object instance that exposes the event to convert.</param>
         /// <param name="eventName">Name of the event to convert.</param>
         /// <returns></returns>
+        [Obsolete("Use WeakEvent-based overload")]
         public static IObservable<EventPattern<object, TEventArgs>> FromEventPattern<TTarget, TEventArgs>(
             TTarget target, 
             string eventName)
@@ -34,7 +35,9 @@ public static IObservable<EventPattern<object, TEventArgs>> FromEventPattern<TTa
             }).Publish().RefCount();
         }
 
-        private class Handler<TEventArgs> : IWeakSubscriber<TEventArgs> where TEventArgs : EventArgs
+        private class Handler<TEventArgs> 
+            : IWeakSubscriber<TEventArgs>,
+                IWeakEventSubscriber<TEventArgs> where TEventArgs : EventArgs
         {
             private IObserver<EventPattern<object, TEventArgs>> _observer;
 
@@ -47,6 +50,36 @@ public void OnEvent(object? sender, TEventArgs e)
             {
                 _observer.OnNext(new EventPattern<object, TEventArgs>(sender, e));
             }
+
+            public void OnEvent(object? sender, WeakEvent ev, TEventArgs e)
+            {
+                _observer.OnNext(new EventPattern<object, TEventArgs>(sender, e));
+            }
         }
+        
+        /// <summary>
+        /// Converts a WeakEvent conforming to the standard .NET event pattern into an observable
+        /// sequence, subscribing weakly.
+        /// </summary>
+        /// <typeparam name="TTarget">The type of target.</typeparam>
+        /// <typeparam name="TEventArgs">The type of the event args.</typeparam>
+        /// <param name="target">Object instance that exposes the event to convert.</param>
+        /// <param name="ev">The weak event to convert.</param>
+        /// <returns></returns>
+        public static IObservable<EventPattern<object, TEventArgs>> FromEventPattern<TTarget, TEventArgs>(
+            TTarget target, WeakEvent<TTarget, TEventArgs> ev)
+            where TEventArgs : EventArgs where TTarget : class
+        {
+            _ = target ?? throw new ArgumentNullException(nameof(target));
+            _ = ev ?? throw new ArgumentNullException(nameof(ev));
+
+            return Observable.Create<EventPattern<object, TEventArgs>>(observer =>
+            {
+                var handler = new Handler<TEventArgs>(observer);
+                ev.Subscribe(target, handler);
+                return () => ev.Unsubscribe(target, handler);
+            }).Publish().RefCount();
+        }
+
     }
 }
diff --git a/src/Avalonia.Base/Utilities/WeakSubscriptionManager.cs b/src/Avalonia.Base/Utilities/WeakSubscriptionManager.cs
index 88b1e3c8073..dc9e86cc321 100644
--- a/src/Avalonia.Base/Utilities/WeakSubscriptionManager.cs
+++ b/src/Avalonia.Base/Utilities/WeakSubscriptionManager.cs
@@ -19,6 +19,7 @@ public static class WeakSubscriptionManager
         /// <param name="target">The event source.</param>
         /// <param name="eventName">The name of the event.</param>
         /// <param name="subscriber">The subscriber.</param>
+        [Obsolete("Use WeakEvent")]
         public static void Subscribe<TTarget, TEventArgs>(TTarget target, string eventName, IWeakSubscriber<TEventArgs> subscriber)
             where TEventArgs : EventArgs
         {
diff --git a/src/Avalonia.Controls.DataGrid/DataGrid.cs b/src/Avalonia.Controls.DataGrid/DataGrid.cs
index 10c7c16488b..95ee73be4e5 100644
--- a/src/Avalonia.Controls.DataGrid/DataGrid.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGrid.cs
@@ -5751,6 +5751,7 @@ private bool UpdateStateOnMouseRightButtonDown(PointerPressedEventArgs pointerPr
                 return true;
             }
             // Unselect everything except the row that was clicked on
+            _noSelectionChangeCount++;
             try
             {
                 UpdateSelectionAndCurrency(columnIndex, slot, DataGridSelectionAction.SelectCurrent, scrollIntoView: false);
diff --git a/src/Avalonia.Controls.DataGrid/DataGridColumn.cs b/src/Avalonia.Controls.DataGrid/DataGridColumn.cs
index 6b515503aa8..8501ce38969 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridColumn.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridColumn.cs
@@ -448,7 +448,7 @@ public bool IsFrozen
             internal set;
         }
 
-        public bool IsReadOnly
+        public virtual bool IsReadOnly
         {
             get
             {
diff --git a/src/Avalonia.Controls.DataGrid/DataGridTemplateColumn.cs b/src/Avalonia.Controls.DataGrid/DataGridTemplateColumn.cs
index 7e95dd100cf..0e754d58153 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridTemplateColumn.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridTemplateColumn.cs
@@ -1,4 +1,4 @@
-// (c) Copyright Microsoft Corporation.
+// (c) Copyright Microsoft Corporation.
 // This source is subject to the Microsoft Public License (Ms-PL).
 // Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
@@ -15,7 +15,7 @@ namespace Avalonia.Controls
 {
     public class DataGridTemplateColumn : DataGridColumn
     {
-        IDataTemplate _cellTemplate;
+        private IDataTemplate _cellTemplate;
 
         public static readonly DirectProperty<DataGridTemplateColumn, IDataTemplate> CellTemplateProperty =
             AvaloniaProperty.RegisterDirect<DataGridTemplateColumn, IDataTemplate>(
@@ -30,17 +30,38 @@ public IDataTemplate CellTemplate
             set { SetAndRaise(CellTemplateProperty, ref _cellTemplate, value); }
         }
 
+        private IDataTemplate _cellEditingCellTemplate;
+
+        /// <summary>
+        /// Defines the <see cref="CellEditingTemplate"/> property.
+        /// </summary>
+        public static readonly DirectProperty<DataGridTemplateColumn, IDataTemplate> CellEditingTemplateProperty =
+                AvaloniaProperty.RegisterDirect<DataGridTemplateColumn, IDataTemplate>(
+                    nameof(CellEditingTemplate),
+                    o => o.CellEditingTemplate,
+                    (o, v) => o.CellEditingTemplate = v);
+
+        /// <summary>
+        /// Gets or sets the <see cref="IDataTemplate"/> which is used for the editing mode of the current <see cref="DataGridCell"/>
+        /// </summary>
+        /// <value>
+        /// An <see cref="IDataTemplate"/> for the editing mode of the current <see cref="DataGridCell"/>
+        /// </value>
+        /// <remarks>
+        /// If this property is <see langword="null"/> the column is read-only.
+        /// </remarks>
+        public IDataTemplate CellEditingTemplate
+        {
+            get => _cellEditingCellTemplate;
+            set => SetAndRaise(CellEditingTemplateProperty, ref _cellEditingCellTemplate, value);
+        }
+        
         private void OnCellTemplateChanged(AvaloniaPropertyChangedEventArgs e)
         {
             var oldValue = (IDataTemplate)e.OldValue;
             var value = (IDataTemplate)e.NewValue;
         }
 
-        public DataGridTemplateColumn()
-        {
-            IsReadOnly = true;
-        }
-
         protected override IControl GenerateElement(DataGridCell cell, object dataItem)
         {
             if(CellTemplate != null)
@@ -60,7 +81,22 @@ protected override IControl GenerateElement(DataGridCell cell, object dataItem)
         protected override IControl GenerateEditingElement(DataGridCell cell, object dataItem, out ICellEditBinding binding)
         {
             binding = null;
-            return GenerateElement(cell, dataItem);
+            if(CellEditingTemplate != null)
+            {
+                return CellEditingTemplate.Build(dataItem);
+            }
+            else if (CellTemplate != null)
+            {
+                return CellTemplate.Build(dataItem);
+            }
+            if (Design.IsDesignMode)
+            {
+                return null;
+            }
+            else
+            {
+                throw DataGridError.DataGridTemplateColumn.MissingTemplateForType(typeof(DataGridTemplateColumn));
+            }
         }
 
         protected override object PrepareCellForEdit(IControl editingElement, RoutedEventArgs editingEventArgs)
@@ -70,12 +106,30 @@ protected override object PrepareCellForEdit(IControl editingElement, RoutedEven
 
         protected internal override void RefreshCellContent(IControl element, string propertyName)
         {
-            if(propertyName == nameof(CellTemplate) && element.Parent is DataGridCell cell)
+            var cell = element.Parent as DataGridCell;
+            if(propertyName == nameof(CellTemplate) && cell is not null)
             {
                 cell.Content = GenerateElement(cell, cell.DataContext);
             }
 
             base.RefreshCellContent(element, propertyName);
         }
+        
+        public override bool IsReadOnly
+        {
+            get
+            {
+                if (CellEditingTemplate is null)
+                {
+                    return true;
+                }
+
+                return base.IsReadOnly;
+            }
+            set
+            {
+                base.IsReadOnly = value;
+            }
+        }
     }
 }
diff --git a/src/Avalonia.Controls/ApiCompatBaseline.txt b/src/Avalonia.Controls/ApiCompatBaseline.txt
index dd41c30e852..9b7d37e1087 100644
--- a/src/Avalonia.Controls/ApiCompatBaseline.txt
+++ b/src/Avalonia.Controls/ApiCompatBaseline.txt
@@ -29,15 +29,20 @@ MembersMustExist : Member 'public void Avalonia.Controls.NumericUpDownValueChang
 MembersMustExist : Member 'public System.Double Avalonia.Controls.NumericUpDownValueChangedEventArgs.NewValue.get()' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'public System.Double Avalonia.Controls.NumericUpDownValueChangedEventArgs.OldValue.get()' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'public Avalonia.StyledProperty<System.Boolean> Avalonia.StyledProperty<System.Boolean> Avalonia.Controls.ScrollViewer.AllowAutoHideProperty' does not exist in the implementation but it does exist in the contract.
+CannotRemoveBaseTypeOrInterface : Type 'Avalonia.Controls.TopLevel' does not implement interface 'Avalonia.Utilities.IWeakSubscriber<Avalonia.Controls.ResourcesChangedEventArgs>' in the implementation but it does in the contract.
 MembersMustExist : Member 'public Avalonia.AvaloniaProperty<Avalonia.Media.Stretch> Avalonia.AvaloniaProperty<Avalonia.Media.Stretch> Avalonia.Controls.Viewbox.StretchProperty' does not exist in the implementation but it does exist in the contract.
+CannotRemoveBaseTypeOrInterface : Type 'Avalonia.Controls.Window' does not implement interface 'Avalonia.Utilities.IWeakSubscriber<Avalonia.Controls.ResourcesChangedEventArgs>' in the implementation but it does in the contract.
+CannotRemoveBaseTypeOrInterface : Type 'Avalonia.Controls.WindowBase' does not implement interface 'Avalonia.Utilities.IWeakSubscriber<Avalonia.Controls.ResourcesChangedEventArgs>' in the implementation but it does in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public System.EventHandler<Avalonia.Controls.ApplicationLifetimes.ShutdownRequestedEventArgs> Avalonia.Controls.ApplicationLifetimes.IClassicDesktopStyleApplicationLifetime.ShutdownRequested' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Controls.ApplicationLifetimes.IClassicDesktopStyleApplicationLifetime.add_ShutdownRequested(System.EventHandler<Avalonia.Controls.ApplicationLifetimes.ShutdownRequestedEventArgs>)' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Controls.ApplicationLifetimes.IClassicDesktopStyleApplicationLifetime.remove_ShutdownRequested(System.EventHandler<Avalonia.Controls.ApplicationLifetimes.ShutdownRequestedEventArgs>)' is present in the implementation but not in the contract.
+CannotRemoveBaseTypeOrInterface : Type 'Avalonia.Controls.Embedding.EmbeddableControlRoot' does not implement interface 'Avalonia.Utilities.IWeakSubscriber<Avalonia.Controls.ResourcesChangedEventArgs>' in the implementation but it does in the contract.
 MembersMustExist : Member 'public System.Action<Avalonia.Size> Avalonia.Controls.Embedding.Offscreen.OffscreenTopLevelImplBase.Resized.get()' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'public void Avalonia.Controls.Embedding.Offscreen.OffscreenTopLevelImplBase.Resized.set(System.Action<Avalonia.Size>)' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'public void Avalonia.Controls.Embedding.Offscreen.OffscreenTopLevelImplBase.SetCursor(Avalonia.Platform.IPlatformHandle)' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'public Avalonia.AvaloniaProperty Avalonia.AvaloniaProperty Avalonia.Controls.Notifications.NotificationCard.CloseOnClickProperty' does not exist in the implementation but it does exist in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Controls.Platform.ITopLevelNativeMenuExporter.SetNativeMenu(Avalonia.Controls.NativeMenu)' is present in the contract but not in the implementation.
+CannotRemoveBaseTypeOrInterface : Type 'Avalonia.Controls.Primitives.PopupRoot' does not implement interface 'Avalonia.Utilities.IWeakSubscriber<Avalonia.Controls.ResourcesChangedEventArgs>' in the implementation but it does in the contract.
 EnumValuesMustMatch : Enum value 'Avalonia.Platform.ExtendClientAreaChromeHints Avalonia.Platform.ExtendClientAreaChromeHints.Default' is (System.Int32)2 in the implementation but (System.Int32)1 in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public System.Nullable<Avalonia.Size> Avalonia.Platform.ITopLevelImpl.FrameSize' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public System.Nullable<Avalonia.Size> Avalonia.Platform.ITopLevelImpl.FrameSize.get()' is present in the implementation but not in the contract.
@@ -57,4 +62,4 @@ InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Platfor
 MembersMustExist : Member 'public void Avalonia.Platform.IWindowImpl.Resize(Avalonia.Size)' does not exist in the implementation but it does exist in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Platform.IWindowImpl.Resize(Avalonia.Size, Avalonia.Platform.PlatformResizeReason)' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Platform.ITrayIconImpl Avalonia.Platform.IWindowingPlatform.CreateTrayIcon()' is present in the implementation but not in the contract.
-Total Issues: 58
+Total Issues: 63
diff --git a/src/Avalonia.Controls/Calendar/CalendarDatePicker.cs b/src/Avalonia.Controls/Calendar/CalendarDatePicker.cs
index a856ee071ca..cd9c80d3e08 100644
--- a/src/Avalonia.Controls/Calendar/CalendarDatePicker.cs
+++ b/src/Avalonia.Controls/Calendar/CalendarDatePicker.cs
@@ -185,7 +185,8 @@ public class CalendarDatePicker : TemplatedControl
             AvaloniaProperty.RegisterDirect<CalendarDatePicker, DateTime?>(
                 nameof(SelectedDate),
                 o => o.SelectedDate,
-                (o, v) => o.SelectedDate = v);
+                (o, v) => o.SelectedDate = v,
+                enableDataValidation: true);
 
         public static readonly StyledProperty<CalendarDatePickerFormat> SelectedDateFormatProperty =
             AvaloniaProperty.Register<CalendarDatePicker, CalendarDatePickerFormat>(
@@ -533,13 +534,11 @@ protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
             }
         }
 
-        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        protected override void UpdateDataValidation<T>(AvaloniaProperty<T> property, BindingValue<T> value)
         {
-            base.OnPropertyChanged(change);
-
-            if (change.Property == SelectedDateProperty)
+            if (property == SelectedDateProperty)
             {
-                DataValidationErrors.SetError(this, change.NewValue.Error);
+                DataValidationErrors.SetError(this, value.Error);
             }
         }
 
diff --git a/src/Avalonia.Controls/NativeMenuItem.cs b/src/Avalonia.Controls/NativeMenuItem.cs
index 2ceaeb6dbaa..4d048f0fb07 100644
--- a/src/Avalonia.Controls/NativeMenuItem.cs
+++ b/src/Avalonia.Controls/NativeMenuItem.cs
@@ -33,7 +33,7 @@ static NativeMenuItem()
         }
 
 
-        class CanExecuteChangedSubscriber : IWeakSubscriber<EventArgs>
+        class CanExecuteChangedSubscriber : IWeakEventSubscriber<EventArgs>
         {
             private readonly NativeMenuItem _parent;
 
@@ -42,7 +42,7 @@ public CanExecuteChangedSubscriber(NativeMenuItem parent)
                 _parent = parent;
             }
 
-            public void OnEvent(object sender, EventArgs e)
+            public void OnEvent(object? sender, WeakEvent ev, EventArgs e)
             {
                 _parent.CanExecuteChanged();
             }
@@ -160,14 +160,12 @@ public ICommand Command
             set
             {
                 if (_command != null)
-                    WeakSubscriptionManager.Unsubscribe(_command,
-                        nameof(ICommand.CanExecuteChanged), _canExecuteChangedSubscriber);
+                    WeakEvents.CommandCanExecuteChanged.Unsubscribe(_command, _canExecuteChangedSubscriber);
 
                 SetAndRaise(CommandProperty, ref _command, value);
 
                 if (_command != null)
-                    WeakSubscriptionManager.Subscribe(_command,
-                        nameof(ICommand.CanExecuteChanged), _canExecuteChangedSubscriber);
+                    WeakEvents.CommandCanExecuteChanged.Subscribe(_command, _canExecuteChangedSubscriber);
 
                 CanExecuteChanged();
             }
diff --git a/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs b/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs
index a2bdcd1ea8c..18348571bf6 100644
--- a/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs
+++ b/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs
@@ -101,7 +101,7 @@ public virtual void Detach(IMenu menu)
                 root.Deactivated -= WindowDeactivated;
             }
             
-            if (_root is TopLevel tl)
+            if (_root is TopLevel tl && tl.PlatformImpl != null)
                 tl.PlatformImpl.LostFocus -= TopLevelLostPlatformFocus;
 
             _inputManagerSubscription?.Dispose();
diff --git a/src/Avalonia.Controls/Primitives/PopupRoot.cs b/src/Avalonia.Controls/Primitives/PopupRoot.cs
index f7281c107a8..aee0bc7dc13 100644
--- a/src/Avalonia.Controls/Primitives/PopupRoot.cs
+++ b/src/Avalonia.Controls/Primitives/PopupRoot.cs
@@ -45,7 +45,7 @@ public PopupRoot(TopLevel parent, IPopupImpl impl)
         /// The dependency resolver to use. If null the default dependency resolver will be used.
         /// </param>
         public PopupRoot(TopLevel parent, IPopupImpl impl, IAvaloniaDependencyResolver dependencyResolver)
-            : base(impl, dependencyResolver)
+            : base(ValidatingPopupImpl.Wrap(impl), dependencyResolver)
         {
             _parent = parent;
         }
diff --git a/src/Avalonia.Controls/Repeater/ItemsRepeater.cs b/src/Avalonia.Controls/Repeater/ItemsRepeater.cs
index ecc0fa3a484..b40cf26df55 100644
--- a/src/Avalonia.Controls/Repeater/ItemsRepeater.cs
+++ b/src/Avalonia.Controls/Repeater/ItemsRepeater.cs
@@ -20,7 +20,7 @@ namespace Avalonia.Controls
     /// Represents a data-driven collection control that incorporates a flexible layout system,
     /// custom views, and virtualization.
     /// </summary>
-    public class ItemsRepeater : Panel, IChildIndexProvider
+    public class ItemsRepeater : Panel, IChildIndexProvider, IWeakEventSubscriber<EventArgs>
     {
         /// <summary>
         /// Defines the <see cref="HorizontalCacheLength"/> property.
@@ -723,14 +723,8 @@ private void OnLayoutChanged(AttachedLayout oldValue, AttachedLayout newValue)
             {
                 oldValue.UninitializeForContext(LayoutContext);
 
-                WeakEventHandlerManager.Unsubscribe<EventArgs, ItemsRepeater>(
-                    oldValue,
-                    nameof(AttachedLayout.MeasureInvalidated),
-                    InvalidateMeasureForLayout);
-                WeakEventHandlerManager.Unsubscribe<EventArgs, ItemsRepeater>(
-                    oldValue,
-                    nameof(AttachedLayout.ArrangeInvalidated),
-                    InvalidateArrangeForLayout);
+                AttachedLayout.MeasureInvalidatedWeakEvent.Unsubscribe(oldValue, this);
+                AttachedLayout.ArrangeInvalidatedWeakEvent.Unsubscribe(oldValue, this);
 
                 // Walk through all the elements and make sure they are cleared
                 foreach (var element in Children)
@@ -748,14 +742,8 @@ private void OnLayoutChanged(AttachedLayout oldValue, AttachedLayout newValue)
             {
                 newValue.InitializeForContext(LayoutContext);
 
-                WeakEventHandlerManager.Subscribe<AttachedLayout, EventArgs, ItemsRepeater>(
-                    newValue,
-                    nameof(AttachedLayout.MeasureInvalidated),
-                    InvalidateMeasureForLayout);
-                WeakEventHandlerManager.Subscribe<AttachedLayout, EventArgs, ItemsRepeater>(
-                    newValue,
-                    nameof(AttachedLayout.ArrangeInvalidated),
-                    InvalidateArrangeForLayout);
+                AttachedLayout.MeasureInvalidatedWeakEvent.Subscribe(newValue, this);
+                AttachedLayout.ArrangeInvalidatedWeakEvent.Subscribe(newValue, this);
             }
 
             bool isVirtualizingLayout = newValue != null && newValue is VirtualizingLayout;
@@ -806,9 +794,13 @@ private void OnRequestBringIntoView(RequestBringIntoViewEventArgs e)
             _viewportManager.OnBringIntoViewRequested(e);
         }
 
-        private void InvalidateMeasureForLayout(object sender, EventArgs e) => InvalidateMeasure();
-
-        private void InvalidateArrangeForLayout(object sender, EventArgs e) => InvalidateArrange();
+        void IWeakEventSubscriber<EventArgs>.OnEvent(object? sender, WeakEvent ev, EventArgs e)
+        {
+            if(ev == AttachedLayout.ArrangeInvalidatedWeakEvent)
+                InvalidateArrange();
+            else if (ev == AttachedLayout.MeasureInvalidatedWeakEvent)
+                InvalidateMeasure();
+        }
 
         private VirtualizingLayoutContext GetLayoutContext()
         {
diff --git a/src/Avalonia.Controls/TopLevel.cs b/src/Avalonia.Controls/TopLevel.cs
index 5d9a0c8eed5..9eb35e0548c 100644
--- a/src/Avalonia.Controls/TopLevel.cs
+++ b/src/Avalonia.Controls/TopLevel.cs
@@ -34,7 +34,7 @@ public abstract class TopLevel : ContentControl,
         IStyleHost,
         ILogicalRoot,
         ITextInputMethodRoot,
-        IWeakSubscriber<ResourcesChangedEventArgs>
+        IWeakEventSubscriber<ResourcesChangedEventArgs>
     {
         /// <summary>
         /// Defines the <see cref="ClientSize"/> property.
@@ -74,6 +74,12 @@ public abstract class TopLevel : ContentControl,
         public static readonly StyledProperty<IBrush> TransparencyBackgroundFallbackProperty =
             AvaloniaProperty.Register<TopLevel, IBrush>(nameof(TransparencyBackgroundFallback), Brushes.White);
 
+        private static readonly WeakEvent<IResourceHost, ResourcesChangedEventArgs>
+            ResourcesChangedWeakEvent = WeakEvent.Register<IResourceHost, ResourcesChangedEventArgs>(
+                (s, h) => s.ResourcesChanged += h,
+                (s, h) => s.ResourcesChanged -= h
+            );
+
         private readonly IInputManager _inputManager;
         private readonly IAccessKeyHandler _accessKeyHandler;
         private readonly IKeyboardNavigationHandler _keyboardNavigationHandler;
@@ -128,6 +134,8 @@ public TopLevel(ITopLevelImpl impl, IAvaloniaDependencyResolver dependencyResolv
                     "Could not create window implementation: maybe no windowing subsystem was initialized?");
             }
 
+            impl = ValidatingToplevelImpl.Wrap(impl);
+            
             PlatformImpl = impl;
 
             _actualTransparencyLevel = PlatformImpl.TransparencyLevel;            
@@ -178,10 +186,7 @@ public TopLevel(ITopLevelImpl impl, IAvaloniaDependencyResolver dependencyResolv
 
             if (((IStyleHost)this).StylingParent is IResourceHost applicationResources)
             {
-                WeakSubscriptionManager.Subscribe(
-                    applicationResources,
-                    nameof(IResourceHost.ResourcesChanged),
-                    this);
+                ResourcesChangedWeakEvent.Subscribe(applicationResources, this);
             }
 
             impl.LostFocus += PlatformImpl_LostFocus;
@@ -286,7 +291,7 @@ IInputElement IInputRoot.PointerOverElement
         /// <inheritdoc/>
         IMouseDevice IInputRoot.MouseDevice => PlatformImpl?.MouseDevice;
 
-        void IWeakSubscriber<ResourcesChangedEventArgs>.OnEvent(object sender, ResourcesChangedEventArgs e)
+        void IWeakEventSubscriber<ResourcesChangedEventArgs>.OnEvent(object sender, WeakEvent ev, ResourcesChangedEventArgs e)
         {
             ((ILogical)this).NotifyResourcesChanged(e);
         }
@@ -364,14 +369,15 @@ protected virtual void HandleClosed()
             Renderer?.Dispose();
             Renderer = null;
             
+            (this as IInputRoot).MouseDevice?.TopLevelClosed(this);
+            PlatformImpl = null;
+            
             var logicalArgs = new LogicalTreeAttachmentEventArgs(this, this, null);
             ((ILogical)this).NotifyDetachedFromLogicalTree(logicalArgs);
 
             var visualArgs = new VisualTreeAttachmentEventArgs(this, this);
             OnDetachedFromVisualTreeCore(visualArgs);
-
-            (this as IInputRoot).MouseDevice?.TopLevelClosed(this);
-            PlatformImpl = null;
+            
             OnClosed(EventArgs.Empty);
 
             LayoutManager?.Dispose();
diff --git a/src/Avalonia.Controls/Utils/CollectionChangedEventManager.cs b/src/Avalonia.Controls/Utils/CollectionChangedEventManager.cs
index 1a190391b7f..74705a0262b 100644
--- a/src/Avalonia.Controls/Utils/CollectionChangedEventManager.cs
+++ b/src/Avalonia.Controls/Utils/CollectionChangedEventManager.cs
@@ -83,7 +83,7 @@ public void RemoveListener(INotifyCollectionChanged collection, ICollectionChang
                 "Collection listener not registered for this collection/listener combination.");
         }
 
-        private class Entry : IWeakSubscriber<NotifyCollectionChangedEventArgs>, IDisposable
+        private class Entry : IWeakEventSubscriber<NotifyCollectionChangedEventArgs>, IDisposable
         {
             private INotifyCollectionChanged _collection;
 
@@ -91,23 +91,18 @@ public Entry(INotifyCollectionChanged collection)
             {
                 _collection = collection;
                 Listeners = new List<WeakReference<ICollectionChangedListener>>();
-                WeakSubscriptionManager.Subscribe(
-                    _collection,
-                    nameof(INotifyCollectionChanged.CollectionChanged),
-                    this);
+                WeakEvents.CollectionChanged.Subscribe(_collection, this);
             }
 
             public List<WeakReference<ICollectionChangedListener>> Listeners { get; }
 
             public void Dispose()
             {
-                WeakSubscriptionManager.Unsubscribe(
-                    _collection,
-                    nameof(INotifyCollectionChanged.CollectionChanged),
-                    this);
+                WeakEvents.CollectionChanged.Unsubscribe(_collection, this);
             }
 
-            void IWeakSubscriber<NotifyCollectionChangedEventArgs>.OnEvent(object? sender, NotifyCollectionChangedEventArgs e)
+            void IWeakEventSubscriber<NotifyCollectionChangedEventArgs>.
+                OnEvent(object? notifyCollectionChanged, WeakEvent ev, NotifyCollectionChangedEventArgs e)
             {
                 static void Notify(
                     INotifyCollectionChanged incc,
diff --git a/src/Avalonia.Controls/ValidatingToplevel.cs b/src/Avalonia.Controls/ValidatingToplevel.cs
new file mode 100644
index 00000000000..d1edd28ebc6
--- /dev/null
+++ b/src/Avalonia.Controls/ValidatingToplevel.cs
@@ -0,0 +1,337 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Controls.Platform;
+using Avalonia.Controls.Primitives.PopupPositioning;
+using Avalonia.Input;
+using Avalonia.Input.Raw;
+using Avalonia.Input.TextInput;
+using Avalonia.Platform;
+using Avalonia.Rendering;
+
+namespace Avalonia.Controls;
+
+internal class ValidatingToplevelImpl : ITopLevelImpl, ITopLevelImplWithNativeControlHost,
+    ITopLevelImplWithNativeMenuExporter, ITopLevelImplWithTextInputMethod
+{
+    private readonly ITopLevelImpl _impl;
+    private bool _disposed;
+
+    public ValidatingToplevelImpl(ITopLevelImpl impl)
+    {
+        _impl = impl ?? throw new InvalidOperationException(
+            "Could not create TopLevel implementation: maybe no windowing subsystem was initialized?");
+    }
+
+    public void Dispose()
+    {
+        _disposed = true;
+        _impl.Dispose();
+    }
+
+    protected void CheckDisposed()
+    {
+        if (_disposed)
+            throw new ObjectDisposedException(_impl.GetType().FullName);
+    }
+
+    protected ITopLevelImpl Inner
+    {
+        get
+        {
+            CheckDisposed();
+            return _impl;
+        }
+    }
+
+    public static ITopLevelImpl Wrap(ITopLevelImpl impl)
+    {
+#if DEBUG
+        if (impl is ValidatingToplevelImpl)
+            return impl;
+        return new ValidatingToplevelImpl(impl);
+#else
+        return impl;
+#endif
+    }
+
+    public Size ClientSize => Inner.ClientSize;
+    public Size? FrameSize => Inner.FrameSize;
+    public double RenderScaling => Inner.RenderScaling;
+    public IEnumerable<object> Surfaces => Inner.Surfaces;
+
+    public Action<RawInputEventArgs> Input
+    {
+        get => Inner.Input;
+        set => Inner.Input = value;
+    }
+
+    public Action<Rect> Paint
+    {
+        get => Inner.Paint;
+        set => Inner.Paint = value;
+    }
+
+    public Action<Size, PlatformResizeReason> Resized
+    {
+        get => Inner.Resized;
+        set => Inner.Resized = value;
+    }
+
+    public Action<double> ScalingChanged
+    {
+        get => Inner.ScalingChanged;
+        set => Inner.ScalingChanged = value;
+    }
+
+    public Action<WindowTransparencyLevel> TransparencyLevelChanged
+    {
+        get => Inner.TransparencyLevelChanged;
+        set => Inner.TransparencyLevelChanged = value;
+    }
+
+    public IRenderer CreateRenderer(IRenderRoot root) => Inner.CreateRenderer(root);
+
+    public void Invalidate(Rect rect) => Inner.Invalidate(rect);
+
+    public void SetInputRoot(IInputRoot inputRoot) => Inner.SetInputRoot(inputRoot);
+
+    public Point PointToClient(PixelPoint point) => Inner.PointToClient(point);
+
+    public PixelPoint PointToScreen(Point point) => Inner.PointToScreen(point);
+
+    public void SetCursor(ICursorImpl cursor) => Inner.SetCursor(cursor);
+
+    public Action Closed
+    {
+        get => Inner.Closed;
+        set => Inner.Closed = value;
+    }
+
+    public Action LostFocus
+    {
+        get => Inner.LostFocus;
+        set => Inner.LostFocus = value;
+    }
+
+    // Exception: for some reason we are notifying platform mouse device from TopLevel.cs
+    public IMouseDevice MouseDevice => _impl.MouseDevice;
+    public IPopupImpl CreatePopup() => Inner.CreatePopup();
+
+    public void SetTransparencyLevelHint(WindowTransparencyLevel transparencyLevel) =>
+        Inner.SetTransparencyLevelHint(transparencyLevel);
+
+
+    public WindowTransparencyLevel TransparencyLevel => Inner.TransparencyLevel;
+    public AcrylicPlatformCompensationLevels AcrylicCompensationLevels => Inner.AcrylicCompensationLevels;
+    public INativeControlHostImpl NativeControlHost => (Inner as ITopLevelImplWithNativeControlHost)?.NativeControlHost;
+
+    public ITopLevelNativeMenuExporter NativeMenuExporter =>
+        (Inner as ITopLevelImplWithNativeMenuExporter)?.NativeMenuExporter;
+
+    public ITextInputMethodImpl TextInputMethod => (Inner as ITopLevelImplWithTextInputMethod)?.TextInputMethod;
+}
+
+internal class ValidatingWindowBaseImpl : ValidatingToplevelImpl, IWindowBaseImpl
+{
+    private readonly IWindowBaseImpl _impl;
+
+    public ValidatingWindowBaseImpl(IWindowBaseImpl impl) : base(impl)
+    {
+        _impl = impl;
+    }
+
+    protected new IWindowBaseImpl Inner
+    {
+        get
+        {
+            CheckDisposed();
+            return _impl;
+        }
+    }
+    
+    public static IWindowBaseImpl Wrap(IWindowBaseImpl impl)
+    {
+#if DEBUG
+        if (impl is ValidatingToplevelImpl)
+            return impl;
+        return new ValidatingWindowBaseImpl(impl);
+#else
+        return impl;
+#endif
+    }
+
+    public void Show(bool activate, bool isDialog) => Inner.Show(activate, isDialog);
+
+    public void Hide() => Inner.Hide();
+
+    public double DesktopScaling => Inner.DesktopScaling;
+    public PixelPoint Position => Inner.Position;
+
+    public Action<PixelPoint> PositionChanged
+    {
+        get => Inner.PositionChanged;
+        set => Inner.PositionChanged = value;
+    }
+
+    public void Activate() => Inner.Activate();
+
+    public Action Deactivated
+    {
+        get => Inner.Deactivated;
+        set => Inner.Deactivated = value;
+    }
+
+    public Action Activated
+    {
+        get => Inner.Activated;
+        set => Inner.Deactivated = value;
+    }
+
+    public IPlatformHandle Handle => Inner.Handle;
+    public Size MaxAutoSizeHint => Inner.MaxAutoSizeHint;
+    public void SetTopmost(bool value) => Inner.SetTopmost(value);
+    public IScreenImpl Screen => Inner.Screen;
+}
+
+internal class ValidatingWindowImpl : ValidatingWindowBaseImpl, IWindowImpl
+{
+    private readonly IWindowImpl _impl;
+
+    public ValidatingWindowImpl(IWindowImpl impl) : base(impl)
+    {
+        _impl = impl;
+    }
+
+    protected new IWindowImpl Inner
+    {
+        get
+        {
+            CheckDisposed();
+            return _impl;
+        }
+    }
+    
+    public static IWindowImpl Wrap(IWindowImpl impl)
+    {
+#if DEBUG
+        if (impl is ValidatingToplevelImpl)
+            return impl;
+        return new ValidatingWindowImpl(impl);
+#else
+        return impl;
+#endif
+    }
+
+    public WindowState WindowState
+    {
+        get => Inner.WindowState;
+        set => Inner.WindowState = value;
+    }
+
+    public Action<WindowState> WindowStateChanged
+    {
+        get => Inner.WindowStateChanged;
+        set => Inner.WindowStateChanged = value;
+    }
+
+    public void SetTitle(string title) => Inner.SetTitle(title);
+
+    public void SetParent(IWindowImpl parent)
+    {
+        //Workaround. SetParent will cast IWindowImpl to WindowImpl but  ValidatingWindowImpl isn't actual WindowImpl so it will fail with InvalidCastException.
+        if (parent is ValidatingWindowImpl validatingToplevelImpl)
+        {
+            Inner.SetParent(validatingToplevelImpl.Inner);
+        }
+        else
+        {
+            Inner.SetParent(parent);
+        }
+    }
+
+    public void SetEnabled(bool enable) => Inner.SetEnabled(enable);
+
+    public Action GotInputWhenDisabled
+    {
+        get => Inner.GotInputWhenDisabled;
+        set => Inner.GotInputWhenDisabled = value;
+    }
+
+    public void SetSystemDecorations(SystemDecorations enabled) => Inner.SetSystemDecorations(enabled);
+
+    public void SetIcon(IWindowIconImpl icon) => Inner.SetIcon(icon);
+
+    public void ShowTaskbarIcon(bool value) => Inner.ShowTaskbarIcon(value);
+
+    public void CanResize(bool value) => Inner.CanResize(value);
+
+    public Func<bool> Closing
+    {
+        get => Inner.Closing;
+        set => Inner.Closing = value;
+    }
+
+    public bool IsClientAreaExtendedToDecorations => Inner.IsClientAreaExtendedToDecorations;
+
+    public Action<bool> ExtendClientAreaToDecorationsChanged
+    {
+        get => Inner.ExtendClientAreaToDecorationsChanged;
+        set => Inner.ExtendClientAreaToDecorationsChanged = value;
+    }
+
+    public bool NeedsManagedDecorations => Inner.NeedsManagedDecorations;
+    public Thickness ExtendedMargins => Inner.ExtendedMargins;
+    public Thickness OffScreenMargin => Inner.OffScreenMargin;
+    public void BeginMoveDrag(PointerPressedEventArgs e) => Inner.BeginMoveDrag(e);
+
+    public void BeginResizeDrag(WindowEdge edge, PointerPressedEventArgs e) => Inner.BeginResizeDrag(edge, e);
+
+    public void Resize(Size clientSize, PlatformResizeReason reason) =>
+        Inner.Resize(clientSize, reason);
+
+    public void Move(PixelPoint point) => Inner.Move(point);
+
+    public void SetMinMaxSize(Size minSize, Size maxSize) => Inner.SetMinMaxSize(minSize, maxSize);
+
+    public void SetExtendClientAreaToDecorationsHint(bool extendIntoClientAreaHint) =>
+        Inner.SetExtendClientAreaToDecorationsHint(extendIntoClientAreaHint);
+
+    public void SetExtendClientAreaChromeHints(ExtendClientAreaChromeHints hints) =>
+        Inner.SetExtendClientAreaChromeHints(hints);
+
+    public void SetExtendClientAreaTitleBarHeightHint(double titleBarHeight) =>
+        Inner.SetExtendClientAreaTitleBarHeightHint(titleBarHeight);
+}
+
+internal class ValidatingPopupImpl : ValidatingWindowBaseImpl, IPopupImpl
+{
+    private readonly IPopupImpl _impl;
+
+    public ValidatingPopupImpl(IPopupImpl impl) : base(impl)
+    {
+        _impl = impl;
+    }
+
+    protected new IPopupImpl Inner
+    {
+        get
+        {
+            CheckDisposed();
+            return _impl;
+        }
+    }
+    
+    public static IPopupImpl Wrap(IPopupImpl impl)
+    {
+#if DEBUG
+        if (impl is ValidatingToplevelImpl)
+            return impl;
+        return new ValidatingPopupImpl(impl);
+#else
+        return impl;
+#endif
+    }
+
+    public IPopupPositioner PopupPositioner => Inner.PopupPositioner;
+    public void SetWindowManagerAddShadowHint(bool enabled) => Inner.SetWindowManagerAddShadowHint(enabled);
+}
diff --git a/src/Avalonia.Controls/Window.cs b/src/Avalonia.Controls/Window.cs
index fab69021d0f..e94d42ed70b 100644
--- a/src/Avalonia.Controls/Window.cs
+++ b/src/Avalonia.Controls/Window.cs
@@ -238,13 +238,14 @@ public Window()
         /// </summary>
         /// <param name="impl">The window implementation.</param>
         public Window(IWindowImpl impl)
-            : base(impl)
+            : base(ValidatingWindowImpl.Wrap(impl))
         {
-            impl.Closing = HandleClosing;
-            impl.GotInputWhenDisabled = OnGotInputWhenDisabled;
-            impl.WindowStateChanged = HandleWindowStateChanged;
+            var wrapped = (IWindowImpl)base.PlatformImpl!;
+            wrapped.Closing = HandleClosing;
+            wrapped.GotInputWhenDisabled = OnGotInputWhenDisabled;
+            wrapped.WindowStateChanged = HandleWindowStateChanged;
             _maxPlatformClientSize = PlatformImpl?.MaxAutoSizeHint ?? default(Size);
-            impl.ExtendClientAreaToDecorationsChanged = ExtendClientAreaToDecorationsChanged;            
+            wrapped.ExtendClientAreaToDecorationsChanged = ExtendClientAreaToDecorationsChanged;            
             this.GetObservable(ClientSizeProperty).Skip(1).Subscribe(x => PlatformImpl?.Resize(x, PlatformResizeReason.Application));
 
             PlatformImpl?.ShowTaskbarIcon(ShowInTaskbar);
diff --git a/src/Avalonia.Controls/WindowBase.cs b/src/Avalonia.Controls/WindowBase.cs
index 214d77c7ae5..00135465bc0 100644
--- a/src/Avalonia.Controls/WindowBase.cs
+++ b/src/Avalonia.Controls/WindowBase.cs
@@ -58,12 +58,13 @@ public WindowBase(IWindowBaseImpl impl) : this(impl, AvaloniaLocator.Current)
         {
         }
 
-        public WindowBase(IWindowBaseImpl impl, IAvaloniaDependencyResolver dependencyResolver) : base(impl, dependencyResolver)
+        public WindowBase(IWindowBaseImpl impl, IAvaloniaDependencyResolver dependencyResolver) : base(ValidatingWindowBaseImpl.Wrap(impl), dependencyResolver)
         {
             Screens = new Screens(PlatformImpl?.Screen);
-            impl.Activated = HandleActivated;
-            impl.Deactivated = HandleDeactivated;
-            impl.PositionChanged = HandlePositionChanged;
+            var wrapped = PlatformImpl!;
+            wrapped.Activated = HandleActivated;
+            wrapped.Deactivated = HandleDeactivated;
+            wrapped.PositionChanged = HandlePositionChanged;
         }
 
         /// <summary>
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml
index 45bfe5ff817..c32638f6caf 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml
@@ -2,6 +2,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:views="clr-namespace:Avalonia.Diagnostics.Views"
         xmlns:diag="clr-namespace:Avalonia.Diagnostics"
+        xmlns:default="using:Avalonia.Themes.Default"
         Title="Avalonia DevTools"
         x:Class="Avalonia.Diagnostics.Views.MainWindow">
   <Window.DataTemplates>
@@ -9,8 +10,7 @@
   </Window.DataTemplates>
   
   <Window.Styles>
-    <StyleInclude Source="resm:Avalonia.Themes.Default.DefaultTheme.xaml?assembly=Avalonia.Themes.Default"/>
-    <StyleInclude Source="resm:Avalonia.Themes.Default.Accents.BaseLight.xaml?assembly=Avalonia.Themes.Default"/>
+    <default:SimpleTheme Mode="Light"/>
     <StyleInclude Source="resm:Avalonia.Controls.DataGrid.Themes.Default.xaml?assembly=Avalonia.Controls.DataGrid"/>
     <Style Selector="DataGrid ContextMenu">
       <Setter Property="Foreground" Value="Black"/>
diff --git a/src/Avalonia.Dialogs/AboutAvaloniaDialog.xaml b/src/Avalonia.Dialogs/AboutAvaloniaDialog.xaml
index 08e8798cd50..c959fdc143a 100644
--- a/src/Avalonia.Dialogs/AboutAvaloniaDialog.xaml
+++ b/src/Avalonia.Dialogs/AboutAvaloniaDialog.xaml
@@ -95,7 +95,7 @@
       </StackPanel>
       <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" >
         <TextBlock Text="Chat Room | " />
-        <Button Classes="Hyperlink" CommandParameter="https://gitter.im/AvaloniaUI/Avalonia/"  />
+        <Button Classes="Hyperlink" CommandParameter="https://t.me/Avalonia"  />
       </StackPanel>
      </StackPanel> 
     <StackPanel VerticalAlignment="Bottom" Margin="10">
diff --git a/src/Avalonia.Dialogs/ApiCompatBaseline.txt b/src/Avalonia.Dialogs/ApiCompatBaseline.txt
new file mode 100644
index 00000000000..9cb1b470156
--- /dev/null
+++ b/src/Avalonia.Dialogs/ApiCompatBaseline.txt
@@ -0,0 +1,3 @@
+Compat issues with assembly Avalonia.Dialogs:
+CannotRemoveBaseTypeOrInterface : Type 'Avalonia.Dialogs.AboutAvaloniaDialog' does not implement interface 'Avalonia.Utilities.IWeakSubscriber<Avalonia.Controls.ResourcesChangedEventArgs>' in the implementation but it does in the contract.
+Total Issues: 1
diff --git a/src/Avalonia.Dialogs/Avalonia.Dialogs.csproj b/src/Avalonia.Dialogs/Avalonia.Dialogs.csproj
index 475a3655e4b..770d15ea277 100644
--- a/src/Avalonia.Dialogs/Avalonia.Dialogs.csproj
+++ b/src/Avalonia.Dialogs/Avalonia.Dialogs.csproj
@@ -5,6 +5,7 @@
 
   <ItemGroup>
     <AvaloniaResource Include="Assets\*" />
+    <AvaloniaResource Include="**/*.xaml" />
   </ItemGroup>
 
   <Import Project="..\..\build\BuildTargets.targets" />
diff --git a/src/Avalonia.Input/KeyBinding.cs b/src/Avalonia.Input/KeyBinding.cs
index 856157eafa0..7cb4f443f3f 100644
--- a/src/Avalonia.Input/KeyBinding.cs
+++ b/src/Avalonia.Input/KeyBinding.cs
@@ -35,9 +35,11 @@ public void TryHandle(KeyEventArgs args)
         {
             if (Gesture?.Matches(args) == true)
             {
-                args.Handled = true;
-                if (Command?.CanExecute(CommandParameter) == true)
+                if (Command?.CanExecute(CommandParameter) == true) 
+                {
+                    args.Handled = true;
                     Command.Execute(CommandParameter);
+                }
             }
         }
     }
diff --git a/src/Avalonia.Layout/AttachedLayout.cs b/src/Avalonia.Layout/AttachedLayout.cs
index 6c884641f86..ece8bbe8052 100644
--- a/src/Avalonia.Layout/AttachedLayout.cs
+++ b/src/Avalonia.Layout/AttachedLayout.cs
@@ -4,6 +4,7 @@
 // Licensed to The Avalonia Project under MIT License, courtesy of The .NET Foundation.
 
 using System;
+using Avalonia.Utilities;
 
 namespace Avalonia.Layout
 {
@@ -19,10 +20,26 @@ public abstract class AttachedLayout : AvaloniaObject
         /// </summary>
         public event EventHandler? MeasureInvalidated;
 
+        /// <summary>
+        /// Occurs when the measurement state (layout) has been invalidated.
+        /// </summary>
+        public static readonly WeakEvent<AttachedLayout, EventArgs> MeasureInvalidatedWeakEvent =
+            WeakEvent.Register<AttachedLayout>(
+                (s, h) => s.MeasureInvalidated += h,
+                (s, h) => s.MeasureInvalidated -= h);
+
         /// <summary>
         /// Occurs when the arrange state (layout) has been invalidated.
         /// </summary>
         public event EventHandler? ArrangeInvalidated;
+        
+        /// <summary>
+        /// Occurs when the arrange state (layout) has been invalidated.
+        /// </summary>
+        public static readonly WeakEvent<AttachedLayout, EventArgs> ArrangeInvalidatedWeakEvent =
+            WeakEvent.Register<AttachedLayout>(
+                (s, h) => s.ArrangeInvalidated += h,
+                (s, h) => s.ArrangeInvalidated -= h);
 
         /// <summary>
         /// Initializes any per-container state the layout requires when it is attached to an
diff --git a/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs b/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs
index 57a87012020..de6ba30a858 100644
--- a/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs
+++ b/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs
@@ -70,81 +70,83 @@ private NativeMenu CreateDefaultAppMenu()
             var result = new NativeMenu();
 
             var aboutItem = new NativeMenuItem("About Avalonia");
-            aboutItem.Click += async (sender, e) =>
+            
+            aboutItem.Click += async (_, _) =>
             {
                 var dialog = new AboutAvaloniaDialog();
 
-                var mainWindow = (Application.Current.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime)?.MainWindow;
-
-                await dialog.ShowDialog(mainWindow);
+                if (Application.Current is
+                    { ApplicationLifetime: IClassicDesktopStyleApplicationLifetime { MainWindow: { } mainWindow } })
+                {
+                    await dialog.ShowDialog(mainWindow);   
+                }
             };
+            
             result.Add(aboutItem);
 
-            var macOpts = AvaloniaLocator.Current.GetService<MacOSPlatformOptions>();
-            if (macOpts == null || !macOpts.DisableDefaultApplicationMenuItems)
-            {
-                result.Add(new NativeMenuItemSeparator());
+            return result;
+        }
 
-                var servicesMenu = new NativeMenuItem("Services");
-                servicesMenu.Menu = new NativeMenu
-                {
-                    [MacOSNativeMenuCommands.IsServicesSubmenuProperty] = true
-                };
-                result.Add(servicesMenu);
+        private void PopulateStandardOSXMenuItems(NativeMenu appMenu)
+        {
+            appMenu.Add(new NativeMenuItemSeparator());
 
-                result.Add(new NativeMenuItemSeparator());
+            var servicesMenu = new NativeMenuItem("Services");
+            servicesMenu.Menu = new NativeMenu { [MacOSNativeMenuCommands.IsServicesSubmenuProperty] = true };
 
-                var hideItem = new NativeMenuItem("Hide " + Application.Current.Name)
-                {
-                    Gesture = new KeyGesture(Key.H, KeyModifiers.Meta)
-                };
-                hideItem.Click += (sender, args) =>
-                {
-                    _applicationCommands.HideApp();
-                };
-                result.Add(hideItem);
+            appMenu.Add(servicesMenu);
 
+            appMenu.Add(new NativeMenuItemSeparator());
 
-                var hideOthersItem = new NativeMenuItem("Hide Others")
-                {
-                    Gesture = new KeyGesture(Key.Q, KeyModifiers.Meta | KeyModifiers.Alt)
-                };
-                hideOthersItem.Click += (sender, args) =>
-                {
-                    _applicationCommands.HideOthers();
-                };
-                result.Add(hideOthersItem);
+            var hideItem = new NativeMenuItem("Hide " + (Application.Current?.Name ?? "Application"))
+            {
+                Gesture = new KeyGesture(Key.H, KeyModifiers.Meta)
+            };
 
+            hideItem.Click += (_, _) =>
+            {
+                _applicationCommands.HideApp();
+            };
 
-                var showAllItem = new NativeMenuItem("Show All");
-                showAllItem.Click += (sender, args) =>
-                {
-                    _applicationCommands.ShowAll();
-                };
-                result.Add(showAllItem);
+            appMenu.Add(hideItem);
 
-                result.Add(new NativeMenuItemSeparator());
+            var hideOthersItem = new NativeMenuItem("Hide Others")
+            {
+                Gesture = new KeyGesture(Key.Q, KeyModifiers.Meta | KeyModifiers.Alt)
+            };
+            hideOthersItem.Click += (_, _) =>
+            {
+                _applicationCommands.HideOthers();
+            };
+            appMenu.Add(hideOthersItem);
 
-                var quitItem = new NativeMenuItem("Quit")
-                {
-                    Gesture = new KeyGesture(Key.Q, KeyModifiers.Meta)
-                };
-                quitItem.Click += (sender, args) =>
-                {
-                    (Application.Current.ApplicationLifetime as IControlledApplicationLifetime)?.Shutdown();
-                };
-                result.Add(quitItem);
-            }
+            var showAllItem = new NativeMenuItem("Show All");
+            showAllItem.Click += (_, _) =>
+            {
+                _applicationCommands.ShowAll();
+            };
 
+            appMenu.Add(showAllItem);
 
-            return result;
+            appMenu.Add(new NativeMenuItemSeparator());
+
+            var quitItem = new NativeMenuItem("Quit") { Gesture = new KeyGesture(Key.Q, KeyModifiers.Meta) };
+            quitItem.Click += (_, _) =>
+            {
+                if (Application.Current is { ApplicationLifetime: IControlledApplicationLifetime lifetime })
+                {
+                    lifetime.Shutdown();
+                }
+            };
+
+            appMenu.Add(quitItem);
         }
 
         private void DoLayoutReset(bool forceUpdate = false)
         {
-            var macOpts = AvaloniaLocator.Current.GetService<MacOSPlatformOptions>();
+            var macOpts = AvaloniaLocator.Current.GetService<MacOSPlatformOptions>() ?? new MacOSPlatformOptions();
 
-            if (macOpts != null && macOpts.DisableNativeMenus)
+            if (macOpts.DisableNativeMenus)
             {
                 return;
             }
@@ -220,6 +222,13 @@ private void SetMenu(NativeMenu menu)
 
                 _nativeMenu.Initialize(this, appMenuHolder, "");
 
+                var macOpts = AvaloniaLocator.Current.GetService<MacOSPlatformOptions>();
+
+                if (macOpts == null || !macOpts.DisableDefaultApplicationMenuItems)
+                {
+                    PopulateStandardOSXMenuItems(menu);
+                }
+
                 setMenu = true;
             }
 
diff --git a/src/Avalonia.Native/AvaloniaNativePlatform.cs b/src/Avalonia.Native/AvaloniaNativePlatform.cs
index 5fa50f0e7f6..1eadf70b13a 100644
--- a/src/Avalonia.Native/AvaloniaNativePlatform.cs
+++ b/src/Avalonia.Native/AvaloniaNativePlatform.cs
@@ -96,9 +96,9 @@ void DoInitialize(AvaloniaNativePlatformOptions options)
             _factory.Initialize(new GCHandleDeallocator(), applicationPlatform);
             if (_factory.MacOptions != null)
             {
-                var macOpts = AvaloniaLocator.Current.GetService<MacOSPlatformOptions>();
+                var macOpts = AvaloniaLocator.Current.GetService<MacOSPlatformOptions>() ?? new MacOSPlatformOptions();
 
-                _factory.MacOptions.SetShowInDock(macOpts?.ShowInDock != false ? 1 : 0);
+                _factory.MacOptions.SetShowInDock(macOpts.ShowInDock ? 1 : 0);
             }
 
             AvaloniaLocator.CurrentMutable
diff --git a/src/Avalonia.Themes.Default/Accents/Base.xaml b/src/Avalonia.Themes.Default/Accents/Base.xaml
new file mode 100644
index 00000000000..1f7d703b544
--- /dev/null
+++ b/src/Avalonia.Themes.Default/Accents/Base.xaml
@@ -0,0 +1,64 @@
+<Style
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:sys="clr-namespace:System;assembly=netstandard">
+    <Style.Resources>
+        <Color x:Key="ThemeAccentColor">#CC119EDA</Color>
+        <Color x:Key="ThemeAccentColor2">#99119EDA</Color>
+        <Color x:Key="ThemeAccentColor3">#66119EDA</Color>
+        <Color x:Key="ThemeAccentColor4">#33119EDA</Color>
+        <Color x:Key="ThemeForegroundLowColor">#FF808080</Color>
+        <Color x:Key="HighlightForegroundColor">#FFFFFFFF</Color>
+        <Color x:Key="ErrorColor">#FFFF0000</Color>
+        <Color x:Key="ErrorLowColor">#10FF0000</Color>
+        <SolidColorBrush x:Key="HighlightForegroundBrush" Color="{StaticResource HighlightForegroundColor}" />
+        <SolidColorBrush x:Key="ThemeForegroundLowBrush" Color="{StaticResource ThemeForegroundLowColor}" />
+        <SolidColorBrush x:Key="ThemeAccentBrush2" Color="{StaticResource ThemeAccentColor2}" />
+        <SolidColorBrush x:Key="ThemeAccentBrush3" Color="{StaticResource ThemeAccentColor3}" />
+        <SolidColorBrush x:Key="ThemeAccentBrush4" Color="{StaticResource ThemeAccentColor4}" />
+        <SolidColorBrush x:Key="ThemeAccentBrush" Color="{StaticResource ThemeAccentColor}" />
+        <SolidColorBrush x:Key="ErrorBrush" Color="{StaticResource ErrorColor}" />
+        <SolidColorBrush x:Key="ErrorLowBrush" Color="{StaticResource ErrorLowColor}" />
+        <SolidColorBrush
+            x:Key="NotificationCardBackgroundBrush"
+            Opacity="0.75"
+            Color="#444444" />
+        <SolidColorBrush
+            x:Key="NotificationCardInformationBackgroundBrush"
+            Opacity="0.75"
+            Color="#007ACC" />
+        <SolidColorBrush
+            x:Key="NotificationCardSuccessBackgroundBrush"
+            Opacity="0.75"
+            Color="#1F9E45" />
+        <SolidColorBrush
+            x:Key="NotificationCardWarningBackgroundBrush"
+            Opacity="0.75"
+            Color="#FDB328" />
+        <SolidColorBrush
+            x:Key="NotificationCardErrorBackgroundBrush"
+            Opacity="0.75"
+            Color="#BD202C" />
+        <SolidColorBrush x:Key="ThemeControlTransparentBrush" Color="Transparent" />
+        <SolidColorBrush
+            x:Key="DatePickerFlyoutPresenterHighlightFill"
+            Opacity="0.4"
+            Color="{StaticResource ThemeAccentColor}" />
+        <SolidColorBrush
+            x:Key="TimePickerFlyoutPresenterHighlightFill"
+            Opacity="0.4"
+            Color="{StaticResource ThemeAccentColor}" />
+        <Thickness x:Key="ThemeBorderThickness">1</Thickness>
+        <sys:Double x:Key="ThemeDisabledOpacity">0.5</sys:Double>
+
+        <sys:Double x:Key="FontSizeSmall">10</sys:Double>
+        <sys:Double x:Key="FontSizeNormal">12</sys:Double>
+        <sys:Double x:Key="FontSizeLarge">16</sys:Double>
+
+        <sys:Double x:Key="ScrollBarThickness">18</sys:Double>
+        <sys:Double x:Key="ScrollBarThumbThickness">8</sys:Double>
+
+        <sys:Double x:Key="IconElementThemeHeight">20</sys:Double>
+        <sys:Double x:Key="IconElementThemeWidth">20</sys:Double>
+    </Style.Resources>
+</Style>
diff --git a/src/Avalonia.Themes.Default/Accents/BaseDark.xaml b/src/Avalonia.Themes.Default/Accents/BaseDark.xaml
index 5f18bac44ae..1843abebfd4 100644
--- a/src/Avalonia.Themes.Default/Accents/BaseDark.xaml
+++ b/src/Avalonia.Themes.Default/Accents/BaseDark.xaml
@@ -1,13 +1,9 @@
-<Style xmlns="https://github.com/avaloniaui"
-       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-       xmlns:sys="clr-namespace:System;assembly=netstandard">
+<Style
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:sys="clr-namespace:System;assembly=netstandard">
     <Style.Resources>
 
-        <Color x:Key="ThemeAccentColor">#CC119EDA</Color>
-        <Color x:Key="ThemeAccentColor2">#99119EDA</Color>
-        <Color x:Key="ThemeAccentColor3">#66119EDA</Color>
-        <Color x:Key="ThemeAccentColor4">#33119EDA</Color>
-
         <Color x:Key="ThemeBackgroundColor">#FF282828</Color>
         <Color x:Key="ThemeBorderLowColor">#FF505050</Color>
         <Color x:Key="ThemeBorderMidColor">#FF808080</Color>
@@ -21,59 +17,22 @@
         <Color x:Key="ThemeControlHighlightMidColor">#FF828282</Color>
         <Color x:Key="ThemeControlHighlightHighColor">#FF505050</Color>
         <Color x:Key="ThemeForegroundColor">#FFDEDEDE</Color>
-        <Color x:Key="ThemeForegroundLowColor">#FF808080</Color>
-
         <Color x:Key="HighlightColor">#FF119EDA</Color>
-        <Color x:Key="HighlightForegroundColor">#FFFFFFFF</Color>
-        <Color x:Key="ErrorColor">#FFFF0000</Color>
-        <Color x:Key="ErrorLowColor">#10FF0000</Color>
-
-        <SolidColorBrush x:Key="ThemeBackgroundBrush" Color="{DynamicResource ThemeBackgroundColor}"></SolidColorBrush>
-        <SolidColorBrush x:Key="ThemeBorderLowBrush" Color="{DynamicResource ThemeBorderLowColor}"></SolidColorBrush>
-        <SolidColorBrush x:Key="ThemeBorderMidBrush" Color="{DynamicResource ThemeBorderMidColor}"></SolidColorBrush>
-        <SolidColorBrush x:Key="ThemeBorderHighBrush" Color="{DynamicResource ThemeBorderHighColor}"></SolidColorBrush>
-        <SolidColorBrush x:Key="ThemeControlLowBrush" Color="{DynamicResource ThemeControlLowColor}"></SolidColorBrush>
-        <SolidColorBrush x:Key="ThemeControlMidBrush" Color="{DynamicResource ThemeControlMidColor}"></SolidColorBrush>
-        <SolidColorBrush x:Key="ThemeControlMidHighBrush" Color="{DynamicResource ThemeControlMidHighColor}"></SolidColorBrush>
-        <SolidColorBrush x:Key="ThemeControlHighBrush" Color="{DynamicResource ThemeControlHighColor}"></SolidColorBrush>
-        <SolidColorBrush x:Key="ThemeControlVeryHighBrush" Color="{DynamicResource ThemeControlVeryHighColor}"></SolidColorBrush>
-        <SolidColorBrush x:Key="ThemeControlHighlightLowBrush" Color="{DynamicResource ThemeControlHighlightLowColor}"></SolidColorBrush>
-        <SolidColorBrush x:Key="ThemeControlHighlightMidBrush" Color="{DynamicResource ThemeControlHighlightMidColor}"></SolidColorBrush>
-        <SolidColorBrush x:Key="ThemeControlHighlightHighBrush" Color="{DynamicResource ThemeControlHighlightHighColor}"></SolidColorBrush>
-        <SolidColorBrush x:Key="ThemeForegroundBrush" Color="{DynamicResource ThemeForegroundColor}"></SolidColorBrush>
-        <SolidColorBrush x:Key="ThemeForegroundLowBrush" Color="{DynamicResource ThemeForegroundLowColor}"></SolidColorBrush>
-
-        <SolidColorBrush x:Key="HighlightBrush" Color="{DynamicResource HighlightColor}"></SolidColorBrush>
-        <SolidColorBrush x:Key="HighlightForegroundBrush" Color="{DynamicResource HighlightForegroundColor}"></SolidColorBrush>
-        <SolidColorBrush x:Key="ThemeAccentBrush" Color="{DynamicResource ThemeAccentColor}"></SolidColorBrush>
-        <SolidColorBrush x:Key="ThemeAccentBrush2" Color="{DynamicResource ThemeAccentColor2}"></SolidColorBrush>
-        <SolidColorBrush x:Key="ThemeAccentBrush3" Color="{DynamicResource ThemeAccentColor3}"></SolidColorBrush>
-        <SolidColorBrush x:Key="ThemeAccentBrush4" Color="{DynamicResource ThemeAccentColor4}"></SolidColorBrush>
-        <SolidColorBrush x:Key="ErrorBrush" Color="{DynamicResource ErrorColor}"></SolidColorBrush>
-        <SolidColorBrush x:Key="ErrorLowBrush" Color="{DynamicResource ErrorLowColor}"></SolidColorBrush>
-
-        <SolidColorBrush x:Key="NotificationCardBackgroundBrush" Color="#444444" Opacity="0.75"/>
-        <SolidColorBrush x:Key="NotificationCardInformationBackgroundBrush" Color="#007ACC" Opacity="0.75"/>
-        <SolidColorBrush x:Key="NotificationCardSuccessBackgroundBrush" Color="#1F9E45" Opacity="0.75"/>
-        <SolidColorBrush x:Key="NotificationCardWarningBackgroundBrush" Color="#FDB328" Opacity="0.75"/>
-        <SolidColorBrush x:Key="NotificationCardErrorBackgroundBrush" Color="#BD202C" Opacity="0.75"/>
-
-        <SolidColorBrush x:Key="DatePickerFlyoutPresenterHighlightFill" Color="{DynamicResource ThemeAccentColor}" Opacity="0.4" />
-        <SolidColorBrush x:Key="TimePickerFlyoutPresenterHighlightFill" Color="{DynamicResource ThemeAccentColor}" Opacity="0.4" />
-
-        <SolidColorBrush x:Key="ThemeControlTransparentBrush" Color="Transparent" />
-      
-        <Thickness x:Key="ThemeBorderThickness">1,1,1,1</Thickness>
-        <sys:Double x:Key="ThemeDisabledOpacity">0.5</sys:Double>
-
-        <sys:Double x:Key="FontSizeSmall">10</sys:Double>
-        <sys:Double x:Key="FontSizeNormal">12</sys:Double>
-        <sys:Double x:Key="FontSizeLarge">16</sys:Double>
 
-        <sys:Double x:Key="ScrollBarThickness">18</sys:Double>
-        <sys:Double x:Key="ScrollBarThumbThickness">8</sys:Double>
+        <SolidColorBrush x:Key="ThemeBackgroundBrush" Color="{StaticResource ThemeBackgroundColor}" />
+        <SolidColorBrush x:Key="ThemeBorderLowBrush" Color="{StaticResource ThemeBorderLowColor}" />
+        <SolidColorBrush x:Key="ThemeBorderMidBrush" Color="{StaticResource ThemeBorderMidColor}" />
+        <SolidColorBrush x:Key="ThemeBorderHighBrush" Color="{StaticResource ThemeBorderHighColor}" />
+        <SolidColorBrush x:Key="ThemeControlLowBrush" Color="{StaticResource ThemeControlLowColor}" />
+        <SolidColorBrush x:Key="ThemeControlMidBrush" Color="{StaticResource ThemeControlMidColor}" />
+        <SolidColorBrush x:Key="ThemeControlMidHighBrush" Color="{StaticResource ThemeControlMidHighColor}" />
+        <SolidColorBrush x:Key="ThemeControlHighBrush" Color="{StaticResource ThemeControlHighColor}" />
+        <SolidColorBrush x:Key="ThemeControlVeryHighBrush" Color="{StaticResource ThemeControlVeryHighColor}" />
+        <SolidColorBrush x:Key="ThemeControlHighlightLowBrush" Color="{StaticResource ThemeControlHighlightLowColor}" />
+        <SolidColorBrush x:Key="ThemeControlHighlightMidBrush" Color="{StaticResource ThemeControlHighlightMidColor}" />
+        <SolidColorBrush x:Key="ThemeControlHighlightHighBrush" Color="{StaticResource ThemeControlHighlightHighColor}" />
+        <SolidColorBrush x:Key="ThemeForegroundBrush" Color="{StaticResource ThemeForegroundColor}" />
+        <SolidColorBrush x:Key="HighlightBrush" Color="{StaticResource HighlightColor}" />
 
-        <sys:Double x:Key="IconElementThemeHeight">20</sys:Double>
-        <sys:Double x:Key="IconElementThemeWidth">20</sys:Double>
     </Style.Resources>
 </Style>
diff --git a/src/Avalonia.Themes.Default/Accents/BaseLight.xaml b/src/Avalonia.Themes.Default/Accents/BaseLight.xaml
index 30c6d398568..6247815303c 100644
--- a/src/Avalonia.Themes.Default/Accents/BaseLight.xaml
+++ b/src/Avalonia.Themes.Default/Accents/BaseLight.xaml
@@ -1,82 +1,38 @@
-<Style xmlns="https://github.com/avaloniaui"
-       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-       xmlns:sys="clr-namespace:System;assembly=netstandard">
+<Style
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:sys="clr-namespace:System;assembly=netstandard">
     <Style.Resources>
 
-        <Color x:Key="ThemeAccentColor">#CC119EDA</Color>
-        <Color x:Key="ThemeAccentColor2">#99119EDA</Color>
-        <Color x:Key="ThemeAccentColor3">#66119EDA</Color>
-        <Color x:Key="ThemeAccentColor4">#33119EDA</Color>
-
         <Color x:Key="ThemeBackgroundColor">#FFFFFFFF</Color>
         <Color x:Key="ThemeBorderLowColor">#FFAAAAAA</Color>
         <Color x:Key="ThemeBorderMidColor">#FF888888</Color>
         <Color x:Key="ThemeBorderHighColor">#FF333333</Color>
-      
-      
         <Color x:Key="ThemeControlLowColor">#FF868999</Color>
         <Color x:Key="ThemeControlMidColor">#FFF5F5F5</Color>
         <Color x:Key="ThemeControlMidHighColor">#FFC2C3C9</Color>
         <Color x:Key="ThemeControlHighColor">#FF686868</Color>
         <Color x:Key="ThemeControlVeryHighColor">#FF5B5B5B</Color>
-
         <Color x:Key="ThemeControlHighlightLowColor">#FFF0F0F0</Color>
         <Color x:Key="ThemeControlHighlightMidColor">#FFD0D0D0</Color>
         <Color x:Key="ThemeControlHighlightHighColor">#FF808080</Color>
         <Color x:Key="ThemeForegroundColor">#FF000000</Color>
-        <Color x:Key="ThemeForegroundLowColor">#FF808080</Color>
-
         <Color x:Key="HighlightColor">#FF086F9E</Color>
-        <Color x:Key="HighlightForegroundColor">#FFFFFFFF</Color>
-        <Color x:Key="ErrorColor">#FFFF0000</Color>
-        <Color x:Key="ErrorLowColor">#10FF0000</Color>
-
-        <SolidColorBrush x:Key="ThemeBackgroundBrush" Color="{DynamicResource ThemeBackgroundColor}"></SolidColorBrush>
-        <SolidColorBrush x:Key="ThemeBorderLowBrush" Color="{DynamicResource ThemeBorderLowColor}"></SolidColorBrush>
-        <SolidColorBrush x:Key="ThemeBorderMidBrush" Color="{DynamicResource ThemeBorderMidColor}"></SolidColorBrush>
-        <SolidColorBrush x:Key="ThemeBorderHighBrush" Color="{DynamicResource ThemeBorderHighColor}"></SolidColorBrush>
-        <SolidColorBrush x:Key="ThemeControlLowBrush" Color="{DynamicResource ThemeControlLowColor}"></SolidColorBrush>
-        <SolidColorBrush x:Key="ThemeControlMidBrush" Color="{DynamicResource ThemeControlMidColor}"></SolidColorBrush>
-        <SolidColorBrush x:Key="ThemeControlMidHighBrush" Color="{DynamicResource ThemeControlMidHighColor}"></SolidColorBrush>
-        <SolidColorBrush x:Key="ThemeControlHighBrush" Color="{DynamicResource ThemeControlHighColor}"></SolidColorBrush>
-        <SolidColorBrush x:Key="ThemeControlVeryHighBrush" Color="{DynamicResource ThemeControlVeryHighColor}"></SolidColorBrush>
-        <SolidColorBrush x:Key="ThemeControlHighlightLowBrush" Color="{DynamicResource ThemeControlHighlightLowColor}"></SolidColorBrush>
-        <SolidColorBrush x:Key="ThemeControlHighlightMidBrush" Color="{DynamicResource ThemeControlHighlightMidColor}"></SolidColorBrush>
-        <SolidColorBrush x:Key="ThemeControlHighlightHighBrush" Color="{DynamicResource ThemeControlHighlightHighColor}"></SolidColorBrush>
-        <SolidColorBrush x:Key="ThemeForegroundBrush" Color="{DynamicResource ThemeForegroundColor}"></SolidColorBrush>
-        <SolidColorBrush x:Key="ThemeForegroundLowBrush" Color="{DynamicResource ThemeForegroundLowColor}"></SolidColorBrush>
-
-        <SolidColorBrush x:Key="HighlightBrush" Color="{DynamicResource HighlightColor}"></SolidColorBrush>
-        <SolidColorBrush x:Key="HighlightForegroundBrush" Color="{DynamicResource HighlightForegroundColor}"></SolidColorBrush>
-        <SolidColorBrush x:Key="ThemeAccentBrush" Color="{DynamicResource ThemeAccentColor}"></SolidColorBrush>
-        <SolidColorBrush x:Key="ThemeAccentBrush2" Color="{DynamicResource ThemeAccentColor2}"></SolidColorBrush>
-        <SolidColorBrush x:Key="ThemeAccentBrush3" Color="{DynamicResource ThemeAccentColor3}"></SolidColorBrush>
-        <SolidColorBrush x:Key="ThemeAccentBrush4" Color="{DynamicResource ThemeAccentColor4}"></SolidColorBrush>
-        <SolidColorBrush x:Key="ErrorBrush" Color="{DynamicResource ErrorColor}"></SolidColorBrush>
-        <SolidColorBrush x:Key="ErrorLowBrush" Color="{DynamicResource ErrorLowColor}"></SolidColorBrush>
-
-        <SolidColorBrush x:Key="NotificationCardBackgroundBrush" Color="#444444" Opacity="0.75"/>
-        <SolidColorBrush x:Key="NotificationCardInformationBackgroundBrush" Color="#007ACC" Opacity="0.75"/>
-        <SolidColorBrush x:Key="NotificationCardSuccessBackgroundBrush" Color="#1F9E45" Opacity="0.75"/>
-        <SolidColorBrush x:Key="NotificationCardWarningBackgroundBrush" Color="#FDB328" Opacity="0.75"/>
-        <SolidColorBrush x:Key="NotificationCardErrorBackgroundBrush" Color="#BD202C" Opacity="0.75"/>
-
-        <SolidColorBrush x:Key="DatePickerFlyoutPresenterHighlightFill" Color="{DynamicResource ThemeAccentColor}" Opacity="0.4" />
-        <SolidColorBrush x:Key="TimePickerFlyoutPresenterHighlightFill" Color="{DynamicResource ThemeAccentColor}" Opacity="0.4" />
-      
-        <SolidColorBrush x:Key="ThemeControlTransparentBrush" Color="Transparent" />
-
-        <Thickness x:Key="ThemeBorderThickness">1</Thickness>
-        <sys:Double x:Key="ThemeDisabledOpacity">0.5</sys:Double>
-
-        <sys:Double x:Key="FontSizeSmall">10</sys:Double>
-        <sys:Double x:Key="FontSizeNormal">12</sys:Double>
-        <sys:Double x:Key="FontSizeLarge">16</sys:Double>
-
-        <sys:Double x:Key="ScrollBarThickness">18</sys:Double>
-        <sys:Double x:Key="ScrollBarThumbThickness">8</sys:Double>
 
-        <sys:Double x:Key="IconElementThemeHeight">20</sys:Double>
-        <sys:Double x:Key="IconElementThemeWidth">20</sys:Double>
+        <SolidColorBrush x:Key="ThemeBackgroundBrush" Color="{StaticResource ThemeBackgroundColor}" />
+        <SolidColorBrush x:Key="ThemeBorderLowBrush" Color="{StaticResource ThemeBorderLowColor}" />
+        <SolidColorBrush x:Key="ThemeBorderMidBrush" Color="{StaticResource ThemeBorderMidColor}" />
+        <SolidColorBrush x:Key="ThemeBorderHighBrush" Color="{StaticResource ThemeBorderHighColor}" />
+        <SolidColorBrush x:Key="ThemeControlLowBrush" Color="{StaticResource ThemeControlLowColor}" />
+        <SolidColorBrush x:Key="ThemeControlMidBrush" Color="{StaticResource ThemeControlMidColor}" />
+        <SolidColorBrush x:Key="ThemeControlMidHighBrush" Color="{StaticResource ThemeControlMidHighColor}" />
+        <SolidColorBrush x:Key="ThemeControlHighBrush" Color="{StaticResource ThemeControlHighColor}" />
+        <SolidColorBrush x:Key="ThemeControlVeryHighBrush" Color="{StaticResource ThemeControlVeryHighColor}" />
+        <SolidColorBrush x:Key="ThemeControlHighlightLowBrush" Color="{StaticResource ThemeControlHighlightLowColor}" />
+        <SolidColorBrush x:Key="ThemeControlHighlightMidBrush" Color="{StaticResource ThemeControlHighlightMidColor}" />
+        <SolidColorBrush x:Key="ThemeControlHighlightHighBrush" Color="{StaticResource ThemeControlHighlightHighColor}" />
+        <SolidColorBrush x:Key="ThemeForegroundBrush" Color="{StaticResource ThemeForegroundColor}" />
+
+        <SolidColorBrush x:Key="HighlightBrush" Color="{StaticResource HighlightColor}" />
     </Style.Resources>
 </Style>
diff --git a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
index 678f75b43fa..ef200b5532e 100644
--- a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
+++ b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
@@ -13,10 +13,7 @@
     <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
     <ProjectReference Include="..\Avalonia.Styling\Avalonia.Styling.csproj" />
     <ProjectReference Include="..\Avalonia.Dialogs\Avalonia.Dialogs.csproj" />
-    <AvaloniaResource Include="DefaultTheme.xaml" />
-    <AvaloniaResource Include="Accents/*.xaml" />
-    <!-- Compatibility with old apps, probably need to replace with AvaloniaResource -->
-    <EmbeddedResource Include="**/*.xaml" />
+    <AvaloniaResource Include="**/*.xaml" />
   </ItemGroup>
   <Import Project="..\..\build\BuildTargets.targets" />
   <Import Project="..\..\build\Rx.props" />
diff --git a/src/Avalonia.Themes.Default/AutoCompleteBox.xaml b/src/Avalonia.Themes.Default/Controls/AutoCompleteBox.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/AutoCompleteBox.xaml
rename to src/Avalonia.Themes.Default/Controls/AutoCompleteBox.xaml
diff --git a/src/Avalonia.Themes.Default/Button.xaml b/src/Avalonia.Themes.Default/Controls/Button.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Button.xaml
rename to src/Avalonia.Themes.Default/Controls/Button.xaml
diff --git a/src/Avalonia.Themes.Default/ButtonSpinner.xaml b/src/Avalonia.Themes.Default/Controls/ButtonSpinner.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/ButtonSpinner.xaml
rename to src/Avalonia.Themes.Default/Controls/ButtonSpinner.xaml
diff --git a/src/Avalonia.Themes.Default/Calendar.xaml b/src/Avalonia.Themes.Default/Controls/Calendar.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Calendar.xaml
rename to src/Avalonia.Themes.Default/Controls/Calendar.xaml
diff --git a/src/Avalonia.Themes.Default/CalendarButton.xaml b/src/Avalonia.Themes.Default/Controls/CalendarButton.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/CalendarButton.xaml
rename to src/Avalonia.Themes.Default/Controls/CalendarButton.xaml
diff --git a/src/Avalonia.Themes.Default/CalendarDatePicker.xaml b/src/Avalonia.Themes.Default/Controls/CalendarDatePicker.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/CalendarDatePicker.xaml
rename to src/Avalonia.Themes.Default/Controls/CalendarDatePicker.xaml
diff --git a/src/Avalonia.Themes.Default/CalendarDayButton.xaml b/src/Avalonia.Themes.Default/Controls/CalendarDayButton.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/CalendarDayButton.xaml
rename to src/Avalonia.Themes.Default/Controls/CalendarDayButton.xaml
diff --git a/src/Avalonia.Themes.Default/CalendarItem.xaml b/src/Avalonia.Themes.Default/Controls/CalendarItem.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/CalendarItem.xaml
rename to src/Avalonia.Themes.Default/Controls/CalendarItem.xaml
diff --git a/src/Avalonia.Themes.Default/CaptionButtons.xaml b/src/Avalonia.Themes.Default/Controls/CaptionButtons.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/CaptionButtons.xaml
rename to src/Avalonia.Themes.Default/Controls/CaptionButtons.xaml
diff --git a/src/Avalonia.Themes.Default/Carousel.xaml b/src/Avalonia.Themes.Default/Controls/Carousel.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Carousel.xaml
rename to src/Avalonia.Themes.Default/Controls/Carousel.xaml
diff --git a/src/Avalonia.Themes.Default/CheckBox.xaml b/src/Avalonia.Themes.Default/Controls/CheckBox.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/CheckBox.xaml
rename to src/Avalonia.Themes.Default/Controls/CheckBox.xaml
diff --git a/src/Avalonia.Themes.Default/ComboBox.xaml b/src/Avalonia.Themes.Default/Controls/ComboBox.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/ComboBox.xaml
rename to src/Avalonia.Themes.Default/Controls/ComboBox.xaml
diff --git a/src/Avalonia.Themes.Default/ComboBoxItem.xaml b/src/Avalonia.Themes.Default/Controls/ComboBoxItem.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/ComboBoxItem.xaml
rename to src/Avalonia.Themes.Default/Controls/ComboBoxItem.xaml
diff --git a/src/Avalonia.Themes.Default/ContentControl.xaml b/src/Avalonia.Themes.Default/Controls/ContentControl.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/ContentControl.xaml
rename to src/Avalonia.Themes.Default/Controls/ContentControl.xaml
diff --git a/src/Avalonia.Themes.Default/ContextMenu.xaml b/src/Avalonia.Themes.Default/Controls/ContextMenu.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/ContextMenu.xaml
rename to src/Avalonia.Themes.Default/Controls/ContextMenu.xaml
diff --git a/src/Avalonia.Themes.Default/DataValidationErrors.xaml b/src/Avalonia.Themes.Default/Controls/DataValidationErrors.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/DataValidationErrors.xaml
rename to src/Avalonia.Themes.Default/Controls/DataValidationErrors.xaml
diff --git a/src/Avalonia.Themes.Default/DatePicker.xaml b/src/Avalonia.Themes.Default/Controls/DatePicker.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/DatePicker.xaml
rename to src/Avalonia.Themes.Default/Controls/DatePicker.xaml
diff --git a/src/Avalonia.Themes.Default/EmbeddableControlRoot.xaml b/src/Avalonia.Themes.Default/Controls/EmbeddableControlRoot.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/EmbeddableControlRoot.xaml
rename to src/Avalonia.Themes.Default/Controls/EmbeddableControlRoot.xaml
diff --git a/src/Avalonia.Themes.Default/Expander.xaml b/src/Avalonia.Themes.Default/Controls/Expander.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Expander.xaml
rename to src/Avalonia.Themes.Default/Controls/Expander.xaml
diff --git a/src/Avalonia.Themes.Default/FlyoutPresenter.xaml b/src/Avalonia.Themes.Default/Controls/FlyoutPresenter.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/FlyoutPresenter.xaml
rename to src/Avalonia.Themes.Default/Controls/FlyoutPresenter.xaml
diff --git a/src/Avalonia.Themes.Default/FocusAdorner.xaml b/src/Avalonia.Themes.Default/Controls/FocusAdorner.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/FocusAdorner.xaml
rename to src/Avalonia.Themes.Default/Controls/FocusAdorner.xaml
diff --git a/src/Avalonia.Themes.Default/GridSplitter.xaml b/src/Avalonia.Themes.Default/Controls/GridSplitter.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/GridSplitter.xaml
rename to src/Avalonia.Themes.Default/Controls/GridSplitter.xaml
diff --git a/src/Avalonia.Themes.Default/ItemsControl.xaml b/src/Avalonia.Themes.Default/Controls/ItemsControl.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/ItemsControl.xaml
rename to src/Avalonia.Themes.Default/Controls/ItemsControl.xaml
diff --git a/src/Avalonia.Themes.Default/Label.xaml b/src/Avalonia.Themes.Default/Controls/Label.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Label.xaml
rename to src/Avalonia.Themes.Default/Controls/Label.xaml
diff --git a/src/Avalonia.Themes.Default/ListBox.xaml b/src/Avalonia.Themes.Default/Controls/ListBox.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/ListBox.xaml
rename to src/Avalonia.Themes.Default/Controls/ListBox.xaml
diff --git a/src/Avalonia.Themes.Default/ListBoxItem.xaml b/src/Avalonia.Themes.Default/Controls/ListBoxItem.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/ListBoxItem.xaml
rename to src/Avalonia.Themes.Default/Controls/ListBoxItem.xaml
diff --git a/src/Avalonia.Themes.Default/ManagedFileChooser.xaml b/src/Avalonia.Themes.Default/Controls/ManagedFileChooser.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/ManagedFileChooser.xaml
rename to src/Avalonia.Themes.Default/Controls/ManagedFileChooser.xaml
diff --git a/src/Avalonia.Themes.Default/Menu.xaml b/src/Avalonia.Themes.Default/Controls/Menu.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Menu.xaml
rename to src/Avalonia.Themes.Default/Controls/Menu.xaml
diff --git a/src/Avalonia.Themes.Default/MenuFlyoutPresenter.xaml b/src/Avalonia.Themes.Default/Controls/MenuFlyoutPresenter.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/MenuFlyoutPresenter.xaml
rename to src/Avalonia.Themes.Default/Controls/MenuFlyoutPresenter.xaml
diff --git a/src/Avalonia.Themes.Default/MenuItem.xaml b/src/Avalonia.Themes.Default/Controls/MenuItem.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/MenuItem.xaml
rename to src/Avalonia.Themes.Default/Controls/MenuItem.xaml
diff --git a/src/Avalonia.Themes.Default/NativeMenuBar.xaml b/src/Avalonia.Themes.Default/Controls/NativeMenuBar.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/NativeMenuBar.xaml
rename to src/Avalonia.Themes.Default/Controls/NativeMenuBar.xaml
diff --git a/src/Avalonia.Themes.Default/NotificationCard.xaml b/src/Avalonia.Themes.Default/Controls/NotificationCard.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/NotificationCard.xaml
rename to src/Avalonia.Themes.Default/Controls/NotificationCard.xaml
diff --git a/src/Avalonia.Themes.Default/NumericUpDown.xaml b/src/Avalonia.Themes.Default/Controls/NumericUpDown.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/NumericUpDown.xaml
rename to src/Avalonia.Themes.Default/Controls/NumericUpDown.xaml
diff --git a/src/Avalonia.Themes.Default/OverlayPopupHost.xaml b/src/Avalonia.Themes.Default/Controls/OverlayPopupHost.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/OverlayPopupHost.xaml
rename to src/Avalonia.Themes.Default/Controls/OverlayPopupHost.xaml
diff --git a/src/Avalonia.Themes.Default/PathIcon.xaml b/src/Avalonia.Themes.Default/Controls/PathIcon.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/PathIcon.xaml
rename to src/Avalonia.Themes.Default/Controls/PathIcon.xaml
diff --git a/src/Avalonia.Themes.Default/PopupRoot.xaml b/src/Avalonia.Themes.Default/Controls/PopupRoot.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/PopupRoot.xaml
rename to src/Avalonia.Themes.Default/Controls/PopupRoot.xaml
diff --git a/src/Avalonia.Themes.Default/ProgressBar.xaml b/src/Avalonia.Themes.Default/Controls/ProgressBar.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/ProgressBar.xaml
rename to src/Avalonia.Themes.Default/Controls/ProgressBar.xaml
diff --git a/src/Avalonia.Themes.Default/RadioButton.xaml b/src/Avalonia.Themes.Default/Controls/RadioButton.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/RadioButton.xaml
rename to src/Avalonia.Themes.Default/Controls/RadioButton.xaml
diff --git a/src/Avalonia.Themes.Default/RepeatButton.xaml b/src/Avalonia.Themes.Default/Controls/RepeatButton.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/RepeatButton.xaml
rename to src/Avalonia.Themes.Default/Controls/RepeatButton.xaml
diff --git a/src/Avalonia.Themes.Default/ScrollBar.xaml b/src/Avalonia.Themes.Default/Controls/ScrollBar.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/ScrollBar.xaml
rename to src/Avalonia.Themes.Default/Controls/ScrollBar.xaml
diff --git a/src/Avalonia.Themes.Default/ScrollViewer.xaml b/src/Avalonia.Themes.Default/Controls/ScrollViewer.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/ScrollViewer.xaml
rename to src/Avalonia.Themes.Default/Controls/ScrollViewer.xaml
diff --git a/src/Avalonia.Themes.Default/Separator.xaml b/src/Avalonia.Themes.Default/Controls/Separator.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Separator.xaml
rename to src/Avalonia.Themes.Default/Controls/Separator.xaml
diff --git a/src/Avalonia.Themes.Default/Slider.xaml b/src/Avalonia.Themes.Default/Controls/Slider.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Slider.xaml
rename to src/Avalonia.Themes.Default/Controls/Slider.xaml
diff --git a/src/Avalonia.Themes.Default/SplitView.xaml b/src/Avalonia.Themes.Default/Controls/SplitView.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/SplitView.xaml
rename to src/Avalonia.Themes.Default/Controls/SplitView.xaml
diff --git a/src/Avalonia.Themes.Default/TabControl.xaml b/src/Avalonia.Themes.Default/Controls/TabControl.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/TabControl.xaml
rename to src/Avalonia.Themes.Default/Controls/TabControl.xaml
diff --git a/src/Avalonia.Themes.Default/TabItem.xaml b/src/Avalonia.Themes.Default/Controls/TabItem.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/TabItem.xaml
rename to src/Avalonia.Themes.Default/Controls/TabItem.xaml
diff --git a/src/Avalonia.Themes.Default/TabStrip.xaml b/src/Avalonia.Themes.Default/Controls/TabStrip.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/TabStrip.xaml
rename to src/Avalonia.Themes.Default/Controls/TabStrip.xaml
diff --git a/src/Avalonia.Themes.Default/TabStripItem.xaml b/src/Avalonia.Themes.Default/Controls/TabStripItem.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/TabStripItem.xaml
rename to src/Avalonia.Themes.Default/Controls/TabStripItem.xaml
diff --git a/src/Avalonia.Themes.Default/TextBox.xaml b/src/Avalonia.Themes.Default/Controls/TextBox.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/TextBox.xaml
rename to src/Avalonia.Themes.Default/Controls/TextBox.xaml
diff --git a/src/Avalonia.Themes.Default/TimePicker.xaml b/src/Avalonia.Themes.Default/Controls/TimePicker.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/TimePicker.xaml
rename to src/Avalonia.Themes.Default/Controls/TimePicker.xaml
diff --git a/src/Avalonia.Themes.Default/TitleBar.xaml b/src/Avalonia.Themes.Default/Controls/TitleBar.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/TitleBar.xaml
rename to src/Avalonia.Themes.Default/Controls/TitleBar.xaml
diff --git a/src/Avalonia.Themes.Default/ToggleButton.xaml b/src/Avalonia.Themes.Default/Controls/ToggleButton.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/ToggleButton.xaml
rename to src/Avalonia.Themes.Default/Controls/ToggleButton.xaml
diff --git a/src/Avalonia.Themes.Default/ToggleSwitch.xaml b/src/Avalonia.Themes.Default/Controls/ToggleSwitch.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/ToggleSwitch.xaml
rename to src/Avalonia.Themes.Default/Controls/ToggleSwitch.xaml
diff --git a/src/Avalonia.Themes.Default/ToolTip.xaml b/src/Avalonia.Themes.Default/Controls/ToolTip.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/ToolTip.xaml
rename to src/Avalonia.Themes.Default/Controls/ToolTip.xaml
diff --git a/src/Avalonia.Themes.Default/TreeView.xaml b/src/Avalonia.Themes.Default/Controls/TreeView.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/TreeView.xaml
rename to src/Avalonia.Themes.Default/Controls/TreeView.xaml
diff --git a/src/Avalonia.Themes.Default/TreeViewItem.xaml b/src/Avalonia.Themes.Default/Controls/TreeViewItem.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/TreeViewItem.xaml
rename to src/Avalonia.Themes.Default/Controls/TreeViewItem.xaml
diff --git a/src/Avalonia.Themes.Default/UserControl.xaml b/src/Avalonia.Themes.Default/Controls/UserControl.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/UserControl.xaml
rename to src/Avalonia.Themes.Default/Controls/UserControl.xaml
diff --git a/src/Avalonia.Themes.Default/Window.xaml b/src/Avalonia.Themes.Default/Controls/Window.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Window.xaml
rename to src/Avalonia.Themes.Default/Controls/Window.xaml
diff --git a/src/Avalonia.Themes.Default/WindowNotificationManager.xaml b/src/Avalonia.Themes.Default/Controls/WindowNotificationManager.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/WindowNotificationManager.xaml
rename to src/Avalonia.Themes.Default/Controls/WindowNotificationManager.xaml
diff --git a/src/Avalonia.Themes.Default/DefaultTheme.xaml b/src/Avalonia.Themes.Default/DefaultTheme.xaml
index 109fde390cc..702fcc7c7a2 100644
--- a/src/Avalonia.Themes.Default/DefaultTheme.xaml
+++ b/src/Avalonia.Themes.Default/DefaultTheme.xaml
@@ -2,65 +2,65 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         x:Class="Avalonia.Themes.Default.DefaultTheme">
   <!-- Define ToolTip first so its styles can be overriden by other controls (e.g. TextBox) -->
-  <StyleInclude Source="resm:Avalonia.Themes.Default.ToolTip.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.DataValidationErrors.xaml?assembly=Avalonia.Themes.Default"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/ToolTip.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/DataValidationErrors.xaml"/>
 
-  <StyleInclude Source="resm:Avalonia.Themes.Default.FocusAdorner.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.Button.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.Carousel.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.CheckBox.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.CaptionButtons.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.ComboBox.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.ComboBoxItem.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.ContentControl.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.Label.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.GridSplitter.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.ItemsControl.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.ListBox.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.ListBoxItem.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.Menu.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.ContextMenu.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.MenuItem.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.OverlayPopupHost.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.PathIcon.xaml?assembly=Avalonia.Themes.Default" />
-  <StyleInclude Source="resm:Avalonia.Themes.Default.PopupRoot.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.ProgressBar.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.RadioButton.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.RepeatButton.xaml?assembly=Avalonia.Themes.Default" />
-  <StyleInclude Source="resm:Avalonia.Themes.Default.Separator.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.Slider.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.ScrollBar.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.ScrollViewer.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.TabStrip.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.TabStripItem.xaml?assembly=Avalonia.Themes.Default"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/FocusAdorner.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/Button.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/Carousel.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/CheckBox.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/CaptionButtons.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/ComboBox.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/ComboBoxItem.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/ContentControl.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/Label.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/GridSplitter.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/ItemsControl.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/ListBox.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/ListBoxItem.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/Menu.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/ContextMenu.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/MenuItem.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/OverlayPopupHost.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/PathIcon.xaml" />
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/PopupRoot.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/ProgressBar.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/RadioButton.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/RepeatButton.xaml" />
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/Separator.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/Slider.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/ScrollBar.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/ScrollViewer.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/TabStrip.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/TabStripItem.xaml"/>
   <!-- TabControl needs to come after TabStrip as it redefines the inner TabStrip.ItemsPanel-->
-  <StyleInclude Source="resm:Avalonia.Themes.Default.TabControl.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.TabItem.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.TextBox.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.ToggleButton.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.Expander.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.TitleBar.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.TreeView.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.TreeViewItem.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.UserControl.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.Window.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.EmbeddableControlRoot.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.CalendarButton.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.CalendarDayButton.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.CalendarItem.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.Calendar.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.CalendarDatePicker.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.ButtonSpinner.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.NumericUpDown.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.AutoCompleteBox.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.WindowNotificationManager.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.NotificationCard.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.NativeMenuBar.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.ToggleSwitch.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.SplitView.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.DatePicker.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.TimePicker.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.FlyoutPresenter.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.MenuFlyoutPresenter.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.ManagedFileChooser.xaml?assembly=Avalonia.Themes.Default"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/TabControl.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/TabItem.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/TextBox.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/ToggleButton.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/Expander.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/TitleBar.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/TreeView.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/TreeViewItem.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/UserControl.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/Window.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/EmbeddableControlRoot.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/CalendarButton.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/CalendarDayButton.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/CalendarItem.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/Calendar.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/CalendarDatePicker.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/ButtonSpinner.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/NumericUpDown.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/AutoCompleteBox.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/WindowNotificationManager.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/NotificationCard.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/NativeMenuBar.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/ToggleSwitch.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/SplitView.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/DatePicker.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/TimePicker.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/FlyoutPresenter.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/MenuFlyoutPresenter.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/ManagedFileChooser.xaml"/>
 </Styles>
diff --git a/src/Avalonia.Themes.Default/DefaultTheme.xaml.cs b/src/Avalonia.Themes.Default/DefaultTheme.xaml.cs
index effdb885372..598b418977e 100644
--- a/src/Avalonia.Themes.Default/DefaultTheme.xaml.cs
+++ b/src/Avalonia.Themes.Default/DefaultTheme.xaml.cs
@@ -1,4 +1,3 @@
-using Avalonia.Markup.Xaml;
 using Avalonia.Styling;
 
 namespace Avalonia.Themes.Default
diff --git a/src/Avalonia.Themes.Default/SimpleTheme.cs b/src/Avalonia.Themes.Default/SimpleTheme.cs
new file mode 100644
index 00000000000..1d9f2d5f9d4
--- /dev/null
+++ b/src/Avalonia.Themes.Default/SimpleTheme.cs
@@ -0,0 +1,166 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using Avalonia.Markup.Xaml.Styling;
+using Avalonia.Styling;
+#nullable enable
+
+namespace Avalonia.Themes.Default
+{
+    public class SimpleTheme : AvaloniaObject, IStyle, IResourceProvider
+    {
+        public static readonly StyledProperty<SimpleThemeMode> ModeProperty =
+        AvaloniaProperty.Register<SimpleTheme, SimpleThemeMode>(nameof(Mode));
+
+        private readonly Uri _baseUri;
+        private bool _isLoading;
+        private IStyle? _loaded;
+        private Styles _sharedStyles = new();
+        private Styles _simpleDark = new();
+        private Styles _simpleLight = new();
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SimpleTheme"/> class.
+        /// </summary>
+        /// <param name="baseUri">The base URL for the XAML context.</param>
+        public SimpleTheme(Uri baseUri)
+        {
+            _baseUri = baseUri;
+            InitStyles(_baseUri);
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SimpleTheme"/> class.
+        /// </summary>
+        /// <param name="serviceProvider">The XAML service provider.</param>
+        public SimpleTheme(IServiceProvider serviceProvider)
+        {
+            var service = serviceProvider.GetService(typeof(IUriContext));
+            if (service == null)
+            {
+                throw new Exception("There is no service object of type IUriContext!");
+            }
+            _baseUri = ((IUriContext)service).BaseUri;
+            InitStyles(_baseUri);
+        }
+
+        public event EventHandler OwnerChanged
+        {
+            add
+            {
+                if (Loaded is IResourceProvider rp)
+                {
+                    rp.OwnerChanged += value;
+                }
+            }
+            remove
+            {
+                if (Loaded is IResourceProvider rp)
+                {
+                    rp.OwnerChanged -= value;
+                }
+            }
+        }
+
+        IReadOnlyList<IStyle> IStyle.Children => _loaded?.Children ?? Array.Empty<IStyle>();
+
+        bool IResourceNode.HasResources => (Loaded as IResourceProvider)?.HasResources ?? false;
+
+        public IStyle Loaded
+        {
+            get
+            {
+                if (_loaded == null)
+                {
+                    _isLoading = true;
+
+                    if (Mode == SimpleThemeMode.Light)
+                    {
+                        _loaded = new Styles { _sharedStyles, _simpleLight };
+                    }
+                    else if (Mode == SimpleThemeMode.Dark)
+                    {
+                        _loaded = new Styles { _sharedStyles, _simpleDark };
+                    }
+                    _isLoading = false;
+                }
+
+                return _loaded!;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the mode of the fluent theme (light, dark).
+        /// </summary>
+        public SimpleThemeMode Mode
+        {
+            get => GetValue(ModeProperty);
+            set => SetValue(ModeProperty, value);
+        }
+        public IResourceHost? Owner => (Loaded as IResourceProvider)?.Owner;
+
+        void IResourceProvider.AddOwner(IResourceHost owner) => (Loaded as IResourceProvider)?.AddOwner(owner);
+
+        void IResourceProvider.RemoveOwner(IResourceHost owner) => (Loaded as IResourceProvider)?.RemoveOwner(owner);
+
+        public SelectorMatchResult TryAttach(IStyleable target, IStyleHost? host) => Loaded.TryAttach(target, host);
+
+        public bool TryGetResource(object key, out object? value)
+        {
+            if (!_isLoading && Loaded is IResourceProvider p)
+            {
+                return p.TryGetResource(key, out value);
+            }
+
+            value = null;
+            return false;
+        }
+
+        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        {
+            base.OnPropertyChanged(change);
+            if (change.Property == ModeProperty)
+            {
+                if (Mode == SimpleThemeMode.Dark)
+                {
+                    (Loaded as Styles)![1] = _simpleDark[0];
+                }
+                else
+                {
+                    (Loaded as Styles)![1] = _simpleLight[0];
+                }
+            }
+        }
+
+        private void InitStyles(Uri baseUri)
+        {
+            _sharedStyles = new Styles
+            {
+                new StyleInclude(baseUri)
+                {
+                    Source = new Uri("avares://Avalonia.Themes.Default/DefaultTheme.xaml")
+                },
+                new StyleInclude(baseUri)
+                {
+                    Source = new Uri("avares://Avalonia.Themes.Default/Accents/Base.xaml")
+                }
+            };
+            _simpleLight = new Styles
+            {
+                new StyleInclude(baseUri)
+                {
+                    Source = new Uri("avares://Avalonia.Themes.Default/Accents/BaseLight.xaml")
+                }
+            };
+
+            _simpleDark = new Styles
+            {
+                new StyleInclude(baseUri)
+                {
+                    Source = new Uri("avares://Avalonia.Themes.Default/Accents/BaseDark.xaml")
+                }
+            };
+        }
+
+    }
+}
diff --git a/src/Avalonia.Themes.Default/SimpleThemeMode.cs b/src/Avalonia.Themes.Default/SimpleThemeMode.cs
new file mode 100644
index 00000000000..be334663278
--- /dev/null
+++ b/src/Avalonia.Themes.Default/SimpleThemeMode.cs
@@ -0,0 +1,8 @@
+namespace Avalonia.Themes.Default
+{
+    public enum SimpleThemeMode
+    {
+        Light,
+        Dark
+    }
+}
diff --git a/src/Avalonia.Themes.Fluent/Controls/CalendarButton.xaml b/src/Avalonia.Themes.Fluent/Controls/CalendarButton.xaml
index ca538e4b0ae..3a6af609839 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CalendarButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CalendarButton.xaml
@@ -11,7 +11,7 @@
     <Setter Property="MinWidth" Value="40"/>
     <Setter Property="MinHeight" Value="40"/>
     <Setter Property="Margin" Value="1"/>
-    <Setter Property="Padding" Value="0,0,0,4"/>
+    <Setter Property="Padding" Value="0,0,0,0"/>
     <!--These are actually set on the CalendarView in WinUI-->
     <Setter Property="Foreground" Value="{DynamicResource CalendarViewCalendarItemForeground}"/>
     <Setter Property="Background" Value="{DynamicResource CalendarViewCalendarItemRevealBackground}"/>
diff --git a/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml b/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml
index 6c4e94caf13..26c3bbc19fe 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml
@@ -33,6 +33,7 @@
     
     <Setter Property="Template">
       <ControlTemplate>
+        <DataValidationErrors>
         <Grid ColumnDefinitions="*,Auto">
 
           <Grid.Styles>
@@ -107,7 +108,6 @@
                    Padding="{TemplateBinding Padding}"
                    Watermark="{TemplateBinding Watermark}"
                    UseFloatingWatermark="{TemplateBinding UseFloatingWatermark}"
-                   DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
                    VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                    HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                    Grid.Column="0"/>
@@ -136,8 +136,12 @@
                       DisplayDateEnd="{TemplateBinding DisplayDateEnd}" />
           </Popup>
         </Grid>
+        </DataValidationErrors>
       </ControlTemplate>
     </Setter>
   </Style>
   
+  <Style Selector="CalendarDatePicker:error TextBox /template/ Border#PART_BorderElement">
+    <Setter Property="BorderBrush" Value="{DynamicResource SystemControlErrorTextForegroundBrush}"/>
+  </Style>
 </Styles>
diff --git a/src/Avalonia.Themes.Fluent/Controls/CalendarDayButton.xaml b/src/Avalonia.Themes.Fluent/Controls/CalendarDayButton.xaml
index ff72044c93c..9223c0dd71c 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CalendarDayButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CalendarDayButton.xaml
@@ -11,7 +11,7 @@
     <Setter Property="MinWidth" Value="40"/>
     <Setter Property="MinHeight" Value="40"/>
     <Setter Property="Margin" Value="1"/>
-    <Setter Property="Padding" Value="0,0,0,4"/>
+    <Setter Property="Padding" Value="0,0,0,0"/>
     <!--These are actually set on the CalendarView in WinUI-->
     <Setter Property="Foreground" Value="{DynamicResource CalendarViewCalendarItemForeground}"/>
     <Setter Property="Background" Value="{DynamicResource CalendarViewCalendarItemRevealBackground}"/>
diff --git a/src/Avalonia.Themes.Fluent/Controls/CalendarItem.xaml b/src/Avalonia.Themes.Fluent/Controls/CalendarItem.xaml
index 5bf3ac11af0..2c1031f3e5e 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CalendarItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CalendarItem.xaml
@@ -32,6 +32,7 @@
             <Style Selector="Button.CalendarHeader">
               <Setter Property="HorizontalAlignment" Value="Stretch" />
               <Setter Property="VerticalAlignment" Value="Stretch" />
+              <Setter Property="VerticalContentAlignment" Value="Center" />
               <Setter Property="FontSize" Value="20" />
               <Setter Property="Background" Value="{DynamicResource CalendarViewNavigationButtonBackground}"/>
               <Setter Property="Template">
diff --git a/src/Avalonia.Themes.Fluent/Controls/ListBox.xaml b/src/Avalonia.Themes.Fluent/Controls/ListBox.xaml
index 47704c12bd7..1b4d66405b1 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ListBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ListBox.xaml
@@ -20,6 +20,7 @@
     <Setter Property="Template">
       <ControlTemplate>
         <Border Name="border"
+                ClipToBounds="{TemplateBinding ClipToBounds}"
                 Background="{TemplateBinding Background}"
                 BorderBrush="{TemplateBinding BorderBrush}"
                 BorderThickness="{TemplateBinding BorderThickness}"
diff --git a/src/Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml b/src/Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml
index 1e582593584..36ab07e3e34 100644
--- a/src/Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml
@@ -38,7 +38,7 @@
                        BorderBrush="{TemplateBinding BorderBrush}"
                        CornerRadius="{TemplateBinding CornerRadius}"
                        Padding="0"
-                       MinWidth="{TemplateBinding MinWidth}"
+                       MinWidth="0"
                        HorizontalContentAlignment="Stretch"
                        VerticalContentAlignment="Stretch"
                        AllowSpin="{TemplateBinding AllowSpin}"
@@ -50,7 +50,7 @@
                    BorderBrush="Transparent"
                    Margin="-1"
                    Padding="{TemplateBinding Padding}"
-                   MinWidth="{TemplateBinding MinWidth}"
+                   MinWidth="0"
                    Foreground="{TemplateBinding Foreground}"
                    FontSize="{TemplateBinding FontSize}"
                    Watermark="{TemplateBinding Watermark}"
diff --git a/src/Avalonia.Visuals/Animation/Animators/BaseBrushAnimator.cs b/src/Avalonia.Visuals/Animation/Animators/BaseBrushAnimator.cs
index a2c4b0313bd..5f22254fb5b 100644
--- a/src/Avalonia.Visuals/Animation/Animators/BaseBrushAnimator.cs
+++ b/src/Avalonia.Visuals/Animation/Animators/BaseBrushAnimator.cs
@@ -38,8 +38,8 @@ public static void RegisterBrushAnimator<TAnimator>(Func<Type, bool> condition)
         }
 
         /// <inheritdoc/>
-        public override IDisposable Apply(Animation animation, Animatable control, IClock clock,
-            IObservable<bool> match, Action onComplete)
+        public override IDisposable? Apply(Animation animation, Animatable control, IClock? clock,
+            IObservable<bool> match, Action? onComplete)
         {
             if (TryCreateCustomRegisteredAnimator(out var animator)
                 || TryCreateGradientAnimator(out animator)
@@ -135,9 +135,8 @@ private bool TryCreateSolidColorBrushAnimator([NotNullWhen(true)] out IAnimator?
 
         private bool TryCreateCustomRegisteredAnimator([NotNullWhen(true)] out IAnimator? animator)
         {
-            if (_brushAnimators.Count > 0)
+            if (_brushAnimators.Count > 0 && this[0].Value?.GetType() is Type firstKeyType)
             {
-                var firstKeyType = this[0].Value.GetType();
                 foreach (var (match, animatorType) in _brushAnimators)
                 {
                     if (!match(firstKeyType))
diff --git a/src/Avalonia.Visuals/Animation/Animators/GradientBrushAnimator.cs b/src/Avalonia.Visuals/Animation/Animators/GradientBrushAnimator.cs
index 864e12413fc..0979de16d03 100644
--- a/src/Avalonia.Visuals/Animation/Animators/GradientBrushAnimator.cs
+++ b/src/Avalonia.Visuals/Animation/Animators/GradientBrushAnimator.cs
@@ -58,6 +58,11 @@ public class GradientBrushAnimator : Animator<IGradientBrush?>
 
         public override IDisposable BindAnimation(Animatable control, IObservable<IGradientBrush?> instance)
         {
+            if (Property is null)
+            {
+                throw new InvalidOperationException("Animator has no property specified.");
+            }
+
             return control.Bind((AvaloniaProperty<IBrush?>)Property, instance, BindingPriority.Animation);
         }
 
diff --git a/src/Avalonia.Visuals/Animation/Animators/SolidColorBrushAnimator.cs b/src/Avalonia.Visuals/Animation/Animators/SolidColorBrushAnimator.cs
index 7c6372aae23..57f9f3c1a5f 100644
--- a/src/Avalonia.Visuals/Animation/Animators/SolidColorBrushAnimator.cs
+++ b/src/Avalonia.Visuals/Animation/Animators/SolidColorBrushAnimator.cs
@@ -24,6 +24,11 @@ public class ISolidColorBrushAnimator : Animator<ISolidColorBrush?>
 
         public override IDisposable BindAnimation(Animatable control, IObservable<ISolidColorBrush?> instance)
         {
+            if (Property is null)
+            {
+                throw new InvalidOperationException("Animator has no property specified.");
+            }
+
             return control.Bind((AvaloniaProperty<IBrush?>)Property, instance, BindingPriority.Animation);
         }
     }
diff --git a/src/Avalonia.Visuals/Animation/Animators/TransformAnimator.cs b/src/Avalonia.Visuals/Animation/Animators/TransformAnimator.cs
index 1d7bfd3748e..34ec8ac5030 100644
--- a/src/Avalonia.Visuals/Animation/Animators/TransformAnimator.cs
+++ b/src/Avalonia.Visuals/Animation/Animators/TransformAnimator.cs
@@ -14,10 +14,15 @@ public class TransformAnimator : Animator<double>
         DoubleAnimator? _doubleAnimator;
 
         /// <inheritdoc/>
-        public override IDisposable? Apply(Animation animation, Animatable control, IClock clock, IObservable<bool> obsMatch, Action onComplete)
+        public override IDisposable? Apply(Animation animation, Animatable control, IClock? clock, IObservable<bool> obsMatch, Action? onComplete)
         {
             var ctrl = (Visual)control;
 
+            if (Property is null)
+            {
+                throw new InvalidOperationException("Animator has no property specified.");
+            }
+
             // Check if the Target Property is Transform derived.
             if (typeof(Transform).IsAssignableFrom(Property.OwnerType))
             {
diff --git a/src/Avalonia.Visuals/ApiCompatBaseline.txt b/src/Avalonia.Visuals/ApiCompatBaseline.txt
index dcb3246a633..68e3673cfef 100644
--- a/src/Avalonia.Visuals/ApiCompatBaseline.txt
+++ b/src/Avalonia.Visuals/ApiCompatBaseline.txt
@@ -7,6 +7,9 @@ InterfacesShouldHaveSameMembers : Interface member 'public System.Threading.Task
 MembersMustExist : Member 'public System.Threading.Tasks.Task Avalonia.Animation.PageSlide.Start(Avalonia.Visual, Avalonia.Visual, System.Boolean)' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'public void Avalonia.Media.GlyphRun..ctor()' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'public void Avalonia.Media.GlyphRun.GlyphTypeface.set(Avalonia.Media.GlyphTypeface)' does not exist in the implementation but it does exist in the contract.
+CannotSealType : Type 'Avalonia.Media.Pen' is actually (has the sealed modifier) sealed in the implementation but not sealed in the contract.
+MembersMustExist : Member 'protected void Avalonia.Media.Pen.AffectsRender<T>(Avalonia.AvaloniaProperty[])' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'protected void Avalonia.Media.Pen.RaiseInvalidated(System.EventArgs)' does not exist in the implementation but it does exist in the contract.
 TypeCannotChangeClassification : Type 'Avalonia.Media.Immutable.ImmutableSolidColorBrush' is a 'class' in the implementation but is a 'struct' in the contract.
 MembersMustExist : Member 'public void Avalonia.Media.TextFormatting.DrawableTextRun.Draw(Avalonia.Media.DrawingContext)' does not exist in the implementation but it does exist in the contract.
 CannotAddAbstractMembers : Member 'public void Avalonia.Media.TextFormatting.DrawableTextRun.Draw(Avalonia.Media.DrawingContext, Avalonia.Point)' is abstract in the implementation but is missing in the contract.
@@ -83,4 +86,4 @@ InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Size Avaloni
 InterfacesShouldHaveSameMembers : Interface member 'public System.TimeSpan Avalonia.Platform.IPlatformSettings.TouchDoubleClickTime' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Size Avalonia.Platform.IPlatformSettings.TouchDoubleClickSize.get()' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public System.TimeSpan Avalonia.Platform.IPlatformSettings.TouchDoubleClickTime.get()' is present in the implementation but not in the contract.
-Total Issues: 84
+Total Issues: 87
diff --git a/src/Avalonia.Visuals/Media/Pen.cs b/src/Avalonia.Visuals/Media/Pen.cs
index 7c966a35cf8..65ba851100d 100644
--- a/src/Avalonia.Visuals/Media/Pen.cs
+++ b/src/Avalonia.Visuals/Media/Pen.cs
@@ -7,7 +7,7 @@ namespace Avalonia.Media
     /// <summary>
     /// Describes how a stroke is drawn.
     /// </summary>
-    public class Pen : AvaloniaObject, IPen
+    public sealed class Pen : AvaloniaObject, IPen, IWeakEventSubscriber<EventArgs>
     {
         /// <summary>
         /// Defines the <see cref="Brush"/> property.
@@ -45,6 +45,10 @@ public class Pen : AvaloniaObject, IPen
         public static readonly StyledProperty<double> MiterLimitProperty =
             AvaloniaProperty.Register<Pen, double>(nameof(MiterLimit), 10.0);
 
+        private EventHandler? _invalidated;
+        private IAffectsRender? _subscribedToBrush;
+        private IAffectsRender? _subscribedToDashes;
+        
         /// <summary>
         /// Initializes a new instance of the <see cref="Pen"/> class.
         /// </summary>
@@ -96,17 +100,6 @@ public Pen(
             DashStyle = dashStyle;
         }
 
-        static Pen()
-        {
-            AffectsRender<Pen>(
-                BrushProperty,
-                ThicknessProperty,
-                DashStyleProperty,
-                LineCapProperty,
-                LineJoinProperty,
-                MiterLimitProperty);
-        }
-
         /// <summary>
         /// Gets or sets the brush used to draw the stroke.
         /// </summary>
@@ -116,6 +109,11 @@ public IBrush? Brush
             set => SetValue(BrushProperty, value);
         }
 
+        private static readonly WeakEvent<IAffectsRender, EventArgs> InvalidatedWeakEvent =
+            WeakEvent.Register<IAffectsRender>(
+                (s, h) => s.Invalidated += h,
+                (s, h) => s.Invalidated -= h);
+
         /// <summary>
         /// Gets or sets the stroke thickness.
         /// </summary>
@@ -165,7 +163,19 @@ public double MiterLimit
         /// <summary>
         /// Raised when the pen changes.
         /// </summary>
-        public event EventHandler? Invalidated;
+        public event EventHandler? Invalidated
+        {
+            add
+            {
+                _invalidated += value;
+                UpdateSubscriptions();
+            }
+            remove
+            {
+                _invalidated -= value; 
+                UpdateSubscriptions();
+            }
+        }
 
         /// <summary>
         /// Creates an immutable clone of the brush.
@@ -182,68 +192,42 @@ public ImmutablePen ToImmutable()
                 MiterLimit);
         }
 
-        /// <summary>
-        /// Marks a property as affecting the pen's visual representation.
-        /// </summary>
-        /// <param name="properties">The properties.</param>
-        /// <remarks>
-        /// After a call to this method in a pen's static constructor, any change to the
-        /// property will cause the <see cref="Invalidated"/> event to be raised on the pen.
-        /// </remarks>
-        protected static void AffectsRender<T>(params AvaloniaProperty[] properties)
-            where T : Pen
+        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
         {
-            static void Invalidate(AvaloniaPropertyChangedEventArgs e)
-            {
-                if (e.Sender is T sender)
-                {
-                    sender.RaiseInvalidated(EventArgs.Empty);
-                }
-            }
+            _invalidated?.Invoke(this, EventArgs.Empty);
+            if(change.Property == BrushProperty)
+                UpdateSubscription(ref _subscribedToBrush, Brush);
+            if(change.Property == DashStyleProperty)
+                UpdateSubscription(ref _subscribedToDashes, DashStyle);
+            base.OnPropertyChanged(change);
+        }
 
-            static void InvalidateAndSubscribe(AvaloniaPropertyChangedEventArgs e)
+        
+        void UpdateSubscription(ref IAffectsRender? field, object? value)
+        {
+            if ((_invalidated == null || field != value) && field != null)
             {
-                if (e.Sender is T sender)
-                {
-                    if (e.OldValue is IAffectsRender oldValue)
-                    {
-                        WeakEventHandlerManager.Unsubscribe<EventArgs, T>(
-                            oldValue,
-                            nameof(oldValue.Invalidated),
-                            sender.AffectsRenderInvalidated);
-                    }
-
-                    if (e.NewValue is IAffectsRender newValue)
-                    {
-                        WeakEventHandlerManager.Subscribe<IAffectsRender, EventArgs, T>(
-                            newValue,
-                            nameof(newValue.Invalidated),
-                            sender.AffectsRenderInvalidated);
-                    }
-
-                    sender.RaiseInvalidated(EventArgs.Empty);
-                }
+                InvalidatedWeakEvent.Unsubscribe(field, this);
+                field = null;
             }
 
-            foreach (var property in properties)
+            if (_invalidated != null && field != value && value is IAffectsRender affectsRender)
             {
-                if (property.CanValueAffectRender())
-                {
-                    property.Changed.Subscribe(e => InvalidateAndSubscribe(e));
-                }
-                else
-                {
-                    property.Changed.Subscribe(e => Invalidate(e));
-                }
+                InvalidatedWeakEvent.Subscribe(affectsRender, this);
+                field = affectsRender;
             }
         }
 
-        /// <summary>
-        /// Raises the <see cref="Invalidated"/> event.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected void RaiseInvalidated(EventArgs e) => Invalidated?.Invoke(this, e);
-
-        private void AffectsRenderInvalidated(object? sender, EventArgs e) => RaiseInvalidated(EventArgs.Empty);
+        void UpdateSubscriptions()
+        {
+            UpdateSubscription(ref _subscribedToBrush, Brush);
+            UpdateSubscription(ref _subscribedToDashes, DashStyle);
+        }
+        
+        void IWeakEventSubscriber<EventArgs>.OnEvent(object? sender, WeakEvent ev, EventArgs e)
+        {
+            if (ev == InvalidatedWeakEvent) 
+                _invalidated?.Invoke(this, EventArgs.Empty);
+        }
     }
 }
diff --git a/src/Avalonia.X11/Glx/GlxDisplay.cs b/src/Avalonia.X11/Glx/GlxDisplay.cs
index fa8c866c092..fcdc10e9991 100644
--- a/src/Avalonia.X11/Glx/GlxDisplay.cs
+++ b/src/Avalonia.X11/Glx/GlxDisplay.cs
@@ -95,8 +95,8 @@ public GlxDisplay(X11Info x11, IList<GlVersion> probeProfiles)
 
                 if (Environment.GetEnvironmentVariable("AVALONIA_GLX_IGNORE_RENDERER_BLACKLIST") != "1")
                 {
-                    var blacklist = AvaloniaLocator.Current.GetService<X11PlatformOptions>()
-                        ?.GlxRendererBlacklist;
+                    var opts = AvaloniaLocator.Current.GetService<X11PlatformOptions>() ?? new X11PlatformOptions();
+                    var blacklist = opts.GlxRendererBlacklist;
                     if (blacklist != null)
                         foreach (var item in blacklist)
                             if (glInterface.Renderer.Contains(item))
diff --git a/src/Avalonia.X11/X11Window.cs b/src/Avalonia.X11/X11Window.cs
index cf402fd6625..be3d455c47c 100644
--- a/src/Avalonia.X11/X11Window.cs
+++ b/src/Avalonia.X11/X11Window.cs
@@ -342,9 +342,13 @@ public double RenderScaling
 
         public Action<WindowTransparencyLevel> TransparencyLevelChanged
         {
-            get => _transparencyHelper.TransparencyLevelChanged;
-            set => _transparencyHelper.TransparencyLevelChanged = value;
-        }        
+            get => _transparencyHelper?.TransparencyLevelChanged;
+            set
+            {
+                if (_transparencyHelper != null)
+                    _transparencyHelper.TransparencyLevelChanged = value;
+            }
+        }
 
         public Action<bool> ExtendClientAreaToDecorationsChanged { get; set; }
 
@@ -1164,7 +1168,8 @@ public void SetWindowManagerAddShadowHint(bool enabled)
         {
         }
 
-        public WindowTransparencyLevel TransparencyLevel => _transparencyHelper.CurrentLevel;
+        public WindowTransparencyLevel TransparencyLevel =>
+            _transparencyHelper?.CurrentLevel ?? WindowTransparencyLevel.None;
 
         public AcrylicPlatformCompensationLevels AcrylicCompensationLevels { get; } = new AcrylicPlatformCompensationLevels(1, 0.8, 0.8);
 
diff --git a/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebufferPlatform.cs b/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebufferPlatform.cs
index f4db6bf48a1..4add4c423b0 100644
--- a/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebufferPlatform.cs
+++ b/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebufferPlatform.cs
@@ -38,11 +38,11 @@ void Initialize()
             if (_fb is IGlOutputBackend gl)
                 AvaloniaLocator.CurrentMutable.Bind<IPlatformOpenGlInterface>().ToConstant(gl.PlatformOpenGlInterface);
             
-            var opts = AvaloniaLocator.Current.GetService<LinuxFramebufferPlatformOptions>();
+            var opts = AvaloniaLocator.Current.GetService<LinuxFramebufferPlatformOptions>() ?? new LinuxFramebufferPlatformOptions();
             
             AvaloniaLocator.CurrentMutable
                 .Bind<IPlatformThreadingInterface>().ToConstant(Threading)
-                .Bind<IRenderTimer>().ToConstant(new DefaultRenderTimer(opts?.Fps ?? 60))
+                .Bind<IRenderTimer>().ToConstant(new DefaultRenderTimer(opts.Fps))
                 .Bind<IRenderLoop>().ToConstant(new RenderLoop())
                 .Bind<ICursorFactory>().ToTransient<CursorFactoryStub>()
                 .Bind<IKeyboardDevice>().ToConstant(new KeyboardDevice())
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/PropertyInfoAccessorFactory.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/PropertyInfoAccessorFactory.cs
index b3f78bfbe3b..c21a2d4299e 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/PropertyInfoAccessorFactory.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/PropertyInfoAccessorFactory.cs
@@ -72,7 +72,7 @@ protected override void UnsubscribeCore()
         }
     }
 
-    internal class InpcPropertyAccessor : PropertyAccessorBase
+    internal class InpcPropertyAccessor : PropertyAccessorBase, IWeakEventSubscriber<PropertyChangedEventArgs>
     {
         protected readonly WeakReference<object> _reference;
         private readonly IPropertyInfo _property;
@@ -110,7 +110,7 @@ public override bool SetValue(object value, BindingPriority priority)
             return false;
         }
 
-        void OnNotifyPropertyChanged(object sender, PropertyChangedEventArgs e)
+        public void OnEvent(object sender, WeakEvent ev, PropertyChangedEventArgs e)
         {
             if (e.PropertyName == _property.Name || string.IsNullOrEmpty(e.PropertyName))
             {
@@ -128,10 +128,7 @@ protected override void UnsubscribeCore()
         {
             if (_reference.TryGetTarget(out var o) && o is INotifyPropertyChanged inpc)
             {
-                WeakEventHandlerManager.Unsubscribe<PropertyChangedEventArgs, InpcPropertyAccessor>(
-                    inpc,
-                    nameof(INotifyPropertyChanged.PropertyChanged),
-                    OnNotifyPropertyChanged);
+                WeakEvents.PropertyChanged.Unsubscribe(inpc, this);
             }
         }
 
@@ -148,16 +145,11 @@ protected void SendCurrentValue()
         private void SubscribeToChanges()
         {
             if (_reference.TryGetTarget(out var o) && o is INotifyPropertyChanged inpc)
-            {
-                WeakEventHandlerManager.Subscribe<INotifyPropertyChanged, PropertyChangedEventArgs, InpcPropertyAccessor>(
-                    inpc,
-                    nameof(INotifyPropertyChanged.PropertyChanged),
-                    OnNotifyPropertyChanged);
-            }
+                WeakEvents.PropertyChanged.Subscribe(inpc, this);
         }
     }
 
-    internal class IndexerAccessor : InpcPropertyAccessor
+    internal class IndexerAccessor : InpcPropertyAccessor, IWeakEventSubscriber<NotifyCollectionChangedEventArgs>
     {
         private int _index;
 
@@ -172,27 +164,17 @@ protected override void SubscribeCore()
         {
             base.SubscribeCore();
             if (_reference.TryGetTarget(out var o) && o is INotifyCollectionChanged incc)
-            {
-                WeakEventHandlerManager.Subscribe<INotifyCollectionChanged, NotifyCollectionChangedEventArgs, IndexerAccessor>(
-                  incc,
-                  nameof(INotifyCollectionChanged.CollectionChanged),
-                  OnNotifyCollectionChanged);
-            }
+                WeakEvents.CollectionChanged.Subscribe(incc, this);
         }
 
         protected override void UnsubscribeCore()
         {
             base.UnsubscribeCore();
             if (_reference.TryGetTarget(out var o) && o is INotifyCollectionChanged incc)
-            {
-                WeakEventHandlerManager.Unsubscribe<NotifyCollectionChangedEventArgs, IndexerAccessor>(
-                  incc,
-                  nameof(INotifyCollectionChanged.CollectionChanged),
-                  OnNotifyCollectionChanged);
-            }
+                WeakEvents.CollectionChanged.Unsubscribe(incc, this);
         }
-
-        void OnNotifyCollectionChanged(object sender, NotifyCollectionChangedEventArgs args)
+        
+        public void OnEvent(object? sender, WeakEvent ev, NotifyCollectionChangedEventArgs args)
         {
             if (ShouldNotifyListeners(args))
             {
diff --git a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
index 4dedd27445e..2694a61353a 100644
--- a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
+++ b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
@@ -459,8 +459,6 @@ public void DrawGlyphRun(IBrush foreground, GlyphRun glyphRun)
             {
                 var glyphRunImpl = (GlyphRunImpl)glyphRun.GlyphRunImpl;
 
-                ConfigureTextRendering(paintWrapper);
-
                 Canvas.DrawText(glyphRunImpl.TextBlob, (float)glyphRun.BaselineOrigin.X,
                     (float)glyphRun.BaselineOrigin.Y, paintWrapper.Paint);
             }
@@ -482,7 +480,7 @@ public void PushClip(Rect clip)
         public void PushClip(RoundedRect clip)
         {
             Canvas.Save();
-            Canvas.ClipRoundRect(clip.ToSKRoundRect());
+            Canvas.ClipRoundRect(clip.ToSKRoundRect(), antialias:true);
         }
 
         /// <inheritdoc />
@@ -606,15 +604,6 @@ public Matrix Transform
             }
         }
 
-        internal void ConfigureTextRendering(PaintWrapper wrapper)
-        {
-            var paint = wrapper.Paint;
-
-            paint.IsEmbeddedBitmapText = true;
-            paint.SubpixelText = true;
-            paint.LcdRenderText = _canTextUseLcdRendering;
-        }
-
         /// <summary>
         /// Configure paint wrapper for using gradient brush.
         /// </summary>
diff --git a/src/Skia/Avalonia.Skia/FormattedTextImpl.cs b/src/Skia/Avalonia.Skia/FormattedTextImpl.cs
index 81a79201d0d..625d1c6f520 100644
--- a/src/Skia/Avalonia.Skia/FormattedTextImpl.cs
+++ b/src/Skia/Avalonia.Skia/FormattedTextImpl.cs
@@ -291,7 +291,7 @@ internal void Draw(DrawingContextImpl context,
                     {
                         AvaloniaFormattedTextLine line = _skiaLines[c];
 
-                        float x = TransformX(origin.X, 0, paint.TextAlign);
+                        float x = TransformX(origin.X, line.Width, paint.TextAlign);
 
                         if (!hasCusomFGBrushes)
                         {
diff --git a/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs b/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs
index 4130d38f171..c3ac5e17744 100644
--- a/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs
+++ b/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs
@@ -198,7 +198,7 @@ public IWriteableBitmapImpl CreateWriteableBitmap(PixelSize size, Vector dpi, Pi
         private static readonly SKFont s_font = new SKFont
         {
             Subpixel = true,
-            Edging = SKFontEdging.Antialias,
+            Edging = SKFontEdging.SubpixelAntialias,
             Hinting = SKFontHinting.Full,
             LinearMetrics = true
         };
diff --git a/src/Windows/Avalonia.Win32/Win32GlManager.cs b/src/Windows/Avalonia.Win32/Win32GlManager.cs
index 289c100d51a..0376a41f8cd 100644
--- a/src/Windows/Avalonia.Win32/Win32GlManager.cs
+++ b/src/Windows/Avalonia.Win32/Win32GlManager.cs
@@ -13,19 +13,18 @@ public static void Initialize()
         {
             AvaloniaLocator.CurrentMutable.Bind<IPlatformOpenGlInterface>().ToLazy<IPlatformOpenGlInterface>(() =>
             {
-                var opts = AvaloniaLocator.Current.GetService<Win32PlatformOptions>();
-                if (opts?.UseWgl == true)
+                var opts = AvaloniaLocator.Current.GetService<Win32PlatformOptions>() ?? new Win32PlatformOptions();
+                if (opts.UseWgl)
                 {
                     var wgl = WglPlatformOpenGlInterface.TryCreate();
                     return wgl;
                 }
 
-                if (opts?.AllowEglInitialization ?? Win32Platform.WindowsVersion > PlatformConstants.Windows7)
+                if (opts.AllowEglInitialization ?? Win32Platform.WindowsVersion > PlatformConstants.Windows7)
                 {
                     var egl = EglPlatformOpenGlInterface.TryCreate(() => new AngleWin32EglDisplay());
 
-                    if (egl != null &&
-                        opts?.UseWindowsUIComposition == true)
+                    if (egl != null && opts.UseWindowsUIComposition)
                     {
                         WinUICompositorConnection.TryCreateAndRegister(egl, opts.CompositionBackdropCornerRadius);
                     }
diff --git a/src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs b/src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs
index 56a4090b438..44a17963979 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs
@@ -157,8 +157,8 @@ protected virtual unsafe IntPtr AppWndProc(IntPtr hWnd, uint msg, IntPtr wParam,
                     }
                 case WindowsMessage.WM_CHAR:
                     {
-                        // Ignore control chars
-                        if (ToInt32(wParam) >= 32)
+                        // Ignore control chars and chars that were handled in WM_KEYDOWN.
+                        if (ToInt32(wParam) >= 32 && !_ignoreWmChar)
                         {
                             e = new RawTextInputEventArgs(WindowsKeyboardDevice.Instance, timestamp, _owner,
                                 new string((char)ToInt32(wParam), 1));
@@ -533,6 +533,15 @@ protected virtual unsafe IntPtr AppWndProc(IntPtr hWnd, uint msg, IntPtr wParam,
             {
                 Input(e);
 
+                if ((WindowsMessage)msg == WindowsMessage.WM_KEYDOWN)
+                {
+                    // Handling a WM_KEYDOWN message should cause the subsequent WM_CHAR message to
+                    // be ignored. This should be safe to do as WM_CHAR should only be produced in
+                    // response to the call to TranslateMessage/DispatchMessage after a WM_KEYDOWN
+                    // is handled.
+                    _ignoreWmChar = e.Handled;
+                }
+
                 if (e.Handled)
                 {
                     return IntPtr.Zero;
diff --git a/src/Windows/Avalonia.Win32/WindowImpl.cs b/src/Windows/Avalonia.Win32/WindowImpl.cs
index 95d8912ddbb..e29de34f99d 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.cs
@@ -92,6 +92,7 @@ public partial class WindowImpl : IWindowImpl, EglGlPlatformSurface.IEglWindowGl
         private bool _shown;
         private bool _hiddenWindowIsParent;
         private uint _langid;
+        private bool _ignoreWmChar;
 
         public WindowImpl()
         {
diff --git a/tests/Avalonia.Animation.UnitTests/AnimatableTests.cs b/tests/Avalonia.Animation.UnitTests/AnimatableTests.cs
index 26d8059eecf..1d5296bebd9 100644
--- a/tests/Avalonia.Animation.UnitTests/AnimatableTests.cs
+++ b/tests/Avalonia.Animation.UnitTests/AnimatableTests.cs
@@ -36,7 +36,7 @@ public void Transition_Is_Not_Applied_When_Not_Attached_To_Visual_Tree()
         [Fact]
         public void Transition_Is_Not_Applied_To_Initial_Style()
         {
-            using (UnitTestApplication.Start(TestServices.RealStyler))
+            using (Start())
             {
                 var target = CreateTarget();
                 var control = new Control
@@ -74,6 +74,7 @@ public void Transition_Is_Not_Applied_To_Initial_Style()
         [Fact]
         public void Transition_Is_Applied_When_Local_Value_Changes()
         {
+            using var app = Start();
             var target = CreateTarget();
             var control = CreateControl(target.Object);
 
@@ -170,6 +171,7 @@ public void Invalid_Values_In_Animation_Should_Not_Crash_Animations(object inval
         [Fact]
         public void Transition_Is_Not_Applied_When_StyleTrigger_Changes_With_LocalValue_Present()
         {
+            using var app = Start();
             var target = CreateTarget();
             var control = CreateControl(target.Object);
 
@@ -195,6 +197,7 @@ public void Transition_Is_Not_Applied_When_StyleTrigger_Changes_With_LocalValue_
         [Fact]
         public void Transition_Is_Disposed_When_Local_Value_Changes()
         {
+            using var app = Start();
             var target = CreateTarget();
             var control = CreateControl(target.Object);
             var sub = new Mock<IDisposable>();
@@ -211,6 +214,7 @@ public void Transition_Is_Disposed_When_Local_Value_Changes()
         [Fact]
         public void New_Transition_Is_Applied_When_Local_Value_Changes()
         {
+            using var app = Start();
             var target = CreateTarget();
             var control = CreateControl(target.Object);
 
@@ -239,6 +243,7 @@ public void New_Transition_Is_Applied_When_Local_Value_Changes()
         [Fact]
         public void Transition_Is_Not_Applied_When_Removed_From_Visual_Tree()
         {
+            using var app = Start();
             var target = CreateTarget();
             var control = CreateControl(target.Object);
 
@@ -266,6 +271,7 @@ public void Transition_Is_Not_Applied_When_Removed_From_Visual_Tree()
         [Fact]
         public void Animation_Is_Cancelled_When_Transition_Removed()
         {
+            using var app = Start();
             var target = CreateTarget();
             var control = CreateControl(target.Object);
             var sub = new Mock<IDisposable>();
@@ -285,7 +291,7 @@ public void Animation_Is_Cancelled_When_Transition_Removed()
         [Fact]
         public void Animation_Is_Cancelled_When_New_Style_Activates()
         {
-            using (UnitTestApplication.Start(TestServices.RealStyler))
+            using (Start())
             {
                 var target = CreateTarget();
                 var control = CreateStyledControl(target.Object);
@@ -301,7 +307,7 @@ public void Animation_Is_Cancelled_When_New_Style_Activates()
 
                 target.Verify(x => x.Apply(
                     control,
-                    It.IsAny<Clock>(),
+                    It.IsAny<IClock>(),
                     1.0,
                     0.5),
                     Times.Once);
@@ -315,7 +321,7 @@ public void Animation_Is_Cancelled_When_New_Style_Activates()
         [Fact]
         public void Transition_From_Style_Trigger_Is_Applied()
         {
-            using (UnitTestApplication.Start(TestServices.RealStyler))
+            using (Start())
             {
                 var target = CreateTransition(Control.WidthProperty);
                 var control = CreateStyledControl(transition2: target.Object);
@@ -326,7 +332,7 @@ public void Transition_From_Style_Trigger_Is_Applied()
 
                 target.Verify(x => x.Apply(
                     control,
-                    It.IsAny<Clock>(),
+                    It.IsAny<IClock>(),
                     double.NaN,
                     100.0),
                     Times.Once);
@@ -337,7 +343,7 @@ public void Transition_From_Style_Trigger_Is_Applied()
         public void Replacing_Transitions_During_Animation_Does_Not_Throw_KeyNotFound()
         {
             // Issue #4059
-            using (UnitTestApplication.Start(TestServices.RealStyler))
+            using (Start())
             {
                 Border target;
                 var clock = new TestClock();
@@ -428,6 +434,13 @@ public void Transitions_Can_Re_Set_During_Batch_Update()
             control.EndBatchUpdate();
         }
 
+        private static IDisposable Start()
+        {
+            var clock = new MockGlobalClock();
+            var services = TestServices.RealStyler.With(globalClock: clock);
+            return UnitTestApplication.Start(services);
+        }
+
         private static Mock<ITransition> CreateTarget()
         {
             return CreateTransition(Visual.OpacityProperty);
diff --git a/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_DataValidation.cs b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_DataValidation.cs
index ecc43aa3a58..43192584afb 100644
--- a/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_DataValidation.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_DataValidation.cs
@@ -6,6 +6,7 @@
 using Avalonia.Data;
 using Avalonia.Data.Core;
 using Avalonia.Markup.Parsers;
+using Avalonia.Threading;
 using Avalonia.UnitTests;
 using Xunit;
 
@@ -67,6 +68,8 @@ public void Enabled_Indei_Validation_Subscribes()
 
             Assert.Equal(1, data.ErrorsChangedSubscriptionCount);
             sub.Dispose();
+            // Forces WeakEvent compact
+            Dispatcher.UIThread.RunJobs();
             Assert.Equal(0, data.ErrorsChangedSubscriptionCount);
         }
 
diff --git a/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Indexer.cs b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Indexer.cs
index 6289ec46c7a..20a4cb6d981 100644
--- a/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Indexer.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Indexer.cs
@@ -9,6 +9,7 @@
 using Avalonia.UnitTests;
 using Xunit;
 using Avalonia.Markup.Parsers;
+using Avalonia.Threading;
 
 namespace Avalonia.Base.UnitTests.Data.Core
 {
@@ -110,6 +111,9 @@ public void Should_Track_INCC_Add()
                 data.Foo.Add("baz");
             }
 
+            // Forces WeakEvent compact
+            Dispatcher.UIThread.RunJobs();
+            
             Assert.Equal(new[] { AvaloniaProperty.UnsetValue, "baz" }, result);
             Assert.Null(((INotifyCollectionChangedDebug)data.Foo).GetCollectionChangedSubscribers());
 
@@ -127,6 +131,8 @@ public void Should_Track_INCC_Remove()
             {
                 data.Foo.RemoveAt(0);
             }
+            // Forces WeakEvent compact
+            Dispatcher.UIThread.RunJobs();
 
             Assert.Equal(new[] { "foo", "bar" }, result);
             Assert.Null(((INotifyCollectionChangedDebug)data.Foo).GetCollectionChangedSubscribers());
@@ -145,6 +151,9 @@ public void Should_Track_INCC_Replace()
             {
                 data.Foo[1] = "baz";
             }
+            
+            // Forces WeakEvent compact
+            Dispatcher.UIThread.RunJobs();
 
             Assert.Equal(new[] { "bar", "baz" }, result);
             Assert.Null(((INotifyCollectionChangedDebug)data.Foo).GetCollectionChangedSubscribers());
@@ -202,6 +211,9 @@ public void Should_Track_NonIntegerIndexer()
                 data.Foo["foo"] = "bar2";
             }
 
+            // Forces WeakEvent compact
+            Dispatcher.UIThread.RunJobs();
+            
             var expected = new[] { "bar", "bar2" };
             Assert.Equal(expected, result);
             Assert.Equal(0, data.Foo.PropertyChangedSubscriptionCount);
diff --git a/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Observable.cs b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Observable.cs
index a70d4574a6c..4f88d2de7c2 100644
--- a/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Observable.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Observable.cs
@@ -5,6 +5,7 @@
 using Avalonia.Data;
 using Avalonia.Data.Core;
 using Avalonia.Markup.Parsers;
+using Avalonia.Threading;
 using Avalonia.UnitTests;
 using Xunit;
 
@@ -68,6 +69,8 @@ public void Should_Get_Property_Value_From_Observable()
                 Assert.Equal(new[] { "foo" }, result);
 
                 sub.Dispose();
+                // Forces WeakEvent compact
+                Dispatcher.UIThread.RunJobs();
                 Assert.Equal(0, data.PropertyChangedSubscriptionCount);
 
                 GC.KeepAlive(data);
@@ -109,10 +112,16 @@ public void Should_Get_Property_Value_From_Observable_With_DataValidation_Enable
                 var sub = target.Subscribe(x => result.Add(x));
                 data1.Next.OnNext(data2);
                 sync.ExecutePostedCallbacks();
-
+                
+                // Forces WeakEvent compact
+                Dispatcher.UIThread.RunJobs();
                 Assert.Equal(new[] { new BindingNotification("foo") }, result);
 
                 sub.Dispose();
+                
+                // Forces WeakEvent compact
+                Dispatcher.UIThread.RunJobs();
+                
                 Assert.Equal(0, data1.PropertyChangedSubscriptionCount);
 
                 GC.KeepAlive(data1);
diff --git a/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Property.cs b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Property.cs
index 32cdd21e043..a9c62a3c4a5 100644
--- a/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Property.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Property.cs
@@ -10,6 +10,7 @@
 using Xunit;
 using System.Threading.Tasks;
 using Avalonia.Markup.Parsers;
+using Avalonia.Threading;
 
 namespace Avalonia.Base.UnitTests.Data.Core
 {
@@ -182,6 +183,9 @@ public void Should_Track_Simple_Property_Value()
 
             sub.Dispose();
 
+            // Forces WeakEvent compact
+            Dispatcher.UIThread.RunJobs();
+            
             Assert.Equal(0, data.PropertyChangedSubscriptionCount);
 
             GC.KeepAlive(data);
@@ -209,8 +213,11 @@ public void Should_Trigger_PropertyChanged_On_Null_Or_Empty_String()
             data.RaisePropertyChanged(null);
 
             Assert.Equal(new[] { "foo", "bar", "bar" }, result);
-
+            
             sub.Dispose();
+            
+            // Forces WeakEvent compact
+            Dispatcher.UIThread.RunJobs();
 
             Assert.Equal(0, data.PropertyChangedSubscriptionCount);
 
@@ -231,7 +238,9 @@ public void Should_Track_End_Of_Property_Chain_Changing()
             Assert.Equal(new[] { "bar", "baz", null }, result);
 
             sub.Dispose();
-
+            // Forces WeakEvent compact
+            Dispatcher.UIThread.RunJobs();
+            
             Assert.Equal(0, data.PropertyChangedSubscriptionCount);
             Assert.Equal(0, data.Next.PropertyChangedSubscriptionCount);
 
@@ -253,6 +262,9 @@ public void Should_Track_Property_Chain_Changing()
             Assert.Equal(new[] { "bar", "baz", null }, result);
 
             sub.Dispose();
+            
+            // Forces WeakEvent compact
+            Dispatcher.UIThread.RunJobs();
 
             Assert.Equal(0, data.PropertyChangedSubscriptionCount);
             Assert.Equal(0, data.Next.PropertyChangedSubscriptionCount);
@@ -297,6 +309,9 @@ public void Should_Track_Property_Chain_Breaking_With_Null_Then_Mending()
 
             sub.Dispose();
 
+            // Forces WeakEvent compact
+            Dispatcher.UIThread.RunJobs();
+            
             Assert.Equal(0, data.PropertyChangedSubscriptionCount);
             Assert.Equal(0, data.Next.PropertyChangedSubscriptionCount);
             Assert.Equal(0, old.PropertyChangedSubscriptionCount);
@@ -329,6 +344,9 @@ public void Should_Track_Property_Chain_Breaking_With_Missing_Member_Then_Mendin
                 result);
 
             sub.Dispose();
+            
+            // Forces WeakEvent compact
+            Dispatcher.UIThread.RunJobs();
 
             Assert.Equal(0, data.PropertyChangedSubscriptionCount);
             Assert.Equal(0, data.Next.PropertyChangedSubscriptionCount);
@@ -412,6 +430,9 @@ public void Subscribing_Multiple_Times_Should_Only_Add_PropertyChanged_Handlers_
             sub1.Dispose();
             sub2.Dispose();
 
+            // Forces WeakEvent compact
+            Dispatcher.UIThread.RunJobs();
+            
             Assert.Equal(0, data.PropertyChangedSubscriptionCount);
 
             GC.KeepAlive(data);
@@ -535,6 +556,8 @@ public void Can_Replace_Root()
                 },
                 result);
 
+            // Forces WeakEvent compact
+            Dispatcher.UIThread.RunJobs();
             Assert.Equal(0, first.PropertyChangedSubscriptionCount);
             Assert.Equal(0, second.PropertyChangedSubscriptionCount);
 
diff --git a/tests/Avalonia.Base.UnitTests/Data/Core/Plugins/IndeiValidationPluginTests.cs b/tests/Avalonia.Base.UnitTests/Data/Core/Plugins/IndeiValidationPluginTests.cs
index d8eddf6330f..e8f1f38b90b 100644
--- a/tests/Avalonia.Base.UnitTests/Data/Core/Plugins/IndeiValidationPluginTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/Core/Plugins/IndeiValidationPluginTests.cs
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using Avalonia.Data;
 using Avalonia.Data.Core.Plugins;
+using Avalonia.Threading;
 using Xunit;
 
 namespace Avalonia.Base.UnitTests.Data.Core.Plugins
@@ -57,6 +58,8 @@ public void Subscribes_And_Unsubscribes()
             validator.Subscribe(_ => { });
             Assert.Equal(1, data.ErrorsChangedSubscriptionCount);
             validator.Unsubscribe();
+            // Forces WeakEvent compact
+            Dispatcher.UIThread.RunJobs();
             Assert.Equal(0, data.ErrorsChangedSubscriptionCount);
         }
 
diff --git a/tests/Avalonia.Base.UnitTests/WeakEventTests.cs b/tests/Avalonia.Base.UnitTests/WeakEventTests.cs
new file mode 100644
index 00000000000..2663b4858fe
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/WeakEventTests.cs
@@ -0,0 +1,75 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Avalonia.Utilities;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests
+{
+    public class WeakEventTests
+    {
+        class EventSource
+        {
+            public event EventHandler Event;
+
+            public void Fire()
+            {
+                Event?.Invoke(this, new EventArgs());
+            }
+
+            public static readonly WeakEvent<EventSource, EventArgs> WeakEv = WeakEvent.Register<EventSource>(
+                (t, s) => t.Event += s,
+                (t, s) => t.Event -= s);
+        }
+
+        class Subscriber : IWeakEventSubscriber<EventArgs>
+        {
+            private readonly Action _onEvent;
+
+            public Subscriber(Action onEvent)
+            {
+                _onEvent = onEvent;
+            }
+
+            public void OnEvent(object sender, WeakEvent ev, EventArgs args)
+            {
+                _onEvent?.Invoke();
+            }
+        }
+
+        [Fact]
+        public void EventShouldBePassedToSubscriber()
+        {
+            bool handled = false;
+            var subscriber = new Subscriber(() => handled = true);
+            var source = new EventSource();
+            EventSource.WeakEv.Subscribe(source, subscriber);
+
+            source.Fire();
+            Assert.True(handled);
+        }
+
+ 
+        [Fact]
+        public void EventHandlerShouldNotBeKeptAlive()
+        {
+            bool handled = false;
+            var source = new EventSource();
+            AddSubscriber(source, () => handled = true);
+            for (int c = 0; c < 10; c++)
+            {
+                GC.Collect();
+                GC.Collect(3, GCCollectionMode.Forced, true);
+            }
+            source.Fire();
+            Assert.False(handled);
+        }
+
+        private void AddSubscriber(EventSource source, Action func)
+        {
+            EventSource.WeakEv.Subscribe(source, new Subscriber(func));
+        }
+    }
+}
diff --git a/tests/Avalonia.DesignerSupport.TestApp/App.xaml b/tests/Avalonia.DesignerSupport.TestApp/App.xaml
index 56c0e8059a3..5a33ffff805 100644
--- a/tests/Avalonia.DesignerSupport.TestApp/App.xaml
+++ b/tests/Avalonia.DesignerSupport.TestApp/App.xaml
@@ -1,8 +1,10 @@
-<Application xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             x:Class="Avalonia.DesignerSupport.TestApp.App">
+<Application
+    x:Class="Avalonia.DesignerSupport.TestApp.App"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Application.Styles>
-        <StyleInclude Source="resm:Avalonia.Themes.Default.DefaultTheme.xaml?assembly=Avalonia.Themes.Default"/>
-        <StyleInclude Source="resm:Avalonia.Themes.Default.Accents.BaseLight.xaml?assembly=Avalonia.Themes.Default"/>
+        <StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml" />
+        <StyleInclude Source="avares://Avalonia.Themes.Default/Accents/Base.xaml" />
+        <StyleInclude Source="avares://Avalonia.Themes.Default/Accents/BaseLight.xaml" />
     </Application.Styles>
 </Application>
diff --git a/tests/Avalonia.LeakTests/AvaloniaObjectTests.cs b/tests/Avalonia.LeakTests/AvaloniaObjectTests.cs
index 54f9a87f94b..19208b15f3d 100644
--- a/tests/Avalonia.LeakTests/AvaloniaObjectTests.cs
+++ b/tests/Avalonia.LeakTests/AvaloniaObjectTests.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Reactive.Subjects;
+using Avalonia.Threading;
 using JetBrains.dotMemoryUnit;
 using Xunit;
 using Xunit.Abstractions;
@@ -56,7 +57,9 @@ public void Binding_To_Direct_Property_Gets_Collected_When_Completed()
 
             completeSource();
             GC.Collect();
-
+            // Forces WeakEvent compact
+            Dispatcher.UIThread.RunJobs();
+            GC.Collect();
             Assert.False(weakSource.IsAlive);
         }
 
diff --git a/tests/Avalonia.Markup.UnitTests/Data/BindingTests.cs b/tests/Avalonia.Markup.UnitTests/Data/BindingTests.cs
index a0dd565a87f..055de999e2e 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/BindingTests.cs
+++ b/tests/Avalonia.Markup.UnitTests/Data/BindingTests.cs
@@ -12,6 +12,7 @@
 using Avalonia.UnitTests;
 using Avalonia.Data.Converters;
 using Avalonia.Data.Core;
+using Avalonia.Threading;
 
 namespace Avalonia.Markup.UnitTests.Data
 {
@@ -160,6 +161,9 @@ public void OneTime_Binding_Releases_Subscription_If_DataContext_Set_Later()
             target.Bind(TextBlock.TextProperty, new Binding("Foo", BindingMode.OneTime));
             target.DataContext = source;
 
+            // Forces WeakEvent compact
+            Dispatcher.UIThread.RunJobs();
+            
             Assert.Equal(0, source.SubscriberCount);
         }
 
@@ -608,6 +612,9 @@ public void Combined_OneTime_And_OneWayToSource_Bindings_Should_Release_Subscrip
                 root.DataContext = source;
             }
 
+            // Forces WeakEvent compact
+            Dispatcher.UIThread.RunJobs();
+            
             Assert.Equal(0, source.SubscriberCount);
         }
 
diff --git a/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionObserverBuilderTests_Indexer.cs b/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionObserverBuilderTests_Indexer.cs
index 39d6152b690..dbf6ef2ce96 100644
--- a/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionObserverBuilderTests_Indexer.cs
+++ b/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionObserverBuilderTests_Indexer.cs
@@ -10,6 +10,7 @@
 using System.Reactive.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Avalonia.Threading;
 using Xunit;
 
 namespace Avalonia.Markup.UnitTests.Parsers
@@ -159,7 +160,10 @@ public void Should_Track_INCC_Add()
             {
                 data.Foo.Add("baz");
             }
-
+            
+            // Forces WeakEvent compact
+            Dispatcher.UIThread.RunJobs();
+            
             Assert.Equal(new[] { AvaloniaProperty.UnsetValue, "baz" }, result);
             Assert.Null(((INotifyCollectionChangedDebug)data.Foo).GetCollectionChangedSubscribers());
 
@@ -178,6 +182,9 @@ public void Should_Track_INCC_Remove()
                 data.Foo.RemoveAt(0);
             }
 
+            // Forces WeakEvent compact
+            Dispatcher.UIThread.RunJobs();
+            
             Assert.Equal(new[] { "foo", "bar" }, result);
             Assert.Null(((INotifyCollectionChangedDebug)data.Foo).GetCollectionChangedSubscribers());
 
@@ -196,6 +203,9 @@ public void Should_Track_INCC_Replace()
                 data.Foo[1] = "baz";
             }
 
+            // Forces WeakEvent compact
+            Dispatcher.UIThread.RunJobs();
+            
             Assert.Equal(new[] { "bar", "baz" }, result);
             Assert.Null(((INotifyCollectionChangedDebug)data.Foo).GetCollectionChangedSubscribers());
 
@@ -252,6 +262,9 @@ public void Should_Track_NonIntegerIndexer()
                 data.Foo["foo"] = "bar2";
             }
 
+            // Forces WeakEvent compact
+            Dispatcher.UIThread.RunJobs();
+            
             var expected = new[] { "bar", "bar2" };
             Assert.Equal(expected, result);
             Assert.Equal(0, data.Foo.PropertyChangedSubscriptionCount);
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
index 6db4b9e6245..f20faa22870 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
@@ -528,7 +528,7 @@ public void StyleInclude_Is_Built()
                 var xaml = @"
 <Styles xmlns='https://github.com/avaloniaui'
         xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
-    <StyleInclude Source='resm:Avalonia.Themes.Default.ContextMenu.xaml?assembly=Avalonia.Themes.Default'/>
+    <StyleInclude Source='avares://Avalonia.Themes.Default/Controls/ContextMenu.xaml'/>
 </Styles>";
 
                 var styles = AvaloniaRuntimeXamlLoader.Parse<Styles>(xaml);
diff --git a/tests/Avalonia.UnitTests/TestServices.cs b/tests/Avalonia.UnitTests/TestServices.cs
index 8d27562146c..1e586e3bb17 100644
--- a/tests/Avalonia.UnitTests/TestServices.cs
+++ b/tests/Avalonia.UnitTests/TestServices.cs
@@ -168,7 +168,7 @@ private static Styles CreateDefaultTheme()
             };
 
             var baseLight = (IStyle)AvaloniaXamlLoader.Load(
-                new Uri("resm:Avalonia.Themes.Default.Accents.BaseLight.xaml?assembly=Avalonia.Themes.Default"));
+                new Uri("avares://Avalonia.Themes.Default/Accents/BaseLight.xaml"));
             result.Add(baseLight);
 
             return result;
diff --git a/tests/Avalonia.UnitTests/UnitTestApplication.cs b/tests/Avalonia.UnitTests/UnitTestApplication.cs
index 2d37057779e..dc10754ea27 100644
--- a/tests/Avalonia.UnitTests/UnitTestApplication.cs
+++ b/tests/Avalonia.UnitTests/UnitTestApplication.cs
@@ -10,6 +10,7 @@
 using System.Reactive.Concurrency;
 using Avalonia.Input.Platform;
 using Avalonia.Animation;
+using Avalonia.Shared.PlatformSupport;
 
 namespace Avalonia.UnitTests
 {
@@ -29,6 +30,11 @@ public UnitTestApplication(TestServices services)
             RegisterServices();
         }
 
+        static UnitTestApplication()
+        {
+            AssetLoader.RegisterResUriParsers();
+        }
+
         public static new UnitTestApplication Current => (UnitTestApplication)Application.Current;
 
         public TestServices Services => _services;