From f2050c868ac6ac4d0d134e99304b5c681f5b808d Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Wed, 1 Feb 2023 01:22:16 -0500
Subject: [PATCH 1/9] Extract theme related properties to IThemeVariantHost and
 move property definitions to ThemeVariantScope

---
 .../Controls/ResourceNodeExtensions.cs        | 39 ++++++++-----------
 src/Avalonia.Base/StyledElement.cs            | 33 ----------------
 .../Styling/IGlobalThemeVariantProvider.cs    | 22 -----------
 .../Styling/IThemeVariantHost.cs              | 26 +++++++++++++
 src/Avalonia.Controls/Application.cs          | 19 ++++-----
 src/Avalonia.Controls/Control.cs              | 17 +++++++-
 src/Avalonia.Controls/ThemeVariantScope.cs    | 17 ++++++++
 src/Avalonia.Controls/TopLevel.cs             | 14 +++++--
 .../Diagnostics/Controls/Application.cs       |  2 +-
 .../StaticResourceExtension.cs                |  2 +-
 .../Xaml/ThemeDictionariesTests.cs            |  4 +-
 11 files changed, 99 insertions(+), 96 deletions(-)
 delete mode 100644 src/Avalonia.Base/Styling/IGlobalThemeVariantProvider.cs
 create mode 100644 src/Avalonia.Base/Styling/IThemeVariantHost.cs

diff --git a/src/Avalonia.Base/Controls/ResourceNodeExtensions.cs b/src/Avalonia.Base/Controls/ResourceNodeExtensions.cs
index 4b0bab0c92..8aed1545a5 100644
--- a/src/Avalonia.Base/Controls/ResourceNodeExtensions.cs
+++ b/src/Avalonia.Base/Controls/ResourceNodeExtensions.cs
@@ -138,18 +138,18 @@ namespace Avalonia.Controls
             protected override void Initialize()
             {
                 _target.ResourcesChanged += ResourcesChanged;
-                if (_target is StyledElement themeStyleable)
+                if (_target is IThemeVariantHost themeVariantHost)
                 {
-                    themeStyleable.PropertyChanged += PropertyChanged;
+                    themeVariantHost.ActualThemeVariantChanged += ActualThemeVariantChanged;
                 }
             }
 
             protected override void Deinitialize()
             {
                 _target.ResourcesChanged -= ResourcesChanged;
-                if (_target is StyledElement themeStyleable)
+                if (_target is IThemeVariantHost themeVariantHost)
                 {
-                    themeStyleable.PropertyChanged -= PropertyChanged;
+                    themeVariantHost.ActualThemeVariantChanged -= ActualThemeVariantChanged;
                 }
             }
 
@@ -163,18 +163,15 @@ namespace Avalonia.Controls
                 PublishNext(GetValue());
             }
 
-            private void PropertyChanged(object? sender, AvaloniaPropertyChangedEventArgs e)
+            private void ActualThemeVariantChanged(object? sender, EventArgs e)
             {
-                if (e.Property == StyledElement.ActualThemeVariantProperty)
-                {
-                    PublishNext(GetValue());
-                }
+                PublishNext(GetValue());
             }
 
             private object? GetValue()
             {
-                if (_target is not StyledElement themeStyleable
-                    || !_target.TryFindResource(_key, themeStyleable.ActualThemeVariant, out var value))
+                if (_target is not IThemeVariantHost themeVariantHost
+                    || !_target.TryFindResource(_key, themeVariantHost.ActualThemeVariant, out var value))
                 {
                     value = _target.FindResource(_key) ?? AvaloniaProperty.UnsetValue;
                 }
@@ -236,9 +233,9 @@ namespace Avalonia.Controls
                 {
                     _owner.ResourcesChanged -= ResourcesChanged;
                 }
-                if (_owner is StyledElement styleable)
+                if (_owner is IThemeVariantHost themeVariantHost)
                 {
-                    styleable.PropertyChanged += PropertyChanged;
+                    themeVariantHost.ActualThemeVariantChanged += ActualThemeVariantChanged;
                 }
 
                 _owner = _target.Owner;
@@ -247,20 +244,18 @@ namespace Avalonia.Controls
                 {
                     _owner.ResourcesChanged += ResourcesChanged;
                 }
-                if (_owner is StyledElement styleable2)
+                if (_owner is IThemeVariantHost themeVariantHost2)
                 {
-                    styleable2.PropertyChanged += PropertyChanged;
+                    themeVariantHost2.ActualThemeVariantChanged -= ActualThemeVariantChanged;
                 }
 
+
                 PublishNext();
             }
 
-            private void PropertyChanged(object? sender, AvaloniaPropertyChangedEventArgs e)
+            private void ActualThemeVariantChanged(object? sender, EventArgs e)
             {
-                if (e.Property == StyledElement.ActualThemeVariantProperty)
-                {
-                    PublishNext();
-                }
+                PublishNext();
             }
 
             private void ResourcesChanged(object? sender, ResourcesChangedEventArgs e)
@@ -270,8 +265,8 @@ namespace Avalonia.Controls
 
             private object? GetValue()
             {
-                if (!(_target.Owner is StyledElement themeStyleable)
-                    || !_target.Owner.TryFindResource(_key, themeStyleable.ActualThemeVariant, out var value))
+                if (!(_target.Owner is IThemeVariantHost themeVariantHost)
+                    || !_target.Owner.TryFindResource(_key, themeVariantHost.ActualThemeVariant, out var value))
                 {
                     value = _target.Owner?.FindResource(_key) ?? AvaloniaProperty.UnsetValue;
                 }
diff --git a/src/Avalonia.Base/StyledElement.cs b/src/Avalonia.Base/StyledElement.cs
index 5bf022cd51..17d0699336 100644
--- a/src/Avalonia.Base/StyledElement.cs
+++ b/src/Avalonia.Base/StyledElement.cs
@@ -71,23 +71,6 @@ namespace Avalonia
         public static readonly StyledProperty<ControlTheme?> ThemeProperty =
             AvaloniaProperty.Register<StyledElement, ControlTheme?>(nameof(Theme));
 
-        /// <summary>
-        /// Defines the <see cref="ActualThemeVariant"/> property.
-        /// </summary>
-        public static readonly StyledProperty<ThemeVariant> ActualThemeVariantProperty =
-            AvaloniaProperty.Register<StyledElement, ThemeVariant>(
-                nameof(ThemeVariant),
-                inherits: true,
-                defaultValue: ThemeVariant.Light);
-
-        /// <summary>
-        /// Defines the RequestedThemeVariant property.
-        /// </summary>
-        public static readonly StyledProperty<ThemeVariant?> RequestedThemeVariantProperty =
-            AvaloniaProperty.Register<StyledElement, ThemeVariant?>(
-                nameof(ThemeVariant),
-                defaultValue: ThemeVariant.Default);
-
         private static readonly ControlTheme s_invalidTheme = new ControlTheme();
         private int _initCount;
         private string? _name;
@@ -274,15 +257,6 @@ namespace Avalonia
             set => SetValue(ThemeProperty, value);
         }
 
-        /// <summary>
-        /// Gets the UI theme that is currently used by the element, which might be different than the <see cref="RequestedThemeVariantProperty"/>.
-        /// </summary>
-        /// <returns>
-        /// If current control is contained in the ThemeVariantScope, TopLevel or Application with non-default RequestedThemeVariant, that value will be returned.
-        /// Otherwise, current OS theme variant is returned.
-        /// </returns>
-        public ThemeVariant ActualThemeVariant => GetValue(ActualThemeVariantProperty);
-
         /// <summary>
         /// Gets the styled element's logical children.
         /// </summary>
@@ -647,13 +621,6 @@ namespace Avalonia
 
             if (change.Property == ThemeProperty)
                 OnControlThemeChanged();
-            else if (change.Property == RequestedThemeVariantProperty)
-            {
-                if (change.GetNewValue<ThemeVariant>() is {} themeVariant && themeVariant != ThemeVariant.Default)
-                    SetValue(ActualThemeVariantProperty, themeVariant);
-                else
-                    ClearValue(ActualThemeVariantProperty);
-            }
         }
 
         private protected virtual void OnControlThemeChanged()
diff --git a/src/Avalonia.Base/Styling/IGlobalThemeVariantProvider.cs b/src/Avalonia.Base/Styling/IGlobalThemeVariantProvider.cs
deleted file mode 100644
index 2467d99b3b..0000000000
--- a/src/Avalonia.Base/Styling/IGlobalThemeVariantProvider.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using Avalonia.Controls;
-using Avalonia.Metadata;
-
-namespace Avalonia.Styling;
-
-/// <summary>
-/// Interface for an application host element with a root theme variant.
-/// </summary>
-[Unstable]
-public interface IGlobalThemeVariantProvider : IResourceHost
-{
-    /// <summary>
-    /// Gets the UI theme variant that is used by the control (and its child elements) for resource determination.
-    /// </summary>
-    ThemeVariant ActualThemeVariant { get; }
-
-    /// <summary>
-    /// Raised when the theme variant is changed on the element or an ancestor of the element.
-    /// </summary>
-    event EventHandler? ActualThemeVariantChanged;
-}
diff --git a/src/Avalonia.Base/Styling/IThemeVariantHost.cs b/src/Avalonia.Base/Styling/IThemeVariantHost.cs
new file mode 100644
index 0000000000..01583148a8
--- /dev/null
+++ b/src/Avalonia.Base/Styling/IThemeVariantHost.cs
@@ -0,0 +1,26 @@
+using System;
+using Avalonia.Controls;
+using Avalonia.Metadata;
+
+namespace Avalonia.Styling;
+
+/// <summary>
+/// Interface for the host element with a theme variant.
+/// </summary>
+[Unstable]
+public interface IThemeVariantHost : IResourceHost
+{
+    /// <summary>
+    /// Gets the UI theme that is currently used by the element, which might be different than the RequestedThemeVariantProperty.
+    /// </summary>
+    /// <returns>
+    /// If current control is contained in the ThemeVariantScope, TopLevel or Application with non-default RequestedThemeVariant, that value will be returned.
+    /// Otherwise, current OS theme variant is returned.
+    /// </returns>
+    ThemeVariant ActualThemeVariant { get; }
+
+    /// <summary>
+    /// Raised when the theme variant is changed on the element or an ancestor of the element.
+    /// </summary>
+    event EventHandler? ActualThemeVariantChanged;
+}
diff --git a/src/Avalonia.Controls/Application.cs b/src/Avalonia.Controls/Application.cs
index 6d3ba3cf8a..8456a9a3a9 100644
--- a/src/Avalonia.Controls/Application.cs
+++ b/src/Avalonia.Controls/Application.cs
@@ -29,7 +29,7 @@ namespace Avalonia
     /// method.
     /// - Tracks the lifetime of the application.
     /// </remarks>
-    public class Application : AvaloniaObject, IDataContextProvider, IGlobalDataTemplates, IGlobalStyles, IGlobalThemeVariantProvider, IApplicationPlatformEvents
+    public class Application : AvaloniaObject, IDataContextProvider, IGlobalDataTemplates, IGlobalStyles, IThemeVariantHost, IApplicationPlatformEvents
     {
         /// <summary>
         /// The application-global data templates.
@@ -50,13 +50,13 @@ namespace Avalonia
         public static readonly StyledProperty<object?> DataContextProperty =
             StyledElement.DataContextProperty.AddOwner<Application>();
 
-        /// <inheritdoc cref="StyledElement.ActualThemeVariantProperty" />
+        /// <inheritdoc cref="ThemeVariantScope.ActualThemeVariantProperty" />
         public static readonly StyledProperty<ThemeVariant> ActualThemeVariantProperty =
-            StyledElement.ActualThemeVariantProperty.AddOwner<Application>();
+            ThemeVariantScope.ActualThemeVariantProperty.AddOwner<Application>();
         
-        /// <inheritdoc cref="StyledElement.RequestedThemeVariantProperty" />
+        /// <inheritdoc cref="ThemeVariantScope.RequestedThemeVariantProperty" />
         public static readonly StyledProperty<ThemeVariant?> RequestedThemeVariantProperty =
-            StyledElement.RequestedThemeVariantProperty.AddOwner<Application>();
+            ThemeVariantScope.RequestedThemeVariantProperty.AddOwner<Application>();
 
         /// <inheritdoc/>
         public event EventHandler<ResourcesChangedEventArgs>? ResourcesChanged;
@@ -95,11 +95,8 @@ namespace Avalonia
             set => SetValue(RequestedThemeVariantProperty, value);
         }
         
-        /// <inheritdoc cref="StyledElement.ActualThemeVariant"/>
-        public ThemeVariant ActualThemeVariant
-        {
-            get => GetValue(ActualThemeVariantProperty);
-        } 
+        /// <inheritdoc cref="ThemeVariantScope.ActualThemeVariant"/>
+        public ThemeVariant ActualThemeVariant => GetValue(ActualThemeVariantProperty);
 
         /// <summary>
         /// Gets the current instance of the <see cref="Application"/> class.
@@ -256,7 +253,7 @@ namespace Avalonia
                 .Bind<IAccessKeyHandler>().ToTransient<AccessKeyHandler>()
                 .Bind<IGlobalDataTemplates>().ToConstant(this)
                 .Bind<IGlobalStyles>().ToConstant(this)
-                .Bind<IGlobalThemeVariantProvider>().ToConstant(this)
+                .Bind<IThemeVariantHost>().ToConstant(this)
                 .Bind<IFocusManager>().ToConstant(FocusManager)
                 .Bind<IInputManager>().ToConstant(InputManager)
                 .Bind<IKeyboardNavigationHandler>().ToTransient<KeyboardNavigationHandler>()
diff --git a/src/Avalonia.Controls/Control.cs b/src/Avalonia.Controls/Control.cs
index ed24c3c7c2..bfef190dfd 100644
--- a/src/Avalonia.Controls/Control.cs
+++ b/src/Avalonia.Controls/Control.cs
@@ -26,7 +26,7 @@ namespace Avalonia.Controls
     /// - A <see cref="Tag"/> property to allow user-defined data to be attached to the control.
     /// - <see cref="ContextRequestedEvent"/> and other context menu related members.
     /// </remarks>
-    public class Control : InputElement, IDataTemplateHost, INamed, IVisualBrushInitialize, ISetterValue
+    public class Control : InputElement, IDataTemplateHost, INamed, IVisualBrushInitialize, ISetterValue, IThemeVariantHost
     {
         /// <summary>
         /// Defines the <see cref="FocusAdorner"/> property.
@@ -163,6 +163,10 @@ namespace Avalonia.Controls
             get => GetValue(TagProperty);
             set => SetValue(TagProperty, value);
         }
+        
+        public ThemeVariant ActualThemeVariant => GetValue(ThemeVariantScope.ActualThemeVariantProperty);
+
+        public event EventHandler? ActualThemeVariantChanged;
 
         /// <summary>
         /// Occurs when the user has completed a context input gesture, such as a right-click.
@@ -530,6 +534,17 @@ namespace Avalonia.Controls
                     RaiseEvent(sizeChangedEventArgs);
                 }
             }
+            else if (change.Property == ThemeVariantScope.RequestedThemeVariantProperty)
+            {
+                if (change.GetNewValue<ThemeVariant>() is {} themeVariant && themeVariant != ThemeVariant.Default)
+                    SetValue(ThemeVariantScope.ActualThemeVariantProperty, themeVariant);
+                else
+                    ClearValue(ThemeVariantScope.ActualThemeVariantProperty);
+            }
+            else if (change.Property == ThemeVariantScope.ActualThemeVariantProperty)
+            {
+                ActualThemeVariantChanged?.Invoke(this, EventArgs.Empty);
+            }
         }
     }
 }
diff --git a/src/Avalonia.Controls/ThemeVariantScope.cs b/src/Avalonia.Controls/ThemeVariantScope.cs
index b9724251c7..2aac1d3e2f 100644
--- a/src/Avalonia.Controls/ThemeVariantScope.cs
+++ b/src/Avalonia.Controls/ThemeVariantScope.cs
@@ -7,6 +7,23 @@ namespace Avalonia.Controls
     /// </summary>
     public class ThemeVariantScope : Decorator
     {
+        /// <summary>
+        /// Defines the <see cref="StyledElement.ActualThemeVariant"/> property.
+        /// </summary>
+        public static readonly StyledProperty<ThemeVariant> ActualThemeVariantProperty =
+            AvaloniaProperty.Register<ThemeVariantScope, ThemeVariant>(
+                nameof(ThemeVariant),
+                inherits: true,
+                defaultValue: ThemeVariant.Light);
+
+        /// <summary>
+        /// Defines the <see cref="RequestedThemeVariant"/> property.
+        /// </summary>
+        public static readonly StyledProperty<ThemeVariant?> RequestedThemeVariantProperty =
+            AvaloniaProperty.Register<ThemeVariantScope, ThemeVariant?>(
+                nameof(ThemeVariant),
+                defaultValue: ThemeVariant.Default);
+        
         /// <summary>
         /// Gets or sets the UI theme variant that is used by the control (and its child elements) for resource determination.
         /// The UI theme you specify with ThemeVariant can override the app-level ThemeVariant.
diff --git a/src/Avalonia.Controls/TopLevel.cs b/src/Avalonia.Controls/TopLevel.cs
index 676fa1519a..f9f7cfc4c6 100644
--- a/src/Avalonia.Controls/TopLevel.cs
+++ b/src/Avalonia.Controls/TopLevel.cs
@@ -79,6 +79,14 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<IBrush> TransparencyBackgroundFallbackProperty =
             AvaloniaProperty.Register<TopLevel, IBrush>(nameof(TransparencyBackgroundFallback), Brushes.White);
 
+        /// <inheritdoc cref="ThemeVariantScope.ActualThemeVariantProperty" />
+        public static readonly StyledProperty<ThemeVariant> ActualThemeVariantProperty =
+            ThemeVariantScope.ActualThemeVariantProperty.AddOwner<Application>();
+        
+        /// <inheritdoc cref="ThemeVariantScope.RequestedThemeVariantProperty" />
+        public static readonly StyledProperty<ThemeVariant?> RequestedThemeVariantProperty =
+            ThemeVariantScope.RequestedThemeVariantProperty.AddOwner<Application>();
+        
         /// <summary>
         /// Defines the <see cref="BackRequested"/> event.
         /// </summary>
@@ -96,7 +104,7 @@ namespace Avalonia.Controls
         private readonly IKeyboardNavigationHandler? _keyboardNavigationHandler;
         private readonly IPlatformRenderInterface? _renderInterface;
         private readonly IGlobalStyles? _globalStyles;
-        private readonly IGlobalThemeVariantProvider? _applicationThemeHost;
+        private readonly IThemeVariantHost? _applicationThemeHost;
         private readonly PointerOverPreProcessor? _pointerOverPreProcessor;
         private readonly IDisposable? _pointerOverPreProcessorSubscription;
         private readonly IDisposable? _backGestureSubscription;
@@ -153,7 +161,7 @@ namespace Avalonia.Controls
             _keyboardNavigationHandler = TryGetService<IKeyboardNavigationHandler>(dependencyResolver);
             _renderInterface = TryGetService<IPlatformRenderInterface>(dependencyResolver);
             _globalStyles = TryGetService<IGlobalStyles>(dependencyResolver);
-            _applicationThemeHost = TryGetService<IGlobalThemeVariantProvider>(dependencyResolver);
+            _applicationThemeHost = TryGetService<IThemeVariantHost>(dependencyResolver);
 
             Renderer = impl.CreateRenderer(this);
 
@@ -633,7 +641,7 @@ namespace Avalonia.Controls
 
         private void GlobalActualThemeVariantChanged(object? sender, EventArgs e)
         {
-            SetValue(ActualThemeVariantProperty, ((IGlobalThemeVariantProvider)sender!).ActualThemeVariant, BindingPriority.Template);
+            SetValue(ActualThemeVariantProperty, ((IThemeVariantHost)sender!).ActualThemeVariant, BindingPriority.Template);
         }
 
         private void SceneInvalidated(object? sender, SceneInvalidatedEventArgs e)
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Controls/Application.cs b/src/Avalonia.Diagnostics/Diagnostics/Controls/Application.cs
index 7426c4e2ed..e21983700d 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Controls/Application.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/Controls/Application.cs
@@ -14,7 +14,7 @@ namespace Avalonia.Diagnostics.Controls
         public event EventHandler? Closed;
 
         public static readonly StyledProperty<ThemeVariant?> RequestedThemeVariantProperty =
-            StyledElement.RequestedThemeVariantProperty.AddOwner<Application>();
+            ThemeVariantScope.RequestedThemeVariantProperty.AddOwner<Application>();
         
         public Application(Avalonia.Application application)
         {
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs
index cdd344becc..bef32766dc 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs
@@ -34,7 +34,7 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
 
             var stack = serviceProvider.GetService<IAvaloniaXamlIlParentStackProvider>();
             var provideTarget = serviceProvider.GetService<IProvideValueTarget>();
-            var themeVariant = (provideTarget.TargetObject as StyledElement)?.ActualThemeVariant;
+            var themeVariant = (provideTarget.TargetObject as IThemeVariantHost)?.ActualThemeVariant;
 
             var targetType = provideTarget.TargetProperty switch
             {
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ThemeDictionariesTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ThemeDictionariesTests.cs
index c5b62cdff2..20d76a3cc7 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ThemeDictionariesTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ThemeDictionariesTests.cs
@@ -185,9 +185,9 @@ public class ThemeDictionariesTests : XamlTestBase
     {
         using (AvaloniaLocator.EnterScope())
         {
-            var applicationThemeHost = new Mock<IGlobalThemeVariantProvider>();
+            var applicationThemeHost = new Mock<IThemeVariantHost>();
             applicationThemeHost.SetupGet(h => h.ActualThemeVariant).Returns(ThemeVariant.Dark);
-            AvaloniaLocator.CurrentMutable.Bind<IGlobalThemeVariantProvider>().ToConstant(applicationThemeHost.Object);
+            AvaloniaLocator.CurrentMutable.Bind<IThemeVariantHost>().ToConstant(applicationThemeHost.Object);
 
             var themeVariantScope = (ThemeVariantScope)AvaloniaRuntimeXamlLoader.Load(@"
 <ThemeVariantScope xmlns='https://github.com/avaloniaui'

From 86c7e9078376a718f457d253b8e79590b1b63ed4 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Wed, 1 Feb 2023 01:39:11 -0500
Subject: [PATCH 2/9] Fix DataGrid theming

---
 .../Themes/Fluent.xaml                        | 71 ++++++++++++-------
 1 file changed, 44 insertions(+), 27 deletions(-)

diff --git a/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml b/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
index dd8575c989..2197b0fe59 100644
--- a/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
+++ b/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
@@ -1,6 +1,48 @@
 <Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:collections="using:Avalonia.Collections">
   <Styles.Resources>
+   <ResourceDictionary>
+    <ResourceDictionary.ThemeDictionaries>
+        <ResourceDictionary x:Key="Dark">
+          <SolidColorBrush x:Key="DataGridColumnHeaderForegroundBrush" Color="{DynamicResource SystemBaseMediumColor}" />
+          <SolidColorBrush x:Key="DataGridColumnHeaderBackgroundBrush" Color="{DynamicResource SystemAltHighColor}" />
+          <SolidColorBrush x:Key="DataGridColumnHeaderHoveredBackgroundBrush" Color="{DynamicResource SystemListLowColor}" />
+          <SolidColorBrush x:Key="DataGridColumnHeaderPressedBackgroundBrush" Color="{DynamicResource SystemListMediumColor}" />
+          <SolidColorBrush x:Key="DataGridColumnHeaderDraggedBackgroundBrush" Color="{DynamicResource SystemChromeMediumLowColor}" />
+          <SolidColorBrush x:Key="DataGridRowGroupHeaderBackgroundBrush" Color="{DynamicResource SystemChromeMediumColor}" />
+          <SolidColorBrush x:Key="DataGridRowGroupHeaderPressedBackgroundBrush" Color="{DynamicResource SystemListMediumColor}" />
+          <SolidColorBrush x:Key="DataGridRowGroupHeaderForegroundBrush" Color="{DynamicResource SystemBaseHighColor}" />
+          <SolidColorBrush x:Key="DataGridRowGroupHeaderHoveredBackgroundBrush" Color="{DynamicResource SystemListLowColor}" />
+          <SolidColorBrush x:Key="DataGridRowHoveredBackgroundColor" Color="{DynamicResource SystemListLowColor}" />
+          <SolidColorBrush x:Key="DataGridRowInvalidBrush" Color="{DynamicResource SystemErrorTextColor}" />
+          <SolidColorBrush x:Key="DataGridCellFocusVisualPrimaryBrush" Color="{DynamicResource SystemBaseHighColor}" />
+          <SolidColorBrush x:Key="DataGridCellFocusVisualSecondaryBrush" Color="{DynamicResource SystemAltMediumColor}" />
+          <SolidColorBrush x:Key="DataGridCellInvalidBrush" Color="{DynamicResource SystemErrorTextColor}" />
+          <SolidColorBrush x:Key="DataGridGridLinesBrush" Opacity="0.4" Color="{DynamicResource SystemBaseMediumLowColor}" />
+          <SolidColorBrush x:Key="DataGridDetailsPresenterBackgroundBrush" Color="{DynamicResource SystemChromeMediumLowColor}" />
+
+        </ResourceDictionary>
+        <ResourceDictionary x:Key="Light">
+          <SolidColorBrush x:Key="DataGridColumnHeaderForegroundBrush" Color="{DynamicResource SystemBaseMediumColor}" />
+          <SolidColorBrush x:Key="DataGridColumnHeaderBackgroundBrush" Color="{DynamicResource SystemAltHighColor}" />
+          <SolidColorBrush x:Key="DataGridColumnHeaderHoveredBackgroundBrush" Color="{DynamicResource SystemListLowColor}" />
+          <SolidColorBrush x:Key="DataGridColumnHeaderPressedBackgroundBrush" Color="{DynamicResource SystemListMediumColor}" />
+          <SolidColorBrush x:Key="DataGridColumnHeaderDraggedBackgroundBrush" Color="{DynamicResource SystemChromeMediumLowColor}" />
+          <SolidColorBrush x:Key="DataGridRowGroupHeaderBackgroundBrush" Color="{DynamicResource SystemChromeMediumColor}" />
+          <SolidColorBrush x:Key="DataGridRowGroupHeaderPressedBackgroundBrush" Color="{DynamicResource SystemListMediumColor}" />
+          <SolidColorBrush x:Key="DataGridRowGroupHeaderForegroundBrush" Color="{DynamicResource SystemBaseHighColor}" />
+          <SolidColorBrush x:Key="DataGridRowGroupHeaderHoveredBackgroundBrush" Color="{DynamicResource SystemListLowColor}" />
+          <SolidColorBrush x:Key="DataGridRowHoveredBackgroundColor" Color="{DynamicResource SystemListLowColor}" />
+          <SolidColorBrush x:Key="DataGridRowInvalidBrush" Color="{DynamicResource SystemErrorTextColor}" />
+          <SolidColorBrush x:Key="DataGridCellFocusVisualPrimaryBrush" Color="{DynamicResource SystemBaseHighColor}" />
+          <SolidColorBrush x:Key="DataGridCellFocusVisualSecondaryBrush" Color="{DynamicResource SystemAltMediumColor}" />
+          <SolidColorBrush x:Key="DataGridCellInvalidBrush" Color="{DynamicResource SystemErrorTextColor}" />
+          <SolidColorBrush x:Key="DataGridGridLinesBrush" Opacity="0.4" Color="{DynamicResource SystemBaseMediumLowColor}" />
+          <SolidColorBrush x:Key="DataGridDetailsPresenterBackgroundBrush" Color="{DynamicResource SystemChromeMediumLowColor}" />
+
+        </ResourceDictionary>
+    </ResourceDictionary.ThemeDictionaries>
+    
     <x:Double x:Key="ListAccentLowOpacity">0.6</x:Double>
     <x:Double x:Key="ListAccentMediumOpacity">0.8</x:Double>
 
@@ -9,19 +51,6 @@
     <StreamGeometry x:Key="DataGridRowGroupHeaderIconClosedPath">M515 93l930 931l-930 931l90 90l1022 -1021l-1022 -1021z</StreamGeometry>
     <StreamGeometry x:Key="DataGridRowGroupHeaderIconOpenedPath">M109 486 19 576 1024 1581 2029 576 1939 486 1024 1401z</StreamGeometry>
 
-    <SolidColorBrush x:Key="DataGridColumnHeaderForegroundBrush" Color="{DynamicResource SystemBaseMediumColor}" />
-    <SolidColorBrush x:Key="DataGridColumnHeaderBackgroundBrush" Color="{DynamicResource SystemAltHighColor}" />
-    <SolidColorBrush x:Key="DataGridColumnHeaderHoveredBackgroundBrush" Color="{DynamicResource SystemListLowColor}" />
-    <SolidColorBrush x:Key="DataGridColumnHeaderPressedBackgroundBrush" Color="{DynamicResource SystemListMediumColor}" />
-    <SolidColorBrush x:Key="DataGridColumnHeaderDraggedBackgroundBrush"
-                     Color="{DynamicResource SystemChromeMediumLowColor}" />
-
-    <SolidColorBrush x:Key="DataGridRowGroupHeaderBackgroundBrush" Color="{DynamicResource SystemChromeMediumColor}" />
-    <SolidColorBrush x:Key="DataGridRowGroupHeaderPressedBackgroundBrush"
-                     Color="{DynamicResource SystemListMediumColor}" />
-    <SolidColorBrush x:Key="DataGridRowGroupHeaderForegroundBrush" Color="{DynamicResource SystemBaseHighColor}" />
-    <SolidColorBrush x:Key="DataGridRowGroupHeaderHoveredBackgroundBrush" Color="{DynamicResource SystemListLowColor}" />
-
     <StaticResource x:Key="DataGridRowBackgroundBrush" ResourceKey="SystemControlTransparentBrush" />
     <SolidColorBrush x:Key="DataGridRowSelectedBackgroundBrush" Color="{DynamicResource SystemAccentColor}" />
     <StaticResource x:Key="DataGridRowSelectedBackgroundOpacity" ResourceKey="ListAccentLowOpacity" />
@@ -29,23 +58,10 @@
     <StaticResource x:Key="DataGridRowSelectedHoveredBackgroundOpacity" ResourceKey="ListAccentMediumOpacity" />
     <SolidColorBrush x:Key="DataGridRowSelectedUnfocusedBackgroundBrush" Color="{DynamicResource SystemAccentColor}" />
     <StaticResource x:Key="DataGridRowSelectedUnfocusedBackgroundOpacity" ResourceKey="ListAccentLowOpacity" />
-    <SolidColorBrush x:Key="DataGridRowSelectedHoveredUnfocusedBackgroundBrush"
-                     Color="{DynamicResource SystemAccentColor}" />
+    <SolidColorBrush x:Key="DataGridRowSelectedHoveredUnfocusedBackgroundBrush" Color="{DynamicResource SystemAccentColor}" />
     <StaticResource x:Key="DataGridRowSelectedHoveredUnfocusedBackgroundOpacity" ResourceKey="ListAccentMediumOpacity" />
-    <SolidColorBrush x:Key="DataGridRowHoveredBackgroundColor" Color="{DynamicResource SystemListLowColor}" />
-    <SolidColorBrush x:Key="DataGridRowInvalidBrush" Color="{DynamicResource SystemErrorTextColor}" />
-    
     <StaticResource x:Key="DataGridCellBackgroundBrush" ResourceKey="SystemControlTransparentBrush" />
-    <SolidColorBrush x:Key="DataGridCellFocusVisualPrimaryBrush" Color="{DynamicResource SystemBaseHighColor}" />
-    <SolidColorBrush x:Key="DataGridCellFocusVisualSecondaryBrush" Color="{DynamicResource SystemAltMediumColor}" />
-    <SolidColorBrush x:Key="DataGridCellInvalidBrush" Color="{DynamicResource SystemErrorTextColor}" />
-
-    <SolidColorBrush x:Key="DataGridGridLinesBrush"
-                     Opacity="0.4"
-                     Color="{DynamicResource SystemBaseMediumLowColor}" />
     <StaticResource x:Key="DataGridCurrencyVisualPrimaryBrush" ResourceKey="SystemControlTransparentBrush" />
-    <SolidColorBrush x:Key="DataGridDetailsPresenterBackgroundBrush"
-                     Color="{DynamicResource SystemChromeMediumLowColor}" />
     <StaticResource x:Key="DataGridFillerColumnGridLinesBrush" ResourceKey="SystemControlTransparentBrush" />
 
     <ControlTheme x:Key="DataGridCellTextBlockTheme" TargetType="TextBlock">
@@ -565,5 +581,6 @@
         </Style>
       </Style>
     </ControlTheme>
+   </ResourceDictionary>
   </Styles.Resources>
 </Styles>

From 0c20abec120cd9a0039342c88737c4b0085d6e13 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Wed, 1 Feb 2023 02:27:27 -0500
Subject: [PATCH 3/9] Update src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml

---
 src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml b/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
index 2197b0fe59..ca516c8918 100644
--- a/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
+++ b/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
@@ -22,7 +22,7 @@
           <SolidColorBrush x:Key="DataGridDetailsPresenterBackgroundBrush" Color="{DynamicResource SystemChromeMediumLowColor}" />
 
         </ResourceDictionary>
-        <ResourceDictionary x:Key="Light">
+        <ResourceDictionary x:Key="Default">
           <SolidColorBrush x:Key="DataGridColumnHeaderForegroundBrush" Color="{DynamicResource SystemBaseMediumColor}" />
           <SolidColorBrush x:Key="DataGridColumnHeaderBackgroundBrush" Color="{DynamicResource SystemAltHighColor}" />
           <SolidColorBrush x:Key="DataGridColumnHeaderHoveredBackgroundBrush" Color="{DynamicResource SystemListLowColor}" />

From 3ace482c198a56f558cb1369b5885508d2c839da Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Tue, 14 Feb 2023 20:32:12 -0500
Subject: [PATCH 4/9] Fix wrong property names and documentation

---
 src/Avalonia.Base/Styling/ThemeVariant.cs  | 2 +-
 src/Avalonia.Controls/Application.cs       | 2 +-
 src/Avalonia.Controls/Control.cs           | 1 +
 src/Avalonia.Controls/ThemeVariantScope.cs | 8 ++++----
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/Avalonia.Base/Styling/ThemeVariant.cs b/src/Avalonia.Base/Styling/ThemeVariant.cs
index 8218533f4f..5a6a8785a5 100644
--- a/src/Avalonia.Base/Styling/ThemeVariant.cs
+++ b/src/Avalonia.Base/Styling/ThemeVariant.cs
@@ -6,7 +6,7 @@ using Avalonia.Platform;
 namespace Avalonia.Styling;
 
 /// <summary>
-/// Specifies a UI theme variant that should be used for the 
+/// Specifies a UI theme variant that should be used for the Control and Application types.
 /// </summary>
 [TypeConverter(typeof(ThemeVariantTypeConverter))]
 public sealed record ThemeVariant
diff --git a/src/Avalonia.Controls/Application.cs b/src/Avalonia.Controls/Application.cs
index 8456a9a3a9..6d9a6bd493 100644
--- a/src/Avalonia.Controls/Application.cs
+++ b/src/Avalonia.Controls/Application.cs
@@ -95,7 +95,7 @@ namespace Avalonia
             set => SetValue(RequestedThemeVariantProperty, value);
         }
         
-        /// <inheritdoc cref="ThemeVariantScope.ActualThemeVariant"/>
+        /// <inheritdoc />
         public ThemeVariant ActualThemeVariant => GetValue(ActualThemeVariantProperty);
 
         /// <summary>
diff --git a/src/Avalonia.Controls/Control.cs b/src/Avalonia.Controls/Control.cs
index 775fc8e243..c9e8f0d045 100644
--- a/src/Avalonia.Controls/Control.cs
+++ b/src/Avalonia.Controls/Control.cs
@@ -162,6 +162,7 @@ namespace Avalonia.Controls
             set => SetValue(TagProperty, value);
         }
         
+        /// <inheritdoc />
         public ThemeVariant ActualThemeVariant => GetValue(ThemeVariantScope.ActualThemeVariantProperty);
 
         public event EventHandler? ActualThemeVariantChanged;
diff --git a/src/Avalonia.Controls/ThemeVariantScope.cs b/src/Avalonia.Controls/ThemeVariantScope.cs
index 2aac1d3e2f..ff950d3985 100644
--- a/src/Avalonia.Controls/ThemeVariantScope.cs
+++ b/src/Avalonia.Controls/ThemeVariantScope.cs
@@ -8,11 +8,11 @@ namespace Avalonia.Controls
     public class ThemeVariantScope : Decorator
     {
         /// <summary>
-        /// Defines the <see cref="StyledElement.ActualThemeVariant"/> property.
+        /// Defines the <see cref="Control.ActualThemeVariant"/> property.
         /// </summary>
         public static readonly StyledProperty<ThemeVariant> ActualThemeVariantProperty =
             AvaloniaProperty.Register<ThemeVariantScope, ThemeVariant>(
-                nameof(ThemeVariant),
+                nameof(ActualThemeVariant),
                 inherits: true,
                 defaultValue: ThemeVariant.Light);
 
@@ -21,9 +21,9 @@ namespace Avalonia.Controls
         /// </summary>
         public static readonly StyledProperty<ThemeVariant?> RequestedThemeVariantProperty =
             AvaloniaProperty.Register<ThemeVariantScope, ThemeVariant?>(
-                nameof(ThemeVariant),
+                nameof(RequestedThemeVariant),
                 defaultValue: ThemeVariant.Default);
-        
+
         /// <summary>
         /// Gets or sets the UI theme variant that is used by the control (and its child elements) for resource determination.
         /// The UI theme you specify with ThemeVariant can override the app-level ThemeVariant.

From af70f74c88163b9e0d5446163685ec9f0b748e7d Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Tue, 14 Feb 2023 23:03:11 -0500
Subject: [PATCH 5/9] Workaround for the inherited default value bug

---
 src/Avalonia.Controls/ThemeVariantScope.cs    |  3 +-
 .../Xaml/ThemeDictionariesTests.cs            | 73 ++++++++++++++++++-
 2 files changed, 73 insertions(+), 3 deletions(-)

diff --git a/src/Avalonia.Controls/ThemeVariantScope.cs b/src/Avalonia.Controls/ThemeVariantScope.cs
index ff950d3985..b29f1ee56e 100644
--- a/src/Avalonia.Controls/ThemeVariantScope.cs
+++ b/src/Avalonia.Controls/ThemeVariantScope.cs
@@ -13,8 +13,7 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<ThemeVariant> ActualThemeVariantProperty =
             AvaloniaProperty.Register<ThemeVariantScope, ThemeVariant>(
                 nameof(ActualThemeVariant),
-                inherits: true,
-                defaultValue: ThemeVariant.Light);
+                inherits: true);
 
         /// <summary>
         /// Defines the <see cref="RequestedThemeVariant"/> property.
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ThemeDictionariesTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ThemeDictionariesTests.cs
index 20d76a3cc7..3ac4677694 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ThemeDictionariesTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ThemeDictionariesTests.cs
@@ -1,8 +1,12 @@
-using Avalonia.Controls;
+using System.Linq;
+using Avalonia.Controls;
+using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Primitives;
 using Avalonia.Markup.Data;
 using Avalonia.Markup.Xaml.MarkupExtensions;
 using Avalonia.Media;
 using Avalonia.Styling;
+using Avalonia.UnitTests;
 using Moq;
 using Xunit;
 
@@ -444,4 +448,71 @@ public class ThemeDictionariesTests : XamlTestBase
 
         Assert.Equal(Colors.Black, ((ISolidColorBrush)border.Background)!.Color);
     }
+    
+    [Fact]
+    public void Theme_Switch_Works_In_Nested_Scope()
+    {
+        using (UnitTestApplication.Start(TestServices.StyledWindow))
+        {
+            var window = (Window)AvaloniaRuntimeXamlLoader.Load(@"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+        RequestedThemeVariant='Dark'>
+    <ThemeVariantScope Name='Scope'>
+        <TextBlock Name='Text' />
+    </ThemeVariantScope>
+</Window>");
+            window.ApplyTemplate();
+
+            var scope = window.FindControl<ThemeVariantScope>("Scope")!;
+            var text = window.FindControl<TextBlock>("Text")!;
+
+            Assert.Equal(ThemeVariant.Dark, text.ActualThemeVariant);
+            Assert.Equal(Color.Parse("#dedede"), ((ISolidColorBrush)text.Foreground!).Color);
+            
+            scope.RequestedThemeVariant = ThemeVariant.Light;
+            Assert.Equal(ThemeVariant.Light, text.ActualThemeVariant);
+            Assert.Equal(Colors.Black, ((ISolidColorBrush)text.Foreground!).Color);
+        }
+    }
+    
+    [Fact]
+    public void Theme_Switch_Works_In_With_Popup()
+    {
+        using (UnitTestApplication.Start(TestServices.StyledWindow))
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(@"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <ThemeVariantScope Name='Scope' RequestedThemeVariant='Dark'>
+        <Popup Name='Popup'>
+            <Border Width='100' Height='100'
+                    Background='{DynamicResource ThemeBackgroundBrush}'>
+            </Border>
+        </Popup>
+    </ThemeVariantScope>
+</Window>");
+                window.Show();
+
+                var scope = window.FindControl<ThemeVariantScope>("Scope")!;
+                var popup = window.FindControl<Popup>("Popup")!;
+                
+                popup.IsOpen = true;
+
+                var border = (Border)popup.Child!;
+
+                Assert.Equal(ThemeVariant.Dark, popup.ActualThemeVariant);
+                Assert.Equal(ThemeVariant.Dark, border.ActualThemeVariant);
+                Assert.Equal(Color.Parse("#282828"), ((ISolidColorBrush)border.Background!).Color);
+                
+                scope.RequestedThemeVariant = ThemeVariant.Light;
+
+                Assert.Equal(ThemeVariant.Light, popup.ActualThemeVariant);
+                Assert.Equal(ThemeVariant.Light, border.ActualThemeVariant);
+                Assert.Equal(Colors.White, ((ISolidColorBrush)border.Background!).Color);
+            }
+        }
+    }
 }

From 9933fd04ce136e0376b78b57355556267b28493e Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Tue, 14 Feb 2023 23:47:55 -0500
Subject: [PATCH 6/9] Bind target theme variant to the popup root

---
 src/Avalonia.Controls/Primitives/Popup.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/Avalonia.Controls/Primitives/Popup.cs b/src/Avalonia.Controls/Primitives/Popup.cs
index d6cd71aedc..142db71761 100644
--- a/src/Avalonia.Controls/Primitives/Popup.cs
+++ b/src/Avalonia.Controls/Primitives/Popup.cs
@@ -387,6 +387,15 @@ namespace Avalonia.Controls.Primitives
                 popupHost.Transform = null;
             }
 
+            if (popupHost is PopupRoot topLevelPopup)
+            {
+                topLevelPopup
+                    .Bind(
+                        ThemeVariantScope.ActualThemeVariantProperty,
+                        placementTarget.GetBindingObservable(ThemeVariantScope.ActualThemeVariantProperty))
+                    .DisposeWith(handlerCleanup);
+            }
+
             UpdateHostPosition(popupHost, placementTarget);
 
             SubscribeToEventHandler<IPopupHost, EventHandler<TemplateAppliedEventArgs>>(popupHost, RootTemplateApplied,

From 5d0d3ba5bbe791590215a88d8e05b83ab68f9ae4 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Wed, 15 Feb 2023 00:05:03 -0500
Subject: [PATCH 7/9] Simplify simple themes of ported control

---
 .../Controls/SplitButton.xaml                 | 104 +++++++-----------
 .../Controls/SplitView.xaml                   |   6 +-
 .../Controls/ToggleSwitch.xaml                |  91 +++++----------
 3 files changed, 73 insertions(+), 128 deletions(-)

diff --git a/src/Avalonia.Themes.Simple/Controls/SplitButton.xaml b/src/Avalonia.Themes.Simple/Controls/SplitButton.xaml
index 3c621a981d..2a7dc081f0 100644
--- a/src/Avalonia.Themes.Simple/Controls/SplitButton.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/SplitButton.xaml
@@ -2,8 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:converters="using:Avalonia.Controls.Converters">
 
-  <!-- This style is heavily based on the Fluent v1 style.
-       The base resources are switched out along with a few minor changes such as Padding, CornerRadius. -->
+  <!-- This style is based on the Fluent v1 style. -->
 
   <Design.PreviewWith>
     <Border Padding="20">
@@ -26,37 +25,7 @@
   <converters:CornerRadiusFilterConverter x:Key="RightCornerRadiusFilterConverter" Filter="TopRight, BottomRight" />
   <converters:CornerRadiusFilterConverter x:Key="BottomCornerRadiusFilterConverter" Filter="BottomLeft, BottomRight" />
   <converters:CornerRadiusFilterConverter x:Key="LeftCornerRadiusFilterConverter" Filter="TopLeft, BottomLeft" />
-
-  <SolidColorBrush x:Key="SplitButtonBackground" Color="{DynamicResource ThemeControlMidColor}" />
-  <SolidColorBrush x:Key="SplitButtonBackgroundPointerOver" Color="{DynamicResource ThemeControlMidColor}" />
-  <SolidColorBrush x:Key="SplitButtonBackgroundPressed" Color="{DynamicResource ThemeBorderHighColor}" />
-  <SolidColorBrush x:Key="SplitButtonBackgroundDisabled" Color="{DynamicResource ThemeControlMidColor}"
-                   Opacity="{DynamicResource ThemeDisabledOpacity}" />
-  <SolidColorBrush x:Key="SplitButtonBackgroundChecked" Color="{DynamicResource ThemeBorderHighColor}" />
-  <SolidColorBrush x:Key="SplitButtonBackgroundCheckedPointerOver" Color="{DynamicResource ThemeBorderHighColor}" />
-  <SolidColorBrush x:Key="SplitButtonBackgroundCheckedPressed" Color="{DynamicResource ThemeBorderHighColor}" />
-  <SolidColorBrush x:Key="SplitButtonBackgroundCheckedDisabled" Color="{DynamicResource ThemeControlHighColor}"
-                   Opacity="{DynamicResource ThemeDisabledOpacity}" />
-
-  <SolidColorBrush x:Key="SplitButtonForeground" Color="{DynamicResource ThemeForegroundColor}" />
-  <SolidColorBrush x:Key="SplitButtonForegroundPointerOver" Color="{DynamicResource ThemeForegroundColor}" />
-  <SolidColorBrush x:Key="SplitButtonForegroundPressed" Color="{DynamicResource ThemeForegroundColor}" />
-  <SolidColorBrush x:Key="SplitButtonForegroundDisabled" Color="{DynamicResource ThemeForegroundColor}" />
-  <SolidColorBrush x:Key="SplitButtonForegroundChecked" Color="{DynamicResource ThemeForegroundColor}" />
-  <SolidColorBrush x:Key="SplitButtonForegroundCheckedPointerOver" Color="{DynamicResource ThemeForegroundColor}" />
-  <SolidColorBrush x:Key="SplitButtonForegroundCheckedPressed" Color="{DynamicResource ThemeForegroundColor}" />
-  <SolidColorBrush x:Key="SplitButtonForegroundCheckedDisabled" Color="{DynamicResource ThemeForegroundColor}" />
-
-  <SolidColorBrush x:Key="SplitButtonBorderBrush" Color="{DynamicResource ThemeBorderLowColor}" />
-  <SolidColorBrush x:Key="SplitButtonBorderBrushPointerOver" Color="{DynamicResource ThemeBorderMidColor}" />
-  <SolidColorBrush x:Key="SplitButtonBorderBrushPressed" Color="{DynamicResource ThemeBorderLowColor}" />
-  <SolidColorBrush x:Key="SplitButtonBorderBrushDisabled" Color="{DynamicResource ThemeBorderLowColor}" />
-  <SolidColorBrush x:Key="SplitButtonBorderBrushChecked" Color="{DynamicResource ThemeBorderMidColor}" />
-  <SolidColorBrush x:Key="SplitButtonBorderBrushCheckedPointerOver" Color="{DynamicResource ThemeBorderMidColor}" />
-  <SolidColorBrush x:Key="SplitButtonBorderBrushCheckedPressed" Color="{DynamicResource ThemeControlHighColor}" />
-  <SolidColorBrush x:Key="SplitButtonBorderBrushCheckedDisabled" Color="{DynamicResource ThemeControlMidColor}"
-                   Opacity="{DynamicResource ThemeDisabledOpacity}" />
-
+  
   <ControlTheme x:Key="SimpleSplitButtonComponent" TargetType="Button">
     <Setter Property="Template">
       <ControlTemplate>
@@ -75,66 +44,75 @@
     </Setter>
 
     <Style Selector="^:pointerover /template/ ContentPresenter">
-      <Setter Property="Background" Value="{DynamicResource SplitButtonBackgroundPointerOver}" />
-      <Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushPointerOver}" />
-      <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundPointerOver}" />
+      <Setter Property="Background" Value="{DynamicResource ThemeControlMidColor}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidColor}" />
+      <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundColor}" />
     </Style>
 
     <Style Selector="^:pressed /template/ ContentPresenter">
-      <Setter Property="Background" Value="{DynamicResource SplitButtonBackgroundPressed}" />
-      <Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushPressed}" />
-      <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
+      <Setter Property="Background" Value="{DynamicResource ThemeBorderHighColor}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderLowColor}" />
+      <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundColor}" />
     </Style>
 
     <Style Selector="^:disabled /template/ ContentPresenter">
-      <Setter Property="Background" Value="{DynamicResource SplitButtonBackgroundDisabled}" />
-      <Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushDisabled}" />
-      <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundDisabled}" />
+      <Setter Property="Background">
+        <SolidColorBrush Color="{DynamicResource ThemeControlMidColor}"
+                         Opacity="{DynamicResource ThemeDisabledOpacity}" />
+      </Setter>
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderLowColor}" />
+      <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundColor}" />
     </Style>
 
     <Style Selector="^[Tag=flyout-open] /template/ ContentPresenter">
-      <Setter Property="Background" Value="{DynamicResource SplitButtonBackgroundPressed}" />
-      <Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushPressed}" />
-      <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
+      <Setter Property="Background" Value="{DynamicResource ThemeBorderHighColor}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderLowColor}" />
+      <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundColor}" />
     </Style>
 
     <Style Selector="^[Tag=checked]">
       <Style Selector="^ /template/ ContentPresenter">
-        <Setter Property="Background" Value="{DynamicResource SplitButtonBackgroundChecked}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushChecked}" />
-        <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundChecked}" />
+        <Setter Property="Background" Value="{DynamicResource ThemeBorderHighColor}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidColor}" />
+        <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundColor}" />
       </Style>
 
       <Style Selector="^:pointerover /template/ ContentPresenter">
-        <Setter Property="Background" Value="{DynamicResource SplitButtonBackgroundCheckedPointerOver}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedPointerOver}" />
-        <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPointerOver}" />
+        <Setter Property="Background" Value="{DynamicResource ThemeBorderHighColor}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidColor}" />
+        <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundColor}" />
       </Style>
 
       <Style Selector="^:pressed /template/ ContentPresenter">
-        <Setter Property="Background" Value="{DynamicResource SplitButtonBackgroundCheckedPressed}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedPressed}" />
-        <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
+        <Setter Property="Background" Value="{DynamicResource ThemeBorderHighColor}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ThemeControlHighColor}" />
+        <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundColor}" />
       </Style>
 
       <Style Selector="^:disabled /template/ ContentPresenter">
-        <Setter Property="Background" Value="{DynamicResource SplitButtonBackgroundCheckedDisabled}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedDisabled}" />
-        <Setter Property="TextElement.Foreground" Value="{DynamicResource SplitButtonForegroundCheckedDisabled}" />
+        <Setter Property="Background">
+          <SolidColorBrush Color="{DynamicResource ThemeControlHighColor}"
+                           Opacity="{DynamicResource ThemeDisabledOpacity}" />
+        </Setter>
+        <Setter Property="BorderBrush">
+          <SolidColorBrush Color="{DynamicResource ThemeControlMidColor}"
+                           Opacity="{DynamicResource ThemeDisabledOpacity}" />
+        </Setter>
+        <Setter Property="TextElement.Foreground" Value="{DynamicResource ThemeForegroundColor}" />
       </Style>
     </Style>
 
     <Style Selector="^[Tag=checked-flyout-open] /template/ ContentPresenter">
-      <Setter Property="Background" Value="{DynamicResource SplitButtonBackgroundCheckedPressed}" />
-      <Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedPressed}" />
-      <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
+      <Setter Property="Background" Value="{DynamicResource ThemeBorderHighColor}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeControlHighColor}" />
+      <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundColor}" />
     </Style>
   </ControlTheme>
 
   <ControlTheme x:Key="{x:Type SplitButton}" TargetType="SplitButton">
-    <Setter Property="Background" Value="{DynamicResource SplitButtonBackground}" />
-    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForeground}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrush}" />
+    <Setter Property="Background" Value="{DynamicResource ThemeControlMidColor}" />
+    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundColor}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderLowColor}" />
     <Setter Property="BorderThickness" Value="{DynamicResource SplitButtonBorderThemeThickness}" />
     <Setter Property="MinHeight" Value="{DynamicResource SplitButtonMinHeight}" />
     <Setter Property="HorizontalAlignment" Value="Left" />
diff --git a/src/Avalonia.Themes.Simple/Controls/SplitView.xaml b/src/Avalonia.Themes.Simple/Controls/SplitView.xaml
index d6f293a730..f839e9a598 100644
--- a/src/Avalonia.Themes.Simple/Controls/SplitView.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/SplitView.xaml
@@ -17,8 +17,6 @@
 
   <x:Double x:Key="SplitViewOpenPaneThemeLength">320</x:Double>
   <x:Double x:Key="SplitViewCompactPaneThemeLength">48</x:Double>
-  <SolidColorBrush x:Key="SplitViewLightDismissOverlayBackground" Color="{DynamicResource ThemeControlLowColor}"
-                   Opacity="0.6" />
   <sys:TimeSpan x:Key="SplitViewPaneAnimationOpenDuration">00:00:00.2</sys:TimeSpan>
   <sys:TimeSpan x:Key="SplitViewPaneAnimationCloseDuration">00:00:00.1</sys:TimeSpan>
   <Easing x:Key="SplitViewPaneAnimationEasing">0.1,0.9,0.2,1.0</Easing>
@@ -240,7 +238,9 @@
       <Setter Property="Fill" Value="Transparent" />
     </Style>
     <Style Selector="^:lightdismiss /template/ Rectangle#LightDismissLayer">
-      <Setter Property="Fill" Value="{DynamicResource SplitViewLightDismissOverlayBackground}" />
+      <Setter Property="Fill">
+        <SolidColorBrush Color="{DynamicResource ThemeControlLowColor}" Opacity="0.6" />
+      </Setter>
     </Style>
 
     <Style Selector="^:overlay:open /template/ Rectangle#LightDismissLayer">
diff --git a/src/Avalonia.Themes.Simple/Controls/ToggleSwitch.xaml b/src/Avalonia.Themes.Simple/Controls/ToggleSwitch.xaml
index 0815f487f8..f7223c46c0 100644
--- a/src/Avalonia.Themes.Simple/Controls/ToggleSwitch.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/ToggleSwitch.xaml
@@ -36,43 +36,10 @@
   <x:Double x:Key="ToggleSwitchThemeMinWidth">0</x:Double>
   <Thickness x:Key="ToggleSwitchOnStrokeThickness">0</Thickness>
   <Thickness x:Key="ToggleSwitchOuterBorderStrokeThickness">1</Thickness>
-  <SolidColorBrush x:Key="ToggleSwitchContentForeground" Color="{DynamicResource ThemeForegroundColor}" />
-  <SolidColorBrush x:Key="ToggleSwitchContentForegroundDisabled" Color="{DynamicResource ThemeForegroundLowColor}" />
-  <SolidColorBrush x:Key="ToggleSwitchHeaderForeground" Color="{DynamicResource ThemeForegroundColor}" />
-  <SolidColorBrush x:Key="ToggleSwitchHeaderForegroundDisabled" Color="{DynamicResource ThemeForegroundLowColor}" />
-  <SolidColorBrush x:Key="ToggleSwitchContainerBackground" Color="Transparent" />
-  <SolidColorBrush x:Key="ToggleSwitchContainerBackgroundPointerOver" Color="Transparent" />
-  <SolidColorBrush x:Key="ToggleSwitchContainerBackgroundPressed" Color="Transparent" />
-  <SolidColorBrush x:Key="ToggleSwitchContainerBackgroundDisabled" Color="Transparent" />
-  <SolidColorBrush x:Key="ToggleSwitchFillOff" Color="Transparent" />
-  <SolidColorBrush x:Key="ToggleSwitchFillOffPointerOver" Color="Transparent" />
-  <SolidColorBrush x:Key="ToggleSwitchFillOffPressed" Color="{DynamicResource ThemeControlMidHighColor}" />
-  <SolidColorBrush x:Key="ToggleSwitchFillOffDisabled" Color="Transparent" />
-  <SolidColorBrush x:Key="ToggleSwitchStrokeOff" Color="{DynamicResource ThemeBorderMidColor}" />
-  <SolidColorBrush x:Key="ToggleSwitchStrokeOffPointerOver" Color="{DynamicResource ThemeBorderHighColor}" />
-  <SolidColorBrush x:Key="ToggleSwitchStrokeOffPressed" Color="{DynamicResource ThemeBorderHighColor}" />
-  <SolidColorBrush x:Key="ToggleSwitchStrokeOffDisabled" Color="{DynamicResource ThemeForegroundLowColor}" />
-  <SolidColorBrush x:Key="ToggleSwitchFillOn" Color="{DynamicResource ThemeAccentColor}" />
-  <SolidColorBrush x:Key="ToggleSwitchFillOnPointerOver" Color="{DynamicResource ThemeAccentColor2}" />
-  <SolidColorBrush x:Key="ToggleSwitchFillOnPressed" Color="{DynamicResource ThemeAccentColor3}" />
-  <SolidColorBrush x:Key="ToggleSwitchFillOnDisabled" Color="{DynamicResource ThemeForegroundLowColor}" />
-  <SolidColorBrush x:Key="ToggleSwitchStrokeOn" Color="{DynamicResource ThemeAccentColor}" />
-  <SolidColorBrush x:Key="ToggleSwitchStrokeOnPointerOver" Color="{DynamicResource ThemeAccentColor2}" />
-  <SolidColorBrush x:Key="ToggleSwitchStrokeOnPressed" Color="{DynamicResource ThemeAccentColor3}" />
-  <SolidColorBrush x:Key="ToggleSwitchStrokeOnDisabled" Color="{DynamicResource ThemeForegroundLowColor}" />
-  <SolidColorBrush x:Key="ToggleSwitchKnobFillOff" Color="{DynamicResource ThemeBorderMidColor}" />
-  <SolidColorBrush x:Key="ToggleSwitchKnobFillOffPointerOver" Color="{DynamicResource ThemeBorderHighColor}" />
-  <SolidColorBrush x:Key="ToggleSwitchKnobFillOffPressed" Color="{DynamicResource ThemeBorderHighColor}" />
-  <SolidColorBrush x:Key="ToggleSwitchKnobFillOffDisabled" Color="{DynamicResource ThemeForegroundLowColor}" />
-  <SolidColorBrush x:Key="ToggleSwitchKnobFillOn" Color="{DynamicResource HighlightForegroundColor}" />
-  <SolidColorBrush x:Key="ToggleSwitchKnobFillOnPointerOver" Color="{DynamicResource HighlightForegroundColor}" />
-  <SolidColorBrush x:Key="ToggleSwitchKnobFillOnPressed" Color="{DynamicResource HighlightForegroundColor}" />
-  <SolidColorBrush x:Key="ToggleSwitchKnobFillOnDisabled" Color="{DynamicResource HighlightForegroundColor}" />
-
 
   <ControlTheme x:Key="{x:Type ToggleSwitch}"
                 TargetType="ToggleSwitch">
-    <Setter Property="Foreground" Value="{DynamicResource ToggleSwitchContentForeground}" />
+    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundColor}" />
     <Setter Property="HorizontalAlignment" Value="Left" />
     <Setter Property="VerticalAlignment" Value="Center" />
     <Setter Property="HorizontalContentAlignment" Value="Left" />
@@ -111,7 +78,7 @@
             <Grid x:Name="SwitchAreaGrid"
                   Grid.RowSpan="3"
                   Grid.ColumnSpan="3"
-                  Background="{DynamicResource ToggleSwitchContainerBackground}"
+                  Background="Transparent"
                   TemplatedControl.IsTemplateFocusTarget="True"
                   Margin="0,5" />
 
@@ -136,8 +103,8 @@
                     Height="20"
                     Width="40"
                     CornerRadius="10"
-                    Background="{DynamicResource ToggleSwitchFillOff}"
-                    BorderBrush="{DynamicResource ToggleSwitchStrokeOff}"
+                    Background="Transparent"
+                    BorderBrush="{DynamicResource ThemeBorderMidColor}"
                     BorderThickness="{DynamicResource ToggleSwitchOuterBorderStrokeThickness}" />
 
             <Border x:Name="SwitchKnobBounds"
@@ -145,8 +112,8 @@
                     Height="20"
                     Width="40"
                     CornerRadius="10"
-                    Background="{DynamicResource ToggleSwitchFillOn}"
-                    BorderBrush="{DynamicResource ToggleSwitchStrokeOn}"
+                    Background="{DynamicResource ThemeAccentColor}"
+                    BorderBrush="{DynamicResource ThemeAccentColor}"
                     BorderThickness="{DynamicResource ToggleSwitchOnStrokeThickness}" />
 
             <Canvas x:Name="PART_SwitchKnob" Grid.Row="1"
@@ -162,11 +129,11 @@
                 </Grid.Transitions>
 
                 <Ellipse x:Name="SwitchKnobOn"
-                         Fill="{DynamicResource ToggleSwitchKnobFillOn}"
+                         Fill="{DynamicResource HighlightForegroundColor}"
                          Width="10" Height="10" />
 
                 <Ellipse x:Name="SwitchKnobOff"
-                         Fill="{DynamicResource ToggleSwitchKnobFillOff}"
+                         Fill="{DynamicResource ThemeBorderMidColor}"
                          Width="10" Height="10" />
               </Grid>
             </Canvas>
@@ -181,71 +148,71 @@
 
     <!-- PointerOverState -->
     <Style Selector="^:pointerover /template/ Border#OuterBorder">
-      <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOffPointerOver}" />
-      <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOffPointerOver}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderHighColor}" />
+      <Setter Property="Background" Value="Transparent" />
     </Style>
 
     <Style Selector="^:pointerover /template/ Ellipse#SwitchKnobOff">
-      <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOffPointerOver}" />
+      <Setter Property="Fill" Value="{DynamicResource ThemeBorderHighColor}" />
     </Style>
 
     <Style Selector="^:pointerover /template/ Ellipse#SwitchKnobOn">
-      <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOnPointerOver}" />
+      <Setter Property="Fill" Value="{DynamicResource HighlightForegroundColor}" />
     </Style>
 
     <Style Selector="^:pointerover /template/ Border#SwitchKnobBounds">
-      <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOnPointerOver}" />
-      <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOnPointerOver}" />
+      <Setter Property="Background" Value="{DynamicResource ThemeAccentColor2}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeAccentColor2}" />
     </Style>
 
     <Style Selector="^:pointerover /template/ Grid#SwitchAreaGrid">
-      <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerBackgroundPointerOver}" />
+      <Setter Property="Background" Value="Transparent" />
     </Style>
 
     <!-- PressedState -->
     <Style Selector="^:pressed /template/ Border#OuterBorder">
-      <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOffPressed}" />
-      <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOffPressed}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderHighColor}" />
+      <Setter Property="Background" Value="{DynamicResource ThemeControlMidHighColor}" />
     </Style>
 
     <Style Selector="^:pressed /template/ Border#SwitchKnobBounds">
-      <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOnPressed}" />
-      <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOnPressed}" />
+      <Setter Property="Background" Value="{DynamicResource ThemeAccentColor3}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeAccentColor3}" />
     </Style>
 
     <Style Selector="^:pressed /template/ Ellipse#SwitchKnobOff">
-      <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOffPressed}" />
+      <Setter Property="Fill" Value="{DynamicResource ThemeBorderHighColor}" />
     </Style>
 
     <Style Selector="^:pressed /template/ Ellipse#SwitchKnobOn">
-      <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOnPressed}" />
+      <Setter Property="Fill" Value="{DynamicResource HighlightForegroundColor}" />
     </Style>
 
     <Style Selector="^:pressed /template/ Grid#SwitchAreaGrid">
-      <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerBackgroundPressed}" />
+      <Setter Property="Background" Value="Transparent" />
     </Style>
 
     <!-- DisabledState -->
     <Style Selector="^:disabled">
-      <Setter Property="Foreground" Value="{DynamicResource ToggleSwitchHeaderForegroundDisabled}" />
+      <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundLowColor}" />
     </Style>
 
     <Style Selector="^:disabled /template/ Border#OuterBorder">
-      <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOffDisabled}" />
-      <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOffDisabled}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeForegroundLowColor}" />
+      <Setter Property="Background" Value="Transparent" />
     </Style>
 
     <Style Selector="^:disabled /template/ Ellipse#SwitchKnobOff">
-      <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOffDisabled}" />
+      <Setter Property="Fill" Value="{DynamicResource ThemeForegroundLowColor}" />
     </Style>
 
     <Style Selector="^:disabled /template/ Ellipse#SwitchKnobOn">
-      <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOnDisabled}" />
+      <Setter Property="Fill" Value="{DynamicResource HighlightForegroundColor}" />
     </Style>
 
     <Style Selector="^:disabled /template/ Border#SwitchKnobBounds">
-      <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOnDisabled}" />
-      <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOnDisabled}" />
+      <Setter Property="Background" Value="{DynamicResource ThemeForegroundLowColor}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeForegroundLowColor}" />
     </Style>
 
     <!-- CheckedState -->

From cbcff7bf1d9d8bf8c3311029077b84c11fe2536a Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Tue, 21 Feb 2023 03:19:25 -0500
Subject: [PATCH 8/9] Use popup theme instead of target, as it is correct

---
 src/Avalonia.Controls/Primitives/Popup.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Primitives/Popup.cs b/src/Avalonia.Controls/Primitives/Popup.cs
index 142db71761..9d443d9289 100644
--- a/src/Avalonia.Controls/Primitives/Popup.cs
+++ b/src/Avalonia.Controls/Primitives/Popup.cs
@@ -392,7 +392,7 @@ namespace Avalonia.Controls.Primitives
                 topLevelPopup
                     .Bind(
                         ThemeVariantScope.ActualThemeVariantProperty,
-                        placementTarget.GetBindingObservable(ThemeVariantScope.ActualThemeVariantProperty))
+                        this.GetBindingObservable(ThemeVariantScope.ActualThemeVariantProperty))
                     .DisposeWith(handlerCleanup);
             }
 

From 74ef92a4a8f5575472d02c8ffed01774d118cd2e Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Tue, 21 Feb 2023 03:19:41 -0500
Subject: [PATCH 9/9] Make StyledElement use theme variants again

---
 src/Avalonia.Base/StyledElement.cs         | 21 ++++++++++++++++++++-
 src/Avalonia.Base/Styling/ThemeVariant.cs  | 15 +++++++++++++++
 src/Avalonia.Controls/Control.cs           | 18 +-----------------
 src/Avalonia.Controls/ThemeVariantScope.cs | 16 ++++------------
 4 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/src/Avalonia.Base/StyledElement.cs b/src/Avalonia.Base/StyledElement.cs
index 405b874fed..94af8385a8 100644
--- a/src/Avalonia.Base/StyledElement.cs
+++ b/src/Avalonia.Base/StyledElement.cs
@@ -28,7 +28,7 @@ namespace Avalonia
     public class StyledElement : Animatable, 
         IDataContextProvider, 
         ILogical,
-        IResourceHost,
+        IThemeVariantHost,
         IStyleHost,
         IStyleable,
         ISetLogicalParent,
@@ -143,6 +143,9 @@ namespace Avalonia
         /// </summary>
         public event EventHandler<ResourcesChangedEventArgs>? ResourcesChanged;
 
+        /// <inheritdoc />
+        public event EventHandler? ActualThemeVariantChanged;
+        
         /// <summary>
         /// Gets or sets the name of the styled element.
         /// </summary>
@@ -299,6 +302,9 @@ namespace Avalonia
         /// </summary>
         public StyledElement? Parent { get; private set; }
 
+        /// <inheritdoc />
+        public ThemeVariant ActualThemeVariant => GetValue(ThemeVariant.ActualThemeVariantProperty);
+        
         /// <summary>
         /// Gets the styled element's logical parent.
         /// </summary>
@@ -618,7 +624,20 @@ namespace Avalonia
             base.OnPropertyChanged(change);
 
             if (change.Property == ThemeProperty)
+            {
                 OnControlThemeChanged();
+            }
+            else if (change.Property == ThemeVariant.RequestedThemeVariantProperty)
+            {
+                if (change.GetNewValue<ThemeVariant>() is {} themeVariant && themeVariant != ThemeVariant.Default)
+                    SetValue(ThemeVariant.ActualThemeVariantProperty, themeVariant);
+                else
+                    ClearValue(ThemeVariant.ActualThemeVariantProperty);
+            }
+            else if (change.Property == ThemeVariant.ActualThemeVariantProperty)
+            {
+                ActualThemeVariantChanged?.Invoke(this, EventArgs.Empty);
+            }
         }
 
         private protected virtual void OnControlThemeChanged()
diff --git a/src/Avalonia.Base/Styling/ThemeVariant.cs b/src/Avalonia.Base/Styling/ThemeVariant.cs
index 5a6a8785a5..389136b0f5 100644
--- a/src/Avalonia.Base/Styling/ThemeVariant.cs
+++ b/src/Avalonia.Base/Styling/ThemeVariant.cs
@@ -11,6 +11,21 @@ namespace Avalonia.Styling;
 [TypeConverter(typeof(ThemeVariantTypeConverter))]
 public sealed record ThemeVariant
 {
+    /// <summary>
+    /// Defines the ActualThemeVariant property.
+    /// </summary>
+    internal static readonly StyledProperty<ThemeVariant> ActualThemeVariantProperty =
+        AvaloniaProperty.Register<StyledElement, ThemeVariant>(
+            "ActualThemeVariant",
+            inherits: true);
+
+    /// <summary>
+    /// Defines the RequestedThemeVariant property.
+    /// </summary>
+    internal static readonly StyledProperty<ThemeVariant?> RequestedThemeVariantProperty =
+        AvaloniaProperty.Register<StyledElement, ThemeVariant?>(
+            "RequestedThemeVariant", defaultValue: Default);
+    
     /// <summary>
     /// Creates a new instance of the <see cref="ThemeVariant"/>
     /// </summary>
diff --git a/src/Avalonia.Controls/Control.cs b/src/Avalonia.Controls/Control.cs
index c9e8f0d045..dbece12575 100644
--- a/src/Avalonia.Controls/Control.cs
+++ b/src/Avalonia.Controls/Control.cs
@@ -24,7 +24,7 @@ namespace Avalonia.Controls
     /// - A <see cref="Tag"/> property to allow user-defined data to be attached to the control.
     /// - <see cref="ContextRequestedEvent"/> and other context menu related members.
     /// </remarks>
-    public class Control : InputElement, IDataTemplateHost, INamed, IVisualBrushInitialize, ISetterValue, IThemeVariantHost
+    public class Control : InputElement, IDataTemplateHost, INamed, IVisualBrushInitialize, ISetterValue
     {
         /// <summary>
         /// Defines the <see cref="FocusAdorner"/> property.
@@ -162,11 +162,6 @@ namespace Avalonia.Controls
             set => SetValue(TagProperty, value);
         }
         
-        /// <inheritdoc />
-        public ThemeVariant ActualThemeVariant => GetValue(ThemeVariantScope.ActualThemeVariantProperty);
-
-        public event EventHandler? ActualThemeVariantChanged;
-
         /// <summary>
         /// Occurs when the user has completed a context input gesture, such as a right-click.
         /// </summary>
@@ -531,17 +526,6 @@ namespace Avalonia.Controls
                     RaiseEvent(sizeChangedEventArgs);
                 }
             }
-            else if (change.Property == ThemeVariantScope.RequestedThemeVariantProperty)
-            {
-                if (change.GetNewValue<ThemeVariant>() is {} themeVariant && themeVariant != ThemeVariant.Default)
-                    SetValue(ThemeVariantScope.ActualThemeVariantProperty, themeVariant);
-                else
-                    ClearValue(ThemeVariantScope.ActualThemeVariantProperty);
-            }
-            else if (change.Property == ThemeVariantScope.ActualThemeVariantProperty)
-            {
-                ActualThemeVariantChanged?.Invoke(this, EventArgs.Empty);
-            }
         }
     }
 }
diff --git a/src/Avalonia.Controls/ThemeVariantScope.cs b/src/Avalonia.Controls/ThemeVariantScope.cs
index b29f1ee56e..f5ad4b2f94 100644
--- a/src/Avalonia.Controls/ThemeVariantScope.cs
+++ b/src/Avalonia.Controls/ThemeVariantScope.cs
@@ -7,21 +7,13 @@ namespace Avalonia.Controls
     /// </summary>
     public class ThemeVariantScope : Decorator
     {
-        /// <summary>
-        /// Defines the <see cref="Control.ActualThemeVariant"/> property.
-        /// </summary>
+        /// <inheritdoc cref="ThemeVariant.ActualThemeVariantProperty" />
         public static readonly StyledProperty<ThemeVariant> ActualThemeVariantProperty =
-            AvaloniaProperty.Register<ThemeVariantScope, ThemeVariant>(
-                nameof(ActualThemeVariant),
-                inherits: true);
+            ThemeVariant.ActualThemeVariantProperty.AddOwner<ThemeVariantScope>();
 
-        /// <summary>
-        /// Defines the <see cref="RequestedThemeVariant"/> property.
-        /// </summary>
+        /// <inheritdoc cref="ThemeVariant.RequestedThemeVariantProperty" />
         public static readonly StyledProperty<ThemeVariant?> RequestedThemeVariantProperty =
-            AvaloniaProperty.Register<ThemeVariantScope, ThemeVariant?>(
-                nameof(RequestedThemeVariant),
-                defaultValue: ThemeVariant.Default);
+            ThemeVariant.RequestedThemeVariantProperty.AddOwner<ThemeVariantScope>();
 
         /// <summary>
         /// Gets or sets the UI theme variant that is used by the control (and its child elements) for resource determination.