From a26059630f19e5ec8ceb5d65aff29193ee74a036 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 1 Feb 2022 14:57:08 +0100
Subject: [PATCH 001/240] Add failing test for control template value priority.

Add tests to check that template values are assigned with Style priority and move other XAML control template tests alongside it in a new test class.
---
 .../Xaml/BasicTests.cs                        |  66 +-------
 .../Xaml/ControlTemplateTests.cs              | 143 ++++++++++++++++++
 2 files changed, 144 insertions(+), 65 deletions(-)
 create mode 100644 tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlTemplateTests.cs

diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
index f20faa2287..16685c5d2d 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
@@ -281,70 +281,6 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
             Assert.Equal(expected4, grid.RowDefinitions[3].Height);
         }
 
-        [Fact]
-        public void ControlTemplate_With_Nested_Child_Is_Operational()
-        {
-            var xaml = @"
-<ControlTemplate xmlns='https://github.com/avaloniaui'>
-    <ContentControl Name='parent'>
-        <ContentControl Name='child' />
-    </ContentControl>
-</ControlTemplate>
-";
-            var template = AvaloniaRuntimeXamlLoader.Parse<ControlTemplate>(xaml);
-
-            var parent = (ContentControl)template.Build(new ContentControl()).Control;
-
-            Assert.Equal("parent", parent.Name);
-
-            var child = parent.Content as ContentControl;
-
-            Assert.NotNull(child);
-
-            Assert.Equal("child", child.Name);
-        }
-
-        [Fact]
-        public void ControlTemplate_With_TargetType_Is_Operational()
-        {
-            var xaml = @"
-<ControlTemplate xmlns='https://github.com/avaloniaui' 
-                 xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
-                 TargetType='{x:Type ContentControl}'>
-    <ContentPresenter Content='{TemplateBinding Content}' />
-</ControlTemplate>
-";
-            var template = AvaloniaRuntimeXamlLoader.Parse<ControlTemplate>(xaml);
-
-            Assert.Equal(typeof(ContentControl), template.TargetType);
-
-            Assert.IsType(typeof(ContentPresenter), template.Build(new ContentControl()).Control);
-        }
-
-        [Fact]
-        public void ControlTemplate_With_Panel_Children_Are_Added()
-        {
-            var xaml = @"
-<ControlTemplate xmlns='https://github.com/avaloniaui'>
-    <Panel Name='panel'>
-        <ContentControl Name='Foo' />
-        <ContentControl Name='Bar' />
-    </Panel>
-</ControlTemplate>
-";
-            var template = AvaloniaRuntimeXamlLoader.Parse<ControlTemplate>(xaml);
-
-            var panel = (Panel)template.Build(new ContentControl()).Control;
-
-            Assert.Equal(2, panel.Children.Count);
-
-            var foo = panel.Children[0];
-            var bar = panel.Children[1];
-
-            Assert.Equal("Foo", foo.Name);
-            Assert.Equal("Bar", bar.Name);
-        }
-
         [Fact]
         public void Named_x_Control_Is_Added_To_NameScope_Simple()
         {
@@ -361,7 +297,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         }
 
         [Fact]
-        public void Standart_TypeConverter_Is_Used()
+        public void Standard_TypeConverter_Is_Used()
         {
             var xaml = @"<UserControl xmlns='https://github.com/avaloniaui' Width='200.5' />";
 
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlTemplateTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlTemplateTests.cs
new file mode 100644
index 0000000000..fbb16d9f2e
--- /dev/null
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlTemplateTests.cs
@@ -0,0 +1,143 @@
+using Avalonia.Controls;
+using Avalonia.Controls.Presenters;
+using Avalonia.Data;
+using Avalonia.Diagnostics;
+using Avalonia.Markup.Xaml.Templates;
+using Avalonia.Media;
+using Avalonia.UnitTests;
+using Xunit;
+
+namespace Avalonia.Markup.Xaml.UnitTests.Xaml
+{
+    public class ControlTemplateTests : XamlTestBase
+    {
+        [Fact]
+        public void Inline_ControlTemplate_Values_Are_Set_With_Style_Priority()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Button>
+        <Button.Template>
+            <ControlTemplate>
+                <ContentPresenter Name='PART_ContentPresenter'
+                                  Background='Red'/>
+            </ControlTemplate>
+        </Button.Template>
+    </Button>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var button = (Button)window.Content;
+
+                window.ApplyTemplate();
+                button.ApplyTemplate();
+
+                var presenter = (ContentPresenter)button.Presenter;
+                Assert.Equal(Brushes.Red, presenter.Background);
+
+                var diagnostic = presenter.GetDiagnostic(Button.BackgroundProperty);
+                Assert.Equal(BindingPriority.Style, diagnostic.Priority);
+            }
+        }
+
+        [Fact]
+        public void Style_ControlTemplate_Values_Are_Set_With_Style_Priority()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Window.Styles>
+        <Style Selector='Button'>
+            <Setter Property='Template'>
+                <ControlTemplate>
+                    <ContentPresenter Name='PART_ContentPresenter'
+                                      Background='Red'/>
+                </ControlTemplate>
+            </Setter>
+        </Style>
+    </Window.Styles>
+    <Button/>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var button = (Button)window.Content;
+
+                window.ApplyTemplate();
+                button.ApplyTemplate();
+
+                var presenter = (ContentPresenter)button.Presenter;
+                Assert.Equal(Brushes.Red, presenter.Background);
+
+                var diagnostic = presenter.GetDiagnostic(Button.BackgroundProperty);
+                Assert.Equal(BindingPriority.Style, diagnostic.Priority);
+            }
+        }
+
+        [Fact]
+        public void ControlTemplate_With_Nested_Child_Is_Operational()
+        {
+            var xaml = @"
+<ControlTemplate xmlns='https://github.com/avaloniaui'>
+    <ContentControl Name='parent'>
+        <ContentControl Name='child' />
+    </ContentControl>
+</ControlTemplate>
+";
+            var template = AvaloniaRuntimeXamlLoader.Parse<ControlTemplate>(xaml);
+
+            var parent = (ContentControl)template.Build(new ContentControl()).Control;
+
+            Assert.Equal("parent", parent.Name);
+
+            var child = parent.Content as ContentControl;
+
+            Assert.NotNull(child);
+
+            Assert.Equal("child", child.Name);
+        }
+
+        [Fact]
+        public void ControlTemplate_With_TargetType_Is_Operational()
+        {
+            var xaml = @"
+<ControlTemplate xmlns='https://github.com/avaloniaui' 
+                 xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+                 TargetType='{x:Type ContentControl}'>
+    <ContentPresenter Content='{TemplateBinding Content}' />
+</ControlTemplate>
+";
+            var template = AvaloniaRuntimeXamlLoader.Parse<ControlTemplate>(xaml);
+
+            Assert.Equal(typeof(ContentControl), template.TargetType);
+
+            Assert.IsType(typeof(ContentPresenter), template.Build(new ContentControl()).Control);
+        }
+
+        [Fact]
+        public void ControlTemplate_With_Panel_Children_Are_Added()
+        {
+            var xaml = @"
+<ControlTemplate xmlns='https://github.com/avaloniaui'>
+    <Panel Name='panel'>
+        <ContentControl Name='Foo' />
+        <ContentControl Name='Bar' />
+    </Panel>
+</ControlTemplate>
+";
+            var template = AvaloniaRuntimeXamlLoader.Parse<ControlTemplate>(xaml);
+
+            var panel = (Panel)template.Build(new ContentControl()).Control;
+
+            Assert.Equal(2, panel.Children.Count);
+
+            var foo = panel.Children[0];
+            var bar = panel.Children[1];
+
+            Assert.Equal("Foo", foo.Name);
+            Assert.Equal("Bar", bar.Name);
+        }
+    }
+}

From ba8026b1b97456137f8978f3b7c61fd79f3dc030 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 1 Feb 2022 15:50:31 +0100
Subject: [PATCH 002/240] WIP: Trying to use Style priority for ControlTemplate
 values.

---
 .../AvaloniaXamlIlCompiler.cs                 |  1 +
 ...amlIlControlTemplatePriorityTransformer.cs | 37 +++++++++++++++++
 .../AvaloniaXamlIlWellKnownTypes.cs           |  2 +
 .../XamlIlAvaloniaPropertyHelper.cs           | 41 ++++++++++++++++++-
 4 files changed, 80 insertions(+), 1 deletion(-)
 create mode 100644 src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlControlTemplatePriorityTransformer.cs

diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlCompiler.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlCompiler.cs
index 1ca7be67a7..46af0c81f5 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlCompiler.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlCompiler.cs
@@ -65,6 +65,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
                 new AvaloniaXamlIlCompiledBindingsMetadataRemover()
                 );
 
+            Transformers.Add(new AvaloniaXamlIlControlTemplatePriorityTransformer());
             Transformers.Add(new AvaloniaXamlIlMetadataRemover());
             Transformers.Add(new AvaloniaXamlIlRootObjectScope());
 
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlControlTemplatePriorityTransformer.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlControlTemplatePriorityTransformer.cs
new file mode 100644
index 0000000000..22f1a8bc00
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlControlTemplatePriorityTransformer.cs
@@ -0,0 +1,37 @@
+using System.Linq;
+using XamlX.Ast;
+using XamlX.Transform;
+
+namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
+{
+    /// <summary>
+    /// Transforms property assignments within ControlTemplates to use Style priority where possible.
+    /// </summary>
+    class AvaloniaXamlIlControlTemplatePriorityTransformer : IXamlAstTransformer
+    {
+        public IXamlAstNode Transform(AstTransformationContext context, IXamlAstNode node)
+        {
+            var bindingPriorityType = context.GetAvaloniaTypes().BindingPriority;
+
+            if (node is XamlPropertyAssignmentNode prop &&
+                prop.Property is XamlIlAvaloniaProperty avaloniaProperty &&
+                context.ParentNodes().Any(IsControlTemplate))
+            {
+                // If there are any setters which accept a binding priority, then add the Style
+                // binding priority as a value.
+                if (avaloniaProperty.Setters.Any(x => x.Parameters[0] == bindingPriorityType))
+                {
+                    prop.Values.Insert(0, new XamlConstantNode(node, bindingPriorityType, 1));
+                }
+            }
+
+            return node;
+        }
+
+        private static bool IsControlTemplate(IXamlAstNode node)
+        {
+            return node is AvaloniaXamlIlTargetTypeMetadataNode tt &&
+                tt.ScopeType == AvaloniaXamlIlTargetTypeMetadataNode.ScopeTypes.ControlTemplate;
+        }
+    }
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlWellKnownTypes.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlWellKnownTypes.cs
index 89b88790dc..eb3b7b8f7e 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlWellKnownTypes.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlWellKnownTypes.cs
@@ -15,6 +15,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
         public IXamlType AvaloniaObjectExtensions { get; }
         public IXamlType AvaloniaProperty { get; }
         public IXamlType AvaloniaPropertyT { get; }
+        public IXamlType StyledPropertyT { get; }
         public IXamlType AvaloniaAttachedPropertyT { get; }
         public IXamlType IBinding { get; }
         public IXamlMethod AvaloniaObjectBindMethod { get; }
@@ -94,6 +95,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
             AvaloniaObjectExtensions = cfg.TypeSystem.GetType("Avalonia.AvaloniaObjectExtensions");
             AvaloniaProperty = cfg.TypeSystem.GetType("Avalonia.AvaloniaProperty");
             AvaloniaPropertyT = cfg.TypeSystem.GetType("Avalonia.AvaloniaProperty`1");
+            StyledPropertyT = cfg.TypeSystem.GetType("Avalonia.StyledProperty`1");
             AvaloniaAttachedPropertyT = cfg.TypeSystem.GetType("Avalonia.AttachedProperty`1");
             BindingPriority = cfg.TypeSystem.GetType("Avalonia.Data.BindingPriority");
             IBinding = cfg.TypeSystem.GetType("Avalonia.Data.IBinding");
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlAvaloniaPropertyHelper.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlAvaloniaPropertyHelper.cs
index 7f1b8caf0d..6c61ad0705 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlAvaloniaPropertyHelper.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlAvaloniaPropertyHelper.cs
@@ -189,7 +189,13 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
             CustomAttributes = original.CustomAttributes;
             if (!original.CustomAttributes.Any(ca => ca.Type.Equals(types.AssignBindingAttribute)))
                 Setters.Insert(0, new BindingSetter(types, original.DeclaringType, field));
-            
+
+            if (field.FieldType.GenericTypeDefinition == types.StyledPropertyT)
+            {
+                var propertyType = field.FieldType.GenericArguments[0];
+                Setters.Insert(1, new SetValueWithPrioritySetter(types, original.DeclaringType, field, propertyType));
+            }
+
             Setters.Insert(0, new UnsetValueSetter(types, original.DeclaringType, field));
         }
 
@@ -240,6 +246,39 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
             }
         }
 
+        class SetValueWithPrioritySetter : AvaloniaPropertyCustomSetter
+        {
+            public SetValueWithPrioritySetter(AvaloniaXamlIlWellKnownTypes types, IXamlType declaringType, IXamlField avaloniaProperty,
+                IXamlType propertyType)
+                : base(types, declaringType, avaloniaProperty)
+            {
+                Parameters = new[] { types.BindingPriority, propertyType };
+            }
+
+            public override void Emit(IXamlILEmitter emitter)
+            {
+                var method = Types.AvaloniaObject
+                    .FindMethod(m => m.IsPublic && !m.IsStatic && m.Name == "SetValue"
+                                     && m.Parameters.Count == 3
+                                     && m.Parameters[0].Name == "StyledPropertyBase`1"
+                                     && m.Parameters[2].Equals(Types.BindingPriority));
+
+                if (method == null)
+                    throw new XamlTypeSystemException(
+                        $"Unable to find AvaloniaObject.SetValue<T>(StyledPropertyBase<T>, T, BindingPriority).");
+
+                method = method.MakeGenericMethod(new[] { Parameters[1] });
+
+                using (var bloc = emitter.LocalsPool.GetLocal(Parameters[1]))
+                    emitter
+                        .Stloc(bloc.Local)
+                        .Ldsfld(AvaloniaProperty)
+                        .Ldloc(bloc.Local)
+                        .Ldc_I4(0)
+                        .EmitCall(method, true);
+            }
+        }
+
         class UnsetValueSetter : AvaloniaPropertyCustomSetter
         {
             public UnsetValueSetter(AvaloniaXamlIlWellKnownTypes types, IXamlType declaringType, IXamlField avaloniaProperty) 

From 598966a725d7e861d42ba1271ab6b8ef012f3ca5 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Sat, 19 Feb 2022 18:42:33 +0300
Subject: [PATCH 003/240] Fixed template BindingPriority rewriter

---
 .../Avalonia.Build.Tasks.csproj               |  3 ++
 ...amlIlControlTemplatePriorityTransformer.cs | 12 +++++--
 .../AvaloniaXamlIlWellKnownTypes.cs           |  6 ++++
 .../XamlIlAvaloniaPropertyHelper.cs           | 32 +++++++++----------
 .../Avalonia.Markup.Xaml.Loader/xamlil.github |  2 +-
 5 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj b/src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj
index e864ea2007..da17b80e25 100644
--- a/src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj
+++ b/src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj
@@ -89,6 +89,9 @@
       <Compile Include="../Avalonia.Controls/GridLength.cs">
         <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
       </Compile>
+      <Compile Include="../Avalonia.Base/Data/BindingPriority.cs">
+        <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
+      </Compile>
       <Compile Include="..\Avalonia.Base\Metadata\NullableAttributes.cs" Link="NullableAttributes.cs" />
       <Compile Remove="../Markup/Avalonia.Markup.Xaml.Loader\xamlil.github\**\obj\**\*.cs" />
       <Compile Remove="../Markup/Avalonia.Markup.Xaml.Loader\xamlil.github\src\XamlX\IL\SreTypeSystem.cs" />
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlControlTemplatePriorityTransformer.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlControlTemplatePriorityTransformer.cs
index 22f1a8bc00..fceebf860d 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlControlTemplatePriorityTransformer.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlControlTemplatePriorityTransformer.cs
@@ -1,4 +1,6 @@
+using System.Collections.Generic;
 using System.Linq;
+using Avalonia.Data;
 using XamlX.Ast;
 using XamlX.Transform;
 
@@ -19,9 +21,15 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
             {
                 // If there are any setters which accept a binding priority, then add the Style
                 // binding priority as a value.
-                if (avaloniaProperty.Setters.Any(x => x.Parameters[0] == bindingPriorityType))
+                var setPriorityValueSetter =
+                    avaloniaProperty.Setters.FirstOrDefault(x => x.Parameters[0] == bindingPriorityType);
+                
+                if(setPriorityValueSetter != null 
+                   && prop.Values.Count == 1
+                   && setPriorityValueSetter.Parameters[1].IsAssignableFrom(prop.Values[0].Type.GetClrType()))
                 {
-                    prop.Values.Insert(0, new XamlConstantNode(node, bindingPriorityType, 1));
+                    prop.PossibleSetters = new List<IXamlPropertySetter> { setPriorityValueSetter };
+                    prop.Values.Insert(0, new XamlConstantNode(node, bindingPriorityType, (int)BindingPriority.Style));
                 }
             }
 
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlWellKnownTypes.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlWellKnownTypes.cs
index eb3b7b8f7e..cc84fb0e52 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlWellKnownTypes.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlWellKnownTypes.cs
@@ -16,6 +16,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
         public IXamlType AvaloniaProperty { get; }
         public IXamlType AvaloniaPropertyT { get; }
         public IXamlType StyledPropertyT { get; }
+        public IXamlMethod AvaloniaObjectSetStyledPropertyValue { get; }
         public IXamlType AvaloniaAttachedPropertyT { get; }
         public IXamlType IBinding { get; }
         public IXamlMethod AvaloniaObjectBindMethod { get; }
@@ -98,6 +99,11 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
             StyledPropertyT = cfg.TypeSystem.GetType("Avalonia.StyledProperty`1");
             AvaloniaAttachedPropertyT = cfg.TypeSystem.GetType("Avalonia.AttachedProperty`1");
             BindingPriority = cfg.TypeSystem.GetType("Avalonia.Data.BindingPriority");
+            AvaloniaObjectSetStyledPropertyValue = AvaloniaObject
+                .FindMethod(m => m.IsPublic && !m.IsStatic && m.Name == "SetValue"
+                                 && m.Parameters.Count == 3
+                                 && m.Parameters[0].Name == "StyledPropertyBase`1"
+                                 && m.Parameters[2].Equals(BindingPriority));
             IBinding = cfg.TypeSystem.GetType("Avalonia.Data.IBinding");
             IDisposable = cfg.TypeSystem.GetType("System.IDisposable");
             Transitions = cfg.TypeSystem.GetType("Avalonia.Animation.Transitions");
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlAvaloniaPropertyHelper.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlAvaloniaPropertyHelper.cs
index 6c61ad0705..a568cbcef4 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlAvaloniaPropertyHelper.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlAvaloniaPropertyHelper.cs
@@ -257,24 +257,24 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
 
             public override void Emit(IXamlILEmitter emitter)
             {
-                var method = Types.AvaloniaObject
-                    .FindMethod(m => m.IsPublic && !m.IsStatic && m.Name == "SetValue"
-                                     && m.Parameters.Count == 3
-                                     && m.Parameters[0].Name == "StyledPropertyBase`1"
-                                     && m.Parameters[2].Equals(Types.BindingPriority));
-
-                if (method == null)
-                    throw new XamlTypeSystemException(
-                        $"Unable to find AvaloniaObject.SetValue<T>(StyledPropertyBase<T>, T, BindingPriority).");
-
-                method = method.MakeGenericMethod(new[] { Parameters[1] });
-
-                using (var bloc = emitter.LocalsPool.GetLocal(Parameters[1]))
+                /*
+                  Current stack:
+                   - object
+                   - binding priority
+                   - value
+                */
+
+                var method = Types.AvaloniaObjectSetStyledPropertyValue
+                    .MakeGenericMethod(new[] { Parameters[1] });
+
+                using (var valueLocal = emitter.LocalsPool.GetLocal(Parameters[1]))
+                using (var priorityLocal = emitter.LocalsPool.GetLocal(Types.Int))
                     emitter
-                        .Stloc(bloc.Local)
+                        .Stloc(valueLocal.Local)
+                        .Stloc(priorityLocal.Local)
                         .Ldsfld(AvaloniaProperty)
-                        .Ldloc(bloc.Local)
-                        .Ldc_I4(0)
+                        .Ldloc(valueLocal.Local)
+                        .Ldloc(priorityLocal.Local)
                         .EmitCall(method, true);
             }
         }
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github b/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github
index 8e20d65eb5..e0cfcd0ef6 160000
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github
@@ -1 +1 @@
-Subproject commit 8e20d65eb5f1efbae08e49b18f39bfdce32df7b3
+Subproject commit e0cfcd0ef687e613ef8905e8d0891974b68c565d

From 3c5a7caf74d6c22a26c63a5c7d787c2914e7a600 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sun, 20 Feb 2022 22:48:51 +0100
Subject: [PATCH 004/240] Fix compile errors.

---
 src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs          | 4 +++-
 .../AvaloniaXamlIlLanguageParseIntrinsics.cs                  | 2 +-
 .../Transformers/AvaloniaXamlIlSelectorTransformer.cs         | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs b/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs
index 593d79471e..e6da450ae9 100644
--- a/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs
+++ b/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs
@@ -247,7 +247,8 @@ namespace Avalonia.Build.Tasks
                         var populateBuilder = classTypeDefinition == null ?
                             builder :
                             typeSystem.CreateTypeBuilder(classTypeDefinition);
-                        compiler.Compile(parsed, contextClass,
+                        compiler.Compile(parsed, 
+                            contextClass,
                             compiler.DefinePopulateMethod(populateBuilder, parsed, populateName,
                                 classTypeDefinition == null),
                             buildName == null ? null : compiler.DefineBuildMethod(builder, parsed, buildName, true),
@@ -255,6 +256,7 @@ namespace Avalonia.Build.Tasks
                                 true),
                             (closureName, closureBaseType) =>
                                 populateBuilder.DefineSubType(closureBaseType, closureName, false),
+                            (s, returnType, parameters) => builder.DefineDelegateSubType(s, false, returnType, parameters),
                             res.Uri, res
                         );
                         
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlLanguageParseIntrinsics.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlLanguageParseIntrinsics.cs
index 4592b9c8b4..b622971d38 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlLanguageParseIntrinsics.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlLanguageParseIntrinsics.cs
@@ -201,7 +201,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
             if (type.Equals(types.Classes))
             {
                 var classes = text.Split(' ');
-                var classNodes = classes.Select(c => new XamlAstTextNode(node, c, types.XamlIlTypes.String)).ToArray();
+                var classNodes = classes.Select(c => new XamlAstTextNode(node, c, type: types.XamlIlTypes.String)).ToArray();
 
                 result = new AvaloniaXamlIlAvaloniaListConstantAstNode(node, types, types.Classes, types.XamlIlTypes.String, classNodes);
                 return true;
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSelectorTransformer.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSelectorTransformer.cs
index 79589a5a4f..4c4df1f53a 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSelectorTransformer.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSelectorTransformer.cs
@@ -77,7 +77,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
                                 throw new XamlParseException($"Cannot find '{property.Property}' on '{type}", node);
 
                             if (!XamlTransformHelpers.TryGetCorrectlyTypedValue(context,
-                                new XamlAstTextNode(node, property.Value, context.Configuration.WellKnownTypes.String),
+                                new XamlAstTextNode(node, property.Value, type: context.Configuration.WellKnownTypes.String),
                                 targetProperty.PropertyType, out var typedValue))
                                 throw new XamlParseException(
                                     $"Cannot convert '{property.Value}' to '{targetProperty.PropertyType.GetFqn()}",
@@ -118,7 +118,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
                                     .GetAvaloniaPropertyType(targetPropertyField, context.GetAvaloniaTypes(), node);
 
                                 if (!XamlTransformHelpers.TryGetCorrectlyTypedValue(context,
-                                    new XamlAstTextNode(node, attachedProperty.Value, context.Configuration.WellKnownTypes.String),
+                                    new XamlAstTextNode(node, attachedProperty.Value, type: context.Configuration.WellKnownTypes.String),
                                     targetPropertyType, out var typedValue))
                                         throw new XamlParseException(
                                             $"Cannot convert '{attachedProperty.Value}' to '{targetPropertyType.GetFqn()}",

From 351be2f4b271fded6405bb9663f3f6c5d69053f3 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sun, 20 Feb 2022 23:33:15 +0100
Subject: [PATCH 005/240] Use style priority for attached values in templates.

---
 ...amlIlControlTemplatePriorityTransformer.cs | 14 +++-
 .../XamlIlAvaloniaPropertyHelper.cs           |  5 +-
 .../Xaml/ControlTemplateTests.cs              | 66 ++++++++++++++++++-
 3 files changed, 79 insertions(+), 6 deletions(-)

diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlControlTemplatePriorityTransformer.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlControlTemplatePriorityTransformer.cs
index fceebf860d..eede21396d 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlControlTemplatePriorityTransformer.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlControlTemplatePriorityTransformer.cs
@@ -15,12 +15,19 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
         {
             var bindingPriorityType = context.GetAvaloniaTypes().BindingPriority;
 
+            // The node is a candidate for transformation if:
+            // - It's a property assignment to an Avalonia property
+            // - There's a ControlTemplate ancestor
+            // - There's just a direct call setter available
             if (node is XamlPropertyAssignmentNode prop &&
                 prop.Property is XamlIlAvaloniaProperty avaloniaProperty &&
-                context.ParentNodes().Any(IsControlTemplate))
+                context.ParentNodes().Any(IsControlTemplate) &&
+                prop.PossibleSetters.Count == 1 &&
+                prop.PossibleSetters[0] is XamlDirectCallPropertySetter)
             {
-                // If there are any setters which accept a binding priority, then add the Style
-                // binding priority as a value.
+                // Check if there are any setters on the property which accept a binding priority -
+                // this filters the candidates down to styled and attached properties. If so, then
+                // use this setter with BindingPriority.Style.
                 var setPriorityValueSetter =
                     avaloniaProperty.Setters.FirstOrDefault(x => x.Parameters[0] == bindingPriorityType);
                 
@@ -30,6 +37,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
                 {
                     prop.PossibleSetters = new List<IXamlPropertySetter> { setPriorityValueSetter };
                     prop.Values.Insert(0, new XamlConstantNode(node, bindingPriorityType, (int)BindingPriority.Style));
+                    return node;
                 }
             }
 
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlAvaloniaPropertyHelper.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlAvaloniaPropertyHelper.cs
index a568cbcef4..bb439b8816 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlAvaloniaPropertyHelper.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlAvaloniaPropertyHelper.cs
@@ -190,7 +190,10 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
             if (!original.CustomAttributes.Any(ca => ca.Type.Equals(types.AssignBindingAttribute)))
                 Setters.Insert(0, new BindingSetter(types, original.DeclaringType, field));
 
-            if (field.FieldType.GenericTypeDefinition == types.StyledPropertyT)
+            // Styled and attached properties can be set with a BindingPriority when they're
+            // assigned in a ControlTemplate.
+            if (field.FieldType.GenericTypeDefinition == types.StyledPropertyT ||
+                field.FieldType.GenericTypeDefinition == types.AvaloniaAttachedPropertyT)
             {
                 var propertyType = field.FieldType.GenericArguments[0];
                 Setters.Insert(1, new SetValueWithPrioritySetter(types, original.DeclaringType, field, propertyType));
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlTemplateTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlTemplateTests.cs
index fbb16d9f2e..f74aaaed76 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlTemplateTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlTemplateTests.cs
@@ -12,7 +12,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
     public class ControlTemplateTests : XamlTestBase
     {
         [Fact]
-        public void Inline_ControlTemplate_Values_Are_Set_With_Style_Priority()
+        public void Inline_ControlTemplate_Styled_Values_Are_Set_With_Style_Priority()
         {
             using (UnitTestApplication.Start(TestServices.StyledWindow))
             {
@@ -43,7 +43,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         }
 
         [Fact]
-        public void Style_ControlTemplate_Values_Are_Set_With_Style_Priority()
+        public void Style_ControlTemplate_Styled_Values_Are_Set_With_Style_Priority()
         {
             using (UnitTestApplication.Start(TestServices.StyledWindow))
             {
@@ -76,6 +76,68 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
             }
         }
 
+        [Fact]
+        public void ControlTemplate_Attached_Values_Are_Set_With_Style_Priority()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Button>
+        <Button.Template>
+            <ControlTemplate>
+                <ContentPresenter Name='PART_ContentPresenter'
+                                  DockPanel.Dock='Top'/>
+            </ControlTemplate>
+        </Button.Template>
+    </Button>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var button = (Button)window.Content;
+
+                window.ApplyTemplate();
+                button.ApplyTemplate();
+
+                var presenter = (ContentPresenter)button.Presenter;
+                Assert.Equal(Dock.Top, DockPanel.GetDock(presenter));
+
+                var diagnostic = presenter.GetDiagnostic(DockPanel.DockProperty);
+                Assert.Equal(BindingPriority.Style, diagnostic.Priority);
+            }
+        }
+
+        [Fact]
+        public void ControlTemplate_TemplateBindings_Are_Set_With_TemplatedParent_Priority()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Button Content='Foo'>
+        <Button.Template>
+            <ControlTemplate>
+                <ContentPresenter Name='PART_ContentPresenter'
+                                  Content='{TemplateBinding Content}'/>
+            </ControlTemplate>
+        </Button.Template>
+    </Button>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var button = (Button)window.Content;
+
+                window.ApplyTemplate();
+                button.ApplyTemplate();
+
+                var presenter = (ContentPresenter)button.Presenter;
+                Assert.Equal("Foo", presenter.Content);
+
+                var diagnostic = presenter.GetDiagnostic(ContentPresenter.ContentProperty);
+                Assert.Equal(BindingPriority.TemplatedParent, diagnostic.Priority);
+            }
+        }
+
         [Fact]
         public void ControlTemplate_With_Nested_Child_Is_Operational()
         {

From f7ff0a02893396f5ed28a033005d9907b97af096 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sun, 20 Feb 2022 23:48:49 +0100
Subject: [PATCH 006/240] More failing tests for ControlTemplate resources.

---
 .../Xaml/ControlTemplateTests.cs              | 68 +++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlTemplateTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlTemplateTests.cs
index f74aaaed76..2c38a82031 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlTemplateTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlTemplateTests.cs
@@ -107,6 +107,74 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
             }
         }
 
+        [Fact]
+        public void ControlTemplate_StaticResources_Are_Set_With_Style_Priority()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Window.Resources>
+        <SolidColorBrush x:Key='red'>Red</SolidColorBrush>
+    </Window.Resources>
+    <Button Content='Foo'>
+        <Button.Template>
+            <ControlTemplate>
+                <ContentPresenter Name='PART_ContentPresenter'
+                                  Background='{StaticResource red}'/>
+            </ControlTemplate>
+        </Button.Template>
+    </Button>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var button = (Button)window.Content;
+
+                window.ApplyTemplate();
+                button.ApplyTemplate();
+
+                var presenter = (ContentPresenter)button.Presenter;
+                Assert.Equal(Brushes.Red, presenter.Background);
+
+                var diagnostic = presenter.GetDiagnostic(Button.BackgroundProperty);
+                Assert.Equal(BindingPriority.Style, diagnostic.Priority);
+            }
+        }
+
+        [Fact]
+        public void ControlTemplate_DynamicResources_Are_Set_With_Style_Priority()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Window.Resources>
+        <SolidColorBrush x:Key='red'>Red</SolidColorBrush>
+    </Window.Resources>
+    <Button Content='Foo'>
+        <Button.Template>
+            <ControlTemplate>
+                <ContentPresenter Name='PART_ContentPresenter'
+                                  Background='{DynamicResource red}'/>
+            </ControlTemplate>
+        </Button.Template>
+    </Button>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var button = (Button)window.Content;
+
+                window.ApplyTemplate();
+                button.ApplyTemplate();
+
+                var presenter = (ContentPresenter)button.Presenter;
+                Assert.Equal(Brushes.Red, presenter.Background);
+
+                var diagnostic = presenter.GetDiagnostic(Button.BackgroundProperty);
+                Assert.Equal(BindingPriority.Style, diagnostic.Priority);
+            }
+        }
+
         [Fact]
         public void ControlTemplate_TemplateBindings_Are_Set_With_TemplatedParent_Priority()
         {

From cb7488baa7ed96fedd0308f8363c7003f4484893 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Mon, 21 Feb 2022 22:54:58 +0100
Subject: [PATCH 007/240] Use Style priority for StaticResource in
 ControlTemplate.

---
 ...amlIlControlTemplatePriorityTransformer.cs | 33 +++++++++++--------
 .../XamlIlAvaloniaPropertyHelper.cs           | 32 ++++++++++++++++--
 .../Avalonia.Markup.Xaml.Loader/xamlil.github |  2 +-
 3 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlControlTemplatePriorityTransformer.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlControlTemplatePriorityTransformer.cs
index eede21396d..e0090eb2e8 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlControlTemplatePriorityTransformer.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlControlTemplatePriorityTransformer.cs
@@ -18,26 +18,31 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
             // The node is a candidate for transformation if:
             // - It's a property assignment to an Avalonia property
             // - There's a ControlTemplate ancestor
-            // - There's just a direct call setter available
+            // - The property has a single value
             if (node is XamlPropertyAssignmentNode prop &&
                 prop.Property is XamlIlAvaloniaProperty avaloniaProperty &&
                 context.ParentNodes().Any(IsControlTemplate) &&
-                prop.PossibleSetters.Count == 1 &&
-                prop.PossibleSetters[0] is XamlDirectCallPropertySetter)
+                prop.Values.Count == 1)
             {
-                // Check if there are any setters on the property which accept a binding priority -
-                // this filters the candidates down to styled and attached properties. If so, then
-                // use this setter with BindingPriority.Style.
-                var setPriorityValueSetter =
-                    avaloniaProperty.Setters.FirstOrDefault(x => x.Parameters[0] == bindingPriorityType);
-                
-                if(setPriorityValueSetter != null 
-                   && prop.Values.Count == 1
-                   && setPriorityValueSetter.Parameters[1].IsAssignableFrom(prop.Values[0].Type.GetClrType()))
+                var priorityValueSetters = new List<IXamlPropertySetter>();
+
+                // Iterate through the possible setters, trying to find a setter on the property 
+                // which has a BindingPriority parameter followed by the parameter of the existing
+                // setter.
+                foreach (var setter in prop.PossibleSetters)
+                {
+                    var s = avaloniaProperty.Setters.FirstOrDefault(x => 
+                        x.Parameters[0] == bindingPriorityType &&
+                        x.Parameters[1] == setter.Parameters[0]);
+                    if (s != null)
+                        priorityValueSetters.Add(s);
+                }
+
+                // If any BindingPriority setters were found, use those.
+                if (priorityValueSetters.Count > 0)
                 {
-                    prop.PossibleSetters = new List<IXamlPropertySetter> { setPriorityValueSetter };
+                    prop.PossibleSetters = priorityValueSetters;
                     prop.Values.Insert(0, new XamlConstantNode(node, bindingPriorityType, (int)BindingPriority.Style));
-                    return node;
                 }
             }
 
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlAvaloniaPropertyHelper.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlAvaloniaPropertyHelper.cs
index bb439b8816..5c7a80e680 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlAvaloniaPropertyHelper.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlAvaloniaPropertyHelper.cs
@@ -185,9 +185,11 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
             AvaloniaXamlIlWellKnownTypes types)
             :base(original, original.Name, original.DeclaringType, original.Getter, original.Setters)
         {
+            var assignBinding = original.CustomAttributes.Any(ca => ca.Type.Equals(types.AssignBindingAttribute));
+
             AvaloniaProperty = field;
             CustomAttributes = original.CustomAttributes;
-            if (!original.CustomAttributes.Any(ca => ca.Type.Equals(types.AssignBindingAttribute)))
+            if (!assignBinding)
                 Setters.Insert(0, new BindingSetter(types, original.DeclaringType, field));
 
             // Styled and attached properties can be set with a BindingPriority when they're
@@ -196,7 +198,9 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
                 field.FieldType.GenericTypeDefinition == types.AvaloniaAttachedPropertyT)
             {
                 var propertyType = field.FieldType.GenericArguments[0];
-                Setters.Insert(1, new SetValueWithPrioritySetter(types, original.DeclaringType, field, propertyType));
+                Setters.Insert(0, new SetValueWithPrioritySetter(types, original.DeclaringType, field, propertyType));
+                if (!assignBinding)
+                    Setters.Insert(1, new BindingWithPrioritySetter(types, original.DeclaringType, field));
             }
 
             Setters.Insert(0, new UnsetValueSetter(types, original.DeclaringType, field));
@@ -249,6 +253,30 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
             }
         }
 
+        class BindingWithPrioritySetter : AvaloniaPropertyCustomSetter
+        {
+            public BindingWithPrioritySetter(AvaloniaXamlIlWellKnownTypes types,
+                IXamlType declaringType,
+                IXamlField avaloniaProperty) : base(types, declaringType, avaloniaProperty)
+            {
+                Parameters = new[] { types.BindingPriority, types.IBinding };
+            }
+
+            public override void Emit(IXamlILEmitter emitter)
+            {
+                using (var bloc = emitter.LocalsPool.GetLocal(Types.IBinding))
+                using (var priorityLocal = emitter.LocalsPool.GetLocal(Types.Int))
+                    emitter
+                        .Stloc(bloc.Local)
+                        .Stloc(priorityLocal.Local)
+                        .Ldsfld(AvaloniaProperty)
+                        .Ldloc(bloc.Local)
+                        // TODO: provide anchor?
+                        .Ldnull();
+                emitter.EmitCall(Types.AvaloniaObjectBindMethod, true);
+            }
+        }
+
         class SetValueWithPrioritySetter : AvaloniaPropertyCustomSetter
         {
             public SetValueWithPrioritySetter(AvaloniaXamlIlWellKnownTypes types, IXamlType declaringType, IXamlField avaloniaProperty,
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github b/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github
index e0cfcd0ef6..a4897d581c 160000
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github
@@ -1 +1 @@
-Subproject commit e0cfcd0ef687e613ef8905e8d0891974b68c565d
+Subproject commit a4897d581c7f155543102f0d744a47863e1fbfea

From a142b7ea04578e2b4cc5e521a38288fe9b3cd790 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 22 Feb 2022 23:14:46 +0100
Subject: [PATCH 008/240] Detect control template from markup extensions.

Allow markup extensions to detect whether they're in a control template and use that info in `DynamicResourceExtension` to use `Style` priority.
---
 .../Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj      | 1 +
 src/Markup/Avalonia.Markup.Xaml/Extensions.cs             | 4 ++--
 .../MarkupExtensions/DynamicResourceExtension.cs          | 8 ++++++--
 .../Runtime/IAvaloniaXamlIlControlTemplateProvider.cs     | 8 ++++++++
 .../XamlIl/Runtime/XamlIlRuntimeHelpers.cs                | 5 ++++-
 5 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 src/Markup/Avalonia.Markup.Xaml/XamlIl/Runtime/IAvaloniaXamlIlControlTemplateProvider.cs

diff --git a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
index 86132c5d27..4d9e216916 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
+++ b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
@@ -46,6 +46,7 @@
         <Compile Include="Templates\Template.cs" />
         <Compile Include="Templates\TemplateContent.cs" />
         <Compile Include="Templates\TreeDataTemplate.cs" />
+        <Compile Include="XamlIl\Runtime\IAvaloniaXamlIlControlTemplateProvider.cs" />
         <Compile Include="XamlIl\Runtime\IAvaloniaXamlIlParentStackProvider.cs" />
         <Compile Include="XamlIl\Runtime\IAvaloniaXamlIlXmlNamespaceInfoProviderV1.cs" />
         <Compile Include="XamlIl\Runtime\XamlIlRuntimeHelpers.cs" />
diff --git a/src/Markup/Avalonia.Markup.Xaml/Extensions.cs b/src/Markup/Avalonia.Markup.Xaml/Extensions.cs
index 263750c316..d937a83010 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Extensions.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Extensions.cs
@@ -24,10 +24,10 @@ namespace Avalonia.Markup.Xaml
         public static IEnumerable<T> GetParents<T>(this IServiceProvider sp)
         {
             return sp.GetService<IAvaloniaXamlIlParentStackProvider>().Parents.OfType<T>();
-            
-            
         }
 
+        public static bool IsInControlTemplate(this IServiceProvider sp) => sp.GetService<IAvaloniaXamlIlControlTemplateProvider>() != null;
+
         public static Type ResolveType(this IServiceProvider ctx, string namespacePrefix, string type)
         {
             var tr = ctx.GetService<IXamlTypeResolver>();
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/DynamicResourceExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/DynamicResourceExtension.cs
index 087611bd59..65e38508bc 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/DynamicResourceExtension.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/DynamicResourceExtension.cs
@@ -11,6 +11,7 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
     public class DynamicResourceExtension : IBinding
     {
         private object? _anchor;
+        private BindingPriority _priority;
 
         public DynamicResourceExtension()
         {
@@ -25,6 +26,9 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
 
         public IBinding ProvideValue(IServiceProvider serviceProvider)
         {
+            if (serviceProvider.IsInControlTemplate())
+                _priority = BindingPriority.Style;
+
             var provideTarget = serviceProvider.GetService<IProvideValueTarget>();
 
             if (!(provideTarget.TargetObject is IStyledElement))
@@ -53,12 +57,12 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
             if (control != null)
             {
                 var source = control.GetResourceObservable(ResourceKey, GetConverter(targetProperty));
-                return InstancedBinding.OneWay(source);
+                return InstancedBinding.OneWay(source, _priority);
             }
             else if (_anchor is IResourceProvider resourceProvider)
             {
                 var source = resourceProvider.GetResourceObservable(ResourceKey, GetConverter(targetProperty));
-                return InstancedBinding.OneWay(source);
+                return InstancedBinding.OneWay(source, _priority);
             }
 
             return null;
diff --git a/src/Markup/Avalonia.Markup.Xaml/XamlIl/Runtime/IAvaloniaXamlIlControlTemplateProvider.cs b/src/Markup/Avalonia.Markup.Xaml/XamlIl/Runtime/IAvaloniaXamlIlControlTemplateProvider.cs
new file mode 100644
index 0000000000..ed3f5bfdff
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml/XamlIl/Runtime/IAvaloniaXamlIlControlTemplateProvider.cs
@@ -0,0 +1,8 @@
+using System.Collections.Generic;
+
+namespace Avalonia.Markup.Xaml.XamlIl.Runtime
+{
+    public interface IAvaloniaXamlIlControlTemplateProvider
+    {
+    }
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml/XamlIl/Runtime/XamlIlRuntimeHelpers.cs b/src/Markup/Avalonia.Markup.Xaml/XamlIl/Runtime/XamlIlRuntimeHelpers.cs
index c48f386ffd..a0e7fd7dcf 100644
--- a/src/Markup/Avalonia.Markup.Xaml/XamlIl/Runtime/XamlIlRuntimeHelpers.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/XamlIl/Runtime/XamlIlRuntimeHelpers.cs
@@ -42,7 +42,8 @@ namespace Avalonia.Markup.Xaml.XamlIl.Runtime
         class DeferredParentServiceProvider :
             IAvaloniaXamlIlParentStackProvider,
             IServiceProvider,
-            IRootObjectProvider
+            IRootObjectProvider,
+            IAvaloniaXamlIlControlTemplateProvider
         {
             private readonly IServiceProvider _parentProvider;
             private readonly List<IResourceNode> _parentResourceNodes;
@@ -75,6 +76,8 @@ namespace Avalonia.Markup.Xaml.XamlIl.Runtime
                     return this;
                 if (serviceType == typeof(IRootObjectProvider))
                     return this;
+                if (serviceType == typeof(IAvaloniaXamlIlControlTemplateProvider))
+                    return this;
                 return _parentProvider?.GetService(serviceType);
             }
 

From beaf956af72b4ad38a56f92b6d9ec048fedb2815 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 22 Feb 2022 23:23:15 +0100
Subject: [PATCH 009/240] Use TemplatedParent priority in ControlTemplates.

---
 ...AvaloniaXamlIlControlTemplatePriorityTransformer.cs |  2 +-
 .../MarkupExtensions/DynamicResourceExtension.cs       |  2 +-
 .../Xaml/ControlTemplateTests.cs                       | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlControlTemplatePriorityTransformer.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlControlTemplatePriorityTransformer.cs
index e0090eb2e8..6cab68e756 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlControlTemplatePriorityTransformer.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlControlTemplatePriorityTransformer.cs
@@ -42,7 +42,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
                 if (priorityValueSetters.Count > 0)
                 {
                     prop.PossibleSetters = priorityValueSetters;
-                    prop.Values.Insert(0, new XamlConstantNode(node, bindingPriorityType, (int)BindingPriority.Style));
+                    prop.Values.Insert(0, new XamlConstantNode(node, bindingPriorityType, (int)BindingPriority.TemplatedParent));
                 }
             }
 
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/DynamicResourceExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/DynamicResourceExtension.cs
index 65e38508bc..f13ecab4e1 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/DynamicResourceExtension.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/DynamicResourceExtension.cs
@@ -27,7 +27,7 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
         public IBinding ProvideValue(IServiceProvider serviceProvider)
         {
             if (serviceProvider.IsInControlTemplate())
-                _priority = BindingPriority.Style;
+                _priority = BindingPriority.TemplatedParent;
 
             var provideTarget = serviceProvider.GetService<IProvideValueTarget>();
 
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlTemplateTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlTemplateTests.cs
index 2c38a82031..2d6ed1dc62 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlTemplateTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlTemplateTests.cs
@@ -38,7 +38,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
                 Assert.Equal(Brushes.Red, presenter.Background);
 
                 var diagnostic = presenter.GetDiagnostic(Button.BackgroundProperty);
-                Assert.Equal(BindingPriority.Style, diagnostic.Priority);
+                Assert.Equal(BindingPriority.TemplatedParent, diagnostic.Priority);
             }
         }
 
@@ -72,7 +72,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
                 Assert.Equal(Brushes.Red, presenter.Background);
 
                 var diagnostic = presenter.GetDiagnostic(Button.BackgroundProperty);
-                Assert.Equal(BindingPriority.Style, diagnostic.Priority);
+                Assert.Equal(BindingPriority.TemplatedParent, diagnostic.Priority);
             }
         }
 
@@ -103,7 +103,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
                 Assert.Equal(Dock.Top, DockPanel.GetDock(presenter));
 
                 var diagnostic = presenter.GetDiagnostic(DockPanel.DockProperty);
-                Assert.Equal(BindingPriority.Style, diagnostic.Priority);
+                Assert.Equal(BindingPriority.TemplatedParent, diagnostic.Priority);
             }
         }
 
@@ -137,7 +137,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
                 Assert.Equal(Brushes.Red, presenter.Background);
 
                 var diagnostic = presenter.GetDiagnostic(Button.BackgroundProperty);
-                Assert.Equal(BindingPriority.Style, diagnostic.Priority);
+                Assert.Equal(BindingPriority.TemplatedParent, diagnostic.Priority);
             }
         }
 
@@ -171,7 +171,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
                 Assert.Equal(Brushes.Red, presenter.Background);
 
                 var diagnostic = presenter.GetDiagnostic(Button.BackgroundProperty);
-                Assert.Equal(BindingPriority.Style, diagnostic.Priority);
+                Assert.Equal(BindingPriority.TemplatedParent, diagnostic.Priority);
             }
         }
 

From c02439aaaf5c1984f8aae75c777173c775c89257 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Mon, 30 May 2022 17:10:09 +0200
Subject: [PATCH 010/240] Refactored most of Style into StyleBase.

Ready for `ControlTheme` class, which is a style without a selector.
---
 src/Avalonia.Base/Styling/Style.cs         | 148 ++-------------------
 src/Avalonia.Base/Styling/StyleBase.cs     | 137 +++++++++++++++++++
 src/Avalonia.Base/Styling/StyleChildren.cs |  10 +-
 3 files changed, 151 insertions(+), 144 deletions(-)
 create mode 100644 src/Avalonia.Base/Styling/StyleBase.cs

diff --git a/src/Avalonia.Base/Styling/Style.cs b/src/Avalonia.Base/Styling/Style.cs
index 000e588bad..c85c85fe21 100644
--- a/src/Avalonia.Base/Styling/Style.cs
+++ b/src/Avalonia.Base/Styling/Style.cs
@@ -1,23 +1,12 @@
 using System;
-using System.Collections.Generic;
-using Avalonia.Animation;
-using Avalonia.Controls;
-using Avalonia.Metadata;
 
 namespace Avalonia.Styling
 {
     /// <summary>
     /// Defines a style.
     /// </summary>
-    public class Style : AvaloniaObject, IStyle, IResourceProvider
+    public class Style : StyleBase
     {
-        private IResourceHost? _owner;
-        private StyleChildren? _children;
-        private IResourceDictionary? _resources;
-        private List<ISetter>? _setters;
-        private List<IAnimation>? _animations;
-        private StyleCache? _childCache;
-
         /// <summary>
         /// Initializes a new instance of the <see cref="Style"/> class.
         /// </summary>
@@ -34,114 +23,11 @@ namespace Avalonia.Styling
             Selector = selector(null);
         }
 
-        /// <summary>
-        /// Gets the children of the style.
-        /// </summary>
-        public IList<IStyle> Children => _children ??= new(this);
-
-        /// <summary>
-        /// Gets the <see cref="StyledElement"/> or Application that hosts the style.
-        /// </summary>
-        public IResourceHost? Owner
-        {
-            get => _owner;
-            private set
-            {
-                if (_owner != value)
-                {
-                    _owner = value;
-                    OwnerChanged?.Invoke(this, EventArgs.Empty);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets the parent style if this style is hosted in a <see cref="Style.Children"/> collection.
-        /// </summary>
-        public Style? Parent { get; private set; }
-
-        /// <summary>
-        /// Gets or sets a dictionary of style resources.
-        /// </summary>
-        public IResourceDictionary Resources
-        {
-            get => _resources ?? (Resources = new ResourceDictionary());
-            set
-            {
-                value = value ?? throw new ArgumentNullException(nameof(value));
-
-                var hadResources = _resources?.HasResources ?? false;
-
-                _resources = value;
-
-                if (Owner is object)
-                {
-                    _resources.AddOwner(Owner);
-
-                    if (hadResources || _resources.HasResources)
-                    {
-                        Owner.NotifyHostedResourcesChanged(ResourcesChangedEventArgs.Empty);
-                    }
-                }
-            }
-        }
-
         /// <summary>
         /// Gets or sets the style's selector.
         /// </summary>
         public Selector? Selector { get; set; }
 
-        /// <summary>
-        /// Gets the style's setters.
-        /// </summary>
-        public IList<ISetter> Setters => _setters ??= new List<ISetter>();
-
-        /// <summary>
-        /// Gets the style's animations.
-        /// </summary>
-        public IList<IAnimation> Animations => _animations ??= new List<IAnimation>();
-
-        bool IResourceNode.HasResources => _resources?.Count > 0;
-        IReadOnlyList<IStyle> IStyle.Children => (IReadOnlyList<IStyle>?)_children ?? Array.Empty<IStyle>();
-
-        public event EventHandler? OwnerChanged;
-
-        public void Add(ISetter setter) => Setters.Add(setter);
-        public void Add(IStyle style) => Children.Add(style);
-
-        public SelectorMatchResult TryAttach(IStyleable target, IStyleHost? host)
-        {
-            target = target ?? throw new ArgumentNullException(nameof(target));
-
-            var match = Selector is object ? Selector.Match(target, Parent) :
-                target == host ? SelectorMatch.AlwaysThisInstance : SelectorMatch.NeverThisInstance;
-
-            if (match.IsMatch && (_setters is object || _animations is object))
-            {
-                var instance = new StyleInstance(this, target, _setters, _animations, match.Activator);
-                target.StyleApplied(instance);
-                instance.Start();
-            }
-
-            var result = match.Result;
-
-            if (_children is not null)
-            {
-                _childCache ??= new StyleCache();
-                var childResult = _childCache.TryAttach(_children, target, host);
-                if (childResult > result)
-                    result = childResult;
-            }
-
-            return result;
-        }
-
-        public bool TryGetResource(object key, out object? result)
-        {
-            result = null;
-            return _resources?.TryGetResource(key, out result) ?? false;
-        }
-
         /// <summary>
         /// Returns a string representation of the style.
         /// </summary>
@@ -158,33 +44,17 @@ namespace Avalonia.Styling
             }
         }
 
-        void IResourceProvider.AddOwner(IResourceHost owner)
-        {
-            owner = owner ?? throw new ArgumentNullException(nameof(owner));
-
-            if (Owner != null)
-            {
-                throw new InvalidOperationException("The Style already has a parent.");
-            }
-
-            Owner = owner;
-            _resources?.AddOwner(owner);
-        }
-
-        void IResourceProvider.RemoveOwner(IResourceHost owner)
+        protected override SelectorMatch Matches(IStyleable target, IStyleHost? host)
         {
-            owner = owner ?? throw new ArgumentNullException(nameof(owner));
-
-            if (Owner == owner)
-            {
-                Owner = null;
-                _resources?.RemoveOwner(owner);
-            }
+            return Selector?.Match(target, Parent) ??
+                (target == host ?
+                    SelectorMatch.AlwaysThisInstance :
+                    SelectorMatch.NeverThisInstance);
         }
 
-        internal void SetParent(Style? parent)
+        internal override void SetParent(StyleBase? parent)
         {
-            if (parent?.Selector is not null)
+            if (parent is Style parentStyle && parentStyle.Selector is not null)
             {
                 if (Selector is null)
                     throw new InvalidOperationException("Child styles must have a selector.");
@@ -192,7 +62,7 @@ namespace Avalonia.Styling
                     throw new InvalidOperationException("Child styles must have a nesting selector.");
             }
 
-            Parent = parent;
+            base.SetParent(parent);
         }
     }
 }
diff --git a/src/Avalonia.Base/Styling/StyleBase.cs b/src/Avalonia.Base/Styling/StyleBase.cs
new file mode 100644
index 0000000000..0fc57da728
--- /dev/null
+++ b/src/Avalonia.Base/Styling/StyleBase.cs
@@ -0,0 +1,137 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Animation;
+using Avalonia.Controls;
+using Avalonia.Metadata;
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// Base class for <see cref="Style"/> and <see cref="ControlTheme"/>.
+    /// </summary>
+    public abstract class StyleBase : AvaloniaObject, IStyle, IResourceProvider
+    {
+        private IResourceHost? _owner;
+        private StyleChildren? _children;
+        private IResourceDictionary? _resources;
+        private List<ISetter>? _setters;
+        private List<IAnimation>? _animations;
+        private StyleCache? _childCache;
+
+        public IList<IStyle> Children => _children ??= new(this);
+
+        public IResourceHost? Owner
+        {
+            get => _owner;
+            private set
+            {
+                if (_owner != value)
+                {
+                    _owner = value;
+                    OwnerChanged?.Invoke(this, EventArgs.Empty);
+                }
+            }
+        }
+
+        public IStyle? Parent { get; private set; }
+
+        public IResourceDictionary Resources
+        {
+            get => _resources ?? (Resources = new ResourceDictionary());
+            set
+            {
+                value = value ?? throw new ArgumentNullException(nameof(value));
+
+                var hadResources = _resources?.HasResources ?? false;
+
+                _resources = value;
+
+                if (Owner is object)
+                {
+                    _resources.AddOwner(Owner);
+
+                    if (hadResources || _resources.HasResources)
+                    {
+                        Owner.NotifyHostedResourcesChanged(ResourcesChangedEventArgs.Empty);
+                    }
+                }
+            }
+        }
+
+        public IList<ISetter> Setters => _setters ??= new List<ISetter>();
+        public IList<IAnimation> Animations => _animations ??= new List<IAnimation>();
+
+        bool IResourceNode.HasResources => _resources?.Count > 0;
+        IReadOnlyList<IStyle> IStyle.Children => (IReadOnlyList<IStyle>?)_children ?? Array.Empty<IStyle>();
+
+        public void Add(ISetter setter) => Setters.Add(setter);
+        public void Add(IStyle style) => Children.Add(style);
+
+        public event EventHandler? OwnerChanged;
+
+        public SelectorMatchResult TryAttach(IStyleable target, IStyleHost? host)
+        {
+            target = target ?? throw new ArgumentNullException(nameof(target));
+
+            var result = SelectorMatchResult.NeverThisType;
+
+            if (_setters?.Count > 0 || _animations?.Count > 0)
+            {
+                var match = Matches(target, host);
+
+                if (match.IsMatch)
+                {
+                    var instance = new StyleInstance(this, target, _setters, _animations, match.Activator);
+                    target.StyleApplied(instance);
+                    instance.Start();
+                }
+
+                result = match.Result;
+            }
+
+            if (_children is not null)
+            {
+                _childCache ??= new StyleCache();
+                var childResult = _childCache.TryAttach(_children, target, host);
+                if (childResult > result)
+                    result = childResult;
+            }
+
+            return result;
+        }
+
+        public bool TryGetResource(object key, out object? result)
+        {
+            result = null;
+            return _resources?.TryGetResource(key, out result) ?? false;
+        }
+
+        protected abstract SelectorMatch Matches(IStyleable target, IStyleHost? host);
+
+        internal virtual void SetParent(StyleBase? parent) => Parent = parent;
+
+        void IResourceProvider.AddOwner(IResourceHost owner)
+        {
+            owner = owner ?? throw new ArgumentNullException(nameof(owner));
+
+            if (Owner != null)
+            {
+                throw new InvalidOperationException("The Style already has a parent.");
+            }
+
+            Owner = owner;
+            _resources?.AddOwner(owner);
+        }
+
+        void IResourceProvider.RemoveOwner(IResourceHost owner)
+        {
+            owner = owner ?? throw new ArgumentNullException(nameof(owner));
+
+            if (Owner == owner)
+            {
+                Owner = null;
+                _resources?.RemoveOwner(owner);
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Styling/StyleChildren.cs b/src/Avalonia.Base/Styling/StyleChildren.cs
index 5f8635f155..42b0a331ee 100644
--- a/src/Avalonia.Base/Styling/StyleChildren.cs
+++ b/src/Avalonia.Base/Styling/StyleChildren.cs
@@ -5,20 +5,20 @@ namespace Avalonia.Styling
 {
     internal class StyleChildren : Collection<IStyle>
     {
-        private readonly Style _owner;
+        private readonly StyleBase _owner;
 
-        public StyleChildren(Style owner) => _owner = owner;
+        public StyleChildren(StyleBase owner) => _owner = owner;
 
         protected override void InsertItem(int index, IStyle item)
         {
-            (item as Style)?.SetParent(_owner);
+            (item as StyleBase)?.SetParent(_owner);
             base.InsertItem(index, item);
         }
 
         protected override void RemoveItem(int index)
         {
             var item = Items[index];
-            (item as Style)?.SetParent(null);
+            (item as StyleBase)?.SetParent(null);
             if (_owner.Owner is IResourceHost host)
                 (item as IResourceProvider)?.RemoveOwner(host);
             base.RemoveItem(index);
@@ -26,7 +26,7 @@ namespace Avalonia.Styling
 
         protected override void SetItem(int index, IStyle item)
         {
-            (item as Style)?.SetParent(_owner);
+            (item as StyleBase)?.SetParent(_owner);
             base.SetItem(index, item);
             if (_owner.Owner is IResourceHost host)
                 (item as IResourceProvider)?.AddOwner(host);

From 088d8cfc5c147da723e7641cf77c8dc67646e786 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Wed, 1 Jun 2022 13:21:52 +0200
Subject: [PATCH 011/240] Initial implementation of control themes.

---
 src/Avalonia.Base/Styling/ControlTheme.cs     |  27 ++++
 src/Avalonia.Base/Styling/IStyle.cs           |   2 +-
 src/Avalonia.Base/Styling/IThemed.cs          |  13 ++
 src/Avalonia.Base/Styling/NestingSelector.cs  |   4 +-
 src/Avalonia.Base/Styling/Style.cs            |   8 +-
 src/Avalonia.Base/Styling/StyleBase.cs        |  20 ++-
 src/Avalonia.Base/Styling/StyleCache.cs       |   2 +-
 src/Avalonia.Base/Styling/Styler.cs           |  14 +++
 src/Avalonia.Base/Styling/Styles.cs           |   2 +-
 .../Primitives/TemplatedControl.cs            |  25 +++-
 src/Avalonia.Themes.Default/SimpleTheme.cs    |   2 +-
 src/Avalonia.Themes.Fluent/FluentTheme.cs     |   2 +-
 .../Styling/StyleInclude.cs                   |   2 +-
 .../TemplatedControlTests_Theming.cs          | 119 ++++++++++++++++++
 14 files changed, 227 insertions(+), 15 deletions(-)
 create mode 100644 src/Avalonia.Base/Styling/ControlTheme.cs
 create mode 100644 src/Avalonia.Base/Styling/IThemed.cs
 create mode 100644 tests/Avalonia.Controls.UnitTests/Primitives/TemplatedControlTests_Theming.cs

diff --git a/src/Avalonia.Base/Styling/ControlTheme.cs b/src/Avalonia.Base/Styling/ControlTheme.cs
new file mode 100644
index 0000000000..54fc972c31
--- /dev/null
+++ b/src/Avalonia.Base/Styling/ControlTheme.cs
@@ -0,0 +1,27 @@
+using System;
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// Defines a switchable theme for a control.
+    /// </summary>
+    public class ControlTheme : StyleBase
+    {
+        /// <summary>
+        /// Gets or sets the type for which this control theme is intended.
+        /// </summary>
+        public Type? TargetType { get; set; }
+
+        internal override bool HasSelector => TargetType is not null;
+
+        internal override SelectorMatch Match(IStyleable control, object? host, bool subscribe)
+        {
+            if (TargetType is null)
+                throw new InvalidOperationException("ControlTheme has no TargetType.");
+
+            return control.StyleKey == TargetType ?
+                SelectorMatch.AlwaysThisType :
+                SelectorMatch.NeverThisType;
+        }
+    }
+}
diff --git a/src/Avalonia.Base/Styling/IStyle.cs b/src/Avalonia.Base/Styling/IStyle.cs
index e9faf82c07..417739fb28 100644
--- a/src/Avalonia.Base/Styling/IStyle.cs
+++ b/src/Avalonia.Base/Styling/IStyle.cs
@@ -23,6 +23,6 @@ namespace Avalonia.Styling
         /// <returns>
         /// A <see cref="SelectorMatchResult"/> describing how the style matches the control.
         /// </returns>
-        SelectorMatchResult TryAttach(IStyleable target, IStyleHost? host);
+        SelectorMatchResult TryAttach(IStyleable target, object? host);
     }
 }
diff --git a/src/Avalonia.Base/Styling/IThemed.cs b/src/Avalonia.Base/Styling/IThemed.cs
new file mode 100644
index 0000000000..32ae515bcb
--- /dev/null
+++ b/src/Avalonia.Base/Styling/IThemed.cs
@@ -0,0 +1,13 @@
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// Represents a themed element.
+    /// </summary>
+    public interface IThemed
+    {
+        /// <summary>
+        /// Gets the theme style for the element.
+        /// </summary>
+        public ControlTheme? Theme { get; }
+    }
+}
diff --git a/src/Avalonia.Base/Styling/NestingSelector.cs b/src/Avalonia.Base/Styling/NestingSelector.cs
index 481a937867..6d31f7cb18 100644
--- a/src/Avalonia.Base/Styling/NestingSelector.cs
+++ b/src/Avalonia.Base/Styling/NestingSelector.cs
@@ -15,9 +15,9 @@ namespace Avalonia.Styling
 
         protected override SelectorMatch Evaluate(IStyleable control, IStyle? parent, bool subscribe)
         {
-            if (parent is Style s && s.Selector is Selector selector)
+            if (parent is StyleBase s && s.HasSelector)
             {
-                return selector.Match(control, (parent as Style)?.Parent, subscribe);
+                return s.Match(control, null, subscribe);
             }
 
             throw new InvalidOperationException(
diff --git a/src/Avalonia.Base/Styling/Style.cs b/src/Avalonia.Base/Styling/Style.cs
index c85c85fe21..ca20ff2b4b 100644
--- a/src/Avalonia.Base/Styling/Style.cs
+++ b/src/Avalonia.Base/Styling/Style.cs
@@ -28,6 +28,8 @@ namespace Avalonia.Styling
         /// </summary>
         public Selector? Selector { get; set; }
 
+        internal override bool HasSelector => Selector is not null;
+
         /// <summary>
         /// Returns a string representation of the style.
         /// </summary>
@@ -44,10 +46,10 @@ namespace Avalonia.Styling
             }
         }
 
-        protected override SelectorMatch Matches(IStyleable target, IStyleHost? host)
+        internal override SelectorMatch Match(IStyleable control, object? host, bool subscribe)
         {
-            return Selector?.Match(target, Parent) ??
-                (target == host ?
+            return Selector?.Match(control, Parent, subscribe) ??
+                (control == host ?
                     SelectorMatch.AlwaysThisInstance :
                     SelectorMatch.NeverThisInstance);
         }
diff --git a/src/Avalonia.Base/Styling/StyleBase.cs b/src/Avalonia.Base/Styling/StyleBase.cs
index 0fc57da728..b6bfec62bd 100644
--- a/src/Avalonia.Base/Styling/StyleBase.cs
+++ b/src/Avalonia.Base/Styling/StyleBase.cs
@@ -64,12 +64,14 @@ namespace Avalonia.Styling
         bool IResourceNode.HasResources => _resources?.Count > 0;
         IReadOnlyList<IStyle> IStyle.Children => (IReadOnlyList<IStyle>?)_children ?? Array.Empty<IStyle>();
 
+        internal abstract bool HasSelector { get; }
+
         public void Add(ISetter setter) => Setters.Add(setter);
         public void Add(IStyle style) => Children.Add(style);
 
         public event EventHandler? OwnerChanged;
 
-        public SelectorMatchResult TryAttach(IStyleable target, IStyleHost? host)
+        public SelectorMatchResult TryAttach(IStyleable target, object? host)
         {
             target = target ?? throw new ArgumentNullException(nameof(target));
 
@@ -77,7 +79,7 @@ namespace Avalonia.Styling
 
             if (_setters?.Count > 0 || _animations?.Count > 0)
             {
-                var match = Matches(target, host);
+                var match = Match(target, host, subscribe: true);
 
                 if (match.IsMatch)
                 {
@@ -106,7 +108,19 @@ namespace Avalonia.Styling
             return _resources?.TryGetResource(key, out result) ?? false;
         }
 
-        protected abstract SelectorMatch Matches(IStyleable target, IStyleHost? host);
+        /// <summary>
+        /// Evaluates the style's selector against the specified target element.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        /// <param name="host">The element that hosts the style.</param>
+        /// <param name="subscribe">
+        /// Whether the match should subscribe to changes in order to track the match over time,
+        /// or simply return an immediate result.
+        /// </param>
+        /// <returns>
+        /// A <see cref="SelectorMatchResult"/> describing how the style matches the control.
+        /// </returns>
+        internal abstract SelectorMatch Match(IStyleable control, object? host, bool subscribe);
 
         internal virtual void SetParent(StyleBase? parent) => Parent = parent;
 
diff --git a/src/Avalonia.Base/Styling/StyleCache.cs b/src/Avalonia.Base/Styling/StyleCache.cs
index 3285476880..81196f6a27 100644
--- a/src/Avalonia.Base/Styling/StyleCache.cs
+++ b/src/Avalonia.Base/Styling/StyleCache.cs
@@ -12,7 +12,7 @@ namespace Avalonia.Styling
     /// </remarks>
     internal class StyleCache : Dictionary<Type, List<IStyle>?>
     {
-        public SelectorMatchResult TryAttach(IList<IStyle> styles, IStyleable target, IStyleHost? host)
+        public SelectorMatchResult TryAttach(IList<IStyle> styles, IStyleable target, object? host)
         {
             if (TryGetValue(target.StyleKey, out var cached))
             {
diff --git a/src/Avalonia.Base/Styling/Styler.cs b/src/Avalonia.Base/Styling/Styler.cs
index 74cf77ea40..b9359b3329 100644
--- a/src/Avalonia.Base/Styling/Styler.cs
+++ b/src/Avalonia.Base/Styling/Styler.cs
@@ -10,6 +10,20 @@ namespace Avalonia.Styling
         {
             target = target ?? throw new ArgumentNullException(nameof(target));
 
+            // If the control has a themed templated parent then first apply the styles from
+            // the templated parent theme.
+            if (target.TemplatedParent is IThemed themedTemplatedParent)
+            {
+                themedTemplatedParent.Theme?.TryAttach(target, themedTemplatedParent);
+            }
+
+            // If the control itself is themed, then next apply the control theme.
+            if (target is IThemed themed)
+            {
+                themed.Theme?.TryAttach(target, target);
+            }
+
+            // Apply styles from the rest of the tree.
             if (target is IStyleHost styleHost)
             {
                 ApplyStyles(target, styleHost);
diff --git a/src/Avalonia.Base/Styling/Styles.cs b/src/Avalonia.Base/Styling/Styles.cs
index 7c0bc4ad7f..4c011f1b0d 100644
--- a/src/Avalonia.Base/Styling/Styles.cs
+++ b/src/Avalonia.Base/Styling/Styles.cs
@@ -109,7 +109,7 @@ namespace Avalonia.Styling
             set => _styles[index] = value;
         }
 
-        public SelectorMatchResult TryAttach(IStyleable target, IStyleHost? host)
+        public SelectorMatchResult TryAttach(IStyleable target, object? host)
         {
             _cache ??= new StyleCache();
             return _cache.TryAttach(this, target, host);
diff --git a/src/Avalonia.Controls/Primitives/TemplatedControl.cs b/src/Avalonia.Controls/Primitives/TemplatedControl.cs
index db029d38c0..e1f42b6eb0 100644
--- a/src/Avalonia.Controls/Primitives/TemplatedControl.cs
+++ b/src/Avalonia.Controls/Primitives/TemplatedControl.cs
@@ -12,7 +12,7 @@ namespace Avalonia.Controls.Primitives
     /// <summary>
     /// A lookless control whose visual appearance is defined by its <see cref="Template"/>.
     /// </summary>
-    public class TemplatedControl : Control, ITemplatedControl
+    public class TemplatedControl : Control, IThemed, ITemplatedControl
     {
         /// <summary>
         /// Defines the <see cref="Background"/> property.
@@ -86,6 +86,12 @@ namespace Avalonia.Controls.Primitives
         public static readonly StyledProperty<IControlTemplate?> TemplateProperty =
             AvaloniaProperty.Register<TemplatedControl, IControlTemplate?>(nameof(Template));
 
+        /// <summary>
+        /// Defines the <see cref="Theme"/> property.
+        /// </summary>
+        public static readonly StyledProperty<ControlTheme?> ThemeProperty =
+            AvaloniaProperty.Register<TemplatedControl, ControlTheme?>(nameof(Theme));
+
         /// <summary>
         /// Defines the IsTemplateFocusTarget attached property.
         /// </summary>
@@ -228,6 +234,15 @@ namespace Avalonia.Controls.Primitives
             set { SetValue(TemplateProperty, value); }
         }
 
+        /// <summary>
+        /// Gets or sets the theme to be applied to the control.
+        /// </summary>
+        public ControlTheme? Theme
+        {
+            get { return GetValue(ThemeProperty); }
+            set { SetValue(ThemeProperty, value); }
+        }
+
         /// <summary>
         /// Gets the value of the IsTemplateFocusTargetProperty attached property on a control.
         /// </summary>
@@ -365,6 +380,14 @@ namespace Avalonia.Controls.Primitives
         {
         }
 
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == ThemeProperty)
+                InvalidateStyles();
+        }
+
         /// <summary>
         /// Called when the control's template is applied.
         /// </summary>
diff --git a/src/Avalonia.Themes.Default/SimpleTheme.cs b/src/Avalonia.Themes.Default/SimpleTheme.cs
index 6929660757..d7939a68c1 100644
--- a/src/Avalonia.Themes.Default/SimpleTheme.cs
+++ b/src/Avalonia.Themes.Default/SimpleTheme.cs
@@ -103,7 +103,7 @@ namespace Avalonia.Themes.Default
 
         void IResourceProvider.RemoveOwner(IResourceHost owner) => (Loaded as IResourceProvider)?.RemoveOwner(owner);
 
-        public SelectorMatchResult TryAttach(IStyleable target, IStyleHost? host) => Loaded.TryAttach(target, host);
+        public SelectorMatchResult TryAttach(IStyleable target, object? host) => Loaded.TryAttach(target, host);
 
         public bool TryGetResource(object key, out object? value)
         {
diff --git a/src/Avalonia.Themes.Fluent/FluentTheme.cs b/src/Avalonia.Themes.Fluent/FluentTheme.cs
index f6b47a5466..befe669029 100644
--- a/src/Avalonia.Themes.Fluent/FluentTheme.cs
+++ b/src/Avalonia.Themes.Fluent/FluentTheme.cs
@@ -164,7 +164,7 @@ namespace Avalonia.Themes.Fluent
             }
         }
 
-        public SelectorMatchResult TryAttach(IStyleable target, IStyleHost? host) => Loaded.TryAttach(target, host);
+        public SelectorMatchResult TryAttach(IStyleable target, object? host) => Loaded.TryAttach(target, host);
 
         public bool TryGetResource(object key, out object? value)
         {
diff --git a/src/Markup/Avalonia.Markup.Xaml/Styling/StyleInclude.cs b/src/Markup/Avalonia.Markup.Xaml/Styling/StyleInclude.cs
index fa4a27fc50..109e85f1a4 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Styling/StyleInclude.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Styling/StyleInclude.cs
@@ -82,7 +82,7 @@ namespace Avalonia.Markup.Xaml.Styling
             }
         }
 
-        public SelectorMatchResult TryAttach(IStyleable target, IStyleHost? host) => Loaded.TryAttach(target, host);
+        public SelectorMatchResult TryAttach(IStyleable target, object? host) => Loaded.TryAttach(target, host);
 
         public bool TryGetResource(object key, out object? value)
         {
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/TemplatedControlTests_Theming.cs b/tests/Avalonia.Controls.UnitTests/Primitives/TemplatedControlTests_Theming.cs
new file mode 100644
index 0000000000..b24adfe7ab
--- /dev/null
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/TemplatedControlTests_Theming.cs
@@ -0,0 +1,119 @@
+using System.Linq;
+using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Templates;
+using Avalonia.Media;
+using Avalonia.Styling;
+using Avalonia.UnitTests;
+using Avalonia.VisualTree;
+using Xunit;
+
+#nullable enable
+
+namespace Avalonia.Controls.UnitTests.Primitives
+{
+    public class TemplatedControlTests_Theming
+    {
+        [Fact]
+        public void Theme_Is_Applied_When_Attached_To_Logical_Tree()
+        {
+            using var app = UnitTestApplication.Start(TestServices.RealStyler);
+            var target = CreateTarget();
+
+            Assert.Null(target.Template);
+
+            var root = CreateRoot(target);
+
+            Assert.NotNull(target.Template);
+            var border = Assert.IsType<Border>(target.VisualChild);
+            
+            Assert.Equal(border.Background, Brushes.Red);
+
+            target.Classes.Add("foo");
+            Assert.Equal(border.Background, Brushes.Green);
+        }
+
+        [Fact]
+        public void Theme_Is_Detached_When_Theme_Property_Cleared()
+        {
+            using var app = UnitTestApplication.Start(TestServices.RealStyler);
+            var target = CreateTarget();
+            var root = CreateRoot(target);
+
+            Assert.NotNull(target.Template);
+
+            target.Theme = null;
+            Assert.Null(target.Template);
+        }
+
+        [Fact]
+        public void Theme_Is_Applied_On_Layout_After_Theme_Property_Changes()
+        {
+            using var app = UnitTestApplication.Start(TestServices.RealStyler);
+            var target = new ThemedControl();
+            var root = CreateRoot(target);
+
+            Assert.Null(target.Template);
+
+            target.Theme = CreateTheme();
+            Assert.Null(target.Template);
+
+            root.LayoutManager.ExecuteLayoutPass();
+
+            var border = Assert.IsType<Border>(target.VisualChild);
+            Assert.NotNull(target.Template);
+            Assert.Equal(border.Background, Brushes.Red);
+        }
+
+        private static ThemedControl CreateTarget()
+        {
+            return new ThemedControl
+            {
+                Theme = CreateTheme(),
+            };
+        }
+
+        private static ControlTheme CreateTheme()
+        {
+            var template = new FuncControlTemplate<ThemedControl>((o, n) =>
+                new Border { Name = "PART_Border" });
+
+            return new ControlTheme
+            {
+                TargetType = typeof(ThemedControl),
+                Setters =
+                {
+                    new Setter(ThemedControl.TemplateProperty, template),
+                },
+                Children =
+                {
+                    new Style(x => x.Nesting().Template().OfType<Border>())
+                    {
+                        Setters =
+                        {
+                            new Setter(Border.BackgroundProperty, Brushes.Red),
+                        }
+                    },
+                    new Style(x => x.Nesting().Class("foo").Template().OfType<Border>())
+                    {
+                        Setters =
+                        {
+                            new Setter(Border.BackgroundProperty, Brushes.Green),
+                        }
+                    },
+                }
+            };
+        }
+
+        private static TestRoot CreateRoot(IControl child)
+        {
+            var result = new TestRoot(child);
+            result.LayoutManager.ExecuteInitialLayoutPass();
+            return result;
+        }
+
+        private class ThemedControl : TemplatedControl
+        {
+            public IVisual? VisualChild => VisualChildren?.SingleOrDefault();
+        }
+    }
+}

From dee353bb9640278ab2364b1d9b4624d5cbe7a215 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Wed, 1 Jun 2022 15:24:15 +0200
Subject: [PATCH 012/240] Support ControlTheme in XAML compiler.

---
 .../AvaloniaXamlIlCompiler.cs                 |  1 +
 .../AvaloniaXamlIlControlThemeTransformer.cs  | 39 ++++++++++
 .../AvaloniaXamlIlSetterTransformer.cs        | 75 +++++++++++++------
 .../Xaml/ControlThemeTests.cs                 | 53 +++++++++++++
 .../Xaml/TestTemplatedControl.cs              |  8 ++
 5 files changed, 155 insertions(+), 21 deletions(-)
 create mode 100644 src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlControlThemeTransformer.cs
 create mode 100644 tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlThemeTests.cs
 create mode 100644 tests/Avalonia.Markup.Xaml.UnitTests/Xaml/TestTemplatedControl.cs

diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlCompiler.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlCompiler.cs
index 1ca7be67a7..20e035f8ff 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlCompiler.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlCompiler.cs
@@ -48,6 +48,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
 
             InsertBefore<ContentConvertTransformer>(                
                 new AvaloniaXamlIlBindingPathParser(),
+                new AvaloniaXamlIlControlThemeTransformer(),
                 new AvaloniaXamlIlSelectorTransformer(),
                 new AvaloniaXamlIlControlTemplateTargetTypeMetadataTransformer(),
                 new AvaloniaXamlIlPropertyPathTransformer(),
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlControlThemeTransformer.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlControlThemeTransformer.cs
new file mode 100644
index 0000000000..1338dc7248
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlControlThemeTransformer.cs
@@ -0,0 +1,39 @@
+using System.Linq;
+using XamlX;
+using XamlX.Ast;
+using XamlX.Transform;
+using XamlX.Transform.Transformers;
+using XamlX.TypeSystem;
+
+namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
+{
+    class AvaloniaXamlIlControlThemeTransformer : IXamlAstTransformer
+    {
+        public IXamlAstNode Transform(AstTransformationContext context, IXamlAstNode node)
+        {
+            if (!(node is XamlAstObjectNode on && on.Type.GetClrType().FullName == "Avalonia.Styling.ControlTheme"))
+                return node;
+
+            // Check if we've already transformed this node.
+            if (context.ParentNodes().FirstOrDefault() is AvaloniaXamlIlTargetTypeMetadataNode)
+                return node;
+
+            var targetTypeNode = on.Children.OfType<XamlAstXamlPropertyValueNode>()
+                .FirstOrDefault(p => p.Property.GetClrProperty().Name == "TargetType") ??
+                throw new XamlParseException("ControlTheme must have a TargetType.", node);
+
+            IXamlType targetType;
+
+            if (targetTypeNode.Values[0] is XamlTypeExtensionNode extension)
+                targetType = extension.Value.GetClrType();
+            else if (targetTypeNode.Values[0] is XamlAstTextNode text)
+                targetType = TypeReferenceResolver.ResolveType(context, text.Text, false, text, true).GetClrType();
+            else
+                throw new XamlParseException("Could not determine TargetType for ControlTheme.", targetTypeNode);
+
+            return new AvaloniaXamlIlTargetTypeMetadataNode(on,
+                new XamlAstClrTypeReference(targetTypeNode, targetType, false),
+                AvaloniaXamlIlTargetTypeMetadataNode.ScopeTypes.Style);
+        }
+    }
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSetterTransformer.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSetterTransformer.cs
index e816265422..06e34a85a2 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSetterTransformer.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSetterTransformer.cs
@@ -1,19 +1,14 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using Avalonia.Data.Core;
-using XamlX;
 using XamlX.Ast;
 using XamlX.Emit;
 using XamlX.IL;
 using XamlX.Transform;
-using XamlX.Transform.Transformers;
 using XamlX.TypeSystem;
 
 namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
 {
     using XamlParseException = XamlX.XamlParseException;
-    using XamlLoadException = XamlX.XamlLoadException;
     class AvaloniaXamlIlSetterTransformer : IXamlAstTransformer
     {
         public IXamlAstNode Transform(AstTransformationContext context, IXamlAstNode node)
@@ -22,21 +17,10 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
                   && on.Type.GetClrType().FullName == "Avalonia.Styling.Setter"))
                 return node;
 
-            var parent = context.ParentNodes().OfType<XamlAstObjectNode>()
-                .FirstOrDefault(p => p.Type.GetClrType().FullName == "Avalonia.Styling.Style");
-            
-            if (parent == null)
-                throw new XamlParseException(
-                    "Avalonia.Styling.Setter is only valid inside Avalonia.Styling.Style", node);
-            var selectorProperty = parent.Children.OfType<XamlAstXamlPropertyValueNode>()
-                .FirstOrDefault(p => p.Property.GetClrProperty().Name == "Selector");
-            if (selectorProperty == null)
-                throw new XamlParseException(
-                    "Can not find parent Style Selector", node);
-            var selector = selectorProperty.Values.FirstOrDefault() as XamlIlSelectorNode;
-            if (selector?.TargetType == null)
-                throw new XamlParseException(
-                    "Can not resolve parent Style Selector type", node);
+            var targetTypeNode = context.ParentNodes()
+                .OfType<AvaloniaXamlIlTargetTypeMetadataNode>()
+                .FirstOrDefault(x => x.ScopeType == AvaloniaXamlIlTargetTypeMetadataNode.ScopeTypes.Style) ??
+                throw new XamlParseException("Can not find parent Style Selector or ControlTemplate TargetType", node);
 
             IXamlType propType = null;
             var property = @on.Children.OfType<XamlAstXamlPropertyValueNode>()
@@ -50,7 +34,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
 
 
                 var avaloniaPropertyNode = XamlIlAvaloniaPropertyHelper.CreateNode(context, propertyName,
-                    new XamlAstClrTypeReference(selector, selector.TargetType, false), property.Values[0]);
+                    new XamlAstClrTypeReference(targetTypeNode, targetTypeNode.TargetType.GetClrType(), false), property.Values[0]);
                 property.Values = new List<IXamlAstValueNode> {avaloniaPropertyNode};
                 propType = avaloniaPropertyNode.AvaloniaPropertyType;
             }
@@ -84,6 +68,55 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
             return node;
         }
 
+        private (IXamlLineInfo, IXamlType) GetTargetType(AstTransformationContext context, IXamlAstNode node)
+        {
+            foreach (var n in context.ParentNodes())
+            {
+                if (n is XamlAstObjectNode parent)
+                {
+                    switch (parent.Type.GetClrType().FullName)
+                    {
+                        case "Avalonia.Styling.Style":
+                            var selectorProperty = parent.Children.OfType<XamlAstXamlPropertyValueNode>()
+                                .FirstOrDefault(p => p.Property.GetClrProperty().Name == "Selector");
+                            if (selectorProperty == null)
+                                throw new XamlParseException("Can not find parent Style Selector.", node);
+                            var selector = selectorProperty.Values.FirstOrDefault() as XamlIlSelectorNode;
+                            if (selector?.TargetType != null)
+                                return (selector, selector.TargetType);
+                            throw new XamlParseException(
+                                "Can not resolve parent Style Selector type", node);
+
+                        case "Avalonia.Styling.ControlTheme":
+                            var targetTypeProperty = parent.Children.OfType<XamlAstXamlPropertyValueNode>()
+                                .FirstOrDefault(p => p.Property.GetClrProperty().Name == "TargetType");
+                            if (targetTypeProperty == null)
+                                throw new XamlParseException("ControlTemplate has no TargetType.", parent);
+                            break;
+                    }
+                }
+            }
+
+            throw new XamlParseException("'Setter' is only valid inside a 'Style' or 'ControlTheme'.", node);
+            //var parent = context.ParentNodes().OfType<XamlAstObjectNode>()
+            //    .FirstOrDefault(p => p.Type.GetClrType().FullName == "Avalonia.Styling.Style" ||
+            //                         p.Type.GetClrType().FullName == "Avalonia.Styling.ControlTheme");
+
+            //if (parent == null)
+            //    throw new XamlParseException(
+            //        "Avalonia.Styling.Setter is only valid inside Avalonia.Styling.Style", node);
+            //var selectorProperty = parent.Children.OfType<XamlAstXamlPropertyValueNode>()
+            //    .FirstOrDefault(p => p.Property.GetClrProperty().Name == "Selector" ||
+            //                         p.Property.GetClrProperty().Name == "TargetType");
+            //if (selectorProperty == null)
+            //    throw new XamlParseException(
+            //        "Can not find parent Style Selector or ControlTemplate TargetType", node);
+            //var selector = selectorProperty.Values.FirstOrDefault() as XamlIlSelectorNode;
+            //if (selector?.TargetType == null)
+            //    throw new XamlParseException(
+            //        "Can not resolve parent Style Selector type", node);
+        }
+
         class SetterValueProperty : XamlAstClrProperty
         {
             public SetterValueProperty(IXamlLineInfo line, IXamlType setterType, IXamlType targetType,
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlThemeTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlThemeTests.cs
new file mode 100644
index 0000000000..05083537cd
--- /dev/null
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlThemeTests.cs
@@ -0,0 +1,53 @@
+using Avalonia.Controls;
+using Avalonia.Media;
+using Avalonia.UnitTests;
+using Avalonia.VisualTree;
+using Xunit;
+
+namespace Avalonia.Markup.Xaml.UnitTests.Xaml
+{
+    public class ControlThemeTests : XamlTestBase
+    {
+        [Fact]
+        public void ControlTheme_Can_Be_StaticResource()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = $@"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+        xmlns:u='using:Avalonia.Markup.Xaml.UnitTests.Xaml'>
+    <Window.Resources>
+        {ControlThemeXaml}
+    </Window.Resources>
+
+    <u:TestTemplatedControl Theme='{{StaticResource MyTheme}}'/>
+</Window>";
+
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var button = Assert.IsType<TestTemplatedControl>(window.Content);
+
+                window.LayoutManager.ExecuteInitialLayoutPass();
+
+                Assert.NotNull(button.Template);
+
+                var child = Assert.Single(button.GetVisualChildren());
+                var border = Assert.IsType<Border>(child);
+
+                Assert.Equal(Brushes.Red, border.Background);
+            }
+        }
+
+        private const string ControlThemeXaml = @"
+<ControlTheme x:Key='MyTheme' TargetType='u:TestTemplatedControl'>
+    <Setter Property='Template'>
+        <ControlTemplate>
+            <Border/>
+        </ControlTemplate>
+    </Setter>
+    <Style Selector='^ /template/ Border'>
+        <Setter Property='Background' Value='Red'/>
+    </Style>
+</ControlTheme>";
+    }
+}
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/TestTemplatedControl.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/TestTemplatedControl.cs
new file mode 100644
index 0000000000..0c862bb66a
--- /dev/null
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/TestTemplatedControl.cs
@@ -0,0 +1,8 @@
+using Avalonia.Controls.Primitives;
+
+namespace Avalonia.Markup.Xaml.UnitTests.Xaml
+{
+    public class TestTemplatedControl : TemplatedControl
+    {
+    }
+}

From a6dc6b1c887c8a5139be7bf1abba1315c26af0d7 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Wed, 1 Jun 2022 21:45:45 +0200
Subject: [PATCH 013/240] Prevent ControlTheme as a nested style.

---
 src/Avalonia.Base/Styling/ControlTheme.cs     | 16 +++++++++++
 .../Styling/ControlThemeTests.cs              | 28 +++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 tests/Avalonia.Base.UnitTests/Styling/ControlThemeTests.cs

diff --git a/src/Avalonia.Base/Styling/ControlTheme.cs b/src/Avalonia.Base/Styling/ControlTheme.cs
index 54fc972c31..9dcbd7d2c4 100644
--- a/src/Avalonia.Base/Styling/ControlTheme.cs
+++ b/src/Avalonia.Base/Styling/ControlTheme.cs
@@ -7,6 +7,17 @@ namespace Avalonia.Styling
     /// </summary>
     public class ControlTheme : StyleBase
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ControlTheme"/> class.
+        /// </summary>
+        public ControlTheme() { }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ControlTheme"/> class.
+        /// </summary>
+        /// <param name="targetType">The value for <see cref="TargetType"/>.</param>
+        public ControlTheme(Type targetType) => TargetType = targetType;
+
         /// <summary>
         /// Gets or sets the type for which this control theme is intended.
         /// </summary>
@@ -23,5 +34,10 @@ namespace Avalonia.Styling
                 SelectorMatch.AlwaysThisType :
                 SelectorMatch.NeverThisType;
         }
+
+        internal override void SetParent(StyleBase? parent)
+        {
+            throw new InvalidOperationException("ControlThemes cannot be added as a nested style.");
+        }
     }
 }
diff --git a/tests/Avalonia.Base.UnitTests/Styling/ControlThemeTests.cs b/tests/Avalonia.Base.UnitTests/Styling/ControlThemeTests.cs
new file mode 100644
index 0000000000..93a0e6c2fd
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/ControlThemeTests.cs
@@ -0,0 +1,28 @@
+using System;
+using Avalonia.Controls;
+using Avalonia.Styling;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Styling
+{
+    public class ControlThemeTests
+    {
+        [Fact]
+        public void ControlTheme_Cannot_Be_Added_To_Style_Children()
+        {
+            var target = new ControlTheme(typeof(Button));
+            var style = new Style();
+
+            Assert.Throws<InvalidOperationException>(() => style.Children.Add(target));
+        }
+
+        [Fact]
+        public void ControlTheme_Cannot_Be_Added_To_ControlTheme_Children()
+        {
+            var target = new ControlTheme(typeof(Button));
+            var other = new ControlTheme(typeof(CheckBox));
+
+            Assert.Throws<InvalidOperationException>(() => other.Children.Add(target));
+        }
+    }
+}

From fc3c036b02afce41d8faca7e4c1e8219fb0c4ceb Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Wed, 1 Jun 2022 22:48:34 +0200
Subject: [PATCH 014/240] Move Theme to StyledElement.

The WPF equivalent (`Style`) is in `FrameworkElement` so it would make sense. Will also make stuff a lot easier and removes the need for an `IThemed` interface.
---
 src/Avalonia.Base/StyledElement.cs            | 25 +++++++++++++++++--
 src/Avalonia.Base/Styling/IStyleable.cs       |  7 ++++--
 src/Avalonia.Base/Styling/IThemed.cs          | 13 ----------
 src/Avalonia.Base/Styling/Styler.cs           | 23 ++++-------------
 .../Primitives/TemplatedControl.cs            | 25 +------------------
 .../AvaloniaPropertyConverterTest.cs          |  5 ++++
 6 files changed, 39 insertions(+), 59 deletions(-)
 delete mode 100644 src/Avalonia.Base/Styling/IThemed.cs

diff --git a/src/Avalonia.Base/StyledElement.cs b/src/Avalonia.Base/StyledElement.cs
index f98d2cdbcc..4ead2470d7 100644
--- a/src/Avalonia.Base/StyledElement.cs
+++ b/src/Avalonia.Base/StyledElement.cs
@@ -12,8 +12,6 @@ using Avalonia.Logging;
 using Avalonia.LogicalTree;
 using Avalonia.Styling;
 
-#nullable enable
-
 namespace Avalonia
 {
     /// <summary>
@@ -55,6 +53,12 @@ namespace Avalonia
                 nameof(TemplatedParent),
                 o => o.TemplatedParent,
                 (o ,v) => o.TemplatedParent = v);
+        
+        /// <summary>
+        /// Defines the <see cref="Theme"/> property.
+        /// </summary>
+        public static readonly StyledProperty<ControlTheme?> ThemeProperty =
+            AvaloniaProperty.Register<StyledElement, ControlTheme?>(nameof(Theme));
 
         private int _initCount;
         private string? _name;
@@ -230,6 +234,15 @@ namespace Avalonia
             internal set => SetAndRaise(TemplatedParentProperty, ref _templatedParent, value);
         }
 
+        /// <summary>
+        /// Gets or sets the theme to be applied to the element.
+        /// </summary>
+        public ControlTheme? Theme
+        {
+            get { return GetValue(ThemeProperty); }
+            set { SetValue(ThemeProperty, value); }
+        }
+
         /// <summary>
         /// Gets the styled element's logical children.
         /// </summary>
@@ -590,6 +603,14 @@ namespace Avalonia
         {
         }
 
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == ThemeProperty)
+                InvalidateStyles();
+        }
+
         private static void DataContextNotifying(IAvaloniaObject o, bool updateStarted)
         {
             if (o is StyledElement element)
diff --git a/src/Avalonia.Base/Styling/IStyleable.cs b/src/Avalonia.Base/Styling/IStyleable.cs
index 5bc972e7ab..61fcbdf850 100644
--- a/src/Avalonia.Base/Styling/IStyleable.cs
+++ b/src/Avalonia.Base/Styling/IStyleable.cs
@@ -3,8 +3,6 @@ using System.Collections.Generic;
 using Avalonia.Collections;
 using Avalonia.Metadata;
 
-#nullable enable
-
 namespace Avalonia.Styling
 {
     /// <summary>
@@ -28,6 +26,11 @@ namespace Avalonia.Styling
         /// </summary>
         ITemplatedControl? TemplatedParent { get; }
 
+        /// <summary>
+        /// Gets the theme to be applied to the control.
+        /// </summary>
+        public ControlTheme? Theme { get; }
+
         /// <summary>
         /// Notifies the element that a style has been applied.
         /// </summary>
diff --git a/src/Avalonia.Base/Styling/IThemed.cs b/src/Avalonia.Base/Styling/IThemed.cs
deleted file mode 100644
index 32ae515bcb..0000000000
--- a/src/Avalonia.Base/Styling/IThemed.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace Avalonia.Styling
-{
-    /// <summary>
-    /// Represents a themed element.
-    /// </summary>
-    public interface IThemed
-    {
-        /// <summary>
-        /// Gets the theme style for the element.
-        /// </summary>
-        public ControlTheme? Theme { get; }
-    }
-}
diff --git a/src/Avalonia.Base/Styling/Styler.cs b/src/Avalonia.Base/Styling/Styler.cs
index b9359b3329..c9ea123bdc 100644
--- a/src/Avalonia.Base/Styling/Styler.cs
+++ b/src/Avalonia.Base/Styling/Styler.cs
@@ -1,33 +1,24 @@
 using System;
 
-#nullable enable
-
 namespace Avalonia.Styling
 {
     public class Styler : IStyler
     {
         public void ApplyStyles(IStyleable target)
         {
-            target = target ?? throw new ArgumentNullException(nameof(target));
+            _ = target ?? throw new ArgumentNullException(nameof(target));
 
             // If the control has a themed templated parent then first apply the styles from
             // the templated parent theme.
-            if (target.TemplatedParent is IThemed themedTemplatedParent)
-            {
-                themedTemplatedParent.Theme?.TryAttach(target, themedTemplatedParent);
-            }
+            if (target.TemplatedParent is IStyleable styleableParent)
+                styleableParent.Theme?.TryAttach(target, styleableParent);
 
-            // If the control itself is themed, then next apply the control theme.
-            if (target is IThemed themed)
-            {
-                themed.Theme?.TryAttach(target, target);
-            }
+            // Next apply the control theme.
+            target.Theme?.TryAttach(target, target);
 
             // Apply styles from the rest of the tree.
             if (target is IStyleHost styleHost)
-            {
                 ApplyStyles(target, styleHost);
-            }
         }
 
         private void ApplyStyles(IStyleable target, IStyleHost host)
@@ -35,14 +26,10 @@ namespace Avalonia.Styling
             var parent = host.StylingParent;
 
             if (parent != null)
-            {
                 ApplyStyles(target, parent);
-            }
 
             if (host.IsStylesInitialized)
-            {
                 host.Styles.TryAttach(target, host);
-            }
         }
     }
 }
diff --git a/src/Avalonia.Controls/Primitives/TemplatedControl.cs b/src/Avalonia.Controls/Primitives/TemplatedControl.cs
index e1f42b6eb0..db029d38c0 100644
--- a/src/Avalonia.Controls/Primitives/TemplatedControl.cs
+++ b/src/Avalonia.Controls/Primitives/TemplatedControl.cs
@@ -12,7 +12,7 @@ namespace Avalonia.Controls.Primitives
     /// <summary>
     /// A lookless control whose visual appearance is defined by its <see cref="Template"/>.
     /// </summary>
-    public class TemplatedControl : Control, IThemed, ITemplatedControl
+    public class TemplatedControl : Control, ITemplatedControl
     {
         /// <summary>
         /// Defines the <see cref="Background"/> property.
@@ -86,12 +86,6 @@ namespace Avalonia.Controls.Primitives
         public static readonly StyledProperty<IControlTemplate?> TemplateProperty =
             AvaloniaProperty.Register<TemplatedControl, IControlTemplate?>(nameof(Template));
 
-        /// <summary>
-        /// Defines the <see cref="Theme"/> property.
-        /// </summary>
-        public static readonly StyledProperty<ControlTheme?> ThemeProperty =
-            AvaloniaProperty.Register<TemplatedControl, ControlTheme?>(nameof(Theme));
-
         /// <summary>
         /// Defines the IsTemplateFocusTarget attached property.
         /// </summary>
@@ -234,15 +228,6 @@ namespace Avalonia.Controls.Primitives
             set { SetValue(TemplateProperty, value); }
         }
 
-        /// <summary>
-        /// Gets or sets the theme to be applied to the control.
-        /// </summary>
-        public ControlTheme? Theme
-        {
-            get { return GetValue(ThemeProperty); }
-            set { SetValue(ThemeProperty, value); }
-        }
-
         /// <summary>
         /// Gets the value of the IsTemplateFocusTargetProperty attached property on a control.
         /// </summary>
@@ -380,14 +365,6 @@ namespace Avalonia.Controls.Primitives
         {
         }
 
-        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
-        {
-            base.OnPropertyChanged(change);
-
-            if (change.Property == ThemeProperty)
-                InvalidateStyles();
-        }
-
         /// <summary>
         /// Called when the control's template is applied.
         /// </summary>
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Converters/AvaloniaPropertyConverterTest.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Converters/AvaloniaPropertyConverterTest.cs
index 33bf72014c..ca59fe8480 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Converters/AvaloniaPropertyConverterTest.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Converters/AvaloniaPropertyConverterTest.cs
@@ -137,6 +137,11 @@ namespace Avalonia.Markup.Xaml.UnitTests.Converters
                 get { throw new NotImplementedException(); }
             }
 
+            public ControlTheme Theme
+            {
+                get { throw new NotImplementedException(); }
+            }
+
             public void DetachStyles()
             {
                 throw new NotImplementedException();

From 8c61f25188afe50b0785150e2e1fbf605c4652c5 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 2 Jun 2022 09:23:17 +0200
Subject: [PATCH 015/240] Promote theme to LocalValue if applied from style.

---
 src/Avalonia.Base/StyledElement.cs            |  25 ++-
 .../TemplatedControlTests_Theming.cs          | 146 ++++++++++++------
 .../Xaml/ControlThemeTests.cs                 |  36 +++++
 3 files changed, 157 insertions(+), 50 deletions(-)

diff --git a/src/Avalonia.Base/StyledElement.cs b/src/Avalonia.Base/StyledElement.cs
index 4ead2470d7..75c4b94174 100644
--- a/src/Avalonia.Base/StyledElement.cs
+++ b/src/Avalonia.Base/StyledElement.cs
@@ -71,6 +71,7 @@ namespace Avalonia
         private List<IStyleInstance>? _appliedStyles;
         private ITemplatedControl? _templatedParent;
         private bool _dataContextUpdating;
+        private bool _hasPromotedTheme;
 
         /// <summary>
         /// Initializes static members of the <see cref="StyledElement"/> class.
@@ -239,8 +240,8 @@ namespace Avalonia
         /// </summary>
         public ControlTheme? Theme
         {
-            get { return GetValue(ThemeProperty); }
-            set { SetValue(ThemeProperty, value); }
+            get => GetValue(ThemeProperty);
+            set => SetValue(ThemeProperty, value);
         }
 
         /// <summary>
@@ -315,6 +316,7 @@ namespace Avalonia
         /// <inheritdoc/>
         IStyleHost? IStyleHost.StylingParent => (IStyleHost?)InheritanceParent;
 
+
         /// <inheritdoc/>
         public virtual void BeginInit()
         {
@@ -354,10 +356,15 @@ namespace Avalonia
                 }
                 finally
                 {
+                    _styled = true;
                     EndBatchUpdate();
                 }
 
-                _styled = true;
+                if (_hasPromotedTheme)
+                {
+                    _hasPromotedTheme = false;
+                    ClearValue(ThemeProperty);
+                }
             }
 
             return _styled;
@@ -608,7 +615,19 @@ namespace Avalonia
             base.OnPropertyChanged(change);
 
             if (change.Property == ThemeProperty)
+            {
+                // Changing the theme detaches all styles, meaning that if the theme property was
+                // set via a style, it will get cleared! To work around this, if the value was
+                // applied at less than local value priority then promote the value to local value
+                // priority until styling is re-applied.
+                if (change.Priority > BindingPriority.LocalValue)
+                {
+                    Theme = change.GetNewValue<ControlTheme?>();
+                    _hasPromotedTheme = true;
+                }
+
                 InvalidateStyles();
+            }
         }
 
         private static void DataContextNotifying(IAvaloniaObject o, bool updateStarted)
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/TemplatedControlTests_Theming.cs b/tests/Avalonia.Controls.UnitTests/Primitives/TemplatedControlTests_Theming.cs
index b24adfe7ab..74d75ff056 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/TemplatedControlTests_Theming.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/TemplatedControlTests_Theming.cs
@@ -13,63 +13,122 @@ namespace Avalonia.Controls.UnitTests.Primitives
 {
     public class TemplatedControlTests_Theming
     {
-        [Fact]
-        public void Theme_Is_Applied_When_Attached_To_Logical_Tree()
+        public class InlineTheme
         {
-            using var app = UnitTestApplication.Start(TestServices.RealStyler);
-            var target = CreateTarget();
+            [Fact]
+            public void Theme_Is_Applied_When_Attached_To_Logical_Tree()
+            {
+                using var app = UnitTestApplication.Start(TestServices.RealStyler);
+                var target = CreateTarget();
 
-            Assert.Null(target.Template);
+                Assert.Null(target.Template);
 
-            var root = CreateRoot(target);
+                var root = CreateRoot(target);
+                Assert.NotNull(target.Template);
 
-            Assert.NotNull(target.Template);
-            var border = Assert.IsType<Border>(target.VisualChild);
-            
-            Assert.Equal(border.Background, Brushes.Red);
+                var border = Assert.IsType<Border>(target.VisualChild);
+                Assert.Equal(border.Background, Brushes.Red);
 
-            target.Classes.Add("foo");
-            Assert.Equal(border.Background, Brushes.Green);
-        }
+                target.Classes.Add("foo");
+                Assert.Equal(border.Background, Brushes.Green);
+            }
 
-        [Fact]
-        public void Theme_Is_Detached_When_Theme_Property_Cleared()
-        {
-            using var app = UnitTestApplication.Start(TestServices.RealStyler);
-            var target = CreateTarget();
-            var root = CreateRoot(target);
+            [Fact]
+            public void Theme_Is_Detached_When_Theme_Property_Cleared()
+            {
+                using var app = UnitTestApplication.Start(TestServices.RealStyler);
+                var target = CreateTarget();
+                var root = CreateRoot(target);
 
-            Assert.NotNull(target.Template);
+                Assert.NotNull(target.Template);
 
-            target.Theme = null;
-            Assert.Null(target.Template);
-        }
+                target.Theme = null;
+                Assert.Null(target.Template);
+            }
 
-        [Fact]
-        public void Theme_Is_Applied_On_Layout_After_Theme_Property_Changes()
-        {
-            using var app = UnitTestApplication.Start(TestServices.RealStyler);
-            var target = new ThemedControl();
-            var root = CreateRoot(target);
+            [Fact]
+            public void Theme_Is_Applied_On_Layout_After_Theme_Property_Changes()
+            {
+                using var app = UnitTestApplication.Start(TestServices.RealStyler);
+                var target = new ThemedControl();
+                var root = CreateRoot(target);
+
+                Assert.Null(target.Template);
 
-            Assert.Null(target.Template);
+                target.Theme = CreateTheme();
+                Assert.Null(target.Template);
 
-            target.Theme = CreateTheme();
-            Assert.Null(target.Template);
+                root.LayoutManager.ExecuteLayoutPass();
 
-            root.LayoutManager.ExecuteLayoutPass();
+                var border = Assert.IsType<Border>(target.VisualChild);
+                Assert.NotNull(target.Template);
+                Assert.Equal(border.Background, Brushes.Red);
+            }
 
-            var border = Assert.IsType<Border>(target.VisualChild);
-            Assert.NotNull(target.Template);
-            Assert.Equal(border.Background, Brushes.Red);
+            private static ThemedControl CreateTarget()
+            {
+                return new ThemedControl
+                {
+                    Theme = CreateTheme(),
+                };
+            }
+
+            private static TestRoot CreateRoot(IControl child)
+            {
+                var result = new TestRoot(child);
+                result.LayoutManager.ExecuteInitialLayoutPass();
+                return result;
+            }
         }
 
-        private static ThemedControl CreateTarget()
+        public class ThemeFromStyle
         {
-            return new ThemedControl
+            [Fact]
+            public void Theme_Is_Applied_When_Attached_To_Logical_Tree()
             {
-                Theme = CreateTheme(),
-            };
+                using var app = UnitTestApplication.Start(TestServices.RealStyler);
+                var target = CreateTarget();
+
+                Assert.Null(target.Theme);
+                Assert.Null(target.Template);
+
+                var root = CreateRoot(target);
+
+                Assert.NotNull(target.Theme);
+                Assert.NotNull(target.Template);
+                
+                var border = Assert.IsType<Border>(target.VisualChild);
+                Assert.Equal(border.Background, Brushes.Red);
+
+                target.Classes.Add("foo");
+                Assert.Equal(border.Background, Brushes.Green);
+            }
+
+            private static ThemedControl CreateTarget()
+            {
+                return new ThemedControl();
+            }
+
+            private static TestRoot CreateRoot(IControl child)
+            {
+                var result = new TestRoot()
+                {
+                    Styles =
+                    {
+                        new Style(x => x.OfType<ThemedControl>())
+                        {
+                            Setters =
+                            {
+                                new Setter(TemplatedControl.ThemeProperty, CreateTheme())
+                            }
+                        }
+                    }
+                };
+
+                result.Child = child;
+                result.LayoutManager.ExecuteInitialLayoutPass();
+                return result;
+            }
         }
 
         private static ControlTheme CreateTheme()
@@ -104,13 +163,6 @@ namespace Avalonia.Controls.UnitTests.Primitives
             };
         }
 
-        private static TestRoot CreateRoot(IControl child)
-        {
-            var result = new TestRoot(child);
-            result.LayoutManager.ExecuteInitialLayoutPass();
-            return result;
-        }
-
         private class ThemedControl : TemplatedControl
         {
             public IVisual? VisualChild => VisualChildren?.SingleOrDefault();
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlThemeTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlThemeTests.cs
index 05083537cd..9eb48311df 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlThemeTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlThemeTests.cs
@@ -38,6 +38,42 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
             }
         }
 
+        [Fact]
+        public void ControlTheme_Can_Be_Set_In_Style()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var xaml = $@"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
+        xmlns:u='using:Avalonia.Markup.Xaml.UnitTests.Xaml'>
+    <Window.Resources>
+        {ControlThemeXaml}
+    </Window.Resources>
+
+    <Window.Styles>
+        <Style Selector='u|TestTemplatedControl'>
+            <Setter Property='Theme' Value='{{StaticResource MyTheme}}'/>
+        </Style>
+    </Window.Styles>
+
+    <u:TestTemplatedControl/>
+</Window>";
+
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var button = Assert.IsType<TestTemplatedControl>(window.Content);
+
+                window.LayoutManager.ExecuteInitialLayoutPass();
+
+                Assert.NotNull(button.Template);
+
+                var child = Assert.Single(button.GetVisualChildren());
+                var border = Assert.IsType<Border>(child);
+
+                Assert.Equal(Brushes.Red, border.Background);
+            }
+        }
+
         private const string ControlThemeXaml = @"
 <ControlTheme x:Key='MyTheme' TargetType='u:TestTemplatedControl'>
     <Setter Property='Template'>

From 5cd95320128fa97fff7af8223cf55b9d043086f8 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 2 Jun 2022 09:36:53 +0200
Subject: [PATCH 016/240] Move tests to correct place.

---
 .../Styling/StyledElementTests_Theming.cs     | 169 +++++++++++++++++
 .../TemplatedControlTests_Theming.cs          | 171 ------------------
 2 files changed, 169 insertions(+), 171 deletions(-)
 create mode 100644 tests/Avalonia.Base.UnitTests/Styling/StyledElementTests_Theming.cs
 delete mode 100644 tests/Avalonia.Controls.UnitTests/Primitives/TemplatedControlTests_Theming.cs

diff --git a/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests_Theming.cs b/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests_Theming.cs
new file mode 100644
index 0000000000..539f9e6576
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests_Theming.cs
@@ -0,0 +1,169 @@
+using System.Linq;
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Templates;
+using Avalonia.Media;
+using Avalonia.Styling;
+using Avalonia.UnitTests;
+using Avalonia.VisualTree;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Styling;
+
+public class StyledElementTests_Theming
+{
+    public class InlineTheme
+    {
+        [Fact]
+        public void Theme_Is_Applied_When_Attached_To_Logical_Tree()
+        {
+            using var app = UnitTestApplication.Start(TestServices.RealStyler);
+            var target = CreateTarget();
+
+            Assert.Null(target.Template);
+
+            var root = CreateRoot(target);
+            Assert.NotNull(target.Template);
+
+            var border = Assert.IsType<Border>(target.VisualChild);
+            Assert.Equal(border.Background, Brushes.Red);
+
+            target.Classes.Add("foo");
+            Assert.Equal(border.Background, Brushes.Green);
+        }
+
+        [Fact]
+        public void Theme_Is_Detached_When_Theme_Property_Cleared()
+        {
+            using var app = UnitTestApplication.Start(TestServices.RealStyler);
+            var target = CreateTarget();
+            var root = CreateRoot(target);
+
+            Assert.NotNull(target.Template);
+
+            target.Theme = null;
+            Assert.Null(target.Template);
+        }
+
+        [Fact]
+        public void Theme_Is_Applied_On_Layout_After_Theme_Property_Changes()
+        {
+            using var app = UnitTestApplication.Start(TestServices.RealStyler);
+            var target = new ThemedControl();
+            var root = CreateRoot(target);
+
+            Assert.Null(target.Template);
+
+            target.Theme = CreateTheme();
+            Assert.Null(target.Template);
+
+            root.LayoutManager.ExecuteLayoutPass();
+
+            var border = Assert.IsType<Border>(target.VisualChild);
+            Assert.NotNull(target.Template);
+            Assert.Equal(border.Background, Brushes.Red);
+        }
+
+        private static ThemedControl CreateTarget()
+        {
+            return new ThemedControl
+            {
+                Theme = CreateTheme(),
+            };
+        }
+
+        private static TestRoot CreateRoot(IControl child)
+        {
+            var result = new TestRoot(child);
+            result.LayoutManager.ExecuteInitialLayoutPass();
+            return result;
+        }
+    }
+
+    public class ThemeFromStyle
+    {
+        [Fact]
+        public void Theme_Is_Applied_When_Attached_To_Logical_Tree()
+        {
+            using var app = UnitTestApplication.Start(TestServices.RealStyler);
+            var target = CreateTarget();
+
+            Assert.Null(target.Theme);
+            Assert.Null(target.Template);
+
+            var root = CreateRoot(target);
+
+            Assert.NotNull(target.Theme);
+            Assert.NotNull(target.Template);
+
+            var border = Assert.IsType<Border>(target.VisualChild);
+            Assert.Equal(border.Background, Brushes.Red);
+
+            target.Classes.Add("foo");
+            Assert.Equal(border.Background, Brushes.Green);
+        }
+
+        private static ThemedControl CreateTarget()
+        {
+            return new ThemedControl();
+        }
+
+        private static TestRoot CreateRoot(IControl child)
+        {
+            var result = new TestRoot()
+            {
+                Styles =
+            {
+                new Style(x => x.OfType<ThemedControl>())
+                {
+                    Setters =
+                    {
+                        new Setter(TemplatedControl.ThemeProperty, CreateTheme())
+                    }
+                }
+            }
+            };
+
+            result.Child = child;
+            result.LayoutManager.ExecuteInitialLayoutPass();
+            return result;
+        }
+    }
+
+    private static ControlTheme CreateTheme()
+    {
+        var template = new FuncControlTemplate<ThemedControl>((o, n) =>
+            new Border { Name = "PART_Border" });
+
+        return new ControlTheme
+        {
+            TargetType = typeof(ThemedControl),
+            Setters =
+        {
+            new Setter(ThemedControl.TemplateProperty, template),
+        },
+            Children =
+        {
+            new Style(x => x.Nesting().Template().OfType<Border>())
+            {
+                Setters =
+                {
+                    new Setter(Border.BackgroundProperty, Brushes.Red),
+                }
+            },
+            new Style(x => x.Nesting().Class("foo").Template().OfType<Border>())
+            {
+                Setters =
+                {
+                    new Setter(Border.BackgroundProperty, Brushes.Green),
+                }
+            },
+        }
+        };
+    }
+
+    private class ThemedControl : TemplatedControl
+    {
+        public IVisual? VisualChild => VisualChildren?.SingleOrDefault();
+    }
+}
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/TemplatedControlTests_Theming.cs b/tests/Avalonia.Controls.UnitTests/Primitives/TemplatedControlTests_Theming.cs
deleted file mode 100644
index 74d75ff056..0000000000
--- a/tests/Avalonia.Controls.UnitTests/Primitives/TemplatedControlTests_Theming.cs
+++ /dev/null
@@ -1,171 +0,0 @@
-using System.Linq;
-using Avalonia.Controls.Primitives;
-using Avalonia.Controls.Templates;
-using Avalonia.Media;
-using Avalonia.Styling;
-using Avalonia.UnitTests;
-using Avalonia.VisualTree;
-using Xunit;
-
-#nullable enable
-
-namespace Avalonia.Controls.UnitTests.Primitives
-{
-    public class TemplatedControlTests_Theming
-    {
-        public class InlineTheme
-        {
-            [Fact]
-            public void Theme_Is_Applied_When_Attached_To_Logical_Tree()
-            {
-                using var app = UnitTestApplication.Start(TestServices.RealStyler);
-                var target = CreateTarget();
-
-                Assert.Null(target.Template);
-
-                var root = CreateRoot(target);
-                Assert.NotNull(target.Template);
-
-                var border = Assert.IsType<Border>(target.VisualChild);
-                Assert.Equal(border.Background, Brushes.Red);
-
-                target.Classes.Add("foo");
-                Assert.Equal(border.Background, Brushes.Green);
-            }
-
-            [Fact]
-            public void Theme_Is_Detached_When_Theme_Property_Cleared()
-            {
-                using var app = UnitTestApplication.Start(TestServices.RealStyler);
-                var target = CreateTarget();
-                var root = CreateRoot(target);
-
-                Assert.NotNull(target.Template);
-
-                target.Theme = null;
-                Assert.Null(target.Template);
-            }
-
-            [Fact]
-            public void Theme_Is_Applied_On_Layout_After_Theme_Property_Changes()
-            {
-                using var app = UnitTestApplication.Start(TestServices.RealStyler);
-                var target = new ThemedControl();
-                var root = CreateRoot(target);
-
-                Assert.Null(target.Template);
-
-                target.Theme = CreateTheme();
-                Assert.Null(target.Template);
-
-                root.LayoutManager.ExecuteLayoutPass();
-
-                var border = Assert.IsType<Border>(target.VisualChild);
-                Assert.NotNull(target.Template);
-                Assert.Equal(border.Background, Brushes.Red);
-            }
-
-            private static ThemedControl CreateTarget()
-            {
-                return new ThemedControl
-                {
-                    Theme = CreateTheme(),
-                };
-            }
-
-            private static TestRoot CreateRoot(IControl child)
-            {
-                var result = new TestRoot(child);
-                result.LayoutManager.ExecuteInitialLayoutPass();
-                return result;
-            }
-        }
-
-        public class ThemeFromStyle
-        {
-            [Fact]
-            public void Theme_Is_Applied_When_Attached_To_Logical_Tree()
-            {
-                using var app = UnitTestApplication.Start(TestServices.RealStyler);
-                var target = CreateTarget();
-
-                Assert.Null(target.Theme);
-                Assert.Null(target.Template);
-
-                var root = CreateRoot(target);
-
-                Assert.NotNull(target.Theme);
-                Assert.NotNull(target.Template);
-                
-                var border = Assert.IsType<Border>(target.VisualChild);
-                Assert.Equal(border.Background, Brushes.Red);
-
-                target.Classes.Add("foo");
-                Assert.Equal(border.Background, Brushes.Green);
-            }
-
-            private static ThemedControl CreateTarget()
-            {
-                return new ThemedControl();
-            }
-
-            private static TestRoot CreateRoot(IControl child)
-            {
-                var result = new TestRoot()
-                {
-                    Styles =
-                    {
-                        new Style(x => x.OfType<ThemedControl>())
-                        {
-                            Setters =
-                            {
-                                new Setter(TemplatedControl.ThemeProperty, CreateTheme())
-                            }
-                        }
-                    }
-                };
-
-                result.Child = child;
-                result.LayoutManager.ExecuteInitialLayoutPass();
-                return result;
-            }
-        }
-
-        private static ControlTheme CreateTheme()
-        {
-            var template = new FuncControlTemplate<ThemedControl>((o, n) =>
-                new Border { Name = "PART_Border" });
-
-            return new ControlTheme
-            {
-                TargetType = typeof(ThemedControl),
-                Setters =
-                {
-                    new Setter(ThemedControl.TemplateProperty, template),
-                },
-                Children =
-                {
-                    new Style(x => x.Nesting().Template().OfType<Border>())
-                    {
-                        Setters =
-                        {
-                            new Setter(Border.BackgroundProperty, Brushes.Red),
-                        }
-                    },
-                    new Style(x => x.Nesting().Class("foo").Template().OfType<Border>())
-                    {
-                        Setters =
-                        {
-                            new Setter(Border.BackgroundProperty, Brushes.Green),
-                        }
-                    },
-                }
-            };
-        }
-
-        private class ThemedControl : TemplatedControl
-        {
-            public IVisual? VisualChild => VisualChildren?.SingleOrDefault();
-        }
-    }
-}

From 4bdcb8eeeaab2f790245ddb70a5cfca3df7886f8 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 2 Jun 2022 10:34:34 +0200
Subject: [PATCH 017/240] Invalidate template control styles when Theme
 changes.

---
 .../Primitives/TemplatedControl.cs            | 11 +++
 .../Styling/StyledElementTests_Theming.cs     | 75 ++++++++++++++-----
 2 files changed, 66 insertions(+), 20 deletions(-)

diff --git a/src/Avalonia.Controls/Primitives/TemplatedControl.cs b/src/Avalonia.Controls/Primitives/TemplatedControl.cs
index db029d38c0..a07dd9ae27 100644
--- a/src/Avalonia.Controls/Primitives/TemplatedControl.cs
+++ b/src/Avalonia.Controls/Primitives/TemplatedControl.cs
@@ -365,6 +365,17 @@ namespace Avalonia.Controls.Primitives
         {
         }
 
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == ThemeProperty)
+            {
+                foreach (var child in this.GetTemplateChildren())
+                    child.InvalidateStyles();
+            }
+        }
+
         /// <summary>
         /// Called when the control's template is applied.
         /// </summary>
diff --git a/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests_Theming.cs b/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests_Theming.cs
index 539f9e6576..0c0808987a 100644
--- a/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests_Theming.cs
+++ b/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests_Theming.cs
@@ -8,6 +8,8 @@ using Avalonia.UnitTests;
 using Avalonia.VisualTree;
 using Xunit;
 
+#nullable enable
+
 namespace Avalonia.Base.UnitTests.Styling;
 
 public class StyledElementTests_Theming
@@ -45,6 +47,40 @@ public class StyledElementTests_Theming
             Assert.Null(target.Template);
         }
 
+        [Fact]
+        public void Theme_Is_Detached_From_Template_Controls_When_Theme_Property_Cleared()
+        {
+            using var app = UnitTestApplication.Start(TestServices.RealStyler);
+
+            var theme = new ControlTheme
+            {
+                TargetType = typeof(ThemedControl),
+                Children =
+                {
+                    new Style(x => x.Nesting().Template().OfType<Canvas>())
+                    {
+                        Setters =
+                        {
+                            new Setter(Canvas.BackgroundProperty, Brushes.Red),
+                        }
+                    },
+                }
+            };
+
+            var target = CreateTarget(theme);
+            target.Template = new FuncControlTemplate<ThemedControl>((o, n) => new Canvas());
+
+            var root = CreateRoot(target);
+
+            var canvas = Assert.IsType<Canvas>(target.VisualChild);
+            Assert.Equal(canvas.Background, Brushes.Red);
+
+            target.Theme = null;
+
+            Assert.IsType<Canvas>(target.VisualChild);
+            Assert.Null(canvas.Background);
+        }
+
         [Fact]
         public void Theme_Is_Applied_On_Layout_After_Theme_Property_Changes()
         {
@@ -64,11 +100,11 @@ public class StyledElementTests_Theming
             Assert.Equal(border.Background, Brushes.Red);
         }
 
-        private static ThemedControl CreateTarget()
+        private static ThemedControl CreateTarget(ControlTheme? theme = null)
         {
             return new ThemedControl
             {
-                Theme = CreateTheme(),
+                Theme = theme ?? CreateTheme(),
             };
         }
 
@@ -132,33 +168,32 @@ public class StyledElementTests_Theming
 
     private static ControlTheme CreateTheme()
     {
-        var template = new FuncControlTemplate<ThemedControl>((o, n) =>
-            new Border { Name = "PART_Border" });
+        var template = new FuncControlTemplate<ThemedControl>((o, n) => new Border());
 
         return new ControlTheme
         {
             TargetType = typeof(ThemedControl),
             Setters =
-        {
-            new Setter(ThemedControl.TemplateProperty, template),
-        },
-            Children =
-        {
-            new Style(x => x.Nesting().Template().OfType<Border>())
             {
-                Setters =
-                {
-                    new Setter(Border.BackgroundProperty, Brushes.Red),
-                }
+                new Setter(ThemedControl.TemplateProperty, template),
             },
-            new Style(x => x.Nesting().Class("foo").Template().OfType<Border>())
+            Children =
             {
-                Setters =
+                new Style(x => x.Nesting().Template().OfType<Border>())
                 {
-                    new Setter(Border.BackgroundProperty, Brushes.Green),
-                }
-            },
-        }
+                    Setters =
+                    {
+                        new Setter(Border.BackgroundProperty, Brushes.Red),
+                    }
+                },
+                new Style(x => x.Nesting().Class("foo").Template().OfType<Border>())
+                {
+                    Setters =
+                    {
+                        new Setter(Border.BackgroundProperty, Brushes.Green),
+                    }
+                },
+            }
         };
     }
 

From 49613c7bceb5244444df97862b59285915a8e4ee Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 3 Jun 2022 12:04:37 +0200
Subject: [PATCH 018/240] Add accent button to control catalog.

---
 samples/ControlCatalog/Pages/ButtonsPage.xaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/samples/ControlCatalog/Pages/ButtonsPage.xaml b/samples/ControlCatalog/Pages/ButtonsPage.xaml
index 059b4d9788..8a474a203d 100644
--- a/samples/ControlCatalog/Pages/ButtonsPage.xaml
+++ b/samples/ControlCatalog/Pages/ButtonsPage.xaml
@@ -90,6 +90,7 @@
               </Style>
             </Button.Styles>
           </Button>
+          <Button Classes="accent">Accent</Button>
         </StackPanel>
 
         <StackPanel Orientation="Vertical"

From d215a1edc700289cafc5c5524f0b5c1217c85492 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 3 Jun 2022 14:32:19 +0200
Subject: [PATCH 019/240] Fix nested :not selector.

---
 src/Avalonia.Base/Styling/NotSelector.cs      |  2 +-
 .../Styling/SelectorTests_Nesting.cs          | 24 +++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Base/Styling/NotSelector.cs b/src/Avalonia.Base/Styling/NotSelector.cs
index cdc3254d38..76a0690e96 100644
--- a/src/Avalonia.Base/Styling/NotSelector.cs
+++ b/src/Avalonia.Base/Styling/NotSelector.cs
@@ -67,6 +67,6 @@ namespace Avalonia.Styling
         }
 
         protected override Selector? MovePrevious() => _previous;
-        internal override bool HasValidNestingSelector() => _argument.HasValidNestingSelector();
+        internal override bool HasValidNestingSelector() => _previous?.HasValidNestingSelector() ?? false;
     }
 }
diff --git a/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Nesting.cs b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Nesting.cs
index d49fcf03a2..1520dc329d 100644
--- a/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Nesting.cs
+++ b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Nesting.cs
@@ -257,6 +257,30 @@ namespace Avalonia.Base.UnitTests.Styling
             parent.Children.Add(child);
         }
 
+
+        [Fact]
+        public void Nesting_Not_Class_Matches()
+        {
+            var control = new Control1 { Classes = { "foo" } };
+            Style nested;
+            var parent = new Style(x => x.OfType<Control1>())
+            {
+                Children =
+                {
+                    (nested = new Style(x => x.Nesting().Not(y => y.Class("foo")))),
+                }
+            };
+
+            var match = nested.Selector.Match(control, parent);
+            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
+
+            var sink = new ActivatorSink(match.Activator);
+
+            Assert.False(sink.Active);
+            control.Classes.Clear();
+            Assert.True(sink.Active);
+        }
+
         public class Control1 : Control
         {
         }

From 05fdc0446416a285c9067b56d858c018e4f7104d Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 3 Jun 2022 23:43:55 +0200
Subject: [PATCH 020/240] Add ControlTheme.BasedOn.

---
 src/Avalonia.Base/Styling/ControlTheme.cs     | 26 ++++++--
 src/Avalonia.Base/Styling/NestingSelector.cs  | 12 +++-
 src/Avalonia.Base/Styling/Style.cs            | 35 ++++++++---
 src/Avalonia.Base/Styling/StyleBase.cs        | 61 ++++++-------------
 .../Styling/StyledElementTests_Theming.cs     | 59 ++++++++++++++++--
 5 files changed, 129 insertions(+), 64 deletions(-)

diff --git a/src/Avalonia.Base/Styling/ControlTheme.cs b/src/Avalonia.Base/Styling/ControlTheme.cs
index 9dcbd7d2c4..aff6fad990 100644
--- a/src/Avalonia.Base/Styling/ControlTheme.cs
+++ b/src/Avalonia.Base/Styling/ControlTheme.cs
@@ -23,16 +23,32 @@ namespace Avalonia.Styling
         /// </summary>
         public Type? TargetType { get; set; }
 
-        internal override bool HasSelector => TargetType is not null;
+        /// <summary>
+        /// Gets or sets a control theme that is the basis of the current theme.
+        /// </summary>
+        public ControlTheme? BasedOn { get; set; }
 
-        internal override SelectorMatch Match(IStyleable control, object? host, bool subscribe)
+        public override SelectorMatchResult TryAttach(IStyleable target, object? host)
         {
+            _ = target ?? throw new ArgumentNullException(nameof(target));
+
             if (TargetType is null)
                 throw new InvalidOperationException("ControlTheme has no TargetType.");
 
-            return control.StyleKey == TargetType ?
-                SelectorMatch.AlwaysThisType :
-                SelectorMatch.NeverThisType;
+            var result = BasedOn?.TryAttach(target, host) ?? SelectorMatchResult.NeverThisType;
+
+            if (HasSettersOrAnimations && target.StyleKey == TargetType)
+            {
+                Attach(target, null);
+                result = SelectorMatchResult.AlwaysThisType;
+            }
+
+            var childResult = TryAttachChildren(target, host);
+
+            if (childResult > result)
+                result = childResult;
+
+            return result;
         }
 
         internal override void SetParent(StyleBase? parent)
diff --git a/src/Avalonia.Base/Styling/NestingSelector.cs b/src/Avalonia.Base/Styling/NestingSelector.cs
index 6d31f7cb18..c8945a713d 100644
--- a/src/Avalonia.Base/Styling/NestingSelector.cs
+++ b/src/Avalonia.Base/Styling/NestingSelector.cs
@@ -15,9 +15,17 @@ namespace Avalonia.Styling
 
         protected override SelectorMatch Evaluate(IStyleable control, IStyle? parent, bool subscribe)
         {
-            if (parent is StyleBase s && s.HasSelector)
+            if (parent is Style s && s.Selector is not null)
             {
-                return s.Match(control, null, subscribe);
+                return s.Selector.Match(control, s.Parent, subscribe);
+            }
+            else if (parent is ControlTheme theme)
+            {
+                if (theme.TargetType is null)
+                    throw new InvalidOperationException("ControlTheme has no TargetType.");
+                return control.StyleKey == theme.TargetType ?
+                    SelectorMatch.AlwaysThisType :
+                    SelectorMatch.NeverThisType;
             }
 
             throw new InvalidOperationException(
diff --git a/src/Avalonia.Base/Styling/Style.cs b/src/Avalonia.Base/Styling/Style.cs
index ca20ff2b4b..7a6b746488 100644
--- a/src/Avalonia.Base/Styling/Style.cs
+++ b/src/Avalonia.Base/Styling/Style.cs
@@ -28,7 +28,32 @@ namespace Avalonia.Styling
         /// </summary>
         public Selector? Selector { get; set; }
 
-        internal override bool HasSelector => Selector is not null;
+        public override SelectorMatchResult TryAttach(IStyleable target, object? host)
+        {
+            _ = target ?? throw new ArgumentNullException(nameof(target));
+
+            var result = SelectorMatchResult.NeverThisType;
+
+            if (HasSettersOrAnimations)
+            {
+                var match = Selector?.Match(target, Parent, true) ??
+                    (target == host ?
+                        SelectorMatch.AlwaysThisInstance :
+                        SelectorMatch.NeverThisInstance);
+
+                if (match.IsMatch)
+                    Attach(target, match.Activator);
+
+                result = match.Result;
+            }
+
+            var childResult = TryAttachChildren(target, host);
+
+            if (childResult > result)
+                result = childResult;
+
+            return result;
+        }
 
         /// <summary>
         /// Returns a string representation of the style.
@@ -46,14 +71,6 @@ namespace Avalonia.Styling
             }
         }
 
-        internal override SelectorMatch Match(IStyleable control, object? host, bool subscribe)
-        {
-            return Selector?.Match(control, Parent, subscribe) ??
-                (control == host ?
-                    SelectorMatch.AlwaysThisInstance :
-                    SelectorMatch.NeverThisInstance);
-        }
-
         internal override void SetParent(StyleBase? parent)
         {
             if (parent is Style parentStyle && parentStyle.Selector is not null)
diff --git a/src/Avalonia.Base/Styling/StyleBase.cs b/src/Avalonia.Base/Styling/StyleBase.cs
index b6bfec62bd..306a4cf010 100644
--- a/src/Avalonia.Base/Styling/StyleBase.cs
+++ b/src/Avalonia.Base/Styling/StyleBase.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using Avalonia.Animation;
 using Avalonia.Controls;
 using Avalonia.Metadata;
+using Avalonia.Styling.Activators;
 
 namespace Avalonia.Styling
 {
@@ -64,43 +65,14 @@ namespace Avalonia.Styling
         bool IResourceNode.HasResources => _resources?.Count > 0;
         IReadOnlyList<IStyle> IStyle.Children => (IReadOnlyList<IStyle>?)_children ?? Array.Empty<IStyle>();
 
-        internal abstract bool HasSelector { get; }
+        internal bool HasSettersOrAnimations => _setters?.Count > 0 || _animations?.Count > 0;
 
         public void Add(ISetter setter) => Setters.Add(setter);
         public void Add(IStyle style) => Children.Add(style);
 
         public event EventHandler? OwnerChanged;
 
-        public SelectorMatchResult TryAttach(IStyleable target, object? host)
-        {
-            target = target ?? throw new ArgumentNullException(nameof(target));
-
-            var result = SelectorMatchResult.NeverThisType;
-
-            if (_setters?.Count > 0 || _animations?.Count > 0)
-            {
-                var match = Match(target, host, subscribe: true);
-
-                if (match.IsMatch)
-                {
-                    var instance = new StyleInstance(this, target, _setters, _animations, match.Activator);
-                    target.StyleApplied(instance);
-                    instance.Start();
-                }
-
-                result = match.Result;
-            }
-
-            if (_children is not null)
-            {
-                _childCache ??= new StyleCache();
-                var childResult = _childCache.TryAttach(_children, target, host);
-                if (childResult > result)
-                    result = childResult;
-            }
-
-            return result;
-        }
+        public abstract SelectorMatchResult TryAttach(IStyleable target, object? host);
 
         public bool TryGetResource(object key, out object? result)
         {
@@ -108,19 +80,20 @@ namespace Avalonia.Styling
             return _resources?.TryGetResource(key, out result) ?? false;
         }
 
-        /// <summary>
-        /// Evaluates the style's selector against the specified target element.
-        /// </summary>
-        /// <param name="control">The control.</param>
-        /// <param name="host">The element that hosts the style.</param>
-        /// <param name="subscribe">
-        /// Whether the match should subscribe to changes in order to track the match over time,
-        /// or simply return an immediate result.
-        /// </param>
-        /// <returns>
-        /// A <see cref="SelectorMatchResult"/> describing how the style matches the control.
-        /// </returns>
-        internal abstract SelectorMatch Match(IStyleable control, object? host, bool subscribe);
+        internal void Attach(IStyleable target, IStyleActivator? activator)
+        {
+            var instance = new StyleInstance(this, target, _setters, _animations, activator);
+            target.StyleApplied(instance);
+            instance.Start();
+        }
+
+        internal SelectorMatchResult TryAttachChildren(IStyleable target, object? host)
+        {
+            if (_children is null || _children.Count == 0)
+                return SelectorMatchResult.NeverThisType;
+            _childCache ??= new StyleCache();
+            return _childCache.TryAttach(_children, target, host);
+        }
 
         internal virtual void SetParent(StyleBase? parent) => Parent = parent;
 
diff --git a/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests_Theming.cs b/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests_Theming.cs
index 0c0808987a..737cf1e048 100644
--- a/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests_Theming.cs
+++ b/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests_Theming.cs
@@ -28,10 +28,10 @@ public class StyledElementTests_Theming
             Assert.NotNull(target.Template);
 
             var border = Assert.IsType<Border>(target.VisualChild);
-            Assert.Equal(border.Background, Brushes.Red);
+            Assert.Equal(Brushes.Red, border.Background);
 
             target.Classes.Add("foo");
-            Assert.Equal(border.Background, Brushes.Green);
+            Assert.Equal(Brushes.Green, border.Background);
         }
 
         [Fact]
@@ -73,7 +73,7 @@ public class StyledElementTests_Theming
             var root = CreateRoot(target);
 
             var canvas = Assert.IsType<Canvas>(target.VisualChild);
-            Assert.Equal(canvas.Background, Brushes.Red);
+            Assert.Equal(Brushes.Red, canvas.Background);
 
             target.Theme = null;
 
@@ -97,7 +97,28 @@ public class StyledElementTests_Theming
 
             var border = Assert.IsType<Border>(target.VisualChild);
             Assert.NotNull(target.Template);
-            Assert.Equal(border.Background, Brushes.Red);
+            Assert.Equal(Brushes.Red, border.Background);
+        }
+
+        [Fact]
+        public void BasedOn_Theme_Is_Applied_When_Attached_To_Logical_Tree()
+        {
+            using var app = UnitTestApplication.Start(TestServices.RealStyler);
+            var target = CreateTarget(CreateDerivedTheme());
+
+            Assert.Null(target.Template);
+
+            var root = CreateRoot(target);
+            Assert.NotNull(target.Template);
+            Assert.Equal(Brushes.Blue, target.BorderBrush);
+
+            var border = Assert.IsType<Border>(target.VisualChild);
+            Assert.Equal(Brushes.Red, border.Background);
+            Assert.Equal(Brushes.Yellow, border.BorderBrush);
+
+            target.Classes.Add("foo");
+            Assert.Equal(Brushes.Green, border.Background);
+            Assert.Equal(Brushes.Cyan, border.BorderBrush);
         }
 
         private static ThemedControl CreateTarget(ControlTheme? theme = null)
@@ -197,6 +218,36 @@ public class StyledElementTests_Theming
         };
     }
 
+    private static ControlTheme CreateDerivedTheme()
+    {
+        return new ControlTheme
+        {
+            TargetType = typeof(ThemedControl),
+            BasedOn = CreateTheme(),
+            Setters =
+            {
+                new Setter(Border.BorderBrushProperty, Brushes.Blue),
+            },
+            Children =
+            {
+                new Style(x => x.Nesting().Template().OfType<Border>())
+                {
+                    Setters =
+                    {
+                        new Setter(Border.BorderBrushProperty, Brushes.Yellow),
+                    }
+                },
+                new Style(x => x.Nesting().Class("foo").Template().OfType<Border>())
+                {
+                    Setters =
+                    {
+                        new Setter(Border.BorderBrushProperty, Brushes.Cyan),
+                    }
+                },
+            }
+        };
+    }
+
     private class ThemedControl : TemplatedControl
     {
         public IVisual? VisualChild => VisualChildren?.SingleOrDefault();

From 1d1ef5ca9fdb42d2fbf029f122530dcca9b51a59 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 4 Jun 2022 12:45:19 +0200
Subject: [PATCH 021/240] Display control themes in devtools.

---
 src/Avalonia.Base/Styling/ControlTheme.cs             |  8 ++++++++
 .../Diagnostics/ViewModels/ControlDetailsViewModel.cs | 11 +++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Base/Styling/ControlTheme.cs b/src/Avalonia.Base/Styling/ControlTheme.cs
index aff6fad990..399eb9ae59 100644
--- a/src/Avalonia.Base/Styling/ControlTheme.cs
+++ b/src/Avalonia.Base/Styling/ControlTheme.cs
@@ -51,6 +51,14 @@ namespace Avalonia.Styling
             return result;
         }
 
+        public override string ToString()
+        {
+            if (TargetType is not null)
+                return "ControlTheme: " + TargetType.Name;
+            else
+                return "ControlTheme";
+        }
+
         internal override void SetParent(StyleBase? parent)
         {
             throw new InvalidOperationException("ControlThemes cannot be added as a nested style.");
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs
index e383c160e3..795826e4f6 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs
@@ -67,8 +67,15 @@ namespace Avalonia.Diagnostics.ViewModels
 
                     var setters = new List<SetterViewModel>();
 
-                    if (styleSource is Style style)
+                    if (styleSource is StyleBase style)
                     {
+                        var selector = style switch
+                        {
+                            Style s => s.Selector?.ToString(),
+                            ControlTheme t => t.TargetType?.Name.ToString(),
+                            _ => null,
+                        };
+
                         foreach (var setter in style.Setters)
                         {
                             if (setter is Setter regularSetter
@@ -105,7 +112,7 @@ namespace Avalonia.Diagnostics.ViewModels
                             }
                         }
 
-                        AppliedStyles.Add(new StyleViewModel(appliedStyle, style.Selector?.ToString() ?? "No selector", setters));
+                        AppliedStyles.Add(new StyleViewModel(appliedStyle, selector ?? "No selector", setters));
                     }
                 }
 

From 95f70143ca319e5e6f49601d1e2de60bdbb39759 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 4 Jun 2022 14:53:31 +0200
Subject: [PATCH 022/240] Can apply control theme to derived types.

---
 src/Avalonia.Base/Styling/ControlTheme.cs     |  2 +-
 src/Avalonia.Base/Styling/NestingSelector.cs  |  2 +-
 .../Styling/StyledElementTests_Theming.cs     | 25 +++++++++++++++++++
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Base/Styling/ControlTheme.cs b/src/Avalonia.Base/Styling/ControlTheme.cs
index 399eb9ae59..644e8b32d4 100644
--- a/src/Avalonia.Base/Styling/ControlTheme.cs
+++ b/src/Avalonia.Base/Styling/ControlTheme.cs
@@ -37,7 +37,7 @@ namespace Avalonia.Styling
 
             var result = BasedOn?.TryAttach(target, host) ?? SelectorMatchResult.NeverThisType;
 
-            if (HasSettersOrAnimations && target.StyleKey == TargetType)
+            if (HasSettersOrAnimations && TargetType.IsAssignableFrom(target.StyleKey))
             {
                 Attach(target, null);
                 result = SelectorMatchResult.AlwaysThisType;
diff --git a/src/Avalonia.Base/Styling/NestingSelector.cs b/src/Avalonia.Base/Styling/NestingSelector.cs
index c8945a713d..4393d3239f 100644
--- a/src/Avalonia.Base/Styling/NestingSelector.cs
+++ b/src/Avalonia.Base/Styling/NestingSelector.cs
@@ -23,7 +23,7 @@ namespace Avalonia.Styling
             {
                 if (theme.TargetType is null)
                     throw new InvalidOperationException("ControlTheme has no TargetType.");
-                return control.StyleKey == theme.TargetType ?
+                return theme.TargetType.IsAssignableFrom(control.StyleKey) ?
                     SelectorMatch.AlwaysThisType :
                     SelectorMatch.NeverThisType;
             }
diff --git a/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests_Theming.cs b/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests_Theming.cs
index 737cf1e048..ab6c239393 100644
--- a/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests_Theming.cs
+++ b/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests_Theming.cs
@@ -34,6 +34,27 @@ public class StyledElementTests_Theming
             Assert.Equal(Brushes.Green, border.Background);
         }
 
+        [Fact]
+        public void Theme_Is_Applied_To_Derived_Class_When_Attached_To_Logical_Tree()
+        {
+            using var app = UnitTestApplication.Start(TestServices.RealStyler);
+            var target = new DerivedThemedControl
+            {
+                Theme = CreateTheme(),
+            };
+
+            Assert.Null(target.Template);
+
+            var root = CreateRoot(target);
+            Assert.NotNull(target.Template);
+
+            var border = Assert.IsType<Border>(target.VisualChild);
+            Assert.Equal(Brushes.Red, border.Background);
+
+            target.Classes.Add("foo");
+            Assert.Equal(Brushes.Green, border.Background);
+        }
+
         [Fact]
         public void Theme_Is_Detached_When_Theme_Property_Cleared()
         {
@@ -252,4 +273,8 @@ public class StyledElementTests_Theming
     {
         public IVisual? VisualChild => VisualChildren?.SingleOrDefault();
     }
+
+    private class DerivedThemedControl : ThemedControl
+    {
+    }
 }

From d21e634ab308c1b63d1e2f2105de29c8af236b2a Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Wed, 8 Jun 2022 12:00:14 +0200
Subject: [PATCH 023/240] Added support for implicit themes.

If no `Theme` property is provided, try to look up a resource keyed with the control's `StyleKey`.
---
 src/Avalonia.Base/StyledElement.cs            | 28 ++++++++++++
 src/Avalonia.Base/Styling/IStyleable.cs       |  4 +-
 src/Avalonia.Base/Styling/Styler.cs           |  4 +-
 .../Styling/StyledElementTests_Theming.cs     | 43 +++++++++++++++++++
 .../AvaloniaPropertyConverterTest.cs          |  4 +-
 .../DynamicResourceExtensionTests.cs          |  6 ++-
 6 files changed, 81 insertions(+), 8 deletions(-)

diff --git a/src/Avalonia.Base/StyledElement.cs b/src/Avalonia.Base/StyledElement.cs
index 75c4b94174..f377eb848c 100644
--- a/src/Avalonia.Base/StyledElement.cs
+++ b/src/Avalonia.Base/StyledElement.cs
@@ -60,6 +60,7 @@ namespace Avalonia
         public static readonly StyledProperty<ControlTheme?> ThemeProperty =
             AvaloniaProperty.Register<StyledElement, ControlTheme?>(nameof(Theme));
 
+        private static readonly ControlTheme s_invalidTheme = new ControlTheme();
         private int _initCount;
         private string? _name;
         private readonly Classes _classes = new Classes();
@@ -72,6 +73,7 @@ namespace Avalonia
         private ITemplatedControl? _templatedParent;
         private bool _dataContextUpdating;
         private bool _hasPromotedTheme;
+        private ControlTheme? _implicitTheme;
 
         /// <summary>
         /// Initializes static members of the <see cref="StyledElement"/> class.
@@ -495,6 +497,31 @@ namespace Avalonia
             };
         }
 
+        ControlTheme? IStyleable.GetEffectiveTheme()
+        {
+            var theme = Theme;
+
+            // Explitly set Theme property takes precedence.
+            if (theme is not null)
+                return theme;
+
+            // If the Theme property is not set, try to find a ControlTheme resource with our StyleKey.
+            if (_implicitTheme is null)
+            {
+                var key = ((IStyleable)this).StyleKey;
+
+                if (this.TryFindResource(key, out var value) && value is ControlTheme t)
+                    _implicitTheme = t;
+                else
+                    _implicitTheme = s_invalidTheme;
+            }
+
+            if (_implicitTheme != s_invalidTheme)
+                return _implicitTheme;
+
+            return null;
+        }
+
         void IStyleable.StyleApplied(IStyleInstance instance)
         {
             instance = instance ?? throw new ArgumentNullException(nameof(instance));
@@ -736,6 +763,7 @@ namespace Avalonia
             if (_logicalRoot != null)
             {
                 _logicalRoot = null;
+                _implicitTheme = null;
                 DetachStyles();
                 OnDetachedFromLogicalTree(e);
                 DetachedFromLogicalTree?.Invoke(this, e);
diff --git a/src/Avalonia.Base/Styling/IStyleable.cs b/src/Avalonia.Base/Styling/IStyleable.cs
index 61fcbdf850..254da4d85c 100644
--- a/src/Avalonia.Base/Styling/IStyleable.cs
+++ b/src/Avalonia.Base/Styling/IStyleable.cs
@@ -27,9 +27,9 @@ namespace Avalonia.Styling
         ITemplatedControl? TemplatedParent { get; }
 
         /// <summary>
-        /// Gets the theme to be applied to the control.
+        /// Gets the effective theme for the control as used by the syling system.
         /// </summary>
-        public ControlTheme? Theme { get; }
+        ControlTheme? GetEffectiveTheme();
 
         /// <summary>
         /// Notifies the element that a style has been applied.
diff --git a/src/Avalonia.Base/Styling/Styler.cs b/src/Avalonia.Base/Styling/Styler.cs
index c9ea123bdc..6ac2e8d372 100644
--- a/src/Avalonia.Base/Styling/Styler.cs
+++ b/src/Avalonia.Base/Styling/Styler.cs
@@ -11,10 +11,10 @@ namespace Avalonia.Styling
             // If the control has a themed templated parent then first apply the styles from
             // the templated parent theme.
             if (target.TemplatedParent is IStyleable styleableParent)
-                styleableParent.Theme?.TryAttach(target, styleableParent);
+                styleableParent.GetEffectiveTheme()?.TryAttach(target, styleableParent);
 
             // Next apply the control theme.
-            target.Theme?.TryAttach(target, target);
+            target.GetEffectiveTheme()?.TryAttach(target, target);
 
             // Apply styles from the rest of the tree.
             if (target is IStyleHost styleHost)
diff --git a/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests_Theming.cs b/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests_Theming.cs
index ab6c239393..522937b669 100644
--- a/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests_Theming.cs
+++ b/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests_Theming.cs
@@ -158,6 +158,49 @@ public class StyledElementTests_Theming
         }
     }
 
+    public class ImplicitTheme
+    {
+        [Fact]
+        public void Implicit_Theme_Is_Applied_When_Attached_To_Logical_Tree()
+        {
+            using var app = UnitTestApplication.Start(TestServices.RealStyler);
+            var target = CreateTarget();
+            var root = CreateRoot(target);
+            Assert.NotNull(target.Template);
+
+            var border = Assert.IsType<Border>(target.VisualChild);
+            Assert.Equal(Brushes.Red, border.Background);
+
+            target.Classes.Add("foo");
+            Assert.Equal(Brushes.Green, border.Background);
+        }
+
+        [Fact]
+        public void Implicit_Theme_Is_Cleared_When_Removed_From_Logical_Tree()
+        {
+            using var app = UnitTestApplication.Start(TestServices.RealStyler);
+            var target = CreateTarget();
+            var root = CreateRoot(target);
+            
+            Assert.NotNull(((IStyleable)target).GetEffectiveTheme());
+
+            root.Child = null;
+
+            Assert.Null(((IStyleable)target).GetEffectiveTheme());
+        }
+
+        private static ThemedControl CreateTarget() => new ThemedControl();
+
+        private static TestRoot CreateRoot(IControl child)
+        {
+            var result = new TestRoot();
+            result.Resources.Add(typeof(ThemedControl), CreateTheme());
+            result.Child = child;
+            result.LayoutManager.ExecuteInitialLayoutPass();
+            return result;
+        }
+    }
+
     public class ThemeFromStyle
     {
         [Fact]
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Converters/AvaloniaPropertyConverterTest.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Converters/AvaloniaPropertyConverterTest.cs
index ca59fe8480..75e21a7138 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Converters/AvaloniaPropertyConverterTest.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Converters/AvaloniaPropertyConverterTest.cs
@@ -137,9 +137,9 @@ namespace Avalonia.Markup.Xaml.UnitTests.Converters
                 get { throw new NotImplementedException(); }
             }
 
-            public ControlTheme Theme
+            public ControlTheme GetEffectiveTheme()
             {
-                get { throw new NotImplementedException(); }
+                throw new NotImplementedException();
             }
 
             public void DetachStyles()
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/DynamicResourceExtensionTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/DynamicResourceExtensionTests.cs
index 592dbfc0d1..987725c314 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/DynamicResourceExtensionTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/DynamicResourceExtensionTests.cs
@@ -845,7 +845,8 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
             Assert.Equal("bar", border.Tag);
 
             var resourceProvider = (TrackingResourceProvider)window.Resources.MergedDictionaries[0];
-            Assert.Equal(new[] { "bar" }, resourceProvider.RequestedResources);
+            Assert.Contains("bar", resourceProvider.RequestedResources);
+            Assert.DoesNotContain("foo", resourceProvider.RequestedResources);
         }
 
         [Fact]
@@ -883,7 +884,8 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
             Assert.Equal("bar", border.Tag);
 
             var resourceProvider = (TrackingResourceProvider)window.Resources.MergedDictionaries[0];
-            Assert.Equal(new[] { "bar" }, resourceProvider.RequestedResources);
+            Assert.Contains("bar", resourceProvider.RequestedResources);
+            Assert.DoesNotContain("foo", resourceProvider.RequestedResources);
         }
 
         private IDisposable StyledWindow(params (string, string)[] assets)

From 8b4cf63be3ffbf29427bb16d15ff514c595d348b Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 10 Jun 2022 11:18:22 +0200
Subject: [PATCH 024/240] Additional validation for ControlTheme children.

---
 src/Avalonia.Base/Styling/ChildSelector.cs    |  2 +-
 .../Styling/DescendentSelector.cs             |  2 +-
 src/Avalonia.Base/Styling/NestingSelector.cs  |  2 +-
 src/Avalonia.Base/Styling/NotSelector.cs      |  2 +-
 src/Avalonia.Base/Styling/NthChildSelector.cs |  2 +-
 src/Avalonia.Base/Styling/OrSelector.cs       | 12 +---
 .../Styling/PropertyEqualsSelector.cs         |  2 +-
 src/Avalonia.Base/Styling/Selector.cs         | 31 ++++++++-
 src/Avalonia.Base/Styling/Style.cs            |  9 ++-
 src/Avalonia.Base/Styling/Styles.cs           |  5 ++
 src/Avalonia.Base/Styling/TemplateSelector.cs |  2 +-
 .../Styling/TypeNameAndClassSelector.cs       |  2 +-
 .../Styling/ControlThemeTests.cs              | 64 +++++++++++++++++++
 13 files changed, 117 insertions(+), 20 deletions(-)

diff --git a/src/Avalonia.Base/Styling/ChildSelector.cs b/src/Avalonia.Base/Styling/ChildSelector.cs
index 34f3a76b61..9512dc34df 100644
--- a/src/Avalonia.Base/Styling/ChildSelector.cs
+++ b/src/Avalonia.Base/Styling/ChildSelector.cs
@@ -65,6 +65,6 @@ namespace Avalonia.Styling
         }
 
         protected override Selector? MovePrevious() => null;
-        internal override bool HasValidNestingSelector() => _parent.HasValidNestingSelector();
+        protected override Selector? MovePreviousOrParent() => _parent;
     }
 }
diff --git a/src/Avalonia.Base/Styling/DescendentSelector.cs b/src/Avalonia.Base/Styling/DescendentSelector.cs
index 4ffaff6861..677a924189 100644
--- a/src/Avalonia.Base/Styling/DescendentSelector.cs
+++ b/src/Avalonia.Base/Styling/DescendentSelector.cs
@@ -70,6 +70,6 @@ namespace Avalonia.Styling
         }
 
         protected override Selector? MovePrevious() => null;
-        internal override bool HasValidNestingSelector() => _parent.HasValidNestingSelector();
+        protected override Selector? MovePreviousOrParent() => _parent;
     }
 }
diff --git a/src/Avalonia.Base/Styling/NestingSelector.cs b/src/Avalonia.Base/Styling/NestingSelector.cs
index 4393d3239f..77c5b719c6 100644
--- a/src/Avalonia.Base/Styling/NestingSelector.cs
+++ b/src/Avalonia.Base/Styling/NestingSelector.cs
@@ -33,6 +33,6 @@ namespace Avalonia.Styling
         }
 
         protected override Selector? MovePrevious() => null;
-        internal override bool HasValidNestingSelector() => true;
+        protected override Selector? MovePreviousOrParent() => null;
     }
 }
diff --git a/src/Avalonia.Base/Styling/NotSelector.cs b/src/Avalonia.Base/Styling/NotSelector.cs
index 76a0690e96..c7727bb6b8 100644
--- a/src/Avalonia.Base/Styling/NotSelector.cs
+++ b/src/Avalonia.Base/Styling/NotSelector.cs
@@ -67,6 +67,6 @@ namespace Avalonia.Styling
         }
 
         protected override Selector? MovePrevious() => _previous;
-        internal override bool HasValidNestingSelector() => _previous?.HasValidNestingSelector() ?? false;
+        protected override Selector? MovePreviousOrParent() => _previous;
     }
 }
diff --git a/src/Avalonia.Base/Styling/NthChildSelector.cs b/src/Avalonia.Base/Styling/NthChildSelector.cs
index 047bf434da..f473791664 100644
--- a/src/Avalonia.Base/Styling/NthChildSelector.cs
+++ b/src/Avalonia.Base/Styling/NthChildSelector.cs
@@ -105,7 +105,7 @@ namespace Avalonia.Styling
         }
 
         protected override Selector? MovePrevious() => _previous;
-        internal override bool HasValidNestingSelector() => _previous?.HasValidNestingSelector() ?? false;
+        protected override Selector? MovePreviousOrParent() => _previous;
 
         public override string ToString()
         {
diff --git a/src/Avalonia.Base/Styling/OrSelector.cs b/src/Avalonia.Base/Styling/OrSelector.cs
index 913c27bf0c..af9249864f 100644
--- a/src/Avalonia.Base/Styling/OrSelector.cs
+++ b/src/Avalonia.Base/Styling/OrSelector.cs
@@ -103,18 +103,12 @@ namespace Avalonia.Styling
         }
 
         protected override Selector? MovePrevious() => null;
+        protected override Selector? MovePreviousOrParent() => null;
 
-        internal override bool HasValidNestingSelector()
+        internal override void ValidateNestingSelector(bool inControlTheme)
         {
             foreach (var selector in _selectors)
-            {
-                if (!selector.HasValidNestingSelector())
-                {
-                    return false;
-                }
-            }
-
-            return true;
+                selector.ValidateNestingSelector(inControlTheme);
         }
 
         private Type? EvaluateTargetType()
diff --git a/src/Avalonia.Base/Styling/PropertyEqualsSelector.cs b/src/Avalonia.Base/Styling/PropertyEqualsSelector.cs
index 7a37daf087..48136ba2de 100644
--- a/src/Avalonia.Base/Styling/PropertyEqualsSelector.cs
+++ b/src/Avalonia.Base/Styling/PropertyEqualsSelector.cs
@@ -90,7 +90,7 @@ namespace Avalonia.Styling
         }
 
         protected override Selector? MovePrevious() => _previous;
-        internal override bool HasValidNestingSelector() => _previous?.HasValidNestingSelector() ?? false;
+        protected override Selector? MovePreviousOrParent() => _previous;
 
         internal static bool Compare(Type propertyType, object? propertyValue, object? value)
         {
diff --git a/src/Avalonia.Base/Styling/Selector.cs b/src/Avalonia.Base/Styling/Selector.cs
index 1e06f3d375..7ce17518dd 100644
--- a/src/Avalonia.Base/Styling/Selector.cs
+++ b/src/Avalonia.Base/Styling/Selector.cs
@@ -86,7 +86,36 @@ namespace Avalonia.Styling
         /// </summary>
         protected abstract Selector? MovePrevious();
 
-        internal abstract bool HasValidNestingSelector();
+        /// <summary>
+        /// Moves to the previous selector or the parent selector.
+        /// </summary>
+        protected abstract Selector? MovePreviousOrParent();
+
+        internal virtual void ValidateNestingSelector(bool inControlTheme)
+        {
+            var s = this;
+            var templateCount = 0;
+
+            do
+            {
+                if (inControlTheme)
+                {
+                    if (!s.InTemplate && s.IsCombinator)
+                        throw new InvalidOperationException(
+                            "ControlTheme style may not directly contain a child or descendent selector.");
+                    if (s is TemplateSelector && templateCount++ > 0)
+                        throw new InvalidOperationException(
+                            "ControlTemplate styles cannot contain multiple template selectors.");
+                }
+
+                var previous = s.MovePreviousOrParent();
+
+                if (previous is null && s is not NestingSelector)
+                    throw new InvalidOperationException("Child styles must have a nesting selector.");
+
+                s = previous;
+            } while (s is not null);
+        }
 
         private static SelectorMatch MatchUntilCombinator(
             IStyleable control,
diff --git a/src/Avalonia.Base/Styling/Style.cs b/src/Avalonia.Base/Styling/Style.cs
index 7a6b746488..77c4e62d29 100644
--- a/src/Avalonia.Base/Styling/Style.cs
+++ b/src/Avalonia.Base/Styling/Style.cs
@@ -77,8 +77,13 @@ namespace Avalonia.Styling
             {
                 if (Selector is null)
                     throw new InvalidOperationException("Child styles must have a selector.");
-                if (!Selector.HasValidNestingSelector())
-                    throw new InvalidOperationException("Child styles must have a nesting selector.");
+                Selector.ValidateNestingSelector(false);
+            }
+            else if (parent is ControlTheme)
+            {
+                if (Selector is null)
+                    throw new InvalidOperationException("Child styles must have a selector.");
+                Selector.ValidateNestingSelector(true);
             }
 
             base.SetParent(parent);
diff --git a/src/Avalonia.Base/Styling/Styles.cs b/src/Avalonia.Base/Styling/Styles.cs
index 4c011f1b0d..3a27275438 100644
--- a/src/Avalonia.Base/Styling/Styles.cs
+++ b/src/Avalonia.Base/Styling/Styles.cs
@@ -26,6 +26,11 @@ namespace Avalonia.Styling
         {
             _styles.ResetBehavior = ResetBehavior.Remove;
             _styles.CollectionChanged += OnCollectionChanged;
+            _styles.Validate = i =>
+            {
+                if (i is ControlTheme)
+                    throw new InvalidOperationException("ControlThemes cannot be added to a Styles collection.");
+            };
         }
 
         public Styles(IResourceHost owner)
diff --git a/src/Avalonia.Base/Styling/TemplateSelector.cs b/src/Avalonia.Base/Styling/TemplateSelector.cs
index b0a2dae8d6..278e24a203 100644
--- a/src/Avalonia.Base/Styling/TemplateSelector.cs
+++ b/src/Avalonia.Base/Styling/TemplateSelector.cs
@@ -49,6 +49,6 @@ namespace Avalonia.Styling
         }
 
         protected override Selector? MovePrevious() => null;
-        internal override bool HasValidNestingSelector() => _parent?.HasValidNestingSelector() ?? false;
+        protected override Selector? MovePreviousOrParent() => _parent;
     }
 }
diff --git a/src/Avalonia.Base/Styling/TypeNameAndClassSelector.cs b/src/Avalonia.Base/Styling/TypeNameAndClassSelector.cs
index 24d5d6bbbf..6681a7da36 100644
--- a/src/Avalonia.Base/Styling/TypeNameAndClassSelector.cs
+++ b/src/Avalonia.Base/Styling/TypeNameAndClassSelector.cs
@@ -140,7 +140,7 @@ namespace Avalonia.Styling
         }
 
         protected override Selector? MovePrevious() => _previous;
-        internal override bool HasValidNestingSelector() => _previous?.HasValidNestingSelector() ?? false;
+        protected override Selector? MovePreviousOrParent() => _previous;
 
         private string BuildSelectorString()
         {
diff --git a/tests/Avalonia.Base.UnitTests/Styling/ControlThemeTests.cs b/tests/Avalonia.Base.UnitTests/Styling/ControlThemeTests.cs
index 93a0e6c2fd..7a27a02fc4 100644
--- a/tests/Avalonia.Base.UnitTests/Styling/ControlThemeTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Styling/ControlThemeTests.cs
@@ -1,5 +1,6 @@
 using System;
 using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
 using Avalonia.Styling;
 using Xunit;
 
@@ -7,6 +8,15 @@ namespace Avalonia.Base.UnitTests.Styling
 {
     public class ControlThemeTests
     {
+        [Fact]
+        public void ControlTheme_Cannot_Be_Added_To_Styles()
+        {
+            var target = new ControlTheme(typeof(Button));
+            var styles = new Styles();
+
+            Assert.Throws<InvalidOperationException>(() => styles.Add(target));
+        }
+
         [Fact]
         public void ControlTheme_Cannot_Be_Added_To_Style_Children()
         {
@@ -24,5 +34,59 @@ namespace Avalonia.Base.UnitTests.Styling
 
             Assert.Throws<InvalidOperationException>(() => other.Children.Add(target));
         }
+
+        [Fact]
+        public void Style_Without_Selector_Cannot_Be_Added_To_Children()
+        {
+            var target = new ControlTheme(typeof(Button));
+            var child = new Style();
+
+            Assert.Throws<InvalidOperationException>(() => target.Children.Add(child));
+        }
+
+        [Fact]
+        public void Style_Without_Nesting_Selector_Cannot_Be_Added_To_Children()
+        {
+            var target = new ControlTheme(typeof(Button));
+            var child = new Style(x => x.OfType<Button>().Template().OfType<Border>());
+
+            Assert.Throws<InvalidOperationException>(() => target.Children.Add(child));
+        }
+
+        [Fact]
+        public void Style_With_NonTemplate_Child_Selector_Cannot_Be_Added_To_Children()
+        {
+            var target = new ControlTheme(typeof(Button));
+            var child = new Style(x => x.Nesting().Child().OfType<Border>());
+
+            Assert.Throws<InvalidOperationException>(() => target.Children.Add(child));
+        }
+
+        [Fact]
+        public void Style_With_NonTemplate_Descendent_Selector_Cannot_Be_Added_To_Children()
+        {
+            var target = new ControlTheme(typeof(Button));
+            var child = new Style(x => x.Nesting().Descendant().OfType<Border>());
+
+            Assert.Throws<InvalidOperationException>(() => target.Children.Add(child));
+        }
+
+        [Fact]
+        public void Style_With_NonTemplate_Child_Template_Selector_Cannot_Be_Added_To_Children()
+        {
+            var target = new ControlTheme(typeof(Button));
+            var child = new Style(x => x.Nesting().Child().Template().OfType<Border>());
+
+            Assert.Throws<InvalidOperationException>(() => target.Children.Add(child));
+        }
+
+        [Fact]
+        public void Style_With_Double_Template_Selector_Cannot_Be_Added_To_Children()
+        {
+            var target = new ControlTheme(typeof(Button));
+            var child = new Style(x => x.Nesting().Template().OfType<ToggleButton>().Template().OfType<Border>());
+
+            Assert.Throws<InvalidOperationException>(() => target.Children.Add(child));
+        }
     }
 }

From 7b7d6581253ab244b22455ff3b8fdae35dab52a9 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Wed, 22 Jun 2022 13:38:49 +0200
Subject: [PATCH 025/240] Added a new failing test.

---
 .../Styling/StyledElementTests_Theming.cs     | 64 ++++++++++++-------
 1 file changed, 41 insertions(+), 23 deletions(-)

diff --git a/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests_Theming.cs b/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests_Theming.cs
index 522937b669..c2692c30ab 100644
--- a/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests_Theming.cs
+++ b/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests_Theming.cs
@@ -82,7 +82,7 @@ public class StyledElementTests_Theming
                     {
                         Setters =
                         {
-                            new Setter(Canvas.BackgroundProperty, Brushes.Red),
+                            new Setter(Panel.BackgroundProperty, Brushes.Red),
                         }
                     },
                 }
@@ -224,6 +224,39 @@ public class StyledElementTests_Theming
             Assert.Equal(border.Background, Brushes.Green);
         }
 
+        [Fact]
+        public void Theme_Can_Be_Changed_By_Style_Class()
+        {
+            using var app = UnitTestApplication.Start(TestServices.RealStyler);
+            var target = CreateTarget();
+            var theme1 = CreateTheme();
+            var theme2 = new ControlTheme(typeof(ThemedControl));
+            var root = new TestRoot()
+            {
+                Styles =
+                {
+                    new Style(x => x.OfType<ThemedControl>())
+                    {
+                        Setters = { new Setter(StyledElement.ThemeProperty, theme1) }
+                    },
+                    new Style(x => x.OfType<ThemedControl>().Class("bar"))
+                    {
+                        Setters = { new Setter(StyledElement.ThemeProperty, theme2) }
+                    },
+                }
+            };
+
+            root.Child = target;
+            root.LayoutManager.ExecuteInitialLayoutPass();
+
+            Assert.Same(theme1, target.Theme);
+            Assert.NotNull(target.Template);
+
+            target.Classes.Add("bar");
+            Assert.Same(theme2, target.Theme);
+            Assert.Null(target.Template);
+        }
+
         private static ThemedControl CreateTarget()
         {
             return new ThemedControl();
@@ -234,15 +267,12 @@ public class StyledElementTests_Theming
             var result = new TestRoot()
             {
                 Styles =
-            {
-                new Style(x => x.OfType<ThemedControl>())
                 {
-                    Setters =
+                    new Style(x => x.OfType<ThemedControl>())
                     {
-                        new Setter(TemplatedControl.ThemeProperty, CreateTheme())
+                        Setters = { new Setter(StyledElement.ThemeProperty, CreateTheme()) }
                     }
                 }
-            }
             };
 
             result.Child = child;
@@ -260,23 +290,17 @@ public class StyledElementTests_Theming
             TargetType = typeof(ThemedControl),
             Setters =
             {
-                new Setter(ThemedControl.TemplateProperty, template),
+                new Setter(TemplatedControl.TemplateProperty, template),
             },
             Children =
             {
                 new Style(x => x.Nesting().Template().OfType<Border>())
                 {
-                    Setters =
-                    {
-                        new Setter(Border.BackgroundProperty, Brushes.Red),
-                    }
+                    Setters = { new Setter(Border.BackgroundProperty, Brushes.Red) }
                 },
                 new Style(x => x.Nesting().Class("foo").Template().OfType<Border>())
                 {
-                    Setters =
-                    {
-                        new Setter(Border.BackgroundProperty, Brushes.Green),
-                    }
+                    Setters = { new Setter(Border.BackgroundProperty, Brushes.Green) }
                 },
             }
         };
@@ -296,17 +320,11 @@ public class StyledElementTests_Theming
             {
                 new Style(x => x.Nesting().Template().OfType<Border>())
                 {
-                    Setters =
-                    {
-                        new Setter(Border.BorderBrushProperty, Brushes.Yellow),
-                    }
+                    Setters = { new Setter(Border.BorderBrushProperty, Brushes.Yellow) }
                 },
                 new Style(x => x.Nesting().Class("foo").Template().OfType<Border>())
                 {
-                    Setters =
-                    {
-                        new Setter(Border.BorderBrushProperty, Brushes.Cyan),
-                    }
+                    Setters = { new Setter(Border.BorderBrushProperty, Brushes.Cyan) }
                 },
             }
         };

From 421546609a68933dee4e427968a74733f929fe04 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Wed, 22 Jun 2022 16:13:43 +0200
Subject: [PATCH 026/240] Add test/fix for promoted themes.

A bit of an edge case here, but we should deal with it.
---
 src/Avalonia.Base/StyledElement.cs            |  4 ++
 .../Styling/StyledElementTests_Theming.cs     | 41 +++++++++++++++++++
 2 files changed, 45 insertions(+)

diff --git a/src/Avalonia.Base/StyledElement.cs b/src/Avalonia.Base/StyledElement.cs
index f377eb848c..189d73c502 100644
--- a/src/Avalonia.Base/StyledElement.cs
+++ b/src/Avalonia.Base/StyledElement.cs
@@ -652,6 +652,10 @@ namespace Avalonia
                     Theme = change.GetNewValue<ControlTheme?>();
                     _hasPromotedTheme = true;
                 }
+                else if (_hasPromotedTheme && change.Priority == BindingPriority.LocalValue)
+                {
+                    _hasPromotedTheme = false;
+                }
 
                 InvalidateStyles();
             }
diff --git a/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests_Theming.cs b/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests_Theming.cs
index c2692c30ab..9b133035f4 100644
--- a/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests_Theming.cs
+++ b/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests_Theming.cs
@@ -257,6 +257,47 @@ public class StyledElementTests_Theming
             Assert.Null(target.Template);
         }
 
+        [Fact]
+        public void Theme_Can_Be_Set_To_LocalValue_While_Updating_Due_To_Style_Class()
+        {
+            using var app = UnitTestApplication.Start(TestServices.RealStyler);
+            var target = CreateTarget();
+            var theme1 = CreateTheme();
+            var theme2 = new ControlTheme(typeof(ThemedControl));
+            var theme3 = new ControlTheme(typeof(ThemedControl));
+            var root = new TestRoot()
+            {
+                Styles =
+                {
+                    new Style(x => x.OfType<ThemedControl>())
+                    {
+                        Setters = { new Setter(StyledElement.ThemeProperty, theme1) }
+                    },
+                    new Style(x => x.OfType<ThemedControl>().Class("bar"))
+                    {
+                        Setters = { new Setter(StyledElement.ThemeProperty, theme2) }
+                    },
+                }
+            };
+
+            root.Child = target;
+            root.LayoutManager.ExecuteInitialLayoutPass();
+
+            Assert.Same(theme1, target.Theme);
+            Assert.NotNull(target.Template);
+
+            target.Classes.Add("bar");
+
+            // At this point, theme2 has been promoted to a local value internally in StyledElement;
+            // make sure that setting a new local value here doesn't cause it to be cleared when we
+            // do a layout pass because StyledElement thinks its clearing the promoted theme.
+            target.Theme = theme3;
+
+            root.LayoutManager.ExecuteLayoutPass();
+
+            Assert.Same(target.Theme, theme3);
+        }
+
         private static ThemedControl CreateTarget()
         {
             return new ThemedControl();

From 8abeb76235a259b4b03ebb9a2c008231479128bc Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Wed, 22 Jun 2022 17:13:20 +0200
Subject: [PATCH 027/240] Added support for Design.PreviewWith in resource
 dictionaries.

---
 src/Avalonia.Controls/Design.cs               | 22 +++++++++++++++----
 .../DesignWindowLoader.cs                     | 22 +++++++++++++++++++
 2 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/src/Avalonia.Controls/Design.cs b/src/Avalonia.Controls/Design.cs
index 07d2918a88..80600b2276 100644
--- a/src/Avalonia.Controls/Design.cs
+++ b/src/Avalonia.Controls/Design.cs
@@ -1,4 +1,5 @@
 
+using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using Avalonia.Styling;
 
@@ -6,6 +7,8 @@ namespace Avalonia.Controls
 {
     public static class Design
     {
+        private static Dictionary<object, Control?>? _previewWith;
+
         public static bool IsDesignMode { get; internal set; }
 
         public static readonly AttachedProperty<double> HeightProperty = AvaloniaProperty
@@ -47,19 +50,30 @@ namespace Avalonia.Controls
             return control.GetValue(DataContextProperty);
         }
         
-        public static readonly AttachedProperty<Control> PreviewWithProperty = AvaloniaProperty
-            .RegisterAttached<AvaloniaObject, Control>("PreviewWith", typeof (Design));
+        public static readonly AttachedProperty<Control?> PreviewWithProperty = AvaloniaProperty
+            .RegisterAttached<AvaloniaObject, Control?>("PreviewWith", typeof (Design));
 
-        public static void SetPreviewWith(AvaloniaObject target, Control control)
+        public static void SetPreviewWith(AvaloniaObject target, Control? control)
         {
             target.SetValue(PreviewWithProperty, control);
         }
 
-        public static Control GetPreviewWith(AvaloniaObject target)
+        public static void SetPreviewWith(ResourceDictionary target, Control? control)
+        {
+            _previewWith ??= new();
+            _previewWith[target] = control;
+        }
+
+        public static Control? GetPreviewWith(AvaloniaObject target)
         {
             return target.GetValue(PreviewWithProperty);
         }
 
+        public static Control? GetPreviewWith(ResourceDictionary target)
+        {
+            return _previewWith?[target];
+        }
+
         public static readonly AttachedProperty<IStyle> DesignStyleProperty = AvaloniaProperty
             .RegisterAttached<Control, IStyle>("DesignStyle", typeof(Design));
 
diff --git a/src/Avalonia.DesignerSupport/DesignWindowLoader.cs b/src/Avalonia.DesignerSupport/DesignWindowLoader.cs
index b009778f97..811f9c7baa 100644
--- a/src/Avalonia.DesignerSupport/DesignWindowLoader.cs
+++ b/src/Avalonia.DesignerSupport/DesignWindowLoader.cs
@@ -37,6 +37,7 @@ namespace Avalonia.DesignerSupport
                 var localAsm = assemblyPath != null ? Assembly.LoadFile(Path.GetFullPath(assemblyPath)) : null;
                 var loaded = loader.Load(stream, localAsm, null, baseUri, true);
                 var style = loaded as IStyle;
+                var resources = loaded as ResourceDictionary;
                 if (style != null)
                 {
                     var substitute = Design.GetPreviewWith((AvaloniaObject)style);
@@ -58,6 +59,27 @@ namespace Avalonia.DesignerSupport
                             }
                         };
                 }
+                else if (resources != null)
+                {
+                    var substitute = Design.GetPreviewWith(resources);
+                    if (substitute != null)
+                    {
+                        substitute.Resources.MergedDictionaries.Add(resources);
+                        control = substitute;
+                    }
+                    else
+                        control = new StackPanel
+                        {
+                            Children =
+                            {
+                                new TextBlock {Text = "ResourceDictionaries can't be previewed without Design.PreviewWith. Add"},
+                                new TextBlock {Text = "<Design.PreviewWith>"},
+                                new TextBlock {Text = "    <Border Padding=20><!-- YOUR CONTROL FOR PREVIEW HERE --></Border>"},
+                                new TextBlock {Text = "</Design.PreviewWith>"},
+                                new TextBlock {Text = "in your resource dictionary"}
+                            }
+                        };
+                }
                 else if (loaded is Application)
                     control = new TextBlock {Text = "Application can't be previewed in design view"};
                 else

From e50b416d5bf1529544830d5a291a1fb2f1b0da64 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 30 Jun 2022 12:50:52 +0200
Subject: [PATCH 028/240] Fix parent selectors with /template/ at end.

Previously the combinator state was lost when traversing nested selectors. To fix it, instead of running the parent selector in `NestingSelector.Evaluate`, return the parent selector with `MovePrevious`. This required `MovePrevious` to be aware of parent styles and because I had to change its signature, I also made it internal as it doesn't need to be a public API.
---
 src/Avalonia.Base/Styling/ChildSelector.cs    |  2 +-
 .../Styling/DescendentSelector.cs             |  2 +-
 src/Avalonia.Base/Styling/NestingSelector.cs  |  8 +-
 src/Avalonia.Base/Styling/NotSelector.cs      |  2 +-
 src/Avalonia.Base/Styling/NthChildSelector.cs |  2 +-
 src/Avalonia.Base/Styling/OrSelector.cs       |  2 +-
 .../Styling/PropertyEqualsSelector.cs         |  2 +-
 src/Avalonia.Base/Styling/Selector.cs         | 12 ++-
 src/Avalonia.Base/Styling/TemplateSelector.cs |  2 +-
 .../Styling/TypeNameAndClassSelector.cs       |  2 +-
 .../Styling/SelectorTests_Nesting.cs          | 80 +++++++++++++++++++
 11 files changed, 103 insertions(+), 13 deletions(-)

diff --git a/src/Avalonia.Base/Styling/ChildSelector.cs b/src/Avalonia.Base/Styling/ChildSelector.cs
index 9512dc34df..bc1d257ce6 100644
--- a/src/Avalonia.Base/Styling/ChildSelector.cs
+++ b/src/Avalonia.Base/Styling/ChildSelector.cs
@@ -64,7 +64,7 @@ namespace Avalonia.Styling
             }
         }
 
-        protected override Selector? MovePrevious() => null;
+        private protected override (Selector?, IStyle?) MovePrevious(IStyle? nestingParent) => (null, null);
         protected override Selector? MovePreviousOrParent() => _parent;
     }
 }
diff --git a/src/Avalonia.Base/Styling/DescendentSelector.cs b/src/Avalonia.Base/Styling/DescendentSelector.cs
index 677a924189..3a16574e04 100644
--- a/src/Avalonia.Base/Styling/DescendentSelector.cs
+++ b/src/Avalonia.Base/Styling/DescendentSelector.cs
@@ -69,7 +69,7 @@ namespace Avalonia.Styling
             }
         }
 
-        protected override Selector? MovePrevious() => null;
+        private protected override (Selector?, IStyle?) MovePrevious(IStyle? nestingParent) => (null, null);
         protected override Selector? MovePreviousOrParent() => _parent;
     }
 }
diff --git a/src/Avalonia.Base/Styling/NestingSelector.cs b/src/Avalonia.Base/Styling/NestingSelector.cs
index 77c5b719c6..dd0bac31c6 100644
--- a/src/Avalonia.Base/Styling/NestingSelector.cs
+++ b/src/Avalonia.Base/Styling/NestingSelector.cs
@@ -17,7 +17,7 @@ namespace Avalonia.Styling
         {
             if (parent is Style s && s.Selector is not null)
             {
-                return s.Selector.Match(control, s.Parent, subscribe);
+                return SelectorMatch.AlwaysThisType;
             }
             else if (parent is ControlTheme theme)
             {
@@ -32,7 +32,11 @@ namespace Avalonia.Styling
                 "Nesting selector was specified but cannot determine parent selector.");
         }
 
-        protected override Selector? MovePrevious() => null;
+        private protected override (Selector?, IStyle?) MovePrevious(IStyle? parent)
+        {
+            return parent is Style parentStyle ? (parentStyle.Selector, parentStyle.Parent) : (null, null);
+        }
+
         protected override Selector? MovePreviousOrParent() => null;
     }
 }
diff --git a/src/Avalonia.Base/Styling/NotSelector.cs b/src/Avalonia.Base/Styling/NotSelector.cs
index c7727bb6b8..ebde392a3b 100644
--- a/src/Avalonia.Base/Styling/NotSelector.cs
+++ b/src/Avalonia.Base/Styling/NotSelector.cs
@@ -66,7 +66,7 @@ namespace Avalonia.Styling
             }
         }
 
-        protected override Selector? MovePrevious() => _previous;
+        private protected override (Selector?, IStyle?) MovePrevious(IStyle? nestingParent) => (_previous, nestingParent);
         protected override Selector? MovePreviousOrParent() => _previous;
     }
 }
diff --git a/src/Avalonia.Base/Styling/NthChildSelector.cs b/src/Avalonia.Base/Styling/NthChildSelector.cs
index f473791664..e6d9cf58a9 100644
--- a/src/Avalonia.Base/Styling/NthChildSelector.cs
+++ b/src/Avalonia.Base/Styling/NthChildSelector.cs
@@ -104,7 +104,7 @@ namespace Avalonia.Styling
             return match ? SelectorMatch.AlwaysThisInstance : SelectorMatch.NeverThisInstance;
         }
 
-        protected override Selector? MovePrevious() => _previous;
+        private protected override (Selector?, IStyle?) MovePrevious(IStyle? nestingParent) => (_previous, nestingParent);
         protected override Selector? MovePreviousOrParent() => _previous;
 
         public override string ToString()
diff --git a/src/Avalonia.Base/Styling/OrSelector.cs b/src/Avalonia.Base/Styling/OrSelector.cs
index af9249864f..115e0aeb95 100644
--- a/src/Avalonia.Base/Styling/OrSelector.cs
+++ b/src/Avalonia.Base/Styling/OrSelector.cs
@@ -102,7 +102,7 @@ namespace Avalonia.Styling
             }
         }
 
-        protected override Selector? MovePrevious() => null;
+        private protected override (Selector?, IStyle?) MovePrevious(IStyle? nestingParent) => (null, null);
         protected override Selector? MovePreviousOrParent() => null;
 
         internal override void ValidateNestingSelector(bool inControlTheme)
diff --git a/src/Avalonia.Base/Styling/PropertyEqualsSelector.cs b/src/Avalonia.Base/Styling/PropertyEqualsSelector.cs
index 48136ba2de..96f8c8dfeb 100644
--- a/src/Avalonia.Base/Styling/PropertyEqualsSelector.cs
+++ b/src/Avalonia.Base/Styling/PropertyEqualsSelector.cs
@@ -89,7 +89,7 @@ namespace Avalonia.Styling
             
         }
 
-        protected override Selector? MovePrevious() => _previous;
+        private protected override (Selector?, IStyle?) MovePrevious(IStyle? nestingParent) => (_previous, nestingParent);
         protected override Selector? MovePreviousOrParent() => _previous;
 
         internal static bool Compare(Type propertyType, object? propertyValue, object? value)
diff --git a/src/Avalonia.Base/Styling/Selector.cs b/src/Avalonia.Base/Styling/Selector.cs
index 7ce17518dd..cc8598c5e3 100644
--- a/src/Avalonia.Base/Styling/Selector.cs
+++ b/src/Avalonia.Base/Styling/Selector.cs
@@ -84,7 +84,13 @@ namespace Avalonia.Styling
         /// <summary>
         /// Moves to the previous selector.
         /// </summary>
-        protected abstract Selector? MovePrevious();
+        /// <param name="nestingParent">
+        /// The parent style, if the selector is on a nested style.
+        /// </param>
+        /// <remarks>
+        /// The previous selector, and its nesting parent.
+        /// </remarks>
+        private protected abstract (Selector?, IStyle?) MovePrevious(IStyle? nestingParent);
 
         /// <summary>
         /// Moves to the previous selector or the parent selector.
@@ -142,14 +148,14 @@ namespace Avalonia.Styling
             ref AndActivatorBuilder activators,
             ref Selector? combinator)
         {
-            var previous = selector.MovePrevious();
+            var (previous, previousParent) = selector.MovePrevious(parent);
 
             // Selectors are stored from right-to-left, so we recurse into the selector in order to
             // reverse this order, because the type selector will be on the left and is our best
             // opportunity to exit early.
             if (previous != null && !previous.IsCombinator)
             {
-                var previousMatch = Match(control, previous, parent, subscribe, ref activators, ref combinator);
+                var previousMatch = Match(control, previous, previousParent, subscribe, ref activators, ref combinator);
 
                 if (previousMatch < SelectorMatchResult.Sometimes)
                 {
diff --git a/src/Avalonia.Base/Styling/TemplateSelector.cs b/src/Avalonia.Base/Styling/TemplateSelector.cs
index 278e24a203..a68b7003b8 100644
--- a/src/Avalonia.Base/Styling/TemplateSelector.cs
+++ b/src/Avalonia.Base/Styling/TemplateSelector.cs
@@ -48,7 +48,7 @@ namespace Avalonia.Styling
             return _parent.Match(templatedParent, parent, subscribe);
         }
 
-        protected override Selector? MovePrevious() => null;
+        private protected override (Selector?, IStyle?) MovePrevious(IStyle? nestingParent) => (null, null);
         protected override Selector? MovePreviousOrParent() => _parent;
     }
 }
diff --git a/src/Avalonia.Base/Styling/TypeNameAndClassSelector.cs b/src/Avalonia.Base/Styling/TypeNameAndClassSelector.cs
index 6681a7da36..3a2150b1e9 100644
--- a/src/Avalonia.Base/Styling/TypeNameAndClassSelector.cs
+++ b/src/Avalonia.Base/Styling/TypeNameAndClassSelector.cs
@@ -139,7 +139,7 @@ namespace Avalonia.Styling
             return Name == null ? SelectorMatch.AlwaysThisType : SelectorMatch.AlwaysThisInstance;
         }
 
-        protected override Selector? MovePrevious() => _previous;
+        private protected override (Selector?, IStyle?) MovePrevious(IStyle? nestingParent) => (_previous, nestingParent);
         protected override Selector? MovePreviousOrParent() => _previous;
 
         private string BuildSelectorString()
diff --git a/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Nesting.cs b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Nesting.cs
index 1520dc329d..bd7f0338e6 100644
--- a/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Nesting.cs
+++ b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Nesting.cs
@@ -1,5 +1,6 @@
 using System;
 using Avalonia.Controls;
+using Avalonia.Controls.Templates;
 using Avalonia.Styling;
 using Avalonia.Styling.Activators;
 using Xunit;
@@ -148,6 +149,85 @@ namespace Avalonia.Base.UnitTests.Styling
             control.Classes.Remove("foo");
             Assert.False(sink.Active);
         }
+        
+        [Fact]
+        public void Template_Nesting_OfType_Matches()
+        {
+            var control = new Control1 { Classes = { "foo" } };
+            var button = new Button
+            {
+                Template = new FuncControlTemplate((x, _) => control),
+            };
+
+            button.ApplyTemplate();
+
+            Style nested;
+            var parent = new Style(x => x.OfType<Button>().Template())
+            {
+                Children =
+                {
+                    (nested = new Style(x => x.Nesting().OfType<Control1>())),
+                }
+            };
+
+            // REMOOOOVEEEE
+            var foo = new Style(x => x.OfType<Button>().Template().OfType<Control1>());
+            var match2 = foo.Selector.Match(control, parent);
+            Assert.Equal(SelectorMatchResult.AlwaysThisInstance, match2.Result);
+
+            var match = nested.Selector.Match(control, parent);
+            Assert.Equal(SelectorMatchResult.AlwaysThisInstance, match.Result);
+
+
+        }
+
+        [Fact]
+        public void Template_Nesting_OfType_Class_Matches()
+        {
+            var control = new Control1 { Classes = { "foo" } };
+            var button = new Button
+            {
+                Template = new FuncControlTemplate((x, _) => control),
+            };
+
+            button.ApplyTemplate();
+
+            Style nested;
+            var parent = new Style(x => x.OfType<Button>().Template())
+            {
+                Children =
+                {
+                    (nested = new Style(x => x.Nesting().OfType<Control1>().Class("foo"))),
+                }
+            };
+
+            var match = nested.Selector.Match(control, parent);
+            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
+        }
+
+        [Fact]
+        public void Class_Template_Nesting_OfType_Matches()
+        {
+            var control = new Control1 { Classes = { "foo" } };
+            var button = new Button
+            {
+                Template = new FuncControlTemplate((x, _) => control),
+            };
+
+            button.ApplyTemplate();
+
+            Style nested;
+            var parent = new Style(x => x.OfType<Button>().Class("bar").Template())
+            {
+                Children =
+                {
+                    (nested = new Style(x => x.Nesting().OfType<Control1>())),
+                }
+            };
+
+            var match = nested.Selector.Match(control, parent);
+            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
+        }
 
         [Fact]
         public void Or_Nesting_Class_Matches()

From 5e1f28f2a9e3a4f8606bf8efb6aa393d12f62d45 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 30 Jun 2022 12:52:03 +0200
Subject: [PATCH 029/240] Make MovePreviousOrParent internal as well.

---
 src/Avalonia.Base/Styling/ChildSelector.cs            | 2 +-
 src/Avalonia.Base/Styling/DescendentSelector.cs       | 2 +-
 src/Avalonia.Base/Styling/NestingSelector.cs          | 2 +-
 src/Avalonia.Base/Styling/NotSelector.cs              | 2 +-
 src/Avalonia.Base/Styling/NthChildSelector.cs         | 2 +-
 src/Avalonia.Base/Styling/OrSelector.cs               | 2 +-
 src/Avalonia.Base/Styling/PropertyEqualsSelector.cs   | 2 +-
 src/Avalonia.Base/Styling/Selector.cs                 | 2 +-
 src/Avalonia.Base/Styling/TemplateSelector.cs         | 2 +-
 src/Avalonia.Base/Styling/TypeNameAndClassSelector.cs | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Avalonia.Base/Styling/ChildSelector.cs b/src/Avalonia.Base/Styling/ChildSelector.cs
index bc1d257ce6..b3f6794154 100644
--- a/src/Avalonia.Base/Styling/ChildSelector.cs
+++ b/src/Avalonia.Base/Styling/ChildSelector.cs
@@ -65,6 +65,6 @@ namespace Avalonia.Styling
         }
 
         private protected override (Selector?, IStyle?) MovePrevious(IStyle? nestingParent) => (null, null);
-        protected override Selector? MovePreviousOrParent() => _parent;
+        private protected override Selector? MovePreviousOrParent() => _parent;
     }
 }
diff --git a/src/Avalonia.Base/Styling/DescendentSelector.cs b/src/Avalonia.Base/Styling/DescendentSelector.cs
index 3a16574e04..7f36c27a37 100644
--- a/src/Avalonia.Base/Styling/DescendentSelector.cs
+++ b/src/Avalonia.Base/Styling/DescendentSelector.cs
@@ -70,6 +70,6 @@ namespace Avalonia.Styling
         }
 
         private protected override (Selector?, IStyle?) MovePrevious(IStyle? nestingParent) => (null, null);
-        protected override Selector? MovePreviousOrParent() => _parent;
+        private protected override Selector? MovePreviousOrParent() => _parent;
     }
 }
diff --git a/src/Avalonia.Base/Styling/NestingSelector.cs b/src/Avalonia.Base/Styling/NestingSelector.cs
index dd0bac31c6..60ad8106d9 100644
--- a/src/Avalonia.Base/Styling/NestingSelector.cs
+++ b/src/Avalonia.Base/Styling/NestingSelector.cs
@@ -37,6 +37,6 @@ namespace Avalonia.Styling
             return parent is Style parentStyle ? (parentStyle.Selector, parentStyle.Parent) : (null, null);
         }
 
-        protected override Selector? MovePreviousOrParent() => null;
+        private protected override Selector? MovePreviousOrParent() => null;
     }
 }
diff --git a/src/Avalonia.Base/Styling/NotSelector.cs b/src/Avalonia.Base/Styling/NotSelector.cs
index ebde392a3b..be5cfaca49 100644
--- a/src/Avalonia.Base/Styling/NotSelector.cs
+++ b/src/Avalonia.Base/Styling/NotSelector.cs
@@ -67,6 +67,6 @@ namespace Avalonia.Styling
         }
 
         private protected override (Selector?, IStyle?) MovePrevious(IStyle? nestingParent) => (_previous, nestingParent);
-        protected override Selector? MovePreviousOrParent() => _previous;
+        private protected override Selector? MovePreviousOrParent() => _previous;
     }
 }
diff --git a/src/Avalonia.Base/Styling/NthChildSelector.cs b/src/Avalonia.Base/Styling/NthChildSelector.cs
index e6d9cf58a9..40fb5a4434 100644
--- a/src/Avalonia.Base/Styling/NthChildSelector.cs
+++ b/src/Avalonia.Base/Styling/NthChildSelector.cs
@@ -105,7 +105,7 @@ namespace Avalonia.Styling
         }
 
         private protected override (Selector?, IStyle?) MovePrevious(IStyle? nestingParent) => (_previous, nestingParent);
-        protected override Selector? MovePreviousOrParent() => _previous;
+        private protected override Selector? MovePreviousOrParent() => _previous;
 
         public override string ToString()
         {
diff --git a/src/Avalonia.Base/Styling/OrSelector.cs b/src/Avalonia.Base/Styling/OrSelector.cs
index 115e0aeb95..2ab00d65f8 100644
--- a/src/Avalonia.Base/Styling/OrSelector.cs
+++ b/src/Avalonia.Base/Styling/OrSelector.cs
@@ -103,7 +103,7 @@ namespace Avalonia.Styling
         }
 
         private protected override (Selector?, IStyle?) MovePrevious(IStyle? nestingParent) => (null, null);
-        protected override Selector? MovePreviousOrParent() => null;
+        private protected override Selector? MovePreviousOrParent() => null;
 
         internal override void ValidateNestingSelector(bool inControlTheme)
         {
diff --git a/src/Avalonia.Base/Styling/PropertyEqualsSelector.cs b/src/Avalonia.Base/Styling/PropertyEqualsSelector.cs
index 96f8c8dfeb..62caa9bab3 100644
--- a/src/Avalonia.Base/Styling/PropertyEqualsSelector.cs
+++ b/src/Avalonia.Base/Styling/PropertyEqualsSelector.cs
@@ -90,7 +90,7 @@ namespace Avalonia.Styling
         }
 
         private protected override (Selector?, IStyle?) MovePrevious(IStyle? nestingParent) => (_previous, nestingParent);
-        protected override Selector? MovePreviousOrParent() => _previous;
+        private protected override Selector? MovePreviousOrParent() => _previous;
 
         internal static bool Compare(Type propertyType, object? propertyValue, object? value)
         {
diff --git a/src/Avalonia.Base/Styling/Selector.cs b/src/Avalonia.Base/Styling/Selector.cs
index cc8598c5e3..67109961ba 100644
--- a/src/Avalonia.Base/Styling/Selector.cs
+++ b/src/Avalonia.Base/Styling/Selector.cs
@@ -95,7 +95,7 @@ namespace Avalonia.Styling
         /// <summary>
         /// Moves to the previous selector or the parent selector.
         /// </summary>
-        protected abstract Selector? MovePreviousOrParent();
+        private protected abstract Selector? MovePreviousOrParent();
 
         internal virtual void ValidateNestingSelector(bool inControlTheme)
         {
diff --git a/src/Avalonia.Base/Styling/TemplateSelector.cs b/src/Avalonia.Base/Styling/TemplateSelector.cs
index a68b7003b8..0af263b4e5 100644
--- a/src/Avalonia.Base/Styling/TemplateSelector.cs
+++ b/src/Avalonia.Base/Styling/TemplateSelector.cs
@@ -49,6 +49,6 @@ namespace Avalonia.Styling
         }
 
         private protected override (Selector?, IStyle?) MovePrevious(IStyle? nestingParent) => (null, null);
-        protected override Selector? MovePreviousOrParent() => _parent;
+        private protected override Selector? MovePreviousOrParent() => _parent;
     }
 }
diff --git a/src/Avalonia.Base/Styling/TypeNameAndClassSelector.cs b/src/Avalonia.Base/Styling/TypeNameAndClassSelector.cs
index 3a2150b1e9..7783d3f653 100644
--- a/src/Avalonia.Base/Styling/TypeNameAndClassSelector.cs
+++ b/src/Avalonia.Base/Styling/TypeNameAndClassSelector.cs
@@ -140,7 +140,7 @@ namespace Avalonia.Styling
         }
 
         private protected override (Selector?, IStyle?) MovePrevious(IStyle? nestingParent) => (_previous, nestingParent);
-        protected override Selector? MovePreviousOrParent() => _previous;
+        private protected override Selector? MovePreviousOrParent() => _previous;
 
         private string BuildSelectorString()
         {

From 5fd854e35b73b42d7a9843b5dbcf4373112487cb Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 30 Jun 2022 14:43:56 +0200
Subject: [PATCH 030/240] Added failing test.

---
 .../Styling/StyledElementTests_Theming.cs     | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests_Theming.cs b/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests_Theming.cs
index 9b133035f4..45188de6cb 100644
--- a/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests_Theming.cs
+++ b/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests_Theming.cs
@@ -189,6 +189,36 @@ public class StyledElementTests_Theming
             Assert.Null(((IStyleable)target).GetEffectiveTheme());
         }
 
+        [Fact]
+        public void Nested_Style_Can_Override_Property_In_Inner_Templated_Control()
+        {
+            using var app = UnitTestApplication.Start(TestServices.RealStyler);
+            var target = new ThemedControl2
+            {
+                Theme = new ControlTheme(typeof(ThemedControl2))
+                {
+                    Setters =
+                    {
+                        new Setter(
+                            TemplatedControl.TemplateProperty,
+                            new FuncControlTemplate<ThemedControl2>((o, n) => new ThemedControl())),
+                    },
+                    Children =
+                    {
+                        new Style(x => x.Nesting().Template().OfType<ThemedControl>())
+                        {
+                            Setters = { new Setter(TemplatedControl.CornerRadiusProperty, new CornerRadius(7)), }
+                        },
+                    }
+                },
+            };
+
+            var root = CreateRoot(target);
+            var inner = Assert.IsType<ThemedControl>(target.VisualChild);
+
+            Assert.Equal(new CornerRadius(7), inner.CornerRadius);
+        }
+
         private static ThemedControl CreateTarget() => new ThemedControl();
 
         private static TestRoot CreateRoot(IControl child)
@@ -332,6 +362,7 @@ public class StyledElementTests_Theming
             Setters =
             {
                 new Setter(TemplatedControl.TemplateProperty, template),
+                new Setter(TemplatedControl.CornerRadiusProperty, new CornerRadius(5)),
             },
             Children =
             {
@@ -376,6 +407,11 @@ public class StyledElementTests_Theming
         public IVisual? VisualChild => VisualChildren?.SingleOrDefault();
     }
 
+    private class ThemedControl2 : TemplatedControl
+    {
+        public IVisual? VisualChild => VisualChildren?.SingleOrDefault();
+    }
+
     private class DerivedThemedControl : ThemedControl
     {
     }

From 19703360f7286bf8f5faac1cc9be63209c88b5e1 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 30 Jun 2022 14:44:34 +0200
Subject: [PATCH 031/240] Apply own control theme before templated parent's.

---
 src/Avalonia.Base/Styling/Styler.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Avalonia.Base/Styling/Styler.cs b/src/Avalonia.Base/Styling/Styler.cs
index 6ac2e8d372..ad5c1cd102 100644
--- a/src/Avalonia.Base/Styling/Styler.cs
+++ b/src/Avalonia.Base/Styling/Styler.cs
@@ -8,14 +8,14 @@ namespace Avalonia.Styling
         {
             _ = target ?? throw new ArgumentNullException(nameof(target));
 
-            // If the control has a themed templated parent then first apply the styles from
-            // the templated parent theme.
+            // Apply the control theme.
+            target.GetEffectiveTheme()?.TryAttach(target, target);
+
+            // If the control has a themed templated parent then apply the styles from the
+            // templated parent theme.
             if (target.TemplatedParent is IStyleable styleableParent)
                 styleableParent.GetEffectiveTheme()?.TryAttach(target, styleableParent);
 
-            // Next apply the control theme.
-            target.GetEffectiveTheme()?.TryAttach(target, target);
-
             // Apply styles from the rest of the tree.
             if (target is IStyleHost styleHost)
                 ApplyStyles(target, styleHost);

From 6bd0d2818c5e0c759d3a2729566ad2c0fced2689 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Wed, 29 Jun 2022 13:40:10 +0200
Subject: [PATCH 032/240] Add deferred support to ResourceDictionary.

---
 .../Controls/ResourceDictionary.cs            | 40 +++++++++++++++----
 .../Controls/Templates/ITemplateResult.cs     |  8 ++++
 .../Controls}/Templates/TemplateResult.cs     |  3 +-
 3 files changed, 43 insertions(+), 8 deletions(-)
 create mode 100644 src/Avalonia.Base/Controls/Templates/ITemplateResult.cs
 rename src/{Avalonia.Controls => Avalonia.Base/Controls}/Templates/TemplateResult.cs (80%)

diff --git a/src/Avalonia.Base/Controls/ResourceDictionary.cs b/src/Avalonia.Base/Controls/ResourceDictionary.cs
index 77863e5101..e3a8bbbcbc 100644
--- a/src/Avalonia.Base/Controls/ResourceDictionary.cs
+++ b/src/Avalonia.Base/Controls/ResourceDictionary.cs
@@ -3,6 +3,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using Avalonia.Collections;
+using Avalonia.Controls.Templates;
 
 namespace Avalonia.Controls
 {
@@ -29,7 +30,11 @@ namespace Avalonia.Controls
 
         public object? this[object key]
         {
-            get => _inner?[key];
+            get
+            {
+                TryGetValue(key, out var value);
+                return value;
+            }
             set
             {
                 Inner[key] = value;
@@ -119,6 +124,12 @@ namespace Avalonia.Controls
             Owner?.NotifyHostedResourcesChanged(ResourcesChangedEventArgs.Empty);
         }
 
+        public void AddDeferred(object key, Func<IServiceProvider?, object?> factory)
+        {
+            Inner.Add(key, new DeferredItem(factory));
+            Owner?.NotifyHostedResourcesChanged(ResourcesChangedEventArgs.Empty);
+        }
+
         public void Clear()
         {
             if (_inner?.Count > 0)
@@ -143,10 +154,8 @@ namespace Avalonia.Controls
 
         public bool TryGetResource(object key, out object? value)
         {
-            if (_inner is not null && _inner.TryGetValue(key, out value))
-            {
+            if (TryGetValue(key, out value))
                 return true;
-            }
 
             if (_mergedDictionaries != null)
             {
@@ -165,13 +174,24 @@ namespace Avalonia.Controls
 
         public bool TryGetValue(object key, out object? value)
         {
-            if (_inner is not null)
-                return _inner.TryGetValue(key, out value);
+            if (_inner is not null && _inner.TryGetValue(key, out value))
+            {
+                if (value is DeferredItem deffered)
+                {
+                    _inner[key] = value = deffered.Factory(null) switch
+                    {
+                        ITemplateResult t => t.Result,
+                        object v => v,
+                        _ => null,
+                    };
+                }
+                return true;
+            }
+
             value = null;
             return false;
         }
 
-
         void ICollection<KeyValuePair<object, object?>>.Add(KeyValuePair<object, object?> item)
         {
             Add(item.Key, item.Value);
@@ -258,5 +278,11 @@ namespace Avalonia.Controls
                 }
             }
         }
+
+        private class DeferredItem
+        {
+            public DeferredItem(Func<IServiceProvider?, object?> factory) => Factory = factory;
+            public Func<IServiceProvider?, object?> Factory { get; }
+        }
     }
 }
diff --git a/src/Avalonia.Base/Controls/Templates/ITemplateResult.cs b/src/Avalonia.Base/Controls/Templates/ITemplateResult.cs
new file mode 100644
index 0000000000..6bd4d735a7
--- /dev/null
+++ b/src/Avalonia.Base/Controls/Templates/ITemplateResult.cs
@@ -0,0 +1,8 @@
+namespace Avalonia.Controls.Templates
+{
+    public interface ITemplateResult
+    {
+        public object? Result { get; }
+        public INameScope NameScope { get; }
+    }
+}
diff --git a/src/Avalonia.Controls/Templates/TemplateResult.cs b/src/Avalonia.Base/Controls/Templates/TemplateResult.cs
similarity index 80%
rename from src/Avalonia.Controls/Templates/TemplateResult.cs
rename to src/Avalonia.Base/Controls/Templates/TemplateResult.cs
index 770aecc329..0e38c6c0ce 100644
--- a/src/Avalonia.Controls/Templates/TemplateResult.cs
+++ b/src/Avalonia.Base/Controls/Templates/TemplateResult.cs
@@ -1,9 +1,10 @@
 namespace Avalonia.Controls.Templates
 {
-    public class TemplateResult<T>
+    public class TemplateResult<T> : ITemplateResult
     {
         public T Result { get; }
         public INameScope NameScope { get; }
+        object? ITemplateResult.Result => Result;
 
         public TemplateResult(T result, INameScope nameScope)
         {

From 5c6eeed4fae39ec31824c9dedb94183aee143e5d Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Wed, 29 Jun 2022 14:01:41 +0200
Subject: [PATCH 033/240] Initial support for deferred resources in XAML
 compiler.

---
 .../Controls/ResourceDictionary.cs            | 18 +++-
 .../AvaloniaXamlIlCompiler.cs                 |  4 +
 ...aloniaXamlIlDeferredResourceTransformer.cs | 80 +++++++++++++++
 .../AvaloniaXamlIlWellKnownTypes.cs           |  9 ++
 .../Xaml/ResourceDictionaryTests.cs           | 98 +++++++++++++++++++
 5 files changed, 205 insertions(+), 4 deletions(-)
 create mode 100644 src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlDeferredResourceTransformer.cs

diff --git a/src/Avalonia.Base/Controls/ResourceDictionary.cs b/src/Avalonia.Base/Controls/ResourceDictionary.cs
index e3a8bbbcbc..d6197c50c6 100644
--- a/src/Avalonia.Base/Controls/ResourceDictionary.cs
+++ b/src/Avalonia.Base/Controls/ResourceDictionary.cs
@@ -192,6 +192,11 @@ namespace Avalonia.Controls
             return false;
         }
 
+        public IEnumerator<KeyValuePair<object, object?>> GetEnumerator()
+        {
+            return _inner?.GetEnumerator() ?? Enumerable.Empty<KeyValuePair<object, object?>>().GetEnumerator();
+        }
+
         void ICollection<KeyValuePair<object, object?>>.Add(KeyValuePair<object, object?> item)
         {
             Add(item.Key, item.Value);
@@ -218,12 +223,17 @@ namespace Avalonia.Controls
             return false;
         }
 
-        public IEnumerator<KeyValuePair<object, object?>> GetEnumerator()
+        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+
+        internal bool ContainsDeferredKey(object key)
         {
-            return _inner?.GetEnumerator() ?? Enumerable.Empty<KeyValuePair<object, object?>>().GetEnumerator();
-        }
+            if (_inner is not null && _inner.TryGetValue(key, out var result))
+            {
+                return result is DeferredItem;
+            }
 
-        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+            return false;
+        }
 
         void IResourceProvider.AddOwner(IResourceHost owner)
         {
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlCompiler.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlCompiler.cs
index 04a61e5f10..fac053df14 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlCompiler.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlCompiler.cs
@@ -59,6 +59,10 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
             InsertAfter<TypeReferenceResolver>(
                 new XDataTypeTransformer());
 
+            InsertBefore<DeferredContentTransformer>(
+                new AvaloniaXamlIlDeferredResourceTransformer()
+            );
+
             // After everything else
             InsertBefore<NewObjectTransformer>(
                 new AddNameScopeRegistration(),
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlDeferredResourceTransformer.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlDeferredResourceTransformer.cs
new file mode 100644
index 0000000000..099878df08
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlDeferredResourceTransformer.cs
@@ -0,0 +1,80 @@
+using System.Collections.Generic;
+using System.Linq;
+using XamlX.Ast;
+using XamlX.Emit;
+using XamlX.IL;
+using XamlX.Transform;
+using XamlX.TypeSystem;
+
+namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
+{
+    internal class AvaloniaXamlIlDeferredResourceTransformer : IXamlAstTransformer
+    {
+        public IXamlAstNode Transform(AstTransformationContext context, IXamlAstNode node)
+        {
+            if (!(node is XamlPropertyAssignmentNode pa) || pa.Values.Count != 2)
+                return node;
+
+            var types = context.GetAvaloniaTypes();
+
+            if (pa.Property.DeclaringType == types.ResourceDictionary && pa.Property.Name == "Content")
+            {
+                pa.Values[1] = new XamlDeferredContentNode(pa.Values[1], types.XamlIlTypes.Object, context.Configuration);
+                pa.PossibleSetters = new List<IXamlPropertySetter>
+                {
+                    new XamlDirectCallPropertySetter(types.ResourceDictionaryDeferredAdd),
+                };
+            }
+            else if (pa.Property.Name == "Resources" && pa.Property.Getter.ReturnType.Equals(types.IResourceDictionary))
+            {
+                pa.Values[1] = new XamlDeferredContentNode(pa.Values[1], types.XamlIlTypes.Object, context.Configuration);
+                pa.PossibleSetters = new List<IXamlPropertySetter>
+                {
+                    new AdderSetter(pa.Property.Getter, types.ResourceDictionaryDeferredAdd),
+                };
+            }
+
+            return node;
+        }
+
+        class AdderSetter : IXamlPropertySetter, IXamlEmitablePropertySetter<IXamlILEmitter>
+        {
+            private readonly IXamlMethod _getter;
+            private readonly IXamlMethod _adder;
+
+            public AdderSetter(IXamlMethod getter, IXamlMethod adder)
+            {
+                _getter = getter;
+                _adder = adder;
+                TargetType = getter.DeclaringType;
+                Parameters = adder.ParametersWithThis().Skip(1).ToList();
+            }
+
+            public IXamlType TargetType { get; }
+
+            public PropertySetterBinderParameters BinderParameters { get; } = new PropertySetterBinderParameters
+            {
+                AllowMultiple = true
+            };
+
+            public IReadOnlyList<IXamlType> Parameters { get; }
+            public void Emit(IXamlILEmitter emitter)
+            {
+                var locals = new Stack<XamlLocalsPool.PooledLocal>();
+                // Save all "setter" parameters
+                for (var c = Parameters.Count - 1; c >= 0; c--)
+                {
+                    var loc = emitter.LocalsPool.GetLocal(Parameters[c]);
+                    locals.Push(loc);
+                    emitter.Stloc(loc.Local);
+                }
+
+                emitter.EmitCall(_getter);
+                while (locals.Count > 0)
+                    using (var loc = locals.Pop())
+                        emitter.Ldloc(loc.Local);
+                emitter.EmitCall(_adder, true);
+            }
+        }
+    }
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlWellKnownTypes.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlWellKnownTypes.cs
index 28787d9b84..330d836f49 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlWellKnownTypes.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlWellKnownTypes.cs
@@ -96,6 +96,9 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
         public IXamlType TextDecorations { get; }
         public IXamlType TextTrimming { get; }
         public IXamlType ISetter { get; }
+        public IXamlType IResourceDictionary { get; }
+        public IXamlType ResourceDictionary { get; }
+        public IXamlMethod ResourceDictionaryDeferredAdd { get; }
 
         public AvaloniaXamlIlWellKnownTypes(TransformerConfiguration cfg)
         {
@@ -210,6 +213,12 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
             TextDecorations = cfg.TypeSystem.GetType("Avalonia.Media.TextDecorations");
             TextTrimming = cfg.TypeSystem.GetType("Avalonia.Media.TextTrimming");
             ISetter = cfg.TypeSystem.GetType("Avalonia.Styling.ISetter");
+            IResourceDictionary = cfg.TypeSystem.GetType("Avalonia.Controls.IResourceDictionary");
+            ResourceDictionary = cfg.TypeSystem.GetType("Avalonia.Controls.ResourceDictionary");
+            ResourceDictionaryDeferredAdd = ResourceDictionary.FindMethod("AddDeferred", XamlIlTypes.Void, true, XamlIlTypes.Object,
+                cfg.TypeSystem.GetType("System.Func`2").MakeGenericType(
+                    cfg.TypeSystem.GetType("System.IServiceProvider"),
+                    XamlIlTypes.Object));
         }
     }
 
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ResourceDictionaryTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ResourceDictionaryTests.cs
index 578fa888a3..939c5319e4 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ResourceDictionaryTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ResourceDictionaryTests.cs
@@ -66,6 +66,104 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
             }
         }
 
+        [Fact]
+        public void Item_Is_Added_To_ResourceDictionary_As_Deferred()
+        {
+            using (StyledWindow())
+            {
+                var xaml = @"
+<ResourceDictionary xmlns='https://github.com/avaloniaui'
+                    xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+  <Color x:Key='Red'>Red</Color>
+</ResourceDictionary>";
+                var resources = (ResourceDictionary)AvaloniaRuntimeXamlLoader.Load(xaml);
+
+                Assert.True(resources.ContainsDeferredKey("Red"));
+            }
+        }
+
+        [Fact]
+        public void Item_Is_Added_To_Window_Resources_As_Deferred()
+        {
+            using (StyledWindow())
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Window.Resources>
+        <Color x:Key='Red'>Red</Color>
+    </Window.Resources>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var resources = (ResourceDictionary)window.Resources;
+
+                Assert.True(resources.ContainsDeferredKey("Red"));
+            }
+        }
+
+        [Fact]
+        public void Item_Is_Added_To_Window_MergedDictionaries_As_Deferred()
+        {
+            using (StyledWindow())
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Window.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary>
+                    <Color x:Key='Red'>Red</Color>
+                </ResourceDictionary>
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Window.Resources>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var resources = (ResourceDictionary)window.Resources.MergedDictionaries[0];
+
+                Assert.True(resources.ContainsDeferredKey("Red"));
+            }
+        }
+
+        [Fact]
+        public void Item_Is_Added_To_Style_Resources_As_Deferred()
+        {
+            using (StyledWindow())
+            {
+                var xaml = @"
+<Style xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Style.Resources>
+        <Color x:Key='Red'>Red</Color>
+    </Style.Resources>
+</Style>";
+                var style = (Style)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var resources = (ResourceDictionary)style.Resources;
+
+                Assert.True(resources.ContainsDeferredKey("Red"));
+            }
+        }
+
+        [Fact]
+        public void Item_Is_Added_To_Styles_Resources_As_Deferred()
+        {
+            using (StyledWindow())
+            {
+                var xaml = @"
+<Styles xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Styles.Resources>
+        <Color x:Key='Red'>Red</Color>
+    </Styles.Resources>
+</Styles>";
+                var style = (Styles)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var resources = (ResourceDictionary)style.Resources;
+
+                Assert.True(resources.ContainsDeferredKey("Red"));
+            }
+        }
+
         private IDisposable StyledWindow(params (string, string)[] assets)
         {
             var services = TestServices.StyledWindow.With(

From ccdc11d0accad930a11996546d4cef9af41d191b Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 30 Jun 2022 15:34:48 +0200
Subject: [PATCH 034/240] Fix missing subscribe if owner is already set.

---
 src/Avalonia.Base/Controls/ResourceNodeExtensions.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Avalonia.Base/Controls/ResourceNodeExtensions.cs b/src/Avalonia.Base/Controls/ResourceNodeExtensions.cs
index 1758c45650..6121646107 100644
--- a/src/Avalonia.Base/Controls/ResourceNodeExtensions.cs
+++ b/src/Avalonia.Base/Controls/ResourceNodeExtensions.cs
@@ -132,6 +132,11 @@ namespace Avalonia.Controls
             {
                 _target.OwnerChanged += OwnerChanged;
                 _owner = _target.Owner;
+
+                if (_owner is object)
+                {
+                    _owner.ResourcesChanged += ResourcesChanged;
+                }
             }
 
             protected override void Deinitialize()

From f385cc12f1836185afaf9de279a0d5affb30490a Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Mon, 4 Jul 2022 13:44:30 +0200
Subject: [PATCH 035/240] Remove debug/unused code.

---
 .../AvaloniaXamlIlSetterTransformer.cs        | 50 -------------------
 .../Styling/SelectorTests_Nesting.cs          |  7 ---
 2 files changed, 57 deletions(-)

diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSetterTransformer.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSetterTransformer.cs
index 06e34a85a2..6da95be1c1 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSetterTransformer.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSetterTransformer.cs
@@ -27,7 +27,6 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
                 .FirstOrDefault(x => x.Property.GetClrProperty().Name == "Property");
             if (property != null)
             {
-
                 var propertyName = property.Values.OfType<XamlAstTextNode>().FirstOrDefault()?.Text;
                 if (propertyName == null)
                     throw new XamlParseException("Setter.Property must be a string", node);
@@ -68,55 +67,6 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
             return node;
         }
 
-        private (IXamlLineInfo, IXamlType) GetTargetType(AstTransformationContext context, IXamlAstNode node)
-        {
-            foreach (var n in context.ParentNodes())
-            {
-                if (n is XamlAstObjectNode parent)
-                {
-                    switch (parent.Type.GetClrType().FullName)
-                    {
-                        case "Avalonia.Styling.Style":
-                            var selectorProperty = parent.Children.OfType<XamlAstXamlPropertyValueNode>()
-                                .FirstOrDefault(p => p.Property.GetClrProperty().Name == "Selector");
-                            if (selectorProperty == null)
-                                throw new XamlParseException("Can not find parent Style Selector.", node);
-                            var selector = selectorProperty.Values.FirstOrDefault() as XamlIlSelectorNode;
-                            if (selector?.TargetType != null)
-                                return (selector, selector.TargetType);
-                            throw new XamlParseException(
-                                "Can not resolve parent Style Selector type", node);
-
-                        case "Avalonia.Styling.ControlTheme":
-                            var targetTypeProperty = parent.Children.OfType<XamlAstXamlPropertyValueNode>()
-                                .FirstOrDefault(p => p.Property.GetClrProperty().Name == "TargetType");
-                            if (targetTypeProperty == null)
-                                throw new XamlParseException("ControlTemplate has no TargetType.", parent);
-                            break;
-                    }
-                }
-            }
-
-            throw new XamlParseException("'Setter' is only valid inside a 'Style' or 'ControlTheme'.", node);
-            //var parent = context.ParentNodes().OfType<XamlAstObjectNode>()
-            //    .FirstOrDefault(p => p.Type.GetClrType().FullName == "Avalonia.Styling.Style" ||
-            //                         p.Type.GetClrType().FullName == "Avalonia.Styling.ControlTheme");
-
-            //if (parent == null)
-            //    throw new XamlParseException(
-            //        "Avalonia.Styling.Setter is only valid inside Avalonia.Styling.Style", node);
-            //var selectorProperty = parent.Children.OfType<XamlAstXamlPropertyValueNode>()
-            //    .FirstOrDefault(p => p.Property.GetClrProperty().Name == "Selector" ||
-            //                         p.Property.GetClrProperty().Name == "TargetType");
-            //if (selectorProperty == null)
-            //    throw new XamlParseException(
-            //        "Can not find parent Style Selector or ControlTemplate TargetType", node);
-            //var selector = selectorProperty.Values.FirstOrDefault() as XamlIlSelectorNode;
-            //if (selector?.TargetType == null)
-            //    throw new XamlParseException(
-            //        "Can not resolve parent Style Selector type", node);
-        }
-
         class SetterValueProperty : XamlAstClrProperty
         {
             public SetterValueProperty(IXamlLineInfo line, IXamlType setterType, IXamlType targetType,
diff --git a/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Nesting.cs b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Nesting.cs
index bd7f0338e6..a60d21a018 100644
--- a/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Nesting.cs
+++ b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Nesting.cs
@@ -170,15 +170,8 @@ namespace Avalonia.Base.UnitTests.Styling
                 }
             };
 
-            // REMOOOOVEEEE
-            var foo = new Style(x => x.OfType<Button>().Template().OfType<Control1>());
-            var match2 = foo.Selector.Match(control, parent);
-            Assert.Equal(SelectorMatchResult.AlwaysThisInstance, match2.Result);
-
             var match = nested.Selector.Match(control, parent);
             Assert.Equal(SelectorMatchResult.AlwaysThisInstance, match.Result);
-
-
         }
 
         [Fact]

From 9cea09caa2b24097c9680b424c43ce44e4116f07 Mon Sep 17 00:00:00 2001
From: Luis von der Eltz <luis@gritworld.com>
Date: Mon, 4 Jul 2022 14:58:25 +0200
Subject: [PATCH 036/240] Fix Intersect missing nullable return type

---
 src/Avalonia.Base/Platform/IGeometryImpl.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Base/Platform/IGeometryImpl.cs b/src/Avalonia.Base/Platform/IGeometryImpl.cs
index c80f8923ef..8760f9ed8a 100644
--- a/src/Avalonia.Base/Platform/IGeometryImpl.cs
+++ b/src/Avalonia.Base/Platform/IGeometryImpl.cs
@@ -39,7 +39,7 @@ namespace Avalonia.Platform
         /// </summary>
         /// <param name="geometry">The other geometry.</param>
         /// <returns>A new <see cref="IGeometryImpl"/> representing the intersection.</returns>
-        IGeometryImpl Intersect(IGeometryImpl geometry);
+        IGeometryImpl? Intersect(IGeometryImpl geometry);
 
         /// <summary>
         /// Indicates whether the geometry's stroke contains the specified point.

From 14a7ee7e319b7a26d156770fc2b6c0ccb5243a14 Mon Sep 17 00:00:00 2001
From: Luis von der Eltz <luis@gritworld.com>
Date: Mon, 4 Jul 2022 15:07:23 +0200
Subject: [PATCH 037/240] Extend docs

---
 src/Avalonia.Base/Platform/IGeometryImpl.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Base/Platform/IGeometryImpl.cs b/src/Avalonia.Base/Platform/IGeometryImpl.cs
index 8760f9ed8a..5826cfb2ff 100644
--- a/src/Avalonia.Base/Platform/IGeometryImpl.cs
+++ b/src/Avalonia.Base/Platform/IGeometryImpl.cs
@@ -38,7 +38,7 @@ namespace Avalonia.Platform
         /// Intersects the geometry with another geometry.
         /// </summary>
         /// <param name="geometry">The other geometry.</param>
-        /// <returns>A new <see cref="IGeometryImpl"/> representing the intersection.</returns>
+        /// <returns>A new <see cref="IGeometryImpl"/> representing the intersection or <c>null</c> when the operation failed.</returns>
         IGeometryImpl? Intersect(IGeometryImpl geometry);
 
         /// <summary>

From 4d23058c9b940bd993ba7e08536e4725c1deb14c Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Mon, 4 Jul 2022 17:37:04 +0200
Subject: [PATCH 038/240] Don't run an unnecessary batch update.

If there are no styles to detach, there's no reason to run a batch update.
---
 src/Avalonia.Base/StyledElement.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Base/StyledElement.cs b/src/Avalonia.Base/StyledElement.cs
index 189d73c502..ecf5d95ffc 100644
--- a/src/Avalonia.Base/StyledElement.cs
+++ b/src/Avalonia.Base/StyledElement.cs
@@ -832,7 +832,7 @@ namespace Avalonia
 
         private void DetachStyles()
         {
-            if (_appliedStyles is object)
+            if (_appliedStyles?.Count > 0)
             {
                 BeginBatchUpdate();
 

From 9ab31f60b40d676fbe1a876dbf70a5e498904ebf Mon Sep 17 00:00:00 2001
From: Luis von der Eltz <luis@gritworld.com>
Date: Tue, 5 Jul 2022 17:17:51 +0200
Subject: [PATCH 039/240] Fix button flyout toggle

Expose OverlayDismissEventPassThrough on FlyoutBase
---
 src/Avalonia.Controls/Button.cs             | 56 ++++++++++++++-------
 src/Avalonia.Controls/Flyouts/FlyoutBase.cs | 48 ++++++++++++++----
 src/Avalonia.Controls/Primitives/Popup.cs   |  2 +-
 3 files changed, 77 insertions(+), 29 deletions(-)

diff --git a/src/Avalonia.Controls/Button.cs b/src/Avalonia.Controls/Button.cs
index 6dba33516b..8e5d4e1e06 100644
--- a/src/Avalonia.Controls/Button.cs
+++ b/src/Avalonia.Controls/Button.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 using System.Linq;
 using System.Windows.Input;
 using Avalonia.Automation.Peers;
@@ -281,24 +282,29 @@ namespace Avalonia.Controls
         /// <inheritdoc/>
         protected override void OnKeyDown(KeyEventArgs e)
         {
-            if (e.Key == Key.Enter)
+            switch (e.Key)
             {
-                OnClick();
-                e.Handled = true;
-            }
-            else if (e.Key == Key.Space)
-            {
-                if (ClickMode == ClickMode.Press)
-                {
+                case Key.Enter:
                     OnClick();
+                    e.Handled = true;
+                    break;
+
+                case Key.Space:
+                {
+                    if (ClickMode == ClickMode.Press)
+                    {
+                        OnClick();
+                    }
+
+                    IsPressed = true;
+                    e.Handled = true;
+                    break;
                 }
-                IsPressed = true;
-                e.Handled = true;
-            }
-            else if (e.Key == Key.Escape && Flyout != null)
-            {
-                // If Flyout doesn't have focusable content, close the flyout here
-                Flyout.Hide();
+
+                case Key.Escape when Flyout != null:
+                    // If Flyout doesn't have focusable content, close the flyout here
+                    CloseFlyout();
+                    break;
             }
 
             base.OnKeyDown(e);
@@ -327,7 +333,14 @@ namespace Avalonia.Controls
         {
             if (IsEffectivelyEnabled)
             {
-                OpenFlyout();
+                if (_isFlyoutOpen)
+                {
+                    CloseFlyout();
+                }
+                else
+                {
+                    OpenFlyout();
+                }
 
                 var e = new RoutedEventArgs(ClickEvent);
                 RaiseEvent(e);
@@ -348,6 +361,14 @@ namespace Avalonia.Controls
             Flyout?.ShowAt(this);
         }
 
+        /// <summary>
+        /// Closes the button's flyout.
+        /// </summary>
+        protected virtual void CloseFlyout()
+        {
+            Flyout?.Hide();
+        }
+
         /// <summary>
         /// Invoked when the button's flyout is opened.
         /// </summary>
@@ -494,8 +515,7 @@ namespace Avalonia.Controls
 
                 // If flyout is changed while one is already open, make sure we 
                 // close the old one first
-                if (oldFlyout != null &&
-                    oldFlyout.IsOpen)
+                if (oldFlyout != null && oldFlyout.IsOpen)
                 {
                     oldFlyout.Hide();
                 }
diff --git a/src/Avalonia.Controls/Flyouts/FlyoutBase.cs b/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
index 1504d2b25f..a0f3407b7a 100644
--- a/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
+++ b/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
@@ -12,11 +12,6 @@ namespace Avalonia.Controls.Primitives
 {
     public abstract class FlyoutBase : AvaloniaObject, IPopupHostProvider
     {
-        static FlyoutBase()
-        {
-            Control.ContextFlyoutProperty.Changed.Subscribe(OnContextFlyoutPropertyChanged);
-        }
-
         /// <summary>
         /// Defines the <see cref="IsOpen"/> property
         /// </summary>
@@ -49,6 +44,12 @@ namespace Avalonia.Controls.Primitives
         public static readonly AttachedProperty<FlyoutBase?> AttachedFlyoutProperty =
             AvaloniaProperty.RegisterAttached<FlyoutBase, Control, FlyoutBase?>("AttachedFlyout", null);
 
+        /// <summary>
+        /// Defines the OverlayDismissEventPassThrough property
+        /// </summary>
+        public static readonly StyledProperty<bool> OverlayDismissEventPassThroughProperty =
+            Popup.OverlayDismissEventPassThroughProperty.AddOwner<FlyoutBase>();
+
         private readonly Lazy<Popup> _popupLazy;
         private bool _isOpen;
         private Control? _target;
@@ -58,6 +59,12 @@ namespace Avalonia.Controls.Primitives
         private IDisposable? _transientDisposable;
         private Action<IPopupHost?>? _popupHostChangedHandler;
 
+        static FlyoutBase()
+        {
+            OverlayDismissEventPassThroughProperty.OverrideDefaultValue<FlyoutBase>(true);
+            Control.ContextFlyoutProperty.Changed.Subscribe(OnContextFlyoutPropertyChanged);
+        }
+
         public FlyoutBase()
         {
             _popupLazy = new Lazy<Popup>(() => CreatePopup());
@@ -101,6 +108,21 @@ namespace Avalonia.Controls.Primitives
             private set => SetAndRaise(TargetProperty, ref _target, value);
         }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether the event that closes the flyout is passed
+        /// through to the parent window.
+        /// </summary>
+        /// <remarks>
+        /// Clicks outside the the flyout cause the flyout to close. When <see cref="OverlayDismissEventPassThrough"/> is set to
+        /// false, these clicks will be handled by the flyout and not be registered by the parent
+        /// window. When set to true, the events will be passed through to the parent window.
+        /// </remarks>
+        public bool OverlayDismissEventPassThrough
+        {
+            get => GetValue(OverlayDismissEventPassThroughProperty);
+            set => SetValue(OverlayDismissEventPassThroughProperty, value);
+        }
+
         IPopupHost? IPopupHostProvider.PopupHost => Popup?.Host;
 
         event Action<IPopupHost?>? IPopupHostProvider.PopupHostChanged 
@@ -175,6 +197,8 @@ namespace Avalonia.Controls.Primitives
 
             IsOpen = false;
             Popup.IsOpen = false;
+            Popup.OverlayInputPassThroughElement = null;
+
             ((ISetLogicalParent)Popup).SetParent(null);
             
             // Ensure this isn't active
@@ -231,6 +255,9 @@ namespace Avalonia.Controls.Primitives
                 Popup.Child = CreatePresenter();
             }
 
+            Popup.OverlayInputPassThroughElement = placementTarget;
+            Popup.OverlayDismissEventPassThrough = OverlayDismissEventPassThrough;
+
             if (CancelOpening())
             {
                 return false;
@@ -356,10 +383,11 @@ namespace Avalonia.Controls.Primitives
 
         private Popup CreatePopup()
         {
-            var popup = new Popup();
-            popup.WindowManagerAddShadowHint = false;
-            popup.IsLightDismissEnabled = true;
-            popup.OverlayDismissEventPassThrough = true;
+            var popup = new Popup
+            {
+                WindowManagerAddShadowHint = false,
+                IsLightDismissEnabled = true
+            };
 
             popup.Opened += OnPopupOpened;
             popup.Closed += OnPopupClosed;
@@ -372,7 +400,7 @@ namespace Avalonia.Controls.Primitives
         {
             IsOpen = true;
 
-            _popupHostChangedHandler?.Invoke(Popup!.Host);
+            _popupHostChangedHandler?.Invoke(Popup.Host);
         }
 
         private void OnPopupClosing(object? sender, CancelEventArgs e)
diff --git a/src/Avalonia.Controls/Primitives/Popup.cs b/src/Avalonia.Controls/Primitives/Popup.cs
index 1501d97470..3573ad9aaa 100644
--- a/src/Avalonia.Controls/Primitives/Popup.cs
+++ b/src/Avalonia.Controls/Primitives/Popup.cs
@@ -501,7 +501,7 @@ namespace Avalonia.Controls.Primitives
                 if (dismissLayer != null)
                 {
                     dismissLayer.IsVisible = true;
-                    dismissLayer.InputPassThroughElement = _overlayInputPassThroughElement;
+                    dismissLayer.InputPassThroughElement = OverlayInputPassThroughElement;
                     
                     Disposable.Create(() =>
                     {

From 030c956e31d77e2572088b94daf69a8f0ec317a6 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 5 Jul 2022 18:31:49 +0200
Subject: [PATCH 040/240] Revert "Make MovePreviousOrParent internal as well."

This reverts commit 5e1f28f2a9e3a4f8606bf8efb6aa393d12f62d45.
---
 src/Avalonia.Base/Styling/ChildSelector.cs            | 2 +-
 src/Avalonia.Base/Styling/DescendentSelector.cs       | 2 +-
 src/Avalonia.Base/Styling/NestingSelector.cs          | 2 +-
 src/Avalonia.Base/Styling/NotSelector.cs              | 2 +-
 src/Avalonia.Base/Styling/NthChildSelector.cs         | 2 +-
 src/Avalonia.Base/Styling/OrSelector.cs               | 2 +-
 src/Avalonia.Base/Styling/PropertyEqualsSelector.cs   | 2 +-
 src/Avalonia.Base/Styling/Selector.cs                 | 2 +-
 src/Avalonia.Base/Styling/TemplateSelector.cs         | 2 +-
 src/Avalonia.Base/Styling/TypeNameAndClassSelector.cs | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Avalonia.Base/Styling/ChildSelector.cs b/src/Avalonia.Base/Styling/ChildSelector.cs
index b3f6794154..bc1d257ce6 100644
--- a/src/Avalonia.Base/Styling/ChildSelector.cs
+++ b/src/Avalonia.Base/Styling/ChildSelector.cs
@@ -65,6 +65,6 @@ namespace Avalonia.Styling
         }
 
         private protected override (Selector?, IStyle?) MovePrevious(IStyle? nestingParent) => (null, null);
-        private protected override Selector? MovePreviousOrParent() => _parent;
+        protected override Selector? MovePreviousOrParent() => _parent;
     }
 }
diff --git a/src/Avalonia.Base/Styling/DescendentSelector.cs b/src/Avalonia.Base/Styling/DescendentSelector.cs
index 7f36c27a37..3a16574e04 100644
--- a/src/Avalonia.Base/Styling/DescendentSelector.cs
+++ b/src/Avalonia.Base/Styling/DescendentSelector.cs
@@ -70,6 +70,6 @@ namespace Avalonia.Styling
         }
 
         private protected override (Selector?, IStyle?) MovePrevious(IStyle? nestingParent) => (null, null);
-        private protected override Selector? MovePreviousOrParent() => _parent;
+        protected override Selector? MovePreviousOrParent() => _parent;
     }
 }
diff --git a/src/Avalonia.Base/Styling/NestingSelector.cs b/src/Avalonia.Base/Styling/NestingSelector.cs
index 60ad8106d9..dd0bac31c6 100644
--- a/src/Avalonia.Base/Styling/NestingSelector.cs
+++ b/src/Avalonia.Base/Styling/NestingSelector.cs
@@ -37,6 +37,6 @@ namespace Avalonia.Styling
             return parent is Style parentStyle ? (parentStyle.Selector, parentStyle.Parent) : (null, null);
         }
 
-        private protected override Selector? MovePreviousOrParent() => null;
+        protected override Selector? MovePreviousOrParent() => null;
     }
 }
diff --git a/src/Avalonia.Base/Styling/NotSelector.cs b/src/Avalonia.Base/Styling/NotSelector.cs
index be5cfaca49..ebde392a3b 100644
--- a/src/Avalonia.Base/Styling/NotSelector.cs
+++ b/src/Avalonia.Base/Styling/NotSelector.cs
@@ -67,6 +67,6 @@ namespace Avalonia.Styling
         }
 
         private protected override (Selector?, IStyle?) MovePrevious(IStyle? nestingParent) => (_previous, nestingParent);
-        private protected override Selector? MovePreviousOrParent() => _previous;
+        protected override Selector? MovePreviousOrParent() => _previous;
     }
 }
diff --git a/src/Avalonia.Base/Styling/NthChildSelector.cs b/src/Avalonia.Base/Styling/NthChildSelector.cs
index 40fb5a4434..e6d9cf58a9 100644
--- a/src/Avalonia.Base/Styling/NthChildSelector.cs
+++ b/src/Avalonia.Base/Styling/NthChildSelector.cs
@@ -105,7 +105,7 @@ namespace Avalonia.Styling
         }
 
         private protected override (Selector?, IStyle?) MovePrevious(IStyle? nestingParent) => (_previous, nestingParent);
-        private protected override Selector? MovePreviousOrParent() => _previous;
+        protected override Selector? MovePreviousOrParent() => _previous;
 
         public override string ToString()
         {
diff --git a/src/Avalonia.Base/Styling/OrSelector.cs b/src/Avalonia.Base/Styling/OrSelector.cs
index 2ab00d65f8..115e0aeb95 100644
--- a/src/Avalonia.Base/Styling/OrSelector.cs
+++ b/src/Avalonia.Base/Styling/OrSelector.cs
@@ -103,7 +103,7 @@ namespace Avalonia.Styling
         }
 
         private protected override (Selector?, IStyle?) MovePrevious(IStyle? nestingParent) => (null, null);
-        private protected override Selector? MovePreviousOrParent() => null;
+        protected override Selector? MovePreviousOrParent() => null;
 
         internal override void ValidateNestingSelector(bool inControlTheme)
         {
diff --git a/src/Avalonia.Base/Styling/PropertyEqualsSelector.cs b/src/Avalonia.Base/Styling/PropertyEqualsSelector.cs
index 62caa9bab3..96f8c8dfeb 100644
--- a/src/Avalonia.Base/Styling/PropertyEqualsSelector.cs
+++ b/src/Avalonia.Base/Styling/PropertyEqualsSelector.cs
@@ -90,7 +90,7 @@ namespace Avalonia.Styling
         }
 
         private protected override (Selector?, IStyle?) MovePrevious(IStyle? nestingParent) => (_previous, nestingParent);
-        private protected override Selector? MovePreviousOrParent() => _previous;
+        protected override Selector? MovePreviousOrParent() => _previous;
 
         internal static bool Compare(Type propertyType, object? propertyValue, object? value)
         {
diff --git a/src/Avalonia.Base/Styling/Selector.cs b/src/Avalonia.Base/Styling/Selector.cs
index 67109961ba..cc8598c5e3 100644
--- a/src/Avalonia.Base/Styling/Selector.cs
+++ b/src/Avalonia.Base/Styling/Selector.cs
@@ -95,7 +95,7 @@ namespace Avalonia.Styling
         /// <summary>
         /// Moves to the previous selector or the parent selector.
         /// </summary>
-        private protected abstract Selector? MovePreviousOrParent();
+        protected abstract Selector? MovePreviousOrParent();
 
         internal virtual void ValidateNestingSelector(bool inControlTheme)
         {
diff --git a/src/Avalonia.Base/Styling/TemplateSelector.cs b/src/Avalonia.Base/Styling/TemplateSelector.cs
index 0af263b4e5..a68b7003b8 100644
--- a/src/Avalonia.Base/Styling/TemplateSelector.cs
+++ b/src/Avalonia.Base/Styling/TemplateSelector.cs
@@ -49,6 +49,6 @@ namespace Avalonia.Styling
         }
 
         private protected override (Selector?, IStyle?) MovePrevious(IStyle? nestingParent) => (null, null);
-        private protected override Selector? MovePreviousOrParent() => _parent;
+        protected override Selector? MovePreviousOrParent() => _parent;
     }
 }
diff --git a/src/Avalonia.Base/Styling/TypeNameAndClassSelector.cs b/src/Avalonia.Base/Styling/TypeNameAndClassSelector.cs
index 7783d3f653..3a2150b1e9 100644
--- a/src/Avalonia.Base/Styling/TypeNameAndClassSelector.cs
+++ b/src/Avalonia.Base/Styling/TypeNameAndClassSelector.cs
@@ -140,7 +140,7 @@ namespace Avalonia.Styling
         }
 
         private protected override (Selector?, IStyle?) MovePrevious(IStyle? nestingParent) => (_previous, nestingParent);
-        private protected override Selector? MovePreviousOrParent() => _previous;
+        protected override Selector? MovePreviousOrParent() => _previous;
 
         private string BuildSelectorString()
         {

From a341c33b5526c1b2fc886db3d07025e6fbb8110d Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 5 Jul 2022 18:58:38 +0200
Subject: [PATCH 041/240] Revert "Fix parent selectors with /template/ at end."

This reverts commit e50b416d5bf1529544830d5a291a1fb2f1b0da64 as it was not functioning correctly.
---
 src/Avalonia.Base/Styling/ChildSelector.cs           |  2 +-
 src/Avalonia.Base/Styling/DescendentSelector.cs      |  2 +-
 src/Avalonia.Base/Styling/NestingSelector.cs         |  8 ++------
 src/Avalonia.Base/Styling/NotSelector.cs             |  2 +-
 src/Avalonia.Base/Styling/NthChildSelector.cs        |  2 +-
 src/Avalonia.Base/Styling/OrSelector.cs              |  2 +-
 src/Avalonia.Base/Styling/PropertyEqualsSelector.cs  |  2 +-
 src/Avalonia.Base/Styling/Selector.cs                | 12 +++---------
 src/Avalonia.Base/Styling/TemplateSelector.cs        |  2 +-
 .../Styling/TypeNameAndClassSelector.cs              |  2 +-
 10 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/src/Avalonia.Base/Styling/ChildSelector.cs b/src/Avalonia.Base/Styling/ChildSelector.cs
index bc1d257ce6..9512dc34df 100644
--- a/src/Avalonia.Base/Styling/ChildSelector.cs
+++ b/src/Avalonia.Base/Styling/ChildSelector.cs
@@ -64,7 +64,7 @@ namespace Avalonia.Styling
             }
         }
 
-        private protected override (Selector?, IStyle?) MovePrevious(IStyle? nestingParent) => (null, null);
+        protected override Selector? MovePrevious() => null;
         protected override Selector? MovePreviousOrParent() => _parent;
     }
 }
diff --git a/src/Avalonia.Base/Styling/DescendentSelector.cs b/src/Avalonia.Base/Styling/DescendentSelector.cs
index 3a16574e04..677a924189 100644
--- a/src/Avalonia.Base/Styling/DescendentSelector.cs
+++ b/src/Avalonia.Base/Styling/DescendentSelector.cs
@@ -69,7 +69,7 @@ namespace Avalonia.Styling
             }
         }
 
-        private protected override (Selector?, IStyle?) MovePrevious(IStyle? nestingParent) => (null, null);
+        protected override Selector? MovePrevious() => null;
         protected override Selector? MovePreviousOrParent() => _parent;
     }
 }
diff --git a/src/Avalonia.Base/Styling/NestingSelector.cs b/src/Avalonia.Base/Styling/NestingSelector.cs
index dd0bac31c6..77c5b719c6 100644
--- a/src/Avalonia.Base/Styling/NestingSelector.cs
+++ b/src/Avalonia.Base/Styling/NestingSelector.cs
@@ -17,7 +17,7 @@ namespace Avalonia.Styling
         {
             if (parent is Style s && s.Selector is not null)
             {
-                return SelectorMatch.AlwaysThisType;
+                return s.Selector.Match(control, s.Parent, subscribe);
             }
             else if (parent is ControlTheme theme)
             {
@@ -32,11 +32,7 @@ namespace Avalonia.Styling
                 "Nesting selector was specified but cannot determine parent selector.");
         }
 
-        private protected override (Selector?, IStyle?) MovePrevious(IStyle? parent)
-        {
-            return parent is Style parentStyle ? (parentStyle.Selector, parentStyle.Parent) : (null, null);
-        }
-
+        protected override Selector? MovePrevious() => null;
         protected override Selector? MovePreviousOrParent() => null;
     }
 }
diff --git a/src/Avalonia.Base/Styling/NotSelector.cs b/src/Avalonia.Base/Styling/NotSelector.cs
index ebde392a3b..c7727bb6b8 100644
--- a/src/Avalonia.Base/Styling/NotSelector.cs
+++ b/src/Avalonia.Base/Styling/NotSelector.cs
@@ -66,7 +66,7 @@ namespace Avalonia.Styling
             }
         }
 
-        private protected override (Selector?, IStyle?) MovePrevious(IStyle? nestingParent) => (_previous, nestingParent);
+        protected override Selector? MovePrevious() => _previous;
         protected override Selector? MovePreviousOrParent() => _previous;
     }
 }
diff --git a/src/Avalonia.Base/Styling/NthChildSelector.cs b/src/Avalonia.Base/Styling/NthChildSelector.cs
index e6d9cf58a9..f473791664 100644
--- a/src/Avalonia.Base/Styling/NthChildSelector.cs
+++ b/src/Avalonia.Base/Styling/NthChildSelector.cs
@@ -104,7 +104,7 @@ namespace Avalonia.Styling
             return match ? SelectorMatch.AlwaysThisInstance : SelectorMatch.NeverThisInstance;
         }
 
-        private protected override (Selector?, IStyle?) MovePrevious(IStyle? nestingParent) => (_previous, nestingParent);
+        protected override Selector? MovePrevious() => _previous;
         protected override Selector? MovePreviousOrParent() => _previous;
 
         public override string ToString()
diff --git a/src/Avalonia.Base/Styling/OrSelector.cs b/src/Avalonia.Base/Styling/OrSelector.cs
index 115e0aeb95..af9249864f 100644
--- a/src/Avalonia.Base/Styling/OrSelector.cs
+++ b/src/Avalonia.Base/Styling/OrSelector.cs
@@ -102,7 +102,7 @@ namespace Avalonia.Styling
             }
         }
 
-        private protected override (Selector?, IStyle?) MovePrevious(IStyle? nestingParent) => (null, null);
+        protected override Selector? MovePrevious() => null;
         protected override Selector? MovePreviousOrParent() => null;
 
         internal override void ValidateNestingSelector(bool inControlTheme)
diff --git a/src/Avalonia.Base/Styling/PropertyEqualsSelector.cs b/src/Avalonia.Base/Styling/PropertyEqualsSelector.cs
index 96f8c8dfeb..48136ba2de 100644
--- a/src/Avalonia.Base/Styling/PropertyEqualsSelector.cs
+++ b/src/Avalonia.Base/Styling/PropertyEqualsSelector.cs
@@ -89,7 +89,7 @@ namespace Avalonia.Styling
             
         }
 
-        private protected override (Selector?, IStyle?) MovePrevious(IStyle? nestingParent) => (_previous, nestingParent);
+        protected override Selector? MovePrevious() => _previous;
         protected override Selector? MovePreviousOrParent() => _previous;
 
         internal static bool Compare(Type propertyType, object? propertyValue, object? value)
diff --git a/src/Avalonia.Base/Styling/Selector.cs b/src/Avalonia.Base/Styling/Selector.cs
index cc8598c5e3..7ce17518dd 100644
--- a/src/Avalonia.Base/Styling/Selector.cs
+++ b/src/Avalonia.Base/Styling/Selector.cs
@@ -84,13 +84,7 @@ namespace Avalonia.Styling
         /// <summary>
         /// Moves to the previous selector.
         /// </summary>
-        /// <param name="nestingParent">
-        /// The parent style, if the selector is on a nested style.
-        /// </param>
-        /// <remarks>
-        /// The previous selector, and its nesting parent.
-        /// </remarks>
-        private protected abstract (Selector?, IStyle?) MovePrevious(IStyle? nestingParent);
+        protected abstract Selector? MovePrevious();
 
         /// <summary>
         /// Moves to the previous selector or the parent selector.
@@ -148,14 +142,14 @@ namespace Avalonia.Styling
             ref AndActivatorBuilder activators,
             ref Selector? combinator)
         {
-            var (previous, previousParent) = selector.MovePrevious(parent);
+            var previous = selector.MovePrevious();
 
             // Selectors are stored from right-to-left, so we recurse into the selector in order to
             // reverse this order, because the type selector will be on the left and is our best
             // opportunity to exit early.
             if (previous != null && !previous.IsCombinator)
             {
-                var previousMatch = Match(control, previous, previousParent, subscribe, ref activators, ref combinator);
+                var previousMatch = Match(control, previous, parent, subscribe, ref activators, ref combinator);
 
                 if (previousMatch < SelectorMatchResult.Sometimes)
                 {
diff --git a/src/Avalonia.Base/Styling/TemplateSelector.cs b/src/Avalonia.Base/Styling/TemplateSelector.cs
index a68b7003b8..278e24a203 100644
--- a/src/Avalonia.Base/Styling/TemplateSelector.cs
+++ b/src/Avalonia.Base/Styling/TemplateSelector.cs
@@ -48,7 +48,7 @@ namespace Avalonia.Styling
             return _parent.Match(templatedParent, parent, subscribe);
         }
 
-        private protected override (Selector?, IStyle?) MovePrevious(IStyle? nestingParent) => (null, null);
+        protected override Selector? MovePrevious() => null;
         protected override Selector? MovePreviousOrParent() => _parent;
     }
 }
diff --git a/src/Avalonia.Base/Styling/TypeNameAndClassSelector.cs b/src/Avalonia.Base/Styling/TypeNameAndClassSelector.cs
index 3a2150b1e9..6681a7da36 100644
--- a/src/Avalonia.Base/Styling/TypeNameAndClassSelector.cs
+++ b/src/Avalonia.Base/Styling/TypeNameAndClassSelector.cs
@@ -139,7 +139,7 @@ namespace Avalonia.Styling
             return Name == null ? SelectorMatch.AlwaysThisType : SelectorMatch.AlwaysThisInstance;
         }
 
-        private protected override (Selector?, IStyle?) MovePrevious(IStyle? nestingParent) => (_previous, nestingParent);
+        protected override Selector? MovePrevious() => _previous;
         protected override Selector? MovePreviousOrParent() => _previous;
 
         private string BuildSelectorString()

From 3e17bd066240ef2661ea305b7c16be78ac090877 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Wed, 6 Jul 2022 10:06:39 +0200
Subject: [PATCH 042/240] Skip these failing tests for now.

I will work on a fix.
---
 .../Styling/SelectorTests_Nesting.cs                        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Nesting.cs b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Nesting.cs
index a60d21a018..747ad585e7 100644
--- a/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Nesting.cs
+++ b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Nesting.cs
@@ -149,8 +149,8 @@ namespace Avalonia.Base.UnitTests.Styling
             control.Classes.Remove("foo");
             Assert.False(sink.Active);
         }
-        
-        [Fact]
+
+        [Fact(Skip = "Template selectors a the end of nesting parent selectors currently broken")]
         public void Template_Nesting_OfType_Matches()
         {
             var control = new Control1 { Classes = { "foo" } };
@@ -198,7 +198,7 @@ namespace Avalonia.Base.UnitTests.Styling
             Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
         }
 
-        [Fact]
+        [Fact(Skip = "Template selectors a the end of nesting parent selectors currently broken")]
         public void Class_Template_Nesting_OfType_Matches()
         {
             var control = new Control1 { Classes = { "foo" } };

From 97a5a9e1f64110d01b8d8bf3937a3518f6fd567b Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Wed, 6 Jul 2022 14:24:55 -0400
Subject: [PATCH 043/240] Add folder.GetItemsAsync API

---
 .../ControlCatalog/Pages/DialogsPage.xaml.cs  | 16 ++++++-
 .../Platform/Storage/AndroidStorageItem.cs    | 25 +++++++++++
 .../Storage/FileIO/BclStorageFolder.cs        | 12 +++++
 .../Platform/Storage/IStorageFolder.cs        | 11 ++++-
 .../Interop/Storage/StorageProviderInterop.cs | 25 +++++++++++
 .../Interop/Typescript/StorageProvider.ts     | 45 +++++++++++++------
 .../Avalonia.iOS/Storage/IOSStorageItem.cs    | 17 +++++++
 7 files changed, 134 insertions(+), 17 deletions(-)

diff --git a/samples/ControlCatalog/Pages/DialogsPage.xaml.cs b/samples/ControlCatalog/Pages/DialogsPage.xaml.cs
index f7b6db1255..e13c2052eb 100644
--- a/samples/ControlCatalog/Pages/DialogsPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/DialogsPage.xaml.cs
@@ -243,8 +243,8 @@ namespace ControlCatalog.Pages
             async Task SetPickerResult(IReadOnlyCollection<IStorageItem>? items)
             {
                 items ??= Array.Empty<IStorageItem>();
-                var mappedResults = items.Select(FullPathOrName).ToList();
                 bookmarkContainer.Text = items.FirstOrDefault(f => f.CanBookmark) is { } f ? await f.SaveBookmark() : "Can't bookmark";
+                var mappedResults = new List<string>();
 
                 if (items.FirstOrDefault() is IStorageItem item)
                 {
@@ -293,7 +293,19 @@ Content:
                     lastSelectedDirectory = await item.GetParentAsync();
                     if (lastSelectedDirectory is not null)
                     {
-                        mappedResults.Insert(0,  "Parent: " + FullPathOrName(lastSelectedDirectory));
+                        mappedResults.Add(FullPathOrName(lastSelectedDirectory));
+                    }
+
+                    foreach (var selectedItem in items)
+                    {
+                        mappedResults.Add("+> " + FullPathOrName(selectedItem));
+                        if (selectedItem is IStorageFolder folder)
+                        {
+                            foreach (var innerItems in await folder.GetItemsAsync())
+                            {
+                                mappedResults.Add("++> " + FullPathOrName(innerItems));
+                            }
+                        }
                     }
                 }
 
diff --git a/src/Android/Avalonia.Android/Platform/Storage/AndroidStorageItem.cs b/src/Android/Avalonia.Android/Platform/Storage/AndroidStorageItem.cs
index 50581d47b1..1e81642e15 100644
--- a/src/Android/Avalonia.Android/Platform/Storage/AndroidStorageItem.cs
+++ b/src/Android/Avalonia.Android/Platform/Storage/AndroidStorageItem.cs
@@ -1,6 +1,7 @@
 #nullable enable
 
 using System;
+using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
@@ -106,6 +107,30 @@ internal sealed class AndroidStorageFolder : AndroidStorageItem, IStorageBookmar
     {
         return Task.FromResult(new StorageItemProperties());
     }
+
+    public async Task<IReadOnlyList<IStorageItem>> GetItemsAsync()
+    {
+        using var javaFile = new JavaFile(Uri.Path!);
+
+        // Java file represents files AND directories. Don't be confused.
+        var files = await javaFile.ListFilesAsync().ConfigureAwait(false);
+        if (files is null)
+        {
+            return Array.Empty<IStorageItem>();
+        }
+
+        return files
+            .Select(f => (file: f, uri: AndroidUri.FromFile(f)))
+            .Where(t => t.uri is not null)
+            .Select(t => t.file switch
+            {
+                { IsFile: true } => (IStorageItem)new AndroidStorageFile(Context, t.uri!),
+                { IsDirectory: true } => new AndroidStorageFolder(Context, t.uri!),
+                _ => null
+            })
+            .Where(i => i is not null)
+            .ToArray()!;
+    }
 }
 
 internal sealed class AndroidStorageFile : AndroidStorageItem, IStorageBookmarkFile
diff --git a/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageFolder.cs b/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageFolder.cs
index 7267017eaf..0a22f4bd03 100644
--- a/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageFolder.cs
+++ b/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageFolder.cs
@@ -1,6 +1,8 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
+using System.Linq;
 using System.Security;
 using System.Threading.Tasks;
 using Avalonia.Metadata;
@@ -43,6 +45,16 @@ public class BclStorageFolder : IStorageBookmarkFolder
         return Task.FromResult<IStorageFolder?>(null);
     }
 
+    public Task<IReadOnlyList<IStorageItem>> GetItemsAsync()
+    {
+         var items = _directoryInfo.GetDirectories()
+            .Select(d => (IStorageItem)new BclStorageFolder(d))
+            .Concat(_directoryInfo.GetFiles().Select(f => new BclStorageFile(f)))
+            .ToArray();
+
+         return Task.FromResult<IReadOnlyList<IStorageItem>>(items);
+    }
+
     public virtual Task<string?> SaveBookmark()
     {
         return Task.FromResult<string?>(_directoryInfo.FullName);
diff --git a/src/Avalonia.Base/Platform/Storage/IStorageFolder.cs b/src/Avalonia.Base/Platform/Storage/IStorageFolder.cs
index 25b9f01a92..0ffb9f41c6 100644
--- a/src/Avalonia.Base/Platform/Storage/IStorageFolder.cs
+++ b/src/Avalonia.Base/Platform/Storage/IStorageFolder.cs
@@ -1,4 +1,6 @@
-using Avalonia.Metadata;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Avalonia.Metadata;
 
 namespace Avalonia.Platform.Storage;
 
@@ -8,4 +10,11 @@ namespace Avalonia.Platform.Storage;
 [NotClientImplementable]
 public interface IStorageFolder : IStorageItem
 {
+    /// <summary>
+    /// Gets the files and subfolders in the current folder.
+    /// </summary>
+    /// <returns>
+    /// When this method completes successfully, it returns a list of the files and folders in the current folder. Each item in the list is represented by an <see cref="IStorageItem"/> implementation object.
+    /// </returns>
+    Task<IReadOnlyList<IStorageItem>> GetItemsAsync();
 }
diff --git a/src/Web/Avalonia.Web.Blazor/Interop/Storage/StorageProviderInterop.cs b/src/Web/Avalonia.Web.Blazor/Interop/Storage/StorageProviderInterop.cs
index 14dc53d7b5..129463774c 100644
--- a/src/Web/Avalonia.Web.Blazor/Interop/Storage/StorageProviderInterop.cs
+++ b/src/Web/Avalonia.Web.Blazor/Interop/Storage/StorageProviderInterop.cs
@@ -196,5 +196,30 @@ namespace Avalonia.Web.Blazor.Interop.Storage
         public JSStorageFolder(IJSInProcessObjectReference fileHandle) : base(fileHandle)
         {
         }
+
+        public async Task<IReadOnlyList<IStorageItem>> GetItemsAsync()
+        {
+            var items = await FileHandle.InvokeAsync<IJSInProcessObjectReference?>("getItems");
+            if (items is null)
+            {
+                return Array.Empty<IStorageItem>();
+            }
+
+            var count = items.Invoke<int>("count");
+
+            return Enumerable.Range(0, count)
+                .Select(index =>
+                {
+                    var reference = items.Invoke<IJSInProcessObjectReference>("at", index);
+                    return reference.Invoke<string>("getKind") switch
+                    {
+                        "directory" => (IStorageItem)new JSStorageFolder(reference),
+                        "file" => new JSStorageFile(reference),
+                        _ => null
+                    };
+                })
+                .Where(i => i is not null)
+                .ToArray()!;
+        }
     }
 }
diff --git a/src/Web/Avalonia.Web.Blazor/Interop/Typescript/StorageProvider.ts b/src/Web/Avalonia.Web.Blazor/Interop/Typescript/StorageProvider.ts
index c32eef3226..aee74b9067 100644
--- a/src/Web/Avalonia.Web.Blazor/Interop/Typescript/StorageProvider.ts
+++ b/src/Web/Avalonia.Web.Blazor/Interop/Typescript/StorageProvider.ts
@@ -14,6 +14,8 @@ declare global {
 
         queryPermission(options?: { mode: PermissionsMode }): Promise<"granted" | "denied" | "prompt">;
         requestPermission(options?: { mode: PermissionsMode }): Promise<"granted" | "denied" | "prompt">;
+
+        entries(): AsyncIterableIterator<[string, FileSystemFileHandle]>;
     }
     type WellKnownDirectory = "desktop" | "documents" | "downloads" | "music" | "pictures" | "videos"; 
     type StartInDirectory =  WellKnownDirectory | FileSystemFileHandle;
@@ -53,7 +55,7 @@ class IndexedDbWrapper {
     }
 
     public connect(): Promise<InnerDbConnection> {
-        var conn = window.indexedDB.open(this.databaseName, 1);
+        const conn = window.indexedDB.open(this.databaseName, 1);
 
         conn.onupgradeneeded = event => {
             const db = (<IDBRequest<IDBDatabase>>event.target).result;
@@ -85,7 +87,7 @@ class InnerDbConnection {
         const os = this.openStore(store, "readwrite");
 
         return new Promise((resolve, reject) => {
-            var response = os.put(obj, key);
+            const response = os.put(obj, key);
             response.onsuccess = () => {
                 resolve(response.result);
             };
@@ -99,7 +101,7 @@ class InnerDbConnection {
         const os = this.openStore(store, "readonly");
 
         return new Promise((resolve, reject) => {
-            var response = os.get(key);
+            const response = os.get(key);
             response.onsuccess = () => {
                 resolve(response.result);
             };
@@ -113,7 +115,7 @@ class InnerDbConnection {
         const os = this.openStore(store, "readwrite");
 
         return new Promise((resolve, reject) => {
-            var response = os.delete(key);
+            const response = os.delete(key);
             response.onsuccess = () => {
                 resolve();
             };
@@ -134,17 +136,20 @@ const avaloniaDb = new IndexedDbWrapper("AvaloniaDb", [
 ])
 
 class StorageItem {
-    constructor(private handle: FileSystemFileHandle, private bookmarkId?: string) { }
+    constructor(public handle: FileSystemFileHandle, private bookmarkId?: string) { }
 
     public getName(): string {
         return this.handle.name
     }
 
+    public getKind(): string {
+        return this.handle.kind;
+    }
+
     public async openRead(): Promise<Blob> {
         await this.verityPermissions('read');
 
-        var file = await this.handle.getFile();
-        return file;
+        return await this.handle.getFile();
     }
 
     public async openWrite(): Promise<FileSystemWritableFileStream> {
@@ -154,7 +159,7 @@ class StorageItem {
     }
 
     public async getProperties(): Promise<{ Size: number, LastModified: number, Type: string }> {
-        var file = this.handle.getFile && await this.handle.getFile();
+        const file = this.handle.getFile && await this.handle.getFile();
         
         return file && {
             Size: file.size,
@@ -163,6 +168,18 @@ class StorageItem {
         }
     }
 
+    public async getItems(): Promise<StorageItems> {
+        if (this.handle.kind !== "directory"){
+            return new StorageItems([]);
+        }
+        
+        const items: StorageItem[] = [];
+        for await (const [key, value] of this.handle.entries()) {
+            items.push(new StorageItem(value));
+        }
+        return new StorageItems(items);
+    }
+    
     private async verityPermissions(mode: PermissionsMode): Promise<void | never> {
         if (await this.handle.queryPermission({ mode }) === 'granted') {
             return;
@@ -235,12 +252,12 @@ export class StorageProvider {
     }
 
     public static async selectFolderDialog(
-        startIn: StartInDirectory | null)
+        startIn: StorageItem | null)
         : Promise<StorageItem> {
 
         // 'Picker' API doesn't accept "null" as a parameter, so it should be set to undefined.
         const options: DirectoryPickerOptions = {
-            startIn: (startIn || undefined)
+            startIn: (startIn?.handle || undefined)
         };
 
         const handle = await window.showDirectoryPicker(options);
@@ -248,12 +265,12 @@ export class StorageProvider {
     }
 
     public static async openFileDialog(
-        startIn: StartInDirectory | null, multiple: boolean,
+        startIn: StorageItem | null, multiple: boolean,
         types: FilePickerAcceptType[] | null, excludeAcceptAllOption: boolean)
         : Promise<StorageItems> {
 
         const options: OpenFilePickerOptions = {
-            startIn: (startIn || undefined),
+            startIn: (startIn?.handle || undefined),
             multiple,
             excludeAcceptAllOption,
             types: (types || undefined)
@@ -264,12 +281,12 @@ export class StorageProvider {
     }
 
     public static async saveFileDialog(
-        startIn: StartInDirectory | null, suggestedName: string | null,
+        startIn: StorageItem | null, suggestedName: string | null,
         types: FilePickerAcceptType[] | null, excludeAcceptAllOption: boolean)
         : Promise<StorageItem> {
 
         const options: SaveFilePickerOptions = {
-            startIn: (startIn || undefined),
+            startIn: (startIn?.handle || undefined),
             suggestedName: (suggestedName || undefined),
             excludeAcceptAllOption,
             types: (types || undefined)
diff --git a/src/iOS/Avalonia.iOS/Storage/IOSStorageItem.cs b/src/iOS/Avalonia.iOS/Storage/IOSStorageItem.cs
index 6fb296d0e0..cfb2a497be 100644
--- a/src/iOS/Avalonia.iOS/Storage/IOSStorageItem.cs
+++ b/src/iOS/Avalonia.iOS/Storage/IOSStorageItem.cs
@@ -1,6 +1,8 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
+using System.Linq;
 using System.Threading.Tasks;
 using Avalonia.Logging;
 using Avalonia.Platform.Storage;
@@ -118,4 +120,19 @@ internal sealed class IOSStorageFolder : IOSStorageItem, IStorageBookmarkFolder
     public IOSStorageFolder(NSUrl url) : base(url)
     {
     }
+
+    public Task<IReadOnlyList<IStorageItem>> GetItemsAsync()
+    {
+        var content = NSFileManager.DefaultManager.GetDirectoryContent(Url, null, NSDirectoryEnumerationOptions.None, out var error);
+        if (error is not null)
+        {
+            return Task.FromException<IReadOnlyList<IStorageItem>>(new NSErrorException(error));
+        }
+
+        var items = content
+            .Select(u => u.HasDirectoryPath ? (IStorageItem)new IOSStorageFolder(u) : new IOSStorageFile(u))
+            .ToArray();
+
+        return Task.FromResult<IReadOnlyList<IStorageItem>>(items);
+    }
 }

From 5a8c9f9c0904c83095291d9ae0c02abd8a9d259f Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Wed, 6 Jul 2022 14:31:00 -0400
Subject: [PATCH 044/240] Use Async in naming

---
 samples/ControlCatalog/Pages/DialogsPage.xaml.cs       | 10 +++++-----
 .../Platform/Storage/AndroidStorageItem.cs             |  8 ++++----
 .../Platform/Storage/FileIO/BclStorageFile.cs          |  8 ++++----
 .../Platform/Storage/FileIO/BclStorageFolder.cs        |  4 ++--
 .../Platform/Storage/IStorageBookmarkItem.cs           |  2 +-
 src/Avalonia.Base/Platform/Storage/IStorageFile.cs     |  4 ++--
 src/Avalonia.Base/Platform/Storage/IStorageItem.cs     |  2 +-
 .../Interop/Storage/StorageProviderInterop.cs          |  8 ++++----
 src/iOS/Avalonia.iOS/Storage/IOSStorageItem.cs         |  8 ++++----
 9 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/samples/ControlCatalog/Pages/DialogsPage.xaml.cs b/samples/ControlCatalog/Pages/DialogsPage.xaml.cs
index e13c2052eb..036dccde0e 100644
--- a/samples/ControlCatalog/Pages/DialogsPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/DialogsPage.xaml.cs
@@ -195,10 +195,10 @@ namespace ControlCatalog.Pages
                 {
                     // Sync disposal of StreamWriter is not supported on WASM
 #if NET6_0_OR_GREATER
-                    await using var stream = await file.OpenWrite();
+                    await using var stream = await file.OpenWriteAsync();
                     await using var reader = new System.IO.StreamWriter(stream);
 #else
-                    using var stream = await file.OpenWrite();
+                    using var stream = await file.OpenWriteAsync();
                     using var reader = new System.IO.StreamWriter(stream);
 #endif
                     await reader.WriteLineAsync(openedFileContent.Text);
@@ -243,7 +243,7 @@ namespace ControlCatalog.Pages
             async Task SetPickerResult(IReadOnlyCollection<IStorageItem>? items)
             {
                 items ??= Array.Empty<IStorageItem>();
-                bookmarkContainer.Text = items.FirstOrDefault(f => f.CanBookmark) is { } f ? await f.SaveBookmark() : "Can't bookmark";
+                bookmarkContainer.Text = items.FirstOrDefault(f => f.CanBookmark) is { } f ? await f.SaveBookmarkAsync() : "Can't bookmark";
                 var mappedResults = new List<string>();
 
                 if (items.FirstOrDefault() is IStorageItem item)
@@ -267,9 +267,9 @@ Content:
                         if (file.CanOpenRead)
                         {
 #if NET6_0_OR_GREATER
-                            await using var stream = await file.OpenRead();
+                            await using var stream = await file.OpenReadAsync();
 #else
-                            using var stream = await file.OpenRead();
+                            using var stream = await file.OpenReadAsync();
 #endif
                             using var reader = new System.IO.StreamReader(stream);
 
diff --git a/src/Android/Avalonia.Android/Platform/Storage/AndroidStorageItem.cs b/src/Android/Avalonia.Android/Platform/Storage/AndroidStorageItem.cs
index 1e81642e15..a9b2e16d43 100644
--- a/src/Android/Avalonia.Android/Platform/Storage/AndroidStorageItem.cs
+++ b/src/Android/Avalonia.Android/Platform/Storage/AndroidStorageItem.cs
@@ -36,13 +36,13 @@ internal abstract class AndroidStorageItem : IStorageBookmarkItem
 
     public bool CanBookmark => true;
 
-    public Task<string?> SaveBookmark()
+    public Task<string?> SaveBookmarkAsync()
     {
         Context.ContentResolver?.TakePersistableUriPermission(Uri, ActivityFlags.GrantWriteUriPermission | ActivityFlags.GrantReadUriPermission);
         return Task.FromResult(Uri.ToString());
     }
 
-    public Task ReleaseBookmark()
+    public Task ReleaseBookmarkAsync()
     {
         Context.ContentResolver?.ReleasePersistableUriPermission(Uri, ActivityFlags.GrantWriteUriPermission | ActivityFlags.GrantReadUriPermission);
         return Task.CompletedTask;
@@ -143,10 +143,10 @@ internal sealed class AndroidStorageFile : AndroidStorageItem, IStorageBookmarkF
 
     public bool CanOpenWrite => true;
 
-    public Task<Stream> OpenRead() => Task.FromResult(OpenContentStream(Context, Uri, false)
+    public Task<Stream> OpenReadAsync() => Task.FromResult(OpenContentStream(Context, Uri, false)
         ?? throw new InvalidOperationException("Failed to open content stream"));
 
-    public Task<Stream> OpenWrite() => Task.FromResult(OpenContentStream(Context, Uri, true)
+    public Task<Stream> OpenWriteAsync() => Task.FromResult(OpenContentStream(Context, Uri, true)
         ?? throw new InvalidOperationException("Failed to open content stream"));
 
     private Stream? OpenContentStream(Context context, AndroidUri uri, bool isOutput)
diff --git a/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageFile.cs b/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageFile.cs
index 5af02219ce..cf21e9b8b5 100644
--- a/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageFile.cs
+++ b/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageFile.cs
@@ -47,22 +47,22 @@ public class BclStorageFile : IStorageBookmarkFile
         return Task.FromResult<IStorageFolder?>(null);
     }
 
-    public Task<Stream> OpenRead()
+    public Task<Stream> OpenReadAsync()
     {
         return Task.FromResult<Stream>(_fileInfo.OpenRead());
     }
 
-    public Task<Stream> OpenWrite()
+    public Task<Stream> OpenWriteAsync()
     {
         return Task.FromResult<Stream>(_fileInfo.OpenWrite());
     }
 
-    public virtual Task<string?> SaveBookmark()
+    public virtual Task<string?> SaveBookmarkAsync()
     {
         return Task.FromResult<string?>(_fileInfo.FullName);
     }
 
-    public Task ReleaseBookmark()
+    public Task ReleaseBookmarkAsync()
     {
         // No-op
         return Task.CompletedTask;
diff --git a/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageFolder.cs b/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageFolder.cs
index 0a22f4bd03..cd6c8be1ae 100644
--- a/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageFolder.cs
+++ b/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageFolder.cs
@@ -55,12 +55,12 @@ public class BclStorageFolder : IStorageBookmarkFolder
          return Task.FromResult<IReadOnlyList<IStorageItem>>(items);
     }
 
-    public virtual Task<string?> SaveBookmark()
+    public virtual Task<string?> SaveBookmarkAsync()
     {
         return Task.FromResult<string?>(_directoryInfo.FullName);
     }
     
-    public Task ReleaseBookmark()
+    public Task ReleaseBookmarkAsync()
     {
         // No-op
         return Task.CompletedTask;
diff --git a/src/Avalonia.Base/Platform/Storage/IStorageBookmarkItem.cs b/src/Avalonia.Base/Platform/Storage/IStorageBookmarkItem.cs
index d21c950862..40f2720ee8 100644
--- a/src/Avalonia.Base/Platform/Storage/IStorageBookmarkItem.cs
+++ b/src/Avalonia.Base/Platform/Storage/IStorageBookmarkItem.cs
@@ -6,7 +6,7 @@ namespace Avalonia.Platform.Storage;
 [NotClientImplementable]
 public interface IStorageBookmarkItem : IStorageItem
 {
-    Task ReleaseBookmark();
+    Task ReleaseBookmarkAsync();
 }
 
 [NotClientImplementable]
diff --git a/src/Avalonia.Base/Platform/Storage/IStorageFile.cs b/src/Avalonia.Base/Platform/Storage/IStorageFile.cs
index 965caf8216..46aa6efa72 100644
--- a/src/Avalonia.Base/Platform/Storage/IStorageFile.cs
+++ b/src/Avalonia.Base/Platform/Storage/IStorageFile.cs
@@ -18,7 +18,7 @@ public interface IStorageFile : IStorageItem
     /// <summary>
     /// Opens a stream for read access.
     /// </summary>
-    Task<Stream> OpenRead();
+    Task<Stream> OpenReadAsync();
 
     /// <summary>
     /// Returns true, if file is writeable. 
@@ -28,5 +28,5 @@ public interface IStorageFile : IStorageItem
     /// <summary>
     /// Opens stream for writing to the file.
     /// </summary>
-    Task<Stream> OpenWrite();
+    Task<Stream> OpenWriteAsync();
 }
diff --git a/src/Avalonia.Base/Platform/Storage/IStorageItem.cs b/src/Avalonia.Base/Platform/Storage/IStorageItem.cs
index 8513ebc7d9..f5469d31c9 100644
--- a/src/Avalonia.Base/Platform/Storage/IStorageItem.cs
+++ b/src/Avalonia.Base/Platform/Storage/IStorageItem.cs
@@ -44,7 +44,7 @@ public interface IStorageItem : IDisposable
     /// <returns>
     /// Returns identifier of a bookmark. Can be null if OS denied request.
     /// </returns>
-    Task<string?> SaveBookmark();
+    Task<string?> SaveBookmarkAsync();
 
     /// <summary>
     /// Gets the parent folder of the current storage item.
diff --git a/src/Web/Avalonia.Web.Blazor/Interop/Storage/StorageProviderInterop.cs b/src/Web/Avalonia.Web.Blazor/Interop/Storage/StorageProviderInterop.cs
index 129463774c..2bc46e97b5 100644
--- a/src/Web/Avalonia.Web.Blazor/Interop/Storage/StorageProviderInterop.cs
+++ b/src/Web/Avalonia.Web.Blazor/Interop/Storage/StorageProviderInterop.cs
@@ -145,7 +145,7 @@ namespace Avalonia.Web.Blazor.Interop.Storage
 
         public bool CanBookmark => true;
 
-        public Task<string?> SaveBookmark()
+        public Task<string?> SaveBookmarkAsync()
         {
             return FileHandle.InvokeAsync<string?>("saveBookmark").AsTask();
         }
@@ -155,7 +155,7 @@ namespace Avalonia.Web.Blazor.Interop.Storage
             return Task.FromResult<IStorageFolder?>(null);
         }
 
-        public Task ReleaseBookmark()
+        public Task ReleaseBookmarkAsync()
         {
             return FileHandle.InvokeAsync<string?>("deleteBookmark").AsTask();
         }
@@ -174,7 +174,7 @@ namespace Avalonia.Web.Blazor.Interop.Storage
         }
 
         public bool CanOpenRead => true;
-        public async Task<Stream> OpenRead()
+        public async Task<Stream> OpenReadAsync()
         {
             var stream = await FileHandle.InvokeAsync<IJSStreamReference>("openRead");
             // Remove maxAllowedSize limit, as developer can decide if they read only small part or everything.
@@ -182,7 +182,7 @@ namespace Avalonia.Web.Blazor.Interop.Storage
         }
 
         public bool CanOpenWrite => true;
-        public async Task<Stream> OpenWrite()
+        public async Task<Stream> OpenWriteAsync()
         {
             var properties = await FileHandle.InvokeAsync<FileProperties?>("getProperties");
             var streamWriter = await FileHandle.InvokeAsync<IJSInProcessObjectReference>("openWrite");
diff --git a/src/iOS/Avalonia.iOS/Storage/IOSStorageItem.cs b/src/iOS/Avalonia.iOS/Storage/IOSStorageItem.cs
index cfb2a497be..a801e83562 100644
--- a/src/iOS/Avalonia.iOS/Storage/IOSStorageItem.cs
+++ b/src/iOS/Avalonia.iOS/Storage/IOSStorageItem.cs
@@ -51,13 +51,13 @@ internal abstract class IOSStorageItem : IStorageBookmarkItem
         return Task.FromResult<IStorageFolder?>(new IOSStorageFolder(Url.RemoveLastPathComponent()));
     }
 
-    public Task ReleaseBookmark()
+    public Task ReleaseBookmarkAsync()
     {
         // no-op
         return Task.CompletedTask;
     }
 
-    public Task<string?> SaveBookmark()
+    public Task<string?> SaveBookmarkAsync()
     {
         try
         {
@@ -104,12 +104,12 @@ internal sealed class IOSStorageFile : IOSStorageItem, IStorageBookmarkFile
 
     public bool CanOpenWrite => true;
 
-    public Task<Stream> OpenRead()
+    public Task<Stream> OpenReadAsync()
     {
         return Task.FromResult<Stream>(new IOSSecurityScopedStream(Url, FileAccess.Read));
     }
 
-    public Task<Stream> OpenWrite()
+    public Task<Stream> OpenWriteAsync()
     {
         return Task.FromResult<Stream>(new IOSSecurityScopedStream(Url, FileAccess.Write));
     }

From 002377044aea087f4bf3ca4b2af088be469c7b2b Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 7 Jul 2022 09:50:06 +0200
Subject: [PATCH 046/240] Disallow selectors with trailing /template/.

It's an invalid selector: what does `Button /template/` select?
---
 src/Avalonia.Base/Styling/Style.cs            | 16 ++++-
 .../Styling/SelectorTests_Nesting.cs          | 72 -------------------
 .../Styling/StyleTests.cs                     |  7 ++
 3 files changed, 22 insertions(+), 73 deletions(-)

diff --git a/src/Avalonia.Base/Styling/Style.cs b/src/Avalonia.Base/Styling/Style.cs
index 77c4e62d29..c61b08b2a1 100644
--- a/src/Avalonia.Base/Styling/Style.cs
+++ b/src/Avalonia.Base/Styling/Style.cs
@@ -7,6 +7,8 @@ namespace Avalonia.Styling
     /// </summary>
     public class Style : StyleBase
     {
+        private Selector? _selector;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="Style"/> class.
         /// </summary>
@@ -26,7 +28,11 @@ namespace Avalonia.Styling
         /// <summary>
         /// Gets or sets the style's selector.
         /// </summary>
-        public Selector? Selector { get; set; }
+        public Selector? Selector 
+        {
+            get => _selector;
+            set => _selector = ValidateSelector(value);
+        }
 
         public override SelectorMatchResult TryAttach(IStyleable target, object? host)
         {
@@ -88,5 +94,13 @@ namespace Avalonia.Styling
 
             base.SetParent(parent);
         }
+
+        private static Selector? ValidateSelector(Selector? selector)
+        {
+            if (selector is TemplateSelector)
+                throw new InvalidOperationException(
+                    "Invalid selector: Template selector must be followed by control selector.");
+            return selector;
+        }
     }
 }
diff --git a/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Nesting.cs b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Nesting.cs
index 747ad585e7..9048b488b6 100644
--- a/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Nesting.cs
+++ b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Nesting.cs
@@ -150,78 +150,6 @@ namespace Avalonia.Base.UnitTests.Styling
             Assert.False(sink.Active);
         }
 
-        [Fact(Skip = "Template selectors a the end of nesting parent selectors currently broken")]
-        public void Template_Nesting_OfType_Matches()
-        {
-            var control = new Control1 { Classes = { "foo" } };
-            var button = new Button
-            {
-                Template = new FuncControlTemplate((x, _) => control),
-            };
-
-            button.ApplyTemplate();
-
-            Style nested;
-            var parent = new Style(x => x.OfType<Button>().Template())
-            {
-                Children =
-                {
-                    (nested = new Style(x => x.Nesting().OfType<Control1>())),
-                }
-            };
-
-            var match = nested.Selector.Match(control, parent);
-            Assert.Equal(SelectorMatchResult.AlwaysThisInstance, match.Result);
-        }
-
-        [Fact]
-        public void Template_Nesting_OfType_Class_Matches()
-        {
-            var control = new Control1 { Classes = { "foo" } };
-            var button = new Button
-            {
-                Template = new FuncControlTemplate((x, _) => control),
-            };
-
-            button.ApplyTemplate();
-
-            Style nested;
-            var parent = new Style(x => x.OfType<Button>().Template())
-            {
-                Children =
-                {
-                    (nested = new Style(x => x.Nesting().OfType<Control1>().Class("foo"))),
-                }
-            };
-
-            var match = nested.Selector.Match(control, parent);
-            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
-        }
-
-        [Fact(Skip = "Template selectors a the end of nesting parent selectors currently broken")]
-        public void Class_Template_Nesting_OfType_Matches()
-        {
-            var control = new Control1 { Classes = { "foo" } };
-            var button = new Button
-            {
-                Template = new FuncControlTemplate((x, _) => control),
-            };
-
-            button.ApplyTemplate();
-
-            Style nested;
-            var parent = new Style(x => x.OfType<Button>().Class("bar").Template())
-            {
-                Children =
-                {
-                    (nested = new Style(x => x.Nesting().OfType<Control1>())),
-                }
-            };
-
-            var match = nested.Selector.Match(control, parent);
-            Assert.Equal(SelectorMatchResult.Sometimes, match.Result);
-        }
-
         [Fact]
         public void Or_Nesting_Class_Matches()
         {
diff --git a/tests/Avalonia.Base.UnitTests/Styling/StyleTests.cs b/tests/Avalonia.Base.UnitTests/Styling/StyleTests.cs
index 7aa86a1328..f2dfe66054 100644
--- a/tests/Avalonia.Base.UnitTests/Styling/StyleTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Styling/StyleTests.cs
@@ -69,6 +69,13 @@ namespace Avalonia.Base.UnitTests.Styling
             Assert.Equal("Foo", target.Foo);
         }
 
+        [Fact]
+        public void Should_Throw_For_Selector_With_Trailing_Template_Selector()
+        {
+            Assert.Throws<InvalidOperationException>(() =>
+                new Style(x => x.OfType<Button>().Template()));
+        }
+
         [Fact]
         public void Style_With_No_Selector_Should_Not_Apply_To_Other_Control()
         {

From 05c1f583087eb864544a0c1c71cd3421584c5a9a Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 7 Jul 2022 17:06:44 +0200
Subject: [PATCH 047/240] Added ItemContainerTheme property.

Otherwise there's no easy way to apply themes to item containers.
---
 .../Generators/IItemContainerGenerator.cs     |  6 +++
 .../Generators/ItemContainerGenerator.cs      | 16 ++++++-
 .../Generators/ItemContainerGenerator`1.cs    | 21 ++++-----
 .../Generators/TreeItemContainerGenerator.cs  |  5 +++
 src/Avalonia.Controls/ItemsControl.cs         | 21 +++++++++
 src/Avalonia.Controls/TreeViewItem.cs         |  5 +++
 .../ItemsControlTests.cs                      | 28 +++++++++---
 .../ListBoxTests.cs                           | 44 +++++++++++++++++++
 .../TreeViewTests.cs                          | 29 ++++++++++++
 9 files changed, 159 insertions(+), 16 deletions(-)

diff --git a/src/Avalonia.Controls/Generators/IItemContainerGenerator.cs b/src/Avalonia.Controls/Generators/IItemContainerGenerator.cs
index 70d9dbec08..f9772cb399 100644
--- a/src/Avalonia.Controls/Generators/IItemContainerGenerator.cs
+++ b/src/Avalonia.Controls/Generators/IItemContainerGenerator.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Avalonia.Controls.Templates;
+using Avalonia.Styling;
 
 namespace Avalonia.Controls.Generators
 {
@@ -14,6 +15,11 @@ namespace Avalonia.Controls.Generators
         /// </summary>
         IEnumerable<ItemContainerInfo> Containers { get; }
 
+        /// <summary>
+        /// Gets or sets the theme to be applied to the items in the control.
+        /// </summary>
+        ControlTheme? ItemContainerTheme { get; set; }
+
         /// <summary>
         /// Gets or sets the data template used to display the items in the control.
         /// </summary>
diff --git a/src/Avalonia.Controls/Generators/ItemContainerGenerator.cs b/src/Avalonia.Controls/Generators/ItemContainerGenerator.cs
index a76dcbe9c8..8b36b07cec 100644
--- a/src/Avalonia.Controls/Generators/ItemContainerGenerator.cs
+++ b/src/Avalonia.Controls/Generators/ItemContainerGenerator.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Templates;
 using Avalonia.Data;
+using Avalonia.Styling;
 
 namespace Avalonia.Controls.Generators
 {
@@ -35,6 +36,11 @@ namespace Avalonia.Controls.Generators
         /// <inheritdoc/>
         public event EventHandler<ItemContainerEventArgs>? Recycled;
 
+        /// <summary>
+        /// Gets or sets the theme to be applied to the items in the control.
+        /// </summary>
+        public ControlTheme? ItemContainerTheme { get; set; }
+
         /// <summary>
         /// Gets or sets the data template used to display the items in the control.
         /// </summary>
@@ -190,10 +196,18 @@ namespace Avalonia.Controls.Generators
                     result.SetValue(
                         ContentPresenter.ContentTemplateProperty,
                         ItemTemplate,
-                        BindingPriority.TemplatedParent);
+                        BindingPriority.Style);
                 }
             }
 
+            if (ItemContainerTheme != null)
+            {
+                result.SetValue(
+                    StyledElement.ThemeProperty,
+                    ItemContainerTheme,
+                    BindingPriority.TemplatedParent);
+            }
+
             return result;
         }
 
diff --git a/src/Avalonia.Controls/Generators/ItemContainerGenerator`1.cs b/src/Avalonia.Controls/Generators/ItemContainerGenerator`1.cs
index 635f3a7d37..3ff1b0702d 100644
--- a/src/Avalonia.Controls/Generators/ItemContainerGenerator`1.cs
+++ b/src/Avalonia.Controls/Generators/ItemContainerGenerator`1.cs
@@ -44,28 +44,29 @@ namespace Avalonia.Controls.Generators
         {
             var container = item as T;
 
-            if (container != null)
+            if (container is null)
             {
-                return container;
-            }
-            else
-            {
-                var result = new T();
+                container = new T();
 
                 if (ContentTemplateProperty != null)
                 {
-                    result.SetValue(ContentTemplateProperty, ItemTemplate, BindingPriority.Style);
+                    container.SetValue(ContentTemplateProperty, ItemTemplate, BindingPriority.Style);
                 }
 
-                result.SetValue(ContentProperty, item, BindingPriority.Style);
+                container.SetValue(ContentProperty, item, BindingPriority.Style);
 
                 if (!(item is IControl))
                 {
-                    result.DataContext = item;
+                    container.DataContext = item;
                 }
+            }
 
-                return result;
+            if (ItemContainerTheme != null)
+            {
+                container.SetValue(StyledElement.ThemeProperty, ItemContainerTheme, BindingPriority.Style);
             }
+
+            return container;
         }
 
         /// <inheritdoc/>
diff --git a/src/Avalonia.Controls/Generators/TreeItemContainerGenerator.cs b/src/Avalonia.Controls/Generators/TreeItemContainerGenerator.cs
index 536a5fdd06..4e3deb5552 100644
--- a/src/Avalonia.Controls/Generators/TreeItemContainerGenerator.cs
+++ b/src/Avalonia.Controls/Generators/TreeItemContainerGenerator.cs
@@ -71,6 +71,11 @@ namespace Avalonia.Controls.Generators
                 var template = GetTreeDataTemplate(item, ItemTemplate);
                 var result = new T();
 
+                if (ItemContainerTheme != null)
+                {
+                    result.SetValue(Control.ThemeProperty, ItemContainerTheme, BindingPriority.Style);
+                }
+
                 result.SetValue(ContentProperty, template.Build(item), BindingPriority.Style);
 
                 var itemsSelector = template.ItemsSelector(item);
diff --git a/src/Avalonia.Controls/ItemsControl.cs b/src/Avalonia.Controls/ItemsControl.cs
index 56b0014c05..427f5c8a9b 100644
--- a/src/Avalonia.Controls/ItemsControl.cs
+++ b/src/Avalonia.Controls/ItemsControl.cs
@@ -15,6 +15,7 @@ using Avalonia.Input;
 using Avalonia.LogicalTree;
 using Avalonia.Metadata;
 using Avalonia.VisualTree;
+using Avalonia.Styling;
 
 namespace Avalonia.Controls
 {
@@ -36,6 +37,12 @@ namespace Avalonia.Controls
         public static readonly DirectProperty<ItemsControl, IEnumerable?> ItemsProperty =
             AvaloniaProperty.RegisterDirect<ItemsControl, IEnumerable?>(nameof(Items), o => o.Items, (o, v) => o.Items = v);
 
+        /// <summary>
+        /// Defines the <see cref="ItemContainerTheme"/> property.
+        /// </summary>
+        public static readonly StyledProperty<ControlTheme?> ItemContainerThemeProperty =
+            AvaloniaProperty.Register<ItemsControl, ControlTheme?>(nameof(ItemContainerTheme));
+
         /// <summary>
         /// Defines the <see cref="ItemCount"/> property.
         /// </summary>
@@ -88,6 +95,7 @@ namespace Avalonia.Controls
                 {
                     _itemContainerGenerator = CreateItemContainerGenerator();
 
+                    _itemContainerGenerator.ItemContainerTheme = ItemContainerTheme;
                     _itemContainerGenerator.ItemTemplate = ItemTemplate;
                     _itemContainerGenerator.Materialized += (_, e) => OnContainersMaterialized(e);
                     _itemContainerGenerator.Dematerialized += (_, e) => OnContainersDematerialized(e);
@@ -108,6 +116,15 @@ namespace Avalonia.Controls
             set { SetAndRaise(ItemsProperty, ref _items, value); }
         }
 
+        /// <summary>
+        /// Gets or sets the <see cref="ControlTheme"/> that is applied to the container element generated for each item.
+        /// </summary>
+        public ControlTheme? ItemContainerTheme
+        {
+            get { return GetValue(ItemContainerThemeProperty); }
+            set { SetValue(ItemContainerThemeProperty, value); }
+        }
+
         /// <summary>
         /// Gets the number of items in <see cref="Items"/>.
         /// </summary>
@@ -349,6 +366,10 @@ namespace Avalonia.Controls
             {
                 UpdatePseudoClasses(change.GetNewValue<int>());
             }
+            else if (change.Property == ItemContainerThemeProperty && _itemContainerGenerator is not null)
+            {
+                _itemContainerGenerator.ItemContainerTheme = change.GetNewValue<ControlTheme?>();
+            }
         }
 
         /// <summary>
diff --git a/src/Avalonia.Controls/TreeViewItem.cs b/src/Avalonia.Controls/TreeViewItem.cs
index 490b0b3ce3..2e3aa037c2 100644
--- a/src/Avalonia.Controls/TreeViewItem.cs
+++ b/src/Avalonia.Controls/TreeViewItem.cs
@@ -121,6 +121,11 @@ namespace Avalonia.Controls
             {
                 ItemTemplate = _treeView.ItemTemplate;
             }
+
+            if (ItemContainerTheme == null && _treeView?.ItemContainerTheme != null)
+            {
+                ItemContainerTheme = _treeView.ItemContainerTheme;
+            }
         }
 
         protected override void OnDetachedFromLogicalTree(LogicalTreeAttachmentEventArgs e)
diff --git a/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs b/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs
index bfece7871c..f08653a4f8 100644
--- a/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs
@@ -1,15 +1,14 @@
+using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.Linq;
 using Avalonia.Collections;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Templates;
+using Avalonia.Input;
 using Avalonia.LogicalTree;
-using Avalonia.VisualTree;
-using Xunit;
-using System.Collections.ObjectModel;
+using Avalonia.Styling;
 using Avalonia.UnitTests;
-using Avalonia.Input;
-using System.Collections.Generic;
+using Xunit;
 
 namespace Avalonia.Controls.UnitTests
 {
@@ -62,6 +61,25 @@ namespace Avalonia.Controls.UnitTests
             Assert.Null(container.TemplatedParent);
         }
 
+        [Fact]
+        public void Container_Should_Have_Theme_Set_To_ItemContainerTheme()
+        {
+            var theme = new ControlTheme();
+            var target = new ItemsControl
+            {
+                ItemContainerTheme = theme,
+            };
+
+            target.Template = GetTemplate();
+            target.Items = new[] { "Foo" };
+            target.ApplyTemplate();
+            target.Presenter.ApplyTemplate();
+
+            var container = (ContentPresenter)target.Presenter.Panel.Children[0];
+
+            Assert.Same(container.Theme, theme);
+        }
+
         [Fact]
         public void Container_Should_Have_LogicalParent_Set_To_ItemsControl()
         {
diff --git a/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs b/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs
index e87990ebb1..afa153a593 100644
--- a/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs
@@ -94,6 +94,50 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
+        [Fact]
+        public void Container_Should_Have_Theme_Set_To_ItemContainerTheme()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var items = new[] { "Foo", "Bar", "Baz " };
+                var theme = new ControlTheme();
+                var target = new ListBox
+                {
+                    Template = ListBoxTemplate(),
+                    Items = items,
+                    ItemContainerTheme = theme,
+                };
+
+                Prepare(target);
+
+                var container = (ListBoxItem)target.Presenter.Panel.Children[0];
+
+                Assert.Same(container.Theme, theme);
+            }
+        }
+
+        [Fact]
+        public void Inline_Item_Should_Have_Theme_Set_To_ItemContainerTheme()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var items = new[] { "Foo", "Bar", "Baz " };
+                var theme = new ControlTheme();
+                var target = new ListBox
+                {
+                    Template = ListBoxTemplate(),
+                    Items = new[] { new ListBoxItem() },
+                    ItemContainerTheme = theme,
+                };
+
+                Prepare(target);
+
+                var container = (ListBoxItem)target.Presenter.Panel.Children[0];
+
+                Assert.Same(container.Theme, theme);
+            }
+        }
+
         [Fact]
         public void LogicalChildren_Should_Be_Set_For_DataTemplate_Generated_Items()
         {
diff --git a/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs b/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs
index 2169b15cad..d784caf2db 100644
--- a/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs
@@ -72,6 +72,35 @@ namespace Avalonia.Controls.UnitTests
             Assert.All(items, x => Assert.IsType<Canvas>(x.HeaderPresenter.Child));
         }
 
+        [Fact]
+        public void Items_Should_Be_Created_Using_ItemConatinerTheme_If_Present()
+        {
+            TreeView target;
+            var theme = new ControlTheme();
+
+            var root = new TestRoot
+            {
+                Child = target = new TreeView
+                {
+                    Template = CreateTreeViewTemplate(),
+                    Items = CreateTestTreeData(),
+                    ItemContainerTheme = theme,
+                    ItemTemplate = new FuncTreeDataTemplate<Node>(
+                        (_, __) => new Canvas(),
+                        x => x.Children),
+                }
+            };
+
+            ApplyTemplates(target);
+
+            var items = target.ItemContainerGenerator.Index.Containers
+                .OfType<TreeViewItem>()
+                .ToList();
+
+            Assert.Equal(5, items.Count);
+            Assert.All(items, x => Assert.Same(theme, x.ItemContainerTheme));
+        }
+
         [Fact]
         public void Root_ItemContainerGenerator_Containers_Should_Be_Root_Containers()
         {

From 7cbeb7ad3f4aac3412efd662d5dac4f6f984cdbb Mon Sep 17 00:00:00 2001
From: Benedikt Stebner <Gillibald@users.noreply.github.com>
Date: Fri, 8 Jul 2022 18:56:29 +0200
Subject: [PATCH 048/240] Rework TextLineImpl hit testing

---
 .../ControlCatalog/Pages/TextBlockPage.xaml   |   2 +-
 samples/Sandbox/MainWindow.axaml              |   1 +
 samples/Sandbox/Sandbox.csproj                |   1 +
 src/Avalonia.Base/Media/GlyphRun.cs           | 109 ++++-
 .../Media/TextFormatting/TextLineImpl.cs      | 371 +++++++++---------
 .../Media/TextFormatting/TextLayoutTests.cs   |  84 +++-
 6 files changed, 366 insertions(+), 202 deletions(-)

diff --git a/samples/ControlCatalog/Pages/TextBlockPage.xaml b/samples/ControlCatalog/Pages/TextBlockPage.xaml
index cb49ba96c6..32914428ed 100644
--- a/samples/ControlCatalog/Pages/TextBlockPage.xaml
+++ b/samples/ControlCatalog/Pages/TextBlockPage.xaml
@@ -118,7 +118,7 @@
         </StackPanel>
       </Border>
       <Border>
-        <RichTextBlock Margin="10" TextWrapping="Wrap">
+        <RichTextBlock SelectionBrush="LightBlue" IsTextSelectionEnabled="True" Margin="10" TextWrapping="Wrap">
           This <Span FontWeight="Bold">is</Span> a
           <Span Background="Silver" Foreground="Maroon">TextBlock</Span>
           with <Span TextDecorations="Underline">several</Span>
diff --git a/samples/Sandbox/MainWindow.axaml b/samples/Sandbox/MainWindow.axaml
index 6929f192c7..0c5a7a11e3 100644
--- a/samples/Sandbox/MainWindow.axaml
+++ b/samples/Sandbox/MainWindow.axaml
@@ -1,4 +1,5 @@
 <Window xmlns="https://github.com/avaloniaui"
         xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
         x:Class="Sandbox.MainWindow">
+  <RichTextBlock Width="200" IsTextSelectionEnabled="True" Text="Multiline TextBlock with TextWrapping.&#xD;&#xD;Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus magna. Cras in mi at felis aliquet congue. Ut a est eget ligula molestie gravida. Curabitur massa. Donec eleifend, libero at sagittis mollis, tellus est malesuada tellus, at luctus turpis elit sit amet quam. Vivamus pretium ornare est." TextWrapping="Wrap" />
 </Window>
diff --git a/samples/Sandbox/Sandbox.csproj b/samples/Sandbox/Sandbox.csproj
index eab654acb6..20c7f29201 100644
--- a/samples/Sandbox/Sandbox.csproj
+++ b/samples/Sandbox/Sandbox.csproj
@@ -10,6 +10,7 @@
     <ProjectReference Include="..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Controls.ColorPicker\Avalonia.Controls.ColorPicker.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Controls.DataGrid\Avalonia.Controls.DataGrid.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.NativeGraphics.Backend\Avalonia.NativeGraphics.Backend.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Themes.Fluent\Avalonia.Themes.Fluent.csproj" />
   </ItemGroup>
   
diff --git a/src/Avalonia.Base/Media/GlyphRun.cs b/src/Avalonia.Base/Media/GlyphRun.cs
index ac87d521a5..703b56b0e8 100644
--- a/src/Avalonia.Base/Media/GlyphRun.cs
+++ b/src/Avalonia.Base/Media/GlyphRun.cs
@@ -614,17 +614,29 @@ namespace Avalonia.Media
 
         private GlyphRunMetrics CreateGlyphRunMetrics()
         {
+            var firstCluster = 0;
+            var lastCluster = Characters.Length - 1;
+
+            if (!IsLeftToRight)
+            {
+                var cluster = firstCluster;
+                firstCluster = lastCluster;
+                lastCluster = cluster;
+            }
+
             if (GlyphClusters != null && GlyphClusters.Count > 0)
             {
-                var firstCluster = GlyphClusters[0];
+                firstCluster = GlyphClusters[0];
+                lastCluster = GlyphClusters[GlyphClusters.Count - 1];
 
                 _offsetToFirstCharacter = Math.Max(0, Characters.Start - firstCluster);
             }
 
+            var isReversed = firstCluster > lastCluster;
             var height = (GlyphTypeface.Descent - GlyphTypeface.Ascent + GlyphTypeface.LineGap) * Scale;
             var widthIncludingTrailingWhitespace = 0d;
 
-            var trailingWhitespaceLength = GetTrailingWhitespaceLength(out var newLineLength, out var glyphCount);
+            var trailingWhitespaceLength = GetTrailingWhitespaceLength(isReversed, out var newLineLength, out var glyphCount);
 
             for (var index = 0; index < GlyphIndices.Count; index++)
             {
@@ -635,16 +647,16 @@ namespace Avalonia.Media
 
             var width = widthIncludingTrailingWhitespace;
 
-            if (IsLeftToRight)
+            if (isReversed)
             {
-                for (var index = GlyphIndices.Count - glyphCount; index < GlyphIndices.Count; index++)
+                for (var index = 0; index < glyphCount; index++)
                 {
                     width -= GetGlyphAdvance(index, out _);
-                }
+                }             
             }
             else
             {
-                for (var index = 0; index < glyphCount; index++)
+                for (var index = GlyphIndices.Count - glyphCount; index < GlyphIndices.Count; index++)
                 {
                     width -= GetGlyphAdvance(index, out _);
                 }
@@ -654,16 +666,15 @@ namespace Avalonia.Media
                 height);
         }
 
-        private int GetTrailingWhitespaceLength(out int newLineLength, out int glyphCount)
-        {
-            glyphCount = 0;
-            newLineLength = 0;
-
-            if (Characters.IsEmpty)
+        private int GetTrailingWhitespaceLength(bool isReversed, out int newLineLength, out int glyphCount)
+        {          
+            if (isReversed)
             {
-                return 0;
+                return GetTralingWhitespaceLengthRightToLeft(out newLineLength, out glyphCount);
             }
 
+            glyphCount = 0;
+            newLineLength = 0;
             var trailingWhitespaceLength = 0;
 
             if (GlyphClusters == null)
@@ -732,6 +743,78 @@ namespace Avalonia.Media
             return trailingWhitespaceLength;
         }
 
+        private int GetTralingWhitespaceLengthRightToLeft(out int newLineLength, out int glyphCount)
+        {
+            glyphCount = 0;
+            newLineLength = 0;
+            var trailingWhitespaceLength = 0;
+
+            if (GlyphClusters == null)
+            {
+                for (var i = 0; i < Characters.Length;)
+                {
+                    var codepoint = Codepoint.ReadAt(_characters, i, out var count);
+
+                    if (!codepoint.IsWhiteSpace)
+                    {
+                        break;
+                    }
+
+                    if (codepoint.IsBreakChar)
+                    {
+                        newLineLength++;
+                    }
+
+                    trailingWhitespaceLength++;
+
+                    i += count;
+                    glyphCount++;
+                }
+            }
+            else
+            {
+                for (var i = 0; i < GlyphClusters.Count; i++)
+                {
+                    var currentCluster = GlyphClusters[i];
+                    var characterIndex = Math.Max(0, currentCluster - _characters.BufferOffset);
+                    var codepoint = Codepoint.ReadAt(_characters, characterIndex, out _);
+
+                    if (!codepoint.IsWhiteSpace)
+                    {
+                        break;
+                    }
+
+                    var clusterLength = 1;
+
+                    while (i - 1 >= 0)
+                    {
+                        var nextCluster = GlyphClusters[i - 1];
+
+                        if (currentCluster == nextCluster)
+                        {
+                            clusterLength++;
+                            i--;
+
+                            continue;
+                        }
+
+                        break;
+                    }
+
+                    if (codepoint.IsBreakChar)
+                    {
+                        newLineLength += clusterLength;
+                    }
+
+                    trailingWhitespaceLength += clusterLength;
+
+                    glyphCount++;
+                }
+            }
+
+            return trailingWhitespaceLength;
+        }
+
         private void Set<T>(ref T field, T value)
         {
             _glyphRunImpl?.Dispose();
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs b/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
index 7c686358e2..f4a0324d90 100644
--- a/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
@@ -166,58 +166,74 @@ namespace Avalonia.Media.TextFormatting
 
             if (distance <= 0)
             {
-                // hit happens before the line, return the first position
                 var firstRun = _textRuns[0];
 
-                if (firstRun is ShapedTextCharacters shapedTextCharacters)
-                {
-                    return shapedTextCharacters.GlyphRun.GetCharacterHitFromDistance(distance, out _);
-                }
+                return GetRunCharacterHit(firstRun, FirstTextSourceIndex, 0);
+            }
 
-                return _resolvedFlowDirection == FlowDirection.LeftToRight ?
-                    new CharacterHit(FirstTextSourceIndex) :
-                    new CharacterHit(FirstTextSourceIndex + Length);
+            if (distance > WidthIncludingTrailingWhitespace)
+            {
+                var lastRun = _textRuns[_textRuns.Count - 1];
+
+                return GetRunCharacterHit(lastRun, FirstTextSourceIndex + Length - lastRun.TextSourceLength, lastRun.Size.Width);
             }
 
             // process hit that happens within the line
             var characterHit = new CharacterHit();
             var currentPosition = FirstTextSourceIndex;
+            var currentDistance = 0.0;
 
             foreach (var currentRun in _textRuns)
             {
-                switch (currentRun)
+                if (currentDistance + currentRun.Size.Width < distance)
                 {
-                    case ShapedTextCharacters shapedRun:
-                        {
-                            characterHit = shapedRun.GlyphRun.GetCharacterHitFromDistance(distance, out _);
+                    currentDistance += currentRun.Size.Width;
+                    currentPosition += currentRun.TextSourceLength;
 
-                            var offset = Math.Max(0, currentPosition - shapedRun.Text.Start);
+                    continue;
+                }
 
-                            characterHit = new CharacterHit(characterHit.FirstCharacterIndex + offset, characterHit.TrailingLength);
+                characterHit = GetRunCharacterHit(currentRun, currentPosition, distance - currentDistance);
 
-                            break;
-                        }
-                    default:
+                break;
+            }
+
+            return characterHit;
+        }
+
+        private static CharacterHit GetRunCharacterHit(DrawableTextRun run, int currentPosition, double distance)
+        {
+            CharacterHit characterHit;
+
+            switch (run)
+            {
+                case ShapedTextCharacters shapedRun:
+                    {
+                        characterHit = shapedRun.GlyphRun.GetCharacterHitFromDistance(distance, out _);
+
+                        var offset = Math.Max(0, currentPosition - shapedRun.Text.Start);
+
+                        if (!shapedRun.GlyphRun.IsLeftToRight)
                         {
-                            if (distance < currentRun.Size.Width / 2)
-                            {
-                                characterHit = new CharacterHit(currentPosition);
-                            }
-                            else
-                            {
-                                characterHit = new CharacterHit(currentPosition, currentRun.TextSourceLength);
-                            }
-                            break;
+                            offset = Math.Max(0, offset - shapedRun.Text.End);
                         }
-                }
 
-                if (distance <= currentRun.Size.Width)
-                {
-                    break;
-                }
+                        characterHit = new CharacterHit(characterHit.FirstCharacterIndex + offset, characterHit.TrailingLength);
 
-                distance -= currentRun.Size.Width;
-                currentPosition += currentRun.TextSourceLength;
+                        break;
+                    }
+                default:
+                    {
+                        if (distance < run.Size.Width / 2)
+                        {
+                            characterHit = new CharacterHit(currentPosition);
+                        }
+                        else
+                        {
+                            characterHit = new CharacterHit(currentPosition, run.TextSourceLength);
+                        }
+                        break;
+                    }
             }
 
             return characterHit;
@@ -226,136 +242,122 @@ namespace Avalonia.Media.TextFormatting
         /// <inheritdoc/>
         public override double GetDistanceFromCharacterHit(CharacterHit characterHit)
         {
-            var isTrailingHit = characterHit.TrailingLength > 0;
+            var flowDirection = _paragraphProperties.FlowDirection;
             var characterIndex = characterHit.FirstCharacterIndex + characterHit.TrailingLength;
-            var currentDistance = Start;
             var currentPosition = FirstTextSourceIndex;
             var remainingLength = characterIndex - FirstTextSourceIndex;
 
-            GlyphRun? lastRun = null;
+            var currentDistance = Start;
 
-            for (var index = 0; index < _textRuns.Count; index++)
+            if (flowDirection == FlowDirection.LeftToRight)
+            {
+                for (var index = 0; index < _textRuns.Count; index++)
+                {
+                    var currentRun = _textRuns[index];
+
+                    if (TryGetDistanceFromCharacterHit(currentRun, characterHit, currentPosition, remainingLength,
+                        flowDirection, out var distance, out _))
+                    {
+                        return currentDistance + distance;
+                    }
+
+                    //No hit hit found so we add the full width
+                    currentDistance += currentRun.Size.Width;
+                    currentPosition += currentRun.TextSourceLength;
+                    remainingLength -= currentRun.TextSourceLength;
+                }
+            }
+            else
             {
-                var textRun = _textRuns[index];
+                currentDistance += WidthIncludingTrailingWhitespace;
 
-                switch (textRun)
+                for (var index = _textRuns.Count - 1; index >= 0; index--)
                 {
-                    case ShapedTextCharacters shapedTextCharacters:
+                    var currentRun = _textRuns[index];
+
+                    if (TryGetDistanceFromCharacterHit(currentRun, characterHit, currentPosition, remainingLength,
+                        flowDirection, out var distance, out var currentGlyphRun))
+                    {
+                        if (currentGlyphRun != null)
                         {
-                            var currentRun = shapedTextCharacters.GlyphRun;
+                            distance = currentGlyphRun.Size.Width - distance;
+                        }
 
-                            if (lastRun != null)
-                            {
-                                if (!lastRun.IsLeftToRight && currentRun.IsLeftToRight &&
-                                    currentRun.Characters.Start == characterHit.FirstCharacterIndex &&
-                                    characterHit.TrailingLength == 0)
-                                {
-                                    return currentDistance;
-                                }
-                            }
+                        return currentDistance - distance;
+                    }
 
-                            //Look for a hit in within the current run
-                            if (currentPosition + remainingLength <= currentPosition + textRun.Text.Length)
-                            {
-                                characterHit = new CharacterHit(textRun.Text.Start + remainingLength);
+                    //No hit hit found so we add the full width
+                    currentDistance -= currentRun.Size.Width;
+                    currentPosition += currentRun.TextSourceLength;
+                    remainingLength -= currentRun.TextSourceLength;
+                }
+            }
 
-                                var distance = currentRun.GetDistanceFromCharacterHit(characterHit);
+            return currentDistance;
+        }
 
-                                return currentDistance + distance;
-                            }
+        private static bool TryGetDistanceFromCharacterHit(
+            DrawableTextRun currentRun,
+            CharacterHit characterHit,
+            int currentPosition,
+            int remainingLength,
+            FlowDirection flowDirection,
+            out double distance,
+            out GlyphRun? currentGlyphRun)
+        {
+            var characterIndex = characterHit.FirstCharacterIndex + characterHit.TrailingLength;
+            var isTrailingHit = characterHit.TrailingLength > 0;
 
-                            //Look at the left and right edge of the current run
-                            if (currentRun.IsLeftToRight)
-                            {
-                                if (_resolvedFlowDirection == FlowDirection.LeftToRight && (lastRun == null || lastRun.IsLeftToRight))
-                                {
-                                    if (characterIndex <= currentPosition)
-                                    {
-                                        return currentDistance;
-                                    }
-                                }
-                                else
-                                {
-                                    if (characterIndex == currentPosition)
-                                    {
-                                        return currentDistance;
-                                    }
-                                }
+            distance = 0;
+            currentGlyphRun = null;
 
-                                if (characterIndex == currentPosition + textRun.Text.Length && isTrailingHit)
-                                {
-                                    return currentDistance + currentRun.Size.Width;
-                                }
-                            }
-                            else
-                            {
-                                if (characterIndex == currentPosition)
-                                {
-                                    return currentDistance + currentRun.Size.Width;
-                                }
-
-                                var nextRun = index + 1 < _textRuns.Count ?
-                                    _textRuns[index + 1] as ShapedTextCharacters :
-                                    null;
+            switch (currentRun)
+            {
+                case ShapedTextCharacters shapedTextCharacters:
+                    {
+                        currentGlyphRun = shapedTextCharacters.GlyphRun;
 
-                                if (nextRun != null)
-                                {
-                                    if (nextRun.ShapedBuffer.IsLeftToRight)
-                                    {
-                                        if (characterIndex == currentPosition + textRun.Text.Length)
-                                        {
-                                            return currentDistance;
-                                        }
-                                    }
-                                    else
-                                    {
-                                        if (currentPosition + nextRun.Text.Length == characterIndex)
-                                        {
-                                            return currentDistance;
-                                        }
-                                    }
-                                }
-                                else
-                                {
-                                    if (characterIndex > currentPosition + textRun.Text.Length)
-                                    {
-                                        return currentDistance;
-                                    }
-                                }
-                            }
+                        if (currentPosition + remainingLength < currentPosition + currentRun.Text.Length)
+                        {
+                            characterHit = new CharacterHit(currentRun.Text.Start + remainingLength);
 
-                            lastRun = currentRun;
+                            distance = currentGlyphRun.GetDistanceFromCharacterHit(characterHit);
 
-                            break;
+                            return true;
                         }
-                    default:
+
+                        if (currentPosition + remainingLength == currentPosition + currentRun.Text.Length && isTrailingHit)
                         {
-                            if (characterIndex == currentPosition)
+                            if (currentGlyphRun.IsLeftToRight || flowDirection == FlowDirection.RightToLeft)
                             {
-                                return currentDistance;
+                                distance = currentGlyphRun.Size.Width;
                             }
 
-                            if (characterIndex == currentPosition + textRun.TextSourceLength)
-                            {
-                                return currentDistance + textRun.Size.Width;
-                            }
+                            return true;
+                        }
 
-                            break;
+                        break;
+                    }
+                default:
+                    {
+                        if (characterIndex == currentPosition)
+                        {
+                            return true;
                         }
-                }
 
-                //No hit hit found so we add the full width
-                currentDistance += textRun.Size.Width;
-                currentPosition += textRun.TextSourceLength;
-                remainingLength -= textRun.TextSourceLength;
+                        if (characterIndex == currentPosition + currentRun.TextSourceLength)
+                        {
+                            distance = currentRun.Size.Width;
 
-                if (remainingLength <= 0)
-                {
-                    break;
-                }
+                            return true;
+
+                        }
+
+                        break;
+                    }
             }
 
-            return currentDistance;
+            return false;
         }
 
         /// <inheritdoc/>
@@ -460,20 +462,33 @@ namespace Avalonia.Media.TextFormatting
 
                     var startIndex = currentRun.Text.Start + offset;
 
-                    var endOffset = currentShapedRun.GlyphRun.GetDistanceFromCharacterHit(
-                       currentShapedRun.ShapedBuffer.IsLeftToRight ?
-                            new CharacterHit(startIndex + remainingLength) :
-                            new CharacterHit(startIndex));
+                    double startOffset;
+                    double endOffset;
 
-                    endX += endOffset;
+                    if (currentShapedRun.ShapedBuffer.IsLeftToRight)
+                    {
+                        startOffset = currentShapedRun.GlyphRun.GetDistanceFromCharacterHit(new CharacterHit(startIndex));
+
+                        endOffset = currentShapedRun.GlyphRun.GetDistanceFromCharacterHit(new CharacterHit(startIndex + remainingLength));
+                    }
+                    else
+                    {
+                        endOffset = currentShapedRun.GlyphRun.GetDistanceFromCharacterHit(new CharacterHit(startIndex));
 
-                    var startOffset = currentShapedRun.GlyphRun.GetDistanceFromCharacterHit(
-                        currentShapedRun.ShapedBuffer.IsLeftToRight ?
-                            new CharacterHit(startIndex) :
-                            new CharacterHit(startIndex + remainingLength));
+                        if (currentPosition < startIndex)
+                        {
+                            startOffset = endOffset;
+                        }
+                        else
+                        {
+                            startOffset = currentShapedRun.GlyphRun.GetDistanceFromCharacterHit(new CharacterHit(startIndex + remainingLength));
+                        }
+                    }
 
                     startX += startOffset;
 
+                    endX += endOffset;
+
                     var endHit = currentShapedRun.GlyphRun.GetCharacterHitFromDistance(endOffset, out _);
                     var startHit = currentShapedRun.GlyphRun.GetCharacterHitFromDistance(startOffset, out _);
 
@@ -504,7 +519,7 @@ namespace Avalonia.Media.TextFormatting
                 }
 
                 //Lines that only contain a linebreak need to be covered here
-                if(characterLength == 0)
+                if (characterLength == 0)
                 {
                     characterLength = NewLineLength;
                 }
@@ -532,19 +547,9 @@ namespace Avalonia.Media.TextFormatting
                 currentWidth += runwidth;
                 currentPosition += characterLength;
 
-                if (currentDirection == FlowDirection.LeftToRight)
+                if (currentPosition > characterIndex)
                 {
-                    if (currentPosition > characterIndex)
-                    {
-                        break;
-                    }
-                }
-                else
-                {
-                    if (currentPosition <= firstTextSourceIndex)
-                    {
-                        break;
-                    }
+                    break;
                 }
 
                 startX = endX;
@@ -571,7 +576,7 @@ namespace Avalonia.Media.TextFormatting
             var currentPosition = FirstTextSourceIndex;
             var remainingLength = textLength;
 
-            var startX = Start + WidthIncludingTrailingWhitespace;
+            var startX = WidthIncludingTrailingWhitespace;
             double currentWidth = 0;
             var currentRect = Rect.Empty;
 
@@ -582,7 +587,7 @@ namespace Avalonia.Media.TextFormatting
                     continue;
                 }
 
-                if (currentPosition + currentRun.TextSourceLength <= firstTextSourceIndex)
+                if (currentPosition + currentRun.TextSourceLength < firstTextSourceIndex)
                 {
                     startX -= currentRun.Size.Width;
 
@@ -601,20 +606,31 @@ namespace Avalonia.Media.TextFormatting
                     currentPosition += offset;
 
                     var startIndex = currentRun.Text.Start + offset;
+                    double startOffset;
+                    double endOffset;
 
-                    var endOffset = currentShapedRun.GlyphRun.GetDistanceFromCharacterHit(
-                        currentShapedRun.ShapedBuffer.IsLeftToRight ?
-                            new CharacterHit(startIndex + remainingLength) :
-                            new CharacterHit(startIndex));
+                    if (currentShapedRun.ShapedBuffer.IsLeftToRight)
+                    {
+                        if (currentPosition < startIndex)
+                        {
+                            startOffset = endOffset = 0;
+                        }
+                        else
+                        {
+                            endOffset = currentShapedRun.GlyphRun.GetDistanceFromCharacterHit(new CharacterHit(startIndex + remainingLength));
 
-                    endX += endOffset - currentShapedRun.Size.Width;
+                            startOffset = currentShapedRun.GlyphRun.GetDistanceFromCharacterHit(new CharacterHit(startIndex));
+                        }
+                    }
+                    else
+                    {
+                        endOffset = currentShapedRun.GlyphRun.GetDistanceFromCharacterHit(new CharacterHit(startIndex));
 
-                    var startOffset = currentShapedRun.GlyphRun.GetDistanceFromCharacterHit(
-                        currentShapedRun.ShapedBuffer.IsLeftToRight ?
-                            new CharacterHit(startIndex) :
-                            new CharacterHit(startIndex + remainingLength));
+                        startOffset = currentShapedRun.GlyphRun.GetDistanceFromCharacterHit(new CharacterHit(startIndex + remainingLength));
+                    }
 
-                    startX += startOffset - currentShapedRun.Size.Width;
+                    startX -= currentRun.Size.Width - startOffset;
+                    endX -= currentRun.Size.Width - endOffset;
 
                     var endHit = currentShapedRun.GlyphRun.GetCharacterHitFromDistance(endOffset, out _);
                     var startHit = currentShapedRun.GlyphRun.GetCharacterHitFromDistance(startOffset, out _);
@@ -652,9 +668,10 @@ namespace Avalonia.Media.TextFormatting
                 }
 
                 var runWidth = endX - startX;
-                var currentRunBounds = new TextRunBounds(new Rect(startX, 0, runWidth, Height), currentPosition, characterLength, currentRun);
 
-                if (lastDirection == currentDirection && result.Count > 0 && MathUtilities.AreClose(currentRect.Right, startX))
+                var currentRunBounds = new TextRunBounds(new Rect(Start + startX, 0, runWidth, Height), currentPosition, characterLength, currentRun);
+
+                if (lastDirection == currentDirection && result.Count > 0 && MathUtilities.AreClose(currentRect.Right, Start + startX))
                 {
                     currentRect = currentRect.WithWidth(currentWidth + runWidth);
 
@@ -674,19 +691,9 @@ namespace Avalonia.Media.TextFormatting
                 currentWidth += runWidth;
                 currentPosition += characterLength;
 
-                if (currentDirection == FlowDirection.LeftToRight)
+                if (currentPosition > characterIndex)
                 {
-                    if (currentPosition > characterIndex)
-                    {
-                        break;
-                    }
-                }
-                else
-                {
-                    if (currentPosition <= firstTextSourceIndex)
-                    {
-                        break;
-                    }
+                    break;
                 }
 
                 lastDirection = currentDirection;
diff --git a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs
index 7e1103d624..631d0881b0 100644
--- a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs
+++ b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs
@@ -154,7 +154,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                     {
                         j += inner.Current.Text.Length;
 
-                        if(j + i > text.Length)
+                        if (j + i > text.Length)
                         {
                             break;
                         }
@@ -738,7 +738,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                 var textLine = layout.TextLines[0];
 
                 var start = textLine.GetDistanceFromCharacterHit(new CharacterHit(5, 1));
-                
+
                 var end = textLine.GetDistanceFromCharacterHit(new CharacterHit(6, 1));
 
                 var rects = layout.HitTestTextRange(0, 7).ToArray();
@@ -746,7 +746,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                 Assert.Equal(1, rects.Length);
 
                 var expected = rects[0];
-                
+
                 Assert.Equal(expected.Left, start);
                 Assert.Equal(expected.Right, end);
             }
@@ -818,11 +818,11 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                         var expected = text.Substring(textLine.FirstTextSourceIndex, textLine.Length);
 
                         Assert.Equal(expected, actual);
-                    }                  
+                    }
                 }
             }
         }
-        
+
         [Fact]
         public void Should_Layout_Empty_String()
         {
@@ -833,11 +833,83 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                     Typeface.Default,
                     12,
                     Brushes.Black);
-                
+
                 Assert.True(layout.Bounds.Height > 0);
             }
         }
 
+        [Fact]
+        public void Should_HitTestPoint_RightToLeft()
+        {
+            using (Start())
+            {
+                var text = "אאא AAA";
+
+                var layout = new TextLayout(
+                    text,
+                    Typeface.Default,
+                    12,
+                    Brushes.Black,
+                    flowDirection: FlowDirection.RightToLeft);
+
+                var firstRun = layout.TextLines[0].TextRuns[0] as ShapedTextCharacters;
+
+                var hit = layout.HitTestPoint(new Point());
+
+                Assert.Equal(4, hit.TextPosition);
+
+                var currentX = 0.0;
+
+                for (var i = 0; i < firstRun.GlyphRun.GlyphClusters.Count; i++)
+                {
+                    var cluster = firstRun.GlyphRun.GlyphClusters[i];
+                    var advance = firstRun.GlyphRun.GlyphAdvances[i];
+
+                    hit = layout.HitTestPoint(new Point(currentX, 0));
+
+                    Assert.Equal(cluster, hit.TextPosition);
+
+                    var hitRange = layout.HitTestTextRange(hit.TextPosition, 1);
+
+                    var distance = hitRange.First().Left;
+
+                    Assert.Equal(currentX, distance);
+
+                    currentX += advance;
+                }
+
+                var secondRun = layout.TextLines[0].TextRuns[1] as ShapedTextCharacters;
+
+                hit = layout.HitTestPoint(new Point(firstRun.Size.Width, 0));
+
+                Assert.Equal(7, hit.TextPosition);
+
+                hit = layout.HitTestPoint(new Point(layout.TextLines[0].WidthIncludingTrailingWhitespace, 0));
+
+                Assert.Equal(0, hit.TextPosition);
+
+                currentX = firstRun.Size.Width + 0.5;
+
+                for (var i = 0; i < secondRun.GlyphRun.GlyphClusters.Count; i++)
+                {
+                    var cluster = secondRun.GlyphRun.GlyphClusters[i];
+                    var advance = secondRun.GlyphRun.GlyphAdvances[i];
+
+                    hit = layout.HitTestPoint(new Point(currentX, 0));
+
+                    Assert.Equal(cluster, hit.CharacterHit.FirstCharacterIndex);
+
+                    var hitRange = layout.HitTestTextRange(hit.CharacterHit.FirstCharacterIndex, hit.CharacterHit.TrailingLength);
+
+                    var distance = hitRange.First().Left + 0.5;
+
+                    Assert.Equal(currentX, distance);
+
+                    currentX += advance;
+                }
+            }
+        }
+
         private static IDisposable Start()
         {
             var disposable = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface

From 2b3608078ea33439364d5ff61cf1868e2026b3bf Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 7 Jul 2022 11:03:55 +0200
Subject: [PATCH 049/240] WIP: Porting fluent theme to use control themes.

Co-Authored-By: Takoooooo <tako0qq@gmail.com>
---
 .../DateTimePickers/DateTimePickerPanel.cs    |   2 +-
 .../Controls/AutoCompleteBox.xaml             | 110 ++--
 .../Controls/Button.xaml                      |  41 +-
 .../Controls/ButtonSpinner.xaml               | 229 +++----
 .../Controls/Calendar.xaml                    |  56 +-
 .../Controls/CalendarButton.xaml              | 204 +++---
 .../Controls/CalendarDatePicker.xaml          | 346 +++++-----
 .../Controls/CalendarDayButton.xaml           | 194 +++---
 .../Controls/CalendarItem.xaml                | 275 ++++----
 .../Controls/CaptionButtons.xaml              | 129 ++--
 .../Controls/Carousel.xaml                    |  37 +-
 .../Controls/CheckBox.xaml                    | 572 ++++++++--------
 .../Controls/ComboBox.xaml                    | 440 ++++++-------
 .../Controls/ComboBoxItem.xaml                | 171 +++--
 .../Controls/Common.xaml                      |   6 -
 .../Controls/ContentControl.xaml              |  35 +-
 .../Controls/ContextMenu.xaml                 | 136 ++--
 .../Controls/DataValidationErrors.xaml        | 207 +++---
 .../Controls/DatePicker.xaml                  | 622 +++++++++---------
 .../Controls/DropDownButton.xaml              | 198 +++---
 .../Controls/EmbeddableControlRoot.xaml       |  42 +-
 .../Controls/Expander.xaml                    | 354 +++++-----
 .../Controls/FluentControls.xaml              | 146 ++--
 .../Controls/FlyoutPresenter.xaml             |  14 +-
 .../Controls/FocusAdorner.xaml                |   2 +-
 .../Controls/GridSplitter.xaml                |  46 +-
 .../Controls/ItemsControl.xaml                |  35 +-
 .../Controls/Label.xaml                       |  40 +-
 .../Controls/ListBox.xaml                     |  92 +--
 .../Controls/ListBoxItem.xaml                 | 155 ++---
 .../Controls/ManagedFileChooser.xaml          | 608 ++++++++---------
 src/Avalonia.Themes.Fluent/Controls/Menu.xaml |  65 +-
 .../Controls/MenuFlyoutPresenter.xaml         |  69 +-
 .../Controls/MenuItem.xaml                    |   4 +-
 .../Controls/NativeMenuBar.xaml               |  59 +-
 .../Controls/NotificationCard.xaml            |  37 +-
 .../Controls/NumericUpDown.xaml               | 135 ++--
 .../Controls/OverlayPopupHost.xaml            |  43 +-
 .../Controls/PathIcon.xaml                    |  55 +-
 .../Controls/PopupRoot.xaml                   |  56 +-
 .../Controls/ProgressBar.xaml                 | 343 +++++-----
 .../Controls/RadioButton.xaml                 | 286 ++++----
 .../Controls/RepeatButton.xaml                | 118 ++--
 .../Controls/ScrollBar.xaml                   |   2 +-
 .../Controls/ScrollViewer.xaml                | 245 +++----
 .../Controls/Separator.xaml                   |  15 +-
 .../Controls/Slider.xaml                      | 603 ++++++++++-------
 .../Controls/SplitButton.xaml                 |   1 -
 .../Controls/SplitView.xaml                   |   2 +-
 .../Controls/TabControl.xaml                  | 122 ++--
 .../Controls/TabItem.xaml                     | 237 +++----
 .../Controls/TabStrip.xaml                    |  66 +-
 .../Controls/TabStripItem.xaml                | 193 +++---
 .../Controls/TextBox.xaml                     |  62 +-
 .../Controls/TimePicker.xaml                  | 409 ++++--------
 .../Controls/TitleBar.xaml                    |  94 +--
 .../Controls/ToggleButton.xaml                | 189 +++---
 .../Controls/ToggleSwitch.xaml                | 585 ++++++++--------
 .../Controls/ToolTip.xaml                     | 146 ++--
 .../Controls/TransitioningContentControl.xaml |  39 +-
 .../Controls/TreeView.xaml                    |  59 +-
 .../Controls/TreeViewItem.xaml                |   3 +-
 .../Controls/UserControl.xaml                 |  38 +-
 .../Controls/Window.xaml                      |  57 +-
 .../Controls/WindowNotificationManager.xaml   |  97 +--
 65 files changed, 4976 insertions(+), 5102 deletions(-)
 delete mode 100644 src/Avalonia.Themes.Fluent/Controls/Common.xaml

diff --git a/src/Avalonia.Controls/DateTimePickers/DateTimePickerPanel.cs b/src/Avalonia.Controls/DateTimePickers/DateTimePickerPanel.cs
index 667f994a1d..3fdfbee54d 100644
--- a/src/Avalonia.Controls/DateTimePickers/DateTimePickerPanel.cs
+++ b/src/Avalonia.Controls/DateTimePickers/DateTimePickerPanel.cs
@@ -454,7 +454,7 @@ namespace Avalonia.Controls.Primitives
                 children.Add(new ListBoxItem
                 {
                     Height = ItemHeight,
-                    Classes = new Classes("DateTimePickerItem", $"{PanelType}Item"),
+                    Classes = new Classes($"{PanelType}Item"),
                     VerticalContentAlignment = Avalonia.Layout.VerticalAlignment.Center,
                     Focusable = false
                 });
diff --git a/src/Avalonia.Themes.Fluent/Controls/AutoCompleteBox.xaml b/src/Avalonia.Themes.Fluent/Controls/AutoCompleteBox.xaml
index 58295d024f..6004d42120 100644
--- a/src/Avalonia.Themes.Fluent/Controls/AutoCompleteBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/AutoCompleteBox.xaml
@@ -1,5 +1,5 @@
-<Styles xmlns="https://github.com/avaloniaui" 
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Design.PreviewWith>
     <Border Padding="20">
       <AutoCompleteBox Width="200">
@@ -16,56 +16,56 @@
       </AutoCompleteBox>
     </Border>
   </Design.PreviewWith>
-
-  <Style Selector="AutoCompleteBox">
-    <Setter Property="VerticalAlignment" Value="Top" />
-    <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}" />
-    <Setter Property="Background" Value="{DynamicResource TextControlBackground}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrush}" />
-    <Setter Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThickness}" />
-    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-    <Setter Property="Padding" Value="{DynamicResource TextControlThemePadding}" />
-    <Setter Property="MaxDropDownHeight" Value="{DynamicResource AutoCompleteListMaxHeight}" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Grid Name="PART_LayoutRoot">
-          <TextBox Name="PART_TextBox"
-                   Watermark="{TemplateBinding Watermark}"
-                   Width="{TemplateBinding Width}"
-                   Foreground="{TemplateBinding Foreground}"
-                   Background="{TemplateBinding Background}"
-                   BorderBrush="{TemplateBinding BorderBrush}"
-                   BorderThickness="{TemplateBinding BorderThickness}"
-                   CornerRadius="{TemplateBinding CornerRadius}"
-                   FontSize="{TemplateBinding FontSize}"
-                   FontFamily="{TemplateBinding FontFamily}"
-                   FontWeight="{TemplateBinding FontWeight}"
-                   Padding="{TemplateBinding Padding}"
-                   Margin="0"
-                   DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}" />
-          
-          <Popup Name="PART_Popup"
-                 WindowManagerAddShadowHint="False"
-                 MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
-                 MaxHeight="{TemplateBinding MaxDropDownHeight}"
-                 IsLightDismissEnabled="True"
-                 PlacementTarget="{TemplateBinding}">            
-            <Border Name="PART_SuggestionsContainer"
-                    Padding="{DynamicResource AutoCompleteListMargin}"
-                    BorderThickness="{DynamicResource AutoCompleteListBorderThemeThickness}"
-                    BorderBrush="{DynamicResource AutoCompleteBoxSuggestionsListBorderBrush}"
-                    Background="{DynamicResource AutoCompleteBoxSuggestionsListBackground}"
-                    CornerRadius="{DynamicResource OverlayCornerRadius}">
-              <ListBox Name="PART_SelectingItemsControl"
-                       BorderThickness="0"
-                       Background="Transparent"
-                       ItemTemplate="{TemplateBinding ItemTemplate}"
-                       Margin="{DynamicResource AutoCompleteListPadding}" />
-            </Border>
-          </Popup>
-        </Grid>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-</Styles>
+  
+    <ControlTheme x:Key="{x:Type AutoCompleteBox}" TargetType="AutoCompleteBox">
+      <Setter Property="VerticalAlignment" Value="Top" />
+      <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}" />
+      <Setter Property="Background" Value="{DynamicResource TextControlBackground}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrush}" />
+      <Setter Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThickness}" />
+      <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+      <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+      <Setter Property="Padding" Value="{DynamicResource TextControlThemePadding}" />
+      <Setter Property="MaxDropDownHeight" Value="{DynamicResource AutoCompleteListMaxHeight}" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Grid Name="PART_LayoutRoot">
+            <TextBox Name="PART_TextBox"
+                     Watermark="{TemplateBinding Watermark}"
+                     Width="{TemplateBinding Width}"
+                     Foreground="{TemplateBinding Foreground}"
+                     Background="{TemplateBinding Background}"
+                     BorderBrush="{TemplateBinding BorderBrush}"
+                     BorderThickness="{TemplateBinding BorderThickness}"
+                     CornerRadius="{TemplateBinding CornerRadius}"
+                     FontSize="{TemplateBinding FontSize}"
+                     FontFamily="{TemplateBinding FontFamily}"
+                     FontWeight="{TemplateBinding FontWeight}"
+                     Padding="{TemplateBinding Padding}"
+                     Margin="0"
+                     DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}" />
+            <Popup Name="PART_Popup" 
+                   WindowManagerAddShadowHint="False"
+                   MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}" 
+                   MaxHeight="{TemplateBinding MaxDropDownHeight}"
+                   IsLightDismissEnabled="True"
+                   PlacementTarget="{TemplateBinding}">
+              <Border Name="PART_SuggestionsContainer"
+                      Padding="{DynamicResource AutoCompleteListMargin}"
+                      BorderThickness="{DynamicResource AutoCompleteListBorderThemeThickness}"
+                      BorderBrush="{DynamicResource AutoCompleteBoxSuggestionsListBorderBrush}"
+                      Background="{DynamicResource AutoCompleteBoxSuggestionsListBackground}"
+                      CornerRadius="{DynamicResource OverlayCornerRadius}">
+                <ListBox Name="PART_SelectingItemsControl"
+                         BorderThickness="0"
+                         Background="Transparent"
+                         ItemTemplate="{TemplateBinding ItemTemplate}"
+                         Margin="{DynamicResource AutoCompleteListPadding}" />
+              </Border>
+            </Popup>
+          </Grid>
+        </ControlTemplate>
+      </Setter>
+    </ControlTheme>
+  
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/Button.xaml b/src/Avalonia.Themes.Fluent/Controls/Button.xaml
index 3fb0d43342..b8fea84ae0 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Button.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Button.xaml
@@ -1,4 +1,5 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Design.PreviewWith>
     <Border Padding="20">
       <StackPanel Spacing="20">
@@ -7,14 +8,11 @@
       </StackPanel>
     </Border>
   </Design.PreviewWith>
-
-  <Styles.Resources>
-    <Thickness x:Key="ButtonPadding">8,5,8,6</Thickness>
-  </Styles.Resources>
   
-  <Style Selector="Button">
+  <Thickness x:Key="ButtonPadding">8,5,8,6</Thickness>
+
+  <ControlTheme x:Key="{x:Type Button}" TargetType="Button">
     <Setter Property="Background" Value="{DynamicResource ButtonBackground}" />
-    <!--<Setter Property="BackgroundSizing" Value="OuterBorderEdge" />-->
     <Setter Property="Foreground" Value="{DynamicResource ButtonForeground}" />
     <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrush}" />
     <Setter Property="BorderThickness" Value="{DynamicResource ButtonBorderThemeThickness}" />
@@ -22,8 +20,13 @@
     <Setter Property="Padding" Value="{DynamicResource ButtonPadding}" />
     <Setter Property="HorizontalAlignment" Value="Left" />
     <Setter Property="VerticalAlignment" Value="Center" />
-    <!--<Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
-    <Setter Property="FocusVisualMargin" Value="-3" />-->
+    <Setter Property="RenderTransform" Value="none" />
+    <Setter Property="Transitions">
+      <Transitions>
+        <TransformOperationsTransition Property="RenderTransform" Duration="0:0:.075" />
+      </Transitions>
+    </Setter>
+
     <Setter Property="Template">
       <ControlTemplate>
         <ContentPresenter x:Name="PART_ContentPresenter"
@@ -83,19 +86,9 @@
         <Setter Property="Foreground" Value="{DynamicResource AccentButtonForegroundDisabled}" />
       </Style>
     </Style>
-  </Style>
 
-  <Style Selector="Button, RepeatButton, ToggleButton, DropDownButton">
-    <Setter Property="RenderTransform" Value="none" />
-    <Setter Property="Transitions">
-      <Transitions>
-        <TransformOperationsTransition Property="RenderTransform" Duration="0:0:.075" />
-      </Transitions>
-    </Setter>
-  </Style>
-
-  <Style Selector="Button:pressed, RepeatButton:pressed, ToggleButton:pressed, DropDownButton:pressed">
-    <Setter Property="RenderTransform" Value="scale(0.98)" />    
-  </Style>
-
-</Styles>
+    <Style Selector="^:pressed">
+      <Setter Property="RenderTransform" Value="scale(0.98)" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml b/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml
index 836cc27db3..a5234f5771 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml
@@ -1,28 +1,26 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:sys="clr-namespace:System;assembly=netstandard"
-        xmlns:converters="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls"
-        x:CompileBindings="True">
-  <Design.PreviewWith>
-    <Border Padding="20"
-            Background="Black">
-      <StackPanel Spacing="20">
-        <ButtonSpinner ButtonSpinnerLocation="Right"
-                       Content="Right disabled inline spinner"
-                       AllowSpin="False">
-          <DataValidationErrors.Error>
-            <sys:Exception />
-          </DataValidationErrors.Error>
-        </ButtonSpinner>
-        <ButtonSpinner ButtonSpinnerLocation="Left"
-                       Content="Left spinner" />
-        <ButtonSpinner ShowButtonSpinner="False"
-                       Content="Hide spinner" />
-      </StackPanel>
-    </Border>
-  </Design.PreviewWith>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:sys="clr-namespace:System;assembly=netstandard"
+                    xmlns:converters="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls"
+                    x:CompileBindings="True">
+    <Design.PreviewWith>
+      <Border Padding="20" Background="Black">
+        <StackPanel Spacing="20">
+          <ButtonSpinner ButtonSpinnerLocation="Right"
+                         Content="Right disabled inline spinner"
+                         AllowSpin="False">
+            <DataValidationErrors.Error>
+              <sys:Exception />
+            </DataValidationErrors.Error>
+          </ButtonSpinner>
+          <ButtonSpinner ButtonSpinnerLocation="Left"
+                         Content="Left spinner" />
+          <ButtonSpinner ShowButtonSpinner="False"
+                         Content="Hide spinner" />
+        </StackPanel>
+      </Border>
+    </Design.PreviewWith>
 
-  <Styles.Resources>
     <converters:MarginMultiplierConverter x:Key="ButtonSpinner_OnlyLeftThinknessConverter"
                                           Indent="1"
                                           Left="True" />
@@ -32,118 +30,79 @@
 
     <StreamGeometry x:Key="ButtonSpinnerIncreaseButtonIcon">M0,9 L10,0 20,9 19,10 10,2 1,10 z</StreamGeometry>
     <StreamGeometry x:Key="ButtonSpinnerDecreaseButtonIcon">M0,1 L10,10 20,1 19,0 10,8 1,0 z</StreamGeometry>
-  </Styles.Resources>
 
-  <!--  RepeatButton.ButtonSpinnerRepeatButton  -->
-  <Style Selector="RepeatButton.ButtonSpinnerRepeatButton">
-    <Setter Property="MinWidth" Value="34" />
-    <Setter Property="VerticalAlignment" Value="Stretch" />
-  </Style>
+    <ControlTheme x:Key="{x:Type ButtonSpinner}" TargetType="ButtonSpinner">
+      <Setter Property="Background" Value="Transparent" />
+      <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}" />
+      <Setter Property="Padding" Value="10, 0" />
+      <Setter Property="Background" Value="{DynamicResource TextControlBackground}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrush}" />
+      <Setter Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThickness}" />
+      <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+      <Setter Property="MinHeight" Value="{DynamicResource TextControlThemeMinHeight}" />
+      <Setter Property="MinWidth" Value="{DynamicResource TextControlThemeMinWidth}" />
+      <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+      <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="Focusable" Value="True" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <DataValidationErrors>
+            <Border Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    CornerRadius="{TemplateBinding CornerRadius}"
+                    MinHeight="{TemplateBinding MinHeight}">
+              <Grid ColumnDefinitions="Auto,*,Auto">
+                <ContentPresenter Name="PART_ContentPresenter"
+                                  Grid.Column="1"
+                                  ContentTemplate="{TemplateBinding ContentTemplate}"
+                                  Content="{TemplateBinding Content}"
+                                  HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                  VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                  Padding="{TemplateBinding Padding}" />
+                <StackPanel Name="PART_SpinnerPanel"
+                            Orientation="Horizontal"
+                            IsVisible="{TemplateBinding ShowButtonSpinner}">
+                  <RepeatButton Name="PART_IncreaseButton"
+                                Classes="ButtonSpinnerRepeatButton"
+                                VerticalContentAlignment="Center"
+                                Foreground="{TemplateBinding Foreground}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                Background="{TemplateBinding Background}"
+                                FontSize="{TemplateBinding FontSize}">
+                    <Path Fill="{TemplateBinding Foreground}" Width="16" Height="8" Stretch="Uniform" HorizontalAlignment="Center" VerticalAlignment="Center" Data="{StaticResource ButtonSpinnerIncreaseButtonIcon}" />
+                  </RepeatButton>
+                  <RepeatButton Name="PART_DecreaseButton" Classes="ButtonSpinnerRepeatButton" Foreground="{TemplateBinding Foreground}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" VerticalContentAlignment="Center" FontSize="{TemplateBinding FontSize}">
+                    <Path Fill="{TemplateBinding Foreground}" Width="16" Height="8" Stretch="Uniform" HorizontalAlignment="Center" VerticalAlignment="Center" Data="{StaticResource ButtonSpinnerDecreaseButtonIcon}" />
+                  </RepeatButton>
+                </StackPanel>
+              </Grid>
+            </Border>
+          </DataValidationErrors>
+        </ControlTemplate>
+      </Setter>
 
-  <Style Selector="RepeatButton.ButtonSpinnerRepeatButton /template/ ContentPresenter">
-    <Setter Property="CornerRadius" Value="0" />
-    <Setter Property="BorderBrush" Value="{TemplateBinding BorderBrush}" />
-  </Style>
-  <Style Selector="RepeatButton.ButtonSpinnerRepeatButton:disabled">
-    <Setter Property="BorderBrush" Value="{TemplateBinding BorderBrush}" />
-  </Style>
-  <Style Selector="RepeatButton.ButtonSpinnerRepeatButton:disabled > Path">
-    <Setter Property="Fill" Value="{DynamicResource RepeatButtonForegroundDisabled}" />
-  </Style>
+      <Style Selector="^:error">
+        <Setter Property="BorderBrush" Value="{DynamicResource SystemErrorTextColor}" />
+      </Style>
 
-  <!--  ButtonSpinner  -->
-  <Style Selector="ButtonSpinner">
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}" />
-    <Setter Property="Padding" Value="10, 0" />
-    <Setter Property="Background" Value="{DynamicResource TextControlBackground}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrush}" />
-    <Setter Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThickness}" />
-    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-    <Setter Property="MinHeight" Value="{DynamicResource TextControlThemeMinHeight}" />
-    <Setter Property="MinWidth" Value="{DynamicResource TextControlThemeMinWidth}" />    
-    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="Focusable" Value="True"/>
-    <Setter Property="Template">
-      <ControlTemplate>
-        <DataValidationErrors>
-          <Border Background="{TemplateBinding Background}"
-                  BorderBrush="{TemplateBinding BorderBrush}"
-                  BorderThickness="{TemplateBinding BorderThickness}"
-                  CornerRadius="{TemplateBinding CornerRadius}"
-                  MinHeight="{TemplateBinding MinHeight}">
-            <Grid ColumnDefinitions="Auto,*,Auto">
-              <ContentPresenter Name="PART_ContentPresenter"
-                                Grid.Column="1"
-                                ContentTemplate="{TemplateBinding ContentTemplate}"
-                                Content="{TemplateBinding Content}"
-                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                Padding="{TemplateBinding Padding}" />
+      <Style Selector="^:left /template/">
+        <Style Selector="^ StackPanel#PART_SpinnerPanel">
+          <Setter Property="Grid.Column" Value="0" />
+        </Style>
+        <Style Selector="^ RepeatButton.ButtonSpinnerRepeatButton">
+          <Setter Property="BorderThickness" Value="{Binding $parent[ButtonSpinner].BorderThickness, Converter={StaticResource ButtonSpinner_OnlyRightThinknessConverter}}" />
+        </Style>
+      </Style>
 
-              <StackPanel Name="PART_SpinnerPanel"
-                          Orientation="Horizontal"
-                          IsVisible="{TemplateBinding ShowButtonSpinner}">
-                <RepeatButton Name="PART_IncreaseButton"
-                              Classes="ButtonSpinnerRepeatButton"
-                              VerticalContentAlignment="Center"
-                              Foreground="{TemplateBinding Foreground}"
-                              BorderBrush="{TemplateBinding BorderBrush}"
-                              Background="{TemplateBinding Background}"
-                              FontSize="{TemplateBinding FontSize}">
-                  <Path Fill="{TemplateBinding Foreground}"
-                        Width="16"
-                        Height="8"
-                        Stretch="Uniform"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        Data="{StaticResource ButtonSpinnerIncreaseButtonIcon}" />
-                </RepeatButton>
-
-                <RepeatButton Name="PART_DecreaseButton"
-                              Classes="ButtonSpinnerRepeatButton"
-                              Foreground="{TemplateBinding Foreground}"
-                              BorderBrush="{TemplateBinding BorderBrush}"
-                              Background="{TemplateBinding Background}"
-                              VerticalContentAlignment="Center"
-                              FontSize="{TemplateBinding FontSize}">
-                  <Path Fill="{TemplateBinding Foreground}"
-                        Width="16"
-                        Height="8"
-                        Stretch="Uniform"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        Data="{StaticResource ButtonSpinnerDecreaseButtonIcon}" />
-                </RepeatButton>
-              </StackPanel>
-            </Grid>
-          </Border>
-        </DataValidationErrors>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <!--  ButtonSpinnerLocation=Right  -->
-  <Style Selector="ButtonSpinner:right /template/ StackPanel#PART_SpinnerPanel">
-    <Setter Property="Grid.Column" Value="2" />
-  </Style>
-  <Style Selector="ButtonSpinner:right /template/ RepeatButton.ButtonSpinnerRepeatButton">
-    <Setter Property="BorderThickness" Value="{Binding $parent[ButtonSpinner].BorderThickness, Converter={StaticResource ButtonSpinner_OnlyLeftThinknessConverter}}" />
-  </Style>
-
-  <!--  ButtonSpinnerLocation=Left  -->
-  <Style Selector="ButtonSpinner:left /template/ StackPanel#PART_SpinnerPanel">
-    <Setter Property="Grid.Column" Value="0" />
-  </Style>
-  <Style Selector="ButtonSpinner:left /template/ RepeatButton.ButtonSpinnerRepeatButton">
-    <Setter Property="BorderThickness" Value="{Binding $parent[ButtonSpinner].BorderThickness, Converter={StaticResource ButtonSpinner_OnlyRightThinknessConverter}}" />
-  </Style>
-
-  <!--  Error state  -->
-  <Style Selector="ButtonSpinner:error">
-    <Setter Property="BorderBrush" Value="{DynamicResource SystemErrorTextColor}" />
-  </Style>
-
-</Styles>
+      <Style Selector="^:right /template/">
+        <Style Selector="^ StackPanel#PART_SpinnerPanel">
+          <Setter Property="Grid.Column" Value="2" />
+        </Style>
+        <Style Selector="^ RepeatButton.ButtonSpinnerRepeatButton">
+          <Setter Property="BorderThickness" Value="{Binding $parent[ButtonSpinner].BorderThickness, Converter={StaticResource ButtonSpinner_OnlyLeftThinknessConverter}}" />
+        </Style>
+      </Style>
+    </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/Calendar.xaml b/src/Avalonia.Themes.Fluent/Controls/Calendar.xaml
index 43e4a1fcea..3434f9b6e5 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Calendar.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Calendar.xaml
@@ -1,38 +1,40 @@
-<!--
-// (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.
+<!--
+    // (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.
 -->
 
-<Styles xmlns="https://github.com/avaloniaui">
-  <Design.PreviewWith>
+<ResourceDictionary xmlns="https://github.com/avaloniaui" 
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+   <Design.PreviewWith>
     <Border Padding="20">
       <Calendar />
     </Border>
   </Design.PreviewWith>
-  <Style Selector="Calendar">
-    <Setter Property="Foreground" Value="{DynamicResource CalendarViewForeground}" />
-    <Setter Property="Background" Value="{DynamicResource CalendarViewBackground}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewBorderBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="HorizontalAlignment" Value="Left" />
-    <Setter Property="VerticalAlignment" Value="Center" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <StackPanel Name="Root"
+
+    <ControlTheme x:Key="{x:Type Calendar}" TargetType="Calendar">
+        <Setter Property="Foreground" Value="{DynamicResource CalendarViewForeground}" />
+        <Setter Property="Background" Value="{DynamicResource CalendarViewBackground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewBorderBrush}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="Template">
+            <ControlTemplate>
+                <StackPanel
+                    Name="Root"
                     HorizontalAlignment="Center"
                     ClipToBounds="True">
-
-                    <CalendarItem Name="CalendarItem"
+                    <CalendarItem
+                        Name="CalendarItem"
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
-                        HeaderBackground="{TemplateBinding HeaderBackground}"
-                        CornerRadius="{TemplateBinding CornerRadius}"/>
-
-        </StackPanel>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-</Styles>
+                        CornerRadius="{TemplateBinding CornerRadius}"
+                        HeaderBackground="{TemplateBinding HeaderBackground}" />
+                </StackPanel>
+            </ControlTemplate>
+        </Setter>
+    </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/CalendarButton.xaml b/src/Avalonia.Themes.Fluent/Controls/CalendarButton.xaml
index 3a6af60983..0381022910 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CalendarButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CalendarButton.xaml
@@ -1,121 +1,109 @@
-<!--
+<!--
 // (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.
 -->
+<ResourceDictionary xmlns="https://github.com/avaloniaui" 
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ControlTheme x:Key="{x:Type CalendarButton}" TargetType="CalendarButton">
+      <Setter Property="ClickMode" Value="Release" />
+      <Setter Property="MinWidth" Value="40" />
+      <Setter Property="MinHeight" Value="40" />
+      <Setter Property="Margin" Value="1" />
+      <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}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewCalendarItemRevealBorderBrush}" />
+      <Setter Property="BorderThickness" Value="2" />
+      <Setter Property="FontSize" Value="20" />
+      <Setter Property="ClipToBounds" Value="False" />
+      <Setter Property="HorizontalContentAlignment" Value="Center" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Panel>
+            <!-- To mimic WinUI SystemFocusVisual, Focus visual is drawn outside the bounds of the item -->
+            <Border Name="Root" Background="{TemplateBinding Background}"
+                    BorderThickness="0" ClipToBounds="True">
+              <ContentControl Name="Content"
+                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                              Content="{TemplateBinding Content}"
+                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                              FontSize="{TemplateBinding FontSize}"
+                              Margin="{TemplateBinding Padding}" />
+            </Border>
+            
+            <!-- Drawn Border should render on top of background to preserve the 1px margin between items -->
+            <Border Name="Border"
+                    BorderThickness="2"
+                    BorderBrush="{TemplateBinding BorderBrush}" />
+          </Panel>
+        </ControlTemplate>
+      </Setter>
 
-<Styles xmlns="https://github.com/avaloniaui">
-  <Style Selector="CalendarButton">
-    <Setter Property="ClickMode" Value="Release"/>
-    <Setter Property="MinWidth" Value="40"/>
-    <Setter Property="MinHeight" Value="40"/>
-    <Setter Property="Margin" Value="1"/>
-    <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}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewCalendarItemRevealBorderBrush}"/>
-    <Setter Property="BorderThickness" Value="2"/>
-    <Setter Property="FontSize" Value="20"/>
-    <Setter Property="ClipToBounds" Value="False"/>
-    <Setter Property="HorizontalContentAlignment" Value="Center"/>
-    <Setter Property="VerticalContentAlignment" Value="Center"/>
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Panel>
-          <!-- To mimic WinUI SystemFocusVisual, Focus visual is drawn outside the bounds of the item -->
-          <Border Name="Root" Background="{TemplateBinding Background}"
-                  BorderThickness="0" ClipToBounds="True">
+      <Style Selector="^:pointerover /template/ Border#Border">
+        <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewHoverBorderBrush}" />
+      </Style>
+      
+      <Style Selector="^:pressed /template/ Border#Border">
+        <Setter Property="BorderBrush" Value="{DynamicResource SystemAccentColorDark2}" />
+      </Style>
 
-            <ContentControl Name="Content"
-                  ContentTemplate="{TemplateBinding ContentTemplate}"
-                  Content="{TemplateBinding Content}"
-                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                  FontSize="{TemplateBinding FontSize}"
-                  Margin="{TemplateBinding Padding}"/>
+      <!-- Adjusted :selected to look like :today from DayItem -->
+      <Style Selector="^:selected">
+        <Style Selector="^ /template/ Border#Root">
+          <Setter Property="Background" Value="{DynamicResource SystemAccentColor}" />
+        </Style>
+        
+        <Style Selector="^ /template/ Border#Border">
+          <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewSelectedBorderBrush}" />
+        </Style>
 
-          </Border>
+        <Style Selector="^ /template/ ContentControl#Content">
+          <Setter Property="Foreground" Value="{DynamicResource CalendarViewTodayForeground}" />
+          <Setter Property="FontWeight" Value="SemiBold" />
+        </Style>
 
-          <!-- Drawn Border should render on top of background to preserve the 1px
-                        margin between items-->
-          <Border Name="Border"
-                  BorderThickness="2"
-                  BorderBrush="{TemplateBinding BorderBrush}"/>
+        <Style Selector="^:pointerover">
+          <Style Selector="^ /template/ Border#Border">
+            <Setter Property="BorderBrush" Value="{DynamicResource SystemAccentColorDark1}" />
+          </Style>
+          <Style Selector="^ /template/ Border#Root">
+            <Setter Property="Background" Value="{DynamicResource SystemAccentColor}" />
+          </Style>
+        </Style>
 
-          <!--Removed for now...WinUI doesn't have selection follow focus, and only uses 
-              focus visual w/ keyboard focus
-          <Border Name="FocusVisual" BorderThickness="2"
-                     BorderBrush="{DynamicResource SystemControlHighlightBaseHighBrush}"
-                     IsHitTestVisible="False"
-                     Margin="-2"  CornerRadius="{DynamicResource ControlCornerRadius}"/>-->
-        </Panel>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-  <!--<Style Selector="CalendarButton /template/ Border#FocusVisual">
-    <Setter Property="IsVisible" Value="False"/>
-  </Style>-->
+        <Style Selector="^:pressed">
+          <Style Selector="^ /template/ Border#Border">
+            <Setter Property="BorderBrush" Value="{DynamicResource SystemAccentColorDark2}" />
+          </Style>
+          
+          <Style Selector="^ /template/ Border#Root">
+            <Setter Property="Background" Value="{DynamicResource SystemAccentColor}" />
+          </Style>
+        </Style>
+      </Style>
 
-  <Style Selector="CalendarButton:pointerover /template/ Border#Border">
-    <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewHoverBorderBrush}"/>
-  </Style>
-  <Style Selector="CalendarButton:pressed /template/ Border#Border">
-    <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewPressedBorderBrush}"/>
-  </Style>
+      <!-- WinUI calls this OutOfFocus -->
+      <Style Selector="^:inactive">
+        <Style Selector="^ /template/ Border#Root">
+          <!-- These are probably set in code, but consistent -->
+          <Setter Property="Background" Value="{DynamicResource CalendarViewOutOfScopeBackground}"/>
+        </Style>
+        <Style Selector="^ /template/ ContentControl#Content">
+          <Setter Property="Foreground" Value="{DynamicResource CalendarViewOutOfScopeForeground}"/>
+        </Style>
+      </Style>
 
-  <!-- Adjusted :selected to look like :today from DayItem -->
-  <Style Selector="CalendarButton:selected /template/ Border#Root">
-    <Setter Property="Background" Value="{DynamicResource SystemAccentColor}"/>
-  </Style>
-  <Style Selector="CalendarButton:selected /template/ Border#Border">
-    <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewSelectedBorderBrush}"/>
-  </Style>
-  <Style Selector="CalendarButton:selected:pointerover /template/ Border#Root">
-    <Setter Property="Background">
-      <SolidColorBrush Color="{DynamicResource SystemAccentColor}"/>
-    </Setter>
-  </Style>
-  <Style Selector="CalendarButton:selected:pointerover /template/ Border#Border">
-    <Setter Property="BorderBrush">
-      <SolidColorBrush Color="{DynamicResource SystemAccentColorDark1}"/>
-    </Setter>
-  </Style>
-  <Style Selector="CalendarButton:selected:pressed /template/ Border#Root">
-    <Setter Property="Background">
-      <SolidColorBrush Color="{DynamicResource SystemAccentColor}"/>
-    </Setter>
-  </Style>
-  <Style Selector="CalendarButton:pressed /template/ Border#Border">
-    <Setter Property="BorderBrush">
-      <SolidColorBrush Color="{DynamicResource SystemAccentColorDark2}"/>
-    </Setter>
-  </Style>
+      <Style Selector="^:blackout /template/ ContentControl#Content">
+        <Setter Property="Foreground" Value="{DynamicResource CalendarViewBlackoutForeground}" />
+      </Style>
 
-  <Style Selector="CalendarButton:selected /template/ ContentControl#Content">
-    <Setter Property="Foreground" Value="{DynamicResource CalendarViewTodayForeground}"/>
-    <Setter Property="FontWeight" Value="SemiBold"/>
-  </Style>
-
-  <!-- WinUI calls this OutOfFocus -->
-  <Style Selector="CalendarButton:inactive /template/ Border#Root">
-    <!-- These are probably set in code, but consistent -->
-    <Setter Property="Background" Value="{DynamicResource CalendarViewOutOfScopeBackground}"/>
-  </Style>
-  <Style Selector="CalendarButton:inactive /template/ ContentControl#Content">
-    <Setter Property="Foreground" Value="{DynamicResource CalendarViewOutOfScopeForeground}"/>
-  </Style>
-
-  <Style Selector="CalendarButton:blackout /template/ ContentControl#Content">
-    <Setter Property="Foreground" Value="{DynamicResource CalendarViewBlackoutForeground}"/>
-  </Style>
-
-  <!--<Style Selector="CalendarButton:dayfocused /template/ Border#FocusVisual">
-            <Setter Property="IsVisible" Value="True"/>
-      </Style>-->
-
-  <Style Selector="CalendarDayButton:disabled /template/ ContentControl#Content">
-    <Setter Property="Foreground" Value="{DynamicResource CalendarViewWeekDayForegroundDisabled}"/>
-  </Style>
-</Styles>
+      <Style Selector="^:disabled /template/ ContentControl#Content">
+        <Setter Property="Foreground" Value="{DynamicResource CalendarViewWeekDayForegroundDisabled}" />
+      </Style>
+    </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml b/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml
index c6f70d05e1..83a254be56 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml
@@ -1,182 +1,180 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:sys="clr-namespace:System;assembly=netstandard"
-        x:CompileBindings="True">
-  <Design.PreviewWith>
-    <Border Margin="20, 20, 20, 200">
-      <CalendarDatePicker Width="200"
-                          VerticalContentAlignment="Center"
-                          HorizontalContentAlignment="Center" />
-    </Border>
-  </Design.PreviewWith>
-
-  <Styles.Resources>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:sys="clr-namespace:System;assembly=netstandard"
+                    x:CompileBindings="True">
+    <Design.PreviewWith>
+      <Border Margin="20, 20, 20, 200">
+        <CalendarDatePicker Width="200" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" />
+      </Border>
+    </Design.PreviewWith>
+  
     <x:Double x:Key="CalendarDatePickerCurrentDayFontSize">12</x:Double>
     <x:Double x:Key="CalendarDatePickerMinHeight">32</x:Double>
-  </Styles.Resources>
-  
-  <Style Selector="CalendarDatePicker">
-    <Setter Property="Background" Value="{DynamicResource CalendarDatePickerBackground}"/>
-    <Setter Property="Foreground" Value="{DynamicResource CalendarDatePickerForeground}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderBrush}"/>
-    <Setter Property="BorderThickness" Value="{DynamicResource CalendarDatePickerBorderThemeThickness}"/>
-    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-    <Setter Property="MinHeight" Value="{DynamicResource CalendarDatePickerMinHeight}" />
-    <Setter Property="HorizontalAlignment" Value="Left" />
-    <Setter Property="VerticalAlignment" Value="Center" />
-    <Setter Property="HorizontalContentAlignment" Value="Left" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="Padding" Value="4"/>
-    <Setter Property="Template">
-      <ControlTemplate>
-        <DataValidationErrors>
-          <Panel x:Name="LayoutRoot"
-                 HorizontalAlignment="Stretch"
-                 VerticalAlignment="Stretch">
-            <Border x:Name="Background"
-                    CornerRadius="{TemplateBinding CornerRadius}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    Background="{TemplateBinding Background}" />
-            <Grid ColumnDefinitions="*,Auto">
-              <TextBox Name="PART_TextBox"
-                       Foreground="{TemplateBinding Foreground}"
-                       Background="Transparent"
-                       BorderBrush="Transparent"
-                       BorderThickness="0"
-                       CornerRadius="{TemplateBinding CornerRadius}"
-                       Margin="{TemplateBinding BorderThickness}"
-                       Padding="{TemplateBinding Padding}"
-                       Watermark="{TemplateBinding Watermark}"
-                       UseFloatingWatermark="{TemplateBinding UseFloatingWatermark}"
-                       HorizontalAlignment="Stretch"
-                       VerticalAlignment="Stretch"
-                       VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                       HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                       Grid.Column="0" />
-              <Button Name="PART_Button"
-                      Grid.Column="1"
-                      Focusable="False" />
-              <Popup Name="PART_Popup"
-                     PlacementTarget="{TemplateBinding}"
-                     IsLightDismissEnabled="True">
-                <Calendar Name="PART_Calendar"
-                          FirstDayOfWeek="{TemplateBinding FirstDayOfWeek}"
-                          IsTodayHighlighted="{TemplateBinding IsTodayHighlighted}"
-                          SelectedDate="{TemplateBinding SelectedDate, Mode=TwoWay}"
-                          DisplayDate="{TemplateBinding DisplayDate}"
-                          DisplayDateStart="{TemplateBinding DisplayDateStart}"
-                          DisplayDateEnd="{TemplateBinding DisplayDateEnd}" />
-              </Popup>
-            </Grid>
-          </Panel>
-        </DataValidationErrors>
-      </ControlTemplate>
-    </Setter>
-  </Style>
 
-  <!-- Normal State -->
-  <Style Selector="CalendarDatePicker /template/ Button#PART_Button">
-    <Setter Property="TextElement.Foreground" Value="{DynamicResource CalendarDatePickerCalendarGlyphForeground}" />
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="BorderThickness" Value="0" />
-    <Setter Property="Margin" Value="2,0,4,0" />
-    <Setter Property="Padding" Value="0" />
-    <Setter Property="Width" Value="20" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Grid Height="24"
-              Width="20"
-              HorizontalAlignment="Center"
-              VerticalAlignment="Center"
-              Margin="0"
-              ColumnDefinitions="*,*,*,*"
-              RowDefinitions="23*,19*,19*,19*"
-              ClipToBounds="False">
-          <Border Name="Background"
-                  Margin="0,-1,0,0"
-                  Grid.ColumnSpan="4"
-                  Grid.Row="1"
-                  Grid.RowSpan="3"
-                  BorderThickness="0.5,0,0.5,0.5"
-                  BorderBrush="{TemplateBinding Foreground}"
-                  CornerRadius="0,0,2,2" />
-          <Border Grid.ColumnSpan="4"
-                  Grid.RowSpan="1"
-                  BorderBrush="{TemplateBinding Foreground}"
-                  BorderThickness="0.5"
-                  CornerRadius="2,2,0,0" />
-          <TextBlock Margin="0,-1,0,0"
+    <ControlTheme x:Key="FluentCalendarDatePickerButton" TargetType="Button">
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource CalendarDatePickerCalendarGlyphForeground}" />
+      <Setter Property="Margin" Value="2,0,4,0" />
+      <Setter Property="Width" Value="20" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Grid Height="24"
+                Width="20"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Margin="0"
+                ColumnDefinitions="*,*,*,*"
+                RowDefinitions="23*,19*,19*,19*"
+                ClipToBounds="False">
+            <Border Name="Background"
+                    Margin="0,-1,0,0"
+                    Grid.ColumnSpan="4"
+                    Grid.Row="1"
+                    Grid.RowSpan="3"
+                    BorderThickness="0.5,0,0.5,0.5"
+                    BorderBrush="{TemplateBinding Foreground}"
+                    CornerRadius="0,0,2,2" />
+            <Border Grid.ColumnSpan="4"
+                    Grid.RowSpan="1"
+                    BorderBrush="{TemplateBinding Foreground}"
+                    BorderThickness="0.5"
+                    CornerRadius="2,2,0,0" />
+            <TextBlock Margin="0,-1,0,0"
+                       VerticalAlignment="Center"
+                       HorizontalAlignment="Center"
+                       Grid.Column="0"
+                       Grid.Row="1"
+                       Grid.ColumnSpan="4"
+                       Grid.RowSpan="3"
+                       Foreground="{TemplateBinding Foreground}"
+                       FontSize="{DynamicResource CalendarDatePickerCurrentDayFontSize}"
+                       Text="{Binding Source={x:Static sys:DateTime.Today}, Path=Day}" />
+            <Ellipse HorizontalAlignment="Center"
                      VerticalAlignment="Center"
-                     HorizontalAlignment="Center"
-                     Grid.Column="0"
-                     Grid.Row="1"
+                     Fill="{TemplateBinding Foreground}"
+                     StrokeThickness="0"
                      Grid.ColumnSpan="4"
-                     Grid.RowSpan="3"
-                     Foreground="{TemplateBinding Foreground}"
-                     FontSize="{DynamicResource CalendarDatePickerCurrentDayFontSize}"
-                     Text="{Binding Source={x:Static sys:DateTime.Today}, Path=Day}" />
-          <Ellipse HorizontalAlignment="Center"
-                   VerticalAlignment="Center"
-                   Fill="{TemplateBinding Foreground}"
-                   StrokeThickness="0"
-                   Grid.ColumnSpan="4"
-                   Width="3"
-                   Height="3" />
-        </Grid>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <!-- Pressed State -->
-  <Style Selector="CalendarDatePicker:pressed /template/ Border#Background">
-    <Setter Property="Background" Value="{DynamicResource CalendarDatePickerBackgroundPressed}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderBrushPressed}" />
-  </Style>
+                     Width="3"
+                     Height="3" />
+          </Grid>
+        </ControlTemplate>
+      </Setter>
+    </ControlTheme>
+    
+    <ControlTheme x:Key="{x:Type CalendarDatePicker}" TargetType="CalendarDatePicker">
+      <Setter Property="Background" Value="{DynamicResource CalendarDatePickerBackground}" />
+      <Setter Property="Foreground" Value="{DynamicResource CalendarDatePickerForeground}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderBrush}" />
+      <Setter Property="BorderThickness" Value="{DynamicResource CalendarDatePickerBorderThemeThickness}" />
+      <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+      <Setter Property="MinHeight" Value="{DynamicResource CalendarDatePickerMinHeight}" />
+      <Setter Property="HorizontalAlignment" Value="Left" />
+      <Setter Property="VerticalAlignment" Value="Center" />
+      <Setter Property="HorizontalContentAlignment" Value="Left" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="Padding" Value="4" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <DataValidationErrors>
+            <Panel x:Name="LayoutRoot"
+                   HorizontalAlignment="Stretch"
+                   VerticalAlignment="Stretch">
+              <Border x:Name="Background"
+                      CornerRadius="{TemplateBinding CornerRadius}"
+                      BorderThickness="{TemplateBinding BorderThickness}"
+                      BorderBrush="{TemplateBinding BorderBrush}"
+                      Background="{TemplateBinding Background}" />
+              <Grid ColumnDefinitions="*,Auto">
+                <TextBox Name="PART_TextBox"
+                         Foreground="{TemplateBinding Foreground}"
+                         Background="Transparent"
+                         BorderBrush="Transparent"
+                         BorderThickness="0"
+                         CornerRadius="{TemplateBinding CornerRadius}"
+                         Margin="{TemplateBinding BorderThickness}"
+                         Padding="{TemplateBinding Padding}"
+                         Watermark="{TemplateBinding Watermark}"
+                         UseFloatingWatermark="{TemplateBinding UseFloatingWatermark}"
+                         HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                         HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                         Grid.Column="0">
+                  <TextBox.Styles>
+                    <Style Selector="TextBox#PART_TextBox:focus /template/ Border#PART_BorderElement">
+                      <!-- By default the TextBox has its own focused state, override this to disable it here -->
+                      <Setter Property="Background" Value="Transparent"/>
+                      <Setter Property="BorderBrush" Value="Transparent"/>
+                      <Setter Property="BorderThickness" Value="0" />
+                    </Style>
+                    <Style Selector="TextBox#PART_TextBox:disabled /template/">
+                      <Style Selector="^ Border#PART_BorderElement">
+                        <!-- By default the TextBox has its own disabled state, override this to make the border background show through -->
+                        <Setter Property="Background" Value="Transparent" />
+                        <Setter Property="BorderBrush" Value="Transparent" />
+                      </Style>
+                      <Style Selector="^ TextBlock#PART_Watermark, ^ TextBlock#PART_FloatingWatermark">
+                        <Setter Property="TextElement.Foreground" Value="{DynamicResource CalendarDatePickerTextForegroundDisabled}" />
+                      </Style>
+                    </Style>
+                  </TextBox.Styles>
+                </TextBox>
+                <Button Name="PART_Button" 
+                        Theme="{StaticResource FluentCalendarDatePickerButton}"
+                        Grid.Column="1"
+                        Focusable="False" />
+                <Popup Name="PART_Popup"
+                       PlacementTarget="{TemplateBinding}"
+                       IsLightDismissEnabled="True">
+                  <Calendar Name="PART_Calendar" 
+                            FirstDayOfWeek="{TemplateBinding FirstDayOfWeek}" 
+                            IsTodayHighlighted="{TemplateBinding IsTodayHighlighted}"
+                            SelectedDate="{TemplateBinding SelectedDate, Mode=TwoWay}"
+                            DisplayDate="{TemplateBinding DisplayDate}" 
+                            DisplayDateStart="{TemplateBinding DisplayDateStart}"
+                            DisplayDateEnd="{TemplateBinding DisplayDateEnd}" />
+                </Popup>
+              </Grid>
+            </Panel>
+          </DataValidationErrors>
+        </ControlTemplate>
+      </Setter>
+     
+      <!-- Pressed State -->
+      <Style Selector="^:pressed /template/ Border#Background">
+        <Setter Property="Background" Value="{DynamicResource CalendarDatePickerBackgroundPressed}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderBrushPressed}" />
+      </Style>
+      
+      <!-- Pointer-over State -->
+      <Style Selector="^:pointerover /template/ Border#Background">
+        <Setter Property="Background" Value="{DynamicResource CalendarDatePickerBackgroundPointerOver}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderBrushPointerOver}" />
+      </Style>
 
-  <!-- Pointer-over State -->
-  <Style Selector="CalendarDatePicker:pointerover /template/ Border#Background">
-    <Setter Property="Background" Value="{DynamicResource CalendarDatePickerBackgroundPointerOver}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderBrushPointerOver}" />
-  </Style>
+      <!-- Disabled State -->
+      <Style Selector="^:disabled /template/">
+        <Style Selector="^ Border#Background">
+          <Setter Property="Background" Value="{DynamicResource CalendarDatePickerBackgroundDisabled}" />
+          <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderBrushDisabled}" />
+        </Style>
+        
+        <Style Selector="^ Button#PART_Button">
+          <Setter Property="TextElement.Foreground" Value="{DynamicResource CalendarDatePickerCalendarGlyphForegroundDisabled}" />
+        </Style>
 
-  <!-- Disabled State -->
-  <Style Selector="CalendarDatePicker:disabled /template/ Border#Background">
-    <Setter Property="Background" Value="{DynamicResource CalendarDatePickerBackgroundDisabled}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderBrushDisabled}" />
-  </Style>
+      </Style>
 
-  <Style Selector="CalendarDatePicker:disabled /template/ Button#PART_Button">
-    <Setter Property="TextElement.Foreground" Value="{DynamicResource CalendarDatePickerCalendarGlyphForegroundDisabled}" />
-  </Style>
-
-  <Style Selector="CalendarDatePicker:disabled /template/ TextBox#PART_TextBox:disabled /template/ Border#PART_BorderElement">
-    <!-- By default the TextBox has its own disabled state, override this to make the border background show through -->
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="BorderBrush" Value="Transparent" />
-  </Style>
-
-  <Style Selector="CalendarDatePicker:disabled /template/ TextBox#PART_TextBox:disabled /template/ TextBlock#PART_Watermark,
-                   CalendarDatePicker:disabled /template/ TextBox#PART_TextBox:disabled /template/ TextBlock#PART_FloatingWatermark">
-    <Setter Property="TextElement.Foreground" Value="{DynamicResource CalendarDatePickerTextForegroundDisabled}" />
-  </Style>
-
-  <!-- Focused State -->
-  <Style Selector="CalendarDatePicker:focus-within:not(CalendarDatePicker:focus) /template/ Border#Background">
-    <Setter Property="Background" Value="{DynamicResource TextControlBackgroundFocused}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushFocused}"/>
-    <Setter Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThicknessFocused}" />
-  </Style>
-
-  <Style Selector="CalendarDatePicker /template/ TextBox#PART_TextBox:focus /template/ Border#PART_BorderElement">
-    <!-- By default the TextBox has its own focused state, override this to disable it here -->
-    <Setter Property="Background" Value="Transparent"/>
-    <Setter Property="BorderBrush" Value="Transparent"/>
-    <Setter Property="BorderThickness" Value="0" />
-  </Style>
-
-  <!-- Error State -->
-  <Style Selector="CalendarDatePicker:error /template/ Border#Background">
-    <Setter Property="BorderBrush" Value="{DynamicResource SystemControlErrorTextForegroundBrush}"/>
-  </Style>
-</Styles>
+      <!-- Focused State -->
+      <Style Selector="^:focus-within:not(CalendarDatePicker:focus) /template/ Border#Background">
+        <Setter Property="Background" Value="{DynamicResource TextControlBackgroundFocused}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushFocused}" />
+        <Setter Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThicknessFocused}" />
+      </Style>
+      
+      <!-- Error State -->
+      <Style Selector="^:error /template/ Border#Background">
+        <Setter Property="BorderBrush" Value="{DynamicResource SystemControlErrorTextForegroundBrush}" />
+      </Style>
+    </ControlTheme>
+  
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/CalendarDayButton.xaml b/src/Avalonia.Themes.Fluent/Controls/CalendarDayButton.xaml
index 9223c0dd71..b119dd1355 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CalendarDayButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CalendarDayButton.xaml
@@ -1,116 +1,104 @@
-<!--
+<!--
 // (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.
 -->
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ControlTheme x:Key="{x:Type CalendarDayButton}" TargetType="CalendarDayButton">
+      <Setter Property="ClickMode" Value="Release" />
+      <Setter Property="MinWidth" Value="40" />
+      <Setter Property="MinHeight" Value="40" />
+      <Setter Property="Margin" Value="1" />
+      <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}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewCalendarItemRevealBorderBrush}" />
+      <Setter Property="BorderThickness" Value="2" />
+      <Setter Property="FontSize" Value="20" />
+      <Setter Property="ClipToBounds" Value="False" />
+      <Setter Property="HorizontalContentAlignment" Value="Center" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Panel>
+            <!-- To mimic WinUI SystemFocusVisual, Focus visual is drawn outside the bounds of the item -->
+            <Border Name="Root" Background="{TemplateBinding Background}"
+                    BorderThickness="0" ClipToBounds="True">
 
-<Styles xmlns="https://github.com/avaloniaui">
-  <Style Selector="CalendarDayButton">
-    <Setter Property="ClickMode" Value="Release"/>
-    <Setter Property="MinWidth" Value="40"/>
-    <Setter Property="MinHeight" Value="40"/>
-    <Setter Property="Margin" Value="1"/>
-    <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}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewCalendarItemRevealBorderBrush}"/>
-    <Setter Property="BorderThickness" Value="2"/>
-    <Setter Property="FontSize" Value="20"/>
-    <Setter Property="ClipToBounds" Value="False"/>
-    <Setter Property="HorizontalContentAlignment" Value="Center"/>
-    <Setter Property="VerticalContentAlignment" Value="Center"/>
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Panel>
-          <!-- To mimic WinUI SystemFocusVisual, Focus visual is drawn outside the bounds of the item -->
-          <Border Name="Root" Background="{TemplateBinding Background}"
-                  BorderThickness="0" ClipToBounds="True">
+              <ContentControl Name="Content"
+                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                              Content="{TemplateBinding Content}"
+                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                              FontSize="{TemplateBinding FontSize}"
+                              Margin="{TemplateBinding Padding}" />
+              
+            </Border>
+            
+            <!-- Drawn Border should render on top of background to preserve the 1px margin between items-->
+            <Border Name="Border"
+                    BorderThickness="2"
+                    BorderBrush="{TemplateBinding BorderBrush}" />
+          </Panel>
+        </ControlTemplate>
+      </Setter>
 
-            <ContentControl Name="Content"
-                  ContentTemplate="{TemplateBinding ContentTemplate}"
-                  Content="{TemplateBinding Content}"
-                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                  FontSize="{TemplateBinding FontSize}"
-                  Margin="{TemplateBinding Padding}"/>
+      <Style Selector="^:pointerover /template/ Border#Border">
+        <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewHoverBorderBrush}" />
+      </Style>
 
-          </Border>
+      <Style Selector="^:pressed /template/ Border#Border">
+        <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewPressedBorderBrush}" />
+      </Style>
 
-          <!-- Drawn Border should render on top of background to preserve the 1px
-                        margin between items-->
-          <Border Name="Border"
-                  BorderThickness="2"
-                  BorderBrush="{TemplateBinding BorderBrush}"/>
+      <Style Selector="^:selected">
+        <Style Selector="^ /template/ Border#Border">
+          <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewSelectedBorderBrush}" />
+        </Style>
+        <Style Selector="^:pointerover /template/ Border#Border">
+          <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewSelectedHoverBorderBrush}" />
+        </Style>
+        <Style Selector="^:pressed /template/ Border#Border">
+          <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewSelectedPressedBorderBrush}" />
+        </Style>
+      </Style>
 
-          <!--Removed for now...WinUI doesn't have selection follow focus, and only uses 
-              focus visual w/ keyboard focus
-                <Border Name="FocusVisual" BorderThickness="2"
-                            BorderBrush="{DynamicResource SystemControlHighlightBaseHighBrush}"
-                            IsHitTestVisible="False"
-                            Margin="-2"  CornerRadius="2"/>-->
-        </Panel>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-  <!--<Style Selector="CalendarDayButton /template/ Border#FocusVisual">
-    <Setter Property="IsVisible" Value="False"/>
-  </Style>-->
+      <Style Selector="^:today">
+        <Style Selector="^ /template/ Border#Root">
+          <Setter Property="Background" Value="{DynamicResource SystemAccentColor}" />
+        </Style>
+        <!-- These are probably set in code, but consistent -->
+        <Style Selector="^:pointerover /template/ Border#Border">
+          <Setter Property="BorderBrush" Value="{DynamicResource SystemAccentColorDark1}" />
+        </Style>
+        <Style Selector="^:pressed /template/ Border#Border">
+          <Setter Property="BorderBrush" Value="{DynamicResource SystemAccentColorDark2}" />
+        </Style>
+        <Style Selector="^ ContentControl#Content">
+          <Setter Property="Foreground" Value="{DynamicResource CalendarViewTodayForeground}" />
+          <Setter Property="FontWeight" Value="SemiBold" />
+        </Style>
+      </Style>
 
-  <Style Selector="CalendarDayButton:pointerover /template/ Border#Border">
-    <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewHoverBorderBrush}"/>
-  </Style>
-  <Style Selector="CalendarDayButton:pressed /template/ Border#Border">
-    <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewPressedBorderBrush}"/>
-  </Style>
-  <Style Selector="CalendarDayButton:selected /template/ Border#Border">
-    <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewSelectedBorderBrush}"/>
-  </Style>
-  <Style Selector="CalendarDayButton:selected:pointerover /template/ Border#Border">
-    <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewSelectedHoverBorderBrush}"/>
-  </Style>
-  <Style Selector="CalendarDayButton:selected:pressed /template/ Border#Border">
-    <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewSelectedPressedBorderBrush}"/>
-  </Style>
+      <!-- WinUI calls this OutOfFocus -->
+      <Style Selector="^:inactive /template/">
+        <Style Selector="^ Border#Root">
+          <Setter Property="Background" Value="{DynamicResource CalendarViewOutOfScopeBackground}" />
+        </Style>
+        <Style Selector="^ ContentControl#Content">
+          <Setter Property="Foreground" Value="{DynamicResource CalendarViewOutOfScopeForeground}" />
+        </Style>
+      </Style>
 
-  <Style Selector="CalendarDayButton:today /template/ Border#Root">
-    <!-- These are probably set in code, but consistent -->
-    <Setter Property="Background">
-      <SolidColorBrush Color="{DynamicResource SystemAccentColor}"/>
-    </Setter>
-  </Style>
-  <Style Selector="CalendarDayButton:today:pointerover /template/ Border#Border">
-    <Setter Property="BorderBrush">
-      <SolidColorBrush Color="{DynamicResource SystemAccentColorDark1}"/>
-    </Setter>
-  </Style>
-  <Style Selector="CalendarDayButton:today:pressed /template/ Border#Border">
-    <Setter Property="BorderBrush">
-      <SolidColorBrush Color="{DynamicResource SystemAccentColorDark2}"/>
-    </Setter>
-  </Style>
-  <Style Selector="CalendarDayButton:today /template/ ContentControl#Content">
-    <Setter Property="Foreground" Value="{DynamicResource CalendarViewTodayForeground}"/>
-    <Setter Property="FontWeight" Value="SemiBold"/>
-  </Style>
+      <Style Selector="^:blackout /template/ ContentControl#Content">
+        <Setter Property="Foreground" Value="{DynamicResource CalendarViewBlackoutForeground}" />
+      </Style>
 
-  <!-- WinUI calls this OutOfFocus -->
-  <Style Selector="CalendarDayButton:inactive /template/ Border#Root">
-    <Setter Property="Background" Value="{DynamicResource CalendarViewOutOfScopeBackground}"/>
-  </Style>
-  <Style Selector="CalendarDayButton:inactive /template/ ContentControl#Content">
-    <Setter Property="Foreground" Value="{DynamicResource CalendarViewOutOfScopeForeground}"/>
-  </Style>
-
-  <Style Selector="CalendarDayButton:blackout /template/ ContentControl#Content">
-    <Setter Property="Foreground" Value="{DynamicResource CalendarViewBlackoutForeground}"/>
-  </Style>
-
-  <!--<Style Selector="CalendarDayButton:dayfocused /template/ Border#FocusVisual">
-            <Setter Property="IsVisible" Value="True"/>
-      </Style>-->
-  <Style Selector="CalendarDayButton:disabled /template/ ContentControl#Content">
-    <Setter Property="Foreground" Value="{DynamicResource CalendarViewWeekDayForegroundDisabled}"/>
-  </Style>
-</Styles>
+      <Style Selector="^:disabled /template/ ContentControl#Content">
+        <Setter Property="Foreground" Value="{DynamicResource CalendarViewWeekDayForegroundDisabled}" />
+      </Style>
+    </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/CalendarItem.xaml b/src/Avalonia.Themes.Fluent/Controls/CalendarItem.xaml
index e8e2df03b4..f8fec58ef7 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CalendarItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CalendarItem.xaml
@@ -1,143 +1,150 @@
-<!--
+<!--
 // (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.
 -->
-
-<Styles xmlns="https://github.com/avaloniaui"
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         x:CompileBindings="True"
         x:DataType="CalendarItem">
-  <Design.PreviewWith>
-    <Border Padding="20">
-      <Calendar />
-    </Border>
-  </Design.PreviewWith>
-  <Style Selector="CalendarItem">
-    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-    <Setter Property="DayTitleTemplate">
-      <Template>
-        <TextBlock Text="{Binding}"
-                   HorizontalAlignment="Center"
-                   VerticalAlignment="Center"
-                   FontSize="12"/>
-      </Template>
-    </Setter>
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border BorderThickness="{TemplateBinding BorderThickness}"
-                Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                CornerRadius="{TemplateBinding CornerRadius}">
-          <Border.Styles>
-            <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">
-                <ControlTemplate>
-                  <!-- HCA was changed here to ensure nav arrows display correctly -->
-                  <ContentPresenter Name="Text" Background="{TemplateBinding Background}"
-                                    BorderBrush="{DynamicResource CalendarViewNavigationButtonBorderBrush}"
-                                    BorderThickness="{TemplateBinding BorderThickness}"
-                                    Content="{TemplateBinding Content}"
-                                    Margin="{TemplateBinding Padding}"
-                                    HorizontalContentAlignment="Stretch"
-                                    VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-                </ControlTemplate>
-              </Setter>
-            </Style>
-            <Style Selector="Button.CalendarNavigation > Path">
-              <Setter Property="Stroke" Value="{DynamicResource CalendarViewForeground}"/>
-            </Style>
-            <Style Selector="Button.CalendarNavigation:pointerover > Path">
-              <Setter Property="Stroke" Value="{DynamicResource CalendarViewNavigationButtonForegroundPointerOver}"/>
-            </Style>
-            <Style Selector="Button.CalendarNavigation:pressed > Path">
-              <Setter Property="Stroke" Value="{DynamicResource CalendarViewNavigationButtonForegroundPressed}"/>
-            </Style>
-            <Style Selector="Button.CalendarHeader:pointerover /template/ ContentPresenter#Text">
-              <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewNavigationButtonBorderBrushPointerOver}" />
-              <Setter Property="Foreground" Value="{DynamicResource CalendarViewNavigationButtonForegroundPointerOver}"/>
-              <!-- Prevent base button template:pointerover from overriding background here -->
-              <Setter Property="Background" Value="{DynamicResource CalendarViewNavigationButtonBackground}"/>
-            </Style>
-            <Style Selector="Button.CalendarHeader:pressed /template/ ContentPresenter#Text">
-              <Setter Property="Foreground" Value="{DynamicResource CalendarViewNavigationButtonForegroundPressed}"/>
-              <!-- Prevent base button template:pointerover from overriding background here -->
-              <Setter Property="Background" Value="{DynamicResource CalendarViewNavigationButtonBackground}"/>
-            </Style>
-            <Style Selector="Button.CalendarHeader:disabled /template/ ContentPresenter">
-              <Setter Property="Foreground" Value="{DynamicResource CalendarViewWeekDayForegroundDisabled}"/>
-            </Style>
-          </Border.Styles>
-          <!--  To keep calendar from resizing when switching DisplayMode
-                In WinUI Min-Width from TemplateSettings
-                basically...MinWidth of DayItem = 40, 40 * 7 = 280 + margins/padding = ~294
-                Viewport height is set from # of rows displayed (2-8) in Month mode, = ~290 for 6 weeks (+ day names)
-                -->
-          <Grid VerticalAlignment="Stretch" HorizontalAlignment="Stretch" RowDefinitions="40,*" MinWidth="294">
-            <Grid ColumnDefinitions="5*,*,*">
-              <Button Name="HeaderButton" Classes="CalendarHeader" Foreground="{TemplateBinding Foreground}" Padding="12,0,0,0" HorizontalContentAlignment="Left" />
-              <Button Name="PreviousButton" Grid.Column="1" Classes="CalendarHeader CalendarNavigation" Foreground="{TemplateBinding Foreground}" Padding="1" HorizontalContentAlignment="Left">
-                <!--Path mimics Segoe MDL2 Assets font glyph used in WinUI-->
-                <Path StrokeThickness="1.5" Data="M 0,9 L 9,0 L 18,9"  HorizontalAlignment="Center" VerticalAlignment="Center"/>
-              </Button>
-              <Button Name="NextButton" Grid.Column="2" Classes="CalendarHeader CalendarNavigation" Foreground="{TemplateBinding Foreground}" Padding="1" HorizontalContentAlignment="Left">
-                <!--Path mimics Segoe MDL2 Assets font glyph used in WinUI-->
-                <Path StrokeThickness="1.5" Data="M 0,0 L 9,9 L 18,0" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-              </Button>
-            </Grid>
-            <Border Name="BackgroundLayer" Background="{TemplateBinding BorderBrush}" Grid.Row="1" />
-            <Grid Name="MonthView" Grid.Row="1" IsVisible="False" MinHeight="290" >
-              <Grid.RowDefinitions>
-                <!--This should always be the week day names??-->
-                <RowDefinition Height="38" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-              </Grid.RowDefinitions>
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="Auto" />
-              </Grid.ColumnDefinitions>
-            </Grid>
-            <Grid Name="YearView" MinHeight="290"
-                    Grid.Row="1" IsVisible="False">
-              <Grid.RowDefinitions>
-                <RowDefinition Height="*" />
-                <RowDefinition Height="*" />
-                <RowDefinition Height="*" />
-              </Grid.RowDefinitions>
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="*" />
-              </Grid.ColumnDefinitions>
-            </Grid>
-
-          </Grid>
-
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <!-- BackgroundLayer shouldn't show in the week day names row-->
-  <Style Selector="Calendar[DisplayMode=Month] CalendarItem /template/ Border#BackgroundLayer">
-    <Setter Property="Margin" Value="0,38,0,0"/>
-  </Style>
+    <Design.PreviewWith>
+      <Border Padding="20">
+        <Calendar />
+      </Border>
+    </Design.PreviewWith>
   
-</Styles>
+    <ControlTheme x:Key="FluentCalendarItemButton" TargetType="Button">
+      <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">
+        <ControlTemplate>
+          <!-- HCA was changed here to ensure nav arrows display correctly -->
+          <ContentPresenter Name="Text" Background="{TemplateBinding Background}"
+                            BorderBrush="{DynamicResource CalendarViewNavigationButtonBorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Content="{TemplateBinding Content}"
+                            Margin="{TemplateBinding Padding}"
+                            HorizontalContentAlignment="Stretch"
+                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+        </ControlTemplate>
+      </Setter>
+      
+      <Style Selector="^:pointerover /template/ ContentPresenter#Text">
+        <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewNavigationButtonBorderBrushPointerOver}" />
+        <Setter Property="Foreground" Value="{DynamicResource CalendarViewNavigationButtonForegroundPointerOver}" />
+      </Style>
+      <Style Selector="^:pressed /template/ ContentPresenter#Text">
+        <Setter Property="Foreground" Value="{DynamicResource CalendarViewNavigationButtonForegroundPressed}" />
+      </Style>
+      <Style Selector="^:disabled /template/ ContentPresenter">
+        <Setter Property="Foreground" Value="{DynamicResource CalendarViewWeekDayForegroundDisabled}" />
+      </Style>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type CalendarItem}" TargetType="CalendarItem">
+      <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+      <Setter Property="DayTitleTemplate">
+        <Template>
+          <TextBlock Text="{Binding}"
+                     HorizontalAlignment="Center"
+                     VerticalAlignment="Center"
+                     FontSize="12" />
+        </Template>
+      </Setter>
+      
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border BorderThickness="{TemplateBinding BorderThickness}" 
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <!-- To keep calendar from resizing when switching DisplayMode
+                 In WinUI Min-Width from TemplateSettings
+                 basically...MinWidth of DayItem = 40, 40 * 7 = 280 + margins/padding = ~294
+                 Viewport height is set from # of rows displayed (2-8) in Month mode, = ~290 for 6 weeks (+ day names)
+                 -->
+            <Grid VerticalAlignment="Stretch" HorizontalAlignment="Stretch" RowDefinitions="40,*" MinWidth="294">
+              <Grid ColumnDefinitions="5*,*,*">
+                <Button Name="HeaderButton" 
+                        Theme="{StaticResource FluentCalendarItemButton}"
+                        Foreground="{TemplateBinding Foreground}"
+                        Padding="12,0,0,0"
+                        HorizontalContentAlignment="Left" />
+                <Button Name="PreviousButton"
+                        Grid.Column="1"
+                        Theme="{StaticResource FluentCalendarItemButton}"
+                        Foreground="{TemplateBinding Foreground}"
+                        Padding="1"
+                        HorizontalContentAlignment="Left">
+                  <!--Path mimics Segoe MDL2 Assets font glyph used in WinUI-->
+                  <Path StrokeThickness="1.5" Data="M 0,9 L 9,0 L 18,9" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                </Button>
+                <Button Name="NextButton"
+                        Grid.Column="2"
+                        Theme="{StaticResource FluentCalendarItemButton}"
+                        Foreground="{TemplateBinding Foreground}" 
+                        Padding="1"
+                        HorizontalContentAlignment="Left">
+                  <!--Path mimics Segoe MDL2 Assets font glyph used in WinUI-->
+                  <Path StrokeThickness="1.5" Data="M 0,0 L 9,9 L 18,0" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                </Button>
+              </Grid>
+              <!--Border below is used only for MonthView but it can't be moved inside of Grid because CalendarItem expects it to be empty and it will cause side-effects-->
+              <Border Name="BackgroundLayer" Background="{TemplateBinding BorderBrush}" Margin="0,38,0,0" IsVisible="{ReflectionBinding #MonthView.IsVisible}" Grid.Row="1" />
+              <Grid Name="MonthView" Grid.Row="1" IsVisible="False" MinHeight="290">
+                <Grid.RowDefinitions>
+                  <!--This should always be the week day names??-->
+                  <RowDefinition Height="38" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="Auto" />
+                  <ColumnDefinition Width="Auto" />
+                  <ColumnDefinition Width="Auto" />
+                  <ColumnDefinition Width="Auto" />
+                  <ColumnDefinition Width="Auto" />
+                  <ColumnDefinition Width="Auto" />
+                  <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+              </Grid>
+              <Grid Name="YearView"
+                    Background="{TemplateBinding BorderBrush}"
+                    MinHeight="290"
+                    Grid.Row="1"
+                    IsVisible="False">
+                <Grid.RowDefinitions>
+                  <RowDefinition Height="*" />
+                  <RowDefinition Height="*" />
+                  <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="*" />
+                  <ColumnDefinition Width="*" />
+                  <ColumnDefinition Width="*" />
+                  <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+              </Grid>
+            </Grid>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+      <Style Selector="^ /template/ Button > Path">
+        <Setter Property="Stroke" Value="{DynamicResource CalendarViewForeground}" />
+      </Style>
+      <Style Selector="^ /template/ Button:pointerover > Path">
+        <Setter Property="Stroke" Value="{DynamicResource CalendarViewNavigationButtonForegroundPointerOver}" />
+      </Style>
+      <Style Selector="^ /template/ Button:pressed > Path">
+        <Setter Property="Stroke" Value="{DynamicResource CalendarViewNavigationButtonForegroundPressed}" />
+      </Style>
+    </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/CaptionButtons.xaml b/src/Avalonia.Themes.Fluent/Controls/CaptionButtons.xaml
index 62874f4884..3c45de18c6 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CaptionButtons.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CaptionButtons.xaml
@@ -1,72 +1,57 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Style Selector="CaptionButtons">    
-    <Setter Property="MaxHeight" Value="30" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <StackPanel Spacing="2" VerticalAlignment="Stretch" TextElement.FontSize="10" Orientation="Horizontal">
-          <StackPanel.Styles>
-            <Style Selector="Panel">
-              <Setter Property="Width" Value="45" />
-              <Setter Property="Background" Value="Transparent" />
-            </Style>
-            <Style Selector="Panel:pointerover">
-              <Setter Property="Background" Value="#7F7f7f7f" />
-            </Style>
-            <Style Selector="Panel#PART_CloseButton:pointerover">
-              <Setter Property="Background" Value="#7FFF0000" />
-            </Style>
-            <Style Selector="Viewbox">
-              <Setter Property="Width" Value="11" />
-              <Setter Property="Margin" Value="2" />
-            </Style>
-          </StackPanel.Styles>
-          <Panel x:Name="PART_FullScreenButton">
-            <Viewbox>
-              <Path Stretch="UniformToFill" Fill="{TemplateBinding Foreground}" />
-            </Viewbox>
-          </Panel>
-
-          <Panel x:Name="PART_MinimiseButton">
-            <Viewbox>
-              <Path Stretch="UniformToFill" Fill="{TemplateBinding Foreground}" Data="M2048 1229v-205h-2048v205h2048z" />
-            </Viewbox>
-          </Panel>
-
-          <Panel x:Name="PART_RestoreButton">
-            <Viewbox>
-              <Viewbox.RenderTransform>
-                <RotateTransform Angle="-90" />
-              </Viewbox.RenderTransform>
-              <Path Stretch="UniformToFill" Fill="{TemplateBinding Foreground}"/>
-            </Viewbox>
-          </Panel>
-
-          <Panel x:Name="PART_CloseButton">
-            <Viewbox>
-              <Path Stretch="UniformToFill" Fill="{TemplateBinding Foreground}" Data="M1169 1024l879 -879l-145 -145l-879 879l-879 -879l-145 145l879 879l-879 879l145 145l879 -879l879 879l145 -145z" />
-            </Viewbox>
-          </Panel>
-        </StackPanel>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-  <Style Selector="CaptionButtons Panel#PART_RestoreButton Path">
-    <Setter Property="Data" Value="M2048 2048v-2048h-2048v2048h2048zM1843 1843h-1638v-1638h1638v1638z" />
-  </Style>
-  <Style Selector="CaptionButtons:maximized Panel#PART_RestoreButton Path">
-    <Setter Property="Data" Value="M2048 410h-410v-410h-1638v1638h410v410h1638v-1638zM1434 1434h-1229v-1229h1229v1229zM1843 1843h-1229v-205h1024v-1024h205v1229z" />
-  </Style>
-  <Style Selector="CaptionButtons Panel#PART_FullScreenButton">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-  <Style Selector="CaptionButtons Panel#PART_FullScreenButton Path">
-    <Setter Property="Data" Value="M2048 2048v-819h-205v469l-1493 -1493h469v-205h-819v819h205v-469l1493 1493h-469v205h819z" />
-  </Style>
-  <Style Selector="CaptionButtons:fullscreen Panel#PART_FullScreenButton Path">
-    <Setter Property="IsVisible" Value="True" />
-    <Setter Property="Data" Value="M205 1024h819v-819h-205v469l-674 -674l-145 145l674 674h-469v205zM1374 1229h469v-205h-819v819h205v-469l674 674l145 -145z" />
-  </Style>
-  <Style Selector="CaptionButtons:fullscreen Panel#PART_RestoreButton, CaptionButtons:fullscreen Panel#PART_MinimiseButton">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
- </Styles>
+<ResourceDictionary 
+  xmlns="https://github.com/avaloniaui" 
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ControlTheme x:Key="{x:Type CaptionButtons}" TargetType="CaptionButtons">
+      <Setter Property="MaxHeight" Value="30" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <StackPanel Spacing="2" VerticalAlignment="Stretch" TextElement.FontSize="10" Orientation="Horizontal">
+            <StackPanel.Styles>
+              <Style Selector="Panel:pointerover">
+                <Setter Property="Background" Value="#7F7f7f7f" />
+              </Style>
+              <Style Selector="Panel#PART_CloseButton:pointerover">
+                <Setter Property="Background" Value="#7FFF0000" />
+              </Style>
+            </StackPanel.Styles>
+            <Panel x:Name="PART_FullScreenButton" IsVisible="False" Width="45" Background="Transparent">
+              <Viewbox Width="11" Margin="2">
+                <Path Stretch="UniformToFill" Fill="{TemplateBinding Foreground}" Data="M2048 2048v-819h-205v469l-1493 -1493h469v-205h-819v819h205v-469l1493 1493h-469v205h819z" />
+              </Viewbox>
+            </Panel>
+            <Panel x:Name="PART_MinimiseButton" Width="45" Background="Transparent">
+              <Viewbox Width="11" Margin="2">
+                <Path Stretch="UniformToFill" Fill="{TemplateBinding Foreground}" Data="M2048 1229v-205h-2048v205h2048z" />
+              </Viewbox>
+            </Panel>
+            <Panel x:Name="PART_RestoreButton" Width="45" Background="Transparent">
+              <Viewbox Width="11" Margin="2">
+                <Viewbox.RenderTransform>
+                  <RotateTransform Angle="-90" />
+                </Viewbox.RenderTransform>
+                <Path Stretch="UniformToFill" Fill="{TemplateBinding Foreground}" Data="M2048 2048v-2048h-2048v2048h2048zM1843 1843h-1638v-1638h1638v1638z"/>
+              </Viewbox>
+            </Panel>
+            <Panel x:Name="PART_CloseButton" Width="45" Background="Transparent">
+              <Viewbox Width="11" Margin="2">
+                <Path Stretch="UniformToFill" Fill="{TemplateBinding Foreground}" Data="M1169 1024l879 -879l-145 -145l-879 879l-879 -879l-145 145l879 879l-879 879l145 145l879 -879l879 879l145 -145z" />
+              </Viewbox>
+            </Panel>
+          </StackPanel>
+        </ControlTemplate>
+      </Setter>
+      <Style Selector="^:maximized /template/ Panel#PART_RestoreButton Path">
+        <Setter Property="Data" Value="M2048 410h-410v-410h-1638v1638h410v410h1638v-1638zM1434 1434h-1229v-1229h1229v1229zM1843 1843h-1229v-205h1024v-1024h205v1229z" />
+      </Style>
+      <Style Selector="^:fullscreen /template/ Panel#PART_FullScreenButton Path">
+        <Setter Property="IsVisible" Value="True" />
+        <Setter Property="Data" Value="M205 1024h819v-819h-205v469l-674 -674l-145 145l674 674h-469v205zM1374 1229h469v-205h-819v819h205v-469l674 674l145 -145z" />
+      </Style>
+      <Style Selector="^:fullscreen /template/ Panel#PART_RestoreButton">
+        <Setter Property="IsVisible" Value="False" />
+      </Style>
+      <Style Selector="^:fullscreen /template/ Panel#PART_MinimiseButton">
+        <Setter Property="IsVisible" Value="False" />
+      </Style>
+    </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/Carousel.xaml b/src/Avalonia.Themes.Fluent/Controls/Carousel.xaml
index baba0649aa..6c05a62250 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Carousel.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Carousel.xaml
@@ -1,17 +1,20 @@
-<Style xmlns="https://github.com/avaloniaui" Selector="Carousel">
-  <Setter Property="Template">
-    <ControlTemplate>
-      <Border Background="{TemplateBinding Background}"
-              BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}"
-              CornerRadius="{TemplateBinding CornerRadius}">
-        <CarouselPresenter IsVirtualized="{TemplateBinding IsVirtualized}"
-                           Items="{TemplateBinding Items}"
-                           ItemsPanel="{TemplateBinding ItemsPanel}"
-                           Margin="{TemplateBinding Padding}"
-                           SelectedIndex="{TemplateBinding SelectedIndex}"
-                           PageTransition="{TemplateBinding PageTransition}"/>
-      </Border>
-    </ControlTemplate>
-  </Setter>
-</Style>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ControlTheme x:Key="{x:Type Carousel}" TargetType="Carousel">
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <CarouselPresenter IsVirtualized="{TemplateBinding IsVirtualized}"
+                               Items="{TemplateBinding Items}"
+                               ItemsPanel="{TemplateBinding ItemsPanel}"
+                               Margin="{TemplateBinding Padding}"
+                               SelectedIndex="{TemplateBinding SelectedIndex}"
+                               PageTransition="{TemplateBinding PageTransition}"/>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+    </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml b/src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml
index e9830fb228..2eee425cb0 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml
@@ -1,297 +1,293 @@
-<Style xmlns="https://github.com/avaloniaui"
-       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-       Selector="CheckBox">
-  <Design.PreviewWith>
-    <Border Padding="20">
-      <CheckBox IsThreeState="True" IsChecked="True" Content="Content" Foreground="Gold" />
-    </Border>
-  </Design.PreviewWith>
-  
-  <Setter Property="Padding" Value="8,0,0,0" />
-  <Setter Property="HorizontalAlignment" Value="Left" />
-  <Setter Property="VerticalAlignment" Value="Center" />
-  <Setter Property="HorizontalContentAlignment" Value="Left" />
-  <Setter Property="VerticalContentAlignment" Value="Center" />    
-  <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-  <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-  <Setter Property="MinHeight" Value="32" />
-  <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundUnchecked}" />
-  <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundUnchecked}" />
-  <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUnchecked}" />
-  <Setter Property="Template">
-    <ControlTemplate>
-      <Grid x:Name="RootGrid" ColumnDefinitions="20,*">
-        <Border x:Name="PART_Border"
-                Grid.ColumnSpan="2"
-                Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}" />
-
-        <Grid VerticalAlignment="Top" Height="32">
-          <Border x:Name="NormalRectangle"
-              BorderThickness="{DynamicResource CheckBoxBorderThemeThickness}"
-              CornerRadius="{TemplateBinding CornerRadius}"
-              UseLayoutRounding="False"
-              Height="20"
-              Width="20" />
-
-          <Viewbox UseLayoutRounding="False">
-            <Panel>
-              <Panel Height="16" Width="16" />
-              <Path x:Name="CheckGlyph" Stretch="Uniform" VerticalAlignment="Center" />
-            </Panel>
-          </Viewbox>
-        </Grid>
-        <ContentPresenter x:Name="ContentPresenter"
-                        ContentTemplate="{TemplateBinding ContentTemplate}"
-                        Content="{TemplateBinding Content}"
-                        Margin="{TemplateBinding Padding}"
-                        RecognizesAccessKey="True"
-                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                        Grid.Column="1" />
-        <!-- TODO: TextWrapping="Wrap" on contentpresenter -->
-      </Grid>
-    </ControlTemplate>
-  </Setter>
-
-  <!-- Unchecked Normal State -->
-  <Style Selector="^ /template/ Border#NormalRectangle">
-    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUnchecked}" />
-    <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillUnchecked}" />
-  </Style>
-
-  <Style Selector="^ /template/ Path#CheckGlyph">
-    <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundUnchecked}" />
-    <Setter Property="Opacity" Value="0" />
-  </Style>
-
-  <!-- Unchecked PointerOver State -->
-  <Style Selector="^:pointerover">
-    <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
-      <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundUncheckedPointerOver}" />
-    </Style>
-
-    <Style Selector="^ /template/ Border#PART_Border">
-      <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundUncheckedPointerOver}" />
-      <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUncheckedPointerOver}" />
-    </Style>
-
-    <Style Selector="^ /template/ Border#NormalRectangle">
-      <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUncheckedPointerOver}" />
-      <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillUncheckedPointerOver}" />
-    </Style>
-
-    <Style Selector="^ /template/ Path#CheckGlyph">
-      <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundUncheckedPointerOver}" />
-    </Style>
-  </Style>
-
-  <!-- Unchecked Pressed State -->
-  <Style Selector="^:pressed">
-    <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
-      <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundUncheckedPressed}" />
-    </Style>
-
-    <Style Selector="^ /template/ Border#PART_Border">
-      <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundUncheckedPressed}" />
-      <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUncheckedPressed}" />
-    </Style>
-
-    <Style Selector="^ /template/ Border#NormalRectangle">
-      <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUncheckedPressed}" />
-      <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillUncheckedPressed}" />
-    </Style>
-
-    <Style Selector="^ /template/ Path#CheckGlyph">
-      <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundUncheckedPressed}" />
-    </Style>
-  </Style>
-
-  <!-- Unchecked Disabled state -->
-  <Style Selector="^:disabled">
-    <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
-      <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundUncheckedDisabled}" />
-    </Style>
-
-    <Style Selector="^ /template/ Border#PART_Border">
-      <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundUncheckedDisabled}" />
-      <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUncheckedDisabled}" />
-    </Style>
-
-    <Style Selector="^ /template/ Border#NormalRectangle">
-      <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUncheckedDisabled}" />
-      <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillUncheckedDisabled}" />
-    </Style>
-
-    <Style Selector="^ /template/ Path#CheckGlyph">
-      <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundUncheckedDisabled}" />
-    </Style>
-  </Style>
-
-  <Style Selector="^:checked">
-    <!-- Checked Normal State -->
-    <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundChecked}" />
-    <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundChecked}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushChecked}" />
-
-    <Style Selector="^ /template/ Border#NormalRectangle">
-      <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundFillChecked}" />
-      <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillChecked}" />
-    </Style>
-
-    <Style Selector="^ /template/ Path#CheckGlyph">
-      <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundChecked}" />
-      <Setter Property="Data" Value="M1507 31L438 1101L-119 543L-29 453L438 919L1417 -59L1507 31Z" />
-      <Setter Property="Width" Value="9" />
-      <Setter Property="Opacity" Value="1" />
-      <Setter Property="FlowDirection" Value="LeftToRight" />
-    </Style>
-
-    <!-- Checked PointerOver State -->
-    <Style Selector="^:pointerover">
-      <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
-        <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundCheckedPointerOver}" />
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Design.PreviewWith>
+      <Border Padding="20">
+        <CheckBox IsThreeState="True" IsChecked="True" Content="Content" Foreground="Gold" />
+      </Border>
+    </Design.PreviewWith>
+
+    <ControlTheme x:Key="{x:Type CheckBox}" TargetType="CheckBox">
+      <Setter Property="Padding" Value="8,0,0,0" />
+      <Setter Property="HorizontalAlignment" Value="Left" />
+      <Setter Property="VerticalAlignment" Value="Center" />
+      <Setter Property="HorizontalContentAlignment" Value="Left" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+      <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+      <Setter Property="MinHeight" Value="32" />
+      <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundUnchecked}" />
+      <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundUnchecked}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUnchecked}" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Grid x:Name="RootGrid" ColumnDefinitions="20,*">
+            <Border x:Name="PART_Border"
+                    Grid.ColumnSpan="2"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    CornerRadius="{TemplateBinding CornerRadius}" />
+
+            <Grid VerticalAlignment="Top" Height="32">
+              <Border x:Name="NormalRectangle"
+                      BorderBrush="{DynamicResource CheckBoxCheckBackgroundStrokeUnchecked}"
+                      Background="{DynamicResource CheckBoxCheckBackgroundFillUnchecked}"
+                      BorderThickness="{DynamicResource CheckBoxBorderThemeThickness}"
+                      CornerRadius="{TemplateBinding CornerRadius}"
+                      UseLayoutRounding="False"
+                      Height="20"
+                      Width="20" />
+
+              <Viewbox UseLayoutRounding="False">
+                <Panel>
+                  <Panel Height="16" Width="16" />
+                  <Path x:Name="CheckGlyph" 
+                        Opacity="0" 
+                        Fill="{DynamicResource CheckBoxCheckGlyphForegroundUnchecked}" 
+                        Stretch="Uniform" 
+                        VerticalAlignment="Center" />
+                </Panel>
+              </Viewbox>
+            </Grid>
+            <ContentPresenter x:Name="ContentPresenter"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            Content="{TemplateBinding Content}"
+                            Margin="{TemplateBinding Padding}"
+                            RecognizesAccessKey="True"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            Grid.Column="1" />
+            <!-- TODO: TextWrapping="Wrap" on contentpresenter -->
+          </Grid>
+        </ControlTemplate>
+      </Setter>
+
+      <!-- Unchecked PointerOver State -->
+      <Style Selector="^:pointerover /template/">
+        <Style Selector="^ ContentPresenter#ContentPresenter">
+          <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundUncheckedPointerOver}" />
+        </Style>
+
+        <Style Selector="^ Border#PART_Border">
+          <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundUncheckedPointerOver}" />
+          <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUncheckedPointerOver}" />
+        </Style>
+
+        <Style Selector="^ Border#NormalRectangle">
+          <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUncheckedPointerOver}" />
+          <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillUncheckedPointerOver}" />
+        </Style>
+
+        <Style Selector="^ Path#CheckGlyph">
+          <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundUncheckedPointerOver}" />
+        </Style>
       </Style>
 
-      <Style Selector="^ /template/ Border#PART_Border">
-        <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundCheckedPointerOver}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushCheckedPointerOver}" />
+      <!-- Unchecked Pressed State -->
+      <Style Selector="^:pressed /template/">
+        <Style Selector="^ ContentPresenter#ContentPresenter">
+          <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundUncheckedPressed}" />
+        </Style>
+
+        <Style Selector="^ Border#PART_Border">
+          <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundUncheckedPressed}" />
+          <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUncheckedPressed}" />
+        </Style>
+
+        <Style Selector="^ Border#NormalRectangle">
+          <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUncheckedPressed}" />
+          <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillUncheckedPressed}" />
+        </Style>
+
+        <Style Selector="^ Path#CheckGlyph">
+          <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundUncheckedPressed}" />
+        </Style>
       </Style>
 
-      <Style Selector="^ /template/ Border#NormalRectangle">
-        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeCheckedPointerOver}" />
-        <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillCheckedPointerOver}" />
+      <!-- Unchecked Disabled state -->
+      <Style Selector="^:disabled /template/">
+        <Style Selector="^ ContentPresenter#ContentPresenter">
+          <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundUncheckedDisabled}" />
+        </Style>
+
+        <Style Selector="^ Border#PART_Border">
+          <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundUncheckedDisabled}" />
+          <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUncheckedDisabled}" />
+        </Style>
+
+        <Style Selector="^ Border#NormalRectangle">
+          <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUncheckedDisabled}" />
+          <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillUncheckedDisabled}" />
+        </Style>
+
+        <Style Selector="^ Path#CheckGlyph">
+          <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundUncheckedDisabled}" />
+        </Style>
       </Style>
 
-      <Style Selector="^ /template/ Path#CheckGlyph">
-        <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundCheckedPointerOver}" />
+      <Style Selector="^:checked">
+        <!-- Checked Normal State -->
+        <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundChecked}" />
+        <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundChecked}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushChecked}" />
+
+        <Style Selector="^ /template/ Border#NormalRectangle">
+          <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundFillChecked}" />
+          <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillChecked}" />
+        </Style>
+
+        <Style Selector="^ /template/ Path#CheckGlyph">
+          <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundChecked}" />
+          <Setter Property="Data" Value="M1507 31L438 1101L-119 543L-29 453L438 919L1417 -59L1507 31Z" />
+          <Setter Property="Width" Value="9" />
+          <Setter Property="Opacity" Value="1" />
+          <Setter Property="FlowDirection" Value="LeftToRight" />
+        </Style>
+
+        <!-- Checked PointerOver State -->
+        <Style Selector="^:pointerover /template/">
+          <Style Selector="^ ContentPresenter#ContentPresenter">
+            <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundCheckedPointerOver}" />
+          </Style>
+
+          <Style Selector="^ Border#PART_Border">
+            <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundCheckedPointerOver}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushCheckedPointerOver}" />
+          </Style>
+
+          <Style Selector="^ Border#NormalRectangle">
+            <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeCheckedPointerOver}" />
+            <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillCheckedPointerOver}" />
+          </Style>
+
+          <Style Selector="^ Path#CheckGlyph">
+            <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundCheckedPointerOver}" />
+          </Style>
+        </Style>
+
+        <!-- Checked Pressed State -->
+        <Style Selector="^:pressed /template/">
+          <Style Selector="^ ContentPresenter#ContentPresenter">
+            <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundCheckedPressed}" />
+          </Style>
+
+          <Style Selector="^ Border#PART_Border">
+            <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundCheckedPressed}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushCheckedPressed}" />
+          </Style>
+
+          <Style Selector="^ Border#NormalRectangle">
+            <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeCheckedPressed}" />
+            <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillCheckedPressed}" />
+          </Style>
+
+          <Style Selector="^ Path#CheckGlyph">
+            <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundCheckedPressed}" />
+          </Style>
+        </Style>
+
+        <!-- Checked Disabled State -->
+        <Style Selector="^:disabled /template/">
+          <Style Selector="^ ContentPresenter#ContentPresenter">
+            <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundCheckedDisabled}" />
+          </Style>
+
+          <Style Selector="^ Border#PART_Border">
+            <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundCheckedDisabled}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushCheckedDisabled}" />
+          </Style>
+
+          <Style Selector="^ Border#NormalRectangle">
+            <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeCheckedDisabled}" />
+            <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillCheckedDisabled}" />
+          </Style>
+
+          <Style Selector="^ Path#CheckGlyph">
+            <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundCheckedDisabled}" />
+          </Style>
+        </Style>
       </Style>
-    </Style>
 
-    <!-- Checked Pressed State -->
-    <Style Selector="^:pressed">
-      <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
-        <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundCheckedPressed}" />
+      <Style Selector="^:indeterminate">
+        <!-- Indeterminate Normal State -->
+        <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminate}" />
+        <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundIndeterminate}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminate}" />
+
+        <Style Selector="^ /template/ Border#NormalRectangle">
+          <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminate}" />
+          <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminate}" />
+        </Style>
+
+        <Style Selector="^ /template/ Path#CheckGlyph">
+          <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminate}" />
+          <Setter Property="Data" Value="M1536 1536v-1024h-1024v1024h1024z" />
+          <Setter Property="Width" Value="7" />
+          <Setter Property="Opacity" Value="1" />
+        </Style>
+
+        <!-- Indeterminate PointerOver State -->
+        <Style Selector="^:pointerover /template/">
+          <Style Selector="^ ContentPresenter#ContentPresenter">
+            <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminatePointerOver}" />
+          </Style>
+
+          <Style Selector="^ Border#PART_Border">
+            <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundIndeterminatePointerOver}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminatePointerOver}" />
+          </Style>
+
+          <Style Selector="^ Border#NormalRectangle">
+            <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminatePointerOver}" />
+            <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminatePointerOver}" />
+          </Style>
+
+          <Style Selector="^ Path#CheckGlyph">
+            <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminatePointerOver}" />
+          </Style>
+        </Style>
+
+        <!-- Indeterminate Pressed State -->
+        <Style Selector="^:pressed /template/">
+          <Style Selector="^ ContentPresenter#ContentPresenter">
+            <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminatePressed}" />
+          </Style>
+
+          <Style Selector="^ Border#PART_Border">
+            <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundIndeterminatePressed}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminatePressed}" />
+          </Style>
+
+          <Style Selector="^ Border#NormalRectangle">
+            <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminatePressed}" />
+            <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminatePressed}" />
+          </Style>
+
+          <Style Selector="^ Path#CheckGlyph">
+            <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminatePressed}" />
+          </Style>
+        </Style>
+
+        <!-- Indeterminate Disabled State -->
+        <Style Selector="^:disabled /template/">
+          <Style Selector="^ ContentPresenter#ContentPresenter">
+            <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminateDisabled}" />
+          </Style>
+
+          <Style Selector="^ Border#PART_Border">
+            <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundIndeterminateDisabled}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminateDisabled}" />
+          </Style>
+
+          <Style Selector="^ Border#NormalRectangle">
+            <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminateDisabled}" />
+            <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminateDisabled}" />
+          </Style>
+
+          <Style Selector="^ Path#CheckGlyph">
+            <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminateDisabled}" />
+          </Style>
+        </Style>
       </Style>
-
-      <Style Selector="^ /template/ Border#PART_Border">
-        <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundCheckedPressed}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushCheckedPressed}" />
-      </Style>
-
-      <Style Selector="^ /template/ Border#NormalRectangle">
-        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeCheckedPressed}" />
-        <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillCheckedPressed}" />
-      </Style>
-
-      <Style Selector="^ /template/ Path#CheckGlyph">
-        <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundCheckedPressed}" />
-      </Style>
-    </Style>
-
-    <!-- Checked Disabled State -->
-    <Style Selector="^:disabled">
-      <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
-        <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundCheckedDisabled}" />
-      </Style>
-
-      <Style Selector="^ /template/ Border#PART_Border">
-        <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundCheckedDisabled}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushCheckedDisabled}" />
-      </Style>
-
-      <Style Selector="^ /template/ Border#NormalRectangle">
-        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeCheckedDisabled}" />
-        <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillCheckedDisabled}" />
-      </Style>
-
-      <Style Selector="^ /template/ Path#CheckGlyph">
-        <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundCheckedDisabled}" />
-      </Style>
-    </Style>
-  </Style>
-
-  <Style Selector="^:indeterminate">
-    <!-- Indeterminate Normal State -->
-    <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminate}" />
-    <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundIndeterminate}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminate}" />
-
-    <Style Selector="^ /template/ Border#NormalRectangle">
-      <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminate}" />
-      <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminate}" />
-    </Style>
-
-    <Style Selector="^ /template/ Path#CheckGlyph">
-      <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminate}" />
-      <Setter Property="Data" Value="M1536 1536v-1024h-1024v1024h1024z" />
-      <Setter Property="Width" Value="7" />
-      <Setter Property="Opacity" Value="1" />
-    </Style>
-
-    <!-- Indeterminate PointerOver State -->
-    <Style Selector="^:pointerover">
-      <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
-        <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminatePointerOver}" />
-      </Style>
-
-      <Style Selector="^ /template/ Border#PART_Border">
-        <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundIndeterminatePointerOver}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminatePointerOver}" />
-      </Style>
-
-      <Style Selector="^ /template/ Border#NormalRectangle">
-        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminatePointerOver}" />
-        <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminatePointerOver}" />
-      </Style>
-
-      <Style Selector="^ /template/ Path#CheckGlyph">
-        <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminatePointerOver}" />
-      </Style>
-    </Style>
-
-    <!-- Indeterminate Pressed State -->
-    <Style Selector="^:pressed">
-      <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
-        <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminatePressed}" />
-      </Style>
-
-      <Style Selector="^ /template/ Border#PART_Border">
-        <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundIndeterminatePressed}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminatePressed}" />
-      </Style>
-
-      <Style Selector="^ /template/ Border#NormalRectangle">
-        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminatePressed}" />
-        <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminatePressed}" />
-      </Style>
-
-      <Style Selector="^ /template/ Path#CheckGlyph">
-        <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminatePressed}" />
-      </Style>
-    </Style>
-
-    <!-- Indeterminate Disabled State -->
-    <Style Selector="^:disabled">
-      <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
-        <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminateDisabled}" />
-      </Style>
-
-      <Style Selector="^ /template/ Border#PART_Border">
-        <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundIndeterminateDisabled}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminateDisabled}" />
-      </Style>
-
-      <Style Selector="^ /template/ Border#NormalRectangle">
-        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminateDisabled}" />
-        <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminateDisabled}" />
-      </Style>
-
-      <Style Selector="^ /template/ Path#CheckGlyph">
-        <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminateDisabled}" />
-      </Style>
-    </Style>
-  </Style>
-</Style>
+    </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml b/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml
index 93ecc438eb..2dc7439001 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml
@@ -1,232 +1,228 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Design.PreviewWith>
-    <Border Padding="20">
-      <StackPanel Spacing="10">
-        <ComboBox PlaceholderText="Select an item">
-          <ComboBoxItem>Item 1</ComboBoxItem>
-          <ComboBoxItem>Item 2</ComboBoxItem>
-        </ComboBox>
-        <ComboBox IsEnabled="False"
-                  Width="200"
-                  SelectedIndex="1"
-                  HorizontalContentAlignment="Center">
-          <ComboBoxItem>Item 1</ComboBoxItem>
-          <ComboBoxItem>Item 2</ComboBoxItem>
-        </ComboBox>
-      </StackPanel>
-    </Border>
-  </Design.PreviewWith>
-  <Styles.Resources>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Design.PreviewWith>
+      <Border Padding="20">
+        <StackPanel Spacing="10">
+          <ComboBox PlaceholderText="Select an item">
+            <ComboBoxItem>Item 1</ComboBoxItem>
+            <ComboBoxItem>Item 2</ComboBoxItem>
+          </ComboBox>
+          <ComboBox IsEnabled="False" 
+                    Width="200" 
+                    SelectedIndex="1" 
+                    HorizontalContentAlignment="Center">
+            <ComboBoxItem>Item 1</ComboBoxItem>
+            <ComboBoxItem>Item 2</ComboBoxItem>
+          </ComboBox>
+        </StackPanel>
+      </Border>
+    </Design.PreviewWith>
+  
     <Thickness x:Key="ComboBoxTopHeaderMargin">0,0,0,4</Thickness>
     <x:Int32 x:Key="ComboBoxPopupMaxNumberOfItems">15</x:Int32>
     <x:Int32 x:Key="ComboBoxPopupMaxNumberOfItemsThatCanBeShownOnOneSide">7</x:Int32>
-
+    
     <Thickness x:Key="ComboBoxPadding">12,5,0,7</Thickness>
     <Thickness x:Key="ComboBoxEditableTextPadding">11,5,32,6</Thickness>
     <x:Double x:Key="ComboBoxMinHeight">32</x:Double>
-  </Styles.Resources>
-  <Style Selector="ComboBox">
-    <Setter Property="Padding" Value="{DynamicResource ComboBoxPadding}" />
-    <Setter Property="FocusAdorner" Value="{x:Null}" />
-    <Setter Property="MaxDropDownHeight" Value="504" />
-    <Setter Property="Foreground" Value="{DynamicResource ComboBoxForeground}" />
-    <Setter Property="Background" Value="{DynamicResource ComboBoxBackground}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxBorderBrush}" />
-    <Setter Property="BorderThickness" Value="{DynamicResource ComboBoxBorderThemeThickness}" />
-    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
-    <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-    <Setter Property="MinHeight" Value="{DynamicResource ComboBoxMinHeight}" />
-    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="HorizontalAlignment" Value="Left" />
-    <Setter Property="VerticalAlignment" Value="Top" />    
-    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-    <Setter Property="PlaceholderForeground" Value="{DynamicResource ComboBoxPlaceHolderForeground}" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <DataValidationErrors>
-          <Grid RowDefinitions="Auto, *, Auto"
-                ColumnDefinitions="*,32">
-            <ContentPresenter x:Name="HeaderContentPresenter"
-                              Grid.Row="0"
+    
+    <ControlTheme x:Key="{x:Type ComboBox}" TargetType="ComboBox">
+      <Setter Property="Padding" Value="{DynamicResource ComboBoxPadding}" />
+      <Setter Property="FocusAdorner" Value="{x:Null}" />
+      <Setter Property="MaxDropDownHeight" Value="504" />
+      <Setter Property="Foreground" Value="{DynamicResource ComboBoxForeground}" />
+      <Setter Property="Background" Value="{DynamicResource ComboBoxBackground}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxBorderBrush}" />
+      <Setter Property="BorderThickness" Value="{DynamicResource ComboBoxBorderThemeThickness}" />
+      <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+      <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
+      <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+      <Setter Property="MinHeight" Value="{DynamicResource ComboBoxMinHeight}" />
+      <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="HorizontalAlignment" Value="Left" />
+      <Setter Property="VerticalAlignment" Value="Top" />
+      <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+      <Setter Property="PlaceholderForeground" Value="{DynamicResource ComboBoxPlaceHolderForeground}" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <DataValidationErrors>
+            <Grid RowDefinitions="Auto, *, Auto" ColumnDefinitions="*,32">
+              <ContentPresenter x:Name="HeaderContentPresenter"
+                                Grid.Row="0"
+                                Grid.Column="0" 
+                                Grid.ColumnSpan="2"
+                                IsVisible="False"
+                                FontWeight="{DynamicResource ComboBoxHeaderThemeFontWeight}" 
+                                Margin="{DynamicResource ComboBoxTopHeaderMargin}"
+                                VerticalAlignment="Top" />
+              <Border x:Name="Background"
+                      Grid.Row="1"
+                      Grid.Column="0"
+                      Grid.ColumnSpan="2"
+                      Background="{TemplateBinding Background}"
+                      BorderBrush="{TemplateBinding BorderBrush}"
+                      BorderThickness="{TemplateBinding BorderThickness}"
+                      CornerRadius="{TemplateBinding CornerRadius}"
+                      MinWidth="{DynamicResource ComboBoxThemeMinWidth}" />
+              <Border x:Name="HighlightBackground"
+                      Grid.Row="1"
+                      Grid.Column="0"
+                      Grid.ColumnSpan="2"
+                      Background="{DynamicResource ComboBoxBackgroundUnfocused}"
+                      BorderBrush="{DynamicResource ComboBoxBackgroundBorderBrushUnfocused}"
+                      BorderThickness="{TemplateBinding BorderThickness}"
+                      CornerRadius="{TemplateBinding CornerRadius}" />
+              <TextBlock x:Name="PlaceholderTextBlock"
+                         Grid.Row="1"
+                         Grid.Column="0"
+                         HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                         VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                         Margin="{TemplateBinding Padding}"
+                         Text="{TemplateBinding PlaceholderText}"
+                         Foreground="{TemplateBinding PlaceholderForeground}"
+                         IsVisible="{TemplateBinding SelectionBoxItem, Converter={x:Static ObjectConverters.IsNull}}" />
+              <ContentControl x:Name="ContentPresenter"
+                              Content="{TemplateBinding SelectionBoxItem}"
+                              ContentTemplate="{TemplateBinding ItemTemplate}"
+                              Grid.Row="1"
                               Grid.Column="0"
-                              Grid.ColumnSpan="2"
-                              IsVisible="False"
-                              FontWeight="{DynamicResource ComboBoxHeaderThemeFontWeight}"
-                              Margin="{DynamicResource ComboBoxTopHeaderMargin}"
-                              VerticalAlignment="Top" />
-            <Border x:Name="Background"
-                    Grid.Row="1"
-                    Grid.Column="0"
-                    Grid.ColumnSpan="2"
-                    Background="{TemplateBinding Background}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    CornerRadius="{TemplateBinding CornerRadius}"
-                    MinWidth="{DynamicResource ComboBoxThemeMinWidth}" />
-
-            <Border x:Name="HighlightBackground"
-                    Grid.Row="1"
-                    Grid.Column="0"
-                    Grid.ColumnSpan="2"
-                    Background="{DynamicResource ComboBoxBackgroundUnfocused}"
-                    BorderBrush="{DynamicResource ComboBoxBackgroundBorderBrushUnfocused}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    CornerRadius="{TemplateBinding CornerRadius}" />
-            <TextBlock x:Name="PlaceholderTextBlock"
-                       Grid.Row="1"
-                       Grid.Column="0"
-                       HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                       VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                       Margin="{TemplateBinding Padding}"
-                       Text="{TemplateBinding PlaceholderText}"
-                       Foreground="{TemplateBinding PlaceholderForeground}"
-                       IsVisible="{TemplateBinding SelectionBoxItem, Converter={x:Static ObjectConverters.IsNull}}" />
-            <ContentControl x:Name="ContentPresenter"
-                            Content="{TemplateBinding SelectionBoxItem}"
-                            ContentTemplate="{TemplateBinding ItemTemplate}"
-                            Grid.Row="1"
-                            Grid.Column="0"
-                            Margin="{TemplateBinding Padding}"
-                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-
-            <Border x:Name="DropDownOverlay"
-                    Grid.Row="1"
-                    Grid.Column="1"
-                    Background="Transparent"
-                    Margin="0,1,1,1"
-                    Width="30"
-                    IsVisible="False"
-                    HorizontalAlignment="Right" />
-
-            <PathIcon x:Name="DropDownGlyph"
+                              Margin="{TemplateBinding Padding}"
+                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+              
+              <Border x:Name="DropDownOverlay"
                       Grid.Row="1"
                       Grid.Column="1"
-                      UseLayoutRounding="False"
-                      IsHitTestVisible="False"
-                      Height="12"
-                      Width="12"
-                      Margin="0,0,10,0"
-                      HorizontalAlignment="Right"
-                      VerticalAlignment="Center" />
-
-            <Popup Name="PART_Popup"
-                   WindowManagerAddShadowHint="False"
-                   IsOpen="{TemplateBinding IsDropDownOpen, Mode=TwoWay}"
-                   MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
-                   MaxHeight="{TemplateBinding MaxDropDownHeight}"
-                   PlacementTarget="Background"
-                   IsLightDismissEnabled="True"
-                   InheritsTransform="True">
-              <Border x:Name="PopupBorder"
-                      Background="{DynamicResource ComboBoxDropDownBackground}"
-                      BorderBrush="{DynamicResource ComboBoxDropDownBorderBrush}"
-                      BorderThickness="{DynamicResource ComboBoxDropdownBorderThickness}"
-                      Margin="0,-1,0,-1"
-                      Padding="{DynamicResource ComboBoxDropdownBorderPadding}"
-                      HorizontalAlignment="Stretch"
-                      CornerRadius="{DynamicResource OverlayCornerRadius}">
-                <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
-                              VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
-                  <ItemsPresenter Name="PART_ItemsPresenter"
-                                  Items="{TemplateBinding Items}"
-                                  Margin="{DynamicResource ComboBoxDropdownContentMargin}"
-                                  ItemsPanel="{TemplateBinding ItemsPanel}"
-                                  ItemTemplate="{TemplateBinding ItemTemplate}"
-                                  VirtualizationMode="{TemplateBinding VirtualizationMode}" />
-                </ScrollViewer>
-              </Border>
-            </Popup>
-          </Grid>
-        </DataValidationErrors>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <!--  Normal State  -->
-  <Style Selector="ComboBox /template/ TextBlock#PlaceholderTextBlock">
-    <Setter Property="Foreground" Value="{DynamicResource ComboBoxPlaceHolderForeground}" />
-  </Style>
-
-  <Style Selector="ComboBox /template/ Border#HighlightBackground">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-
-  <Style Selector="ComboBox /template/ PathIcon#DropDownGlyph">
-    <Setter Property="Foreground" Value="{DynamicResource ComboBoxDropDownGlyphForeground}" />
-    <Setter Property="Data" Value="M1939 486L2029 576L1024 1581L19 576L109 486L1024 1401L1939 486Z" />
-  </Style>
-
-  <!--  PointerOver State  -->
-  <Style Selector="ComboBox:pointerover /template/ Border#Background">
-    <Setter Property="Background" Value="{DynamicResource ComboBoxBackgroundPointerOver}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxBorderBrushPointerOver}" />
-  </Style>
-
-  <!--  Pressed State  -->
-  <Style Selector="ComboBox:pressed /template/ Border#Background">
-    <Setter Property="Background" Value="{DynamicResource ComboBoxBackgroundPressed}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxBorderBrushPressed}" />
-  </Style>
-
-  <!--  Disabled State  -->
-  <Style Selector="ComboBox:disabled /template/ Border#Background">
-    <Setter Property="Background" Value="{DynamicResource ComboBoxBackgroundDisabled}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxBorderBrushDisabled}" />
-  </Style>
-
-  <Style Selector="ComboBox:disabled /template/ ContentPresenter#HeaderContentPresenter">
-    <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundDisabled}" />
-  </Style>
-
-  <Style Selector="ComboBox:disabled /template/ ContentControl#ContentPresenter">
-    <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundDisabled}" />
-  </Style>
-
-  <Style Selector="ComboBox:disabled /template/ TextBlock#PlaceholderTextBlock">
-    <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundDisabled}" />
-  </Style>
-
-  <Style Selector="ComboBox:disabled /template/ PathIcon#DropDownGlyph">
-    <Setter Property="Foreground" Value="{DynamicResource ComboBoxDropDownGlyphForegroundDisabled}" />
-  </Style>
-
-  <!--  Focused State  -->
-  <Style Selector="ComboBox:focus-visible /template/ Border#HighlightBackground">
-    <Setter Property="IsVisible" Value="True" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxBackgroundBorderBrushFocused}" />
-  </Style>
-
-  <Style Selector="ComboBox:focus-visible /template/ ContentControl#ContentPresenter">
-    <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundFocused}" />
-  </Style>
-
-  <Style Selector="ComboBox:focus-visible /template/ TextBlock#PlaceholderTextBlock">
-    <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundFocused}" />
-  </Style>
-
-  <Style Selector="ComboBox:focus-visible /template/ PathIcon#DropDownGlyph">
-    <Setter Property="Foreground" Value="{DynamicResource ComboBoxDropDownGlyphForegroundFocused}" />
-  </Style>
-
-  <!--  Focus Pressed State  -->
-  <Style Selector="ComboBox:focused:pressed /template/ ContentControl#ContentPresenter">
-    <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundFocusedPressed}" />
-  </Style>
-
-  <Style Selector="ComboBox:focused:pressed /template/ TextBlock#PlaceholderTextBlock">
-    <Setter Property="Foreground" Value="{DynamicResource ComboBoxPlaceHolderForegroundFocusedPressed}" />
-  </Style>
-
-  <Style Selector="ComboBox:focused:pressed /template/ PathIcon#DropDownGlyph">
-    <Setter Property="Foreground" Value="{DynamicResource ComboBoxDropDownGlyphForegroundFocusedPressed}" />
-  </Style>
+                      Background="Transparent"
+                      Margin="0,1,1,1" 
+                      Width="30" 
+                      IsVisible="False" 
+                      HorizontalAlignment="Right" />
+              
+              <PathIcon x:Name="DropDownGlyph"
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        UseLayoutRounding="False"
+                        IsHitTestVisible="False"
+                        Height="12"
+                        Width="12"
+                        Margin="0,0,10,0" 
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Center" />
+              
+              <Popup Name="PART_Popup" 
+                     WindowManagerAddShadowHint="False"
+                     IsOpen="{TemplateBinding IsDropDownOpen, Mode=TwoWay}" 
+                     MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}" 
+                     MaxHeight="{TemplateBinding MaxDropDownHeight}"
+                     PlacementTarget="Background" 
+                     IsLightDismissEnabled="True" 
+                     InheritsTransform="True">
+                <Border x:Name="PopupBorder"
+                        Background="{DynamicResource ComboBoxDropDownBackground}"
+                        BorderBrush="{DynamicResource ComboBoxDropDownBorderBrush}" 
+                        BorderThickness="{DynamicResource ComboBoxDropdownBorderThickness}"
+                        Margin="0,-1,0,-1"
+                        Padding="{DynamicResource ComboBoxDropdownBorderPadding}"
+                        HorizontalAlignment="Stretch"
+                        CornerRadius="{DynamicResource OverlayCornerRadius}">
+                  <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                                VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
+                    <ItemsPresenter Name="PART_ItemsPresenter"
+                                    Items="{TemplateBinding Items}" 
+                                    Margin="{DynamicResource ComboBoxDropdownContentMargin}" 
+                                    ItemsPanel="{TemplateBinding ItemsPanel}"
+                                    ItemTemplate="{TemplateBinding ItemTemplate}" 
+                                    VirtualizationMode="{TemplateBinding VirtualizationMode}" />
+                  </ScrollViewer>
+                </Border>
+              </Popup>
+            </Grid>
+          </DataValidationErrors>
+        </ControlTemplate>
+      </Setter>
+
+      <!--  Normal State  -->
+      <Style Selector="^ /template/">
+        <Style Selector="^ TextBlock#PlaceholderTextBlock">
+          <Setter Property="Foreground" Value="{DynamicResource ComboBoxPlaceHolderForeground}" />
+        </Style>
+        <Style Selector="^ Border#HighlightBackground">
+          <Setter Property="IsVisible" Value="False" />
+        </Style>
+        <Style Selector="^ PathIcon#DropDownGlyph">
+          <Setter Property="Foreground" Value="{DynamicResource ComboBoxDropDownGlyphForeground}" />
+          <Setter Property="Data" Value="M1939 486L2029 576L1024 1581L19 576L109 486L1024 1401L1939 486Z" />
+        </Style>
+      </Style>
+
+      <!--  PointerOver State  -->
+      <Style Selector="^:pointerover /template/ Border#Background">
+        <Setter Property="Background" Value="{DynamicResource ComboBoxBackgroundPointerOver}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxBorderBrushPointerOver}" />
+      </Style>
+      
+      <!--  Pressed State  -->
+      <Style Selector="^:pressed /template/ Border#Background">
+        <Setter Property="Background" Value="{DynamicResource ComboBoxBackgroundPressed}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxBorderBrushPressed}" />
+      </Style>
+      
+      <!-- Error State -->
+      <Style Selector="^:error /template/ Border#Background">
+        <Setter Property="BorderBrush" Value="{DynamicResource SystemControlErrorTextForegroundBrush}" />
+      </Style>
+
+      <!--  Focus Pressed State  -->
+      <Style Selector="^:focused:pressed /template/">
+        <Style Selector="^ ContentControl#ContentPresenter">
+          <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundFocusedPressed}" />
+        </Style>
+        <Style Selector="^ TextBlock#PlaceholderTextBlock">
+          <Setter Property="Foreground" Value="{DynamicResource ComboBoxPlaceHolderForegroundFocusedPressed}" />
+        </Style>
+        <Style Selector="^ PathIcon#DropDownGlyph">
+          <Setter Property="Foreground" Value="{DynamicResource ComboBoxDropDownGlyphForegroundFocusedPressed}" />
+        </Style>
+      </Style>
+
+      <!--  Focused State  -->
+      <Style Selector="^:focus-visible /template/">
+        <Style Selector="^ Border#HighlightBackground">
+          <Setter Property="IsVisible" Value="True" />
+          <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxBackgroundBorderBrushFocused}" />
+        </Style>
+        <Style Selector="^ ContentControl#ContentPresenter">
+          <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundFocused}" />
+        </Style>
+        <Style Selector="^ TextBlock#PlaceholderTextBlock">
+          <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundFocused}" />
+        </Style>
+        <Style Selector="^ PathIcon#DropDownGlyph">
+          <Setter Property="Foreground" Value="{DynamicResource ComboBoxDropDownGlyphForegroundFocused}" />
+        </Style>
+      </Style>
+
+      <!--  Disabled State  -->
+      <Style Selector="^:disabled /template/">
+        <Style Selector="^ Border#Background">
+          <Setter Property="Background" Value="{DynamicResource ComboBoxBackgroundDisabled}" />
+          <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxBorderBrushDisabled}" />
+        </Style>
+        <Style Selector="^ ContentPresenter#HeaderContentPresenter">
+          <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundDisabled}" />
+        </Style>
+        <Style Selector="^ ContentControl#ContentPresenter">
+          <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundDisabled}" />
+        </Style>
+        <Style Selector="^ TextBlock#PlaceholderTextBlock">
+          <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundDisabled}" />
+        </Style>
+        <Style Selector="^ PathIcon#DropDownGlyph">
+          <Setter Property="Foreground" Value="{DynamicResource ComboBoxDropDownGlyphForegroundDisabled}" />
+        </Style>
+      </Style>
+    </ControlTheme>
   
-  <!-- Error State -->
-  <Style Selector="ComboBox:error /template/ Border#Background">
-    <Setter Property="BorderBrush" Value="{DynamicResource SystemControlErrorTextForegroundBrush}"/>
-  </Style>
-</Styles>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ComboBoxItem.xaml b/src/Avalonia.Themes.Fluent/Controls/ComboBoxItem.xaml
index 0debe87445..88f9c0ea15 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ComboBoxItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ComboBoxItem.xaml
@@ -1,90 +1,85 @@
-<Styles xmlns="https://github.com/avaloniaui">
-  <Design.PreviewWith>
-    <Border Padding="20">
-      <Border Background="{DynamicResource ComboBoxDropDownBackground}"
-              BorderBrush="{DynamicResource ComboBoxDropDownBorderBrush}"
-              BorderThickness="{DynamicResource ComboBoxDropdownBorderThickness}"
-              Margin="0,-1,0,-1"
-              Padding="{DynamicResource ComboBoxDropdownBorderPadding}"
-              CornerRadius="{DynamicResource OverlayCornerRadius}">
-        <StackPanel HorizontalAlignment="Stretch">
-          <ComboBoxItem>Item 1</ComboBoxItem>
-          <ComboBoxItem>Item 2 long</ComboBoxItem>
-          <ComboBoxItem IsSelected="True">Item 3</ComboBoxItem>
-          <ComboBoxItem IsEnabled="False">Item 4</ComboBoxItem>
-        </StackPanel>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Design.PreviewWith>
+      <Border Padding="20">
+        <Border Background="{DynamicResource ComboBoxDropDownBackground}" BorderBrush="{DynamicResource ComboBoxDropDownBorderBrush}" BorderThickness="{DynamicResource ComboBoxDropdownBorderThickness}" Margin="0,-1,0,-1" Padding="{DynamicResource ComboBoxDropdownBorderPadding}" CornerRadius="{DynamicResource OverlayCornerRadius}">
+          <StackPanel HorizontalAlignment="Stretch">
+            <ComboBoxItem>Item 1</ComboBoxItem>
+            <ComboBoxItem>Item 2 long</ComboBoxItem>
+            <ComboBoxItem IsSelected="True">Item 3</ComboBoxItem>
+            <ComboBoxItem IsEnabled="False">Item 4</ComboBoxItem>
+          </StackPanel>
+        </Border>
       </Border>
-    </Border>
-  </Design.PreviewWith>
+    </Design.PreviewWith>
+  
+    <ControlTheme x:Key="{x:Type ComboBoxItem}" TargetType="ComboBoxItem">
+      <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForeground}" />
+      <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackground}" />
+      <Setter Property="Padding" Value="{DynamicResource ComboBoxItemThemePadding}" />
+      <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <ContentPresenter Name="PART_ContentPresenter"
+                            Foreground="{TemplateBinding Foreground}"
+                            Background="{TemplateBinding Background}" 
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{TemplateBinding CornerRadius}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            Content="{TemplateBinding Content}" 
+                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                            Padding="{TemplateBinding Padding}" />
+        </ControlTemplate>
+      </Setter>
+      
+      <!--  PointerOver state  -->
+      <Style Selector="^:pointerover /template/ ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundPointerOver}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushPointerOver}" />
+        <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForegroundPointerOver}" />
+      </Style>
+      
+      <!--  Disabled state  -->
+      <Style Selector="^:disabled /template/ ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundDisabled}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushDisabled}" />
+        <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForegroundDisabled}" />
+      </Style>
+      
+      <!--  Pressed state  -->
+      <Style Selector="^:pressed /template/ ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundPressed}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushPressed}" />
+        <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForegroundPressed}" />
+      </Style>
 
-  <Style Selector="ComboBoxItem">
-    <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForeground}" />
-    <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackground}" />
-    <Setter Property="Padding" Value="{DynamicResource ComboBoxItemThemePadding}" />
-    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <ContentPresenter Name="PART_ContentPresenter"
-                          Foreground="{TemplateBinding Foreground}"
-                          Background="{TemplateBinding Background}"
-                          BorderBrush="{TemplateBinding BorderBrush}"
-                          BorderThickness="{TemplateBinding BorderThickness}"
-                          CornerRadius="{TemplateBinding CornerRadius}"
-                          ContentTemplate="{TemplateBinding ContentTemplate}"
-                          Content="{TemplateBinding Content}"
-                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                          Padding="{TemplateBinding Padding}" />
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <!--  PointerOver state  -->
-  <Style Selector="ComboBoxItem:pointerover /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundPointerOver}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushPointerOver}" />
-    <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForegroundPointerOver}" />
-  </Style>
-
-  <!--  Disabled state  -->
-  <Style Selector="ComboBoxItem:disabled /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundDisabled}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushDisabled}" />
-    <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForegroundDisabled}" />
-  </Style>
-
-  <!--  Pressed state  -->
-  <Style Selector="ComboBoxItem:pressed /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundPressed}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushPressed}" />
-    <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForegroundPressed}" />
-  </Style>
-
-  <!--  Selected state  -->
-  <Style Selector="ComboBoxItem:selected /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundSelected}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushSelected}" />
-    <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForegroundSelected}" />
-  </Style>
-
-  <!--  Selected Disabled state  -->
-  <Style Selector="ComboBoxItem:selected:disabled /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundSelectedDisabled}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushSelectedDisabled}" />
-    <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForegroundSelectedDisabled}" />
-  </Style>
-
-  <!--  Selected PointerOver state  -->
-  <Style Selector="ComboBoxItem:selected:pointerover /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundSelectedPointerOver}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushSelectedPointerOver}" />
-    <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForegroundSelectedPointerOver}" />
-  </Style>
-
-  <!--  Selected Pressed state  -->
-  <Style Selector="ComboBoxItem:selected:pressed /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundSelectedPressed}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushSelectedPressed}" />
-    <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForegroundSelectedPressed}" />
-  </Style>
-</Styles>
+      <!--  Selected state  -->
+      <Style Selector="^:selected">
+        <Style Selector="^ /template/ ContentPresenter">
+          <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundSelected}" />
+          <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushSelected}" />
+          <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForegroundSelected}" />
+        </Style>
+        <!--  Selected Disabled state  -->
+        <Style Selector="^:disabled /template/ ContentPresenter">
+          <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundSelectedDisabled}" />
+          <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushSelectedDisabled}" />
+          <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForegroundSelectedDisabled}" />
+        </Style>
+        <!--  Selected PointerOver state  -->
+        <Style Selector="^:pointerover /template/ ContentPresenter">
+          <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundSelectedPointerOver}" />
+          <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushSelectedPointerOver}" />
+          <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForegroundSelectedPointerOver}" />
+        </Style>
+        <!--  Selected Pressed state  -->
+        <Style Selector="^:pressed /template/ ContentPresenter">
+          <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundSelectedPressed}" />
+          <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushSelectedPressed}" />
+          <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForegroundSelectedPressed}" />
+        </Style>
+      </Style>
+    </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/Common.xaml b/src/Avalonia.Themes.Fluent/Controls/Common.xaml
deleted file mode 100644
index e09e39d7cb..0000000000
--- a/src/Avalonia.Themes.Fluent/Controls/Common.xaml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Style Selector="TextBlock.CaptionTextBlockStyle">
-    <Setter Property="FontSize" Value="12" />
-    <Setter Property="FontWeight" Value="Normal" />
-  </Style>
-</Styles>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ContentControl.xaml b/src/Avalonia.Themes.Fluent/Controls/ContentControl.xaml
index d32bc399b6..5777603074 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ContentControl.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ContentControl.xaml
@@ -1,16 +1,19 @@
-<Style xmlns="https://github.com/avaloniaui" Selector="ContentControl">
-  <Setter Property="Template">
-    <ControlTemplate>
-      <ContentPresenter Name="PART_ContentPresenter"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="{TemplateBinding CornerRadius}"
-                        ContentTemplate="{TemplateBinding ContentTemplate}"
-                        Content="{TemplateBinding Content}"
-                        Padding="{TemplateBinding Padding}"
-                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"/>
-    </ControlTemplate>
-  </Setter>
-</Style>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ControlTheme x:Key="{x:Type ContentControl}" TargetType="ContentControl">
+      <Setter Property="Template">
+        <ControlTemplate>
+          <ContentPresenter Name="PART_ContentPresenter"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{TemplateBinding CornerRadius}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            Content="{TemplateBinding Content}"
+                            Padding="{TemplateBinding Padding}"
+                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"/>
+        </ControlTemplate>
+      </Setter>
+    </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ContextMenu.xaml b/src/Avalonia.Themes.Fluent/Controls/ContextMenu.xaml
index df800b4a06..fe0f0f3f6c 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ContextMenu.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ContextMenu.xaml
@@ -1,72 +1,72 @@
-<Style xmlns="https://github.com/avaloniaui"
-       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-       Selector="ContextMenu">
-  <Design.PreviewWith>
-    <Border Background="{DynamicResource SystemAccentColor}"
-            Margin="16"
-            Padding="48"
-            Width="400"
-            Height="200">
-      <Border.ContextMenu>
-        <ContextMenu>
-          <MenuItem Header="Standard _Menu Item" />
-          <MenuItem Header="Disabled"
-                    IsEnabled="False" />
-          <Separator />
-          <MenuItem Header="Menu with _Submenu">
-            <MenuItem Header="Submenu _1" />
-            <MenuItem Header="Submenu _2" />
-          </MenuItem>
-          <MenuItem Header="Menu Item with _Icon" />
-          <MenuItem Header="Menu Item with _Checkbox">
-            <MenuItem.Icon>
-              <CheckBox BorderThickness="0"
-                        IsHitTestVisible="False"
-                        IsChecked="True" />
-            </MenuItem.Icon>
-          </MenuItem>
-        </ContextMenu>
-      </Border.ContextMenu>
-      <TextBlock Text="Defined in XAML" />
-    </Border>
-  </Design.PreviewWith>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Design.PreviewWith>
+      <Border Background="{DynamicResource SystemAccentColor}"
+              Margin="16"
+              Padding="48"
+              Width="400"
+              Height="200">
+        <Border.ContextMenu>
+          <ContextMenu>
+            <MenuItem Header="Standard _Menu Item" />
+            <MenuItem Header="Disabled"
+                      IsEnabled="False" />
+            <Separator />
+            <MenuItem Header="Menu with _Submenu">
+              <MenuItem Header="Submenu _1" />
+              <MenuItem Header="Submenu _2" />
+            </MenuItem>
+            <MenuItem Header="Menu Item with _Icon" />
+            <MenuItem Header="Menu Item with _Checkbox">
+              <MenuItem.Icon>
+                <CheckBox BorderThickness="0"
+                          IsHitTestVisible="False"
+                          IsChecked="True" />
+              </MenuItem.Icon>
+            </MenuItem>
+          </ContextMenu>
+        </Border.ContextMenu>
+        <TextBlock Text="Defined in XAML" />
+      </Border>
+    </Design.PreviewWith>
 
-  <Style.Resources>
     <!-- Added missing resource -->
     <Thickness x:Key="MenuFlyoutScrollerMargin">0,4,0,4</Thickness>
-  </Style.Resources>
 
-  <Setter Property="Background" Value="{DynamicResource MenuFlyoutPresenterBackground}" />
-  <Setter Property="BorderBrush" Value="{DynamicResource MenuFlyoutPresenterBorderBrush}" />
-  <Setter Property="BorderThickness" Value="{DynamicResource MenuFlyoutPresenterBorderThemeThickness}" />
-  <Setter Property="CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
-  <Setter Property="MaxWidth" Value="{DynamicResource FlyoutThemeMaxWidth}" />
-  <Setter Property="MinHeight" Value="{DynamicResource MenuFlyoutThemeMinHeight}" />
-  <Setter Property="Padding" Value="{DynamicResource MenuFlyoutPresenterThemePadding}" />
-  <Setter Property="HorizontalAlignment" Value="Stretch" />
-  <Setter Property="TextBlock.FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-  <Setter Property="TextBlock.FontWeight" Value="Normal" />
-  <Setter Property="WindowManagerAddShadowHint" Value="False" />
-  <Setter Property="Template">
-    <ControlTemplate>
-      <Border Background="{TemplateBinding Background}"
-              BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}"
-              Padding="{TemplateBinding Padding}"
-              MaxWidth="{TemplateBinding MaxWidth}"
-              MinHeight="{TemplateBinding MinHeight}"
-              HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-              CornerRadius="{TemplateBinding CornerRadius}">
-        <ScrollViewer Classes="menuscroller">
-          <ItemsPresenter Name="PART_ItemsPresenter"
-                          Items="{TemplateBinding Items}"
-                          ItemsPanel="{TemplateBinding ItemsPanel}"
-                          ItemTemplate="{TemplateBinding ItemTemplate}"
-                          Margin="{DynamicResource MenuFlyoutScrollerMargin}"
-                          KeyboardNavigation.TabNavigation="Continue"
-                          Grid.IsSharedSizeScope="True" />
-        </ScrollViewer>
-      </Border>
-    </ControlTemplate>
-  </Setter>
-</Style>
+    <ControlTheme x:Key="{x:Type ContextMenu}" TargetType="ContextMenu">
+      <Setter Property="Background" Value="{DynamicResource MenuFlyoutPresenterBackground}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource MenuFlyoutPresenterBorderBrush}" />
+      <Setter Property="BorderThickness" Value="{DynamicResource MenuFlyoutPresenterBorderThemeThickness}" />
+      <Setter Property="CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
+      <Setter Property="MaxWidth" Value="{DynamicResource FlyoutThemeMaxWidth}" />
+      <Setter Property="MinHeight" Value="{DynamicResource MenuFlyoutThemeMinHeight}" />
+      <Setter Property="Padding" Value="{DynamicResource MenuFlyoutPresenterThemePadding}" />
+      <Setter Property="HorizontalAlignment" Value="Stretch" />
+      <Setter Property="TextBlock.FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+      <Setter Property="TextBlock.FontWeight" Value="Normal" />
+      <Setter Property="WindowManagerAddShadowHint" Value="False" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  Padding="{TemplateBinding Padding}"
+                  MaxWidth="{TemplateBinding MaxWidth}"
+                  MinHeight="{TemplateBinding MinHeight}"
+                  HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <ScrollViewer Classes="menuscroller">
+              <ItemsPresenter Name="PART_ItemsPresenter"
+                              Items="{TemplateBinding Items}"
+                              ItemsPanel="{TemplateBinding ItemsPanel}"
+                              ItemTemplate="{TemplateBinding ItemTemplate}"
+                              Margin="{DynamicResource MenuFlyoutScrollerMargin}"
+                              KeyboardNavigation.TabNavigation="Continue"
+                              Grid.IsSharedSizeScope="True" />
+            </ScrollViewer>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+    </ControlTheme>
+
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml b/src/Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml
index 649a186c7e..6ed73148a7 100644
--- a/src/Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml
@@ -1,104 +1,103 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:sys="using:System"
-        x:CompileBindings="True"
-        x:DataType="DataValidationErrors">
-  <Design.PreviewWith>
-    <Border Padding="20">
-      <StackPanel Spacing="20">
-        <TextBox Text="Sample">
-          <DataValidationErrors.Error>
-            <sys:Exception />
-          </DataValidationErrors.Error>
-        </TextBox>
-        <TextBox Text="Sample">
-          <TextBox.Styles>
-            <Style Selector="DataValidationErrors">
-              <Setter Property="Template" Value="{DynamicResource TooltipDataValidationContentTemplate}" />
-              <Setter Property="ErrorTemplate" Value="{DynamicResource TooltipDataValidationErrorTemplate}" />
-            </Style>
-          </TextBox.Styles>
-          <DataValidationErrors.Error>
-            <sys:Exception />
-          </DataValidationErrors.Error>
-        </TextBox>
-      </StackPanel>
-    </Border>
-  </Design.PreviewWith>
-
-  <Style Selector="DataValidationErrors">
-    <Style.Resources>
-      <DataTemplate x:Key="InlineDataValidationErrorTemplate">
-        <ItemsControl Items="{Binding}" x:DataType="DataValidationErrors" Foreground="{DynamicResource SystemControlErrorTextForegroundBrush}">
-          <ItemsControl.Styles>
-            <Style Selector="TextBlock">
-              <Setter Property="TextWrapping" Value="Wrap" />
-            </Style>
-          </ItemsControl.Styles>
-        </ItemsControl>
-      </DataTemplate>
-      <ControlTemplate x:Key="InlineDataValidationContentTemplate" TargetType="DataValidationErrors">
-        <DockPanel LastChildFill="True">
-          <ContentControl x:Name="InlineDataValidationContentControl"
-                          Margin="0,4,0,0"
-                          Content="{Binding (DataValidationErrors.Errors)}"
-                          ContentTemplate="{TemplateBinding ErrorTemplate}"
-                          DataContext="{TemplateBinding Owner}"
-                          DockPanel.Dock="Bottom"
-                          IsVisible="{Binding (DataValidationErrors.HasErrors)}" />
-          <ContentPresenter Name="PART_ContentPresenter"
-                            Padding="{TemplateBinding Padding}"
-                            Background="{TemplateBinding Background}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding CornerRadius}"
-                            Content="{TemplateBinding Content}"
-                            ContentTemplate="{TemplateBinding ContentTemplate}" />
-        </DockPanel>
-      </ControlTemplate>
-
-      <DataTemplate x:DataType="DataValidationErrors" x:Key="TooltipDataValidationErrorTemplate">
-        <Panel Name="PART_InlineErrorTemplatePanel" Background="Transparent">
-          <Panel.Styles>
-            <Style Selector="Panel#PART_InlineErrorTemplatePanel">
-              <Setter Property="Margin" Value="8,0" />
-            </Style>
-            <Style Selector="Panel#PART_InlineErrorTemplatePanel ToolTip">
-              <Setter Property="BorderBrush" Value="{DynamicResource SystemControlErrorTextForegroundBrush}" />
-            </Style>
-            <Style Selector="Panel#PART_InlineErrorTemplatePanel ToolTip TextBlock">
-              <Setter Property="TextWrapping" Value="Wrap" />
-            </Style>
-          </Panel.Styles>
-          <ToolTip.Tip>
-            <ItemsControl Items="{Binding}" />
-          </ToolTip.Tip>
-          <Path Width="14"
-                Height="14"
-                Data="M14,7 A7,7 0 0,0 0,7 M0,7 A7,7 0 1,0 14,7 M7,3l0,5 M7,9l0,2"
-                Stroke="{DynamicResource SystemControlErrorTextForegroundBrush}"
-                StrokeThickness="2" />
-        </Panel>
-      </DataTemplate>
-      <ControlTemplate x:Key="TooltipDataValidationContentTemplate" TargetType="DataValidationErrors">
-        <DockPanel LastChildFill="True">
-          <ContentControl Content="{Binding (DataValidationErrors.Errors)}"
-                          ContentTemplate="{TemplateBinding ErrorTemplate}"
-                          DataContext="{TemplateBinding Owner}"
-                          DockPanel.Dock="Right"
-                          IsVisible="{Binding (DataValidationErrors.HasErrors)}" />
-          <ContentPresenter Name="PART_ContentPresenter"
-                            Padding="{TemplateBinding Padding}"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding CornerRadius}"
-                            Content="{TemplateBinding Content}"
-                            ContentTemplate="{TemplateBinding ContentTemplate}" />
-        </DockPanel>
-      </ControlTemplate>
-    </Style.Resources>
-
-    <Setter Property="Template" Value="{StaticResource InlineDataValidationContentTemplate}" />
-    <Setter Property="ErrorTemplate" Value="{StaticResource InlineDataValidationErrorTemplate}" />
-  </Style>
-</Styles>
+<ResourceDictionary xmlns="https://github.com/avaloniaui" 
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:sys="using:System" 
+                    x:CompileBindings="True"
+                    x:DataType="DataValidationErrors">
+    <Design.PreviewWith>
+      <Border Padding="20">
+        <StackPanel Spacing="20">
+          <TextBox Text="Sample">
+            <DataValidationErrors.Error>
+              <sys:Exception />
+            </DataValidationErrors.Error>
+          </TextBox>
+          <TextBox Text="Sample">
+            <TextBox.Styles>
+              <Style Selector="DataValidationErrors">
+                <Setter Property="Template" Value="{DynamicResource TooltipDataValidationContentTemplate}" />
+                <Setter Property="ErrorTemplate" Value="{DynamicResource TooltipDataValidationErrorTemplate}" />
+              </Style>
+            </TextBox.Styles>
+            <DataValidationErrors.Error>
+              <sys:Exception />
+            </DataValidationErrors.Error>
+          </TextBox>
+        </StackPanel>
+      </Border>
+    </Design.PreviewWith>
+  
+    <ControlTheme x:Key="{x:Type DataValidationErrors}" TargetType="DataValidationErrors">
+      <ControlTheme.Resources>
+        <DataTemplate x:Key="InlineDataValidationErrorTemplate">
+          <ItemsControl Items="{Binding}" x:DataType="DataValidationErrors" Foreground="{DynamicResource SystemControlErrorTextForegroundBrush}">
+            <ItemsControl.Styles>
+              <Style Selector="TextBlock">
+                <Setter Property="TextWrapping" Value="Wrap" />
+              </Style>
+            </ItemsControl.Styles>
+          </ItemsControl>
+        </DataTemplate>
+        <ControlTemplate x:Key="InlineDataValidationContentTemplate" TargetType="DataValidationErrors">
+          <DockPanel LastChildFill="True">
+            <ContentControl x:Name="InlineDataValidationContentControl"
+                            Margin="0,4,0,0" 
+                            Content="{Binding (DataValidationErrors.Errors)}" 
+                            ContentTemplate="{TemplateBinding ErrorTemplate}" 
+                            DataContext="{TemplateBinding Owner}" 
+                            DockPanel.Dock="Bottom"
+                            IsVisible="{Binding (DataValidationErrors.HasErrors)}" />
+            <ContentPresenter Name="PART_ContentPresenter"
+                              Padding="{TemplateBinding Padding}" 
+                              Background="{TemplateBinding Background}"
+                              BorderThickness="{TemplateBinding BorderThickness}" 
+                              CornerRadius="{TemplateBinding CornerRadius}"
+                              Content="{TemplateBinding Content}" 
+                              ContentTemplate="{TemplateBinding ContentTemplate}" />
+          </DockPanel>
+        </ControlTemplate>
+        
+        <DataTemplate x:DataType="DataValidationErrors" x:Key="TooltipDataValidationErrorTemplate">
+          <Panel Name="PART_InlineErrorTemplatePanel" Background="Transparent">
+            <Panel.Styles>
+              <Style Selector="Panel#PART_InlineErrorTemplatePanel">
+                <Setter Property="Margin" Value="8,0" />
+              </Style>
+              <Style Selector="Panel#PART_InlineErrorTemplatePanel ToolTip">
+                <Setter Property="BorderBrush" Value="{DynamicResource SystemControlErrorTextForegroundBrush}" />
+              </Style>
+              <Style Selector="Panel#PART_InlineErrorTemplatePanel ToolTip TextBlock">
+                <Setter Property="TextWrapping" Value="Wrap" />
+              </Style>
+            </Panel.Styles>
+            <ToolTip.Tip>
+              <ItemsControl Items="{Binding}" />
+            </ToolTip.Tip>
+            <Path Width="14"
+                  Height="14"
+                  Data="M14,7 A7,7 0 0,0 0,7 M0,7 A7,7 0 1,0 14,7 M7,3l0,5 M7,9l0,2"
+                  Stroke="{DynamicResource SystemControlErrorTextForegroundBrush}"
+                  StrokeThickness="2" />
+          </Panel>
+        </DataTemplate>
+        <ControlTemplate x:Key="TooltipDataValidationContentTemplate" TargetType="DataValidationErrors">
+          <DockPanel LastChildFill="True">
+            <ContentControl Content="{Binding (DataValidationErrors.Errors)}"
+                            ContentTemplate="{TemplateBinding ErrorTemplate}" 
+                            DataContext="{TemplateBinding Owner}" 
+                            DockPanel.Dock="Right" 
+                            IsVisible="{Binding (DataValidationErrors.HasErrors)}" />
+            <ContentPresenter Name="PART_ContentPresenter"
+                              Padding="{TemplateBinding Padding}"
+                              Background="{TemplateBinding Background}"
+                              BorderBrush="{TemplateBinding BorderBrush}" 
+                              BorderThickness="{TemplateBinding BorderThickness}" 
+                              CornerRadius="{TemplateBinding CornerRadius}" 
+                              Content="{TemplateBinding Content}"
+                              ContentTemplate="{TemplateBinding ContentTemplate}" />
+          </DockPanel>
+        </ControlTemplate>
+      </ControlTheme.Resources>
+      <Setter Property="Template" Value="{StaticResource InlineDataValidationContentTemplate}" />
+      <Setter Property="ErrorTemplate" Value="{StaticResource InlineDataValidationErrorTemplate}" />
+    </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml b/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml
index 11d6b9fdfc..a7093c1341 100644
--- a/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml
@@ -5,17 +5,16 @@
 // All other rights reserved.
 -->
 
-<Styles xmlns="https://github.com/avaloniaui"
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:sys="clr-namespace:System;assembly=netstandard"
         x:CompileBindings="True">
-  <Design.PreviewWith>
-    <Border Padding="20">
-      <DatePicker CornerRadius="10" />
-    </Border>
-  </Design.PreviewWith>
-  
-  <Styles.Resources>
+    <Design.PreviewWith>
+      <Border Padding="20">
+        <DatePicker CornerRadius="10" />
+      </Border>
+    </Design.PreviewWith>
+
     <Thickness x:Key="DatePickerTopHeaderMargin">0,0,0,4</Thickness>
     <x:Double x:Key="DatePickerFlyoutPresenterHighlightHeight">40</x:Double>
     <x:Double x:Key="DatePickerFlyoutPresenterItemHeight">40</x:Double>
@@ -27,328 +26,327 @@
     <Thickness x:Key="DatePickerHostPadding">0,3,0,6</Thickness>
     <Thickness x:Key="DatePickerHostMonthPadding">9,3,0,6</Thickness>
     <x:Double x:Key="DatePickerSpacerThemeWidth">1</x:Double>
-  </Styles.Resources>
-
-  <!-- Styles for the items displayed in the selectors -->
-  <Style Selector="ListBoxItem.DateTimePickerItem">
-    <Setter Property="Padding" Value="{DynamicResource DatePickerFlyoutPresenterItemPadding}"/>
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="HorizontalContentAlignment" Value="Center" />
-  </Style>
-  <Style Selector="ListBoxItem.DateTimePickerItem:selected">
-    <Setter Property="IsHitTestVisible" Value="False"/>
-  </Style>
-  <Style Selector="ListBoxItem.DateTimePickerItem:selected /template/ Rectangle#PressedBackground">
-    <Setter Property="Fill" Value="Transparent"/>
-  </Style>
-  <Style Selector="ListBoxItem.DateTimePickerItem:selected /template/ ContentPresenter">
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
-  </Style>
-  <Style Selector="ListBoxItem.DateTimePickerItem.MonthItem">
-    <Setter Property="Padding" Value="{DynamicResource DatePickerFlyoutPresenterMonthPadding}"/>
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="HorizontalContentAlignment" Value="Left" />
-  </Style>
 
+    <!-- Theme for the items displayed in the selectors -->
+    <ControlTheme x:Key="FluentDateTimePickerItem" TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
+      <Setter Property="Padding" Value="{DynamicResource DatePickerFlyoutPresenterItemPadding}"/>
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="HorizontalContentAlignment" Value="Center" />
+      
+      <Style Selector="^:selected">
+        <Setter Property="IsHitTestVisible" Value="False"/>
+        <Style Selector="^/template/ Rectangle#PressedBackground">
+          <Setter Property="Fill" Value="Transparent"/>
+        </Style>
+        <Style Selector="^/template/ ContentPresenter">
+          <Setter Property="Background" Value="Transparent" />
+          <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
+        </Style>
+      </Style>
+      <Style Selector="^.MonthItem">
+        <Setter Property="Padding" Value="{DynamicResource DatePickerFlyoutPresenterMonthPadding}"/>
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="HorizontalContentAlignment" Value="Left" />
+      </Style>
+    </ControlTheme>
 
-  <!-- This is used for both the accept/dismiss & repeatbuttons in the presenter-->
-  <Style Selector=":is(Button).DateTimeFlyoutButtonStyle">
-    <Setter Property="Background" Value="{DynamicResource DateTimePickerFlyoutButtonBackground}" />
-    <Setter Property="HorizontalContentAlignment" Value="Center"/>
-    <Setter Property="VerticalContentAlignment" Value="Center"/>
-    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <!-- 
+    <!-- This is used for both the accept/dismiss & repeatbuttons in the presenter-->
+    <ControlTheme x:Key="FluentDateTimePickerButton" TargetType="Button">
+      <Setter Property="Background" Value="{DynamicResource DateTimePickerFlyoutButtonBackground}" />
+      <Setter Property="HorizontalContentAlignment" Value="Center"/>
+      <Setter Property="VerticalContentAlignment" Value="Center"/>
+      <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <!-- 
                 The background is doubled here for the loopingselector up/down repeat buttons 
                 that appear opaque. Not sure how MS does it though I suspect this is it
                 but source isn't MIT yet, so this is my solution -->
-        <Border Background="{TemplateBinding Background}">
-          <ContentPresenter x:Name="ContentPresenter"
-                  Background="{TemplateBinding Background}"
-                  BorderBrush="{DynamicResource DateTimePickerFlyoutButtonBorderBrush}"
-                  BorderThickness="{DynamicResource DateTimeFlyoutButtonBorderThickness}"
-                  Content="{TemplateBinding Content}"
-                  Foreground="{DynamicResource SystemControlHighlightAltBaseHighBrush}"
-                  ContentTemplate="{TemplateBinding ContentTemplate}"
-                  Padding="{TemplateBinding Padding}"
-                  HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                  VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                  CornerRadius="{TemplateBinding CornerRadius}"/>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
+          <Border Background="{TemplateBinding Background}">
+            <ContentPresenter x:Name="ContentPresenter"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{DynamicResource DateTimePickerFlyoutButtonBorderBrush}"
+                    BorderThickness="{DynamicResource DateTimeFlyoutButtonBorderThickness}"
+                    Content="{TemplateBinding Content}"
+                    Foreground="{DynamicResource SystemControlHighlightAltBaseHighBrush}"
+                    ContentTemplate="{TemplateBinding ContentTemplate}"
+                    Padding="{TemplateBinding Padding}"
+                    HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                    VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                    CornerRadius="{TemplateBinding CornerRadius}"/>
+          </Border>
+        </ControlTemplate>
+      </Setter>
 
-  <Style Selector=":is(Button).DateTimeFlyoutButtonStyle:pointerover /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource DateTimePickerFlyoutButtonBackgroundPointerOver}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource DateTimePickerFlyoutButtonBorderBrushPointerOver}"/>
-    <Setter Property="Foreground" Value="{DynamicResource DateTimePickerFlyoutButtonForegroundPointerOver}"/>
-  </Style>
+      <Style Selector="^:pointerover /template/ ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource DateTimePickerFlyoutButtonBackgroundPointerOver}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource DateTimePickerFlyoutButtonBorderBrushPointerOver}"/>
+        <Setter Property="Foreground" Value="{DynamicResource DateTimePickerFlyoutButtonForegroundPointerOver}"/>
+      </Style>
 
-  <Style Selector=":is(Button).DateTimeFlyoutButtonStyle:pressed /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource DateTimePickerFlyoutButtonBackgroundPressed}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource DateTimePickerFlyoutButtonBorderBrushPressed}"/>
-    <Setter Property="Foreground" Value="{DynamicResource DateTimePickerFlyoutButtonForegroundPressed}"/>
-  </Style>
+      <Style Selector="^:pressed /template/ ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource DateTimePickerFlyoutButtonBackgroundPressed}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource DateTimePickerFlyoutButtonBorderBrushPressed}"/>
+        <Setter Property="Foreground" Value="{DynamicResource DateTimePickerFlyoutButtonForegroundPressed}"/>
+      </Style>
+    </ControlTheme>
 
+    <ControlTheme x:Key="FluentDateTimePickerUpButton" TargetType="RepeatButton" BasedOn="{StaticResource FluentDateTimePickerButton}">
+      <Setter Property="VerticalAlignment" Value="Top"/>
+      <Setter Property="Height" Value="22" />
+      <Setter Property="HorizontalAlignment" Value="Stretch" />
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}" />
+      <Setter Property="Content">
+        <Template>
+          <Viewbox Height="10" Width="10" HorizontalAlignment="Center" VerticalAlignment="Center">
+            <Path Stroke="{Binding $parent[RepeatButton].Foreground}" StrokeThickness="1" Data="M 0,9 L 9,0 L 18,9"/>
+          </Viewbox>
+        </Template>
+      </Setter>
+    </ControlTheme>
 
-  <Style Selector="RepeatButton.UpButton">
-    <Setter Property="VerticalAlignment" Value="Top"/>
-    <Setter Property="Height" Value="22" />
-    <Setter Property="HorizontalAlignment" Value="Stretch" />
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}" />
-    <Setter Property="Content">
-      <Template>
-        <Viewbox Height="10" Width="10" HorizontalAlignment="Center" VerticalAlignment="Center">
-          <Path Stroke="{Binding $parent[RepeatButton].Foreground}" StrokeThickness="1" Data="M 0,9 L 9,0 L 18,9"/>
-        </Viewbox>
-      </Template>
-    </Setter>
-  </Style>
-  <Style Selector="RepeatButton.DownButton">
-    <Setter Property="VerticalAlignment" Value="Bottom"/>
-    <Setter Property="Height" Value="22" />
-    <Setter Property="HorizontalAlignment" Value="Stretch" />
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}" />
-    <Setter Property="Content">
-      <Template>
-        <Viewbox Height="10" Width="10" HorizontalAlignment="Center" VerticalAlignment="Center">
-          <Path Stroke="{Binding $parent[RepeatButton].Foreground}" StrokeThickness="1" Data="M 0,0 L 9,9 L 18,0"/>
-        </Viewbox>
-      </Template>
-    </Setter>
-  </Style>
+    <ControlTheme x:Key="FluentDateTimePickerDownButton" TargetType="RepeatButton" BasedOn="{StaticResource FluentDateTimePickerButton}">
+      <Setter Property="VerticalAlignment" Value="Bottom"/>
+      <Setter Property="Height" Value="22" />
+      <Setter Property="HorizontalAlignment" Value="Stretch" />
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}" />
+      <Setter Property="Content">
+        <Template>
+          <Viewbox Height="10" Width="10" HorizontalAlignment="Center" VerticalAlignment="Center">
+            <Path Stroke="{Binding $parent[RepeatButton].Foreground}" StrokeThickness="1" Data="M 0,0 L 9,9 L 18,0"/>
+          </Viewbox>
+        </Template>
+      </Setter>
+    </ControlTheme>
 
-  <Style Selector="DatePicker">    
-    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-    <Setter Property="Foreground" Value="{DynamicResource DatePickerButtonForeground}" />
-    <Setter Property="Background" Value="{DynamicResource DatePickerButtonBackground}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource DatePickerButtonBorderBrush}"/>
-    <Setter Property="BorderThickness" Value="1"/>
-    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-    <Setter Property="HorizontalAlignment" Value="Left" />
-    <Setter Property="VerticalAlignment" Value="Center" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <DataValidationErrors>
-          <Grid Name="LayoutRoot" Margin="{TemplateBinding Padding}" RowDefinitions="Auto,*">
-            <ContentPresenter Name="HeaderContentPresenter" Grid.Row="0"
-                              Content="{TemplateBinding Header}"
-                              ContentTemplate="{TemplateBinding HeaderTemplate}"
-                              Margin="{DynamicResource DatePickerTopHeaderMargin}"
-                              MaxWidth="{DynamicResource DatePickerThemeMaxWidth}"
-                              HorizontalAlignment="Stretch"
-                              VerticalAlignment="Top"/>
+    <ControlTheme x:Key="{x:Type DatePicker}" TargetType="DatePicker">
+      <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+      <Setter Property="Foreground" Value="{DynamicResource DatePickerButtonForeground}" />
+      <Setter Property="Background" Value="{DynamicResource DatePickerButtonBackground}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource DatePickerButtonBorderBrush}"/>
+      <Setter Property="BorderThickness" Value="1"/>
+      <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+      <Setter Property="HorizontalAlignment" Value="Left" />
+      <Setter Property="VerticalAlignment" Value="Center" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <DataValidationErrors>
+            <Grid Name="LayoutRoot" Margin="{TemplateBinding Padding}" RowDefinitions="Auto,*">
+              <ContentPresenter Name="HeaderContentPresenter" Grid.Row="0"
+                                Content="{TemplateBinding Header}"
+                                Foreground="{DynamicResource DatePickerHeaderForeground}"
+                                ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                Margin="{DynamicResource DatePickerTopHeaderMargin}"
+                                MaxWidth="{DynamicResource DatePickerThemeMaxWidth}"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Top"/>
 
-            <Button Name="FlyoutButton" Grid.Row="1"
-                    Foreground="{TemplateBinding Foreground}"
-                    Background="{TemplateBinding Background}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    CornerRadius="{TemplateBinding CornerRadius}"
-                    IsEnabled="{TemplateBinding IsEnabled}"
-                    MinWidth="{DynamicResource DatePickerThemeMinWidth}"
-                    MaxWidth="{DynamicResource DatePickerThemeMaxWidth}"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Stretch"
-                    HorizontalContentAlignment="Stretch"
-                    VerticalContentAlignment="Stretch"
-                    TemplatedControl.IsTemplateFocusTarget="True">
-              <Button.Template>
-                <ControlTemplate>
-                  <ContentPresenter Name="ContentPresenter"
-                                    BorderBrush="{TemplateBinding BorderBrush}"
-                                    Background="{TemplateBinding Background}"
-                                    BorderThickness="{TemplateBinding BorderThickness}"
-                                    Content="{TemplateBinding Content}"
-                                    Foreground="{TemplateBinding Foreground}"
-                                    HorizontalContentAlignment="Stretch"
-                                    VerticalContentAlignment="Stretch"
-                                    CornerRadius="{TemplateBinding CornerRadius}"/>
-                </ControlTemplate>
-              </Button.Template>
-              <Grid Name="ButtonContentGrid" ColumnDefinitions="78*,Auto,132*,Auto,78*">
-                <TextBlock Name="DayText" Text="day" HorizontalAlignment="Center"
-                           Padding="{DynamicResource DatePickerHostPadding}"
-                           FontFamily="{TemplateBinding FontFamily}"
-                           FontWeight="{TemplateBinding FontWeight}"
-                           FontSize="{TemplateBinding FontSize}"/>
-                <TextBlock Name="MonthText" Text="month" TextAlignment="Left"
-                           Padding="{DynamicResource DatePickerHostMonthPadding}"
-                           FontFamily="{TemplateBinding FontFamily}"
-                           FontWeight="{TemplateBinding FontWeight}"
-                           FontSize="{TemplateBinding FontSize}"/>
-                <TextBlock Name="YearText" Text="year" HorizontalAlignment="Center"
-                           Padding="{DynamicResource DatePickerHostPadding}"
-                           FontFamily="{TemplateBinding FontFamily}"
-                           FontWeight="{TemplateBinding FontWeight}"
-                           FontSize="{TemplateBinding FontSize}"/>
-                <Rectangle x:Name="FirstSpacer"
-                      Fill="{DynamicResource DatePickerSpacerFill}"
-                      HorizontalAlignment="Center"
-                      Width="1"
-                      Grid.Column="1" />
-                <Rectangle x:Name="SecondSpacer"
-                      Fill="{DynamicResource DatePickerSpacerFill}"
-                      HorizontalAlignment="Center"
-                      Width="1"
-                      Grid.Column="3" />
-              </Grid>
-            </Button>
+              <Button Name="FlyoutButton" Grid.Row="1"
+                      Foreground="{TemplateBinding Foreground}"
+                      Background="{TemplateBinding Background}"
+                      BorderBrush="{TemplateBinding BorderBrush}"
+                      BorderThickness="{TemplateBinding BorderThickness}"
+                      CornerRadius="{TemplateBinding CornerRadius}"
+                      IsEnabled="{TemplateBinding IsEnabled}"
+                      MinWidth="{DynamicResource DatePickerThemeMinWidth}"
+                      MaxWidth="{DynamicResource DatePickerThemeMaxWidth}"
+                      HorizontalAlignment="Stretch"
+                      VerticalAlignment="Stretch"
+                      HorizontalContentAlignment="Stretch"
+                      VerticalContentAlignment="Stretch"
+                      TemplatedControl.IsTemplateFocusTarget="True">
+                <Button.Template>
+                  <ControlTemplate>
+                    <ContentPresenter Name="ContentPresenter"
+                                      BorderBrush="{TemplateBinding BorderBrush}"
+                                      Background="{TemplateBinding Background}"
+                                      BorderThickness="{TemplateBinding BorderThickness}"
+                                      Content="{TemplateBinding Content}"
+                                      Foreground="{TemplateBinding Foreground}"
+                                      HorizontalContentAlignment="Stretch"
+                                      VerticalContentAlignment="Stretch"
+                                      CornerRadius="{TemplateBinding CornerRadius}"/>
+                  </ControlTemplate>
+                </Button.Template>
+                <Grid Name="ButtonContentGrid" ColumnDefinitions="78*,Auto,132*,Auto,78*">
+                  <TextBlock Name="DayText" Text="day" HorizontalAlignment="Center"
+                             Padding="{DynamicResource DatePickerHostPadding}"
+                             FontFamily="{TemplateBinding FontFamily}"
+                             FontWeight="{TemplateBinding FontWeight}"
+                             FontSize="{TemplateBinding FontSize}"/>
+                  <TextBlock Name="MonthText" Text="month" TextAlignment="Left"
+                             Padding="{DynamicResource DatePickerHostMonthPadding}"
+                             FontFamily="{TemplateBinding FontFamily}"
+                             FontWeight="{TemplateBinding FontWeight}"
+                             FontSize="{TemplateBinding FontSize}"/>
+                  <TextBlock Name="YearText" Text="year" HorizontalAlignment="Center"
+                             Padding="{DynamicResource DatePickerHostPadding}"
+                             FontFamily="{TemplateBinding FontFamily}"
+                             FontWeight="{TemplateBinding FontWeight}"
+                             FontSize="{TemplateBinding FontSize}"/>
+                  <Rectangle x:Name="FirstSpacer"
+                        Fill="{DynamicResource DatePickerSpacerFill}"
+                        HorizontalAlignment="Center"
+                        Width="1"
+                        Grid.Column="1" />
+                  <Rectangle x:Name="SecondSpacer"
+                        Fill="{DynamicResource DatePickerSpacerFill}"
+                        HorizontalAlignment="Center"
+                        Width="1"
+                        Grid.Column="3" />
+                </Grid>
+              </Button>
 
-            <Popup Name="Popup" WindowManagerAddShadowHint="False"
-                   IsLightDismissEnabled="True" PlacementTarget="{TemplateBinding}"
-                   PlacementMode="Bottom">
-              <DatePickerPresenter Name="PickerPresenter" />
-            </Popup>
+              <Popup Name="Popup" WindowManagerAddShadowHint="False"
+                     IsLightDismissEnabled="True" PlacementTarget="{TemplateBinding}"
+                     PlacementMode="Bottom">
+                <DatePickerPresenter Name="PickerPresenter" />
+              </Popup>
 
-          </Grid>
-        </DataValidationErrors>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-  <Style Selector="DatePicker /template/ ContentPresenter#HeaderContentPresenter">
-    <Setter Property="Foreground" Value="{DynamicResource DatePickerHeaderForeground}"/>
-  </Style>
-  <Style Selector="DatePicker:disabled /template/ Rectangle">
-    <Setter Property="Fill" Value="{DynamicResource DatePickerSpacerFillDisabled}"/>
-  </Style>
+            </Grid>
+          </DataValidationErrors>
+        </ControlTemplate>
+      </Setter>
 
-  <Style Selector="DatePicker /template/ Button#FlyoutButton:pointerover /template/ ContentPresenter">
-    <Setter Property="BorderBrush" Value="{DynamicResource DatePickerButtonBorderBrushPointerOver}"/>
-    <Setter Property="Background" Value="{DynamicResource DatePickerButtonBackgroundPointerOver}"/>
-    <Setter Property="Foreground" Value="{DynamicResource DatePickerButtonForegroundPointerOver}"/>
-  </Style>
+      <Style Selector="^:disabled /template/ Rectangle">
+        <Setter Property="Fill" Value="{DynamicResource DatePickerSpacerFillDisabled}"/>
+      </Style>
 
-  <Style Selector="DatePicker /template/ Button#FlyoutButton:pressed /template/ ContentPresenter">
-    <Setter Property="BorderBrush" Value="{DynamicResource DatePickerButtonBorderBrushPressed}"/>
-    <Setter Property="Background" Value="{DynamicResource DatePickerButtonBackgroundPressed}"/>
-    <Setter Property="Foreground" Value="{DynamicResource DatePickerButtonForegroundPressed}"/>
-  </Style>
+      <!-- Changes foreground for watermark text when SelectedDate is null-->
+      <Style Selector="^:hasnodate /template/ Button#FlyoutButton TextBlock">
+        <Setter Property="Foreground" Value="{DynamicResource TextControlPlaceholderForeground}"/>
+      </Style>
+      <Style Selector="^/template/ Button#FlyoutButton">
+        <Style Selector="^:pointerover">
+          <Setter Property="BorderBrush" Value="{DynamicResource DatePickerButtonBorderBrushPointerOver}"/>
+          <Setter Property="Background" Value="{DynamicResource DatePickerButtonBackgroundPointerOver}"/>
+          <Setter Property="Foreground" Value="{DynamicResource DatePickerButtonForegroundPointerOver}"/>
+        </Style>
 
-  <Style Selector="DatePicker /template/ Button#FlyoutButton:disabled /template/ ContentPresenter">
-    <Setter Property="BorderBrush" Value="{DynamicResource DatePickerButtonBorderBrushDisabled}"/>
-    <Setter Property="Background" Value="{DynamicResource DatePickerButtonBackgroundDisabled}"/>
-    <Setter Property="Foreground" Value="{DynamicResource DatePickerButtonForegroundDisabled}"/>
-  </Style>
+        <Style Selector="^:pressed">
+          <Setter Property="BorderBrush" Value="{DynamicResource DatePickerButtonBorderBrushPressed}"/>
+          <Setter Property="Background" Value="{DynamicResource DatePickerButtonBackgroundPressed}"/>
+          <Setter Property="Foreground" Value="{DynamicResource DatePickerButtonForegroundPressed}"/>
+        </Style>
 
-  <!-- Changes foreground for watermark text when SelectedDate is null-->
-  <Style Selector="DatePicker:hasnodate /template/ Button#FlyoutButton TextBlock">
-    <Setter Property="Foreground" Value="{DynamicResource TextControlPlaceholderForeground}"/>
-  </Style>
-  
-  <Style Selector="DatePicker:error /template/ Button#FlyoutButton /template/ ContentPresenter">
-    <Setter Property="BorderBrush" Value="{DynamicResource SystemControlErrorTextForegroundBrush}"/>
-  </Style>
-  
+        <Style Selector="^:disabled">
+          <Setter Property="BorderBrush" Value="{DynamicResource DatePickerButtonBorderBrushDisabled}"/>
+          <Setter Property="Background" Value="{DynamicResource DatePickerButtonBackgroundDisabled}"/>
+          <Setter Property="Foreground" Value="{DynamicResource DatePickerButtonForegroundDisabled}"/>
+        </Style>
+      </Style>
+      <Style Selector="^:error /template/ Button#FlyoutButton">
+        <Setter Property="BorderBrush" Value="{DynamicResource SystemControlErrorTextForegroundBrush}"/>
+      </Style>
+    </ControlTheme>
 
-  <!--WinUI: DatePickerFlyoutPresenter-->
-  <Style Selector="DatePickerPresenter">
-    <Setter Property="Width" Value="296" />
-    <Setter Property="MinWidth" Value="296" />
-    <Setter Property="MaxHeight" Value="398" />    
-    <Setter Property="FontWeight" Value="Normal" />
-    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-    <Setter Property="Background" Value="{DynamicResource DatePickerFlyoutPresenterBackground}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource DatePickerFlyoutPresenterBorderBrush}" />
-    <Setter Property="BorderThickness" Value="{DynamicResource DateTimeFlyoutBorderThickness}" />
-    <Setter Property="CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Name="Background" Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                Padding="{DynamicResource DateTimeFlyoutBorderPadding}"
-                MaxHeight="398" CornerRadius="{TemplateBinding CornerRadius}">
-          <Grid Name="ContentRoot" RowDefinitions="*,Auto">
-            <Grid Name="PickerContainer">
-              <!--Column Definitions set in code, ignore here-->
-              <Panel Name="MonthHost">
-                <ScrollViewer HorizontalScrollBarVisibility="Disabled"
-                              VerticalScrollBarVisibility="Hidden">
-                  <DateTimePickerPanel Name="MonthSelector"
-                                      PanelType="Month"
-                                      ItemHeight="{DynamicResource DatePickerFlyoutPresenterItemHeight}"
-                                      ShouldLoop="True" />
-                </ScrollViewer>
-                <RepeatButton Name="MonthUpButton"
-                              Classes="DateTimeFlyoutButtonStyle UpButton"/>
-                <RepeatButton Name="MonthDownButton"
-                              Classes="DateTimeFlyoutButtonStyle DownButton"/>
-              </Panel>
-              <Panel Name="DayHost">
-                <ScrollViewer HorizontalScrollBarVisibility="Disabled"
-                              VerticalScrollBarVisibility="Hidden">
-                  <DateTimePickerPanel Name="DaySelector"
-                                      PanelType="Day"
-                                      ItemHeight="{DynamicResource DatePickerFlyoutPresenterItemHeight}"
-                                      ShouldLoop="True" />
-                </ScrollViewer>
-                <RepeatButton Name="DayUpButton"
-                              Classes="DateTimeFlyoutButtonStyle UpButton"/>
-                <RepeatButton Name="DayDownButton"
-                              Classes="DateTimeFlyoutButtonStyle DownButton"/>
-              </Panel>
-              <Panel Name="YearHost">
-                <ScrollViewer HorizontalScrollBarVisibility="Disabled"
-                              VerticalScrollBarVisibility="Hidden">
-                  <DateTimePickerPanel Name="YearSelector"
-                                      PanelType="Year"
-                                      ItemHeight="{DynamicResource DatePickerFlyoutPresenterItemHeight}"
-                                      ShouldLoop="False" />
-                </ScrollViewer>
-                <RepeatButton Name="YearUpButton"
-                              Classes="DateTimeFlyoutButtonStyle UpButton"/>
-                <RepeatButton Name="YearDownButton"
-                              Classes="DateTimeFlyoutButtonStyle DownButton"/>
-              </Panel>
-              <Rectangle Name="HighlightRect" IsHitTestVisible="False" ZIndex="-1"
-                         Fill="{DynamicResource DatePickerFlyoutPresenterHighlightFill}"
-                         Grid.Column="0" Grid.ColumnSpan="5" VerticalAlignment="Center"
-                         Height="{DynamicResource DatePickerFlyoutPresenterHighlightHeight}" />
-              <Rectangle Name="FirstSpacer"
-                         Fill="{DynamicResource DatePickerFlyoutPresenterSpacerFill}"
-                         HorizontalAlignment="Center"
-                         Width="{DynamicResource DatePickerSpacerThemeWidth}"
-                         Grid.Column="1" />
-              <Rectangle Name="SecondSpacer"
-                         Fill="{DynamicResource DatePickerFlyoutPresenterSpacerFill}"
-                         HorizontalAlignment="Center"
-                         Width="{DynamicResource DatePickerSpacerThemeWidth}"
-                         Grid.Column="3" />
-            </Grid>
-            <Grid Grid.Row="1" Height="{DynamicResource DatePickerFlyoutPresenterAcceptDismissHostGridHeight}"
-                  Name="AcceptDismissGrid" ColumnDefinitions="*,*">
-              <Rectangle Height="{DynamicResource DatePickerSpacerThemeWidth}" VerticalAlignment="Top"
-                         Fill="{DynamicResource DatePickerFlyoutPresenterSpacerFill}"
-                         Grid.ColumnSpan="2"/>
-              <Button Name="AcceptButton" Grid.Column="0" Classes="DateTimeFlyoutButtonStyle"
-                          HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                <Path Stroke="{Binding $parent[Button].Foreground}" StrokeLineCap="Round"
-                      StrokeThickness="0.75" Data="M0.5,8.5 5,13.5 15.5,3" />
-              </Button>
-              <Button Name="DismissButton" Grid.Column="1" Classes="DateTimeFlyoutButtonStyle"
-                         FontSize="16" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                <Path Stroke="{Binding $parent[Button].Foreground}" StrokeLineCap="Round"
-                      StrokeThickness="0.75" Data="M2,2 14,14 M2,14 14 2" />
-              </Button>
+    <!--WinUI: DatePickerFlyoutPresenter-->
+    <ControlTheme x:Key="{x:Type DatePickerPresenter}" TargetType="DatePickerPresenter">
+      <Setter Property="Width" Value="296" />
+      <Setter Property="MinWidth" Value="296" />
+      <Setter Property="MaxHeight" Value="398" />
+      <Setter Property="FontWeight" Value="Normal" />
+      <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+      <Setter Property="Background" Value="{DynamicResource DatePickerFlyoutPresenterBackground}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource DatePickerFlyoutPresenterBorderBrush}" />
+      <Setter Property="BorderThickness" Value="{DynamicResource DateTimeFlyoutBorderThickness}" />
+      <Setter Property="CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border Name="Background" Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  Padding="{DynamicResource DateTimeFlyoutBorderPadding}"
+                  MaxHeight="398" CornerRadius="{TemplateBinding CornerRadius}">
+            <Grid Name="ContentRoot" RowDefinitions="*,Auto">
+              <Grid Name="PickerContainer">
+                <Grid.Styles>
+                  <Style Selector="DateTimePickerPanel > ListBoxItem">
+                    <Setter Property="Theme" Value="{StaticResource FluentDateTimePickerItem}" />
+                  </Style>
+                </Grid.Styles>
+                <!--Column Definitions set in code, ignore here-->
+                <Panel Name="MonthHost">
+                  <ScrollViewer HorizontalScrollBarVisibility="Disabled"
+                                VerticalScrollBarVisibility="Hidden">
+                    <DateTimePickerPanel Name="MonthSelector"
+                                         PanelType="Month"
+                                         ItemHeight="{DynamicResource DatePickerFlyoutPresenterItemHeight}"
+                                         ShouldLoop="True" />
+                  </ScrollViewer>
+                  <RepeatButton Name="MonthUpButton" Theme="{StaticResource FluentDateTimePickerUpButton}"/>
+                  <RepeatButton Name="MonthDownButton" Theme="{StaticResource FluentDateTimePickerDownButton}"/>
+                </Panel>
+                <Panel Name="DayHost">
+                  <ScrollViewer HorizontalScrollBarVisibility="Disabled"
+                                VerticalScrollBarVisibility="Hidden">
+                    <DateTimePickerPanel Name="DaySelector"
+                                         PanelType="Day"
+                                         ItemHeight="{DynamicResource DatePickerFlyoutPresenterItemHeight}"
+                                         ShouldLoop="True" />
+                  </ScrollViewer>
+                  <RepeatButton Name="DayUpButton" Theme="{StaticResource FluentDateTimePickerUpButton}"/>
+                  <RepeatButton Name="DayDownButton" Theme="{StaticResource FluentDateTimePickerDownButton}"/>
+                </Panel>
+                <Panel Name="YearHost">
+                  <ScrollViewer HorizontalScrollBarVisibility="Disabled"
+                                VerticalScrollBarVisibility="Hidden">
+                    <DateTimePickerPanel Name="YearSelector"
+                                         PanelType="Year"
+                                         ItemHeight="{DynamicResource DatePickerFlyoutPresenterItemHeight}"
+                                         ShouldLoop="False" />
+                  </ScrollViewer>
+                  <RepeatButton Name="YearUpButton" Theme="{StaticResource FluentDateTimePickerUpButton}"/>
+                  <RepeatButton Name="YearDownButton" Theme="{StaticResource FluentDateTimePickerDownButton}"/>
+                </Panel>
+                <Rectangle Name="HighlightRect" IsHitTestVisible="False" ZIndex="-1"
+                           Fill="{DynamicResource DatePickerFlyoutPresenterHighlightFill}"
+                           Grid.Column="0" Grid.ColumnSpan="5" VerticalAlignment="Center"
+                           Height="{DynamicResource DatePickerFlyoutPresenterHighlightHeight}" />
+                <Rectangle Name="FirstSpacer"
+                           Fill="{DynamicResource DatePickerFlyoutPresenterSpacerFill}"
+                           HorizontalAlignment="Center"
+                           Width="{DynamicResource DatePickerSpacerThemeWidth}"
+                           Grid.Column="1" />
+                <Rectangle Name="SecondSpacer"
+                           Fill="{DynamicResource DatePickerFlyoutPresenterSpacerFill}"
+                           HorizontalAlignment="Center"
+                           Width="{DynamicResource DatePickerSpacerThemeWidth}"
+                           Grid.Column="3" />
+              </Grid>
+              <Grid Grid.Row="1" Height="{DynamicResource DatePickerFlyoutPresenterAcceptDismissHostGridHeight}"
+                    Name="AcceptDismissGrid" ColumnDefinitions="*,*">
+                <Rectangle Height="{DynamicResource DatePickerSpacerThemeWidth}" VerticalAlignment="Top"
+                           Fill="{DynamicResource DatePickerFlyoutPresenterSpacerFill}"
+                           Grid.ColumnSpan="2"/>
+                <Button Name="AcceptButton" Grid.Column="0" Theme="{StaticResource FluentDateTimePickerButton}"
+                        HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                  <Path Stroke="{Binding $parent[Button].Foreground}" StrokeLineCap="Round"
+                        StrokeThickness="0.75" Data="M0.5,8.5 5,13.5 15.5,3" />
+                </Button>
+                <Button Name="DismissButton" Grid.Column="1" Theme="{StaticResource FluentDateTimePickerButton}"
+                        FontSize="16" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                  <Path Stroke="{Binding $parent[Button].Foreground}" StrokeLineCap="Round"
+                        StrokeThickness="0.75" Data="M2,2 14,14 M2,14 14 2" />
+                </Button>
+              </Grid>
             </Grid>
-          </Grid>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+
+      <Style Selector="^ /template/ Panel">
+        <Style Selector="^ RepeatButton">
+          <Setter Property="IsVisible" Value="False" />
+        </Style>
+
+        <Style Selector="^:pointerover RepeatButton">
+          <Setter Property="IsVisible" Value="True" />
+        </Style>
+      </Style> 
+    </ControlTheme>
 
-  <Style Selector="DatePickerPresenter /template/ Panel RepeatButton">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
 
-  <Style Selector="DatePickerPresenter /template/ Panel:pointerover RepeatButton">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
-  
-</Styles>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/DropDownButton.xaml b/src/Avalonia.Themes.Fluent/Controls/DropDownButton.xaml
index b96c689ab6..3206cb8cb1 100644
--- a/src/Avalonia.Themes.Fluent/Controls/DropDownButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/DropDownButton.xaml
@@ -1,103 +1,101 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        x:CompileBindings="True">
-
-  <Design.PreviewWith>
-    <Border Padding="20">
-      <StackPanel Spacing="20">
-        <DropDownButton Content="Click Me!" />
-        <DropDownButton Content="Disabled" IsEnabled="False" />
-      </StackPanel>
-    </Border>
-  </Design.PreviewWith>
-
-  <Styles.Resources>
-    <x:Double x:Key="DropDownButtonMinHeight">32</x:Double>
-  </Styles.Resources>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    x:CompileBindings="True">
+    <Design.PreviewWith>
+      <Border Padding="20">
+        <StackPanel Spacing="20">
+          <DropDownButton Content="Click Me!" />
+          <DropDownButton Content="Disabled" IsEnabled="False" />
+        </StackPanel>
+      </Border>
+    </Design.PreviewWith>
   
-  <Style Selector="DropDownButton">
-    <Setter Property="Background" Value="{DynamicResource ButtonBackground}" />
-    <Setter Property="Foreground" Value="{DynamicResource ButtonForeground}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrush}" />
-    <Setter Property="BorderThickness" Value="{DynamicResource ButtonBorderThemeThickness}" />
-    <Setter Property="Padding" Value="{DynamicResource ButtonPadding}" />
-    <Setter Property="MinHeight" Value="{DynamicResource DropDownButtonMinHeight}" />
-    <Setter Property="HorizontalAlignment" Value="Left" />
-    <Setter Property="VerticalAlignment" Value="Center" />
-    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <!--<Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
-    <Setter Property="FocusVisualMargin" Value="-3" />-->
-    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate>
-          <Border x:Name="RootBorder"
-                  Background="{TemplateBinding Background}"
-                  BorderBrush="{TemplateBinding BorderBrush}"
-                  BorderThickness="{TemplateBinding BorderThickness}"
-                  CornerRadius="{TemplateBinding CornerRadius}"
-                  ClipToBounds="True">
-            <Grid x:Name="InnerGrid">
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="Auto" />
-              </Grid.ColumnDefinitions>
-
-              <ContentPresenter x:Name="PART_ContentPresenter"
-                                Grid.Column="0"
-                                Content="{TemplateBinding Content}"
-                                ContentTemplate="{TemplateBinding ContentTemplate}"
-                                Padding="{TemplateBinding Padding}"
-                                RecognizesAccessKey="True"
-                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-
-              <PathIcon x:Name="DropDownGlyph"
-                        Grid.Column="1"
-                        UseLayoutRounding="False"
-                        IsHitTestVisible="False"
-                        Height="12"
-                        Width="12"
-                        Margin="0,0,10,0"
-                        HorizontalAlignment="Right"
-                        VerticalAlignment="Center" />
-
-            </Grid>
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <!--  Normal State  -->
-  <Style Selector="DropDownButton /template/ PathIcon#DropDownGlyph">
-    <Setter Property="Foreground" Value="{DynamicResource ComboBoxDropDownGlyphForeground}" />
-    <Setter Property="Data" Value="M1939 486L2029 576L1024 1581L19 576L109 486L1024 1401L1939 486Z" />
-  </Style>
-
-  <!--  PointerOver State  -->
-  <Style Selector="DropDownButton:pointerover /template/ Border#RootBorder">
-    <Setter Property="Background" Value="{DynamicResource ButtonBackgroundPointerOver}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushPointerOver}" />
-    <Setter Property="TextElement.Foreground" Value="{DynamicResource ButtonForegroundPointerOver}" />
-  </Style>
-
-  <!--  Pressed State  -->
-  <Style Selector="DropDownButton:pressed  /template/ Border#RootBorder">
-    <Setter Property="Background" Value="{DynamicResource ButtonBackgroundPressed}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushPressed}" />
-    <Setter Property="TextElement.Foreground" Value="{DynamicResource ButtonForegroundPressed}" />
-  </Style>
+    <x:Double x:Key="DropDownButtonMinHeight">32</x:Double>
+    
+    <ControlTheme x:Key="{x:Type DropDownButton}" TargetType="DropDownButton">
+      <Setter Property="Background" Value="{DynamicResource ButtonBackground}" />
+      <Setter Property="Foreground" Value="{DynamicResource ButtonForeground}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrush}" />
+      <Setter Property="BorderThickness" Value="{DynamicResource ButtonBorderThemeThickness}" />
+      <Setter Property="Padding" Value="{DynamicResource ButtonPadding}" />
+      <Setter Property="MinHeight" Value="{DynamicResource DropDownButtonMinHeight}" />
+      <Setter Property="HorizontalAlignment" Value="Left" />
+      <Setter Property="VerticalAlignment" Value="Center" />
+      <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+      <Setter Property="Template">
+        <Setter.Value>
+          <ControlTemplate>
+            <Border x:Name="RootBorder" 
+                    Background="{TemplateBinding Background}" 
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}" 
+                    CornerRadius="{TemplateBinding CornerRadius}"
+                    ClipToBounds="True">
+              <Grid x:Name="InnerGrid">
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="*" />
+                  <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+                
+                <ContentPresenter x:Name="PART_ContentPresenter" 
+                                  Grid.Column="0" 
+                                  Content="{TemplateBinding Content}" 
+                                  ContentTemplate="{TemplateBinding ContentTemplate}"
+                                  Padding="{TemplateBinding Padding}" 
+                                  RecognizesAccessKey="True" 
+                                  HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                  VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+                
+                <PathIcon x:Name="DropDownGlyph"
+                          Grid.Column="1" 
+                          UseLayoutRounding="False"
+                          IsHitTestVisible="False" 
+                          Height="12" 
+                          Width="12"
+                          Margin="0,0,10,0"
+                          Data="M1939 486L2029 576L1024 1581L19 576L109 486L1024 1401L1939 486Z"
+                          HorizontalAlignment="Right"
+                          VerticalAlignment="Center" />
+              </Grid>
+            </Border>
+          </ControlTemplate>
+        </Setter.Value>
+      </Setter>
+      
+      <!--  Normal State  -->
+      <Style Selector="^ /template/ PathIcon#DropDownGlyph">
+        <Setter Property="Foreground" Value="{DynamicResource ComboBoxDropDownGlyphForeground}" />
+      </Style>
+      
+      <!--  PointerOver State  -->
+      <Style Selector="^:pointerover /template/ Border#RootBorder">
+        <Setter Property="Background" Value="{DynamicResource ButtonBackgroundPointerOver}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushPointerOver}" />
+        <Setter Property="TextElement.Foreground" Value="{DynamicResource ButtonForegroundPointerOver}" />
+      </Style>
+      
+      <!--  Pressed State  -->
+      <Style Selector="^:pressed /template/ Border#RootBorder">
+        <Setter Property="Background" Value="{DynamicResource ButtonBackgroundPressed}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushPressed}" />
+        <Setter Property="TextElement.Foreground" Value="{DynamicResource ButtonForegroundPressed}" />
+      </Style>
 
-  <!--  Disabled State  -->
-  <Style Selector="DropDownButton:disabled /template/ Border#RootBorder">
-    <Setter Property="Background" Value="{DynamicResource ButtonBackgroundDisabled}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushDisabled}" />
-    <Setter Property="TextElement.Foreground" Value="{DynamicResource ButtonForegroundDisabled}" />
-  </Style>
-  <Style Selector="DropDownButton:disabled /template/ PathIcon#DropDownGlyph">
-    <Setter Property="Foreground" Value="{DynamicResource ButtonForegroundDisabled}" />
-  </Style>
+      <!--  Disabled State  -->
+      <Style Selector="^:disabled /template/ Border#RootBorder">
+        <Setter Property="Background" Value="{DynamicResource ButtonBackgroundDisabled}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushDisabled}" />
+        <Setter Property="TextElement.Foreground" Value="{DynamicResource ButtonForegroundDisabled}" />
+      </Style>
+      <Style Selector="^:disabled /template/ PathIcon#DropDownGlyph">
+        <Setter Property="Foreground" Value="{DynamicResource ButtonForegroundDisabled}" />
+      </Style>
 
-</Styles>
+      <Style Selector="^:pressed">
+        <Setter Property="RenderTransform" Value="scale(0.98)" />
+      </Style>
+    </ControlTheme>
+  
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/EmbeddableControlRoot.xaml b/src/Avalonia.Themes.Fluent/Controls/EmbeddableControlRoot.xaml
index 79560be933..89eaec70ad 100644
--- a/src/Avalonia.Themes.Fluent/Controls/EmbeddableControlRoot.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/EmbeddableControlRoot.xaml
@@ -1,19 +1,23 @@
-<Style xmlns="https://github.com/avaloniaui" Selector="EmbeddableControlRoot">
-  <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundAltHighBrush}"/>
-  <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
-  <Setter Property="Template">
-    <ControlTemplate>
-      <Panel>
-        <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
-        <Border Background="{TemplateBinding Background}">
-          <VisualLayerManager>
-            <ContentPresenter Name="PART_ContentPresenter"
-                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                              Content="{TemplateBinding Content}"
-                              Margin="{TemplateBinding Padding}"/>
-          </VisualLayerManager>
-        </Border>
-      </Panel>
-    </ControlTemplate>
-  </Setter>
-</Style>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ControlTheme x:Key="{x:Type EmbeddableControlRoot}" TargetType="EmbeddableControlRoot">
+      <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundAltHighBrush}"/>
+      <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Panel>
+            <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
+            <Border Background="{TemplateBinding Background}">
+              <VisualLayerManager>
+                <ContentPresenter Name="PART_ContentPresenter"
+                                  ContentTemplate="{TemplateBinding ContentTemplate}"
+                                  Content="{TemplateBinding Content}"
+                                  Margin="{TemplateBinding Padding}"/>
+              </VisualLayerManager>
+            </Border>
+          </Panel>
+        </ControlTemplate>
+      </Setter>
+    </ControlTheme>
+
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/Expander.xaml b/src/Avalonia.Themes.Fluent/Controls/Expander.xaml
index 33d502772e..36f6008782 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Expander.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Expander.xaml
@@ -1,6 +1,6 @@
-<Styles xmlns="https://github.com/avaloniaui" 
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        x:CompileBindings="True">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    x:CompileBindings="True">
   <Design.PreviewWith>
     <Border Padding="20">
       <StackPanel Orientation="Vertical" Spacing="20" Width="350">
@@ -34,72 +34,34 @@
     </Border>
   </Design.PreviewWith>
 
-  <Styles.Resources>
-    <Thickness x:Key="ExpanderHeaderPadding">16</Thickness>
-    <Thickness x:Key="ExpanderContentPadding">16</Thickness>
+  <Thickness x:Key="ExpanderHeaderPadding">16</Thickness>
+  <Thickness x:Key="ExpanderContentPadding">16</Thickness>
 
-    <Thickness x:Key="ExpanderBorderThickness">1</Thickness>
+  <Thickness x:Key="ExpanderBorderThickness">1</Thickness>
 
-    <Thickness x:Key="ExpanderDropdownLeftBorderThickness">1,1,0,1</Thickness>
-    <Thickness x:Key="ExpanderDropdownUpBorderThickness">1,1,1,0</Thickness>
-    <Thickness x:Key="ExpanderDropdownRightBorderThickness">0,1,1,1</Thickness>
-    <Thickness x:Key="ExpanderDropdownDownBorderThickness">1,0,1,1</Thickness>
+  <Thickness x:Key="ExpanderDropdownLeftBorderThickness">1,1,0,1</Thickness>
+  <Thickness x:Key="ExpanderDropdownUpBorderThickness">1,1,1,0</Thickness>
+  <Thickness x:Key="ExpanderDropdownRightBorderThickness">0,1,1,1</Thickness>
+  <Thickness x:Key="ExpanderDropdownDownBorderThickness">1,0,1,1</Thickness>
 
-    <SolidColorBrush x:Key="ExpanderBackground" Color="{DynamicResource SystemAltMediumHighColor}" />
-    <SolidColorBrush x:Key="ExpanderBorderBrush" Color="{DynamicResource SystemBaseLowColor}" />
+  <SolidColorBrush x:Key="ExpanderBackground" Color="{DynamicResource SystemAltMediumHighColor}" />
+  <SolidColorBrush x:Key="ExpanderBorderBrush" Color="{DynamicResource SystemBaseLowColor}" />
 
-    <SolidColorBrush x:Key="ExpanderDropDownBackground" Color="{DynamicResource SystemChromeMediumLowColor}" />
-    <SolidColorBrush x:Key="ExpanderDropDownBorderBrush" Color="{DynamicResource SystemBaseLowColor}" />
+  <SolidColorBrush x:Key="ExpanderDropDownBackground" Color="{DynamicResource SystemChromeMediumLowColor}" />
+  <SolidColorBrush x:Key="ExpanderDropDownBorderBrush" Color="{DynamicResource SystemBaseLowColor}" />
 
-    <SolidColorBrush x:Key="ExpanderForeground" Color="{DynamicResource SystemBaseHighColor}" />
+  <SolidColorBrush x:Key="ExpanderForeground" Color="{DynamicResource SystemBaseHighColor}" />
 
-    <SolidColorBrush x:Key="ExpanderChevronForeground" Color="{DynamicResource SystemBaseHighColor}" />
-  </Styles.Resources>
-  <Style Selector="Expander">
-    <Setter Property="Background" Value="{DynamicResource ExpanderBackground}" />
-    <Setter Property="BorderThickness" Value="{DynamicResource ExpanderBorderThickness}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ExpanderBorderBrush}" />
-    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-    <Setter Property="Padding" Value="{DynamicResource ExpanderHeaderPadding}" />
-    <Setter Property="HorizontalAlignment" Value="Stretch" />
-    <Setter Property="HorizontalContentAlignment" Value="Left" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-  </Style>
-  <Style Selector="Expander">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <DockPanel>
-          <ToggleButton x:Name="ExpanderHeader"
-                        Padding="{TemplateBinding Padding}"
-                        HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        Content="{TemplateBinding Header}"
-                        ContentTemplate="{TemplateBinding HeaderTemplate}"
-                        IsChecked="{TemplateBinding IsExpanded, Mode=TwoWay}"
-                        IsEnabled="{TemplateBinding IsEnabled}" />
-          <Border x:Name="ExpanderContent"
-                  Padding="{DynamicResource ExpanderContentPadding}"
-                  Background="{DynamicResource ExpanderDropDownBackground}"
-                  BorderBrush="{DynamicResource ExpanderDropDownBorderBrush}"
-                  IsVisible="{TemplateBinding IsExpanded, Mode=TwoWay}">
-            <ContentPresenter x:Name="PART_ContentPresenter"
-                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                              Content="{TemplateBinding Content}"
-                              ContentTemplate="{TemplateBinding ContentTemplate}" />
-          </Border>
-        </DockPanel>
-      </ControlTemplate>
-    </Setter>
-  </Style>
+  <SolidColorBrush x:Key="ExpanderChevronForeground" Color="{DynamicResource SystemBaseHighColor}" />
 
-  <Style Selector="Expander /template/ ToggleButton#ExpanderHeader">
-    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+  <ControlTheme x:Key="FluentExpanderToggleButtonTheme" TargetType="ToggleButton" BasedOn="{StaticResource {x:Type ToggleButton}}">
     <Setter Property="Template">
       <ControlTemplate>
-        <Border x:Name="ToggleButtonBackground">
+        <Border x:Name="ToggleButtonBackground"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                CornerRadius="{TemplateBinding CornerRadius}"
+                BorderThickness="{TemplateBinding BorderThickness}">
           <Grid ColumnDefinitions="*,Auto">
             <ContentPresenter x:Name="PART_ContentPresenter"
                               Margin="{TemplateBinding Padding}"
@@ -132,110 +94,168 @@
         </Border>
       </ControlTemplate>
     </Setter>
-  </Style>
-  <Style Selector="Expander /template/ ToggleButton#ExpanderHeader:pressed">
-    <Setter Property="RenderTransform" Value="{x:Null}" />
-  </Style>
-
-  <Style Selector="Expander:left /template/ ToggleButton#ExpanderHeader, Expander:right /template/ ToggleButton#ExpanderHeader">
-    <Setter Property="VerticalAlignment" Value="Stretch" />
-  </Style>
-
-
-  <Style Selector="Expander /template/ ToggleButton#ExpanderHeader /template/ Border#ToggleButtonBackground">
-    <Setter Property="Background" Value="{TemplateBinding Background}" />
-    <Setter Property="BorderBrush" Value="{TemplateBinding BorderBrush}" />
-    <Setter Property="BorderThickness" Value="{TemplateBinding BorderThickness}" />
-  </Style>
-
-  <Style Selector="Expander:not(:expanded) /template/ ToggleButton#ExpanderHeader /template/ Border#ToggleButtonBackground">
-    <Setter Property="CornerRadius" Value="{Binding $parent[Expander].CornerRadius}" />
-  </Style>
-  <Style Selector="Expander:expanded:up /template/ ToggleButton#ExpanderHeader /template/ Border#ToggleButtonBackground">
-    <Setter Property="CornerRadius" Value="{Binding $parent[Expander].CornerRadius, Converter={StaticResource BottomCornerRadiusFilterConverter}}" />
-  </Style>
-  <Style Selector="Expander:expanded:up /template/ Border#ExpanderContent">
-    <Setter Property="CornerRadius" Value="{Binding $parent[Expander].CornerRadius, Converter={StaticResource TopCornerRadiusFilterConverter}}" />
-  </Style>
-  <Style Selector="Expander:expanded:down /template/ ToggleButton#ExpanderHeader /template/ Border#ToggleButtonBackground">
-    <Setter Property="CornerRadius" Value="{Binding $parent[Expander].CornerRadius, Converter={StaticResource TopCornerRadiusFilterConverter}}" />
-  </Style>
-  <Style Selector="Expander:expanded:down /template/ Border#ExpanderContent">
-    <Setter Property="CornerRadius" Value="{Binding $parent[Expander].CornerRadius, Converter={StaticResource BottomCornerRadiusFilterConverter}}" />
-  </Style>
-  <Style Selector="Expander:expanded:left /template/ ToggleButton#ExpanderHeader /template/ Border#ToggleButtonBackground">
-    <Setter Property="CornerRadius" Value="{Binding $parent[Expander].CornerRadius, Converter={StaticResource RightCornerRadiusFilterConverter}}" />
-  </Style>
-  <Style Selector="Expander:expanded:left /template/ Border#ExpanderContent">
-    <Setter Property="CornerRadius" Value="{Binding $parent[Expander].CornerRadius, Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
-  </Style>
-  <Style Selector="Expander:expanded:right /template/ ToggleButton#ExpanderHeader /template/ Border#ToggleButtonBackground">
-    <Setter Property="CornerRadius" Value="{Binding $parent[Expander].CornerRadius, Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
-  </Style>
-  <Style Selector="Expander:expanded:right /template/ Border#ExpanderContent">
-    <Setter Property="CornerRadius" Value="{Binding $parent[Expander].CornerRadius, Converter={StaticResource RightCornerRadiusFilterConverter}}" />
-  </Style>
-
-  <Style Selector="Expander:left /template/ ToggleButton#ExpanderHeader">
-    <Setter Property="DockPanel.Dock" Value="Right" />
-  </Style>
-  <Style Selector="Expander:up /template/ ToggleButton#ExpanderHeader">
-    <Setter Property="DockPanel.Dock" Value="Bottom" />
-  </Style>
-  <Style Selector="Expander:right /template/ ToggleButton#ExpanderHeader">
-    <Setter Property="DockPanel.Dock" Value="Left" />
-  </Style>
-  <Style Selector="Expander:down /template/ ToggleButton#ExpanderHeader">
-    <Setter Property="DockPanel.Dock" Value="Top" />
-  </Style>
-
-
-  <Style Selector="Expander:expanded /template/ ToggleButton#ExpanderHeader /template/ Border#ExpandCollapseChevronBorder">
-    <Style.Animations>
-      <Animation FillMode="Both" Duration="0:0:0.0625">
-        <KeyFrame Cue="100%">
-          <Setter Property="RotateTransform.Angle" Value="180" />
-        </KeyFrame>
-      </Animation>
-    </Style.Animations>
-  </Style>
-  <Style Selector="Expander:not(:expanded) /template/ ToggleButton#ExpanderHeader /template/ Border#ExpandCollapseChevronBorder">
-    <Style.Animations>
-      <Animation FillMode="Both" Duration="0:0:0.0625">
-        <KeyFrame Cue="0%">
-          <Setter Property="RotateTransform.Angle" Value="180" />
-        </KeyFrame>
-        <KeyFrame Cue="100%">
-          <Setter Property="RotateTransform.Angle" Value="0" />
-        </KeyFrame>
-      </Animation>
-    </Style.Animations>
-  </Style>
-
-  <Style Selector="Expander:left /template/ ToggleButton#ExpanderHeader /template/ Path#ExpandCollapseChevron">
-    <Setter Property="Data" Value="M 7 0 L 0 7 L 7 14" />
-  </Style>
-  <Style Selector="Expander:up /template/ ToggleButton#ExpanderHeader /template/ Path#ExpandCollapseChevron">
-    <Setter Property="Data" Value="M 0 7 L 7 0 L 14 7" />
-  </Style>
-  <Style Selector="Expander:right /template/ ToggleButton#ExpanderHeader /template/ Path#ExpandCollapseChevron">
-    <Setter Property="Data" Value="M 0 0 L 7 7 L 0 14" />
-  </Style>
-  <Style Selector="Expander:down /template/ ToggleButton#ExpanderHeader /template/ Path#ExpandCollapseChevron">
-    <Setter Property="Data" Value="M 0 0 L 7 7 L 14 0" />
-  </Style>
-
-
-  <Style Selector="Expander:left /template/ Border#ExpanderContent">
-    <Setter Property="BorderThickness" Value="{DynamicResource ExpanderDropdownLeftBorderThickness}" />
-  </Style>
-  <Style Selector="Expander:up /template/ Border#ExpanderContent">
-    <Setter Property="BorderThickness" Value="{DynamicResource ExpanderDropdownUpBorderThickness}" />
-  </Style>
-  <Style Selector="Expander:right /template/ Border#ExpanderContent">
-    <Setter Property="BorderThickness" Value="{DynamicResource ExpanderDropdownRightBorderThickness}" />
-  </Style>
-  <Style Selector="Expander:down /template/ Border#ExpanderContent">
-    <Setter Property="BorderThickness" Value="{DynamicResource ExpanderDropdownDownBorderThickness}" />
-  </Style>
-</Styles>
+    <Style Selector="^[Tag=Expanded] /template/ Border#ExpandCollapseChevronBorder">
+      <Style.Animations>
+        <Animation FillMode="Both" Duration="0:0:0.0625">
+          <KeyFrame Cue="100%">
+            <Setter Property="RotateTransform.Angle" Value="180" />
+          </KeyFrame>
+        </Animation>
+      </Style.Animations>
+    </Style>
+    <Style Selector="^[Tag=NotExpanded] /template/ Border#ExpandCollapseChevronBorder">
+      <Style.Animations>
+        <Animation FillMode="Both" Duration="0:0:0.0625">
+          <KeyFrame Cue="0%">
+            <Setter Property="RotateTransform.Angle" Value="180" />
+          </KeyFrame>
+          <KeyFrame Cue="100%">
+            <Setter Property="RotateTransform.Angle" Value="0" />
+          </KeyFrame>
+        </Animation>
+      </Style.Animations>
+    </Style>
+  </ControlTheme>
+  <ControlTheme x:Key="FluentExpanderToggleButtonUpTheme" TargetType="ToggleButton" BasedOn="{StaticResource FluentExpanderToggleButtonTheme}">
+    <Style Selector="^ /template/ Path#ExpandCollapseChevron">
+      <Setter Property="Data" Value="M 0 7 L 7 0 L 14 7" />
+    </Style>
+  </ControlTheme>
+  <ControlTheme x:Key="FluentExpanderToggleButtonDownTheme" TargetType="ToggleButton" BasedOn="{StaticResource FluentExpanderToggleButtonTheme}">
+    <Style Selector="^ /template/ Path#ExpandCollapseChevron">
+      <Setter Property="Data" Value="M 0 0 L 7 7 L 14 0" />
+    </Style>
+  </ControlTheme>
+  <ControlTheme x:Key="FluentExpanderToggleButtonLeftTheme" TargetType="ToggleButton" BasedOn="{StaticResource FluentExpanderToggleButtonTheme}">
+    <Style Selector="^ /template/ Path#ExpandCollapseChevron">
+      <Setter Property="Data" Value="M 7 0 L 0 7 L 7 14" />
+    </Style>
+  </ControlTheme>
+  <ControlTheme x:Key="FluentExpanderToggleButtonRightTheme" TargetType="ToggleButton" BasedOn="{StaticResource FluentExpanderToggleButtonTheme}">
+    <Style Selector="^ /template/ Path#ExpandCollapseChevron">
+      <Setter Property="Data" Value="M 0 0 L 7 7 L 0 14" />
+    </Style>
+  </ControlTheme>
+  <ControlTheme x:Key="{x:Type Expander}" TargetType="Expander">
+    <Setter Property="Background" Value="{DynamicResource ExpanderBackground}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource ExpanderBorderThickness}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ExpanderBorderBrush}" />
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+    <Setter Property="Padding" Value="{DynamicResource ExpanderHeaderPadding}" />
+    <Setter Property="HorizontalAlignment" Value="Stretch" />
+    <Setter Property="HorizontalContentAlignment" Value="Left" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <DockPanel>
+          <ToggleButton x:Name="ExpanderHeader"
+                        Padding="{TemplateBinding Padding}"
+                        HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        HorizontalContentAlignment="Stretch"
+                        Content="{TemplateBinding Header}"
+                        ContentTemplate="{TemplateBinding HeaderTemplate}"
+                        IsChecked="{TemplateBinding IsExpanded, Mode=TwoWay}"
+                        IsEnabled="{TemplateBinding IsEnabled}"/>
+          <Border x:Name="ExpanderContent"
+                  Padding="{DynamicResource ExpanderContentPadding}"
+                  Background="{DynamicResource ExpanderDropDownBackground}"
+                  BorderBrush="{DynamicResource ExpanderDropDownBorderBrush}"
+                  IsVisible="{TemplateBinding IsExpanded, Mode=TwoWay}">
+            <ContentPresenter x:Name="PART_ContentPresenter"
+                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                              Content="{TemplateBinding Content}"
+                              ContentTemplate="{TemplateBinding ContentTemplate}" />
+          </Border>
+        </DockPanel>
+      </ControlTemplate>
+    </Setter>
+ 
+    <Style Selector="^ /template/ ToggleButton#ExpanderHeader:pressed">
+      <Setter Property="RenderTransform" Value="{x:Null}" />
+    </Style>
+
+    <Style Selector="^:left /template/ ToggleButton#ExpanderHeader, ^:right /template/ ToggleButton#ExpanderHeader">
+      <Setter Property="VerticalAlignment" Value="Stretch" />
+    </Style>
+
+    <Style Selector="^:not(:expanded) /template/ ToggleButton#ExpanderHeader">
+      <Setter Property="CornerRadius" Value="{Binding $parent[Expander].CornerRadius}" />
+    </Style>
+    <Style Selector="^:expanded:up /template/ ToggleButton#ExpanderHeader">
+      <Setter Property="CornerRadius" Value="{Binding $parent[Expander].CornerRadius, Converter={StaticResource BottomCornerRadiusFilterConverter}}" />
+    </Style>
+    <Style Selector="^:expanded:up /template/ Border#ExpanderContent">
+      <Setter Property="CornerRadius" Value="{Binding $parent[Expander].CornerRadius, Converter={StaticResource TopCornerRadiusFilterConverter}}" />
+    </Style>
+    <Style Selector="^:expanded:down /template/ ToggleButton#ExpanderHeader">
+      <Setter Property="CornerRadius" Value="{Binding $parent[Expander].CornerRadius, Converter={StaticResource TopCornerRadiusFilterConverter}}" />
+    </Style>
+    <Style Selector="^:expanded:down /template/ Border#ExpanderContent">
+      <Setter Property="CornerRadius" Value="{Binding $parent[Expander].CornerRadius, Converter={StaticResource BottomCornerRadiusFilterConverter}}" />
+    </Style>
+    <Style Selector="^:expanded:left /template/ ToggleButton#ExpanderHeader">
+      <Setter Property="CornerRadius" Value="{Binding $parent[Expander].CornerRadius, Converter={StaticResource RightCornerRadiusFilterConverter}}" />
+    </Style>
+    <Style Selector="^:expanded:left /template/ Border#ExpanderContent">
+      <Setter Property="CornerRadius" Value="{Binding $parent[Expander].CornerRadius, Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
+    </Style>
+    <Style Selector="^:expanded:right /template/ ToggleButton#ExpanderHeader">
+      <Setter Property="CornerRadius" Value="{Binding $parent[Expander].CornerRadius, Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
+    </Style>
+    <Style Selector="^:expanded:right /template/ Border#ExpanderContent">
+      <Setter Property="CornerRadius" Value="{Binding $parent[Expander].CornerRadius, Converter={StaticResource RightCornerRadiusFilterConverter}}" />
+    </Style>
+
+    <Style Selector="^:left /template/ ToggleButton#ExpanderHeader">
+      <Setter Property="DockPanel.Dock" Value="Right" />
+    </Style>
+    <Style Selector="^:up /template/ ToggleButton#ExpanderHeader">
+      <Setter Property="DockPanel.Dock" Value="Bottom" />
+    </Style>
+    <Style Selector="^:right /template/ ToggleButton#ExpanderHeader">
+      <Setter Property="DockPanel.Dock" Value="Left" />
+    </Style>
+    <Style Selector="^:down /template/ ToggleButton#ExpanderHeader">
+      <Setter Property="DockPanel.Dock" Value="Top" />
+    </Style>
+
+
+    <Style Selector="^:expanded /template/ ToggleButton#ExpanderHeader">
+      <Setter Property="Tag" Value="Expanded"/>
+    </Style>
+    <Style Selector="^:not(:expanded) /template/ ToggleButton#ExpanderHeader">
+      <Setter Property="Tag" Value="NotExpanded"/>
+    </Style>
+
+    <Style Selector="^:left /template/ ToggleButton#ExpanderHeader">
+      <Setter Property="Theme" Value="{StaticResource FluentExpanderToggleButtonLeftTheme}" />
+    </Style>
+    <Style Selector="^:up /template/ ToggleButton#ExpanderHeader">
+      <Setter Property="Theme" Value="{StaticResource FluentExpanderToggleButtonUpTheme}" />
+    </Style>
+    <Style Selector="^:right /template/ ToggleButton#ExpanderHeader">
+      <Setter Property="Theme" Value="{StaticResource FluentExpanderToggleButtonRightTheme}" />
+    </Style>
+    <Style Selector="^:down /template/ ToggleButton#ExpanderHeader">
+      <Setter Property="Theme" Value="{StaticResource FluentExpanderToggleButtonDownTheme}" />
+    </Style>
+
+
+    <Style Selector="^:left /template/ Border#ExpanderContent">
+      <Setter Property="BorderThickness" Value="{DynamicResource ExpanderDropdownLeftBorderThickness}" />
+    </Style>
+    <Style Selector="^:up /template/ Border#ExpanderContent">
+      <Setter Property="BorderThickness" Value="{DynamicResource ExpanderDropdownUpBorderThickness}" />
+    </Style>
+    <Style Selector="^:right /template/ Border#ExpanderContent">
+      <Setter Property="BorderThickness" Value="{DynamicResource ExpanderDropdownRightBorderThickness}" />
+    </Style>
+    <Style Selector="^:down /template/ Border#ExpanderContent">
+      <Setter Property="BorderThickness" Value="{DynamicResource ExpanderDropdownDownBorderThickness}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
index 5b217e4764..286b3e3fcd 100644
--- a/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
@@ -1,70 +1,78 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        x:Class="Avalonia.Themes.Fluent.Controls.FluentControls">
-  <!-- Define ToolTip first so its styles can be overriden by other controls (e.g. TextBox) -->  
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ToolTip.xaml"/>
-  <!-- PathIcon also needs to be defined early so it can be overriden by other styles (e.g. ComboBox) -->
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/PathIcon.xaml" />
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/FocusAdorner.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/Button.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/CaptionButtons.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/Carousel.xaml"/>  
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/CheckBox.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ComboBox.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ComboBoxItem.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ContentControl.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/DropDownButton.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/Label.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/GridSplitter.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ItemsControl.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ListBox.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ListBoxItem.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/Menu.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ContextMenu.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/MenuItem.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/OverlayPopupHost.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/PopupRoot.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ProgressBar.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/RadioButton.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/RepeatButton.xaml" />
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/Separator.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/Slider.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ScrollBar.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/TabStrip.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/TabStripItem.xaml"/>
-  <!-- TabControl needs to come after TabStrip as it redefines the inner TabStrip.ItemsPanel-->
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/TabControl.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/TabItem.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/TextBox.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ToggleButton.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/TransitioningContentControl.xaml" />
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/Expander.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/TitleBar.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/TreeView.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/TreeViewItem.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/UserControl.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/Window.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/EmbeddableControlRoot.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/CalendarButton.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/CalendarDayButton.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/CalendarItem.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/Calendar.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/AutoCompleteBox.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/WindowNotificationManager.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/NotificationCard.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/NativeMenuBar.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/SplitButton.xaml" />
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/SplitView.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/DatePicker.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/TimePicker.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/FlyoutPresenter.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/MenuFlyoutPresenter.xaml"/>
-  <!-- ManagedFileChooser comes last because it uses (and overrides) styles for a multitude of other controls...the dialogs were originally UserControls, after all-->
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ManagedFileChooser.xaml"/>
+<Styles
+    x:Class="Avalonia.Themes.Fluent.Controls.FluentControls"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Styles.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/Button.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/RadioButton.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/Expander.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/ProgressBar.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/AutoCompleteBox.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/Calendar.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/CalendarButton.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/CalendarDayButton.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/CalendarItem.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/CaptionButtons.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/Carousel.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/CheckBox.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/FlyoutPresenter.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/GridSplitter.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/ItemsControl.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/Label.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/ListBox.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/ListBoxItem.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/Menu.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/MenuFlyoutPresenter.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/NativeMenuBar.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/NotificationCard.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/OverlayPopupHost.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/PopupRoot.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/PathIcon.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/RepeatButton.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/Separator.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/TabControl.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/TabItem.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/TabStrip.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/TabStripItem.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/ToggleButton.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/ToolTip.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/TitleBar.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/TransitioningContentControl.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/TreeView.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/WindowNotificationManager.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/Window.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/ComboBox.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/ComboBoxItem.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/ContentControl.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/ContextMenu.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/DatePicker.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/DropDownButton.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/EmbeddableControlRoot.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/Slider.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Styles.Resources>
+
+    <!--  Define ToolTip first so its styles can be overriden by other controls (e.g. TextBox)  -->
+    <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/FocusAdorner.xaml" />
+    <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/MenuItem.xaml" />
+    <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ScrollBar.xaml" />
+    <!--  TabControl needs to come after TabStrip as it redefines the inner TabStrip.ItemsPanel  -->
+    <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/TextBox.xaml" />
+    <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/TreeViewItem.xaml" />
+    <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/SplitButton.xaml" />
+    <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/SplitView.xaml" />
+    <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/UserControl.xaml" />
+    <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/TimePicker.xaml" />
+    <!--  ManagedFileChooser comes last because it uses (and overrides) styles for a multitude of other controls...the dialogs were originally UserControls, after all  -->
+    <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ManagedFileChooser.xaml" />
+    <Styles.Resources />
 </Styles>
diff --git a/src/Avalonia.Themes.Fluent/Controls/FlyoutPresenter.xaml b/src/Avalonia.Themes.Fluent/Controls/FlyoutPresenter.xaml
index 92f8177ead..2dca5b0770 100644
--- a/src/Avalonia.Themes.Fluent/Controls/FlyoutPresenter.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/FlyoutPresenter.xaml
@@ -1,9 +1,7 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Styles.Resources>
-    <Thickness x:Key="FlyoutBorderThemeThickness">1</Thickness>
-  </Styles.Resources>
-  
-  <Style Selector="FlyoutPresenter">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Thickness x:Key="FlyoutBorderThemeThickness">1</Thickness>
+  <ControlTheme x:Key="{x:Type FlyoutPresenter}" TargetType="FlyoutPresenter">
     <Setter Property="HorizontalContentAlignment" Value="Stretch" />
     <Setter Property="VerticalContentAlignment" Value="Stretch" />
     <Setter Property="Background" Value="{DynamicResource FlyoutPresenterBackground}" />
@@ -38,5 +36,5 @@
         </Border>
       </ControlTemplate>
     </Setter>
-  </Style>
-</Styles>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/FocusAdorner.xaml b/src/Avalonia.Themes.Fluent/Controls/FocusAdorner.xaml
index 91bf71ed4d..c3f489da80 100644
--- a/src/Avalonia.Themes.Fluent/Controls/FocusAdorner.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/FocusAdorner.xaml
@@ -1,4 +1,4 @@
-<Styles xmlns="https://github.com/avaloniaui"
+<Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Styles.Resources>
     <Thickness x:Key="SystemControlFocusVisualMargin">0</Thickness>
diff --git a/src/Avalonia.Themes.Fluent/Controls/GridSplitter.xaml b/src/Avalonia.Themes.Fluent/Controls/GridSplitter.xaml
index e3a7b04f33..ca57eccd13 100644
--- a/src/Avalonia.Themes.Fluent/Controls/GridSplitter.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/GridSplitter.xaml
@@ -1,24 +1,22 @@
-<Styles xmlns="https://github.com/avaloniaui">
-
-  <Style Selector="GridSplitter">
-    <Setter Property="Focusable" Value="True" />
-    <Setter Property="MinWidth" Value="6" />
-    <Setter Property="MinHeight" Value="6" />
-    <Setter Property="Background" Value="{DynamicResource SystemAltMediumLowColor}" />
-    <Setter Property="PreviewContent">
-      <Template>
-        <Rectangle Fill="{DynamicResource SystemAccentColor}" />
-      </Template>
-    </Setter>
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border 
-          BorderBrush="{TemplateBinding BorderBrush}"
-          BorderThickness="{TemplateBinding BorderThickness}"
-          CornerRadius="{TemplateBinding CornerRadius}"
-          Background="{TemplateBinding Background}"/>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-</Styles>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ControlTheme x:Key="{x:Type GridSplitter}" TargetType="GridSplitter">
+      <Setter Property="Focusable" Value="True" />
+      <Setter Property="MinWidth" Value="6" />
+      <Setter Property="MinHeight" Value="6" />
+      <Setter Property="Background" Value="{DynamicResource SystemAltMediumLowColor}" />
+      <Setter Property="PreviewContent">
+        <Template>
+          <Rectangle Fill="{DynamicResource SystemAccentColor}" />
+        </Template>
+      </Setter>
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}"
+                  Background="{TemplateBinding Background}" />
+        </ControlTemplate>
+      </Setter>
+    </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ItemsControl.xaml b/src/Avalonia.Themes.Fluent/Controls/ItemsControl.xaml
index 19d13b6399..b8d7c2c4ef 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ItemsControl.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ItemsControl.xaml
@@ -1,16 +1,19 @@
-<Style xmlns="https://github.com/avaloniaui" Selector="ItemsControl">
-  <Setter Property="Template">
-    <ControlTemplate>
-      <Border Background="{TemplateBinding Background}"
-              BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}"
-              CornerRadius="{TemplateBinding CornerRadius}"
-              Padding="{TemplateBinding Padding}">
-        <ItemsPresenter Name="PART_ItemsPresenter"
-                        Items="{TemplateBinding Items}"
-                        ItemsPanel="{TemplateBinding ItemsPanel}"
-                        ItemTemplate="{TemplateBinding ItemTemplate}"/>
-      </Border>
-    </ControlTemplate>
-  </Setter>
-</Style>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ControlTheme x:Key="{x:Type ItemsControl}" TargetType="ItemsControl">
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}"
+                  Padding="{TemplateBinding Padding}">
+            <ItemsPresenter Name="PART_ItemsPresenter"
+                            Items="{TemplateBinding Items}"
+                            ItemsPanel="{TemplateBinding ItemsPanel}"
+                            ItemTemplate="{TemplateBinding ItemTemplate}"/>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+    </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/Label.xaml b/src/Avalonia.Themes.Fluent/Controls/Label.xaml
index d41e4e2166..ad57239648 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Label.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Label.xaml
@@ -1,18 +1,22 @@
-<Style xmlns="https://github.com/avaloniaui" Selector="Label">
-  <Setter Property="Padding" Value="3"/>
-  <Setter Property="Template">
-    <ControlTemplate>
-      <ContentPresenter Name="PART_ContentPresenter"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"                        
-                        CornerRadius="{TemplateBinding CornerRadius}"
-                        ContentTemplate="{TemplateBinding ContentTemplate}"
-                        Content="{TemplateBinding Content}"
-                        Padding="{TemplateBinding Padding}"
-                        RecognizesAccessKey="True"
-                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"/>
-    </ControlTemplate>
-  </Setter>
-</Style>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <ControlTheme x:Key="{x:Type Label}" TargetType="Label">
+      <Setter Property="Padding" Value="3"/>
+      <Setter Property="Template">
+        <ControlTemplate>
+          <ContentPresenter Name="PART_ContentPresenter"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{TemplateBinding CornerRadius}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            Content="{TemplateBinding Content}"
+                            Padding="{TemplateBinding Padding}"
+                            RecognizesAccessKey="True"
+                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"/>
+        </ControlTemplate>
+      </Setter>
+    </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ListBox.xaml b/src/Avalonia.Themes.Fluent/Controls/ListBox.xaml
index 8011ed9daf..b1d4b77a3f 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ListBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ListBox.xaml
@@ -1,45 +1,47 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Design.PreviewWith>
-    <Border Padding="20">
-      <ListBox>
-        <ListBoxItem>Test</ListBoxItem>
-        <ListBoxItem>Test</ListBoxItem>
-        <ListBoxItem>Test</ListBoxItem>
-        <ListBoxItem>Test</ListBoxItem>
-      </ListBox>
-    </Border>
-  </Design.PreviewWith>
-  <Style Selector="ListBox">
-    <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}" />
-    <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource SystemControlForegroundBaseHighBrush}" />
-    <Setter Property="BorderThickness" Value="{DynamicResource ListBoxBorderThemeThickness}" />
-    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
-    <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />        
-    <Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />        
-    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />    
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Name="border"
-                ClipToBounds="{TemplateBinding ClipToBounds}"
-                Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}">
-          <ScrollViewer Name="PART_ScrollViewer"
-                        HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
-                        VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}"
-                        IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
-                        AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}">
-            <ItemsPresenter Name="PART_ItemsPresenter"
-                            Items="{TemplateBinding Items}"
-                            ItemsPanel="{TemplateBinding ItemsPanel}"
-                            ItemTemplate="{TemplateBinding ItemTemplate}"
-                            Margin="{TemplateBinding Padding}"
-                            VirtualizationMode="{TemplateBinding VirtualizationMode}"/>
-          </ScrollViewer>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-</Styles>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Design.PreviewWith>
+      <Border Padding="20">
+        <ListBox>
+          <ListBoxItem>Test</ListBoxItem>
+          <ListBoxItem>Test</ListBoxItem>
+          <ListBoxItem>Test</ListBoxItem>
+          <ListBoxItem>Test</ListBoxItem>
+        </ListBox>
+      </Border>
+    </Design.PreviewWith>
+  
+    <ControlTheme x:Key="{x:Type ListBox}" TargetType="ListBox">
+      <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}" />
+      <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource SystemControlForegroundBaseHighBrush}" />
+      <Setter Property="BorderThickness" Value="{DynamicResource ListBoxBorderThemeThickness}" />
+      <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
+      <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+      <Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
+      <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border Name="border"
+                  ClipToBounds="{TemplateBinding ClipToBounds}" 
+                  Background="{TemplateBinding Background}" 
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <ScrollViewer Name="PART_ScrollViewer" 
+                          HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}" 
+                          VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}"
+                          IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
+                          AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}">
+              <ItemsPresenter Name="PART_ItemsPresenter" 
+                              Items="{TemplateBinding Items}" 
+                              ItemsPanel="{TemplateBinding ItemsPanel}"
+                              ItemTemplate="{TemplateBinding ItemTemplate}" 
+                              Margin="{TemplateBinding Padding}"
+                              VirtualizationMode="{TemplateBinding VirtualizationMode}" />
+            </ScrollViewer>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+    </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ListBoxItem.xaml b/src/Avalonia.Themes.Fluent/Controls/ListBoxItem.xaml
index 11f3c12772..c00e920f75 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ListBoxItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ListBoxItem.xaml
@@ -1,94 +1,79 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Design.PreviewWith>
-    <Border Padding="0">
-      <ListBox>
-        <ListBoxItem IsEnabled="False">Disabled</ListBoxItem>
-        <ListBoxItem Background="#66000000"
-                     Padding="20">
-          Test
-        </ListBoxItem>
-        <ListBoxItem>Test</ListBoxItem>
-      </ListBox>
-    </Border>
-  </Design.PreviewWith>
-  <Styles.Resources>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Design.PreviewWith>
+      <Border Padding="0">
+        <ListBox>
+          <ListBoxItem IsEnabled="False">Disabled</ListBoxItem>
+          <ListBoxItem Background="#66000000"
+                       Padding="20">
+            Test
+          </ListBoxItem>
+          <ListBoxItem>Test</ListBoxItem>
+        </ListBox>
+      </Border>
+    </Design.PreviewWith>
     <Thickness x:Key="ListBoxItemPadding">12,9,12,12</Thickness>
-  </Styles.Resources>
-  <Style Selector="ListBoxItem">
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="Padding" Value="{DynamicResource ListBoxItemPadding}" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <ContentPresenter Name="PART_ContentPresenter"
-                          Background="{TemplateBinding Background}"
-                          BorderBrush="{TemplateBinding BorderBrush}"
-                          BorderThickness="{TemplateBinding BorderThickness}"
-                          CornerRadius="{TemplateBinding CornerRadius}"
-                          ContentTemplate="{TemplateBinding ContentTemplate}"
-                          Content="{TemplateBinding Content}"
-                          Padding="{TemplateBinding Padding}"
-                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" />
-      </ControlTemplate>
-    </Setter>
-  </Style>
+    <ControlTheme x:Key="{x:Type ListBoxItem}" TargetType="ListBoxItem">
+      <Setter Property="Background" Value="Transparent" />
+      <Setter Property="Padding" Value="{DynamicResource ListBoxItemPadding}" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <ContentPresenter Name="PART_ContentPresenter"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{TemplateBinding CornerRadius}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            Content="{TemplateBinding Content}"
+                            FontWeight="Normal"
+                            FontSize="{DynamicResource ControlContentThemeFontSize}"
+                            Padding="{TemplateBinding Padding}"
+                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" />
+        </ControlTemplate>
+      </Setter>
 
-  <Style Selector="ListBoxItem /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="FontWeight" Value="Normal" />
-    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-  </Style>
+      <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Foreground" Value="{DynamicResource SystemControlDisabledBaseMediumLowBrush}" />
+      </Style>
 
-  <!--  Disabled State  -->
-  <Style Selector="ListBoxItem:disabled /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Foreground" Value="{DynamicResource SystemControlDisabledBaseMediumLowBrush}" />
-  </Style>
+      <!--  PointerOver State  -->
+      <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource SystemControlHighlightListLowBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
+      </Style>
 
-  <!--  PointerOver State  -->
-  <Style Selector="ListBoxItem:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource SystemControlHighlightListLowBrush}" />
-  </Style>
-  <Style Selector="ListBoxItem:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
-  </Style>
+      <!--  Pressed State  -->
+      <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource SystemControlHighlightListMediumBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
+      </Style>
 
-  <!--  Pressed State  -->
-  <Style Selector="ListBoxItem:pressed /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource SystemControlHighlightListMediumBrush}" />
-  </Style>
-  <Style Selector="ListBoxItem:pressed /template/ ContentPresenter">
-    <Setter Property="Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
-  </Style>
+      <!--  Selected State  -->
+      <Style Selector="^:selected">
 
-  <!--  Selected State  -->
-  <Style Selector="ListBoxItem:selected /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource SystemControlHighlightListAccentLowBrush}" />
-  </Style>
-  <Style Selector="ListBoxItem:selected /template/ ContentPresenter">
-    <Setter Property="Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
-  </Style>
+        <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+          <Setter Property="Background" Value="{DynamicResource SystemControlHighlightListAccentLowBrush}" />
+          <Setter Property="Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
+        </Style>
 
-  <!--  Selected Unfocused State  -->
-  <Style Selector="ListBoxItem:selected:not(:focus) /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource SystemControlHighlightListAccentLowBrush}" />
-  </Style>
-  <Style Selector="ListBoxItem:selected:not(:focus) /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
-  </Style>
+        <!--  Selected Unfocused State  -->
+        <Style Selector="^:not(:focus) /template/ ContentPresenter#PART_ContentPresenter">
+          <Setter Property="Background" Value="{DynamicResource SystemControlHighlightListAccentLowBrush}" />
+          <Setter Property="Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
+        </Style>
 
-  <!--  Selected PointerOver State  -->
-  <Style Selector="ListBoxItem:selected:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource SystemControlHighlightListAccentMediumBrush}" />
-  </Style>
-  <Style Selector="ListBoxItem:selected:pointerover /template/ ContentPresenter">
-    <Setter Property="Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
-  </Style>
+        <!--  Selected PointerOver State  -->
+        <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+          <Setter Property="Background" Value="{DynamicResource SystemControlHighlightListAccentMediumBrush}" />
+          <Setter Property="Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
+        </Style>
 
-  <!--  Selected Pressed State  -->
-  <Style Selector="ListBoxItem:selected:pressed /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource SystemControlHighlightListAccentHighBrush}" />
-  </Style>
-  <Style Selector="ListBoxItem:selected:pressed /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
-  </Style>
-</Styles>
+        <!--  Selected Pressed State  -->
+        <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+          <Setter Property="Background" Value="{DynamicResource SystemControlHighlightListAccentHighBrush}" />
+          <Setter Property="Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
+        </Style>
+      </Style>
+    </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ManagedFileChooser.xaml b/src/Avalonia.Themes.Fluent/Controls/ManagedFileChooser.xaml
index 60e16fcff2..dc454e4fdb 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ManagedFileChooser.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ManagedFileChooser.xaml
@@ -1,324 +1,324 @@
-<Styles xmlns="https://github.com/avaloniaui"
+<Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:dialogs="clr-namespace:Avalonia.Dialogs;assembly=Avalonia.Dialogs">
-    <Style Selector="dialogs|ManagedFileChooser">
-        <Style.Resources>
-            <ResourceDictionary>
-                <GradientStops x:Key="IconRes.FolderBackGradientStops">
-                </GradientStops>
-                <GradientStops x:Key="IconRes.FolderFrontGradientStops">
-                    <GradientStop Offset="0" Color="#FFFFDA6F"/>
-                    <GradientStop Offset="1" Color="#FFFEC326"/>
-                </GradientStops>
-                <DrawingGroup x:Key="LevelUp">
-                    <GeometryDrawing Brush="#00FFFFFF" Geometry="F1M16,16L0,16 0,0 16,0z" />
-                    <GeometryDrawing Brush="#FFF6F6F6" Geometry="F1M14.5,0L6.39,0 5.39,2 2.504,2C1.677,2,1,2.673,1,3.5L1,10.582 1,10.586 1,15.414 3,13.414 3,16 7,16 7,13.414 9,15.414 9,13 14.5,13C15.327,13,16,12.327,16,11.5L16,1.5C16,0.673,15.327,0,14.5,0" />
-                    <GeometryDrawing Brush="#FFDCB679" Geometry="F1M14,3L7.508,3 8.008,2 8.012,2 14,2z M14.5,1L7.008,1 6.008,3 2.504,3C2.227,3,2,3.224,2,3.5L2,9.582 4.998,6.586 9,10.586 9,12 14.5,12C14.775,12,15,11.776,15,11.5L15,1.5C15,1.224,14.775,1,14.5,1" />
-                    <GeometryDrawing Brush="#FF00529C" Geometry="F1M8,11L5,8 2,11 2,13 4,11 4,15 6,15 6,11 8,13z" />
-                    <GeometryDrawing Brush="#FFF0EFF1" Geometry="F1M8.0001,1.9996L7.5001,3.0006 14.0001,3.0006 14.0001,1.9996z" />
-                </DrawingGroup>
-                <dialogs:ResourceSelectorConverter x:Key="Icons">
-                    <DrawingGroup x:Key="Icon_Folder">
-                        <GeometryDrawing Geometry="M 0 0 L 16 16"/>
-                        <GeometryDrawing Geometry="M 0 3 C 0,1 0,1 2,1 L 5 1 C 5.5,1 6,1 6.5,1.5 L 8 3 L 14 3 C 16,3 16,3 16,5
+  <Style Selector="dialogs|ManagedFileChooser">
+    <Style.Resources>
+      <ResourceDictionary>
+        <GradientStops x:Key="IconRes.FolderBackGradientStops">
+        </GradientStops>
+        <GradientStops x:Key="IconRes.FolderFrontGradientStops">
+          <GradientStop Offset="0" Color="#FFFFDA6F"/>
+          <GradientStop Offset="1" Color="#FFFEC326"/>
+        </GradientStops>
+        <DrawingGroup x:Key="LevelUp">
+          <GeometryDrawing Brush="#00FFFFFF" Geometry="F1M16,16L0,16 0,0 16,0z" />
+          <GeometryDrawing Brush="#FFF6F6F6" Geometry="F1M14.5,0L6.39,0 5.39,2 2.504,2C1.677,2,1,2.673,1,3.5L1,10.582 1,10.586 1,15.414 3,13.414 3,16 7,16 7,13.414 9,15.414 9,13 14.5,13C15.327,13,16,12.327,16,11.5L16,1.5C16,0.673,15.327,0,14.5,0" />
+          <GeometryDrawing Brush="#FFDCB679" Geometry="F1M14,3L7.508,3 8.008,2 8.012,2 14,2z M14.5,1L7.008,1 6.008,3 2.504,3C2.227,3,2,3.224,2,3.5L2,9.582 4.998,6.586 9,10.586 9,12 14.5,12C14.775,12,15,11.776,15,11.5L15,1.5C15,1.224,14.775,1,14.5,1" />
+          <GeometryDrawing Brush="#FF00529C" Geometry="F1M8,11L5,8 2,11 2,13 4,11 4,15 6,15 6,11 8,13z" />
+          <GeometryDrawing Brush="#FFF0EFF1" Geometry="F1M8.0001,1.9996L7.5001,3.0006 14.0001,3.0006 14.0001,1.9996z" />
+        </DrawingGroup>
+        <dialogs:ResourceSelectorConverter x:Key="Icons">
+          <DrawingGroup x:Key="Icon_Folder">
+            <GeometryDrawing Geometry="M 0 0 L 16 16"/>
+            <GeometryDrawing Geometry="M 0 3 C 0,1 0,1 2,1 L 5 1 C 5.5,1 6,1 6.5,1.5 L 8 3 L 14 3 C 16,3 16,3 16,5
                         L 16,12 C 16,14 16,14 14,14
                         L 2,14 C 0,14 0,14 0,12 Z">
-                            <GeometryDrawing.Brush>
-                                <LinearGradientBrush StartPoint="1,4" EndPoint="23,20">
-                                    <GradientStop Offset="0" Color="#FFFFC018"/>
-                                    <GradientStop Offset="1" Color="#FFDFA32D"/>
-                                </LinearGradientBrush>
-                            </GeometryDrawing.Brush>
-                        </GeometryDrawing>
-                        <GeometryDrawing Geometry="M 0 4.5 L 8 4.5 L 8 9 L 0 9 Z">
-                            <GeometryDrawing.Brush>
-                                <LinearGradientBrush StartPoint="0,4.5" EndPoint="0,5">
-                                    <GradientStop Offset="0" Color="#00D7A018"/>
-                                    <GradientStop Offset="1" Color="#7FD7A018"/>
-                                </LinearGradientBrush>
-                            </GeometryDrawing.Brush>
-                        </GeometryDrawing>
-                        <GeometryDrawing Geometry="M 0 9 C 0,5 0,5 2,5 L 5 5 C 5.5,5 6,5 6.5,4.75 L 8 4 L 14 4 C 16,4 16,4 16,6
+              <GeometryDrawing.Brush>
+                <LinearGradientBrush StartPoint="1,4" EndPoint="23,20">
+                  <GradientStop Offset="0" Color="#FFFFC018"/>
+                  <GradientStop Offset="1" Color="#FFDFA32D"/>
+                </LinearGradientBrush>
+              </GeometryDrawing.Brush>
+            </GeometryDrawing>
+            <GeometryDrawing Geometry="M 0 4.5 L 8 4.5 L 8 9 L 0 9 Z">
+              <GeometryDrawing.Brush>
+                <LinearGradientBrush StartPoint="0,4.5" EndPoint="0,5">
+                  <GradientStop Offset="0" Color="#00D7A018"/>
+                  <GradientStop Offset="1" Color="#7FD7A018"/>
+                </LinearGradientBrush>
+              </GeometryDrawing.Brush>
+            </GeometryDrawing>
+            <GeometryDrawing Geometry="M 0 9 C 0,5 0,5 2,5 L 5 5 C 5.5,5 6,5 6.5,4.75 L 8 4 L 14 4 C 16,4 16,4 16,6
                                                     L 16,11 C 16,13 16,13 14,13
                                                     L 2,13 C 0,13 0,13 0,11 Z">
-                            <GeometryDrawing.Brush>
-                                <LinearGradientBrush StartPoint="1,6" EndPoint="23,19">
-                                    <GradientStop Offset="0" Color="#FFFFE69D"/>
-                                    <GradientStop Offset="1" Color="#FFFFC937"/>
-                                </LinearGradientBrush>
-                            </GeometryDrawing.Brush>
-                        </GeometryDrawing>
-                        <GeometryDrawing Geometry="M 0 9 C 0,5 0,5 2,5 L 5 5 C 5.5,5 6,5 6.5,4.75 L 8 4 L 14 4
+              <GeometryDrawing.Brush>
+                <LinearGradientBrush StartPoint="1,6" EndPoint="23,19">
+                  <GradientStop Offset="0" Color="#FFFFE69D"/>
+                  <GradientStop Offset="1" Color="#FFFFC937"/>
+                </LinearGradientBrush>
+              </GeometryDrawing.Brush>
+            </GeometryDrawing>
+            <GeometryDrawing Geometry="M 0 9 C 0,5 0,5 2,5 L 5 5 C 5.5,5 6,5 6.5,4.75 L 8 4 L 14 4
                                                     L 8 4.25 C 6,5.25 5.5,5.25 5.125,5.25 L 2 5.25 C 0,5.25 0,5.25 0,9.25 z" Brush="#7FFFFFFF"/>
-                    </DrawingGroup>
-                    <DrawingGroup x:Key="Icon_File">
-                        <GeometryDrawing Geometry="M 0 0 L 16 16"/>
-                        <GeometryDrawing Geometry="M 2 0 L 10 0 L 14 4 L 14 16 L 2 16 Z" Brush="#FF797774"/>
-                        <GeometryDrawing Geometry="M 3 1 L 9.7 1 L 13 4.3 L 13 15 L 3 15 Z" Brush="#FFFAFAFA"/>
-                        <GeometryDrawing Geometry="L 9 1 L 9 5 L 14 5 L 14 4 L 10 4 L 10 1 Z" Brush="#FF797774"/>
-                    </DrawingGroup>
-                    <DrawingGroup x:Key="Icon_Volume">
-                        <GeometryDrawing Geometry="M 0 0 L 16 16"/>
-                        <GeometryDrawing Geometry="M 4 5 L 12 5 L 14.5 7.5 C 15,8 15,8 15,9 L 1 9 C 1,8 1,8 1.5 7.5 Z" Brush="#FFE1E3E6"/>
-                        <GeometryDrawing Geometry="M 12 5 L 14.5 7.5 C 15,8 15,8 15,9 L 10 9 L 10 5 Z">
-                            <GeometryDrawing.Brush>
-                                <LinearGradientBrush StartPoint="12,5" EndPoint="11.5,5.5">
-                                    <GradientStop Offset="0" Color="#FFCDCFD1"/>
-                                    <GradientStop Offset="1" Color="#00CDCFD1"/>
-                                </LinearGradientBrush>
-                            </GeometryDrawing.Brush>
-                        </GeometryDrawing>
-                        <GeometryDrawing Geometry="M 4 5 L 1.5 7.5 C 1,8 1,8 1,9 L 4 9 L 6 9 L 6 5 Z">
-                            <GeometryDrawing.Brush>
-                                <LinearGradientBrush StartPoint="4,5" EndPoint="4.5,5.5">
-                                    <GradientStop Offset="0" Color="#FFCDCFD1"/>
-                                    <GradientStop Offset="1" Color="#00CDCFD1"/>
-                                </LinearGradientBrush>
-                            </GeometryDrawing.Brush>
-                        </GeometryDrawing>
-                        <GeometryDrawing Geometry="M 1 9 C 1,8 1,8 2,8 L 14 8
+          </DrawingGroup>
+          <DrawingGroup x:Key="Icon_File">
+            <GeometryDrawing Geometry="M 0 0 L 16 16"/>
+            <GeometryDrawing Geometry="M 2 0 L 10 0 L 14 4 L 14 16 L 2 16 Z" Brush="#FF797774"/>
+            <GeometryDrawing Geometry="M 3 1 L 9.7 1 L 13 4.3 L 13 15 L 3 15 Z" Brush="#FFFAFAFA"/>
+            <GeometryDrawing Geometry="L 9 1 L 9 5 L 14 5 L 14 4 L 10 4 L 10 1 Z" Brush="#FF797774"/>
+          </DrawingGroup>
+          <DrawingGroup x:Key="Icon_Volume">
+            <GeometryDrawing Geometry="M 0 0 L 16 16"/>
+            <GeometryDrawing Geometry="M 4 5 L 12 5 L 14.5 7.5 C 15,8 15,8 15,9 L 1 9 C 1,8 1,8 1.5 7.5 Z" Brush="#FFE1E3E6"/>
+            <GeometryDrawing Geometry="M 12 5 L 14.5 7.5 C 15,8 15,8 15,9 L 10 9 L 10 5 Z">
+              <GeometryDrawing.Brush>
+                <LinearGradientBrush StartPoint="12,5" EndPoint="11.5,5.5">
+                  <GradientStop Offset="0" Color="#FFCDCFD1"/>
+                  <GradientStop Offset="1" Color="#00CDCFD1"/>
+                </LinearGradientBrush>
+              </GeometryDrawing.Brush>
+            </GeometryDrawing>
+            <GeometryDrawing Geometry="M 4 5 L 1.5 7.5 C 1,8 1,8 1,9 L 4 9 L 6 9 L 6 5 Z">
+              <GeometryDrawing.Brush>
+                <LinearGradientBrush StartPoint="4,5" EndPoint="4.5,5.5">
+                  <GradientStop Offset="0" Color="#FFCDCFD1"/>
+                  <GradientStop Offset="1" Color="#00CDCFD1"/>
+                </LinearGradientBrush>
+              </GeometryDrawing.Brush>
+            </GeometryDrawing>
+            <GeometryDrawing Geometry="M 1 9 C 1,8 1,8 2,8 L 14 8
                                                     C 15,8 15,8 15,9 L 15 11
                                                     C 15,12 15,12 14,12 L 2 12
                                                     C 1,12 1,12 1,11 Z">
-                            <GeometryDrawing.Brush>
-                                <LinearGradientBrush StartPoint="0,8" EndPoint="0,12">
-                                    <GradientStop Offset="0" Color="#FF737374"/>
-                                    <GradientStop Offset="1" Color="#FFA8A8A8"/>
-                                </LinearGradientBrush>
-                            </GeometryDrawing.Brush>
-                        </GeometryDrawing>
-                        <GeometryDrawing Geometry="M 2 9 C 2,8 2,8 3,8 L 13 8
+              <GeometryDrawing.Brush>
+                <LinearGradientBrush StartPoint="0,8" EndPoint="0,12">
+                  <GradientStop Offset="0" Color="#FF737374"/>
+                  <GradientStop Offset="1" Color="#FFA8A8A8"/>
+                </LinearGradientBrush>
+              </GeometryDrawing.Brush>
+            </GeometryDrawing>
+            <GeometryDrawing Geometry="M 2 9 C 2,8 2,8 3,8 L 13 8
                                                     C 14,8 14,8 14,9 L 14 10
                                                     C 14,11 14,11 13,11 L 3 11
                                                     C 2,11 2,11 2,10 Z">
-                            <GeometryDrawing.Brush>
-                                <LinearGradientBrush StartPoint="0,8" EndPoint="0,11">
-                                    <GradientStop Offset="0" Color="#FF333333"/>
-                                    <GradientStop Offset="1" Color="#FF5A5A5A"/>
-                                </LinearGradientBrush>
-                            </GeometryDrawing.Brush>
-                        </GeometryDrawing>
-                        <GeometryDrawing>
-                            <GeometryDrawing.Geometry>
-                                <EllipseGeometry Rect="2.5,8.5,2,2"/>
-                            </GeometryDrawing.Geometry>
-                            <GeometryDrawing.Brush>
-                                <RadialGradientBrush GradientOrigin="3.5,9.5" Center="3.5,9.5">
-                                    <GradientStop Offset="0.8" Color="#4001FF01"/>
-                                    <GradientStop Offset="1" Color="#0001FF01"/>
-                                </RadialGradientBrush>
-                            </GeometryDrawing.Brush>
-                        </GeometryDrawing>
-                        <GeometryDrawing>
-                            <GeometryDrawing.Geometry>
-                                <EllipseGeometry Rect="3,9,1,1"/>
-                            </GeometryDrawing.Geometry>
-                            <GeometryDrawing.Brush>
-                                <RadialGradientBrush GradientOrigin="3.5,9.5" Center="3.25,9.75">
-                                    <GradientStop Offset="0" Color="#FFB6FFB6"/>
-                                    <GradientStop Offset="1" Color="#FF01FF01"/>
-                                </RadialGradientBrush>
-                            </GeometryDrawing.Brush>
-                        </GeometryDrawing>
-                        <GeometryDrawing Geometry="M 3.23483495705 9.76516504295 A 0.375,0.375 180 1 0 3.76516504295,9.23483495705 A 0.4375,0.4375 135 0 1 3.23483495705,9.76516504295 Z" Brush="#FF00B300"/>
-                    </DrawingGroup>
-                </dialogs:ResourceSelectorConverter>
-            </ResourceDictionary>
-        </Style.Resources>
-        <Setter Property="Template">
-            <ControlTemplate>
-                <DockPanel>
-                    <ListBox x:Name="QuickLinks" DockPanel.Dock="Left" Items="{Binding QuickLinks}" SelectedIndex="{Binding QuickLinksSelectedIndex}" Focusable="False">
-                        <ListBox.ItemTemplate>
-                            <DataTemplate>
-                                <StackPanel Spacing="4" Orientation="Horizontal" Background="Transparent">
-                                    <DrawingPresenter Width="16" Height="16" Drawing="{Binding IconKey, Converter={StaticResource Icons}}"/>
-                                    <TextBlock Text="{Binding DisplayName}"/>
-                                </StackPanel>
-                            </DataTemplate>
-                        </ListBox.ItemTemplate>
-                    </ListBox>
-                    <DockPanel x:Name="NavBar" DockPanel.Dock="Top" Margin="8,5,8,0" VerticalAlignment="Center">
-                        <Rectangle Fill="{DynamicResource SystemControlHighlightAltBaseMediumLowBrush}" Height="1" Margin="0,5,0,0" DockPanel.Dock="Bottom"/>
-                        <DockPanel Margin="4,0">
-                            <Button Command="{Binding GoUp}" DockPanel.Dock="Left">
-                                <Path Data="M 0 7 L 7 0 L 14 7 M 7 0 L 7 16" Stroke="{CompiledBinding $parent[Button].Foreground}" StrokeThickness="1" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,1,0,-1"/>
-                            </Button>
-                            <TextBox x:Name="Location" Text="{Binding Location}">
-                                <TextBox.KeyBindings>
-                                    <KeyBinding Command="{Binding EnterPressed}" Gesture="Enter"/>
-                                </TextBox.KeyBindings>
-                            </TextBox>
-                        </DockPanel>
-                    </DockPanel>
-                    <DockPanel Margin="8,0,8,5" DockPanel.Dock="Bottom">
-                        <Rectangle Fill="{DynamicResource SystemControlHighlightAltBaseMediumLowBrush}" Height="1" Margin="0,0,0,5" DockPanel.Dock="Top"/>
-                        <DockPanel Margin="4,0">
-                            <DockPanel DockPanel.Dock="Top" Margin="0,0,0,4">
-                                <ComboBox DockPanel.Dock="Right"
-                                    IsVisible="{Binding ShowFilters}" 
-                                    Items="{Binding Filters}"
-                                    SelectedItem="{Binding SelectedFilter}" />
-                                <TextBox Text="{Binding FileName}" Watermark="File name" IsVisible="{Binding !SelectingFolder}" />
-                            </DockPanel>
-                            <CheckBox IsChecked="{Binding ShowHiddenFiles}" Content="Show hidden files" DockPanel.Dock="Left"/>
-                            <UniformGrid x:Name="Finalize" HorizontalAlignment="Right" Rows="1">
-                                <Button Command="{Binding Ok}">OK</Button>
-                                <Button Command="{Binding Cancel}">Cancel</Button>
-                            </UniformGrid>
-                        </DockPanel>
-                    </DockPanel>
+              <GeometryDrawing.Brush>
+                <LinearGradientBrush StartPoint="0,8" EndPoint="0,11">
+                  <GradientStop Offset="0" Color="#FF333333"/>
+                  <GradientStop Offset="1" Color="#FF5A5A5A"/>
+                </LinearGradientBrush>
+              </GeometryDrawing.Brush>
+            </GeometryDrawing>
+            <GeometryDrawing>
+              <GeometryDrawing.Geometry>
+                <EllipseGeometry Rect="2.5,8.5,2,2"/>
+              </GeometryDrawing.Geometry>
+              <GeometryDrawing.Brush>
+                <RadialGradientBrush GradientOrigin="3.5,9.5" Center="3.5,9.5">
+                  <GradientStop Offset="0.8" Color="#4001FF01"/>
+                  <GradientStop Offset="1" Color="#0001FF01"/>
+                </RadialGradientBrush>
+              </GeometryDrawing.Brush>
+            </GeometryDrawing>
+            <GeometryDrawing>
+              <GeometryDrawing.Geometry>
+                <EllipseGeometry Rect="3,9,1,1"/>
+              </GeometryDrawing.Geometry>
+              <GeometryDrawing.Brush>
+                <RadialGradientBrush GradientOrigin="3.5,9.5" Center="3.25,9.75">
+                  <GradientStop Offset="0" Color="#FFB6FFB6"/>
+                  <GradientStop Offset="1" Color="#FF01FF01"/>
+                </RadialGradientBrush>
+              </GeometryDrawing.Brush>
+            </GeometryDrawing>
+            <GeometryDrawing Geometry="M 3.23483495705 9.76516504295 A 0.375,0.375 180 1 0 3.76516504295,9.23483495705 A 0.4375,0.4375 135 0 1 3.23483495705,9.76516504295 Z" Brush="#FF00B300"/>
+          </DrawingGroup>
+        </dialogs:ResourceSelectorConverter>
+      </ResourceDictionary>
+    </Style.Resources>
+    <Setter Property="Template">
+      <ControlTemplate>
+        <DockPanel>
+          <ListBox x:Name="QuickLinks" DockPanel.Dock="Left" Items="{Binding QuickLinks}" SelectedIndex="{Binding QuickLinksSelectedIndex}" Focusable="False">
+            <ListBox.ItemTemplate>
+              <DataTemplate>
+                <StackPanel Spacing="4" Orientation="Horizontal" Background="Transparent">
+                  <DrawingPresenter Width="16" Height="16" Drawing="{Binding IconKey, Converter={StaticResource Icons}}"/>
+                  <TextBlock Text="{Binding DisplayName}"/>
+                </StackPanel>
+              </DataTemplate>
+            </ListBox.ItemTemplate>
+          </ListBox>
+          <DockPanel x:Name="NavBar" DockPanel.Dock="Top" Margin="8,5,8,0" VerticalAlignment="Center">
+            <Rectangle Fill="{DynamicResource SystemControlHighlightAltBaseMediumLowBrush}" Height="1" Margin="0,5,0,0" DockPanel.Dock="Bottom"/>
+            <DockPanel Margin="4,0">
+              <Button Command="{Binding GoUp}" DockPanel.Dock="Left">
+                <Path Data="M 0 7 L 7 0 L 14 7 M 7 0 L 7 16" Stroke="{CompiledBinding $parent[Button].Foreground}" StrokeThickness="1" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,1,0,-1"/>
+              </Button>
+              <TextBox x:Name="Location" Text="{Binding Location}">
+                <TextBox.KeyBindings>
+                  <KeyBinding Command="{Binding EnterPressed}" Gesture="Enter"/>
+                </TextBox.KeyBindings>
+              </TextBox>
+            </DockPanel>
+          </DockPanel>
+          <DockPanel Margin="8,0,8,5" DockPanel.Dock="Bottom">
+            <Rectangle Fill="{DynamicResource SystemControlHighlightAltBaseMediumLowBrush}" Height="1" Margin="0,0,0,5" DockPanel.Dock="Top"/>
+            <DockPanel Margin="4,0">
+              <DockPanel DockPanel.Dock="Top" Margin="0,0,0,4">
+                <ComboBox DockPanel.Dock="Right"
+                    IsVisible="{Binding ShowFilters}"
+                    Items="{Binding Filters}"
+                    SelectedItem="{Binding SelectedFilter}" />
+                <TextBox Text="{Binding FileName}" Watermark="File name" IsVisible="{Binding !SelectingFolder}" />
+              </DockPanel>
+              <CheckBox IsChecked="{Binding ShowHiddenFiles}" Content="Show hidden files" DockPanel.Dock="Left"/>
+              <UniformGrid x:Name="Finalize" HorizontalAlignment="Right" Rows="1">
+                <Button Command="{Binding Ok}">OK</Button>
+                <Button Command="{Binding Cancel}">Cancel</Button>
+              </UniformGrid>
+            </DockPanel>
+          </DockPanel>
 
-                    <DockPanel Grid.IsSharedSizeScope="True">
-                        <Grid DockPanel.Dock="Top" Margin="15 5 0 0" HorizontalAlignment="Stretch">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="20" SharedSizeGroup="Icon" />
-                                <ColumnDefinition Width="16" SharedSizeGroup="Splitter"  />
-                                <ColumnDefinition Width="275" SharedSizeGroup="Name" />
-                                <ColumnDefinition Width="16" SharedSizeGroup="Splitter" />
-                                <ColumnDefinition Width="200" SharedSizeGroup="Modified" />
-                                <ColumnDefinition Width="16" SharedSizeGroup="Splitter" />
-                                <ColumnDefinition Width="150" SharedSizeGroup="Type" />
-                                <ColumnDefinition Width="16" SharedSizeGroup="Splitter" />
-                                <ColumnDefinition Width="200" SharedSizeGroup="Size" />
-                            </Grid.ColumnDefinitions>
-                            <Grid.Styles>
-                                <Style Selector="GridSplitter">
-                                    <Setter Property="Background" Value="{DynamicResource SystemControlHighlightAltBaseMediumLowBrush}"/>
-                                    <Setter Property="Template">
-                                        <ControlTemplate>
-                                            <Border VerticalAlignment="Stretch" BorderThickness="0" Background="#01000000">
-                                                <Rectangle Width="1" VerticalAlignment="Stretch" Fill="{TemplateBinding Background}"/>
-                                            </Border>
-                                        </ControlTemplate>
-                                    </Setter>
-                                </Style>
-                            </Grid.Styles>
-                            <GridSplitter Grid.Column="1" />
-                            <TextBlock Grid.Column="2" Text="Name" />
-                            <GridSplitter Grid.Column="3" />
-                            <TextBlock Grid.Column="4" Text="Date Modified" />
-                            <GridSplitter Grid.Column="5" />
-                            <TextBlock Grid.Column="6" Text="Type" />
-                            <GridSplitter Grid.Column="7" />
-                            <TextBlock Grid.Column="8" Text="Size" />
-                        </Grid>
-                        <ListBox x:Name="Files"
-                            VirtualizationMode="Simple"
-                            Items="{Binding Items}"
-                            Margin="0 5"
-                            SelectionMode="{Binding SelectionMode}"
-                            SelectedItems="{Binding SelectedItems}"
-                            Background="Transparent"
-                            ScrollViewer.HorizontalScrollBarVisibility="Disabled">
-                            <ListBox.ItemTemplate>
-                                <DataTemplate>
-                                    <Grid Background="Transparent">
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition SharedSizeGroup="Icon" />
-                                            <ColumnDefinition SharedSizeGroup="Splitter"  />
-                                            <ColumnDefinition SharedSizeGroup="Name" />
-                                            <ColumnDefinition SharedSizeGroup="Splitter" />
-                                            <ColumnDefinition SharedSizeGroup="Modified" />
-                                            <ColumnDefinition SharedSizeGroup="Splitter" />
-                                            <ColumnDefinition SharedSizeGroup="Type" />
-                                            <ColumnDefinition SharedSizeGroup="Splitter" />
-                                            <ColumnDefinition SharedSizeGroup="Size" />
-                                        </Grid.ColumnDefinitions>
-                                        <DrawingPresenter Width="16" Height="16" Drawing="{Binding IconKey, Converter={StaticResource Icons}}"/>
-                                        <TextBlock Grid.Column="2" Text="{Binding DisplayName}"/>
-                                        <TextBlock Grid.Column="4" Text="{Binding Modified}" />
-                                        <TextBlock Grid.Column="6" Text="{Binding Type}" />
-                                        <TextBlock Grid.Column="8">
-                                            <TextBlock.Text>
-                                                <Binding Path="Size">
-                                                    <Binding.Converter>
-                                                        <dialogs:FileSizeStringConverter/>
-                                                    </Binding.Converter>
-                                                </Binding>
-                                            </TextBlock.Text>
-                                        </TextBlock>
-                                    </Grid>
-                                </DataTemplate>
-                            </ListBox.ItemTemplate>
-                        </ListBox>
-                    </DockPanel>
-                </DockPanel>
-            </ControlTemplate>
-        </Setter>
-    </Style>
+          <DockPanel Grid.IsSharedSizeScope="True">
+            <Grid DockPanel.Dock="Top" Margin="15 5 0 0" HorizontalAlignment="Stretch">
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="20" SharedSizeGroup="Icon" />
+                <ColumnDefinition Width="16" SharedSizeGroup="Splitter"  />
+                <ColumnDefinition Width="275" SharedSizeGroup="Name" />
+                <ColumnDefinition Width="16" SharedSizeGroup="Splitter" />
+                <ColumnDefinition Width="200" SharedSizeGroup="Modified" />
+                <ColumnDefinition Width="16" SharedSizeGroup="Splitter" />
+                <ColumnDefinition Width="150" SharedSizeGroup="Type" />
+                <ColumnDefinition Width="16" SharedSizeGroup="Splitter" />
+                <ColumnDefinition Width="200" SharedSizeGroup="Size" />
+              </Grid.ColumnDefinitions>
+              <Grid.Styles>
+                <Style Selector="GridSplitter">
+                  <Setter Property="Background" Value="{DynamicResource SystemControlHighlightAltBaseMediumLowBrush}"/>
+                  <Setter Property="Template">
+                    <ControlTemplate>
+                      <Border VerticalAlignment="Stretch" BorderThickness="0" Background="#01000000">
+                        <Rectangle Width="1" VerticalAlignment="Stretch" Fill="{TemplateBinding Background}"/>
+                      </Border>
+                    </ControlTemplate>
+                  </Setter>
+                </Style>
+              </Grid.Styles>
+              <GridSplitter Grid.Column="1" />
+              <TextBlock Grid.Column="2" Text="Name" />
+              <GridSplitter Grid.Column="3" />
+              <TextBlock Grid.Column="4" Text="Date Modified" />
+              <GridSplitter Grid.Column="5" />
+              <TextBlock Grid.Column="6" Text="Type" />
+              <GridSplitter Grid.Column="7" />
+              <TextBlock Grid.Column="8" Text="Size" />
+            </Grid>
+            <ListBox x:Name="Files"
+                VirtualizationMode="Simple"
+                Items="{Binding Items}"
+                Margin="0 5"
+                SelectionMode="{Binding SelectionMode}"
+                SelectedItems="{Binding SelectedItems}"
+                Background="Transparent"
+                ScrollViewer.HorizontalScrollBarVisibility="Disabled">
+              <ListBox.ItemTemplate>
+                <DataTemplate>
+                  <Grid Background="Transparent">
+                    <Grid.ColumnDefinitions>
+                      <ColumnDefinition SharedSizeGroup="Icon" />
+                      <ColumnDefinition SharedSizeGroup="Splitter"  />
+                      <ColumnDefinition SharedSizeGroup="Name" />
+                      <ColumnDefinition SharedSizeGroup="Splitter" />
+                      <ColumnDefinition SharedSizeGroup="Modified" />
+                      <ColumnDefinition SharedSizeGroup="Splitter" />
+                      <ColumnDefinition SharedSizeGroup="Type" />
+                      <ColumnDefinition SharedSizeGroup="Splitter" />
+                      <ColumnDefinition SharedSizeGroup="Size" />
+                    </Grid.ColumnDefinitions>
+                    <DrawingPresenter Width="16" Height="16" Drawing="{Binding IconKey, Converter={StaticResource Icons}}"/>
+                    <TextBlock Grid.Column="2" Text="{Binding DisplayName}"/>
+                    <TextBlock Grid.Column="4" Text="{Binding Modified}" />
+                    <TextBlock Grid.Column="6" Text="{Binding Type}" />
+                    <TextBlock Grid.Column="8">
+                      <TextBlock.Text>
+                        <Binding Path="Size">
+                          <Binding.Converter>
+                            <dialogs:FileSizeStringConverter/>
+                          </Binding.Converter>
+                        </Binding>
+                      </TextBlock.Text>
+                    </TextBlock>
+                  </Grid>
+                </DataTemplate>
+              </ListBox.ItemTemplate>
+            </ListBox>
+          </DockPanel>
+        </DockPanel>
+      </ControlTemplate>
+    </Setter>
+  </Style>
 
 
-    <Style Selector="dialogs|ManagedFileChooser /template/ ListBox#QuickLinks">
-        <Setter Property="Margin" Value="0"/>
-        <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundChromeMediumBrush}"/>
-        <Setter Property="BorderThickness" Value="0"/>
-        <Setter Property="Width" Value="240"/>
-        <Setter Property="Padding" Value="0,20"/>
-        <Setter Property="Template">
-            <ControlTemplate>
-                <Border Name="border" BoxShadow="inset -6 0 3 -3 #20000000" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
-                    <ScrollViewer Name="PART_ScrollViewer" HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}" VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
-                        <ItemsPresenter Name="PART_ItemsPresenter"
-                                        Items="{TemplateBinding Items}"
-                                        ItemsPanel="{TemplateBinding ItemsPanel}"
-                                        ItemTemplate="{TemplateBinding ItemTemplate}"
-                                        Margin="{TemplateBinding Padding}"
-                                        VirtualizationMode="{TemplateBinding VirtualizationMode}"/>
-                    </ScrollViewer>
-                </Border>
-            </ControlTemplate>
-        </Setter>
-    </Style>
-    <Style Selector="dialogs|ManagedFileChooser /template/ ListBox#QuickLinks ListBoxItem">
-        <Setter Property="Height" Value="32"/>
-        <Setter Property="Padding" Value="30,6"/>
-        <Setter Property="Template">
-            <ControlTemplate>
-                <Border x:Name="LayoutRoot" CornerRadius="2" Margin="10,0">
-                    <Panel>
-                        <Border x:Name="SelectedLine" HorizontalAlignment="Left" Margin="2,6" CornerRadius="0.5" Width="3" Background="{DynamicResource SystemControlHighlightAccentBrush}" IsVisible="{TemplateBinding IsSelected}"/>
-                        <ContentPresenter Name="PART_ContentPresenter"
-                                    Background="Transparent"
-                                    BorderBrush="Transparent"
-                                    BorderThickness="0"
-                                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                                    Content="{TemplateBinding Content}"
-                                    Padding="{TemplateBinding Padding}"
-                                    VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                    HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"/>
+  <Style Selector="dialogs|ManagedFileChooser /template/ ListBox#QuickLinks">
+    <Setter Property="Margin" Value="0"/>
+    <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundChromeMediumBrush}"/>
+    <Setter Property="BorderThickness" Value="0"/>
+    <Setter Property="Width" Value="240"/>
+    <Setter Property="Padding" Value="0,20"/>
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Name="border" BoxShadow="inset -6 0 3 -3 #20000000" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+          <ScrollViewer Name="PART_ScrollViewer" HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}" VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
+            <ItemsPresenter Name="PART_ItemsPresenter"
+                            Items="{TemplateBinding Items}"
+                            ItemsPanel="{TemplateBinding ItemsPanel}"
+                            ItemTemplate="{TemplateBinding ItemTemplate}"
+                            Margin="{TemplateBinding Padding}"
+                            VirtualizationMode="{TemplateBinding VirtualizationMode}"/>
+          </ScrollViewer>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+  <Style Selector="dialogs|ManagedFileChooser /template/ ListBox#QuickLinks ListBoxItem">
+    <Setter Property="Height" Value="32"/>
+    <Setter Property="Padding" Value="30,6"/>
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border x:Name="LayoutRoot" CornerRadius="2" Margin="10,0">
+          <Panel>
+            <Border x:Name="SelectedLine" HorizontalAlignment="Left" Margin="2,6" CornerRadius="0.5" Width="3" Background="{DynamicResource SystemControlHighlightAccentBrush}" IsVisible="{TemplateBinding IsSelected}"/>
+            <ContentPresenter Name="PART_ContentPresenter"
+                        Background="Transparent"
+                        BorderBrush="Transparent"
+                        BorderThickness="0"
+                        ContentTemplate="{TemplateBinding ContentTemplate}"
+                        Content="{TemplateBinding Content}"
+                        Padding="{TemplateBinding Padding}"
+                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"/>
 
-                    </Panel>
-                </Border>
-            </ControlTemplate>
-        </Setter>
-    </Style>
-    <Style Selector="dialogs|ManagedFileChooser /template/ ListBox#QuickLinks ListBoxItem:pointerover /template/ Border#LayoutRoot">
-        <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundAltMediumBrush}"/>
-    </Style>
-    <Style Selector="dialogs|ManagedFileChooser /template/ ListBox#QuickLinks ListBoxItem:selected /template/ Border#LayoutRoot">
-        <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundAltMediumHighBrush}"/>
-    </Style>
-    <Style Selector="dialogs|ManagedFileChooser /template/ DockPanel#NavBar Button,
+          </Panel>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+  <Style Selector="dialogs|ManagedFileChooser /template/ ListBox#QuickLinks ListBoxItem:pointerover /template/ Border#LayoutRoot">
+    <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundAltMediumBrush}"/>
+  </Style>
+  <Style Selector="dialogs|ManagedFileChooser /template/ ListBox#QuickLinks ListBoxItem:selected /template/ Border#LayoutRoot">
+    <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundAltMediumHighBrush}"/>
+  </Style>
+  <Style Selector="dialogs|ManagedFileChooser /template/ DockPanel#NavBar Button,
                     dialogs|ManagedFileChooser /template/ DockPanel#NavBar TextBox">
-        <Setter Property="Height" Value="30"/>
-    </Style>
-    <Style Selector="dialogs|ManagedFileChooser /template/ DockPanel#NavBar Button">
-        <Setter Property="VerticalAlignment" Value="Stretch"/>
-        <Setter Property="Width" Value="40"/>
-        <Setter Property="Margin" Value="0,0,8,0"/>
-        <Setter Property="BorderThickness" Value="0"/>
-    </Style>
-    <Style Selector="dialogs|ManagedFileChooser /template/ DockPanel#NavBar Button:not(:pointerover):not(:pressed)">
-        <Setter Property="Background" Value="Transparent"/>
-    </Style>
+    <Setter Property="Height" Value="30"/>
+  </Style>
+  <Style Selector="dialogs|ManagedFileChooser /template/ DockPanel#NavBar Button">
+    <Setter Property="VerticalAlignment" Value="Stretch"/>
+    <Setter Property="Width" Value="40"/>
+    <Setter Property="Margin" Value="0,0,8,0"/>
+    <Setter Property="BorderThickness" Value="0"/>
+  </Style>
+  <Style Selector="dialogs|ManagedFileChooser /template/ DockPanel#NavBar Button:not(:pointerover):not(:pressed)">
+    <Setter Property="Background" Value="Transparent"/>
+  </Style>
 
-    <Style Selector="dialogs|ManagedFileChooser /template/ UniformGrid#Finalize > Button">
-            <Setter Property="HorizontalContentAlignment" Value="Center"/>
-            <Setter Property="HorizontalAlignment" Value="Stretch"/>
-            <Setter Property="Margin" Value="4,0,0,0"/>
-    </Style>
-    <Style Selector="dialogs|ManagedFileChooser /template/ UniformGrid#Finalize > Button /template/ ContentPresenter#PART_ContentPresenter">
-            <Setter Property="HorizontalAlignment" Value="Stretch"/>
-    </Style>
+  <Style Selector="dialogs|ManagedFileChooser /template/ UniformGrid#Finalize > Button">
+    <Setter Property="HorizontalContentAlignment" Value="Center"/>
+    <Setter Property="HorizontalAlignment" Value="Stretch"/>
+    <Setter Property="Margin" Value="4,0,0,0"/>
+  </Style>
+  <Style Selector="dialogs|ManagedFileChooser /template/ UniformGrid#Finalize > Button /template/ ContentPresenter#PART_ContentPresenter">
+    <Setter Property="HorizontalAlignment" Value="Stretch"/>
+  </Style>
 </Styles>
diff --git a/src/Avalonia.Themes.Fluent/Controls/Menu.xaml b/src/Avalonia.Themes.Fluent/Controls/Menu.xaml
index 4eb724a926..d42e413f00 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Menu.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Menu.xaml
@@ -1,36 +1,35 @@
-<Style xmlns="https://github.com/avaloniaui"
-       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-       Selector="Menu">
-  <Design.PreviewWith>
-    <Border Padding="20">
-      <Menu>
-        <MenuItem Header="New" />
-        <MenuItem Header="Open" />
-      </Menu>
-    </Border>
-  </Design.PreviewWith>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Design.PreviewWith>
+      <Border Padding="20">
+        <Menu>
+          <MenuItem Header="New" />
+          <MenuItem Header="Open" />
+        </Menu>
+      </Border>
+    </Design.PreviewWith>
 
-  <Style.Resources>
     <x:Double x:Key="MenuBarHeight">32</x:Double>
-  </Style.Resources>
 
-  <Setter Property="Background" Value="Transparent" />
-  <Setter Property="Height" Value="{DynamicResource MenuBarHeight}" />
-  <Setter Property="Template">
-    <ControlTemplate>
-      <Border Background="{TemplateBinding Background}"
-              BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}"
-              CornerRadius="{TemplateBinding CornerRadius}"
-              HorizontalAlignment="Stretch"
-              Padding="{TemplateBinding Padding}">
-        <ItemsPresenter Name="PART_ItemsPresenter"
-                        Items="{TemplateBinding Items}"
-                        ItemsPanel="{TemplateBinding ItemsPanel}"
-                        ItemTemplate="{TemplateBinding ItemTemplate}"
-                        VerticalAlignment="Stretch"
-                        KeyboardNavigation.TabNavigation="Continue" />
-      </Border>
-    </ControlTemplate>
-  </Setter>
-</Style>
+    <ControlTheme x:Key="{x:Type Menu}" TargetType="Menu">
+      <Setter Property="Background" Value="Transparent" />
+      <Setter Property="Height" Value="{DynamicResource MenuBarHeight}" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}"
+                  HorizontalAlignment="Stretch"
+                  Padding="{TemplateBinding Padding}">
+            <ItemsPresenter Name="PART_ItemsPresenter"
+                            Items="{TemplateBinding Items}"
+                            ItemsPanel="{TemplateBinding ItemsPanel}"
+                            ItemTemplate="{TemplateBinding ItemTemplate}"
+                            VerticalAlignment="Stretch"
+                            KeyboardNavigation.TabNavigation="Continue" />
+          </Border>
+        </ControlTemplate>
+      </Setter>
+    </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/MenuFlyoutPresenter.xaml b/src/Avalonia.Themes.Fluent/Controls/MenuFlyoutPresenter.xaml
index ff50acab5e..7769f0a5c9 100644
--- a/src/Avalonia.Themes.Fluent/Controls/MenuFlyoutPresenter.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/MenuFlyoutPresenter.xaml
@@ -1,35 +1,34 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  
-  <Style Selector="MenuFlyoutPresenter">
-    <Setter Property="Background" Value="{DynamicResource MenuFlyoutPresenterBackground}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource MenuFlyoutPresenterBorderBrush}" />
-    <Setter Property="BorderThickness" Value="{DynamicResource MenuFlyoutPresenterBorderThemeThickness}" />
-    <Setter Property="Padding" Value="{DynamicResource MenuFlyoutPresenterThemePadding}" />
-    <Setter Property="MaxWidth" Value="{DynamicResource FlyoutThemeMaxWidth}" />
-    <Setter Property="MinHeight" Value="{DynamicResource MenuFlyoutThemeMinHeight}" />
-    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
-    <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-    <Setter Property="CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Name="LayoutRoot"
-                Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                Padding="{DynamicResource FlyoutBorderThemePadding}"
-                CornerRadius="{TemplateBinding CornerRadius}">
-          <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
-                        VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
-            <ItemsPresenter Name="PART_ItemsPresenter"
-                            Items="{TemplateBinding Items}"
-                            ItemsPanel="{TemplateBinding ItemsPanel}"
-                            ItemTemplate="{TemplateBinding ItemTemplate}"
-                            Margin="{DynamicResource MenuFlyoutScrollerMargin}"
-                            KeyboardNavigation.TabNavigation="Continue"
-                            Grid.IsSharedSizeScope="True" />
-          </ScrollViewer>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-</Styles>
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ControlTheme x:Key="{x:Type MenuFlyoutPresenter}" TargetType="MenuFlyoutPresenter">
+      <Setter Property="Background" Value="{DynamicResource MenuFlyoutPresenterBackground}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource MenuFlyoutPresenterBorderBrush}" />
+      <Setter Property="BorderThickness" Value="{DynamicResource MenuFlyoutPresenterBorderThemeThickness}" />
+      <Setter Property="Padding" Value="{DynamicResource MenuFlyoutPresenterThemePadding}" />
+      <Setter Property="MaxWidth" Value="{DynamicResource FlyoutThemeMaxWidth}" />
+      <Setter Property="MinHeight" Value="{DynamicResource MenuFlyoutThemeMinHeight}" />
+      <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+      <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+      <Setter Property="CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border Name="LayoutRoot"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  Padding="{DynamicResource FlyoutBorderThemePadding}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                          VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
+              <ItemsPresenter Name="PART_ItemsPresenter"
+                              Items="{TemplateBinding Items}"
+                              ItemsPanel="{TemplateBinding ItemsPanel}"
+                              ItemTemplate="{TemplateBinding ItemTemplate}"
+                              Margin="{DynamicResource MenuFlyoutScrollerMargin}"
+                              KeyboardNavigation.TabNavigation="Continue"
+                              Grid.IsSharedSizeScope="True" />
+            </ScrollViewer>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+    </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml b/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
index 33cf6bfdde..b7a9435749 100644
--- a/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
@@ -1,4 +1,4 @@
-<Styles xmlns="https://github.com/avaloniaui"
+<Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:conv="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls"
         xmlns:sys="clr-namespace:System;assembly=netstandard"
@@ -45,7 +45,7 @@
 
   <Styles.Resources>
     <conv:PlatformKeyGestureConverter x:Key="KeyGestureConverter" />
-    <x:Double x:Key="MenuFlyoutSubItemPopupHorizontalOffset">-4</x:Double>    
+    <x:Double x:Key="MenuFlyoutSubItemPopupHorizontalOffset">-4</x:Double>
     <Thickness x:Key="MenuIconPresenterMargin">0,0,12,0</Thickness>
     <Thickness x:Key="MenuInputGestureTextMargin">24,0,0,0</Thickness>
     <StreamGeometry x:Key="MenuItemChevronPathData">M 1,0 10,10 l -9,10 -1,-1 L 8,10 -0,1 Z</StreamGeometry>
diff --git a/src/Avalonia.Themes.Fluent/Controls/NativeMenuBar.xaml b/src/Avalonia.Themes.Fluent/Controls/NativeMenuBar.xaml
index d40ba0cc1d..753c03992a 100644
--- a/src/Avalonia.Themes.Fluent/Controls/NativeMenuBar.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/NativeMenuBar.xaml
@@ -1,30 +1,29 @@
-<Style xmlns="https://github.com/avaloniaui"
-       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-       xmlns:local="clr-namespace:Avalonia.Themes.Fluent"
-       x:CompileBindings="True"
-       Selector="NativeMenuBar">
-  <Style.Resources>
-    <local:InverseBooleanValueConverter x:Key="AvaloniaThemesFluentNativeMenuBarInverseBooleanValueConverter" Default="True"/>
-    <local:IBitmapToImageConverter x:Key="AvaloniaThemesFluentNativeMenuBarIBitmapToImageConverter"/>
-  </Style.Resources>
-  <Setter Property="Template">
-    <ControlTemplate>
-      <Menu
-        IsVisible="{Binding $parent[TopLevel].(NativeMenu.IsNativeMenuExported), Converter={StaticResource AvaloniaThemesFluentNativeMenuBarInverseBooleanValueConverter}}"
-        Items="{Binding $parent[TopLevel].(NativeMenu.Menu).Items}">
-        <Menu.Styles>
-          <Style x:CompileBindings="False" Selector="MenuItem">
-            <Setter Property="Header" Value="{Binding Header}"/>
-            <Setter Property="InputGesture" Value="{Binding Gesture}"/>
-            <Setter Property="Items" Value="{Binding Menu.Items}"/>
-            <Setter Property="Command" Value="{Binding Command}"/>
-            <Setter Property="CommandParameter" Value="{Binding CommandParameter}"/>
-            <Setter Property="(NativeMenuBar.EnableMenuItemClickForwarding)" Value="True"/>
-            <!--NativeMenuItem is IBitmap and MenuItem is Image-->
-            <Setter Property="Icon" Value="{Binding Icon , Converter={StaticResource AvaloniaThemesFluentNativeMenuBarIBitmapToImageConverter}}"/>
-          </Style>
-        </Menu.Styles>
-      </Menu>
-    </ControlTemplate>
-  </Setter>
-</Style>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Avalonia.Themes.Fluent"
+                    x:CompileBindings="True">
+  <local:InverseBooleanValueConverter x:Key="AvaloniaThemesFluentNativeMenuBarInverseBooleanValueConverter" Default="True"/>
+  <local:IBitmapToImageConverter x:Key="AvaloniaThemesFluentNativeMenuBarIBitmapToImageConverter"/>
+  <ControlTheme x:Key="{x:Type NativeMenuBar}" TargetType="NativeMenuBar">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Menu
+          IsVisible="{Binding $parent[TopLevel].(NativeMenu.IsNativeMenuExported), Converter={StaticResource AvaloniaThemesFluentNativeMenuBarInverseBooleanValueConverter}}"
+          Items="{Binding $parent[TopLevel].(NativeMenu.Menu).Items}">
+          <Menu.Styles>
+            <Style x:CompileBindings="False" Selector="MenuItem">
+              <Setter Property="Header" Value="{Binding Header}"/>
+              <Setter Property="InputGesture" Value="{Binding Gesture}"/>
+              <Setter Property="Items" Value="{Binding Menu.Items}"/>
+              <Setter Property="Command" Value="{Binding Command}"/>
+              <Setter Property="CommandParameter" Value="{Binding CommandParameter}"/>
+              <Setter Property="(NativeMenuBar.EnableMenuItemClickForwarding)" Value="True"/>
+              <!--NativeMenuItem is IBitmap and MenuItem is Image-->
+              <Setter Property="Icon" Value="{Binding Icon , Converter={StaticResource AvaloniaThemesFluentNativeMenuBarIBitmapToImageConverter}}"/>
+            </Style>
+          </Menu.Styles>
+        </Menu>
+      </ControlTemplate>
+    </Setter>
+   </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/NotificationCard.xaml b/src/Avalonia.Themes.Fluent/Controls/NotificationCard.xaml
index 924d977eb5..e55fcb90e8 100644
--- a/src/Avalonia.Themes.Fluent/Controls/NotificationCard.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/NotificationCard.xaml
@@ -1,11 +1,11 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Design.PreviewWith>
     <Border Padding="0" Background="White">
       <NotificationCard Content="Testing" />
     </Border>
   </Design.PreviewWith>
-  <Style Selector="NotificationCard">
+  <ControlTheme x:Key="{x:Type NotificationCard}" TargetType="NotificationCard">
     <Setter Property="UseLayoutRounding" Value="True"/>
     <Setter Property="Width" Value="350"/>
     <Setter Property="FontSize" Value="14"/>
@@ -24,8 +24,8 @@
                     CornerRadius="{TemplateBinding CornerRadius}"
                     ClipToBounds="True">
               <DockPanel>
-                <Panel x:Name="PART_HeaderBar" Height="4" DockPanel.Dock="Top" />
-                <ContentControl Name="PART_Content" Content="{TemplateBinding Content}" />
+                <Panel x:Name="PART_HeaderBar" Height="4" Background="{DynamicResource NotificationCardProgressBackgroundBrush}" DockPanel.Dock="Top" />
+                <ContentControl Name="PART_Content" MinHeight="64" Content="{TemplateBinding Content}" />
               </DockPanel>
             </Border>
           </Border>
@@ -33,7 +33,7 @@
       </ControlTemplate>
     </Setter>
 
-    <Style.Animations>
+    <ControlTheme.Animations>
       <Animation Duration="0:0:0.45" Easing="QuadraticEaseIn" FillMode="Forward">
         <KeyFrame Cue="0%">
           <Setter Property="Opacity" Value="0"/>
@@ -51,14 +51,9 @@
           <Setter Property="ScaleTransform.ScaleY" Value="1"/>
         </KeyFrame>
       </Animation>
-    </Style.Animations>
-  </Style>
+    </ControlTheme.Animations>
 
-  <Style Selector="NotificationCard/template/ ContentControl#PART_Content">
-    <Setter Property="MinHeight" Value="64" />
-  </Style>
-
-  <Style Selector="NotificationCard[IsClosing=true] /template/ LayoutTransformControl#PART_LayoutTransformControl">
+  <Style Selector="^[IsClosing=true] /template/ LayoutTransformControl#PART_LayoutTransformControl">
     <Setter Property="RenderTransformOrigin" Value="50%,0%"/>
     <Style.Animations>
       <Animation Duration="0:0:0.75" Easing="QuadraticEaseOut" FillMode="Forward">
@@ -78,7 +73,7 @@
     </Style.Animations>
   </Style>
 
-  <Style Selector="NotificationCard[IsClosing=true]">
+  <Style Selector="^[IsClosing=true]">
     <Style.Animations>
       <Animation Duration="0:0:1.25" Easing="QuadraticEaseOut" FillMode="Forward">
         <KeyFrame Cue="100%">
@@ -88,19 +83,17 @@
     </Style.Animations>
   </Style>
 
-  <Style Selector="NotificationCard /template/ Panel#PART_HeaderBar">
-    <Setter Property="Background" Value="{DynamicResource NotificationCardProgressBackgroundBrush}"/>
-  </Style>
-  <Style Selector="NotificationCard:information /template/ Panel#PART_HeaderBar">
+  <Style Selector="^:information /template/ Panel#PART_HeaderBar">
     <Setter Property="Background" Value="{DynamicResource NotificationCardInformationBackgroundBrush}"/>
   </Style>
-  <Style Selector="NotificationCard:success /template/ Panel#PART_HeaderBar">
+  <Style Selector="^:success /template/ Panel#PART_HeaderBar">
     <Setter Property="Background" Value="{DynamicResource NotificationCardSuccessBackgroundBrush}"/>
   </Style>
-  <Style Selector="NotificationCard:warning /template/ Panel#PART_HeaderBar">
+  <Style Selector="^:warning /template/ Panel#PART_HeaderBar">
     <Setter Property="Background" Value="{DynamicResource NotificationCardWarningBackgroundBrush}"/>
   </Style>
-  <Style Selector="NotificationCard:error /template/ Panel#PART_HeaderBar">
+  <Style Selector="^:error /template/ Panel#PART_HeaderBar">
     <Setter Property="Background" Value="{DynamicResource NotificationCardErrorBackgroundBrush}"/>
   </Style>
-</Styles>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml b/src/Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml
index 36ab07e3e3..74ffff0f5c 100644
--- a/src/Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml
@@ -1,68 +1,67 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Design.PreviewWith>
-    <Border Padding="20">
-      <StackPanel Spacing="20">
-        <NumericUpDown Minimum="0"
-                       Maximum="10"
-                       Increment="0.5"
-                       Width="150"
-                       Watermark="Enter text" />
-        <NumericUpDown Minimum="0"
-                       Maximum="10"
-                       Increment="0.5"
-                       Width="150"
-                       VerticalContentAlignment="Center"
-                       HorizontalContentAlignment="Center"
-                       ButtonSpinnerLocation="Left"
-                       Watermark="Enter text" />
-      </StackPanel>
-    </Border>
-  </Design.PreviewWith>
-
-  <Style Selector="NumericUpDown">
-    <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}" />
-    <Setter Property="Background" Value="{DynamicResource TextControlBackground}" />
-    <Setter Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThickness}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrush}" />
-    <Setter Property="MinHeight" Value="{DynamicResource TextControlThemeMinHeight}" />
-    <Setter Property="MinWidth" Value="{DynamicResource TextControlThemeMinWidth}" />    
-    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-    <Setter Property="Padding" Value="{DynamicResource TextControlThemePadding}" />
-    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <ButtonSpinner Name="PART_Spinner"
-                       Background="{TemplateBinding Background}"
-                       BorderThickness="{TemplateBinding BorderThickness}"
-                       BorderBrush="{TemplateBinding BorderBrush}"
-                       CornerRadius="{TemplateBinding CornerRadius}"
-                       Padding="0"
-                       MinWidth="0"
-                       HorizontalContentAlignment="Stretch"
-                       VerticalContentAlignment="Stretch"
-                       AllowSpin="{TemplateBinding AllowSpin}"
-                       ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}"
-                       DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
-                       ButtonSpinnerLocation="{TemplateBinding ButtonSpinnerLocation}">
-          <TextBox Name="PART_TextBox"
-                   Background="Transparent"
-                   BorderBrush="Transparent"
-                   Margin="-1"
-                   Padding="{TemplateBinding Padding}"
-                   MinWidth="0"
-                   Foreground="{TemplateBinding Foreground}"
-                   FontSize="{TemplateBinding FontSize}"
-                   Watermark="{TemplateBinding Watermark}"
-                   IsReadOnly="{TemplateBinding IsReadOnly}"
-                   VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                   Text="{TemplateBinding Text}"
-                   AcceptsReturn="False"
-                   TextWrapping="NoWrap" />
-        </ButtonSpinner>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-</Styles>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Design.PreviewWith>
+      <Border Padding="20">
+        <StackPanel Spacing="20">
+          <NumericUpDown Minimum="0"
+                         Maximum="10"
+                         Increment="0.5"
+                         Width="150"
+                         Watermark="Enter text" />
+          <NumericUpDown Minimum="0"
+                         Maximum="10"
+                         Increment="0.5"
+                         Width="150"
+                         VerticalContentAlignment="Center"
+                         HorizontalContentAlignment="Center"
+                         ButtonSpinnerLocation="Left"
+                         Watermark="Enter text" />
+        </StackPanel>
+      </Border>
+    </Design.PreviewWith>
+  
+    <ControlTheme x:Key="{x:Type NumericUpDown}" TargetType="NumericUpDown">
+      <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}" />
+      <Setter Property="Background" Value="{DynamicResource TextControlBackground}" />
+      <Setter Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThickness}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrush}" />
+      <Setter Property="MinHeight" Value="{DynamicResource TextControlThemeMinHeight}" />
+      <Setter Property="MinWidth" Value="{DynamicResource TextControlThemeMinWidth}" />
+      <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+      <Setter Property="Padding" Value="{DynamicResource TextControlThemePadding}" />
+      <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <ButtonSpinner Name="PART_Spinner" 
+                         Background="{TemplateBinding Background}" 
+                         BorderThickness="{TemplateBinding BorderThickness}" 
+                         BorderBrush="{TemplateBinding BorderBrush}"
+                         CornerRadius="{TemplateBinding CornerRadius}"
+                         Padding="0"
+                         MinWidth="0"
+                         HorizontalContentAlignment="Stretch"
+                         VerticalContentAlignment="Stretch"
+                         AllowSpin="{TemplateBinding AllowSpin}"
+                         ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}" 
+                         DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
+                         ButtonSpinnerLocation="{TemplateBinding ButtonSpinnerLocation}">
+            <TextBox Name="PART_TextBox" 
+                     Background="Transparent"
+                     BorderBrush="Transparent"
+                     Margin="-1" 
+                     Padding="{TemplateBinding Padding}" 
+                     MinWidth="0" 
+                     Foreground="{TemplateBinding Foreground}"
+                     FontSize="{TemplateBinding FontSize}" 
+                     Watermark="{TemplateBinding Watermark}" 
+                     IsReadOnly="{TemplateBinding IsReadOnly}" 
+                     VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                     HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" 
+                     Text="{TemplateBinding Text}" 
+                     AcceptsReturn="False"
+                     TextWrapping="NoWrap" />
+          </ButtonSpinner>
+        </ControlTemplate>
+      </Setter>
+    </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/OverlayPopupHost.xaml b/src/Avalonia.Themes.Fluent/Controls/OverlayPopupHost.xaml
index 31b43c39cd..0b587e6037 100644
--- a/src/Avalonia.Themes.Fluent/Controls/OverlayPopupHost.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/OverlayPopupHost.xaml
@@ -1,20 +1,23 @@
-<Style xmlns="https://github.com/avaloniaui" Selector="OverlayPopupHost">
-  <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
-  <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
-  <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
-  <Setter Property="FontWeight" Value="400" />
-  <Setter Property="FontStyle" Value="Normal" />
-  <Setter Property="Template">
-    <ControlTemplate>
-      <LayoutTransformControl LayoutTransform="{TemplateBinding Transform}">
-        <VisualLayerManager IsPopup="True">
-          <ContentPresenter Name="PART_ContentPresenter"
-                            Background="{TemplateBinding Background}"
-                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                            Content="{TemplateBinding Content}"
-                            Padding="{TemplateBinding Padding}"/>
-        </VisualLayerManager>
-      </LayoutTransformControl>
-    </ControlTemplate>
-  </Setter>
-</Style>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ControlTheme x:Key="{x:Type OverlayPopupHost}" TargetType="OverlayPopupHost">
+      <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
+      <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
+      <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
+      <Setter Property="FontWeight" Value="400" />
+      <Setter Property="FontStyle" Value="Normal" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <LayoutTransformControl LayoutTransform="{TemplateBinding Transform}">
+            <VisualLayerManager IsPopup="True">
+              <ContentPresenter Name="PART_ContentPresenter"
+                                Background="{TemplateBinding Background}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                Content="{TemplateBinding Content}"
+                                Padding="{TemplateBinding Padding}"/>
+            </VisualLayerManager>
+          </LayoutTransformControl>
+        </ControlTemplate>
+      </Setter>
+    </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/PathIcon.xaml b/src/Avalonia.Themes.Fluent/Controls/PathIcon.xaml
index d4952b3571..966c6c2632 100644
--- a/src/Avalonia.Themes.Fluent/Controls/PathIcon.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/PathIcon.xaml
@@ -1,29 +1,26 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Design.PreviewWith>
-    <StackPanel>
-      <StackPanel.Resources>
-        <StreamGeometry x:Key="settings_regular">M14 9.50006C11.5147 9.50006 9.5 11.5148 9.5 14.0001C9.5 16.4853 11.5147 18.5001 14 18.5001C15.3488 18.5001 16.559 17.9066 17.3838 16.9666C18.0787 16.1746 18.5 15.1365 18.5 14.0001C18.5 13.5401 18.431 13.0963 18.3028 12.6784C17.7382 10.8381 16.0253 9.50006 14 9.50006ZM11 14.0001C11 12.3432 12.3431 11.0001 14 11.0001C15.6569 11.0001 17 12.3432 17 14.0001C17 15.6569 15.6569 17.0001 14 17.0001C12.3431 17.0001 11 15.6569 11 14.0001Z  M21.7093 22.3948L19.9818 21.6364C19.4876 21.4197 18.9071 21.4515 18.44 21.7219C17.9729 21.9924 17.675 22.4693 17.6157 23.0066L17.408 24.8855C17.3651 25.273 17.084 25.5917 16.7055 25.682C14.9263 26.1061 13.0725 26.1061 11.2933 25.682C10.9148 25.5917 10.6336 25.273 10.5908 24.8855L10.3834 23.0093C10.3225 22.4731 10.0112 21.9976 9.54452 21.7281C9.07783 21.4586 8.51117 21.4269 8.01859 21.6424L6.29071 22.4009C5.93281 22.558 5.51493 22.4718 5.24806 22.1859C4.00474 20.8536 3.07924 19.2561 2.54122 17.5137C2.42533 17.1384 2.55922 16.7307 2.8749 16.4977L4.40219 15.3703C4.83721 15.0501 5.09414 14.5415 5.09414 14.0007C5.09414 13.4598 4.83721 12.9512 4.40162 12.6306L2.87529 11.5051C2.55914 11.272 2.42513 10.8638 2.54142 10.4882C3.08038 8.74734 4.00637 7.15163 5.24971 5.82114C5.51684 5.53528 5.93492 5.44941 6.29276 5.60691L8.01296 6.36404C8.50793 6.58168 9.07696 6.54881 9.54617 6.27415C10.0133 6.00264 10.3244 5.52527 10.3844 4.98794L10.5933 3.11017C10.637 2.71803 10.9245 2.39704 11.3089 2.31138C12.19 2.11504 13.0891 2.01071 14.0131 2.00006C14.9147 2.01047 15.8128 2.11485 16.6928 2.31149C17.077 2.39734 17.3643 2.71823 17.4079 3.11017L17.617 4.98937C17.7116 5.85221 18.4387 6.50572 19.3055 6.50663C19.5385 6.507 19.769 6.45838 19.9843 6.36294L21.7048 5.60568C22.0626 5.44818 22.4807 5.53405 22.7478 5.81991C23.9912 7.1504 24.9172 8.74611 25.4561 10.487C25.5723 10.8623 25.4386 11.2703 25.1228 11.5035L23.5978 12.6297C23.1628 12.95 22.9 13.4586 22.9 13.9994C22.9 14.5403 23.1628 15.0489 23.5988 15.3698L25.1251 16.4965C25.441 16.7296 25.5748 17.1376 25.4586 17.5131C24.9198 19.2536 23.9944 20.8492 22.7517 22.1799C22.4849 22.4657 22.0671 22.5518 21.7093 22.3948ZM16.263 22.1966C16.4982 21.4685 16.9889 20.8288 17.6884 20.4238C18.5702 19.9132 19.6536 19.8547 20.5841 20.2627L21.9281 20.8526C22.791 19.8538 23.4593 18.7013 23.8981 17.4552L22.7095 16.5778L22.7086 16.5771C21.898 15.98 21.4 15.0277 21.4 13.9994C21.4 12.9719 21.8974 12.0195 22.7073 11.4227L22.7085 11.4218L23.8957 10.545C23.4567 9.2988 22.7881 8.14636 21.9248 7.1477L20.5922 7.73425L20.5899 7.73527C20.1844 7.91463 19.7472 8.00722 19.3039 8.00663C17.6715 8.00453 16.3046 6.77431 16.1261 5.15465L16.1259 5.15291L15.9635 3.69304C15.3202 3.57328 14.6677 3.50872 14.013 3.50017C13.3389 3.50891 12.6821 3.57367 12.0377 3.69328L11.8751 5.15452C11.7625 6.16272 11.1793 7.05909 10.3019 7.56986C9.41937 8.0856 8.34453 8.14844 7.40869 7.73694L6.07273 7.14893C5.20949 8.14751 4.54092 9.29983 4.10196 10.5459L5.29181 11.4233C6.11115 12.0269 6.59414 12.9837 6.59414 14.0007C6.59414 15.0173 6.11142 15.9742 5.29237 16.5776L4.10161 17.4566C4.54002 18.7044 5.2085 19.8585 6.07205 20.8587L7.41742 20.2682C8.34745 19.8613 9.41573 19.9215 10.2947 20.4292C11.174 20.937 11.7593 21.832 11.8738 22.84L11.8744 22.8445L12.0362 24.3088C13.3326 24.5638 14.6662 24.5638 15.9626 24.3088L16.1247 22.8418C16.1491 22.6217 16.1955 22.4055 16.263 22.1966Z</StreamGeometry>
-      </StackPanel.Resources>
-      <PathIcon Data="{StaticResource settings_regular}" />
-    </StackPanel>
-  </Design.PreviewWith>
-  <Style Selector="PathIcon">
-    <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}" />
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="Height" Value="{DynamicResource IconElementThemeHeight}" />
-    <Setter Property="Width" Value="{DynamicResource IconElementThemeWidth}" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Background="{TemplateBinding Background}">
-          <Viewbox Height="{TemplateBinding Height}"
-                   Width="{TemplateBinding Width}">
-            <Path Fill="{TemplateBinding Foreground}"
-                  Data="{TemplateBinding Data}"
-                  Stretch="Uniform" />
-          </Viewbox>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-</Styles>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Design.PreviewWith>
+      <StackPanel>
+        <StackPanel.Resources>
+          <StreamGeometry x:Key="settings_regular">M14 9.50006C11.5147 9.50006 9.5 11.5148 9.5 14.0001C9.5 16.4853 11.5147 18.5001 14 18.5001C15.3488 18.5001 16.559 17.9066 17.3838 16.9666C18.0787 16.1746 18.5 15.1365 18.5 14.0001C18.5 13.5401 18.431 13.0963 18.3028 12.6784C17.7382 10.8381 16.0253 9.50006 14 9.50006ZM11 14.0001C11 12.3432 12.3431 11.0001 14 11.0001C15.6569 11.0001 17 12.3432 17 14.0001C17 15.6569 15.6569 17.0001 14 17.0001C12.3431 17.0001 11 15.6569 11 14.0001Z  M21.7093 22.3948L19.9818 21.6364C19.4876 21.4197 18.9071 21.4515 18.44 21.7219C17.9729 21.9924 17.675 22.4693 17.6157 23.0066L17.408 24.8855C17.3651 25.273 17.084 25.5917 16.7055 25.682C14.9263 26.1061 13.0725 26.1061 11.2933 25.682C10.9148 25.5917 10.6336 25.273 10.5908 24.8855L10.3834 23.0093C10.3225 22.4731 10.0112 21.9976 9.54452 21.7281C9.07783 21.4586 8.51117 21.4269 8.01859 21.6424L6.29071 22.4009C5.93281 22.558 5.51493 22.4718 5.24806 22.1859C4.00474 20.8536 3.07924 19.2561 2.54122 17.5137C2.42533 17.1384 2.55922 16.7307 2.8749 16.4977L4.40219 15.3703C4.83721 15.0501 5.09414 14.5415 5.09414 14.0007C5.09414 13.4598 4.83721 12.9512 4.40162 12.6306L2.87529 11.5051C2.55914 11.272 2.42513 10.8638 2.54142 10.4882C3.08038 8.74734 4.00637 7.15163 5.24971 5.82114C5.51684 5.53528 5.93492 5.44941 6.29276 5.60691L8.01296 6.36404C8.50793 6.58168 9.07696 6.54881 9.54617 6.27415C10.0133 6.00264 10.3244 5.52527 10.3844 4.98794L10.5933 3.11017C10.637 2.71803 10.9245 2.39704 11.3089 2.31138C12.19 2.11504 13.0891 2.01071 14.0131 2.00006C14.9147 2.01047 15.8128 2.11485 16.6928 2.31149C17.077 2.39734 17.3643 2.71823 17.4079 3.11017L17.617 4.98937C17.7116 5.85221 18.4387 6.50572 19.3055 6.50663C19.5385 6.507 19.769 6.45838 19.9843 6.36294L21.7048 5.60568C22.0626 5.44818 22.4807 5.53405 22.7478 5.81991C23.9912 7.1504 24.9172 8.74611 25.4561 10.487C25.5723 10.8623 25.4386 11.2703 25.1228 11.5035L23.5978 12.6297C23.1628 12.95 22.9 13.4586 22.9 13.9994C22.9 14.5403 23.1628 15.0489 23.5988 15.3698L25.1251 16.4965C25.441 16.7296 25.5748 17.1376 25.4586 17.5131C24.9198 19.2536 23.9944 20.8492 22.7517 22.1799C22.4849 22.4657 22.0671 22.5518 21.7093 22.3948ZM16.263 22.1966C16.4982 21.4685 16.9889 20.8288 17.6884 20.4238C18.5702 19.9132 19.6536 19.8547 20.5841 20.2627L21.9281 20.8526C22.791 19.8538 23.4593 18.7013 23.8981 17.4552L22.7095 16.5778L22.7086 16.5771C21.898 15.98 21.4 15.0277 21.4 13.9994C21.4 12.9719 21.8974 12.0195 22.7073 11.4227L22.7085 11.4218L23.8957 10.545C23.4567 9.2988 22.7881 8.14636 21.9248 7.1477L20.5922 7.73425L20.5899 7.73527C20.1844 7.91463 19.7472 8.00722 19.3039 8.00663C17.6715 8.00453 16.3046 6.77431 16.1261 5.15465L16.1259 5.15291L15.9635 3.69304C15.3202 3.57328 14.6677 3.50872 14.013 3.50017C13.3389 3.50891 12.6821 3.57367 12.0377 3.69328L11.8751 5.15452C11.7625 6.16272 11.1793 7.05909 10.3019 7.56986C9.41937 8.0856 8.34453 8.14844 7.40869 7.73694L6.07273 7.14893C5.20949 8.14751 4.54092 9.29983 4.10196 10.5459L5.29181 11.4233C6.11115 12.0269 6.59414 12.9837 6.59414 14.0007C6.59414 15.0173 6.11142 15.9742 5.29237 16.5776L4.10161 17.4566C4.54002 18.7044 5.2085 19.8585 6.07205 20.8587L7.41742 20.2682C8.34745 19.8613 9.41573 19.9215 10.2947 20.4292C11.174 20.937 11.7593 21.832 11.8738 22.84L11.8744 22.8445L12.0362 24.3088C13.3326 24.5638 14.6662 24.5638 15.9626 24.3088L16.1247 22.8418C16.1491 22.6217 16.1955 22.4055 16.263 22.1966Z</StreamGeometry>
+        </StackPanel.Resources>
+        <PathIcon Data="{StaticResource settings_regular}" />
+      </StackPanel>
+    </Design.PreviewWith>
+    <ControlTheme x:Key="{x:Type PathIcon}" TargetType="PathIcon">
+      <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}" />
+      <Setter Property="Background" Value="Transparent" />
+      <Setter Property="Height" Value="{DynamicResource IconElementThemeHeight}" />
+      <Setter Property="Width" Value="{DynamicResource IconElementThemeWidth}" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border Background="{TemplateBinding Background}">
+            <Viewbox Height="{TemplateBinding Height}" Width="{TemplateBinding Width}">
+              <Path Fill="{TemplateBinding Foreground}" Data="{TemplateBinding Data}" Stretch="Uniform" />
+            </Viewbox>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+    </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/PopupRoot.xaml b/src/Avalonia.Themes.Fluent/Controls/PopupRoot.xaml
index f608cf55f5..f57ecd2013 100644
--- a/src/Avalonia.Themes.Fluent/Controls/PopupRoot.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/PopupRoot.xaml
@@ -1,28 +1,28 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Style Selector="PopupRoot">
-    <Setter Property="Background" Value="{x:Null}"/>
-    <Setter Property="TransparencyLevelHint" Value="Transparent" />
-    <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
-    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
-    <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
-    <Setter Property="FontWeight" Value="400" />
-    <Setter Property="FontStyle" Value="Normal" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <LayoutTransformControl LayoutTransform="{TemplateBinding Transform}">
-          <Panel>
-            <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
-            <VisualLayerManager IsPopup="True">
-              <ContentPresenter Name="PART_ContentPresenter"
-                              Background="{TemplateBinding Background}"
-                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                              Content="{TemplateBinding Content}"
-                              Padding="{TemplateBinding Padding}"/>
-            </VisualLayerManager>
-          </Panel>
-        </LayoutTransformControl>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-</Styles>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ControlTheme x:Key="{x:Type PopupRoot}" TargetType="PopupRoot">
+      <Setter Property="Background" Value="{x:Null}" />
+      <Setter Property="TransparencyLevelHint" Value="Transparent" />
+      <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}" />
+      <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+      <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
+      <Setter Property="FontWeight" Value="400" />
+      <Setter Property="FontStyle" Value="Normal" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <LayoutTransformControl LayoutTransform="{TemplateBinding Transform}">
+            <Panel>
+              <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
+              <VisualLayerManager IsPopup="True">
+                <ContentPresenter Name="PART_ContentPresenter"
+                                  Background="{TemplateBinding Background}"
+                                  ContentTemplate="{TemplateBinding ContentTemplate}"
+                                  Content="{TemplateBinding Content}"
+                                  Padding="{TemplateBinding Padding}" />
+              </VisualLayerManager>
+            </Panel>
+          </LayoutTransformControl>
+        </ControlTemplate>
+      </Setter>
+    </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ProgressBar.xaml b/src/Avalonia.Themes.Fluent/Controls/ProgressBar.xaml
index a463334a76..3c7d22e13f 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ProgressBar.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ProgressBar.xaml
@@ -1,164 +1,179 @@
-<Styles xmlns="https://github.com/avaloniaui" 
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        x:CompileBindings="True">
-  <Design.PreviewWith>
-    <Border Padding="20">
-      <StackPanel Spacing="10">
-        <ProgressBar VerticalAlignment="Center" IsIndeterminate="True" />
-        <ProgressBar VerticalAlignment="Center" Value="5" Maximum="10" />
-        <ProgressBar VerticalAlignment="Center" Value="50" />
-        <ProgressBar VerticalAlignment="Center" Value="50" Minimum="25" Maximum="75" />
-        <ProgressBar HorizontalAlignment="Left" IsIndeterminate="True" Orientation="Vertical" />
-      </StackPanel>
-    </Border>
-  </Design.PreviewWith>
-  <Style Selector="ProgressBar">
-    <Setter Property="Foreground" Value="{DynamicResource SystemControlHighlightAccentBrush}" />
-    <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundBaseLowBrush}" />
-    <Setter Property="BorderThickness" Value="{DynamicResource ProgressBarBorderThemeThickness}" />
-    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource SystemControlHighlightTransparentBrush}" />
-    <Setter Property="MinHeight" Value="{DynamicResource ProgressBarThemeMinHeight}" />
-    <Setter Property="VerticalAlignment" Value="Center" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border x:Name="ProgressBarRoot" ClipToBounds="True" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}">          
-            <Panel>
-              <Panel x:Name="DeterminateRoot">
-                <Border CornerRadius="{TemplateBinding CornerRadius}" x:Name="PART_Indicator" Margin="{TemplateBinding Padding}" Background="{TemplateBinding Foreground}" />
-              </Panel>
-              <Panel x:Name="IndeterminateRoot">
-                <Border x:Name="IndeterminateProgressBarIndicator" CornerRadius="{TemplateBinding CornerRadius}" Margin="{TemplateBinding Padding}" Background="{TemplateBinding Foreground}" />
-                <Border x:Name="IndeterminateProgressBarIndicator2" CornerRadius="{TemplateBinding CornerRadius}" Margin="{TemplateBinding Padding}" Background="{TemplateBinding Foreground}" />
-              </Panel>
-              <LayoutTransformControl x:Name="PART_LayoutTransformControl" HorizontalAlignment="Center" VerticalAlignment="Center" IsVisible="{TemplateBinding ShowProgressText}">
-                <TextBlock Foreground="{DynamicResource SystemControlForegroundBaseHighBrush}" Text="{ReflectionBinding Value, RelativeSource={RelativeSource TemplatedParent}, StringFormat={}{0:0}%}" />
-              </LayoutTransformControl>
-            </Panel>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-  <Style Selector="ProgressBar:horizontal /template/ Border#PART_Indicator">
-    <Setter Property="HorizontalAlignment" Value="Left" />
-    <Setter Property="VerticalAlignment" Value="Stretch" />
-  </Style>
-  <Style Selector="ProgressBar:vertical /template/ Border#PART_Indicator">
-    <Setter Property="HorizontalAlignment" Value="Stretch" />
-    <Setter Property="VerticalAlignment" Value="Bottom" />
-  </Style>
-  <Style Selector="ProgressBar:horizontal">
-    <Setter Property="MinWidth" Value="200" />
-    <Setter Property="MinHeight" Value="4" />
-  </Style>
-  <Style Selector="ProgressBar:vertical">
-    <Setter Property="MinWidth" Value="4" />
-    <Setter Property="MinHeight" Value="200" />
-  </Style>
-  <Style Selector="ProgressBar:vertical /template/ LayoutTransformControl#PART_LayoutTransformControl">
-    <Setter Property="LayoutTransform">
-      <Setter.Value>
-        <RotateTransform Angle="90" />
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <!-- FadeInAnimation mockup-->
-  <Style Selector="ProgressBar /template/ Panel#DeterminateRoot">
-    <Setter Property="Transitions">
-      <Transitions>
-        <DoubleTransition Property="Opacity" Duration="0:0:0.197" />
-      </Transitions>
-    </Setter>
-  </Style>
-  <Style Selector="ProgressBar /template/ Panel#IndeterminateRoot">
-    <Setter Property="Transitions">
-      <Transitions>
-        <DoubleTransition Property="Opacity" Duration="0:0:0.197" />
-      </Transitions>
-    </Setter>
-  </Style>
-  <Style Selector="ProgressBar /template/ Panel#DeterminateRoot">
-    <Setter Property="Opacity" Value="1" />
-  </Style>
-  <Style Selector="ProgressBar /template/ Panel#IndeterminateRoot">
-    <Setter Property="Opacity" Value="0" />
-  </Style>
-  <Style Selector="ProgressBar:indeterminate /template/ Panel#DeterminateRoot">
-    <Setter Property="Opacity" Value="0" />
-  </Style>
-  <Style Selector="ProgressBar:indeterminate /template/ Panel#IndeterminateRoot">
-    <Setter Property="Opacity" Value="1" />
-  </Style>
-  <Style Selector="ProgressBar:horizontal:indeterminate /template/ Border#IndeterminateProgressBarIndicator">
-    <Style.Animations>
-      <Animation Duration="0:0:2" IterationCount="Infinite">
-        <KeyFrame KeyTime="0:0:0" KeySpline="0.4,0,0.6,1">
-          <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerAnimationStartPosition}" />
-        </KeyFrame>
-        <KeyFrame KeyTime="0:0:1.5" KeySpline="0.4,0,0.6,1">
-          <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerAnimationEndPosition}" />
-        </KeyFrame>
-        <KeyFrame KeyTime="0:0:2" KeySpline="0.4,0,0.6,1">
-          <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerAnimationEndPosition}" />
-        </KeyFrame>
-      </Animation>
-    </Style.Animations>
-  </Style>
-  <Style Selector="ProgressBar:horizontal:indeterminate /template/ Border#IndeterminateProgressBarIndicator2">
-    <Style.Animations>
-      <Animation Duration="0:0:2" IterationCount="Infinite">
-        <KeyFrame KeyTime="0:0:0" KeySpline="0.4,0,0.6,1">
-          <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2AnimationStartPosition}" />
-        </KeyFrame>
-        <KeyFrame KeyTime="0:0:0.75" KeySpline="0.4,0,0.6,1">
-          <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2AnimationStartPosition}" />
-        </KeyFrame>
-        <KeyFrame KeyTime="0:0:2" KeySpline="0.4,0,0.6,1">
-          <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2AnimationEndPosition}" />
-        </KeyFrame>
-      </Animation>
-    </Style.Animations>
-  </Style>
-  <Style Selector="ProgressBar:vertical:indeterminate /template/ Border#IndeterminateProgressBarIndicator">
-    <Style.Animations>
-      <Animation Duration="0:0:2" IterationCount="Infinite">
-        <KeyFrame KeyTime="0:0:0" KeySpline="0.4,0,0.6,1">
-          <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerAnimationStartPosition}" />
-        </KeyFrame>
-        <KeyFrame KeyTime="0:0:1.5" KeySpline="0.4,0,0.6,1">
-          <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerAnimationEndPosition}" />
-        </KeyFrame>
-        <KeyFrame KeyTime="0:0:2" KeySpline="0.4,0,0.6,1">
-          <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerAnimationEndPosition}" />
-        </KeyFrame>
-      </Animation>
-    </Style.Animations>
-  </Style>
-  <Style Selector="ProgressBar:vertical:indeterminate /template/ Border#IndeterminateProgressBarIndicator2">
-    <Style.Animations>
-      <Animation Duration="0:0:2" IterationCount="Infinite">
-        <KeyFrame KeyTime="0:0:0" KeySpline="0.4,0,0.6,1">
-          <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2AnimationStartPosition}" />
-        </KeyFrame>
-        <KeyFrame KeyTime="0:0:0.75" KeySpline="0.4,0,0.6,1">
-          <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2AnimationStartPosition}" />
-        </KeyFrame>
-        <KeyFrame KeyTime="0:0:2" KeySpline="0.4,0,0.6,1">
-          <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2AnimationEndPosition}" />
-        </KeyFrame>
-      </Animation>
-    </Style.Animations>
-  </Style>
-  <Style Selector="ProgressBar:horizontal /template/ Border#IndeterminateProgressBarIndicator">
-    <Setter Property="Width" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerWidth}" />    
-  </Style>
-  <Style Selector="ProgressBar:horizontal /template/ Border#IndeterminateProgressBarIndicator2">
-    <Setter Property="Width" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2Width}" />    
-  </Style>
-  <Style Selector="ProgressBar:vertical /template/ Border#IndeterminateProgressBarIndicator">
-    <Setter Property="Height" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerWidth}" />    
-  </Style>
-  <Style Selector="ProgressBar:vertical /template/ Border#IndeterminateProgressBarIndicator2">
-    <Setter Property="Height" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2Width}" />    
-  </Style>
-</Styles>
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    x:CompileBindings="True">
+      <Design.PreviewWith>
+      <Border Padding="20">
+        <StackPanel Spacing="10">
+          <ProgressBar VerticalAlignment="Center" IsIndeterminate="True" />
+          <ProgressBar VerticalAlignment="Center" Value="5" Maximum="10" />
+          <ProgressBar VerticalAlignment="Center" Value="50" />
+          <ProgressBar VerticalAlignment="Center" Value="50" Minimum="25" Maximum="75" />
+          <ProgressBar HorizontalAlignment="Left" IsIndeterminate="True" Orientation="Vertical" />
+        </StackPanel>
+      </Border>
+    </Design.PreviewWith>
+  
+    <ControlTheme x:Key="{x:Type ProgressBar}" TargetType="ProgressBar">
+        <Setter Property="Foreground" Value="{DynamicResource SystemControlHighlightAccentBrush}" />
+        <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundBaseLowBrush}" />
+        <Setter Property="BorderThickness" Value="{DynamicResource ProgressBarBorderThemeThickness}" />
+        <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource SystemControlHighlightTransparentBrush}" />
+        <Setter Property="MinHeight" Value="{DynamicResource ProgressBarThemeMinHeight}" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="Template">
+            <ControlTemplate>
+                <Border
+                    x:Name="ProgressBarRoot"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    ClipToBounds="True"
+                    CornerRadius="{TemplateBinding CornerRadius}">
+                    <Panel>
+                        <Panel x:Name="DeterminateRoot" Opacity="1">
+                          <Panel.Transitions>
+                            <Transitions>
+                              <DoubleTransition Property="Opacity" Duration="0:0:0.197" />
+                            </Transitions>
+                          </Panel.Transitions>
+                            <Border
+                                x:Name="PART_Indicator"
+                                Margin="{TemplateBinding Padding}"
+                                Background="{TemplateBinding Foreground}"
+                                CornerRadius="{TemplateBinding CornerRadius}" />
+                        </Panel>
+                        <Panel x:Name="IndeterminateRoot" Opacity="0">
+                          <Panel.Transitions>
+                            <Transitions>
+                              <DoubleTransition Property="Opacity" Duration="0:0:0.197" />
+                            </Transitions>
+                          </Panel.Transitions>
+                            <Border
+                                x:Name="IndeterminateProgressBarIndicator"
+                                Margin="{TemplateBinding Padding}"
+                                Background="{TemplateBinding Foreground}"
+                                CornerRadius="{TemplateBinding CornerRadius}" />
+                            <Border
+                                x:Name="IndeterminateProgressBarIndicator2"
+                                Margin="{TemplateBinding Padding}"
+                                Background="{TemplateBinding Foreground}"
+                                CornerRadius="{TemplateBinding CornerRadius}" />
+                        </Panel>
+                        <LayoutTransformControl
+                            x:Name="PART_LayoutTransformControl"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            IsVisible="{TemplateBinding ShowProgressText}">
+                            <TextBlock 
+                              Foreground="{DynamicResource SystemControlForegroundBaseHighBrush}" 
+                              Text="{ReflectionBinding Value, RelativeSource={RelativeSource TemplatedParent}, StringFormat={}{0:0}%}" />
+                        </LayoutTransformControl>
+                    </Panel>
+                </Border>
+            </ControlTemplate>
+        </Setter>
+        <Style Selector="^:horizontal /template/ Border#PART_Indicator">
+            <Setter Property="HorizontalAlignment" Value="Left" />
+            <Setter Property="VerticalAlignment" Value="Stretch" />
+        </Style>
+        <Style Selector="^:vertical /template/ Border#PART_Indicator">
+            <Setter Property="HorizontalAlignment" Value="Stretch" />
+            <Setter Property="VerticalAlignment" Value="Bottom" />
+        </Style>
+        <Style Selector="^:horizontal">
+            <Setter Property="MinWidth" Value="200" />
+            <Setter Property="MinHeight" Value="4" />
+        </Style>
+        <Style Selector="^:vertical">
+            <Setter Property="MinWidth" Value="4" />
+            <Setter Property="MinHeight" Value="200" />
+        </Style>
+        <Style Selector="^:vertical /template/ LayoutTransformControl#PART_LayoutTransformControl">
+            <Setter Property="LayoutTransform">
+                <Setter.Value>
+                    <RotateTransform Angle="90" />
+                </Setter.Value>
+            </Setter>
+        </Style>
+        <Style Selector="^:indeterminate /template/ Panel#DeterminateRoot">
+            <Setter Property="Opacity" Value="0" />
+        </Style>
+        <Style Selector="^:indeterminate /template/ Panel#IndeterminateRoot">
+            <Setter Property="Opacity" Value="1" />
+        </Style>
+        <Style Selector="^:horizontal:indeterminate /template/ Border#IndeterminateProgressBarIndicator">
+            <Style.Animations>
+                <Animation IterationCount="Infinite" Duration="0:0:2">
+                    <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0">
+                        <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerAnimationStartPosition}" />
+                    </KeyFrame>
+                    <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:1.5">
+                        <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerAnimationEndPosition}" />
+                    </KeyFrame>
+                    <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:2">
+                        <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerAnimationEndPosition}" />
+                    </KeyFrame>
+                </Animation>
+            </Style.Animations>
+        </Style>
+        <Style Selector="^:horizontal:indeterminate /template/ Border#IndeterminateProgressBarIndicator2">
+            <Style.Animations>
+                <Animation IterationCount="Infinite" Duration="0:0:2">
+                    <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0">
+                        <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2AnimationStartPosition}" />
+                    </KeyFrame>
+                    <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0.75">
+                        <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2AnimationStartPosition}" />
+                    </KeyFrame>
+                    <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:2">
+                        <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2AnimationEndPosition}" />
+                    </KeyFrame>
+                </Animation>
+            </Style.Animations>
+        </Style>
+        <Style Selector="^:vertical:indeterminate /template/ Border#IndeterminateProgressBarIndicator">
+            <Style.Animations>
+                <Animation IterationCount="Infinite" Duration="0:0:2">
+                    <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0">
+                        <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerAnimationStartPosition}" />
+                    </KeyFrame>
+                    <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:1.5">
+                        <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerAnimationEndPosition}" />
+                    </KeyFrame>
+                    <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:2">
+                        <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerAnimationEndPosition}" />
+                    </KeyFrame>
+                </Animation>
+            </Style.Animations>
+        </Style>
+        <Style Selector="^:vertical:indeterminate /template/ Border#IndeterminateProgressBarIndicator2">
+            <Style.Animations>
+                <Animation IterationCount="Infinite" Duration="0:0:2">
+                    <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0">
+                        <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2AnimationStartPosition}" />
+                    </KeyFrame>
+                    <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0.75">
+                        <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2AnimationStartPosition}" />
+                    </KeyFrame>
+                    <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:2">
+                        <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2AnimationEndPosition}" />
+                    </KeyFrame>
+                </Animation>
+            </Style.Animations>
+        </Style>
+        <Style Selector="^:horizontal /template/ Border#IndeterminateProgressBarIndicator">
+            <Setter Property="Width" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerWidth}" />
+        </Style>
+        <Style Selector="^:horizontal /template/ Border#IndeterminateProgressBarIndicator2">
+            <Setter Property="Width" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2Width}" />
+        </Style>
+        <Style Selector="^:vertical /template/ Border#IndeterminateProgressBarIndicator">
+            <Setter Property="Height" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerWidth}" />
+        </Style>
+        <Style Selector="^:vertical /template/ Border#IndeterminateProgressBarIndicator2">
+            <Setter Property="Height" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2Width}" />
+        </Style>
+    </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/RadioButton.xaml b/src/Avalonia.Themes.Fluent/Controls/RadioButton.xaml
index e967dc8807..a1c4ba4f2d 100644
--- a/src/Avalonia.Themes.Fluent/Controls/RadioButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/RadioButton.xaml
@@ -1,4 +1,4 @@
-<Styles xmlns="https://github.com/avaloniaui">
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Design.PreviewWith>
     <Border Padding="20">
       <StackPanel Spacing="10">
@@ -9,7 +9,8 @@
       </StackPanel>
     </Border>
   </Design.PreviewWith>
-  <Style Selector="RadioButton">
+  
+  <ControlTheme x:Key="{x:Type RadioButton}" TargetType="RadioButton">
     <Setter Property="Background" Value="{DynamicResource RadioButtonBackground}" />
     <Setter Property="Foreground" Value="{DynamicResource RadioButtonForeground}" />
     <Setter Property="BorderBrush" Value="{DynamicResource RadioButtonBorderBrush}" />
@@ -18,155 +19,152 @@
     <Setter Property="HorizontalAlignment" Value="Left" />
     <Setter Property="VerticalAlignment" Value="Center" />
     <Setter Property="HorizontalContentAlignment" Value="Left" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />    
+    <Setter Property="VerticalContentAlignment" Value="Center" />
     <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
     <Setter Property="Template">
       <ControlTemplate TargetType="RadioButton">
-        <Border Name="RootBorder"
-                Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}">
+        <Border
+            Name="RootBorder"
+            Background="{TemplateBinding Background}"
+            BorderBrush="{TemplateBinding BorderBrush}"
+            BorderThickness="{TemplateBinding BorderThickness}"
+            CornerRadius="{TemplateBinding CornerRadius}">
           <Grid ColumnDefinitions="20,*">
-            <Grid VerticalAlignment="Top"
-              Height="32">
-
-              <Ellipse Name="OuterEllipse"
-                       Width="20" Height="20"
-                       UseLayoutRounding="False"
-                       StrokeThickness="{DynamicResource RadioButtonBorderThemeThickness}" />
-
-              <Ellipse Name="CheckOuterEllipse"
-                       Width="20" Height="20"
-                       UseLayoutRounding="False"
-                       StrokeThickness="{DynamicResource RadioButtonBorderThemeThickness}" />
-
-              <Ellipse Name="CheckGlyph"
-                       Width="8" Height="8"
-                       UseLayoutRounding="False" />
+            <Grid Height="32" VerticalAlignment="Top">
+
+              <Ellipse
+                  Name="OuterEllipse"
+                  Width="20"
+                  Height="20"
+                  Fill="{DynamicResource RadioButtonOuterEllipseFill}"
+                  Stroke="{DynamicResource RadioButtonOuterEllipseStroke}"
+                  StrokeThickness="{DynamicResource RadioButtonBorderThemeThickness}"
+                  UseLayoutRounding="False" />
+
+              <Ellipse
+                  Name="CheckOuterEllipse"
+                  Width="20"
+                  Height="20"
+                  Fill="{DynamicResource RadioButtonOuterEllipseCheckedFill}"
+                  Opacity="0"
+                  Stroke="{DynamicResource RadioButtonOuterEllipseCheckedStroke}"
+                  StrokeThickness="{DynamicResource RadioButtonBorderThemeThickness}"
+                  UseLayoutRounding="False" />
+
+              <Ellipse
+                  Name="CheckGlyph"
+                  Width="8"
+                  Height="8"
+                  Fill="{DynamicResource RadioButtonCheckGlyphFill}"
+                  Opacity="0"
+                  Stroke="{DynamicResource RadioButtonCheckGlyphStroke}"
+                  UseLayoutRounding="False" />
             </Grid>
 
-            <ContentPresenter Name="PART_ContentPresenter"
-                              Content="{TemplateBinding Content}"
-                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                              Foreground="{TemplateBinding Foreground}"
-                              Margin="{TemplateBinding Padding}"
-                              RecognizesAccessKey="True"
-                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                              Grid.Column="1" />
+            <ContentPresenter
+                Name="PART_ContentPresenter"
+                Grid.Column="1"
+                Margin="{TemplateBinding Padding}"
+                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                Content="{TemplateBinding Content}"
+                ContentTemplate="{TemplateBinding ContentTemplate}"
+                Foreground="{TemplateBinding Foreground}"
+                RecognizesAccessKey="True" />
           </Grid>
         </Border>
       </ControlTemplate>
     </Setter>
-  </Style>
-
-  <!-- Normal State -->
-  <Style Selector="RadioButton /template/ Ellipse#OuterEllipse">
-    <Setter Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseStroke}" />
-    <Setter Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseFill}" />
-  </Style>
-
-  <Style Selector="RadioButton /template/ Ellipse#CheckOuterEllipse">
-    <Setter Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseCheckedStroke}" />
-    <Setter Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseCheckedFill}" />
-    <Setter Property="Opacity" Value="0" />
-  </Style>
-
-  <Style Selector="RadioButton /template/ Ellipse#CheckGlyph">
-    <Setter Property="Opacity" Value="0" />
-    <Setter Property="Stroke" Value="{DynamicResource RadioButtonCheckGlyphStroke}" />
-    <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckGlyphFill}" />
-  </Style>
-
-  <!-- PointerOver State -->
-  <Style Selector="RadioButton:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Foreground" Value="{DynamicResource RadioButtonForegroundPointerOver}" />
-  </Style>
-
-  <Style Selector="RadioButton:pointerover /template/ Border#RootBorder">
-    <Setter Property="Background" Value="{DynamicResource RadioButtonBackgroundPointerOver}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource RadioButtonBorderBrushPointerOver}" />
-  </Style>
-
-  <Style Selector="RadioButton:pointerover /template/ Ellipse#OuterEllipse">
-    <Setter Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseStrokePointerOver}" />
-    <Setter Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseFillPointerOver}" />
-  </Style>
-
-  <Style Selector="RadioButton:pointerover /template/ Ellipse#CheckOuterEllipse">
-    <Setter Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseCheckedStrokePointerOver}" />
-    <Setter Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseCheckedFillPointerOver}" />
-  </Style>
-
-  <Style Selector="RadioButton:pointerover /template/ Ellipse#CheckGlyph">
-    <Setter Property="Stroke" Value="{DynamicResource RadioButtonCheckGlyphStrokePointerOver}" />
-    <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckGlyphFillPointerOver}" />
-  </Style>
-
-
-  <!-- Pressed State -->
-  <Style Selector="RadioButton:pressed /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Foreground" Value="{DynamicResource RadioButtonForegroundPressed}" />
-  </Style>
-
-  <Style Selector="RadioButton:pressed /template/ Border#RootBorder">
-    <Setter Property="Background" Value="{DynamicResource RadioButtonBackgroundPressed}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource RadioButtonBorderBrushPressed}" />
-  </Style>
-
-  <Style Selector="RadioButton:pressed /template/ Ellipse#OuterEllipse">
-    <Setter Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseStrokePressed}" />
-    <Setter Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseFillPressed}" />
-  </Style>
-
-  <Style Selector="RadioButton:pressed /template/ Ellipse#CheckOuterEllipse">
-    <Setter Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseCheckedStrokePressed}" />
-    <Setter Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseCheckedFillPressed}" />
-  </Style>
-
-  <Style Selector="RadioButton:pressed /template/ Ellipse#CheckGlyph">
-    <Setter Property="Stroke" Value="{DynamicResource RadioButtonCheckGlyphStrokePressed}" />
-    <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckGlyphFillPressed}" />
-  </Style>
-
-
-  <!-- Disabled State -->
-  <Style Selector="RadioButton:disabled /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Foreground" Value="{DynamicResource RadioButtonForegroundDisabled}" />
-  </Style>
-
-  <Style Selector="RadioButton:disabled /template/ Border#RootBorder">
-    <Setter Property="Background" Value="{DynamicResource RadioButtonBackgroundDisabled}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource RadioButtonBorderBrushDisabled}" />
-  </Style>
-
-  <Style Selector="RadioButton:disabled /template/ Ellipse#OuterEllipse">
-    <Setter Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseStrokeDisabled}" />
-    <Setter Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseFillDisabled}" />
-  </Style>
-
-  <Style Selector="RadioButton:disabled /template/ Ellipse#CheckOuterEllipse">
-    <Setter Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseCheckedStrokeDisabled}" />
-    <Setter Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseCheckedFillDisabled}" />
-  </Style>
-
-  <Style Selector="RadioButton:disabled /template/ Ellipse#CheckGlyph">
-    <Setter Property="Stroke" Value="{DynamicResource RadioButtonCheckGlyphFillDisabled}" />
-    <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckGlyphStrokeDisabled}" />
-  </Style>
-
-
-  <!-- Checked State -->
-  <Style Selector="RadioButton:checked /template/ Ellipse#CheckGlyph">
-    <Setter Property="Opacity" Value="1" />
-  </Style>
-
-  <Style Selector="RadioButton:checked /template/ Ellipse#OuterEllipse">
-    <Setter Property="Opacity" Value="0" />
-  </Style>
-
-  <Style Selector="RadioButton:checked /template/ Ellipse#CheckOuterEllipse">
-    <Setter Property="Opacity" Value="1" />
-  </Style>
-</Styles>
+
+    <!--  PointerOver State  -->
+    <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Foreground" Value="{DynamicResource RadioButtonForegroundPointerOver}" />
+    </Style>
+
+    <Style Selector="^:pointerover /template/ Border#RootBorder">
+      <Setter Property="Background" Value="{DynamicResource RadioButtonBackgroundPointerOver}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource RadioButtonBorderBrushPointerOver}" />
+    </Style>
+
+    <Style Selector="^:pointerover /template/ Ellipse#OuterEllipse">
+      <Setter Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseStrokePointerOver}" />
+      <Setter Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseFillPointerOver}" />
+    </Style>
+
+    <Style Selector="^:pointerover /template/ Ellipse#CheckOuterEllipse">
+      <Setter Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseCheckedStrokePointerOver}" />
+      <Setter Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseCheckedFillPointerOver}" />
+    </Style>
+
+    <Style Selector="^:pointerover /template/ Ellipse#CheckGlyph">
+      <Setter Property="Stroke" Value="{DynamicResource RadioButtonCheckGlyphStrokePointerOver}" />
+      <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckGlyphFillPointerOver}" />
+    </Style>
+
+
+    <!--  Pressed State  -->
+    <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Foreground" Value="{DynamicResource RadioButtonForegroundPressed}" />
+    </Style>
+
+    <Style Selector="^:pressed /template/ Border#RootBorder">
+      <Setter Property="Background" Value="{DynamicResource RadioButtonBackgroundPressed}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource RadioButtonBorderBrushPressed}" />
+    </Style>
+
+    <Style Selector="^:pressed /template/ Ellipse#OuterEllipse">
+      <Setter Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseStrokePressed}" />
+      <Setter Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseFillPressed}" />
+    </Style>
+
+    <Style Selector="^:pressed /template/ Ellipse#CheckOuterEllipse">
+      <Setter Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseCheckedStrokePressed}" />
+      <Setter Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseCheckedFillPressed}" />
+    </Style>
+
+    <Style Selector="^:pressed /template/ Ellipse#CheckGlyph">
+      <Setter Property="Stroke" Value="{DynamicResource RadioButtonCheckGlyphStrokePressed}" />
+      <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckGlyphFillPressed}" />
+    </Style>
+
+
+    <!--  Disabled State  -->
+    <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Foreground" Value="{DynamicResource RadioButtonForegroundDisabled}" />
+    </Style>
+
+    <Style Selector="^:disabled /template/ Border#RootBorder">
+      <Setter Property="Background" Value="{DynamicResource RadioButtonBackgroundDisabled}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource RadioButtonBorderBrushDisabled}" />
+    </Style>
+
+    <Style Selector="^:disabled /template/ Ellipse#OuterEllipse">
+      <Setter Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseStrokeDisabled}" />
+      <Setter Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseFillDisabled}" />
+    </Style>
+
+    <Style Selector="^:disabled /template/ Ellipse#CheckOuterEllipse">
+      <Setter Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseCheckedStrokeDisabled}" />
+      <Setter Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseCheckedFillDisabled}" />
+    </Style>
+
+    <Style Selector="^:disabled /template/ Ellipse#CheckGlyph">
+      <Setter Property="Stroke" Value="{DynamicResource RadioButtonCheckGlyphFillDisabled}" />
+      <Setter Property="Fill" Value="{DynamicResource RadioButtonCheckGlyphStrokeDisabled}" />
+    </Style>
+
+
+    <!--  Checked State  -->
+    <Style Selector="^:checked /template/ Ellipse#CheckGlyph">
+      <Setter Property="Opacity" Value="1" />
+    </Style>
+
+    <Style Selector="^:checked /template/ Ellipse#OuterEllipse">
+      <Setter Property="Opacity" Value="0" />
+    </Style>
+
+    <Style Selector="^:checked /template/ Ellipse#CheckOuterEllipse">
+      <Setter Property="Opacity" Value="1" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/RepeatButton.xaml b/src/Avalonia.Themes.Fluent/Controls/RepeatButton.xaml
index 7fa515d3f7..670212c4b1 100644
--- a/src/Avalonia.Themes.Fluent/Controls/RepeatButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/RepeatButton.xaml
@@ -1,63 +1,65 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Design.PreviewWith>
-    <Border Padding="20">
-      <StackPanel Spacing="20">
-        <RepeatButton Content="Click Me!" />
-      </StackPanel>
-    </Border>
-  </Design.PreviewWith>
-  <Styles.Resources>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Design.PreviewWith>
+      <Border Padding="20">
+        <StackPanel Spacing="20">
+          <RepeatButton Content="Click Me!" />
+        </StackPanel>
+      </Border>
+    </Design.PreviewWith>
+  
     <Thickness x:Key="ButtonPadding">8,5,8,6</Thickness>
-  </Styles.Resources>
-  <Style Selector="RepeatButton">
-    <Setter Property="Background" Value="{DynamicResource RepeatButtonBackground}" />
-    <!--<Setter Property="BackgroundSizing" Value="OuterBorderEdge" />-->
-    <Setter Property="Foreground" Value="{DynamicResource RepeatButtonForeground}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource RepeatButtonBorderBrush}" />
-    <Setter Property="BorderThickness" Value="{DynamicResource ButtonBorderThemeThickness}" />
-    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-    <Setter Property="Padding" Value="{StaticResource ButtonPadding}" />
-    <Setter Property="HorizontalAlignment" Value="Left" />
-    <Setter Property="VerticalAlignment" Value="Center" />    
-    <Setter Property="FontWeight" Value="Normal" />
-    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-    <!--<Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
-    <Setter Property="FocusVisualMargin" Value="-3" />-->
-    <Setter Property="Template">
-      <ControlTemplate>
-        <ContentPresenter x:Name="PART_ContentPresenter"
-                          Background="{TemplateBinding Background}"
-                          BorderBrush="{TemplateBinding BorderBrush}"
-                          BorderThickness="{TemplateBinding BorderThickness}"
-                          CornerRadius="{TemplateBinding CornerRadius}"
-                          Content="{TemplateBinding Content}"
-                          ContentTemplate="{TemplateBinding ContentTemplate}"
-                          Padding="{TemplateBinding Padding}"
-                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-      </ControlTemplate>
-    </Setter>
-  </Style>
 
-  <Style Selector="RepeatButton /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-  </Style>
+    <ControlTheme x:Key="{x:Type RepeatButton}" TargetType="RepeatButton">
+      <Setter Property="Background" Value="{DynamicResource RepeatButtonBackground}" />
+      <Setter Property="Foreground" Value="{DynamicResource RepeatButtonForeground}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource RepeatButtonBorderBrush}" />
+      <Setter Property="BorderThickness" Value="{DynamicResource ButtonBorderThemeThickness}" />
+      <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+      <Setter Property="Padding" Value="{StaticResource ButtonPadding}" />
+      <Setter Property="HorizontalAlignment" Value="Left" />
+      <Setter Property="VerticalAlignment" Value="Center" />
+      <Setter Property="FontWeight" Value="Normal" />
+      <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <ContentPresenter x:Name="PART_ContentPresenter"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{TemplateBinding CornerRadius}"
+                            Content="{TemplateBinding Content}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            Padding="{TemplateBinding Padding}"
+                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+        </ControlTemplate>
+      </Setter>
 
-  <Style Selector="RepeatButton:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource RepeatButtonBackgroundPointerOver}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource RepeatButtonBorderBrushPointerOver}" />
-    <Setter Property="Foreground" Value="{DynamicResource RepeatButtonForegroundPointerOver}" />
-  </Style>
+      <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+      </Style>
 
-  <Style Selector="RepeatButton:pressed  /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource RepeatButtonBackgroundPressed}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource RepeatButtonBorderBrushPressed}" />
-    <Setter Property="Foreground" Value="{DynamicResource RepeatButtonForegroundPressed}" />
-  </Style>
+      <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource RepeatButtonBackgroundPointerOver}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource RepeatButtonBorderBrushPointerOver}" />
+        <Setter Property="Foreground" Value="{DynamicResource RepeatButtonForegroundPointerOver}" />
+      </Style>
 
-  <Style Selector="RepeatButton:disabled /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource RepeatButtonBackgroundDisabled}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource RepeatButtonBorderBrushDisabled}" />
-    <Setter Property="Foreground" Value="{DynamicResource RepeatButtonForegroundDisabled}" />
-  </Style>
-</Styles>
+      <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource RepeatButtonBackgroundPressed}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource RepeatButtonBorderBrushPressed}" />
+        <Setter Property="Foreground" Value="{DynamicResource RepeatButtonForegroundPressed}" />
+      </Style>
+
+      <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource RepeatButtonBackgroundDisabled}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource RepeatButtonBorderBrushDisabled}" />
+        <Setter Property="Foreground" Value="{DynamicResource RepeatButtonForegroundDisabled}" />
+      </Style>
+
+      <Style Selector="^:pressed">
+        <Setter Property="RenderTransform" Value="scale(0.98)" />
+      </Style>
+    </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ScrollBar.xaml b/src/Avalonia.Themes.Fluent/Controls/ScrollBar.xaml
index 4727ff72b9..7d87a3e35a 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ScrollBar.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ScrollBar.xaml
@@ -1,4 +1,4 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
   <Style Selector="ScrollBar">
     <Setter Property="MinWidth" Value="{DynamicResource ScrollBarSize}" />
diff --git a/src/Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml b/src/Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml
index b7addcb61e..a6e02d2769 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml
@@ -1,160 +1,87 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:converters="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls">
-
-  <Design.PreviewWith>
-    <Grid ColumnDefinitions="*,20,*"
-          Height="300"
-          Width="200"
-          Margin="20">
-      <ScrollViewer>
-        <Border Height="1000" Background="#ccc"/>
-      </ScrollViewer>
-      <ScrollViewer Grid.Column="2" Classes="menuscroller">
-        <Border Height="1000" Background="#ccc"/>
-      </ScrollViewer>
-    </Grid>
-  </Design.PreviewWith>
+<ResourceDictionary 
+  xmlns="https://github.com/avaloniaui"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+  xmlns:converters="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls">
+    <Design.PreviewWith>
+      <Grid ColumnDefinitions="*,20,*" Height="300" Width="200" Margin="20">
+        <ScrollViewer>
+          <Border Height="1000" Background="#ccc" />
+        </ScrollViewer>
+        <ScrollViewer Grid.Column="2" Classes="menuscroller">
+          <Border Height="1000" Background="#ccc" />
+        </ScrollViewer>
+      </Grid>
+    </Design.PreviewWith>
   
-  <Style Selector="ScrollViewer">
-    <Setter Property="Background"
-            Value="Transparent" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Grid ColumnDefinitions="*,Auto" RowDefinitions="*,Auto">
-          <ScrollContentPresenter Name="PART_ContentPresenter"
-                                  Grid.Row="0"
-                                  Grid.Column="0"
-                                  Grid.RowSpan="2"
-                                  Grid.ColumnSpan="2"
-                                  Background="{TemplateBinding Background}"
-                                  CanHorizontallyScroll="{TemplateBinding CanHorizontallyScroll}"
-                                  CanVerticallyScroll="{TemplateBinding CanVerticallyScroll}"
-                                  Content="{TemplateBinding Content}"
-                                  Extent="{TemplateBinding Extent, Mode=TwoWay}"
-                                  Padding="{TemplateBinding Padding}"
-                                  Offset="{TemplateBinding Offset, Mode=TwoWay}"
-                                  Viewport="{TemplateBinding Viewport, Mode=TwoWay}"
-                                  IsScrollChainingEnabled="{TemplateBinding IsScrollChainingEnabled}">
-            <ScrollContentPresenter.GestureRecognizers>
-              <ScrollGestureRecognizer
-                CanHorizontallyScroll="{TemplateBinding CanHorizontallyScroll}"
-                CanVerticallyScroll="{TemplateBinding CanVerticallyScroll}" />
-            </ScrollContentPresenter.GestureRecognizers>
-          </ScrollContentPresenter>
-          <ScrollBar Name="PART_HorizontalScrollBar"
-                     AllowAutoHide="{TemplateBinding AllowAutoHide}"
-                     Orientation="Horizontal"
-                     LargeChange="{Binding LargeChange.Width, RelativeSource={RelativeSource TemplatedParent}}"
-                     SmallChange="{Binding SmallChange.Width, RelativeSource={RelativeSource TemplatedParent}}"
-                     Maximum="{TemplateBinding HorizontalScrollBarMaximum}"
-                     Value="{TemplateBinding HorizontalScrollBarValue, Mode=TwoWay}"
-                     ViewportSize="{TemplateBinding HorizontalScrollBarViewportSize}"
-                     Visibility="{TemplateBinding HorizontalScrollBarVisibility}"
-                     Grid.Row="1"
-                     Focusable="False" />
-          <ScrollBar Name="PART_VerticalScrollBar"
-                     AllowAutoHide="{TemplateBinding AllowAutoHide}"
-                     Orientation="Vertical"
-                     LargeChange="{Binding LargeChange.Height, RelativeSource={RelativeSource TemplatedParent}}"
-                     SmallChange="{Binding SmallChange.Height, RelativeSource={RelativeSource TemplatedParent}}"
-                     Maximum="{TemplateBinding VerticalScrollBarMaximum}"
-                     Value="{TemplateBinding VerticalScrollBarValue, Mode=TwoWay}"
-                     ViewportSize="{TemplateBinding VerticalScrollBarViewportSize}"
-                     Visibility="{TemplateBinding VerticalScrollBarVisibility}"
-                     Grid.Column="1"
-                     Focusable="False" />
-          <Panel x:Name="PART_ScrollBarsSeparator" Grid.Row="1" Grid.Column="1" Background="{DynamicResource ScrollViewerScrollBarsSeparatorBackground}" />
-        </Grid>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="ScrollViewer /template/ Panel#PART_ScrollBarsSeparator">
-    <Setter Property="Opacity" Value="0" />
-    <Setter Property="Transitions">
-      <Transitions>
-        <DoubleTransition Property="Opacity" Duration="0:0:0.1" />
-      </Transitions>
-    </Setter>
-  </Style>
-
-  <Style Selector="ScrollViewer[IsExpanded=true] /template/ Panel#PART_ScrollBarsSeparator">
-    <Setter Property="Opacity" Value="1" />
-  </Style>
-
-  <Style Selector="ScrollViewer.menuscroller">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <DockPanel>
-          <RepeatButton DockPanel.Dock="Top"
-                        BorderThickness="0"
-                        Background="Transparent"
-                        HorizontalAlignment="Stretch"
-                        HorizontalContentAlignment="Center"
-                        RenderTransform="{x:Null}"
-                        Command="{Binding LineUp, RelativeSource={RelativeSource TemplatedParent}}">
-            <RepeatButton.IsVisible>
-              <MultiBinding Converter="{x:Static converters:MenuScrollingVisibilityConverter.Instance}"
-                            ConverterParameter="0">
-                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="VerticalScrollBarVisibility"/>
-                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Offset.Y"/>
-                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Extent.Height"/>
-                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Viewport.Height"/>
-              </MultiBinding>
-            </RepeatButton.IsVisible>
-            <Viewbox Width="{DynamicResource ScrollBarButtonArrowIconFontSize}"
-                     Height="{DynamicResource ScrollBarButtonArrowIconFontSize}">
-              <Path VerticalAlignment="Center"
-                    HorizontalAlignment="Center"
-                    Data="M 19.091797 14.970703 L 10 5.888672 L 0.908203 14.970703 L 0.029297 14.091797 L 10 4.111328 L 19.970703 14.091797 Z"
-                    Width="20"
-                    Height="20" />
-            </Viewbox>
-          </RepeatButton>
-          <RepeatButton DockPanel.Dock="Bottom"
-                        BorderThickness="0"
-                        Background="Transparent"
-                        HorizontalAlignment="Stretch"
-                        HorizontalContentAlignment="Center"
-                        RenderTransform="{x:Null}"
-                        Command="{Binding LineDown, RelativeSource={RelativeSource TemplatedParent}}">
-            <RepeatButton.IsVisible>
-              <MultiBinding Converter="{x:Static converters:MenuScrollingVisibilityConverter.Instance}"
-                            ConverterParameter="100">
-                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="VerticalScrollBarVisibility"/>
-                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Offset.Y"/>
-                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Extent.Height"/>
-                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Viewport.Height"/>
-              </MultiBinding>
-            </RepeatButton.IsVisible>
-            <Viewbox Width="{DynamicResource ScrollBarButtonArrowIconFontSize}"
-                     Height="{DynamicResource ScrollBarButtonArrowIconFontSize}">
-              <Path VerticalAlignment="Center"
-                    HorizontalAlignment="Center"
-                    Data="M 18.935547 4.560547 L 19.814453 5.439453 L 10 15.253906 L 0.185547 5.439453 L 1.064453 4.560547 L 10 13.496094 Z"
-                    Width="20"
-                    Height="20" />
-            </Viewbox>
-          </RepeatButton>
-          <ScrollContentPresenter Name="PART_ContentPresenter"
-                                  CanHorizontallyScroll="{TemplateBinding CanHorizontallyScroll}"
-                                  CanVerticallyScroll="{TemplateBinding CanVerticallyScroll}"
-                                  Content="{TemplateBinding Content}"
-                                  Extent="{TemplateBinding Extent, Mode=TwoWay}"
-                                  Margin="{TemplateBinding Padding}"
-                                  Offset="{TemplateBinding Offset, Mode=TwoWay}"
-                                  Viewport="{TemplateBinding Viewport, Mode=TwoWay}"/>
-        </DockPanel>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-  <Style Selector="ScrollViewer.menuscroller /template/ RepeatButton > Viewbox > Path">
-    <Setter Property="Fill" Value="{DynamicResource ScrollBarButtonArrowForeground}" />
-  </Style>
-
-  <Style Selector="ScrollViewer.menuscroller /template/ RepeatButton:pointerover > Viewbox > Path">
-    <Setter Property="Fill" Value="{DynamicResource ScrollBarButtonArrowForegroundPointerOver}" />
-  </Style>
-
-</Styles>
+    <ControlTheme x:Key="{x:Type ScrollViewer}" TargetType="ScrollViewer">
+      <Setter Property="Background" Value="Transparent" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Grid ColumnDefinitions="*,Auto" RowDefinitions="*,Auto">
+            <ScrollContentPresenter Name="PART_ContentPresenter" Grid.Row="0" Grid.Column="0" Grid.RowSpan="2" Grid.ColumnSpan="2" Background="{TemplateBinding Background}" CanHorizontallyScroll="{TemplateBinding CanHorizontallyScroll}" CanVerticallyScroll="{TemplateBinding CanVerticallyScroll}" Content="{TemplateBinding Content}" Extent="{TemplateBinding Extent, Mode=TwoWay}" Padding="{TemplateBinding Padding}" Offset="{TemplateBinding Offset, Mode=TwoWay}" Viewport="{TemplateBinding Viewport, Mode=TwoWay}" IsScrollChainingEnabled="{TemplateBinding IsScrollChainingEnabled}">
+              <ScrollContentPresenter.GestureRecognizers>
+                <ScrollGestureRecognizer CanHorizontallyScroll="{TemplateBinding CanHorizontallyScroll}" CanVerticallyScroll="{TemplateBinding CanVerticallyScroll}" />
+              </ScrollContentPresenter.GestureRecognizers>
+            </ScrollContentPresenter>
+            <ScrollBar Name="PART_HorizontalScrollBar" AllowAutoHide="{TemplateBinding AllowAutoHide}" Orientation="Horizontal" LargeChange="{Binding LargeChange.Width, RelativeSource={RelativeSource TemplatedParent}}" SmallChange="{Binding SmallChange.Width, RelativeSource={RelativeSource TemplatedParent}}" Maximum="{TemplateBinding HorizontalScrollBarMaximum}" Value="{TemplateBinding HorizontalScrollBarValue, Mode=TwoWay}" ViewportSize="{TemplateBinding HorizontalScrollBarViewportSize}" Visibility="{TemplateBinding HorizontalScrollBarVisibility}" Grid.Row="1" Focusable="False" />
+            <ScrollBar Name="PART_VerticalScrollBar" AllowAutoHide="{TemplateBinding AllowAutoHide}" Orientation="Vertical" LargeChange="{Binding LargeChange.Height, RelativeSource={RelativeSource TemplatedParent}}" SmallChange="{Binding SmallChange.Height, RelativeSource={RelativeSource TemplatedParent}}" Maximum="{TemplateBinding VerticalScrollBarMaximum}" Value="{TemplateBinding VerticalScrollBarValue, Mode=TwoWay}" ViewportSize="{TemplateBinding VerticalScrollBarViewportSize}" Visibility="{TemplateBinding VerticalScrollBarVisibility}" Grid.Column="1" Focusable="False" />
+            <Panel x:Name="PART_ScrollBarsSeparator" Grid.Row="1" Grid.Column="1" Background="{DynamicResource ScrollViewerScrollBarsSeparatorBackground}" />
+          </Grid>
+        </ControlTemplate>
+      </Setter>
+      <Style Selector="^ /template/ Panel#PART_ScrollBarsSeparator">
+        <Setter Property="Opacity" Value="0" />
+        <Setter Property="Transitions">
+          <Transitions>
+            <DoubleTransition Property="Opacity" Duration="0:0:0.1" />
+          </Transitions>
+        </Setter>
+      </Style>
+      <Style Selector="^[IsExpanded=true] /template/ Panel#PART_ScrollBarsSeparator">
+        <Setter Property="Opacity" Value="1" />
+      </Style>
+      <Style Selector="^.menuscroller">
+        <Setter Property="Template">
+          <ControlTemplate>
+            <DockPanel>
+              <RepeatButton DockPanel.Dock="Top" BorderThickness="0" Background="Transparent" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" RenderTransform="{x:Null}" Command="{Binding LineUp, RelativeSource={RelativeSource TemplatedParent}}">
+                <RepeatButton.IsVisible>
+                  <MultiBinding Converter="{x:Static converters:MenuScrollingVisibilityConverter.Instance}" ConverterParameter="0">
+                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="VerticalScrollBarVisibility" />
+                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Offset.Y" />
+                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Extent.Height" />
+                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Viewport.Height" />
+                  </MultiBinding>
+                </RepeatButton.IsVisible>
+                <Viewbox Width="{DynamicResource ScrollBarButtonArrowIconFontSize}" Height="{DynamicResource ScrollBarButtonArrowIconFontSize}">
+                  <Path VerticalAlignment="Center" HorizontalAlignment="Center" Data="M 19.091797 14.970703 L 10 5.888672 L 0.908203 14.970703 L 0.029297 14.091797 L 10 4.111328 L 19.970703 14.091797 Z" Width="20" Height="20" />
+                </Viewbox>
+              </RepeatButton>
+              <RepeatButton DockPanel.Dock="Bottom" BorderThickness="0" Background="Transparent" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" RenderTransform="{x:Null}" Command="{Binding LineDown, RelativeSource={RelativeSource TemplatedParent}}">
+                <RepeatButton.IsVisible>
+                  <MultiBinding Converter="{x:Static converters:MenuScrollingVisibilityConverter.Instance}" ConverterParameter="100">
+                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="VerticalScrollBarVisibility" />
+                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Offset.Y" />
+                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Extent.Height" />
+                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Viewport.Height" />
+                  </MultiBinding>
+                </RepeatButton.IsVisible>
+                <Viewbox Width="{DynamicResource ScrollBarButtonArrowIconFontSize}" Height="{DynamicResource ScrollBarButtonArrowIconFontSize}">
+                  <Path VerticalAlignment="Center" HorizontalAlignment="Center" Data="M 18.935547 4.560547 L 19.814453 5.439453 L 10 15.253906 L 0.185547 5.439453 L 1.064453 4.560547 L 10 13.496094 Z" Width="20" Height="20" />
+                </Viewbox>
+              </RepeatButton>
+              <ScrollContentPresenter Name="PART_ContentPresenter" CanHorizontallyScroll="{TemplateBinding CanHorizontallyScroll}" CanVerticallyScroll="{TemplateBinding CanVerticallyScroll}" Content="{TemplateBinding Content}" Extent="{TemplateBinding Extent, Mode=TwoWay}" Margin="{TemplateBinding Padding}" Offset="{TemplateBinding Offset, Mode=TwoWay}" Viewport="{TemplateBinding Viewport, Mode=TwoWay}" />
+            </DockPanel>
+          </ControlTemplate>
+        </Setter>
+        <Style Selector="^ /template/ RepeatButton">
+          <Style Selector="^ > Viewbox > Path">
+            <Setter Property="Fill" Value="{DynamicResource ScrollBarButtonArrowForeground}" />
+          </Style>
+          <Style Selector="^:pointerover > Viewbox > Path">
+            <Setter Property="Fill" Value="{DynamicResource ScrollBarButtonArrowForegroundPointerOver}" />
+          </Style>
+        </Style>
+      </Style>
+    </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/Separator.xaml b/src/Avalonia.Themes.Fluent/Controls/Separator.xaml
index 5d95ccc404..afbc3770c1 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Separator.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Separator.xaml
@@ -1,7 +1,7 @@
-<Styles xmlns="https://github.com/avaloniaui">
-
-  <Style Selector="Separator">
-    <Setter Property="Focusable" Value="False"/>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type Separator}" TargetType="Separator">
+    <Setter Property="Focusable" Value="False" />
     <Setter Property="Template">
       <ControlTemplate>
         <Border Padding="{TemplateBinding Margin}"
@@ -11,9 +11,8 @@
                 BorderBrush="{TemplateBinding BorderBrush}"
                 BorderThickness="{TemplateBinding BorderThickness}"
                 CornerRadius="{TemplateBinding CornerRadius}"
-                Background="{TemplateBinding Background}"/>
+                Background="{TemplateBinding Background}" />
       </ControlTemplate>
     </Setter>
-  </Style>
-
-</Styles>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/Slider.xaml b/src/Avalonia.Themes.Fluent/Controls/Slider.xaml
index cd2c02c567..b468f7f4ad 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Slider.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Slider.xaml
@@ -1,19 +1,20 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Design.PreviewWith>
-    <Border Margin="20" Width="200" Height="200">
-      <DockPanel LastChildFill="True">
-        <StackPanel Spacing="10" DockPanel.Dock="Top">
-          <Slider Value="50" />
-          <Slider IsEnabled="False" Value="50" />
-        </StackPanel>
-        <StackPanel Spacing="10" Orientation="Horizontal">
-          <Slider Value="50" Orientation="Vertical" />
-          <Slider IsEnabled="False" Orientation="Vertical" Value="50" />
-        </StackPanel>
-      </DockPanel>
-    </Border>
-  </Design.PreviewWith>
-  <Styles.Resources>
+<ResourceDictionary 
+  xmlns="https://github.com/avaloniaui" 
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+     <Design.PreviewWith>
+      <Border Margin="20" Width="200" Height="200">
+        <DockPanel LastChildFill="True">
+          <StackPanel Spacing="10" DockPanel.Dock="Top">
+            <Slider Value="50" />
+            <Slider IsEnabled="False" Value="50" />
+          </StackPanel>
+          <StackPanel Spacing="10" Orientation="Horizontal">
+            <Slider Value="50" Orientation="Vertical" />
+            <Slider IsEnabled="False" Orientation="Vertical" Value="50" />
+          </StackPanel>
+        </DockPanel>
+      </Border>
+    </Design.PreviewWith>
     <Thickness x:Key="SliderTopHeaderMargin">0,0,0,4</Thickness>
     <GridLength x:Key="SliderPreContentMargin">15</GridLength>
     <GridLength x:Key="SliderPostContentMargin">15</GridLength>
@@ -24,252 +25,364 @@
     <x:Double x:Key="SliderHorizontalThumbHeight">20</x:Double>
     <x:Double x:Key="SliderVerticalThumbWidth">20</x:Double>
     <x:Double x:Key="SliderVerticalThumbHeight">20</x:Double>
-  </Styles.Resources>
-  <Style Selector="Thumb.SliderThumbStyle">
-    <Setter Property="BorderThickness" Value="0" />
+
+
+  <ControlTheme x:Key="FluentBaseSliderDecreaseIncreaseRepeatButtonTheme" TargetType="RepeatButton" BasedOn="{StaticResource {x:Type RepeatButton}}">
     <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate>
-          <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{DynamicResource SliderThumbCornerRadius}" />
-        </ControlTemplate>
-      </Setter.Value>
+      <ControlTemplate>
+        <Grid>
+          <Border
+              Name="FocusTarget"
+              Margin="0,-10"
+              Background="Transparent" />
+          <Border
+              Name="TrackBackground"
+              Background="{TemplateBinding Background}"
+              CornerRadius="{DynamicResource ControlCornerRadius}" />
+        </Grid>
+      </ControlTemplate>
     </Setter>
-  </Style>
-  <Style Selector="Slider:horizontal">
-    <Setter Property="Background" Value="{DynamicResource SliderTrackFill}" />
-    <Setter Property="BorderThickness" Value="{DynamicResource SliderBorderThemeThickness}" />
-    <Setter Property="Foreground" Value="{DynamicResource SliderTrackValueFill}" />    
-    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+  </ControlTheme>
+  
+  <ControlTheme x:Key="FluentHorizontalSliderDecreaseIncreaseRepeatButtonTheme" TargetType="RepeatButton" BasedOn="{StaticResource FluentBaseSliderDecreaseIncreaseRepeatButtonTheme}">
+    <Setter Property="Height" Value="{DynamicResource SliderTrackThemeHeight}"/>
+    <Setter Property="VerticalAlignment" Value="Center"/>
+  </ControlTheme>
+  
+  <ControlTheme x:Key="FluentVerticalSliderDecreaseIncreaseRepeatButtonTheme" TargetType="RepeatButton" BasedOn="{StaticResource FluentBaseSliderDecreaseIncreaseRepeatButtonTheme}">
+    <Setter Property="Width" Value="{DynamicResource SliderTrackThemeHeight}"/>
+    <Setter Property="HorizontalAlignment" Value="Center"/>
+  </ControlTheme>
+
+  <ControlTheme x:Key="FluentSliderThumbTheme" TargetType="Thumb">
     <Setter Property="Template">
       <ControlTemplate>
-        <DataValidationErrors>
-          <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{TemplateBinding CornerRadius}">
-            <Grid Name="grid" Margin="{TemplateBinding Padding}" RowDefinitions="Auto, *">
-              <ContentPresenter x:Name="HeaderContentPresenter" Grid.Row="0" TextElement.FontWeight="{DynamicResource SliderHeaderThemeFontWeight}" TextElement.Foreground="{DynamicResource SliderHeaderForeground}"
-              Margin="{DynamicResource SliderTopHeaderMargin}" />
-              <Grid x:Name="SliderContainer" Grid.Row="1">
-                <Grid.Styles>
-                  <Style Selector="TickBar">
-                    <Setter Property="ReservedSpace" Value="{Binding #PART_Track.Thumb.Bounds}" />
-                  </Style>
-                </Grid.Styles>
-                <Grid x:Name="HorizontalTemplate" ColumnDefinitions="Auto,Auto,*" MinHeight="{DynamicResource SliderHorizontalHeight}">
-                  <Grid.RowDefinitions>
-                    <RowDefinition Height="{DynamicResource SliderPreContentMargin}" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="{DynamicResource SliderPostContentMargin}" />
-                  </Grid.RowDefinitions>
-                  <TickBar Name="TopTickBar" Placement="Top" Height="{DynamicResource SliderOutsideTickBarThemeHeight}" VerticalAlignment="Bottom" Margin="0,0,0,4" Grid.ColumnSpan="3" />
-                  <!-- <TickBar Name="HorizontalInlineTickBar" Placement="Top" Fill="{DynamicResource SliderInlineTickBarFill}" Height="{DynamicResource SliderTrackThemeHeight}" Grid.Row="1" Grid.ColumnSpan="3" /> -->
-                  <TickBar Name="BottomTickBar" Placement="Bottom" Height="{DynamicResource SliderOutsideTickBarThemeHeight}" VerticalAlignment="Top" Margin="0,4,0,0" Grid.Row="2" Grid.ColumnSpan="3" />
-                  <Track Name="PART_Track" Grid.Row="1" Grid.ColumnSpan="3" IsDirectionReversed="{TemplateBinding IsDirectionReversed}" Orientation="Horizontal">
-                    <Track.DecreaseButton>
-                      <RepeatButton Name="PART_DecreaseButton" Background="{TemplateBinding Foreground}" Focusable="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                        <RepeatButton.Template>
-                          <ControlTemplate>
-                            <Grid>
-                              <Border Name="FocusTarget" Background="Transparent" Margin="0,-10" />
-                              <Border Name="TrackBackground" Background="{TemplateBinding Background}" CornerRadius="{DynamicResource ControlCornerRadius}" Height="{DynamicResource SliderTrackThemeHeight}" VerticalAlignment="Center" />
-                            </Grid>
-                          </ControlTemplate>
-                        </RepeatButton.Template>
-                      </RepeatButton>
-                    </Track.DecreaseButton>
-                    <Track.IncreaseButton>
-                      <RepeatButton Name="PART_IncreaseButton" Background="{TemplateBinding Background}" Focusable="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                        <RepeatButton.Template>
-                          <ControlTemplate>
-                            <Grid>
-                              <Border Name="FocusTarget" Background="Transparent" Margin="0,-10" />
-                              <Border Name="TrackBackground" Background="{TemplateBinding Background}" CornerRadius="{DynamicResource ControlCornerRadius}" Height="{DynamicResource SliderTrackThemeHeight}" VerticalAlignment="Center" />
-                            </Grid>
-                          </ControlTemplate>
-                        </RepeatButton.Template>
-                      </RepeatButton>
-                    </Track.IncreaseButton>
-                    <Thumb Classes="SliderThumbStyle" Name="thumb" Margin="0" Padding="0" DataContext="{TemplateBinding Value}" Height="{DynamicResource SliderHorizontalThumbHeight}" Width="{DynamicResource SliderHorizontalThumbWidth}" />
-                  </Track>
-                </Grid>
-              </Grid>
-            </Grid>
-          </Border>
-        </DataValidationErrors>
+        <Border
+            Background="{TemplateBinding Background}"
+            BorderBrush="{TemplateBinding BorderBrush}"
+            BorderThickness="{TemplateBinding BorderThickness}"
+            CornerRadius="{DynamicResource SliderThumbCornerRadius}" />
       </ControlTemplate>
     </Setter>
-  </Style>
-  <Style Selector="Slider:vertical">
+  </ControlTheme>
+  
+  <ControlTheme x:Key="{x:Type Slider}" TargetType="Slider">
     <Setter Property="Background" Value="{DynamicResource SliderTrackFill}" />
     <Setter Property="BorderThickness" Value="{DynamicResource SliderBorderThemeThickness}" />
-    <Setter Property="Foreground" Value="{DynamicResource SliderTrackValueFill}" />    
+    <Setter Property="Foreground" Value="{DynamicResource SliderTrackValueFill}" />
     <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <DataValidationErrors>
-          <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{TemplateBinding CornerRadius}">
-            <Grid Name="grid" Margin="{TemplateBinding Padding}" RowDefinitions="Auto, *">
-              <ContentPresenter x:Name="HeaderContentPresenter" Grid.Row="0" TextElement.FontWeight="{DynamicResource SliderHeaderThemeFontWeight}" TextElement.Foreground="{DynamicResource SliderHeaderForeground}"
-              Margin="{DynamicResource SliderTopHeaderMargin}" />
-              <Grid x:Name="SliderContainer" Grid.Row="1">
-                <Grid.Styles>
-                  <Style Selector="TickBar">
-                    <Setter Property="ReservedSpace" Value="{Binding #PART_Track.Thumb.Bounds}" />
-                  </Style>
-                </Grid.Styles>
-                <Grid x:Name="VerticalTemplate" RowDefinitions="*,Auto,Auto" MinWidth="{DynamicResource SliderVerticalWidth}">
-                  <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="{DynamicResource SliderPreContentMargin}" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="{DynamicResource SliderPostContentMargin}" />
-                  </Grid.ColumnDefinitions>
-                  <TickBar Name="LeftTickBar" Placement="Left" Width="{DynamicResource SliderOutsideTickBarThemeHeight}" HorizontalAlignment="Right" Margin="0,0,4,0" Grid.RowSpan="3" />
-                  <!-- <TickBar Name="VerticalInlineTickBar" Placement="Inline" Fill="{DynamicResource SliderInlineTickBarFill}" Width="{DynamicResource SliderTrackThemeHeight}" Grid.Column="1" Grid.RowSpan="3" /> -->
-                  <TickBar Name="RightTickBar" Placement="Right" Width="{DynamicResource SliderOutsideTickBarThemeHeight}" HorizontalAlignment="Left" Margin="4,0,0,0" Grid.Column="2" Grid.RowSpan="3" />
-                  <Track Name="PART_Track" Grid.Column="1" Grid.ColumnSpan="1" Grid.RowSpan="3" IsDirectionReversed="{TemplateBinding IsDirectionReversed}" Orientation="Vertical">
-                    <Track.DecreaseButton>
-                      <RepeatButton Name="PART_DecreaseButton" Background="{TemplateBinding Foreground}" Focusable="False" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
-                        <RepeatButton.Template>
-                          <ControlTemplate>
-                            <Grid>
-                              <Border Name="FocusTarget" Background="Transparent" Margin="0,-10" />
-                              <Border Name="TrackBackground" Background="{TemplateBinding Background}" CornerRadius="{DynamicResource ControlCornerRadius}" Width="{DynamicResource SliderTrackThemeHeight}" HorizontalAlignment="Center" />
+    <Style Selector="^:horizontal">
+        <Setter Property="Template">
+            <ControlTemplate>
+                <DataValidationErrors>
+                    <Border
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        CornerRadius="{TemplateBinding CornerRadius}">
+                        <Grid
+                            Name="grid"
+                            Margin="{TemplateBinding Padding}"
+                            RowDefinitions="Auto, *">
+                            <ContentPresenter
+                                x:Name="HeaderContentPresenter"
+                                Grid.Row="0"
+                                Margin="{DynamicResource SliderTopHeaderMargin}"
+                                TextElement.FontWeight="{DynamicResource SliderHeaderThemeFontWeight}"
+                                TextElement.Foreground="{DynamicResource SliderHeaderForeground}" />
+                            <Grid x:Name="SliderContainer" Grid.Row="1">
+                                <Grid.Styles>
+                                    <Style Selector="TickBar">
+                                        <Setter Property="ReservedSpace" Value="{Binding #PART_Track.Thumb.Bounds}" />
+                                    </Style>
+                                </Grid.Styles>
+                                <Grid
+                                    x:Name="HorizontalTemplate"
+                                    MinHeight="{DynamicResource SliderHorizontalHeight}"
+                                    ColumnDefinitions="Auto,Auto,*">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="{DynamicResource SliderPreContentMargin}" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="{DynamicResource SliderPostContentMargin}" />
+                                    </Grid.RowDefinitions>
+                                    <TickBar
+                                        Name="TopTickBar"
+                                        Grid.ColumnSpan="3"
+                                        Ticks="{TemplateBinding Ticks}"
+                                        TickFrequency="{TemplateBinding Slider.TickFrequency}"
+                                        Orientation="{TemplateBinding Slider.Orientation}"
+                                        Minimum="{TemplateBinding Slider.Minimum}"
+                                        Maximum="{TemplateBinding Slider.Maximum}"
+                                        Height="{DynamicResource SliderOutsideTickBarThemeHeight}"
+                                        Margin="0,0,0,4"
+                                        VerticalAlignment="Bottom"
+                                        Placement="Top" />
+                                    <TickBar
+                                        Name="BottomTickBar"
+                                        Grid.Row="2"
+                                        Grid.ColumnSpan="3"
+                                        Ticks="{TemplateBinding Ticks}"
+                                        TickFrequency="{TemplateBinding Slider.TickFrequency}"
+                                        Orientation="{TemplateBinding Slider.Orientation}"
+                                        Minimum="{TemplateBinding Slider.Minimum}"
+                                        Maximum="{TemplateBinding Slider.Maximum}"
+                                        Height="{DynamicResource SliderOutsideTickBarThemeHeight}"
+                                        Margin="0,4,0,0"
+                                        VerticalAlignment="Top"
+                                        Placement="Bottom" />
+                                    <Track
+                                        Name="PART_Track"
+                                        Grid.Row="1"
+                                        Grid.ColumnSpan="3"
+                                        Minimum="{TemplateBinding Minimum}"
+                                        Maximum="{TemplateBinding Maximum}"
+                                        Value="{TemplateBinding Value, Mode=TwoWay}"
+                                        IsDirectionReversed="{TemplateBinding IsDirectionReversed}"
+                                        Orientation="Horizontal">
+                                        <Track.DecreaseButton>
+                                            <RepeatButton
+                                                Name="PART_DecreaseButton"
+                                                HorizontalAlignment="Stretch"
+                                                VerticalAlignment="Stretch"
+                                                Theme="{StaticResource FluentHorizontalSliderDecreaseIncreaseRepeatButtonTheme}"
+                                                Background="{TemplateBinding Foreground}"
+                                                Focusable="False"/>
+                                        </Track.DecreaseButton>
+                                        <Track.IncreaseButton>
+                                            <RepeatButton
+                                                Name="PART_IncreaseButton"
+                                                HorizontalAlignment="Stretch"
+                                                VerticalAlignment="Stretch"
+                                                Theme="{StaticResource FluentHorizontalSliderDecreaseIncreaseRepeatButtonTheme}"
+                                                Background="{TemplateBinding Background}"
+                                                Focusable="False"/>
+                                        </Track.IncreaseButton>
+                                      <Thumb
+                                          Name="thumb"
+                                          Width="{DynamicResource SliderHorizontalThumbWidth}"
+                                          Height="{DynamicResource SliderHorizontalThumbHeight}"
+                                          Margin="0"
+                                          Padding="0"
+                                          BorderThickness="0"
+                                          Classes="SliderThumbStyle"
+                                          Theme="{StaticResource FluentSliderThumbTheme}"
+                                          DataContext="{TemplateBinding Value}"/>
+                                    </Track>
+                                </Grid>
                             </Grid>
-                          </ControlTemplate>
-                        </RepeatButton.Template>
-                      </RepeatButton>
-                    </Track.DecreaseButton>
-                    <Track.IncreaseButton>
-                      <RepeatButton Name="PART_IncreaseButton" Background="{TemplateBinding Background}" Focusable="False" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
-                        <RepeatButton.Template>
-                          <ControlTemplate>
-                            <Grid>
-                              <Border Name="FocusTarget" Background="Transparent" Margin="0,-10" />
-                              <Border Name="TrackBackground" Background="{TemplateBinding Background}" CornerRadius="{DynamicResource ControlCornerRadius}" Width="{DynamicResource SliderTrackThemeHeight}" HorizontalAlignment="Center" />
+                        </Grid>
+                    </Border>
+                </DataValidationErrors>
+            </ControlTemplate>
+        </Setter>
+    </Style>
+    <Style Selector="^:vertical">
+        <Setter Property="Template">
+            <ControlTemplate>
+                <DataValidationErrors>
+                    <Border
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        CornerRadius="{TemplateBinding CornerRadius}">
+                        <Grid
+                            Name="grid"
+                            Margin="{TemplateBinding Padding}"
+                            RowDefinitions="Auto, *">
+                            <ContentPresenter
+                                x:Name="HeaderContentPresenter"
+                                Grid.Row="0"
+                                Margin="{DynamicResource SliderTopHeaderMargin}"
+                                TextElement.FontWeight="{DynamicResource SliderHeaderThemeFontWeight}"
+                                TextElement.Foreground="{DynamicResource SliderHeaderForeground}" />
+                            <Grid x:Name="SliderContainer" Grid.Row="1">
+                                <Grid.Styles>
+                                    <Style Selector="TickBar">
+                                        <Setter Property="ReservedSpace" Value="{Binding #PART_Track.Thumb.Bounds}" />
+                                    </Style>
+                                </Grid.Styles>
+                                <Grid
+                                    x:Name="VerticalTemplate"
+                                    MinWidth="{DynamicResource SliderVerticalWidth}"
+                                    RowDefinitions="*,Auto,Auto">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="{DynamicResource SliderPreContentMargin}" />
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="{DynamicResource SliderPostContentMargin}" />
+                                    </Grid.ColumnDefinitions>
+                                    <TickBar
+                                        Name="LeftTickBar"
+                                        Grid.RowSpan="3"
+                                        Ticks="{TemplateBinding Ticks}"
+                                        TickFrequency="{TemplateBinding Slider.TickFrequency}"
+                                        Orientation="{TemplateBinding Slider.Orientation}"
+                                        Minimum="{TemplateBinding Slider.Minimum}"
+                                        Maximum="{TemplateBinding Slider.Maximum}"
+                                        Width="{DynamicResource SliderOutsideTickBarThemeHeight}"
+                                        Margin="0,0,4,0"
+                                        HorizontalAlignment="Right"
+                                        Placement="Left" />
+                                    <TickBar
+                                        Name="RightTickBar"
+                                        Grid.RowSpan="3"
+                                        Grid.Column="2"
+                                        Ticks="{TemplateBinding Ticks}"
+                                        TickFrequency="{TemplateBinding Slider.TickFrequency}"
+                                        Orientation="{TemplateBinding Slider.Orientation}"
+                                        Minimum="{TemplateBinding Slider.Minimum}"
+                                        Maximum="{TemplateBinding Slider.Maximum}"
+                                        Width="{DynamicResource SliderOutsideTickBarThemeHeight}"
+                                        Margin="4,0,0,0"
+                                        HorizontalAlignment="Left"
+                                        Placement="Right" />
+                                    <Track
+                                        Name="PART_Track"
+                                        Grid.RowSpan="3"
+                                        Grid.Column="1"
+                                        Grid.ColumnSpan="1"
+                                        Minimum="{TemplateBinding Minimum}"
+                                        Maximum="{TemplateBinding Maximum}"
+                                        Value="{TemplateBinding Value, Mode=TwoWay}"
+                                        IsDirectionReversed="{TemplateBinding IsDirectionReversed}"
+                                        Orientation="Vertical">
+                                        <Track.DecreaseButton>
+                                            <RepeatButton
+                                                Name="PART_DecreaseButton"
+                                                HorizontalAlignment="Stretch"
+                                                VerticalAlignment="Stretch"
+                                                Theme="{StaticResource FluentVerticalSliderDecreaseIncreaseRepeatButtonTheme}"
+                                                Background="{TemplateBinding Foreground}"
+                                                Focusable="False"/>
+                                        </Track.DecreaseButton>
+                                        <Track.IncreaseButton>
+                                            <RepeatButton
+                                                Name="PART_IncreaseButton"
+                                                HorizontalAlignment="Stretch"
+                                                VerticalAlignment="Stretch"
+                                                Background="{TemplateBinding Background}"
+                                                Theme="{StaticResource FluentVerticalSliderDecreaseIncreaseRepeatButtonTheme}"
+                                                Focusable="False"/>
+                                        </Track.IncreaseButton>
+                                        <Thumb
+                                            Name="SliderThumb"
+                                            Width="{DynamicResource SliderVerticalThumbWidth}"
+                                            Height="{DynamicResource SliderVerticalThumbHeight}"
+                                            Margin="0"
+                                            Padding="0"
+                                            BorderThickness="0"
+                                            Classes="SliderThumbStyle"
+                                            Theme="{StaticResource FluentSliderThumbTheme}"
+                                            DataContext="{TemplateBinding Value}" />
+                                    </Track>
+                                </Grid>
                             </Grid>
-                          </ControlTemplate>
-                        </RepeatButton.Template>
-                      </RepeatButton>
-                    </Track.IncreaseButton>
-                    <Thumb Classes="SliderThumbStyle" Name="SliderThumb" Margin="0" Padding="0" DataContext="{TemplateBinding Value}" Height="{DynamicResource SliderVerticalThumbHeight}" Width="{DynamicResource SliderVerticalThumbWidth}" />
-                  </Track>
-                </Grid>
-              </Grid>
-            </Grid>
-          </Border>
-        </DataValidationErrors>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-  <Style Selector="Slider /template/ Track#PART_Track">
-    <Setter Property="Minimum" Value="{TemplateBinding Minimum}" />
-    <Setter Property="Maximum" Value="{TemplateBinding Maximum}" />
-    <Setter Property="Value" Value="{TemplateBinding Value, Mode=TwoWay}" />
-  </Style>
-  <Style Selector="Slider /template/ TickBar">
-    <Setter Property="Fill" Value="{DynamicResource SliderTickBarFill}" />
-    <Setter Property="TickFrequency" Value="{TemplateBinding Slider.TickFrequency}" />
-    <Setter Property="Orientation" Value="{TemplateBinding Slider.Orientation}" />
-    <Setter Property="Minimum" Value="{TemplateBinding Slider.Minimum}" />
-    <Setter Property="Maximum" Value="{TemplateBinding Slider.Maximum}" />
-  </Style>
-  
-  <!-- Normal State -->
-  
-  <Style Selector="Slider /template/ Thumb.SliderThumbStyle">
-    <Setter Property="Background" Value="{DynamicResource SliderThumbBackground}" />
-  </Style>
+                        </Grid>
+                    </Border>
+                </DataValidationErrors>
+            </ControlTemplate>
+        </Setter>
+    </Style>
 
-  <Style Selector="Slider /template/ Grid#SliderContainer">
-    <Setter Property="Background" Value="{DynamicResource SliderContainerBackground}" />
-  </Style>
+    <!--  Normal State  -->
 
-  <Style Selector="Slider /template/ TickBar">
-    <Setter Property="IsVisible" Value="False" />
-    <Setter Property="Ticks" Value="{TemplateBinding Ticks}" />
-  </Style>
+    <Style Selector="^ /template/">
+      <Style Selector="^Thumb.SliderThumbStyle">
+        <Setter Property="Background" Value="{DynamicResource SliderThumbBackground}" />
+      </Style>
+      <Style Selector="^Grid#SliderContainer">
+        <Setter Property="Background" Value="{DynamicResource SliderContainerBackground}" />
+      </Style>
+      <Style Selector="^TickBar">
+        <Setter Property="IsVisible" Value="False" />
+        <Setter Property="Fill" Value="{DynamicResource SliderTickBarFill}" />
+      </Style>
+    </Style>
 
-  <!-- TickBar Placement States -->
+    <!--  TickBar Placement States  -->
 
-  <Style Selector="Slider[TickPlacement=TopLeft] /template/ TickBar#LeftTickBar, Slider[TickPlacement=Outside] /template/ TickBar#LeftTickBar">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
- 
-  <Style Selector="Slider[TickPlacement=TopLeft] /template/ TickBar#TopTickBar, Slider[TickPlacement=Outside] /template/ TickBar#TopTickBar">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
- 
-  <Style Selector="Slider[TickPlacement=BottomRight] /template/ TickBar#BottomTickBar, Slider[TickPlacement=Outside] /template/ TickBar#BottomTickBar">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
- 
-  <Style Selector="Slider[TickPlacement=BottomRight] /template/ TickBar#RightTickBar, Slider[TickPlacement=Outside] /template/ TickBar#RightTickBar">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
- 
-  <!-- Disabled State -->
+    <Style Selector="^[TickPlacement=TopLeft] /template/ TickBar#LeftTickBar, ^[TickPlacement=Outside] /template/ TickBar#LeftTickBar">
+        <Setter Property="IsVisible" Value="True" />
+    </Style>
 
-  <Style Selector="Slider:disabled /template/ ContentPresenter#HeaderContentPresenter">
-    <Setter Property="Foreground" Value="{DynamicResource SliderHeaderForegroundDisabled}" />
-  </Style>
-  
-  <Style Selector="Slider:disabled /template/ RepeatButton#PART_DecreaseButton">
-    <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillDisabled}" />
-  </Style>
-  
-  <Style Selector="Slider:disabled /template/ RepeatButton#PART_IncreaseButton">
-    <Setter Property="Background" Value="{DynamicResource SliderTrackFillDisabled}" />
-  </Style>
-  
-  <Style Selector="Slider:disabled /template/ Thumb.SliderThumbStyle">
-    <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundDisabled}" />
-  </Style>
-  
-  <Style Selector="Slider:disabled /template/ TickBar">
-    <Setter Property="Fill" Value="{DynamicResource SliderTickBarFillDisabled}" />
-  </Style>
-  
-  <Style Selector="Slider:pointerover /template/ Grid#SliderContainer">
-    <Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundDisabled}" />
-  </Style>
+    <Style Selector="^[TickPlacement=TopLeft] /template/ TickBar#TopTickBar, ^[TickPlacement=Outside] /template/ TickBar#TopTickBar">
+        <Setter Property="IsVisible" Value="True" />
+    </Style>
 
-  <!-- PointerOver State -->
-  <Style Selector="Slider:pointerover /template/ RepeatButton#PART_IncreaseButton">
-    <Setter Property="Background" Value="{DynamicResource SliderTrackFillPointerOver}" />
-  </Style>
-  
-  <Style Selector="Slider:pointerover /template/ Thumb.SliderThumbStyle">
-    <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPointerOver}" />
-  </Style>
-  
-  <Style Selector="Slider:pointerover /template/ Grid#SliderContainer">
-    <Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundPointerOver}" />
-  </Style>
-  
-  <Style Selector="Slider:pointerover /template/ RepeatButton#PART_DecreaseButton">
-    <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillPointerOver}" />
-  </Style>
+    <Style Selector="^[TickPlacement=BottomRight] /template/ TickBar#BottomTickBar, ^[TickPlacement=Outside] /template/ TickBar#BottomTickBar">
+        <Setter Property="IsVisible" Value="True" />
+    </Style>
 
-  <!-- Pressed State -->
-  <Style Selector="Slider:pressed /template/ RepeatButton#PART_IncreaseButton">
-    <Setter Property="Background" Value="{DynamicResource SliderTrackFillPressed}" />
-  </Style>
+    <Style Selector="^[TickPlacement=BottomRight] /template/ TickBar#RightTickBar, ^[TickPlacement=Outside] /template/ TickBar#RightTickBar">
+        <Setter Property="IsVisible" Value="True" />
+    </Style>
 
-  <Style Selector="Slider:pressed /template/ Thumb.SliderThumbStyle">
-    <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPressed}" />
-  </Style>
-  
-  <Style Selector="Slider:pointerover /template/ Grid#SliderContainer">
-    <Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundPressed}" />
-  </Style>
-  
-  <Style Selector="Slider:pointerover /template/ RepeatButton#PART_DecreaseButton">
-    <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillPressed}" />
-  </Style>
-  
-  <Style Selector="Slider:error /template/ Thumb.SliderThumbStyle">
-    <Setter Property="Background" Value="{DynamicResource SystemControlErrorTextForegroundBrush}" />
-  </Style>
-  
-  <Style Selector="Slider:error">
+    <!--  Disabled State  -->
+
+    <Style Selector="^:disabled /template/">
+      <Style Selector="^ContentPresenter#HeaderContentPresenter">
+        <Setter Property="Foreground" Value="{DynamicResource SliderHeaderForegroundDisabled}" />
+      </Style>
+      <Style Selector="^RepeatButton#PART_DecreaseButton">
+        <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillDisabled}" />
+      </Style>
+
+      <Style Selector="^RepeatButton#PART_IncreaseButton">
+        <Setter Property="Background" Value="{DynamicResource SliderTrackFillDisabled}" />
+      </Style>
+
+      <Style Selector="^Thumb.SliderThumbStyle">
+        <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundDisabled}" />
+      </Style>
+
+      <Style Selector="^TickBar">
+        <Setter Property="Fill" Value="{DynamicResource SliderTickBarFillDisabled}" />
+      </Style>
+    </Style>
+
+    <!--  PointerOver State  -->
+    <Style Selector="^:pointerover /template/">
+      <Style Selector="^Grid#SliderContainer">
+        <Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundDisabled}" />
+      </Style>
+      <Style Selector="^RepeatButton#PART_IncreaseButton">
+        <Setter Property="Background" Value="{DynamicResource SliderTrackFillPointerOver}" />
+      </Style>
+
+      <Style Selector="^Thumb.SliderThumbStyle">
+          <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPointerOver}" />
+      </Style>
+
+      <Style Selector="^Grid#SliderContainer">
+          <Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundPointerOver}" />
+      </Style>
+
+      <Style Selector="^RepeatButton#PART_DecreaseButton">
+          <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillPointerOver}" />
+      </Style>
+    
+    </Style>
+
+    <!--  Pressed State  -->
+    <Style Selector="^:pressed /template/">
+      <Style Selector="^Grid#SliderContainer">
+        <Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundPressed}" />
+      </Style>
+      <Style Selector="^RepeatButton#PART_DecreaseButton">
+        <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillPressed}" />
+      </Style>
+      <Style Selector="^RepeatButton#PART_IncreaseButton">
+        <Setter Property="Background" Value="{DynamicResource SliderTrackFillPressed}" />
+      </Style>
+
+      <Style Selector="^Thumb.SliderThumbStyle">
+        <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPressed}" />
+      </Style>
+    </Style>
+
+    <Style Selector="^:error">
       <Setter Property="Foreground" Value="{DynamicResource SystemControlErrorTextForegroundBrush}" />
-  </Style>
-</Styles>
+      <Style Selector="^/template/ Thumb.SliderThumbStyle">
+        <Setter Property="Background" Value="{DynamicResource SystemControlErrorTextForegroundBrush}" />
+      </Style>
+    </Style>
+
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/SplitButton.xaml b/src/Avalonia.Themes.Fluent/Controls/SplitButton.xaml
index 91c901f567..fb0460d9a1 100644
--- a/src/Avalonia.Themes.Fluent/Controls/SplitButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/SplitButton.xaml
@@ -2,7 +2,6 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         x:CompileBindings="True"
         xmlns:converters="using:Avalonia.Controls.Converters">
-
   <Design.PreviewWith>
     <Border Padding="60">
       <StackPanel>
diff --git a/src/Avalonia.Themes.Fluent/Controls/SplitView.xaml b/src/Avalonia.Themes.Fluent/Controls/SplitView.xaml
index 55d46e32a1..6b9b94852f 100644
--- a/src/Avalonia.Themes.Fluent/Controls/SplitView.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/SplitView.xaml
@@ -1,4 +1,4 @@
-<Styles xmlns="https://github.com/avaloniaui"
+<Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:sys="using:System">
   <Design.PreviewWith>
diff --git a/src/Avalonia.Themes.Fluent/Controls/TabControl.xaml b/src/Avalonia.Themes.Fluent/Controls/TabControl.xaml
index 322f6ce89e..1cc31f8e15 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TabControl.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TabControl.xaml
@@ -1,65 +1,63 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Design.PreviewWith>
-    <Border Width="400">
-      <TabControl>
-        <TabItem Header="Arch">
-          <Border Background="AntiqueWhite"
-                  Height="100">
-            <TextBlock Text="Content" Foreground="Black" FontSize="20"/>
-          </Border>
-        </TabItem>
-        <TabItem Header="Leaf">
-          <Border Background="Green"
-                  Height="100" />
-        </TabItem>
-        <TabItem Header="Disabled"
-                 IsEnabled="False" />
-      </TabControl>
-    </Border>
-  </Design.PreviewWith>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Design.PreviewWith>
+      <Border Width="400">
+        <TabControl>
+          <TabItem Header="Arch">
+            <Border Background="AntiqueWhite"
+                    Height="100">
+              <TextBlock Text="Content" Foreground="Black" FontSize="20"/>
+            </Border>
+          </TabItem>
+          <TabItem Header="Leaf">
+            <Border Background="Green"
+                    Height="100" />
+          </TabItem>
+          <TabItem Header="Disabled"
+                   IsEnabled="False" />
+        </TabControl>
+      </Border>
+    </Design.PreviewWith>
 
-  <Styles.Resources>
     <Thickness x:Key="TabControlTopPlacementItemMargin">0 0 0 2</Thickness>
-  </Styles.Resources>
-  
-  <Style Selector="TabControl">
-    <Setter Property="Margin" Value="0" />
-    <Setter Property="Padding" Value="{DynamicResource TabItemMargin}" />
-    <Setter Property="Background" Value="{DynamicResource TabControlBackground}" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}"
-                Background="{TemplateBinding Background}"
-                HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                VerticalAlignment="{TemplateBinding VerticalAlignment}">
-          <DockPanel>
-            <ItemsPresenter Name="PART_ItemsPresenter"
-                            Items="{TemplateBinding Items}"
-                            ItemsPanel="{TemplateBinding ItemsPanel}"
-                            ItemTemplate="{TemplateBinding ItemTemplate}"
-                            DockPanel.Dock="{TemplateBinding TabStripPlacement}"/>
-            <ContentPresenter Name="PART_SelectedContentHost"
-                              Margin="{TemplateBinding Padding}"
-                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                              Content="{TemplateBinding SelectedContent}"
-                              ContentTemplate="{TemplateBinding SelectedContentTemplate}" />
-          </DockPanel>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
 
-  <Style Selector="TabControl[TabStripPlacement=Left] /template/ ItemsPresenter#PART_ItemsPresenter > WrapPanel">
-    <Setter Property="Orientation" Value="Vertical" />
-  </Style>
-  <Style Selector="TabControl[TabStripPlacement=Right] /template/ ItemsPresenter#PART_ItemsPresenter > WrapPanel">
-    <Setter Property="Orientation" Value="Vertical" />
-  </Style>
-  <Style Selector="TabControl[TabStripPlacement=Top] /template/ ItemsPresenter#PART_ItemsPresenter">
-    <Setter Property="Margin" Value="{DynamicResource TabControlTopPlacementItemMargin}" />
-  </Style>
-</Styles>
+    <ControlTheme x:Key="{x:Type TabControl}" TargetType="TabControl">
+      <Setter Property="Margin" Value="0" />
+      <Setter Property="Padding" Value="{DynamicResource TabItemMargin}" />
+      <Setter Property="Background" Value="{DynamicResource TabControlBackground}" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}"
+                  Background="{TemplateBinding Background}"
+                  HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                  VerticalAlignment="{TemplateBinding VerticalAlignment}">
+            <DockPanel>
+              <ItemsPresenter Name="PART_ItemsPresenter"
+                              Items="{TemplateBinding Items}"
+                              ItemsPanel="{TemplateBinding ItemsPanel}"
+                              ItemTemplate="{TemplateBinding ItemTemplate}"
+                              DockPanel.Dock="{TemplateBinding TabStripPlacement}" />
+              <ContentPresenter Name="PART_SelectedContentHost"
+                                Margin="{TemplateBinding Padding}"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Content="{TemplateBinding SelectedContent}"
+                                ContentTemplate="{TemplateBinding SelectedContentTemplate}" />
+            </DockPanel>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+
+      <Style Selector="^[TabStripPlacement=Left] /template/ ItemsPresenter#PART_ItemsPresenter > WrapPanel">
+        <Setter Property="Orientation" Value="Vertical" />
+      </Style>
+      <Style Selector="^[TabStripPlacement=Right] /template/ ItemsPresenter#PART_ItemsPresenter > WrapPanel">
+        <Setter Property="Orientation" Value="Vertical" />
+      </Style>
+      <Style Selector="^[TabStripPlacement=Top] /template/ ItemsPresenter#PART_ItemsPresenter">
+        <Setter Property="Margin" Value="{DynamicResource TabControlTopPlacementItemMargin}" />
+      </Style>
+    </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/TabItem.xaml b/src/Avalonia.Themes.Fluent/Controls/TabItem.xaml
index ebe6f82917..110ffc2f48 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TabItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TabItem.xaml
@@ -1,132 +1,133 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        x:CompileBindings="True">
-  <Design.PreviewWith>
-    <Border Padding="20">
-      <StackPanel Spacing="20">
-        <TabItem Header="Leaf" />
-        <TabItem Header="Arch" IsSelected="True" />
-      </StackPanel>
-    </Border>
-  </Design.PreviewWith>
-  <Styles.Resources>
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    x:CompileBindings="True">
+     <Design.PreviewWith>
+      <Border Padding="20">
+        <StackPanel Spacing="20">
+          <TabItem Header="Leaf" />
+          <TabItem Header="Arch" IsSelected="True" />
+        </StackPanel>
+      </Border>
+    </Design.PreviewWith>
+  
     <x:Double x:Key="TabItemMinHeight">48</x:Double>
     <x:Double x:Key="TabItemVerticalPipeHeight">24</x:Double>
     <x:Double x:Key="TabItemPipeThickness">2</x:Double>
-  </Styles.Resources>
 
-  <Style Selector="TabItem">
-    <Setter Property="FontSize" Value="{DynamicResource TabItemHeaderFontSize}" />
-    <Setter Property="FontWeight" Value="{DynamicResource TabItemHeaderThemeFontWeight}" />
-    <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundUnselected}" />
-    <Setter Property="Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselected}" />
-    <Setter Property="Padding" Value="{DynamicResource TabItemHeaderMargin}" />
-    <Setter Property="Margin" Value="0" />
-    <Setter Property="MinHeight" Value="{DynamicResource TabItemMinHeight}" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Name="PART_LayoutRoot"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}"
-                Padding="{TemplateBinding Padding}">
-          <Panel>
-            <ContentPresenter Name="PART_ContentPresenter"
-                              ContentTemplate="{TemplateBinding HeaderTemplate}"
-                              Content="{TemplateBinding Header}"
-                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                              FontFamily="{TemplateBinding FontFamily}"
-                              FontSize="{TemplateBinding FontSize}"
-                              FontWeight="{TemplateBinding FontWeight}" />
-            <Border Name="PART_SelectedPipe"
-                    Background="{DynamicResource TabItemHeaderSelectedPipeFill}" />
-          </Panel>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
+    <ControlTheme x:Key="{x:Type TabItem}" TargetType="TabItem">
+        <Setter Property="FontSize" Value="{DynamicResource TabItemHeaderFontSize}" />
+        <Setter Property="FontWeight" Value="{DynamicResource TabItemHeaderThemeFontWeight}" />
+        <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundUnselected}" />
+        <Setter Property="Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselected}" />
+        <Setter Property="Padding" Value="{DynamicResource TabItemHeaderMargin}" />
+        <Setter Property="Margin" Value="0" />
+        <Setter Property="MinHeight" Value="{DynamicResource TabItemMinHeight}" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Template">
+            <ControlTemplate>
+                <Border
+                    Name="PART_LayoutRoot"
+                    Padding="{TemplateBinding Padding}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    CornerRadius="{TemplateBinding CornerRadius}">
+                    <Panel>
+                        <ContentPresenter
+                            Name="PART_ContentPresenter"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            Content="{TemplateBinding Header}"
+                            ContentTemplate="{TemplateBinding HeaderTemplate}"
+                            FontFamily="{TemplateBinding FontFamily}"
+                            FontSize="{TemplateBinding FontSize}"
+                            FontWeight="{TemplateBinding FontWeight}" />
+                        <Border Name="PART_SelectedPipe" Background="{DynamicResource TabItemHeaderSelectedPipeFill}" />
+                    </Panel>
+                </Border>
+            </ControlTemplate>
+        </Setter>
 
-  <!-- Nornal state -->
-  <Style Selector="TabItem /template/ Border#PART_LayoutRoot">
-    <Setter Property="Background" Value="{Binding $parent[TabItem].Background}" />
-  </Style>
-  <Style Selector="TabItem /template/ Border#PART_SelectedPipe">
-    <Setter Property="IsVisible" Value="False" />
-    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-  </Style>
+        <!--  Nornal state  -->
+        <Style Selector="^ /template/ Border#PART_LayoutRoot">
+            <Setter Property="Background" Value="{Binding $parent[TabItem].Background}" />
+        </Style>
+        <Style Selector="^ /template/ Border#PART_SelectedPipe">
+            <Setter Property="IsVisible" Value="False" />
+            <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+        </Style>
 
-  <!-- Selected state -->
-  <!--  We don't use selector to PART_LayoutRoot, so developer can override selected item background with TabStripItem.Background  -->
-  <Style Selector="TabItem:selected">
-    <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundSelected}" />
-    <Setter Property="Foreground" Value="{DynamicResource TabItemHeaderForegroundSelected}" />
-  </Style>
-  <Style Selector="TabItem:selected /template/ Border#PART_SelectedPipe">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
+        <!--  Selected state  -->
+        <!--  We don't use selector to PART_LayoutRoot, so developer can override selected item background with TabStripItem.Background  -->
+        <Style Selector="^:selected">
+            <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundSelected}" />
+            <Setter Property="Foreground" Value="{DynamicResource TabItemHeaderForegroundSelected}" />
+        </Style>
+        <Style Selector="^:selected /template/ Border#PART_SelectedPipe">
+            <Setter Property="IsVisible" Value="True" />
+        </Style>
 
-  <!-- PointerOver state -->
-  <Style Selector="TabItem:pointerover /template/ Border#PART_LayoutRoot">
-    <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundUnselectedPointerOver}" />
-    <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPointerOver}" />
-  </Style>
+        <!--  PointerOver state  -->
+        <Style Selector="^:pointerover /template/ Border#PART_LayoutRoot">
+            <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundUnselectedPointerOver}" />
+            <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPointerOver}" />
+        </Style>
 
-  <!-- Selected PointerOver state -->
-  <Style Selector="TabItem:selected:pointerover /template/ Border#PART_LayoutRoot">
-    <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundSelectedPointerOver}" />
-    <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundSelectedPointerOver}" />
-  </Style>
+        <!--  Selected PointerOver state  -->
+        <Style Selector="^:selected:pointerover /template/ Border#PART_LayoutRoot">
+            <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundSelectedPointerOver}" />
+            <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundSelectedPointerOver}" />
+        </Style>
 
-  <!-- Pressed state -->
-  <Style Selector="TabItem:pressed /template/ Border#PART_LayoutRoot">
-    <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundUnselectedPressed}" />
-    <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPressed}" />
-  </Style>
+        <!--  Pressed state  -->
+        <Style Selector="^:pressed /template/ Border#PART_LayoutRoot">
+            <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundUnselectedPressed}" />
+            <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPressed}" />
+        </Style>
 
-  <!-- Selected Pressed state -->
-  <Style Selector="TabItem:selected:pressed /template/ Border#PART_LayoutRoot">
-    <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundSelectedPressed}" />
-    <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundSelectedPressed}" />
-  </Style>
+        <!--  Selected Pressed state  -->
+        <Style Selector="^:selected:pressed /template/ Border#PART_LayoutRoot">
+            <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundSelectedPressed}" />
+            <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundSelectedPressed}" />
+        </Style>
 
-  <!-- Disabled state -->
-  <Style Selector="TabItem:disabled /template/ Border#PART_LayoutRoot">
-    <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundDisabled}" />
-    <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundDisabled}" />
-  </Style>
+        <!--  Disabled state  -->
+        <Style Selector="^:disabled /template/ Border#PART_LayoutRoot">
+            <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundDisabled}" />
+            <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundDisabled}" />
+        </Style>
 
-  <!-- TabStripPlacement States Group -->
-  <Style Selector="TabItem[TabStripPlacement=Left] /template/ Border#PART_SelectedPipe">
-    <Setter Property="Width" Value="{DynamicResource TabItemPipeThickness}" />
-    <Setter Property="Height" Value="{DynamicResource TabItemVerticalPipeHeight}" />
-    <Setter Property="Margin" Value="0,0,2,0" />
-    <Setter Property="HorizontalAlignment" Value="Left" />
-    <Setter Property="VerticalAlignment" Value="Center" />
-  </Style>
-  <Style Selector="TabItem[TabStripPlacement=Left] /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Margin" Value="8,0,0,0" />
-  </Style>
+        <!--  TabStripPlacement States Group  -->
+        <Style Selector="^[TabStripPlacement=Left] /template/ Border#PART_SelectedPipe">
+            <Setter Property="Width" Value="{DynamicResource TabItemPipeThickness}" />
+            <Setter Property="Height" Value="{DynamicResource TabItemVerticalPipeHeight}" />
+            <Setter Property="Margin" Value="0,0,2,0" />
+            <Setter Property="HorizontalAlignment" Value="Left" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+        </Style>
+        <Style Selector="^[TabStripPlacement=Left] /template/ ContentPresenter#PART_ContentPresenter">
+            <Setter Property="Margin" Value="8,0,0,0" />
+        </Style>
 
-  <Style Selector="TabItem[TabStripPlacement=Top] /template/ Border#PART_SelectedPipe, TabItem[TabStripPlacement=Bottom] /template/ Border#PART_SelectedPipe">
-    <Setter Property="Height" Value="{DynamicResource TabItemPipeThickness}" />
-    <Setter Property="Margin" Value="0,0,0,2" />
-    <Setter Property="HorizontalAlignment" Value="Stretch" />
-    <Setter Property="VerticalAlignment" Value="Bottom" />
-  </Style>
+        <Style Selector="^[TabStripPlacement=Top] /template/ Border#PART_SelectedPipe, ^[TabStripPlacement=Bottom] /template/ Border#PART_SelectedPipe">
+            <Setter Property="Height" Value="{DynamicResource TabItemPipeThickness}" />
+            <Setter Property="Margin" Value="0,0,0,2" />
+            <Setter Property="HorizontalAlignment" Value="Stretch" />
+            <Setter Property="VerticalAlignment" Value="Bottom" />
+        </Style>
 
-  <Style Selector="TabItem[TabStripPlacement=Right] /template/ Border#PART_SelectedPipe">
-    <Setter Property="Width" Value="{DynamicResource TabItemPipeThickness}" />
-    <Setter Property="Height" Value="{DynamicResource TabItemVerticalPipeHeight}" />
-    <Setter Property="Margin" Value="2,0,0,0" />
-    <Setter Property="HorizontalAlignment" Value="Right" />
-    <Setter Property="VerticalAlignment" Value="Center" />
-  </Style>
-  <Style Selector="TabItem[TabStripPlacement=Right] /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Margin" Value="0,0,8,0" />
-  </Style>
-  <Style Selector="TabItem[TabStripPlacement=Right]">
-    <Setter Property="HorizontalContentAlignment" Value="Right" />
-  </Style>
-</Styles>
+        <Style Selector="^[TabStripPlacement=Right] /template/ Border#PART_SelectedPipe">
+            <Setter Property="Width" Value="{DynamicResource TabItemPipeThickness}" />
+            <Setter Property="Height" Value="{DynamicResource TabItemVerticalPipeHeight}" />
+            <Setter Property="Margin" Value="2,0,0,0" />
+            <Setter Property="HorizontalAlignment" Value="Right" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+        </Style>
+        <Style Selector="^[TabStripPlacement=Right] /template/ ContentPresenter#PART_ContentPresenter">
+            <Setter Property="Margin" Value="0,0,8,0" />
+        </Style>
+        <Style Selector="^[TabStripPlacement=Right]">
+            <Setter Property="HorizontalContentAlignment" Value="Right" />
+        </Style>
+    </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/TabStrip.xaml b/src/Avalonia.Themes.Fluent/Controls/TabStrip.xaml
index 681ac48850..15c3ba2f37 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TabStrip.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TabStrip.xaml
@@ -1,32 +1,34 @@
-<Styles xmlns="https://github.com/avaloniaui">
-  <Design.PreviewWith>
-    <Border Padding="20">
-      <TabStrip>
-        <TabStripItem>Item 1</TabStripItem>
-        <TabStripItem>Item 2</TabStripItem>
-        <TabStripItem IsEnabled="False">Disabled</TabStripItem>
-      </TabStrip>
-    </Border>
-  </Design.PreviewWith>
-  <Style Selector="TabStrip">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}"
-                Padding="{TemplateBinding Padding}">
-          <ItemsPresenter Name="PART_ItemsPresenter"
-                          Items="{TemplateBinding Items}"
-                          ItemsPanel="{TemplateBinding ItemsPanel}"
-                          ItemTemplate="{TemplateBinding ItemTemplate}" />
-        </Border>
-      </ControlTemplate>
-    </Setter>
-    <Setter Property="ItemsPanel">
-      <ItemsPanelTemplate>
-        <WrapPanel />
-      </ItemsPanelTemplate>
-    </Setter>
-  </Style>
-</Styles>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Design.PreviewWith>
+      <Border Padding="20">
+        <TabStrip>
+          <TabStripItem>Item 1</TabStripItem>
+          <TabStripItem>Item 2</TabStripItem>
+          <TabStripItem IsEnabled="False">Disabled</TabStripItem>
+        </TabStrip>
+      </Border>
+    </Design.PreviewWith>
+  
+    <ControlTheme x:Key="{x:Type TabStrip}" TargetType="TabStrip">
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}"
+                  Padding="{TemplateBinding Padding}">
+            <ItemsPresenter Name="PART_ItemsPresenter"
+                            Items="{TemplateBinding Items}"
+                            ItemsPanel="{TemplateBinding ItemsPanel}"
+                            ItemTemplate="{TemplateBinding ItemTemplate}" />
+          </Border>
+        </ControlTemplate>
+      </Setter>
+      <Setter Property="ItemsPanel">
+        <ItemsPanelTemplate>
+          <WrapPanel />
+        </ItemsPanelTemplate>
+      </Setter>
+    </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/TabStripItem.xaml b/src/Avalonia.Themes.Fluent/Controls/TabStripItem.xaml
index 59f68a1547..5ccd430d33 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TabStripItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TabStripItem.xaml
@@ -1,107 +1,108 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        x:CompileBindings="True">
-  <Design.PreviewWith>
-    <Border Padding="20">
-      <StackPanel Spacing="20">
-        <TabStripItem>Leaf</TabStripItem>
-        <TabStripItem IsSelected="True">Arch</TabStripItem>
-      </StackPanel>
-    </Border>
-  </Design.PreviewWith>
-  <Styles.Resources>
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    x:CompileBindings="True">
+     <Design.PreviewWith>
+      <Border Padding="20">
+        <StackPanel Spacing="20">
+          <TabStripItem>Leaf</TabStripItem>
+          <TabStripItem IsSelected="True">Arch</TabStripItem>
+        </StackPanel>
+      </Border>
+    </Design.PreviewWith>
+  
     <x:Double x:Key="TabStripItemMinHeight">48</x:Double>
     <x:Double x:Key="TabStripItemPipeThickness">2</x:Double>
-  </Styles.Resources>
 
-  <Style Selector="TabStripItem">
-    <Setter Property="FontSize" Value="{DynamicResource TabItemHeaderFontSize}" />
-    <Setter Property="FontWeight" Value="{DynamicResource TabItemHeaderThemeFontWeight}" />
-    <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundUnselected}" />
-    <Setter Property="Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselected}" />
-    <Setter Property="Padding" Value="{DynamicResource TabItemHeaderMargin}" />
-    <Setter Property="Margin" Value="0" />
-    <Setter Property="MinHeight" Value="{DynamicResource TabStripItemMinHeight}" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Name="PART_LayoutRoot"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}"
-                Padding="{TemplateBinding Padding}">
-          <Panel>
-            <ContentPresenter Name="PART_ContentPresenter"
-                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                              Content="{TemplateBinding Content}"
-                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                              FontFamily="{TemplateBinding FontFamily}"
-                              FontSize="{TemplateBinding FontSize}"
-                              FontWeight="{TemplateBinding FontWeight}" />
-            <Border Name="PART_SelectedPipe"
-                    Background="{DynamicResource TabItemHeaderSelectedPipeFill}" />
-          </Panel>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
+    <ControlTheme x:Key="{x:Type TabStripItem}" TargetType="TabStripItem">
+        <Setter Property="FontSize" Value="{DynamicResource TabItemHeaderFontSize}" />
+        <Setter Property="FontWeight" Value="{DynamicResource TabItemHeaderThemeFontWeight}" />
+        <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundUnselected}" />
+        <Setter Property="Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselected}" />
+        <Setter Property="Padding" Value="{DynamicResource TabItemHeaderMargin}" />
+        <Setter Property="Margin" Value="0" />
+        <Setter Property="MinHeight" Value="{DynamicResource TabStripItemMinHeight}" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Template">
+            <ControlTemplate>
+                <Border
+                    Name="PART_LayoutRoot"
+                    Padding="{TemplateBinding Padding}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    CornerRadius="{TemplateBinding CornerRadius}">
+                    <Panel>
+                        <ContentPresenter
+                            Name="PART_ContentPresenter"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            Content="{TemplateBinding Content}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            FontFamily="{TemplateBinding FontFamily}"
+                            FontSize="{TemplateBinding FontSize}"
+                            FontWeight="{TemplateBinding FontWeight}" />
+                        <Border Name="PART_SelectedPipe" Background="{DynamicResource TabItemHeaderSelectedPipeFill}" />
+                    </Panel>
+                </Border>
+            </ControlTemplate>
+        </Setter>
 
-  <Style Selector="TabStripItem /template/ Border#PART_SelectedPipe">
-    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-  </Style>
+        <Style Selector="^ /template/ Border#PART_SelectedPipe">
+            <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+        </Style>
 
-  <!--  Nornal state  -->
-  <Style Selector="TabStripItem /template/ Border#PART_LayoutRoot">
-    <Setter Property="Background" Value="{Binding $parent[TabStripItem].Background}" />
-  </Style>
-  <Style Selector="TabStripItem /template/ Border#PART_SelectedPipe">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-  <Style Selector="TabStripItem /template/ Border#PART_SelectedPipe, TabItem[TabStripPlacement=Bottom] /template/ Border#PART_SelectedPipe">
-    <Setter Property="Height" Value="{DynamicResource TabStripItemPipeThickness}" />
-    <Setter Property="Margin" Value="0,0,0,2" />
-    <Setter Property="HorizontalAlignment" Value="Stretch" />
-    <Setter Property="VerticalAlignment" Value="Bottom" />
-  </Style>
+        <!--  Nornal state  -->
+        <Style Selector="^ /template/ Border#PART_LayoutRoot">
+            <Setter Property="Background" Value="{Binding $parent[TabStripItem].Background}" />
+        </Style>
+        <Style Selector="^ /template/ Border#PART_SelectedPipe">
+            <Setter Property="IsVisible" Value="False" />
+        </Style>
+        <Style Selector="^ /template/ Border#PART_SelectedPipe">
+            <Setter Property="Height" Value="{DynamicResource TabStripItemPipeThickness}" />
+            <Setter Property="Margin" Value="0,0,0,2" />
+            <Setter Property="HorizontalAlignment" Value="Stretch" />
+            <Setter Property="VerticalAlignment" Value="Bottom" />
+        </Style>
 
-  <!--  Selected state  -->
-  <!--  We don't use selector to PART_LayoutRoot, so developer can override selected item background with TabStripItem.Background  -->
-  <Style Selector="TabStripItem:selected">
-    <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundSelected}" />
-    <Setter Property="Foreground" Value="{DynamicResource TabItemHeaderForegroundSelected}" />
-  </Style>
-  <Style Selector="TabStripItem:selected /template/ Border#PART_SelectedPipe">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
+        <!--  Selected state  -->
+        <!--  We don't use selector to PART_LayoutRoot, so developer can override selected item background with TabStripItem.Background  -->
+        <Style Selector="^:selected">
+            <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundSelected}" />
+            <Setter Property="Foreground" Value="{DynamicResource TabItemHeaderForegroundSelected}" />
+        </Style>
+        <Style Selector="^:selected /template/ Border#PART_SelectedPipe">
+            <Setter Property="IsVisible" Value="True" />
+        </Style>
 
-  <!--  PointerOver state  -->
-  <Style Selector="TabStripItem:pointerover /template/ Border#PART_LayoutRoot">
-    <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundUnselectedPointerOver}" />
-    <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPointerOver}" />
-  </Style>
+        <!--  PointerOver state  -->
+        <Style Selector="^:pointerover /template/ Border#PART_LayoutRoot">
+            <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundUnselectedPointerOver}" />
+            <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPointerOver}" />
+        </Style>
 
-  <!--  Selected PointerOver state  -->
-  <Style Selector="TabStripItem:selected:pointerover /template/ Border#PART_LayoutRoot">
-    <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundSelectedPointerOver}" />
-    <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundSelectedPointerOver}" />
-  </Style>
+        <!--  Selected PointerOver state  -->
+        <Style Selector="^:selected:pointerover /template/ Border#PART_LayoutRoot">
+            <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundSelectedPointerOver}" />
+            <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundSelectedPointerOver}" />
+        </Style>
 
-  <!--  Pressed state  -->
-  <Style Selector="TabStripItem:pressed /template/ Border#PART_LayoutRoot">
-    <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundUnselectedPressed}" />
-    <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPressed}" />
-  </Style>
+        <!--  Pressed state  -->
+        <Style Selector="^:pressed /template/ Border#PART_LayoutRoot">
+            <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundUnselectedPressed}" />
+            <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPressed}" />
+        </Style>
 
-  <!--  Selected Pressed state  -->
-  <Style Selector="TabStripItem:selected:pressed /template/ Border#PART_LayoutRoot">
-    <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundSelectedPressed}" />
-    <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundSelectedPressed}" />
-  </Style>
+        <!--  Selected Pressed state  -->
+        <Style Selector="^:selected:pressed /template/ Border#PART_LayoutRoot">
+            <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundSelectedPressed}" />
+            <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundSelectedPressed}" />
+        </Style>
 
-  <!--  Disabled state  -->
-  <Style Selector="TabStripItem:disabled /template/ Border#PART_LayoutRoot">
-    <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundDisabled}" />
-    <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundDisabled}" />
-  </Style>
-</Styles>
+        <!--  Disabled state  -->
+        <Style Selector="^:disabled /template/ Border#PART_LayoutRoot">
+            <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundDisabled}" />
+            <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundDisabled}" />
+        </Style>
+    </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml b/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
index 40d9b11f7c..0fd3758d77 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
@@ -1,4 +1,4 @@
-<Styles xmlns="https://github.com/avaloniaui" 
+<Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         x:CompileBindings="True">
   <Design.PreviewWith>
@@ -10,7 +10,7 @@
                TextAlignment="Center"/>
     </Border>
   </Design.PreviewWith>
-  
+
   <Styles.Resources>
     <Thickness x:Key="TextBoxTopHeaderMargin">0,0,0,4</Thickness>
     <StreamGeometry x:Key="TextBoxClearButtonData">M 11.416016,10 20,1.4160156 18.583984,0 10,8.5839846 1.4160156,0 0,1.4160156 8.5839844,10 0,18.583985 1.4160156,20 10,11.416015 18.583984,20 20,18.583985 Z</StreamGeometry>
@@ -36,7 +36,7 @@
     <Setter Property="CaretBrush" Value="{DynamicResource TextControlForeground}" />
     <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrush}" />
     <Setter Property="SelectionBrush" Value="{DynamicResource TextControlSelectionHighlightColor}" />
-    <Setter Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThickness}" />    
+    <Setter Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThickness}" />
     <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
     <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
     <Setter Property="MinHeight" Value="{DynamicResource TextControlThemeMinHeight}" />
@@ -73,32 +73,32 @@
                                 VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}"
                                 IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
                                 AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}">
-                      <Panel>
-                        <TextBlock Name="PART_Watermark"
-                                Opacity="0.5"
-                                Text="{TemplateBinding Watermark}"
-                                TextAlignment="{TemplateBinding TextAlignment}"
-                                TextWrapping="{TemplateBinding TextWrapping}"
-                                IsVisible="{TemplateBinding Text, Converter={x:Static StringConverters.IsNullOrEmpty}}"
-                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" 
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-                        <TextPresenter Name="PART_TextPresenter"
-                                      Text="{TemplateBinding Text, Mode=TwoWay}"
-                                      CaretIndex="{TemplateBinding CaretIndex}"
-                                      SelectionStart="{TemplateBinding SelectionStart}"
-                                      SelectionEnd="{TemplateBinding SelectionEnd}"
-                                      TextAlignment="{TemplateBinding TextAlignment}"
-                                      TextWrapping="{TemplateBinding TextWrapping}"
-                                      LineHeight="{TemplateBinding LineHeight}"
-                                      PasswordChar="{TemplateBinding PasswordChar}"
-                                      RevealPassword="{TemplateBinding RevealPassword}"
-                                      SelectionBrush="{TemplateBinding SelectionBrush}"
-                                      SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
-                                      CaretBrush="{TemplateBinding CaretBrush}"
-                                      HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" 
-                                      VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/> 
-                      </Panel>
-                    </ScrollViewer>
+                    <Panel>
+                      <TextBlock Name="PART_Watermark"
+                              Opacity="0.5"
+                              Text="{TemplateBinding Watermark}"
+                              TextAlignment="{TemplateBinding TextAlignment}"
+                              TextWrapping="{TemplateBinding TextWrapping}"
+                              IsVisible="{TemplateBinding Text, Converter={x:Static StringConverters.IsNullOrEmpty}}"
+                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                      <TextPresenter Name="PART_TextPresenter"
+                                    Text="{TemplateBinding Text, Mode=TwoWay}"
+                                    CaretIndex="{TemplateBinding CaretIndex}"
+                                    SelectionStart="{TemplateBinding SelectionStart}"
+                                    SelectionEnd="{TemplateBinding SelectionEnd}"
+                                    TextAlignment="{TemplateBinding TextAlignment}"
+                                    TextWrapping="{TemplateBinding TextWrapping}"
+                                    LineHeight="{TemplateBinding LineHeight}"
+                                    PasswordChar="{TemplateBinding PasswordChar}"
+                                    RevealPassword="{TemplateBinding RevealPassword}"
+                                    SelectionBrush="{TemplateBinding SelectionBrush}"
+                                    SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
+                                    CaretBrush="{TemplateBinding CaretBrush}"
+                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                    </Panel>
+                  </ScrollViewer>
                 </DockPanel>
                 <ContentPresenter Grid.Column="2" Grid.ColumnSpan="1" Content="{TemplateBinding InnerRightContent}"/>
               </Grid>
@@ -159,7 +159,7 @@
   <Style Selector="TextBox /template/ DockPanel#PART_InnerDockPanel">
     <Setter Property="Cursor" Value="IBeam" />
   </Style>
-  
+
   <Style Selector="TextBox /template/ TextBlock#PART_FloatingWatermark">
     <Setter Property="IsVisible" Value="False" />
   </Style>
@@ -237,7 +237,7 @@
     <Setter Property="MinWidth" Value="34" />
     <Setter Property="Width" Value="{Binding $self.Bounds.Height}"/>
     <Setter Property="Focusable" Value="False" />
-    <Setter Property="VerticalAlignment" Value="Stretch" />    
+    <Setter Property="VerticalAlignment" Value="Stretch" />
   </Style>
   <Style Selector="Button.textBoxClearButton /template/ Border#PART_ButtonLayoutBorder,
                    ToggleButton.passwordBoxRevealButton /template/ Border#PART_ButtonLayoutBorder">
diff --git a/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml b/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml
index e03dc76f16..69b2d32dda 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml
@@ -1,14 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 // (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.
 -->
-
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:sys="clr-namespace:System;assembly=netstandard"
-        x:CompileBindings="True">
+<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:sys="clr-namespace:System;assembly=netstandard" x:CompileBindings="True">
   <Styles.Resources>
     <x:Double x:Key="TimePickerFlyoutPresenterItemHeight">40</x:Double>
     <x:Double x:Key="TimePickerSpacerThemeWidth">1</x:Double>
@@ -20,273 +17,147 @@
     <x:Double x:Key="TimePickerThemeMaxWidth">456</x:Double>
     <Thickness x:Key="TimePickerFlyoutPresenterItemPadding">0,3,0,6</Thickness>
     <Thickness x:Key="TimePickerHostPadding">0,3,0,6</Thickness>
-  </Styles.Resources>
-
-  <Style Selector="ListBoxItem.DateTimePickerItem.HourItem">
-    <Setter Property="Padding" Value="{DynamicResource TimePickerFlyoutPresenterItemPadding}" />
-  </Style>
-  <Style Selector="ListBoxItem.DateTimePickerItem.MinuteItem">
-    <Setter Property="Padding" Value="{DynamicResource TimePickerFlyoutPresenterItemPadding}" />
-  </Style>
-  <Style Selector="ListBoxItem.DateTimePickerItem.TimePeriodItem">
-    <Setter Property="Padding" Value="{DynamicResource TimePickerFlyoutPresenterItemPadding}" />
-  </Style>
-
-  <Style Selector="TimePicker">    
-    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-    <Setter Property="Foreground" Value="{DynamicResource TimePickerButtonForeground}" />
-    <Setter Property="Background" Value="{DynamicResource TimePickerButtonBackground}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource TimePickerButtonBorderBrush}"/>
-    <Setter Property="BorderThickness" Value="{DynamicResource TimePickerBorderThemeThickness}"/>
-    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-    <Setter Property="HorizontalAlignment" Value="Left" />
-    <Setter Property="VerticalAlignment" Value="Center" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <DataValidationErrors>
-          <Grid Name="LayoutRoot" Margin="{TemplateBinding Padding}" RowDefinitions="Auto,*">
-            <ContentPresenter x:Name="HeaderContentPresenter"
-                   Grid.Row="0"
-                   Content="{TemplateBinding Header}"
-                   ContentTemplate="{TemplateBinding HeaderTemplate}"
-                   Margin="{DynamicResource TimePickerTopHeaderMargin}"
-                   MaxWidth="{DynamicResource TimePickerThemeMaxWidth}"
-                   Foreground="{DynamicResource TimePickerHeaderForeground}"
-                   HorizontalAlignment="Stretch"
-                   VerticalAlignment="Top" />
-
-            <Button x:Name="FlyoutButton"
-                    Grid.Row="1"
-                    Foreground="{TemplateBinding Foreground}"
-                    Background="{TemplateBinding Background}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    CornerRadius="{TemplateBinding CornerRadius}"
-                    IsEnabled="{TemplateBinding IsEnabled}"
-                    MinWidth="{DynamicResource TimePickerThemeMinWidth}"
-                    MaxWidth="{DynamicResource TimePickerThemeMaxWidth}"
-                    HorizontalAlignment="Stretch"
-                    HorizontalContentAlignment="Stretch"
-                    VerticalAlignment="Top"
-                    VerticalContentAlignment="Stretch">
-              <Button.Template>
-                <ControlTemplate>
-                  <ContentPresenter Name="ContentPresenter"
-                                  BorderBrush="{TemplateBinding BorderBrush}"
-                                  Background="{TemplateBinding Background}"
-                                  BorderThickness="{TemplateBinding BorderThickness}"
-                                  CornerRadius="{TemplateBinding CornerRadius}"
-                                  Content="{TemplateBinding Content}"
-                                  Foreground="{TemplateBinding Foreground}"
-                                  HorizontalContentAlignment="Stretch"
-                                  VerticalContentAlignment="Stretch" />
-                </ControlTemplate>
-              </Button.Template>
-
-              <Grid Name="FlyoutButtonContentGrid">
+    <ControlTheme x:Key="FluentTimePicker" TargetType="TimePicker">
+      <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+      <Setter Property="Foreground" Value="{DynamicResource TimePickerButtonForeground}" />
+      <Setter Property="Background" Value="{DynamicResource TimePickerButtonBackground}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource TimePickerButtonBorderBrush}" />
+      <Setter Property="BorderThickness" Value="{DynamicResource TimePickerBorderThemeThickness}" />
+      <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+      <Setter Property="HorizontalAlignment" Value="Left" />
+      <Setter Property="VerticalAlignment" Value="Center" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <DataValidationErrors>
+            <Grid Name="LayoutRoot" Margin="{TemplateBinding Padding}" RowDefinitions="Auto,*">
+              <ContentPresenter x:Name="HeaderContentPresenter" Grid.Row="0" Content="{TemplateBinding Header}" ContentTemplate="{TemplateBinding HeaderTemplate}" Margin="{DynamicResource TimePickerTopHeaderMargin}" MaxWidth="{DynamicResource TimePickerThemeMaxWidth}" Foreground="{DynamicResource TimePickerHeaderForeground}" HorizontalAlignment="Stretch" VerticalAlignment="Top" />
+              <Button x:Name="FlyoutButton" Grid.Row="1" Foreground="{TemplateBinding Foreground}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" IsEnabled="{TemplateBinding IsEnabled}" MinWidth="{DynamicResource TimePickerThemeMinWidth}" MaxWidth="{DynamicResource TimePickerThemeMaxWidth}" HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch" VerticalAlignment="Top" VerticalContentAlignment="Stretch">
+                <Button.Template>
+                  <ControlTemplate>
+                    <ContentPresenter Name="ContentPresenter" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" Content="{TemplateBinding Content}" Foreground="{TemplateBinding Foreground}" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" />
+                  </ControlTemplate>
+                </Button.Template>
+                <Grid Name="FlyoutButtonContentGrid">
+                  <!--Ignore col defs here, set in code-->
+                  <Border x:Name="FirstPickerHost" Grid.Column="0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                    <TextBlock x:Name="HourTextBlock" HorizontalAlignment="Center" Padding="{DynamicResource TimePickerHostPadding}" FontFamily="{TemplateBinding FontFamily}" FontWeight="{TemplateBinding FontWeight}" FontSize="{TemplateBinding FontSize}" />
+                  </Border>
+                  <Rectangle Name="FirstColumnDivider" Fill="{DynamicResource TimePickerSpacerFill}" HorizontalAlignment="Center" Width="{DynamicResource TimePickerSpacerThemeWidth}" Grid.Column="1" />
+                  <Border x:Name="SecondPickerHost" Grid.Column="2" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                    <TextBlock x:Name="MinuteTextBlock" HorizontalAlignment="Center" Padding="{DynamicResource TimePickerHostPadding}" FontFamily="{TemplateBinding FontFamily}" FontWeight="{TemplateBinding FontWeight}" FontSize="{TemplateBinding FontSize}" />
+                  </Border>
+                  <Rectangle Name="SecondColumnDivider" Fill="{DynamicResource TimePickerSpacerFill}" HorizontalAlignment="Center" Width="{DynamicResource TimePickerSpacerThemeWidth}" Grid.Column="3" />
+                  <Border x:Name="ThirdPickerHost" Grid.Column="4" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                    <TextBlock x:Name="PeriodTextBlock" HorizontalAlignment="Center" Padding="{DynamicResource TimePickerHostPadding}" FontFamily="{TemplateBinding FontFamily}" FontWeight="{TemplateBinding FontWeight}" FontSize="{TemplateBinding FontSize}" />
+                  </Border>
+                </Grid>
+              </Button>
+              <Popup Name="Popup" WindowManagerAddShadowHint="False" IsLightDismissEnabled="True" PlacementTarget="{TemplateBinding}" PlacementMode="Bottom">
+                <TimePickerPresenter Name="PickerPresenter" />
+              </Popup>
+            </Grid>
+          </DataValidationErrors>
+        </ControlTemplate>
+      </Setter>
+      <Style Selector="^:hasnotime /template/ Button#FlyoutButton TextBlock">
+        <Setter Property="Foreground" Value="{DynamicResource TextControlPlaceholderForeground}" />
+      </Style>
+      <!--<Style Selector="^:error /template/ Button#FlyoutButton /template/ ContentPresenter">
+        <Setter Property="BorderBrush" Value="{DynamicResource SystemControlErrorTextForegroundBrush}" />
+      </Style>
+      <Style Selector="^ /template/ Button">
+        <Style Selector="^#FlyoutButton:pointerover /template/ ContentPresenter">
+          <Setter Property="Background" Value="{DynamicResource TimePickerButtonBackgroundPointerOver}" />
+          <Setter Property="BorderBrush" Value="{DynamicResource TimePickerButtonBorderBrushPointerOver}" />
+          <Setter Property="Foreground" Value="{DynamicResource TimePickerButtonForegroundPointerOver}" />
+        </Style>
+        <Style Selector="^:pressed /template/ ContentPresenter">
+          <Setter Property="Background" Value="{DynamicResource TimePickerButtonBackgroundPressed}" />
+          <Setter Property="BorderBrush" Value="{DynamicResource TimePickerButtonBorderBrushPressed}" />
+          <Setter Property="Foreground" Value="{DynamicResource TimePickerButtonForegroundPressed}" />
+        </Style>
+        <Style Selector="^:disabled /template/ ContentPresenter">
+          <Setter Property="Background" Value="{DynamicResource TimePickerButtonBackgroundDisabled}" />
+          <Setter Property="BorderBrush" Value="{DynamicResource TimePickerButtonBorderBrushDisabled}" />
+          <Setter Property="Foreground" Value="{DynamicResource TimePickerButtonForegroundDisabled}" />
+        </Style>
+      </Style>-->
+      <Style Selector="^:disabled /template/">
+        <Style Selector="^ ContentPresenter#HeaderContentPresenter">
+          <Setter Property="Foreground" Value="{DynamicResource TimePickerHeaderForegroundDisabled}" />
+        </Style>
+        <Style Selector="^ Rectangle">
+          <Setter Property="Fill" Value="{DynamicResource TimePickerSpacerFillDisabled}" />
+        </Style>
+      </Style>
+    </ControlTheme>
+    <ControlTheme x:Key="FluentTimePickerPresenter" TargetType="TimePickerPresenter">
+      <Setter Property="Width" Value="242" />
+      <Setter Property="MinWidth" Value="242" />
+      <Setter Property="MaxHeight" Value="398" />
+      <Setter Property="FontWeight" Value="Normal" />
+      <Setter Property="Background" Value="{DynamicResource TimePickerFlyoutPresenterBackground}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource TimePickerFlyoutPresenterBorderBrush}" />
+      <Setter Property="BorderThickness" Value="{DynamicResource DateTimeFlyoutBorderThickness}" />
+      <Setter Property="CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border Name="Background" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" Padding="{DynamicResource DateTimeFlyoutBorderPadding}" MaxHeight="398">
+            <Grid Name="ContentPanel" RowDefinitions="*,Auto">
+              <Grid Name="PickerContainer">
                 <!--Ignore col defs here, set in code-->
-                <Border x:Name="FirstPickerHost" Grid.Column="0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                  <TextBlock x:Name="HourTextBlock"
-                      HorizontalAlignment="Center"
-                      Padding="{DynamicResource TimePickerHostPadding}"
-                      FontFamily="{TemplateBinding FontFamily}"
-                      FontWeight="{TemplateBinding FontWeight}"
-                      FontSize="{TemplateBinding FontSize}" />
-                </Border>
-
-                <Rectangle Name="FirstColumnDivider"
-                    Fill="{DynamicResource TimePickerSpacerFill}"
-                    HorizontalAlignment="Center"
-                    Width="{DynamicResource TimePickerSpacerThemeWidth}"
-                    Grid.Column="1" />
-
-                <Border x:Name="SecondPickerHost" Grid.Column="2" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                  <TextBlock x:Name="MinuteTextBlock"
-                      HorizontalAlignment="Center"
-                      Padding="{DynamicResource TimePickerHostPadding}"
-                      FontFamily="{TemplateBinding FontFamily}"
-                      FontWeight="{TemplateBinding FontWeight}"
-                      FontSize="{TemplateBinding FontSize}"/>
-                </Border>
-
-                <Rectangle Name="SecondColumnDivider"
-                    Fill="{DynamicResource TimePickerSpacerFill}"
-                    HorizontalAlignment="Center"
-                    Width="{DynamicResource TimePickerSpacerThemeWidth}"
-                    Grid.Column="3" />
-
-                <Border x:Name="ThirdPickerHost" Grid.Column="4" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                  <TextBlock x:Name="PeriodTextBlock"
-                      HorizontalAlignment="Center"
-                      Padding="{DynamicResource TimePickerHostPadding}"
-                      FontFamily="{TemplateBinding FontFamily}"
-                      FontWeight="{TemplateBinding FontWeight}"
-                      FontSize="{TemplateBinding FontSize}" />
-                </Border>
+                <Panel Name="HourHost" Grid.Column="0">
+                  <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Hidden">
+                    <DateTimePickerPanel Name="HourSelector" PanelType="Hour" ShouldLoop="True" ItemHeight="{DynamicResource TimePickerFlyoutPresenterItemHeight}" />
+                  </ScrollViewer>
+                  <RepeatButton Name="HourUpButton" Classes="DateTimeFlyoutButtonStyle UpButton" />
+                  <RepeatButton Name="HourDownButton" Classes="DateTimeFlyoutButtonStyle DownButton" />
+                </Panel>
+                <Panel Name="MinuteHost" Grid.Column="2">
+                  <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Hidden">
+                    <DateTimePickerPanel Name="MinuteSelector" PanelType="Minute" ShouldLoop="True" ItemHeight="{DynamicResource TimePickerFlyoutPresenterItemHeight}" />
+                  </ScrollViewer>
+                  <RepeatButton Name="MinuteUpButton" Classes="DateTimeFlyoutButtonStyle UpButton" />
+                  <RepeatButton Name="MinuteDownButton" Classes="DateTimeFlyoutButtonStyle DownButton" />
+                </Panel>
+                <Panel Name="PeriodHost" Grid.Column="4">
+                  <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Hidden">
+                    <DateTimePickerPanel Name="PeriodSelector" PanelType="TimePeriod" ShouldLoop="False" ItemHeight="{DynamicResource TimePickerFlyoutPresenterItemHeight}" />
+                  </ScrollViewer>
+                  <RepeatButton Name="PeriodUpButton" Classes="DateTimeFlyoutButtonStyle UpButton" />
+                  <RepeatButton Name="PeriodDownButton" Classes="DateTimeFlyoutButtonStyle DownButton" />
+                </Panel>
+                <Rectangle x:Name="HighlightRect" ZIndex="-1" Fill="{DynamicResource TimePickerFlyoutPresenterHighlightFill}" Grid.Column="0" Grid.ColumnSpan="5" VerticalAlignment="Center" Height="{DynamicResource TimePickerFlyoutPresenterHighlightHeight}" />
+                <Rectangle Name="FirstSpacer" Fill="{DynamicResource TimePickerFlyoutPresenterSpacerFill}" HorizontalAlignment="Center" Width="{DynamicResource TimePickerSpacerThemeWidth}" Grid.Column="1" />
+                <Rectangle Name="SecondSpacer" Fill="{DynamicResource TimePickerFlyoutPresenterSpacerFill}" HorizontalAlignment="Center" Width="{DynamicResource TimePickerSpacerThemeWidth}" Grid.Column="3" />
+              </Grid>
+              <Grid Grid.Row="1" Height="{DynamicResource TimePickerFlyoutPresenterAcceptDismissHostGridHeight}" Name="AcceptDismissHostGrid" ColumnDefinitions="*,*">
+                <Rectangle Height="{DynamicResource TimePickerSpacerThemeWidth}" VerticalAlignment="Top" Fill="{DynamicResource TimePickerFlyoutPresenterSpacerFill}" Grid.ColumnSpan="2" />
+                <Button Name="AcceptButton" Grid.Column="0" Classes="DateTimeFlyoutButtonStyle" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                  <Path Stroke="{Binding $parent[Button].Foreground}" StrokeLineCap="Round" StrokeThickness="0.75" Data="M0.5,8.5 5,13.5 15.5,3" />
+                </Button>
+                <Button Name="DismissButton" Grid.Column="1" Classes="DateTimeFlyoutButtonStyle" FontSize="16" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                  <Path Stroke="{Binding $parent[Button].Foreground}" StrokeLineCap="Round" StrokeThickness="0.75" Data="M2,2 14,14 M2,14 14 2" />
+                </Button>
               </Grid>
-            </Button>
-
-            <Popup Name="Popup" WindowManagerAddShadowHint="False"
-                   IsLightDismissEnabled="True" PlacementTarget="{TemplateBinding}"
-                   PlacementMode="Bottom">
-              <TimePickerPresenter Name="PickerPresenter" />
-            </Popup>
-
-          </Grid>
-        </DataValidationErrors>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="TimePicker:disabled /template/ ContentPresenter#HeaderContentPresenter">
-    <Setter Property="Foreground" Value="{DynamicResource TimePickerHeaderForegroundDisabled}"/>
-  </Style>
-  <Style Selector="TimePicker:disabled /template/ Rectangle">
-    <Setter Property="Fill" Value="{DynamicResource TimePickerSpacerFillDisabled}"/>
-  </Style>
-
-  <Style Selector="TimePicker /template/ Button#FlyoutButton:pointerover /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource TimePickerButtonBackgroundPointerOver}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource TimePickerButtonBorderBrushPointerOver}"/>
-    <Setter Property="Foreground" Value="{DynamicResource TimePickerButtonForegroundPointerOver}"/>
-  </Style>
-
-  <Style Selector="TimePicker /template/ Button:pressed /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource TimePickerButtonBackgroundPressed}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource TimePickerButtonBorderBrushPressed}"/>
-    <Setter Property="Foreground" Value="{DynamicResource TimePickerButtonForegroundPressed}"/>
-  </Style>
-
-  <Style Selector="TimePicker /template/ Button:disabled /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource TimePickerButtonBackgroundDisabled}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource TimePickerButtonBorderBrushDisabled}"/>
-    <Setter Property="Foreground" Value="{DynamicResource TimePickerButtonForegroundDisabled}"/>
-  </Style>
-
-  <Style Selector="TimePicker:hasnotime /template/ Button#FlyoutButton TextBlock">
-    <Setter Property="Foreground" Value="{DynamicResource TextControlPlaceholderForeground}"/>
-  </Style>
-  
-  <Style Selector="TimePicker:error /template/ Button#FlyoutButton /template/ ContentPresenter">
-    <Setter Property="BorderBrush" Value="{DynamicResource SystemControlErrorTextForegroundBrush}"/>
-  </Style>
-
-  <Style Selector="TimePickerPresenter">
-    <Setter Property="Width" Value="242" />
-    <Setter Property="MinWidth" Value="242" />
-    <Setter Property="MaxHeight" Value="398" />    
-    <Setter Property="FontWeight" Value="Normal" />
-    <Setter Property="Background" Value="{DynamicResource TimePickerFlyoutPresenterBackground}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource TimePickerFlyoutPresenterBorderBrush}" />
-    <Setter Property="BorderThickness" Value="{DynamicResource DateTimeFlyoutBorderThickness}" />
-    <Setter Property="CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Name="Background"
-                Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}"
-                Padding="{DynamicResource DateTimeFlyoutBorderPadding}"
-                MaxHeight="398">
-          <Grid Name="ContentPanel" RowDefinitions="*,Auto">
-            <Grid Name="PickerContainer">
-              <!--Ignore col defs here, set in code-->
-              <Panel Name="HourHost" Grid.Column="0">
-                <ScrollViewer HorizontalScrollBarVisibility="Disabled"
-                              VerticalScrollBarVisibility="Hidden">
-                  <DateTimePickerPanel Name="HourSelector"
-                                          PanelType="Hour"
-                                          ShouldLoop="True"
-                                          ItemHeight="{DynamicResource TimePickerFlyoutPresenterItemHeight}"/>
-                </ScrollViewer>
-                <RepeatButton Name="HourUpButton"
-                              Classes="DateTimeFlyoutButtonStyle UpButton"/>
-                <RepeatButton Name="HourDownButton"
-                              Classes="DateTimeFlyoutButtonStyle DownButton"/>
-
-              </Panel>
-
-              <Panel Name="MinuteHost" Grid.Column="2">
-                <ScrollViewer HorizontalScrollBarVisibility="Disabled"
-                              VerticalScrollBarVisibility="Hidden">
-                  <DateTimePickerPanel Name="MinuteSelector"
-                                          PanelType="Minute"
-                                          ShouldLoop="True"
-                                          ItemHeight="{DynamicResource TimePickerFlyoutPresenterItemHeight}"/>
-                </ScrollViewer>
-                <RepeatButton Name="MinuteUpButton"
-                              Classes="DateTimeFlyoutButtonStyle UpButton"/>
-                <RepeatButton Name="MinuteDownButton"
-                              Classes="DateTimeFlyoutButtonStyle DownButton"/>
-
-              </Panel>
-
-              <Panel Name="PeriodHost" Grid.Column="4">
-                <ScrollViewer HorizontalScrollBarVisibility="Disabled"
-                              VerticalScrollBarVisibility="Hidden">
-                  <DateTimePickerPanel Name="PeriodSelector"
-                                          PanelType="TimePeriod"
-                                          ShouldLoop="False"
-                                          ItemHeight="{DynamicResource TimePickerFlyoutPresenterItemHeight}"/>
-                </ScrollViewer>
-                <RepeatButton Name="PeriodUpButton"
-                              Classes="DateTimeFlyoutButtonStyle UpButton"/>
-                <RepeatButton Name="PeriodDownButton"
-                              Classes="DateTimeFlyoutButtonStyle DownButton"/>
-
-              </Panel>
-
-              <Rectangle x:Name="HighlightRect" ZIndex="-1"
-                      Fill="{DynamicResource TimePickerFlyoutPresenterHighlightFill}"
-                      Grid.Column="0"
-                      Grid.ColumnSpan="5"
-                      VerticalAlignment="Center"
-                      Height="{DynamicResource TimePickerFlyoutPresenterHighlightHeight}" />
-
-              <Rectangle Name="FirstSpacer"
-                  Fill="{DynamicResource TimePickerFlyoutPresenterSpacerFill}"
-                  HorizontalAlignment="Center"
-                  Width="{DynamicResource TimePickerSpacerThemeWidth}"
-                  Grid.Column="1" />
-
-              <Rectangle Name="SecondSpacer"
-                  Fill="{DynamicResource TimePickerFlyoutPresenterSpacerFill}"
-                  HorizontalAlignment="Center"
-                  Width="{DynamicResource TimePickerSpacerThemeWidth}"
-                  Grid.Column="3" />
-            </Grid>
-
-            <Grid Grid.Row="1" Height="{DynamicResource TimePickerFlyoutPresenterAcceptDismissHostGridHeight}"
-                  Name="AcceptDismissHostGrid" ColumnDefinitions="*,*">
-              <Rectangle Height="{DynamicResource TimePickerSpacerThemeWidth}"
-                      VerticalAlignment="Top"
-                      Fill="{DynamicResource TimePickerFlyoutPresenterSpacerFill}"
-                      Grid.ColumnSpan="2" />
-              <Button Name="AcceptButton" Grid.Column="0" Classes="DateTimeFlyoutButtonStyle"
-                          HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                <Path Stroke="{Binding $parent[Button].Foreground}" StrokeLineCap="Round"
-                      StrokeThickness="0.75" Data="M0.5,8.5 5,13.5 15.5,3" />
-              </Button>
-              <Button Name="DismissButton" Grid.Column="1" Classes="DateTimeFlyoutButtonStyle"
-                         FontSize="16" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                <Path Stroke="{Binding $parent[Button].Foreground}" StrokeLineCap="Round"
-                      StrokeThickness="0.75" Data="M2,2 14,14 M2,14 14 2" />
-              </Button>
             </Grid>
-
-          </Grid>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="TimePickerPresenter /template/ Panel RepeatButton">
-    <Setter Property="IsVisible" Value="False" />
+          </Border>
+        </ControlTemplate>
+      </Setter>
+      <Style Selector="^ /template/ Panel">
+        <Style Selector="^ RepeatButton">
+          <Setter Property="IsVisible" Value="False" />
+        </Style>
+        <Style Selector="^:pointerover RepeatButton">
+          <Setter Property="IsVisible" Value="True" />
+        </Style>
+      </Style>
+    </ControlTheme>
+  </Styles.Resources>
+  <Style Selector="TimePicker">
+    <Setter Property="Theme" Value="{StaticResource FluentTimePicker}" />
   </Style>
-
-  <Style Selector="TimePickerPresenter /template/ Panel:pointerover RepeatButton">
-    <Setter Property="IsVisible" Value="True" />
+  <Style Selector="TimePickerPresenter">
+    <Setter Property="Theme" Value="{StaticResource FluentTimePickerPresenter}" />
   </Style>
-  
 </Styles>
diff --git a/src/Avalonia.Themes.Fluent/Controls/TitleBar.xaml b/src/Avalonia.Themes.Fluent/Controls/TitleBar.xaml
index 4dba5b4ba4..2b97df020f 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TitleBar.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TitleBar.xaml
@@ -1,53 +1,55 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Design.PreviewWith>
-    <Border>
-      <TitleBar Background="SkyBlue" Height="30" Width="300" Foreground="Black" />
-    </Border>
-  </Design.PreviewWith>
-  <Style Selector="TitleBar">
-    <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>    
-    <Setter Property="VerticalAlignment" Value="Top" />
-    <Setter Property="HorizontalAlignment" Value="Stretch" />
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Panel HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="Stretch">
-          <Panel x:Name="PART_MouseTracker" Height="1" VerticalAlignment="Top" />
-          <Panel x:Name="PART_Container">
-            <Border x:Name="PART_Background" Background="{TemplateBinding Background}" />
-            <CaptionButtons x:Name="PART_CaptionButtons" VerticalAlignment="Top" HorizontalAlignment="Right" Foreground="{TemplateBinding Foreground}" />
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Design.PreviewWith>
+      <Border>
+        <TitleBar Background="SkyBlue" Height="30" Width="300" Foreground="Black" />
+      </Border>
+    </Design.PreviewWith>
+
+    <ControlTheme x:Key="{x:Type TitleBar}" TargetType="TitleBar">
+      <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}" />
+      <Setter Property="VerticalAlignment" Value="Top" />
+      <Setter Property="HorizontalAlignment" Value="Stretch" />
+      <Setter Property="Background" Value="Transparent" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Panel HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="Stretch">
+            <Panel x:Name="PART_MouseTracker" Height="1" VerticalAlignment="Top" />
+            <Panel x:Name="PART_Container">
+              <Border x:Name="PART_Background" Background="{TemplateBinding Background}" />
+              <CaptionButtons x:Name="PART_CaptionButtons" VerticalAlignment="Top" HorizontalAlignment="Right" Foreground="{TemplateBinding Foreground}" />
+            </Panel>
           </Panel>
-        </Panel>
-      </ControlTemplate>
-    </Setter>
-  </Style>
+        </ControlTemplate>
+      </Setter>
 
-  <Style Selector="TitleBar:fullscreen">
-    <Setter Property="Background" Value="{DynamicResource SystemAccentColor}" />
-  </Style>
+      <Style Selector="^:fullscreen">
+        <Setter Property="Background" Value="{DynamicResource SystemAccentColor}" />
+      </Style>
 
-  <Style Selector="TitleBar /template/ Border#PART_Background">
-    <Setter Property="IsHitTestVisible" Value="False" />
-  </Style>
+      <Style Selector="^ /template/ Border#PART_Background">
+        <Setter Property="IsHitTestVisible" Value="False" />
+      </Style>
 
-  <Style Selector="TitleBar:fullscreen /template/ Border#PART_Background">
-    <Setter Property="IsHitTestVisible" Value="True" />
-  </Style>
+      <Style Selector="^:fullscreen /template/ Border#PART_Background">
+        <Setter Property="IsHitTestVisible" Value="True" />
+      </Style>
 
-  <Style Selector="TitleBar:fullscreen /template/ Panel#PART_MouseTracker">
-    <Setter Property="Background" Value="Transparent" />
-  </Style>
+      <Style Selector="^:fullscreen /template/ Panel#PART_MouseTracker">
+        <Setter Property="Background" Value="Transparent" />
+      </Style>
 
-  <Style Selector="TitleBar:fullscreen /template/ Panel#PART_Container">
-    <Setter Property="RenderTransform" Value="translateY(-30px)" />
-    <Setter Property="Transitions">
-      <Transitions>
-        <TransformOperationsTransition Property="RenderTransform" Duration="0:0:.25" />
-      </Transitions>
-    </Setter>
-  </Style>
+      <Style Selector="^:fullscreen /template/ Panel#PART_Container">
+        <Setter Property="RenderTransform" Value="translateY(-30px)" />
+        <Setter Property="Transitions">
+          <Transitions>
+            <TransformOperationsTransition Property="RenderTransform" Duration="0:0:.25" />
+          </Transitions>
+        </Setter>
+      </Style>
 
-  <Style Selector="TitleBar:fullscreen:pointerover /template/ Panel#PART_Container">
-    <Setter Property="RenderTransform" Value="none" />
-  </Style>
-</Styles>
+      <Style Selector="^:fullscreen:pointerover /template/ Panel#PART_Container">
+        <Setter Property="RenderTransform" Value="none" />
+      </Style>
+    </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ToggleButton.xaml b/src/Avalonia.Themes.Fluent/Controls/ToggleButton.xaml
index e0d54d7232..b53980b792 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ToggleButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ToggleButton.xaml
@@ -1,5 +1,5 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Design.PreviewWith>
     <Border Padding="20">
       <StackPanel Spacing="20">
@@ -10,104 +10,111 @@
     </Border>
   </Design.PreviewWith>
 
-  <Styles.Resources>
     <Thickness x:Key="ButtonPadding">8,5,8,6</Thickness>
-  </Styles.Resources>
-  <Style Selector="ToggleButton">
-    <Setter Property="Background" Value="{DynamicResource ToggleButtonBackground}" />
-    <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForeground}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrush}" />
-    <Setter Property="BorderThickness" Value="{DynamicResource ToggleButtonBorderThemeThickness}" />
-    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-    <Setter Property="Padding" Value="{DynamicResource ButtonPadding}" />
-    <Setter Property="HorizontalAlignment" Value="Left" />
-    <Setter Property="VerticalAlignment" Value="Center" />    
-    <Setter Property="FontWeight" Value="Normal" />
-    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <ContentPresenter x:Name="PART_ContentPresenter"
-                          Background="{TemplateBinding Background}"
-                          BorderBrush="{TemplateBinding BorderBrush}"
-                          BorderThickness="{TemplateBinding BorderThickness}"
-                          CornerRadius="{TemplateBinding CornerRadius}"
-                          Content="{TemplateBinding Content}"
-                          ContentTemplate="{TemplateBinding ContentTemplate}"
-                          Padding="{TemplateBinding Padding}"
-                          RecognizesAccessKey="True"
-                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-      </ControlTemplate>
-    </Setter>
-  </Style>
-  
-  <Style Selector="ToggleButton /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-  </Style>
 
-  <Style Selector="ToggleButton:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundPointerOver}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushPointerOver}" />
-    <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundPointerOver}" />
-  </Style>
+    <ControlTheme x:Key="{x:Type ToggleButton}" TargetType="ToggleButton">
+      <Setter Property="Background" Value="{DynamicResource ToggleButtonBackground}" />
+      <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForeground}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrush}" />
+      <Setter Property="BorderThickness" Value="{DynamicResource ToggleButtonBorderThemeThickness}" />
+      <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+      <Setter Property="Padding" Value="{DynamicResource ButtonPadding}" />
+      <Setter Property="HorizontalAlignment" Value="Left" />
+      <Setter Property="VerticalAlignment" Value="Center" />
+      <Setter Property="FontWeight" Value="Normal" />
+      <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <ContentPresenter x:Name="PART_ContentPresenter"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{TemplateBinding CornerRadius}"
+                            Content="{TemplateBinding Content}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            Padding="{TemplateBinding Padding}"
+                            RecognizesAccessKey="True"
+                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+        </ControlTemplate>
+      </Setter>
 
-  <Style Selector="ToggleButton:pressed  /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundPressed}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushPressed}" />
-    <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundPressed}" />
-  </Style>
+      <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+      </Style>
 
-  <Style Selector="ToggleButton:disabled /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundDisabled}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushDisabled}" />
-    <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundDisabled}" />
-  </Style>
+      <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundPointerOver}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushPointerOver}" />
+        <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundPointerOver}" />
+      </Style>
 
-  <Style Selector="ToggleButton:checked /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundChecked}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushChecked}" />
-    <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundChecked}" />
-  </Style>
+      <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundPressed}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushPressed}" />
+        <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundPressed}" />
+      </Style>
 
-  <Style Selector="ToggleButton:checked:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundCheckedPointerOver}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushCheckedPointerOver}" />
-    <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundCheckedPointerOver}" />
-  </Style>
+      <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundDisabled}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushDisabled}" />
+        <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundDisabled}" />
+      </Style>
 
-  <Style Selector="ToggleButton:checked:pressed /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundCheckedPressed}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushCheckedPressed}" />
-    <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundCheckedPressed}" />
-  </Style>
+      <Style Selector="^:indeterminate">
+        <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+          <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundIndeterminate}" />
+          <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushIndeterminate}" />
+          <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundIndeterminate}" />
+        </Style>
 
-  <Style Selector="ToggleButton:checked:disabled /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundCheckedDisabled}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushCheckedDisabled}" />
-    <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundCheckedDisabled}" />
-  </Style>
+        <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+          <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundIndeterminatePointerOver}" />
+          <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushIndeterminatePointerOver}" />
+          <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundIndeterminatePointerOver}" />
+        </Style>
 
-  <Style Selector="ToggleButton:indeterminate /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundIndeterminate}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushIndeterminate}" />
-    <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundIndeterminate}" />
-  </Style>
+        <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+          <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundIndeterminatePressed}" />
+          <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushIndeterminatePressed}" />
+          <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundIndeterminatePressed}" />
+        </Style>
 
-  <Style Selector="ToggleButton:indeterminate:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundIndeterminatePointerOver}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushIndeterminatePointerOver}" />
-    <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundIndeterminatePointerOver}" />
-  </Style>
+        <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
+          <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundIndeterminateDisabled}" />
+          <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushIndeterminateDisabled}" />
+          <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundIndeterminateDisabled}" />
+        </Style>
+      </Style>
 
-  <Style Selector="ToggleButton:indeterminate:pressed /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundIndeterminatePressed}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushIndeterminatePressed}" />
-    <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundIndeterminatePressed}" />
-  </Style>
+      <Style Selector="^:checked">
+        <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+          <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundChecked}" />
+          <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushChecked}" />
+          <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundChecked}" />
+        </Style>
 
-  <Style Selector="ToggleButton:indeterminate:disabled /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundIndeterminateDisabled}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushIndeterminateDisabled}" />
-    <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundIndeterminateDisabled}" />
-  </Style>
-</Styles>
+        <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+          <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundCheckedPointerOver}" />
+          <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushCheckedPointerOver}" />
+          <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundCheckedPointerOver}" />
+        </Style>
+
+        <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+          <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundCheckedPressed}" />
+          <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushCheckedPressed}" />
+          <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundCheckedPressed}" />
+        </Style>
+
+        <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
+          <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundCheckedDisabled}" />
+          <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushCheckedDisabled}" />
+          <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundCheckedDisabled}" />
+        </Style>
+
+        <Style Selector="^:pressed">
+          <Setter Property="RenderTransform" Value="scale(0.98)" />
+        </Style>
+      </Style>
+    </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml b/src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml
index a2b50a859d..533903bec7 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml
@@ -1,288 +1,307 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:sys="clr-namespace:System;assembly=netstandard">
-  <Styles.Resources>
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:sys="clr-namespace:System;assembly=netstandard">
+     <Design.PreviewWith>
+      <StackPanel Margin="20" Width="250" Spacing="24" >
+        <StackPanel Spacing="12" >
+          <TextBlock
+            Text="Automatic updates"
+            Classes="h1"/>
+          <TextBlock
+            Text="Updates will be automaticly Downloaded and installed shile the computer is shutting down or restarting"
+            TextWrapping="Wrap"/>
+          <ToggleSwitch HorizontalContentAlignment="Left"
+            Content="Enable automatic Updates?"
+            OffContent="Uit"
+            OnContent="Aan"
+            VerticalAlignment="Bottom"/>
+        </StackPanel>
+
+        <StackPanel Spacing="12">
+          <TextBlock
+            Text="Previewer"
+            Classes="h1"/>
+          <TextBlock
+            Text="The previewer Shows a preview off your code, this could slow down your system"
+            TextWrapping="Wrap"/>
+          <ToggleSwitch
+            Background="Green"
+            IsChecked="True" />
+        </StackPanel>
+      </StackPanel>
+    </Design.PreviewWith>
+  
     <Thickness x:Key="ToggleSwitchTopHeaderMargin">0,0,0,6</Thickness>
     <GridLength x:Key="ToggleSwitchPreContentMargin">6</GridLength>
     <GridLength x:Key="ToggleSwitchPostContentMargin">6</GridLength>
     <x:Double x:Key="ToggleSwitchThemeMinWidth">0</x:Double>
-  </Styles.Resources>
-  <Design.PreviewWith>
-    <StackPanel Margin="20" Width="250" Spacing="24" >
-      <StackPanel Spacing="12" >
-        <TextBlock
-          Text="Automatic updates"
-          Classes="h1"/>
-        <TextBlock
-          Text="Updates will be automaticly Downloaded and installed shile the computer is shutting down or restarting"
-          TextWrapping="Wrap"/>
-        <ToggleSwitch HorizontalContentAlignment="Left"
-          Content="Enable automatic Updates?"
-          OffContent="Uit"
-          OnContent="Aan"
-          VerticalAlignment="Bottom"/>
-      </StackPanel>
 
-      <StackPanel Spacing="12">
-        <TextBlock
-          Text="Previewer"
-          Classes="h1"/>
-        <TextBlock
-          Text="The previewer Shows a preview off your code, this could slow down your system"
-          TextWrapping="Wrap"/>
-        <ToggleSwitch
-          Background="Green"
-          IsChecked="True" />
-      </StackPanel>
-    </StackPanel>
-  </Design.PreviewWith>
-
-  <Style Selector="ToggleSwitch">
-    <Setter Property="Foreground" Value="{DynamicResource ToggleSwitchContentForeground}" />
-    <Setter Property="HorizontalAlignment" Value="Left" />
-    <Setter Property="VerticalAlignment" Value="Center" />
-    <Setter Property="HorizontalContentAlignment" Value="Left" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Grid Background="{TemplateBinding Background}"
-          RowDefinitions="Auto,*">
-
-          <ContentPresenter x:Name="PART_ContentPresenter"
-            Grid.Row="0"
-            Content="{TemplateBinding Content}"
-            ContentTemplate="{TemplateBinding ContentTemplate}"
-            RecognizesAccessKey="True"
-            VerticalAlignment="Top"/>
-
-          <Grid Grid.Row="1"
-            MinWidth="{DynamicResource ToggleSwitchThemeMinWidth}"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top">
-
-            <Grid.RowDefinitions>
-              <RowDefinition Height="{DynamicResource ToggleSwitchPreContentMargin}" />
-              <RowDefinition Height="Auto" />
-              <RowDefinition Height="{DynamicResource ToggleSwitchPostContentMargin}" />
-            </Grid.RowDefinitions>
-
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition Width="Auto" />
-              <ColumnDefinition Width="12" MaxWidth="12" />
-              <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-
-            <Grid x:Name="SwitchAreaGrid"
-              Grid.RowSpan="3"
-              Grid.ColumnSpan="3"
-              TemplatedControl.IsTemplateFocusTarget="True"
-              Margin="0,5" />
-
-            <ContentPresenter x:Name="PART_OffContentPresenter"
-              Grid.RowSpan="3"
-              Grid.Column="2"
-              Content="{TemplateBinding OffContent}"
-              ContentTemplate="{TemplateBinding OffContentTemplate}"
-              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-
-            <ContentPresenter x:Name="PART_OnContentPresenter"
-              Grid.RowSpan="3"
-              Grid.Column="2"
-              Content="{TemplateBinding OnContent}"
-              ContentTemplate="{TemplateBinding OnContentTemplate}"
-              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-
-            <Border x:Name="OuterBorder"
-              Grid.Row="1"
-              Height="20"
-              Width="40"
-              CornerRadius="10"
-              BorderThickness="{DynamicResource ToggleSwitchOuterBorderStrokeThickness}" />
-
-            <Border x:Name="SwitchKnobBounds"
-              Grid.Row="1"
-              Height="20"
-              Width="40"
-              CornerRadius="10"
-              BorderThickness="{DynamicResource ToggleSwitchOnStrokeThickness}"/>
-
-            <Canvas x:Name="SwitchKnob" Grid.Row="1"
-               HorizontalAlignment="Left"
-               Width="20" Height="20">
-
-              <Grid x:Name="MovingKnobs"
-                Width="20" Height="20">
-
-                <Ellipse x:Name="SwitchKnobOn"
-                         Width="10" Height="10" />
-
-                <Ellipse x:Name="SwitchKnobOff"
-                         Width="10" Height="10" />
-              </Grid>
-            </Canvas>
-          </Grid>
-        </Grid>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="ToggleSwitch /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Margin" Value="{DynamicResource ToggleSwitchTopHeaderMargin}" />
-  </Style>
-  <Style Selector="ToggleSwitch /template/ ContentPresenter#PART_ContentPresenter:empty">
-    <Setter Property="Margin" Value="0" />
-  </Style>
-
-  <!-- NormalState -->
-  <Style Selector="ToggleSwitch /template/ Grid#SwitchAreaGrid">
-    <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerBackground}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch /template/ Border#OuterBorder">
-    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOff}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOff}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch /template/ Border#SwitchKnobBounds">
-    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOn}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOn}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch /template/ Ellipse#SwitchKnobOn">
-    <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOn}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch /template/ Ellipse#SwitchKnobOff">
-    <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOff}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:not(:dragging) /template/ Grid#MovingKnobs">
-    <Setter Property="Transitions">
-      <Transitions>
-        <DoubleTransition Property="Canvas.Left" Duration="0:0:0.2" Easing="CubicEaseOut"/>
-      </Transitions>
-    </Setter>
-  </Style>
-
-  <!-- PointerOverState -->
-  <Style Selector="ToggleSwitch:pointerover /template/ Border#OuterBorder">
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOffPointerOver}"/>
-    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOffPointerOver}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:pointerover /template/ Ellipse#SwitchKnobOff">
-    <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOffPointerOver}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:pointerover /template/ Ellipse#SwitchKnobOn">
-    <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOnPointerOver}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:pointerover /template/ Border#SwitchKnobBounds">
-    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOnPointerOver}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOnPointerOver}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:pointerover /template/ Grid#SwitchAreaGrid">
-    <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerBackgroundPointerOver}"/>
-  </Style>
-
-  <!-- PressedState -->
-  <Style Selector="ToggleSwitch:pressed /template/ Border#OuterBorder">
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOffPressed}"/>
-    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOffPressed}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:pressed /template/ Border#SwitchKnobBounds">
-    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOnPressed}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOnPressed}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:pressed /template/ Ellipse#SwitchKnobOff">
-    <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOffPressed}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:pressed /template/ Ellipse#SwitchKnobOn">
-    <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOnPressed}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:pressed /template/ Grid#SwitchAreaGrid">
-    <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerBackgroundPressed}"/>
-  </Style>
-
-  <!-- DisabledState -->
-  <Style Selector="ToggleSwitch:disabled">
-    <Setter Property="Foreground" Value="{DynamicResource ToggleSwitchHeaderForegroundDisabled}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:disabled /template/ Border#OuterBorder">
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOffDisabled}"/>
-    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOffDisabled}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:disabled /template/ Ellipse#SwitchKnobOff">
-    <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOffDisabled}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:disabled /template/ Ellipse#SwitchKnobOn">
-    <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOnDisabled}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:disabled /template/ Border#SwitchKnobBounds">
-    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOnDisabled}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOnDisabled}"/>
-  </Style>
-
-  <!-- CheckedState -->
-  <Style Selector="ToggleSwitch:checked /template/ Border#OuterBorder">
-    <Setter Property="Opacity" Value="0"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:checked  /template/ Ellipse#SwitchKnobOff">
-    <Setter Property="Opacity" Value="0"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:checked  /template/ Border#SwitchKnobBounds">
-    <Setter Property="Opacity" Value="1"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:checked /template/ Ellipse#SwitchKnobOn">
-    <Setter Property="Opacity" Value="1"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:checked /template/ ContentPresenter#PART_OffContentPresenter">
-    <Setter Property="Opacity" Value="0"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:checked /template/ ContentPresenter#PART_OnContentPresenter">
-    <Setter Property="Opacity" Value="1"/>
-  </Style>
-
-  <!--UncheckedState -->
-  <Style Selector="ToggleSwitch:unchecked /template/ Border#OuterBorder">
-    <Setter Property="Opacity" Value="1"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:unchecked /template/ Ellipse#SwitchKnobOff">
-    <Setter Property="Opacity" Value="1"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:unchecked /template/ Ellipse#SwitchKnobOn">
-    <Setter Property="Opacity" Value="0"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:unchecked  /template/ Border#SwitchKnobBounds">
-    <Setter Property="Opacity" Value="0"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:unchecked /template/ ContentPresenter#PART_OffContentPresenter">
-    <Setter Property="Opacity" Value="1"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:unchecked /template/ ContentPresenter#PART_OnContentPresenter">
-    <Setter Property="Opacity" Value="0"/>
-  </Style>
-</Styles>
+
+    <ControlTheme x:Key="{x:Type ToggleSwitch}" TargetType="ToggleSwitch">
+        <Setter Property="Foreground" Value="{DynamicResource ToggleSwitchContentForeground}" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="HorizontalContentAlignment" Value="Left" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <Setter Property="Template">
+            <ControlTemplate>
+                <Grid Background="{TemplateBinding Background}" RowDefinitions="Auto,*">
+
+                    <ContentPresenter
+                        x:Name="PART_ContentPresenter"
+                        Grid.Row="0"
+                        VerticalAlignment="Top"
+                        Content="{TemplateBinding Content}"
+                        ContentTemplate="{TemplateBinding ContentTemplate}"
+                        RecognizesAccessKey="True" />
+
+                    <Grid
+                        Grid.Row="1"
+                        MinWidth="{DynamicResource ToggleSwitchThemeMinWidth}"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Top">
+
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="{DynamicResource ToggleSwitchPreContentMargin}" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="{DynamicResource ToggleSwitchPostContentMargin}" />
+                        </Grid.RowDefinitions>
+
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="12" MaxWidth="12" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+
+                        <Grid
+                            x:Name="SwitchAreaGrid"
+                            Grid.RowSpan="3"
+                            Grid.ColumnSpan="3"
+                            Margin="0,5"
+                            TemplatedControl.IsTemplateFocusTarget="True" />
+
+                        <ContentPresenter
+                            x:Name="PART_OffContentPresenter"
+                            Grid.RowSpan="3"
+                            Grid.Column="2"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            Content="{TemplateBinding OffContent}"
+                            ContentTemplate="{TemplateBinding OffContentTemplate}" />
+
+                        <ContentPresenter
+                            x:Name="PART_OnContentPresenter"
+                            Grid.RowSpan="3"
+                            Grid.Column="2"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            Content="{TemplateBinding OnContent}"
+                            ContentTemplate="{TemplateBinding OnContentTemplate}" />
+
+                        <Border
+                            x:Name="OuterBorder"
+                            Grid.Row="1"
+                            Width="40"
+                            Height="20"
+                            BorderThickness="{DynamicResource ToggleSwitchOuterBorderStrokeThickness}"
+                            CornerRadius="10" />
+
+                        <Border
+                            x:Name="SwitchKnobBounds"
+                            Grid.Row="1"
+                            Width="40"
+                            Height="20"
+                            BorderThickness="{DynamicResource ToggleSwitchOnStrokeThickness}"
+                            CornerRadius="10" />
+
+                        <Canvas
+                            x:Name="SwitchKnob"
+                            Grid.Row="1"
+                            Width="20"
+                            Height="20"
+                            HorizontalAlignment="Left">
+
+                            <Grid
+                                x:Name="MovingKnobs"
+                                Width="20"
+                                Height="20">
+
+                                <Ellipse
+                                    x:Name="SwitchKnobOn"
+                                    Width="10"
+                                    Height="10" />
+
+                                <Ellipse
+                                    x:Name="SwitchKnobOff"
+                                    Width="10"
+                                    Height="10" />
+                            </Grid>
+                        </Canvas>
+                    </Grid>
+                </Grid>
+            </ControlTemplate>
+        </Setter>
+
+        <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+            <Setter Property="Margin" Value="{DynamicResource ToggleSwitchTopHeaderMargin}" />
+        </Style>
+        <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter:empty">
+            <Setter Property="Margin" Value="0" />
+        </Style>
+
+        <!--  NormalState  -->
+        <Style Selector="^ /template/ Grid#SwitchAreaGrid">
+            <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerBackground}" />
+        </Style>
+
+        <Style Selector="^ /template/ Border#OuterBorder">
+            <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOff}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOff}" />
+        </Style>
+
+        <Style Selector="^ /template/ Border#SwitchKnobBounds">
+            <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOn}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOn}" />
+        </Style>
+
+        <Style Selector="^ /template/ Ellipse#SwitchKnobOn">
+            <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOn}" />
+        </Style>
+
+        <Style Selector="^ /template/ Ellipse#SwitchKnobOff">
+            <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOff}" />
+        </Style>
+
+        <Style Selector="^:not(:dragging) /template/ Grid#MovingKnobs">
+            <Setter Property="Transitions">
+                <Transitions>
+                    <DoubleTransition
+                        Easing="CubicEaseOut"
+                        Property="Canvas.Left"
+                        Duration="0:0:0.2" />
+                </Transitions>
+            </Setter>
+        </Style>
+
+        <!--  PointerOverState  -->
+        <Style Selector="^:pointerover /template/ Border#OuterBorder">
+            <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOffPointerOver}" />
+            <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOffPointerOver}" />
+        </Style>
+
+        <Style Selector="^:pointerover /template/ Ellipse#SwitchKnobOff">
+            <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOffPointerOver}" />
+        </Style>
+
+        <Style Selector="^:pointerover /template/ Ellipse#SwitchKnobOn">
+            <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOnPointerOver}" />
+        </Style>
+
+        <Style Selector="^:pointerover /template/ Border#SwitchKnobBounds">
+            <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOnPointerOver}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOnPointerOver}" />
+        </Style>
+
+        <Style Selector="^:pointerover /template/ Grid#SwitchAreaGrid">
+            <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerBackgroundPointerOver}" />
+        </Style>
+
+        <!--  PressedState  -->
+        <Style Selector="^:pressed /template/ Border#OuterBorder">
+            <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOffPressed}" />
+            <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOffPressed}" />
+        </Style>
+
+        <Style Selector="^:pressed /template/ Border#SwitchKnobBounds">
+            <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOnPressed}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOnPressed}" />
+        </Style>
+
+        <Style Selector="^:pressed /template/ Ellipse#SwitchKnobOff">
+            <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOffPressed}" />
+        </Style>
+
+        <Style Selector="^:pressed /template/ Ellipse#SwitchKnobOn">
+            <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOnPressed}" />
+        </Style>
+
+        <Style Selector="^:pressed /template/ Grid#SwitchAreaGrid">
+            <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerBackgroundPressed}" />
+        </Style>
+
+        <!--  DisabledState  -->
+        <Style Selector="^:disabled">
+            <Setter Property="Foreground" Value="{DynamicResource ToggleSwitchHeaderForegroundDisabled}" />
+        </Style>
+
+        <Style Selector="^:disabled /template/ Border#OuterBorder">
+            <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOffDisabled}" />
+            <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOffDisabled}" />
+        </Style>
+
+        <Style Selector="^:disabled /template/ Ellipse#SwitchKnobOff">
+            <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOffDisabled}" />
+        </Style>
+
+        <Style Selector="^:disabled /template/ Ellipse#SwitchKnobOn">
+            <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOnDisabled}" />
+        </Style>
+
+        <Style Selector="^:disabled /template/ Border#SwitchKnobBounds">
+            <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOnDisabled}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOnDisabled}" />
+        </Style>
+
+        <!--  CheckedState  -->
+        <Style Selector="^:checked /template/ Border#OuterBorder">
+            <Setter Property="Opacity" Value="0" />
+        </Style>
+
+        <Style Selector="^:checked  /template/ Ellipse#SwitchKnobOff">
+            <Setter Property="Opacity" Value="0" />
+        </Style>
+
+        <Style Selector="^:checked  /template/ Border#SwitchKnobBounds">
+            <Setter Property="Opacity" Value="1" />
+        </Style>
+
+        <Style Selector="^:checked /template/ Ellipse#SwitchKnobOn">
+            <Setter Property="Opacity" Value="1" />
+        </Style>
+
+        <Style Selector="^:checked /template/ ContentPresenter#PART_OffContentPresenter">
+            <Setter Property="Opacity" Value="0" />
+        </Style>
+
+        <Style Selector="^:checked /template/ ContentPresenter#PART_OnContentPresenter">
+            <Setter Property="Opacity" Value="1" />
+        </Style>
+
+        <!--  UncheckedState  -->
+        <Style Selector="^:unchecked /template/ Border#OuterBorder">
+            <Setter Property="Opacity" Value="1" />
+        </Style>
+
+        <Style Selector="^:unchecked /template/ Ellipse#SwitchKnobOff">
+            <Setter Property="Opacity" Value="1" />
+        </Style>
+
+        <Style Selector="^:unchecked /template/ Ellipse#SwitchKnobOn">
+            <Setter Property="Opacity" Value="0" />
+        </Style>
+
+        <Style Selector="^:unchecked  /template/ Border#SwitchKnobBounds">
+            <Setter Property="Opacity" Value="0" />
+        </Style>
+
+        <Style Selector="^:unchecked /template/ ContentPresenter#PART_OffContentPresenter">
+            <Setter Property="Opacity" Value="1" />
+        </Style>
+
+        <Style Selector="^:unchecked /template/ ContentPresenter#PART_OnContentPresenter">
+            <Setter Property="Opacity" Value="0" />
+        </Style>
+    </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ToolTip.xaml b/src/Avalonia.Themes.Fluent/Controls/ToolTip.xaml
index 2d18be91cb..1070f3b68c 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ToolTip.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ToolTip.xaml
@@ -1,87 +1,71 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"       
-        xmlns:sys="clr-namespace:System;assembly=netstandard"
-        x:CompileBindings="True">
-
-  <Design.PreviewWith>
-    <Grid RowDefinitions="Auto,Auto"
-          ColumnDefinitions="Auto,Auto"
-          HorizontalAlignment="Center">
-      <Border Grid.Column="0"
-              Grid.Row="1"
-              Background="{DynamicResource SystemControlBackgroundAccentBrush}"
-              Margin="5"
-              Padding="50"
-              ToolTip.Tip="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.">
-        <TextBlock>Hover Here</TextBlock>
-      </Border>
-      <CheckBox Grid.Column="1"
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:sys="clr-namespace:System;assembly=netstandard"
+                    x:CompileBindings="True">
+    <Design.PreviewWith>
+      <Grid RowDefinitions="Auto,Auto"
+            ColumnDefinitions="Auto,Auto"
+            HorizontalAlignment="Center">
+        <Border Grid.Column="0"
+                Grid.Row="1"
+                Background="{DynamicResource SystemControlBackgroundAccentBrush}"
+                Margin="5" Padding="50" ToolTip.Tip="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.">
+          <TextBlock>Hover Here</TextBlock>
+        </Border>
+        <CheckBox Grid.Column="1"
+                  Margin="5"
+                  Grid.Row="0"
+                  IsChecked="{Binding ElementName=Border, Path=(ToolTip.IsOpen)}"
+                  Content="ToolTip Open" />
+        <Border Name="Border"
+                Grid.Column="1"
+                Grid.Row="1"
+                Background="{DynamicResource SystemControlBackgroundAccentBrush}"
                 Margin="5"
-                Grid.Row="0"
-                IsChecked="{Binding ElementName=Border, Path=(ToolTip.IsOpen)}"
-                Content="ToolTip Open" />
-      <Border Name="Border"
-              Grid.Column="1"
-              Grid.Row="1"
-              Background="{DynamicResource SystemControlBackgroundAccentBrush}"
-              Margin="5"
-              Padding="50"
-              ToolTip.Placement="Bottom">
-        <ToolTip.Tip>
-          <StackPanel>
-            <TextBlock Classes="h1">ToolTip</TextBlock>
-            <TextBlock Classes="h2">A control which pops up a hint when a control is hovered</TextBlock>
-          </StackPanel>
-        </ToolTip.Tip>
-        <TextBlock>ToolTip bottom placement</TextBlock>
-      </Border>
-    </Grid>
-  </Design.PreviewWith>
+                Padding="50"
+                ToolTip.Placement="Bottom">
+          <ToolTip.Tip>
+            <StackPanel>
+              <TextBlock Classes="h1">ToolTip</TextBlock>
+              <TextBlock Classes="h2">A control which pops up a hint when a control is hovered</TextBlock>
+            </StackPanel>
+          </ToolTip.Tip>
+          <TextBlock>ToolTip bottom placement</TextBlock>
+        </Border>
+      </Grid>
+    </Design.PreviewWith>
 
-  <Styles.Resources>
     <sys:Double x:Key="ToolTipContentMaxWidth">320</sys:Double>
-  </Styles.Resources>
-
-  <Style Selector="ToolTip">
-    <Setter Property="Foreground" Value="{DynamicResource ToolTipForeground}" />
-    <Setter Property="Background" Value="{DynamicResource ToolTipBackground}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ToolTipBorderBrush}" />
-    <Setter Property="BorderThickness" Value="{DynamicResource ToolTipBorderThemeThickness}" />    
-    <Setter Property="FontSize" Value="{DynamicResource ToolTipContentThemeFontSize}" />
-    <Setter Property="Padding" Value="{DynamicResource ToolTipBorderThemePadding}" />
-    <Setter Property="MaxWidth" Value="{DynamicResource ToolTipContentMaxWidth}" />
-    <Setter Property="CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
-    <Setter Property="Transitions">
-      <Transitions>
-        <DoubleTransition Property="Opacity" Duration="0:0:0.15" />
-      </Transitions>
-    </Setter>
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Name="PART_LayoutRoot"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                Padding="{TemplateBinding Padding}"
-                CornerRadius="{TemplateBinding CornerRadius}">
-          <ContentPresenter Name="PART_ContentPresenter"
-                            MaxWidth="{TemplateBinding MaxWidth}"
-                            Content="{TemplateBinding Content}"
-                            ContentTemplate="{TemplateBinding ContentTemplate}" />
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
 
-  <Style Selector="ToolTip > TextBlock">
-    <Setter Property="TextWrapping" Value="Wrap" />
-  </Style>
+    <ControlTheme x:Key="{x:Type ToolTip}" TargetType="ToolTip">
+      <Setter Property="Foreground" Value="{DynamicResource ToolTipForeground}" />
+      <Setter Property="Background" Value="{DynamicResource ToolTipBackground}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ToolTipBorderBrush}" />
+      <Setter Property="BorderThickness" Value="{DynamicResource ToolTipBorderThemeThickness}" />
+      <Setter Property="FontSize" Value="{DynamicResource ToolTipContentThemeFontSize}" />
+      <Setter Property="Padding" Value="{DynamicResource ToolTipBorderThemePadding}" />
+      <Setter Property="MaxWidth" Value="{DynamicResource ToolTipContentMaxWidth}" />
+      <Setter Property="CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
+      <Setter Property="Opacity" Value="0" />
+      <Setter Property="Transitions">
+        <Transitions>
+          <DoubleTransition Property="Opacity" Duration="0:0:0.15" />
+        </Transitions>
+      </Setter>
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border Name="PART_LayoutRoot" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" Padding="{TemplateBinding Padding}" CornerRadius="{TemplateBinding CornerRadius}">
+            <ContentPresenter Name="PART_ContentPresenter" MaxWidth="{TemplateBinding MaxWidth}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
+          </Border>
+        </ControlTemplate>
+      </Setter>
 
-  <Style Selector="ToolTip">
-    <Setter Property="Opacity" Value="0" />
-  </Style>
+      <!--<Style Selector="^ > TextBlock">
+        <Setter Property="TextWrapping" Value="Wrap" />
+      </Style>-->
 
-  <Style Selector="ToolTip:open">
-    <Setter Property="Opacity" Value="1" />
-  </Style>
-</Styles>
+      <Style Selector="^:open">
+        <Setter Property="Opacity" Value="1" />
+      </Style>
+    </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/TransitioningContentControl.xaml b/src/Avalonia.Themes.Fluent/Controls/TransitioningContentControl.xaml
index 6a4d56ccb7..f28dc66a5f 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TransitioningContentControl.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TransitioningContentControl.xaml
@@ -1,20 +1,19 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Style Selector="TransitioningContentControl">
-    <!-- Set Defaults -->
-    <Setter Property="Template">
-      <ControlTemplate>
-        <ContentPresenter Name="PART_ContentPresenter"
-                          Background="{TemplateBinding Background}"
-                          BorderBrush="{TemplateBinding BorderBrush}"
-                          BorderThickness="{TemplateBinding BorderThickness}"
-                          CornerRadius="{TemplateBinding CornerRadius}"
-                          ContentTemplate="{TemplateBinding ContentTemplate}"
-                          Content="{TemplateBinding CurrentContent}"
-                          Padding="{TemplateBinding Padding}"
-                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"/>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-</Styles>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ControlTheme x:Key="{x:Type TransitioningContentControl}" TargetType="TransitioningContentControl">
+      <Setter Property="Template">
+        <ControlTemplate>
+          <ContentPresenter Name="PART_ContentPresenter"
+                            Background="{TemplateBinding Background}" 
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{TemplateBinding CornerRadius}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            Content="{TemplateBinding CurrentContent}"
+                            Padding="{TemplateBinding Padding}"
+                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" />
+        </ControlTemplate>
+      </Setter>
+    </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/TreeView.xaml b/src/Avalonia.Themes.Fluent/Controls/TreeView.xaml
index 656b72e07b..4fcec79f25 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TreeView.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TreeView.xaml
@@ -1,28 +1,31 @@
-<Style xmlns="https://github.com/avaloniaui"
-       Selector="TreeView">
-  <Setter Property="Background" Value="Transparent" />
-  <Setter Property="BorderBrush" Value="Transparent" />
-  <Setter Property="BorderThickness" Value="0" />
-  <Setter Property="Padding" Value="0" />
-  <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
-  <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-  <Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
-  <Setter Property="Template">
-    <ControlTemplate>
-      <Border BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}"
-              CornerRadius="{TemplateBinding CornerRadius}">
-        <ScrollViewer Background="{TemplateBinding Background}"
-                      HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
-                      VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}"
-                      IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
-                      AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}">
-          <ItemsPresenter Name="PART_ItemsPresenter"
-                          Items="{TemplateBinding Items}"
-                          ItemsPanel="{TemplateBinding ItemsPanel}"
-                          Margin="{TemplateBinding Padding}" />
-        </ScrollViewer>
-      </Border>
-    </ControlTemplate>
-  </Setter>
-</Style>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <ControlTheme x:Key="{x:Type TreeView}" TargetType="TreeView">
+      <Setter Property="Background" Value="Transparent" />
+      <Setter Property="BorderBrush" Value="Transparent" />
+      <Setter Property="BorderThickness" Value="0" />
+      <Setter Property="Padding" Value="0" />
+      <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+      <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+      <Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <ScrollViewer Background="{TemplateBinding Background}"
+                          HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
+                          VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}"
+                          IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
+                          AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}">
+              <ItemsPresenter Name="PART_ItemsPresenter"
+                              Items="{TemplateBinding Items}"
+                              ItemsPanel="{TemplateBinding ItemsPanel}"
+                              Margin="{TemplateBinding Padding}" />
+            </ScrollViewer>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+    </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/TreeViewItem.xaml b/src/Avalonia.Themes.Fluent/Controls/TreeViewItem.xaml
index f86b67bb6c..6510832eb3 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TreeViewItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TreeViewItem.xaml
@@ -1,4 +1,4 @@
-<Styles xmlns="https://github.com/avaloniaui"
+<Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:converters="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls">
 
@@ -53,7 +53,6 @@
   </Style>
 
   <Style Selector="TreeViewItem">
-    <Style.Resources />
     <Setter Property="Padding" Value="0" />
     <Setter Property="Background" Value="{DynamicResource TreeViewItemBackground}" />
     <Setter Property="BorderBrush" Value="{DynamicResource TreeViewItemBorderBrush}" />
diff --git a/src/Avalonia.Themes.Fluent/Controls/UserControl.xaml b/src/Avalonia.Themes.Fluent/Controls/UserControl.xaml
index d6028daff8..7dc23f652a 100644
--- a/src/Avalonia.Themes.Fluent/Controls/UserControl.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/UserControl.xaml
@@ -1,16 +1,24 @@
-<Style xmlns="https://github.com/avaloniaui" Selector=":is(UserControl)">
-  <Setter Property="Template">
-    <ControlTemplate>
-      <ContentPresenter Name="PART_ContentPresenter"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="{TemplateBinding CornerRadius}"
-                        ContentTemplate="{TemplateBinding ContentTemplate}"
-                        Content="{TemplateBinding Content}"
-                        Padding="{TemplateBinding Padding}"
-                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"/>
-    </ControlTemplate>
-  </Setter>
+<Style xmlns="https://github.com/avaloniaui"
+       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+       Selector=":is(UserControl)">
+  <Style.Resources>
+    <ControlTheme x:Key="FluentUserControl" TargetType="UserControl">
+      <Setter Property="Template">
+        <ControlTemplate>
+          <ContentPresenter Name="PART_ContentPresenter"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{TemplateBinding CornerRadius}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            Content="{TemplateBinding Content}"
+                            Padding="{TemplateBinding Padding}"
+                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"/>
+        </ControlTemplate>
+      </Setter>
+    </ControlTheme>
+  </Style.Resources>
+  
+  <Setter Property="Theme" Value="{StaticResource FluentUserControl}" />
 </Style>
diff --git a/src/Avalonia.Themes.Fluent/Controls/Window.xaml b/src/Avalonia.Themes.Fluent/Controls/Window.xaml
index 90963c606c..d78fd76a37 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Window.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Window.xaml
@@ -1,27 +1,30 @@
-<Style xmlns="https://github.com/avaloniaui" Selector="Window">
-  <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundAltHighBrush}"/>  
-  <Setter Property="TransparencyBackgroundFallback" Value="{DynamicResource SystemControlBackgroundAltHighBrush}" />
-  <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
-  <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>  
-  <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
-  <Setter Property="Template">
-    <ControlTemplate>
-      <Panel>
-        <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
-        <Border Background="{TemplateBinding Background}" IsHitTestVisible="False" />
-        <Panel Background="Transparent" Margin="{TemplateBinding WindowDecorationMargin}" />
-        <VisualLayerManager>
-          <VisualLayerManager.ChromeOverlayLayer>
-            <TitleBar />
-          </VisualLayerManager.ChromeOverlayLayer>
-          <ContentPresenter Name="PART_ContentPresenter"
-                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                            Content="{TemplateBinding Content}"
-                            Margin="{TemplateBinding Padding}"
-                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
-        </VisualLayerManager>
-      </Panel>
-    </ControlTemplate>
-  </Setter>
-</Style>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ControlTheme x:Key="{x:Type Window}" TargetType="Window">
+      <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundAltHighBrush}"/>
+      <Setter Property="TransparencyBackgroundFallback" Value="{DynamicResource SystemControlBackgroundAltHighBrush}" />
+      <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
+      <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
+      <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Panel>
+            <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
+            <Border Background="{TemplateBinding Background}" IsHitTestVisible="False" />
+            <Panel Background="Transparent" Margin="{TemplateBinding WindowDecorationMargin}" />
+            <VisualLayerManager>
+              <VisualLayerManager.ChromeOverlayLayer>
+                <TitleBar />
+              </VisualLayerManager.ChromeOverlayLayer>
+              <ContentPresenter Name="PART_ContentPresenter"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                Content="{TemplateBinding Content}"
+                                Margin="{TemplateBinding Padding}"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
+            </VisualLayerManager>
+          </Panel>
+        </ControlTemplate>
+      </Setter>
+    </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/WindowNotificationManager.xaml b/src/Avalonia.Themes.Fluent/Controls/WindowNotificationManager.xaml
index 8d14c2d972..d5d5114c1b 100644
--- a/src/Avalonia.Themes.Fluent/Controls/WindowNotificationManager.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/WindowNotificationManager.xaml
@@ -1,47 +1,58 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        x:DataType="WindowNotificationManager"
-        x:CompileBindings="True">
-  <Style Selector="WindowNotificationManager">
-    <Setter Property="Margin" Value="0 0"/>    
-    <Setter Property="Template">
-      <ControlTemplate>
-        <ReversibleStackPanel Name="PART_Items">
-          <ReversibleStackPanel.DataTemplates>
-            <DataTemplate DataType="INotification">
-              <StackPanel Spacing="8" Margin="12" TextElement.Foreground="{DynamicResource SystemControlForegroundBaseHighBrush}">
-                <TextBlock Text="{Binding Title}" FontWeight="Medium" />
-                <TextBlock MaxHeight="80" Text="{Binding Message}" TextWrapping="Wrap" Margin="0,0,12,0"/>
-              </StackPanel>
-            </DataTemplate>
-            <DataTemplate DataType="x:String">
-              <TextBlock Text="{Binding }" Margin="12" Foreground="{DynamicResource SystemControlForegroundBaseHighBrush}" />
-            </DataTemplate>
-          </ReversibleStackPanel.DataTemplates>
-        </ReversibleStackPanel>
-      </ControlTemplate>
-    </Setter>
-  </Style>
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    x:CompileBindings="True"
+    x:DataType="WindowNotificationManager">
+    <ControlTheme x:Key="{x:Type WindowNotificationManager}" TargetType="WindowNotificationManager">
+        <Setter Property="Margin" Value="0 0" />
+        <Setter Property="Template">
+            <ControlTemplate>
+                <ReversibleStackPanel Name="PART_Items">
+                    <ReversibleStackPanel.DataTemplates>
+                        <DataTemplate DataType="INotification">
+                            <StackPanel
+                                Margin="12"
+                                Spacing="8"
+                                TextElement.Foreground="{DynamicResource SystemControlForegroundBaseHighBrush}">
+                                <TextBlock FontWeight="Medium" Text="{Binding Title}" />
+                                <TextBlock
+                                    MaxHeight="80"
+                                    Margin="0,0,12,0"
+                                    Text="{Binding Message}"
+                                    TextWrapping="Wrap" />
+                            </StackPanel>
+                        </DataTemplate>
+                        <DataTemplate DataType="x:String">
+                            <TextBlock
+                                Margin="12"
+                                Foreground="{DynamicResource SystemControlForegroundBaseHighBrush}"
+                                Text="{Binding}" />
+                        </DataTemplate>
+                    </ReversibleStackPanel.DataTemplates>
+                </ReversibleStackPanel>
+            </ControlTemplate>
+        </Setter>
 
-  <Style Selector="WindowNotificationManager:topleft /template/ ReversibleStackPanel#PART_Items">
-    <Setter Property="VerticalAlignment" Value="Top"/>
-    <Setter Property="HorizontalAlignment" Value="Left"/>
-  </Style>
+        <Style Selector="^:topleft /template/ ReversibleStackPanel#PART_Items">
+            <Setter Property="VerticalAlignment" Value="Top" />
+            <Setter Property="HorizontalAlignment" Value="Left" />
+        </Style>
 
-  <Style Selector="WindowNotificationManager:topright /template/ ReversibleStackPanel#PART_Items">
-    <Setter Property="VerticalAlignment" Value="Top"/>
-    <Setter Property="HorizontalAlignment" Value="Right"/>
-  </Style>
+        <Style Selector="^:topright /template/ ReversibleStackPanel#PART_Items">
+            <Setter Property="VerticalAlignment" Value="Top" />
+            <Setter Property="HorizontalAlignment" Value="Right" />
+        </Style>
 
-  <Style Selector="WindowNotificationManager:bottomleft /template/ ReversibleStackPanel#PART_Items">
-    <Setter Property="ReverseOrder" Value="True"/>
-    <Setter Property="VerticalAlignment" Value="Bottom"/>
-    <Setter Property="HorizontalAlignment" Value="Left"/>
-  </Style>
+        <Style Selector="^:bottomleft /template/ ReversibleStackPanel#PART_Items">
+            <Setter Property="ReverseOrder" Value="True" />
+            <Setter Property="VerticalAlignment" Value="Bottom" />
+            <Setter Property="HorizontalAlignment" Value="Left" />
+        </Style>
 
-  <Style Selector="WindowNotificationManager:bottomright /template/ ReversibleStackPanel#PART_Items">
-    <Setter Property="ReverseOrder" Value="True"/>
-    <Setter Property="VerticalAlignment" Value="Bottom"/>
-    <Setter Property="HorizontalAlignment" Value="Right"/>
-  </Style>
-</Styles>
+        <Style Selector="^:bottomright /template/ ReversibleStackPanel#PART_Items">
+            <Setter Property="ReverseOrder" Value="True" />
+            <Setter Property="VerticalAlignment" Value="Bottom" />
+            <Setter Property="HorizontalAlignment" Value="Right" />
+        </Style>
+    </ControlTheme>
+</ResourceDictionary>

From afe3486e9f3ea7a493c7e66ca3e5b59682357dcb Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 7 Jul 2022 11:15:41 +0200
Subject: [PATCH 050/240] Remove trailing /template/ selectors.

---
 .../Controls/ButtonSpinner.xaml               | 12 +--
 .../Controls/CalendarDatePicker.xaml          | 12 +--
 .../Controls/CalendarDayButton.xaml           |  6 +-
 .../Controls/CheckBox.xaml                    | 88 +++++++++----------
 .../Controls/ComboBox.xaml                    | 50 +++++------
 .../Controls/Slider.xaml                      | 56 ++++++------
 .../Controls/TimePicker.xaml                  |  6 +-
 7 files changed, 113 insertions(+), 117 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml b/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml
index a5234f5771..f99f1040e5 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml
@@ -87,20 +87,20 @@
         <Setter Property="BorderBrush" Value="{DynamicResource SystemErrorTextColor}" />
       </Style>
 
-      <Style Selector="^:left /template/">
-        <Style Selector="^ StackPanel#PART_SpinnerPanel">
+      <Style Selector="^:left">
+        <Style Selector="^ /template/ StackPanel#PART_SpinnerPanel">
           <Setter Property="Grid.Column" Value="0" />
         </Style>
-        <Style Selector="^ RepeatButton.ButtonSpinnerRepeatButton">
+        <Style Selector="^ /template/ RepeatButton.ButtonSpinnerRepeatButton">
           <Setter Property="BorderThickness" Value="{Binding $parent[ButtonSpinner].BorderThickness, Converter={StaticResource ButtonSpinner_OnlyRightThinknessConverter}}" />
         </Style>
       </Style>
 
-      <Style Selector="^:right /template/">
-        <Style Selector="^ StackPanel#PART_SpinnerPanel">
+      <Style Selector="^:right">
+        <Style Selector="^ /template/ StackPanel#PART_SpinnerPanel">
           <Setter Property="Grid.Column" Value="2" />
         </Style>
-        <Style Selector="^ RepeatButton.ButtonSpinnerRepeatButton">
+        <Style Selector="^ /template/ RepeatButton.ButtonSpinnerRepeatButton">
           <Setter Property="BorderThickness" Value="{Binding $parent[ButtonSpinner].BorderThickness, Converter={StaticResource ButtonSpinner_OnlyLeftThinknessConverter}}" />
         </Style>
       </Style>
diff --git a/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml b/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml
index 83a254be56..eefd9e9b51 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml
@@ -106,13 +106,13 @@
                       <Setter Property="BorderBrush" Value="Transparent"/>
                       <Setter Property="BorderThickness" Value="0" />
                     </Style>
-                    <Style Selector="TextBox#PART_TextBox:disabled /template/">
-                      <Style Selector="^ Border#PART_BorderElement">
+                    <Style Selector="TextBox#PART_TextBox:disabled">
+                      <Style Selector="^ /template/ Border#PART_BorderElement">
                         <!-- By default the TextBox has its own disabled state, override this to make the border background show through -->
                         <Setter Property="Background" Value="Transparent" />
                         <Setter Property="BorderBrush" Value="Transparent" />
                       </Style>
-                      <Style Selector="^ TextBlock#PART_Watermark, ^ TextBlock#PART_FloatingWatermark">
+                      <Style Selector="^ /template/ TextBlock#PART_Watermark, ^ TextBlock#PART_FloatingWatermark">
                         <Setter Property="TextElement.Foreground" Value="{DynamicResource CalendarDatePickerTextForegroundDisabled}" />
                       </Style>
                     </Style>
@@ -152,13 +152,13 @@
       </Style>
 
       <!-- Disabled State -->
-      <Style Selector="^:disabled /template/">
-        <Style Selector="^ Border#Background">
+      <Style Selector="^:disabled">
+        <Style Selector="^ /template/ Border#Background">
           <Setter Property="Background" Value="{DynamicResource CalendarDatePickerBackgroundDisabled}" />
           <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderBrushDisabled}" />
         </Style>
         
-        <Style Selector="^ Button#PART_Button">
+        <Style Selector="^ /template/ Button#PART_Button">
           <Setter Property="TextElement.Foreground" Value="{DynamicResource CalendarDatePickerCalendarGlyphForegroundDisabled}" />
         </Style>
 
diff --git a/src/Avalonia.Themes.Fluent/Controls/CalendarDayButton.xaml b/src/Avalonia.Themes.Fluent/Controls/CalendarDayButton.xaml
index b119dd1355..9f476d51bc 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CalendarDayButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CalendarDayButton.xaml
@@ -84,11 +84,11 @@
       </Style>
 
       <!-- WinUI calls this OutOfFocus -->
-      <Style Selector="^:inactive /template/">
-        <Style Selector="^ Border#Root">
+      <Style Selector="^:inactive">
+        <Style Selector="^ /template/ Border#Root">
           <Setter Property="Background" Value="{DynamicResource CalendarViewOutOfScopeBackground}" />
         </Style>
-        <Style Selector="^ ContentControl#Content">
+        <Style Selector="^ /template/ ContentControl#Content">
           <Setter Property="Foreground" Value="{DynamicResource CalendarViewOutOfScopeForeground}" />
         </Style>
       </Style>
diff --git a/src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml b/src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml
index 2eee425cb0..44e1afefa4 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml
@@ -63,64 +63,64 @@
       </Setter>
 
       <!-- Unchecked PointerOver State -->
-      <Style Selector="^:pointerover /template/">
-        <Style Selector="^ ContentPresenter#ContentPresenter">
+      <Style Selector="^:pointerover">
+        <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
           <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundUncheckedPointerOver}" />
         </Style>
 
-        <Style Selector="^ Border#PART_Border">
+        <Style Selector="^ /template/ Border#PART_Border">
           <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundUncheckedPointerOver}" />
           <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUncheckedPointerOver}" />
         </Style>
 
-        <Style Selector="^ Border#NormalRectangle">
+        <Style Selector="^ /template/ Border#NormalRectangle">
           <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUncheckedPointerOver}" />
           <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillUncheckedPointerOver}" />
         </Style>
 
-        <Style Selector="^ Path#CheckGlyph">
+        <Style Selector="^ /template/ Path#CheckGlyph">
           <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundUncheckedPointerOver}" />
         </Style>
       </Style>
 
       <!-- Unchecked Pressed State -->
-      <Style Selector="^:pressed /template/">
-        <Style Selector="^ ContentPresenter#ContentPresenter">
+      <Style Selector="^:pressed">
+        <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
           <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundUncheckedPressed}" />
         </Style>
 
-        <Style Selector="^ Border#PART_Border">
+        <Style Selector="^ /template/ Border#PART_Border">
           <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundUncheckedPressed}" />
           <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUncheckedPressed}" />
         </Style>
 
-        <Style Selector="^ Border#NormalRectangle">
+        <Style Selector="^ /template/ Border#NormalRectangle">
           <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUncheckedPressed}" />
           <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillUncheckedPressed}" />
         </Style>
 
-        <Style Selector="^ Path#CheckGlyph">
+        <Style Selector="^ /template/ Path#CheckGlyph">
           <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundUncheckedPressed}" />
         </Style>
       </Style>
 
       <!-- Unchecked Disabled state -->
-      <Style Selector="^:disabled /template/">
-        <Style Selector="^ ContentPresenter#ContentPresenter">
+      <Style Selector="^:disabled">
+        <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
           <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundUncheckedDisabled}" />
         </Style>
 
-        <Style Selector="^ Border#PART_Border">
+        <Style Selector="^ /template/ Border#PART_Border">
           <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundUncheckedDisabled}" />
           <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUncheckedDisabled}" />
         </Style>
 
-        <Style Selector="^ Border#NormalRectangle">
+        <Style Selector="^ /template/ Border#NormalRectangle">
           <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUncheckedDisabled}" />
           <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillUncheckedDisabled}" />
         </Style>
 
-        <Style Selector="^ Path#CheckGlyph">
+        <Style Selector="^ /template/ Path#CheckGlyph">
           <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundUncheckedDisabled}" />
         </Style>
       </Style>
@@ -145,64 +145,64 @@
         </Style>
 
         <!-- Checked PointerOver State -->
-        <Style Selector="^:pointerover /template/">
-          <Style Selector="^ ContentPresenter#ContentPresenter">
+        <Style Selector="^:pointerover">
+          <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
             <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundCheckedPointerOver}" />
           </Style>
 
-          <Style Selector="^ Border#PART_Border">
+          <Style Selector="^ /template/ Border#PART_Border">
             <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundCheckedPointerOver}" />
             <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushCheckedPointerOver}" />
           </Style>
 
-          <Style Selector="^ Border#NormalRectangle">
+          <Style Selector="^ /template/ Border#NormalRectangle">
             <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeCheckedPointerOver}" />
             <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillCheckedPointerOver}" />
           </Style>
 
-          <Style Selector="^ Path#CheckGlyph">
+          <Style Selector="^ /template/ Path#CheckGlyph">
             <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundCheckedPointerOver}" />
           </Style>
         </Style>
 
         <!-- Checked Pressed State -->
-        <Style Selector="^:pressed /template/">
-          <Style Selector="^ ContentPresenter#ContentPresenter">
+        <Style Selector="^:pressed">
+          <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
             <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundCheckedPressed}" />
           </Style>
 
-          <Style Selector="^ Border#PART_Border">
+          <Style Selector="^ /template/ Border#PART_Border">
             <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundCheckedPressed}" />
             <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushCheckedPressed}" />
           </Style>
 
-          <Style Selector="^ Border#NormalRectangle">
+          <Style Selector="^ /template/ Border#NormalRectangle">
             <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeCheckedPressed}" />
             <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillCheckedPressed}" />
           </Style>
 
-          <Style Selector="^ Path#CheckGlyph">
+          <Style Selector="^ /template/ Path#CheckGlyph">
             <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundCheckedPressed}" />
           </Style>
         </Style>
 
         <!-- Checked Disabled State -->
-        <Style Selector="^:disabled /template/">
+        <Style Selector="^:disabled">
           <Style Selector="^ ContentPresenter#ContentPresenter">
             <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundCheckedDisabled}" />
           </Style>
 
-          <Style Selector="^ Border#PART_Border">
+          <Style Selector="^ /template/ Border#PART_Border">
             <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundCheckedDisabled}" />
             <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushCheckedDisabled}" />
           </Style>
 
-          <Style Selector="^ Border#NormalRectangle">
+          <Style Selector="^ /template/ Border#NormalRectangle">
             <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeCheckedDisabled}" />
             <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillCheckedDisabled}" />
           </Style>
 
-          <Style Selector="^ Path#CheckGlyph">
+          <Style Selector="^ /template/ Path#CheckGlyph">
             <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundCheckedDisabled}" />
           </Style>
         </Style>
@@ -227,64 +227,64 @@
         </Style>
 
         <!-- Indeterminate PointerOver State -->
-        <Style Selector="^:pointerover /template/">
-          <Style Selector="^ ContentPresenter#ContentPresenter">
+        <Style Selector="^:pointerover">
+          <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
             <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminatePointerOver}" />
           </Style>
 
-          <Style Selector="^ Border#PART_Border">
+          <Style Selector="^ /template/ Border#PART_Border">
             <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundIndeterminatePointerOver}" />
             <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminatePointerOver}" />
           </Style>
 
-          <Style Selector="^ Border#NormalRectangle">
+          <Style Selector="^ /template/ Border#NormalRectangle">
             <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminatePointerOver}" />
             <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminatePointerOver}" />
           </Style>
 
-          <Style Selector="^ Path#CheckGlyph">
+          <Style Selector="^ /template/ Path#CheckGlyph">
             <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminatePointerOver}" />
           </Style>
         </Style>
 
         <!-- Indeterminate Pressed State -->
-        <Style Selector="^:pressed /template/">
-          <Style Selector="^ ContentPresenter#ContentPresenter">
+        <Style Selector="^:pressed">
+          <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
             <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminatePressed}" />
           </Style>
 
-          <Style Selector="^ Border#PART_Border">
+          <Style Selector="^ /template/ Border#PART_Border">
             <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundIndeterminatePressed}" />
             <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminatePressed}" />
           </Style>
 
-          <Style Selector="^ Border#NormalRectangle">
+          <Style Selector="^ /template/ Border#NormalRectangle">
             <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminatePressed}" />
             <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminatePressed}" />
           </Style>
 
-          <Style Selector="^ Path#CheckGlyph">
+          <Style Selector="^ /template/ Path#CheckGlyph">
             <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminatePressed}" />
           </Style>
         </Style>
 
         <!-- Indeterminate Disabled State -->
-        <Style Selector="^:disabled /template/">
-          <Style Selector="^ ContentPresenter#ContentPresenter">
+        <Style Selector="^:disabled">
+          <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
             <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminateDisabled}" />
           </Style>
 
-          <Style Selector="^ Border#PART_Border">
+          <Style Selector="^ /template/ Border#PART_Border">
             <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundIndeterminateDisabled}" />
             <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminateDisabled}" />
           </Style>
 
-          <Style Selector="^ Border#NormalRectangle">
+          <Style Selector="^ /template/ Border#NormalRectangle">
             <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminateDisabled}" />
             <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminateDisabled}" />
           </Style>
 
-          <Style Selector="^ Path#CheckGlyph">
+          <Style Selector="^ /template/ Path#CheckGlyph">
             <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminateDisabled}" />
           </Style>
         </Style>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml b/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml
index 2dc7439001..8ef8388cf1 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml
@@ -144,17 +144,15 @@
       </Setter>
 
       <!--  Normal State  -->
-      <Style Selector="^ /template/">
-        <Style Selector="^ TextBlock#PlaceholderTextBlock">
-          <Setter Property="Foreground" Value="{DynamicResource ComboBoxPlaceHolderForeground}" />
-        </Style>
-        <Style Selector="^ Border#HighlightBackground">
-          <Setter Property="IsVisible" Value="False" />
-        </Style>
-        <Style Selector="^ PathIcon#DropDownGlyph">
-          <Setter Property="Foreground" Value="{DynamicResource ComboBoxDropDownGlyphForeground}" />
-          <Setter Property="Data" Value="M1939 486L2029 576L1024 1581L19 576L109 486L1024 1401L1939 486Z" />
-        </Style>
+      <Style Selector="^ /template/ TextBlock#PlaceholderTextBlock">
+        <Setter Property="Foreground" Value="{DynamicResource ComboBoxPlaceHolderForeground}" />
+      </Style>
+      <Style Selector="^ /template/ Border#HighlightBackground">
+        <Setter Property="IsVisible" Value="False" />
+      </Style>
+      <Style Selector="^ /template/ PathIcon#DropDownGlyph">
+        <Setter Property="Foreground" Value="{DynamicResource ComboBoxDropDownGlyphForeground}" />
+        <Setter Property="Data" Value="M1939 486L2029 576L1024 1581L19 576L109 486L1024 1401L1939 486Z" />
       </Style>
 
       <!--  PointerOver State  -->
@@ -175,51 +173,51 @@
       </Style>
 
       <!--  Focus Pressed State  -->
-      <Style Selector="^:focused:pressed /template/">
-        <Style Selector="^ ContentControl#ContentPresenter">
+      <Style Selector="^:focused:pressed">
+        <Style Selector="^ /template/ ContentControl#ContentPresenter">
           <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundFocusedPressed}" />
         </Style>
-        <Style Selector="^ TextBlock#PlaceholderTextBlock">
+        <Style Selector="^ /template/ TextBlock#PlaceholderTextBlock">
           <Setter Property="Foreground" Value="{DynamicResource ComboBoxPlaceHolderForegroundFocusedPressed}" />
         </Style>
-        <Style Selector="^ PathIcon#DropDownGlyph">
+        <Style Selector="^ /template/ PathIcon#DropDownGlyph">
           <Setter Property="Foreground" Value="{DynamicResource ComboBoxDropDownGlyphForegroundFocusedPressed}" />
         </Style>
       </Style>
 
       <!--  Focused State  -->
-      <Style Selector="^:focus-visible /template/">
-        <Style Selector="^ Border#HighlightBackground">
+      <Style Selector="^:focus-visible">
+        <Style Selector="^ /template/ Border#HighlightBackground">
           <Setter Property="IsVisible" Value="True" />
           <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxBackgroundBorderBrushFocused}" />
         </Style>
-        <Style Selector="^ ContentControl#ContentPresenter">
+        <Style Selector="^ /template/ ContentControl#ContentPresenter">
           <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundFocused}" />
         </Style>
-        <Style Selector="^ TextBlock#PlaceholderTextBlock">
+        <Style Selector="^ /template/ TextBlock#PlaceholderTextBlock">
           <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundFocused}" />
         </Style>
-        <Style Selector="^ PathIcon#DropDownGlyph">
+        <Style Selector="^ /template/ PathIcon#DropDownGlyph">
           <Setter Property="Foreground" Value="{DynamicResource ComboBoxDropDownGlyphForegroundFocused}" />
         </Style>
       </Style>
 
       <!--  Disabled State  -->
-      <Style Selector="^:disabled /template/">
-        <Style Selector="^ Border#Background">
+      <Style Selector="^:disabled">
+        <Style Selector="^ /template/ Border#Background">
           <Setter Property="Background" Value="{DynamicResource ComboBoxBackgroundDisabled}" />
           <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxBorderBrushDisabled}" />
         </Style>
-        <Style Selector="^ ContentPresenter#HeaderContentPresenter">
+        <Style Selector="^ /template/ ContentPresenter#HeaderContentPresenter">
           <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundDisabled}" />
         </Style>
-        <Style Selector="^ ContentControl#ContentPresenter">
+        <Style Selector="^ /template/ ContentControl#ContentPresenter">
           <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundDisabled}" />
         </Style>
-        <Style Selector="^ TextBlock#PlaceholderTextBlock">
+        <Style Selector="^ /template/ TextBlock#PlaceholderTextBlock">
           <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundDisabled}" />
         </Style>
-        <Style Selector="^ PathIcon#DropDownGlyph">
+        <Style Selector="^ /template/ PathIcon#DropDownGlyph">
           <Setter Property="Foreground" Value="{DynamicResource ComboBoxDropDownGlyphForegroundDisabled}" />
         </Style>
       </Style>
diff --git a/src/Avalonia.Themes.Fluent/Controls/Slider.xaml b/src/Avalonia.Themes.Fluent/Controls/Slider.xaml
index b468f7f4ad..c74878e8be 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Slider.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Slider.xaml
@@ -283,17 +283,15 @@
 
     <!--  Normal State  -->
 
-    <Style Selector="^ /template/">
-      <Style Selector="^Thumb.SliderThumbStyle">
-        <Setter Property="Background" Value="{DynamicResource SliderThumbBackground}" />
-      </Style>
-      <Style Selector="^Grid#SliderContainer">
-        <Setter Property="Background" Value="{DynamicResource SliderContainerBackground}" />
-      </Style>
-      <Style Selector="^TickBar">
-        <Setter Property="IsVisible" Value="False" />
-        <Setter Property="Fill" Value="{DynamicResource SliderTickBarFill}" />
-      </Style>
+    <Style Selector="^ /template/ Thumb.SliderThumbStyle">
+      <Setter Property="Background" Value="{DynamicResource SliderThumbBackground}" />
+    </Style>
+    <Style Selector="^ /template/ Grid#SliderContainer">
+      <Setter Property="Background" Value="{DynamicResource SliderContainerBackground}" />
+    </Style>
+    <Style Selector="^/template/ TickBar">
+      <Setter Property="IsVisible" Value="False" />
+      <Setter Property="Fill" Value="{DynamicResource SliderTickBarFill}" />
     </Style>
 
     <!--  TickBar Placement States  -->
@@ -316,70 +314,70 @@
 
     <!--  Disabled State  -->
 
-    <Style Selector="^:disabled /template/">
-      <Style Selector="^ContentPresenter#HeaderContentPresenter">
+    <Style Selector="^:disabled">
+      <Style Selector="^ /template/ ContentPresenter#HeaderContentPresenter">
         <Setter Property="Foreground" Value="{DynamicResource SliderHeaderForegroundDisabled}" />
       </Style>
-      <Style Selector="^RepeatButton#PART_DecreaseButton">
+      <Style Selector="^ /template/ RepeatButton#PART_DecreaseButton">
         <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillDisabled}" />
       </Style>
 
-      <Style Selector="^RepeatButton#PART_IncreaseButton">
+      <Style Selector="^ /template/ RepeatButton#PART_IncreaseButton">
         <Setter Property="Background" Value="{DynamicResource SliderTrackFillDisabled}" />
       </Style>
 
-      <Style Selector="^Thumb.SliderThumbStyle">
+      <Style Selector="^ /template/ Thumb.SliderThumbStyle">
         <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundDisabled}" />
       </Style>
 
-      <Style Selector="^TickBar">
+      <Style Selector="^ /template/ TickBar">
         <Setter Property="Fill" Value="{DynamicResource SliderTickBarFillDisabled}" />
       </Style>
     </Style>
 
     <!--  PointerOver State  -->
-    <Style Selector="^:pointerover /template/">
-      <Style Selector="^Grid#SliderContainer">
+    <Style Selector="^:pointerover">
+      <Style Selector="^ /template/ Grid#SliderContainer">
         <Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundDisabled}" />
       </Style>
-      <Style Selector="^RepeatButton#PART_IncreaseButton">
+      <Style Selector="^ /template/ RepeatButton#PART_IncreaseButton">
         <Setter Property="Background" Value="{DynamicResource SliderTrackFillPointerOver}" />
       </Style>
 
-      <Style Selector="^Thumb.SliderThumbStyle">
+      <Style Selector="^ /template/ Thumb.SliderThumbStyle">
           <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPointerOver}" />
       </Style>
 
-      <Style Selector="^Grid#SliderContainer">
+      <Style Selector="^ /template/ Grid#SliderContainer">
           <Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundPointerOver}" />
       </Style>
 
-      <Style Selector="^RepeatButton#PART_DecreaseButton">
+      <Style Selector="^ /template/ RepeatButton#PART_DecreaseButton">
           <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillPointerOver}" />
       </Style>
     
     </Style>
 
     <!--  Pressed State  -->
-    <Style Selector="^:pressed /template/">
-      <Style Selector="^Grid#SliderContainer">
+    <Style Selector="^:pressed">
+      <Style Selector="^ /template/ Grid#SliderContainer">
         <Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundPressed}" />
       </Style>
-      <Style Selector="^RepeatButton#PART_DecreaseButton">
+      <Style Selector="^ /template/ RepeatButton#PART_DecreaseButton">
         <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillPressed}" />
       </Style>
-      <Style Selector="^RepeatButton#PART_IncreaseButton">
+      <Style Selector="^ /template/ RepeatButton#PART_IncreaseButton">
         <Setter Property="Background" Value="{DynamicResource SliderTrackFillPressed}" />
       </Style>
 
-      <Style Selector="^Thumb.SliderThumbStyle">
+      <Style Selector="^ /template/ Thumb.SliderThumbStyle">
         <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPressed}" />
       </Style>
     </Style>
 
     <Style Selector="^:error">
       <Setter Property="Foreground" Value="{DynamicResource SystemControlErrorTextForegroundBrush}" />
-      <Style Selector="^/template/ Thumb.SliderThumbStyle">
+      <Style Selector="^ /template/ Thumb.SliderThumbStyle">
         <Setter Property="Background" Value="{DynamicResource SystemControlErrorTextForegroundBrush}" />
       </Style>
     </Style>
diff --git a/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml b/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml
index 69b2d32dda..dc09032a36 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml
@@ -82,11 +82,11 @@
           <Setter Property="Foreground" Value="{DynamicResource TimePickerButtonForegroundDisabled}" />
         </Style>
       </Style>-->
-      <Style Selector="^:disabled /template/">
-        <Style Selector="^ ContentPresenter#HeaderContentPresenter">
+      <Style Selector="^:disabled">
+        <Style Selector="^ /template/ ContentPresenter#HeaderContentPresenter">
           <Setter Property="Foreground" Value="{DynamicResource TimePickerHeaderForegroundDisabled}" />
         </Style>
-        <Style Selector="^ Rectangle">
+        <Style Selector="^ /template/ Rectangle">
           <Setter Property="Fill" Value="{DynamicResource TimePickerSpacerFillDisabled}" />
         </Style>
       </Style>

From 671b7ea83e75a2b442a4ee0d5877c0e269dfbc48 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 7 Jul 2022 11:50:33 +0200
Subject: [PATCH 051/240] WIP: HamburgerMenu.

---
 samples/ControlCatalog/App.xaml               |   8 +-
 .../HamburgerMenu/HamburgerMenu.xaml          | 260 +++++++++---------
 2 files changed, 139 insertions(+), 129 deletions(-)

diff --git a/samples/ControlCatalog/App.xaml b/samples/ControlCatalog/App.xaml
index d0e1bd885e..c7ad72d2c5 100644
--- a/samples/ControlCatalog/App.xaml
+++ b/samples/ControlCatalog/App.xaml
@@ -5,6 +5,13 @@
              x:CompileBindings="True"
              Name="Avalonia ControlCatalog"
              x:Class="ControlCatalog.App">
+  <Application.Resources>
+    <ResourceDictionary>
+      <ResourceDictionary.MergedDictionaries>
+        <ResourceInclude Source="avares://ControlSamples/HamburgerMenu/HamburgerMenu.xaml" />
+      </ResourceDictionary.MergedDictionaries>
+    </ResourceDictionary>
+  </Application.Resources>
   <Application.Styles>
     <Style Selector="TextBlock.h1, TextBlock.h2, TextBlock.h3">
       <Setter Property="TextWrapping" Value="Wrap" />
@@ -29,7 +36,6 @@
     <Style Selector="Label.h3">
       <Setter Property="FontSize" Value="12" />
     </Style>
-    <StyleInclude Source="avares://ControlSamples/HamburgerMenu/HamburgerMenu.xaml" />
   </Application.Styles>
   <TrayIcon.Icons>
     <TrayIcons>
diff --git a/samples/SampleControls/HamburgerMenu/HamburgerMenu.xaml b/samples/SampleControls/HamburgerMenu/HamburgerMenu.xaml
index 1d58c465a0..5f8bfe4fb5 100644
--- a/samples/SampleControls/HamburgerMenu/HamburgerMenu.xaml
+++ b/samples/SampleControls/HamburgerMenu/HamburgerMenu.xaml
@@ -1,6 +1,6 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:catalog="using:ControlSamples">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:catalog="using:ControlSamples">
   <Design.PreviewWith>
     <Border Width="400"
             Height="150">
@@ -20,21 +20,84 @@
     </Border>
   </Design.PreviewWith>
 
-  <Styles.Resources>
-    <x:Double x:Key="PaneCompactWidth">40</x:Double>
-    <x:Double x:Key="PaneExpandWidth">220</x:Double>
-    <x:Double x:Key="HeaderHeight">36</x:Double>
-    <x:Double x:Key="NavigationItemHeight">36</x:Double>
-    <x:Double x:Key="HamburgerMenuButtonHeight">32</x:Double>
-    <Thickness x:Key="HeaderMarginCollapsedPane">12,0,0,0</Thickness>
-    <Thickness x:Key="HeaderMarginExpandedPane">52,0,0,0</Thickness>
-    <Thickness x:Key="HeaderMarginExpandedOverlayPane">212,0,0,0</Thickness>
-    <BoxShadows x:Key="NavigationItemShadow">1 1 1 1 #2000, 0 0 1 1 #2fff</BoxShadows>
-    <BoxShadows x:Key="NavigationContentShadow">0 0 1 1 #2000</BoxShadows>
-  </Styles.Resources>
+  <x:Double x:Key="PaneCompactWidth">40</x:Double>
+  <x:Double x:Key="PaneExpandWidth">220</x:Double>
+  <x:Double x:Key="HeaderHeight">36</x:Double>
+  <x:Double x:Key="NavigationItemHeight">36</x:Double>
+  <x:Double x:Key="HamburgerMenuButtonHeight">32</x:Double>
+  <Thickness x:Key="HeaderMarginCollapsedPane">12,0,0,0</Thickness>
+  <Thickness x:Key="HeaderMarginExpandedPane">52,0,0,0</Thickness>
+  <Thickness x:Key="HeaderMarginExpandedOverlayPane">212,0,0,0</Thickness>
+  <BoxShadows x:Key="NavigationItemShadow">1 1 1 1 #2000, 0 0 1 1 #2fff</BoxShadows>
+  <BoxShadows x:Key="NavigationContentShadow">0 0 1 1 #2000</BoxShadows>
 
+  <ControlTheme x:Key="NavigationButton" TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
+    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="HorizontalAlignment" Value="Stretch" />
+    <Setter Property="VerticalAlignment" Value="Stretch" />
+    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+    <Setter Property="FontWeight" Value="Normal" />
+    <Setter Property="MinHeight" Value="0" />
+    <Setter Property="Height" Value="{StaticResource NavigationItemHeight}" />
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="Padding" Value="12,0,4,0" />
+    <Setter Property="Margin" Value="4,0,8,0" />
+    <Setter Property="CornerRadius" Value="8" />
+    <Setter Property="ClipToBounds" Value="False" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ContentPresenter Name="PART_ContentPresenter"
+                          Padding="{TemplateBinding Padding}"
+                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          Content="{TemplateBinding Content}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
+                          TextElement.FontFamily="{TemplateBinding FontFamily}"
+                          TextElement.FontSize="{TemplateBinding FontSize}"
+                          TextElement.FontWeight="{TemplateBinding FontWeight}" />
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+
+  <ControlTheme x:Key="HamburgerMenuTabItem" TargetType="TabItem">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Name="PART_LayoutRoot"
+                HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <Panel>
+            <Border Name="PART_SelectedPipe"
+                    Width="{DynamicResource TabItemPipeThickness}"
+                    Height="{DynamicResource TabItemVerticalPipeHeight}"
+                    Margin="6,0,0,0"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    Background="{DynamicResource TabItemHeaderSelectedPipeFill}" />
+            <ContentPresenter Name="PART_ContentPresenter"
+                              Padding="{TemplateBinding Padding}"
+                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                              Content="{TemplateBinding Header}"
+                              ContentTemplate="{TemplateBinding HeaderTemplate}"
+                              TextElement.FontFamily="{TemplateBinding FontFamily}"
+                              TextElement.FontSize="{TemplateBinding FontSize}"
+                              TextElement.FontWeight="{TemplateBinding FontWeight}" />
+          </Panel>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+  
   <!--  HamburgerMenu  -->
-  <Style Selector="catalog|HamburgerMenu">
+  <ControlTheme x:Key="{x:Type catalog:HamburgerMenu}" TargetType="catalog:HamburgerMenu">
     <Setter Property="Padding" Value="12 8 4 0" />
     <Setter Property="PaneBackground" Value="{DynamicResource SystemChromeMediumColor}" />
     <Setter Property="Background" Value="{DynamicResource SystemChromeMediumColor}" />
@@ -60,6 +123,11 @@
                                   ItemTemplate="{TemplateBinding ItemTemplate}"
                                   Items="{TemplateBinding Items}"
                                   ItemsPanel="{TemplateBinding ItemsPanel}">
+                    <ItemsPresenter.Styles>
+                      <Style Selector="catalog|HamburgerMenu > TabItem">
+                        <Setter Property="Theme" Value="{StaticResource HamburgerMenuTabItem}"/>
+                      </Style>
+                    </ItemsPresenter.Styles>
                     <ItemsPresenter.ItemsPanel>
                       <ItemsPanelTemplate>
                         <StackPanel x:Name="HamburgerItemsPanel"
@@ -70,7 +138,7 @@
                 </ScrollViewer>
                 <Button x:Name="SettingsButton"
                         Grid.Row="2"
-                        Classes="NavigationButton"
+                        Theme="{StaticResource NavigationButton}"
                         Content="Settings"
                         Flyout="{TemplateBinding (FlyoutBase.AttachedFlyout)}"
                         IsVisible="{Binding $parent[TabControl].(FlyoutBase.AttachedFlyout), Converter={x:Static ObjectConverters.IsNotNull}}" />
@@ -127,116 +195,52 @@
         </Panel>
       </ControlTemplate>
     </Setter>
-  </Style>
 
-  <Style Selector="catalog|HamburgerMenu /template/ SplitView TextBlock#HeaderHolder">
-    <Setter Property="Margin" Value="{StaticResource HeaderMarginExpandedPane}" />
-  </Style>
-  <Style Selector="catalog|HamburgerMenu /template/ SplitView[IsPaneOpen=True] TextBlock#HeaderHolder">
-    <Setter Property="Margin" Value="{StaticResource HeaderMarginCollapsedPane}" />
-  </Style>
-  <Style Selector="catalog|HamburgerMenu /template/ SplitView[DisplayMode=Overlay][IsPaneOpen=True] TextBlock#HeaderHolder">
-    <Setter Property="Margin" Value="{StaticResource HeaderMarginExpandedOverlayPane}" />
-  </Style>
-  <Style Selector="catalog|HamburgerMenu /template/ SplitView">
-    <Setter Property="PaneBackground" Value="Transparent" />
-  </Style>
-  <Style Selector="catalog|HamburgerMenu /template/ SplitView[DisplayMode=Overlay]">
-    <Setter Property="PaneBackground" Value="{TemplateBinding PaneBackground}" />
-  </Style>
-  <Style Selector="catalog|HamburgerMenu /template/ SplitView[DisplayMode=Overlay]">
-    <Setter Property="Background" Value="{Binding $parent[TabControl].ContentBackground}" />
-  </Style>
-  <Style Selector="catalog|HamburgerMenu /template/ SplitView[DisplayMode=Inline] Border#BackgroundBorder">
-    <Setter Property="Background" Value="{Binding $parent[TabControl].ContentBackground}" />
-    <Setter Property="BoxShadow" Value="{StaticResource NavigationContentShadow}" />
-  </Style>
-  <Style Selector="catalog|HamburgerMenu /template/ SplitView[DisplayMode=Inline][IsPaneOpen=True] Border#BackgroundBorder">
-    <Setter Property="CornerRadius" Value="8 0 0 0" />
-  </Style>
+    <Style Selector="^ /template/ SplitView TextBlock#HeaderHolder">
+      <Setter Property="Margin" Value="{StaticResource HeaderMarginExpandedPane}" />
+    </Style>
+    <Style Selector="^ /template/ SplitView[IsPaneOpen=True] TextBlock#HeaderHolder">
+      <Setter Property="Margin" Value="{StaticResource HeaderMarginCollapsedPane}" />
+    </Style>
+    <Style Selector="^ /template/ SplitView[DisplayMode=Overlay][IsPaneOpen=True] TextBlock#HeaderHolder">
+      <Setter Property="Margin" Value="{StaticResource HeaderMarginExpandedOverlayPane}" />
+    </Style>
+    <Style Selector="^ /template/ SplitView">
+      <Setter Property="PaneBackground" Value="Transparent" />
+    </Style>
+    <Style Selector="^ /template/ SplitView[DisplayMode=Overlay]">
+      <Setter Property="PaneBackground" Value="{TemplateBinding PaneBackground}" />
+    </Style>
+    <Style Selector="^ /template/ SplitView[DisplayMode=Overlay]">
+      <Setter Property="Background" Value="{Binding $parent[TabControl].ContentBackground}" />
+    </Style>
+    <Style Selector="^ /template/ SplitView[DisplayMode=Inline] Border#BackgroundBorder">
+      <Setter Property="Background" Value="{Binding $parent[TabControl].ContentBackground}" />
+      <Setter Property="BoxShadow" Value="{StaticResource NavigationContentShadow}" />
+    </Style>
+    <Style Selector="^ /template/ SplitView[DisplayMode=Inline][IsPaneOpen=True] Border#BackgroundBorder">
+      <Setter Property="CornerRadius" Value="8 0 0 0" />
+    </Style>
+    <!--<Style Selector="^ > TabItem">
+      
+    </Style>-->
+    <!--<Style Selector="^ > TabItem /template/ Border#PART_LayoutRoot, :is(Button).NavigationButton /template/ ContentPresenter">
+      <Setter Property="Border.Background" Value="Transparent" />
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource SystemBaseHighColor}" />
+    </Style>
+    <Style Selector="^ > TabItem:pointerover /template/ Border#PART_LayoutRoot, :is(Button).NavigationButton:pointerover /template/ ContentPresenter">
+      <Setter Property="Border.Background" Value="{DynamicResource SystemChromeLowColor}" />
+      <Setter Property="Border.BoxShadow" Value="{StaticResource NavigationItemShadow}" />
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPointerOver}" />
+    </Style>
+    <Style Selector="^ > TabItem:pressed /template/ Border#PART_LayoutRoot, :is(Button).NavigationButton:pressed /template/ ContentPresenter">
+      <Setter Property="Border.Background" Value="{DynamicResource SystemChromeLowColor}" />
+      <Setter Property="Border.BoxShadow" Value="{StaticResource NavigationItemShadow}" />
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPressed}" />
+    </Style>
+    <Style Selector=":is(Button).NavigationButton:pressed">
+      <Setter Property="RenderTransform" Value="none" />
+    </Style>-->
+  </ControlTheme>
 
-
-  <!--  HamburgerMenu TabItem  -->
-  <Style Selector="catalog|HamburgerMenu > TabItem, :is(Button).NavigationButton">
-    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="HorizontalAlignment" Value="Stretch" />
-    <Setter Property="VerticalAlignment" Value="Stretch" />
-    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-    <Setter Property="FontWeight" Value="Normal" />
-    <Setter Property="MinHeight" Value="0" />
-    <Setter Property="Height" Value="{StaticResource NavigationItemHeight}" />
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="Padding" Value="12,0,4,0" />
-    <Setter Property="Margin" Value="4,0,8,0" />
-    <Setter Property="CornerRadius" Value="8" />
-    <Setter Property="ClipToBounds" Value="False" />
-  </Style>
-  <Style Selector="catalog|HamburgerMenu > TabItem">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Name="PART_LayoutRoot"
-                HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}">
-          <Panel>
-            <Border Name="PART_SelectedPipe"
-                    Width="{DynamicResource TabItemPipeThickness}"
-                    Height="{DynamicResource TabItemVerticalPipeHeight}"
-                    Margin="6,0,0,0"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Center"
-                    Background="{DynamicResource TabItemHeaderSelectedPipeFill}" />
-            <ContentPresenter Name="PART_ContentPresenter"
-                              Padding="{TemplateBinding Padding}"
-                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                              Content="{TemplateBinding Header}"
-                              ContentTemplate="{TemplateBinding HeaderTemplate}"
-                              TextElement.FontFamily="{TemplateBinding FontFamily}"
-                              TextElement.FontSize="{TemplateBinding FontSize}"
-                              TextElement.FontWeight="{TemplateBinding FontWeight}" />
-          </Panel>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-  <Style Selector=":is(Button).NavigationButton">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <ContentPresenter Name="PART_ContentPresenter"
-                          Padding="{TemplateBinding Padding}"
-                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                          Background="{TemplateBinding Background}"
-                          BorderBrush="{TemplateBinding BorderBrush}"
-                          BorderThickness="{TemplateBinding BorderThickness}"
-                          Content="{TemplateBinding Content}"
-                          ContentTemplate="{TemplateBinding ContentTemplate}"
-                          CornerRadius="{TemplateBinding CornerRadius}"
-                          TextElement.FontFamily="{TemplateBinding FontFamily}"
-                          TextElement.FontSize="{TemplateBinding FontSize}"
-                          TextElement.FontWeight="{TemplateBinding FontWeight}" />
-      </ControlTemplate>
-    </Setter>
-  </Style>
-  <Style Selector="catalog|HamburgerMenu > TabItem /template/ Border#PART_LayoutRoot, :is(Button).NavigationButton /template/ ContentPresenter">
-    <Setter Property="Border.Background" Value="Transparent" />
-    <Setter Property="TextElement.Foreground" Value="{DynamicResource SystemBaseHighColor}" />
-  </Style>
-  <Style Selector="catalog|HamburgerMenu > TabItem:pointerover /template/ Border#PART_LayoutRoot, :is(Button).NavigationButton:pointerover /template/ ContentPresenter">
-    <Setter Property="Border.Background" Value="{DynamicResource SystemChromeLowColor}" />
-    <Setter Property="Border.BoxShadow" Value="{StaticResource NavigationItemShadow}" />
-    <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPointerOver}" />
-  </Style>
-  <Style Selector="catalog|HamburgerMenu > TabItem:pressed /template/ Border#PART_LayoutRoot, :is(Button).NavigationButton:pressed /template/ ContentPresenter">
-    <Setter Property="Border.Background" Value="{DynamicResource SystemChromeLowColor}" />
-    <Setter Property="Border.BoxShadow" Value="{StaticResource NavigationItemShadow}" />
-    <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPressed}" />
-  </Style>
-  <Style Selector=":is(Button).NavigationButton:pressed">
-    <Setter Property="RenderTransform" Value="none" />
-  </Style>
-</Styles>
+</ResourceDictionary>

From f57c0ffbecafab9cc3b2b7996676694150b7b1af Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 7 Jul 2022 17:06:44 +0200
Subject: [PATCH 052/240] Added ItemContainerTheme property.

Otherwise there's no easy way to apply themes to item containers.
---
 .../Generators/IItemContainerGenerator.cs     |  6 +++
 .../Generators/ItemContainerGenerator.cs      | 16 ++++++-
 .../Generators/ItemContainerGenerator`1.cs    | 21 ++++-----
 .../Generators/TreeItemContainerGenerator.cs  |  5 +++
 src/Avalonia.Controls/ItemsControl.cs         | 21 +++++++++
 src/Avalonia.Controls/TreeViewItem.cs         |  5 +++
 .../ItemsControlTests.cs                      | 28 +++++++++---
 .../ListBoxTests.cs                           | 44 +++++++++++++++++++
 .../TreeViewTests.cs                          | 29 ++++++++++++
 9 files changed, 159 insertions(+), 16 deletions(-)

diff --git a/src/Avalonia.Controls/Generators/IItemContainerGenerator.cs b/src/Avalonia.Controls/Generators/IItemContainerGenerator.cs
index 70d9dbec08..f9772cb399 100644
--- a/src/Avalonia.Controls/Generators/IItemContainerGenerator.cs
+++ b/src/Avalonia.Controls/Generators/IItemContainerGenerator.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Avalonia.Controls.Templates;
+using Avalonia.Styling;
 
 namespace Avalonia.Controls.Generators
 {
@@ -14,6 +15,11 @@ namespace Avalonia.Controls.Generators
         /// </summary>
         IEnumerable<ItemContainerInfo> Containers { get; }
 
+        /// <summary>
+        /// Gets or sets the theme to be applied to the items in the control.
+        /// </summary>
+        ControlTheme? ItemContainerTheme { get; set; }
+
         /// <summary>
         /// Gets or sets the data template used to display the items in the control.
         /// </summary>
diff --git a/src/Avalonia.Controls/Generators/ItemContainerGenerator.cs b/src/Avalonia.Controls/Generators/ItemContainerGenerator.cs
index a76dcbe9c8..8b36b07cec 100644
--- a/src/Avalonia.Controls/Generators/ItemContainerGenerator.cs
+++ b/src/Avalonia.Controls/Generators/ItemContainerGenerator.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Templates;
 using Avalonia.Data;
+using Avalonia.Styling;
 
 namespace Avalonia.Controls.Generators
 {
@@ -35,6 +36,11 @@ namespace Avalonia.Controls.Generators
         /// <inheritdoc/>
         public event EventHandler<ItemContainerEventArgs>? Recycled;
 
+        /// <summary>
+        /// Gets or sets the theme to be applied to the items in the control.
+        /// </summary>
+        public ControlTheme? ItemContainerTheme { get; set; }
+
         /// <summary>
         /// Gets or sets the data template used to display the items in the control.
         /// </summary>
@@ -190,10 +196,18 @@ namespace Avalonia.Controls.Generators
                     result.SetValue(
                         ContentPresenter.ContentTemplateProperty,
                         ItemTemplate,
-                        BindingPriority.TemplatedParent);
+                        BindingPriority.Style);
                 }
             }
 
+            if (ItemContainerTheme != null)
+            {
+                result.SetValue(
+                    StyledElement.ThemeProperty,
+                    ItemContainerTheme,
+                    BindingPriority.TemplatedParent);
+            }
+
             return result;
         }
 
diff --git a/src/Avalonia.Controls/Generators/ItemContainerGenerator`1.cs b/src/Avalonia.Controls/Generators/ItemContainerGenerator`1.cs
index 635f3a7d37..3ff1b0702d 100644
--- a/src/Avalonia.Controls/Generators/ItemContainerGenerator`1.cs
+++ b/src/Avalonia.Controls/Generators/ItemContainerGenerator`1.cs
@@ -44,28 +44,29 @@ namespace Avalonia.Controls.Generators
         {
             var container = item as T;
 
-            if (container != null)
+            if (container is null)
             {
-                return container;
-            }
-            else
-            {
-                var result = new T();
+                container = new T();
 
                 if (ContentTemplateProperty != null)
                 {
-                    result.SetValue(ContentTemplateProperty, ItemTemplate, BindingPriority.Style);
+                    container.SetValue(ContentTemplateProperty, ItemTemplate, BindingPriority.Style);
                 }
 
-                result.SetValue(ContentProperty, item, BindingPriority.Style);
+                container.SetValue(ContentProperty, item, BindingPriority.Style);
 
                 if (!(item is IControl))
                 {
-                    result.DataContext = item;
+                    container.DataContext = item;
                 }
+            }
 
-                return result;
+            if (ItemContainerTheme != null)
+            {
+                container.SetValue(StyledElement.ThemeProperty, ItemContainerTheme, BindingPriority.Style);
             }
+
+            return container;
         }
 
         /// <inheritdoc/>
diff --git a/src/Avalonia.Controls/Generators/TreeItemContainerGenerator.cs b/src/Avalonia.Controls/Generators/TreeItemContainerGenerator.cs
index 536a5fdd06..4e3deb5552 100644
--- a/src/Avalonia.Controls/Generators/TreeItemContainerGenerator.cs
+++ b/src/Avalonia.Controls/Generators/TreeItemContainerGenerator.cs
@@ -71,6 +71,11 @@ namespace Avalonia.Controls.Generators
                 var template = GetTreeDataTemplate(item, ItemTemplate);
                 var result = new T();
 
+                if (ItemContainerTheme != null)
+                {
+                    result.SetValue(Control.ThemeProperty, ItemContainerTheme, BindingPriority.Style);
+                }
+
                 result.SetValue(ContentProperty, template.Build(item), BindingPriority.Style);
 
                 var itemsSelector = template.ItemsSelector(item);
diff --git a/src/Avalonia.Controls/ItemsControl.cs b/src/Avalonia.Controls/ItemsControl.cs
index 56b0014c05..427f5c8a9b 100644
--- a/src/Avalonia.Controls/ItemsControl.cs
+++ b/src/Avalonia.Controls/ItemsControl.cs
@@ -15,6 +15,7 @@ using Avalonia.Input;
 using Avalonia.LogicalTree;
 using Avalonia.Metadata;
 using Avalonia.VisualTree;
+using Avalonia.Styling;
 
 namespace Avalonia.Controls
 {
@@ -36,6 +37,12 @@ namespace Avalonia.Controls
         public static readonly DirectProperty<ItemsControl, IEnumerable?> ItemsProperty =
             AvaloniaProperty.RegisterDirect<ItemsControl, IEnumerable?>(nameof(Items), o => o.Items, (o, v) => o.Items = v);
 
+        /// <summary>
+        /// Defines the <see cref="ItemContainerTheme"/> property.
+        /// </summary>
+        public static readonly StyledProperty<ControlTheme?> ItemContainerThemeProperty =
+            AvaloniaProperty.Register<ItemsControl, ControlTheme?>(nameof(ItemContainerTheme));
+
         /// <summary>
         /// Defines the <see cref="ItemCount"/> property.
         /// </summary>
@@ -88,6 +95,7 @@ namespace Avalonia.Controls
                 {
                     _itemContainerGenerator = CreateItemContainerGenerator();
 
+                    _itemContainerGenerator.ItemContainerTheme = ItemContainerTheme;
                     _itemContainerGenerator.ItemTemplate = ItemTemplate;
                     _itemContainerGenerator.Materialized += (_, e) => OnContainersMaterialized(e);
                     _itemContainerGenerator.Dematerialized += (_, e) => OnContainersDematerialized(e);
@@ -108,6 +116,15 @@ namespace Avalonia.Controls
             set { SetAndRaise(ItemsProperty, ref _items, value); }
         }
 
+        /// <summary>
+        /// Gets or sets the <see cref="ControlTheme"/> that is applied to the container element generated for each item.
+        /// </summary>
+        public ControlTheme? ItemContainerTheme
+        {
+            get { return GetValue(ItemContainerThemeProperty); }
+            set { SetValue(ItemContainerThemeProperty, value); }
+        }
+
         /// <summary>
         /// Gets the number of items in <see cref="Items"/>.
         /// </summary>
@@ -349,6 +366,10 @@ namespace Avalonia.Controls
             {
                 UpdatePseudoClasses(change.GetNewValue<int>());
             }
+            else if (change.Property == ItemContainerThemeProperty && _itemContainerGenerator is not null)
+            {
+                _itemContainerGenerator.ItemContainerTheme = change.GetNewValue<ControlTheme?>();
+            }
         }
 
         /// <summary>
diff --git a/src/Avalonia.Controls/TreeViewItem.cs b/src/Avalonia.Controls/TreeViewItem.cs
index 490b0b3ce3..2e3aa037c2 100644
--- a/src/Avalonia.Controls/TreeViewItem.cs
+++ b/src/Avalonia.Controls/TreeViewItem.cs
@@ -121,6 +121,11 @@ namespace Avalonia.Controls
             {
                 ItemTemplate = _treeView.ItemTemplate;
             }
+
+            if (ItemContainerTheme == null && _treeView?.ItemContainerTheme != null)
+            {
+                ItemContainerTheme = _treeView.ItemContainerTheme;
+            }
         }
 
         protected override void OnDetachedFromLogicalTree(LogicalTreeAttachmentEventArgs e)
diff --git a/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs b/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs
index bfece7871c..f08653a4f8 100644
--- a/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs
@@ -1,15 +1,14 @@
+using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.Linq;
 using Avalonia.Collections;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Templates;
+using Avalonia.Input;
 using Avalonia.LogicalTree;
-using Avalonia.VisualTree;
-using Xunit;
-using System.Collections.ObjectModel;
+using Avalonia.Styling;
 using Avalonia.UnitTests;
-using Avalonia.Input;
-using System.Collections.Generic;
+using Xunit;
 
 namespace Avalonia.Controls.UnitTests
 {
@@ -62,6 +61,25 @@ namespace Avalonia.Controls.UnitTests
             Assert.Null(container.TemplatedParent);
         }
 
+        [Fact]
+        public void Container_Should_Have_Theme_Set_To_ItemContainerTheme()
+        {
+            var theme = new ControlTheme();
+            var target = new ItemsControl
+            {
+                ItemContainerTheme = theme,
+            };
+
+            target.Template = GetTemplate();
+            target.Items = new[] { "Foo" };
+            target.ApplyTemplate();
+            target.Presenter.ApplyTemplate();
+
+            var container = (ContentPresenter)target.Presenter.Panel.Children[0];
+
+            Assert.Same(container.Theme, theme);
+        }
+
         [Fact]
         public void Container_Should_Have_LogicalParent_Set_To_ItemsControl()
         {
diff --git a/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs b/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs
index e87990ebb1..afa153a593 100644
--- a/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs
@@ -94,6 +94,50 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
+        [Fact]
+        public void Container_Should_Have_Theme_Set_To_ItemContainerTheme()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var items = new[] { "Foo", "Bar", "Baz " };
+                var theme = new ControlTheme();
+                var target = new ListBox
+                {
+                    Template = ListBoxTemplate(),
+                    Items = items,
+                    ItemContainerTheme = theme,
+                };
+
+                Prepare(target);
+
+                var container = (ListBoxItem)target.Presenter.Panel.Children[0];
+
+                Assert.Same(container.Theme, theme);
+            }
+        }
+
+        [Fact]
+        public void Inline_Item_Should_Have_Theme_Set_To_ItemContainerTheme()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var items = new[] { "Foo", "Bar", "Baz " };
+                var theme = new ControlTheme();
+                var target = new ListBox
+                {
+                    Template = ListBoxTemplate(),
+                    Items = new[] { new ListBoxItem() },
+                    ItemContainerTheme = theme,
+                };
+
+                Prepare(target);
+
+                var container = (ListBoxItem)target.Presenter.Panel.Children[0];
+
+                Assert.Same(container.Theme, theme);
+            }
+        }
+
         [Fact]
         public void LogicalChildren_Should_Be_Set_For_DataTemplate_Generated_Items()
         {
diff --git a/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs b/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs
index 2169b15cad..d784caf2db 100644
--- a/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs
@@ -72,6 +72,35 @@ namespace Avalonia.Controls.UnitTests
             Assert.All(items, x => Assert.IsType<Canvas>(x.HeaderPresenter.Child));
         }
 
+        [Fact]
+        public void Items_Should_Be_Created_Using_ItemConatinerTheme_If_Present()
+        {
+            TreeView target;
+            var theme = new ControlTheme();
+
+            var root = new TestRoot
+            {
+                Child = target = new TreeView
+                {
+                    Template = CreateTreeViewTemplate(),
+                    Items = CreateTestTreeData(),
+                    ItemContainerTheme = theme,
+                    ItemTemplate = new FuncTreeDataTemplate<Node>(
+                        (_, __) => new Canvas(),
+                        x => x.Children),
+                }
+            };
+
+            ApplyTemplates(target);
+
+            var items = target.ItemContainerGenerator.Index.Containers
+                .OfType<TreeViewItem>()
+                .ToList();
+
+            Assert.Equal(5, items.Count);
+            Assert.All(items, x => Assert.Same(theme, x.ItemContainerTheme));
+        }
+
         [Fact]
         public void Root_ItemContainerGenerator_Containers_Should_Be_Root_Containers()
         {

From 209797e5e1375c2c20a335d3bc2cf66810d9b129 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 7 Jul 2022 23:32:23 +0200
Subject: [PATCH 053/240] Ported HamburgerMenu to ControlTheme.

---
 .../HamburgerMenu/HamburgerMenu.xaml          | 89 +++++++++++--------
 1 file changed, 54 insertions(+), 35 deletions(-)

diff --git a/samples/SampleControls/HamburgerMenu/HamburgerMenu.xaml b/samples/SampleControls/HamburgerMenu/HamburgerMenu.xaml
index 5f8bfe4fb5..73f8e480f5 100644
--- a/samples/SampleControls/HamburgerMenu/HamburgerMenu.xaml
+++ b/samples/SampleControls/HamburgerMenu/HamburgerMenu.xaml
@@ -62,9 +62,28 @@
                           TextElement.FontWeight="{TemplateBinding FontWeight}" />
       </ControlTemplate>
     </Setter>
+
+    <Style Selector="^:pointerover /template/ ContentPresenter">
+      <Setter Property="Border.Background" Value="{DynamicResource SystemChromeLowColor}" />
+      <Setter Property="Border.BoxShadow" Value="{StaticResource NavigationItemShadow}" />
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPointerOver}" />
+    </Style>
   </ControlTheme>
 
   <ControlTheme x:Key="HamburgerMenuTabItem" TargetType="TabItem">
+    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="HorizontalAlignment" Value="Stretch" />
+    <Setter Property="VerticalAlignment" Value="Stretch" />
+    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+    <Setter Property="FontWeight" Value="Normal" />
+    <Setter Property="MinHeight" Value="0" />
+    <Setter Property="Height" Value="{StaticResource NavigationItemHeight}" />
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="Padding" Value="12,0,4,0" />
+    <Setter Property="Margin" Value="4,0,8,0" />
+    <Setter Property="CornerRadius" Value="8" />
+    <Setter Property="ClipToBounds" Value="False" />
     <Setter Property="Template">
       <ControlTemplate>
         <Border Name="PART_LayoutRoot"
@@ -80,9 +99,12 @@
                     Margin="6,0,0,0"
                     HorizontalAlignment="Left"
                     VerticalAlignment="Center"
-                    Background="{DynamicResource TabItemHeaderSelectedPipeFill}" />
+                    Background="{DynamicResource TabItemHeaderSelectedPipeFill}"
+                    IsVisible="False"
+                    CornerRadius="{DynamicResource ControlCornerRadius}"/>
             <ContentPresenter Name="PART_ContentPresenter"
                               Padding="{TemplateBinding Padding}"
+                              Margin="0"
                               HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                               VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                               Content="{TemplateBinding Header}"
@@ -94,14 +116,40 @@
         </Border>
       </ControlTemplate>
     </Setter>
+
+    <Style Selector="^:pointerover">
+      <Setter Property="Background" Value="{DynamicResource ThemeControlHighlightMidBrush}"/>
+      
+      <Style Selector="^ /template/ Border#PART_LayoutRoot">
+        <Setter Property="Background" Value="{DynamicResource SystemChromeLowColor}" />
+        <Setter Property="BoxShadow" Value="{StaticResource NavigationItemShadow}" />
+        <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPointerOver}" />
+      </Style>
+    </Style>
+    
+    <Style Selector="^:selected">
+      <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush4}"/>
+
+      <Style Selector="^ /template/ Border#PART_SelectedPipe">
+        <Setter Property="IsVisible" Value="True" />
+      </Style>
+    </Style>
+
+    <Style Selector="^:pressed /template/ Border#PART_LayoutRoot">
+      <Setter Property="Border.Background" Value="{DynamicResource SystemChromeLowColor}" />
+      <Setter Property="Border.BoxShadow" Value="{StaticResource NavigationItemShadow}" />
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPressed}" />
+    </Style>
   </ControlTheme>
-  
+
   <!--  HamburgerMenu  -->
   <ControlTheme x:Key="{x:Type catalog:HamburgerMenu}" TargetType="catalog:HamburgerMenu">
     <Setter Property="Padding" Value="12 8 4 0" />
     <Setter Property="PaneBackground" Value="{DynamicResource SystemChromeMediumColor}" />
     <Setter Property="Background" Value="{DynamicResource SystemChromeMediumColor}" />
     <Setter Property="ContentBackground" Value="{DynamicResource SystemAltHighColor}" />
+    <Setter Property="ItemContainerTheme" Value="{StaticResource HamburgerMenuTabItem}"/>
+    <Setter Property="TabStripPlacement" Value="Left" />
     <Setter Property="Template">
       <ControlTemplate>
         <Panel Background="{TemplateBinding PaneBackground}">
@@ -109,7 +157,8 @@
                      CompactPaneLength="{StaticResource PaneCompactWidth}"
                      DisplayMode="Inline"
                      IsPaneOpen="True"
-                     OpenPaneLength="{StaticResource PaneExpandWidth}">
+                     OpenPaneLength="{StaticResource PaneExpandWidth}"
+                     PaneBackground="Transparent">
             <SplitView.Pane>
               <Grid Margin="0,0,1,5" RowDefinitions="Auto, *, Auto">
                 <Panel Height="{StaticResource HeaderHeight}" />
@@ -123,11 +172,6 @@
                                   ItemTemplate="{TemplateBinding ItemTemplate}"
                                   Items="{TemplateBinding Items}"
                                   ItemsPanel="{TemplateBinding ItemsPanel}">
-                    <ItemsPresenter.Styles>
-                      <Style Selector="catalog|HamburgerMenu > TabItem">
-                        <Setter Property="Theme" Value="{StaticResource HamburgerMenuTabItem}"/>
-                      </Style>
-                    </ItemsPresenter.Styles>
                     <ItemsPresenter.ItemsPanel>
                       <ItemsPanelTemplate>
                         <StackPanel x:Name="HamburgerItemsPanel"
@@ -150,6 +194,7 @@
                   <TextBlock x:Name="HeaderHolder"
                              VerticalAlignment="Center"
                              Classes="h1"
+                             Margin="{StaticResource HeaderMarginExpandedPane}"
                              Text="{Binding $parent[TabControl].SelectedItem.Header, FallbackValue=''}">
                     <TextBlock.Transitions>
                       <Transitions>
@@ -187,7 +232,7 @@
                         HorizontalAlignment="Left"
                         VerticalAlignment="Top"
                         HorizontalContentAlignment="Center"
-                        Classes="NavigationButton"
+                        Theme="{StaticResource NavigationButton}"
                         CornerRadius="4"
                         IsChecked="{Binding #PART_NavigationPane.IsPaneOpen, Mode=TwoWay}">
             <PathIcon Data="M3 17h18a1 1 0 0 1 .117 1.993L21 19H3a1 1 0 0 1-.117-1.993L3 17h18H3Zm0-6 18-.002a1 1 0 0 1 .117 1.993l-.117.007L3 13a1 1 0 0 1-.117-1.993L3 11l18-.002L3 11Zm0-6h18a1 1 0 0 1 .117 1.993L21 7H3a1 1 0 0 1-.117-1.993L3 5h18H3Z" Foreground="{TemplateBinding Foreground}" />
@@ -196,18 +241,12 @@
       </ControlTemplate>
     </Setter>
 
-    <Style Selector="^ /template/ SplitView TextBlock#HeaderHolder">
-      <Setter Property="Margin" Value="{StaticResource HeaderMarginExpandedPane}" />
-    </Style>
     <Style Selector="^ /template/ SplitView[IsPaneOpen=True] TextBlock#HeaderHolder">
       <Setter Property="Margin" Value="{StaticResource HeaderMarginCollapsedPane}" />
     </Style>
     <Style Selector="^ /template/ SplitView[DisplayMode=Overlay][IsPaneOpen=True] TextBlock#HeaderHolder">
       <Setter Property="Margin" Value="{StaticResource HeaderMarginExpandedOverlayPane}" />
     </Style>
-    <Style Selector="^ /template/ SplitView">
-      <Setter Property="PaneBackground" Value="Transparent" />
-    </Style>
     <Style Selector="^ /template/ SplitView[DisplayMode=Overlay]">
       <Setter Property="PaneBackground" Value="{TemplateBinding PaneBackground}" />
     </Style>
@@ -221,26 +260,6 @@
     <Style Selector="^ /template/ SplitView[DisplayMode=Inline][IsPaneOpen=True] Border#BackgroundBorder">
       <Setter Property="CornerRadius" Value="8 0 0 0" />
     </Style>
-    <!--<Style Selector="^ > TabItem">
-      
-    </Style>-->
-    <!--<Style Selector="^ > TabItem /template/ Border#PART_LayoutRoot, :is(Button).NavigationButton /template/ ContentPresenter">
-      <Setter Property="Border.Background" Value="Transparent" />
-      <Setter Property="TextElement.Foreground" Value="{DynamicResource SystemBaseHighColor}" />
-    </Style>
-    <Style Selector="^ > TabItem:pointerover /template/ Border#PART_LayoutRoot, :is(Button).NavigationButton:pointerover /template/ ContentPresenter">
-      <Setter Property="Border.Background" Value="{DynamicResource SystemChromeLowColor}" />
-      <Setter Property="Border.BoxShadow" Value="{StaticResource NavigationItemShadow}" />
-      <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPointerOver}" />
-    </Style>
-    <Style Selector="^ > TabItem:pressed /template/ Border#PART_LayoutRoot, :is(Button).NavigationButton:pressed /template/ ContentPresenter">
-      <Setter Property="Border.Background" Value="{DynamicResource SystemChromeLowColor}" />
-      <Setter Property="Border.BoxShadow" Value="{StaticResource NavigationItemShadow}" />
-      <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPressed}" />
-    </Style>
-    <Style Selector=":is(Button).NavigationButton:pressed">
-      <Setter Property="RenderTransform" Value="none" />
-    </Style>-->
   </ControlTheme>
 
 </ResourceDictionary>

From 59c58e567242f9641759ef1f1d5dc8380792e03b Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 8 Jul 2022 11:47:26 +0200
Subject: [PATCH 054/240] Don't set Foreground in PathIcon theme.

It is more useful if this property inherits by default.
---
 src/Avalonia.Themes.Fluent/Controls/PathIcon.xaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/PathIcon.xaml b/src/Avalonia.Themes.Fluent/Controls/PathIcon.xaml
index 966c6c2632..b9967a1b44 100644
--- a/src/Avalonia.Themes.Fluent/Controls/PathIcon.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/PathIcon.xaml
@@ -9,7 +9,6 @@
       </StackPanel>
     </Design.PreviewWith>
     <ControlTheme x:Key="{x:Type PathIcon}" TargetType="PathIcon">
-      <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}" />
       <Setter Property="Background" Value="Transparent" />
       <Setter Property="Height" Value="{DynamicResource IconElementThemeHeight}" />
       <Setter Property="Width" Value="{DynamicResource IconElementThemeWidth}" />

From 052cf699d00e30a51347845789bf20f1cd18965d Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 8 Jul 2022 11:47:44 +0200
Subject: [PATCH 055/240] Ported ScrollBar to ControlTheme.

---
 .../Controls/FluentControls.xaml              |   2 +-
 .../Controls/ScrollBar.xaml                   | 521 +++++++++---------
 2 files changed, 252 insertions(+), 271 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
index 286b3e3fcd..d344fedf0a 100644
--- a/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
@@ -34,6 +34,7 @@
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/PopupRoot.xaml" />
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/PathIcon.xaml" />
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/RepeatButton.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/ScrollBar.xaml" />
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml" />
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/Separator.xaml" />
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/TabControl.xaml" />
@@ -64,7 +65,6 @@
     <!--  Define ToolTip first so its styles can be overriden by other controls (e.g. TextBox)  -->
     <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/FocusAdorner.xaml" />
     <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/MenuItem.xaml" />
-    <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ScrollBar.xaml" />
     <!--  TabControl needs to come after TabStrip as it redefines the inner TabStrip.ItemsPanel  -->
     <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/TextBox.xaml" />
     <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/TreeViewItem.xaml" />
diff --git a/src/Avalonia.Themes.Fluent/Controls/ScrollBar.xaml b/src/Avalonia.Themes.Fluent/Controls/ScrollBar.xaml
index 7d87a3e35a..4544fbe339 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ScrollBar.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ScrollBar.xaml
@@ -1,302 +1,283 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-  <Style Selector="ScrollBar">
-    <Setter Property="MinWidth" Value="{DynamicResource ScrollBarSize}" />
-    <Setter Property="MinHeight" Value="{DynamicResource ScrollBarSize}" />
-    <Setter Property="Background" Value="{DynamicResource ScrollBarBackground}" />
-    <Setter Property="Foreground" Value="{DynamicResource ScrollBarForeground}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ScrollBarBorderBrush}" />
-  </Style>
-
-  <Style Selector="ScrollBar:vertical">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Grid x:Name="Root">
-
-          <Border x:Name="VerticalRoot"
-                  Background="{TemplateBinding Background}"
-                  BorderBrush="{TemplateBinding BorderBrush}">
-            <Grid RowDefinitions="Auto,*,Auto">
-
-              <Rectangle x:Name="TrackRect" Grid.RowSpan="3" Margin="0" />
-
-              <RepeatButton Name="PART_LineUpButton"
-                            HorizontalAlignment="Center"
-                            Classes="line up"
-                            Grid.Row="0"
-                            Focusable="False"
-                            MinWidth="{DynamicResource ScrollBarSize}"
-                            Height="{DynamicResource ScrollBarSize}" />
-
-              <Track Grid.Row="1"
-                     Minimum="{TemplateBinding Minimum}"
-                     Maximum="{TemplateBinding Maximum}"
-                     Value="{TemplateBinding Value, Mode=TwoWay}"
-                     ViewportSize="{TemplateBinding ViewportSize}"
-                     Orientation="{TemplateBinding Orientation}"
-                     IsDirectionReversed="True">
-                <Track.DecreaseButton>
-                  <RepeatButton Name="PART_PageUpButton"
-                                Classes="largeIncrease"
-                                Focusable="False" />
-                </Track.DecreaseButton>
-                <Track.IncreaseButton>
-                  <RepeatButton Name="PART_PageDownButton"
-                                Classes="largeIncrease"
-                                Focusable="False" />
-                </Track.IncreaseButton>
-                <Thumb Classes="thumb"
-                       Opacity="1"
-                       Width="{DynamicResource ScrollBarSize}"
-                       MinHeight="{DynamicResource ScrollBarSize}"
-                       RenderTransformOrigin="100%,50%" />
-              </Track>
-
-              <RepeatButton Name="PART_LineDownButton"
-                            HorizontalAlignment="Center"
-                            Classes="line down"
-                            Grid.Row="2"
-                            Focusable="False"
-                            MinWidth="{DynamicResource ScrollBarSize}"
-                            Height="{DynamicResource ScrollBarSize}" />
-
-            </Grid>
-          </Border>
-
-        </Grid>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="ScrollBar:horizontal">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Grid x:Name="Root">
-
-          <Border x:Name="HorizontalRoot"
-                  Background="{TemplateBinding Background}"
-                  BorderBrush="{TemplateBinding BorderBrush}">
-            <Grid ColumnDefinitions="Auto,*,Auto">
-
-              <Rectangle x:Name="TrackRect" Grid.ColumnSpan="3" Margin="0" />
-
-              <RepeatButton Name="PART_LineUpButton"
-                            VerticalAlignment="Center"
-                            Classes="line up"
-                            Grid.Column="0"
-                            Focusable="False"
-                            MinHeight="{DynamicResource ScrollBarSize}"
-                            Width="{DynamicResource ScrollBarSize}" />
-
-              <Track Grid.Column="1"
-                     Minimum="{TemplateBinding Minimum}"
-                     Maximum="{TemplateBinding Maximum}"
-                     Value="{TemplateBinding Value, Mode=TwoWay}"
-                     ViewportSize="{TemplateBinding ViewportSize}"
-                     Orientation="{TemplateBinding Orientation}">
-                <Track.DecreaseButton>
-                  <RepeatButton Name="PART_PageUpButton"
-                                Classes="largeIncrease"
-                                Focusable="False" />
-                </Track.DecreaseButton>
-                <Track.IncreaseButton>
-                  <RepeatButton Name="PART_PageDownButton"
-                                Classes="largeIncrease"
-                                Focusable="False" />
-                </Track.IncreaseButton>
-                <Thumb Classes="thumb"
-                       Opacity="1"
-                       Height="{DynamicResource ScrollBarSize}"
-                       MinWidth="{DynamicResource ScrollBarSize}"
-                       RenderTransformOrigin="50%,100%" />
-              </Track>
-
-              <RepeatButton Name="PART_LineDownButton"
-                            VerticalAlignment="Center"
-                            Classes="line down"
-                            Grid.Column="2"
-                            Focusable="False"
-                            MinHeight="{DynamicResource ScrollBarSize}"
-                            Width="{DynamicResource ScrollBarSize}" />
-
-            </Grid>
-          </Border>
-
-        </Grid>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="ScrollBar[IsExpanded=true] /template/ Grid#Root">
-    <Setter Property="Background" Value="{DynamicResource ScrollBarBackgroundPointerOver}" />
-  </Style>
-
-  <Style Selector="ScrollBar /template/ Thumb.thumb">
-    <Setter Property="Background" Value="{DynamicResource ScrollBarPanningThumbBackground}" />
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Design.PreviewWith>
+    <Border Padding="20">
+      <StackPanel Orientation="Horizontal" Spacing="20">
+        <StackPanel Spacing="20">
+          <ScrollBar Orientation="Horizontal" AllowAutoHide="False" VerticalAlignment="Center" Width="100"/>
+          <ScrollBar Orientation="Horizontal" AllowAutoHide="False" VerticalAlignment="Center" Width="100" IsEnabled="False"/>
+          <ScrollBar Orientation="Horizontal" AllowAutoHide="True" VerticalAlignment="Center" Width="100"/>
+          <ScrollBar Orientation="Horizontal" AllowAutoHide="True" VerticalAlignment="Center" Width="100" IsEnabled="False"/>
+        </StackPanel>
+        <ScrollBar Orientation="Vertical" AllowAutoHide="False" HorizontalAlignment="Center" Height="100"/>
+        <ScrollBar Orientation="Vertical" AllowAutoHide="False" HorizontalAlignment="Center" Height="100" IsEnabled="False"/>
+        <ScrollBar Orientation="Vertical" AllowAutoHide="True" HorizontalAlignment="Center" Height="100"/>
+        <ScrollBar Orientation="Vertical" AllowAutoHide="True" HorizontalAlignment="Center" Height="100" IsEnabled="False"/>
+      </StackPanel>
+    </Border>
+  </Design.PreviewWith>
+
+  <ControlTheme x:Key="FluentScrollBarThumb" TargetType="Thumb">
+    <Setter Property="Background" Value="{DynamicResource ScrollBarPanningThumbBackground}"/>
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate>
-          <Border x:Name="ThumbVisual" Background="{TemplateBinding Background}" />
+          <Border Background="{TemplateBinding Background}"
+                  CornerRadius="{TemplateBinding CornerRadius}"/>
         </ControlTemplate>
       </Setter.Value>
     </Setter>
     <Setter Property="Transitions">
       <Transitions>
+        <CornerRadiusTransition Property="CornerRadius" Duration="0:0:0.1" />
         <TransformOperationsTransition Property="RenderTransform" Duration="0:0:0.1" />
       </Transitions>
     </Setter>
-  </Style>
 
-  <Style Selector="ScrollBar:vertical /template/ Thumb.thumb">
-    <Setter Property="RenderTransform" Value="{DynamicResource VerticalSmallScrollThumbScaleTransform}" />
-  </Style>
-
-  <Style Selector="ScrollBar:horizontal /template/ Thumb.thumb">
-    <Setter Property="RenderTransform" Value="{DynamicResource HorizontalSmallScrollThumbScaleTransform}" />
-  </Style>
-
-  <Style Selector="ScrollBar[IsExpanded=true] /template/ Thumb.thumb">
-    <Setter Property="RenderTransform" Value="none" />
-    <Setter Property="Background" Value="{DynamicResource ScrollBarThumbBackgroundColor}" />
-  </Style>
-
-  <Style Selector="ScrollBar /template/ Thumb.thumb /template/ Border#ThumbVisual">
-    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-    <Setter Property="Transitions">
-      <Transitions>
-        <CornerRadiusTransition Property="CornerRadius" Duration="0:0:0.1" />
-      </Transitions>
+    <Style Selector="^:pointerover /template/ Border">
+      <Setter Property="Background" Value="{DynamicResource ScrollBarThumbFillPointerOver}" />
+    </Style>
+    <Style Selector="^:pressed  /template/ Border">
+      <Setter Property="Background" Value="{DynamicResource ScrollBarThumbFillPressed}" />
+    </Style>
+    <Style Selector="^:disabled  /template/ Border">
+      <Setter Property="Background" Value="{DynamicResource ScrollBarThumbFillDisabled}" />
+    </Style>
+  </ControlTheme>
+
+  <ControlTheme x:Key="FluentScrollBarPageButton" TargetType="RepeatButton">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="VerticalAlignment" Value="Stretch" />
+    <Setter Property="HorizontalAlignment" Value="Stretch" />
+    <Setter Property="Opacity" Value="0" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Background="{TemplateBinding Background}" />
+      </ControlTemplate>
     </Setter>
-  </Style>
-
-  <Style Selector="ScrollBar[IsExpanded=true] /template/ Thumb.thumb /template/ Border#ThumbVisual">
-    <Setter Property="CornerRadius" Value="0" />
-  </Style>
-
-  <Style Selector="ScrollBar /template/ Thumb.thumb:pointerover">
-    <Setter Property="Background" Value="{DynamicResource ScrollBarThumbFillPointerOver}" />
-  </Style>
+  </ControlTheme>
 
-  <Style Selector="ScrollBar /template/ Thumb.thumb:pressed">
-    <Setter Property="Background" Value="{DynamicResource ScrollBarThumbFillPressed}" />
-  </Style>
-
-  <Style Selector="ScrollBar /template/ Thumb.thumb:disabled">
-    <Setter Property="Background" Value="{DynamicResource ScrollBarThumbFillDisabled}" />
-  </Style>
-
-  <Style Selector="ScrollBar /template/ RepeatButton.line">
+  <ControlTheme x:Key="FluentScrollBarLineButton" TargetType="RepeatButton">
+    <Setter Property="Opacity" Value="0" />
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource ScrollBarButtonArrowForeground}"/>
     <Setter Property="Template">
       <ControlTemplate>
-        <Border x:Name="Root">
-          <Viewbox Width="{DynamicResource ScrollBarButtonArrowIconFontSize}"
-                   Height="{DynamicResource ScrollBarButtonArrowIconFontSize}">
-            <Path x:Name="Arrow"
-              VerticalAlignment="Center"
-              HorizontalAlignment="Center"
-              Width="20" Height="20" />
-          </Viewbox>
-        </Border>
+        <ContentPresenter Background="{DynamicResource ScrollBarButtonBackground}"
+                          BorderBrush="{DynamicResource ScrollBarButtonBorderBrush}"
+                          Content="{TemplateBinding Content}"/>
       </ControlTemplate>
     </Setter>
-    <Setter Property="Opacity" Value="0" />
     <Setter Property="Transitions">
       <Transitions>
         <DoubleTransition Property="Opacity" Duration="0:0:0.1" />
       </Transitions>
     </Setter>
-  </Style>
-
-  <Style Selector="ScrollBar /template/ RepeatButton.line /template/ Border#Root" >
-    <Setter Property="Background" Value="{DynamicResource ScrollBarButtonBackground}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ScrollBarButtonBorderBrush}" />
-  </Style>
 
-  <Style Selector="ScrollBar /template/ RepeatButton.line:pointerover /template/ Border#Root" >
-    <Setter Property="Background" Value="{DynamicResource ScrollBarButtonBackgroundPointerOver}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ScrollBarButtonBorderBrushPointerOver}" />
-  </Style>
+    <Style Selector="^:pointerover">
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource ScrollBarButtonArrowForegroundPointerOver}"/>
 
-  <Style Selector="ScrollBar /template/ RepeatButton.line:pressed /template/ Border#Root" >
-    <Setter Property="Background" Value="{DynamicResource ScrollBarButtonBackgroundPressed}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ScrollBarButtonBorderBrushPressed}" />
-  </Style>
+      <Style Selector="^ /template/ ContentPresenter" >
+        <Setter Property="Background" Value="{DynamicResource ScrollBarButtonBackgroundPointerOver}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ScrollBarButtonBorderBrushPointerOver}" />
+      </Style>
+    </Style>
 
-  <Style Selector="ScrollBar /template/ RepeatButton.line:disabled /template/ Border#Root" >
-    <Setter Property="Background" Value="{DynamicResource ScrollBarButtonBackgroundPressed}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ScrollBarButtonBorderBrushDisabled}" />
-  </Style>
+    <Style Selector="^:pressed">
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource ScrollBarButtonArrowForegroundPressed}"/>
 
-  <Style Selector="ScrollBar /template/ RepeatButton.line /template/ Path#Arrow" >
-    <Setter Property="Fill" Value="{DynamicResource ScrollBarButtonArrowForeground}" />
-  </Style>
+      <Style Selector="^ /template/ ContentPresenter" >
+        <Setter Property="Background" Value="{DynamicResource ScrollBarButtonBackgroundPressed}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ScrollBarButtonBorderBrushPressed}" />
+      </Style>
+    </Style>
 
-  <Style Selector="ScrollBar /template/ RepeatButton.line:pointerover /template/ Path#Arrow" >
-    <Setter Property="Fill" Value="{DynamicResource ScrollBarButtonArrowForegroundPointerOver}" />
-  </Style>
+    <Style Selector="^:disabled">
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource ScrollBarButtonArrowForegroundDisabled}"/>
 
-  <Style Selector="ScrollBar /template/ RepeatButton.line:pressed /template/ Path#Arrow" >
-    <Setter Property="Fill" Value="{DynamicResource ScrollBarButtonArrowForegroundPressed}" />
-  </Style>
+      <Style Selector="^ /template/ ContentPresenter" >
+        <Setter Property="Background" Value="{DynamicResource ScrollBarButtonBackgroundDisabled}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ScrollBarButtonBorderBrushDisabled}" />
+      </Style>
+    </Style>
+  </ControlTheme>
 
-  <Style Selector="ScrollBar /template/ RepeatButton.line:disabled /template/ Path#Arrow" >
-    <Setter Property="Fill" Value="{DynamicResource ScrollBarButtonArrowForegroundDisabled}" />
-  </Style>
-
-  <Style Selector="ScrollBar[IsExpanded=true] /template/ RepeatButton.line">
-    <Setter Property="Opacity" Value="1" />
-  </Style>
-
-  <Style Selector="ScrollBar:vertical /template/ RepeatButton.line.up /template/ Path">
-    <Setter Property="Data"
-            Value="M 19.091797 14.970703 L 10 5.888672 L 0.908203 14.970703 L 0.029297 14.091797 L 10 4.111328 L 19.970703 14.091797 Z" />
-  </Style>
-
-  <Style Selector="ScrollBar:vertical /template/ RepeatButton.line.down /template/ Path">
-    <Setter Property="Data"
-            Value="M 18.935547 4.560547 L 19.814453 5.439453 L 10 15.253906 L 0.185547 5.439453 L 1.064453 4.560547 L 10 13.496094 Z" />
-  </Style>
-
-  <Style Selector="ScrollBar:horizontal /template/ RepeatButton.line.up /template/ Path">
-    <Setter Property="Data" Value="M 14.091797 19.970703 L 4.111328 10 L 14.091797 0.029297 L 14.970703 0.908203 L 5.888672 10 L 14.970703 19.091797 Z" />
-  </Style>
-
-  <Style Selector="ScrollBar:horizontal /template/ RepeatButton.line.down /template/ Path">
-    <Setter Property="Data" Value="M 5.029297 19.091797 L 14.111328 10 L 5.029297 0.908203 L 5.908203 0.029297 L 15.888672 10 L 5.908203 19.970703 Z" />
-  </Style>
-
-  <Style Selector="ScrollBar /template/ Rectangle#TrackRect">
-    <Setter Property="StrokeThickness" Value="{DynamicResource ScrollBarTrackBorderThemeThickness}" />
-    <Setter Property="Fill" Value="{DynamicResource ScrollBarTrackFill}" />
-    <Setter Property="Stroke" Value="{DynamicResource ScrollBarTrackStroke}" />
-    <Setter Property="Opacity" Value="0" />
-    <Setter Property="Transitions">
-      <Transitions>
-        <DoubleTransition Property="Opacity" Duration="0:0:0.1" />
-      </Transitions>
-    </Setter>
-  </Style>
-
-  <Style Selector="ScrollBar[IsExpanded=true] /template/ Rectangle#TrackRect">
-    <Setter Property="Fill" Value="{DynamicResource ScrollBarTrackFillPointerOver}" />
-    <Setter Property="Stroke" Value="{DynamicResource ScrollBarTrackStrokePointerOver}" />
-    <Setter Property="Opacity" Value="1" />
-  </Style>
-
-  <Style Selector="ScrollBar /template/ RepeatButton.largeIncrease">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Background="{TemplateBinding Background}" />
-      </ControlTemplate>
-    </Setter>
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="VerticalAlignment" Value="Stretch" />
-    <Setter Property="HorizontalAlignment" Value="Stretch" />
-    <Setter Property="Opacity" Value="0" />
-  </Style>
+  <ControlTheme x:Key="{x:Type ScrollBar}" TargetType="ScrollBar">
+    <Setter Property="MinWidth" Value="{DynamicResource ScrollBarSize}" />
+    <Setter Property="MinHeight" Value="{DynamicResource ScrollBarSize}" />
+    <Setter Property="Background" Value="{DynamicResource ScrollBarBackground}" />
+    <Setter Property="Foreground" Value="{DynamicResource ScrollBarForeground}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ScrollBarBorderBrush}" />
 
-  <Style Selector="ScrollBar[IsExpanded=true] /template/ RepeatButton.largeIncrease">
-    <Setter Property="Opacity" Value="1" />
-  </Style>
+    <Style Selector="^:vertical">
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Grid x:Name="Root">
+            <Border x:Name="VerticalRoot"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}">
+              <Grid RowDefinitions="Auto,*,Auto">
+                <Rectangle x:Name="TrackRect"
+                           Fill="{DynamicResource ScrollBarTrackFill}"
+                           Stroke="{DynamicResource ScrollBarTrackStroke}"
+                           StrokeThickness="{DynamicResource ScrollBarTrackBorderThemeThickness}"
+                           Opacity="0"
+                           Grid.RowSpan="3">
+                  <Rectangle.Transitions>
+                    <Transitions>
+                      <DoubleTransition Property="Opacity" Duration="0:0:0.1" />
+                    </Transitions>
+                  </Rectangle.Transitions>
+                </Rectangle>
+
+                <RepeatButton Name="PART_LineUpButton"
+                              HorizontalAlignment="Center"
+                              Theme="{StaticResource FluentScrollBarLineButton}"
+                              Grid.Row="0"
+                              Focusable="False"
+                              MinWidth="{DynamicResource ScrollBarSize}"
+                              Height="{DynamicResource ScrollBarSize}">
+                  <PathIcon Data="M 19.091797 14.970703 L 10 5.888672 L 0.908203 14.970703 L 0.029297 14.091797 L 10 4.111328 L 19.970703 14.091797 Z"
+                            Width="{DynamicResource ScrollBarButtonArrowIconFontSize}"
+                            Height="{DynamicResource ScrollBarButtonArrowIconFontSize}"/>
+                </RepeatButton>
+
+                <Track Grid.Row="1"
+                       Minimum="{TemplateBinding Minimum}"
+                       Maximum="{TemplateBinding Maximum}"
+                       Value="{TemplateBinding Value, Mode=TwoWay}"
+                       ViewportSize="{TemplateBinding ViewportSize}"
+                       Orientation="{TemplateBinding Orientation}"
+                       IsDirectionReversed="True">
+                  <Track.DecreaseButton>
+                    <RepeatButton Name="PART_PageUpButton"
+                                  Classes="largeIncrease"
+                                  Theme="{StaticResource FluentScrollBarPageButton}"
+                                  Focusable="False" />
+                  </Track.DecreaseButton>
+                  <Track.IncreaseButton>
+                    <RepeatButton Name="PART_PageDownButton"
+                                  Classes="largeIncrease"
+                                  Theme="{StaticResource FluentScrollBarPageButton}"
+                                  Focusable="False" />
+                  </Track.IncreaseButton>
+                  <Thumb Theme="{StaticResource FluentScrollBarThumb}"
+                         Width="{DynamicResource ScrollBarSize}"
+                         MinHeight="{DynamicResource ScrollBarSize}"
+                         RenderTransform="{DynamicResource VerticalSmallScrollThumbScaleTransform}"
+                         RenderTransformOrigin="100%,50%" />
+                </Track>
+
+                <RepeatButton Name="PART_LineDownButton"
+                              HorizontalAlignment="Center"
+                              Theme="{StaticResource FluentScrollBarLineButton}"
+                              Grid.Row="2"
+                              Focusable="False"
+                              MinWidth="{DynamicResource ScrollBarSize}"
+                              Height="{DynamicResource ScrollBarSize}">
+                  <PathIcon Data="M 18.935547 4.560547 L 19.814453 5.439453 L 10 15.253906 L 0.185547 5.439453 L 1.064453 4.560547 L 10 13.496094 Z"
+                            Width="{DynamicResource ScrollBarButtonArrowIconFontSize}"
+                            Height="{DynamicResource ScrollBarButtonArrowIconFontSize}"/>
+                </RepeatButton>
+              </Grid>
+            </Border>
+          </Grid>
+        </ControlTemplate>
+      </Setter>
+    </Style>
 
-</Styles>
+    <Style Selector="^:horizontal">
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Grid x:Name="Root">
+            <Border x:Name="HorizontalRoot"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}">
+              <Grid ColumnDefinitions="Auto,*,Auto">
+                <Rectangle x:Name="TrackRect"
+                           Fill="{DynamicResource ScrollBarTrackFill}"
+                           Stroke="{DynamicResource ScrollBarTrackStroke}"
+                           StrokeThickness="{DynamicResource ScrollBarTrackBorderThemeThickness}"
+                           Opacity="0"
+                           Grid.ColumnSpan="3">
+                  <Rectangle.Transitions>
+                    <Transitions>
+                      <DoubleTransition Property="Opacity" Duration="0:0:0.1" />
+                    </Transitions>
+                  </Rectangle.Transitions>
+                </Rectangle>
+
+                <RepeatButton Name="PART_LineUpButton"
+                              Theme="{StaticResource FluentScrollBarLineButton}"
+                              VerticalAlignment="Center"
+                              Grid.Column="0"
+                              Focusable="False"
+                              MinHeight="{DynamicResource ScrollBarSize}"
+                              Width="{DynamicResource ScrollBarSize}">
+                  <PathIcon Data="M 14.091797 19.970703 L 4.111328 10 L 14.091797 0.029297 L 14.970703 0.908203 L 5.888672 10 L 14.970703 19.091797 Z"
+                            Width="{DynamicResource ScrollBarButtonArrowIconFontSize}"
+                            Height="{DynamicResource ScrollBarButtonArrowIconFontSize}"/>
+                </RepeatButton>
+
+                <Track Grid.Column="1"
+                       Minimum="{TemplateBinding Minimum}"
+                       Maximum="{TemplateBinding Maximum}"
+                       Value="{TemplateBinding Value, Mode=TwoWay}"
+                       ViewportSize="{TemplateBinding ViewportSize}"
+                       Orientation="{TemplateBinding Orientation}">
+                  <Track.DecreaseButton>
+                    <RepeatButton Name="PART_PageUpButton"
+                                  Classes="largeIncrease"
+                                  Theme="{StaticResource FluentScrollBarPageButton}"
+                                  Focusable="False" />
+                  </Track.DecreaseButton>
+                  <Track.IncreaseButton>
+                    <RepeatButton Name="PART_PageDownButton"
+                                  Classes="largeIncrease"
+                                  Theme="{StaticResource FluentScrollBarPageButton}"
+                                  Focusable="False" />
+                  </Track.IncreaseButton>
+                  <Thumb Theme="{StaticResource FluentScrollBarThumb}"
+                         Height="{DynamicResource ScrollBarSize}"
+                         MinWidth="{DynamicResource ScrollBarSize}"
+                         RenderTransform="{DynamicResource HorizontalSmallScrollThumbScaleTransform}"
+                         RenderTransformOrigin="50%,100%" />
+                </Track>
+
+                <RepeatButton Name="PART_LineDownButton"
+                              Theme="{StaticResource FluentScrollBarLineButton}"
+                              VerticalAlignment="Center"
+                              Grid.Column="2"
+                              Focusable="False"
+                              MinHeight="{DynamicResource ScrollBarSize}"
+                              Width="{DynamicResource ScrollBarSize}">
+                  <PathIcon Data="M 5.029297 19.091797 L 14.111328 10 L 5.029297 0.908203 L 5.908203 0.029297 L 15.888672 10 L 5.908203 19.970703 Z"
+                            Width="{DynamicResource ScrollBarButtonArrowIconFontSize}"
+                            Height="{DynamicResource ScrollBarButtonArrowIconFontSize}"/>
+                </RepeatButton>
+              </Grid>
+            </Border>
+          </Grid>
+        </ControlTemplate>
+      </Setter>
+    </Style>
+
+    <Style Selector="^[IsExpanded=true]">
+      <Style Selector="^ /template/ Grid#Root">
+        <Setter Property="Background" Value="{DynamicResource ScrollBarBackgroundPointerOver}" />
+      </Style>
+      <Style Selector="^ /template/ Rectangle#TrackRect">
+        <Setter Property="Fill" Value="{DynamicResource ScrollBarTrackFillPointerOver}" />
+        <Setter Property="Stroke" Value="{DynamicResource ScrollBarTrackStrokePointerOver}" />
+        <Setter Property="Opacity" Value="1" />
+      </Style>
+      <Style Selector="^ /template/ Thumb">
+        <Setter Property="Background" Value="{DynamicResource ScrollBarThumbBackgroundColor}" />
+        <Setter Property="RenderTransform" Value="none" />
+      </Style>
+      <Style Selector="^ /template/ RepeatButton">
+        <Setter Property="Opacity" Value="1" />
+      </Style>
+    </Style>
+  </ControlTheme>
+
+</ResourceDictionary>

From 9d0132dc24535b89aed7e04fc8da2cfecad061f6 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 8 Jul 2022 11:56:21 +0200
Subject: [PATCH 056/240] Remove unneeded normal state.

---
 .../Controls/ComboBox.xaml                    | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml b/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml
index 8ef8388cf1..b3da7735eb 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml
@@ -72,7 +72,8 @@
                       Background="{DynamicResource ComboBoxBackgroundUnfocused}"
                       BorderBrush="{DynamicResource ComboBoxBackgroundBorderBrushUnfocused}"
                       BorderThickness="{TemplateBinding BorderThickness}"
-                      CornerRadius="{TemplateBinding CornerRadius}" />
+                      CornerRadius="{TemplateBinding CornerRadius}"
+                      IsVisible="False"/>
               <TextBlock x:Name="PlaceholderTextBlock"
                          Grid.Row="1"
                          Grid.Column="0"
@@ -109,7 +110,9 @@
                         Width="12"
                         Margin="0,0,10,0" 
                         HorizontalAlignment="Right"
-                        VerticalAlignment="Center" />
+                        VerticalAlignment="Center"
+                        Foreground="{DynamicResource ComboBoxDropDownGlyphForeground}"
+                        Data="M1939 486L2029 576L1024 1581L19 576L109 486L1024 1401L1939 486Z"/>
               
               <Popup Name="PART_Popup" 
                      WindowManagerAddShadowHint="False"
@@ -143,18 +146,6 @@
         </ControlTemplate>
       </Setter>
 
-      <!--  Normal State  -->
-      <Style Selector="^ /template/ TextBlock#PlaceholderTextBlock">
-        <Setter Property="Foreground" Value="{DynamicResource ComboBoxPlaceHolderForeground}" />
-      </Style>
-      <Style Selector="^ /template/ Border#HighlightBackground">
-        <Setter Property="IsVisible" Value="False" />
-      </Style>
-      <Style Selector="^ /template/ PathIcon#DropDownGlyph">
-        <Setter Property="Foreground" Value="{DynamicResource ComboBoxDropDownGlyphForeground}" />
-        <Setter Property="Data" Value="M1939 486L2029 576L1024 1581L19 576L109 486L1024 1401L1939 486Z" />
-      </Style>
-
       <!--  PointerOver State  -->
       <Style Selector="^:pointerover /template/ Border#Background">
         <Setter Property="Background" Value="{DynamicResource ComboBoxBackgroundPointerOver}" />

From 576a8b897c965574ce8298421c9fe17636230dab Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 8 Jul 2022 12:44:03 +0200
Subject: [PATCH 057/240] Fix Button/ToggleButton transitions.

---
 .../Controls/Button.xaml                      |   9 +-
 .../Controls/ToggleButton.xaml                | 184 +++++++++---------
 2 files changed, 99 insertions(+), 94 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/Button.xaml b/src/Avalonia.Themes.Fluent/Controls/Button.xaml
index b8fea84ae0..7ac5c4351a 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Button.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Button.xaml
@@ -20,7 +20,6 @@
     <Setter Property="Padding" Value="{DynamicResource ButtonPadding}" />
     <Setter Property="HorizontalAlignment" Value="Left" />
     <Setter Property="VerticalAlignment" Value="Center" />
-    <Setter Property="RenderTransform" Value="none" />
     <Setter Property="Transitions">
       <Transitions>
         <TransformOperationsTransition Property="RenderTransform" Duration="0:0:.075" />
@@ -49,6 +48,10 @@
       <Setter Property="Foreground" Value="{DynamicResource ButtonForegroundPointerOver}" />
     </Style>
 
+    <Style Selector="^:pressed">
+      <Setter Property="RenderTransform" Value="scale(0.98)" />
+    </Style>
+
     <Style Selector="^:pressed  /template/ ContentPresenter#PART_ContentPresenter">
       <Setter Property="Background" Value="{DynamicResource ButtonBackgroundPressed}" />
       <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushPressed}" />
@@ -86,9 +89,5 @@
         <Setter Property="Foreground" Value="{DynamicResource AccentButtonForegroundDisabled}" />
       </Style>
     </Style>
-
-    <Style Selector="^:pressed">
-      <Setter Property="RenderTransform" Value="scale(0.98)" />
-    </Style>
   </ControlTheme>
 </ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ToggleButton.xaml b/src/Avalonia.Themes.Fluent/Controls/ToggleButton.xaml
index b53980b792..617f3e9c45 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ToggleButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ToggleButton.xaml
@@ -10,111 +10,117 @@
     </Border>
   </Design.PreviewWith>
 
-    <Thickness x:Key="ButtonPadding">8,5,8,6</Thickness>
+  <Thickness x:Key="ButtonPadding">8,5,8,6</Thickness>
 
-    <ControlTheme x:Key="{x:Type ToggleButton}" TargetType="ToggleButton">
-      <Setter Property="Background" Value="{DynamicResource ToggleButtonBackground}" />
-      <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForeground}" />
-      <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrush}" />
-      <Setter Property="BorderThickness" Value="{DynamicResource ToggleButtonBorderThemeThickness}" />
+  <ControlTheme x:Key="{x:Type ToggleButton}" TargetType="ToggleButton">
+    <Setter Property="Background" Value="{DynamicResource ToggleButtonBackground}" />
+    <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForeground}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource ToggleButtonBorderThemeThickness}" />
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+    <Setter Property="Padding" Value="{DynamicResource ButtonPadding}" />
+    <Setter Property="HorizontalAlignment" Value="Left" />
+    <Setter Property="VerticalAlignment" Value="Center" />
+    <Setter Property="FontWeight" Value="Normal" />
+    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+    <Setter Property="Transitions">
+      <Transitions>
+        <TransformOperationsTransition Property="RenderTransform" Duration="0:0:.075" />
+      </Transitions>
+    </Setter>
+
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ContentPresenter x:Name="PART_ContentPresenter"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
+                          Content="{TemplateBinding Content}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          Padding="{TemplateBinding Padding}"
+                          RecognizesAccessKey="True"
+                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
       <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-      <Setter Property="Padding" Value="{DynamicResource ButtonPadding}" />
-      <Setter Property="HorizontalAlignment" Value="Left" />
-      <Setter Property="VerticalAlignment" Value="Center" />
-      <Setter Property="FontWeight" Value="Normal" />
-      <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-      <Setter Property="Template">
-        <ControlTemplate>
-          <ContentPresenter x:Name="PART_ContentPresenter"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding CornerRadius}"
-                            Content="{TemplateBinding Content}"
-                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                            Padding="{TemplateBinding Padding}"
-                            RecognizesAccessKey="True"
-                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-        </ControlTemplate>
-      </Setter>
+    </Style>
+
+    <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundPointerOver}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushPointerOver}" />
+      <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundPointerOver}" />
+    </Style>
+
+    <Style Selector="^:pressed">
+      <Setter Property="RenderTransform" Value="scale(0.98)" />
+    </Style>
 
+    <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundPressed}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushPressed}" />
+      <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundPressed}" />
+    </Style>
+
+    <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundDisabled}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushDisabled}" />
+      <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundDisabled}" />
+    </Style>
+
+    <Style Selector="^:indeterminate">
       <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
-        <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+        <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundIndeterminate}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushIndeterminate}" />
+        <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundIndeterminate}" />
       </Style>
 
       <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-        <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundPointerOver}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushPointerOver}" />
-        <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundPointerOver}" />
+        <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundIndeterminatePointerOver}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushIndeterminatePointerOver}" />
+        <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundIndeterminatePointerOver}" />
       </Style>
 
       <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
-        <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundPressed}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushPressed}" />
-        <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundPressed}" />
+        <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundIndeterminatePressed}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushIndeterminatePressed}" />
+        <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundIndeterminatePressed}" />
       </Style>
 
       <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
-        <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundDisabled}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushDisabled}" />
-        <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundDisabled}" />
+        <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundIndeterminateDisabled}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushIndeterminateDisabled}" />
+        <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundIndeterminateDisabled}" />
+      </Style>
+    </Style>
+
+    <Style Selector="^:checked">
+      <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundChecked}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushChecked}" />
+        <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundChecked}" />
       </Style>
 
-      <Style Selector="^:indeterminate">
-        <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
-          <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundIndeterminate}" />
-          <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushIndeterminate}" />
-          <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundIndeterminate}" />
-        </Style>
-
-        <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-          <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundIndeterminatePointerOver}" />
-          <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushIndeterminatePointerOver}" />
-          <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundIndeterminatePointerOver}" />
-        </Style>
-
-        <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
-          <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundIndeterminatePressed}" />
-          <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushIndeterminatePressed}" />
-          <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundIndeterminatePressed}" />
-        </Style>
-
-        <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
-          <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundIndeterminateDisabled}" />
-          <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushIndeterminateDisabled}" />
-          <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundIndeterminateDisabled}" />
-        </Style>
+      <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundCheckedPointerOver}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushCheckedPointerOver}" />
+        <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundCheckedPointerOver}" />
       </Style>
 
-      <Style Selector="^:checked">
-        <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
-          <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundChecked}" />
-          <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushChecked}" />
-          <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundChecked}" />
-        </Style>
-
-        <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-          <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundCheckedPointerOver}" />
-          <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushCheckedPointerOver}" />
-          <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundCheckedPointerOver}" />
-        </Style>
-
-        <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
-          <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundCheckedPressed}" />
-          <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushCheckedPressed}" />
-          <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundCheckedPressed}" />
-        </Style>
-
-        <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
-          <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundCheckedDisabled}" />
-          <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushCheckedDisabled}" />
-          <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundCheckedDisabled}" />
-        </Style>
-
-        <Style Selector="^:pressed">
-          <Setter Property="RenderTransform" Value="scale(0.98)" />
-        </Style>
+      <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundCheckedPressed}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushCheckedPressed}" />
+        <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundCheckedPressed}" />
+      </Style>
+
+      <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundCheckedDisabled}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushCheckedDisabled}" />
+        <Setter Property="Foreground" Value="{DynamicResource ToggleButtonForegroundCheckedDisabled}" />
       </Style>
-    </ControlTheme>
+    </Style>
+  </ControlTheme>
 </ResourceDictionary>

From c15837b743264282fa070eea4fbc63ebacd3d5c1 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 8 Jul 2022 13:55:18 +0200
Subject: [PATCH 058/240] Ported ButtonSpinner to ControlTheme.

---
 .../Controls/ButtonSpinner.xaml               | 228 ++++++++++--------
 1 file changed, 133 insertions(+), 95 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml b/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml
index f99f1040e5..980ea02a73 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml
@@ -3,106 +3,144 @@
                     xmlns:sys="clr-namespace:System;assembly=netstandard"
                     xmlns:converters="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls"
                     x:CompileBindings="True">
-    <Design.PreviewWith>
-      <Border Padding="20" Background="Black">
-        <StackPanel Spacing="20">
-          <ButtonSpinner ButtonSpinnerLocation="Right"
-                         Content="Right disabled inline spinner"
-                         AllowSpin="False">
-            <DataValidationErrors.Error>
-              <sys:Exception />
-            </DataValidationErrors.Error>
-          </ButtonSpinner>
-          <ButtonSpinner ButtonSpinnerLocation="Left"
-                         Content="Left spinner" />
-          <ButtonSpinner ShowButtonSpinner="False"
-                         Content="Hide spinner" />
-        </StackPanel>
-      </Border>
-    </Design.PreviewWith>
+  <Design.PreviewWith>
+    <Border Padding="20">
+      <StackPanel Spacing="20">
+        <ButtonSpinner Content="Right spinner" />
+        <ButtonSpinner ButtonSpinnerLocation="Left"
+                       Content="Left spinner" />
+        <ButtonSpinner BorderThickness="2"
+                       BorderBrush="Blue"
+                       Content="Right Border" />
+        <ButtonSpinner ButtonSpinnerLocation="Left"
+                       BorderThickness="2"
+                       BorderBrush="Blue"
+                       Content="Left Border" />
+        <ButtonSpinner Content="Right disabled"
+                       AllowSpin="False"/>
+        <ButtonSpinner ButtonSpinnerLocation="Left"
+                       Content="Left disabled"
+                       AllowSpin="False"/>
+        <ButtonSpinner ShowButtonSpinner="False"
+                       Content="Hide spinner" />
+        <ButtonSpinner Content="Error"
+                       AllowSpin="False">
+          <DataValidationErrors.Error>
+            <sys:Exception>
+              <x:Arguments>
+                <x:String>Error</x:String>
+              </x:Arguments>
+            </sys:Exception>
+          </DataValidationErrors.Error>
+        </ButtonSpinner>
+      </StackPanel>
+    </Border>
+  </Design.PreviewWith>
 
-    <converters:MarginMultiplierConverter x:Key="ButtonSpinner_OnlyLeftThinknessConverter"
-                                          Indent="1"
-                                          Left="True" />
-    <converters:MarginMultiplierConverter x:Key="ButtonSpinner_OnlyRightThinknessConverter"
-                                          Indent="1"
-                                          Right="True" />
+  <converters:MarginMultiplierConverter x:Key="ButtonSpinnerLeftThickness" Indent="1" Left="True" />
+  <converters:MarginMultiplierConverter x:Key="ButtonSpinnerRightThickness" Indent="1" Right="True" />
+  <StreamGeometry x:Key="ButtonSpinnerIncreaseButtonIcon">M0,9 L10,0 20,9 19,10 10,2 1,10 z</StreamGeometry>
+  <StreamGeometry x:Key="ButtonSpinnerDecreaseButtonIcon">M0,1 L10,10 20,1 19,0 10,8 1,0 z</StreamGeometry>
 
-    <StreamGeometry x:Key="ButtonSpinnerIncreaseButtonIcon">M0,9 L10,0 20,9 19,10 10,2 1,10 z</StreamGeometry>
-    <StreamGeometry x:Key="ButtonSpinnerDecreaseButtonIcon">M0,1 L10,10 20,1 19,0 10,8 1,0 z</StreamGeometry>
+  <ControlTheme x:Key="FluentButtonSpinnerRepeatButton" TargetType="RepeatButton" BasedOn="{StaticResource {x:Type RepeatButton}}">
+    <Setter Property="CornerRadius" Value="0"/>
+    <Setter Property="MinWidth" Value="34" />
+    <Setter Property="VerticalAlignment" Value="Stretch" />
+  </ControlTheme>
 
-    <ControlTheme x:Key="{x:Type ButtonSpinner}" TargetType="ButtonSpinner">
-      <Setter Property="Background" Value="Transparent" />
-      <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}" />
-      <Setter Property="Padding" Value="10, 0" />
-      <Setter Property="Background" Value="{DynamicResource TextControlBackground}" />
-      <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrush}" />
-      <Setter Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThickness}" />
-      <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-      <Setter Property="MinHeight" Value="{DynamicResource TextControlThemeMinHeight}" />
-      <Setter Property="MinWidth" Value="{DynamicResource TextControlThemeMinWidth}" />
-      <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-      <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-      <Setter Property="VerticalContentAlignment" Value="Center" />
-      <Setter Property="Focusable" Value="True" />
-      <Setter Property="Template">
-        <ControlTemplate>
-          <DataValidationErrors>
-            <Border Background="{TemplateBinding Background}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    CornerRadius="{TemplateBinding CornerRadius}"
-                    MinHeight="{TemplateBinding MinHeight}">
-              <Grid ColumnDefinitions="Auto,*,Auto">
-                <ContentPresenter Name="PART_ContentPresenter"
-                                  Grid.Column="1"
-                                  ContentTemplate="{TemplateBinding ContentTemplate}"
-                                  Content="{TemplateBinding Content}"
-                                  HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                  VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                  Padding="{TemplateBinding Padding}" />
-                <StackPanel Name="PART_SpinnerPanel"
-                            Orientation="Horizontal"
-                            IsVisible="{TemplateBinding ShowButtonSpinner}">
-                  <RepeatButton Name="PART_IncreaseButton"
-                                Classes="ButtonSpinnerRepeatButton"
-                                VerticalContentAlignment="Center"
-                                Foreground="{TemplateBinding Foreground}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                Background="{TemplateBinding Background}"
-                                FontSize="{TemplateBinding FontSize}">
-                    <Path Fill="{TemplateBinding Foreground}" Width="16" Height="8" Stretch="Uniform" HorizontalAlignment="Center" VerticalAlignment="Center" Data="{StaticResource ButtonSpinnerIncreaseButtonIcon}" />
-                  </RepeatButton>
-                  <RepeatButton Name="PART_DecreaseButton" Classes="ButtonSpinnerRepeatButton" Foreground="{TemplateBinding Foreground}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" VerticalContentAlignment="Center" FontSize="{TemplateBinding FontSize}">
-                    <Path Fill="{TemplateBinding Foreground}" Width="16" Height="8" Stretch="Uniform" HorizontalAlignment="Center" VerticalAlignment="Center" Data="{StaticResource ButtonSpinnerDecreaseButtonIcon}" />
-                  </RepeatButton>
-                </StackPanel>
-              </Grid>
-            </Border>
-          </DataValidationErrors>
-        </ControlTemplate>
-      </Setter>
+  <ControlTheme x:Key="{x:Type ButtonSpinner}" TargetType="ButtonSpinner">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}" />
+    <Setter Property="Padding" Value="10, 0" />
+    <Setter Property="Background" Value="{DynamicResource TextControlBackground}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThickness}" />
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+    <Setter Property="MinHeight" Value="{DynamicResource TextControlThemeMinHeight}" />
+    <Setter Property="MinWidth" Value="{DynamicResource TextControlThemeMinWidth}" />
+    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Focusable" Value="True"/>
+    <Setter Property="Template">
+      <ControlTemplate>
+        <DataValidationErrors>
+          <Border Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}"
+                  MinHeight="{TemplateBinding MinHeight}">
+            <DockPanel>
+              <StackPanel Name="PART_SpinnerPanel"
+                          DockPanel.Dock="Right"
+                          Orientation="Horizontal"
+                          IsVisible="{TemplateBinding ShowButtonSpinner}">
+                <RepeatButton Name="PART_IncreaseButton"
+                              Background="{TemplateBinding Background}"
+                              BorderThickness="0"
+                              CornerRadius="0"
+                              VerticalAlignment="Stretch"
+                              VerticalContentAlignment="Center"
+                              Foreground="{TemplateBinding Foreground}"
+                              FontSize="{TemplateBinding FontSize}"
+                              MinWidth="34">
+                  <Path Fill="{TemplateBinding Foreground}"
+                        Width="16"
+                        Height="8"
+                        Stretch="Uniform"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Data="{StaticResource ButtonSpinnerIncreaseButtonIcon}" />
+                </RepeatButton>
 
-      <Style Selector="^:error">
-        <Setter Property="BorderBrush" Value="{DynamicResource SystemErrorTextColor}" />
-      </Style>
+                <Border BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness, Converter={StaticResource ButtonSpinnerRightThickness}}"
+                        VerticalAlignment="Stretch"/>
 
-      <Style Selector="^:left">
-        <Style Selector="^ /template/ StackPanel#PART_SpinnerPanel">
-          <Setter Property="Grid.Column" Value="0" />
-        </Style>
-        <Style Selector="^ /template/ RepeatButton.ButtonSpinnerRepeatButton">
-          <Setter Property="BorderThickness" Value="{Binding $parent[ButtonSpinner].BorderThickness, Converter={StaticResource ButtonSpinner_OnlyRightThinknessConverter}}" />
-        </Style>
-      </Style>
+                <RepeatButton Name="PART_DecreaseButton"
+                              Background="{TemplateBinding Background}"
+                              BorderThickness="0"
+                              CornerRadius="0"
+                              VerticalAlignment="Stretch"
+                              VerticalContentAlignment="Center"
+                              Foreground="{TemplateBinding Foreground}"
+                              FontSize="{TemplateBinding FontSize}"
+                              MinWidth="34">
+                  <Path Fill="{TemplateBinding Foreground}"
+                        Width="16"
+                        Height="8"
+                        Stretch="Uniform"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Data="{StaticResource ButtonSpinnerDecreaseButtonIcon}" />
+                </RepeatButton>
+              </StackPanel>
 
-      <Style Selector="^:right">
-        <Style Selector="^ /template/ StackPanel#PART_SpinnerPanel">
-          <Setter Property="Grid.Column" Value="2" />
-        </Style>
-        <Style Selector="^ /template/ RepeatButton.ButtonSpinnerRepeatButton">
-          <Setter Property="BorderThickness" Value="{Binding $parent[ButtonSpinner].BorderThickness, Converter={StaticResource ButtonSpinner_OnlyLeftThinknessConverter}}" />
-        </Style>
+              <ContentPresenter Name="PART_ContentPresenter"
+                                Grid.Column="1"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness, Converter={StaticResource ButtonSpinnerRightThickness}}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                Content="{TemplateBinding Content}"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Padding="{TemplateBinding Padding}" />
+            </DockPanel>
+          </Border>
+        </DataValidationErrors>
+      </ControlTemplate>
+    </Setter>
+    <Style Selector="^:left">
+      <Style Selector="^ /template/ StackPanel#PART_SpinnerPanel">
+        <Setter Property="DockPanel.Dock" Value="Left"/>
+      </Style>
+      <Style Selector="^ /template/ ContentPresenter">
+        <Setter Property="BorderThickness" Value="{TemplateBinding BorderThickness, Converter={StaticResource ButtonSpinnerLeftThickness}}" />
       </Style>
-    </ControlTheme>
+    </Style>
+    <Style Selector="^:error">
+      <Setter Property="BorderBrush" Value="{DynamicResource SystemErrorTextColor}" />
+    </Style>
+  </ControlTheme>
+
 </ResourceDictionary>

From ddbc9fbfcaf7524fcd7ed03a3f481dab7ecff1bf Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 8 Jul 2022 14:01:56 +0200
Subject: [PATCH 059/240] Tweaked CheckBox ControlTheme.

---
 .../Controls/CheckBox.xaml                    | 451 +++++++++---------
 1 file changed, 228 insertions(+), 223 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml b/src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml
index 44e1afefa4..9abcf5d32b 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml
@@ -1,293 +1,298 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Design.PreviewWith>
-      <Border Padding="20">
-        <CheckBox IsThreeState="True" IsChecked="True" Content="Content" Foreground="Gold" />
-      </Border>
-    </Design.PreviewWith>
-
-    <ControlTheme x:Key="{x:Type CheckBox}" TargetType="CheckBox">
-      <Setter Property="Padding" Value="8,0,0,0" />
-      <Setter Property="HorizontalAlignment" Value="Left" />
-      <Setter Property="VerticalAlignment" Value="Center" />
-      <Setter Property="HorizontalContentAlignment" Value="Left" />
-      <Setter Property="VerticalContentAlignment" Value="Center" />
-      <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-      <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-      <Setter Property="MinHeight" Value="32" />
-      <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundUnchecked}" />
-      <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundUnchecked}" />
-      <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUnchecked}" />
-      <Setter Property="Template">
-        <ControlTemplate>
-          <Grid x:Name="RootGrid" ColumnDefinitions="20,*">
-            <Border x:Name="PART_Border"
-                    Grid.ColumnSpan="2"
-                    Background="{TemplateBinding Background}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    CornerRadius="{TemplateBinding CornerRadius}" />
-
-            <Grid VerticalAlignment="Top" Height="32">
-              <Border x:Name="NormalRectangle"
-                      BorderBrush="{DynamicResource CheckBoxCheckBackgroundStrokeUnchecked}"
-                      Background="{DynamicResource CheckBoxCheckBackgroundFillUnchecked}"
-                      BorderThickness="{DynamicResource CheckBoxBorderThemeThickness}"
-                      CornerRadius="{TemplateBinding CornerRadius}"
-                      UseLayoutRounding="False"
-                      Height="20"
-                      Width="20" />
-
-              <Viewbox UseLayoutRounding="False">
-                <Panel>
-                  <Panel Height="16" Width="16" />
-                  <Path x:Name="CheckGlyph" 
-                        Opacity="0" 
-                        Fill="{DynamicResource CheckBoxCheckGlyphForegroundUnchecked}" 
-                        Stretch="Uniform" 
-                        VerticalAlignment="Center" />
-                </Panel>
-              </Viewbox>
-            </Grid>
-            <ContentPresenter x:Name="ContentPresenter"
-                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                            Content="{TemplateBinding Content}"
-                            Margin="{TemplateBinding Padding}"
-                            RecognizesAccessKey="True"
-                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                            Grid.Column="1" />
-            <!-- TODO: TextWrapping="Wrap" on contentpresenter -->
+  <Design.PreviewWith>
+    <Border Padding="20">
+      <StackPanel Spacing="20">
+        <CheckBox>Unchecked</CheckBox>
+        <CheckBox IsChecked="True">Checked</CheckBox>
+        <CheckBox IsThreeState="True" IsChecked="{x:Null}">Indeterminate</CheckBox>
+        <CheckBox Width="120">Checkbox should wrap its text</CheckBox>
+      </StackPanel>
+    </Border>
+  </Design.PreviewWith>
+
+  <ControlTheme x:Key="{x:Type CheckBox}" TargetType="CheckBox">
+    <Setter Property="Padding" Value="8,0,0,0" />
+    <Setter Property="HorizontalAlignment" Value="Left" />
+    <Setter Property="VerticalAlignment" Value="Center" />
+    <Setter Property="HorizontalContentAlignment" Value="Left" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+    <Setter Property="MinHeight" Value="32" />
+    <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundUnchecked}" />
+    <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundUnchecked}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUnchecked}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Grid x:Name="RootGrid" ColumnDefinitions="20,*">
+          <Border x:Name="PART_Border"
+                  Grid.ColumnSpan="2"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}" />
+
+          <Grid VerticalAlignment="Top" Height="32">
+            <Border x:Name="NormalRectangle"
+                    BorderBrush="{DynamicResource CheckBoxCheckBackgroundStrokeUnchecked}"
+                    Background="{DynamicResource CheckBoxCheckBackgroundFillUnchecked}"
+                    BorderThickness="{DynamicResource CheckBoxBorderThemeThickness}"
+                    CornerRadius="{TemplateBinding CornerRadius}"
+                    UseLayoutRounding="False"
+                    Height="20"
+                    Width="20" />
+
+            <Viewbox UseLayoutRounding="False">
+              <Panel>
+                <Panel Height="16" Width="16" />
+                <Path x:Name="CheckGlyph"
+                      Opacity="0"
+                      Fill="{DynamicResource CheckBoxCheckGlyphForegroundUnchecked}"
+                      Stretch="Uniform"
+                      VerticalAlignment="Center" />
+              </Panel>
+            </Viewbox>
           </Grid>
-        </ControlTemplate>
-      </Setter>
+          <ContentPresenter x:Name="ContentPresenter"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          Content="{TemplateBinding Content}"
+                          Margin="{TemplateBinding Padding}"
+                          RecognizesAccessKey="True"
+                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                          TextWrapping="Wrap"
+                          Grid.Column="1" />
+        </Grid>
+      </ControlTemplate>
+    </Setter>
+
+    <!-- Unchecked PointerOver State -->
+    <Style Selector="^:pointerover">
+      <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+        <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundUncheckedPointerOver}" />
+      </Style>
+
+      <Style Selector="^ /template/ Border#PART_Border">
+        <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundUncheckedPointerOver}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUncheckedPointerOver}" />
+      </Style>
+
+      <Style Selector="^ /template/ Border#NormalRectangle">
+        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUncheckedPointerOver}" />
+        <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillUncheckedPointerOver}" />
+      </Style>
+
+      <Style Selector="^ /template/ Path#CheckGlyph">
+        <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundUncheckedPointerOver}" />
+      </Style>
+    </Style>
+
+    <!-- Unchecked Pressed State -->
+    <Style Selector="^:pressed">
+      <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+        <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundUncheckedPressed}" />
+      </Style>
+
+      <Style Selector="^ /template/ Border#PART_Border">
+        <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundUncheckedPressed}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUncheckedPressed}" />
+      </Style>
+
+      <Style Selector="^ /template/ Border#NormalRectangle">
+        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUncheckedPressed}" />
+        <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillUncheckedPressed}" />
+      </Style>
+
+      <Style Selector="^ /template/ Path#CheckGlyph">
+        <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundUncheckedPressed}" />
+      </Style>
+    </Style>
+
+    <!-- Unchecked Disabled state -->
+    <Style Selector="^:disabled">
+      <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+        <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundUncheckedDisabled}" />
+      </Style>
+
+      <Style Selector="^ /template/ Border#PART_Border">
+        <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundUncheckedDisabled}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUncheckedDisabled}" />
+      </Style>
+
+      <Style Selector="^ /template/ Border#NormalRectangle">
+        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUncheckedDisabled}" />
+        <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillUncheckedDisabled}" />
+      </Style>
+
+      <Style Selector="^ /template/ Path#CheckGlyph">
+        <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundUncheckedDisabled}" />
+      </Style>
+    </Style>
+
+    <Style Selector="^:checked">
+      <!-- Checked Normal State -->
+      <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundChecked}" />
+      <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundChecked}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushChecked}" />
+
+      <Style Selector="^ /template/ Border#NormalRectangle">
+        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundFillChecked}" />
+        <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillChecked}" />
+      </Style>
+
+      <Style Selector="^ /template/ Path#CheckGlyph">
+        <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundChecked}" />
+        <Setter Property="Data" Value="M1507 31L438 1101L-119 543L-29 453L438 919L1417 -59L1507 31Z" />
+        <Setter Property="Width" Value="9" />
+        <Setter Property="Opacity" Value="1" />
+        <Setter Property="FlowDirection" Value="LeftToRight" />
+      </Style>
 
-      <!-- Unchecked PointerOver State -->
+      <!-- Checked PointerOver State -->
       <Style Selector="^:pointerover">
         <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
-          <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundUncheckedPointerOver}" />
+          <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundCheckedPointerOver}" />
         </Style>
 
         <Style Selector="^ /template/ Border#PART_Border">
-          <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundUncheckedPointerOver}" />
-          <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUncheckedPointerOver}" />
+          <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundCheckedPointerOver}" />
+          <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushCheckedPointerOver}" />
         </Style>
 
         <Style Selector="^ /template/ Border#NormalRectangle">
-          <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUncheckedPointerOver}" />
-          <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillUncheckedPointerOver}" />
+          <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeCheckedPointerOver}" />
+          <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillCheckedPointerOver}" />
         </Style>
 
         <Style Selector="^ /template/ Path#CheckGlyph">
-          <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundUncheckedPointerOver}" />
+          <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundCheckedPointerOver}" />
         </Style>
       </Style>
 
-      <!-- Unchecked Pressed State -->
+      <!-- Checked Pressed State -->
       <Style Selector="^:pressed">
         <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
-          <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundUncheckedPressed}" />
+          <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundCheckedPressed}" />
         </Style>
 
         <Style Selector="^ /template/ Border#PART_Border">
-          <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundUncheckedPressed}" />
-          <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUncheckedPressed}" />
+          <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundCheckedPressed}" />
+          <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushCheckedPressed}" />
         </Style>
 
         <Style Selector="^ /template/ Border#NormalRectangle">
-          <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUncheckedPressed}" />
-          <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillUncheckedPressed}" />
+          <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeCheckedPressed}" />
+          <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillCheckedPressed}" />
         </Style>
 
         <Style Selector="^ /template/ Path#CheckGlyph">
-          <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundUncheckedPressed}" />
+          <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundCheckedPressed}" />
         </Style>
       </Style>
 
-      <!-- Unchecked Disabled state -->
+      <!-- Checked Disabled State -->
       <Style Selector="^:disabled">
-        <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
-          <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundUncheckedDisabled}" />
+        <Style Selector="^ ContentPresenter#ContentPresenter">
+          <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundCheckedDisabled}" />
         </Style>
 
         <Style Selector="^ /template/ Border#PART_Border">
-          <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundUncheckedDisabled}" />
-          <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUncheckedDisabled}" />
+          <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundCheckedDisabled}" />
+          <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushCheckedDisabled}" />
         </Style>
 
         <Style Selector="^ /template/ Border#NormalRectangle">
-          <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUncheckedDisabled}" />
-          <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillUncheckedDisabled}" />
+          <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeCheckedDisabled}" />
+          <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillCheckedDisabled}" />
         </Style>
 
         <Style Selector="^ /template/ Path#CheckGlyph">
-          <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundUncheckedDisabled}" />
+          <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundCheckedDisabled}" />
         </Style>
       </Style>
+    </Style>
 
-      <Style Selector="^:checked">
-        <!-- Checked Normal State -->
-        <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundChecked}" />
-        <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundChecked}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushChecked}" />
+    <Style Selector="^:indeterminate">
+      <!-- Indeterminate Normal State -->
+      <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminate}" />
+      <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundIndeterminate}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminate}" />
 
-        <Style Selector="^ /template/ Border#NormalRectangle">
-          <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundFillChecked}" />
-          <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillChecked}" />
-        </Style>
+      <Style Selector="^ /template/ Border#NormalRectangle">
+        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminate}" />
+        <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminate}" />
+      </Style>
 
-        <Style Selector="^ /template/ Path#CheckGlyph">
-          <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundChecked}" />
-          <Setter Property="Data" Value="M1507 31L438 1101L-119 543L-29 453L438 919L1417 -59L1507 31Z" />
-          <Setter Property="Width" Value="9" />
-          <Setter Property="Opacity" Value="1" />
-          <Setter Property="FlowDirection" Value="LeftToRight" />
+      <Style Selector="^ /template/ Path#CheckGlyph">
+        <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminate}" />
+        <Setter Property="Data" Value="M1536 1536v-1024h-1024v1024h1024z" />
+        <Setter Property="Width" Value="7" />
+        <Setter Property="Opacity" Value="1" />
+      </Style>
+
+      <!-- Indeterminate PointerOver State -->
+      <Style Selector="^:pointerover">
+        <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+          <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminatePointerOver}" />
         </Style>
 
-        <!-- Checked PointerOver State -->
-        <Style Selector="^:pointerover">
-          <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
-            <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundCheckedPointerOver}" />
-          </Style>
-
-          <Style Selector="^ /template/ Border#PART_Border">
-            <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundCheckedPointerOver}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushCheckedPointerOver}" />
-          </Style>
-
-          <Style Selector="^ /template/ Border#NormalRectangle">
-            <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeCheckedPointerOver}" />
-            <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillCheckedPointerOver}" />
-          </Style>
-
-          <Style Selector="^ /template/ Path#CheckGlyph">
-            <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundCheckedPointerOver}" />
-          </Style>
+        <Style Selector="^ /template/ Border#PART_Border">
+          <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundIndeterminatePointerOver}" />
+          <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminatePointerOver}" />
         </Style>
 
-        <!-- Checked Pressed State -->
-        <Style Selector="^:pressed">
-          <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
-            <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundCheckedPressed}" />
-          </Style>
-
-          <Style Selector="^ /template/ Border#PART_Border">
-            <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundCheckedPressed}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushCheckedPressed}" />
-          </Style>
-
-          <Style Selector="^ /template/ Border#NormalRectangle">
-            <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeCheckedPressed}" />
-            <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillCheckedPressed}" />
-          </Style>
-
-          <Style Selector="^ /template/ Path#CheckGlyph">
-            <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundCheckedPressed}" />
-          </Style>
+        <Style Selector="^ /template/ Border#NormalRectangle">
+          <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminatePointerOver}" />
+          <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminatePointerOver}" />
         </Style>
 
-        <!-- Checked Disabled State -->
-        <Style Selector="^:disabled">
-          <Style Selector="^ ContentPresenter#ContentPresenter">
-            <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundCheckedDisabled}" />
-          </Style>
-
-          <Style Selector="^ /template/ Border#PART_Border">
-            <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundCheckedDisabled}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushCheckedDisabled}" />
-          </Style>
-
-          <Style Selector="^ /template/ Border#NormalRectangle">
-            <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeCheckedDisabled}" />
-            <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillCheckedDisabled}" />
-          </Style>
-
-          <Style Selector="^ /template/ Path#CheckGlyph">
-            <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundCheckedDisabled}" />
-          </Style>
+        <Style Selector="^ /template/ Path#CheckGlyph">
+          <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminatePointerOver}" />
         </Style>
       </Style>
 
-      <Style Selector="^:indeterminate">
-        <!-- Indeterminate Normal State -->
-        <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminate}" />
-        <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundIndeterminate}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminate}" />
+      <!-- Indeterminate Pressed State -->
+      <Style Selector="^:pressed">
+        <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+          <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminatePressed}" />
+        </Style>
+
+        <Style Selector="^ /template/ Border#PART_Border">
+          <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundIndeterminatePressed}" />
+          <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminatePressed}" />
+        </Style>
 
         <Style Selector="^ /template/ Border#NormalRectangle">
-          <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminate}" />
-          <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminate}" />
+          <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminatePressed}" />
+          <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminatePressed}" />
         </Style>
 
         <Style Selector="^ /template/ Path#CheckGlyph">
-          <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminate}" />
-          <Setter Property="Data" Value="M1536 1536v-1024h-1024v1024h1024z" />
-          <Setter Property="Width" Value="7" />
-          <Setter Property="Opacity" Value="1" />
+          <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminatePressed}" />
         </Style>
+      </Style>
 
-        <!-- Indeterminate PointerOver State -->
-        <Style Selector="^:pointerover">
-          <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
-            <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminatePointerOver}" />
-          </Style>
-
-          <Style Selector="^ /template/ Border#PART_Border">
-            <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundIndeterminatePointerOver}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminatePointerOver}" />
-          </Style>
-
-          <Style Selector="^ /template/ Border#NormalRectangle">
-            <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminatePointerOver}" />
-            <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminatePointerOver}" />
-          </Style>
-
-          <Style Selector="^ /template/ Path#CheckGlyph">
-            <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminatePointerOver}" />
-          </Style>
+      <!-- Indeterminate Disabled State -->
+      <Style Selector="^:disabled">
+        <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+          <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminateDisabled}" />
+        </Style>
+
+        <Style Selector="^ /template/ Border#PART_Border">
+          <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundIndeterminateDisabled}" />
+          <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminateDisabled}" />
         </Style>
 
-        <!-- Indeterminate Pressed State -->
-        <Style Selector="^:pressed">
-          <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
-            <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminatePressed}" />
-          </Style>
-
-          <Style Selector="^ /template/ Border#PART_Border">
-            <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundIndeterminatePressed}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminatePressed}" />
-          </Style>
-
-          <Style Selector="^ /template/ Border#NormalRectangle">
-            <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminatePressed}" />
-            <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminatePressed}" />
-          </Style>
-
-          <Style Selector="^ /template/ Path#CheckGlyph">
-            <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminatePressed}" />
-          </Style>
+        <Style Selector="^ /template/ Border#NormalRectangle">
+          <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminateDisabled}" />
+          <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminateDisabled}" />
         </Style>
 
-        <!-- Indeterminate Disabled State -->
-        <Style Selector="^:disabled">
-          <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
-            <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundIndeterminateDisabled}" />
-          </Style>
-
-          <Style Selector="^ /template/ Border#PART_Border">
-            <Setter Property="Background" Value="{DynamicResource CheckBoxBackgroundIndeterminateDisabled}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushIndeterminateDisabled}" />
-          </Style>
-
-          <Style Selector="^ /template/ Border#NormalRectangle">
-            <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxCheckBackgroundStrokeIndeterminateDisabled}" />
-            <Setter Property="Background" Value="{DynamicResource CheckBoxCheckBackgroundFillIndeterminateDisabled}" />
-          </Style>
-
-          <Style Selector="^ /template/ Path#CheckGlyph">
-            <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminateDisabled}" />
-          </Style>
+        <Style Selector="^ /template/ Path#CheckGlyph">
+          <Setter Property="Fill" Value="{DynamicResource CheckBoxCheckGlyphForegroundIndeterminateDisabled}" />
         </Style>
       </Style>
-    </ControlTheme>
+    </Style>
+  </ControlTheme>
 </ResourceDictionary>

From 47215816a22a68fd5c7ba863e78843127ba6e603 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 8 Jul 2022 14:08:03 +0200
Subject: [PATCH 060/240] Validated ComboBox/Item ControlTheme.

---
 .../Controls/ComboBox.xaml                    | 416 +++++++++---------
 .../Controls/ComboBoxItem.xaml                | 153 +++----
 2 files changed, 290 insertions(+), 279 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml b/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml
index b3da7735eb..ec78bf6ab4 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml
@@ -1,217 +1,227 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Design.PreviewWith>
-      <Border Padding="20">
-        <StackPanel Spacing="10">
-          <ComboBox PlaceholderText="Select an item">
-            <ComboBoxItem>Item 1</ComboBoxItem>
-            <ComboBoxItem>Item 2</ComboBoxItem>
-          </ComboBox>
-          <ComboBox IsEnabled="False" 
-                    Width="200" 
-                    SelectedIndex="1" 
-                    HorizontalContentAlignment="Center">
-            <ComboBoxItem>Item 1</ComboBoxItem>
-            <ComboBoxItem>Item 2</ComboBoxItem>
-          </ComboBox>
-        </StackPanel>
-      </Border>
-    </Design.PreviewWith>
-  
-    <Thickness x:Key="ComboBoxTopHeaderMargin">0,0,0,4</Thickness>
-    <x:Int32 x:Key="ComboBoxPopupMaxNumberOfItems">15</x:Int32>
-    <x:Int32 x:Key="ComboBoxPopupMaxNumberOfItemsThatCanBeShownOnOneSide">7</x:Int32>
-    
-    <Thickness x:Key="ComboBoxPadding">12,5,0,7</Thickness>
-    <Thickness x:Key="ComboBoxEditableTextPadding">11,5,32,6</Thickness>
-    <x:Double x:Key="ComboBoxMinHeight">32</x:Double>
-    
-    <ControlTheme x:Key="{x:Type ComboBox}" TargetType="ComboBox">
-      <Setter Property="Padding" Value="{DynamicResource ComboBoxPadding}" />
-      <Setter Property="FocusAdorner" Value="{x:Null}" />
-      <Setter Property="MaxDropDownHeight" Value="504" />
-      <Setter Property="Foreground" Value="{DynamicResource ComboBoxForeground}" />
-      <Setter Property="Background" Value="{DynamicResource ComboBoxBackground}" />
-      <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxBorderBrush}" />
-      <Setter Property="BorderThickness" Value="{DynamicResource ComboBoxBorderThemeThickness}" />
-      <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-      <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
-      <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-      <Setter Property="MinHeight" Value="{DynamicResource ComboBoxMinHeight}" />
-      <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-      <Setter Property="VerticalContentAlignment" Value="Center" />
-      <Setter Property="HorizontalAlignment" Value="Left" />
-      <Setter Property="VerticalAlignment" Value="Top" />
-      <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-      <Setter Property="PlaceholderForeground" Value="{DynamicResource ComboBoxPlaceHolderForeground}" />
-      <Setter Property="Template">
-        <ControlTemplate>
-          <DataValidationErrors>
-            <Grid RowDefinitions="Auto, *, Auto" ColumnDefinitions="*,32">
-              <ContentPresenter x:Name="HeaderContentPresenter"
-                                Grid.Row="0"
-                                Grid.Column="0" 
-                                Grid.ColumnSpan="2"
-                                IsVisible="False"
-                                FontWeight="{DynamicResource ComboBoxHeaderThemeFontWeight}" 
-                                Margin="{DynamicResource ComboBoxTopHeaderMargin}"
-                                VerticalAlignment="Top" />
-              <Border x:Name="Background"
-                      Grid.Row="1"
-                      Grid.Column="0"
-                      Grid.ColumnSpan="2"
-                      Background="{TemplateBinding Background}"
-                      BorderBrush="{TemplateBinding BorderBrush}"
-                      BorderThickness="{TemplateBinding BorderThickness}"
-                      CornerRadius="{TemplateBinding CornerRadius}"
-                      MinWidth="{DynamicResource ComboBoxThemeMinWidth}" />
-              <Border x:Name="HighlightBackground"
-                      Grid.Row="1"
-                      Grid.Column="0"
-                      Grid.ColumnSpan="2"
-                      Background="{DynamicResource ComboBoxBackgroundUnfocused}"
-                      BorderBrush="{DynamicResource ComboBoxBackgroundBorderBrushUnfocused}"
-                      BorderThickness="{TemplateBinding BorderThickness}"
-                      CornerRadius="{TemplateBinding CornerRadius}"
-                      IsVisible="False"/>
-              <TextBlock x:Name="PlaceholderTextBlock"
-                         Grid.Row="1"
-                         Grid.Column="0"
-                         HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                         VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                         Margin="{TemplateBinding Padding}"
-                         Text="{TemplateBinding PlaceholderText}"
-                         Foreground="{TemplateBinding PlaceholderForeground}"
-                         IsVisible="{TemplateBinding SelectionBoxItem, Converter={x:Static ObjectConverters.IsNull}}" />
-              <ContentControl x:Name="ContentPresenter"
-                              Content="{TemplateBinding SelectionBoxItem}"
-                              ContentTemplate="{TemplateBinding ItemTemplate}"
-                              Grid.Row="1"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:sys="clr-namespace:System;assembly=netstandard">
+  <Design.PreviewWith>
+    <Border Padding="20">
+      <StackPanel Spacing="10">
+        <ComboBox PlaceholderText="Select an item">
+          <ComboBoxItem>Item 1</ComboBoxItem>
+          <ComboBoxItem>Item 2</ComboBoxItem>
+        </ComboBox>
+        <ComboBox IsEnabled="False"
+                  Width="200"
+                  SelectedIndex="1"
+                  HorizontalContentAlignment="Center">
+          <ComboBoxItem>Item 1</ComboBoxItem>
+          <ComboBoxItem>Item 2</ComboBoxItem>
+        </ComboBox>
+        <ComboBox PlaceholderText="Error">
+          <DataValidationErrors.Error>
+            <sys:Exception>
+              <x:Arguments>
+                <x:String>Error</x:String>
+              </x:Arguments>
+            </sys:Exception>
+          </DataValidationErrors.Error>
+        </ComboBox>
+      </StackPanel>
+    </Border>
+  </Design.PreviewWith>
+
+  <Thickness x:Key="ComboBoxTopHeaderMargin">0,0,0,4</Thickness>
+  <x:Int32 x:Key="ComboBoxPopupMaxNumberOfItems">15</x:Int32>
+  <x:Int32 x:Key="ComboBoxPopupMaxNumberOfItemsThatCanBeShownOnOneSide">7</x:Int32>
+
+  <Thickness x:Key="ComboBoxPadding">12,5,0,7</Thickness>
+  <Thickness x:Key="ComboBoxEditableTextPadding">11,5,32,6</Thickness>
+  <x:Double x:Key="ComboBoxMinHeight">32</x:Double>
+
+  <ControlTheme x:Key="{x:Type ComboBox}" TargetType="ComboBox">
+    <Setter Property="Padding" Value="{DynamicResource ComboBoxPadding}" />
+    <Setter Property="FocusAdorner" Value="{x:Null}" />
+    <Setter Property="MaxDropDownHeight" Value="504" />
+    <Setter Property="Foreground" Value="{DynamicResource ComboBoxForeground}" />
+    <Setter Property="Background" Value="{DynamicResource ComboBoxBackground}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxBorderBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource ComboBoxBorderThemeThickness}" />
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
+    <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+    <Setter Property="MinHeight" Value="{DynamicResource ComboBoxMinHeight}" />
+    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="HorizontalAlignment" Value="Left" />
+    <Setter Property="VerticalAlignment" Value="Top" />
+    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+    <Setter Property="PlaceholderForeground" Value="{DynamicResource ComboBoxPlaceHolderForeground}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <DataValidationErrors>
+          <Grid RowDefinitions="Auto, *, Auto" ColumnDefinitions="*,32">
+            <ContentPresenter x:Name="HeaderContentPresenter"
+                              Grid.Row="0"
                               Grid.Column="0"
-                              Margin="{TemplateBinding Padding}"
-                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-              
-              <Border x:Name="DropDownOverlay"
+                              Grid.ColumnSpan="2"
+                              IsVisible="False"
+                              FontWeight="{DynamicResource ComboBoxHeaderThemeFontWeight}"
+                              Margin="{DynamicResource ComboBoxTopHeaderMargin}"
+                              VerticalAlignment="Top" />
+            <Border x:Name="Background"
+                    Grid.Row="1"
+                    Grid.Column="0"
+                    Grid.ColumnSpan="2"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    CornerRadius="{TemplateBinding CornerRadius}"
+                    MinWidth="{DynamicResource ComboBoxThemeMinWidth}" />
+            <Border x:Name="HighlightBackground"
+                    Grid.Row="1"
+                    Grid.Column="0"
+                    Grid.ColumnSpan="2"
+                    Background="{DynamicResource ComboBoxBackgroundUnfocused}"
+                    BorderBrush="{DynamicResource ComboBoxBackgroundBorderBrushUnfocused}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    CornerRadius="{TemplateBinding CornerRadius}"
+                    IsVisible="False"/>
+            <TextBlock x:Name="PlaceholderTextBlock"
+                       Grid.Row="1"
+                       Grid.Column="0"
+                       HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                       VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                       Margin="{TemplateBinding Padding}"
+                       Text="{TemplateBinding PlaceholderText}"
+                       Foreground="{TemplateBinding PlaceholderForeground}"
+                       IsVisible="{TemplateBinding SelectionBoxItem, Converter={x:Static ObjectConverters.IsNull}}" />
+            <ContentControl x:Name="ContentPresenter"
+                            Content="{TemplateBinding SelectionBoxItem}"
+                            ContentTemplate="{TemplateBinding ItemTemplate}"
+                            Grid.Row="1"
+                            Grid.Column="0"
+                            Margin="{TemplateBinding Padding}"
+                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+
+            <Border x:Name="DropDownOverlay"
+                    Grid.Row="1"
+                    Grid.Column="1"
+                    Background="Transparent"
+                    Margin="0,1,1,1"
+                    Width="30"
+                    IsVisible="False"
+                    HorizontalAlignment="Right" />
+
+            <PathIcon x:Name="DropDownGlyph"
                       Grid.Row="1"
                       Grid.Column="1"
-                      Background="Transparent"
-                      Margin="0,1,1,1" 
-                      Width="30" 
-                      IsVisible="False" 
-                      HorizontalAlignment="Right" />
-              
-              <PathIcon x:Name="DropDownGlyph"
-                        Grid.Row="1"
-                        Grid.Column="1"
-                        UseLayoutRounding="False"
-                        IsHitTestVisible="False"
-                        Height="12"
-                        Width="12"
-                        Margin="0,0,10,0" 
-                        HorizontalAlignment="Right"
-                        VerticalAlignment="Center"
-                        Foreground="{DynamicResource ComboBoxDropDownGlyphForeground}"
-                        Data="M1939 486L2029 576L1024 1581L19 576L109 486L1024 1401L1939 486Z"/>
-              
-              <Popup Name="PART_Popup" 
-                     WindowManagerAddShadowHint="False"
-                     IsOpen="{TemplateBinding IsDropDownOpen, Mode=TwoWay}" 
-                     MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}" 
-                     MaxHeight="{TemplateBinding MaxDropDownHeight}"
-                     PlacementTarget="Background" 
-                     IsLightDismissEnabled="True" 
-                     InheritsTransform="True">
-                <Border x:Name="PopupBorder"
-                        Background="{DynamicResource ComboBoxDropDownBackground}"
-                        BorderBrush="{DynamicResource ComboBoxDropDownBorderBrush}" 
-                        BorderThickness="{DynamicResource ComboBoxDropdownBorderThickness}"
-                        Margin="0,-1,0,-1"
-                        Padding="{DynamicResource ComboBoxDropdownBorderPadding}"
-                        HorizontalAlignment="Stretch"
-                        CornerRadius="{DynamicResource OverlayCornerRadius}">
-                  <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
-                                VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
-                    <ItemsPresenter Name="PART_ItemsPresenter"
-                                    Items="{TemplateBinding Items}" 
-                                    Margin="{DynamicResource ComboBoxDropdownContentMargin}" 
-                                    ItemsPanel="{TemplateBinding ItemsPanel}"
-                                    ItemTemplate="{TemplateBinding ItemTemplate}" 
-                                    VirtualizationMode="{TemplateBinding VirtualizationMode}" />
-                  </ScrollViewer>
-                </Border>
-              </Popup>
-            </Grid>
-          </DataValidationErrors>
-        </ControlTemplate>
-      </Setter>
+                      UseLayoutRounding="False"
+                      IsHitTestVisible="False"
+                      Height="12"
+                      Width="12"
+                      Margin="0,0,10,0"
+                      HorizontalAlignment="Right"
+                      VerticalAlignment="Center"
+                      Foreground="{DynamicResource ComboBoxDropDownGlyphForeground}"
+                      Data="M1939 486L2029 576L1024 1581L19 576L109 486L1024 1401L1939 486Z"/>
+
+            <Popup Name="PART_Popup"
+                   WindowManagerAddShadowHint="False"
+                   IsOpen="{TemplateBinding IsDropDownOpen, Mode=TwoWay}"
+                   MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
+                   MaxHeight="{TemplateBinding MaxDropDownHeight}"
+                   PlacementTarget="Background"
+                   IsLightDismissEnabled="True"
+                   InheritsTransform="True">
+              <Border x:Name="PopupBorder"
+                      Background="{DynamicResource ComboBoxDropDownBackground}"
+                      BorderBrush="{DynamicResource ComboBoxDropDownBorderBrush}"
+                      BorderThickness="{DynamicResource ComboBoxDropdownBorderThickness}"
+                      Margin="0,-1,0,-1"
+                      Padding="{DynamicResource ComboBoxDropdownBorderPadding}"
+                      HorizontalAlignment="Stretch"
+                      CornerRadius="{DynamicResource OverlayCornerRadius}">
+                <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                              VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
+                  <ItemsPresenter Name="PART_ItemsPresenter"
+                                  Items="{TemplateBinding Items}"
+                                  Margin="{DynamicResource ComboBoxDropdownContentMargin}"
+                                  ItemsPanel="{TemplateBinding ItemsPanel}"
+                                  ItemTemplate="{TemplateBinding ItemTemplate}"
+                                  VirtualizationMode="{TemplateBinding VirtualizationMode}" />
+                </ScrollViewer>
+              </Border>
+            </Popup>
+          </Grid>
+        </DataValidationErrors>
+      </ControlTemplate>
+    </Setter>
+
+    <!--  PointerOver State  -->
+    <Style Selector="^:pointerover /template/ Border#Background">
+      <Setter Property="Background" Value="{DynamicResource ComboBoxBackgroundPointerOver}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxBorderBrushPointerOver}" />
+    </Style>
+
+    <!--  Pressed State  -->
+    <Style Selector="^:pressed /template/ Border#Background">
+      <Setter Property="Background" Value="{DynamicResource ComboBoxBackgroundPressed}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxBorderBrushPressed}" />
+    </Style>
 
-      <!--  PointerOver State  -->
-      <Style Selector="^:pointerover /template/ Border#Background">
-        <Setter Property="Background" Value="{DynamicResource ComboBoxBackgroundPointerOver}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxBorderBrushPointerOver}" />
+    <!-- Error State -->
+    <Style Selector="^:error /template/ Border#Background">
+      <Setter Property="BorderBrush" Value="{DynamicResource SystemControlErrorTextForegroundBrush}" />
+    </Style>
+
+    <!--  Focus Pressed State  -->
+    <Style Selector="^:focused:pressed">
+      <Style Selector="^ /template/ ContentControl#ContentPresenter">
+        <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundFocusedPressed}" />
       </Style>
-      
-      <!--  Pressed State  -->
-      <Style Selector="^:pressed /template/ Border#Background">
-        <Setter Property="Background" Value="{DynamicResource ComboBoxBackgroundPressed}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxBorderBrushPressed}" />
+      <Style Selector="^ /template/ TextBlock#PlaceholderTextBlock">
+        <Setter Property="Foreground" Value="{DynamicResource ComboBoxPlaceHolderForegroundFocusedPressed}" />
       </Style>
-      
-      <!-- Error State -->
-      <Style Selector="^:error /template/ Border#Background">
-        <Setter Property="BorderBrush" Value="{DynamicResource SystemControlErrorTextForegroundBrush}" />
+      <Style Selector="^ /template/ PathIcon#DropDownGlyph">
+        <Setter Property="Foreground" Value="{DynamicResource ComboBoxDropDownGlyphForegroundFocusedPressed}" />
       </Style>
+    </Style>
 
-      <!--  Focus Pressed State  -->
-      <Style Selector="^:focused:pressed">
-        <Style Selector="^ /template/ ContentControl#ContentPresenter">
-          <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundFocusedPressed}" />
-        </Style>
-        <Style Selector="^ /template/ TextBlock#PlaceholderTextBlock">
-          <Setter Property="Foreground" Value="{DynamicResource ComboBoxPlaceHolderForegroundFocusedPressed}" />
-        </Style>
-        <Style Selector="^ /template/ PathIcon#DropDownGlyph">
-          <Setter Property="Foreground" Value="{DynamicResource ComboBoxDropDownGlyphForegroundFocusedPressed}" />
-        </Style>
+    <!--  Focused State  -->
+    <Style Selector="^:focus-visible">
+      <Style Selector="^ /template/ Border#HighlightBackground">
+        <Setter Property="IsVisible" Value="True" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxBackgroundBorderBrushFocused}" />
       </Style>
-
-      <!--  Focused State  -->
-      <Style Selector="^:focus-visible">
-        <Style Selector="^ /template/ Border#HighlightBackground">
-          <Setter Property="IsVisible" Value="True" />
-          <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxBackgroundBorderBrushFocused}" />
-        </Style>
-        <Style Selector="^ /template/ ContentControl#ContentPresenter">
-          <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundFocused}" />
-        </Style>
-        <Style Selector="^ /template/ TextBlock#PlaceholderTextBlock">
-          <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundFocused}" />
-        </Style>
-        <Style Selector="^ /template/ PathIcon#DropDownGlyph">
-          <Setter Property="Foreground" Value="{DynamicResource ComboBoxDropDownGlyphForegroundFocused}" />
-        </Style>
+      <Style Selector="^ /template/ ContentControl#ContentPresenter">
+        <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundFocused}" />
+      </Style>
+      <Style Selector="^ /template/ TextBlock#PlaceholderTextBlock">
+        <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundFocused}" />
       </Style>
+      <Style Selector="^ /template/ PathIcon#DropDownGlyph">
+        <Setter Property="Foreground" Value="{DynamicResource ComboBoxDropDownGlyphForegroundFocused}" />
+      </Style>
+    </Style>
 
-      <!--  Disabled State  -->
-      <Style Selector="^:disabled">
-        <Style Selector="^ /template/ Border#Background">
-          <Setter Property="Background" Value="{DynamicResource ComboBoxBackgroundDisabled}" />
-          <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxBorderBrushDisabled}" />
-        </Style>
-        <Style Selector="^ /template/ ContentPresenter#HeaderContentPresenter">
-          <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundDisabled}" />
-        </Style>
-        <Style Selector="^ /template/ ContentControl#ContentPresenter">
-          <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundDisabled}" />
-        </Style>
-        <Style Selector="^ /template/ TextBlock#PlaceholderTextBlock">
-          <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundDisabled}" />
-        </Style>
-        <Style Selector="^ /template/ PathIcon#DropDownGlyph">
-          <Setter Property="Foreground" Value="{DynamicResource ComboBoxDropDownGlyphForegroundDisabled}" />
-        </Style>
+    <!--  Disabled State  -->
+    <Style Selector="^:disabled">
+      <Style Selector="^ /template/ Border#Background">
+        <Setter Property="Background" Value="{DynamicResource ComboBoxBackgroundDisabled}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxBorderBrushDisabled}" />
+      </Style>
+      <Style Selector="^ /template/ ContentPresenter#HeaderContentPresenter">
+        <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundDisabled}" />
       </Style>
-    </ControlTheme>
-  
+      <Style Selector="^ /template/ ContentControl#ContentPresenter">
+        <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundDisabled}" />
+      </Style>
+      <Style Selector="^ /template/ TextBlock#PlaceholderTextBlock">
+        <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundDisabled}" />
+      </Style>
+      <Style Selector="^ /template/ PathIcon#DropDownGlyph">
+        <Setter Property="Foreground" Value="{DynamicResource ComboBoxDropDownGlyphForegroundDisabled}" />
+      </Style>
+    </Style>
+  </ControlTheme>
+
 </ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ComboBoxItem.xaml b/src/Avalonia.Themes.Fluent/Controls/ComboBoxItem.xaml
index 88f9c0ea15..581cbaf80a 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ComboBoxItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ComboBoxItem.xaml
@@ -1,85 +1,86 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Design.PreviewWith>
-      <Border Padding="20">
-        <Border Background="{DynamicResource ComboBoxDropDownBackground}" BorderBrush="{DynamicResource ComboBoxDropDownBorderBrush}" BorderThickness="{DynamicResource ComboBoxDropdownBorderThickness}" Margin="0,-1,0,-1" Padding="{DynamicResource ComboBoxDropdownBorderPadding}" CornerRadius="{DynamicResource OverlayCornerRadius}">
-          <StackPanel HorizontalAlignment="Stretch">
-            <ComboBoxItem>Item 1</ComboBoxItem>
-            <ComboBoxItem>Item 2 long</ComboBoxItem>
-            <ComboBoxItem IsSelected="True">Item 3</ComboBoxItem>
-            <ComboBoxItem IsEnabled="False">Item 4</ComboBoxItem>
-          </StackPanel>
-        </Border>
+  <Design.PreviewWith>
+    <Border Padding="20">
+      <Border Background="{DynamicResource ComboBoxDropDownBackground}" BorderBrush="{DynamicResource ComboBoxDropDownBorderBrush}" BorderThickness="{DynamicResource ComboBoxDropdownBorderThickness}" Margin="0,-1,0,-1" Padding="{DynamicResource ComboBoxDropdownBorderPadding}" CornerRadius="{DynamicResource OverlayCornerRadius}">
+        <StackPanel HorizontalAlignment="Stretch">
+          <ComboBoxItem>Item 1</ComboBoxItem>
+          <ComboBoxItem>Item 2 long</ComboBoxItem>
+          <ComboBoxItem IsSelected="True">Item 3</ComboBoxItem>
+          <ComboBoxItem IsEnabled="False">Item 4</ComboBoxItem>
+          <ComboBoxItem IsSelected="True" IsEnabled="False">Item 5</ComboBoxItem>
+        </StackPanel>
       </Border>
-    </Design.PreviewWith>
-  
-    <ControlTheme x:Key="{x:Type ComboBoxItem}" TargetType="ComboBoxItem">
-      <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForeground}" />
-      <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackground}" />
-      <Setter Property="Padding" Value="{DynamicResource ComboBoxItemThemePadding}" />
-      <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-      <Setter Property="Template">
-        <ControlTemplate>
-          <ContentPresenter Name="PART_ContentPresenter"
-                            Foreground="{TemplateBinding Foreground}"
-                            Background="{TemplateBinding Background}" 
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding CornerRadius}"
-                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                            Content="{TemplateBinding Content}" 
-                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                            Padding="{TemplateBinding Padding}" />
-        </ControlTemplate>
-      </Setter>
-      
-      <!--  PointerOver state  -->
-      <Style Selector="^:pointerover /template/ ContentPresenter">
-        <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundPointerOver}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushPointerOver}" />
-        <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForegroundPointerOver}" />
+    </Border>
+  </Design.PreviewWith>
+
+  <ControlTheme x:Key="{x:Type ComboBoxItem}" TargetType="ComboBoxItem">
+    <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForeground}" />
+    <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackground}" />
+    <Setter Property="Padding" Value="{DynamicResource ComboBoxItemThemePadding}" />
+    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ContentPresenter Name="PART_ContentPresenter"
+                          Foreground="{TemplateBinding Foreground}"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          Content="{TemplateBinding Content}"
+                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                          Padding="{TemplateBinding Padding}" />
+      </ControlTemplate>
+    </Setter>
+
+    <!--  PointerOver state  -->
+    <Style Selector="^:pointerover /template/ ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundPointerOver}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushPointerOver}" />
+      <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForegroundPointerOver}" />
+    </Style>
+
+    <!--  Disabled state  -->
+    <Style Selector="^:disabled /template/ ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundDisabled}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushDisabled}" />
+      <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForegroundDisabled}" />
+    </Style>
+
+    <!--  Pressed state  -->
+    <Style Selector="^:pressed /template/ ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundPressed}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushPressed}" />
+      <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForegroundPressed}" />
+    </Style>
+
+    <!--  Selected state  -->
+    <Style Selector="^:selected">
+      <Style Selector="^ /template/ ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundSelected}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushSelected}" />
+        <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForegroundSelected}" />
       </Style>
-      
-      <!--  Disabled state  -->
+      <!--  Selected Disabled state  -->
       <Style Selector="^:disabled /template/ ContentPresenter">
-        <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundDisabled}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushDisabled}" />
-        <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForegroundDisabled}" />
+        <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundSelectedDisabled}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushSelectedDisabled}" />
+        <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForegroundSelectedDisabled}" />
       </Style>
-      
-      <!--  Pressed state  -->
-      <Style Selector="^:pressed /template/ ContentPresenter">
-        <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundPressed}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushPressed}" />
-        <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForegroundPressed}" />
+      <!--  Selected PointerOver state  -->
+      <Style Selector="^:pointerover /template/ ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundSelectedPointerOver}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushSelectedPointerOver}" />
+        <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForegroundSelectedPointerOver}" />
       </Style>
-
-      <!--  Selected state  -->
-      <Style Selector="^:selected">
-        <Style Selector="^ /template/ ContentPresenter">
-          <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundSelected}" />
-          <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushSelected}" />
-          <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForegroundSelected}" />
-        </Style>
-        <!--  Selected Disabled state  -->
-        <Style Selector="^:disabled /template/ ContentPresenter">
-          <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundSelectedDisabled}" />
-          <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushSelectedDisabled}" />
-          <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForegroundSelectedDisabled}" />
-        </Style>
-        <!--  Selected PointerOver state  -->
-        <Style Selector="^:pointerover /template/ ContentPresenter">
-          <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundSelectedPointerOver}" />
-          <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushSelectedPointerOver}" />
-          <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForegroundSelectedPointerOver}" />
-        </Style>
-        <!--  Selected Pressed state  -->
-        <Style Selector="^:pressed /template/ ContentPresenter">
-          <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundSelectedPressed}" />
-          <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushSelectedPressed}" />
-          <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForegroundSelectedPressed}" />
-        </Style>
+      <!--  Selected Pressed state  -->
+      <Style Selector="^:pressed /template/ ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource ComboBoxItemBackgroundSelectedPressed}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushSelectedPressed}" />
+        <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemForegroundSelectedPressed}" />
       </Style>
-    </ControlTheme>
+    </Style>
+  </ControlTheme>
 </ResourceDictionary>

From 100978a5bf491b75d89fa0669fcce52a212d021d Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 8 Jul 2022 14:09:41 +0200
Subject: [PATCH 061/240] Formatted ContentControl ControlTheme.

---
 .../Controls/ContentControl.xaml              | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/ContentControl.xaml b/src/Avalonia.Themes.Fluent/Controls/ContentControl.xaml
index 5777603074..4caf156366 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ContentControl.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ContentControl.xaml
@@ -1,19 +1,19 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <ControlTheme x:Key="{x:Type ContentControl}" TargetType="ContentControl">
-      <Setter Property="Template">
-        <ControlTemplate>
-          <ContentPresenter Name="PART_ContentPresenter"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding CornerRadius}"
-                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                            Content="{TemplateBinding Content}"
-                            Padding="{TemplateBinding Padding}"
-                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"/>
-        </ControlTemplate>
-      </Setter>
-    </ControlTheme>
+  <ControlTheme x:Key="{x:Type ContentControl}" TargetType="ContentControl">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ContentPresenter Name="PART_ContentPresenter"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          Content="{TemplateBinding Content}"
+                          Padding="{TemplateBinding Padding}"
+                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"/>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
 </ResourceDictionary>

From e89060fbc3c655340fc254ca26744ab9ddcd3ab9 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 8 Jul 2022 14:18:48 +0200
Subject: [PATCH 062/240] Formatted DataValidationErrors ControlTheme.

---
 .../Controls/DataValidationErrors.xaml        | 198 +++++++++---------
 1 file changed, 99 insertions(+), 99 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml b/src/Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml
index 6ed73148a7..cc55f84d80 100644
--- a/src/Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml
@@ -1,103 +1,103 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui" 
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:sys="using:System" 
+                    xmlns:sys="using:System"
                     x:CompileBindings="True"
                     x:DataType="DataValidationErrors">
-    <Design.PreviewWith>
-      <Border Padding="20">
-        <StackPanel Spacing="20">
-          <TextBox Text="Sample">
-            <DataValidationErrors.Error>
-              <sys:Exception />
-            </DataValidationErrors.Error>
-          </TextBox>
-          <TextBox Text="Sample">
-            <TextBox.Styles>
-              <Style Selector="DataValidationErrors">
-                <Setter Property="Template" Value="{DynamicResource TooltipDataValidationContentTemplate}" />
-                <Setter Property="ErrorTemplate" Value="{DynamicResource TooltipDataValidationErrorTemplate}" />
-              </Style>
-            </TextBox.Styles>
-            <DataValidationErrors.Error>
-              <sys:Exception />
-            </DataValidationErrors.Error>
-          </TextBox>
-        </StackPanel>
-      </Border>
-    </Design.PreviewWith>
-  
-    <ControlTheme x:Key="{x:Type DataValidationErrors}" TargetType="DataValidationErrors">
-      <ControlTheme.Resources>
-        <DataTemplate x:Key="InlineDataValidationErrorTemplate">
-          <ItemsControl Items="{Binding}" x:DataType="DataValidationErrors" Foreground="{DynamicResource SystemControlErrorTextForegroundBrush}">
-            <ItemsControl.Styles>
-              <Style Selector="TextBlock">
-                <Setter Property="TextWrapping" Value="Wrap" />
-              </Style>
-            </ItemsControl.Styles>
-          </ItemsControl>
-        </DataTemplate>
-        <ControlTemplate x:Key="InlineDataValidationContentTemplate" TargetType="DataValidationErrors">
-          <DockPanel LastChildFill="True">
-            <ContentControl x:Name="InlineDataValidationContentControl"
-                            Margin="0,4,0,0" 
-                            Content="{Binding (DataValidationErrors.Errors)}" 
-                            ContentTemplate="{TemplateBinding ErrorTemplate}" 
-                            DataContext="{TemplateBinding Owner}" 
-                            DockPanel.Dock="Bottom"
-                            IsVisible="{Binding (DataValidationErrors.HasErrors)}" />
-            <ContentPresenter Name="PART_ContentPresenter"
-                              Padding="{TemplateBinding Padding}" 
-                              Background="{TemplateBinding Background}"
-                              BorderThickness="{TemplateBinding BorderThickness}" 
-                              CornerRadius="{TemplateBinding CornerRadius}"
-                              Content="{TemplateBinding Content}" 
-                              ContentTemplate="{TemplateBinding ContentTemplate}" />
-          </DockPanel>
-        </ControlTemplate>
-        
-        <DataTemplate x:DataType="DataValidationErrors" x:Key="TooltipDataValidationErrorTemplate">
-          <Panel Name="PART_InlineErrorTemplatePanel" Background="Transparent">
-            <Panel.Styles>
-              <Style Selector="Panel#PART_InlineErrorTemplatePanel">
-                <Setter Property="Margin" Value="8,0" />
-              </Style>
-              <Style Selector="Panel#PART_InlineErrorTemplatePanel ToolTip">
-                <Setter Property="BorderBrush" Value="{DynamicResource SystemControlErrorTextForegroundBrush}" />
-              </Style>
-              <Style Selector="Panel#PART_InlineErrorTemplatePanel ToolTip TextBlock">
-                <Setter Property="TextWrapping" Value="Wrap" />
-              </Style>
-            </Panel.Styles>
-            <ToolTip.Tip>
-              <ItemsControl Items="{Binding}" />
-            </ToolTip.Tip>
-            <Path Width="14"
-                  Height="14"
-                  Data="M14,7 A7,7 0 0,0 0,7 M0,7 A7,7 0 1,0 14,7 M7,3l0,5 M7,9l0,2"
-                  Stroke="{DynamicResource SystemControlErrorTextForegroundBrush}"
-                  StrokeThickness="2" />
-          </Panel>
-        </DataTemplate>
-        <ControlTemplate x:Key="TooltipDataValidationContentTemplate" TargetType="DataValidationErrors">
-          <DockPanel LastChildFill="True">
-            <ContentControl Content="{Binding (DataValidationErrors.Errors)}"
-                            ContentTemplate="{TemplateBinding ErrorTemplate}" 
-                            DataContext="{TemplateBinding Owner}" 
-                            DockPanel.Dock="Right" 
-                            IsVisible="{Binding (DataValidationErrors.HasErrors)}" />
-            <ContentPresenter Name="PART_ContentPresenter"
-                              Padding="{TemplateBinding Padding}"
-                              Background="{TemplateBinding Background}"
-                              BorderBrush="{TemplateBinding BorderBrush}" 
-                              BorderThickness="{TemplateBinding BorderThickness}" 
-                              CornerRadius="{TemplateBinding CornerRadius}" 
-                              Content="{TemplateBinding Content}"
-                              ContentTemplate="{TemplateBinding ContentTemplate}" />
-          </DockPanel>
-        </ControlTemplate>
-      </ControlTheme.Resources>
-      <Setter Property="Template" Value="{StaticResource InlineDataValidationContentTemplate}" />
-      <Setter Property="ErrorTemplate" Value="{StaticResource InlineDataValidationErrorTemplate}" />
-    </ControlTheme>
+  <Design.PreviewWith>
+    <Border Padding="20">
+      <StackPanel Spacing="20">
+        <TextBox Text="Sample">
+          <DataValidationErrors.Error>
+            <sys:Exception />
+          </DataValidationErrors.Error>
+        </TextBox>
+        <TextBox Text="Sample">
+          <TextBox.Styles>
+            <Style Selector="DataValidationErrors">
+              <Setter Property="Template" Value="{DynamicResource TooltipDataValidationContentTemplate}" />
+              <Setter Property="ErrorTemplate" Value="{DynamicResource TooltipDataValidationErrorTemplate}" />
+            </Style>
+          </TextBox.Styles>
+          <DataValidationErrors.Error>
+            <sys:Exception />
+          </DataValidationErrors.Error>
+        </TextBox>
+      </StackPanel>
+    </Border>
+  </Design.PreviewWith>
+
+  <ControlTheme x:Key="{x:Type DataValidationErrors}" TargetType="DataValidationErrors">
+    <ControlTheme.Resources>
+      <DataTemplate x:Key="InlineDataValidationErrorTemplate">
+        <ItemsControl Items="{Binding}" x:DataType="DataValidationErrors" Foreground="{DynamicResource SystemControlErrorTextForegroundBrush}">
+          <ItemsControl.Styles>
+            <Style Selector="TextBlock">
+              <Setter Property="TextWrapping" Value="Wrap" />
+            </Style>
+          </ItemsControl.Styles>
+        </ItemsControl>
+      </DataTemplate>
+      <ControlTemplate x:Key="InlineDataValidationContentTemplate" TargetType="DataValidationErrors">
+        <DockPanel LastChildFill="True">
+          <ContentControl x:Name="InlineDataValidationContentControl"
+                          Margin="0,4,0,0"
+                          Content="{Binding (DataValidationErrors.Errors)}"
+                          ContentTemplate="{TemplateBinding ErrorTemplate}"
+                          DataContext="{TemplateBinding Owner}"
+                          DockPanel.Dock="Bottom"
+                          IsVisible="{Binding (DataValidationErrors.HasErrors)}" />
+          <ContentPresenter Name="PART_ContentPresenter"
+                            Padding="{TemplateBinding Padding}"
+                            Background="{TemplateBinding Background}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{TemplateBinding CornerRadius}"
+                            Content="{TemplateBinding Content}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}" />
+        </DockPanel>
+      </ControlTemplate>
+
+      <DataTemplate x:DataType="DataValidationErrors" x:Key="TooltipDataValidationErrorTemplate">
+        <Panel Name="PART_InlineErrorTemplatePanel" Background="Transparent">
+          <Panel.Styles>
+            <Style Selector="Panel#PART_InlineErrorTemplatePanel">
+              <Setter Property="Margin" Value="8,0" />
+            </Style>
+            <Style Selector="Panel#PART_InlineErrorTemplatePanel ToolTip">
+              <Setter Property="BorderBrush" Value="{DynamicResource SystemControlErrorTextForegroundBrush}" />
+            </Style>
+            <Style Selector="Panel#PART_InlineErrorTemplatePanel ToolTip TextBlock">
+              <Setter Property="TextWrapping" Value="Wrap" />
+            </Style>
+          </Panel.Styles>
+          <ToolTip.Tip>
+            <ItemsControl Items="{Binding}" />
+          </ToolTip.Tip>
+          <Path Width="14"
+                Height="14"
+                Data="M14,7 A7,7 0 0,0 0,7 M0,7 A7,7 0 1,0 14,7 M7,3l0,5 M7,9l0,2"
+                Stroke="{DynamicResource SystemControlErrorTextForegroundBrush}"
+                StrokeThickness="2" />
+        </Panel>
+      </DataTemplate>
+      <ControlTemplate x:Key="TooltipDataValidationContentTemplate" TargetType="DataValidationErrors">
+        <DockPanel LastChildFill="True">
+          <ContentControl Content="{Binding (DataValidationErrors.Errors)}"
+                          ContentTemplate="{TemplateBinding ErrorTemplate}"
+                          DataContext="{TemplateBinding Owner}"
+                          DockPanel.Dock="Right"
+                          IsVisible="{Binding (DataValidationErrors.HasErrors)}" />
+          <ContentPresenter Name="PART_ContentPresenter"
+                            Padding="{TemplateBinding Padding}"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{TemplateBinding CornerRadius}"
+                            Content="{TemplateBinding Content}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}" />
+        </DockPanel>
+      </ControlTemplate>
+    </ControlTheme.Resources>
+    <Setter Property="Template" Value="{StaticResource InlineDataValidationContentTemplate}" />
+    <Setter Property="ErrorTemplate" Value="{StaticResource InlineDataValidationErrorTemplate}" />
+  </ControlTheme>
 </ResourceDictionary>

From ebe9d6b086c3da15678aea2408412df18ce520e7 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 8 Jul 2022 14:29:30 +0200
Subject: [PATCH 063/240] Tidied up DropDownButton ControlTheme.

---
 .../Controls/DropDownButton.xaml               | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/DropDownButton.xaml b/src/Avalonia.Themes.Fluent/Controls/DropDownButton.xaml
index 3206cb8cb1..96fd575f4f 100644
--- a/src/Avalonia.Themes.Fluent/Controls/DropDownButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/DropDownButton.xaml
@@ -57,26 +57,26 @@
                           Margin="0,0,10,0"
                           Data="M1939 486L2029 576L1024 1581L19 576L109 486L1024 1401L1939 486Z"
                           HorizontalAlignment="Right"
-                          VerticalAlignment="Center" />
+                          VerticalAlignment="Center"
+                          Foreground="{DynamicResource ComboBoxDropDownGlyphForeground}"/>
               </Grid>
             </Border>
           </ControlTemplate>
         </Setter.Value>
       </Setter>
       
-      <!--  Normal State  -->
-      <Style Selector="^ /template/ PathIcon#DropDownGlyph">
-        <Setter Property="Foreground" Value="{DynamicResource ComboBoxDropDownGlyphForeground}" />
-      </Style>
-      
       <!--  PointerOver State  -->
       <Style Selector="^:pointerover /template/ Border#RootBorder">
         <Setter Property="Background" Value="{DynamicResource ButtonBackgroundPointerOver}" />
         <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushPointerOver}" />
         <Setter Property="TextElement.Foreground" Value="{DynamicResource ButtonForegroundPointerOver}" />
       </Style>
-      
+
       <!--  Pressed State  -->
+      <Style Selector="^:pressed">
+        <Setter Property="RenderTransform" Value="scale(0.98)" />
+      </Style>
+
       <Style Selector="^:pressed /template/ Border#RootBorder">
         <Setter Property="Background" Value="{DynamicResource ButtonBackgroundPressed}" />
         <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushPressed}" />
@@ -92,10 +92,6 @@
       <Style Selector="^:disabled /template/ PathIcon#DropDownGlyph">
         <Setter Property="Foreground" Value="{DynamicResource ButtonForegroundDisabled}" />
       </Style>
-
-      <Style Selector="^:pressed">
-        <Setter Property="RenderTransform" Value="scale(0.98)" />
-      </Style>
     </ControlTheme>
   
 </ResourceDictionary>

From 6f797a9c56f643cc724521e75d5ba9ba9a3882bf Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 8 Jul 2022 14:30:04 +0200
Subject: [PATCH 064/240] Tidied up EmbeddableControlRoot ControlTheme.

---
 .../Controls/EmbeddableControlRoot.xaml       | 39 +++++++++----------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/EmbeddableControlRoot.xaml b/src/Avalonia.Themes.Fluent/Controls/EmbeddableControlRoot.xaml
index 89eaec70ad..f8b4854553 100644
--- a/src/Avalonia.Themes.Fluent/Controls/EmbeddableControlRoot.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/EmbeddableControlRoot.xaml
@@ -1,23 +1,22 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <ControlTheme x:Key="{x:Type EmbeddableControlRoot}" TargetType="EmbeddableControlRoot">
-      <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundAltHighBrush}"/>
-      <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
-      <Setter Property="Template">
-        <ControlTemplate>
-          <Panel>
-            <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
-            <Border Background="{TemplateBinding Background}">
-              <VisualLayerManager>
-                <ContentPresenter Name="PART_ContentPresenter"
-                                  ContentTemplate="{TemplateBinding ContentTemplate}"
-                                  Content="{TemplateBinding Content}"
-                                  Margin="{TemplateBinding Padding}"/>
-              </VisualLayerManager>
-            </Border>
-          </Panel>
-        </ControlTemplate>
-      </Setter>
-    </ControlTheme>
-
+  <ControlTheme x:Key="{x:Type EmbeddableControlRoot}" TargetType="EmbeddableControlRoot">
+    <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundAltHighBrush}"/>
+    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Panel>
+          <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
+          <Border Background="{TemplateBinding Background}">
+            <VisualLayerManager>
+              <ContentPresenter Name="PART_ContentPresenter"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                Content="{TemplateBinding Content}"
+                                Margin="{TemplateBinding Padding}"/>
+            </VisualLayerManager>
+          </Border>
+        </Panel>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
 </ResourceDictionary>

From 4f3fafc9dfa6835ed1707715eabd0665dda9bb52 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 8 Jul 2022 14:56:36 +0200
Subject: [PATCH 065/240] Tweaked Expander ControlTheme.

And added "Rounded" option to ControlCatalog for testing.
---
 .../ControlCatalog/Pages/ExpanderPage.xaml    | 15 ++--
 .../ControlCatalog/Pages/ExpanderPage.xaml.cs |  2 +
 .../ViewModels/ExpanderPageViewModel.cs       | 27 +++++++
 .../Controls/Expander.xaml                    | 71 +++++++++----------
 4 files changed, 72 insertions(+), 43 deletions(-)
 create mode 100644 samples/ControlCatalog/ViewModels/ExpanderPageViewModel.cs

diff --git a/samples/ControlCatalog/Pages/ExpanderPage.xaml b/samples/ControlCatalog/Pages/ExpanderPage.xaml
index cef473af04..f9ae1c7a3c 100644
--- a/samples/ControlCatalog/Pages/ExpanderPage.xaml
+++ b/samples/ControlCatalog/Pages/ExpanderPage.xaml
@@ -8,26 +8,31 @@
                 Margin="0,16,0,0"
                 HorizontalAlignment="Center"
                 Spacing="16">
-      <Expander Header="Expand Up" ExpandDirection="Up">
+      <Expander Header="Expand Up" ExpandDirection="Up"
+                CornerRadius="{Binding CornerRadius}">
         <StackPanel>
           <TextBlock>Expanded content</TextBlock>
         </StackPanel>
       </Expander>
-      <Expander Header="Expand Down" ExpandDirection="Down">
+      <Expander Header="Expand Down" ExpandDirection="Down"
+                CornerRadius="{Binding CornerRadius}">
         <StackPanel>
           <TextBlock>Expanded content</TextBlock>
         </StackPanel>
       </Expander>
-      <Expander Header="Expand Left" ExpandDirection="Left">
+      <Expander Header="Expand Left" ExpandDirection="Left"
+                CornerRadius="{Binding CornerRadius}">
         <StackPanel>
           <TextBlock>Expanded content</TextBlock>
         </StackPanel>
       </Expander>
-      <Expander Header="Expand Right" ExpandDirection="Right">
+      <Expander Header="Expand Right" ExpandDirection="Right"
+                CornerRadius="{Binding CornerRadius}">
         <StackPanel>
           <TextBlock>Expanded content</TextBlock>
         </StackPanel>
       </Expander>
-    </StackPanel>    
+      <CheckBox IsChecked="{Binding Rounded}">Rounded</CheckBox>
+    </StackPanel>
   </StackPanel>
 </UserControl>
diff --git a/samples/ControlCatalog/Pages/ExpanderPage.xaml.cs b/samples/ControlCatalog/Pages/ExpanderPage.xaml.cs
index 52166d1a5f..e8a080899a 100644
--- a/samples/ControlCatalog/Pages/ExpanderPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ExpanderPage.xaml.cs
@@ -1,5 +1,6 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
+using ControlCatalog.ViewModels;
 
 namespace ControlCatalog.Pages
 {
@@ -8,6 +9,7 @@ namespace ControlCatalog.Pages
         public ExpanderPage()
         {
             this.InitializeComponent();
+            DataContext = new ExpanderPageViewModel();
         }
 
         private void InitializeComponent()
diff --git a/samples/ControlCatalog/ViewModels/ExpanderPageViewModel.cs b/samples/ControlCatalog/ViewModels/ExpanderPageViewModel.cs
new file mode 100644
index 0000000000..18511a6071
--- /dev/null
+++ b/samples/ControlCatalog/ViewModels/ExpanderPageViewModel.cs
@@ -0,0 +1,27 @@
+using Avalonia;
+using MiniMvvm;
+
+namespace ControlCatalog.ViewModels
+{
+    public class ExpanderPageViewModel : ViewModelBase
+    {
+        private CornerRadius _cornerRadius;
+        private bool _rounded;
+
+        public CornerRadius CornerRadius
+        {
+            get => _cornerRadius;
+            private set => RaiseAndSetIfChanged(ref _cornerRadius, value);
+        }
+
+        public bool Rounded
+        {
+            get => _rounded;
+            set
+            {
+                if (RaiseAndSetIfChanged(ref _rounded, value))
+                    CornerRadius = _rounded ? new CornerRadius(25) : default;
+            }
+        }
+    }
+}
diff --git a/src/Avalonia.Themes.Fluent/Controls/Expander.xaml b/src/Avalonia.Themes.Fluent/Controls/Expander.xaml
index 36f6008782..7d5bb48333 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Expander.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Expander.xaml
@@ -3,29 +3,39 @@
                     x:CompileBindings="True">
   <Design.PreviewWith>
     <Border Padding="20">
-      <StackPanel Orientation="Vertical" Spacing="20" Width="350">
-        <Expander ExpandDirection="Up" Header="Expand Up" CornerRadius="25">
-          <Expander.Header>
-            <Grid ColumnDefinitions="*, Auto">
-              <TextBlock Grid.Column="0" Text="Expand" />
-              <TextBlock Grid.Column="1" Text="Up" />
-            </Grid>
-          </Expander.Header>
+      <StackPanel Orientation="Vertical" Spacing="20" Width="350" Height="600">
+        <Expander ExpandDirection="Up" Header="Expand Up">
           <StackPanel>
             <TextBlock>Expanded content</TextBlock>
           </StackPanel>
         </Expander>
-        <Expander ExpandDirection="Down" Header="Expand Down" CornerRadius="25">
+        <Expander ExpandDirection="Down" Header="Expand Down">
           <StackPanel>
             <TextBlock>Expanded content</TextBlock>
           </StackPanel>
         </Expander>
-        <Expander ExpandDirection="Left" Header="Expand Left" CornerRadius="25">
+        <Expander ExpandDirection="Left" Header="Expand Left">
           <StackPanel>
             <TextBlock>Expanded content</TextBlock>
           </StackPanel>
         </Expander>
-        <Expander ExpandDirection="Right" Header="Expand Right" CornerRadius="25">
+        <Expander ExpandDirection="Right" Header="Expand Right">
+          <StackPanel>
+            <TextBlock>Expanded content</TextBlock>
+          </StackPanel>
+        </Expander>
+        <Expander ExpandDirection="Up">
+          <Expander.Header>
+            <Grid ColumnDefinitions="*, Auto">
+              <TextBlock Grid.Column="0" Text="Control" />
+              <TextBlock Grid.Column="1" Text="Header" />
+            </Grid>
+          </Expander.Header>
+          <StackPanel>
+            <TextBlock>Expanded content</TextBlock>
+          </StackPanel>
+        </Expander>
+        <Expander ExpandDirection="Up" Header="Rounded" CornerRadius="25">
           <StackPanel>
             <TextBlock>Expanded content</TextBlock>
           </StackPanel>
@@ -36,25 +46,19 @@
 
   <Thickness x:Key="ExpanderHeaderPadding">16</Thickness>
   <Thickness x:Key="ExpanderContentPadding">16</Thickness>
-
   <Thickness x:Key="ExpanderBorderThickness">1</Thickness>
-
   <Thickness x:Key="ExpanderDropdownLeftBorderThickness">1,1,0,1</Thickness>
   <Thickness x:Key="ExpanderDropdownUpBorderThickness">1,1,1,0</Thickness>
   <Thickness x:Key="ExpanderDropdownRightBorderThickness">0,1,1,1</Thickness>
   <Thickness x:Key="ExpanderDropdownDownBorderThickness">1,0,1,1</Thickness>
-
   <SolidColorBrush x:Key="ExpanderBackground" Color="{DynamicResource SystemAltMediumHighColor}" />
   <SolidColorBrush x:Key="ExpanderBorderBrush" Color="{DynamicResource SystemBaseLowColor}" />
-
   <SolidColorBrush x:Key="ExpanderDropDownBackground" Color="{DynamicResource SystemChromeMediumLowColor}" />
   <SolidColorBrush x:Key="ExpanderDropDownBorderBrush" Color="{DynamicResource SystemBaseLowColor}" />
-
   <SolidColorBrush x:Key="ExpanderForeground" Color="{DynamicResource SystemBaseHighColor}" />
-
   <SolidColorBrush x:Key="ExpanderChevronForeground" Color="{DynamicResource SystemBaseHighColor}" />
 
-  <ControlTheme x:Key="FluentExpanderToggleButtonTheme" TargetType="ToggleButton" BasedOn="{StaticResource {x:Type ToggleButton}}">
+  <ControlTheme x:Key="FluentExpanderToggleButtonTheme" TargetType="ToggleButton">
     <Setter Property="Template">
       <ControlTemplate>
         <Border x:Name="ToggleButtonBackground"
@@ -94,7 +98,7 @@
         </Border>
       </ControlTemplate>
     </Setter>
-    <Style Selector="^[Tag=Expanded] /template/ Border#ExpandCollapseChevronBorder">
+    <Style Selector="^:checked /template/ Border#ExpandCollapseChevronBorder">
       <Style.Animations>
         <Animation FillMode="Both" Duration="0:0:0.0625">
           <KeyFrame Cue="100%">
@@ -103,7 +107,7 @@
         </Animation>
       </Style.Animations>
     </Style>
-    <Style Selector="^[Tag=NotExpanded] /template/ Border#ExpandCollapseChevronBorder">
+    <Style Selector="^:not(:checked) /template/ Border#ExpandCollapseChevronBorder">
       <Style.Animations>
         <Animation FillMode="Both" Duration="0:0:0.0625">
           <KeyFrame Cue="0%">
@@ -173,7 +177,7 @@
         </DockPanel>
       </ControlTemplate>
     </Setter>
- 
+
     <Style Selector="^ /template/ ToggleButton#ExpanderHeader:pressed">
       <Setter Property="RenderTransform" Value="{x:Null}" />
     </Style>
@@ -186,28 +190,28 @@
       <Setter Property="CornerRadius" Value="{Binding $parent[Expander].CornerRadius}" />
     </Style>
     <Style Selector="^:expanded:up /template/ ToggleButton#ExpanderHeader">
-      <Setter Property="CornerRadius" Value="{Binding $parent[Expander].CornerRadius, Converter={StaticResource BottomCornerRadiusFilterConverter}}" />
+      <Setter Property="CornerRadius" Value="{TemplateBinding CornerRadius, Converter={StaticResource BottomCornerRadiusFilterConverter}}" />
     </Style>
     <Style Selector="^:expanded:up /template/ Border#ExpanderContent">
-      <Setter Property="CornerRadius" Value="{Binding $parent[Expander].CornerRadius, Converter={StaticResource TopCornerRadiusFilterConverter}}" />
+      <Setter Property="CornerRadius" Value="{TemplateBinding CornerRadius, Converter={StaticResource TopCornerRadiusFilterConverter}}" />
     </Style>
     <Style Selector="^:expanded:down /template/ ToggleButton#ExpanderHeader">
-      <Setter Property="CornerRadius" Value="{Binding $parent[Expander].CornerRadius, Converter={StaticResource TopCornerRadiusFilterConverter}}" />
+      <Setter Property="CornerRadius" Value="{TemplateBinding CornerRadius, Converter={StaticResource TopCornerRadiusFilterConverter}}" />
     </Style>
     <Style Selector="^:expanded:down /template/ Border#ExpanderContent">
-      <Setter Property="CornerRadius" Value="{Binding $parent[Expander].CornerRadius, Converter={StaticResource BottomCornerRadiusFilterConverter}}" />
+      <Setter Property="CornerRadius" Value="{TemplateBinding CornerRadius, Converter={StaticResource BottomCornerRadiusFilterConverter}}" />
     </Style>
     <Style Selector="^:expanded:left /template/ ToggleButton#ExpanderHeader">
-      <Setter Property="CornerRadius" Value="{Binding $parent[Expander].CornerRadius, Converter={StaticResource RightCornerRadiusFilterConverter}}" />
+      <Setter Property="CornerRadius" Value="{TemplateBinding CornerRadius, Converter={StaticResource RightCornerRadiusFilterConverter}}" />
     </Style>
     <Style Selector="^:expanded:left /template/ Border#ExpanderContent">
-      <Setter Property="CornerRadius" Value="{Binding $parent[Expander].CornerRadius, Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
+      <Setter Property="CornerRadius" Value="{TemplateBinding CornerRadius, Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
     </Style>
     <Style Selector="^:expanded:right /template/ ToggleButton#ExpanderHeader">
-      <Setter Property="CornerRadius" Value="{Binding $parent[Expander].CornerRadius, Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
+      <Setter Property="CornerRadius" Value="{TemplateBinding CornerRadius, Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
     </Style>
     <Style Selector="^:expanded:right /template/ Border#ExpanderContent">
-      <Setter Property="CornerRadius" Value="{Binding $parent[Expander].CornerRadius, Converter={StaticResource RightCornerRadiusFilterConverter}}" />
+      <Setter Property="CornerRadius" Value="{TemplateBinding CornerRadius, Converter={StaticResource RightCornerRadiusFilterConverter}}" />
     </Style>
 
     <Style Selector="^:left /template/ ToggleButton#ExpanderHeader">
@@ -223,14 +227,6 @@
       <Setter Property="DockPanel.Dock" Value="Top" />
     </Style>
 
-
-    <Style Selector="^:expanded /template/ ToggleButton#ExpanderHeader">
-      <Setter Property="Tag" Value="Expanded"/>
-    </Style>
-    <Style Selector="^:not(:expanded) /template/ ToggleButton#ExpanderHeader">
-      <Setter Property="Tag" Value="NotExpanded"/>
-    </Style>
-
     <Style Selector="^:left /template/ ToggleButton#ExpanderHeader">
       <Setter Property="Theme" Value="{StaticResource FluentExpanderToggleButtonLeftTheme}" />
     </Style>
@@ -244,7 +240,6 @@
       <Setter Property="Theme" Value="{StaticResource FluentExpanderToggleButtonDownTheme}" />
     </Style>
 
-
     <Style Selector="^:left /template/ Border#ExpanderContent">
       <Setter Property="BorderThickness" Value="{DynamicResource ExpanderDropdownLeftBorderThickness}" />
     </Style>

From c246d76a206df3b8325006d88ef8aa7891772e1a Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 8 Jul 2022 14:58:15 +0200
Subject: [PATCH 066/240] Formated ItemsControl ControlTheme.

---
 .../Controls/ItemsControl.xaml                | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/ItemsControl.xaml b/src/Avalonia.Themes.Fluent/Controls/ItemsControl.xaml
index b8d7c2c4ef..fc85b7b9ff 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ItemsControl.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ItemsControl.xaml
@@ -1,19 +1,19 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <ControlTheme x:Key="{x:Type ItemsControl}" TargetType="ItemsControl">
-      <Setter Property="Template">
-        <ControlTemplate>
-          <Border Background="{TemplateBinding Background}"
-                  BorderBrush="{TemplateBinding BorderBrush}"
-                  BorderThickness="{TemplateBinding BorderThickness}"
-                  CornerRadius="{TemplateBinding CornerRadius}"
-                  Padding="{TemplateBinding Padding}">
-            <ItemsPresenter Name="PART_ItemsPresenter"
-                            Items="{TemplateBinding Items}"
-                            ItemsPanel="{TemplateBinding ItemsPanel}"
-                            ItemTemplate="{TemplateBinding ItemTemplate}"/>
-          </Border>
-        </ControlTemplate>
-      </Setter>
-    </ControlTheme>
+  <ControlTheme x:Key="{x:Type ItemsControl}" TargetType="ItemsControl">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}"
+                Padding="{TemplateBinding Padding}">
+          <ItemsPresenter Name="PART_ItemsPresenter"
+                          Items="{TemplateBinding Items}"
+                          ItemsPanel="{TemplateBinding ItemsPanel}"
+                          ItemTemplate="{TemplateBinding ItemTemplate}"/>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
 </ResourceDictionary>

From 4d73e2b3a946fa65db1df2c7b7c222e0c1b6410a Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 8 Jul 2022 14:58:40 +0200
Subject: [PATCH 067/240] Formatted Label ControlTheme.

---
 .../Controls/Label.xaml                       | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/Label.xaml b/src/Avalonia.Themes.Fluent/Controls/Label.xaml
index ad57239648..ff6909ee87 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Label.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Label.xaml
@@ -1,22 +1,22 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-    <ControlTheme x:Key="{x:Type Label}" TargetType="Label">
-      <Setter Property="Padding" Value="3"/>
-      <Setter Property="Template">
-        <ControlTemplate>
-          <ContentPresenter Name="PART_ContentPresenter"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding CornerRadius}"
-                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                            Content="{TemplateBinding Content}"
-                            Padding="{TemplateBinding Padding}"
-                            RecognizesAccessKey="True"
-                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"/>
-        </ControlTemplate>
-      </Setter>
-    </ControlTheme>
+  <ControlTheme x:Key="{x:Type Label}" TargetType="Label">
+    <Setter Property="Padding" Value="3"/>
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ContentPresenter Name="PART_ContentPresenter"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          Content="{TemplateBinding Content}"
+                          Padding="{TemplateBinding Padding}"
+                          RecognizesAccessKey="True"
+                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"/>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
 </ResourceDictionary>

From 901026a187d03fa020c7c503efb443f855cc32f8 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 8 Jul 2022 15:01:03 +0200
Subject: [PATCH 068/240] Formatted ListBox/Item ControlTheme.

---
 .../Controls/ListBox.xaml                     |  88 ++++++------
 .../Controls/ListBoxItem.xaml                 | 132 +++++++++---------
 2 files changed, 110 insertions(+), 110 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/ListBox.xaml b/src/Avalonia.Themes.Fluent/Controls/ListBox.xaml
index b1d4b77a3f..c17dc65cca 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ListBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ListBox.xaml
@@ -1,47 +1,47 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Design.PreviewWith>
-      <Border Padding="20">
-        <ListBox>
-          <ListBoxItem>Test</ListBoxItem>
-          <ListBoxItem>Test</ListBoxItem>
-          <ListBoxItem>Test</ListBoxItem>
-          <ListBoxItem>Test</ListBoxItem>
-        </ListBox>
-      </Border>
-    </Design.PreviewWith>
-  
-    <ControlTheme x:Key="{x:Type ListBox}" TargetType="ListBox">
-      <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}" />
-      <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}" />
-      <Setter Property="BorderBrush" Value="{DynamicResource SystemControlForegroundBaseHighBrush}" />
-      <Setter Property="BorderThickness" Value="{DynamicResource ListBoxBorderThemeThickness}" />
-      <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
-      <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-      <Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
-      <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-      <Setter Property="Template">
-        <ControlTemplate>
-          <Border Name="border"
-                  ClipToBounds="{TemplateBinding ClipToBounds}" 
-                  Background="{TemplateBinding Background}" 
-                  BorderBrush="{TemplateBinding BorderBrush}"
-                  BorderThickness="{TemplateBinding BorderThickness}"
-                  CornerRadius="{TemplateBinding CornerRadius}">
-            <ScrollViewer Name="PART_ScrollViewer" 
-                          HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}" 
-                          VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}"
-                          IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
-                          AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}">
-              <ItemsPresenter Name="PART_ItemsPresenter" 
-                              Items="{TemplateBinding Items}" 
-                              ItemsPanel="{TemplateBinding ItemsPanel}"
-                              ItemTemplate="{TemplateBinding ItemTemplate}" 
-                              Margin="{TemplateBinding Padding}"
-                              VirtualizationMode="{TemplateBinding VirtualizationMode}" />
-            </ScrollViewer>
-          </Border>
-        </ControlTemplate>
-      </Setter>
-    </ControlTheme>
+  <Design.PreviewWith>
+    <Border Padding="20">
+      <ListBox>
+        <ListBoxItem>Test</ListBoxItem>
+        <ListBoxItem>Test</ListBoxItem>
+        <ListBoxItem>Test</ListBoxItem>
+        <ListBoxItem>Test</ListBoxItem>
+      </ListBox>
+    </Border>
+  </Design.PreviewWith>
+
+  <ControlTheme x:Key="{x:Type ListBox}" TargetType="ListBox">
+    <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}" />
+    <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource SystemControlForegroundBaseHighBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource ListBoxBorderThemeThickness}" />
+    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
+    <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+    <Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
+    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Name="border"
+                ClipToBounds="{TemplateBinding ClipToBounds}"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <ScrollViewer Name="PART_ScrollViewer"
+                        HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
+                        VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}"
+                        IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
+                        AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}">
+            <ItemsPresenter Name="PART_ItemsPresenter"
+                            Items="{TemplateBinding Items}"
+                            ItemsPanel="{TemplateBinding ItemsPanel}"
+                            ItemTemplate="{TemplateBinding ItemTemplate}"
+                            Margin="{TemplateBinding Padding}"
+                            VirtualizationMode="{TemplateBinding VirtualizationMode}" />
+          </ScrollViewer>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
 </ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ListBoxItem.xaml b/src/Avalonia.Themes.Fluent/Controls/ListBoxItem.xaml
index c00e920f75..fc1d0c5ff1 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ListBoxItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ListBoxItem.xaml
@@ -1,79 +1,79 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Design.PreviewWith>
-      <Border Padding="0">
-        <ListBox>
-          <ListBoxItem IsEnabled="False">Disabled</ListBoxItem>
-          <ListBoxItem Background="#66000000"
-                       Padding="20">
-            Test
-          </ListBoxItem>
-          <ListBoxItem>Test</ListBoxItem>
-        </ListBox>
-      </Border>
-    </Design.PreviewWith>
-    <Thickness x:Key="ListBoxItemPadding">12,9,12,12</Thickness>
-    <ControlTheme x:Key="{x:Type ListBoxItem}" TargetType="ListBoxItem">
-      <Setter Property="Background" Value="Transparent" />
-      <Setter Property="Padding" Value="{DynamicResource ListBoxItemPadding}" />
-      <Setter Property="Template">
-        <ControlTemplate>
-          <ContentPresenter Name="PART_ContentPresenter"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding CornerRadius}"
-                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                            Content="{TemplateBinding Content}"
-                            FontWeight="Normal"
-                            FontSize="{DynamicResource ControlContentThemeFontSize}"
-                            Padding="{TemplateBinding Padding}"
-                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" />
-        </ControlTemplate>
-      </Setter>
+  <Design.PreviewWith>
+    <Border Padding="0">
+      <ListBox>
+        <ListBoxItem IsEnabled="False">Disabled</ListBoxItem>
+        <ListBoxItem Background="#66000000"
+                     Padding="20">
+          Test
+        </ListBoxItem>
+        <ListBoxItem>Test</ListBoxItem>
+      </ListBox>
+    </Border>
+  </Design.PreviewWith>
+  <Thickness x:Key="ListBoxItemPadding">12,9,12,12</Thickness>
+  <ControlTheme x:Key="{x:Type ListBoxItem}" TargetType="ListBoxItem">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="Padding" Value="{DynamicResource ListBoxItemPadding}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ContentPresenter Name="PART_ContentPresenter"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          Content="{TemplateBinding Content}"
+                          FontWeight="Normal"
+                          FontSize="{DynamicResource ControlContentThemeFontSize}"
+                          Padding="{TemplateBinding Padding}"
+                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" />
+      </ControlTemplate>
+    </Setter>
 
-      <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
-        <Setter Property="Foreground" Value="{DynamicResource SystemControlDisabledBaseMediumLowBrush}" />
-      </Style>
+    <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Foreground" Value="{DynamicResource SystemControlDisabledBaseMediumLowBrush}" />
+    </Style>
 
-      <!--  PointerOver State  -->
-      <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-        <Setter Property="Background" Value="{DynamicResource SystemControlHighlightListLowBrush}" />
+    <!--  PointerOver State  -->
+    <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource SystemControlHighlightListLowBrush}" />
+      <Setter Property="Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
+    </Style>
+
+    <!--  Pressed State  -->
+    <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource SystemControlHighlightListMediumBrush}" />
+      <Setter Property="Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
+    </Style>
+
+    <!--  Selected State  -->
+    <Style Selector="^:selected">
+
+      <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource SystemControlHighlightListAccentLowBrush}" />
         <Setter Property="Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
       </Style>
 
-      <!--  Pressed State  -->
-      <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
-        <Setter Property="Background" Value="{DynamicResource SystemControlHighlightListMediumBrush}" />
+      <!--  Selected Unfocused State  -->
+      <Style Selector="^:not(:focus) /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource SystemControlHighlightListAccentLowBrush}" />
         <Setter Property="Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
       </Style>
 
-      <!--  Selected State  -->
-      <Style Selector="^:selected">
-
-        <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
-          <Setter Property="Background" Value="{DynamicResource SystemControlHighlightListAccentLowBrush}" />
-          <Setter Property="Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
-        </Style>
-
-        <!--  Selected Unfocused State  -->
-        <Style Selector="^:not(:focus) /template/ ContentPresenter#PART_ContentPresenter">
-          <Setter Property="Background" Value="{DynamicResource SystemControlHighlightListAccentLowBrush}" />
-          <Setter Property="Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
-        </Style>
-
-        <!--  Selected PointerOver State  -->
-        <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-          <Setter Property="Background" Value="{DynamicResource SystemControlHighlightListAccentMediumBrush}" />
-          <Setter Property="Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
-        </Style>
+      <!--  Selected PointerOver State  -->
+      <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource SystemControlHighlightListAccentMediumBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
+      </Style>
 
-        <!--  Selected Pressed State  -->
-        <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
-          <Setter Property="Background" Value="{DynamicResource SystemControlHighlightListAccentHighBrush}" />
-          <Setter Property="Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
-        </Style>
+      <!--  Selected Pressed State  -->
+      <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource SystemControlHighlightListAccentHighBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
       </Style>
-    </ControlTheme>
+    </Style>
+  </ControlTheme>
 </ResourceDictionary>

From 800967c62742ca9934f47d6e68be94095b1241c1 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 8 Jul 2022 15:02:52 +0200
Subject: [PATCH 069/240] Formatted Menu/FlyoutPresenter ControlTheme.

---
 src/Avalonia.Themes.Fluent/Controls/Menu.xaml | 62 ++++++++---------
 .../Controls/MenuFlyoutPresenter.xaml         | 67 ++++++++++---------
 2 files changed, 65 insertions(+), 64 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/Menu.xaml b/src/Avalonia.Themes.Fluent/Controls/Menu.xaml
index d42e413f00..11d21b6b23 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Menu.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Menu.xaml
@@ -1,35 +1,35 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
-                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Design.PreviewWith>
-      <Border Padding="20">
-        <Menu>
-          <MenuItem Header="New" />
-          <MenuItem Header="Open" />
-        </Menu>
-      </Border>
-    </Design.PreviewWith>
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Design.PreviewWith>
+    <Border Padding="20">
+      <Menu>
+        <MenuItem Header="New" />
+        <MenuItem Header="Open" />
+      </Menu>
+    </Border>
+  </Design.PreviewWith>
 
-    <x:Double x:Key="MenuBarHeight">32</x:Double>
+  <x:Double x:Key="MenuBarHeight">32</x:Double>
 
-    <ControlTheme x:Key="{x:Type Menu}" TargetType="Menu">
-      <Setter Property="Background" Value="Transparent" />
-      <Setter Property="Height" Value="{DynamicResource MenuBarHeight}" />
-      <Setter Property="Template">
-        <ControlTemplate>
-          <Border Background="{TemplateBinding Background}"
-                  BorderBrush="{TemplateBinding BorderBrush}"
-                  BorderThickness="{TemplateBinding BorderThickness}"
-                  CornerRadius="{TemplateBinding CornerRadius}"
-                  HorizontalAlignment="Stretch"
-                  Padding="{TemplateBinding Padding}">
-            <ItemsPresenter Name="PART_ItemsPresenter"
-                            Items="{TemplateBinding Items}"
-                            ItemsPanel="{TemplateBinding ItemsPanel}"
-                            ItemTemplate="{TemplateBinding ItemTemplate}"
-                            VerticalAlignment="Stretch"
-                            KeyboardNavigation.TabNavigation="Continue" />
-          </Border>
-        </ControlTemplate>
-      </Setter>
-    </ControlTheme>
+  <ControlTheme x:Key="{x:Type Menu}" TargetType="Menu">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="Height" Value="{DynamicResource MenuBarHeight}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}"
+                HorizontalAlignment="Stretch"
+                Padding="{TemplateBinding Padding}">
+          <ItemsPresenter Name="PART_ItemsPresenter"
+                          Items="{TemplateBinding Items}"
+                          ItemsPanel="{TemplateBinding ItemsPanel}"
+                          ItemTemplate="{TemplateBinding ItemTemplate}"
+                          VerticalAlignment="Stretch"
+                          KeyboardNavigation.TabNavigation="Continue" />
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
 </ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/MenuFlyoutPresenter.xaml b/src/Avalonia.Themes.Fluent/Controls/MenuFlyoutPresenter.xaml
index 7769f0a5c9..264438390d 100644
--- a/src/Avalonia.Themes.Fluent/Controls/MenuFlyoutPresenter.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/MenuFlyoutPresenter.xaml
@@ -1,34 +1,35 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <ControlTheme x:Key="{x:Type MenuFlyoutPresenter}" TargetType="MenuFlyoutPresenter">
-      <Setter Property="Background" Value="{DynamicResource MenuFlyoutPresenterBackground}" />
-      <Setter Property="BorderBrush" Value="{DynamicResource MenuFlyoutPresenterBorderBrush}" />
-      <Setter Property="BorderThickness" Value="{DynamicResource MenuFlyoutPresenterBorderThemeThickness}" />
-      <Setter Property="Padding" Value="{DynamicResource MenuFlyoutPresenterThemePadding}" />
-      <Setter Property="MaxWidth" Value="{DynamicResource FlyoutThemeMaxWidth}" />
-      <Setter Property="MinHeight" Value="{DynamicResource MenuFlyoutThemeMinHeight}" />
-      <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
-      <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-      <Setter Property="CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
-      <Setter Property="Template">
-        <ControlTemplate>
-          <Border Name="LayoutRoot"
-                  Background="{TemplateBinding Background}"
-                  BorderBrush="{TemplateBinding BorderBrush}"
-                  BorderThickness="{TemplateBinding BorderThickness}"
-                  Padding="{DynamicResource FlyoutBorderThemePadding}"
-                  CornerRadius="{TemplateBinding CornerRadius}">
-            <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
-                          VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
-              <ItemsPresenter Name="PART_ItemsPresenter"
-                              Items="{TemplateBinding Items}"
-                              ItemsPanel="{TemplateBinding ItemsPanel}"
-                              ItemTemplate="{TemplateBinding ItemTemplate}"
-                              Margin="{DynamicResource MenuFlyoutScrollerMargin}"
-                              KeyboardNavigation.TabNavigation="Continue"
-                              Grid.IsSharedSizeScope="True" />
-            </ScrollViewer>
-          </Border>
-        </ControlTemplate>
-      </Setter>
-    </ControlTheme>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type MenuFlyoutPresenter}" TargetType="MenuFlyoutPresenter">
+    <Setter Property="Background" Value="{DynamicResource MenuFlyoutPresenterBackground}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource MenuFlyoutPresenterBorderBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource MenuFlyoutPresenterBorderThemeThickness}" />
+    <Setter Property="Padding" Value="{DynamicResource MenuFlyoutPresenterThemePadding}" />
+    <Setter Property="MaxWidth" Value="{DynamicResource FlyoutThemeMaxWidth}" />
+    <Setter Property="MinHeight" Value="{DynamicResource MenuFlyoutThemeMinHeight}" />
+    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+    <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+    <Setter Property="CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Name="LayoutRoot"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                Padding="{DynamicResource FlyoutBorderThemePadding}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                        VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
+            <ItemsPresenter Name="PART_ItemsPresenter"
+                            Items="{TemplateBinding Items}"
+                            ItemsPanel="{TemplateBinding ItemsPanel}"
+                            ItemTemplate="{TemplateBinding ItemTemplate}"
+                            Margin="{DynamicResource MenuFlyoutScrollerMargin}"
+                            KeyboardNavigation.TabNavigation="Continue"
+                            Grid.IsSharedSizeScope="True" />
+          </ScrollViewer>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
 </ResourceDictionary>

From f82541a90d4916f192e432c76fa329d4d3dd3dbf Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 8 Jul 2022 15:09:47 +0200
Subject: [PATCH 070/240] Tweaked NotificationCard ControlTheme.

---
 .../Accents/FluentControlResourcesDark.xaml   |  1 +
 .../Accents/FluentControlResourcesLight.xaml  |  1 +
 .../Controls/NotificationCard.xaml            | 82 +++++++++----------
 3 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml
index c5bb70bed3..9d04009aed 100644
--- a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml
+++ b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml
@@ -308,6 +308,7 @@
    
     <!--Resources for NotificationCard.xaml -->
     <SolidColorBrush x:Key="NotificationCardBackgroundBrush" Color="#444444" />
+    <StaticResource x:Key="NotificationCardForegroundBrush" ResourceKey="SystemControlForegroundBaseHighBrush" />
     <SolidColorBrush x:Key="NotificationCardProgressBackgroundBrush" Color="#9A9A9A" />
     <SolidColorBrush x:Key="NotificationCardInformationBackgroundBrush" Color="#007ACC" Opacity="0.75"/>
     <SolidColorBrush x:Key="NotificationCardSuccessBackgroundBrush" Color="#1F9E45" Opacity="0.75"/>
diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml
index 8d38d39bd5..7b673767b8 100644
--- a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml
+++ b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml
@@ -304,6 +304,7 @@
     
     <!--Resources for NotificationCard.xaml -->
     <SolidColorBrush x:Key="NotificationCardBackgroundBrush" Color="White" />
+    <StaticResource x:Key="NotificationCardForegroundBrush" ResourceKey="SystemControlForegroundBaseHighBrush" />
     <SolidColorBrush x:Key="NotificationCardProgressBackgroundBrush" Color="#9A9A9A" />
     <SolidColorBrush x:Key="NotificationCardInformationBackgroundBrush" Color="#0078D4" />
     <SolidColorBrush x:Key="NotificationCardSuccessBackgroundBrush" Color="#128B44" />
diff --git a/src/Avalonia.Themes.Fluent/Controls/NotificationCard.xaml b/src/Avalonia.Themes.Fluent/Controls/NotificationCard.xaml
index e55fcb90e8..51dcdd42e3 100644
--- a/src/Avalonia.Themes.Fluent/Controls/NotificationCard.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/NotificationCard.xaml
@@ -9,7 +9,7 @@
     <Setter Property="UseLayoutRounding" Value="True"/>
     <Setter Property="Width" Value="350"/>
     <Setter Property="FontSize" Value="14"/>
-    <Setter Property="Foreground" Value="White"/>
+    <Setter Property="Foreground" Value="{DynamicResource NotificationCardForegroundBrush}"/>
     <Setter Property="RenderTransformOrigin" Value="50%,75%"/>
     <Setter Property="BorderThickness" Value="0" />
     <Setter Property="Background" Value="{DynamicResource NotificationCardBackgroundBrush}" />
@@ -53,47 +53,47 @@
       </Animation>
     </ControlTheme.Animations>
 
-  <Style Selector="^[IsClosing=true] /template/ LayoutTransformControl#PART_LayoutTransformControl">
-    <Setter Property="RenderTransformOrigin" Value="50%,0%"/>
-    <Style.Animations>
-      <Animation Duration="0:0:0.75" Easing="QuadraticEaseOut" FillMode="Forward">
-        <KeyFrame Cue="0%">
-          <Setter Property="TranslateTransform.X" Value="0"/>
-          <Setter Property="ScaleTransform.ScaleY" Value="1"/>
-        </KeyFrame>
-        <KeyFrame Cue="70%">
-          <Setter Property="TranslateTransform.X" Value="800"/>
-          <Setter Property="ScaleTransform.ScaleY" Value="1"/>
-        </KeyFrame>
-        <KeyFrame Cue="100%">
-          <Setter Property="ScaleTransform.ScaleY" Value="0"/>
-          <Setter Property="TranslateTransform.X" Value="800"/>
-        </KeyFrame>
-      </Animation>
-    </Style.Animations>
-  </Style>
+    <Style Selector="^[IsClosing=true] /template/ LayoutTransformControl#PART_LayoutTransformControl">
+      <Setter Property="RenderTransformOrigin" Value="50%,0%"/>
+      <Style.Animations>
+        <Animation Duration="0:0:0.75" Easing="QuadraticEaseOut" FillMode="Forward">
+          <KeyFrame Cue="0%">
+            <Setter Property="TranslateTransform.X" Value="0"/>
+            <Setter Property="ScaleTransform.ScaleY" Value="1"/>
+          </KeyFrame>
+          <KeyFrame Cue="70%">
+            <Setter Property="TranslateTransform.X" Value="800"/>
+            <Setter Property="ScaleTransform.ScaleY" Value="1"/>
+          </KeyFrame>
+          <KeyFrame Cue="100%">
+            <Setter Property="ScaleTransform.ScaleY" Value="0"/>
+            <Setter Property="TranslateTransform.X" Value="800"/>
+          </KeyFrame>
+        </Animation>
+      </Style.Animations>
+    </Style>
 
-  <Style Selector="^[IsClosing=true]">
-    <Style.Animations>
-      <Animation Duration="0:0:1.25" Easing="QuadraticEaseOut" FillMode="Forward">
-        <KeyFrame Cue="100%">
-          <Setter Property="IsClosed" Value="True"/>
-        </KeyFrame>
-      </Animation>
-    </Style.Animations>
-  </Style>
+    <Style Selector="^[IsClosing=true]">
+      <Style.Animations>
+        <Animation Duration="0:0:1.25" Easing="QuadraticEaseOut" FillMode="Forward">
+          <KeyFrame Cue="100%">
+            <Setter Property="IsClosed" Value="True"/>
+          </KeyFrame>
+        </Animation>
+      </Style.Animations>
+    </Style>
 
-  <Style Selector="^:information /template/ Panel#PART_HeaderBar">
-    <Setter Property="Background" Value="{DynamicResource NotificationCardInformationBackgroundBrush}"/>
-  </Style>
-  <Style Selector="^:success /template/ Panel#PART_HeaderBar">
-    <Setter Property="Background" Value="{DynamicResource NotificationCardSuccessBackgroundBrush}"/>
-  </Style>
-  <Style Selector="^:warning /template/ Panel#PART_HeaderBar">
-    <Setter Property="Background" Value="{DynamicResource NotificationCardWarningBackgroundBrush}"/>
-  </Style>
-  <Style Selector="^:error /template/ Panel#PART_HeaderBar">
-    <Setter Property="Background" Value="{DynamicResource NotificationCardErrorBackgroundBrush}"/>
-  </Style>
+    <Style Selector="^:information /template/ Panel#PART_HeaderBar">
+      <Setter Property="Background" Value="{DynamicResource NotificationCardInformationBackgroundBrush}"/>
+    </Style>
+    <Style Selector="^:success /template/ Panel#PART_HeaderBar">
+      <Setter Property="Background" Value="{DynamicResource NotificationCardSuccessBackgroundBrush}"/>
+    </Style>
+    <Style Selector="^:warning /template/ Panel#PART_HeaderBar">
+      <Setter Property="Background" Value="{DynamicResource NotificationCardWarningBackgroundBrush}"/>
+    </Style>
+    <Style Selector="^:error /template/ Panel#PART_HeaderBar">
+      <Setter Property="Background" Value="{DynamicResource NotificationCardErrorBackgroundBrush}"/>
+    </Style>
   </ControlTheme>
 </ResourceDictionary>

From db954bfd0ebf0401a9bc1cfc6dc517cd1e2d5a08 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 8 Jul 2022 15:11:10 +0200
Subject: [PATCH 071/240] Formatted NumericUpDown ControlTheme.

---
 .../Controls/NumericUpDown.xaml               | 126 +++++++++---------
 1 file changed, 62 insertions(+), 64 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml b/src/Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml
index 74ffff0f5c..872367c6da 100644
--- a/src/Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml
@@ -1,67 +1,65 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Design.PreviewWith>
-      <Border Padding="20">
-        <StackPanel Spacing="20">
-          <NumericUpDown Minimum="0"
-                         Maximum="10"
-                         Increment="0.5"
-                         Width="150"
-                         Watermark="Enter text" />
-          <NumericUpDown Minimum="0"
-                         Maximum="10"
-                         Increment="0.5"
-                         Width="150"
-                         VerticalContentAlignment="Center"
-                         HorizontalContentAlignment="Center"
-                         ButtonSpinnerLocation="Left"
-                         Watermark="Enter text" />
-        </StackPanel>
-      </Border>
-    </Design.PreviewWith>
-  
-    <ControlTheme x:Key="{x:Type NumericUpDown}" TargetType="NumericUpDown">
-      <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}" />
-      <Setter Property="Background" Value="{DynamicResource TextControlBackground}" />
-      <Setter Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThickness}" />
-      <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrush}" />
-      <Setter Property="MinHeight" Value="{DynamicResource TextControlThemeMinHeight}" />
-      <Setter Property="MinWidth" Value="{DynamicResource TextControlThemeMinWidth}" />
-      <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-      <Setter Property="Padding" Value="{DynamicResource TextControlThemePadding}" />
-      <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-      <Setter Property="Template">
-        <ControlTemplate>
-          <ButtonSpinner Name="PART_Spinner" 
-                         Background="{TemplateBinding Background}" 
-                         BorderThickness="{TemplateBinding BorderThickness}" 
-                         BorderBrush="{TemplateBinding BorderBrush}"
-                         CornerRadius="{TemplateBinding CornerRadius}"
-                         Padding="0"
-                         MinWidth="0"
-                         HorizontalContentAlignment="Stretch"
-                         VerticalContentAlignment="Stretch"
-                         AllowSpin="{TemplateBinding AllowSpin}"
-                         ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}" 
-                         DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
-                         ButtonSpinnerLocation="{TemplateBinding ButtonSpinnerLocation}">
-            <TextBox Name="PART_TextBox" 
-                     Background="Transparent"
-                     BorderBrush="Transparent"
-                     Margin="-1" 
-                     Padding="{TemplateBinding Padding}" 
-                     MinWidth="0" 
-                     Foreground="{TemplateBinding Foreground}"
-                     FontSize="{TemplateBinding FontSize}" 
-                     Watermark="{TemplateBinding Watermark}" 
-                     IsReadOnly="{TemplateBinding IsReadOnly}" 
-                     VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                     HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" 
-                     Text="{TemplateBinding Text}" 
-                     AcceptsReturn="False"
-                     TextWrapping="NoWrap" />
-          </ButtonSpinner>
-        </ControlTemplate>
-      </Setter>
-    </ControlTheme>
+  <Design.PreviewWith>
+    <Border Padding="20">
+      <StackPanel Spacing="20">
+        <NumericUpDown Minimum="0"
+                       Maximum="10"
+                       Increment="0.5"
+                       Watermark="Enter text" />
+        <NumericUpDown Minimum="0"
+                       Maximum="10"
+                       Increment="0.5"
+                       VerticalContentAlignment="Center"
+                       HorizontalContentAlignment="Center"
+                       ButtonSpinnerLocation="Left"
+                       Watermark="Enter text" />
+      </StackPanel>
+    </Border>
+  </Design.PreviewWith>
+
+  <ControlTheme x:Key="{x:Type NumericUpDown}" TargetType="NumericUpDown">
+    <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}" />
+    <Setter Property="Background" Value="{DynamicResource TextControlBackground}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThickness}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrush}" />
+    <Setter Property="MinHeight" Value="{DynamicResource TextControlThemeMinHeight}" />
+    <Setter Property="MinWidth" Value="{DynamicResource TextControlThemeMinWidth}" />
+    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+    <Setter Property="Padding" Value="{DynamicResource TextControlThemePadding}" />
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ButtonSpinner Name="PART_Spinner"
+                       Background="{TemplateBinding Background}"
+                       BorderThickness="{TemplateBinding BorderThickness}"
+                       BorderBrush="{TemplateBinding BorderBrush}"
+                       CornerRadius="{TemplateBinding CornerRadius}"
+                       Padding="0"
+                       MinWidth="0"
+                       HorizontalContentAlignment="Stretch"
+                       VerticalContentAlignment="Stretch"
+                       AllowSpin="{TemplateBinding AllowSpin}"
+                       ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}"
+                       DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
+                       ButtonSpinnerLocation="{TemplateBinding ButtonSpinnerLocation}">
+          <TextBox Name="PART_TextBox"
+                   Background="Transparent"
+                   BorderBrush="Transparent"
+                   Margin="-1"
+                   Padding="{TemplateBinding Padding}"
+                   MinWidth="0"
+                   Foreground="{TemplateBinding Foreground}"
+                   FontSize="{TemplateBinding FontSize}"
+                   Watermark="{TemplateBinding Watermark}"
+                   IsReadOnly="{TemplateBinding IsReadOnly}"
+                   VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                   Text="{TemplateBinding Text}"
+                   AcceptsReturn="False"
+                   TextWrapping="NoWrap" />
+        </ButtonSpinner>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
 </ResourceDictionary>

From 474df23c0715253fe3be730fc1cdd59d093a2749 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 8 Jul 2022 15:11:35 +0200
Subject: [PATCH 072/240] Formatted OverlayPopupHost ControlTheme.

---
 .../Controls/OverlayPopupHost.xaml            | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/OverlayPopupHost.xaml b/src/Avalonia.Themes.Fluent/Controls/OverlayPopupHost.xaml
index 0b587e6037..28d8fb508c 100644
--- a/src/Avalonia.Themes.Fluent/Controls/OverlayPopupHost.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/OverlayPopupHost.xaml
@@ -1,23 +1,23 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <ControlTheme x:Key="{x:Type OverlayPopupHost}" TargetType="OverlayPopupHost">
-      <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
-      <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
-      <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
-      <Setter Property="FontWeight" Value="400" />
-      <Setter Property="FontStyle" Value="Normal" />
-      <Setter Property="Template">
-        <ControlTemplate>
-          <LayoutTransformControl LayoutTransform="{TemplateBinding Transform}">
-            <VisualLayerManager IsPopup="True">
-              <ContentPresenter Name="PART_ContentPresenter"
-                                Background="{TemplateBinding Background}"
-                                ContentTemplate="{TemplateBinding ContentTemplate}"
-                                Content="{TemplateBinding Content}"
-                                Padding="{TemplateBinding Padding}"/>
-            </VisualLayerManager>
-          </LayoutTransformControl>
-        </ControlTemplate>
-      </Setter>
-    </ControlTheme>
+  <ControlTheme x:Key="{x:Type OverlayPopupHost}" TargetType="OverlayPopupHost">
+    <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
+    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
+    <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
+    <Setter Property="FontWeight" Value="400" />
+    <Setter Property="FontStyle" Value="Normal" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <LayoutTransformControl LayoutTransform="{TemplateBinding Transform}">
+          <VisualLayerManager IsPopup="True">
+            <ContentPresenter Name="PART_ContentPresenter"
+                              Background="{TemplateBinding Background}"
+                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                              Content="{TemplateBinding Content}"
+                              Padding="{TemplateBinding Padding}"/>
+          </VisualLayerManager>
+        </LayoutTransformControl>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
 </ResourceDictionary>

From 0d7bb472b38e042e44b1200f0f08e0c405f6c353 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 8 Jul 2022 15:12:20 +0200
Subject: [PATCH 073/240] Formatted PathIcon ControlTheme.

---
 .../Controls/PathIcon.xaml                    | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/PathIcon.xaml b/src/Avalonia.Themes.Fluent/Controls/PathIcon.xaml
index b9967a1b44..5584eb3ab9 100644
--- a/src/Avalonia.Themes.Fluent/Controls/PathIcon.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/PathIcon.xaml
@@ -1,25 +1,25 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Design.PreviewWith>
-      <StackPanel>
-        <StackPanel.Resources>
-          <StreamGeometry x:Key="settings_regular">M14 9.50006C11.5147 9.50006 9.5 11.5148 9.5 14.0001C9.5 16.4853 11.5147 18.5001 14 18.5001C15.3488 18.5001 16.559 17.9066 17.3838 16.9666C18.0787 16.1746 18.5 15.1365 18.5 14.0001C18.5 13.5401 18.431 13.0963 18.3028 12.6784C17.7382 10.8381 16.0253 9.50006 14 9.50006ZM11 14.0001C11 12.3432 12.3431 11.0001 14 11.0001C15.6569 11.0001 17 12.3432 17 14.0001C17 15.6569 15.6569 17.0001 14 17.0001C12.3431 17.0001 11 15.6569 11 14.0001Z  M21.7093 22.3948L19.9818 21.6364C19.4876 21.4197 18.9071 21.4515 18.44 21.7219C17.9729 21.9924 17.675 22.4693 17.6157 23.0066L17.408 24.8855C17.3651 25.273 17.084 25.5917 16.7055 25.682C14.9263 26.1061 13.0725 26.1061 11.2933 25.682C10.9148 25.5917 10.6336 25.273 10.5908 24.8855L10.3834 23.0093C10.3225 22.4731 10.0112 21.9976 9.54452 21.7281C9.07783 21.4586 8.51117 21.4269 8.01859 21.6424L6.29071 22.4009C5.93281 22.558 5.51493 22.4718 5.24806 22.1859C4.00474 20.8536 3.07924 19.2561 2.54122 17.5137C2.42533 17.1384 2.55922 16.7307 2.8749 16.4977L4.40219 15.3703C4.83721 15.0501 5.09414 14.5415 5.09414 14.0007C5.09414 13.4598 4.83721 12.9512 4.40162 12.6306L2.87529 11.5051C2.55914 11.272 2.42513 10.8638 2.54142 10.4882C3.08038 8.74734 4.00637 7.15163 5.24971 5.82114C5.51684 5.53528 5.93492 5.44941 6.29276 5.60691L8.01296 6.36404C8.50793 6.58168 9.07696 6.54881 9.54617 6.27415C10.0133 6.00264 10.3244 5.52527 10.3844 4.98794L10.5933 3.11017C10.637 2.71803 10.9245 2.39704 11.3089 2.31138C12.19 2.11504 13.0891 2.01071 14.0131 2.00006C14.9147 2.01047 15.8128 2.11485 16.6928 2.31149C17.077 2.39734 17.3643 2.71823 17.4079 3.11017L17.617 4.98937C17.7116 5.85221 18.4387 6.50572 19.3055 6.50663C19.5385 6.507 19.769 6.45838 19.9843 6.36294L21.7048 5.60568C22.0626 5.44818 22.4807 5.53405 22.7478 5.81991C23.9912 7.1504 24.9172 8.74611 25.4561 10.487C25.5723 10.8623 25.4386 11.2703 25.1228 11.5035L23.5978 12.6297C23.1628 12.95 22.9 13.4586 22.9 13.9994C22.9 14.5403 23.1628 15.0489 23.5988 15.3698L25.1251 16.4965C25.441 16.7296 25.5748 17.1376 25.4586 17.5131C24.9198 19.2536 23.9944 20.8492 22.7517 22.1799C22.4849 22.4657 22.0671 22.5518 21.7093 22.3948ZM16.263 22.1966C16.4982 21.4685 16.9889 20.8288 17.6884 20.4238C18.5702 19.9132 19.6536 19.8547 20.5841 20.2627L21.9281 20.8526C22.791 19.8538 23.4593 18.7013 23.8981 17.4552L22.7095 16.5778L22.7086 16.5771C21.898 15.98 21.4 15.0277 21.4 13.9994C21.4 12.9719 21.8974 12.0195 22.7073 11.4227L22.7085 11.4218L23.8957 10.545C23.4567 9.2988 22.7881 8.14636 21.9248 7.1477L20.5922 7.73425L20.5899 7.73527C20.1844 7.91463 19.7472 8.00722 19.3039 8.00663C17.6715 8.00453 16.3046 6.77431 16.1261 5.15465L16.1259 5.15291L15.9635 3.69304C15.3202 3.57328 14.6677 3.50872 14.013 3.50017C13.3389 3.50891 12.6821 3.57367 12.0377 3.69328L11.8751 5.15452C11.7625 6.16272 11.1793 7.05909 10.3019 7.56986C9.41937 8.0856 8.34453 8.14844 7.40869 7.73694L6.07273 7.14893C5.20949 8.14751 4.54092 9.29983 4.10196 10.5459L5.29181 11.4233C6.11115 12.0269 6.59414 12.9837 6.59414 14.0007C6.59414 15.0173 6.11142 15.9742 5.29237 16.5776L4.10161 17.4566C4.54002 18.7044 5.2085 19.8585 6.07205 20.8587L7.41742 20.2682C8.34745 19.8613 9.41573 19.9215 10.2947 20.4292C11.174 20.937 11.7593 21.832 11.8738 22.84L11.8744 22.8445L12.0362 24.3088C13.3326 24.5638 14.6662 24.5638 15.9626 24.3088L16.1247 22.8418C16.1491 22.6217 16.1955 22.4055 16.263 22.1966Z</StreamGeometry>
-        </StackPanel.Resources>
-        <PathIcon Data="{StaticResource settings_regular}" />
-      </StackPanel>
-    </Design.PreviewWith>
-    <ControlTheme x:Key="{x:Type PathIcon}" TargetType="PathIcon">
-      <Setter Property="Background" Value="Transparent" />
-      <Setter Property="Height" Value="{DynamicResource IconElementThemeHeight}" />
-      <Setter Property="Width" Value="{DynamicResource IconElementThemeWidth}" />
-      <Setter Property="Template">
-        <ControlTemplate>
-          <Border Background="{TemplateBinding Background}">
-            <Viewbox Height="{TemplateBinding Height}" Width="{TemplateBinding Width}">
-              <Path Fill="{TemplateBinding Foreground}" Data="{TemplateBinding Data}" Stretch="Uniform" />
-            </Viewbox>
-          </Border>
-        </ControlTemplate>
-      </Setter>
-    </ControlTheme>
+  <Design.PreviewWith>
+    <StackPanel>
+      <StackPanel.Resources>
+        <StreamGeometry x:Key="settings_regular">M14 9.50006C11.5147 9.50006 9.5 11.5148 9.5 14.0001C9.5 16.4853 11.5147 18.5001 14 18.5001C15.3488 18.5001 16.559 17.9066 17.3838 16.9666C18.0787 16.1746 18.5 15.1365 18.5 14.0001C18.5 13.5401 18.431 13.0963 18.3028 12.6784C17.7382 10.8381 16.0253 9.50006 14 9.50006ZM11 14.0001C11 12.3432 12.3431 11.0001 14 11.0001C15.6569 11.0001 17 12.3432 17 14.0001C17 15.6569 15.6569 17.0001 14 17.0001C12.3431 17.0001 11 15.6569 11 14.0001Z  M21.7093 22.3948L19.9818 21.6364C19.4876 21.4197 18.9071 21.4515 18.44 21.7219C17.9729 21.9924 17.675 22.4693 17.6157 23.0066L17.408 24.8855C17.3651 25.273 17.084 25.5917 16.7055 25.682C14.9263 26.1061 13.0725 26.1061 11.2933 25.682C10.9148 25.5917 10.6336 25.273 10.5908 24.8855L10.3834 23.0093C10.3225 22.4731 10.0112 21.9976 9.54452 21.7281C9.07783 21.4586 8.51117 21.4269 8.01859 21.6424L6.29071 22.4009C5.93281 22.558 5.51493 22.4718 5.24806 22.1859C4.00474 20.8536 3.07924 19.2561 2.54122 17.5137C2.42533 17.1384 2.55922 16.7307 2.8749 16.4977L4.40219 15.3703C4.83721 15.0501 5.09414 14.5415 5.09414 14.0007C5.09414 13.4598 4.83721 12.9512 4.40162 12.6306L2.87529 11.5051C2.55914 11.272 2.42513 10.8638 2.54142 10.4882C3.08038 8.74734 4.00637 7.15163 5.24971 5.82114C5.51684 5.53528 5.93492 5.44941 6.29276 5.60691L8.01296 6.36404C8.50793 6.58168 9.07696 6.54881 9.54617 6.27415C10.0133 6.00264 10.3244 5.52527 10.3844 4.98794L10.5933 3.11017C10.637 2.71803 10.9245 2.39704 11.3089 2.31138C12.19 2.11504 13.0891 2.01071 14.0131 2.00006C14.9147 2.01047 15.8128 2.11485 16.6928 2.31149C17.077 2.39734 17.3643 2.71823 17.4079 3.11017L17.617 4.98937C17.7116 5.85221 18.4387 6.50572 19.3055 6.50663C19.5385 6.507 19.769 6.45838 19.9843 6.36294L21.7048 5.60568C22.0626 5.44818 22.4807 5.53405 22.7478 5.81991C23.9912 7.1504 24.9172 8.74611 25.4561 10.487C25.5723 10.8623 25.4386 11.2703 25.1228 11.5035L23.5978 12.6297C23.1628 12.95 22.9 13.4586 22.9 13.9994C22.9 14.5403 23.1628 15.0489 23.5988 15.3698L25.1251 16.4965C25.441 16.7296 25.5748 17.1376 25.4586 17.5131C24.9198 19.2536 23.9944 20.8492 22.7517 22.1799C22.4849 22.4657 22.0671 22.5518 21.7093 22.3948ZM16.263 22.1966C16.4982 21.4685 16.9889 20.8288 17.6884 20.4238C18.5702 19.9132 19.6536 19.8547 20.5841 20.2627L21.9281 20.8526C22.791 19.8538 23.4593 18.7013 23.8981 17.4552L22.7095 16.5778L22.7086 16.5771C21.898 15.98 21.4 15.0277 21.4 13.9994C21.4 12.9719 21.8974 12.0195 22.7073 11.4227L22.7085 11.4218L23.8957 10.545C23.4567 9.2988 22.7881 8.14636 21.9248 7.1477L20.5922 7.73425L20.5899 7.73527C20.1844 7.91463 19.7472 8.00722 19.3039 8.00663C17.6715 8.00453 16.3046 6.77431 16.1261 5.15465L16.1259 5.15291L15.9635 3.69304C15.3202 3.57328 14.6677 3.50872 14.013 3.50017C13.3389 3.50891 12.6821 3.57367 12.0377 3.69328L11.8751 5.15452C11.7625 6.16272 11.1793 7.05909 10.3019 7.56986C9.41937 8.0856 8.34453 8.14844 7.40869 7.73694L6.07273 7.14893C5.20949 8.14751 4.54092 9.29983 4.10196 10.5459L5.29181 11.4233C6.11115 12.0269 6.59414 12.9837 6.59414 14.0007C6.59414 15.0173 6.11142 15.9742 5.29237 16.5776L4.10161 17.4566C4.54002 18.7044 5.2085 19.8585 6.07205 20.8587L7.41742 20.2682C8.34745 19.8613 9.41573 19.9215 10.2947 20.4292C11.174 20.937 11.7593 21.832 11.8738 22.84L11.8744 22.8445L12.0362 24.3088C13.3326 24.5638 14.6662 24.5638 15.9626 24.3088L16.1247 22.8418C16.1491 22.6217 16.1955 22.4055 16.263 22.1966Z</StreamGeometry>
+      </StackPanel.Resources>
+      <PathIcon Data="{StaticResource settings_regular}" />
+    </StackPanel>
+  </Design.PreviewWith>
+  <ControlTheme x:Key="{x:Type PathIcon}" TargetType="PathIcon">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="Height" Value="{DynamicResource IconElementThemeHeight}" />
+    <Setter Property="Width" Value="{DynamicResource IconElementThemeWidth}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Background="{TemplateBinding Background}">
+          <Viewbox Height="{TemplateBinding Height}" Width="{TemplateBinding Width}">
+            <Path Fill="{TemplateBinding Foreground}" Data="{TemplateBinding Data}" Stretch="Uniform" />
+          </Viewbox>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
 </ResourceDictionary>

From 8b69e083e8968df9361378454ddad87b834159f2 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 8 Jul 2022 15:12:54 +0200
Subject: [PATCH 074/240] Formatted PopupRoot ControlTheme.

---
 .../Controls/PopupRoot.xaml                   | 50 +++++++++----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/PopupRoot.xaml b/src/Avalonia.Themes.Fluent/Controls/PopupRoot.xaml
index f57ecd2013..5a924830b1 100644
--- a/src/Avalonia.Themes.Fluent/Controls/PopupRoot.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/PopupRoot.xaml
@@ -1,28 +1,28 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <ControlTheme x:Key="{x:Type PopupRoot}" TargetType="PopupRoot">
-      <Setter Property="Background" Value="{x:Null}" />
-      <Setter Property="TransparencyLevelHint" Value="Transparent" />
-      <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}" />
-      <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-      <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
-      <Setter Property="FontWeight" Value="400" />
-      <Setter Property="FontStyle" Value="Normal" />
-      <Setter Property="Template">
-        <ControlTemplate>
-          <LayoutTransformControl LayoutTransform="{TemplateBinding Transform}">
-            <Panel>
-              <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
-              <VisualLayerManager IsPopup="True">
-                <ContentPresenter Name="PART_ContentPresenter"
-                                  Background="{TemplateBinding Background}"
-                                  ContentTemplate="{TemplateBinding ContentTemplate}"
-                                  Content="{TemplateBinding Content}"
-                                  Padding="{TemplateBinding Padding}" />
-              </VisualLayerManager>
-            </Panel>
-          </LayoutTransformControl>
-        </ControlTemplate>
-      </Setter>
-    </ControlTheme>
+  <ControlTheme x:Key="{x:Type PopupRoot}" TargetType="PopupRoot">
+    <Setter Property="Background" Value="{x:Null}" />
+    <Setter Property="TransparencyLevelHint" Value="Transparent" />
+    <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}" />
+    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+    <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
+    <Setter Property="FontWeight" Value="400" />
+    <Setter Property="FontStyle" Value="Normal" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <LayoutTransformControl LayoutTransform="{TemplateBinding Transform}">
+          <Panel>
+            <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
+            <VisualLayerManager IsPopup="True">
+              <ContentPresenter Name="PART_ContentPresenter"
+                                Background="{TemplateBinding Background}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                Content="{TemplateBinding Content}"
+                                Padding="{TemplateBinding Padding}" />
+            </VisualLayerManager>
+          </Panel>
+        </LayoutTransformControl>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
 </ResourceDictionary>

From 3dc70c0725526db91f6f9c765ba212d363ef1514 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 8 Jul 2022 15:17:15 +0200
Subject: [PATCH 075/240] Checked ProgressBar ControlTheme.

---
 .../Controls/ProgressBar.xaml                 | 348 +++++++++---------
 1 file changed, 176 insertions(+), 172 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/ProgressBar.xaml b/src/Avalonia.Themes.Fluent/Controls/ProgressBar.xaml
index 3c7d22e13f..6bf813385d 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ProgressBar.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ProgressBar.xaml
@@ -2,178 +2,182 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:CompileBindings="True">
-      <Design.PreviewWith>
-      <Border Padding="20">
+  <Design.PreviewWith>
+    <Border Padding="20">
+      <StackPanel Orientation="Horizontal" Spacing="10">
         <StackPanel Spacing="10">
-          <ProgressBar VerticalAlignment="Center" IsIndeterminate="True" />
-          <ProgressBar VerticalAlignment="Center" Value="5" Maximum="10" />
-          <ProgressBar VerticalAlignment="Center" Value="50" />
-          <ProgressBar VerticalAlignment="Center" Value="50" Minimum="25" Maximum="75" />
-          <ProgressBar HorizontalAlignment="Left" IsIndeterminate="True" Orientation="Vertical" />
+          <ProgressBar Value="5" Maximum="10" />
+          <ProgressBar Value="50" />
+          <ProgressBar Value="50" Minimum="25" Maximum="75" />
+          <ProgressBar IsIndeterminate="True" />
+          <ProgressBar ShowProgressText="True" Value="50"/>
         </StackPanel>
-      </Border>
-    </Design.PreviewWith>
-  
-    <ControlTheme x:Key="{x:Type ProgressBar}" TargetType="ProgressBar">
-        <Setter Property="Foreground" Value="{DynamicResource SystemControlHighlightAccentBrush}" />
-        <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundBaseLowBrush}" />
-        <Setter Property="BorderThickness" Value="{DynamicResource ProgressBarBorderThemeThickness}" />
-        <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource SystemControlHighlightTransparentBrush}" />
-        <Setter Property="MinHeight" Value="{DynamicResource ProgressBarThemeMinHeight}" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="Template">
-            <ControlTemplate>
-                <Border
-                    x:Name="ProgressBarRoot"
-                    Background="{TemplateBinding Background}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    ClipToBounds="True"
-                    CornerRadius="{TemplateBinding CornerRadius}">
-                    <Panel>
-                        <Panel x:Name="DeterminateRoot" Opacity="1">
-                          <Panel.Transitions>
-                            <Transitions>
-                              <DoubleTransition Property="Opacity" Duration="0:0:0.197" />
-                            </Transitions>
-                          </Panel.Transitions>
-                            <Border
-                                x:Name="PART_Indicator"
-                                Margin="{TemplateBinding Padding}"
-                                Background="{TemplateBinding Foreground}"
-                                CornerRadius="{TemplateBinding CornerRadius}" />
-                        </Panel>
-                        <Panel x:Name="IndeterminateRoot" Opacity="0">
-                          <Panel.Transitions>
-                            <Transitions>
-                              <DoubleTransition Property="Opacity" Duration="0:0:0.197" />
-                            </Transitions>
-                          </Panel.Transitions>
-                            <Border
-                                x:Name="IndeterminateProgressBarIndicator"
-                                Margin="{TemplateBinding Padding}"
-                                Background="{TemplateBinding Foreground}"
-                                CornerRadius="{TemplateBinding CornerRadius}" />
-                            <Border
-                                x:Name="IndeterminateProgressBarIndicator2"
-                                Margin="{TemplateBinding Padding}"
-                                Background="{TemplateBinding Foreground}"
-                                CornerRadius="{TemplateBinding CornerRadius}" />
-                        </Panel>
-                        <LayoutTransformControl
-                            x:Name="PART_LayoutTransformControl"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            IsVisible="{TemplateBinding ShowProgressText}">
-                            <TextBlock 
-                              Foreground="{DynamicResource SystemControlForegroundBaseHighBrush}" 
-                              Text="{ReflectionBinding Value, RelativeSource={RelativeSource TemplatedParent}, StringFormat={}{0:0}%}" />
-                        </LayoutTransformControl>
-                    </Panel>
-                </Border>
-            </ControlTemplate>
-        </Setter>
-        <Style Selector="^:horizontal /template/ Border#PART_Indicator">
-            <Setter Property="HorizontalAlignment" Value="Left" />
-            <Setter Property="VerticalAlignment" Value="Stretch" />
-        </Style>
-        <Style Selector="^:vertical /template/ Border#PART_Indicator">
-            <Setter Property="HorizontalAlignment" Value="Stretch" />
-            <Setter Property="VerticalAlignment" Value="Bottom" />
-        </Style>
-        <Style Selector="^:horizontal">
-            <Setter Property="MinWidth" Value="200" />
-            <Setter Property="MinHeight" Value="4" />
-        </Style>
-        <Style Selector="^:vertical">
-            <Setter Property="MinWidth" Value="4" />
-            <Setter Property="MinHeight" Value="200" />
-        </Style>
-        <Style Selector="^:vertical /template/ LayoutTransformControl#PART_LayoutTransformControl">
-            <Setter Property="LayoutTransform">
-                <Setter.Value>
-                    <RotateTransform Angle="90" />
-                </Setter.Value>
-            </Setter>
-        </Style>
-        <Style Selector="^:indeterminate /template/ Panel#DeterminateRoot">
-            <Setter Property="Opacity" Value="0" />
-        </Style>
-        <Style Selector="^:indeterminate /template/ Panel#IndeterminateRoot">
-            <Setter Property="Opacity" Value="1" />
-        </Style>
-        <Style Selector="^:horizontal:indeterminate /template/ Border#IndeterminateProgressBarIndicator">
-            <Style.Animations>
-                <Animation IterationCount="Infinite" Duration="0:0:2">
-                    <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0">
-                        <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerAnimationStartPosition}" />
-                    </KeyFrame>
-                    <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:1.5">
-                        <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerAnimationEndPosition}" />
-                    </KeyFrame>
-                    <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:2">
-                        <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerAnimationEndPosition}" />
-                    </KeyFrame>
-                </Animation>
-            </Style.Animations>
-        </Style>
-        <Style Selector="^:horizontal:indeterminate /template/ Border#IndeterminateProgressBarIndicator2">
-            <Style.Animations>
-                <Animation IterationCount="Infinite" Duration="0:0:2">
-                    <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0">
-                        <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2AnimationStartPosition}" />
-                    </KeyFrame>
-                    <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0.75">
-                        <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2AnimationStartPosition}" />
-                    </KeyFrame>
-                    <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:2">
-                        <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2AnimationEndPosition}" />
-                    </KeyFrame>
-                </Animation>
-            </Style.Animations>
-        </Style>
-        <Style Selector="^:vertical:indeterminate /template/ Border#IndeterminateProgressBarIndicator">
-            <Style.Animations>
-                <Animation IterationCount="Infinite" Duration="0:0:2">
-                    <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0">
-                        <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerAnimationStartPosition}" />
-                    </KeyFrame>
-                    <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:1.5">
-                        <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerAnimationEndPosition}" />
-                    </KeyFrame>
-                    <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:2">
-                        <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerAnimationEndPosition}" />
-                    </KeyFrame>
-                </Animation>
-            </Style.Animations>
-        </Style>
-        <Style Selector="^:vertical:indeterminate /template/ Border#IndeterminateProgressBarIndicator2">
-            <Style.Animations>
-                <Animation IterationCount="Infinite" Duration="0:0:2">
-                    <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0">
-                        <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2AnimationStartPosition}" />
-                    </KeyFrame>
-                    <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0.75">
-                        <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2AnimationStartPosition}" />
-                    </KeyFrame>
-                    <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:2">
-                        <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2AnimationEndPosition}" />
-                    </KeyFrame>
-                </Animation>
-            </Style.Animations>
-        </Style>
-        <Style Selector="^:horizontal /template/ Border#IndeterminateProgressBarIndicator">
-            <Setter Property="Width" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerWidth}" />
-        </Style>
-        <Style Selector="^:horizontal /template/ Border#IndeterminateProgressBarIndicator2">
-            <Setter Property="Width" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2Width}" />
-        </Style>
-        <Style Selector="^:vertical /template/ Border#IndeterminateProgressBarIndicator">
-            <Setter Property="Height" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerWidth}" />
-        </Style>
-        <Style Selector="^:vertical /template/ Border#IndeterminateProgressBarIndicator2">
-            <Setter Property="Height" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2Width}" />
-        </Style>
-    </ControlTheme>
+        <ProgressBar IsIndeterminate="True" Orientation="Vertical" />
+        <ProgressBar ShowProgressText="True" Value="50" Orientation="Vertical"/>
+      </StackPanel>
+    </Border>
+  </Design.PreviewWith>
+
+  <ControlTheme x:Key="{x:Type ProgressBar}" TargetType="ProgressBar">
+    <Setter Property="Foreground" Value="{DynamicResource SystemControlHighlightAccentBrush}" />
+    <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundBaseLowBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource ProgressBarBorderThemeThickness}" />
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource SystemControlHighlightTransparentBrush}" />
+    <Setter Property="MinHeight" Value="{DynamicResource ProgressBarThemeMinHeight}" />
+    <Setter Property="VerticalAlignment" Value="Center" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border
+            x:Name="ProgressBarRoot"
+            Background="{TemplateBinding Background}"
+            BorderBrush="{TemplateBinding BorderBrush}"
+            BorderThickness="{TemplateBinding BorderThickness}"
+            ClipToBounds="True"
+            CornerRadius="{TemplateBinding CornerRadius}">
+          <Panel>
+            <Panel x:Name="DeterminateRoot" Opacity="1">
+              <Panel.Transitions>
+                <Transitions>
+                  <DoubleTransition Property="Opacity" Duration="0:0:0.197" />
+                </Transitions>
+              </Panel.Transitions>
+              <Border
+                  x:Name="PART_Indicator"
+                  Margin="{TemplateBinding Padding}"
+                  Background="{TemplateBinding Foreground}"
+                  CornerRadius="{TemplateBinding CornerRadius}" />
+            </Panel>
+            <Panel x:Name="IndeterminateRoot" Opacity="0">
+              <Panel.Transitions>
+                <Transitions>
+                  <DoubleTransition Property="Opacity" Duration="0:0:0.197" />
+                </Transitions>
+              </Panel.Transitions>
+              <Border
+                  x:Name="IndeterminateProgressBarIndicator"
+                  Margin="{TemplateBinding Padding}"
+                  Background="{TemplateBinding Foreground}"
+                  CornerRadius="{TemplateBinding CornerRadius}" />
+              <Border
+                  x:Name="IndeterminateProgressBarIndicator2"
+                  Margin="{TemplateBinding Padding}"
+                  Background="{TemplateBinding Foreground}"
+                  CornerRadius="{TemplateBinding CornerRadius}" />
+            </Panel>
+            <LayoutTransformControl
+                x:Name="PART_LayoutTransformControl"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                IsVisible="{TemplateBinding ShowProgressText}">
+              <TextBlock
+                Foreground="{DynamicResource SystemControlForegroundBaseHighBrush}"
+                Text="{ReflectionBinding Value, RelativeSource={RelativeSource TemplatedParent}, StringFormat={}{0:0}%}" />
+            </LayoutTransformControl>
+          </Panel>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+    <Style Selector="^:horizontal /template/ Border#PART_Indicator">
+      <Setter Property="HorizontalAlignment" Value="Left" />
+      <Setter Property="VerticalAlignment" Value="Stretch" />
+    </Style>
+    <Style Selector="^:vertical /template/ Border#PART_Indicator">
+      <Setter Property="HorizontalAlignment" Value="Stretch" />
+      <Setter Property="VerticalAlignment" Value="Bottom" />
+    </Style>
+    <Style Selector="^:horizontal">
+      <Setter Property="MinWidth" Value="200" />
+      <Setter Property="MinHeight" Value="4" />
+    </Style>
+    <Style Selector="^:vertical">
+      <Setter Property="MinWidth" Value="4" />
+      <Setter Property="MinHeight" Value="200" />
+    </Style>
+    <Style Selector="^:vertical /template/ LayoutTransformControl#PART_LayoutTransformControl">
+      <Setter Property="LayoutTransform">
+        <Setter.Value>
+          <RotateTransform Angle="90" />
+        </Setter.Value>
+      </Setter>
+    </Style>
+    <Style Selector="^:indeterminate /template/ Panel#DeterminateRoot">
+      <Setter Property="Opacity" Value="0" />
+    </Style>
+    <Style Selector="^:indeterminate /template/ Panel#IndeterminateRoot">
+      <Setter Property="Opacity" Value="1" />
+    </Style>
+    <Style Selector="^:horizontal:indeterminate /template/ Border#IndeterminateProgressBarIndicator">
+      <Style.Animations>
+        <Animation IterationCount="Infinite" Duration="0:0:2">
+          <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0">
+            <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerAnimationStartPosition}" />
+          </KeyFrame>
+          <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:1.5">
+            <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerAnimationEndPosition}" />
+          </KeyFrame>
+          <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:2">
+            <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerAnimationEndPosition}" />
+          </KeyFrame>
+        </Animation>
+      </Style.Animations>
+    </Style>
+    <Style Selector="^:horizontal:indeterminate /template/ Border#IndeterminateProgressBarIndicator2">
+      <Style.Animations>
+        <Animation IterationCount="Infinite" Duration="0:0:2">
+          <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0">
+            <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2AnimationStartPosition}" />
+          </KeyFrame>
+          <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0.75">
+            <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2AnimationStartPosition}" />
+          </KeyFrame>
+          <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:2">
+            <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2AnimationEndPosition}" />
+          </KeyFrame>
+        </Animation>
+      </Style.Animations>
+    </Style>
+    <Style Selector="^:vertical:indeterminate /template/ Border#IndeterminateProgressBarIndicator">
+      <Style.Animations>
+        <Animation IterationCount="Infinite" Duration="0:0:2">
+          <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0">
+            <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerAnimationStartPosition}" />
+          </KeyFrame>
+          <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:1.5">
+            <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerAnimationEndPosition}" />
+          </KeyFrame>
+          <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:2">
+            <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerAnimationEndPosition}" />
+          </KeyFrame>
+        </Animation>
+      </Style.Animations>
+    </Style>
+    <Style Selector="^:vertical:indeterminate /template/ Border#IndeterminateProgressBarIndicator2">
+      <Style.Animations>
+        <Animation IterationCount="Infinite" Duration="0:0:2">
+          <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0">
+            <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2AnimationStartPosition}" />
+          </KeyFrame>
+          <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0.75">
+            <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2AnimationStartPosition}" />
+          </KeyFrame>
+          <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:2">
+            <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2AnimationEndPosition}" />
+          </KeyFrame>
+        </Animation>
+      </Style.Animations>
+    </Style>
+    <Style Selector="^:horizontal /template/ Border#IndeterminateProgressBarIndicator">
+      <Setter Property="Width" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerWidth}" />
+    </Style>
+    <Style Selector="^:horizontal /template/ Border#IndeterminateProgressBarIndicator2">
+      <Setter Property="Width" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2Width}" />
+    </Style>
+    <Style Selector="^:vertical /template/ Border#IndeterminateProgressBarIndicator">
+      <Setter Property="Height" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerWidth}" />
+    </Style>
+    <Style Selector="^:vertical /template/ Border#IndeterminateProgressBarIndicator2">
+      <Setter Property="Height" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2Width}" />
+    </Style>
+  </ControlTheme>
 </ResourceDictionary>

From d284822731e941224c76f0bf9eda3fa1349f3470 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 8 Jul 2022 15:20:16 +0200
Subject: [PATCH 076/240] Tweaked RepeatButton ControlTheme.

---
 .../Controls/RepeatButton.xaml                | 110 +++++++++---------
 1 file changed, 54 insertions(+), 56 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/RepeatButton.xaml b/src/Avalonia.Themes.Fluent/Controls/RepeatButton.xaml
index 670212c4b1..5e789e7e10 100644
--- a/src/Avalonia.Themes.Fluent/Controls/RepeatButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/RepeatButton.xaml
@@ -1,65 +1,63 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Design.PreviewWith>
-      <Border Padding="20">
-        <StackPanel Spacing="20">
-          <RepeatButton Content="Click Me!" />
-        </StackPanel>
-      </Border>
-    </Design.PreviewWith>
-  
-    <Thickness x:Key="ButtonPadding">8,5,8,6</Thickness>
+  <Design.PreviewWith>
+    <Border Padding="20">
+      <StackPanel Spacing="20">
+        <RepeatButton Content="Click Me!" />
+        <RepeatButton Content="Disabled" IsEnabled="False" />
+        <RepeatButton Content="Rounded" CornerRadius="16"/>
+      </StackPanel>
+    </Border>
+  </Design.PreviewWith>
 
-    <ControlTheme x:Key="{x:Type RepeatButton}" TargetType="RepeatButton">
-      <Setter Property="Background" Value="{DynamicResource RepeatButtonBackground}" />
-      <Setter Property="Foreground" Value="{DynamicResource RepeatButtonForeground}" />
-      <Setter Property="BorderBrush" Value="{DynamicResource RepeatButtonBorderBrush}" />
-      <Setter Property="BorderThickness" Value="{DynamicResource ButtonBorderThemeThickness}" />
-      <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-      <Setter Property="Padding" Value="{StaticResource ButtonPadding}" />
-      <Setter Property="HorizontalAlignment" Value="Left" />
-      <Setter Property="VerticalAlignment" Value="Center" />
-      <Setter Property="FontWeight" Value="Normal" />
-      <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-      <Setter Property="Template">
-        <ControlTemplate>
-          <ContentPresenter x:Name="PART_ContentPresenter"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding CornerRadius}"
-                            Content="{TemplateBinding Content}"
-                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                            Padding="{TemplateBinding Padding}"
-                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-        </ControlTemplate>
-      </Setter>
+  <Thickness x:Key="ButtonPadding">8,5,8,6</Thickness>
 
-      <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
-        <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-      </Style>
+  <ControlTheme x:Key="{x:Type RepeatButton}" TargetType="RepeatButton">
+    <Setter Property="Background" Value="{DynamicResource RepeatButtonBackground}" />
+    <Setter Property="Foreground" Value="{DynamicResource RepeatButtonForeground}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource RepeatButtonBorderBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource ButtonBorderThemeThickness}" />
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+    <Setter Property="Padding" Value="{StaticResource ButtonPadding}" />
+    <Setter Property="HorizontalAlignment" Value="Left" />
+    <Setter Property="VerticalAlignment" Value="Center" />
+    <Setter Property="FontWeight" Value="Normal" />
+    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ContentPresenter x:Name="PART_ContentPresenter"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
+                          Content="{TemplateBinding Content}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          Padding="{TemplateBinding Padding}"
+                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+      </ControlTemplate>
+    </Setter>
 
-      <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-        <Setter Property="Background" Value="{DynamicResource RepeatButtonBackgroundPointerOver}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource RepeatButtonBorderBrushPointerOver}" />
-        <Setter Property="Foreground" Value="{DynamicResource RepeatButtonForegroundPointerOver}" />
-      </Style>
+    <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource RepeatButtonBackgroundPointerOver}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource RepeatButtonBorderBrushPointerOver}" />
+      <Setter Property="Foreground" Value="{DynamicResource RepeatButtonForegroundPointerOver}" />
+    </Style>
 
-      <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
-        <Setter Property="Background" Value="{DynamicResource RepeatButtonBackgroundPressed}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource RepeatButtonBorderBrushPressed}" />
-        <Setter Property="Foreground" Value="{DynamicResource RepeatButtonForegroundPressed}" />
-      </Style>
+    <Style Selector="^:pressed">
+      <Setter Property="RenderTransform" Value="scale(0.98)" />
+    </Style>
 
-      <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
-        <Setter Property="Background" Value="{DynamicResource RepeatButtonBackgroundDisabled}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource RepeatButtonBorderBrushDisabled}" />
-        <Setter Property="Foreground" Value="{DynamicResource RepeatButtonForegroundDisabled}" />
-      </Style>
+    <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource RepeatButtonBackgroundPressed}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource RepeatButtonBorderBrushPressed}" />
+      <Setter Property="Foreground" Value="{DynamicResource RepeatButtonForegroundPressed}" />
+    </Style>
 
-      <Style Selector="^:pressed">
-        <Setter Property="RenderTransform" Value="scale(0.98)" />
-      </Style>
-    </ControlTheme>
+    <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource RepeatButtonBackgroundDisabled}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource RepeatButtonBorderBrushDisabled}" />
+      <Setter Property="Foreground" Value="{DynamicResource RepeatButtonForegroundDisabled}" />
+    </Style>
+  </ControlTheme>
 </ResourceDictionary>

From 250b5b91ef8c5d4d8fefd66c14029ee0720fe0ec Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 8 Jul 2022 16:02:03 +0200
Subject: [PATCH 077/240] Tweaked Slider ControlTheme.

---
 .../Controls/Slider.xaml                      | 534 +++++++++---------
 1 file changed, 269 insertions(+), 265 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/Slider.xaml b/src/Avalonia.Themes.Fluent/Controls/Slider.xaml
index c74878e8be..9378640d64 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Slider.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Slider.xaml
@@ -1,57 +1,71 @@
-<ResourceDictionary 
-  xmlns="https://github.com/avaloniaui" 
-  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-     <Design.PreviewWith>
-      <Border Margin="20" Width="200" Height="200">
-        <DockPanel LastChildFill="True">
-          <StackPanel Spacing="10" DockPanel.Dock="Top">
-            <Slider Value="50" />
-            <Slider IsEnabled="False" Value="50" />
-          </StackPanel>
-          <StackPanel Spacing="10" Orientation="Horizontal">
-            <Slider Value="50" Orientation="Vertical" />
-            <Slider IsEnabled="False" Orientation="Vertical" Value="50" />
-          </StackPanel>
-        </DockPanel>
-      </Border>
-    </Design.PreviewWith>
-    <Thickness x:Key="SliderTopHeaderMargin">0,0,0,4</Thickness>
-    <GridLength x:Key="SliderPreContentMargin">15</GridLength>
-    <GridLength x:Key="SliderPostContentMargin">15</GridLength>
-    <x:Double x:Key="SliderHorizontalHeight">32</x:Double>
-    <x:Double x:Key="SliderVerticalWidth">32</x:Double>
-    <CornerRadius x:Key="SliderThumbCornerRadius">10</CornerRadius>
-    <x:Double x:Key="SliderHorizontalThumbWidth">20</x:Double>
-    <x:Double x:Key="SliderHorizontalThumbHeight">20</x:Double>
-    <x:Double x:Key="SliderVerticalThumbWidth">20</x:Double>
-    <x:Double x:Key="SliderVerticalThumbHeight">20</x:Double>
-
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:sys="clr-namespace:System;assembly=netstandard">
+  <Design.PreviewWith>
+    <Border Margin="20" Width="200" Height="400">
+      <DockPanel LastChildFill="True">
+        <StackPanel Spacing="10" DockPanel.Dock="Top">
+          <Slider Value="50" />
+          <Slider IsDirectionReversed="True" Value="50" />
+          <Slider IsEnabled="False" Value="50" />
+          <Slider Value="50">
+            <DataValidationErrors.Error>
+              <sys:Exception>
+                <x:Arguments>
+                  <x:String>Error</x:String>
+                </x:Arguments>
+              </sys:Exception>
+            </DataValidationErrors.Error>
+          </Slider>
+        </StackPanel>
+        <StackPanel Spacing="10" Orientation="Horizontal">
+          <Slider Value="50" Orientation="Vertical" />
+          <Slider IsDirectionReversed="True" Value="50" Orientation="Vertical" />
+          <Slider IsEnabled="False" Orientation="Vertical" Value="50" />
+        </StackPanel>
+      </DockPanel>
+    </Border>
+  </Design.PreviewWith>
+  
+  <Thickness x:Key="SliderTopHeaderMargin">0,0,0,4</Thickness>
+  <GridLength x:Key="SliderPreContentMargin">15</GridLength>
+  <GridLength x:Key="SliderPostContentMargin">15</GridLength>
+  <x:Double x:Key="SliderHorizontalHeight">32</x:Double>
+  <x:Double x:Key="SliderVerticalWidth">32</x:Double>
+  <CornerRadius x:Key="SliderThumbCornerRadius">10</CornerRadius>
+  <x:Double x:Key="SliderHorizontalThumbWidth">20</x:Double>
+  <x:Double x:Key="SliderHorizontalThumbHeight">20</x:Double>
+  <x:Double x:Key="SliderVerticalThumbWidth">20</x:Double>
+  <x:Double x:Key="SliderVerticalThumbHeight">20</x:Double>
 
-  <ControlTheme x:Key="FluentBaseSliderDecreaseIncreaseRepeatButtonTheme" TargetType="RepeatButton" BasedOn="{StaticResource {x:Type RepeatButton}}">
+  <ControlTheme x:Key="FluentSliderHorizontalRepeatButton" TargetType="RepeatButton">
     <Setter Property="Template">
       <ControlTemplate>
         <Grid>
-          <Border
-              Name="FocusTarget"
-              Margin="0,-10"
-              Background="Transparent" />
-          <Border
-              Name="TrackBackground"
-              Background="{TemplateBinding Background}"
-              CornerRadius="{DynamicResource ControlCornerRadius}" />
+          <Border Name="FocusTarget" Margin="0,-10" Background="Transparent" />
+          <Border Name="TrackBackground"
+                  Background="{TemplateBinding Background}"
+                  CornerRadius="{DynamicResource ControlCornerRadius}"
+                  Height="{DynamicResource SliderTrackThemeHeight}"
+                  VerticalAlignment="Center"/>
         </Grid>
       </ControlTemplate>
     </Setter>
   </ControlTheme>
-  
-  <ControlTheme x:Key="FluentHorizontalSliderDecreaseIncreaseRepeatButtonTheme" TargetType="RepeatButton" BasedOn="{StaticResource FluentBaseSliderDecreaseIncreaseRepeatButtonTheme}">
-    <Setter Property="Height" Value="{DynamicResource SliderTrackThemeHeight}"/>
-    <Setter Property="VerticalAlignment" Value="Center"/>
-  </ControlTheme>
-  
-  <ControlTheme x:Key="FluentVerticalSliderDecreaseIncreaseRepeatButtonTheme" TargetType="RepeatButton" BasedOn="{StaticResource FluentBaseSliderDecreaseIncreaseRepeatButtonTheme}">
-    <Setter Property="Width" Value="{DynamicResource SliderTrackThemeHeight}"/>
-    <Setter Property="HorizontalAlignment" Value="Center"/>
+
+  <ControlTheme x:Key="FluentSliderVerticalRepeatButton" TargetType="RepeatButton">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Grid>
+          <Border Name="FocusTarget" Margin="0,-10" Background="Transparent" />
+          <Border Name="TrackBackground"
+                  Background="{TemplateBinding Background}"
+                  CornerRadius="{DynamicResource ControlCornerRadius}"
+                  Width="{DynamicResource SliderTrackThemeHeight}"
+                  HorizontalAlignment="Center"/>
+        </Grid>
+      </ControlTemplate>
+    </Setter>
   </ControlTheme>
 
   <ControlTheme x:Key="FluentSliderThumbTheme" TargetType="Thumb">
@@ -65,225 +79,215 @@
       </ControlTemplate>
     </Setter>
   </ControlTheme>
-  
+
   <ControlTheme x:Key="{x:Type Slider}" TargetType="Slider">
     <Setter Property="Background" Value="{DynamicResource SliderTrackFill}" />
     <Setter Property="BorderThickness" Value="{DynamicResource SliderBorderThemeThickness}" />
     <Setter Property="Foreground" Value="{DynamicResource SliderTrackValueFill}" />
     <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
     <Style Selector="^:horizontal">
-        <Setter Property="Template">
-            <ControlTemplate>
-                <DataValidationErrors>
-                    <Border
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="{TemplateBinding CornerRadius}">
-                        <Grid
-                            Name="grid"
-                            Margin="{TemplateBinding Padding}"
-                            RowDefinitions="Auto, *">
-                            <ContentPresenter
-                                x:Name="HeaderContentPresenter"
-                                Grid.Row="0"
-                                Margin="{DynamicResource SliderTopHeaderMargin}"
-                                TextElement.FontWeight="{DynamicResource SliderHeaderThemeFontWeight}"
-                                TextElement.Foreground="{DynamicResource SliderHeaderForeground}" />
-                            <Grid x:Name="SliderContainer" Grid.Row="1">
-                                <Grid.Styles>
-                                    <Style Selector="TickBar">
-                                        <Setter Property="ReservedSpace" Value="{Binding #PART_Track.Thumb.Bounds}" />
-                                    </Style>
-                                </Grid.Styles>
-                                <Grid
-                                    x:Name="HorizontalTemplate"
-                                    MinHeight="{DynamicResource SliderHorizontalHeight}"
-                                    ColumnDefinitions="Auto,Auto,*">
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition Height="{DynamicResource SliderPreContentMargin}" />
-                                        <RowDefinition Height="Auto" />
-                                        <RowDefinition Height="{DynamicResource SliderPostContentMargin}" />
-                                    </Grid.RowDefinitions>
-                                    <TickBar
-                                        Name="TopTickBar"
-                                        Grid.ColumnSpan="3"
-                                        Ticks="{TemplateBinding Ticks}"
-                                        TickFrequency="{TemplateBinding Slider.TickFrequency}"
-                                        Orientation="{TemplateBinding Slider.Orientation}"
-                                        Minimum="{TemplateBinding Slider.Minimum}"
-                                        Maximum="{TemplateBinding Slider.Maximum}"
-                                        Height="{DynamicResource SliderOutsideTickBarThemeHeight}"
-                                        Margin="0,0,0,4"
-                                        VerticalAlignment="Bottom"
-                                        Placement="Top" />
-                                    <TickBar
-                                        Name="BottomTickBar"
-                                        Grid.Row="2"
-                                        Grid.ColumnSpan="3"
-                                        Ticks="{TemplateBinding Ticks}"
-                                        TickFrequency="{TemplateBinding Slider.TickFrequency}"
-                                        Orientation="{TemplateBinding Slider.Orientation}"
-                                        Minimum="{TemplateBinding Slider.Minimum}"
-                                        Maximum="{TemplateBinding Slider.Maximum}"
-                                        Height="{DynamicResource SliderOutsideTickBarThemeHeight}"
-                                        Margin="0,4,0,0"
-                                        VerticalAlignment="Top"
-                                        Placement="Bottom" />
-                                    <Track
-                                        Name="PART_Track"
-                                        Grid.Row="1"
-                                        Grid.ColumnSpan="3"
-                                        Minimum="{TemplateBinding Minimum}"
-                                        Maximum="{TemplateBinding Maximum}"
-                                        Value="{TemplateBinding Value, Mode=TwoWay}"
-                                        IsDirectionReversed="{TemplateBinding IsDirectionReversed}"
-                                        Orientation="Horizontal">
-                                        <Track.DecreaseButton>
-                                            <RepeatButton
-                                                Name="PART_DecreaseButton"
-                                                HorizontalAlignment="Stretch"
-                                                VerticalAlignment="Stretch"
-                                                Theme="{StaticResource FluentHorizontalSliderDecreaseIncreaseRepeatButtonTheme}"
-                                                Background="{TemplateBinding Foreground}"
-                                                Focusable="False"/>
-                                        </Track.DecreaseButton>
-                                        <Track.IncreaseButton>
-                                            <RepeatButton
-                                                Name="PART_IncreaseButton"
-                                                HorizontalAlignment="Stretch"
-                                                VerticalAlignment="Stretch"
-                                                Theme="{StaticResource FluentHorizontalSliderDecreaseIncreaseRepeatButtonTheme}"
-                                                Background="{TemplateBinding Background}"
-                                                Focusable="False"/>
-                                        </Track.IncreaseButton>
-                                      <Thumb
-                                          Name="thumb"
-                                          Width="{DynamicResource SliderHorizontalThumbWidth}"
-                                          Height="{DynamicResource SliderHorizontalThumbHeight}"
-                                          Margin="0"
-                                          Padding="0"
-                                          BorderThickness="0"
-                                          Classes="SliderThumbStyle"
-                                          Theme="{StaticResource FluentSliderThumbTheme}"
-                                          DataContext="{TemplateBinding Value}"/>
-                                    </Track>
-                                </Grid>
-                            </Grid>
-                        </Grid>
-                    </Border>
-                </DataValidationErrors>
-            </ControlTemplate>
-        </Setter>
+      <Setter Property="Template">
+        <ControlTemplate>
+          <DataValidationErrors>
+            <Border
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+              <Grid
+                  Name="grid"
+                  Margin="{TemplateBinding Padding}"
+                  RowDefinitions="Auto, *">
+                <ContentPresenter
+                    x:Name="HeaderContentPresenter"
+                    Grid.Row="0"
+                    Margin="{DynamicResource SliderTopHeaderMargin}"
+                    TextElement.FontWeight="{DynamicResource SliderHeaderThemeFontWeight}"
+                    TextElement.Foreground="{DynamicResource SliderHeaderForeground}" />
+                <Grid x:Name="SliderContainer" Grid.Row="1">
+                  <Grid.Styles>
+                    <Style Selector="TickBar">
+                      <Setter Property="ReservedSpace" Value="{Binding #PART_Track.Thumb.Bounds}" />
+                    </Style>
+                  </Grid.Styles>
+                  <Grid
+                      x:Name="HorizontalTemplate"
+                      MinHeight="{DynamicResource SliderHorizontalHeight}"
+                      ColumnDefinitions="Auto,Auto,*">
+                    <Grid.RowDefinitions>
+                      <RowDefinition Height="{DynamicResource SliderPreContentMargin}" />
+                      <RowDefinition Height="Auto" />
+                      <RowDefinition Height="{DynamicResource SliderPostContentMargin}" />
+                    </Grid.RowDefinitions>
+                    <TickBar
+                        Name="TopTickBar"
+                        Grid.ColumnSpan="3"
+                        Ticks="{TemplateBinding Ticks}"
+                        TickFrequency="{TemplateBinding Slider.TickFrequency}"
+                        Orientation="{TemplateBinding Slider.Orientation}"
+                        Minimum="{TemplateBinding Slider.Minimum}"
+                        Maximum="{TemplateBinding Slider.Maximum}"
+                        Height="{DynamicResource SliderOutsideTickBarThemeHeight}"
+                        Margin="0,0,0,4"
+                        VerticalAlignment="Bottom"
+                        Placement="Top" />
+                    <TickBar
+                        Name="BottomTickBar"
+                        Grid.Row="2"
+                        Grid.ColumnSpan="3"
+                        Ticks="{TemplateBinding Ticks}"
+                        TickFrequency="{TemplateBinding Slider.TickFrequency}"
+                        Orientation="{TemplateBinding Slider.Orientation}"
+                        Minimum="{TemplateBinding Slider.Minimum}"
+                        Maximum="{TemplateBinding Slider.Maximum}"
+                        Height="{DynamicResource SliderOutsideTickBarThemeHeight}"
+                        Margin="0,4,0,0"
+                        VerticalAlignment="Top"
+                        Placement="Bottom" />
+                    <Track
+                        Name="PART_Track"
+                        Grid.Row="1"
+                        Grid.ColumnSpan="3"
+                        Minimum="{TemplateBinding Minimum}"
+                        Maximum="{TemplateBinding Maximum}"
+                        Value="{TemplateBinding Value, Mode=TwoWay}"
+                        IsDirectionReversed="{TemplateBinding IsDirectionReversed}"
+                        Orientation="Horizontal">
+                      <Track.DecreaseButton>
+                        <RepeatButton
+                            Name="PART_DecreaseButton"
+                            Theme="{StaticResource FluentSliderHorizontalRepeatButton}"
+                            Background="{TemplateBinding Foreground}"
+                            Focusable="False"/>
+                      </Track.DecreaseButton>
+                      <Track.IncreaseButton>
+                        <RepeatButton
+                            Name="PART_IncreaseButton"
+                            Theme="{StaticResource FluentSliderHorizontalRepeatButton}"
+                            Background="{TemplateBinding Background}"
+                            Focusable="False"/>
+                      </Track.IncreaseButton>
+                      <Thumb
+                          Name="thumb"
+                          Width="{DynamicResource SliderHorizontalThumbWidth}"
+                          Height="{DynamicResource SliderHorizontalThumbHeight}"
+                          Margin="0"
+                          Padding="0"
+                          BorderThickness="0"
+                          Theme="{StaticResource FluentSliderThumbTheme}"
+                          DataContext="{TemplateBinding Value}"/>
+                    </Track>
+                  </Grid>
+                </Grid>
+              </Grid>
+            </Border>
+          </DataValidationErrors>
+        </ControlTemplate>
+      </Setter>
     </Style>
     <Style Selector="^:vertical">
-        <Setter Property="Template">
-            <ControlTemplate>
-                <DataValidationErrors>
-                    <Border
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="{TemplateBinding CornerRadius}">
-                        <Grid
-                            Name="grid"
-                            Margin="{TemplateBinding Padding}"
-                            RowDefinitions="Auto, *">
-                            <ContentPresenter
-                                x:Name="HeaderContentPresenter"
-                                Grid.Row="0"
-                                Margin="{DynamicResource SliderTopHeaderMargin}"
-                                TextElement.FontWeight="{DynamicResource SliderHeaderThemeFontWeight}"
-                                TextElement.Foreground="{DynamicResource SliderHeaderForeground}" />
-                            <Grid x:Name="SliderContainer" Grid.Row="1">
-                                <Grid.Styles>
-                                    <Style Selector="TickBar">
-                                        <Setter Property="ReservedSpace" Value="{Binding #PART_Track.Thumb.Bounds}" />
-                                    </Style>
-                                </Grid.Styles>
-                                <Grid
-                                    x:Name="VerticalTemplate"
-                                    MinWidth="{DynamicResource SliderVerticalWidth}"
-                                    RowDefinitions="*,Auto,Auto">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="{DynamicResource SliderPreContentMargin}" />
-                                        <ColumnDefinition Width="Auto" />
-                                        <ColumnDefinition Width="{DynamicResource SliderPostContentMargin}" />
-                                    </Grid.ColumnDefinitions>
-                                    <TickBar
-                                        Name="LeftTickBar"
-                                        Grid.RowSpan="3"
-                                        Ticks="{TemplateBinding Ticks}"
-                                        TickFrequency="{TemplateBinding Slider.TickFrequency}"
-                                        Orientation="{TemplateBinding Slider.Orientation}"
-                                        Minimum="{TemplateBinding Slider.Minimum}"
-                                        Maximum="{TemplateBinding Slider.Maximum}"
-                                        Width="{DynamicResource SliderOutsideTickBarThemeHeight}"
-                                        Margin="0,0,4,0"
-                                        HorizontalAlignment="Right"
-                                        Placement="Left" />
-                                    <TickBar
-                                        Name="RightTickBar"
-                                        Grid.RowSpan="3"
-                                        Grid.Column="2"
-                                        Ticks="{TemplateBinding Ticks}"
-                                        TickFrequency="{TemplateBinding Slider.TickFrequency}"
-                                        Orientation="{TemplateBinding Slider.Orientation}"
-                                        Minimum="{TemplateBinding Slider.Minimum}"
-                                        Maximum="{TemplateBinding Slider.Maximum}"
-                                        Width="{DynamicResource SliderOutsideTickBarThemeHeight}"
-                                        Margin="4,0,0,0"
-                                        HorizontalAlignment="Left"
-                                        Placement="Right" />
-                                    <Track
-                                        Name="PART_Track"
-                                        Grid.RowSpan="3"
-                                        Grid.Column="1"
-                                        Grid.ColumnSpan="1"
-                                        Minimum="{TemplateBinding Minimum}"
-                                        Maximum="{TemplateBinding Maximum}"
-                                        Value="{TemplateBinding Value, Mode=TwoWay}"
-                                        IsDirectionReversed="{TemplateBinding IsDirectionReversed}"
-                                        Orientation="Vertical">
-                                        <Track.DecreaseButton>
-                                            <RepeatButton
-                                                Name="PART_DecreaseButton"
-                                                HorizontalAlignment="Stretch"
-                                                VerticalAlignment="Stretch"
-                                                Theme="{StaticResource FluentVerticalSliderDecreaseIncreaseRepeatButtonTheme}"
-                                                Background="{TemplateBinding Foreground}"
-                                                Focusable="False"/>
-                                        </Track.DecreaseButton>
-                                        <Track.IncreaseButton>
-                                            <RepeatButton
-                                                Name="PART_IncreaseButton"
-                                                HorizontalAlignment="Stretch"
-                                                VerticalAlignment="Stretch"
-                                                Background="{TemplateBinding Background}"
-                                                Theme="{StaticResource FluentVerticalSliderDecreaseIncreaseRepeatButtonTheme}"
-                                                Focusable="False"/>
-                                        </Track.IncreaseButton>
-                                        <Thumb
-                                            Name="SliderThumb"
-                                            Width="{DynamicResource SliderVerticalThumbWidth}"
-                                            Height="{DynamicResource SliderVerticalThumbHeight}"
-                                            Margin="0"
-                                            Padding="0"
-                                            BorderThickness="0"
-                                            Classes="SliderThumbStyle"
-                                            Theme="{StaticResource FluentSliderThumbTheme}"
-                                            DataContext="{TemplateBinding Value}" />
-                                    </Track>
-                                </Grid>
-                            </Grid>
-                        </Grid>
-                    </Border>
-                </DataValidationErrors>
-            </ControlTemplate>
-        </Setter>
+      <Setter Property="Template">
+        <ControlTemplate>
+          <DataValidationErrors>
+            <Border
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+              <Grid
+                  Name="grid"
+                  Margin="{TemplateBinding Padding}"
+                  RowDefinitions="Auto, *">
+                <ContentPresenter
+                    x:Name="HeaderContentPresenter"
+                    Grid.Row="0"
+                    Margin="{DynamicResource SliderTopHeaderMargin}"
+                    TextElement.FontWeight="{DynamicResource SliderHeaderThemeFontWeight}"
+                    TextElement.Foreground="{DynamicResource SliderHeaderForeground}" />
+                <Grid x:Name="SliderContainer" Grid.Row="1">
+                  <Grid.Styles>
+                    <Style Selector="TickBar">
+                      <Setter Property="ReservedSpace" Value="{Binding #PART_Track.Thumb.Bounds}" />
+                    </Style>
+                  </Grid.Styles>
+                  <Grid
+                      x:Name="VerticalTemplate"
+                      MinWidth="{DynamicResource SliderVerticalWidth}"
+                      RowDefinitions="*,Auto,Auto">
+                    <Grid.ColumnDefinitions>
+                      <ColumnDefinition Width="{DynamicResource SliderPreContentMargin}" />
+                      <ColumnDefinition Width="Auto" />
+                      <ColumnDefinition Width="{DynamicResource SliderPostContentMargin}" />
+                    </Grid.ColumnDefinitions>
+                    <TickBar
+                        Name="LeftTickBar"
+                        Grid.RowSpan="3"
+                        Ticks="{TemplateBinding Ticks}"
+                        TickFrequency="{TemplateBinding Slider.TickFrequency}"
+                        Orientation="{TemplateBinding Slider.Orientation}"
+                        Minimum="{TemplateBinding Slider.Minimum}"
+                        Maximum="{TemplateBinding Slider.Maximum}"
+                        Width="{DynamicResource SliderOutsideTickBarThemeHeight}"
+                        Margin="0,0,4,0"
+                        HorizontalAlignment="Right"
+                        Placement="Left" />
+                    <TickBar
+                        Name="RightTickBar"
+                        Grid.RowSpan="3"
+                        Grid.Column="2"
+                        Ticks="{TemplateBinding Ticks}"
+                        TickFrequency="{TemplateBinding Slider.TickFrequency}"
+                        Orientation="{TemplateBinding Slider.Orientation}"
+                        Minimum="{TemplateBinding Slider.Minimum}"
+                        Maximum="{TemplateBinding Slider.Maximum}"
+                        Width="{DynamicResource SliderOutsideTickBarThemeHeight}"
+                        Margin="4,0,0,0"
+                        HorizontalAlignment="Left"
+                        Placement="Right" />
+                    <Track
+                        Name="PART_Track"
+                        Grid.RowSpan="3"
+                        Grid.Column="1"
+                        Grid.ColumnSpan="1"
+                        Minimum="{TemplateBinding Minimum}"
+                        Maximum="{TemplateBinding Maximum}"
+                        Value="{TemplateBinding Value, Mode=TwoWay}"
+                        IsDirectionReversed="{TemplateBinding IsDirectionReversed}"
+                        Orientation="Vertical">
+                      <Track.DecreaseButton>
+                        <RepeatButton
+                            Name="PART_DecreaseButton"
+                            Theme="{StaticResource FluentSliderVerticalRepeatButton}"
+                            Background="{TemplateBinding Foreground}"
+                            Focusable="False"/>
+                      </Track.DecreaseButton>
+                      <Track.IncreaseButton>
+                        <RepeatButton
+                            Name="PART_IncreaseButton"
+                            Background="{TemplateBinding Background}"
+                            Theme="{StaticResource FluentSliderVerticalRepeatButton}"
+                            Focusable="False"/>
+                      </Track.IncreaseButton>
+                      <Thumb
+                          Name="SliderThumb"
+                          Width="{DynamicResource SliderVerticalThumbWidth}"
+                          Height="{DynamicResource SliderVerticalThumbHeight}"
+                          Margin="0"
+                          Padding="0"
+                          BorderThickness="0"
+                          Theme="{StaticResource FluentSliderThumbTheme}"
+                          DataContext="{TemplateBinding Value}" />
+                    </Track>
+                  </Grid>
+                </Grid>
+              </Grid>
+            </Border>
+          </DataValidationErrors>
+        </ControlTemplate>
+      </Setter>
     </Style>
 
     <!--  Normal State  -->
 
-    <Style Selector="^ /template/ Thumb.SliderThumbStyle">
+    <Style Selector="^ /template/ Thumb">
       <Setter Property="Background" Value="{DynamicResource SliderThumbBackground}" />
     </Style>
     <Style Selector="^ /template/ Grid#SliderContainer">
@@ -297,19 +301,19 @@
     <!--  TickBar Placement States  -->
 
     <Style Selector="^[TickPlacement=TopLeft] /template/ TickBar#LeftTickBar, ^[TickPlacement=Outside] /template/ TickBar#LeftTickBar">
-        <Setter Property="IsVisible" Value="True" />
+      <Setter Property="IsVisible" Value="True" />
     </Style>
 
     <Style Selector="^[TickPlacement=TopLeft] /template/ TickBar#TopTickBar, ^[TickPlacement=Outside] /template/ TickBar#TopTickBar">
-        <Setter Property="IsVisible" Value="True" />
+      <Setter Property="IsVisible" Value="True" />
     </Style>
 
     <Style Selector="^[TickPlacement=BottomRight] /template/ TickBar#BottomTickBar, ^[TickPlacement=Outside] /template/ TickBar#BottomTickBar">
-        <Setter Property="IsVisible" Value="True" />
+      <Setter Property="IsVisible" Value="True" />
     </Style>
 
     <Style Selector="^[TickPlacement=BottomRight] /template/ TickBar#RightTickBar, ^[TickPlacement=Outside] /template/ TickBar#RightTickBar">
-        <Setter Property="IsVisible" Value="True" />
+      <Setter Property="IsVisible" Value="True" />
     </Style>
 
     <!--  Disabled State  -->
@@ -326,7 +330,7 @@
         <Setter Property="Background" Value="{DynamicResource SliderTrackFillDisabled}" />
       </Style>
 
-      <Style Selector="^ /template/ Thumb.SliderThumbStyle">
+      <Style Selector="^ /template/ Thumb">
         <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundDisabled}" />
       </Style>
 
@@ -344,18 +348,18 @@
         <Setter Property="Background" Value="{DynamicResource SliderTrackFillPointerOver}" />
       </Style>
 
-      <Style Selector="^ /template/ Thumb.SliderThumbStyle">
-          <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPointerOver}" />
+      <Style Selector="^ /template/ Thumb">
+        <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPointerOver}" />
       </Style>
 
       <Style Selector="^ /template/ Grid#SliderContainer">
-          <Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundPointerOver}" />
+        <Setter Property="Background" Value="{DynamicResource SliderContainerBackgroundPointerOver}" />
       </Style>
 
       <Style Selector="^ /template/ RepeatButton#PART_DecreaseButton">
-          <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillPointerOver}" />
+        <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillPointerOver}" />
       </Style>
-    
+
     </Style>
 
     <!--  Pressed State  -->
@@ -370,14 +374,14 @@
         <Setter Property="Background" Value="{DynamicResource SliderTrackFillPressed}" />
       </Style>
 
-      <Style Selector="^ /template/ Thumb.SliderThumbStyle">
+      <Style Selector="^ /template/ Thumb">
         <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundPressed}" />
       </Style>
     </Style>
 
     <Style Selector="^:error">
       <Setter Property="Foreground" Value="{DynamicResource SystemControlErrorTextForegroundBrush}" />
-      <Style Selector="^ /template/ Thumb.SliderThumbStyle">
+      <Style Selector="^ /template/ Thumb">
         <Setter Property="Background" Value="{DynamicResource SystemControlErrorTextForegroundBrush}" />
       </Style>
     </Style>

From e5f70deab03fea424de8b06a98c4e50f23eecde6 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 8 Jul 2022 16:04:37 +0200
Subject: [PATCH 078/240] Formatted TabControl ControlTheme.

---
 .../Controls/TabControl.xaml                  | 111 +++++++++---------
 1 file changed, 54 insertions(+), 57 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/TabControl.xaml b/src/Avalonia.Themes.Fluent/Controls/TabControl.xaml
index 1cc31f8e15..17d179e0cd 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TabControl.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TabControl.xaml
@@ -1,63 +1,60 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Design.PreviewWith>
-      <Border Width="400">
-        <TabControl>
-          <TabItem Header="Arch">
-            <Border Background="AntiqueWhite"
-                    Height="100">
-              <TextBlock Text="Content" Foreground="Black" FontSize="20"/>
-            </Border>
-          </TabItem>
-          <TabItem Header="Leaf">
-            <Border Background="Green"
-                    Height="100" />
-          </TabItem>
-          <TabItem Header="Disabled"
-                   IsEnabled="False" />
-        </TabControl>
-      </Border>
-    </Design.PreviewWith>
+  <Design.PreviewWith>
+    <Border Width="400">
+      <TabControl>
+        <TabItem Header="Arch">
+          <Border Background="AntiqueWhite" Height="100">
+            <TextBlock Text="Content" Foreground="Black" FontSize="20"/>
+          </Border>
+        </TabItem>
+        <TabItem Header="Leaf">
+          <Border Background="Green" Height="100" />
+        </TabItem>
+        <TabItem Header="Disabled" IsEnabled="False" />
+      </TabControl>
+    </Border>
+  </Design.PreviewWith>
 
-    <Thickness x:Key="TabControlTopPlacementItemMargin">0 0 0 2</Thickness>
+  <Thickness x:Key="TabControlTopPlacementItemMargin">0 0 0 2</Thickness>
 
-    <ControlTheme x:Key="{x:Type TabControl}" TargetType="TabControl">
-      <Setter Property="Margin" Value="0" />
-      <Setter Property="Padding" Value="{DynamicResource TabItemMargin}" />
-      <Setter Property="Background" Value="{DynamicResource TabControlBackground}" />
-      <Setter Property="Template">
-        <ControlTemplate>
-          <Border BorderBrush="{TemplateBinding BorderBrush}"
-                  BorderThickness="{TemplateBinding BorderThickness}"
-                  CornerRadius="{TemplateBinding CornerRadius}"
-                  Background="{TemplateBinding Background}"
-                  HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                  VerticalAlignment="{TemplateBinding VerticalAlignment}">
-            <DockPanel>
-              <ItemsPresenter Name="PART_ItemsPresenter"
-                              Items="{TemplateBinding Items}"
-                              ItemsPanel="{TemplateBinding ItemsPanel}"
-                              ItemTemplate="{TemplateBinding ItemTemplate}"
-                              DockPanel.Dock="{TemplateBinding TabStripPlacement}" />
-              <ContentPresenter Name="PART_SelectedContentHost"
-                                Margin="{TemplateBinding Padding}"
-                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                Content="{TemplateBinding SelectedContent}"
-                                ContentTemplate="{TemplateBinding SelectedContentTemplate}" />
-            </DockPanel>
-          </Border>
-        </ControlTemplate>
-      </Setter>
+  <ControlTheme x:Key="{x:Type TabControl}" TargetType="TabControl">
+    <Setter Property="Margin" Value="0" />
+    <Setter Property="Padding" Value="{DynamicResource TabItemMargin}" />
+    <Setter Property="Background" Value="{DynamicResource TabControlBackground}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}"
+                Background="{TemplateBinding Background}"
+                HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                VerticalAlignment="{TemplateBinding VerticalAlignment}">
+          <DockPanel>
+            <ItemsPresenter Name="PART_ItemsPresenter"
+                            Items="{TemplateBinding Items}"
+                            ItemsPanel="{TemplateBinding ItemsPanel}"
+                            ItemTemplate="{TemplateBinding ItemTemplate}"
+                            DockPanel.Dock="{TemplateBinding TabStripPlacement}" />
+            <ContentPresenter Name="PART_SelectedContentHost"
+                              Margin="{TemplateBinding Padding}"
+                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                              Content="{TemplateBinding SelectedContent}"
+                              ContentTemplate="{TemplateBinding SelectedContentTemplate}" />
+          </DockPanel>
+        </Border>
+      </ControlTemplate>
+    </Setter>
 
-      <Style Selector="^[TabStripPlacement=Left] /template/ ItemsPresenter#PART_ItemsPresenter > WrapPanel">
-        <Setter Property="Orientation" Value="Vertical" />
-      </Style>
-      <Style Selector="^[TabStripPlacement=Right] /template/ ItemsPresenter#PART_ItemsPresenter > WrapPanel">
-        <Setter Property="Orientation" Value="Vertical" />
-      </Style>
-      <Style Selector="^[TabStripPlacement=Top] /template/ ItemsPresenter#PART_ItemsPresenter">
-        <Setter Property="Margin" Value="{DynamicResource TabControlTopPlacementItemMargin}" />
-      </Style>
-    </ControlTheme>
+    <Style Selector="^[TabStripPlacement=Left] /template/ ItemsPresenter#PART_ItemsPresenter > WrapPanel">
+      <Setter Property="Orientation" Value="Vertical" />
+    </Style>
+    <Style Selector="^[TabStripPlacement=Right] /template/ ItemsPresenter#PART_ItemsPresenter > WrapPanel">
+      <Setter Property="Orientation" Value="Vertical" />
+    </Style>
+    <Style Selector="^[TabStripPlacement=Top] /template/ ItemsPresenter#PART_ItemsPresenter">
+      <Setter Property="Margin" Value="{DynamicResource TabControlTopPlacementItemMargin}" />
+    </Style>
+  </ControlTheme>
 </ResourceDictionary>

From 27abe8200987ac1ab627549f3642d1f9353e9e18 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 8 Jul 2022 16:15:06 +0200
Subject: [PATCH 079/240] Twaked TabItem ControlTheme.

---
 .../Controls/TabItem.xaml                     | 230 +++++++++---------
 1 file changed, 113 insertions(+), 117 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/TabItem.xaml b/src/Avalonia.Themes.Fluent/Controls/TabItem.xaml
index 110ffc2f48..e323be72e2 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TabItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TabItem.xaml
@@ -2,132 +2,128 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:CompileBindings="True">
-     <Design.PreviewWith>
-      <Border Padding="20">
-        <StackPanel Spacing="20">
-          <TabItem Header="Leaf" />
-          <TabItem Header="Arch" IsSelected="True" />
-        </StackPanel>
-      </Border>
-    </Design.PreviewWith>
-  
-    <x:Double x:Key="TabItemMinHeight">48</x:Double>
-    <x:Double x:Key="TabItemVerticalPipeHeight">24</x:Double>
-    <x:Double x:Key="TabItemPipeThickness">2</x:Double>
+  <Design.PreviewWith>
+    <Border Padding="20">
+      <StackPanel Spacing="20">
+        <TabItem Header="Leaf" />
+        <TabItem Header="Arch" IsSelected="True" />
+        <TabItem Header="Background" Background="Yellow"/>
+      </StackPanel>
+    </Border>
+  </Design.PreviewWith>
 
-    <ControlTheme x:Key="{x:Type TabItem}" TargetType="TabItem">
-        <Setter Property="FontSize" Value="{DynamicResource TabItemHeaderFontSize}" />
-        <Setter Property="FontWeight" Value="{DynamicResource TabItemHeaderThemeFontWeight}" />
-        <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundUnselected}" />
-        <Setter Property="Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselected}" />
-        <Setter Property="Padding" Value="{DynamicResource TabItemHeaderMargin}" />
-        <Setter Property="Margin" Value="0" />
-        <Setter Property="MinHeight" Value="{DynamicResource TabItemMinHeight}" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="Template">
-            <ControlTemplate>
-                <Border
-                    Name="PART_LayoutRoot"
-                    Padding="{TemplateBinding Padding}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    CornerRadius="{TemplateBinding CornerRadius}">
-                    <Panel>
-                        <ContentPresenter
-                            Name="PART_ContentPresenter"
-                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                            Content="{TemplateBinding Header}"
-                            ContentTemplate="{TemplateBinding HeaderTemplate}"
-                            FontFamily="{TemplateBinding FontFamily}"
-                            FontSize="{TemplateBinding FontSize}"
-                            FontWeight="{TemplateBinding FontWeight}" />
-                        <Border Name="PART_SelectedPipe" Background="{DynamicResource TabItemHeaderSelectedPipeFill}" />
-                    </Panel>
-                </Border>
-            </ControlTemplate>
-        </Setter>
+  <x:Double x:Key="TabItemMinHeight">48</x:Double>
+  <x:Double x:Key="TabItemVerticalPipeHeight">24</x:Double>
+  <x:Double x:Key="TabItemPipeThickness">2</x:Double>
 
-        <!--  Nornal state  -->
-        <Style Selector="^ /template/ Border#PART_LayoutRoot">
-            <Setter Property="Background" Value="{Binding $parent[TabItem].Background}" />
-        </Style>
-        <Style Selector="^ /template/ Border#PART_SelectedPipe">
-            <Setter Property="IsVisible" Value="False" />
-            <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-        </Style>
+  <ControlTheme x:Key="{x:Type TabItem}" TargetType="TabItem">
+    <Setter Property="FontSize" Value="{DynamicResource TabItemHeaderFontSize}" />
+    <Setter Property="FontWeight" Value="{DynamicResource TabItemHeaderThemeFontWeight}" />
+    <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundUnselected}" />
+    <Setter Property="Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselected}" />
+    <Setter Property="Padding" Value="{DynamicResource TabItemHeaderMargin}" />
+    <Setter Property="Margin" Value="0" />
+    <Setter Property="MinHeight" Value="{DynamicResource TabItemMinHeight}" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border
+            Name="PART_LayoutRoot"            
+            Background="{TemplateBinding Background}"
+            BorderBrush="{TemplateBinding BorderBrush}"
+            BorderThickness="{TemplateBinding BorderThickness}"
+            CornerRadius="{TemplateBinding CornerRadius}"
+            Padding="{TemplateBinding Padding}">
+          <Panel>
+            <ContentPresenter
+                Name="PART_ContentPresenter"
+                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                Content="{TemplateBinding Header}"
+                ContentTemplate="{TemplateBinding HeaderTemplate}"
+                FontFamily="{TemplateBinding FontFamily}"
+                FontSize="{TemplateBinding FontSize}"
+                FontWeight="{TemplateBinding FontWeight}" />
+            <Border Name="PART_SelectedPipe"
+                    Background="{DynamicResource TabItemHeaderSelectedPipeFill}"
+                    CornerRadius="{DynamicResource ControlCornerRadius}"
+                    IsVisible="False"/>
+          </Panel>
+        </Border>
+      </ControlTemplate>
+    </Setter>
 
-        <!--  Selected state  -->
-        <!--  We don't use selector to PART_LayoutRoot, so developer can override selected item background with TabStripItem.Background  -->
-        <Style Selector="^:selected">
-            <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundSelected}" />
-            <Setter Property="Foreground" Value="{DynamicResource TabItemHeaderForegroundSelected}" />
-        </Style>
-        <Style Selector="^:selected /template/ Border#PART_SelectedPipe">
-            <Setter Property="IsVisible" Value="True" />
-        </Style>
+    <!--  Selected state  -->
+    <!--  We don't use selector to PART_LayoutRoot, so developer can override selected item background with TabStripItem.Background  -->
+    <Style Selector="^:selected">
+      <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundSelected}" />
+      <Setter Property="Foreground" Value="{DynamicResource TabItemHeaderForegroundSelected}" />
+    </Style>
+    <Style Selector="^:selected /template/ Border#PART_SelectedPipe">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
 
-        <!--  PointerOver state  -->
-        <Style Selector="^:pointerover /template/ Border#PART_LayoutRoot">
-            <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundUnselectedPointerOver}" />
-            <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPointerOver}" />
-        </Style>
+    <!--  PointerOver state  -->
+    <Style Selector="^:pointerover /template/ Border#PART_LayoutRoot">
+      <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundUnselectedPointerOver}" />
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPointerOver}" />
+    </Style>
 
-        <!--  Selected PointerOver state  -->
-        <Style Selector="^:selected:pointerover /template/ Border#PART_LayoutRoot">
-            <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundSelectedPointerOver}" />
-            <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundSelectedPointerOver}" />
-        </Style>
+    <!--  Selected PointerOver state  -->
+    <Style Selector="^:selected:pointerover /template/ Border#PART_LayoutRoot">
+      <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundSelectedPointerOver}" />
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundSelectedPointerOver}" />
+    </Style>
 
-        <!--  Pressed state  -->
-        <Style Selector="^:pressed /template/ Border#PART_LayoutRoot">
-            <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundUnselectedPressed}" />
-            <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPressed}" />
-        </Style>
+    <!--  Pressed state  -->
+    <Style Selector="^:pressed /template/ Border#PART_LayoutRoot">
+      <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundUnselectedPressed}" />
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPressed}" />
+    </Style>
 
-        <!--  Selected Pressed state  -->
-        <Style Selector="^:selected:pressed /template/ Border#PART_LayoutRoot">
-            <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundSelectedPressed}" />
-            <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundSelectedPressed}" />
-        </Style>
+    <!--  Selected Pressed state  -->
+    <Style Selector="^:selected:pressed /template/ Border#PART_LayoutRoot">
+      <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundSelectedPressed}" />
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundSelectedPressed}" />
+    </Style>
 
-        <!--  Disabled state  -->
-        <Style Selector="^:disabled /template/ Border#PART_LayoutRoot">
-            <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundDisabled}" />
-            <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundDisabled}" />
-        </Style>
+    <!--  Disabled state  -->
+    <Style Selector="^:disabled /template/ Border#PART_LayoutRoot">
+      <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundDisabled}" />
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundDisabled}" />
+    </Style>
 
-        <!--  TabStripPlacement States Group  -->
-        <Style Selector="^[TabStripPlacement=Left] /template/ Border#PART_SelectedPipe">
-            <Setter Property="Width" Value="{DynamicResource TabItemPipeThickness}" />
-            <Setter Property="Height" Value="{DynamicResource TabItemVerticalPipeHeight}" />
-            <Setter Property="Margin" Value="0,0,2,0" />
-            <Setter Property="HorizontalAlignment" Value="Left" />
-            <Setter Property="VerticalAlignment" Value="Center" />
-        </Style>
-        <Style Selector="^[TabStripPlacement=Left] /template/ ContentPresenter#PART_ContentPresenter">
-            <Setter Property="Margin" Value="8,0,0,0" />
-        </Style>
+    <!--  TabStripPlacement States Group  -->
+    <Style Selector="^[TabStripPlacement=Left] /template/ Border#PART_SelectedPipe">
+      <Setter Property="Width" Value="{DynamicResource TabItemPipeThickness}" />
+      <Setter Property="Height" Value="{DynamicResource TabItemVerticalPipeHeight}" />
+      <Setter Property="Margin" Value="0,0,2,0" />
+      <Setter Property="HorizontalAlignment" Value="Left" />
+      <Setter Property="VerticalAlignment" Value="Center" />
+    </Style>
+    <Style Selector="^[TabStripPlacement=Left] /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Margin" Value="8,0,0,0" />
+    </Style>
 
-        <Style Selector="^[TabStripPlacement=Top] /template/ Border#PART_SelectedPipe, ^[TabStripPlacement=Bottom] /template/ Border#PART_SelectedPipe">
-            <Setter Property="Height" Value="{DynamicResource TabItemPipeThickness}" />
-            <Setter Property="Margin" Value="0,0,0,2" />
-            <Setter Property="HorizontalAlignment" Value="Stretch" />
-            <Setter Property="VerticalAlignment" Value="Bottom" />
-        </Style>
+    <Style Selector="^[TabStripPlacement=Top] /template/ Border#PART_SelectedPipe, ^[TabStripPlacement=Bottom] /template/ Border#PART_SelectedPipe">
+      <Setter Property="Height" Value="{DynamicResource TabItemPipeThickness}" />
+      <Setter Property="Margin" Value="0,0,0,2" />
+      <Setter Property="HorizontalAlignment" Value="Stretch" />
+      <Setter Property="VerticalAlignment" Value="Bottom" />
+    </Style>
 
-        <Style Selector="^[TabStripPlacement=Right] /template/ Border#PART_SelectedPipe">
-            <Setter Property="Width" Value="{DynamicResource TabItemPipeThickness}" />
-            <Setter Property="Height" Value="{DynamicResource TabItemVerticalPipeHeight}" />
-            <Setter Property="Margin" Value="2,0,0,0" />
-            <Setter Property="HorizontalAlignment" Value="Right" />
-            <Setter Property="VerticalAlignment" Value="Center" />
-        </Style>
-        <Style Selector="^[TabStripPlacement=Right] /template/ ContentPresenter#PART_ContentPresenter">
-            <Setter Property="Margin" Value="0,0,8,0" />
-        </Style>
-        <Style Selector="^[TabStripPlacement=Right]">
-            <Setter Property="HorizontalContentAlignment" Value="Right" />
-        </Style>
-    </ControlTheme>
+    <Style Selector="^[TabStripPlacement=Right] /template/ Border#PART_SelectedPipe">
+      <Setter Property="Width" Value="{DynamicResource TabItemPipeThickness}" />
+      <Setter Property="Height" Value="{DynamicResource TabItemVerticalPipeHeight}" />
+      <Setter Property="Margin" Value="2,0,0,0" />
+      <Setter Property="HorizontalAlignment" Value="Right" />
+      <Setter Property="VerticalAlignment" Value="Center" />
+    </Style>
+    <Style Selector="^[TabStripPlacement=Right] /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Margin" Value="0,0,8,0" />
+    </Style>
+    <Style Selector="^[TabStripPlacement=Right]">
+      <Setter Property="HorizontalContentAlignment" Value="Right" />
+    </Style>
+  </ControlTheme>
 </ResourceDictionary>

From 1af445893abf5d66af80bedd05d932e8e0febe44 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 8 Jul 2022 16:20:33 +0200
Subject: [PATCH 080/240] Tweaked TabStrip/Item ControlTemplates.

---
 .../Controls/TabStrip.xaml                    |  62 +++---
 .../Controls/TabStripItem.xaml                | 180 +++++++++---------
 2 files changed, 116 insertions(+), 126 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/TabStrip.xaml b/src/Avalonia.Themes.Fluent/Controls/TabStrip.xaml
index 15c3ba2f37..59cb7f6752 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TabStrip.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TabStrip.xaml
@@ -1,34 +1,34 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Design.PreviewWith>
-      <Border Padding="20">
-        <TabStrip>
-          <TabStripItem>Item 1</TabStripItem>
-          <TabStripItem>Item 2</TabStripItem>
-          <TabStripItem IsEnabled="False">Disabled</TabStripItem>
-        </TabStrip>
-      </Border>
-    </Design.PreviewWith>
-  
-    <ControlTheme x:Key="{x:Type TabStrip}" TargetType="TabStrip">
-      <Setter Property="Template">
-        <ControlTemplate>
-          <Border Background="{TemplateBinding Background}"
-                  BorderBrush="{TemplateBinding BorderBrush}"
-                  BorderThickness="{TemplateBinding BorderThickness}"
-                  CornerRadius="{TemplateBinding CornerRadius}"
-                  Padding="{TemplateBinding Padding}">
-            <ItemsPresenter Name="PART_ItemsPresenter"
-                            Items="{TemplateBinding Items}"
-                            ItemsPanel="{TemplateBinding ItemsPanel}"
-                            ItemTemplate="{TemplateBinding ItemTemplate}" />
-          </Border>
-        </ControlTemplate>
-      </Setter>
-      <Setter Property="ItemsPanel">
-        <ItemsPanelTemplate>
-          <WrapPanel />
-        </ItemsPanelTemplate>
-      </Setter>
-    </ControlTheme>
+  <Design.PreviewWith>
+    <Border Padding="20">
+      <TabStrip>
+        <TabStripItem>Item 1</TabStripItem>
+        <TabStripItem>Item 2</TabStripItem>
+        <TabStripItem IsEnabled="False">Disabled</TabStripItem>
+      </TabStrip>
+    </Border>
+  </Design.PreviewWith>
+
+  <ControlTheme x:Key="{x:Type TabStrip}" TargetType="TabStrip">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}"
+                Padding="{TemplateBinding Padding}">
+          <ItemsPresenter Name="PART_ItemsPresenter"
+                          Items="{TemplateBinding Items}"
+                          ItemsPanel="{TemplateBinding ItemsPanel}"
+                          ItemTemplate="{TemplateBinding ItemTemplate}" />
+        </Border>
+      </ControlTemplate>
+    </Setter>
+    <Setter Property="ItemsPanel">
+      <ItemsPanelTemplate>
+        <WrapPanel />
+      </ItemsPanelTemplate>
+    </Setter>
+  </ControlTheme>
 </ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/TabStripItem.xaml b/src/Avalonia.Themes.Fluent/Controls/TabStripItem.xaml
index 5ccd430d33..fab8ba87aa 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TabStripItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TabStripItem.xaml
@@ -2,107 +2,97 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:CompileBindings="True">
-     <Design.PreviewWith>
-      <Border Padding="20">
-        <StackPanel Spacing="20">
-          <TabStripItem>Leaf</TabStripItem>
-          <TabStripItem IsSelected="True">Arch</TabStripItem>
-        </StackPanel>
-      </Border>
-    </Design.PreviewWith>
-  
-    <x:Double x:Key="TabStripItemMinHeight">48</x:Double>
-    <x:Double x:Key="TabStripItemPipeThickness">2</x:Double>
+  <Design.PreviewWith>
+    <Border Padding="20">
+      <StackPanel Spacing="20">
+        <TabStripItem>Leaf</TabStripItem>
+        <TabStripItem IsSelected="True">Arch</TabStripItem>
+        <TabStripItem Background="Yellow">Background</TabStripItem>
+      </StackPanel>
+    </Border>
+  </Design.PreviewWith>
 
-    <ControlTheme x:Key="{x:Type TabStripItem}" TargetType="TabStripItem">
-        <Setter Property="FontSize" Value="{DynamicResource TabItemHeaderFontSize}" />
-        <Setter Property="FontWeight" Value="{DynamicResource TabItemHeaderThemeFontWeight}" />
-        <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundUnselected}" />
-        <Setter Property="Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselected}" />
-        <Setter Property="Padding" Value="{DynamicResource TabItemHeaderMargin}" />
-        <Setter Property="Margin" Value="0" />
-        <Setter Property="MinHeight" Value="{DynamicResource TabStripItemMinHeight}" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="Template">
-            <ControlTemplate>
-                <Border
-                    Name="PART_LayoutRoot"
-                    Padding="{TemplateBinding Padding}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    CornerRadius="{TemplateBinding CornerRadius}">
-                    <Panel>
-                        <ContentPresenter
-                            Name="PART_ContentPresenter"
-                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                            Content="{TemplateBinding Content}"
-                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                            FontFamily="{TemplateBinding FontFamily}"
-                            FontSize="{TemplateBinding FontSize}"
-                            FontWeight="{TemplateBinding FontWeight}" />
-                        <Border Name="PART_SelectedPipe" Background="{DynamicResource TabItemHeaderSelectedPipeFill}" />
-                    </Panel>
-                </Border>
-            </ControlTemplate>
-        </Setter>
+  <x:Double x:Key="TabStripItemMinHeight">48</x:Double>
+  <x:Double x:Key="TabStripItemPipeThickness">2</x:Double>
 
-        <Style Selector="^ /template/ Border#PART_SelectedPipe">
-            <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-        </Style>
+  <ControlTheme x:Key="{x:Type TabStripItem}" TargetType="TabStripItem">
+    <Setter Property="FontSize" Value="{DynamicResource TabItemHeaderFontSize}" />
+    <Setter Property="FontWeight" Value="{DynamicResource TabItemHeaderThemeFontWeight}" />
+    <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundUnselected}" />
+    <Setter Property="Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselected}" />
+    <Setter Property="Padding" Value="{DynamicResource TabItemHeaderMargin}" />
+    <Setter Property="Margin" Value="0" />
+    <Setter Property="MinHeight" Value="{DynamicResource TabStripItemMinHeight}" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border
+            Name="PART_LayoutRoot"
+            Background="{TemplateBinding Background}"
+            BorderBrush="{TemplateBinding BorderBrush}"
+            BorderThickness="{TemplateBinding BorderThickness}"
+            CornerRadius="{TemplateBinding CornerRadius}"
+            Padding="{TemplateBinding Padding}">
+          <Panel>
+            <ContentPresenter
+                Name="PART_ContentPresenter"
+                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                Content="{TemplateBinding Content}"
+                ContentTemplate="{TemplateBinding ContentTemplate}"
+                FontFamily="{TemplateBinding FontFamily}"
+                FontSize="{TemplateBinding FontSize}"
+                FontWeight="{TemplateBinding FontWeight}" />
+            <Border Name="PART_SelectedPipe"
+                    Background="{DynamicResource TabItemHeaderSelectedPipeFill}"
+                    CornerRadius="{DynamicResource ControlCornerRadius}"
+                    Height="{DynamicResource TabStripItemPipeThickness}"
+                    IsVisible="False"
+                    Margin="0,0,0,2"
+                    VerticalAlignment="Bottom"/>
+          </Panel>
+        </Border>
+      </ControlTemplate>
+    </Setter>
 
-        <!--  Nornal state  -->
-        <Style Selector="^ /template/ Border#PART_LayoutRoot">
-            <Setter Property="Background" Value="{Binding $parent[TabStripItem].Background}" />
-        </Style>
-        <Style Selector="^ /template/ Border#PART_SelectedPipe">
-            <Setter Property="IsVisible" Value="False" />
-        </Style>
-        <Style Selector="^ /template/ Border#PART_SelectedPipe">
-            <Setter Property="Height" Value="{DynamicResource TabStripItemPipeThickness}" />
-            <Setter Property="Margin" Value="0,0,0,2" />
-            <Setter Property="HorizontalAlignment" Value="Stretch" />
-            <Setter Property="VerticalAlignment" Value="Bottom" />
-        </Style>
+    <!--  Selected state  -->
+    <!--  We don't use selector to PART_LayoutRoot, so developer can override selected item background with TabStripItem.Background  -->
+    <Style Selector="^:selected">
+      <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundSelected}" />
+      <Setter Property="Foreground" Value="{DynamicResource TabItemHeaderForegroundSelected}" />
+    </Style>
+    <Style Selector="^:selected /template/ Border#PART_SelectedPipe">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
 
-        <!--  Selected state  -->
-        <!--  We don't use selector to PART_LayoutRoot, so developer can override selected item background with TabStripItem.Background  -->
-        <Style Selector="^:selected">
-            <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundSelected}" />
-            <Setter Property="Foreground" Value="{DynamicResource TabItemHeaderForegroundSelected}" />
-        </Style>
-        <Style Selector="^:selected /template/ Border#PART_SelectedPipe">
-            <Setter Property="IsVisible" Value="True" />
-        </Style>
+    <!--  PointerOver state  -->
+    <Style Selector="^:pointerover /template/ Border#PART_LayoutRoot">
+      <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundUnselectedPointerOver}" />
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPointerOver}" />
+    </Style>
 
-        <!--  PointerOver state  -->
-        <Style Selector="^:pointerover /template/ Border#PART_LayoutRoot">
-            <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundUnselectedPointerOver}" />
-            <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPointerOver}" />
-        </Style>
+    <!--  Selected PointerOver state  -->
+    <Style Selector="^:selected:pointerover /template/ Border#PART_LayoutRoot">
+      <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundSelectedPointerOver}" />
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundSelectedPointerOver}" />
+    </Style>
 
-        <!--  Selected PointerOver state  -->
-        <Style Selector="^:selected:pointerover /template/ Border#PART_LayoutRoot">
-            <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundSelectedPointerOver}" />
-            <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundSelectedPointerOver}" />
-        </Style>
+    <!--  Pressed state  -->
+    <Style Selector="^:pressed /template/ Border#PART_LayoutRoot">
+      <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundUnselectedPressed}" />
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPressed}" />
+    </Style>
 
-        <!--  Pressed state  -->
-        <Style Selector="^:pressed /template/ Border#PART_LayoutRoot">
-            <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundUnselectedPressed}" />
-            <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPressed}" />
-        </Style>
+    <!--  Selected Pressed state  -->
+    <Style Selector="^:selected:pressed /template/ Border#PART_LayoutRoot">
+      <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundSelectedPressed}" />
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundSelectedPressed}" />
+    </Style>
 
-        <!--  Selected Pressed state  -->
-        <Style Selector="^:selected:pressed /template/ Border#PART_LayoutRoot">
-            <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundSelectedPressed}" />
-            <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundSelectedPressed}" />
-        </Style>
-
-        <!--  Disabled state  -->
-        <Style Selector="^:disabled /template/ Border#PART_LayoutRoot">
-            <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundDisabled}" />
-            <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundDisabled}" />
-        </Style>
-    </ControlTheme>
+    <!--  Disabled state  -->
+    <Style Selector="^:disabled /template/ Border#PART_LayoutRoot">
+      <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundDisabled}" />
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundDisabled}" />
+    </Style>
+  </ControlTheme>
 </ResourceDictionary>

From c27f5e798e0bb1a15491c931abc3330fa3e17d4e Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 8 Jul 2022 16:24:51 +0200
Subject: [PATCH 081/240] Tweaked ToggleButton ControlTheme.

---
 src/Avalonia.Themes.Fluent/Controls/ToggleButton.xaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/ToggleButton.xaml b/src/Avalonia.Themes.Fluent/Controls/ToggleButton.xaml
index 617f3e9c45..36c0c50064 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ToggleButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ToggleButton.xaml
@@ -45,10 +45,6 @@
       </ControlTemplate>
     </Setter>
 
-    <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
-      <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-    </Style>
-
     <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
       <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundPointerOver}" />
       <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushPointerOver}" />

From 9e0e15fedfccef030047cb8a7e98d2e682a8313d Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 8 Jul 2022 16:33:43 +0200
Subject: [PATCH 082/240] Tweaked ToggleSwitch ControlTheme.

---
 .../Controls/ToggleSwitch.xaml                | 563 ++++++++----------
 1 file changed, 262 insertions(+), 301 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml b/src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml
index 533903bec7..aaa20a105c 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml
@@ -2,306 +2,267 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:sys="clr-namespace:System;assembly=netstandard">
-     <Design.PreviewWith>
-      <StackPanel Margin="20" Width="250" Spacing="24" >
-        <StackPanel Spacing="12" >
-          <TextBlock
-            Text="Automatic updates"
-            Classes="h1"/>
-          <TextBlock
-            Text="Updates will be automaticly Downloaded and installed shile the computer is shutting down or restarting"
-            TextWrapping="Wrap"/>
-          <ToggleSwitch HorizontalContentAlignment="Left"
-            Content="Enable automatic Updates?"
-            OffContent="Uit"
-            OnContent="Aan"
-            VerticalAlignment="Bottom"/>
-        </StackPanel>
-
-        <StackPanel Spacing="12">
-          <TextBlock
-            Text="Previewer"
-            Classes="h1"/>
-          <TextBlock
-            Text="The previewer Shows a preview off your code, this could slow down your system"
-            TextWrapping="Wrap"/>
-          <ToggleSwitch
-            Background="Green"
-            IsChecked="True" />
-        </StackPanel>
+  <Design.PreviewWith>
+    <StackPanel Margin="20" Width="250" Spacing="24">
+      <StackPanel Spacing="12" >
+        <ToggleSwitch/>
+        <ToggleSwitch IsChecked="True" />
+        <ToggleSwitch HorizontalContentAlignment="Left"
+                      Content="Header"
+                      OffContent="Off"
+                      OnContent="On"/>
+        <ToggleSwitch Background="Yellow"/>
       </StackPanel>
-    </Design.PreviewWith>
-  
-    <Thickness x:Key="ToggleSwitchTopHeaderMargin">0,0,0,6</Thickness>
-    <GridLength x:Key="ToggleSwitchPreContentMargin">6</GridLength>
-    <GridLength x:Key="ToggleSwitchPostContentMargin">6</GridLength>
-    <x:Double x:Key="ToggleSwitchThemeMinWidth">0</x:Double>
-
-
-    <ControlTheme x:Key="{x:Type ToggleSwitch}" TargetType="ToggleSwitch">
-        <Setter Property="Foreground" Value="{DynamicResource ToggleSwitchContentForeground}" />
-        <Setter Property="HorizontalAlignment" Value="Left" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="HorizontalContentAlignment" Value="Left" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-        <Setter Property="Template">
-            <ControlTemplate>
-                <Grid Background="{TemplateBinding Background}" RowDefinitions="Auto,*">
-
-                    <ContentPresenter
-                        x:Name="PART_ContentPresenter"
-                        Grid.Row="0"
-                        VerticalAlignment="Top"
-                        Content="{TemplateBinding Content}"
-                        ContentTemplate="{TemplateBinding ContentTemplate}"
-                        RecognizesAccessKey="True" />
-
-                    <Grid
-                        Grid.Row="1"
-                        MinWidth="{DynamicResource ToggleSwitchThemeMinWidth}"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Top">
-
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="{DynamicResource ToggleSwitchPreContentMargin}" />
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="{DynamicResource ToggleSwitchPostContentMargin}" />
-                        </Grid.RowDefinitions>
-
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="12" MaxWidth="12" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-
-                        <Grid
-                            x:Name="SwitchAreaGrid"
-                            Grid.RowSpan="3"
-                            Grid.ColumnSpan="3"
-                            Margin="0,5"
-                            TemplatedControl.IsTemplateFocusTarget="True" />
-
-                        <ContentPresenter
-                            x:Name="PART_OffContentPresenter"
-                            Grid.RowSpan="3"
-                            Grid.Column="2"
-                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                            Content="{TemplateBinding OffContent}"
-                            ContentTemplate="{TemplateBinding OffContentTemplate}" />
-
-                        <ContentPresenter
-                            x:Name="PART_OnContentPresenter"
-                            Grid.RowSpan="3"
-                            Grid.Column="2"
-                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                            Content="{TemplateBinding OnContent}"
-                            ContentTemplate="{TemplateBinding OnContentTemplate}" />
-
-                        <Border
-                            x:Name="OuterBorder"
-                            Grid.Row="1"
-                            Width="40"
-                            Height="20"
-                            BorderThickness="{DynamicResource ToggleSwitchOuterBorderStrokeThickness}"
-                            CornerRadius="10" />
-
-                        <Border
-                            x:Name="SwitchKnobBounds"
-                            Grid.Row="1"
-                            Width="40"
-                            Height="20"
-                            BorderThickness="{DynamicResource ToggleSwitchOnStrokeThickness}"
-                            CornerRadius="10" />
-
-                        <Canvas
-                            x:Name="SwitchKnob"
-                            Grid.Row="1"
-                            Width="20"
-                            Height="20"
-                            HorizontalAlignment="Left">
-
-                            <Grid
-                                x:Name="MovingKnobs"
-                                Width="20"
-                                Height="20">
-
-                                <Ellipse
-                                    x:Name="SwitchKnobOn"
-                                    Width="10"
-                                    Height="10" />
-
-                                <Ellipse
-                                    x:Name="SwitchKnobOff"
-                                    Width="10"
-                                    Height="10" />
-                            </Grid>
-                        </Canvas>
-                    </Grid>
-                </Grid>
-            </ControlTemplate>
-        </Setter>
-
-        <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
-            <Setter Property="Margin" Value="{DynamicResource ToggleSwitchTopHeaderMargin}" />
-        </Style>
-        <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter:empty">
-            <Setter Property="Margin" Value="0" />
-        </Style>
-
-        <!--  NormalState  -->
-        <Style Selector="^ /template/ Grid#SwitchAreaGrid">
-            <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerBackground}" />
-        </Style>
-
-        <Style Selector="^ /template/ Border#OuterBorder">
-            <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOff}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOff}" />
-        </Style>
-
-        <Style Selector="^ /template/ Border#SwitchKnobBounds">
-            <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOn}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOn}" />
-        </Style>
-
-        <Style Selector="^ /template/ Ellipse#SwitchKnobOn">
-            <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOn}" />
-        </Style>
-
-        <Style Selector="^ /template/ Ellipse#SwitchKnobOff">
-            <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOff}" />
-        </Style>
-
-        <Style Selector="^:not(:dragging) /template/ Grid#MovingKnobs">
-            <Setter Property="Transitions">
-                <Transitions>
-                    <DoubleTransition
-                        Easing="CubicEaseOut"
-                        Property="Canvas.Left"
-                        Duration="0:0:0.2" />
-                </Transitions>
-            </Setter>
-        </Style>
-
-        <!--  PointerOverState  -->
-        <Style Selector="^:pointerover /template/ Border#OuterBorder">
-            <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOffPointerOver}" />
-            <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOffPointerOver}" />
-        </Style>
-
-        <Style Selector="^:pointerover /template/ Ellipse#SwitchKnobOff">
-            <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOffPointerOver}" />
-        </Style>
-
-        <Style Selector="^:pointerover /template/ Ellipse#SwitchKnobOn">
-            <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOnPointerOver}" />
-        </Style>
-
-        <Style Selector="^:pointerover /template/ Border#SwitchKnobBounds">
-            <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOnPointerOver}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOnPointerOver}" />
-        </Style>
-
-        <Style Selector="^:pointerover /template/ Grid#SwitchAreaGrid">
-            <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerBackgroundPointerOver}" />
-        </Style>
-
-        <!--  PressedState  -->
-        <Style Selector="^:pressed /template/ Border#OuterBorder">
-            <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOffPressed}" />
-            <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOffPressed}" />
-        </Style>
-
-        <Style Selector="^:pressed /template/ Border#SwitchKnobBounds">
-            <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOnPressed}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOnPressed}" />
-        </Style>
-
-        <Style Selector="^:pressed /template/ Ellipse#SwitchKnobOff">
-            <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOffPressed}" />
-        </Style>
-
-        <Style Selector="^:pressed /template/ Ellipse#SwitchKnobOn">
-            <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOnPressed}" />
-        </Style>
-
-        <Style Selector="^:pressed /template/ Grid#SwitchAreaGrid">
-            <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerBackgroundPressed}" />
-        </Style>
-
-        <!--  DisabledState  -->
-        <Style Selector="^:disabled">
-            <Setter Property="Foreground" Value="{DynamicResource ToggleSwitchHeaderForegroundDisabled}" />
-        </Style>
-
-        <Style Selector="^:disabled /template/ Border#OuterBorder">
-            <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOffDisabled}" />
-            <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOffDisabled}" />
-        </Style>
-
-        <Style Selector="^:disabled /template/ Ellipse#SwitchKnobOff">
-            <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOffDisabled}" />
-        </Style>
-
-        <Style Selector="^:disabled /template/ Ellipse#SwitchKnobOn">
-            <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOnDisabled}" />
-        </Style>
-
-        <Style Selector="^:disabled /template/ Border#SwitchKnobBounds">
-            <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOnDisabled}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOnDisabled}" />
-        </Style>
-
-        <!--  CheckedState  -->
-        <Style Selector="^:checked /template/ Border#OuterBorder">
-            <Setter Property="Opacity" Value="0" />
-        </Style>
-
-        <Style Selector="^:checked  /template/ Ellipse#SwitchKnobOff">
-            <Setter Property="Opacity" Value="0" />
-        </Style>
-
-        <Style Selector="^:checked  /template/ Border#SwitchKnobBounds">
-            <Setter Property="Opacity" Value="1" />
-        </Style>
-
-        <Style Selector="^:checked /template/ Ellipse#SwitchKnobOn">
-            <Setter Property="Opacity" Value="1" />
-        </Style>
-
-        <Style Selector="^:checked /template/ ContentPresenter#PART_OffContentPresenter">
-            <Setter Property="Opacity" Value="0" />
-        </Style>
-
-        <Style Selector="^:checked /template/ ContentPresenter#PART_OnContentPresenter">
-            <Setter Property="Opacity" Value="1" />
-        </Style>
-
-        <!--  UncheckedState  -->
-        <Style Selector="^:unchecked /template/ Border#OuterBorder">
-            <Setter Property="Opacity" Value="1" />
-        </Style>
-
-        <Style Selector="^:unchecked /template/ Ellipse#SwitchKnobOff">
-            <Setter Property="Opacity" Value="1" />
-        </Style>
-
-        <Style Selector="^:unchecked /template/ Ellipse#SwitchKnobOn">
-            <Setter Property="Opacity" Value="0" />
-        </Style>
-
-        <Style Selector="^:unchecked  /template/ Border#SwitchKnobBounds">
-            <Setter Property="Opacity" Value="0" />
-        </Style>
-
-        <Style Selector="^:unchecked /template/ ContentPresenter#PART_OffContentPresenter">
-            <Setter Property="Opacity" Value="1" />
-        </Style>
-
-        <Style Selector="^:unchecked /template/ ContentPresenter#PART_OnContentPresenter">
-            <Setter Property="Opacity" Value="0" />
-        </Style>
-    </ControlTheme>
+    </StackPanel>
+  </Design.PreviewWith>
+
+  <Thickness x:Key="ToggleSwitchTopHeaderMargin">0,0,0,6</Thickness>
+  <GridLength x:Key="ToggleSwitchPreContentMargin">6</GridLength>
+  <GridLength x:Key="ToggleSwitchPostContentMargin">6</GridLength>
+  <x:Double x:Key="ToggleSwitchThemeMinWidth">0</x:Double>
+
+  <ControlTheme x:Key="{x:Type ToggleSwitch}" TargetType="ToggleSwitch">
+    <Setter Property="Foreground" Value="{DynamicResource ToggleSwitchContentForeground}" />
+    <Setter Property="HorizontalAlignment" Value="Left" />
+    <Setter Property="VerticalAlignment" Value="Center" />
+    <Setter Property="HorizontalContentAlignment" Value="Left" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Grid Background="{TemplateBinding Background}" RowDefinitions="Auto,*">
+
+          <ContentPresenter
+              x:Name="PART_ContentPresenter"
+              Grid.Row="0"
+              VerticalAlignment="Top"
+              Content="{TemplateBinding Content}"
+              ContentTemplate="{TemplateBinding ContentTemplate}"
+              Margin="{DynamicResource ToggleSwitchTopHeaderMargin}"
+              RecognizesAccessKey="True" />
+
+          <Grid
+              Grid.Row="1"
+              MinWidth="{DynamicResource ToggleSwitchThemeMinWidth}"
+              HorizontalAlignment="Left"
+              VerticalAlignment="Top">
+
+            <Grid.RowDefinitions>
+              <RowDefinition Height="{DynamicResource ToggleSwitchPreContentMargin}" />
+              <RowDefinition Height="Auto" />
+              <RowDefinition Height="{DynamicResource ToggleSwitchPostContentMargin}" />
+            </Grid.RowDefinitions>
+
+            <Grid.ColumnDefinitions>
+              <ColumnDefinition Width="Auto" />
+              <ColumnDefinition Width="12" MaxWidth="12" />
+              <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
+
+            <Grid
+                x:Name="SwitchAreaGrid"
+                Grid.RowSpan="3"
+                Grid.ColumnSpan="3"
+                Background="{DynamicResource ToggleSwitchContainerBackground}"
+                Margin="0,5"
+                TemplatedControl.IsTemplateFocusTarget="True" />
+
+            <ContentPresenter
+                x:Name="PART_OffContentPresenter"
+                Grid.RowSpan="3"
+                Grid.Column="2"
+                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                Content="{TemplateBinding OffContent}"
+                ContentTemplate="{TemplateBinding OffContentTemplate}" />
+
+            <ContentPresenter
+                x:Name="PART_OnContentPresenter"
+                Grid.RowSpan="3"
+                Grid.Column="2"
+                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                Content="{TemplateBinding OnContent}"
+                ContentTemplate="{TemplateBinding OnContentTemplate}" />
+
+            <Border
+                x:Name="OuterBorder"
+                Grid.Row="1"
+                Width="40"
+                Height="20"
+                Background="{DynamicResource ToggleSwitchFillOff}"
+                BorderBrush="{DynamicResource ToggleSwitchStrokeOff}"
+                BorderThickness="{DynamicResource ToggleSwitchOuterBorderStrokeThickness}"
+                CornerRadius="10" />
+
+            <Border
+                x:Name="SwitchKnobBounds"
+                Grid.Row="1"
+                Width="40"
+                Height="20"
+                Background="{DynamicResource ToggleSwitchFillOn}"
+                BorderBrush="{DynamicResource ToggleSwitchStrokeOn}"
+                BorderThickness="{DynamicResource ToggleSwitchOnStrokeThickness}"
+                CornerRadius="10" />
+
+            <Canvas
+                x:Name="SwitchKnob"
+                Grid.Row="1"
+                Width="20"
+                Height="20"
+                HorizontalAlignment="Left">
+
+              <Grid x:Name="MovingKnobs" Width="20" Height="20">
+                <Ellipse
+                  x:Name="SwitchKnobOn"
+                  Fill="{DynamicResource ToggleSwitchKnobFillOn}"
+                  Width="10"
+                  Height="10" />
+                <Ellipse
+                  x:Name="SwitchKnobOff"
+                  Fill="{DynamicResource ToggleSwitchKnobFillOff}"
+                  Width="10"
+                  Height="10" />
+              </Grid>
+            </Canvas>
+          </Grid>
+        </Grid>
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter:empty">
+      <Setter Property="Margin" Value="0" />
+    </Style>
+
+    <!--  NormalState  -->
+    <Style Selector="^:not(:dragging) /template/ Grid#MovingKnobs">
+      <Setter Property="Transitions">
+        <Transitions>
+          <DoubleTransition
+              Easing="CubicEaseOut"
+              Property="Canvas.Left"
+              Duration="0:0:0.2" />
+        </Transitions>
+      </Setter>
+    </Style>
+
+    <!--  PointerOverState  -->
+    <Style Selector="^:pointerover /template/ Border#OuterBorder">
+      <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOffPointerOver}" />
+      <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOffPointerOver}" />
+    </Style>
+
+    <Style Selector="^:pointerover /template/ Ellipse#SwitchKnobOff">
+      <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOffPointerOver}" />
+    </Style>
+
+    <Style Selector="^:pointerover /template/ Ellipse#SwitchKnobOn">
+      <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOnPointerOver}" />
+    </Style>
+
+    <Style Selector="^:pointerover /template/ Border#SwitchKnobBounds">
+      <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOnPointerOver}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOnPointerOver}" />
+    </Style>
+
+    <Style Selector="^:pointerover /template/ Grid#SwitchAreaGrid">
+      <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerBackgroundPointerOver}" />
+    </Style>
+
+    <!--  PressedState  -->
+    <Style Selector="^:pressed /template/ Border#OuterBorder">
+      <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOffPressed}" />
+      <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOffPressed}" />
+    </Style>
+
+    <Style Selector="^:pressed /template/ Border#SwitchKnobBounds">
+      <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOnPressed}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOnPressed}" />
+    </Style>
+
+    <Style Selector="^:pressed /template/ Ellipse#SwitchKnobOff">
+      <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOffPressed}" />
+    </Style>
+
+    <Style Selector="^:pressed /template/ Ellipse#SwitchKnobOn">
+      <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOnPressed}" />
+    </Style>
+
+    <Style Selector="^:pressed /template/ Grid#SwitchAreaGrid">
+      <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerBackgroundPressed}" />
+    </Style>
+
+    <!--  DisabledState  -->
+    <Style Selector="^:disabled">
+      <Setter Property="Foreground" Value="{DynamicResource ToggleSwitchHeaderForegroundDisabled}" />
+    </Style>
+
+    <Style Selector="^:disabled /template/ Border#OuterBorder">
+      <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOffDisabled}" />
+      <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOffDisabled}" />
+    </Style>
+
+    <Style Selector="^:disabled /template/ Ellipse#SwitchKnobOff">
+      <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOffDisabled}" />
+    </Style>
+
+    <Style Selector="^:disabled /template/ Ellipse#SwitchKnobOn">
+      <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOnDisabled}" />
+    </Style>
+
+    <Style Selector="^:disabled /template/ Border#SwitchKnobBounds">
+      <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOnDisabled}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOnDisabled}" />
+    </Style>
+
+    <!--  CheckedState  -->
+    <Style Selector="^:checked /template/ Border#OuterBorder">
+      <Setter Property="Opacity" Value="0" />
+    </Style>
+
+    <Style Selector="^:checked  /template/ Ellipse#SwitchKnobOff">
+      <Setter Property="Opacity" Value="0" />
+    </Style>
+
+    <Style Selector="^:checked  /template/ Border#SwitchKnobBounds">
+      <Setter Property="Opacity" Value="1" />
+    </Style>
+
+    <Style Selector="^:checked /template/ Ellipse#SwitchKnobOn">
+      <Setter Property="Opacity" Value="1" />
+    </Style>
+
+    <Style Selector="^:checked /template/ ContentPresenter#PART_OffContentPresenter">
+      <Setter Property="Opacity" Value="0" />
+    </Style>
+
+    <Style Selector="^:checked /template/ ContentPresenter#PART_OnContentPresenter">
+      <Setter Property="Opacity" Value="1" />
+    </Style>
+
+    <!--  UncheckedState  -->
+    <Style Selector="^:unchecked /template/ Border#OuterBorder">
+      <Setter Property="Opacity" Value="1" />
+    </Style>
+
+    <Style Selector="^:unchecked /template/ Ellipse#SwitchKnobOff">
+      <Setter Property="Opacity" Value="1" />
+    </Style>
+
+    <Style Selector="^:unchecked /template/ Ellipse#SwitchKnobOn">
+      <Setter Property="Opacity" Value="0" />
+    </Style>
+
+    <Style Selector="^:unchecked  /template/ Border#SwitchKnobBounds">
+      <Setter Property="Opacity" Value="0" />
+    </Style>
+
+    <Style Selector="^:unchecked /template/ ContentPresenter#PART_OffContentPresenter">
+      <Setter Property="Opacity" Value="1" />
+    </Style>
+
+    <Style Selector="^:unchecked /template/ ContentPresenter#PART_OnContentPresenter">
+      <Setter Property="Opacity" Value="0" />
+    </Style>
+  </ControlTheme>
 </ResourceDictionary>

From e8091cfe80759251c7fe35f834c91fe606b8576c Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 8 Jul 2022 16:48:04 +0200
Subject: [PATCH 083/240] Tweaked ToolTip ControlTheme.

---
 .../Controls/ToolTip.xaml                     | 113 ++++++++----------
 1 file changed, 50 insertions(+), 63 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/ToolTip.xaml b/src/Avalonia.Themes.Fluent/Controls/ToolTip.xaml
index 1070f3b68c..bc9dceb545 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ToolTip.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ToolTip.xaml
@@ -2,70 +2,57 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:sys="clr-namespace:System;assembly=netstandard"
                     x:CompileBindings="True">
-    <Design.PreviewWith>
-      <Grid RowDefinitions="Auto,Auto"
-            ColumnDefinitions="Auto,Auto"
-            HorizontalAlignment="Center">
-        <Border Grid.Column="0"
-                Grid.Row="1"
-                Background="{DynamicResource SystemControlBackgroundAccentBrush}"
-                Margin="5" Padding="50" ToolTip.Tip="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.">
-          <TextBlock>Hover Here</TextBlock>
-        </Border>
-        <CheckBox Grid.Column="1"
-                  Margin="5"
-                  Grid.Row="0"
-                  IsChecked="{Binding ElementName=Border, Path=(ToolTip.IsOpen)}"
-                  Content="ToolTip Open" />
-        <Border Name="Border"
-                Grid.Column="1"
-                Grid.Row="1"
-                Background="{DynamicResource SystemControlBackgroundAccentBrush}"
-                Margin="5"
-                Padding="50"
-                ToolTip.Placement="Bottom">
-          <ToolTip.Tip>
-            <StackPanel>
-              <TextBlock Classes="h1">ToolTip</TextBlock>
-              <TextBlock Classes="h2">A control which pops up a hint when a control is hovered</TextBlock>
-            </StackPanel>
-          </ToolTip.Tip>
-          <TextBlock>ToolTip bottom placement</TextBlock>
-        </Border>
-      </Grid>
-    </Design.PreviewWith>
+  <Design.PreviewWith>
+    <Border Padding="20">
+      <StackPanel Spacing="20">
+        <ToolTip Opacity="1">Text Content</ToolTip>
+        <ToolTip Opacity="1">Very long text content which should exceed the maximum with of the tooltip and wrap.</ToolTip>
+        <ToolTip Opacity="1">
+          <StackPanel>
+            <TextBlock>Multi-line</TextBlock>
+            <TextBlock>Control Content</TextBlock>
+          </StackPanel>
+        </ToolTip>
+      </StackPanel>
+    </Border>
+  </Design.PreviewWith>
 
-    <sys:Double x:Key="ToolTipContentMaxWidth">320</sys:Double>
+  <sys:Double x:Key="ToolTipContentMaxWidth">320</sys:Double>
 
-    <ControlTheme x:Key="{x:Type ToolTip}" TargetType="ToolTip">
-      <Setter Property="Foreground" Value="{DynamicResource ToolTipForeground}" />
-      <Setter Property="Background" Value="{DynamicResource ToolTipBackground}" />
-      <Setter Property="BorderBrush" Value="{DynamicResource ToolTipBorderBrush}" />
-      <Setter Property="BorderThickness" Value="{DynamicResource ToolTipBorderThemeThickness}" />
-      <Setter Property="FontSize" Value="{DynamicResource ToolTipContentThemeFontSize}" />
-      <Setter Property="Padding" Value="{DynamicResource ToolTipBorderThemePadding}" />
-      <Setter Property="MaxWidth" Value="{DynamicResource ToolTipContentMaxWidth}" />
-      <Setter Property="CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
-      <Setter Property="Opacity" Value="0" />
-      <Setter Property="Transitions">
-        <Transitions>
-          <DoubleTransition Property="Opacity" Duration="0:0:0.15" />
-        </Transitions>
-      </Setter>
-      <Setter Property="Template">
-        <ControlTemplate>
-          <Border Name="PART_LayoutRoot" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" Padding="{TemplateBinding Padding}" CornerRadius="{TemplateBinding CornerRadius}">
-            <ContentPresenter Name="PART_ContentPresenter" MaxWidth="{TemplateBinding MaxWidth}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
-          </Border>
-        </ControlTemplate>
-      </Setter>
-
-      <!--<Style Selector="^ > TextBlock">
-        <Setter Property="TextWrapping" Value="Wrap" />
-      </Style>-->
+  <ControlTheme x:Key="{x:Type ToolTip}" TargetType="ToolTip">
+    <Setter Property="Foreground" Value="{DynamicResource ToolTipForeground}" />
+    <Setter Property="Background" Value="{DynamicResource ToolTipBackground}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ToolTipBorderBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource ToolTipBorderThemeThickness}" />
+    <Setter Property="FontSize" Value="{DynamicResource ToolTipContentThemeFontSize}" />
+    <Setter Property="Padding" Value="{DynamicResource ToolTipBorderThemePadding}" />
+    <Setter Property="MaxWidth" Value="{DynamicResource ToolTipContentMaxWidth}" />
+    <Setter Property="CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
+    <Setter Property="Opacity" Value="0" />
+    <Setter Property="Transitions">
+      <Transitions>
+        <DoubleTransition Property="Opacity" Duration="0:0:0.15" />
+      </Transitions>
+    </Setter>
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Name="PART_LayoutRoot"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                Padding="{TemplateBinding Padding}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <ContentPresenter Name="PART_ContentPresenter"
+                            MaxWidth="{TemplateBinding MaxWidth}"
+                            Content="{TemplateBinding Content}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            TextBlock.TextWrapping="Wrap"/>
+        </Border>
+      </ControlTemplate>
+    </Setter>
 
-      <Style Selector="^:open">
-        <Setter Property="Opacity" Value="1" />
-      </Style>
-    </ControlTheme>
+    <Style Selector="^:open">
+      <Setter Property="Opacity" Value="1" />
+    </Style>
+  </ControlTheme>
 </ResourceDictionary>

From 433325e7463376756de70912a9fac103c958d54c Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 8 Jul 2022 16:48:44 +0200
Subject: [PATCH 084/240] Formatted TransitioningContentControl ControlTheme.

---
 .../Controls/TransitioningContentControl.xaml | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/TransitioningContentControl.xaml b/src/Avalonia.Themes.Fluent/Controls/TransitioningContentControl.xaml
index f28dc66a5f..f1971fe236 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TransitioningContentControl.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TransitioningContentControl.xaml
@@ -1,19 +1,19 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <ControlTheme x:Key="{x:Type TransitioningContentControl}" TargetType="TransitioningContentControl">
-      <Setter Property="Template">
-        <ControlTemplate>
-          <ContentPresenter Name="PART_ContentPresenter"
-                            Background="{TemplateBinding Background}" 
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding CornerRadius}"
-                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                            Content="{TemplateBinding CurrentContent}"
-                            Padding="{TemplateBinding Padding}"
-                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" />
-        </ControlTemplate>
-      </Setter>
-    </ControlTheme>
+  <ControlTheme x:Key="{x:Type TransitioningContentControl}" TargetType="TransitioningContentControl">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ContentPresenter Name="PART_ContentPresenter"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          Content="{TemplateBinding CurrentContent}"
+                          Padding="{TemplateBinding Padding}"
+                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" />
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
 </ResourceDictionary>

From 1bbff64d1fffd557c031e5fc4e78b003fdfe2c35 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 8 Jul 2022 16:50:39 +0200
Subject: [PATCH 085/240] Added preview to TreeView ControlTheme.

---
 .../Controls/TreeView.xaml                    | 66 +++++++++++--------
 1 file changed, 39 insertions(+), 27 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/TreeView.xaml b/src/Avalonia.Themes.Fluent/Controls/TreeView.xaml
index 4fcec79f25..c340599000 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TreeView.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TreeView.xaml
@@ -1,31 +1,43 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Design.PreviewWith>
+    <Border Padding="20">
+      <StackPanel Spacing="20">
+        <TreeView>
+          <TreeViewItem Header="Root" IsExpanded="True">
+            <TreeViewItem Header="Child1"/>
+            <TreeViewItem Header="Child2"/>
+          </TreeViewItem>
+        </TreeView>
+      </StackPanel>
+    </Border>
+  </Design.PreviewWith>
 
-    <ControlTheme x:Key="{x:Type TreeView}" TargetType="TreeView">
-      <Setter Property="Background" Value="Transparent" />
-      <Setter Property="BorderBrush" Value="Transparent" />
-      <Setter Property="BorderThickness" Value="0" />
-      <Setter Property="Padding" Value="0" />
-      <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
-      <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-      <Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
-      <Setter Property="Template">
-        <ControlTemplate>
-          <Border BorderBrush="{TemplateBinding BorderBrush}"
-                  BorderThickness="{TemplateBinding BorderThickness}"
-                  CornerRadius="{TemplateBinding CornerRadius}">
-            <ScrollViewer Background="{TemplateBinding Background}"
-                          HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
-                          VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}"
-                          IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
-                          AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}">
-              <ItemsPresenter Name="PART_ItemsPresenter"
-                              Items="{TemplateBinding Items}"
-                              ItemsPanel="{TemplateBinding ItemsPanel}"
-                              Margin="{TemplateBinding Padding}" />
-            </ScrollViewer>
-          </Border>
-        </ControlTemplate>
-      </Setter>
-    </ControlTheme>
+  <ControlTheme x:Key="{x:Type TreeView}" TargetType="TreeView">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="BorderBrush" Value="Transparent" />
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="Padding" Value="0" />
+    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+    <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+    <Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <ScrollViewer Background="{TemplateBinding Background}"
+                        HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
+                        VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}"
+                        IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
+                        AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}">
+            <ItemsPresenter Name="PART_ItemsPresenter"
+                            Items="{TemplateBinding Items}"
+                            ItemsPanel="{TemplateBinding ItemsPanel}"
+                            Margin="{TemplateBinding Padding}" />
+          </ScrollViewer>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
 </ResourceDictionary>

From 42da6cde7c1d237161768939c032bbf8a54b3f53 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 8 Jul 2022 16:56:49 +0200
Subject: [PATCH 086/240] Formatted Window ControlTheme.

---
 .../Controls/Window.xaml                      | 54 +++++++++----------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/Window.xaml b/src/Avalonia.Themes.Fluent/Controls/Window.xaml
index d78fd76a37..35cc81663f 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Window.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Window.xaml
@@ -1,30 +1,30 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <ControlTheme x:Key="{x:Type Window}" TargetType="Window">
-      <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundAltHighBrush}"/>
-      <Setter Property="TransparencyBackgroundFallback" Value="{DynamicResource SystemControlBackgroundAltHighBrush}" />
-      <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
-      <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
-      <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
-      <Setter Property="Template">
-        <ControlTemplate>
-          <Panel>
-            <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
-            <Border Background="{TemplateBinding Background}" IsHitTestVisible="False" />
-            <Panel Background="Transparent" Margin="{TemplateBinding WindowDecorationMargin}" />
-            <VisualLayerManager>
-              <VisualLayerManager.ChromeOverlayLayer>
-                <TitleBar />
-              </VisualLayerManager.ChromeOverlayLayer>
-              <ContentPresenter Name="PART_ContentPresenter"
-                                ContentTemplate="{TemplateBinding ContentTemplate}"
-                                Content="{TemplateBinding Content}"
-                                Margin="{TemplateBinding Padding}"
-                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
-            </VisualLayerManager>
-          </Panel>
-        </ControlTemplate>
-      </Setter>
-    </ControlTheme>
+  <ControlTheme x:Key="{x:Type Window}" TargetType="Window">
+    <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundAltHighBrush}"/>
+    <Setter Property="TransparencyBackgroundFallback" Value="{DynamicResource SystemControlBackgroundAltHighBrush}" />
+    <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
+    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
+    <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Panel>
+          <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
+          <Border Background="{TemplateBinding Background}" IsHitTestVisible="False" />
+          <Panel Background="Transparent" Margin="{TemplateBinding WindowDecorationMargin}" />
+          <VisualLayerManager>
+            <VisualLayerManager.ChromeOverlayLayer>
+              <TitleBar />
+            </VisualLayerManager.ChromeOverlayLayer>
+            <ContentPresenter Name="PART_ContentPresenter"
+                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                              Content="{TemplateBinding Content}"
+                              Margin="{TemplateBinding Padding}"
+                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
+          </VisualLayerManager>
+        </Panel>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
 </ResourceDictionary>

From fa65cae7d82d6d3769d9a74f46a0033ea9852967 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 8 Jul 2022 16:58:05 +0200
Subject: [PATCH 087/240] Formatted WindowNotificationManager ControlTheme.

---
 .../Controls/WindowNotificationManager.xaml   | 105 +++++++++---------
 1 file changed, 52 insertions(+), 53 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/WindowNotificationManager.xaml b/src/Avalonia.Themes.Fluent/Controls/WindowNotificationManager.xaml
index d5d5114c1b..77f49941f0 100644
--- a/src/Avalonia.Themes.Fluent/Controls/WindowNotificationManager.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/WindowNotificationManager.xaml
@@ -1,58 +1,57 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    x:CompileBindings="True"
-    x:DataType="WindowNotificationManager">
-    <ControlTheme x:Key="{x:Type WindowNotificationManager}" TargetType="WindowNotificationManager">
-        <Setter Property="Margin" Value="0 0" />
-        <Setter Property="Template">
-            <ControlTemplate>
-                <ReversibleStackPanel Name="PART_Items">
-                    <ReversibleStackPanel.DataTemplates>
-                        <DataTemplate DataType="INotification">
-                            <StackPanel
-                                Margin="12"
-                                Spacing="8"
-                                TextElement.Foreground="{DynamicResource SystemControlForegroundBaseHighBrush}">
-                                <TextBlock FontWeight="Medium" Text="{Binding Title}" />
-                                <TextBlock
-                                    MaxHeight="80"
-                                    Margin="0,0,12,0"
-                                    Text="{Binding Message}"
-                                    TextWrapping="Wrap" />
-                            </StackPanel>
-                        </DataTemplate>
-                        <DataTemplate DataType="x:String">
-                            <TextBlock
-                                Margin="12"
-                                Foreground="{DynamicResource SystemControlForegroundBaseHighBrush}"
-                                Text="{Binding}" />
-                        </DataTemplate>
-                    </ReversibleStackPanel.DataTemplates>
-                </ReversibleStackPanel>
-            </ControlTemplate>
-        </Setter>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    x:CompileBindings="True"
+                    x:DataType="WindowNotificationManager">
+  <ControlTheme x:Key="{x:Type WindowNotificationManager}" TargetType="WindowNotificationManager">
+    <Setter Property="Margin" Value="0 0" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ReversibleStackPanel Name="PART_Items">
+          <ReversibleStackPanel.DataTemplates>
+            <DataTemplate DataType="INotification">
+              <StackPanel
+                  Margin="12"
+                  Spacing="8"
+                  TextElement.Foreground="{DynamicResource SystemControlForegroundBaseHighBrush}">
+                <TextBlock FontWeight="Medium" Text="{Binding Title}" />
+                <TextBlock
+                    MaxHeight="80"
+                    Margin="0,0,12,0"
+                    Text="{Binding Message}"
+                    TextWrapping="Wrap" />
+              </StackPanel>
+            </DataTemplate>
+            <DataTemplate DataType="x:String">
+              <TextBlock
+                  Margin="12"
+                  Foreground="{DynamicResource SystemControlForegroundBaseHighBrush}"
+                  Text="{Binding}" />
+            </DataTemplate>
+          </ReversibleStackPanel.DataTemplates>
+        </ReversibleStackPanel>
+      </ControlTemplate>
+    </Setter>
 
-        <Style Selector="^:topleft /template/ ReversibleStackPanel#PART_Items">
-            <Setter Property="VerticalAlignment" Value="Top" />
-            <Setter Property="HorizontalAlignment" Value="Left" />
-        </Style>
+    <Style Selector="^:topleft /template/ ReversibleStackPanel#PART_Items">
+      <Setter Property="VerticalAlignment" Value="Top" />
+      <Setter Property="HorizontalAlignment" Value="Left" />
+    </Style>
 
-        <Style Selector="^:topright /template/ ReversibleStackPanel#PART_Items">
-            <Setter Property="VerticalAlignment" Value="Top" />
-            <Setter Property="HorizontalAlignment" Value="Right" />
-        </Style>
+    <Style Selector="^:topright /template/ ReversibleStackPanel#PART_Items">
+      <Setter Property="VerticalAlignment" Value="Top" />
+      <Setter Property="HorizontalAlignment" Value="Right" />
+    </Style>
 
-        <Style Selector="^:bottomleft /template/ ReversibleStackPanel#PART_Items">
-            <Setter Property="ReverseOrder" Value="True" />
-            <Setter Property="VerticalAlignment" Value="Bottom" />
-            <Setter Property="HorizontalAlignment" Value="Left" />
-        </Style>
+    <Style Selector="^:bottomleft /template/ ReversibleStackPanel#PART_Items">
+      <Setter Property="ReverseOrder" Value="True" />
+      <Setter Property="VerticalAlignment" Value="Bottom" />
+      <Setter Property="HorizontalAlignment" Value="Left" />
+    </Style>
 
-        <Style Selector="^:bottomright /template/ ReversibleStackPanel#PART_Items">
-            <Setter Property="ReverseOrder" Value="True" />
-            <Setter Property="VerticalAlignment" Value="Bottom" />
-            <Setter Property="HorizontalAlignment" Value="Right" />
-        </Style>
-    </ControlTheme>
+    <Style Selector="^:bottomright /template/ ReversibleStackPanel#PART_Items">
+      <Setter Property="ReverseOrder" Value="True" />
+      <Setter Property="VerticalAlignment" Value="Bottom" />
+      <Setter Property="HorizontalAlignment" Value="Right" />
+    </Style>
+  </ControlTheme>
 </ResourceDictionary>

From 5229cf57336c771ecda45dfea704340a7d1141e3 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 8 Jul 2022 17:00:12 +0200
Subject: [PATCH 088/240] Formatted Calendar ControlTheme.

---
 .../Controls/Calendar.xaml                    | 52 +++++++++----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/Calendar.xaml b/src/Avalonia.Themes.Fluent/Controls/Calendar.xaml
index 3434f9b6e5..8d54cb93ca 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Calendar.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Calendar.xaml
@@ -5,36 +5,36 @@
     // All other rights reserved.
 -->
 
-<ResourceDictionary xmlns="https://github.com/avaloniaui" 
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-   <Design.PreviewWith>
+  <Design.PreviewWith>
     <Border Padding="20">
       <Calendar />
     </Border>
   </Design.PreviewWith>
 
-    <ControlTheme x:Key="{x:Type Calendar}" TargetType="Calendar">
-        <Setter Property="Foreground" Value="{DynamicResource CalendarViewForeground}" />
-        <Setter Property="Background" Value="{DynamicResource CalendarViewBackground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewBorderBrush}" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="HorizontalAlignment" Value="Left" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="Template">
-            <ControlTemplate>
-                <StackPanel
-                    Name="Root"
-                    HorizontalAlignment="Center"
-                    ClipToBounds="True">
-                    <CalendarItem
-                        Name="CalendarItem"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="{TemplateBinding CornerRadius}"
-                        HeaderBackground="{TemplateBinding HeaderBackground}" />
-                </StackPanel>
-            </ControlTemplate>
-        </Setter>
-    </ControlTheme>
+  <ControlTheme x:Key="{x:Type Calendar}" TargetType="Calendar">
+    <Setter Property="Foreground" Value="{DynamicResource CalendarViewForeground}" />
+    <Setter Property="Background" Value="{DynamicResource CalendarViewBackground}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewBorderBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="HorizontalAlignment" Value="Left" />
+    <Setter Property="VerticalAlignment" Value="Center" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <StackPanel
+            Name="Root"
+            HorizontalAlignment="Center"
+            ClipToBounds="True">
+          <CalendarItem
+              Name="CalendarItem"
+              Background="{TemplateBinding Background}"
+              BorderBrush="{TemplateBinding BorderBrush}"
+              BorderThickness="{TemplateBinding BorderThickness}"
+              CornerRadius="{TemplateBinding CornerRadius}"
+              HeaderBackground="{TemplateBinding HeaderBackground}" />
+        </StackPanel>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
 </ResourceDictionary>

From 7af2eb9a29e0ea5a2b8b08b3a00b72518b34b6ef Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 8 Jul 2022 17:08:40 +0200
Subject: [PATCH 089/240] Formatted CalendarButton ControlTheme.

---
 .../Controls/CalendarButton.xaml              | 178 +++++++++---------
 1 file changed, 93 insertions(+), 85 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/CalendarButton.xaml b/src/Avalonia.Themes.Fluent/Controls/CalendarButton.xaml
index 0381022910..d1aee7ee9a 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CalendarButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CalendarButton.xaml
@@ -4,106 +4,114 @@
 // Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 -->
-<ResourceDictionary xmlns="https://github.com/avaloniaui" 
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <ControlTheme x:Key="{x:Type CalendarButton}" TargetType="CalendarButton">
-      <Setter Property="ClickMode" Value="Release" />
-      <Setter Property="MinWidth" Value="40" />
-      <Setter Property="MinHeight" Value="40" />
-      <Setter Property="Margin" Value="1" />
-      <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}" />
-      <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewCalendarItemRevealBorderBrush}" />
-      <Setter Property="BorderThickness" Value="2" />
-      <Setter Property="FontSize" Value="20" />
-      <Setter Property="ClipToBounds" Value="False" />
-      <Setter Property="HorizontalContentAlignment" Value="Center" />
-      <Setter Property="VerticalContentAlignment" Value="Center" />
-      <Setter Property="Template">
-        <ControlTemplate>
-          <Panel>
-            <!-- To mimic WinUI SystemFocusVisual, Focus visual is drawn outside the bounds of the item -->
-            <Border Name="Root" Background="{TemplateBinding Background}"
-                    BorderThickness="0" ClipToBounds="True">
-              <ContentControl Name="Content"
-                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                              Content="{TemplateBinding Content}"
-                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                              FontSize="{TemplateBinding FontSize}"
-                              Margin="{TemplateBinding Padding}" />
-            </Border>
-            
-            <!-- Drawn Border should render on top of background to preserve the 1px margin between items -->
-            <Border Name="Border"
-                    BorderThickness="2"
-                    BorderBrush="{TemplateBinding BorderBrush}" />
-          </Panel>
-        </ControlTemplate>
-      </Setter>
+  <Design.PreviewWith>
+    <Border Padding="20">
+      <StackPanel Spacing="20">
+        <CalendarButton/>
+      </StackPanel>
+    </Border>
+  </Design.PreviewWith>
 
-      <Style Selector="^:pointerover /template/ Border#Border">
-        <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewHoverBorderBrush}" />
+  <ControlTheme x:Key="{x:Type CalendarButton}" TargetType="CalendarButton">
+    <Setter Property="ClickMode" Value="Release" />
+    <Setter Property="MinWidth" Value="40" />
+    <Setter Property="MinHeight" Value="40" />
+    <Setter Property="Margin" Value="1" />
+    <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}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewCalendarItemRevealBorderBrush}" />
+    <Setter Property="BorderThickness" Value="2" />
+    <Setter Property="FontSize" Value="20" />
+    <Setter Property="ClipToBounds" Value="False" />
+    <Setter Property="HorizontalContentAlignment" Value="Center" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Panel>
+          <!-- To mimic WinUI SystemFocusVisual, Focus visual is drawn outside the bounds of the item -->
+          <Border Name="Root" Background="{TemplateBinding Background}"
+                  BorderThickness="0" ClipToBounds="True">
+            <ContentControl Name="Content"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            Content="{TemplateBinding Content}"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            FontSize="{TemplateBinding FontSize}"
+                            Margin="{TemplateBinding Padding}" />
+          </Border>
+
+          <!-- Drawn Border should render on top of background to preserve the 1px margin between items -->
+          <Border Name="Border"
+                  BorderThickness="2"
+                  BorderBrush="{TemplateBinding BorderBrush}" />
+        </Panel>
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^:pointerover /template/ Border#Border">
+      <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewHoverBorderBrush}" />
+    </Style>
+
+    <Style Selector="^:pressed /template/ Border#Border">
+      <Setter Property="BorderBrush" Value="{DynamicResource SystemAccentColorDark2}" />
+    </Style>
+
+    <!-- Adjusted :selected to look like :today from DayItem -->
+    <Style Selector="^:selected">
+      <Style Selector="^ /template/ Border#Root">
+        <Setter Property="Background" Value="{DynamicResource SystemAccentColor}" />
       </Style>
-      
-      <Style Selector="^:pressed /template/ Border#Border">
-        <Setter Property="BorderBrush" Value="{DynamicResource SystemAccentColorDark2}" />
+
+      <Style Selector="^ /template/ Border#Border">
+        <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewSelectedBorderBrush}" />
       </Style>
 
-      <!-- Adjusted :selected to look like :today from DayItem -->
-      <Style Selector="^:selected">
-        <Style Selector="^ /template/ Border#Root">
-          <Setter Property="Background" Value="{DynamicResource SystemAccentColor}" />
-        </Style>
-        
-        <Style Selector="^ /template/ Border#Border">
-          <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewSelectedBorderBrush}" />
-        </Style>
+      <Style Selector="^ /template/ ContentControl#Content">
+        <Setter Property="Foreground" Value="{DynamicResource CalendarViewTodayForeground}" />
+        <Setter Property="FontWeight" Value="SemiBold" />
+      </Style>
 
-        <Style Selector="^ /template/ ContentControl#Content">
-          <Setter Property="Foreground" Value="{DynamicResource CalendarViewTodayForeground}" />
-          <Setter Property="FontWeight" Value="SemiBold" />
+      <Style Selector="^:pointerover">
+        <Style Selector="^ /template/ Border#Border">
+          <Setter Property="BorderBrush" Value="{DynamicResource SystemAccentColorDark1}" />
         </Style>
-
-        <Style Selector="^:pointerover">
-          <Style Selector="^ /template/ Border#Border">
-            <Setter Property="BorderBrush" Value="{DynamicResource SystemAccentColorDark1}" />
-          </Style>
-          <Style Selector="^ /template/ Border#Root">
-            <Setter Property="Background" Value="{DynamicResource SystemAccentColor}" />
-          </Style>
+        <Style Selector="^ /template/ Border#Root">
+          <Setter Property="Background" Value="{DynamicResource SystemAccentColor}" />
         </Style>
+      </Style>
 
-        <Style Selector="^:pressed">
-          <Style Selector="^ /template/ Border#Border">
-            <Setter Property="BorderBrush" Value="{DynamicResource SystemAccentColorDark2}" />
-          </Style>
-          
-          <Style Selector="^ /template/ Border#Root">
-            <Setter Property="Background" Value="{DynamicResource SystemAccentColor}" />
-          </Style>
+      <Style Selector="^:pressed">
+        <Style Selector="^ /template/ Border#Border">
+          <Setter Property="BorderBrush" Value="{DynamicResource SystemAccentColorDark2}" />
         </Style>
-      </Style>
 
-      <!-- WinUI calls this OutOfFocus -->
-      <Style Selector="^:inactive">
         <Style Selector="^ /template/ Border#Root">
-          <!-- These are probably set in code, but consistent -->
-          <Setter Property="Background" Value="{DynamicResource CalendarViewOutOfScopeBackground}"/>
-        </Style>
-        <Style Selector="^ /template/ ContentControl#Content">
-          <Setter Property="Foreground" Value="{DynamicResource CalendarViewOutOfScopeForeground}"/>
+          <Setter Property="Background" Value="{DynamicResource SystemAccentColor}" />
         </Style>
       </Style>
+    </Style>
 
-      <Style Selector="^:blackout /template/ ContentControl#Content">
-        <Setter Property="Foreground" Value="{DynamicResource CalendarViewBlackoutForeground}" />
+    <!-- WinUI calls this OutOfFocus -->
+    <Style Selector="^:inactive">
+      <Style Selector="^ /template/ Border#Root">
+        <!-- These are probably set in code, but consistent -->
+        <Setter Property="Background" Value="{DynamicResource CalendarViewOutOfScopeBackground}"/>
       </Style>
-
-      <Style Selector="^:disabled /template/ ContentControl#Content">
-        <Setter Property="Foreground" Value="{DynamicResource CalendarViewWeekDayForegroundDisabled}" />
+      <Style Selector="^ /template/ ContentControl#Content">
+        <Setter Property="Foreground" Value="{DynamicResource CalendarViewOutOfScopeForeground}"/>
       </Style>
-    </ControlTheme>
+    </Style>
+
+    <Style Selector="^:blackout /template/ ContentControl#Content">
+      <Setter Property="Foreground" Value="{DynamicResource CalendarViewBlackoutForeground}" />
+    </Style>
+
+    <Style Selector="^:disabled /template/ ContentControl#Content">
+      <Setter Property="Foreground" Value="{DynamicResource CalendarViewWeekDayForegroundDisabled}" />
+    </Style>
+  </ControlTheme>
 </ResourceDictionary>

From f66d9aca7a7c034ecdc6ec1565176790677c1c39 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 8 Jul 2022 17:10:48 +0200
Subject: [PATCH 090/240] Formatted CalendarDayButton ControlTheme.

---
 .../Controls/CalendarDayButton.xaml           | 172 +++++++++---------
 1 file changed, 90 insertions(+), 82 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/CalendarDayButton.xaml b/src/Avalonia.Themes.Fluent/Controls/CalendarDayButton.xaml
index 9f476d51bc..dd2692cc5a 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CalendarDayButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CalendarDayButton.xaml
@@ -6,99 +6,107 @@
 -->
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <ControlTheme x:Key="{x:Type CalendarDayButton}" TargetType="CalendarDayButton">
-      <Setter Property="ClickMode" Value="Release" />
-      <Setter Property="MinWidth" Value="40" />
-      <Setter Property="MinHeight" Value="40" />
-      <Setter Property="Margin" Value="1" />
-      <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}" />
-      <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewCalendarItemRevealBorderBrush}" />
-      <Setter Property="BorderThickness" Value="2" />
-      <Setter Property="FontSize" Value="20" />
-      <Setter Property="ClipToBounds" Value="False" />
-      <Setter Property="HorizontalContentAlignment" Value="Center" />
-      <Setter Property="VerticalContentAlignment" Value="Center" />
-      <Setter Property="Template">
-        <ControlTemplate>
-          <Panel>
-            <!-- To mimic WinUI SystemFocusVisual, Focus visual is drawn outside the bounds of the item -->
-            <Border Name="Root" Background="{TemplateBinding Background}"
-                    BorderThickness="0" ClipToBounds="True">
+  <Design.PreviewWith>
+    <Border Padding="20">
+      <StackPanel Spacing="20">
+        <CalendarButton/>
+      </StackPanel>
+    </Border>
+  </Design.PreviewWith>
 
-              <ContentControl Name="Content"
-                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                              Content="{TemplateBinding Content}"
-                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                              FontSize="{TemplateBinding FontSize}"
-                              Margin="{TemplateBinding Padding}" />
-              
-            </Border>
-            
-            <!-- Drawn Border should render on top of background to preserve the 1px margin between items-->
-            <Border Name="Border"
-                    BorderThickness="2"
-                    BorderBrush="{TemplateBinding BorderBrush}" />
-          </Panel>
-        </ControlTemplate>
-      </Setter>
+  <ControlTheme x:Key="{x:Type CalendarDayButton}" TargetType="CalendarDayButton">
+    <Setter Property="ClickMode" Value="Release" />
+    <Setter Property="MinWidth" Value="40" />
+    <Setter Property="MinHeight" Value="40" />
+    <Setter Property="Margin" Value="1" />
+    <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}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewCalendarItemRevealBorderBrush}" />
+    <Setter Property="BorderThickness" Value="2" />
+    <Setter Property="FontSize" Value="20" />
+    <Setter Property="ClipToBounds" Value="False" />
+    <Setter Property="HorizontalContentAlignment" Value="Center" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Panel>
+          <!-- To mimic WinUI SystemFocusVisual, Focus visual is drawn outside the bounds of the item -->
+          <Border Name="Root" Background="{TemplateBinding Background}"
+                  BorderThickness="0" ClipToBounds="True">
 
+            <ContentControl Name="Content"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            Content="{TemplateBinding Content}"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            FontSize="{TemplateBinding FontSize}"
+                            Margin="{TemplateBinding Padding}" />
+
+          </Border>
+
+          <!-- Drawn Border should render on top of background to preserve the 1px margin between items-->
+          <Border Name="Border"
+                  BorderThickness="2"
+                  BorderBrush="{TemplateBinding BorderBrush}" />
+        </Panel>
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^:pointerover /template/ Border#Border">
+      <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewHoverBorderBrush}" />
+    </Style>
+
+    <Style Selector="^:pressed /template/ Border#Border">
+      <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewPressedBorderBrush}" />
+    </Style>
+
+    <Style Selector="^:selected">
+      <Style Selector="^ /template/ Border#Border">
+        <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewSelectedBorderBrush}" />
+      </Style>
       <Style Selector="^:pointerover /template/ Border#Border">
-        <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewHoverBorderBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewSelectedHoverBorderBrush}" />
       </Style>
-
       <Style Selector="^:pressed /template/ Border#Border">
-        <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewPressedBorderBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewSelectedPressedBorderBrush}" />
       </Style>
+    </Style>
 
-      <Style Selector="^:selected">
-        <Style Selector="^ /template/ Border#Border">
-          <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewSelectedBorderBrush}" />
-        </Style>
-        <Style Selector="^:pointerover /template/ Border#Border">
-          <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewSelectedHoverBorderBrush}" />
-        </Style>
-        <Style Selector="^:pressed /template/ Border#Border">
-          <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewSelectedPressedBorderBrush}" />
-        </Style>
+    <Style Selector="^:today">
+      <Style Selector="^ /template/ Border#Root">
+        <Setter Property="Background" Value="{DynamicResource SystemAccentColor}" />
       </Style>
-
-      <Style Selector="^:today">
-        <Style Selector="^ /template/ Border#Root">
-          <Setter Property="Background" Value="{DynamicResource SystemAccentColor}" />
-        </Style>
-        <!-- These are probably set in code, but consistent -->
-        <Style Selector="^:pointerover /template/ Border#Border">
-          <Setter Property="BorderBrush" Value="{DynamicResource SystemAccentColorDark1}" />
-        </Style>
-        <Style Selector="^:pressed /template/ Border#Border">
-          <Setter Property="BorderBrush" Value="{DynamicResource SystemAccentColorDark2}" />
-        </Style>
-        <Style Selector="^ ContentControl#Content">
-          <Setter Property="Foreground" Value="{DynamicResource CalendarViewTodayForeground}" />
-          <Setter Property="FontWeight" Value="SemiBold" />
-        </Style>
+      <!-- These are probably set in code, but consistent -->
+      <Style Selector="^:pointerover /template/ Border#Border">
+        <Setter Property="BorderBrush" Value="{DynamicResource SystemAccentColorDark1}" />
       </Style>
-
-      <!-- WinUI calls this OutOfFocus -->
-      <Style Selector="^:inactive">
-        <Style Selector="^ /template/ Border#Root">
-          <Setter Property="Background" Value="{DynamicResource CalendarViewOutOfScopeBackground}" />
-        </Style>
-        <Style Selector="^ /template/ ContentControl#Content">
-          <Setter Property="Foreground" Value="{DynamicResource CalendarViewOutOfScopeForeground}" />
-        </Style>
+      <Style Selector="^:pressed /template/ Border#Border">
+        <Setter Property="BorderBrush" Value="{DynamicResource SystemAccentColorDark2}" />
       </Style>
-
-      <Style Selector="^:blackout /template/ ContentControl#Content">
-        <Setter Property="Foreground" Value="{DynamicResource CalendarViewBlackoutForeground}" />
+      <Style Selector="^ ContentControl#Content">
+        <Setter Property="Foreground" Value="{DynamicResource CalendarViewTodayForeground}" />
+        <Setter Property="FontWeight" Value="SemiBold" />
       </Style>
+    </Style>
 
-      <Style Selector="^:disabled /template/ ContentControl#Content">
-        <Setter Property="Foreground" Value="{DynamicResource CalendarViewWeekDayForegroundDisabled}" />
+    <!-- WinUI calls this OutOfFocus -->
+    <Style Selector="^:inactive">
+      <Style Selector="^ /template/ Border#Root">
+        <Setter Property="Background" Value="{DynamicResource CalendarViewOutOfScopeBackground}" />
       </Style>
-    </ControlTheme>
+      <Style Selector="^ /template/ ContentControl#Content">
+        <Setter Property="Foreground" Value="{DynamicResource CalendarViewOutOfScopeForeground}" />
+      </Style>
+    </Style>
+
+    <Style Selector="^:blackout /template/ ContentControl#Content">
+      <Setter Property="Foreground" Value="{DynamicResource CalendarViewBlackoutForeground}" />
+    </Style>
+
+    <Style Selector="^:disabled /template/ ContentControl#Content">
+      <Setter Property="Foreground" Value="{DynamicResource CalendarViewWeekDayForegroundDisabled}" />
+    </Style>
+  </ControlTheme>
 </ResourceDictionary>

From 1e642fb3218d990cc8bbbe84e22c8f8d336ca52b Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 8 Jul 2022 17:23:24 +0200
Subject: [PATCH 091/240] Tweaked CalendarItem ControlTheme.

---
 .../Controls/CalendarItem.xaml                | 276 +++++++++---------
 1 file changed, 143 insertions(+), 133 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/CalendarItem.xaml b/src/Avalonia.Themes.Fluent/Controls/CalendarItem.xaml
index f8fec58ef7..6914a0db08 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CalendarItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CalendarItem.xaml
@@ -6,145 +6,155 @@
 -->
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:sys="clr-namespace:System;assembly=netstandard"
         x:CompileBindings="True"
         x:DataType="CalendarItem">
-    <Design.PreviewWith>
-      <Border Padding="20">
-        <Calendar />
-      </Border>
-    </Design.PreviewWith>
-  
-    <ControlTheme x:Key="FluentCalendarItemButton" TargetType="Button">
-      <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">
-        <ControlTemplate>
-          <!-- HCA was changed here to ensure nav arrows display correctly -->
-          <ContentPresenter Name="Text" Background="{TemplateBinding Background}"
-                            BorderBrush="{DynamicResource CalendarViewNavigationButtonBorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            Content="{TemplateBinding Content}"
-                            Margin="{TemplateBinding Padding}"
-                            HorizontalContentAlignment="Stretch"
-                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-        </ControlTemplate>
-      </Setter>
-      
-      <Style Selector="^:pointerover /template/ ContentPresenter#Text">
-        <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewNavigationButtonBorderBrushPointerOver}" />
-        <Setter Property="Foreground" Value="{DynamicResource CalendarViewNavigationButtonForegroundPointerOver}" />
-      </Style>
-      <Style Selector="^:pressed /template/ ContentPresenter#Text">
-        <Setter Property="Foreground" Value="{DynamicResource CalendarViewNavigationButtonForegroundPressed}" />
-      </Style>
-      <Style Selector="^:disabled /template/ ContentPresenter">
-        <Setter Property="Foreground" Value="{DynamicResource CalendarViewWeekDayForegroundDisabled}" />
-      </Style>
-    </ControlTheme>
+  <Design.PreviewWith>
+    <Border Padding="20">
+      <Calendar DisplayDate="2000-01-01">
+        <Calendar.BlackoutDates>
+          <CalendarDateRange>
+            <x:Arguments>
+              <sys:DateTime>2000-01-01</sys:DateTime>
+              <sys:DateTime>2000-01-05</sys:DateTime>
+            </x:Arguments>
+          </CalendarDateRange>
+        </Calendar.BlackoutDates>
+      </Calendar>
+    </Border>
+  </Design.PreviewWith>
 
-    <ControlTheme x:Key="{x:Type CalendarItem}" TargetType="CalendarItem">
-      <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-      <Setter Property="DayTitleTemplate">
-        <Template>
-          <TextBlock Text="{Binding}"
-                     HorizontalAlignment="Center"
-                     VerticalAlignment="Center"
-                     FontSize="12" />
-        </Template>
-      </Setter>
-      
-      <Setter Property="Template">
-        <ControlTemplate>
-          <Border BorderThickness="{TemplateBinding BorderThickness}" 
-                  Background="{TemplateBinding Background}"
-                  BorderBrush="{TemplateBinding BorderBrush}"
-                  CornerRadius="{TemplateBinding CornerRadius}">
-            <!-- To keep calendar from resizing when switching DisplayMode
+  <ControlTheme x:Key="FluentCalendarButton" TargetType="Button">
+    <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">
+      <ControlTemplate>
+        <!-- HCA was changed here to ensure nav arrows display correctly -->
+        <ContentPresenter Name="Text" Background="{TemplateBinding Background}"
+                          BorderBrush="{DynamicResource CalendarViewNavigationButtonBorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          Content="{TemplateBinding Content}"
+                          Margin="{TemplateBinding Padding}"
+                          HorizontalContentAlignment="Stretch"
+                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^:pointerover /template/ ContentPresenter#Text">
+      <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewNavigationButtonBorderBrushPointerOver}" />
+      <Setter Property="Foreground" Value="{DynamicResource CalendarViewNavigationButtonForegroundPointerOver}" />
+    </Style>
+    <Style Selector="^:pressed /template/ ContentPresenter#Text">
+      <Setter Property="Foreground" Value="{DynamicResource CalendarViewNavigationButtonForegroundPressed}" />
+    </Style>
+    <Style Selector="^:disabled /template/ ContentPresenter">
+      <Setter Property="Foreground" Value="{DynamicResource CalendarViewWeekDayForegroundDisabled}" />
+    </Style>
+  </ControlTheme>
+
+  <ControlTheme x:Key="{x:Type CalendarItem}" TargetType="CalendarItem">
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+    <Setter Property="DayTitleTemplate">
+      <Template>
+        <TextBlock Text="{Binding}"
+                   HorizontalAlignment="Center"
+                   VerticalAlignment="Center"
+                   FontSize="12" />
+      </Template>
+    </Setter>
+
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border BorderThickness="{TemplateBinding BorderThickness}"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <!-- To keep calendar from resizing when switching DisplayMode
                  In WinUI Min-Width from TemplateSettings
                  basically...MinWidth of DayItem = 40, 40 * 7 = 280 + margins/padding = ~294
                  Viewport height is set from # of rows displayed (2-8) in Month mode, = ~290 for 6 weeks (+ day names)
                  -->
-            <Grid VerticalAlignment="Stretch" HorizontalAlignment="Stretch" RowDefinitions="40,*" MinWidth="294">
-              <Grid ColumnDefinitions="5*,*,*">
-                <Button Name="HeaderButton" 
-                        Theme="{StaticResource FluentCalendarItemButton}"
-                        Foreground="{TemplateBinding Foreground}"
-                        Padding="12,0,0,0"
-                        HorizontalContentAlignment="Left" />
-                <Button Name="PreviousButton"
-                        Grid.Column="1"
-                        Theme="{StaticResource FluentCalendarItemButton}"
-                        Foreground="{TemplateBinding Foreground}"
-                        Padding="1"
-                        HorizontalContentAlignment="Left">
-                  <!--Path mimics Segoe MDL2 Assets font glyph used in WinUI-->
-                  <Path StrokeThickness="1.5" Data="M 0,9 L 9,0 L 18,9" HorizontalAlignment="Center" VerticalAlignment="Center" />
-                </Button>
-                <Button Name="NextButton"
-                        Grid.Column="2"
-                        Theme="{StaticResource FluentCalendarItemButton}"
-                        Foreground="{TemplateBinding Foreground}" 
-                        Padding="1"
-                        HorizontalContentAlignment="Left">
-                  <!--Path mimics Segoe MDL2 Assets font glyph used in WinUI-->
-                  <Path StrokeThickness="1.5" Data="M 0,0 L 9,9 L 18,0" HorizontalAlignment="Center" VerticalAlignment="Center" />
-                </Button>
-              </Grid>
-              <!--Border below is used only for MonthView but it can't be moved inside of Grid because CalendarItem expects it to be empty and it will cause side-effects-->
-              <Border Name="BackgroundLayer" Background="{TemplateBinding BorderBrush}" Margin="0,38,0,0" IsVisible="{ReflectionBinding #MonthView.IsVisible}" Grid.Row="1" />
-              <Grid Name="MonthView" Grid.Row="1" IsVisible="False" MinHeight="290">
-                <Grid.RowDefinitions>
-                  <!--This should always be the week day names??-->
-                  <RowDefinition Height="38" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-              </Grid>
-              <Grid Name="YearView"
-                    Background="{TemplateBinding BorderBrush}"
-                    MinHeight="290"
-                    Grid.Row="1"
-                    IsVisible="False">
-                <Grid.RowDefinitions>
-                  <RowDefinition Height="*" />
-                  <RowDefinition Height="*" />
-                  <RowDefinition Height="*" />
-                </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="*" />
-                  <ColumnDefinition Width="*" />
-                  <ColumnDefinition Width="*" />
-                  <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-              </Grid>
+          <Grid VerticalAlignment="Stretch" HorizontalAlignment="Stretch" RowDefinitions="40,*" MinWidth="294">
+            <Grid ColumnDefinitions="5*,*,*">
+              <Button Name="HeaderButton"
+                      Theme="{StaticResource FluentCalendarButton}"
+                      Foreground="{TemplateBinding Foreground}"
+                      Padding="12,0,0,0"
+                      HorizontalContentAlignment="Left" />
+              <Button Name="PreviousButton"
+                      Grid.Column="1"
+                      Theme="{StaticResource FluentCalendarButton}"
+                      Foreground="{TemplateBinding Foreground}"
+                      Padding="1"
+                      HorizontalContentAlignment="Left">
+                <!--Path mimics Segoe MDL2 Assets font glyph used in WinUI-->
+                <Path StrokeThickness="1.5" Data="M 0,9 L 9,0 L 18,9" HorizontalAlignment="Center" VerticalAlignment="Center" />
+              </Button>
+              <Button Name="NextButton"
+                      Grid.Column="2"
+                      Theme="{StaticResource FluentCalendarButton}"
+                      Foreground="{TemplateBinding Foreground}"
+                      Padding="1"
+                      HorizontalContentAlignment="Left">
+                <!--Path mimics Segoe MDL2 Assets font glyph used in WinUI-->
+                <Path StrokeThickness="1.5" Data="M 0,0 L 9,9 L 18,0" HorizontalAlignment="Center" VerticalAlignment="Center" />
+              </Button>
+            </Grid>
+            <!--Border below is used only for MonthView but it can't be moved inside of Grid because CalendarItem expects it to be empty and it will cause side-effects-->
+            <Border Name="BackgroundLayer" Background="{TemplateBinding BorderBrush}" Margin="0,38,0,0" IsVisible="{ReflectionBinding #MonthView.IsVisible}" Grid.Row="1" />
+            <Grid Name="MonthView" Grid.Row="1" IsVisible="False" MinHeight="290">
+              <Grid.RowDefinitions>
+                <!--This should always be the week day names??-->
+                <RowDefinition Height="38" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+              </Grid.RowDefinitions>
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+              </Grid.ColumnDefinitions>
+            </Grid>
+            <Grid Name="YearView"
+                  Background="{TemplateBinding BorderBrush}"
+                  MinHeight="290"
+                  Grid.Row="1"
+                  IsVisible="False">
+              <Grid.RowDefinitions>
+                <RowDefinition Height="*" />
+                <RowDefinition Height="*" />
+                <RowDefinition Height="*" />
+              </Grid.RowDefinitions>
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="*" />
+              </Grid.ColumnDefinitions>
             </Grid>
-          </Border>
-        </ControlTemplate>
-      </Setter>
-      <Style Selector="^ /template/ Button > Path">
-        <Setter Property="Stroke" Value="{DynamicResource CalendarViewForeground}" />
-      </Style>
-      <Style Selector="^ /template/ Button:pointerover > Path">
-        <Setter Property="Stroke" Value="{DynamicResource CalendarViewNavigationButtonForegroundPointerOver}" />
-      </Style>
-      <Style Selector="^ /template/ Button:pressed > Path">
-        <Setter Property="Stroke" Value="{DynamicResource CalendarViewNavigationButtonForegroundPressed}" />
-      </Style>
-    </ControlTheme>
+          </Grid>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+    <Style Selector="^ /template/ Button > Path">
+      <Setter Property="Stroke" Value="{DynamicResource CalendarViewForeground}" />
+    </Style>
+    <Style Selector="^ /template/ Button:pointerover > Path">
+      <Setter Property="Stroke" Value="{DynamicResource CalendarViewNavigationButtonForegroundPointerOver}" />
+    </Style>
+    <Style Selector="^ /template/ Button:pressed > Path">
+      <Setter Property="Stroke" Value="{DynamicResource CalendarViewNavigationButtonForegroundPressed}" />
+    </Style>
+  </ControlTheme>
 </ResourceDictionary>

From f6e8dda027e159820f744a03ebff8cca80d1c998 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 8 Jul 2022 17:26:17 +0200
Subject: [PATCH 092/240] Formatted CalendarDatePicker ControlTheme.

---
 .../Controls/CalendarDatePicker.xaml          | 328 +++++++++---------
 1 file changed, 163 insertions(+), 165 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml b/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml
index eefd9e9b51..54f6a200b8 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml
@@ -2,179 +2,177 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:sys="clr-namespace:System;assembly=netstandard"
                     x:CompileBindings="True">
-    <Design.PreviewWith>
-      <Border Margin="20, 20, 20, 200">
-        <CalendarDatePicker Width="200" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" />
-      </Border>
-    </Design.PreviewWith>
-  
-    <x:Double x:Key="CalendarDatePickerCurrentDayFontSize">12</x:Double>
-    <x:Double x:Key="CalendarDatePickerMinHeight">32</x:Double>
+  <Design.PreviewWith>
+    <Border Margin="20, 20, 20, 200">
+      <CalendarDatePicker Width="200" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" />
+    </Border>
+  </Design.PreviewWith>
 
-    <ControlTheme x:Key="FluentCalendarDatePickerButton" TargetType="Button">
-      <Setter Property="TextElement.Foreground" Value="{DynamicResource CalendarDatePickerCalendarGlyphForeground}" />
-      <Setter Property="Margin" Value="2,0,4,0" />
-      <Setter Property="Width" Value="20" />
-      <Setter Property="Template">
-        <ControlTemplate>
-          <Grid Height="24"
-                Width="20"
-                HorizontalAlignment="Center"
-                VerticalAlignment="Center"
-                Margin="0"
-                ColumnDefinitions="*,*,*,*"
-                RowDefinitions="23*,19*,19*,19*"
-                ClipToBounds="False">
-            <Border Name="Background"
-                    Margin="0,-1,0,0"
-                    Grid.ColumnSpan="4"
-                    Grid.Row="1"
-                    Grid.RowSpan="3"
-                    BorderThickness="0.5,0,0.5,0.5"
-                    BorderBrush="{TemplateBinding Foreground}"
-                    CornerRadius="0,0,2,2" />
-            <Border Grid.ColumnSpan="4"
-                    Grid.RowSpan="1"
-                    BorderBrush="{TemplateBinding Foreground}"
-                    BorderThickness="0.5"
-                    CornerRadius="2,2,0,0" />
-            <TextBlock Margin="0,-1,0,0"
-                       VerticalAlignment="Center"
-                       HorizontalAlignment="Center"
-                       Grid.Column="0"
-                       Grid.Row="1"
-                       Grid.ColumnSpan="4"
-                       Grid.RowSpan="3"
-                       Foreground="{TemplateBinding Foreground}"
-                       FontSize="{DynamicResource CalendarDatePickerCurrentDayFontSize}"
-                       Text="{Binding Source={x:Static sys:DateTime.Today}, Path=Day}" />
-            <Ellipse HorizontalAlignment="Center"
+  <x:Double x:Key="CalendarDatePickerCurrentDayFontSize">12</x:Double>
+  <x:Double x:Key="CalendarDatePickerMinHeight">32</x:Double>
+
+  <ControlTheme x:Key="FluentCalendarDatePickerButton" TargetType="Button">
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource CalendarDatePickerCalendarGlyphForeground}" />
+    <Setter Property="Margin" Value="2,0,4,0" />
+    <Setter Property="Width" Value="20" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Grid Height="24"
+              Width="20"
+              HorizontalAlignment="Center"
+              VerticalAlignment="Center"
+              Margin="0"
+              ColumnDefinitions="*,*,*,*"
+              RowDefinitions="23*,19*,19*,19*"
+              ClipToBounds="False">
+          <Border Name="Background"
+                  Margin="0,-1,0,0"
+                  Grid.ColumnSpan="4"
+                  Grid.Row="1"
+                  Grid.RowSpan="3"
+                  BorderThickness="0.5,0,0.5,0.5"
+                  BorderBrush="{TemplateBinding Foreground}"
+                  CornerRadius="0,0,2,2" />
+          <Border Grid.ColumnSpan="4"
+                  Grid.RowSpan="1"
+                  BorderBrush="{TemplateBinding Foreground}"
+                  BorderThickness="0.5"
+                  CornerRadius="2,2,0,0" />
+          <TextBlock Margin="0,-1,0,0"
                      VerticalAlignment="Center"
-                     Fill="{TemplateBinding Foreground}"
-                     StrokeThickness="0"
+                     HorizontalAlignment="Center"
+                     Grid.Column="0"
+                     Grid.Row="1"
                      Grid.ColumnSpan="4"
-                     Width="3"
-                     Height="3" />
-          </Grid>
-        </ControlTemplate>
-      </Setter>
-    </ControlTheme>
-    
-    <ControlTheme x:Key="{x:Type CalendarDatePicker}" TargetType="CalendarDatePicker">
-      <Setter Property="Background" Value="{DynamicResource CalendarDatePickerBackground}" />
-      <Setter Property="Foreground" Value="{DynamicResource CalendarDatePickerForeground}" />
-      <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderBrush}" />
-      <Setter Property="BorderThickness" Value="{DynamicResource CalendarDatePickerBorderThemeThickness}" />
-      <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-      <Setter Property="MinHeight" Value="{DynamicResource CalendarDatePickerMinHeight}" />
-      <Setter Property="HorizontalAlignment" Value="Left" />
-      <Setter Property="VerticalAlignment" Value="Center" />
-      <Setter Property="HorizontalContentAlignment" Value="Left" />
-      <Setter Property="VerticalContentAlignment" Value="Center" />
-      <Setter Property="Padding" Value="4" />
-      <Setter Property="Template">
-        <ControlTemplate>
-          <DataValidationErrors>
-            <Panel x:Name="LayoutRoot"
-                   HorizontalAlignment="Stretch"
-                   VerticalAlignment="Stretch">
-              <Border x:Name="Background"
-                      CornerRadius="{TemplateBinding CornerRadius}"
-                      BorderThickness="{TemplateBinding BorderThickness}"
-                      BorderBrush="{TemplateBinding BorderBrush}"
-                      Background="{TemplateBinding Background}" />
-              <Grid ColumnDefinitions="*,Auto">
-                <TextBox Name="PART_TextBox"
-                         Foreground="{TemplateBinding Foreground}"
-                         Background="Transparent"
-                         BorderBrush="Transparent"
-                         BorderThickness="0"
-                         CornerRadius="{TemplateBinding CornerRadius}"
-                         Margin="{TemplateBinding BorderThickness}"
-                         Padding="{TemplateBinding Padding}"
-                         Watermark="{TemplateBinding Watermark}"
-                         UseFloatingWatermark="{TemplateBinding UseFloatingWatermark}"
-                         HorizontalAlignment="Stretch"
-                         VerticalAlignment="Stretch"
-                         VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                         HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                         Grid.Column="0">
-                  <TextBox.Styles>
-                    <Style Selector="TextBox#PART_TextBox:focus /template/ Border#PART_BorderElement">
-                      <!-- By default the TextBox has its own focused state, override this to disable it here -->
-                      <Setter Property="Background" Value="Transparent"/>
-                      <Setter Property="BorderBrush" Value="Transparent"/>
-                      <Setter Property="BorderThickness" Value="0" />
+                     Grid.RowSpan="3"
+                     Foreground="{TemplateBinding Foreground}"
+                     FontSize="{DynamicResource CalendarDatePickerCurrentDayFontSize}"
+                     Text="{Binding Source={x:Static sys:DateTime.Today}, Path=Day}" />
+          <Ellipse HorizontalAlignment="Center"
+                   VerticalAlignment="Center"
+                   Fill="{TemplateBinding Foreground}"
+                   StrokeThickness="0"
+                   Grid.ColumnSpan="4"
+                   Width="3"
+                   Height="3" />
+        </Grid>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+
+  <ControlTheme x:Key="{x:Type CalendarDatePicker}" TargetType="CalendarDatePicker">
+    <Setter Property="Background" Value="{DynamicResource CalendarDatePickerBackground}" />
+    <Setter Property="Foreground" Value="{DynamicResource CalendarDatePickerForeground}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource CalendarDatePickerBorderThemeThickness}" />
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+    <Setter Property="MinHeight" Value="{DynamicResource CalendarDatePickerMinHeight}" />
+    <Setter Property="HorizontalAlignment" Value="Left" />
+    <Setter Property="VerticalAlignment" Value="Center" />
+    <Setter Property="HorizontalContentAlignment" Value="Left" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Padding" Value="4" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <DataValidationErrors>
+          <Panel x:Name="LayoutRoot"
+                 HorizontalAlignment="Stretch"
+                 VerticalAlignment="Stretch">
+            <Border x:Name="Background"
+                    CornerRadius="{TemplateBinding CornerRadius}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    Background="{TemplateBinding Background}" />
+            <Grid ColumnDefinitions="*,Auto">
+              <TextBox Name="PART_TextBox"
+                       Foreground="{TemplateBinding Foreground}"
+                       Background="Transparent"
+                       BorderBrush="Transparent"
+                       BorderThickness="0"
+                       CornerRadius="{TemplateBinding CornerRadius}"
+                       Margin="{TemplateBinding BorderThickness}"
+                       Padding="{TemplateBinding Padding}"
+                       Watermark="{TemplateBinding Watermark}"
+                       UseFloatingWatermark="{TemplateBinding UseFloatingWatermark}"
+                       HorizontalAlignment="Stretch"
+                       VerticalAlignment="Stretch"
+                       VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                       HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                       Grid.Column="0">
+                <TextBox.Styles>
+                  <Style Selector="TextBox#PART_TextBox:focus /template/ Border#PART_BorderElement">
+                    <!-- By default the TextBox has its own focused state, override this to disable it here -->
+                    <Setter Property="Background" Value="Transparent"/>
+                    <Setter Property="BorderBrush" Value="Transparent"/>
+                    <Setter Property="BorderThickness" Value="0" />
+                  </Style>
+                  <Style Selector="TextBox#PART_TextBox:disabled">
+                    <Style Selector="^ /template/ Border#PART_BorderElement">
+                      <!-- By default the TextBox has its own disabled state, override this to make the border background show through -->
+                      <Setter Property="Background" Value="Transparent" />
+                      <Setter Property="BorderBrush" Value="Transparent" />
                     </Style>
-                    <Style Selector="TextBox#PART_TextBox:disabled">
-                      <Style Selector="^ /template/ Border#PART_BorderElement">
-                        <!-- By default the TextBox has its own disabled state, override this to make the border background show through -->
-                        <Setter Property="Background" Value="Transparent" />
-                        <Setter Property="BorderBrush" Value="Transparent" />
-                      </Style>
-                      <Style Selector="^ /template/ TextBlock#PART_Watermark, ^ TextBlock#PART_FloatingWatermark">
-                        <Setter Property="TextElement.Foreground" Value="{DynamicResource CalendarDatePickerTextForegroundDisabled}" />
-                      </Style>
+                    <Style Selector="^ /template/ TextBlock#PART_Watermark, ^ TextBlock#PART_FloatingWatermark">
+                      <Setter Property="TextElement.Foreground" Value="{DynamicResource CalendarDatePickerTextForegroundDisabled}" />
                     </Style>
-                  </TextBox.Styles>
-                </TextBox>
-                <Button Name="PART_Button" 
-                        Theme="{StaticResource FluentCalendarDatePickerButton}"
-                        Grid.Column="1"
-                        Focusable="False" />
-                <Popup Name="PART_Popup"
-                       PlacementTarget="{TemplateBinding}"
-                       IsLightDismissEnabled="True">
-                  <Calendar Name="PART_Calendar" 
-                            FirstDayOfWeek="{TemplateBinding FirstDayOfWeek}" 
-                            IsTodayHighlighted="{TemplateBinding IsTodayHighlighted}"
-                            SelectedDate="{TemplateBinding SelectedDate, Mode=TwoWay}"
-                            DisplayDate="{TemplateBinding DisplayDate}" 
-                            DisplayDateStart="{TemplateBinding DisplayDateStart}"
-                            DisplayDateEnd="{TemplateBinding DisplayDateEnd}" />
-                </Popup>
-              </Grid>
-            </Panel>
-          </DataValidationErrors>
-        </ControlTemplate>
-      </Setter>
-     
-      <!-- Pressed State -->
-      <Style Selector="^:pressed /template/ Border#Background">
-        <Setter Property="Background" Value="{DynamicResource CalendarDatePickerBackgroundPressed}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderBrushPressed}" />
-      </Style>
-      
-      <!-- Pointer-over State -->
-      <Style Selector="^:pointerover /template/ Border#Background">
-        <Setter Property="Background" Value="{DynamicResource CalendarDatePickerBackgroundPointerOver}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderBrushPointerOver}" />
-      </Style>
+                  </Style>
+                </TextBox.Styles>
+              </TextBox>
+              <Button Name="PART_Button"
+                      Theme="{StaticResource FluentCalendarDatePickerButton}"
+                      Grid.Column="1"
+                      Focusable="False" />
+              <Popup Name="PART_Popup"
+                     PlacementTarget="{TemplateBinding}"
+                     IsLightDismissEnabled="True">
+                <Calendar Name="PART_Calendar"
+                          FirstDayOfWeek="{TemplateBinding FirstDayOfWeek}"
+                          IsTodayHighlighted="{TemplateBinding IsTodayHighlighted}"
+                          SelectedDate="{TemplateBinding SelectedDate, Mode=TwoWay}"
+                          DisplayDate="{TemplateBinding DisplayDate}"
+                          DisplayDateStart="{TemplateBinding DisplayDateStart}"
+                          DisplayDateEnd="{TemplateBinding DisplayDateEnd}" />
+              </Popup>
+            </Grid>
+          </Panel>
+        </DataValidationErrors>
+      </ControlTemplate>
+    </Setter>
 
-      <!-- Disabled State -->
-      <Style Selector="^:disabled">
-        <Style Selector="^ /template/ Border#Background">
-          <Setter Property="Background" Value="{DynamicResource CalendarDatePickerBackgroundDisabled}" />
-          <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderBrushDisabled}" />
-        </Style>
-        
-        <Style Selector="^ /template/ Button#PART_Button">
-          <Setter Property="TextElement.Foreground" Value="{DynamicResource CalendarDatePickerCalendarGlyphForegroundDisabled}" />
-        </Style>
+    <!-- Pressed State -->
+    <Style Selector="^:pressed /template/ Border#Background">
+      <Setter Property="Background" Value="{DynamicResource CalendarDatePickerBackgroundPressed}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderBrushPressed}" />
+    </Style>
 
-      </Style>
+    <!-- Pointer-over State -->
+    <Style Selector="^:pointerover /template/ Border#Background">
+      <Setter Property="Background" Value="{DynamicResource CalendarDatePickerBackgroundPointerOver}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderBrushPointerOver}" />
+    </Style>
 
-      <!-- Focused State -->
-      <Style Selector="^:focus-within:not(CalendarDatePicker:focus) /template/ Border#Background">
-        <Setter Property="Background" Value="{DynamicResource TextControlBackgroundFocused}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushFocused}" />
-        <Setter Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThicknessFocused}" />
+    <!-- Disabled State -->
+    <Style Selector="^:disabled">
+      <Style Selector="^ /template/ Border#Background">
+        <Setter Property="Background" Value="{DynamicResource CalendarDatePickerBackgroundDisabled}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderBrushDisabled}" />
       </Style>
-      
-      <!-- Error State -->
-      <Style Selector="^:error /template/ Border#Background">
-        <Setter Property="BorderBrush" Value="{DynamicResource SystemControlErrorTextForegroundBrush}" />
+
+      <Style Selector="^ /template/ Button#PART_Button">
+        <Setter Property="TextElement.Foreground" Value="{DynamicResource CalendarDatePickerCalendarGlyphForegroundDisabled}" />
       </Style>
-    </ControlTheme>
-  
+    </Style>
+
+    <!-- Focused State -->
+    <Style Selector="^:focus-within:not(CalendarDatePicker:focus) /template/ Border#Background">
+      <Setter Property="Background" Value="{DynamicResource TextControlBackgroundFocused}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushFocused}" />
+      <Setter Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThicknessFocused}" />
+    </Style>
+
+    <!-- Error State -->
+    <Style Selector="^:error /template/ Border#Background">
+      <Setter Property="BorderBrush" Value="{DynamicResource SystemControlErrorTextForegroundBrush}" />
+    </Style>
+  </ControlTheme>
 </ResourceDictionary>

From 902955dd0a7cf62ae5c5d4766db9f098bff5c388 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 8 Jul 2022 17:27:20 +0200
Subject: [PATCH 093/240] Formatted Carousel ControlTheme.

---
 .../Controls/Carousel.xaml                    | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/Carousel.xaml b/src/Avalonia.Themes.Fluent/Controls/Carousel.xaml
index 6c05a62250..2cac701e1b 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Carousel.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Carousel.xaml
@@ -1,20 +1,20 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <ControlTheme x:Key="{x:Type Carousel}" TargetType="Carousel">
-      <Setter Property="Template">
-        <ControlTemplate>
-          <Border Background="{TemplateBinding Background}"
-                  BorderBrush="{TemplateBinding BorderBrush}"
-                  BorderThickness="{TemplateBinding BorderThickness}"
-                  CornerRadius="{TemplateBinding CornerRadius}">
-            <CarouselPresenter IsVirtualized="{TemplateBinding IsVirtualized}"
-                               Items="{TemplateBinding Items}"
-                               ItemsPanel="{TemplateBinding ItemsPanel}"
-                               Margin="{TemplateBinding Padding}"
-                               SelectedIndex="{TemplateBinding SelectedIndex}"
-                               PageTransition="{TemplateBinding PageTransition}"/>
-          </Border>
-        </ControlTemplate>
-      </Setter>
-    </ControlTheme>
+  <ControlTheme x:Key="{x:Type Carousel}" TargetType="Carousel">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <CarouselPresenter IsVirtualized="{TemplateBinding IsVirtualized}"
+                             Items="{TemplateBinding Items}"
+                             ItemsPanel="{TemplateBinding ItemsPanel}"
+                             Margin="{TemplateBinding Padding}"
+                             SelectedIndex="{TemplateBinding SelectedIndex}"
+                             PageTransition="{TemplateBinding PageTransition}"/>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
 </ResourceDictionary>

From 0647492701663bba1cdb9ccdaa9a0cc27d352b4a Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 8 Jul 2022 17:28:39 +0200
Subject: [PATCH 094/240] Formatted ContextMenu ControlTheme.

---
 .../Controls/ContextMenu.xaml                 | 132 +++++++++---------
 1 file changed, 65 insertions(+), 67 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/ContextMenu.xaml b/src/Avalonia.Themes.Fluent/Controls/ContextMenu.xaml
index fe0f0f3f6c..8365ee61d3 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ContextMenu.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ContextMenu.xaml
@@ -1,72 +1,70 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Design.PreviewWith>
-      <Border Background="{DynamicResource SystemAccentColor}"
-              Margin="16"
-              Padding="48"
-              Width="400"
-              Height="200">
-        <Border.ContextMenu>
-          <ContextMenu>
-            <MenuItem Header="Standard _Menu Item" />
-            <MenuItem Header="Disabled"
-                      IsEnabled="False" />
-            <Separator />
-            <MenuItem Header="Menu with _Submenu">
-              <MenuItem Header="Submenu _1" />
-              <MenuItem Header="Submenu _2" />
-            </MenuItem>
-            <MenuItem Header="Menu Item with _Icon" />
-            <MenuItem Header="Menu Item with _Checkbox">
-              <MenuItem.Icon>
-                <CheckBox BorderThickness="0"
-                          IsHitTestVisible="False"
-                          IsChecked="True" />
-              </MenuItem.Icon>
-            </MenuItem>
-          </ContextMenu>
-        </Border.ContextMenu>
-        <TextBlock Text="Defined in XAML" />
-      </Border>
-    </Design.PreviewWith>
+  <Design.PreviewWith>
+    <Border Background="{DynamicResource SystemAccentColor}"
+            Margin="16"
+            Padding="48"
+            Width="400"
+            Height="200">
+      <Border.ContextMenu>
+        <ContextMenu>
+          <MenuItem Header="Standard _Menu Item" />
+          <MenuItem Header="Disabled" IsEnabled="False" />
+          <Separator />
+          <MenuItem Header="Menu with _Submenu">
+            <MenuItem Header="Submenu _1" />
+            <MenuItem Header="Submenu _2" />
+          </MenuItem>
+          <MenuItem Header="Menu Item with _Icon" />
+          <MenuItem Header="Menu Item with _Checkbox">
+            <MenuItem.Icon>
+              <CheckBox BorderThickness="0"
+                        IsHitTestVisible="False"
+                        IsChecked="True" />
+            </MenuItem.Icon>
+          </MenuItem>
+        </ContextMenu>
+      </Border.ContextMenu>
+      <TextBlock Text="Defined in XAML" />
+    </Border>
+  </Design.PreviewWith>
 
-    <!-- Added missing resource -->
-    <Thickness x:Key="MenuFlyoutScrollerMargin">0,4,0,4</Thickness>
-
-    <ControlTheme x:Key="{x:Type ContextMenu}" TargetType="ContextMenu">
-      <Setter Property="Background" Value="{DynamicResource MenuFlyoutPresenterBackground}" />
-      <Setter Property="BorderBrush" Value="{DynamicResource MenuFlyoutPresenterBorderBrush}" />
-      <Setter Property="BorderThickness" Value="{DynamicResource MenuFlyoutPresenterBorderThemeThickness}" />
-      <Setter Property="CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
-      <Setter Property="MaxWidth" Value="{DynamicResource FlyoutThemeMaxWidth}" />
-      <Setter Property="MinHeight" Value="{DynamicResource MenuFlyoutThemeMinHeight}" />
-      <Setter Property="Padding" Value="{DynamicResource MenuFlyoutPresenterThemePadding}" />
-      <Setter Property="HorizontalAlignment" Value="Stretch" />
-      <Setter Property="TextBlock.FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-      <Setter Property="TextBlock.FontWeight" Value="Normal" />
-      <Setter Property="WindowManagerAddShadowHint" Value="False" />
-      <Setter Property="Template">
-        <ControlTemplate>
-          <Border Background="{TemplateBinding Background}"
-                  BorderBrush="{TemplateBinding BorderBrush}"
-                  BorderThickness="{TemplateBinding BorderThickness}"
-                  Padding="{TemplateBinding Padding}"
-                  MaxWidth="{TemplateBinding MaxWidth}"
-                  MinHeight="{TemplateBinding MinHeight}"
-                  HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                  CornerRadius="{TemplateBinding CornerRadius}">
-            <ScrollViewer Classes="menuscroller">
-              <ItemsPresenter Name="PART_ItemsPresenter"
-                              Items="{TemplateBinding Items}"
-                              ItemsPanel="{TemplateBinding ItemsPanel}"
-                              ItemTemplate="{TemplateBinding ItemTemplate}"
-                              Margin="{DynamicResource MenuFlyoutScrollerMargin}"
-                              KeyboardNavigation.TabNavigation="Continue"
-                              Grid.IsSharedSizeScope="True" />
-            </ScrollViewer>
-          </Border>
-        </ControlTemplate>
-      </Setter>
-    </ControlTheme>
+  <!-- Added missing resource -->
+  <Thickness x:Key="MenuFlyoutScrollerMargin">0,4,0,4</Thickness>
 
+  <ControlTheme x:Key="{x:Type ContextMenu}" TargetType="ContextMenu">
+    <Setter Property="Background" Value="{DynamicResource MenuFlyoutPresenterBackground}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource MenuFlyoutPresenterBorderBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource MenuFlyoutPresenterBorderThemeThickness}" />
+    <Setter Property="CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
+    <Setter Property="MaxWidth" Value="{DynamicResource FlyoutThemeMaxWidth}" />
+    <Setter Property="MinHeight" Value="{DynamicResource MenuFlyoutThemeMinHeight}" />
+    <Setter Property="Padding" Value="{DynamicResource MenuFlyoutPresenterThemePadding}" />
+    <Setter Property="HorizontalAlignment" Value="Stretch" />
+    <Setter Property="TextBlock.FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+    <Setter Property="TextBlock.FontWeight" Value="Normal" />
+    <Setter Property="WindowManagerAddShadowHint" Value="False" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                Padding="{TemplateBinding Padding}"
+                MaxWidth="{TemplateBinding MaxWidth}"
+                MinHeight="{TemplateBinding MinHeight}"
+                HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <ScrollViewer Classes="menuscroller">
+            <ItemsPresenter Name="PART_ItemsPresenter"
+                            Items="{TemplateBinding Items}"
+                            ItemsPanel="{TemplateBinding ItemsPanel}"
+                            ItemTemplate="{TemplateBinding ItemTemplate}"
+                            Margin="{DynamicResource MenuFlyoutScrollerMargin}"
+                            KeyboardNavigation.TabNavigation="Continue"
+                            Grid.IsSharedSizeScope="True" />
+          </ScrollViewer>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
 </ResourceDictionary>

From fbe983b6042fd6a8c4bd727545bd600e8dd7c077 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 8 Jul 2022 21:12:26 +0200
Subject: [PATCH 095/240] Ported TextBox to ControlTheme.

---
 .../Controls/FluentControls.xaml              |   2 +-
 .../Controls/TextBox.xaml                     | 361 ++++++++----------
 2 files changed, 166 insertions(+), 197 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
index d344fedf0a..0b5f6a4a72 100644
--- a/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
@@ -41,6 +41,7 @@
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/TabItem.xaml" />
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/TabStrip.xaml" />
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/TabStripItem.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/TextBox.xaml" />
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/ToggleButton.xaml" />
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml" />
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/ToolTip.xaml" />
@@ -66,7 +67,6 @@
     <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/FocusAdorner.xaml" />
     <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/MenuItem.xaml" />
     <!--  TabControl needs to come after TabStrip as it redefines the inner TabStrip.ItemsPanel  -->
-    <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/TextBox.xaml" />
     <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/TreeViewItem.xaml" />
     <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/SplitButton.xaml" />
     <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/SplitView.xaml" />
diff --git a/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml b/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
index 0fd3758d77..17c69da8fd 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
@@ -1,36 +1,100 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        x:CompileBindings="True">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    x:CompileBindings="True">
   <Design.PreviewWith>
     <Border Padding="20">
-      <TextBox Text="Sample"
-               FontSize="20"
-               Width="100"
-               Classes="clearButton"
-               TextAlignment="Center"/>
+      <StackPanel Spacing="20">
+        <TextBox>Left</TextBox>
+        <TextBox TextAlignment="Center">Center</TextBox>
+        <TextBox Classes="clearButton">Clear</TextBox>
+        <TextBox PasswordChar="*" Classes="revealPasswordButton">Reveal Password</TextBox>
+        <TextBox PasswordChar="*" Classes="revealPasswordButton" RevealPassword="True">Password Revealed</TextBox>
+        <TextBox Watermark="Watermark"/>
+        <TextBox Watermark="Floating Watermark" UseFloatingWatermark="True"/>
+        <TextBox Watermark="Floating Watermark" UseFloatingWatermark="True">Content</TextBox>
+      </StackPanel>
     </Border>
   </Design.PreviewWith>
 
-  <Styles.Resources>
-    <Thickness x:Key="TextBoxTopHeaderMargin">0,0,0,4</Thickness>
-    <StreamGeometry x:Key="TextBoxClearButtonData">M 11.416016,10 20,1.4160156 18.583984,0 10,8.5839846 1.4160156,0 0,1.4160156 8.5839844,10 0,18.583985 1.4160156,20 10,11.416015 18.583984,20 20,18.583985 Z</StreamGeometry>
-    <StreamGeometry x:Key="PasswordBoxRevealButtonData">m10.051 7.0032c2.215 0 4.0105 1.7901 4.0105 3.9984s-1.7956 3.9984-4.0105 3.9984c-2.215 0-4.0105-1.7901-4.0105-3.9984s1.7956-3.9984 4.0105-3.9984zm0 1.4994c-1.3844 0-2.5066 1.1188-2.5066 2.499s1.1222 2.499 2.5066 2.499 2.5066-1.1188 2.5066-2.499-1.1222-2.499-2.5066-2.499zm0-5.0026c4.6257 0 8.6188 3.1487 9.7267 7.5613 0.10085 0.40165-0.14399 0.80877-0.54686 0.90931-0.40288 0.10054-0.81122-0.14355-0.91208-0.54521-0.94136-3.7492-4.3361-6.4261-8.2678-6.4261-3.9334 0-7.3292 2.6792-8.2689 6.4306-0.10063 0.40171-0.50884 0.64603-0.91177 0.54571s-0.648-0.5073-0.54737-0.90901c1.106-4.4152 5.1003-7.5667 9.728-7.5667z</StreamGeometry>
-    <StreamGeometry x:Key="PasswordBoxHideButtonData">m0.21967 0.21965c-0.26627 0.26627-0.29047 0.68293-0.07262 0.97654l0.07262 0.08412 4.0346 4.0346c-1.922 1.3495-3.3585 3.365-3.9554 5.7495-0.10058 0.4018 0.14362 0.8091 0.54543 0.9097 0.40182 0.1005 0.80909-0.1436 0.90968-0.5455 0.52947-2.1151 1.8371-3.8891 3.5802-5.0341l1.8096 1.8098c-0.70751 0.7215-1.1438 1.71-1.1438 2.8003 0 2.2092 1.7909 4 4 4 1.0904 0 2.0788-0.4363 2.8004-1.1438l5.9193 5.9195c0.2929 0.2929 0.7677 0.2929 1.0606 0 0.2663-0.2662 0.2905-0.6829 0.0726-0.9765l-0.0726-0.0841-6.1135-6.1142 0.0012-0.0015-1.2001-1.1979-2.8699-2.8693 2e-3 -8e-4 -2.8812-2.8782 0.0012-0.0018-1.1333-1.1305-4.3064-4.3058c-0.29289-0.29289-0.76777-0.29289-1.0607 0zm7.9844 9.0458 3.5351 3.5351c-0.45 0.4358-1.0633 0.704-1.7392 0.704-1.3807 0-2.5-1.1193-2.5-2.5 0-0.6759 0.26824-1.2892 0.7041-1.7391zm1.7959-5.7655c-1.0003 0-1.9709 0.14807-2.8889 0.425l1.237 1.2362c0.5358-0.10587 1.0883-0.16119 1.6519-0.16119 3.9231 0 7.3099 2.6803 8.2471 6.4332 0.1004 0.4018 0.5075 0.6462 0.9094 0.5459 0.4019-0.1004 0.6463-0.5075 0.5459-0.9094-1.103-4.417-5.0869-7.5697-9.7024-7.5697zm0.1947 3.5093 3.8013 3.8007c-0.1018-2.0569-1.7488-3.7024-3.8013-3.8007z</StreamGeometry>
+  <Thickness x:Key="TextBoxTopHeaderMargin">0,0,0,4</Thickness>
+  <StreamGeometry x:Key="TextBoxClearButtonData">M 11.416016,10 20,1.4160156 18.583984,0 10,8.5839846 1.4160156,0 0,1.4160156 8.5839844,10 0,18.583985 1.4160156,20 10,11.416015 18.583984,20 20,18.583985 Z</StreamGeometry>
+  <StreamGeometry x:Key="PasswordBoxRevealButtonData">m10.051 7.0032c2.215 0 4.0105 1.7901 4.0105 3.9984s-1.7956 3.9984-4.0105 3.9984c-2.215 0-4.0105-1.7901-4.0105-3.9984s1.7956-3.9984 4.0105-3.9984zm0 1.4994c-1.3844 0-2.5066 1.1188-2.5066 2.499s1.1222 2.499 2.5066 2.499 2.5066-1.1188 2.5066-2.499-1.1222-2.499-2.5066-2.499zm0-5.0026c4.6257 0 8.6188 3.1487 9.7267 7.5613 0.10085 0.40165-0.14399 0.80877-0.54686 0.90931-0.40288 0.10054-0.81122-0.14355-0.91208-0.54521-0.94136-3.7492-4.3361-6.4261-8.2678-6.4261-3.9334 0-7.3292 2.6792-8.2689 6.4306-0.10063 0.40171-0.50884 0.64603-0.91177 0.54571s-0.648-0.5073-0.54737-0.90901c1.106-4.4152 5.1003-7.5667 9.728-7.5667z</StreamGeometry>
+  <StreamGeometry x:Key="PasswordBoxHideButtonData">m0.21967 0.21965c-0.26627 0.26627-0.29047 0.68293-0.07262 0.97654l0.07262 0.08412 4.0346 4.0346c-1.922 1.3495-3.3585 3.365-3.9554 5.7495-0.10058 0.4018 0.14362 0.8091 0.54543 0.9097 0.40182 0.1005 0.80909-0.1436 0.90968-0.5455 0.52947-2.1151 1.8371-3.8891 3.5802-5.0341l1.8096 1.8098c-0.70751 0.7215-1.1438 1.71-1.1438 2.8003 0 2.2092 1.7909 4 4 4 1.0904 0 2.0788-0.4363 2.8004-1.1438l5.9193 5.9195c0.2929 0.2929 0.7677 0.2929 1.0606 0 0.2663-0.2662 0.2905-0.6829 0.0726-0.9765l-0.0726-0.0841-6.1135-6.1142 0.0012-0.0015-1.2001-1.1979-2.8699-2.8693 2e-3 -8e-4 -2.8812-2.8782 0.0012-0.0018-1.1333-1.1305-4.3064-4.3058c-0.29289-0.29289-0.76777-0.29289-1.0607 0zm7.9844 9.0458 3.5351 3.5351c-0.45 0.4358-1.0633 0.704-1.7392 0.704-1.3807 0-2.5-1.1193-2.5-2.5 0-0.6759 0.26824-1.2892 0.7041-1.7391zm1.7959-5.7655c-1.0003 0-1.9709 0.14807-2.8889 0.425l1.237 1.2362c0.5358-0.10587 1.0883-0.16119 1.6519-0.16119 3.9231 0 7.3099 2.6803 8.2471 6.4332 0.1004 0.4018 0.5075 0.6462 0.9094 0.5459 0.4019-0.1004 0.6463-0.5075 0.5459-0.9094-1.103-4.417-5.0869-7.5697-9.7024-7.5697zm0.1947 3.5093 3.8013 3.8007c-0.1018-2.0569-1.7488-3.7024-3.8013-3.8007z</StreamGeometry>
 
-    <MenuFlyout x:Key="DefaultTextBoxContextFlyout" Placement="Bottom">
-      <MenuItem x:Name="TextBoxContextFlyoutCutItem" Header="Cut" Command="{Binding $parent[TextBox].Cut}" IsEnabled="{Binding $parent[TextBox].CanCut}" InputGesture="{x:Static TextBox.CutGesture}" />
-      <MenuItem x:Name="TextBoxContextFlyoutCopyItem" Header="Copy" Command="{Binding $parent[TextBox].Copy}" IsEnabled="{Binding $parent[TextBox].CanCopy}" InputGesture="{x:Static TextBox.CopyGesture}"/>
-      <MenuItem x:Name="TextBoxContextFlyoutPasteItem" Header="Paste" Command="{Binding $parent[TextBox].Paste}" IsEnabled="{Binding $parent[TextBox].CanPaste}" InputGesture="{x:Static TextBox.PasteGesture}"/>
-    </MenuFlyout>
+  <MenuFlyout x:Key="DefaultTextBoxContextFlyout" Placement="Bottom">
+    <MenuItem x:Name="TextBoxContextFlyoutCutItem" Header="Cut" Command="{Binding $parent[TextBox].Cut}" IsEnabled="{Binding $parent[TextBox].CanCut}" InputGesture="{x:Static TextBox.CutGesture}" />
+    <MenuItem x:Name="TextBoxContextFlyoutCopyItem" Header="Copy" Command="{Binding $parent[TextBox].Copy}" IsEnabled="{Binding $parent[TextBox].CanCopy}" InputGesture="{x:Static TextBox.CopyGesture}"/>
+    <MenuItem x:Name="TextBoxContextFlyoutPasteItem" Header="Paste" Command="{Binding $parent[TextBox].Paste}" IsEnabled="{Binding $parent[TextBox].CanPaste}" InputGesture="{x:Static TextBox.PasteGesture}"/>
+  </MenuFlyout>
 
-    <ContextMenu x:Key="DefaultTextBoxContextMenu" x:Name="TextBoxContextMenu">
-      <MenuItem x:Name="TextBoxContextMenuCutItem" Header="Cut" Command="{Binding $parent[TextBox].Cut}" IsEnabled="{Binding $parent[TextBox].CanCut}" InputGesture="{x:Static TextBox.CutGesture}" />
-      <MenuItem x:Name="TextBoxContextMenuCopyItem" Header="Copy" Command="{Binding $parent[TextBox].Copy}" IsEnabled="{Binding $parent[TextBox].CanCopy}" InputGesture="{x:Static TextBox.CopyGesture}"/>
-      <MenuItem x:Name="TextBoxContextMenuPasteItem" Header="Paste" Command="{Binding $parent[TextBox].Paste}" IsEnabled="{Binding $parent[TextBox].CanPaste}" InputGesture="{x:Static TextBox.PasteGesture}"/>
-    </ContextMenu>
-  </Styles.Resources>
+  <ContextMenu x:Key="DefaultTextBoxContextMenu" x:Name="TextBoxContextMenu">
+    <MenuItem x:Name="TextBoxContextMenuCutItem" Header="Cut" Command="{Binding $parent[TextBox].Cut}" IsEnabled="{Binding $parent[TextBox].CanCut}" InputGesture="{x:Static TextBox.CutGesture}" />
+    <MenuItem x:Name="TextBoxContextMenuCopyItem" Header="Copy" Command="{Binding $parent[TextBox].Copy}" IsEnabled="{Binding $parent[TextBox].CanCopy}" InputGesture="{x:Static TextBox.CopyGesture}"/>
+    <MenuItem x:Name="TextBoxContextMenuPasteItem" Header="Paste" Command="{Binding $parent[TextBox].Paste}" IsEnabled="{Binding $parent[TextBox].CanPaste}" InputGesture="{x:Static TextBox.PasteGesture}"/>
+  </ContextMenu>
 
-  <Style Selector="TextBox">
+  <ControlTheme x:Key="FluentTextBoxButton" TargetType="Button">
+    <Setter Property="Background" Value="{DynamicResource TextControlButtonBackground}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource TextControlButtonBorderBrush}" />
+    <Setter Property="Focusable" Value="False"/>
+    <Setter Property="MinWidth" Value="34" />
+    <Setter Property="Padding" Value="{DynamicResource ButtonPadding}" />
+    <Setter Property="Width" Value="{Binding $self.Bounds.Height}"/>
+    <Setter Property="TextElement.Foreground" Value="{DynamicResource TextControlButtonForeground}"/>
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="Button">
+          <ContentPresenter x:Name="PART_ContentPresenter"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Content="{TemplateBinding Content}"
+                            Padding="{TemplateBinding Padding}">
+          </ContentPresenter>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+
+    <Style Selector="^:pointerover /template/ ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource TextControlButtonBackgroundPointerOver}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource TextControlButtonBorderBrushPointerOver}" />
+      <Setter Property="Foreground" Value="{DynamicResource TextControlButtonForegroundPointerOver}" />
+    </Style>
+
+    <Style Selector="^:pressed /template/ ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource TextControlButtonBackgroundPressed}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource TextControlButtonBorderBrushPressed}" />
+      <Setter Property="Foreground" Value="{DynamicResource TextControlButtonForegroundPressed}" />
+    </Style>
+
+    <Style Selector="^:disabled /template/ ContentPresenter">
+      <Setter Property="Opacity" Value="0" />
+    </Style>
+  </ControlTheme>
+
+  <ControlTheme x:Key="FluentTextBoxToggleButton"
+                TargetType="ToggleButton"
+                BasedOn="{StaticResource FluentTextBoxButton}">
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ToggleButton">
+          <ContentPresenter x:Name="PART_ContentPresenter"
+                            Background="{TemplateBinding Background}"
+                            Content="{TemplateBinding Content}"
+                            Padding="{TemplateBinding Padding}">
+          </ContentPresenter>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+
+    <Style Selector="^:checked /template/ ContentPresenter, ^:indeterminate /template/ ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource TextControlButtonBackgroundPressed}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource TextControlButtonBorderBrushPressed}" />
+      <Setter Property="Foreground" Value="{DynamicResource TextControlButtonForegroundPressed}" />
+    </Style>
+  </ControlTheme>
+
+  <ControlTheme x:Key="{x:Type TextBox}" TargetType="TextBox">
     <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}" />
     <Setter Property="Background" Value="{DynamicResource TextControlBackground}" />
     <Setter Property="CaretBrush" Value="{DynamicResource TextControlForeground}" />
@@ -62,11 +126,18 @@
             <Border
               Margin="{TemplateBinding BorderThickness}">
               <Grid ColumnDefinitions="Auto,*,Auto" >
-                <ContentPresenter Grid.Column="0" Grid.ColumnSpan="1" Content="{TemplateBinding InnerLeftContent}"/>
-                <DockPanel x:Name="PART_InnerDockPanel" Grid.Column="1" Grid.ColumnSpan="1" Margin="{TemplateBinding Padding}">
+                <ContentPresenter Grid.Column="0"
+                                  Grid.ColumnSpan="1"
+                                  Content="{TemplateBinding InnerLeftContent}"/>
+                <DockPanel x:Name="PART_InnerDockPanel"
+                           Grid.Column="1"
+                           Grid.ColumnSpan="1"
+                           Cursor="IBeam"
+                           Margin="{TemplateBinding Padding}">
                   <TextBlock Name="PART_FloatingWatermark"
                              Foreground="{DynamicResource SystemAccentColor}"
                              FontSize="{TemplateBinding FontSize}"
+                             IsVisible="False"
                              Text="{TemplateBinding Watermark}"
                              DockPanel.Dock="Top" />
                   <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
@@ -107,187 +178,85 @@
         </DataValidationErrors>
       </ControlTemplate>
     </Setter>
-  </Style>
 
-  <!-- Disabled State -->
-  <Style Selector="TextBox:disabled">
-    <Setter Property="Foreground" Value="{DynamicResource TextControlForegroundDisabled}" />
-  </Style>
+    <!-- Disabled State -->
+    <Style Selector="^:disabled">
+      <Setter Property="Foreground" Value="{DynamicResource TextControlForegroundDisabled}" />
 
-  <Style Selector="TextBox:disabled /template/ Border#PART_BorderElement">
-    <Setter Property="Background" Value="{DynamicResource TextControlBackgroundDisabled}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushDisabled}" />
-  </Style>
+      <Style Selector="^ /template/ Border#PART_BorderElement">
+        <Setter Property="Background" Value="{DynamicResource TextControlBackgroundDisabled}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushDisabled}" />
+      </Style>
 
-  <Style Selector="TextBox:disabled /template/ TextBlock#PART_Watermark, TextBox:disabled /template/ TextBlock#PART_FloatingWatermark">
-    <Setter Property="Foreground" Value="{DynamicResource TextControlPlaceholderForegroundDisabled}" />
-  </Style>
+      <Style Selector="^ /template/ TextBlock#PART_Watermark, ^ /template/ TextBlock#PART_FloatingWatermark">
+        <Setter Property="Foreground" Value="{DynamicResource TextControlPlaceholderForegroundDisabled}" />
+      </Style>
+    </Style>
 
-  <!-- PointerOver State-->
-  <Style Selector="TextBox:pointerover">
-    <Setter Property="Foreground" Value="{DynamicResource TextControlForegroundPointerOver}" />
-  </Style>
+    <!-- PointerOver State-->
+    <Style Selector="^:pointerover">
+      <Setter Property="Foreground" Value="{DynamicResource TextControlForegroundPointerOver}" />
 
-  <Style Selector="TextBox:pointerover /template/ Border#PART_BorderElement">
-    <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushPointerOver}"/>
-    <Setter Property="Background" Value="{DynamicResource TextControlBackgroundPointerOver}" />
-  </Style>
+      <Style Selector="^ /template/ Border#PART_BorderElement">
+        <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushPointerOver}"/>
+        <Setter Property="Background" Value="{DynamicResource TextControlBackgroundPointerOver}" />
+      </Style>
 
-  <Style Selector="TextBox:pointerover /template/ TextBlock#PART_Watermark, TextBox:pointerover /template/ TextBlock#PART_FloatingWatermark">
-    <Setter Property="Foreground" Value="{DynamicResource TextControlPlaceholderForegroundPointerOver}" />
-  </Style>
+      <Style Selector="^ /template/ TextBlock#PART_Watermark">
+        <Setter Property="Foreground" Value="{DynamicResource TextControlPlaceholderForegroundPointerOver}" />
+      </Style>
+    </Style>
 
-  <!-- Focused State -->
-  <Style Selector="TextBox:focus">
-    <Setter Property="Foreground" Value="{DynamicResource TextControlForegroundFocused}" />
-  </Style>
+    <!-- Focused State -->
+    <Style Selector="^:focus">
+      <Setter Property="Foreground" Value="{DynamicResource TextControlForegroundFocused}" />
 
-  <Style Selector="TextBox:focus /template/ TextBlock#PART_Watermark, TextBox:focus /template/ TextBlock#PART_FloatingWatermark">
-    <Setter Property="Foreground" Value="{DynamicResource TextControlPlaceholderForegroundFocused}" />
-  </Style>
+      <Style Selector="^ /template/ TextBlock#PART_Watermark">
+        <Setter Property="Foreground" Value="{DynamicResource TextControlPlaceholderForegroundFocused}" />
+      </Style>
 
-  <Style Selector="TextBox:focus /template/ Border#PART_BorderElement">
-    <Setter Property="Background" Value="{DynamicResource TextControlBackgroundFocused}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushFocused}"/>
-    <Setter Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThicknessFocused}" />
-  </Style>
+      <Style Selector="^ /template/ Border#PART_BorderElement">
+        <Setter Property="Background" Value="{DynamicResource TextControlBackgroundFocused}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushFocused}"/>
+        <Setter Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThicknessFocused}" />
+      </Style>
+    </Style>
 
-  <Style Selector="TextBox:error /template/ Border#PART_BorderElement">
-    <Setter Property="BorderBrush" Value="{DynamicResource SystemControlErrorTextForegroundBrush}"/>
-  </Style>
+    <Style Selector="^:error /template/ Border#PART_BorderElement">
+      <Setter Property="BorderBrush" Value="{DynamicResource SystemControlErrorTextForegroundBrush}"/>
+    </Style>
 
-  <Style Selector="TextBox /template/ DockPanel#PART_InnerDockPanel">
-    <Setter Property="Cursor" Value="IBeam" />
-  </Style>
-
-  <Style Selector="TextBox /template/ TextBlock#PART_FloatingWatermark">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-  <Style Selector="TextBox[UseFloatingWatermark=true]:not(TextBox:empty) /template/ TextBlock#PART_FloatingWatermark">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
-
-  <Style Selector="TextBox.revealPasswordButton[AcceptsReturn=False][IsReadOnly=False]:not(TextBox:empty)">
-    <Setter Property="InnerRightContent">
-      <Template>
-        <ToggleButton Classes="passwordBoxRevealButton"
-                      IsChecked="{Binding $parent[TextBox].RevealPassword, Mode=TwoWay}" />
-      </Template>
-    </Setter>
-  </Style>
+    <Style Selector="^[UseFloatingWatermark=true]:not(:empty) /template/ TextBlock#PART_FloatingWatermark">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
 
-  <Style Selector="TextBox.clearButton[AcceptsReturn=False][IsReadOnly=False]:focus:not(TextBox:empty)">
-    <Setter Property="InnerRightContent">
-      <Template>
-        <Button Classes="textBoxClearButton"
-                Command="{Binding $parent[TextBox].Clear}" />
-      </Template>
-    </Setter>
-  </Style>
-
-  <Style Selector="ToggleButton.passwordBoxRevealButton">
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ToggleButton">
-          <Border x:Name="PART_ButtonLayoutBorder"
-                  BorderThickness="{TemplateBinding BorderThickness}">
+    <Style Selector="^.revealPasswordButton[AcceptsReturn=False][IsReadOnly=False]:not(TextBox:empty)">
+      <Setter Property="InnerRightContent">
+        <Template>
+          <ToggleButton Theme="{StaticResource FluentTextBoxToggleButton}"
+                        IsChecked="{Binding $parent[TextBox].RevealPassword, Mode=TwoWay}">
             <Panel>
-              <Path x:Name="PART_GlyphElement_Reveal"
-                    Data="{StaticResource PasswordBoxRevealButtonData}"
-                    Height="8"
-                    Width="12"
-                    Stretch="Uniform"
-                    VerticalAlignment="Center"
-                    HorizontalAlignment="Center" />
-              <Path x:Name="PART_GlyphElement_Hide"
-                    Data="{StaticResource PasswordBoxHideButtonData}"
-                    Height="12"
-                    Width="12"
-                    Stretch="Uniform"
-                    VerticalAlignment="Center"
-                    HorizontalAlignment="Center" />
+              <PathIcon Data="{StaticResource PasswordBoxRevealButtonData}"
+                        Height="8" Width="12"
+                        IsVisible="{Binding $parent[ToggleButton].!IsChecked}"/>
+              <PathIcon Data="{StaticResource PasswordBoxHideButtonData}"
+                        Height="12" Width="12"
+                        IsVisible="{Binding $parent[ToggleButton].IsChecked}"/>
             </Panel>
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style Selector="Button.textBoxClearButton">
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="Button">
-          <Border x:Name="PART_ButtonLayoutBorder"
-                  BorderThickness="{TemplateBinding BorderThickness}">
-            <Path x:Name="PART_GlyphElement"
-                  Data="{StaticResource TextBoxClearButtonData}"
-                  Height="10"
-                  Width="10"
-                  Stretch="Uniform"
-                  VerticalAlignment="Center"
-                  HorizontalAlignment="Center"/>
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <!-- TextBox.Button Normal State -->
-  <Style Selector="Button.textBoxClearButton, ToggleButton.passwordBoxRevealButton">
-    <Setter Property="MinWidth" Value="34" />
-    <Setter Property="Width" Value="{Binding $self.Bounds.Height}"/>
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="VerticalAlignment" Value="Stretch" />
-  </Style>
-  <Style Selector="Button.textBoxClearButton /template/ Border#PART_ButtonLayoutBorder,
-                   ToggleButton.passwordBoxRevealButton /template/ Border#PART_ButtonLayoutBorder">
-    <Setter Property="Background" Value="{DynamicResource TextControlButtonBackground}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource TextControlButtonBorderBrush}" />
-  </Style>
-  <Style Selector="Button.textBoxClearButton /template/ Path#PART_GlyphElement,
-                   ToggleButton.passwordBoxRevealButton /template/ Path#PART_GlyphElement_Reveal,
-                   ToggleButton.passwordBoxRevealButton /template/ Path#PART_GlyphElement_Hide">
-    <Setter Property="Fill" Value="{DynamicResource TextControlButtonForeground}" />
-  </Style>
-
-  <!-- TextBox.Button PointerOver State -->
-  <Style Selector="Button.textBoxClearButton:pointerover /template/ Border#PART_ButtonLayoutBorder,
-                   ToggleButton.passwordBoxRevealButton:pointerover /template/ Border#PART_ButtonLayoutBorder">
-    <Setter Property="Background" Value="{DynamicResource TextControlButtonBackgroundPointerOver}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource TextControlButtonBorderBrushPointerOver}" />
-  </Style>
-  <Style Selector="Button.textBoxClearButton:pointerover /template/ Path#PART_GlyphElement,
-                   ToggleButton.passwordBoxRevealButton:pointerover /template/ Path#PART_GlyphElement_Reveal,
-                   ToggleButton.passwordBoxRevealButton:pointerover /template/ Path#PART_GlyphElement_Hide">
-    <Setter Property="Fill" Value="{DynamicResource TextControlButtonForegroundPointerOver}" />
-  </Style>
-
-  <!-- TextBox.Button Pressed State -->
-  <Style Selector="Button.textBoxClearButton:pressed /template/ Border#PART_ButtonLayoutBorder,
-                   ToggleButton.passwordBoxRevealButton:pressed /template/ Border#PART_ButtonLayoutBorder,
-                   ToggleButton.passwordBoxRevealButton:checked /template/ Border#PART_ButtonLayoutBorder,
-                   ToggleButton.passwordBoxRevealButton:indeterminate /template/ Border#PART_ButtonLayoutBorder">
-    <Setter Property="Background" Value="{DynamicResource TextControlButtonBackgroundPressed}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource TextControlButtonBorderBrushPressed}" />
-  </Style>
-  <Style Selector="Button.textBoxClearButton:pressed /template/ Path#PART_GlyphElement,
-                   ToggleButton.passwordBoxRevealButton:pressed /template/ Path#PART_GlyphElement_Reveal,
-                   ToggleButton.passwordBoxRevealButton:checked /template/ Path#PART_GlyphElement_Hide,
-                   ToggleButton.passwordBoxRevealButton:indeterminate /template/ Path#PART_GlyphElement_Reveal">
-    <Setter Property="Fill" Value="{DynamicResource TextControlButtonForegroundPressed}" />
-  </Style>
-
-  <!-- TextBox.Button Disabled State -->
-  <Style Selector="Button.textBoxClearButton:disabled /template/ Border#PART_ButtonLayoutBorder,
-                   ToggleButton.passwordBoxRevealButton:disabled /template/ Border#PART_ButtonLayoutBorder">
-    <Setter Property="Opacity" Value="0" />
-  </Style>
-
-  <Style Selector="ToggleButton.passwordBoxRevealButton:not(ToggleButton:checked) /template/ Path#PART_GlyphElement_Hide">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-  <Style Selector="ToggleButton.passwordBoxRevealButton:checked /template/ Path#PART_GlyphElement_Reveal">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
+          </ToggleButton>
+        </Template>
+      </Setter>
+    </Style>
 
-</Styles>
+    <Style Selector="^.clearButton[AcceptsReturn=False][IsReadOnly=False]:focus:not(TextBox:empty)">
+      <Setter Property="InnerRightContent">
+        <Template>
+          <Button Theme="{StaticResource FluentTextBoxButton}"
+                  Command="{Binding $parent[TextBox].Clear}">
+            <PathIcon Data="{StaticResource TextBoxClearButtonData}" Height="10" Width="10"/>
+          </Button>
+        </Template>
+      </Setter>
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>

From 23a6517a6b064cecda957be0eeb768074bf76823 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 8 Jul 2022 22:36:40 +0200
Subject: [PATCH 096/240] Refactored CaptionButtons.

Converted buttons to be actual buttons instead of `Panel`s so that we get correct button behavior, i.e. the possibility to cancel by releasing the mouse outside the button.
---
 .../Chrome/CaptionButtons.cs                  |  27 ++--
 .../Controls/CaptionButtons.xaml              | 152 +++++++++++-------
 2 files changed, 108 insertions(+), 71 deletions(-)

diff --git a/src/Avalonia.Controls/Chrome/CaptionButtons.cs b/src/Avalonia.Controls/Chrome/CaptionButtons.cs
index d5923a8b37..6d7e542bb2 100644
--- a/src/Avalonia.Controls/Chrome/CaptionButtons.cs
+++ b/src/Avalonia.Controls/Chrome/CaptionButtons.cs
@@ -8,10 +8,10 @@ namespace Avalonia.Controls.Chrome
     /// <summary>
     /// Draws window minimize / maximize / close buttons in a <see cref="TitleBar"/> when managed client decorations are enabled.
     /// </summary>
-    [TemplatePart("PART_CloseButton",      typeof(Panel))]
-    [TemplatePart("PART_RestoreButton",    typeof(Panel))]
-    [TemplatePart("PART_MinimiseButton",   typeof(Panel))]
-    [TemplatePart("PART_FullScreenButton", typeof(Panel))]
+    [TemplatePart("PART_CloseButton",      typeof(Button))]
+    [TemplatePart("PART_RestoreButton",    typeof(Button))]
+    [TemplatePart("PART_MinimiseButton",   typeof(Button))]
+    [TemplatePart("PART_FullScreenButton", typeof(Button))]
     [PseudoClasses(":minimized", ":normal", ":maximized", ":fullscreen")]
     public class CaptionButtons : TemplatedControl
     {
@@ -88,18 +88,15 @@ namespace Avalonia.Controls.Chrome
         {
             base.OnApplyTemplate(e);
 
-            var closeButton = e.NameScope.Get<Panel>("PART_CloseButton");
-            var restoreButton = e.NameScope.Get<Panel>("PART_RestoreButton");
-            var minimiseButton = e.NameScope.Get<Panel>("PART_MinimiseButton");
-            var fullScreenButton = e.NameScope.Get<Panel>("PART_FullScreenButton");
+            var closeButton = e.NameScope.Get<Button>("PART_CloseButton");
+            var restoreButton = e.NameScope.Get<Button>("PART_RestoreButton");
+            var minimiseButton = e.NameScope.Get<Button>("PART_MinimiseButton");
+            var fullScreenButton = e.NameScope.Get<Button>("PART_FullScreenButton");
 
-            closeButton.PointerReleased += (sender, e) => OnClose();
-
-            restoreButton.PointerReleased += (sender, e) => OnRestore();
-
-            minimiseButton.PointerReleased += (sender, e) => OnMinimize();
-
-            fullScreenButton.PointerReleased += (sender, e) => OnToggleFullScreen();
+            closeButton.Click += (sender, e) => OnClose();
+            restoreButton.Click += (sender, e) => OnRestore();
+            minimiseButton.Click += (sender, e) => OnMinimize();
+            fullScreenButton.Click += (sender, e) => OnToggleFullScreen();
         }
     }
 }
diff --git a/src/Avalonia.Themes.Fluent/Controls/CaptionButtons.xaml b/src/Avalonia.Themes.Fluent/Controls/CaptionButtons.xaml
index 3c45de18c6..c91e008e02 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CaptionButtons.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CaptionButtons.xaml
@@ -1,57 +1,97 @@
-<ResourceDictionary 
-  xmlns="https://github.com/avaloniaui" 
-  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <ControlTheme x:Key="{x:Type CaptionButtons}" TargetType="CaptionButtons">
-      <Setter Property="MaxHeight" Value="30" />
-      <Setter Property="Template">
-        <ControlTemplate>
-          <StackPanel Spacing="2" VerticalAlignment="Stretch" TextElement.FontSize="10" Orientation="Horizontal">
-            <StackPanel.Styles>
-              <Style Selector="Panel:pointerover">
-                <Setter Property="Background" Value="#7F7f7f7f" />
-              </Style>
-              <Style Selector="Panel#PART_CloseButton:pointerover">
-                <Setter Property="Background" Value="#7FFF0000" />
-              </Style>
-            </StackPanel.Styles>
-            <Panel x:Name="PART_FullScreenButton" IsVisible="False" Width="45" Background="Transparent">
-              <Viewbox Width="11" Margin="2">
-                <Path Stretch="UniformToFill" Fill="{TemplateBinding Foreground}" Data="M2048 2048v-819h-205v469l-1493 -1493h469v-205h-819v819h205v-469l1493 1493h-469v205h819z" />
-              </Viewbox>
-            </Panel>
-            <Panel x:Name="PART_MinimiseButton" Width="45" Background="Transparent">
-              <Viewbox Width="11" Margin="2">
-                <Path Stretch="UniformToFill" Fill="{TemplateBinding Foreground}" Data="M2048 1229v-205h-2048v205h2048z" />
-              </Viewbox>
-            </Panel>
-            <Panel x:Name="PART_RestoreButton" Width="45" Background="Transparent">
-              <Viewbox Width="11" Margin="2">
-                <Viewbox.RenderTransform>
-                  <RotateTransform Angle="-90" />
-                </Viewbox.RenderTransform>
-                <Path Stretch="UniformToFill" Fill="{TemplateBinding Foreground}" Data="M2048 2048v-2048h-2048v2048h2048zM1843 1843h-1638v-1638h1638v1638z"/>
-              </Viewbox>
-            </Panel>
-            <Panel x:Name="PART_CloseButton" Width="45" Background="Transparent">
-              <Viewbox Width="11" Margin="2">
-                <Path Stretch="UniformToFill" Fill="{TemplateBinding Foreground}" Data="M1169 1024l879 -879l-145 -145l-879 879l-879 -879l-145 145l879 879l-879 879l145 145l879 -879l879 879l145 -145z" />
-              </Viewbox>
-            </Panel>
-          </StackPanel>
-        </ControlTemplate>
-      </Setter>
-      <Style Selector="^:maximized /template/ Panel#PART_RestoreButton Path">
-        <Setter Property="Data" Value="M2048 410h-410v-410h-1638v1638h410v410h1638v-1638zM1434 1434h-1229v-1229h1229v1229zM1843 1843h-1229v-205h1024v-1024h205v1229z" />
-      </Style>
-      <Style Selector="^:fullscreen /template/ Panel#PART_FullScreenButton Path">
-        <Setter Property="IsVisible" Value="True" />
-        <Setter Property="Data" Value="M205 1024h819v-819h-205v469l-674 -674l-145 145l674 674h-469v205zM1374 1229h469v-205h-819v819h205v-469l674 674l145 -145z" />
-      </Style>
-      <Style Selector="^:fullscreen /template/ Panel#PART_RestoreButton">
-        <Setter Property="IsVisible" Value="False" />
-      </Style>
-      <Style Selector="^:fullscreen /template/ Panel#PART_MinimiseButton">
-        <Setter Property="IsVisible" Value="False" />
-      </Style>
-    </ControlTheme>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Design.PreviewWith>
+    <Border Padding="20">
+      <StackPanel Spacing="20">
+        <CaptionButtons Height="30"/>
+      </StackPanel>
+    </Border>
+  </Design.PreviewWith>
+
+  <ControlTheme x:Key="FluentCaptionButton" TargetType="Button">
+    <Setter Property="Background" Value="#ffe5e5e5" />
+    <!-- Reusing BorderBrush to define pressed background color, as it's not used otherwise -->
+    <Setter Property="BorderBrush" Value="#ffcacaca" />
+    <Setter Property="Foreground" Value="Black"/>
+    <Setter Property="Width" Value="45"/>
+    <Setter Property="VerticalAlignment" Value="Stretch"/>
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ContentPresenter Name="PART_ContentPresenter"
+                          Background="Transparent"
+                          Content="{TemplateBinding Content}"/>
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^:pointerover /template/ ContentPresenter">
+      <Setter Property="Background" Value="{TemplateBinding Background}" />
+    </Style>
+
+    <Style Selector="^:pressed /template/ ContentPresenter">
+      <Setter Property="Background" Value="{TemplateBinding BorderBrush}" />
+    </Style>
+  </ControlTheme>
+  
+  <ControlTheme x:Key="{x:Type CaptionButtons}" TargetType="CaptionButtons">
+    <Setter Property="MaxHeight" Value="30" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <StackPanel Spacing="2" VerticalAlignment="Stretch" TextElement.FontSize="10" Orientation="Horizontal">
+          <Button x:Name="PART_FullScreenButton"
+                  Theme="{StaticResource FluentCaptionButton}"
+                  IsVisible="False">
+            <Viewbox Width="11" Margin="2">
+              <Path Name="FullScreenButtonPath"
+                    Stretch="UniformToFill"
+                    Fill="{TemplateBinding Foreground}"
+                    Data="M2048 2048v-819h-205v469l-1493 -1493h469v-205h-819v819h205v-469l1493 1493h-469v205h819z" />
+            </Viewbox>
+          </Button>
+          <Button x:Name="PART_MinimiseButton"
+                  Theme="{StaticResource FluentCaptionButton}">
+            <Viewbox Width="11" Margin="2">
+              <Path Stretch="UniformToFill"
+                    Fill="{TemplateBinding Foreground}"
+                    Data="M2048 1229v-205h-2048v205h2048z" />
+            </Viewbox>
+          </Button>
+          <Button x:Name="PART_RestoreButton"
+                  Theme="{StaticResource FluentCaptionButton}">
+            <Viewbox Width="11" Margin="2">
+              <Viewbox.RenderTransform>
+                <RotateTransform Angle="-90" />
+              </Viewbox.RenderTransform>
+              <Path Name="RestoreButtonPath"
+                    Stretch="UniformToFill"
+                    Fill="{TemplateBinding Foreground}"
+                    Data="M2048 2048v-2048h-2048v2048h2048zM1843 1843h-1638v-1638h1638v1638z"/>
+            </Viewbox>
+          </Button>
+          <Button x:Name="PART_CloseButton"
+                  Background="#ffe81123"
+                  BorderBrush="#fff1707a"
+                  Theme="{StaticResource FluentCaptionButton}">
+            <Viewbox Width="11" Margin="2">
+              <Path Stretch="UniformToFill"
+                    Fill="{TemplateBinding Foreground}"
+                    Data="M1169 1024l879 -879l-145 -145l-879 879l-879 -879l-145 145l879 879l-879 879l145 145l879 -879l879 879l145 -145z" />
+            </Viewbox>
+          </Button>
+        </StackPanel>
+      </ControlTemplate>
+    </Setter>
+    <Style Selector="^:maximized /template/ Path#RestoreButtonPath">
+      <Setter Property="Data" Value="M2048 410h-410v-410h-1638v1638h410v410h1638v-1638zM1434 1434h-1229v-1229h1229v1229zM1843 1843h-1229v-205h1024v-1024h205v1229z" />
+    </Style>
+    <Style Selector="^:fullscreen /template/ Path#PART_FullScreenButtonPath">
+      <Setter Property="IsVisible" Value="True" />
+      <Setter Property="Data" Value="M205 1024h819v-819h-205v469l-674 -674l-145 145l674 674h-469v205zM1374 1229h469v-205h-819v819h205v-469l674 674l145 -145z" />
+    </Style>
+    <Style Selector="^:fullscreen /template/ Panel#PART_RestoreButton">
+      <Setter Property="IsVisible" Value="False" />
+    </Style>
+    <Style Selector="^:fullscreen /template/ Panel#PART_MinimiseButton">
+      <Setter Property="IsVisible" Value="False" />
+    </Style>
+  </ControlTheme>
 </ResourceDictionary>

From 83140fe427b8ddcb691b7dc063e5af965de40180 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 9 Jul 2022 00:18:28 +0200
Subject: [PATCH 097/240] Reset button animations correctly.

Otherwise they keep on animating way after the interaction.
---
 src/Avalonia.Themes.Fluent/Controls/Button.xaml       | 1 +
 src/Avalonia.Themes.Fluent/Controls/RepeatButton.xaml | 1 +
 src/Avalonia.Themes.Fluent/Controls/ToggleButton.xaml | 1 +
 3 files changed, 3 insertions(+)

diff --git a/src/Avalonia.Themes.Fluent/Controls/Button.xaml b/src/Avalonia.Themes.Fluent/Controls/Button.xaml
index 7ac5c4351a..7828fd52ed 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Button.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Button.xaml
@@ -20,6 +20,7 @@
     <Setter Property="Padding" Value="{DynamicResource ButtonPadding}" />
     <Setter Property="HorizontalAlignment" Value="Left" />
     <Setter Property="VerticalAlignment" Value="Center" />
+    <Setter Property="RenderTransform" Value="none" />
     <Setter Property="Transitions">
       <Transitions>
         <TransformOperationsTransition Property="RenderTransform" Duration="0:0:.075" />
diff --git a/src/Avalonia.Themes.Fluent/Controls/RepeatButton.xaml b/src/Avalonia.Themes.Fluent/Controls/RepeatButton.xaml
index 5e789e7e10..a54187104b 100644
--- a/src/Avalonia.Themes.Fluent/Controls/RepeatButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/RepeatButton.xaml
@@ -23,6 +23,7 @@
     <Setter Property="VerticalAlignment" Value="Center" />
     <Setter Property="FontWeight" Value="Normal" />
     <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+    <Setter Property="RenderTransform" Value="none" />
     <Setter Property="Template">
       <ControlTemplate>
         <ContentPresenter x:Name="PART_ContentPresenter"
diff --git a/src/Avalonia.Themes.Fluent/Controls/ToggleButton.xaml b/src/Avalonia.Themes.Fluent/Controls/ToggleButton.xaml
index 36c0c50064..7a46f21534 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ToggleButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ToggleButton.xaml
@@ -23,6 +23,7 @@
     <Setter Property="VerticalAlignment" Value="Center" />
     <Setter Property="FontWeight" Value="Normal" />
     <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+    <Setter Property="RenderTransform" Value="none" />
     <Setter Property="Transitions">
       <Transitions>
         <TransformOperationsTransition Property="RenderTransform" Duration="0:0:.075" />

From 0d5b10ec3aa041b21d5cd4a785b37201dec03f7a Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 9 Jul 2022 00:25:04 +0200
Subject: [PATCH 098/240] Tweaked DatePicker ControlTheme.

---
 .../Controls/DatePicker.xaml                  | 629 +++++++++---------
 1 file changed, 317 insertions(+), 312 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml b/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml
index a7093c1341..0537feb60b 100644
--- a/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml
@@ -9,344 +9,349 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:sys="clr-namespace:System;assembly=netstandard"
         x:CompileBindings="True">
-    <Design.PreviewWith>
-      <Border Padding="20">
-        <DatePicker CornerRadius="10" />
-      </Border>
-    </Design.PreviewWith>
+  <Design.PreviewWith>
+    <Border Padding="20">
+      <DatePicker CornerRadius="10" />
+    </Border>
+  </Design.PreviewWith>
 
-    <Thickness x:Key="DatePickerTopHeaderMargin">0,0,0,4</Thickness>
-    <x:Double x:Key="DatePickerFlyoutPresenterHighlightHeight">40</x:Double>
-    <x:Double x:Key="DatePickerFlyoutPresenterItemHeight">40</x:Double>
-    <x:Double x:Key="DatePickerFlyoutPresenterAcceptDismissHostGridHeight">41</x:Double>
-    <x:Double x:Key="DatePickerThemeMinWidth">296</x:Double>
-    <x:Double x:Key="DatePickerThemeMaxWidth">456</x:Double>
-    <Thickness x:Key="DatePickerFlyoutPresenterItemPadding">0,3,0,6</Thickness>
-    <Thickness x:Key="DatePickerFlyoutPresenterMonthPadding">9,3,0,6</Thickness>
-    <Thickness x:Key="DatePickerHostPadding">0,3,0,6</Thickness>
-    <Thickness x:Key="DatePickerHostMonthPadding">9,3,0,6</Thickness>
-    <x:Double x:Key="DatePickerSpacerThemeWidth">1</x:Double>
+  <Thickness x:Key="DatePickerTopHeaderMargin">0,0,0,4</Thickness>
+  <x:Double x:Key="DatePickerFlyoutPresenterHighlightHeight">40</x:Double>
+  <x:Double x:Key="DatePickerFlyoutPresenterItemHeight">40</x:Double>
+  <x:Double x:Key="DatePickerFlyoutPresenterAcceptDismissHostGridHeight">41</x:Double>
+  <x:Double x:Key="DatePickerThemeMinWidth">296</x:Double>
+  <x:Double x:Key="DatePickerThemeMaxWidth">456</x:Double>
+  <Thickness x:Key="DatePickerFlyoutPresenterItemPadding">0,3,0,6</Thickness>
+  <Thickness x:Key="DatePickerFlyoutPresenterMonthPadding">9,3,0,6</Thickness>
+  <Thickness x:Key="DatePickerHostPadding">0,3,0,6</Thickness>
+  <Thickness x:Key="DatePickerHostMonthPadding">9,3,0,6</Thickness>
+  <x:Double x:Key="DatePickerSpacerThemeWidth">1</x:Double>
 
-    <!-- Theme for the items displayed in the selectors -->
-    <ControlTheme x:Key="FluentDateTimePickerItem" TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
-      <Setter Property="Padding" Value="{DynamicResource DatePickerFlyoutPresenterItemPadding}"/>
-      <Setter Property="VerticalContentAlignment" Value="Center" />
-      <Setter Property="HorizontalContentAlignment" Value="Center" />
-      
-      <Style Selector="^:selected">
-        <Setter Property="IsHitTestVisible" Value="False"/>
-        <Style Selector="^/template/ Rectangle#PressedBackground">
-          <Setter Property="Fill" Value="Transparent"/>
-        </Style>
-        <Style Selector="^/template/ ContentPresenter">
-          <Setter Property="Background" Value="Transparent" />
-          <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
-        </Style>
+  <!-- Theme for the items displayed in the selectors -->
+  <ControlTheme x:Key="FluentDateTimePickerItem" TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
+    <Setter Property="Padding" Value="{DynamicResource DatePickerFlyoutPresenterItemPadding}"/>
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="HorizontalContentAlignment" Value="Center" />
+
+    <Style Selector="^:selected">
+      <Setter Property="IsHitTestVisible" Value="False"/>
+      <Style Selector="^/template/ Rectangle#PressedBackground">
+        <Setter Property="Fill" Value="Transparent"/>
       </Style>
-      <Style Selector="^.MonthItem">
-        <Setter Property="Padding" Value="{DynamicResource DatePickerFlyoutPresenterMonthPadding}"/>
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="HorizontalContentAlignment" Value="Left" />
+      <Style Selector="^/template/ ContentPresenter">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
       </Style>
-    </ControlTheme>
+    </Style>
+    <Style Selector="^.MonthItem">
+      <Setter Property="Padding" Value="{DynamicResource DatePickerFlyoutPresenterMonthPadding}"/>
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="HorizontalContentAlignment" Value="Left" />
+    </Style>
+  </ControlTheme>
 
-    <!-- This is used for both the accept/dismiss & repeatbuttons in the presenter-->
-    <ControlTheme x:Key="FluentDateTimePickerButton" TargetType="Button">
-      <Setter Property="Background" Value="{DynamicResource DateTimePickerFlyoutButtonBackground}" />
-      <Setter Property="HorizontalContentAlignment" Value="Center"/>
-      <Setter Property="VerticalContentAlignment" Value="Center"/>
-      <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-      <Setter Property="Template">
-        <ControlTemplate>
-          <!-- 
+  <!-- This is used for both the accept/dismiss & repeatbuttons in the presenter-->
+  <ControlTheme x:Key="FluentDateTimePickerButton" TargetType="Button">
+    <Setter Property="Background" Value="{DynamicResource DateTimePickerFlyoutButtonBackground}" />
+    <Setter Property="HorizontalContentAlignment" Value="Center"/>
+    <Setter Property="VerticalContentAlignment" Value="Center"/>
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+    <Setter Property="RenderTransform" Value="none" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <!-- 
                 The background is doubled here for the loopingselector up/down repeat buttons 
                 that appear opaque. Not sure how MS does it though I suspect this is it
                 but source isn't MIT yet, so this is my solution -->
-          <Border Background="{TemplateBinding Background}">
-            <ContentPresenter x:Name="ContentPresenter"
-                    Background="{TemplateBinding Background}"
-                    BorderBrush="{DynamicResource DateTimePickerFlyoutButtonBorderBrush}"
-                    BorderThickness="{DynamicResource DateTimeFlyoutButtonBorderThickness}"
-                    Content="{TemplateBinding Content}"
-                    Foreground="{DynamicResource SystemControlHighlightAltBaseHighBrush}"
-                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                    Padding="{TemplateBinding Padding}"
-                    HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                    VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                    CornerRadius="{TemplateBinding CornerRadius}"/>
-          </Border>
-        </ControlTemplate>
-      </Setter>
+        <Border Background="{TemplateBinding Background}">
+          <ContentPresenter x:Name="ContentPresenter"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{DynamicResource DateTimePickerFlyoutButtonBorderBrush}"
+                  BorderThickness="{DynamicResource DateTimeFlyoutButtonBorderThickness}"
+                  Content="{TemplateBinding Content}"
+                  Foreground="{DynamicResource SystemControlHighlightAltBaseHighBrush}"
+                  ContentTemplate="{TemplateBinding ContentTemplate}"
+                  Padding="{TemplateBinding Padding}"
+                  HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                  VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                  CornerRadius="{TemplateBinding CornerRadius}"/>
+        </Border>
+      </ControlTemplate>
+    </Setter>
 
-      <Style Selector="^:pointerover /template/ ContentPresenter">
-        <Setter Property="Background" Value="{DynamicResource DateTimePickerFlyoutButtonBackgroundPointerOver}"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource DateTimePickerFlyoutButtonBorderBrushPointerOver}"/>
-        <Setter Property="Foreground" Value="{DynamicResource DateTimePickerFlyoutButtonForegroundPointerOver}"/>
-      </Style>
+    <Style Selector="^:pointerover /template/ ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource DateTimePickerFlyoutButtonBackgroundPointerOver}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource DateTimePickerFlyoutButtonBorderBrushPointerOver}"/>
+      <Setter Property="Foreground" Value="{DynamicResource DateTimePickerFlyoutButtonForegroundPointerOver}"/>
+    </Style>
 
-      <Style Selector="^:pressed /template/ ContentPresenter">
-        <Setter Property="Background" Value="{DynamicResource DateTimePickerFlyoutButtonBackgroundPressed}"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource DateTimePickerFlyoutButtonBorderBrushPressed}"/>
-        <Setter Property="Foreground" Value="{DynamicResource DateTimePickerFlyoutButtonForegroundPressed}"/>
-      </Style>
-    </ControlTheme>
+    <Style Selector="^:pressed">
+      <Setter Property="RenderTransform" Value="scale(0.98)" />
+    </Style>
 
-    <ControlTheme x:Key="FluentDateTimePickerUpButton" TargetType="RepeatButton" BasedOn="{StaticResource FluentDateTimePickerButton}">
-      <Setter Property="VerticalAlignment" Value="Top"/>
-      <Setter Property="Height" Value="22" />
-      <Setter Property="HorizontalAlignment" Value="Stretch" />
-      <Setter Property="Focusable" Value="False" />
-      <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}" />
-      <Setter Property="Content">
-        <Template>
-          <Viewbox Height="10" Width="10" HorizontalAlignment="Center" VerticalAlignment="Center">
-            <Path Stroke="{Binding $parent[RepeatButton].Foreground}" StrokeThickness="1" Data="M 0,9 L 9,0 L 18,9"/>
-          </Viewbox>
-        </Template>
-      </Setter>
-    </ControlTheme>
+    <Style Selector="^:pressed /template/ ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource DateTimePickerFlyoutButtonBackgroundPressed}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource DateTimePickerFlyoutButtonBorderBrushPressed}"/>
+      <Setter Property="Foreground" Value="{DynamicResource DateTimePickerFlyoutButtonForegroundPressed}"/>
+    </Style>
+  </ControlTheme>
 
-    <ControlTheme x:Key="FluentDateTimePickerDownButton" TargetType="RepeatButton" BasedOn="{StaticResource FluentDateTimePickerButton}">
-      <Setter Property="VerticalAlignment" Value="Bottom"/>
-      <Setter Property="Height" Value="22" />
-      <Setter Property="HorizontalAlignment" Value="Stretch" />
-      <Setter Property="Focusable" Value="False" />
-      <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}" />
-      <Setter Property="Content">
-        <Template>
-          <Viewbox Height="10" Width="10" HorizontalAlignment="Center" VerticalAlignment="Center">
-            <Path Stroke="{Binding $parent[RepeatButton].Foreground}" StrokeThickness="1" Data="M 0,0 L 9,9 L 18,0"/>
-          </Viewbox>
-        </Template>
-      </Setter>
-    </ControlTheme>
+  <ControlTheme x:Key="FluentDateTimePickerUpButton" TargetType="RepeatButton" BasedOn="{StaticResource FluentDateTimePickerButton}">
+    <Setter Property="VerticalAlignment" Value="Top"/>
+    <Setter Property="Height" Value="22" />
+    <Setter Property="HorizontalAlignment" Value="Stretch" />
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}" />
+    <Setter Property="Content">
+      <Template>
+        <Viewbox Height="10" Width="10" HorizontalAlignment="Center" VerticalAlignment="Center">
+          <Path Stroke="{Binding $parent[RepeatButton].Foreground}" StrokeThickness="1" Data="M 0,9 L 9,0 L 18,9"/>
+        </Viewbox>
+      </Template>
+    </Setter>
+  </ControlTheme>
 
-    <ControlTheme x:Key="{x:Type DatePicker}" TargetType="DatePicker">
-      <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-      <Setter Property="Foreground" Value="{DynamicResource DatePickerButtonForeground}" />
-      <Setter Property="Background" Value="{DynamicResource DatePickerButtonBackground}"/>
-      <Setter Property="BorderBrush" Value="{DynamicResource DatePickerButtonBorderBrush}"/>
-      <Setter Property="BorderThickness" Value="1"/>
-      <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-      <Setter Property="HorizontalAlignment" Value="Left" />
-      <Setter Property="VerticalAlignment" Value="Center" />
-      <Setter Property="Template">
-        <ControlTemplate>
-          <DataValidationErrors>
-            <Grid Name="LayoutRoot" Margin="{TemplateBinding Padding}" RowDefinitions="Auto,*">
-              <ContentPresenter Name="HeaderContentPresenter" Grid.Row="0"
-                                Content="{TemplateBinding Header}"
-                                Foreground="{DynamicResource DatePickerHeaderForeground}"
-                                ContentTemplate="{TemplateBinding HeaderTemplate}"
-                                Margin="{DynamicResource DatePickerTopHeaderMargin}"
-                                MaxWidth="{DynamicResource DatePickerThemeMaxWidth}"
-                                HorizontalAlignment="Stretch"
-                                VerticalAlignment="Top"/>
+  <ControlTheme x:Key="FluentDateTimePickerDownButton" TargetType="RepeatButton" BasedOn="{StaticResource FluentDateTimePickerButton}">
+    <Setter Property="VerticalAlignment" Value="Bottom"/>
+    <Setter Property="Height" Value="22" />
+    <Setter Property="HorizontalAlignment" Value="Stretch" />
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}" />
+    <Setter Property="Content">
+      <Template>
+        <Viewbox Height="10" Width="10" HorizontalAlignment="Center" VerticalAlignment="Center">
+          <Path Stroke="{Binding $parent[RepeatButton].Foreground}" StrokeThickness="1" Data="M 0,0 L 9,9 L 18,0"/>
+        </Viewbox>
+      </Template>
+    </Setter>
+  </ControlTheme>
 
-              <Button Name="FlyoutButton" Grid.Row="1"
-                      Foreground="{TemplateBinding Foreground}"
-                      Background="{TemplateBinding Background}"
-                      BorderBrush="{TemplateBinding BorderBrush}"
-                      BorderThickness="{TemplateBinding BorderThickness}"
-                      CornerRadius="{TemplateBinding CornerRadius}"
-                      IsEnabled="{TemplateBinding IsEnabled}"
-                      MinWidth="{DynamicResource DatePickerThemeMinWidth}"
-                      MaxWidth="{DynamicResource DatePickerThemeMaxWidth}"
-                      HorizontalAlignment="Stretch"
-                      VerticalAlignment="Stretch"
-                      HorizontalContentAlignment="Stretch"
-                      VerticalContentAlignment="Stretch"
-                      TemplatedControl.IsTemplateFocusTarget="True">
-                <Button.Template>
-                  <ControlTemplate>
-                    <ContentPresenter Name="ContentPresenter"
-                                      BorderBrush="{TemplateBinding BorderBrush}"
-                                      Background="{TemplateBinding Background}"
-                                      BorderThickness="{TemplateBinding BorderThickness}"
-                                      Content="{TemplateBinding Content}"
-                                      Foreground="{TemplateBinding Foreground}"
-                                      HorizontalContentAlignment="Stretch"
-                                      VerticalContentAlignment="Stretch"
-                                      CornerRadius="{TemplateBinding CornerRadius}"/>
-                  </ControlTemplate>
-                </Button.Template>
-                <Grid Name="ButtonContentGrid" ColumnDefinitions="78*,Auto,132*,Auto,78*">
-                  <TextBlock Name="DayText" Text="day" HorizontalAlignment="Center"
-                             Padding="{DynamicResource DatePickerHostPadding}"
-                             FontFamily="{TemplateBinding FontFamily}"
-                             FontWeight="{TemplateBinding FontWeight}"
-                             FontSize="{TemplateBinding FontSize}"/>
-                  <TextBlock Name="MonthText" Text="month" TextAlignment="Left"
-                             Padding="{DynamicResource DatePickerHostMonthPadding}"
-                             FontFamily="{TemplateBinding FontFamily}"
-                             FontWeight="{TemplateBinding FontWeight}"
-                             FontSize="{TemplateBinding FontSize}"/>
-                  <TextBlock Name="YearText" Text="year" HorizontalAlignment="Center"
-                             Padding="{DynamicResource DatePickerHostPadding}"
-                             FontFamily="{TemplateBinding FontFamily}"
-                             FontWeight="{TemplateBinding FontWeight}"
-                             FontSize="{TemplateBinding FontSize}"/>
-                  <Rectangle x:Name="FirstSpacer"
-                        Fill="{DynamicResource DatePickerSpacerFill}"
-                        HorizontalAlignment="Center"
-                        Width="1"
-                        Grid.Column="1" />
-                  <Rectangle x:Name="SecondSpacer"
-                        Fill="{DynamicResource DatePickerSpacerFill}"
-                        HorizontalAlignment="Center"
-                        Width="1"
-                        Grid.Column="3" />
-                </Grid>
-              </Button>
+  <ControlTheme x:Key="{x:Type DatePicker}" TargetType="DatePicker">
+    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+    <Setter Property="Foreground" Value="{DynamicResource DatePickerButtonForeground}" />
+    <Setter Property="Background" Value="{DynamicResource DatePickerButtonBackground}"/>
+    <Setter Property="BorderBrush" Value="{DynamicResource DatePickerButtonBorderBrush}"/>
+    <Setter Property="BorderThickness" Value="1"/>
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+    <Setter Property="HorizontalAlignment" Value="Left" />
+    <Setter Property="VerticalAlignment" Value="Center" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <DataValidationErrors>
+          <Grid Name="LayoutRoot" Margin="{TemplateBinding Padding}" RowDefinitions="Auto,*">
+            <ContentPresenter Name="HeaderContentPresenter" Grid.Row="0"
+                              Content="{TemplateBinding Header}"
+                              Foreground="{DynamicResource DatePickerHeaderForeground}"
+                              ContentTemplate="{TemplateBinding HeaderTemplate}"
+                              Margin="{DynamicResource DatePickerTopHeaderMargin}"
+                              MaxWidth="{DynamicResource DatePickerThemeMaxWidth}"
+                              HorizontalAlignment="Stretch"
+                              VerticalAlignment="Top"/>
 
-              <Popup Name="Popup" WindowManagerAddShadowHint="False"
-                     IsLightDismissEnabled="True" PlacementTarget="{TemplateBinding}"
-                     PlacementMode="Bottom">
-                <DatePickerPresenter Name="PickerPresenter" />
-              </Popup>
+            <Button Name="FlyoutButton" Grid.Row="1"
+                    Foreground="{TemplateBinding Foreground}"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    CornerRadius="{TemplateBinding CornerRadius}"
+                    IsEnabled="{TemplateBinding IsEnabled}"
+                    MinWidth="{DynamicResource DatePickerThemeMinWidth}"
+                    MaxWidth="{DynamicResource DatePickerThemeMaxWidth}"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Stretch"
+                    HorizontalContentAlignment="Stretch"
+                    VerticalContentAlignment="Stretch"
+                    TemplatedControl.IsTemplateFocusTarget="True">
+              <Button.Template>
+                <ControlTemplate>
+                  <ContentPresenter Name="ContentPresenter"
+                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                    Background="{TemplateBinding Background}"
+                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                    Content="{TemplateBinding Content}"
+                                    Foreground="{TemplateBinding Foreground}"
+                                    HorizontalContentAlignment="Stretch"
+                                    VerticalContentAlignment="Stretch"
+                                    CornerRadius="{TemplateBinding CornerRadius}"/>
+                </ControlTemplate>
+              </Button.Template>
+              <Grid Name="ButtonContentGrid" ColumnDefinitions="78*,Auto,132*,Auto,78*">
+                <TextBlock Name="DayText" Text="day" HorizontalAlignment="Center"
+                           Padding="{DynamicResource DatePickerHostPadding}"
+                           FontFamily="{TemplateBinding FontFamily}"
+                           FontWeight="{TemplateBinding FontWeight}"
+                           FontSize="{TemplateBinding FontSize}"/>
+                <TextBlock Name="MonthText" Text="month" TextAlignment="Left"
+                           Padding="{DynamicResource DatePickerHostMonthPadding}"
+                           FontFamily="{TemplateBinding FontFamily}"
+                           FontWeight="{TemplateBinding FontWeight}"
+                           FontSize="{TemplateBinding FontSize}"/>
+                <TextBlock Name="YearText" Text="year" HorizontalAlignment="Center"
+                           Padding="{DynamicResource DatePickerHostPadding}"
+                           FontFamily="{TemplateBinding FontFamily}"
+                           FontWeight="{TemplateBinding FontWeight}"
+                           FontSize="{TemplateBinding FontSize}"/>
+                <Rectangle x:Name="FirstSpacer"
+                      Fill="{DynamicResource DatePickerSpacerFill}"
+                      HorizontalAlignment="Center"
+                      Width="1"
+                      Grid.Column="1" />
+                <Rectangle x:Name="SecondSpacer"
+                      Fill="{DynamicResource DatePickerSpacerFill}"
+                      HorizontalAlignment="Center"
+                      Width="1"
+                      Grid.Column="3" />
+              </Grid>
+            </Button>
 
-            </Grid>
-          </DataValidationErrors>
-        </ControlTemplate>
-      </Setter>
+            <Popup Name="Popup" WindowManagerAddShadowHint="False"
+                   IsLightDismissEnabled="True" PlacementTarget="{TemplateBinding}"
+                   PlacementMode="Bottom">
+              <DatePickerPresenter Name="PickerPresenter" />
+            </Popup>
 
-      <Style Selector="^:disabled /template/ Rectangle">
-        <Setter Property="Fill" Value="{DynamicResource DatePickerSpacerFillDisabled}"/>
-      </Style>
+          </Grid>
+        </DataValidationErrors>
+      </ControlTemplate>
+    </Setter>
 
-      <!-- Changes foreground for watermark text when SelectedDate is null-->
-      <Style Selector="^:hasnodate /template/ Button#FlyoutButton TextBlock">
-        <Setter Property="Foreground" Value="{DynamicResource TextControlPlaceholderForeground}"/>
-      </Style>
-      <Style Selector="^/template/ Button#FlyoutButton">
-        <Style Selector="^:pointerover">
-          <Setter Property="BorderBrush" Value="{DynamicResource DatePickerButtonBorderBrushPointerOver}"/>
-          <Setter Property="Background" Value="{DynamicResource DatePickerButtonBackgroundPointerOver}"/>
-          <Setter Property="Foreground" Value="{DynamicResource DatePickerButtonForegroundPointerOver}"/>
-        </Style>
+    <Style Selector="^:disabled /template/ Rectangle">
+      <Setter Property="Fill" Value="{DynamicResource DatePickerSpacerFillDisabled}"/>
+    </Style>
 
-        <Style Selector="^:pressed">
-          <Setter Property="BorderBrush" Value="{DynamicResource DatePickerButtonBorderBrushPressed}"/>
-          <Setter Property="Background" Value="{DynamicResource DatePickerButtonBackgroundPressed}"/>
-          <Setter Property="Foreground" Value="{DynamicResource DatePickerButtonForegroundPressed}"/>
-        </Style>
+    <!-- Changes foreground for watermark text when SelectedDate is null-->
+    <Style Selector="^:hasnodate /template/ Button#FlyoutButton TextBlock">
+      <Setter Property="Foreground" Value="{DynamicResource TextControlPlaceholderForeground}"/>
+    </Style>
+    <Style Selector="^/template/ Button#FlyoutButton">
+      <Style Selector="^:pointerover">
+        <Setter Property="BorderBrush" Value="{DynamicResource DatePickerButtonBorderBrushPointerOver}"/>
+        <Setter Property="Background" Value="{DynamicResource DatePickerButtonBackgroundPointerOver}"/>
+        <Setter Property="Foreground" Value="{DynamicResource DatePickerButtonForegroundPointerOver}"/>
+      </Style>
 
-        <Style Selector="^:disabled">
-          <Setter Property="BorderBrush" Value="{DynamicResource DatePickerButtonBorderBrushDisabled}"/>
-          <Setter Property="Background" Value="{DynamicResource DatePickerButtonBackgroundDisabled}"/>
-          <Setter Property="Foreground" Value="{DynamicResource DatePickerButtonForegroundDisabled}"/>
-        </Style>
+      <Style Selector="^:pressed">
+        <Setter Property="BorderBrush" Value="{DynamicResource DatePickerButtonBorderBrushPressed}"/>
+        <Setter Property="Background" Value="{DynamicResource DatePickerButtonBackgroundPressed}"/>
+        <Setter Property="Foreground" Value="{DynamicResource DatePickerButtonForegroundPressed}"/>
       </Style>
-      <Style Selector="^:error /template/ Button#FlyoutButton">
-        <Setter Property="BorderBrush" Value="{DynamicResource SystemControlErrorTextForegroundBrush}"/>
+
+      <Style Selector="^:disabled">
+        <Setter Property="BorderBrush" Value="{DynamicResource DatePickerButtonBorderBrushDisabled}"/>
+        <Setter Property="Background" Value="{DynamicResource DatePickerButtonBackgroundDisabled}"/>
+        <Setter Property="Foreground" Value="{DynamicResource DatePickerButtonForegroundDisabled}"/>
       </Style>
-    </ControlTheme>
+    </Style>
+    <Style Selector="^:error /template/ Button#FlyoutButton">
+      <Setter Property="BorderBrush" Value="{DynamicResource SystemControlErrorTextForegroundBrush}"/>
+    </Style>
+  </ControlTheme>
 
-    <!--WinUI: DatePickerFlyoutPresenter-->
-    <ControlTheme x:Key="{x:Type DatePickerPresenter}" TargetType="DatePickerPresenter">
-      <Setter Property="Width" Value="296" />
-      <Setter Property="MinWidth" Value="296" />
-      <Setter Property="MaxHeight" Value="398" />
-      <Setter Property="FontWeight" Value="Normal" />
-      <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-      <Setter Property="Background" Value="{DynamicResource DatePickerFlyoutPresenterBackground}" />
-      <Setter Property="BorderBrush" Value="{DynamicResource DatePickerFlyoutPresenterBorderBrush}" />
-      <Setter Property="BorderThickness" Value="{DynamicResource DateTimeFlyoutBorderThickness}" />
-      <Setter Property="CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
-      <Setter Property="Template">
-        <ControlTemplate>
-          <Border Name="Background" Background="{TemplateBinding Background}"
-                  BorderBrush="{TemplateBinding BorderBrush}"
-                  BorderThickness="{TemplateBinding BorderThickness}"
-                  Padding="{DynamicResource DateTimeFlyoutBorderPadding}"
-                  MaxHeight="398" CornerRadius="{TemplateBinding CornerRadius}">
-            <Grid Name="ContentRoot" RowDefinitions="*,Auto">
-              <Grid Name="PickerContainer">
-                <Grid.Styles>
-                  <Style Selector="DateTimePickerPanel > ListBoxItem">
-                    <Setter Property="Theme" Value="{StaticResource FluentDateTimePickerItem}" />
-                  </Style>
-                </Grid.Styles>
-                <!--Column Definitions set in code, ignore here-->
-                <Panel Name="MonthHost">
-                  <ScrollViewer HorizontalScrollBarVisibility="Disabled"
-                                VerticalScrollBarVisibility="Hidden">
-                    <DateTimePickerPanel Name="MonthSelector"
-                                         PanelType="Month"
-                                         ItemHeight="{DynamicResource DatePickerFlyoutPresenterItemHeight}"
-                                         ShouldLoop="True" />
-                  </ScrollViewer>
-                  <RepeatButton Name="MonthUpButton" Theme="{StaticResource FluentDateTimePickerUpButton}"/>
-                  <RepeatButton Name="MonthDownButton" Theme="{StaticResource FluentDateTimePickerDownButton}"/>
-                </Panel>
-                <Panel Name="DayHost">
-                  <ScrollViewer HorizontalScrollBarVisibility="Disabled"
-                                VerticalScrollBarVisibility="Hidden">
-                    <DateTimePickerPanel Name="DaySelector"
-                                         PanelType="Day"
-                                         ItemHeight="{DynamicResource DatePickerFlyoutPresenterItemHeight}"
-                                         ShouldLoop="True" />
-                  </ScrollViewer>
-                  <RepeatButton Name="DayUpButton" Theme="{StaticResource FluentDateTimePickerUpButton}"/>
-                  <RepeatButton Name="DayDownButton" Theme="{StaticResource FluentDateTimePickerDownButton}"/>
-                </Panel>
-                <Panel Name="YearHost">
-                  <ScrollViewer HorizontalScrollBarVisibility="Disabled"
-                                VerticalScrollBarVisibility="Hidden">
-                    <DateTimePickerPanel Name="YearSelector"
-                                         PanelType="Year"
-                                         ItemHeight="{DynamicResource DatePickerFlyoutPresenterItemHeight}"
-                                         ShouldLoop="False" />
-                  </ScrollViewer>
-                  <RepeatButton Name="YearUpButton" Theme="{StaticResource FluentDateTimePickerUpButton}"/>
-                  <RepeatButton Name="YearDownButton" Theme="{StaticResource FluentDateTimePickerDownButton}"/>
-                </Panel>
-                <Rectangle Name="HighlightRect" IsHitTestVisible="False" ZIndex="-1"
-                           Fill="{DynamicResource DatePickerFlyoutPresenterHighlightFill}"
-                           Grid.Column="0" Grid.ColumnSpan="5" VerticalAlignment="Center"
-                           Height="{DynamicResource DatePickerFlyoutPresenterHighlightHeight}" />
-                <Rectangle Name="FirstSpacer"
-                           Fill="{DynamicResource DatePickerFlyoutPresenterSpacerFill}"
-                           HorizontalAlignment="Center"
-                           Width="{DynamicResource DatePickerSpacerThemeWidth}"
-                           Grid.Column="1" />
-                <Rectangle Name="SecondSpacer"
-                           Fill="{DynamicResource DatePickerFlyoutPresenterSpacerFill}"
-                           HorizontalAlignment="Center"
-                           Width="{DynamicResource DatePickerSpacerThemeWidth}"
-                           Grid.Column="3" />
-              </Grid>
-              <Grid Grid.Row="1" Height="{DynamicResource DatePickerFlyoutPresenterAcceptDismissHostGridHeight}"
-                    Name="AcceptDismissGrid" ColumnDefinitions="*,*">
-                <Rectangle Height="{DynamicResource DatePickerSpacerThemeWidth}" VerticalAlignment="Top"
-                           Fill="{DynamicResource DatePickerFlyoutPresenterSpacerFill}"
-                           Grid.ColumnSpan="2"/>
-                <Button Name="AcceptButton" Grid.Column="0" Theme="{StaticResource FluentDateTimePickerButton}"
-                        HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                  <Path Stroke="{Binding $parent[Button].Foreground}" StrokeLineCap="Round"
-                        StrokeThickness="0.75" Data="M0.5,8.5 5,13.5 15.5,3" />
-                </Button>
-                <Button Name="DismissButton" Grid.Column="1" Theme="{StaticResource FluentDateTimePickerButton}"
-                        FontSize="16" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                  <Path Stroke="{Binding $parent[Button].Foreground}" StrokeLineCap="Round"
-                        StrokeThickness="0.75" Data="M2,2 14,14 M2,14 14 2" />
-                </Button>
-              </Grid>
+  <!--WinUI: DatePickerFlyoutPresenter-->
+  <ControlTheme x:Key="{x:Type DatePickerPresenter}" TargetType="DatePickerPresenter">
+    <Setter Property="Width" Value="296" />
+    <Setter Property="MinWidth" Value="296" />
+    <Setter Property="MaxHeight" Value="398" />
+    <Setter Property="FontWeight" Value="Normal" />
+    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+    <Setter Property="Background" Value="{DynamicResource DatePickerFlyoutPresenterBackground}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource DatePickerFlyoutPresenterBorderBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource DateTimeFlyoutBorderThickness}" />
+    <Setter Property="CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Name="Background" Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                Padding="{DynamicResource DateTimeFlyoutBorderPadding}"
+                MaxHeight="398" CornerRadius="{TemplateBinding CornerRadius}">
+          <Grid Name="ContentRoot" RowDefinitions="*,Auto">
+            <Grid Name="PickerContainer">
+              <Grid.Styles>
+                <Style Selector="DateTimePickerPanel > ListBoxItem">
+                  <Setter Property="Theme" Value="{StaticResource FluentDateTimePickerItem}" />
+                </Style>
+              </Grid.Styles>
+              <!--Column Definitions set in code, ignore here-->
+              <Panel Name="MonthHost">
+                <ScrollViewer HorizontalScrollBarVisibility="Disabled"
+                              VerticalScrollBarVisibility="Hidden">
+                  <DateTimePickerPanel Name="MonthSelector"
+                                       PanelType="Month"
+                                       ItemHeight="{DynamicResource DatePickerFlyoutPresenterItemHeight}"
+                                       ShouldLoop="True" />
+                </ScrollViewer>
+                <RepeatButton Name="MonthUpButton" Theme="{StaticResource FluentDateTimePickerUpButton}"/>
+                <RepeatButton Name="MonthDownButton" Theme="{StaticResource FluentDateTimePickerDownButton}"/>
+              </Panel>
+              <Panel Name="DayHost">
+                <ScrollViewer HorizontalScrollBarVisibility="Disabled"
+                              VerticalScrollBarVisibility="Hidden">
+                  <DateTimePickerPanel Name="DaySelector"
+                                       PanelType="Day"
+                                       ItemHeight="{DynamicResource DatePickerFlyoutPresenterItemHeight}"
+                                       ShouldLoop="True" />
+                </ScrollViewer>
+                <RepeatButton Name="DayUpButton" Theme="{StaticResource FluentDateTimePickerUpButton}"/>
+                <RepeatButton Name="DayDownButton" Theme="{StaticResource FluentDateTimePickerDownButton}"/>
+              </Panel>
+              <Panel Name="YearHost">
+                <ScrollViewer HorizontalScrollBarVisibility="Disabled"
+                              VerticalScrollBarVisibility="Hidden">
+                  <DateTimePickerPanel Name="YearSelector"
+                                       PanelType="Year"
+                                       ItemHeight="{DynamicResource DatePickerFlyoutPresenterItemHeight}"
+                                       ShouldLoop="False" />
+                </ScrollViewer>
+                <RepeatButton Name="YearUpButton" Theme="{StaticResource FluentDateTimePickerUpButton}"/>
+                <RepeatButton Name="YearDownButton" Theme="{StaticResource FluentDateTimePickerDownButton}"/>
+              </Panel>
+              <Rectangle Name="HighlightRect" IsHitTestVisible="False" ZIndex="-1"
+                         Fill="{DynamicResource DatePickerFlyoutPresenterHighlightFill}"
+                         Grid.Column="0" Grid.ColumnSpan="5" VerticalAlignment="Center"
+                         Height="{DynamicResource DatePickerFlyoutPresenterHighlightHeight}" />
+              <Rectangle Name="FirstSpacer"
+                         Fill="{DynamicResource DatePickerFlyoutPresenterSpacerFill}"
+                         HorizontalAlignment="Center"
+                         Width="{DynamicResource DatePickerSpacerThemeWidth}"
+                         Grid.Column="1" />
+              <Rectangle Name="SecondSpacer"
+                         Fill="{DynamicResource DatePickerFlyoutPresenterSpacerFill}"
+                         HorizontalAlignment="Center"
+                         Width="{DynamicResource DatePickerSpacerThemeWidth}"
+                         Grid.Column="3" />
             </Grid>
-          </Border>
-        </ControlTemplate>
-      </Setter>
+            <Grid Grid.Row="1" Height="{DynamicResource DatePickerFlyoutPresenterAcceptDismissHostGridHeight}"
+                  Name="AcceptDismissGrid" ColumnDefinitions="*,*">
+              <Rectangle Height="{DynamicResource DatePickerSpacerThemeWidth}" VerticalAlignment="Top"
+                         Fill="{DynamicResource DatePickerFlyoutPresenterSpacerFill}"
+                         Grid.ColumnSpan="2"/>
+              <Button Name="AcceptButton" Grid.Column="0" Theme="{StaticResource FluentDateTimePickerButton}"
+                      HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                <Path Stroke="{Binding $parent[Button].Foreground}" StrokeLineCap="Round"
+                      StrokeThickness="0.75" Data="M0.5,8.5 5,13.5 15.5,3" />
+              </Button>
+              <Button Name="DismissButton" Grid.Column="1" Theme="{StaticResource FluentDateTimePickerButton}"
+                      FontSize="16" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                <Path Stroke="{Binding $parent[Button].Foreground}" StrokeLineCap="Round"
+                      StrokeThickness="0.75" Data="M2,2 14,14 M2,14 14 2" />
+              </Button>
+            </Grid>
+          </Grid>
+        </Border>
+      </ControlTemplate>
+    </Setter>
 
-      <Style Selector="^ /template/ Panel">
-        <Style Selector="^ RepeatButton">
-          <Setter Property="IsVisible" Value="False" />
-        </Style>
+    <Style Selector="^ /template/ Panel">
+      <Style Selector="^ RepeatButton">
+        <Setter Property="IsVisible" Value="False" />
+      </Style>
 
-        <Style Selector="^:pointerover RepeatButton">
-          <Setter Property="IsVisible" Value="True" />
-        </Style>
-      </Style> 
-    </ControlTheme>
+      <Style Selector="^:pointerover RepeatButton">
+        <Setter Property="IsVisible" Value="True" />
+      </Style>
+    </Style>
+  </ControlTheme>
 
 
 </ResourceDictionary>

From c4541e27db84734a963dc785060ca023a2606283 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 9 Jul 2022 00:48:00 +0200
Subject: [PATCH 099/240] Ported ManagedFileChooser to ControlTheme.

---
 .../Controls/FluentControls.xaml              |   4 +-
 .../Controls/ManagedFileChooser.xaml          | 156 +++++++++---------
 2 files changed, 82 insertions(+), 78 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
index 0b5f6a4a72..1c936ba097 100644
--- a/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
@@ -59,6 +59,8 @@
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/DropDownButton.xaml" />
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/EmbeddableControlRoot.xaml" />
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/Slider.xaml" />
+                <!--  ManagedFileChooser comes last because it uses (and overrides) styles for a multitude of other controls...the dialogs were originally UserControls, after all  -->
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/ManagedFileChooser.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Styles.Resources>
@@ -72,7 +74,5 @@
     <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/SplitView.xaml" />
     <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/UserControl.xaml" />
     <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/TimePicker.xaml" />
-    <!--  ManagedFileChooser comes last because it uses (and overrides) styles for a multitude of other controls...the dialogs were originally UserControls, after all  -->
-    <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ManagedFileChooser.xaml" />
     <Styles.Resources />
 </Styles>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ManagedFileChooser.xaml b/src/Avalonia.Themes.Fluent/Controls/ManagedFileChooser.xaml
index dc454e4fdb..55f4893057 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ManagedFileChooser.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ManagedFileChooser.xaml
@@ -1,8 +1,14 @@
-<Styles xmlns="https://github.com/avaloniaui"
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:dialogs="clr-namespace:Avalonia.Dialogs;assembly=Avalonia.Dialogs">
-  <Style Selector="dialogs|ManagedFileChooser">
-    <Style.Resources>
+  <Design.PreviewWith>
+    <Border Padding="20" Width="800" Height="500">
+      <dialogs:ManagedFileChooser/>
+    </Border>
+  </Design.PreviewWith>
+
+  <ControlTheme x:Key="{x:Type dialogs:ManagedFileChooser}" TargetType="dialogs:ManagedFileChooser">
+    <ControlTheme.Resources>
       <ResourceDictionary>
         <GradientStops x:Key="IconRes.FolderBackGradientStops">
         </GradientStops>
@@ -124,7 +130,7 @@
           </DrawingGroup>
         </dialogs:ResourceSelectorConverter>
       </ResourceDictionary>
-    </Style.Resources>
+    </ControlTheme.Resources>
     <Setter Property="Template">
       <ControlTemplate>
         <DockPanel>
@@ -246,79 +252,77 @@
         </DockPanel>
       </ControlTemplate>
     </Setter>
-  </Style>
+    <Style Selector="^ /template/ ListBox#QuickLinks">
+      <Setter Property="Margin" Value="0"/>
+      <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundChromeMediumBrush}"/>
+      <Setter Property="BorderThickness" Value="0"/>
+      <Setter Property="Width" Value="240"/>
+      <Setter Property="Padding" Value="0,20"/>
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border Name="border" BoxShadow="inset -6 0 3 -3 #20000000" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+            <ScrollViewer Name="PART_ScrollViewer" HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}" VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
+              <ItemsPresenter Name="PART_ItemsPresenter"
+                              Items="{TemplateBinding Items}"
+                              ItemsPanel="{TemplateBinding ItemsPanel}"
+                              ItemTemplate="{TemplateBinding ItemTemplate}"
+                              Margin="{TemplateBinding Padding}"
+                              VirtualizationMode="{TemplateBinding VirtualizationMode}"/>
+            </ScrollViewer>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+      <Setter Property="ItemContainerTheme">
+        <ControlTheme TargetType="ListBoxItem">
+          <Setter Property="Height" Value="32"/>
+          <Setter Property="Padding" Value="30,6"/>
+          <Setter Property="Template">
+            <ControlTemplate>
+              <Border x:Name="LayoutRoot" CornerRadius="2" Margin="10,0">
+                <Panel>
+                  <Border x:Name="SelectedLine" HorizontalAlignment="Left" Margin="2,6" CornerRadius="0.5" Width="3" Background="{DynamicResource SystemControlHighlightAccentBrush}" IsVisible="{TemplateBinding IsSelected}"/>
+                  <ContentPresenter Name="PART_ContentPresenter"
+                              Background="Transparent"
+                              BorderBrush="Transparent"
+                              BorderThickness="0"
+                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                              Content="{TemplateBinding Content}"
+                              Padding="{TemplateBinding Padding}"
+                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"/>
 
+                </Panel>
+              </Border>
+            </ControlTemplate>
+          </Setter>
 
-  <Style Selector="dialogs|ManagedFileChooser /template/ ListBox#QuickLinks">
-    <Setter Property="Margin" Value="0"/>
-    <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundChromeMediumBrush}"/>
-    <Setter Property="BorderThickness" Value="0"/>
-    <Setter Property="Width" Value="240"/>
-    <Setter Property="Padding" Value="0,20"/>
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Name="border" BoxShadow="inset -6 0 3 -3 #20000000" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
-          <ScrollViewer Name="PART_ScrollViewer" HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}" VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
-            <ItemsPresenter Name="PART_ItemsPresenter"
-                            Items="{TemplateBinding Items}"
-                            ItemsPanel="{TemplateBinding ItemsPanel}"
-                            ItemTemplate="{TemplateBinding ItemTemplate}"
-                            Margin="{TemplateBinding Padding}"
-                            VirtualizationMode="{TemplateBinding VirtualizationMode}"/>
-          </ScrollViewer>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-  <Style Selector="dialogs|ManagedFileChooser /template/ ListBox#QuickLinks ListBoxItem">
-    <Setter Property="Height" Value="32"/>
-    <Setter Property="Padding" Value="30,6"/>
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border x:Name="LayoutRoot" CornerRadius="2" Margin="10,0">
-          <Panel>
-            <Border x:Name="SelectedLine" HorizontalAlignment="Left" Margin="2,6" CornerRadius="0.5" Width="3" Background="{DynamicResource SystemControlHighlightAccentBrush}" IsVisible="{TemplateBinding IsSelected}"/>
-            <ContentPresenter Name="PART_ContentPresenter"
-                        Background="Transparent"
-                        BorderBrush="Transparent"
-                        BorderThickness="0"
-                        ContentTemplate="{TemplateBinding ContentTemplate}"
-                        Content="{TemplateBinding Content}"
-                        Padding="{TemplateBinding Padding}"
-                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"/>
+          <Style Selector="^:pointerover /template/ Border#LayoutRoot">
+            <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundAltMediumBrush}"/>
+          </Style>
+          <Style Selector="^:selected /template/ Border#LayoutRoot">
+            <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundAltMediumHighBrush}"/>
+          </Style>
+        </ControlTheme>
+      </Setter>
+    </Style>
 
-          </Panel>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-  <Style Selector="dialogs|ManagedFileChooser /template/ ListBox#QuickLinks ListBoxItem:pointerover /template/ Border#LayoutRoot">
-    <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundAltMediumBrush}"/>
-  </Style>
-  <Style Selector="dialogs|ManagedFileChooser /template/ ListBox#QuickLinks ListBoxItem:selected /template/ Border#LayoutRoot">
-    <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundAltMediumHighBrush}"/>
-  </Style>
-  <Style Selector="dialogs|ManagedFileChooser /template/ DockPanel#NavBar Button,
-                    dialogs|ManagedFileChooser /template/ DockPanel#NavBar TextBox">
-    <Setter Property="Height" Value="30"/>
-  </Style>
-  <Style Selector="dialogs|ManagedFileChooser /template/ DockPanel#NavBar Button">
-    <Setter Property="VerticalAlignment" Value="Stretch"/>
-    <Setter Property="Width" Value="40"/>
-    <Setter Property="Margin" Value="0,0,8,0"/>
-    <Setter Property="BorderThickness" Value="0"/>
-  </Style>
-  <Style Selector="dialogs|ManagedFileChooser /template/ DockPanel#NavBar Button:not(:pointerover):not(:pressed)">
-    <Setter Property="Background" Value="Transparent"/>
-  </Style>
+    <Style Selector="^ /template/ DockPanel#NavBar Button, ^ /template/ DockPanel#NavBar TextBox">
+      <Setter Property="Height" Value="30"/>
+    </Style>
+    <Style Selector="^ /template/ DockPanel#NavBar Button">
+      <Setter Property="VerticalAlignment" Value="Stretch"/>
+      <Setter Property="Width" Value="40"/>
+      <Setter Property="Margin" Value="0,0,8,0"/>
+      <Setter Property="BorderThickness" Value="0"/>
+    </Style>
+    <Style Selector="^ /template/ DockPanel#NavBar Button:not(:pointerover):not(:pressed)">
+      <Setter Property="Background" Value="Transparent"/>
+    </Style>
 
-  <Style Selector="dialogs|ManagedFileChooser /template/ UniformGrid#Finalize > Button">
-    <Setter Property="HorizontalContentAlignment" Value="Center"/>
-    <Setter Property="HorizontalAlignment" Value="Stretch"/>
-    <Setter Property="Margin" Value="4,0,0,0"/>
-  </Style>
-  <Style Selector="dialogs|ManagedFileChooser /template/ UniformGrid#Finalize > Button /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="HorizontalAlignment" Value="Stretch"/>
-  </Style>
-</Styles>
+    <Style Selector="^ /template/ UniformGrid#Finalize > Button">
+      <Setter Property="HorizontalContentAlignment" Value="Center"/>
+      <Setter Property="HorizontalAlignment" Value="Stretch"/>
+      <Setter Property="Margin" Value="4,0,0,0"/>
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>

From da264ac4d0587b7cd6bd36cf0181caafacd83642 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 9 Jul 2022 02:20:14 +0200
Subject: [PATCH 100/240] WIP: Menu/Item.

Something strange is happening when you open the menu a 3rd time.
---
 .../Controls/FluentControls.xaml              |   2 +-
 src/Avalonia.Themes.Fluent/Controls/Menu.xaml |  82 ++++-
 .../Controls/MenuItem.xaml                    | 303 +++++++-----------
 3 files changed, 191 insertions(+), 196 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
index 1c936ba097..6d51dac17f 100644
--- a/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
@@ -26,6 +26,7 @@
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/ListBox.xaml" />
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/ListBoxItem.xaml" />
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/Menu.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/MenuItem.xaml" />
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/MenuFlyoutPresenter.xaml" />
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/NativeMenuBar.xaml" />
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/NotificationCard.xaml" />
@@ -67,7 +68,6 @@
 
     <!--  Define ToolTip first so its styles can be overriden by other controls (e.g. TextBox)  -->
     <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/FocusAdorner.xaml" />
-    <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/MenuItem.xaml" />
     <!--  TabControl needs to come after TabStrip as it redefines the inner TabStrip.ItemsPanel  -->
     <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/TreeViewItem.xaml" />
     <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/SplitButton.xaml" />
diff --git a/src/Avalonia.Themes.Fluent/Controls/Menu.xaml b/src/Avalonia.Themes.Fluent/Controls/Menu.xaml
index 11d21b6b23..3e0e81f870 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Menu.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Menu.xaml
@@ -3,17 +3,95 @@
   <Design.PreviewWith>
     <Border Padding="20">
       <Menu>
-        <MenuItem Header="New" />
-        <MenuItem Header="Open" />
+        <MenuItem Header="_Standard" />
+        <MenuItem Header="Selected" IsSelected="True" />
+        <MenuItem Header="Disabled" IsEnabled="False"/>
       </Menu>
     </Border>
   </Design.PreviewWith>
 
   <x:Double x:Key="MenuBarHeight">32</x:Double>
 
+  <ControlTheme x:Key="FluentTopLevelMenuItem" TargetType="MenuItem">
+    <Setter Property="Background" Value="{DynamicResource MenuFlyoutItemBackground}" />
+    <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemForeground}" />
+    <!--  Narrow padding should be used for mouse input, when non-narrow one should be used for touch input in future.  -->
+    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+    <Setter Property="Padding" Value="{DynamicResource MenuBarItemPadding}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Name="PART_LayoutRoot"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <Panel>
+            <ContentPresenter Name="PART_HeaderPresenter"
+                              Content="{TemplateBinding Header}"
+                              VerticalAlignment="Center"
+                              HorizontalAlignment="Stretch"
+                              RecognizesAccessKey="True"
+                              Margin="{TemplateBinding Padding}"/>
+            <Popup Name="PART_Popup"
+                   WindowManagerAddShadowHint="False"
+                   MinWidth="{ReflectionBinding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
+                   IsLightDismissEnabled="True"
+                   IsOpen="{TemplateBinding IsSubMenuOpen, Mode=TwoWay}"
+                   OverlayInputPassThroughElement="{Binding $parent[Menu]}">
+              <Border Background="{DynamicResource MenuFlyoutPresenterBackground}"
+                      BorderBrush="{DynamicResource MenuFlyoutPresenterBorderBrush}"
+                      BorderThickness="{DynamicResource MenuFlyoutPresenterBorderThemeThickness}"
+                      Padding="{DynamicResource MenuFlyoutPresenterThemePadding}"
+                      MaxWidth="{DynamicResource FlyoutThemeMaxWidth}"
+                      MinHeight="{DynamicResource MenuFlyoutThemeMinHeight}"
+                      HorizontalAlignment="Stretch"
+                      CornerRadius="{DynamicResource OverlayCornerRadius}">
+                <ScrollViewer Classes="menuscroller">
+                  <ItemsPresenter Name="PART_ItemsPresenter"
+                                  Items="{TemplateBinding Items}"
+                                  ItemsPanel="{TemplateBinding ItemsPanel}"
+                                  ItemTemplate="{TemplateBinding ItemTemplate}"
+                                  Margin="{DynamicResource MenuFlyoutScrollerMargin}"
+                                  Grid.IsSharedSizeScope="True" />
+                </ScrollViewer>
+              </Border>
+            </Popup>
+          </Panel>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^:selected">
+      <Style Selector="^ /template/ Border#PART_LayoutRoot">
+        <Setter Property="Background" Value="{DynamicResource MenuFlyoutItemBackgroundPointerOver}" />
+      </Style>
+      <Style Selector="^ /template/ ContentPresenter#PART_HeaderPresenter">
+        <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemForegroundPointerOver}" />
+      </Style>
+    </Style>
+
+    <!--  Listen for PART_LayoutRoot:pointerover, so it will not be triggered when subitem is pressed  -->
+    <Style Selector="^:pressed /template/ Border#PART_LayoutRoot:pointerover">
+      <Setter Property="Background" Value="{DynamicResource MenuFlyoutItemBackgroundPressed}" />
+      <Style Selector="^ ContentPresenter#PART_HeaderPresenter">
+        <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemForegroundPressed}" />
+      </Style>
+    </Style>
+
+    <Style Selector="^:disabled">
+      <Style Selector="^ /template/ Border#PART_LayoutRoot">
+        <Setter Property="Background" Value="{DynamicResource MenuFlyoutItemBackgroundDisabled}" />
+      </Style>
+      <Style Selector="^ /template/ ContentPresenter#PART_HeaderPresenter">
+        <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemForegroundDisabled}" />
+      </Style>
+    </Style>
+  </ControlTheme>
+
   <ControlTheme x:Key="{x:Type Menu}" TargetType="Menu">
     <Setter Property="Background" Value="Transparent" />
     <Setter Property="Height" Value="{DynamicResource MenuBarHeight}" />
+    <Setter Property="ItemContainerTheme" Value="{StaticResource FluentTopLevelMenuItem}"/>
     <Setter Property="Template">
       <ControlTemplate>
         <Border Background="{TemplateBinding Background}"
diff --git a/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml b/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
index b7a9435749..3ec65c4936 100644
--- a/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
@@ -1,60 +1,48 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:conv="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls"
-        xmlns:sys="clr-namespace:System;assembly=netstandard"
-        x:DataType="MenuItem"
-        x:CompileBindings="True">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:conv="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls"
+                    xmlns:sys="clr-namespace:System;assembly=netstandard"
+                    x:DataType="MenuItem"
+                    x:CompileBindings="True">
   <Design.PreviewWith>
-    <Border Padding="20"
-            Width="400"
-            Height="200">
-      <Menu VerticalAlignment="Top">
-        <MenuItem Header="File">
-          <MenuItem Header="Disabled"
-                    IsEnabled="False" />
-          <MenuItem Header="New"
-                    InputGesture="Ctrl+N">
-            <MenuItem Header="XML" />
-          </MenuItem>
-          <MenuItem Header="Open">
-            <MenuItem.Icon>
-              <CheckBox BorderThickness="0"
-                        IsHitTestVisible="False"
-                        IsChecked="True" />
-            </MenuItem.Icon>
-          </MenuItem>
-          <Separator />
-          <MenuItem Header="Exit"
-                    InputGesture="Alt+F4" />
+    <Border Padding="20">
+      <StackPanel Spacing="20">
+        <MenuItem Header="_Standard"/>
+        <MenuItem IsSelected="True" Header="Selected"/>
+        <MenuItem Header="With Icon">
+          <MenuItem.Icon>
+            <TextBlock>😊</TextBlock>
+          </MenuItem.Icon>
         </MenuItem>
-        <MenuItem Header="Edit">
-          <MenuItem Header="Go To">
-            <MenuItem Header="Go To Line" />
-          </MenuItem>
+        <MenuItem Header="With CheckBox">
+          <MenuItem.Icon>
+            <CheckBox IsChecked="True"/>
+          </MenuItem.Icon>
         </MenuItem>
-        <MenuItem Header="View">
-          <MenuItem Header="Designer"
-                    InputGesture="Shift+F7" />
+        <MenuItem Header="Input Gesture" InputGesture="Ctrl+G"/>
+        <MenuItem Header="Disabled" IsEnabled="False"/>
+        <MenuItem Header="-"/>
+        <MenuItem Header="Parent">
+          <MenuItem Header="Child"/>
         </MenuItem>
-        <MenuItem Header="Project">
-          <MenuItem Header="Add class" />
+        <MenuItem Header="Disabled Parent" IsEnabled="False">
+          <MenuItem Header="Child"/>
         </MenuItem>
-      </Menu>
+      </StackPanel>
     </Border>
   </Design.PreviewWith>
 
-  <Styles.Resources>
-    <conv:PlatformKeyGestureConverter x:Key="KeyGestureConverter" />
-    <x:Double x:Key="MenuFlyoutSubItemPopupHorizontalOffset">-4</x:Double>
-    <Thickness x:Key="MenuIconPresenterMargin">0,0,12,0</Thickness>
-    <Thickness x:Key="MenuInputGestureTextMargin">24,0,0,0</Thickness>
-    <StreamGeometry x:Key="MenuItemChevronPathData">M 1,0 10,10 l -9,10 -1,-1 L 8,10 -0,1 Z</StreamGeometry>
-  </Styles.Resources>
+  <conv:PlatformKeyGestureConverter x:Key="KeyGestureConverter" />
+  <x:Double x:Key="MenuFlyoutSubItemPopupHorizontalOffset">-4</x:Double>
+  <Thickness x:Key="MenuIconPresenterMargin">0,0,12,0</Thickness>
+  <Thickness x:Key="MenuInputGestureTextMargin">24,0,0,0</Thickness>
+  <StreamGeometry x:Key="MenuItemChevronPathData">M 1,0 10,10 l -9,10 -1,-1 L 8,10 -0,1 Z</StreamGeometry>
 
-  <Style Selector="MenuItem">
+  <ControlTheme x:Key="{x:Type MenuItem}" TargetType="MenuItem">
     <Setter Property="Background" Value="{DynamicResource MenuFlyoutItemBackground}" />
     <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemForeground}" />
-    <Setter Property="Padding" Value="{DynamicResource MenuFlyoutItemThemePadding}" />
+    <!--  Narrow padding should be used for mouse input, when non-narrow one should be used for touch input in future.  -->
+    <Setter Property="Padding" Value="{DynamicResource MenuFlyoutItemThemePaddingNarrow}" />
     <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
     <Setter Property="Template">
       <ControlTemplate>
@@ -75,35 +63,37 @@
                 <ColumnDefinition Width="Auto"
                                   SharedSizeGroup="MenuItemChevron" />
               </Grid.ColumnDefinitions>
-              <ContentPresenter Name="PART_IconPresenter"
-                                Content="{TemplateBinding Icon}"
-                                Margin="{DynamicResource MenuIconPresenterMargin}"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center" />
+
+              <Viewbox Name="PART_IconPresenter"
+                       Margin="{DynamicResource MenuIconPresenterMargin}"
+                       StretchDirection="DownOnly"
+                       HorizontalAlignment="Center"
+                       VerticalAlignment="Center"
+                       IsVisible="False"
+                       Width="16" Height="16">
+                <ContentPresenter Content="{TemplateBinding Icon}"/>
+              </Viewbox>
 
               <ContentPresenter Name="PART_HeaderPresenter"
                                 Content="{TemplateBinding Header}"
                                 VerticalAlignment="Center"
                                 HorizontalAlignment="Stretch"
-                                Grid.Column="1">
-                <ContentPresenter.DataTemplates>
-                  <DataTemplate DataType="sys:String">
-                    <AccessText Text="{Binding}" />
-                  </DataTemplate>
-                </ContentPresenter.DataTemplates>
-              </ContentPresenter>
+                                RecognizesAccessKey="True"
+                                Grid.Column="1"/>
               <TextBlock x:Name="PART_InputGestureText"
                          Grid.Column="2"
                          Classes="CaptionTextBlockStyle"
                          Margin="{DynamicResource MenuInputGestureTextMargin}"
                          Text="{TemplateBinding InputGesture, Converter={StaticResource KeyGestureConverter}}"
                          HorizontalAlignment="Right"
-                         VerticalAlignment="Center" />
+                         VerticalAlignment="Center"
+                         Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"/>
               <Path Name="PART_ChevronPath"
                     Stretch="Uniform"
                     Width="8"
                     Height="16"
                     Data="{StaticResource MenuItemChevronPathData}"
+                    Fill="{DynamicResource MenuFlyoutSubItemChevron}"
                     Margin="{DynamicResource MenuFlyoutItemChevronMargin}"
                     VerticalAlignment="Center"
                     Grid.Column="3" />
@@ -136,144 +126,71 @@
         </Panel>
       </ControlTemplate>
     </Setter>
-  </Style>
-
-  <Style Selector="Menu > MenuItem">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Name="PART_LayoutRoot"
-                Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}">
-          <Panel>
-            <ContentPresenter Name="PART_HeaderPresenter"
-                              Content="{TemplateBinding Header}"
-                              VerticalAlignment="Center"
-                              HorizontalAlignment="Stretch"
-                              Margin="{TemplateBinding Padding}">
-              <ContentPresenter.DataTemplates>
-                <DataTemplate DataType="sys:String">
-                  <AccessText Text="{Binding}" />
-                </DataTemplate>
-              </ContentPresenter.DataTemplates>
-            </ContentPresenter>
-            <Popup Name="PART_Popup"
-                   WindowManagerAddShadowHint="False"
-                   MinWidth="{ReflectionBinding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
-                   IsLightDismissEnabled="True"
-                   IsOpen="{TemplateBinding IsSubMenuOpen, Mode=TwoWay}"
-                   OverlayInputPassThroughElement="{Binding $parent[Menu]}">
-              <Border Background="{DynamicResource MenuFlyoutPresenterBackground}"
-                      BorderBrush="{DynamicResource MenuFlyoutPresenterBorderBrush}"
-                      BorderThickness="{DynamicResource MenuFlyoutPresenterBorderThemeThickness}"
-                      Padding="{DynamicResource MenuFlyoutPresenterThemePadding}"
-                      MaxWidth="{DynamicResource FlyoutThemeMaxWidth}"
-                      MinHeight="{DynamicResource MenuFlyoutThemeMinHeight}"
-                      HorizontalAlignment="Stretch"
-                      CornerRadius="{DynamicResource OverlayCornerRadius}">
-                <ScrollViewer Classes="menuscroller">
-                  <ItemsPresenter Name="PART_ItemsPresenter"
-                                  Items="{TemplateBinding Items}"
-                                  ItemsPanel="{TemplateBinding ItemsPanel}"
-                                  ItemTemplate="{TemplateBinding ItemTemplate}"
-                                  Margin="{DynamicResource MenuFlyoutScrollerMargin}"
-                                  Grid.IsSharedSizeScope="True" />
-                </ScrollViewer>
-              </Border>
-            </Popup>
-          </Panel>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="MenuItem">
-    <!--  Narrow padding should be used for mouse input, when non-narrow one should be used for touch input in future.  -->
-    <Setter Property="Padding" Value="{DynamicResource MenuFlyoutItemThemePaddingNarrow}" />
-  </Style>
-
-  <Style Selector="Menu > MenuItem">
-    <!--  Custom padding for Menu > MenuItem  -->
-    <Setter Property="Padding" Value="{DynamicResource MenuBarItemPadding}" />
-  </Style>
-
-  <Style Selector="MenuItem /template/ ContentPresenter#PART_IconPresenter">
-    <Setter Property="Width" Value="16" />
-    <Setter Property="Height" Value="16" />
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-  <Style Selector="MenuItem:icon /template/ ContentPresenter#PART_IconPresenter">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
-
-  <Style Selector="MenuItem /template/ TextBlock#PART_InputGestureText">
-    <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}" />
-  </Style>
-  <Style Selector="MenuItem /template/ Path#PART_ChevronPath">
-    <Setter Property="Fill" Value="{DynamicResource MenuFlyoutSubItemChevron}" />
-  </Style>
 
-  <Style Selector="MenuItem:selected /template/ Border#PART_LayoutRoot">
-    <Setter Property="Background" Value="{DynamicResource MenuFlyoutItemBackgroundPointerOver}" />
-  </Style>
-  <Style Selector="MenuItem:selected /template/ ContentPresenter#PART_HeaderPresenter">
-    <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemForegroundPointerOver}" />
-  </Style>
-  <Style Selector="MenuItem:selected /template/ TextBlock#PART_InputGestureText">
-    <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForegroundPointerOver}" />
-  </Style>
-  <Style Selector="MenuItem:selected /template/ Path#PART_ChevronPath">
-    <Setter Property="Fill" Value="{DynamicResource MenuFlyoutSubItemChevronPointerOver}" />
-  </Style>
+    <Style Selector="^:icon /template/ Viewbox#PART_IconPresenter">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
 
-  <!--  Listen for PART_LayoutRoot:pointerover, so it will not be triggered when subitem is pressed  -->
-  <Style Selector="MenuItem:pressed /template/ Border#PART_LayoutRoot:pointerover">
-    <Setter Property="Background" Value="{DynamicResource MenuFlyoutItemBackgroundPressed}" />
-  </Style>
-  <Style Selector="MenuItem:pressed /template/ Border#PART_LayoutRoot:pointerover ContentPresenter#PART_HeaderPresenter">
-    <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemForegroundPressed}" />
-  </Style>
-  <Style Selector="MenuItem:pressed /template/ Border#PART_LayoutRoot:pointerover TextBlock#PART_InputGestureText">
-    <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForegroundPressed}" />
-  </Style>
-  <Style Selector="MenuItem:pressed /template/ Border#PART_LayoutRoot:pointerover Path#PART_ChevronPath">
-    <Setter Property="Fill" Value="{DynamicResource MenuFlyoutSubItemChevronPressed}" />
-  </Style>
+    <Style Selector="^:selected">
+      <Style Selector="^ /template/ Border#PART_LayoutRoot">
+        <Setter Property="Background" Value="{DynamicResource MenuFlyoutItemBackgroundPointerOver}" />
+      </Style>
+      <Style Selector="^ /template/ ContentPresenter#PART_HeaderPresenter">
+        <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemForegroundPointerOver}" />
+      </Style>
+      <Style Selector="^ /template/ TextBlock#PART_InputGestureText">
+        <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForegroundPointerOver}" />
+      </Style>
+      <Style Selector="^ /template/ Path#PART_ChevronPath">
+        <Setter Property="Fill" Value="{DynamicResource MenuFlyoutSubItemChevronPointerOver}" />
+      </Style>
+    </Style>
 
-  <Style Selector="MenuItem:disabled /template/ Border#PART_LayoutRoot">
-    <Setter Property="Background" Value="{DynamicResource MenuFlyoutItemBackgroundDisabled}" />
-  </Style>
-  <Style Selector="MenuItem:disabled /template/ ContentPresenter#PART_HeaderPresenter">
-    <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemForegroundDisabled}" />
-  </Style>
-  <Style Selector="MenuItem:disabled /template/ TextBlock#PART_InputGestureText">
-    <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForegroundDisabled}" />
-  </Style>
-  <Style Selector="MenuItem:disabled /template/ Path#PART_ChevronPath">
-    <Setter Property="Fill" Value="{DynamicResource MenuFlyoutSubItemChevronDisabled}" />
-  </Style>
+    <!--  Listen for PART_LayoutRoot:pointerover, so it will not be triggered when subitem is pressed  -->
+    <Style Selector="^:pressed /template/ Border#PART_LayoutRoot:pointerover">
+      <Setter Property="Background" Value="{DynamicResource MenuFlyoutItemBackgroundPressed}" />
+      <Style Selector="^ ContentPresenter#PART_HeaderPresenter">
+        <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemForegroundPressed}" />
+      </Style>
+      <Style Selector="^ TextBlock#PART_InputGestureText">
+        <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForegroundPressed}" />
+      </Style>
+      <Style Selector="^ Path#PART_ChevronPath">
+        <Setter Property="Fill" Value="{DynamicResource MenuFlyoutSubItemChevronPressed}" />
+      </Style>
+    </Style>
 
-  <Style Selector="MenuItem:open /template/ Path#PART_ChevronPath">
-    <Setter Property="Fill" Value="{DynamicResource MenuFlyoutSubItemChevronSubMenuOpened}" />
-  </Style>
+    <Style Selector="^:disabled">
+      <Style Selector="^ /template/ Border#PART_LayoutRoot">
+        <Setter Property="Background" Value="{DynamicResource MenuFlyoutItemBackgroundDisabled}" />
+      </Style>
+      <Style Selector="^ /template/ ContentPresenter#PART_HeaderPresenter">
+        <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemForegroundDisabled}" />
+      </Style>
+      <Style Selector="^ /template/ TextBlock#PART_InputGestureText">
+        <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForegroundDisabled}" />
+      </Style>
+      <Style Selector="^ /template/ Path#PART_ChevronPath">
+        <Setter Property="Fill" Value="{DynamicResource MenuFlyoutSubItemChevronDisabled}" />
+      </Style>
+    </Style>
 
-  <Style Selector="MenuItem:empty /template/ Path#PART_ChevronPath">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
+    <Style Selector="^:open /template/ Path#PART_ChevronPath">
+      <Setter Property="Fill" Value="{DynamicResource MenuFlyoutSubItemChevronSubMenuOpened}" />
+    </Style>
 
-  <Style Selector="MenuItem:separator">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Separator />
-      </ControlTemplate>
-    </Setter>
-  </Style>
+    <Style Selector="^:empty /template/ Path#PART_ChevronPath">
+      <Setter Property="IsVisible" Value="False" />
+    </Style>
 
-  <Style Selector="MenuItem > Separator, ContextMenu > Separator">
-    <Setter Property="Background" Value="{DynamicResource SystemControlForegroundBaseMediumLowBrush}" />
-    <Setter Property="HorizontalAlignment" Value="Stretch" />
-    <Setter Property="Margin" Value="{DynamicResource MenuFlyoutSeparatorThemePadding}" />
-    <Setter Property="Height" Value="{DynamicResource MenuFlyoutSeparatorThemeHeight}" />
-  </Style>
-</Styles>
+    <Style Selector="^:separator">
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Separator Background="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
+                     Margin="{DynamicResource MenuFlyoutSeparatorThemePadding}"
+                     Height="{DynamicResource MenuFlyoutSeparatorThemeHeight}"/>
+        </ControlTemplate>
+      </Setter>
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>

From d2e4d58f178113d500ca5dffc06734be751ce403 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 9 Jul 2022 15:17:15 +0200
Subject: [PATCH 101/240] Formatted NativeMenuBar ControlTheme.

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

diff --git a/src/Avalonia.Themes.Fluent/Controls/NativeMenuBar.xaml b/src/Avalonia.Themes.Fluent/Controls/NativeMenuBar.xaml
index 753c03992a..4f51ebfa7f 100644
--- a/src/Avalonia.Themes.Fluent/Controls/NativeMenuBar.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/NativeMenuBar.xaml
@@ -25,5 +25,5 @@
         </Menu>
       </ControlTemplate>
     </Setter>
-   </ControlTheme>
+  </ControlTheme>
 </ResourceDictionary>

From d902c3eb0ca5a7559d1e7843abd93f567fe065bc Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 9 Jul 2022 15:53:41 +0200
Subject: [PATCH 102/240] Port ScrollViewer to ControlTheme.

Including splitting out the menu scroller into a separate xaml file for separate preview.
---
 .../Controls/FluentControls.xaml              |   1 +
 .../Controls/MenuItem.xaml                    |  28 ++-
 .../Controls/MenuScrollViewer.xaml            |  98 +++++++++++
 .../Controls/ScrollViewer.xaml                | 164 +++++++++---------
 4 files changed, 204 insertions(+), 87 deletions(-)
 create mode 100644 src/Avalonia.Themes.Fluent/Controls/MenuScrollViewer.xaml

diff --git a/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
index 6d51dac17f..3e4361465c 100644
--- a/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
@@ -25,6 +25,7 @@
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/Label.xaml" />
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/ListBox.xaml" />
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/ListBoxItem.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/MenuScrollViewer.xaml" />
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/Menu.xaml" />
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/MenuItem.xaml" />
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/MenuFlyoutPresenter.xaml" />
diff --git a/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml b/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
index 3ec65c4936..8f77d1bc1b 100644
--- a/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
@@ -5,8 +5,8 @@
                     x:DataType="MenuItem"
                     x:CompileBindings="True">
   <Design.PreviewWith>
-    <Border Padding="20">
-      <StackPanel Spacing="20">
+    <Border Padding="20" Width="320">
+      <StackPanel Spacing="20" HorizontalAlignment="Left">
         <MenuItem Header="_Standard"/>
         <MenuItem IsSelected="True" Header="Selected"/>
         <MenuItem Header="With Icon">
@@ -22,8 +22,26 @@
         <MenuItem Header="Input Gesture" InputGesture="Ctrl+G"/>
         <MenuItem Header="Disabled" IsEnabled="False"/>
         <MenuItem Header="-"/>
-        <MenuItem Header="Parent">
-          <MenuItem Header="Child"/>
+        <MenuItem Header="Parent" IsSubMenuOpen="True">
+          <MenuItem Header="Child 1"/>
+          <MenuItem Header="Child 2"/>
+          <MenuItem Header="Child 3"/>
+          <MenuItem Header="Child 4"/>
+          <MenuItem Header="Child 5"/>
+          <MenuItem Header="Child 6"/>
+          <MenuItem Header="Child 7"/>
+          <MenuItem Header="Child 8"/>
+          <MenuItem Header="Child 9"/>
+          <MenuItem Header="Child 10"/>
+          <MenuItem Header="Child 11"/>
+          <MenuItem Header="Child 12"/>
+          <MenuItem Header="Child 13"/>
+          <MenuItem Header="Child 14"/>
+          <MenuItem Header="Child 15"/>
+          <MenuItem Header="Child 16"/>
+          <MenuItem Header="Child 17"/>
+          <MenuItem Header="Child 18"/>
+          <MenuItem Header="Child 19"/>
         </MenuItem>
         <MenuItem Header="Disabled Parent" IsEnabled="False">
           <MenuItem Header="Child"/>
@@ -113,7 +131,7 @@
                     MinHeight="{DynamicResource MenuFlyoutThemeMinHeight}"
                     HorizontalAlignment="Stretch"
                     CornerRadius="{DynamicResource OverlayCornerRadius}">
-              <ScrollViewer Classes="menuscroller">
+              <ScrollViewer Theme="{StaticResource FluentMenuScrollViewer}">
                 <ItemsPresenter Name="PART_ItemsPresenter"
                                 Items="{TemplateBinding Items}"
                                 ItemsPanel="{TemplateBinding ItemsPanel}"
diff --git a/src/Avalonia.Themes.Fluent/Controls/MenuScrollViewer.xaml b/src/Avalonia.Themes.Fluent/Controls/MenuScrollViewer.xaml
new file mode 100644
index 0000000000..bc71d88a0d
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/MenuScrollViewer.xaml
@@ -0,0 +1,98 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:converters="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls">
+
+  <Design.PreviewWith>
+    <ScrollViewer Theme="{DynamicResource FluentMenuScrollViewer}" Width="200" Height="200">
+      <StackPanel Spacing="20">
+        <TextBlock>Item 1</TextBlock>
+        <TextBlock>Item 2</TextBlock>
+        <TextBlock>Item 3</TextBlock>
+        <TextBlock>Item 4</TextBlock>
+        <TextBlock>Item 5</TextBlock>
+        <TextBlock>Item 6</TextBlock>
+        <TextBlock>Item 7</TextBlock>
+        <TextBlock>Item 8</TextBlock>
+        <TextBlock>Item 9</TextBlock>
+      </StackPanel>
+    </ScrollViewer>
+  </Design.PreviewWith>
+
+  <ControlTheme x:Key="FluentMenuScrollViewer" TargetType="ScrollViewer">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <DockPanel>
+          <RepeatButton DockPanel.Dock="Top"
+                        BorderThickness="0"
+                        Background="Transparent"
+                        HorizontalAlignment="Stretch"
+                        HorizontalContentAlignment="Center"
+                        RenderTransform="{x:Null}"
+                        Command="{Binding LineUp, RelativeSource={RelativeSource TemplatedParent}}">
+            <RepeatButton.IsVisible>
+              <MultiBinding Converter="{x:Static converters:MenuScrollingVisibilityConverter.Instance}"
+                            ConverterParameter="0">
+                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="VerticalScrollBarVisibility" />
+                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Offset.Y" />
+                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Extent.Height" />
+                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Viewport.Height" />
+              </MultiBinding>
+            </RepeatButton.IsVisible>
+            <Viewbox Width="{DynamicResource ScrollBarButtonArrowIconFontSize}"
+                     Height="{DynamicResource ScrollBarButtonArrowIconFontSize}">
+              <Path VerticalAlignment="Center"
+                    HorizontalAlignment="Center"
+                    Data="M 19.091797 14.970703 L 10 5.888672 L 0.908203 14.970703 L 0.029297 14.091797 L 10 4.111328 L 19.970703 14.091797 Z"
+                    Fill="{DynamicResource ScrollBarButtonArrowForeground}"
+                    Width="20"
+                    Height="20" />
+            </Viewbox>
+          </RepeatButton>
+          <RepeatButton DockPanel.Dock="Bottom"
+                        BorderThickness="0"
+                        Background="Transparent"
+                        HorizontalAlignment="Stretch"
+                        HorizontalContentAlignment="Center"
+                        RenderTransform="{x:Null}"
+                        Command="{Binding LineDown, RelativeSource={RelativeSource TemplatedParent}}">
+            <RepeatButton.IsVisible>
+              <MultiBinding Converter="{x:Static converters:MenuScrollingVisibilityConverter.Instance}"
+                            ConverterParameter="100">
+                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="VerticalScrollBarVisibility" />
+                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Offset.Y" />
+                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Extent.Height" />
+                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Viewport.Height" />
+              </MultiBinding>
+            </RepeatButton.IsVisible>
+            <Viewbox Width="{DynamicResource ScrollBarButtonArrowIconFontSize}"
+                     Height="{DynamicResource ScrollBarButtonArrowIconFontSize}">
+              <Path VerticalAlignment="Center"
+                    HorizontalAlignment="Center"
+                    Data="M 18.935547 4.560547 L 19.814453 5.439453 L 10 15.253906 L 0.185547 5.439453 L 1.064453 4.560547 L 10 13.496094 Z"
+                    Fill="{DynamicResource ScrollBarButtonArrowForeground}"
+                    Width="20"
+                    Height="20" />
+            </Viewbox>
+          </RepeatButton>
+          <ScrollContentPresenter Name="PART_ContentPresenter"
+                                  CanHorizontallyScroll="{TemplateBinding CanHorizontallyScroll}"
+                                  CanVerticallyScroll="{TemplateBinding CanVerticallyScroll}"
+                                  Content="{TemplateBinding Content}"
+                                  Extent="{TemplateBinding Extent, Mode=TwoWay}"
+                                  Margin="{TemplateBinding Padding}"
+                                  Offset="{TemplateBinding Offset, Mode=TwoWay}"
+                                  Viewport="{TemplateBinding Viewport, Mode=TwoWay}">
+            <ScrollContentPresenter.GestureRecognizers>
+              <ScrollGestureRecognizer CanHorizontallyScroll="{TemplateBinding CanHorizontallyScroll}"
+                                       CanVerticallyScroll="{TemplateBinding CanVerticallyScroll}" />
+            </ScrollContentPresenter.GestureRecognizers>
+          </ScrollContentPresenter>
+        </DockPanel>
+      </ControlTemplate>
+    </Setter>
+    <Style Selector="^ /template/ RepeatButton:pointerover > Viewbox > Path">
+      <Setter Property="Fill" Value="{DynamicResource ScrollBarButtonArrowForegroundPointerOver}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml b/src/Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml
index a6e02d2769..55adb54d9b 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml
@@ -1,87 +1,87 @@
-<ResourceDictionary 
+<ResourceDictionary
   xmlns="https://github.com/avaloniaui"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
   xmlns:converters="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls">
-    <Design.PreviewWith>
-      <Grid ColumnDefinitions="*,20,*" Height="300" Width="200" Margin="20">
-        <ScrollViewer>
-          <Border Height="1000" Background="#ccc" />
-        </ScrollViewer>
-        <ScrollViewer Grid.Column="2" Classes="menuscroller">
-          <Border Height="1000" Background="#ccc" />
-        </ScrollViewer>
-      </Grid>
-    </Design.PreviewWith>
-  
-    <ControlTheme x:Key="{x:Type ScrollViewer}" TargetType="ScrollViewer">
-      <Setter Property="Background" Value="Transparent" />
-      <Setter Property="Template">
-        <ControlTemplate>
-          <Grid ColumnDefinitions="*,Auto" RowDefinitions="*,Auto">
-            <ScrollContentPresenter Name="PART_ContentPresenter" Grid.Row="0" Grid.Column="0" Grid.RowSpan="2" Grid.ColumnSpan="2" Background="{TemplateBinding Background}" CanHorizontallyScroll="{TemplateBinding CanHorizontallyScroll}" CanVerticallyScroll="{TemplateBinding CanVerticallyScroll}" Content="{TemplateBinding Content}" Extent="{TemplateBinding Extent, Mode=TwoWay}" Padding="{TemplateBinding Padding}" Offset="{TemplateBinding Offset, Mode=TwoWay}" Viewport="{TemplateBinding Viewport, Mode=TwoWay}" IsScrollChainingEnabled="{TemplateBinding IsScrollChainingEnabled}">
-              <ScrollContentPresenter.GestureRecognizers>
-                <ScrollGestureRecognizer CanHorizontallyScroll="{TemplateBinding CanHorizontallyScroll}" CanVerticallyScroll="{TemplateBinding CanVerticallyScroll}" />
-              </ScrollContentPresenter.GestureRecognizers>
-            </ScrollContentPresenter>
-            <ScrollBar Name="PART_HorizontalScrollBar" AllowAutoHide="{TemplateBinding AllowAutoHide}" Orientation="Horizontal" LargeChange="{Binding LargeChange.Width, RelativeSource={RelativeSource TemplatedParent}}" SmallChange="{Binding SmallChange.Width, RelativeSource={RelativeSource TemplatedParent}}" Maximum="{TemplateBinding HorizontalScrollBarMaximum}" Value="{TemplateBinding HorizontalScrollBarValue, Mode=TwoWay}" ViewportSize="{TemplateBinding HorizontalScrollBarViewportSize}" Visibility="{TemplateBinding HorizontalScrollBarVisibility}" Grid.Row="1" Focusable="False" />
-            <ScrollBar Name="PART_VerticalScrollBar" AllowAutoHide="{TemplateBinding AllowAutoHide}" Orientation="Vertical" LargeChange="{Binding LargeChange.Height, RelativeSource={RelativeSource TemplatedParent}}" SmallChange="{Binding SmallChange.Height, RelativeSource={RelativeSource TemplatedParent}}" Maximum="{TemplateBinding VerticalScrollBarMaximum}" Value="{TemplateBinding VerticalScrollBarValue, Mode=TwoWay}" ViewportSize="{TemplateBinding VerticalScrollBarViewportSize}" Visibility="{TemplateBinding VerticalScrollBarVisibility}" Grid.Column="1" Focusable="False" />
-            <Panel x:Name="PART_ScrollBarsSeparator" Grid.Row="1" Grid.Column="1" Background="{DynamicResource ScrollViewerScrollBarsSeparatorBackground}" />
-          </Grid>
-        </ControlTemplate>
+  <Design.PreviewWith>
+    <ScrollViewer Width="200" Height="200"
+                  HorizontalScrollBarVisibility="Auto">
+      <StackPanel Spacing="20" Width="210">
+        <TextBlock>Item 1</TextBlock>
+        <TextBlock>Item 2</TextBlock>
+        <TextBlock>Item 3</TextBlock>
+        <TextBlock>Item 4</TextBlock>
+        <TextBlock>Item 5</TextBlock>
+        <TextBlock>Item 6</TextBlock>
+        <TextBlock>Item 7</TextBlock>
+        <TextBlock>Item 8</TextBlock>
+        <TextBlock>Item 9</TextBlock>
+      </StackPanel>
+    </ScrollViewer>
+  </Design.PreviewWith>
+
+  <ControlTheme x:Key="{x:Type ScrollViewer}" TargetType="ScrollViewer">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Grid ColumnDefinitions="*,Auto" RowDefinitions="*,Auto">
+          <ScrollContentPresenter Name="PART_ContentPresenter"
+                                  Grid.Row="0"
+                                  Grid.Column="0"
+                                  Grid.RowSpan="2"
+                                  Grid.ColumnSpan="2"
+                                  Background="{TemplateBinding Background}"
+                                  CanHorizontallyScroll="{TemplateBinding CanHorizontallyScroll}"
+                                  CanVerticallyScroll="{TemplateBinding CanVerticallyScroll}"
+                                  Content="{TemplateBinding Content}"
+                                  Extent="{TemplateBinding Extent, Mode=TwoWay}"
+                                  Padding="{TemplateBinding Padding}"
+                                  Offset="{TemplateBinding Offset, Mode=TwoWay}"
+                                  Viewport="{TemplateBinding Viewport, Mode=TwoWay}"
+                                  IsScrollChainingEnabled="{TemplateBinding IsScrollChainingEnabled}">
+            <ScrollContentPresenter.GestureRecognizers>
+              <ScrollGestureRecognizer CanHorizontallyScroll="{TemplateBinding CanHorizontallyScroll}"
+                                       CanVerticallyScroll="{TemplateBinding CanVerticallyScroll}" />
+            </ScrollContentPresenter.GestureRecognizers>
+          </ScrollContentPresenter>
+          <ScrollBar Name="PART_HorizontalScrollBar"
+                     AllowAutoHide="{TemplateBinding AllowAutoHide}"
+                     Orientation="Horizontal"
+                     LargeChange="{Binding LargeChange.Width, RelativeSource={RelativeSource TemplatedParent}}"
+                     SmallChange="{Binding SmallChange.Width, RelativeSource={RelativeSource TemplatedParent}}"
+                     Maximum="{TemplateBinding HorizontalScrollBarMaximum}"
+                     Value="{TemplateBinding HorizontalScrollBarValue, Mode=TwoWay}"
+                     ViewportSize="{TemplateBinding HorizontalScrollBarViewportSize}"
+                     Visibility="{TemplateBinding HorizontalScrollBarVisibility}"
+                     Grid.Row="1"
+                     Focusable="False" />
+          <ScrollBar Name="PART_VerticalScrollBar"
+                     AllowAutoHide="{TemplateBinding AllowAutoHide}"
+                     Orientation="Vertical"
+                     LargeChange="{Binding LargeChange.Height, RelativeSource={RelativeSource TemplatedParent}}"
+                     SmallChange="{Binding SmallChange.Height, RelativeSource={RelativeSource TemplatedParent}}"
+                     Maximum="{TemplateBinding VerticalScrollBarMaximum}"
+                     Value="{TemplateBinding VerticalScrollBarValue, Mode=TwoWay}"
+                     ViewportSize="{TemplateBinding VerticalScrollBarViewportSize}"
+                     Visibility="{TemplateBinding VerticalScrollBarVisibility}"
+                     Grid.Column="1"
+                     Focusable="False" />
+          <Panel x:Name="PART_ScrollBarsSeparator"
+                 Grid.Row="1"
+                 Grid.Column="1"
+                 Background="{DynamicResource ScrollViewerScrollBarsSeparatorBackground}" />
+        </Grid>
+      </ControlTemplate>
+    </Setter>
+    <Style Selector="^ /template/ Panel#PART_ScrollBarsSeparator">
+      <Setter Property="Opacity" Value="0" />
+      <Setter Property="Transitions">
+        <Transitions>
+          <DoubleTransition Property="Opacity" Duration="0:0:0.1" />
+        </Transitions>
       </Setter>
-      <Style Selector="^ /template/ Panel#PART_ScrollBarsSeparator">
-        <Setter Property="Opacity" Value="0" />
-        <Setter Property="Transitions">
-          <Transitions>
-            <DoubleTransition Property="Opacity" Duration="0:0:0.1" />
-          </Transitions>
-        </Setter>
-      </Style>
-      <Style Selector="^[IsExpanded=true] /template/ Panel#PART_ScrollBarsSeparator">
-        <Setter Property="Opacity" Value="1" />
-      </Style>
-      <Style Selector="^.menuscroller">
-        <Setter Property="Template">
-          <ControlTemplate>
-            <DockPanel>
-              <RepeatButton DockPanel.Dock="Top" BorderThickness="0" Background="Transparent" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" RenderTransform="{x:Null}" Command="{Binding LineUp, RelativeSource={RelativeSource TemplatedParent}}">
-                <RepeatButton.IsVisible>
-                  <MultiBinding Converter="{x:Static converters:MenuScrollingVisibilityConverter.Instance}" ConverterParameter="0">
-                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="VerticalScrollBarVisibility" />
-                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Offset.Y" />
-                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Extent.Height" />
-                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Viewport.Height" />
-                  </MultiBinding>
-                </RepeatButton.IsVisible>
-                <Viewbox Width="{DynamicResource ScrollBarButtonArrowIconFontSize}" Height="{DynamicResource ScrollBarButtonArrowIconFontSize}">
-                  <Path VerticalAlignment="Center" HorizontalAlignment="Center" Data="M 19.091797 14.970703 L 10 5.888672 L 0.908203 14.970703 L 0.029297 14.091797 L 10 4.111328 L 19.970703 14.091797 Z" Width="20" Height="20" />
-                </Viewbox>
-              </RepeatButton>
-              <RepeatButton DockPanel.Dock="Bottom" BorderThickness="0" Background="Transparent" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" RenderTransform="{x:Null}" Command="{Binding LineDown, RelativeSource={RelativeSource TemplatedParent}}">
-                <RepeatButton.IsVisible>
-                  <MultiBinding Converter="{x:Static converters:MenuScrollingVisibilityConverter.Instance}" ConverterParameter="100">
-                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="VerticalScrollBarVisibility" />
-                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Offset.Y" />
-                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Extent.Height" />
-                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Viewport.Height" />
-                  </MultiBinding>
-                </RepeatButton.IsVisible>
-                <Viewbox Width="{DynamicResource ScrollBarButtonArrowIconFontSize}" Height="{DynamicResource ScrollBarButtonArrowIconFontSize}">
-                  <Path VerticalAlignment="Center" HorizontalAlignment="Center" Data="M 18.935547 4.560547 L 19.814453 5.439453 L 10 15.253906 L 0.185547 5.439453 L 1.064453 4.560547 L 10 13.496094 Z" Width="20" Height="20" />
-                </Viewbox>
-              </RepeatButton>
-              <ScrollContentPresenter Name="PART_ContentPresenter" CanHorizontallyScroll="{TemplateBinding CanHorizontallyScroll}" CanVerticallyScroll="{TemplateBinding CanVerticallyScroll}" Content="{TemplateBinding Content}" Extent="{TemplateBinding Extent, Mode=TwoWay}" Margin="{TemplateBinding Padding}" Offset="{TemplateBinding Offset, Mode=TwoWay}" Viewport="{TemplateBinding Viewport, Mode=TwoWay}" />
-            </DockPanel>
-          </ControlTemplate>
-        </Setter>
-        <Style Selector="^ /template/ RepeatButton">
-          <Style Selector="^ > Viewbox > Path">
-            <Setter Property="Fill" Value="{DynamicResource ScrollBarButtonArrowForeground}" />
-          </Style>
-          <Style Selector="^:pointerover > Viewbox > Path">
-            <Setter Property="Fill" Value="{DynamicResource ScrollBarButtonArrowForegroundPointerOver}" />
-          </Style>
-        </Style>
-      </Style>
-    </ControlTheme>
+    </Style>
+    <Style Selector="^[IsExpanded=true] /template/ Panel#PART_ScrollBarsSeparator">
+      <Setter Property="Opacity" Value="1" />
+    </Style>
+  </ControlTheme>
 </ResourceDictionary>

From 1d15d1b51343137a24171002b6f07ac98517b1af Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sun, 10 Jul 2022 00:04:29 +0200
Subject: [PATCH 103/240] Ported SplitView to ControlTheme.

---
 .../Controls/FluentControls.xaml              |   2 +-
 .../Controls/SplitView.xaml                   | 444 +++++++++---------
 2 files changed, 231 insertions(+), 215 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
index 3e4361465c..fc89d7c21e 100644
--- a/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
@@ -39,6 +39,7 @@
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/ScrollBar.xaml" />
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml" />
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/Separator.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/SplitView.xaml" />
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/TabControl.xaml" />
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/TabItem.xaml" />
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/TabStrip.xaml" />
@@ -72,7 +73,6 @@
     <!--  TabControl needs to come after TabStrip as it redefines the inner TabStrip.ItemsPanel  -->
     <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/TreeViewItem.xaml" />
     <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/SplitButton.xaml" />
-    <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/SplitView.xaml" />
     <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/UserControl.xaml" />
     <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/TimePicker.xaml" />
     <Styles.Resources />
diff --git a/src/Avalonia.Themes.Fluent/Controls/SplitView.xaml b/src/Avalonia.Themes.Fluent/Controls/SplitView.xaml
index 6b9b94852f..9feb6c7fc6 100644
--- a/src/Avalonia.Themes.Fluent/Controls/SplitView.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/SplitView.xaml
@@ -1,4 +1,4 @@
-<Styles xmlns="https://github.com/avaloniaui"
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:sys="using:System">
   <Design.PreviewWith>
@@ -15,219 +15,235 @@
     </Border>
   </Design.PreviewWith>
 
-  <Styles.Resources>
-    <x:Double x:Key="SplitViewOpenPaneThemeLength">320</x:Double>
-    <x:Double x:Key="SplitViewCompactPaneThemeLength">48</x:Double>
-    <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>
-    <!-- Not used here (directly), but preserving for reference
-        <x:String x:Key="SplitViewPaneAnimationOpenPreDuration">00:00:00.19999</x:String>-->
-  </Styles.Resources>
-
-  <Style Selector="SplitView">
+  <x:Double x:Key="SplitViewOpenPaneThemeLength">320</x:Double>
+  <x:Double x:Key="SplitViewCompactPaneThemeLength">48</x:Double>
+  <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>
+
+  <ControlTheme x:Key="{x:Type SplitView}" TargetType="SplitView">
     <Setter Property="OpenPaneLength" Value="{DynamicResource SplitViewOpenPaneThemeLength}" />
     <Setter Property="CompactPaneLength" Value="{DynamicResource SplitViewCompactPaneThemeLength}" />
     <Setter Property="PaneBackground" Value="{DynamicResource SystemControlPageBackgroundChromeLowBrush}" />
-  </Style>
-
-  <!-- Left -->
-  <Style Selector="SplitView:left">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Grid Name="Container" Background="{TemplateBinding Background}">
-          <Grid.ColumnDefinitions>
-            <!-- why is this throwing a binding error? -->
-            <ColumnDefinition Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.PaneColumnGridLength}"/>
-            <ColumnDefinition Width="*"/>
-          </Grid.ColumnDefinitions>
-
-          <Panel Name="PART_PaneRoot" Background="{TemplateBinding PaneBackground}"
-                 ClipToBounds="True"
-                 HorizontalAlignment="Left"
-                 ZIndex="100">
-            <ContentPresenter x:Name="PART_PanePresenter" Content="{TemplateBinding Pane}" ContentTemplate="{TemplateBinding PaneTemplate}" />
-            <Rectangle Name="HCPaneBorder" Fill="{DynamicResource SystemControlForegroundTransparentBrush}" Width="1" HorizontalAlignment="Right"  />
-          </Panel>
-
-          <Panel Name="ContentRoot">
-            <ContentPresenter x:Name="PART_ContentPresenter" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
-            <Rectangle Name="LightDismissLayer"/>
-          </Panel>
-
-        </Grid>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <!-- Overlay -->
-  <Style Selector="SplitView:overlay:left /template/ Panel#PART_PaneRoot">
-    <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
-    <!-- ColumnSpan should be 2 -->
-    <Setter Property="Grid.ColumnSpan" Value="1"/>
-    <Setter Property="Grid.Column" Value="0"/>
-  </Style>
-  <Style Selector="SplitView:overlay:left /template/ Panel#ContentRoot">
-    <Setter Property="Grid.Column" Value="1"/>
-    <Setter Property="Grid.ColumnSpan" Value="2"/>
-  </Style>
-
-  <!-- CompactInline -->
-  <Style Selector="SplitView:compactinline:left /template/ Panel#PART_PaneRoot">
-    <Setter Property="Grid.ColumnSpan" Value="1"/>
-    <Setter Property="Grid.Column" Value="0"/>
-    <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
-  </Style>
-  <Style Selector="SplitView:compactinline:left /template/ Panel#ContentRoot">
-    <Setter Property="Grid.Column" Value="1"/>
-    <Setter Property="Grid.ColumnSpan" Value="1"/>
-  </Style>
-
-  <!-- CompactOverlay -->
-  <Style Selector="SplitView:compactoverlay:left /template/ Panel#PART_PaneRoot">
-    <!-- ColumnSpan should be 2 -->
-    <Setter Property="Grid.ColumnSpan" Value="1"/>
-    <Setter Property="Grid.Column" Value="0"/>
-    <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
-  </Style>
-  <Style Selector="SplitView:compactoverlay:left /template/ Panel#ContentRoot">
-    <Setter Property="Grid.Column" Value="1"/>
-    <Setter Property="Grid.ColumnSpan" Value="1"/>
-  </Style>
-
-  <!-- Inline -->
-  <Style Selector="SplitView:inline:left /template/ Panel#PART_PaneRoot">
-    <Setter Property="Grid.ColumnSpan" Value="1"/>
-    <Setter Property="Grid.Column" Value="0"/>
-    <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
-  </Style>
-  <Style Selector="SplitView:inline:left /template/ Panel#ContentRoot">
-    <Setter Property="Grid.Column" Value="1"/>
-    <Setter Property="Grid.ColumnSpan" Value="1"/>
-  </Style>
-
-  <!-- Right -->
-  <Style Selector="SplitView:right">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Grid Name="Container" Background="{TemplateBinding Background}">
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*"/>
-            <ColumnDefinition Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.PaneColumnGridLength}"/>
-          </Grid.ColumnDefinitions>
-
-          <Panel Name="PART_PaneRoot" Background="{TemplateBinding PaneBackground}"
-                 ClipToBounds="True"
-                 HorizontalAlignment="Right"
-                 ZIndex="100">
-            <ContentPresenter x:Name="PART_PanePresenter" Content="{TemplateBinding Pane}" ContentTemplate="{TemplateBinding PaneTemplate}"/>
-            <Rectangle Name="HCPaneBorder"
-                       Fill="{DynamicResource SystemControlForegroundTransparentBrush}"
-                       Width="1" HorizontalAlignment="Left"  />
-          </Panel>
-
-          <Panel Name="ContentRoot">
-            <ContentPresenter x:Name="PART_ContentPresenter" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
-            <Rectangle Name="LightDismissLayer"/>
-          </Panel>
-
-        </Grid>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <!-- Overlay -->
-  <Style Selector="SplitView:overlay:right /template/ Panel#PART_PaneRoot">
-    <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
-    <Setter Property="Grid.ColumnSpan" Value="2"/>
-    <Setter Property="Grid.Column" Value="1"/>
-  </Style>
-  <Style Selector="SplitView:overlay:right /template/ Panel#ContentRoot">
-    <Setter Property="Grid.Column" Value="0"/>
-    <Setter Property="Grid.ColumnSpan" Value="2"/>
-  </Style>
-
-  <!-- CompactInline -->
-  <Style Selector="SplitView:compactinline:right /template/ Panel#PART_PaneRoot">
-    <Setter Property="Grid.ColumnSpan" Value="1"/>
-    <Setter Property="Grid.Column" Value="1"/>
-    <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
-  </Style>
-  <Style Selector="SplitView:compactinline:right /template/ Panel#ContentRoot">
-    <Setter Property="Grid.Column" Value="0"/>
-    <Setter Property="Grid.ColumnSpan" Value="1"/>
-  </Style>
-
-  <!-- CompactOverlay -->
-  <Style Selector="SplitView:compactoverlay:right /template/ Panel#PART_PaneRoot">
-    <Setter Property="Grid.ColumnSpan" Value="2"/>
-    <Setter Property="Grid.Column" Value="1"/>
-    <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
-  </Style>
-  <Style Selector="SplitView:compactoverlay:right /template/ Panel#ContentRoot">
-    <Setter Property="Grid.Column" Value="0"/>
-    <Setter Property="Grid.ColumnSpan" Value="1"/>
-  </Style>
-
-  <!-- Inline -->
-  <Style Selector="SplitView:inline:right /template/ Panel#PART_PaneRoot">
-    <Setter Property="Grid.ColumnSpan" Value="1"/>
-    <Setter Property="Grid.Column" Value="1"/>
-    <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
-  </Style>
-  <Style Selector="SplitView:inline:right /template/ Panel#ContentRoot">
-    <Setter Property="Grid.Column" Value="0"/>
-    <Setter Property="Grid.ColumnSpan" Value="1"/>
-  </Style>
-
-  <!-- Open/Close Pane animation  -->
-  <Style Selector="SplitView:open /template/ Panel#PART_PaneRoot">
-    <Setter Property="Transitions">
-      <Transitions>
-        <DoubleTransition Property="Width" Duration="{StaticResource SplitViewPaneAnimationOpenDuration}" Easing="{StaticResource SplitViewPaneAnimationEasing}" />
-      </Transitions>
-    </Setter>
-    <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=OpenPaneLength}" />
-  </Style>
-  <Style Selector="SplitView:open /template/ Rectangle#LightDismissLayer">
-    <Setter Property="Transitions">
-      <Transitions>
-        <DoubleTransition Property="Opacity" Duration="{StaticResource SplitViewPaneAnimationOpenDuration}" Easing="{StaticResource SplitViewPaneAnimationEasing}" />
-      </Transitions>
-    </Setter>
-    <Setter Property="Opacity" Value="1.0"/>
-  </Style>
-
-  <Style Selector="SplitView:closed /template/ Panel#PART_PaneRoot">
-    <Setter Property="Transitions">
-      <Transitions>
-        <DoubleTransition Property="Width" Duration="{StaticResource SplitViewPaneAnimationCloseDuration}" Easing="{StaticResource SplitViewPaneAnimationEasing}" />
-      </Transitions>
-    </Setter>
-    <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
-  </Style>
-  <Style Selector="SplitView:closed /template/ Rectangle#LightDismissLayer">
-    <Setter Property="Transitions">
-      <Transitions>
-        <DoubleTransition Property="Opacity" Duration="{StaticResource SplitViewPaneAnimationCloseDuration}" Easing="{StaticResource SplitViewPaneAnimationEasing}" />
-      </Transitions>
-    </Setter>
-    <Setter Property="Opacity" Value="0.0"/>
-  </Style>
-
-  <Style Selector="SplitView /template/ Rectangle#LightDismissLayer">
-    <Setter Property="IsVisible" Value="False"/>
-    <Setter Property="Fill" Value="Transparent" />
-  </Style>
-  <Style Selector="SplitView:lightdismiss /template/ Rectangle#LightDismissLayer">
-    <Setter Property="Fill" Value="{DynamicResource SplitViewLightDismissOverlayBackground}" />
-  </Style>
-
-  <Style Selector="SplitView:overlay:open /template/ Rectangle#LightDismissLayer">
-    <Setter Property="IsVisible" Value="True"/>
-  </Style>
-  <Style Selector="SplitView:compactoverlay:open /template/ Rectangle#LightDismissLayer">
-    <Setter Property="IsVisible" Value="True"/>
-  </Style>
-
-</Styles>
+
+    <Style Selector="^:left">
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Grid Name="Container" Background="{TemplateBinding Background}">
+            <Grid.ColumnDefinitions>
+              <!-- why is this throwing a binding error? -->
+              <ColumnDefinition Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.PaneColumnGridLength}"/>
+              <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+
+            <Panel Name="PART_PaneRoot"
+                   Background="{TemplateBinding PaneBackground}"
+                   ClipToBounds="True"
+                   HorizontalAlignment="Left"
+                   ZIndex="100">
+              <ContentPresenter x:Name="PART_PanePresenter"
+                                Content="{TemplateBinding Pane}"
+                                ContentTemplate="{TemplateBinding PaneTemplate}" />
+              <Rectangle Name="HCPaneBorder"
+                         Fill="{DynamicResource SystemControlForegroundTransparentBrush}"
+                         Width="1"
+                         HorizontalAlignment="Right"  />
+            </Panel>
+
+            <Panel Name="ContentRoot">
+              <ContentPresenter x:Name="PART_ContentPresenter"
+                                Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}" />
+              <Rectangle Name="LightDismissLayer"
+                         Fill="Transparent"
+                         IsVisible="False"/>
+            </Panel>
+
+          </Grid>
+        </ControlTemplate>
+      </Setter>
+
+      <Style Selector="^:overlay">
+        <Style Selector="^ /template/ Panel#PART_PaneRoot">
+          <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
+          <Setter Property="Grid.ColumnSpan" Value="1"/>
+          <Setter Property="Grid.Column" Value="0"/>
+        </Style>
+        <Style Selector="^ /template/ Panel#ContentRoot">
+          <Setter Property="Grid.Column" Value="1"/>
+          <Setter Property="Grid.ColumnSpan" Value="2"/>
+        </Style>
+      </Style>
+
+      <Style Selector="^:compactinline">
+        <Style Selector="^ /template/ Panel#PART_PaneRoot">
+          <Setter Property="Grid.ColumnSpan" Value="1"/>
+          <Setter Property="Grid.Column" Value="0"/>
+          <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
+        </Style>
+        <Style Selector="^ /template/ Panel#ContentRoot">
+          <Setter Property="Grid.Column" Value="1"/>
+          <Setter Property="Grid.ColumnSpan" Value="1"/>
+        </Style>
+      </Style>
+
+      <Style Selector="^:compactoverlay">
+        <Style Selector="^ /template/ Panel#PART_PaneRoot">
+          <!-- ColumnSpan should be 2 -->
+          <Setter Property="Grid.ColumnSpan" Value="1"/>
+          <Setter Property="Grid.Column" Value="0"/>
+          <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
+        </Style>
+        <Style Selector="^ /template/ Panel#ContentRoot">
+          <Setter Property="Grid.Column" Value="1"/>
+          <Setter Property="Grid.ColumnSpan" Value="1"/>
+        </Style>
+      </Style>
+
+      <Style Selector="^:inline">
+        <Style Selector="^ /template/ Panel#PART_PaneRoot">
+          <Setter Property="Grid.ColumnSpan" Value="1"/>
+          <Setter Property="Grid.Column" Value="0"/>
+          <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
+        </Style>
+        <Style Selector="^ /template/ Panel#ContentRoot">
+          <Setter Property="Grid.Column" Value="1"/>
+          <Setter Property="Grid.ColumnSpan" Value="1"/>
+        </Style>
+      </Style>
+    </Style>
+
+    <Style Selector="^:right">
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Grid Name="Container" Background="{TemplateBinding Background}">
+            <Grid.ColumnDefinitions>
+              <ColumnDefinition Width="*"/>
+              <ColumnDefinition Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.PaneColumnGridLength}"/>
+            </Grid.ColumnDefinitions>
+
+            <Panel Name="PART_PaneRoot" Background="{TemplateBinding PaneBackground}"
+                   ClipToBounds="True"
+                   HorizontalAlignment="Right"
+                   ZIndex="100">
+              <ContentPresenter x:Name="PART_PanePresenter"
+                                Content="{TemplateBinding Pane}"
+                                ContentTemplate="{TemplateBinding PaneTemplate}"/>
+              <Rectangle Name="HCPaneBorder"
+                         Fill="{DynamicResource SystemControlForegroundTransparentBrush}"
+                         Width="1" HorizontalAlignment="Left"  />
+            </Panel>
+
+            <Panel Name="ContentRoot">
+              <ContentPresenter x:Name="PART_ContentPresenter"
+                                Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}" />
+              <Rectangle Name="LightDismissLayer"/>
+            </Panel>
+
+          </Grid>
+        </ControlTemplate>
+      </Setter>
+
+      <Style Selector="^:overlay">
+        <Style Selector="^ /template/ Panel#PART_PaneRoot">
+          <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
+          <Setter Property="Grid.ColumnSpan" Value="2"/>
+          <Setter Property="Grid.Column" Value="1"/>
+        </Style>
+        <Style Selector="^ /template/ Panel#ContentRoot">
+          <Setter Property="Grid.Column" Value="0"/>
+          <Setter Property="Grid.ColumnSpan" Value="2"/>
+        </Style>
+      </Style>
+
+      <Style Selector="^:compactinline">
+        <Style Selector="^ /template/ Panel#PART_PaneRoot">
+          <Setter Property="Grid.ColumnSpan" Value="1"/>
+          <Setter Property="Grid.Column" Value="1"/>
+          <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
+        </Style>
+        <Style Selector="^ /template/ Panel#ContentRoot">
+          <Setter Property="Grid.Column" Value="0"/>
+          <Setter Property="Grid.ColumnSpan" Value="1"/>
+        </Style>
+      </Style>
+
+      <Style Selector="^:compactoverlay">
+        <Style Selector="^ /template/ Panel#PART_PaneRoot">
+          <Setter Property="Grid.ColumnSpan" Value="2"/>
+          <Setter Property="Grid.Column" Value="1"/>
+          <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
+        </Style>
+        <Style Selector="^ /template/ Panel#ContentRoot">
+          <Setter Property="Grid.Column" Value="0"/>
+          <Setter Property="Grid.ColumnSpan" Value="1"/>
+        </Style>
+      </Style>
+
+      <Style Selector="^:inline">
+        <Style Selector="^ /template/ Panel#PART_PaneRoot">
+          <Setter Property="Grid.ColumnSpan" Value="1"/>
+          <Setter Property="Grid.Column" Value="1"/>
+          <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
+        </Style>
+        <Style Selector="^ /template/ Panel#ContentRoot">
+          <Setter Property="Grid.Column" Value="0"/>
+          <Setter Property="Grid.ColumnSpan" Value="1"/>
+        </Style>
+      </Style>
+    </Style>
+
+    <Style Selector="^:open">
+      <Style Selector="^ /template/ Panel#PART_PaneRoot">
+        <Setter Property="Transitions">
+          <Transitions>
+            <DoubleTransition Property="Width"
+                              Duration="{StaticResource SplitViewPaneAnimationOpenDuration}"
+                              Easing="{StaticResource SplitViewPaneAnimationEasing}" />
+          </Transitions>
+        </Setter>
+        <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=OpenPaneLength}" />
+      </Style>
+      <Style Selector="^ /template/ Rectangle#LightDismissLayer">
+        <Setter Property="Transitions">
+          <Transitions>
+            <DoubleTransition Property="Opacity"
+                              Duration="{StaticResource SplitViewPaneAnimationOpenDuration}"
+                              Easing="{StaticResource SplitViewPaneAnimationEasing}" />
+          </Transitions>
+        </Setter>
+        <Setter Property="Opacity" Value="1.0"/>
+      </Style>
+    </Style>
+
+    <Style Selector="^:closed">
+      <Style Selector="^ /template/ Panel#PART_PaneRoot">
+        <Setter Property="Transitions">
+          <Transitions>
+            <DoubleTransition Property="Width" Duration="{StaticResource SplitViewPaneAnimationCloseDuration}" Easing="{StaticResource SplitViewPaneAnimationEasing}" />
+          </Transitions>
+        </Setter>
+        <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
+      </Style>
+      <Style Selector="^ /template/ Rectangle#LightDismissLayer">
+        <Setter Property="Transitions">
+          <Transitions>
+            <DoubleTransition Property="Opacity" Duration="{StaticResource SplitViewPaneAnimationCloseDuration}" Easing="{StaticResource SplitViewPaneAnimationEasing}" />
+          </Transitions>
+        </Setter>
+        <Setter Property="Opacity" Value="0.0"/>
+      </Style>
+    </Style>
+
+    <Style Selector="^:lightdismiss /template/ Rectangle#LightDismissLayer">
+      <Setter Property="Fill" Value="{DynamicResource SplitViewLightDismissOverlayBackground}" />
+    </Style>
+    <Style Selector="^:overlay:open /template/ Rectangle#LightDismissLayer">
+      <Setter Property="IsVisible" Value="True"/>
+    </Style>
+    <Style Selector="^:compactoverlay:open /template/ Rectangle#LightDismissLayer">
+      <Setter Property="IsVisible" Value="True"/>
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>

From b1038f115b8abdc48ae884ec531a3ae385731010 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sun, 10 Jul 2022 01:31:23 +0200
Subject: [PATCH 104/240] Ported TreeViewItem to ControlTheme.

---
 .../Controls/FluentControls.xaml              |   4 +-
 .../Controls/TreeViewItem.xaml                | 178 +++++++++---------
 2 files changed, 87 insertions(+), 95 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
index fc89d7c21e..58c33bf26f 100644
--- a/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
@@ -51,6 +51,7 @@
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/TitleBar.xaml" />
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/TransitioningContentControl.xaml" />
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/TreeView.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/TreeViewItem.xaml" />
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/WindowNotificationManager.xaml" />
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/Window.xaml" />
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/ComboBox.xaml" />
@@ -68,10 +69,7 @@
         </ResourceDictionary>
     </Styles.Resources>
 
-    <!--  Define ToolTip first so its styles can be overriden by other controls (e.g. TextBox)  -->
     <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/FocusAdorner.xaml" />
-    <!--  TabControl needs to come after TabStrip as it redefines the inner TabStrip.ItemsPanel  -->
-    <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/TreeViewItem.xaml" />
     <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/SplitButton.xaml" />
     <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/UserControl.xaml" />
     <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/TimePicker.xaml" />
diff --git a/src/Avalonia.Themes.Fluent/Controls/TreeViewItem.xaml b/src/Avalonia.Themes.Fluent/Controls/TreeViewItem.xaml
index 6510832eb3..83abe7848c 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TreeViewItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TreeViewItem.xaml
@@ -1,4 +1,4 @@
-<Styles xmlns="https://github.com/avaloniaui"
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:converters="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls">
 
@@ -6,32 +6,29 @@
     <Border Padding="20"
             MinWidth="300">
       <TreeView>
-        <TreeViewItem Header="Level 1">
-          <TreeViewItem Header="Level 2.1">
+        <TreeViewItem Header="Level 1" IsExpanded="True">
+          <TreeViewItem Header="Level 2.1" IsSelected="True" IsExpanded="True">
             <TreeViewItem Header="Level 3.1" />
-            <TreeViewItem Header="Level 3.2">
+            <TreeViewItem Header="Level 3.2" IsSelected="True">
               <TreeViewItem Header="Level 4" />
             </TreeViewItem>
           </TreeViewItem>
-          <TreeViewItem Header="Level 2.2"
-                        IsEnabled="False" />
+          <TreeViewItem Header="Level 2.2" IsEnabled="False" />
         </TreeViewItem>
       </TreeView>
     </Border>
   </Design.PreviewWith>
 
-  <Styles.Resources>
-    <x:Double x:Key="TreeViewItemIndent">16</x:Double>
-    <x:Double x:Key="TreeViewItemExpandCollapseChevronSize">12</x:Double>
-    <Thickness x:Key="TreeViewItemExpandCollapseChevronMargin">12, 0, 12, 0</Thickness>
-    <StreamGeometry x:Key="TreeViewItemCollapsedChevronPathData">M 1,0 10,10 l -9,10 -1,-1 L 8,10 -0,1 Z</StreamGeometry>
-    <StreamGeometry x:Key="TreeViewItemExpandedChevronPathData">M0,1 L10,10 20,1 19,0 10,8 1,0 Z</StreamGeometry>
-    <converters:MarginMultiplierConverter Indent="{StaticResource TreeViewItemIndent}"
-                                          Left="True"
-                                          x:Key="TreeViewItemLeftMarginConverter" />
-  </Styles.Resources>
+  <x:Double x:Key="TreeViewItemIndent">16</x:Double>
+  <x:Double x:Key="TreeViewItemExpandCollapseChevronSize">12</x:Double>
+  <Thickness x:Key="TreeViewItemExpandCollapseChevronMargin">12, 0, 12, 0</Thickness>
+  <StreamGeometry x:Key="TreeViewItemCollapsedChevronPathData">M 1,0 10,10 l -9,10 -1,-1 L 8,10 -0,1 Z</StreamGeometry>
+  <StreamGeometry x:Key="TreeViewItemExpandedChevronPathData">M0,1 L10,10 20,1 19,0 10,8 1,0 Z</StreamGeometry>
+  <converters:MarginMultiplierConverter Indent="{StaticResource TreeViewItemIndent}"
+                                        Left="True"
+                                        x:Key="TreeViewItemLeftMarginConverter" />
 
-  <Style Selector="ToggleButton.ExpandCollapseChevron">
+  <ControlTheme x:Key="FluentTreeViewExpandCollapseChevron" TargetType="ToggleButton">
     <Setter Property="Margin" Value="0" />
     <Setter Property="Width" Value="{StaticResource TreeViewItemExpandCollapseChevronSize}" />
     <Setter Property="Height" Value="{StaticResource TreeViewItemExpandCollapseChevronSize}" />
@@ -43,6 +40,7 @@
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center">
           <Path x:Name="ChevronPath"
+                Data="{StaticResource TreeViewItemCollapsedChevronPathData}"
                 Fill="{DynamicResource TreeViewItemForeground}"
                 Stretch="Uniform"
                 HorizontalAlignment="Center"
@@ -50,9 +48,13 @@
         </Border>
       </ControlTemplate>
     </Setter>
-  </Style>
 
-  <Style Selector="TreeViewItem">
+    <Style Selector="^:checked /template/ Path#ChevronPath">
+      <Setter Property="Data" Value="{StaticResource TreeViewItemExpandedChevronPathData}" />
+    </Style>
+  </ControlTheme>
+
+  <ControlTheme x:Key="{x:Type TreeViewItem}" TargetType="TreeViewItem">
     <Setter Property="Padding" Value="0" />
     <Setter Property="Background" Value="{DynamicResource TreeViewItemBackground}" />
     <Setter Property="BorderBrush" Value="{DynamicResource TreeViewItemBorderBrush}" />
@@ -78,7 +80,7 @@
               <Panel Name="PART_ExpandCollapseChevronContainer"
                      Margin="{StaticResource TreeViewItemExpandCollapseChevronMargin}">
                 <ToggleButton Name="PART_ExpandCollapseChevron"
-                              Classes="ExpandCollapseChevron"
+                              Theme="{StaticResource FluentTreeViewExpandCollapseChevron}"
                               Focusable="False"
                               IsChecked="{TemplateBinding IsExpanded, Mode=TwoWay}" />
               </Panel>
@@ -98,83 +100,75 @@
         </StackPanel>
       </ControlTemplate>
     </Setter>
-  </Style>
-
-  <!--  PointerOver state  -->
-  <Style Selector="TreeViewItem /template/ Border#PART_LayoutRoot:pointerover">
-    <Setter Property="Background" Value="{DynamicResource TreeViewItemBackgroundPointerOver}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource TreeViewItemBorderBrushPointerOver}" />
-  </Style>
-  <Style Selector="TreeViewItem /template/ Border#PART_LayoutRoot:pointerover > ContentPresenter#PART_HeaderPresenter">
-    <Setter Property="Foreground" Value="{DynamicResource TreeViewItemForegroundPointerOver}" />
-  </Style>
 
-  <!--  Pressed state  -->
-  <Style Selector="TreeViewItem:pressed /template/ Border#PART_LayoutRoot:pointerover">
-    <Setter Property="Background" Value="{DynamicResource TreeViewItemBackgroundPressed}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource TreeViewItemBorderBrushPressed}" />
-  </Style>
-  <Style Selector="TreeViewItem:pressed /template/ Border#PART_LayoutRoot:pointerover > ContentPresenter#PART_HeaderPresenter">
-    <Setter Property="Foreground" Value="{DynamicResource TreeViewItemForegroundPressed}" />
-  </Style>
+    <!--  PointerOver state  -->
+    <Style Selector="^ /template/ Border#PART_LayoutRoot:pointerover">
+      <Setter Property="Background" Value="{DynamicResource TreeViewItemBackgroundPointerOver}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource TreeViewItemBorderBrushPointerOver}" />
+    </Style>
+    <Style Selector="^ /template/ Border#PART_LayoutRoot:pointerover > ContentPresenter#PART_HeaderPresenter">
+      <Setter Property="Foreground" Value="{DynamicResource TreeViewItemForegroundPointerOver}" />
+    </Style>
 
-  <!--  Disabled state  -->
-  <Style Selector="TreeViewItem:disabled /template/ Border#PART_LayoutRoot">
-    <Setter Property="Background" Value="{DynamicResource TreeViewItemBackgroundDisabled}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource TreeViewItemBorderBrushDisabled}" />
-  </Style>
-  <Style Selector="TreeViewItem:disabled /template/ Border#PART_LayoutRoot > ContentPresenter#PART_HeaderPresenter">
-    <Setter Property="Foreground" Value="{DynamicResource TreeViewItemForegroundDisabled}" />
-  </Style>
+    <!--  Pressed state  -->
+    <Style Selector="^:pressed /template/ Border#PART_LayoutRoot:pointerover">
+      <Setter Property="Background" Value="{DynamicResource TreeViewItemBackgroundPressed}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource TreeViewItemBorderBrushPressed}" />
+    </Style>
+    <Style Selector="^:pressed /template/ Border#PART_LayoutRoot:pointerover > ContentPresenter#PART_HeaderPresenter">
+      <Setter Property="Foreground" Value="{DynamicResource TreeViewItemForegroundPressed}" />
+    </Style>
 
-  <!--  Selected state  -->
-  <Style Selector="TreeViewItem:selected /template/ Border#PART_LayoutRoot">
-    <Setter Property="Background" Value="{DynamicResource TreeViewItemBackgroundSelected}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource TreeViewItemBorderBrushSelected}" />
-  </Style>
-  <Style Selector="TreeViewItem:selected /template/ Border#PART_LayoutRoot > ContentPresenter#PART_HeaderPresenter">
-    <Setter Property="Foreground" Value="{DynamicResource TreeViewItemForegroundSelected}" />
-  </Style>
+    <!--  Disabled state  -->
+    <Style Selector="^:disabled /template/ Border#PART_LayoutRoot">
+      <Setter Property="Background" Value="{DynamicResource TreeViewItemBackgroundDisabled}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource TreeViewItemBorderBrushDisabled}" />
+    </Style>
+    <Style Selector="^:disabled /template/ ContentPresenter#PART_HeaderPresenter">
+      <Setter Property="Foreground" Value="{DynamicResource TreeViewItemForegroundDisabled}" />
+    </Style>
 
-  <!--  Selected PointerOver state  -->
-  <Style Selector="TreeViewItem:selected /template/ Border#PART_LayoutRoot:pointerover">
-    <Setter Property="Background" Value="{DynamicResource TreeViewItemBackgroundSelectedPointerOver}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource TreeViewItemBorderBrushSelectedPointerOver}" />
-  </Style>
-  <Style Selector="TreeViewItem:selected /template/ Border#PART_LayoutRoot:pointerover > ContentPresenter#PART_HeaderPresenter">
-    <Setter Property="Foreground" Value="{DynamicResource TreeViewItemForegroundSelectedPointerOver}" />
-  </Style>
+    <!--  Selected state  -->
+    <Style Selector="^:selected /template/ Border#PART_LayoutRoot">
+      <Setter Property="Background" Value="{DynamicResource TreeViewItemBackgroundSelected}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource TreeViewItemBorderBrushSelected}" />
+    </Style>
+    <Style Selector="^:selected /template/ Border#PART_LayoutRoot > ContentPresenter#PART_HeaderPresenter">
+      <Setter Property="Foreground" Value="{DynamicResource TreeViewItemForegroundSelected}" />
+    </Style>
 
-  <!--  Selected Pressed state  -->
-  <Style Selector="TreeViewItem:pressed:selected /template/ Border#PART_LayoutRoot:pointerover">
-    <Setter Property="Background" Value="{DynamicResource TreeViewItemBackgroundSelectedPressed}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource TreeViewItemBorderBrushSelectedPressed}" />
-  </Style>
-  <Style Selector="TreeViewItem:pressed:selected /template/ Border#PART_LayoutRoot:pointerover > ContentPresenter#PART_HeaderPresenter">
-    <Setter Property="Foreground" Value="{DynamicResource TreeViewItemForegroundSelectedPressed}" />
-  </Style>
+    <!--  Selected PointerOver state  -->
+    <Style Selector="^:selected /template/ Border#PART_LayoutRoot:pointerover">
+      <Setter Property="Background" Value="{DynamicResource TreeViewItemBackgroundSelectedPointerOver}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource TreeViewItemBorderBrushSelectedPointerOver}" />
+    </Style>
+    <Style Selector="^:selected /template/ Border#PART_LayoutRoot:pointerover > ContentPresenter#PART_HeaderPresenter">
+      <Setter Property="Foreground" Value="{DynamicResource TreeViewItemForegroundSelectedPointerOver}" />
+    </Style>
 
-  <!--  Disabled Selected state  -->
-  <Style Selector="TreeViewItem:disabled:selected /template/ Border#PART_LayoutRoot">
-    <Setter Property="Background" Value="{DynamicResource TreeViewItemBackgroundSelectedDisabled}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource TreeViewItemBorderBrushSelectedDisabled}" />
-  </Style>
-  <Style Selector="TreeViewItem:disabled:selected /template/ Border#PART_LayoutRoot > ContentPresenter#PART_HeaderPresenter">
-    <Setter Property="Foreground" Value="{DynamicResource TreeViewItemForegroundSelectedDisabled}" />
-  </Style>
+    <!--  Selected Pressed state  -->
+    <Style Selector="^:pressed:selected /template/ Border#PART_LayoutRoot:pointerover">
+      <Setter Property="Background" Value="{DynamicResource TreeViewItemBackgroundSelectedPressed}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource TreeViewItemBorderBrushSelectedPressed}" />
+    </Style>
+    <Style Selector="^:pressed:selected /template/ Border#PART_LayoutRoot:pointerover > ContentPresenter#PART_HeaderPresenter">
+      <Setter Property="Foreground" Value="{DynamicResource TreeViewItemForegroundSelectedPressed}" />
+    </Style>
 
-  <!--  ExpandCollapseChevron Group states  -->
-  <Style Selector="ToggleButton.ExpandCollapseChevron /template/ Path#ChevronPath">
-    <Setter Property="Data" Value="{StaticResource TreeViewItemCollapsedChevronPathData}" />
-  </Style>
-  <Style Selector="ToggleButton.ExpandCollapseChevron:checked /template/ Path#ChevronPath">
-    <Setter Property="Data" Value="{StaticResource TreeViewItemExpandedChevronPathData}" />
-  </Style>
-  <Style Selector="TreeViewItem:empty /template/ ToggleButton#PART_ExpandCollapseChevron">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-  <Style Selector="TreeViewItem:empty /template/ Panel#PART_ExpandCollapseChevronContainer">
-    <Setter Property="Width" Value="{StaticResource TreeViewItemExpandCollapseChevronSize}" />
-  </Style>
+    <!--  Disabled Selected state  -->
+    <Style Selector="^:disabled:selected /template/ Border#PART_LayoutRoot">
+      <Setter Property="Background" Value="{DynamicResource TreeViewItemBackgroundSelectedDisabled}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource TreeViewItemBorderBrushSelectedDisabled}" />
+    </Style>
+    <Style Selector="^:disabled:selected /template/ Border#PART_LayoutRoot > ContentPresenter#PART_HeaderPresenter">
+      <Setter Property="Foreground" Value="{DynamicResource TreeViewItemForegroundSelectedDisabled}" />
+    </Style>
 
-</Styles>
+    <Style Selector="^:empty /template/ ToggleButton#PART_ExpandCollapseChevron">
+      <Setter Property="IsVisible" Value="False" />
+    </Style>
+    <Style Selector="^:empty /template/ Panel#PART_ExpandCollapseChevronContainer">
+      <Setter Property="Width" Value="{StaticResource TreeViewItemExpandCollapseChevronSize}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>

From 7fcd73836940e0bf3654fe4e0a86493eb75e8386 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sun, 10 Jul 2022 02:12:56 +0200
Subject: [PATCH 105/240] Tweaked TitleBar ControlTheme.

---
 src/Avalonia.Controls/Chrome/TitleBar.cs      | 15 ++++++------
 .../Controls/TitleBar.xaml                    | 24 +++++++++++--------
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/src/Avalonia.Controls/Chrome/TitleBar.cs b/src/Avalonia.Controls/Chrome/TitleBar.cs
index b152a31587..428bf8f9b0 100644
--- a/src/Avalonia.Controls/Chrome/TitleBar.cs
+++ b/src/Avalonia.Controls/Chrome/TitleBar.cs
@@ -35,7 +35,8 @@ namespace Avalonia.Controls.Chrome
                     }
                 }
 
-                IsVisible = window.PlatformImpl?.NeedsManagedDecorations ?? false;
+                if (!Design.IsDesignMode)
+                    IsVisible = window.PlatformImpl?.NeedsManagedDecorations ?? false;
             }
         }
 
@@ -44,13 +45,13 @@ namespace Avalonia.Controls.Chrome
             base.OnApplyTemplate(e);
 
             _captionButtons?.Detach();
-            
+
             _captionButtons = e.NameScope.Get<CaptionButtons>("PART_CaptionButtons");
 
-            if (VisualRoot is Window window)
+            if (VisualRoot is Window window && !Design.IsDesignMode)
             {
-                _captionButtons?.Attach(window);   
-                
+                _captionButtons?.Attach(window);
+
                 UpdateSize(window);
             }
         }
@@ -59,7 +60,7 @@ namespace Avalonia.Controls.Chrome
         {
             base.OnAttachedToVisualTree(e);
 
-            if (VisualRoot is Window window)
+            if (VisualRoot is Window window && !Design.IsDesignMode)
             {
                 _disposables = new CompositeDisposable
                 {
@@ -90,7 +91,7 @@ namespace Avalonia.Controls.Chrome
             base.OnDetachedFromVisualTree(e);
 
             _disposables?.Dispose();
-            
+
             _captionButtons?.Detach();
             _captionButtons = null;
         }
diff --git a/src/Avalonia.Themes.Fluent/Controls/TitleBar.xaml b/src/Avalonia.Themes.Fluent/Controls/TitleBar.xaml
index 2b97df020f..5730b19e78 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TitleBar.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TitleBar.xaml
@@ -1,8 +1,8 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Design.PreviewWith>
-      <Border>
-        <TitleBar Background="SkyBlue" Height="30" Width="300" Foreground="Black" />
+      <Border Height="30" Width="300">
+        <TitleBar Background="SkyBlue" Foreground="Black" />
       </Border>
     </Design.PreviewWith>
 
@@ -13,11 +13,19 @@
       <Setter Property="Background" Value="Transparent" />
       <Setter Property="Template">
         <ControlTemplate>
-          <Panel HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="Stretch">
-            <Panel x:Name="PART_MouseTracker" Height="1" VerticalAlignment="Top" />
+          <Panel HorizontalAlignment="{TemplateBinding HorizontalAlignment}" 
+                 VerticalAlignment="Stretch">
+            <Panel x:Name="PART_MouseTracker" 
+                   Height="1" 
+                   VerticalAlignment="Top" />
             <Panel x:Name="PART_Container">
-              <Border x:Name="PART_Background" Background="{TemplateBinding Background}" />
-              <CaptionButtons x:Name="PART_CaptionButtons" VerticalAlignment="Top" HorizontalAlignment="Right" Foreground="{TemplateBinding Foreground}" />
+              <Border x:Name="PART_Background"
+                      Background="{TemplateBinding Background}"
+                      IsHitTestVisible="False"/>
+              <CaptionButtons x:Name="PART_CaptionButtons"
+                              VerticalAlignment="Top" 
+                              HorizontalAlignment="Right"
+                              Foreground="{TemplateBinding Foreground}" />
             </Panel>
           </Panel>
         </ControlTemplate>
@@ -27,10 +35,6 @@
         <Setter Property="Background" Value="{DynamicResource SystemAccentColor}" />
       </Style>
 
-      <Style Selector="^ /template/ Border#PART_Background">
-        <Setter Property="IsHitTestVisible" Value="False" />
-      </Style>
-
       <Style Selector="^:fullscreen /template/ Border#PART_Background">
         <Setter Property="IsHitTestVisible" Value="True" />
       </Style>

From 5864452d75a596bdd7bd0d0cdd6de8f3805d8159 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sun, 10 Jul 2022 15:19:40 +0200
Subject: [PATCH 106/240] Undo changed to TitleBar.

It was causing the title bar to be shown in all designer previews.
---
 src/Avalonia.Controls/Chrome/TitleBar.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Avalonia.Controls/Chrome/TitleBar.cs b/src/Avalonia.Controls/Chrome/TitleBar.cs
index 428bf8f9b0..1bf13111a9 100644
--- a/src/Avalonia.Controls/Chrome/TitleBar.cs
+++ b/src/Avalonia.Controls/Chrome/TitleBar.cs
@@ -35,8 +35,7 @@ namespace Avalonia.Controls.Chrome
                     }
                 }
 
-                if (!Design.IsDesignMode)
-                    IsVisible = window.PlatformImpl?.NeedsManagedDecorations ?? false;
+                IsVisible = window.PlatformImpl?.NeedsManagedDecorations ?? false;
             }
         }
 
@@ -48,7 +47,7 @@ namespace Avalonia.Controls.Chrome
 
             _captionButtons = e.NameScope.Get<CaptionButtons>("PART_CaptionButtons");
 
-            if (VisualRoot is Window window && !Design.IsDesignMode)
+            if (VisualRoot is Window window)
             {
                 _captionButtons?.Attach(window);
 
@@ -60,7 +59,7 @@ namespace Avalonia.Controls.Chrome
         {
             base.OnAttachedToVisualTree(e);
 
-            if (VisualRoot is Window window && !Design.IsDesignMode)
+            if (VisualRoot is Window window)
             {
                 _disposables = new CompositeDisposable
                 {

From 07cce63b8bd4b009bd384e727caaab16d339bc4a Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sun, 10 Jul 2022 16:57:55 +0200
Subject: [PATCH 107/240] Ported TimePicker to ControlTheme.

And refactored shared date/time picker components into a separate file.
---
 .../Controls/DatePicker.xaml                  | 207 +++-----
 .../Controls/DateTimePickerShared.xaml        | 116 +++++
 .../Controls/FluentControls.xaml              |   3 +-
 .../Controls/TimePicker.xaml                  | 465 ++++++++++++------
 4 files changed, 501 insertions(+), 290 deletions(-)
 create mode 100644 src/Avalonia.Themes.Fluent/Controls/DateTimePickerShared.xaml

diff --git a/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml b/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml
index 0537feb60b..0441415128 100644
--- a/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml
@@ -10,8 +10,21 @@
         xmlns:sys="clr-namespace:System;assembly=netstandard"
         x:CompileBindings="True">
   <Design.PreviewWith>
-    <Border Padding="20">
-      <DatePicker CornerRadius="10" />
+    <Border Padding="20" Height="500">
+      <StackPanel Spacing="20" VerticalAlignment="Center">
+        <DatePicker />
+        <DatePicker CornerRadius="10" />
+        <DatePicker IsEnabled="False" />
+        <DatePicker>
+          <DataValidationErrors.Error>
+            <sys:Exception>
+              <x:Arguments>
+                <x:String>Error</x:String>
+              </x:Arguments>
+            </sys:Exception>
+          </DataValidationErrors.Error>
+        </DatePicker>
+      </StackPanel>
     </Border>
   </Design.PreviewWith>
 
@@ -27,105 +40,45 @@
   <Thickness x:Key="DatePickerHostMonthPadding">9,3,0,6</Thickness>
   <x:Double x:Key="DatePickerSpacerThemeWidth">1</x:Double>
 
-  <!-- Theme for the items displayed in the selectors -->
-  <ControlTheme x:Key="FluentDateTimePickerItem" TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
-    <Setter Property="Padding" Value="{DynamicResource DatePickerFlyoutPresenterItemPadding}"/>
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="HorizontalContentAlignment" Value="Center" />
-
-    <Style Selector="^:selected">
-      <Setter Property="IsHitTestVisible" Value="False"/>
-      <Style Selector="^/template/ Rectangle#PressedBackground">
-        <Setter Property="Fill" Value="Transparent"/>
-      </Style>
-      <Style Selector="^/template/ ContentPresenter">
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
-      </Style>
-    </Style>
-    <Style Selector="^.MonthItem">
-      <Setter Property="Padding" Value="{DynamicResource DatePickerFlyoutPresenterMonthPadding}"/>
-      <Setter Property="VerticalContentAlignment" Value="Center" />
-      <Setter Property="HorizontalContentAlignment" Value="Left" />
-    </Style>
-  </ControlTheme>
-
-  <!-- This is used for both the accept/dismiss & repeatbuttons in the presenter-->
-  <ControlTheme x:Key="FluentDateTimePickerButton" TargetType="Button">
-    <Setter Property="Background" Value="{DynamicResource DateTimePickerFlyoutButtonBackground}" />
-    <Setter Property="HorizontalContentAlignment" Value="Center"/>
-    <Setter Property="VerticalContentAlignment" Value="Center"/>
-    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+  <ControlTheme x:Key="FluentDatePickerFlyoutButton" TargetType="Button">
     <Setter Property="RenderTransform" Value="none" />
     <Setter Property="Template">
       <ControlTemplate>
-        <!-- 
-                The background is doubled here for the loopingselector up/down repeat buttons 
-                that appear opaque. Not sure how MS does it though I suspect this is it
-                but source isn't MIT yet, so this is my solution -->
-        <Border Background="{TemplateBinding Background}">
-          <ContentPresenter x:Name="ContentPresenter"
-                  Background="{TemplateBinding Background}"
-                  BorderBrush="{DynamicResource DateTimePickerFlyoutButtonBorderBrush}"
-                  BorderThickness="{DynamicResource DateTimeFlyoutButtonBorderThickness}"
-                  Content="{TemplateBinding Content}"
-                  Foreground="{DynamicResource SystemControlHighlightAltBaseHighBrush}"
-                  ContentTemplate="{TemplateBinding ContentTemplate}"
-                  Padding="{TemplateBinding Padding}"
-                  HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                  VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                  CornerRadius="{TemplateBinding CornerRadius}"/>
-        </Border>
+        <ContentPresenter Name="PART_ContentPresenter"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          Background="{TemplateBinding Background}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          Content="{TemplateBinding Content}"
+                          Foreground="{TemplateBinding Foreground}"
+                          HorizontalContentAlignment="Stretch"
+                          VerticalContentAlignment="Stretch"
+                          CornerRadius="{TemplateBinding CornerRadius}"/>
       </ControlTemplate>
     </Setter>
-
-    <Style Selector="^:pointerover /template/ ContentPresenter">
-      <Setter Property="Background" Value="{DynamicResource DateTimePickerFlyoutButtonBackgroundPointerOver}"/>
-      <Setter Property="BorderBrush" Value="{DynamicResource DateTimePickerFlyoutButtonBorderBrushPointerOver}"/>
-      <Setter Property="Foreground" Value="{DynamicResource DateTimePickerFlyoutButtonForegroundPointerOver}"/>
+    
+    <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="BorderBrush" Value="{DynamicResource DatePickerButtonBorderBrushPointerOver}"/>
+      <Setter Property="Background" Value="{DynamicResource DatePickerButtonBackgroundPointerOver}"/>
+      <Setter Property="Foreground" Value="{DynamicResource DatePickerButtonForegroundPointerOver}"/>
     </Style>
-
+    
     <Style Selector="^:pressed">
       <Setter Property="RenderTransform" Value="scale(0.98)" />
     </Style>
-
-    <Style Selector="^:pressed /template/ ContentPresenter">
-      <Setter Property="Background" Value="{DynamicResource DateTimePickerFlyoutButtonBackgroundPressed}"/>
-      <Setter Property="BorderBrush" Value="{DynamicResource DateTimePickerFlyoutButtonBorderBrushPressed}"/>
-      <Setter Property="Foreground" Value="{DynamicResource DateTimePickerFlyoutButtonForegroundPressed}"/>
+    
+    <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="BorderBrush" Value="{DynamicResource DatePickerButtonBorderBrushPressed}"/>
+      <Setter Property="Background" Value="{DynamicResource DatePickerButtonBackgroundPressed}"/>
+      <Setter Property="Foreground" Value="{DynamicResource DatePickerButtonForegroundPressed}"/>
     </Style>
-  </ControlTheme>
 
-  <ControlTheme x:Key="FluentDateTimePickerUpButton" TargetType="RepeatButton" BasedOn="{StaticResource FluentDateTimePickerButton}">
-    <Setter Property="VerticalAlignment" Value="Top"/>
-    <Setter Property="Height" Value="22" />
-    <Setter Property="HorizontalAlignment" Value="Stretch" />
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}" />
-    <Setter Property="Content">
-      <Template>
-        <Viewbox Height="10" Width="10" HorizontalAlignment="Center" VerticalAlignment="Center">
-          <Path Stroke="{Binding $parent[RepeatButton].Foreground}" StrokeThickness="1" Data="M 0,9 L 9,0 L 18,9"/>
-        </Viewbox>
-      </Template>
-    </Setter>
-  </ControlTheme>
-
-  <ControlTheme x:Key="FluentDateTimePickerDownButton" TargetType="RepeatButton" BasedOn="{StaticResource FluentDateTimePickerButton}">
-    <Setter Property="VerticalAlignment" Value="Bottom"/>
-    <Setter Property="Height" Value="22" />
-    <Setter Property="HorizontalAlignment" Value="Stretch" />
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}" />
-    <Setter Property="Content">
-      <Template>
-        <Viewbox Height="10" Width="10" HorizontalAlignment="Center" VerticalAlignment="Center">
-          <Path Stroke="{Binding $parent[RepeatButton].Foreground}" StrokeThickness="1" Data="M 0,0 L 9,9 L 18,0"/>
-        </Viewbox>
-      </Template>
-    </Setter>
+    <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="BorderBrush" Value="{DynamicResource DatePickerButtonBorderBrushDisabled}"/>
+      <Setter Property="Background" Value="{DynamicResource DatePickerButtonBackgroundDisabled}"/>
+      <Setter Property="Foreground" Value="{DynamicResource DatePickerButtonForegroundDisabled}"/>
+    </Style>
   </ControlTheme>
-
+  
   <ControlTheme x:Key="{x:Type DatePicker}" TargetType="DatePicker">
     <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
     <Setter Property="Foreground" Value="{DynamicResource DatePickerButtonForeground}" />
@@ -148,7 +101,9 @@
                               HorizontalAlignment="Stretch"
                               VerticalAlignment="Top"/>
 
-            <Button Name="FlyoutButton" Grid.Row="1"
+            <Button Name="FlyoutButton"
+                    Grid.Row="1"
+                    Theme="{StaticResource FluentDatePickerFlyoutButton}"
                     Foreground="{TemplateBinding Foreground}"
                     Background="{TemplateBinding Background}"
                     BorderBrush="{TemplateBinding BorderBrush}"
@@ -159,22 +114,7 @@
                     MaxWidth="{DynamicResource DatePickerThemeMaxWidth}"
                     HorizontalAlignment="Stretch"
                     VerticalAlignment="Stretch"
-                    HorizontalContentAlignment="Stretch"
-                    VerticalContentAlignment="Stretch"
                     TemplatedControl.IsTemplateFocusTarget="True">
-              <Button.Template>
-                <ControlTemplate>
-                  <ContentPresenter Name="ContentPresenter"
-                                    BorderBrush="{TemplateBinding BorderBrush}"
-                                    Background="{TemplateBinding Background}"
-                                    BorderThickness="{TemplateBinding BorderThickness}"
-                                    Content="{TemplateBinding Content}"
-                                    Foreground="{TemplateBinding Foreground}"
-                                    HorizontalContentAlignment="Stretch"
-                                    VerticalContentAlignment="Stretch"
-                                    CornerRadius="{TemplateBinding CornerRadius}"/>
-                </ControlTemplate>
-              </Button.Template>
               <Grid Name="ButtonContentGrid" ColumnDefinitions="78*,Auto,132*,Auto,78*">
                 <TextBlock Name="DayText" Text="day" HorizontalAlignment="Center"
                            Padding="{DynamicResource DatePickerHostPadding}"
@@ -223,25 +163,7 @@
     <Style Selector="^:hasnodate /template/ Button#FlyoutButton TextBlock">
       <Setter Property="Foreground" Value="{DynamicResource TextControlPlaceholderForeground}"/>
     </Style>
-    <Style Selector="^/template/ Button#FlyoutButton">
-      <Style Selector="^:pointerover">
-        <Setter Property="BorderBrush" Value="{DynamicResource DatePickerButtonBorderBrushPointerOver}"/>
-        <Setter Property="Background" Value="{DynamicResource DatePickerButtonBackgroundPointerOver}"/>
-        <Setter Property="Foreground" Value="{DynamicResource DatePickerButtonForegroundPointerOver}"/>
-      </Style>
-
-      <Style Selector="^:pressed">
-        <Setter Property="BorderBrush" Value="{DynamicResource DatePickerButtonBorderBrushPressed}"/>
-        <Setter Property="Background" Value="{DynamicResource DatePickerButtonBackgroundPressed}"/>
-        <Setter Property="Foreground" Value="{DynamicResource DatePickerButtonForegroundPressed}"/>
-      </Style>
-
-      <Style Selector="^:disabled">
-        <Setter Property="BorderBrush" Value="{DynamicResource DatePickerButtonBorderBrushDisabled}"/>
-        <Setter Property="Background" Value="{DynamicResource DatePickerButtonBackgroundDisabled}"/>
-        <Setter Property="Foreground" Value="{DynamicResource DatePickerButtonForegroundDisabled}"/>
-      </Style>
-    </Style>
+    
     <Style Selector="^:error /template/ Button#FlyoutButton">
       <Setter Property="BorderBrush" Value="{DynamicResource SystemControlErrorTextForegroundBrush}"/>
     </Style>
@@ -321,20 +243,35 @@
                          Width="{DynamicResource DatePickerSpacerThemeWidth}"
                          Grid.Column="3" />
             </Grid>
-            <Grid Grid.Row="1" Height="{DynamicResource DatePickerFlyoutPresenterAcceptDismissHostGridHeight}"
-                  Name="AcceptDismissGrid" ColumnDefinitions="*,*">
-              <Rectangle Height="{DynamicResource DatePickerSpacerThemeWidth}" VerticalAlignment="Top"
+            
+            <Grid Name="AcceptDismissGrid"
+                  Grid.Row="1"
+                  ColumnDefinitions="*,*">
+              <Rectangle Height="{DynamicResource DatePickerSpacerThemeWidth}" 
+                         VerticalAlignment="Top"
                          Fill="{DynamicResource DatePickerFlyoutPresenterSpacerFill}"
                          Grid.ColumnSpan="2"/>
-              <Button Name="AcceptButton" Grid.Column="0" Theme="{StaticResource FluentDateTimePickerButton}"
-                      HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                <Path Stroke="{Binding $parent[Button].Foreground}" StrokeLineCap="Round"
-                      StrokeThickness="0.75" Data="M0.5,8.5 5,13.5 15.5,3" />
+              <Button Name="AcceptButton"
+                      Grid.Column="0"
+                      Theme="{StaticResource FluentDateTimePickerButton}"
+                      Height="{DynamicResource DatePickerFlyoutPresenterAcceptDismissHostGridHeight}"
+                      HorizontalAlignment="Stretch"
+                      VerticalAlignment="Stretch">
+                <Path Stroke="{Binding $parent[Button].Foreground}"
+                      StrokeLineCap="Round"
+                      StrokeThickness="0.75"
+                      Data="M0.5,8.5 5,13.5 15.5,3" />
               </Button>
-              <Button Name="DismissButton" Grid.Column="1" Theme="{StaticResource FluentDateTimePickerButton}"
-                      FontSize="16" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                <Path Stroke="{Binding $parent[Button].Foreground}" StrokeLineCap="Round"
-                      StrokeThickness="0.75" Data="M2,2 14,14 M2,14 14 2" />
+              <Button Name="DismissButton" 
+                      Grid.Column="1" 
+                      Theme="{StaticResource FluentDateTimePickerButton}"
+                      Height="{DynamicResource DatePickerFlyoutPresenterAcceptDismissHostGridHeight}"
+                      HorizontalAlignment="Stretch" 
+                      VerticalAlignment="Stretch">
+                <Path Stroke="{Binding $parent[Button].Foreground}" 
+                      StrokeLineCap="Round"
+                      StrokeThickness="0.75" 
+                      Data="M2,2 14,14 M2,14 14 2" />
               </Button>
             </Grid>
           </Grid>
diff --git a/src/Avalonia.Themes.Fluent/Controls/DateTimePickerShared.xaml b/src/Avalonia.Themes.Fluent/Controls/DateTimePickerShared.xaml
new file mode 100644
index 0000000000..77271a149f
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/DateTimePickerShared.xaml
@@ -0,0 +1,116 @@
+<!--
+// (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.
+-->
+
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:sys="clr-namespace:System;assembly=netstandard"
+        x:CompileBindings="True">
+  <Design.PreviewWith>
+    <Border Padding="20" Width="200">
+      <StackPanel Spacing="20">
+        <ListBoxItem Theme="{DynamicResource FluentDateTimePickerItem}">Standard Item</ListBoxItem>
+        <ListBoxItem Theme="{DynamicResource FluentDateTimePickerItem}" Classes="MonthItem">Month Item</ListBoxItem>
+        <RepeatButton Theme="{DynamicResource FluentDateTimePickerButton}">Button</RepeatButton>
+        <RepeatButton Theme="{DynamicResource FluentDateTimePickerUpButton}"/>
+        <RepeatButton Theme="{DynamicResource FluentDateTimePickerDownButton}"/>
+      </StackPanel>
+    </Border>
+  </Design.PreviewWith>
+
+  <!-- Theme for the items displayed in the selectors -->
+  <ControlTheme x:Key="FluentDateTimePickerItem" TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
+    <Setter Property="Padding" Value="{DynamicResource DatePickerFlyoutPresenterItemPadding}"/>
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="HorizontalContentAlignment" Value="Center" />
+
+    <Style Selector="^:selected">
+      <Setter Property="IsHitTestVisible" Value="False"/>
+      <Style Selector="^/template/ Rectangle#PressedBackground">
+        <Setter Property="Fill" Value="Transparent"/>
+      </Style>
+      <Style Selector="^/template/ ContentPresenter">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
+      </Style>
+    </Style>
+    <Style Selector="^.MonthItem">
+      <Setter Property="Padding" Value="{DynamicResource DatePickerFlyoutPresenterMonthPadding}"/>
+      <Setter Property="HorizontalContentAlignment" Value="Left" />
+    </Style>
+  </ControlTheme>
+
+  <!-- This is used for both the accept/dismiss & repeatbuttons in the presenter-->
+  <ControlTheme x:Key="FluentDateTimePickerButton" TargetType="Button">
+    <Setter Property="Background" Value="{DynamicResource DateTimePickerFlyoutButtonBackground}" />
+    <Setter Property="Height" Value="22" />
+    <Setter Property="HorizontalContentAlignment" Value="Center"/>
+    <Setter Property="VerticalContentAlignment" Value="Center"/>
+    <Setter Property="Template">
+      <ControlTemplate>
+        <!-- 
+                The background is doubled here for the loopingselector up/down repeat buttons 
+                that appear opaque. Not sure how MS does it though I suspect this is it
+                but source isn't MIT yet, so this is my solution -->
+        <Border Background="{TemplateBinding Background}">
+          <ContentPresenter x:Name="ContentPresenter"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{DynamicResource DateTimePickerFlyoutButtonBorderBrush}"
+                  BorderThickness="{DynamicResource DateTimeFlyoutButtonBorderThickness}"
+                  Content="{TemplateBinding Content}"
+                  Foreground="{DynamicResource SystemControlHighlightAltBaseHighBrush}"
+                  ContentTemplate="{TemplateBinding ContentTemplate}"
+                  Padding="{TemplateBinding Padding}"
+                  HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                  VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                  CornerRadius="{TemplateBinding CornerRadius}"/>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^:pointerover /template/ ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource DateTimePickerFlyoutButtonBackgroundPointerOver}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource DateTimePickerFlyoutButtonBorderBrushPointerOver}"/>
+      <Setter Property="Foreground" Value="{DynamicResource DateTimePickerFlyoutButtonForegroundPointerOver}"/>
+    </Style>
+
+    <Style Selector="^:pressed /template/ ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource DateTimePickerFlyoutButtonBackgroundPressed}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource DateTimePickerFlyoutButtonBorderBrushPressed}"/>
+      <Setter Property="Foreground" Value="{DynamicResource DateTimePickerFlyoutButtonForegroundPressed}"/>
+    </Style>
+  </ControlTheme>
+
+  <ControlTheme x:Key="FluentDateTimePickerUpButton" TargetType="RepeatButton" BasedOn="{StaticResource FluentDateTimePickerButton}">
+    <Setter Property="VerticalAlignment" Value="Top"/>
+    <Setter Property="Height" Value="22" />
+    <Setter Property="HorizontalAlignment" Value="Stretch" />
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}" />
+    <Setter Property="Content">
+      <Template>
+        <Viewbox Height="10" Width="10" HorizontalAlignment="Center" VerticalAlignment="Center">
+          <Path Stroke="{Binding $parent[RepeatButton].Foreground}" StrokeThickness="1" Data="M 0,9 L 9,0 L 18,9"/>
+        </Viewbox>
+      </Template>
+    </Setter>
+  </ControlTheme>
+
+  <ControlTheme x:Key="FluentDateTimePickerDownButton" TargetType="RepeatButton" BasedOn="{StaticResource FluentDateTimePickerButton}">
+    <Setter Property="VerticalAlignment" Value="Bottom"/>
+    <Setter Property="Height" Value="22" />
+    <Setter Property="HorizontalAlignment" Value="Stretch" />
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}" />
+    <Setter Property="Content">
+      <Template>
+        <Viewbox Height="10" Width="10" HorizontalAlignment="Center" VerticalAlignment="Center">
+          <Path Stroke="{Binding $parent[RepeatButton].Foreground}" StrokeThickness="1" Data="M 0,0 L 9,9 L 18,0"/>
+        </Viewbox>
+      </Template>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
index 58c33bf26f..262007082f 100644
--- a/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
@@ -59,7 +59,9 @@
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/ContentControl.xaml" />
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/ContextMenu.xaml" />
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/DateTimePickerShared.xaml" />
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/DatePicker.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/TimePicker.xaml" />
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/DropDownButton.xaml" />
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/EmbeddableControlRoot.xaml" />
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/Slider.xaml" />
@@ -72,6 +74,5 @@
     <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/FocusAdorner.xaml" />
     <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/SplitButton.xaml" />
     <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/UserControl.xaml" />
-    <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/TimePicker.xaml" />
     <Styles.Resources />
 </Styles>
diff --git a/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml b/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml
index dc09032a36..b5f177b985 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml
@@ -1,163 +1,320 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<!--
 // (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.
 -->
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:sys="clr-namespace:System;assembly=netstandard" x:CompileBindings="True">
-  <Styles.Resources>
-    <x:Double x:Key="TimePickerFlyoutPresenterItemHeight">40</x:Double>
-    <x:Double x:Key="TimePickerSpacerThemeWidth">1</x:Double>
-    <Thickness x:Key="TimePickerBorderThemeThickness">1</Thickness>
-    <Thickness x:Key="TimePickerTopHeaderMargin">0,0,0,4</Thickness>
-    <x:Double x:Key="TimePickerFlyoutPresenterHighlightHeight">40</x:Double>
-    <x:Double x:Key="TimePickerFlyoutPresenterAcceptDismissHostGridHeight">41</x:Double>
-    <x:Double x:Key="TimePickerThemeMinWidth">242</x:Double>
-    <x:Double x:Key="TimePickerThemeMaxWidth">456</x:Double>
-    <Thickness x:Key="TimePickerFlyoutPresenterItemPadding">0,3,0,6</Thickness>
-    <Thickness x:Key="TimePickerHostPadding">0,3,0,6</Thickness>
-    <ControlTheme x:Key="FluentTimePicker" TargetType="TimePicker">
-      <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-      <Setter Property="Foreground" Value="{DynamicResource TimePickerButtonForeground}" />
-      <Setter Property="Background" Value="{DynamicResource TimePickerButtonBackground}" />
-      <Setter Property="BorderBrush" Value="{DynamicResource TimePickerButtonBorderBrush}" />
-      <Setter Property="BorderThickness" Value="{DynamicResource TimePickerBorderThemeThickness}" />
-      <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-      <Setter Property="HorizontalAlignment" Value="Left" />
-      <Setter Property="VerticalAlignment" Value="Center" />
-      <Setter Property="Template">
-        <ControlTemplate>
-          <DataValidationErrors>
-            <Grid Name="LayoutRoot" Margin="{TemplateBinding Padding}" RowDefinitions="Auto,*">
-              <ContentPresenter x:Name="HeaderContentPresenter" Grid.Row="0" Content="{TemplateBinding Header}" ContentTemplate="{TemplateBinding HeaderTemplate}" Margin="{DynamicResource TimePickerTopHeaderMargin}" MaxWidth="{DynamicResource TimePickerThemeMaxWidth}" Foreground="{DynamicResource TimePickerHeaderForeground}" HorizontalAlignment="Stretch" VerticalAlignment="Top" />
-              <Button x:Name="FlyoutButton" Grid.Row="1" Foreground="{TemplateBinding Foreground}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" IsEnabled="{TemplateBinding IsEnabled}" MinWidth="{DynamicResource TimePickerThemeMinWidth}" MaxWidth="{DynamicResource TimePickerThemeMaxWidth}" HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch" VerticalAlignment="Top" VerticalContentAlignment="Stretch">
-                <Button.Template>
-                  <ControlTemplate>
-                    <ContentPresenter Name="ContentPresenter" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" Content="{TemplateBinding Content}" Foreground="{TemplateBinding Foreground}" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" />
-                  </ControlTemplate>
-                </Button.Template>
-                <Grid Name="FlyoutButtonContentGrid">
-                  <!--Ignore col defs here, set in code-->
-                  <Border x:Name="FirstPickerHost" Grid.Column="0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                    <TextBlock x:Name="HourTextBlock" HorizontalAlignment="Center" Padding="{DynamicResource TimePickerHostPadding}" FontFamily="{TemplateBinding FontFamily}" FontWeight="{TemplateBinding FontWeight}" FontSize="{TemplateBinding FontSize}" />
-                  </Border>
-                  <Rectangle Name="FirstColumnDivider" Fill="{DynamicResource TimePickerSpacerFill}" HorizontalAlignment="Center" Width="{DynamicResource TimePickerSpacerThemeWidth}" Grid.Column="1" />
-                  <Border x:Name="SecondPickerHost" Grid.Column="2" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                    <TextBlock x:Name="MinuteTextBlock" HorizontalAlignment="Center" Padding="{DynamicResource TimePickerHostPadding}" FontFamily="{TemplateBinding FontFamily}" FontWeight="{TemplateBinding FontWeight}" FontSize="{TemplateBinding FontSize}" />
-                  </Border>
-                  <Rectangle Name="SecondColumnDivider" Fill="{DynamicResource TimePickerSpacerFill}" HorizontalAlignment="Center" Width="{DynamicResource TimePickerSpacerThemeWidth}" Grid.Column="3" />
-                  <Border x:Name="ThirdPickerHost" Grid.Column="4" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                    <TextBlock x:Name="PeriodTextBlock" HorizontalAlignment="Center" Padding="{DynamicResource TimePickerHostPadding}" FontFamily="{TemplateBinding FontFamily}" FontWeight="{TemplateBinding FontWeight}" FontSize="{TemplateBinding FontSize}" />
-                  </Border>
-                </Grid>
-              </Button>
-              <Popup Name="Popup" WindowManagerAddShadowHint="False" IsLightDismissEnabled="True" PlacementTarget="{TemplateBinding}" PlacementMode="Bottom">
-                <TimePickerPresenter Name="PickerPresenter" />
-              </Popup>
-            </Grid>
-          </DataValidationErrors>
-        </ControlTemplate>
-      </Setter>
-      <Style Selector="^:hasnotime /template/ Button#FlyoutButton TextBlock">
-        <Setter Property="Foreground" Value="{DynamicResource TextControlPlaceholderForeground}" />
-      </Style>
-      <!--<Style Selector="^:error /template/ Button#FlyoutButton /template/ ContentPresenter">
-        <Setter Property="BorderBrush" Value="{DynamicResource SystemControlErrorTextForegroundBrush}" />
-      </Style>
-      <Style Selector="^ /template/ Button">
-        <Style Selector="^#FlyoutButton:pointerover /template/ ContentPresenter">
-          <Setter Property="Background" Value="{DynamicResource TimePickerButtonBackgroundPointerOver}" />
-          <Setter Property="BorderBrush" Value="{DynamicResource TimePickerButtonBorderBrushPointerOver}" />
-          <Setter Property="Foreground" Value="{DynamicResource TimePickerButtonForegroundPointerOver}" />
-        </Style>
-        <Style Selector="^:pressed /template/ ContentPresenter">
-          <Setter Property="Background" Value="{DynamicResource TimePickerButtonBackgroundPressed}" />
-          <Setter Property="BorderBrush" Value="{DynamicResource TimePickerButtonBorderBrushPressed}" />
-          <Setter Property="Foreground" Value="{DynamicResource TimePickerButtonForegroundPressed}" />
-        </Style>
-        <Style Selector="^:disabled /template/ ContentPresenter">
-          <Setter Property="Background" Value="{DynamicResource TimePickerButtonBackgroundDisabled}" />
-          <Setter Property="BorderBrush" Value="{DynamicResource TimePickerButtonBorderBrushDisabled}" />
-          <Setter Property="Foreground" Value="{DynamicResource TimePickerButtonForegroundDisabled}" />
-        </Style>
-      </Style>-->
-      <Style Selector="^:disabled">
-        <Style Selector="^ /template/ ContentPresenter#HeaderContentPresenter">
-          <Setter Property="Foreground" Value="{DynamicResource TimePickerHeaderForegroundDisabled}" />
-        </Style>
-        <Style Selector="^ /template/ Rectangle">
-          <Setter Property="Fill" Value="{DynamicResource TimePickerSpacerFillDisabled}" />
-        </Style>
-      </Style>
-    </ControlTheme>
-    <ControlTheme x:Key="FluentTimePickerPresenter" TargetType="TimePickerPresenter">
-      <Setter Property="Width" Value="242" />
-      <Setter Property="MinWidth" Value="242" />
-      <Setter Property="MaxHeight" Value="398" />
-      <Setter Property="FontWeight" Value="Normal" />
-      <Setter Property="Background" Value="{DynamicResource TimePickerFlyoutPresenterBackground}" />
-      <Setter Property="BorderBrush" Value="{DynamicResource TimePickerFlyoutPresenterBorderBrush}" />
-      <Setter Property="BorderThickness" Value="{DynamicResource DateTimeFlyoutBorderThickness}" />
-      <Setter Property="CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
-      <Setter Property="Template">
-        <ControlTemplate>
-          <Border Name="Background" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" Padding="{DynamicResource DateTimeFlyoutBorderPadding}" MaxHeight="398">
-            <Grid Name="ContentPanel" RowDefinitions="*,Auto">
-              <Grid Name="PickerContainer">
+
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:sys="clr-namespace:System;assembly=netstandard"
+        x:CompileBindings="True">
+  <Design.PreviewWith>
+    <Border Padding="20" Height="500">
+      <StackPanel Spacing="20" VerticalAlignment="Center">
+        <TimePicker />
+        <TimePicker CornerRadius="10" />
+        <TimePicker IsEnabled="False"/>
+        <TimePicker>
+          <DataValidationErrors.Error>
+            <sys:Exception>
+              <x:Arguments>
+                <x:String>Error</x:String>
+              </x:Arguments>
+            </sys:Exception>
+          </DataValidationErrors.Error>
+        </TimePicker>
+      </StackPanel>
+    </Border>
+  </Design.PreviewWith>
+
+  <x:Double x:Key="TimePickerFlyoutPresenterItemHeight">40</x:Double>
+  <x:Double x:Key="TimePickerSpacerThemeWidth">1</x:Double>
+  <Thickness x:Key="TimePickerBorderThemeThickness">1</Thickness>
+  <Thickness x:Key="TimePickerTopHeaderMargin">0,0,0,4</Thickness>
+  <x:Double x:Key="TimePickerFlyoutPresenterHighlightHeight">40</x:Double>
+  <x:Double x:Key="TimePickerFlyoutPresenterAcceptDismissHostGridHeight">41</x:Double>
+  <x:Double x:Key="TimePickerThemeMinWidth">242</x:Double>
+  <x:Double x:Key="TimePickerThemeMaxWidth">456</x:Double>
+  <Thickness x:Key="TimePickerFlyoutPresenterItemPadding">0,3,0,6</Thickness>
+  <Thickness x:Key="TimePickerHostPadding">0,3,0,6</Thickness>
+
+  <ControlTheme x:Key="FluentTimePickerFlyoutButton" TargetType="Button">
+    <Setter Property="RenderTransform" Value="none" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ContentPresenter Name="PART_ContentPresenter"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          Background="{TemplateBinding Background}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          Content="{TemplateBinding Content}"
+                          Foreground="{TemplateBinding Foreground}"
+                          HorizontalContentAlignment="Stretch"
+                          VerticalContentAlignment="Stretch"
+                          CornerRadius="{TemplateBinding CornerRadius}"/>
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="BorderBrush" Value="{DynamicResource TimePickerButtonBorderBrushPointerOver}"/>
+      <Setter Property="Background" Value="{DynamicResource TimePickerButtonBackgroundPointerOver}"/>
+      <Setter Property="Foreground" Value="{DynamicResource TimePickerButtonForegroundPointerOver}"/>
+    </Style>
+
+    <Style Selector="^:pressed">
+      <Setter Property="RenderTransform" Value="scale(0.98)" />
+    </Style>
+
+    <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="BorderBrush" Value="{DynamicResource TimePickerButtonBorderBrushPressed}"/>
+      <Setter Property="Background" Value="{DynamicResource TimePickerButtonBackgroundPressed}"/>
+      <Setter Property="Foreground" Value="{DynamicResource TimePickerButtonForegroundPressed}"/>
+    </Style>
+
+    <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="BorderBrush" Value="{DynamicResource TimePickerButtonBorderBrushDisabled}"/>
+      <Setter Property="Background" Value="{DynamicResource TimePickerButtonBackgroundDisabled}"/>
+      <Setter Property="Foreground" Value="{DynamicResource TimePickerButtonForegroundDisabled}"/>
+    </Style>
+  </ControlTheme>
+
+  <ControlTheme x:Key="{x:Type TimePicker}" TargetType="TimePicker">
+    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+    <Setter Property="Foreground" Value="{DynamicResource TimePickerButtonForeground}" />
+    <Setter Property="Background" Value="{DynamicResource TimePickerButtonBackground}"/>
+    <Setter Property="BorderBrush" Value="{DynamicResource TimePickerButtonBorderBrush}"/>
+    <Setter Property="BorderThickness" Value="{DynamicResource TimePickerBorderThemeThickness}"/>
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+    <Setter Property="HorizontalAlignment" Value="Left" />
+    <Setter Property="VerticalAlignment" Value="Center" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <DataValidationErrors>
+          <Grid Name="LayoutRoot" Margin="{TemplateBinding Padding}" RowDefinitions="Auto,*">
+            <ContentPresenter x:Name="HeaderContentPresenter"
+                              Grid.Row="0"
+                              Content="{TemplateBinding Header}"
+                              ContentTemplate="{TemplateBinding HeaderTemplate}"
+                              Margin="{DynamicResource TimePickerTopHeaderMargin}"
+                              MaxWidth="{DynamicResource TimePickerThemeMaxWidth}"
+                              Foreground="{DynamicResource TimePickerHeaderForeground}"
+                              HorizontalAlignment="Stretch"
+                              VerticalAlignment="Top" />
+
+            <Button x:Name="FlyoutButton"
+                    Grid.Row="1"
+                    Theme="{StaticResource FluentTimePickerFlyoutButton}"
+                    Foreground="{TemplateBinding Foreground}"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    CornerRadius="{TemplateBinding CornerRadius}"
+                    IsEnabled="{TemplateBinding IsEnabled}"
+                    MinWidth="{DynamicResource TimePickerThemeMinWidth}"
+                    MaxWidth="{DynamicResource TimePickerThemeMaxWidth}"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Top">
+
+              <Grid Name="FlyoutButtonContentGrid">
                 <!--Ignore col defs here, set in code-->
-                <Panel Name="HourHost" Grid.Column="0">
-                  <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Hidden">
-                    <DateTimePickerPanel Name="HourSelector" PanelType="Hour" ShouldLoop="True" ItemHeight="{DynamicResource TimePickerFlyoutPresenterItemHeight}" />
-                  </ScrollViewer>
-                  <RepeatButton Name="HourUpButton" Classes="DateTimeFlyoutButtonStyle UpButton" />
-                  <RepeatButton Name="HourDownButton" Classes="DateTimeFlyoutButtonStyle DownButton" />
-                </Panel>
-                <Panel Name="MinuteHost" Grid.Column="2">
-                  <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Hidden">
-                    <DateTimePickerPanel Name="MinuteSelector" PanelType="Minute" ShouldLoop="True" ItemHeight="{DynamicResource TimePickerFlyoutPresenterItemHeight}" />
-                  </ScrollViewer>
-                  <RepeatButton Name="MinuteUpButton" Classes="DateTimeFlyoutButtonStyle UpButton" />
-                  <RepeatButton Name="MinuteDownButton" Classes="DateTimeFlyoutButtonStyle DownButton" />
-                </Panel>
-                <Panel Name="PeriodHost" Grid.Column="4">
-                  <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Hidden">
-                    <DateTimePickerPanel Name="PeriodSelector" PanelType="TimePeriod" ShouldLoop="False" ItemHeight="{DynamicResource TimePickerFlyoutPresenterItemHeight}" />
-                  </ScrollViewer>
-                  <RepeatButton Name="PeriodUpButton" Classes="DateTimeFlyoutButtonStyle UpButton" />
-                  <RepeatButton Name="PeriodDownButton" Classes="DateTimeFlyoutButtonStyle DownButton" />
-                </Panel>
-                <Rectangle x:Name="HighlightRect" ZIndex="-1" Fill="{DynamicResource TimePickerFlyoutPresenterHighlightFill}" Grid.Column="0" Grid.ColumnSpan="5" VerticalAlignment="Center" Height="{DynamicResource TimePickerFlyoutPresenterHighlightHeight}" />
-                <Rectangle Name="FirstSpacer" Fill="{DynamicResource TimePickerFlyoutPresenterSpacerFill}" HorizontalAlignment="Center" Width="{DynamicResource TimePickerSpacerThemeWidth}" Grid.Column="1" />
-                <Rectangle Name="SecondSpacer" Fill="{DynamicResource TimePickerFlyoutPresenterSpacerFill}" HorizontalAlignment="Center" Width="{DynamicResource TimePickerSpacerThemeWidth}" Grid.Column="3" />
-              </Grid>
-              <Grid Grid.Row="1" Height="{DynamicResource TimePickerFlyoutPresenterAcceptDismissHostGridHeight}" Name="AcceptDismissHostGrid" ColumnDefinitions="*,*">
-                <Rectangle Height="{DynamicResource TimePickerSpacerThemeWidth}" VerticalAlignment="Top" Fill="{DynamicResource TimePickerFlyoutPresenterSpacerFill}" Grid.ColumnSpan="2" />
-                <Button Name="AcceptButton" Grid.Column="0" Classes="DateTimeFlyoutButtonStyle" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                  <Path Stroke="{Binding $parent[Button].Foreground}" StrokeLineCap="Round" StrokeThickness="0.75" Data="M0.5,8.5 5,13.5 15.5,3" />
-                </Button>
-                <Button Name="DismissButton" Grid.Column="1" Classes="DateTimeFlyoutButtonStyle" FontSize="16" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                  <Path Stroke="{Binding $parent[Button].Foreground}" StrokeLineCap="Round" StrokeThickness="0.75" Data="M2,2 14,14 M2,14 14 2" />
-                </Button>
+                <Border x:Name="FirstPickerHost"
+                        Grid.Column="0"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch">
+                  <TextBlock x:Name="HourTextBlock"
+                      HorizontalAlignment="Center"
+                      Padding="{DynamicResource TimePickerHostPadding}"
+                      FontFamily="{TemplateBinding FontFamily}"
+                      FontWeight="{TemplateBinding FontWeight}"
+                      FontSize="{TemplateBinding FontSize}" />
+                </Border>
+
+                <Rectangle Name="FirstColumnDivider"
+                           Fill="{DynamicResource TimePickerSpacerFill}"
+                           HorizontalAlignment="Center"
+                           Width="{DynamicResource TimePickerSpacerThemeWidth}"
+                           Grid.Column="1" />
+
+                <Border x:Name="SecondPickerHost"
+                        Grid.Column="2"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch">
+                  <TextBlock x:Name="MinuteTextBlock"
+                             HorizontalAlignment="Center"
+                             Padding="{DynamicResource TimePickerHostPadding}"
+                             FontFamily="{TemplateBinding FontFamily}"
+                             FontWeight="{TemplateBinding FontWeight}"
+                             FontSize="{TemplateBinding FontSize}"/>
+                </Border>
+
+                <Rectangle Name="SecondColumnDivider"
+                           Fill="{DynamicResource TimePickerSpacerFill}"
+                           HorizontalAlignment="Center"
+                           Width="{DynamicResource TimePickerSpacerThemeWidth}"
+                           Grid.Column="3" />
+
+                <Border x:Name="ThirdPickerHost"
+                        Grid.Column="4"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch">
+                  <TextBlock x:Name="PeriodTextBlock"
+                             HorizontalAlignment="Center"
+                             Padding="{DynamicResource TimePickerHostPadding}"
+                             FontFamily="{TemplateBinding FontFamily}"
+                             FontWeight="{TemplateBinding FontWeight}"
+                             FontSize="{TemplateBinding FontSize}" />
+                </Border>
               </Grid>
+            </Button>
+
+            <Popup Name="Popup"
+                   WindowManagerAddShadowHint="False"
+                   IsLightDismissEnabled="True"
+                   PlacementTarget="{TemplateBinding}"
+                   PlacementMode="Bottom">
+              <TimePickerPresenter Name="PickerPresenter" />
+            </Popup>
+
+          </Grid>
+        </DataValidationErrors>
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^:disabled /template/ ContentPresenter#HeaderContentPresenter">
+      <Setter Property="Foreground" Value="{DynamicResource TimePickerHeaderForegroundDisabled}"/>
+    </Style>
+
+    <Style Selector="^:disabled /template/ Rectangle">
+      <Setter Property="Fill" Value="{DynamicResource TimePickerSpacerFillDisabled}"/>
+    </Style>
+
+    <Style Selector="^:hasnotime /template/ Button#FlyoutButton TextBlock">
+      <Setter Property="Foreground" Value="{DynamicResource TextControlPlaceholderForeground}"/>
+    </Style>
+
+    <Style Selector="^:error /template/ Button#FlyoutButton">
+      <Setter Property="BorderBrush" Value="{DynamicResource SystemControlErrorTextForegroundBrush}"/>
+    </Style>
+  </ControlTheme>
+
+  <ControlTheme x:Key="{x:Type TimePickerPresenter}" TargetType="TimePickerPresenter">
+    <Setter Property="Width" Value="242" />
+    <Setter Property="MinWidth" Value="242" />
+    <Setter Property="MaxHeight" Value="398" />
+    <Setter Property="FontWeight" Value="Normal" />
+    <Setter Property="Background" Value="{DynamicResource TimePickerFlyoutPresenterBackground}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource TimePickerFlyoutPresenterBorderBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource DateTimeFlyoutBorderThickness}" />
+    <Setter Property="CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Name="Background"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}"
+                Padding="{DynamicResource DateTimeFlyoutBorderPadding}"
+                MaxHeight="398">
+          <Grid Name="ContentPanel" RowDefinitions="*,Auto">
+            <Grid Name="PickerContainer">
+              <!--Ignore col defs here, set in code-->
+              <Panel Name="HourHost" Grid.Column="0">
+                <ScrollViewer HorizontalScrollBarVisibility="Disabled"
+                              VerticalScrollBarVisibility="Hidden">
+                  <DateTimePickerPanel Name="HourSelector"
+                                       PanelType="Hour"
+                                       ShouldLoop="True"
+                                       ItemHeight="{DynamicResource TimePickerFlyoutPresenterItemHeight}"/>
+                </ScrollViewer>
+                <RepeatButton Name="HourUpButton" Theme="{StaticResource FluentDateTimePickerUpButton}"/>
+                <RepeatButton Name="HourDownButton" Theme="{StaticResource FluentDateTimePickerDownButton}"/>
+              </Panel>
+
+              <Panel Name="MinuteHost" Grid.Column="2">
+                <ScrollViewer HorizontalScrollBarVisibility="Disabled"
+                              VerticalScrollBarVisibility="Hidden">
+                  <DateTimePickerPanel Name="MinuteSelector"
+                                       PanelType="Minute"
+                                       ShouldLoop="True"
+                                       ItemHeight="{DynamicResource TimePickerFlyoutPresenterItemHeight}"/>
+                </ScrollViewer>
+                <RepeatButton Name="MinuteUpButton" Theme="{StaticResource FluentDateTimePickerUpButton}"/>
+                <RepeatButton Name="MinuteDownButton" Theme="{StaticResource FluentDateTimePickerDownButton}"/>
+              </Panel>
+
+              <Panel Name="PeriodHost" Grid.Column="4">
+                <ScrollViewer HorizontalScrollBarVisibility="Disabled"
+                              VerticalScrollBarVisibility="Hidden">
+                  <DateTimePickerPanel Name="PeriodSelector"
+                                       PanelType="TimePeriod"
+                                       ShouldLoop="False"
+                                       ItemHeight="{DynamicResource TimePickerFlyoutPresenterItemHeight}"/>
+                </ScrollViewer>
+                <RepeatButton Name="PeriodUpButton" Theme="{StaticResource FluentDateTimePickerUpButton}"/>
+                <RepeatButton Name="PeriodDownButton" Theme="{StaticResource FluentDateTimePickerDownButton}"/>
+              </Panel>
+
+              <Rectangle x:Name="HighlightRect" ZIndex="-1"
+                         Fill="{DynamicResource TimePickerFlyoutPresenterHighlightFill}"
+                         Grid.Column="0"
+                         Grid.ColumnSpan="5"
+                         VerticalAlignment="Center"
+                         Height="{DynamicResource TimePickerFlyoutPresenterHighlightHeight}" />
+              <Rectangle Name="FirstSpacer"
+                         Fill="{DynamicResource TimePickerFlyoutPresenterSpacerFill}"
+                         HorizontalAlignment="Center"
+                         Width="{DynamicResource TimePickerSpacerThemeWidth}"
+                         Grid.Column="1" />
+              <Rectangle Name="SecondSpacer"
+                         Fill="{DynamicResource TimePickerFlyoutPresenterSpacerFill}"
+                         HorizontalAlignment="Center"
+                         Width="{DynamicResource TimePickerSpacerThemeWidth}"
+                         Grid.Column="3" />
             </Grid>
-          </Border>
-        </ControlTemplate>
-      </Setter>
-      <Style Selector="^ /template/ Panel">
-        <Style Selector="^ RepeatButton">
-          <Setter Property="IsVisible" Value="False" />
-        </Style>
-        <Style Selector="^:pointerover RepeatButton">
-          <Setter Property="IsVisible" Value="True" />
-        </Style>
+
+            <Grid Name="AcceptDismissGrid"
+                  Grid.Row="1"
+                  ColumnDefinitions="*,*">
+              <Rectangle Height="{DynamicResource TimePickerSpacerThemeWidth}" 
+                         VerticalAlignment="Top"
+                         Fill="{DynamicResource TimePickerFlyoutPresenterSpacerFill}"
+                         Grid.ColumnSpan="2"/>
+              <Button Name="AcceptButton"
+                      Grid.Column="0"
+                      Theme="{StaticResource FluentDateTimePickerButton}"
+                      Height="{DynamicResource TimePickerFlyoutPresenterAcceptDismissHostGridHeight}"
+                      HorizontalAlignment="Stretch"
+                      VerticalAlignment="Stretch">
+                <Path Stroke="{Binding $parent[Button].Foreground}"
+                      StrokeLineCap="Round"
+                      StrokeThickness="0.75"
+                      Data="M0.5,8.5 5,13.5 15.5,3" />
+              </Button>
+              <Button Name="DismissButton" 
+                      Grid.Column="1" 
+                      Theme="{StaticResource FluentDateTimePickerButton}"
+                      Height="{DynamicResource TimePickerFlyoutPresenterAcceptDismissHostGridHeight}"
+                      FontSize="16" 
+                      HorizontalAlignment="Stretch" 
+                      VerticalAlignment="Stretch">
+                <Path Stroke="{Binding $parent[Button].Foreground}" 
+                      StrokeLineCap="Round"
+                      StrokeThickness="0.75" 
+                      Data="M2,2 14,14 M2,14 14 2" />
+              </Button>
+            </Grid>
+          </Grid>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+    
+    <Style Selector="^ /template/ Panel">
+      <Style Selector="^ RepeatButton">
+        <Setter Property="IsVisible" Value="False" />
+      </Style>
+
+      <Style Selector="^:pointerover RepeatButton">
+        <Setter Property="IsVisible" Value="True" />
       </Style>
-    </ControlTheme>
-  </Styles.Resources>
-  <Style Selector="TimePicker">
-    <Setter Property="Theme" Value="{StaticResource FluentTimePicker}" />
-  </Style>
-  <Style Selector="TimePickerPresenter">
-    <Setter Property="Theme" Value="{StaticResource FluentTimePickerPresenter}" />
-  </Style>
-</Styles>
+    </Style>  </ControlTheme>
+</ResourceDictionary>

From 2dda677fc8099a484806be21574e1a5bbbf721b8 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sun, 10 Jul 2022 22:26:28 +0200
Subject: [PATCH 108/240] Ported SplitButton to ControlTheme.

Not happy with the Tag hack but no better way to add additional states to a control currently.
---
 .../Controls/FluentControls.xaml              |   2 +-
 .../Controls/SplitButton.xaml                 | 388 ++++++++----------
 2 files changed, 173 insertions(+), 217 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
index 262007082f..bc2352d5d0 100644
--- a/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
@@ -39,6 +39,7 @@
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/ScrollBar.xaml" />
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml" />
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/Separator.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/SplitButton.xaml" />
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/SplitView.xaml" />
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/TabControl.xaml" />
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/TabItem.xaml" />
@@ -72,7 +73,6 @@
     </Styles.Resources>
 
     <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/FocusAdorner.xaml" />
-    <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/SplitButton.xaml" />
     <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/UserControl.xaml" />
     <Styles.Resources />
 </Styles>
diff --git a/src/Avalonia.Themes.Fluent/Controls/SplitButton.xaml b/src/Avalonia.Themes.Fluent/Controls/SplitButton.xaml
index fb0460d9a1..9a93b2625b 100644
--- a/src/Avalonia.Themes.Fluent/Controls/SplitButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/SplitButton.xaml
@@ -1,36 +1,120 @@
-<Styles xmlns="https://github.com/avaloniaui"
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         x:CompileBindings="True"
         xmlns:converters="using:Avalonia.Controls.Converters">
   <Design.PreviewWith>
     <Border Padding="60">
-      <StackPanel>
-        <SplitButton Content="Hello World">
+      <StackPanel Spacing="20">
+        <SplitButton Content="SplitButton">
           <SplitButton.Flyout>
             <Flyout>Hello</Flyout>
           </SplitButton.Flyout>
         </SplitButton>
-        <ToggleSplitButton Content="Hello World">
+        <SplitButton CornerRadius="16" Content="Rounded">
+          <SplitButton.Flyout>
+            <Flyout>Hello</Flyout>
+          </SplitButton.Flyout>
+        </SplitButton>
+        <SplitButton IsEnabled="False">Disabled</SplitButton>
+        <ToggleSplitButton Content="ToggleSplitButton">
+          <ToggleSplitButton.Flyout>
+            <Flyout>Hello</Flyout>
+          </ToggleSplitButton.Flyout>
+        </ToggleSplitButton>
+        <ToggleSplitButton Content="Checked" IsChecked="True">
           <ToggleSplitButton.Flyout>
             <Flyout>Hello</Flyout>
           </ToggleSplitButton.Flyout>
         </ToggleSplitButton>
+        <ToggleSplitButton Content="Checked Disabled" IsChecked="True" IsEnabled="False"/>
       </StackPanel>
     </Border>
   </Design.PreviewWith>
 
-  <Styles.Resources>
-    <x:Double x:Key="SplitButtonPrimaryButtonSize">32</x:Double>
-    <x:Double x:Key="SplitButtonSecondaryButtonSize">32</x:Double>
-    <x:Double x:Key="SplitButtonSeparatorWidth">1</x:Double>
-    <x:Double x:Key="SplitButtonMinHeight">32</x:Double>
+  <x:Double x:Key="SplitButtonPrimaryButtonSize">32</x:Double>
+  <x:Double x:Key="SplitButtonSecondaryButtonSize">32</x:Double>
+  <x:Double x:Key="SplitButtonSeparatorWidth">1</x:Double>
+  <x:Double x:Key="SplitButtonMinHeight">32</x:Double>
 
-    <converters:MarginMultiplierConverter x:Key="PrimaryButtonBorderMultiplier" Left="True" Top="True" Bottom="True" Indent="1" />
-    <converters:MarginMultiplierConverter x:Key="SecondaryButtonBorderMultiplier" Right="True" Top="True" Bottom="True" Indent="1" />
-    <converters:MarginMultiplierConverter x:Key="SeparatorBorderMultiplier" Top="True" Bottom="True" Indent="1" />
-  </Styles.Resources>
+  <converters:MarginMultiplierConverter x:Key="PrimaryButtonBorderMultiplier" Left="True" Top="True" Bottom="True" Indent="1" />
+  <converters:MarginMultiplierConverter x:Key="SecondaryButtonBorderMultiplier" Right="True" Top="True" Bottom="True" Indent="1" />
+  <converters:MarginMultiplierConverter x:Key="SeparatorBorderMultiplier" Top="True" Bottom="True" Indent="1" />
 
-  <Style Selector="SplitButton">
+  <ControlTheme x:Key="FluentSplitButtonComponent" TargetType="Button">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ContentPresenter x:Name="PART_ContentPresenter"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
+                          Content="{TemplateBinding Content}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          Padding="{TemplateBinding Padding}"
+                          RecognizesAccessKey="True"
+                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^:pointerover /template/ ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource SplitButtonBackgroundPointerOver}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushPointerOver}" />
+      <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundPointerOver}" />
+    </Style>
+
+    <Style Selector="^:pressed /template/ ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource SplitButtonBackgroundPressed}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushPressed}" />
+      <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
+    </Style>
+
+    <Style Selector="^:disabled /template/ ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource SplitButtonBackgroundDisabled}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushDisabled}" />
+      <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundDisabled}" />
+    </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}" />
+    </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}" />
+      </Style>
+
+      <Style Selector="^:pointerover /template/ ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource SplitButtonBackgroundCheckedPointerOver}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedPointerOver}" />
+        <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPointerOver}" />
+      </Style>
+
+      <Style Selector="^:pressed /template/ ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource SplitButtonBackgroundCheckedPressed}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedPressed}" />
+        <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
+      </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}" />
+      </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}" />
+    </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}" />
@@ -40,211 +124,83 @@
     <Setter Property="VerticalAlignment" Value="Center" />
     <Setter Property="HorizontalContentAlignment" Value="Stretch" />
     <Setter Property="VerticalContentAlignment" Value="Center" />
-    <!--<Setter Property="UseSystemFocusVisuals" Value="True" />
-    <Setter Property="FocusVisualMargin" Value="-3" />-->
     <Setter Property="KeyboardNavigation.IsTabStop" Value="True" />
     <Setter Property="Focusable" Value="True" />
     <Setter Property="Padding" Value="{DynamicResource ButtonPadding}" />
     <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
     <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate>
-          <Grid>
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition Width="*" />
-              <ColumnDefinition Width="Auto" />
-              <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-
-            <Button x:Name="PART_PrimaryButton"
-                    Grid.Column="0"
-                    MinWidth="{DynamicResource SplitButtonPrimaryButtonSize}"
-                    Foreground="{TemplateBinding Foreground}"
-                    Background="{TemplateBinding Background}"
-                    BorderThickness="{TemplateBinding BorderThickness, Converter={StaticResource PrimaryButtonBorderMultiplier}}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    Content="{TemplateBinding Content}"
-                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                    Command="{TemplateBinding Command}"
-                    CommandParameter="{TemplateBinding CommandParameter}"
-                    FontFamily="{TemplateBinding FontFamily}"
-                    FontSize="{TemplateBinding FontSize}"
-                    FontWeight="{TemplateBinding FontWeight}"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Stretch"
-                    HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                    VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                    Padding="{TemplateBinding Padding}"
-                    Focusable="False"
-                    KeyboardNavigation.IsTabStop="False" />
-
-            <Border x:Name="SeparatorBorder"
-                    Grid.Column="1"
-                    Background="Transparent"
-                    Width="{DynamicResource SplitButtonSeparatorWidth}"
-                    BorderThickness="{TemplateBinding BorderThickness, Converter={StaticResource SeparatorBorderMultiplier}}"
-                    BorderBrush="{TemplateBinding BorderBrush}" />
-
-            <Button x:Name="PART_SecondaryButton"
-                    Grid.Column="2"
-                    MinWidth="{DynamicResource SplitButtonSecondaryButtonSize}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    Foreground="{TemplateBinding Foreground}"
-                    Background="{TemplateBinding Background}"
-                    BorderThickness="{TemplateBinding BorderThickness, Converter={StaticResource SecondaryButtonBorderMultiplier}}"
-                    Padding="0"
-                    HorizontalContentAlignment="Center"
-                    VerticalContentAlignment="Center"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Stretch"
-                    Focusable="False"
-                    KeyboardNavigation.IsTabStop="False" />
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <!-- Default overridable styles -->
-  <Style Selector="SplitButton /template/ Button#PART_PrimaryButton">
-    <Setter Property="CornerRadius" Value="{TemplateBinding CornerRadius, Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
-  </Style>
-  <Style Selector="SplitButton /template/ Button#PART_SecondaryButton">
-    <Setter Property="CornerRadius" Value="{TemplateBinding CornerRadius, Converter={StaticResource RightCornerRadiusFilterConverter}}" />
-    <Setter Property="Content">
-      <Template>
-        <PathIcon Height="12"
-                  Width="12"
-                  Data="M1939 486L2029 576L1024 1581L19 576L109 486L1024 1401L1939 486Z" />
-      </Template>
+      <ControlTemplate>
+        <Grid>
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="Auto" />
+          </Grid.ColumnDefinitions>
+
+          <Button x:Name="PART_PrimaryButton"
+                  Grid.Column="0"
+                  Theme="{StaticResource FluentSplitButtonComponent}"
+                  MinWidth="{DynamicResource SplitButtonPrimaryButtonSize}"
+                  Foreground="{TemplateBinding Foreground}"
+                  Background="{TemplateBinding Background}"
+                  BorderThickness="{TemplateBinding BorderThickness, Converter={StaticResource PrimaryButtonBorderMultiplier}}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  Content="{TemplateBinding Content}"
+                  ContentTemplate="{TemplateBinding ContentTemplate}"
+                  Command="{TemplateBinding Command}"
+                  CommandParameter="{TemplateBinding CommandParameter}"
+                  CornerRadius="{TemplateBinding CornerRadius, Converter={StaticResource LeftCornerRadiusFilterConverter}}"
+                  FontFamily="{TemplateBinding FontFamily}"
+                  FontSize="{TemplateBinding FontSize}"
+                  FontWeight="{TemplateBinding FontWeight}"
+                  HorizontalAlignment="Stretch"
+                  VerticalAlignment="Stretch"
+                  HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                  VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                  Padding="{TemplateBinding Padding}"
+                  Focusable="False"
+                  KeyboardNavigation.IsTabStop="False" />
+
+          <Border x:Name="SeparatorBorder"
+                  Grid.Column="1"
+                  Background="Transparent"
+                  Width="{DynamicResource SplitButtonSeparatorWidth}"
+                  BorderThickness="{TemplateBinding BorderThickness, Converter={StaticResource SeparatorBorderMultiplier}}"
+                  BorderBrush="{TemplateBinding BorderBrush}" />
+
+          <Button x:Name="PART_SecondaryButton"
+                  Grid.Column="2"
+                  Theme="{StaticResource FluentSplitButtonComponent}"
+                  MinWidth="{DynamicResource SplitButtonSecondaryButtonSize}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  Foreground="{TemplateBinding Foreground}"
+                  Background="{TemplateBinding Background}"
+                  BorderThickness="{TemplateBinding BorderThickness, Converter={StaticResource SecondaryButtonBorderMultiplier}}"
+                  CornerRadius="{TemplateBinding CornerRadius, Converter={StaticResource RightCornerRadiusFilterConverter}}"
+                  Padding="0"
+                  HorizontalContentAlignment="Center"
+                  VerticalContentAlignment="Center"
+                  HorizontalAlignment="Stretch"
+                  VerticalAlignment="Stretch"
+                  Focusable="False"
+                  KeyboardNavigation.IsTabStop="False">
+            <PathIcon Height="12" Width="12"
+                      Data="M1939 486L2029 576L1024 1581L19 576L109 486L1024 1401L1939 486Z" />
+          </Button>
+        </Grid>
+      </ControlTemplate>
     </Setter>
-  </Style>
-
-  <!-- Primary and Secondary buttons PointerOver State -->
-  <Style Selector="SplitButton /template/ Button#PART_PrimaryButton:pointerover /template/ ContentPresenter,
-         SplitButton /template/ Button#PART_SecondaryButton:pointerover /template/ ContentPresenter">
-    <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundPointerOver}" />
-    <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushPointerOver}" />
-    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundPointerOver}" />
-  </Style>
-  <Style Selector="SplitButton /template/ Button#PART_SecondaryButton:pointerover PathIcon">
-    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundPointerOver}" />
-  </Style>
-
-  <!-- Primary and Secondary buttons Pressed State -->
-  <Style Selector="SplitButton /template/ Button#PART_PrimaryButton:pressed /template/ ContentPresenter,
-         SplitButton /template/ Button#PART_SecondaryButton:pressed /template/ ContentPresenter">
-    <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundPressed}" />
-    <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushPressed}" />
-    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
-  </Style>
-  <Style Selector="SplitButton /template/ Button#PART_SecondaryButton:pressed PathIcon">
-    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
-  </Style>
-
-  <!-- SplitButton Pressed State -->
-  <Style Selector="SplitButton:pressed /template/ Button#PART_PrimaryButton /template/ ContentPresenter,
-         SplitButton:pressed /template/ Button#PART_SecondaryButton /template/ ContentPresenter,
-         SplitButton:pressed /template/ Border#SeparatorBorder">
-    <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundPressed}" />
-    <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushPressed}" />
-    <Setter Property="TextElement.Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
-  </Style>
-  <Style Selector="SplitButton:pressed /template/ Button#PART_SecondaryButton PathIcon">
-    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
-  </Style>
-
-  <!-- Primary and Secondary buttons Flyout Open State -->
-  <Style Selector="SplitButton:flyout-open /template/ Button#PART_PrimaryButton /template/ ContentPresenter,
-         SplitButton:flyout-open /template/ Button#PART_SecondaryButton /template/ ContentPresenter,
-         SplitButton:flyout-open /template/ Border#SeparatorBorder">
-    <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundPressed}" />
-    <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushPressed}" />
-    <Setter Property="TextElement.Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
-  </Style>
-  <Style Selector="SplitButton:flyout-open /template/ Button#PART_SecondaryButton PathIcon">
-    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
-  </Style>
-
-  <!-- Disabled State -->
-  <Style Selector="SplitButton:disabled /template/ Button#PART_PrimaryButton /template/ ContentPresenter,
-         SplitButton:disabled /template/ Button#PART_SecondaryButton /template/ ContentPresenter,
-         SplitButton:disabled /template/ Border#SeparatorBorder">
-    <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundDisabled}" />
-    <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushDisabled}" />
-    <Setter Property="TextElement.Foreground" Value="{DynamicResource SplitButtonForegroundDisabled}" />
-  </Style>
-  <Style Selector="SplitButton:disabled /template/ Button#PART_SecondaryButton PathIcon">
-    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundDisabled}" />
-  </Style>
-
-  <!-- Checked State -->
-  <Style Selector="SplitButton:checked /template/ Button#PART_PrimaryButton /template/ ContentPresenter,
-         SplitButton:checked /template/ Button#PART_SecondaryButton /template/ ContentPresenter,
-         SplitButton:checked /template/ Border#SeparatorBorder">
-    <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundChecked}" />
-    <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushChecked}" />
-    <Setter Property="TextElement.Foreground" Value="{DynamicResource SplitButtonForegroundChecked}" />
-  </Style>
-  <Style Selector="SplitButton:checked /template/ Button#PART_SecondaryButton PathIcon">
-    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundChecked}" />
-  </Style>
-
-  <!-- Checked PointerOver State -->
-  <Style Selector="SplitButton:checked /template/ Button#PART_PrimaryButton:pointerover /template/ ContentPresenter,
-         SplitButton:checked /template/ Button#PART_SecondaryButton:pointerover /template/ ContentPresenter">
-    <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundCheckedPointerOver}" />
-    <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedPointerOver}" />
-    <Setter Property="TextElement.Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPointerOver}" />
-  </Style>
-  <Style Selector="SplitButton:checked /template/ Button#PART_SecondaryButton:pointerover PathIcon">
-    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPointerOver}" />
-  </Style>
-
-  <!-- Checked Pressed State -->
-  <Style Selector="SplitButton:checked /template/ Button#PART_PrimaryButton:pressed /template/ ContentPresenter,
-         SplitButton:checked /template/ Button#PART_SecondaryButton:pressed /template/ ContentPresenter">
-    <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundCheckedPressed}" />
-    <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedPressed}" />
-    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
-  </Style>
-  <Style Selector="SplitButton:checked /template/ Button#PART_SecondaryButton:pressed PathIcon">
-    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
-  </Style>
-
-  <!-- SplitButton Checked Pressed State -->
-  <Style Selector="SplitButton:pressed:checked /template/ Button#PART_PrimaryButton /template/ ContentPresenter,
-         SplitButton:pressed:checked /template/ Button#PART_SecondaryButton /template/ ContentPresenter,
-         SplitButton:pressed:checked /template/ Border#SeparatorBorder">
-    <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundCheckedPressed}" />
-    <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedPressed}" />
-    <Setter Property="TextElement.Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
-  </Style>
-  <Style Selector="SplitButton:pressed:checked /template/ Button#PART_SecondaryButton PathIcon">
-    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
-  </Style>
-
-  <!-- Checked Flyout Open State -->
-  <Style Selector="SplitButton:checked:flyout-open /template/ Button#PART_PrimaryButton /template/ ContentPresenter,
-         SplitButton:checked:flyout-open /template/ Button#PART_SecondaryButton /template/ ContentPresenter,
-         SplitButton:checked:flyout-open /template/ Border#SeparatorBorder">
-    <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundCheckedPressed}" />
-    <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedPressed}" />
-    <Setter Property="TextElement.Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
-  </Style>
-  <Style Selector="SplitButton:checked:flyout-open /template/ Button#PART_SecondaryButton PathIcon">
-    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
-  </Style>
-
-  <!-- Disabled Checked State -->
-  <Style Selector="SplitButton:checked:disabled /template/ Button#PART_PrimaryButton /template/ ContentPresenter,
-         SplitButton:checked:disabled /template/ Button#PART_SecondaryButton /template/ ContentPresenter,
-         SplitButton:checked:disabled /template/ Border#SeparatorBorder">
-    <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundCheckedDisabled}" />
-    <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedDisabled}" />
-    <Setter Property="TextElement.Foreground" Value="{DynamicResource SplitButtonForegroundCheckedDisabled}" />
-  </Style>
-  <Style Selector="SplitButton:checked:disabled /template/ Button#PART_SecondaryButton PathIcon">
-    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedDisabled}" />
-  </Style>
-</Styles>
+
+    <Style Selector="^:flyout-open /template/ Button">
+      <Setter Property="Tag" Value="flyout-open" />
+    </Style>
+
+    <Style Selector="^:checked /template/ Button">
+      <Setter Property="Tag" Value="checked" />
+    </Style>
+
+    <Style Selector="^:checked:flyout-open /template/ Button">
+      <Setter Property="Tag" Value="checked-flyout-open" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>

From 534ccd8c13f51d51d61ffbaa10a952d3b28ce6c2 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sun, 10 Jul 2022 23:05:49 +0200
Subject: [PATCH 109/240] Removed a few unneeded styles I missed.

And tweak some designer previews.
---
 .../Controls/CalendarItem.xaml                | 15 ++++--
 .../Controls/DatePicker.xaml                  |  4 --
 .../Controls/DateTimePickerShared.xaml        |  6 ++-
 .../Controls/ScrollViewer.xaml                | 17 ++++---
 .../Controls/Slider.xaml                      | 47 +++++++++++--------
 .../Controls/TimePicker.xaml                  |  4 --
 6 files changed, 49 insertions(+), 44 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/CalendarItem.xaml b/src/Avalonia.Themes.Fluent/Controls/CalendarItem.xaml
index 6914a0db08..79c872c640 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CalendarItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CalendarItem.xaml
@@ -91,7 +91,11 @@
                       Padding="1"
                       HorizontalContentAlignment="Left">
                 <!--Path mimics Segoe MDL2 Assets font glyph used in WinUI-->
-                <Path StrokeThickness="1.5" Data="M 0,9 L 9,0 L 18,9" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                <Path Stroke="{DynamicResource CalendarViewForeground}"
+                      StrokeThickness="1.5" 
+                      Data="M 0,9 L 9,0 L 18,9" 
+                      HorizontalAlignment="Center" 
+                      VerticalAlignment="Center" />
               </Button>
               <Button Name="NextButton"
                       Grid.Column="2"
@@ -100,7 +104,11 @@
                       Padding="1"
                       HorizontalContentAlignment="Left">
                 <!--Path mimics Segoe MDL2 Assets font glyph used in WinUI-->
-                <Path StrokeThickness="1.5" Data="M 0,0 L 9,9 L 18,0" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                <Path Stroke="{DynamicResource CalendarViewForeground}"
+                      StrokeThickness="1.5" 
+                      Data="M 0,0 L 9,9 L 18,0" 
+                      HorizontalAlignment="Center" 
+                      VerticalAlignment="Center" />
               </Button>
             </Grid>
             <!--Border below is used only for MonthView but it can't be moved inside of Grid because CalendarItem expects it to be empty and it will cause side-effects-->
@@ -147,9 +155,6 @@
         </Border>
       </ControlTemplate>
     </Setter>
-    <Style Selector="^ /template/ Button > Path">
-      <Setter Property="Stroke" Value="{DynamicResource CalendarViewForeground}" />
-    </Style>
     <Style Selector="^ /template/ Button:pointerover > Path">
       <Setter Property="Stroke" Value="{DynamicResource CalendarViewNavigationButtonForegroundPointerOver}" />
     </Style>
diff --git a/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml b/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml
index 0441415128..bc47f3892e 100644
--- a/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml
@@ -280,10 +280,6 @@
     </Setter>
 
     <Style Selector="^ /template/ Panel">
-      <Style Selector="^ RepeatButton">
-        <Setter Property="IsVisible" Value="False" />
-      </Style>
-
       <Style Selector="^:pointerover RepeatButton">
         <Setter Property="IsVisible" Value="True" />
       </Style>
diff --git a/src/Avalonia.Themes.Fluent/Controls/DateTimePickerShared.xaml b/src/Avalonia.Themes.Fluent/Controls/DateTimePickerShared.xaml
index 77271a149f..be664b375d 100644
--- a/src/Avalonia.Themes.Fluent/Controls/DateTimePickerShared.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/DateTimePickerShared.xaml
@@ -15,8 +15,8 @@
         <ListBoxItem Theme="{DynamicResource FluentDateTimePickerItem}">Standard Item</ListBoxItem>
         <ListBoxItem Theme="{DynamicResource FluentDateTimePickerItem}" Classes="MonthItem">Month Item</ListBoxItem>
         <RepeatButton Theme="{DynamicResource FluentDateTimePickerButton}">Button</RepeatButton>
-        <RepeatButton Theme="{DynamicResource FluentDateTimePickerUpButton}"/>
-        <RepeatButton Theme="{DynamicResource FluentDateTimePickerDownButton}"/>
+        <RepeatButton Theme="{DynamicResource FluentDateTimePickerUpButton}" IsVisible="True"/>
+        <RepeatButton Theme="{DynamicResource FluentDateTimePickerDownButton}" IsVisible="True"/>
       </StackPanel>
     </Border>
   </Design.PreviewWith>
@@ -90,6 +90,7 @@
     <Setter Property="HorizontalAlignment" Value="Stretch" />
     <Setter Property="Focusable" Value="False" />
     <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}" />
+    <Setter Property="IsVisible" Value="False"/>
     <Setter Property="Content">
       <Template>
         <Viewbox Height="10" Width="10" HorizontalAlignment="Center" VerticalAlignment="Center">
@@ -105,6 +106,7 @@
     <Setter Property="HorizontalAlignment" Value="Stretch" />
     <Setter Property="Focusable" Value="False" />
     <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}" />
+    <Setter Property="IsVisible" Value="False"/>
     <Setter Property="Content">
       <Template>
         <Viewbox Height="10" Width="10" HorizontalAlignment="Center" VerticalAlignment="Center">
diff --git a/src/Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml b/src/Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml
index 55adb54d9b..2c727b4435 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml
@@ -68,18 +68,17 @@
           <Panel x:Name="PART_ScrollBarsSeparator"
                  Grid.Row="1"
                  Grid.Column="1"
-                 Background="{DynamicResource ScrollViewerScrollBarsSeparatorBackground}" />
+                 Background="{DynamicResource ScrollViewerScrollBarsSeparatorBackground}"
+                 Opacity="0">
+            <Panel.Transitions>
+              <Transitions>
+                <DoubleTransition Property="Opacity" Duration="0:0:0.1" />
+              </Transitions>
+            </Panel.Transitions>
+          </Panel>
         </Grid>
       </ControlTemplate>
     </Setter>
-    <Style Selector="^ /template/ Panel#PART_ScrollBarsSeparator">
-      <Setter Property="Opacity" Value="0" />
-      <Setter Property="Transitions">
-        <Transitions>
-          <DoubleTransition Property="Opacity" Duration="0:0:0.1" />
-        </Transitions>
-      </Setter>
-    </Style>
     <Style Selector="^[IsExpanded=true] /template/ Panel#PART_ScrollBarsSeparator">
       <Setter Property="Opacity" Value="1" />
     </Style>
diff --git a/src/Avalonia.Themes.Fluent/Controls/Slider.xaml b/src/Avalonia.Themes.Fluent/Controls/Slider.xaml
index 9378640d64..1e4a7ac097 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Slider.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Slider.xaml
@@ -2,11 +2,14 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:sys="clr-namespace:System;assembly=netstandard">
   <Design.PreviewWith>
-    <Border Margin="20" Width="200" Height="400">
+    <Border Margin="20" Width="400" Height="600">
       <DockPanel LastChildFill="True">
         <StackPanel Spacing="10" DockPanel.Dock="Top">
           <Slider Value="50" />
           <Slider IsDirectionReversed="True" Value="50" />
+          <Slider Value="50" TickPlacement="TopLeft" TickFrequency="10"/>
+          <Slider Value="50" TickPlacement="BottomRight" TickFrequency="10"/>
+          <Slider Value="50" TickPlacement="Outside" TickFrequency="10"/>
           <Slider IsEnabled="False" Value="50" />
           <Slider Value="50">
             <DataValidationErrors.Error>
@@ -22,6 +25,9 @@
           <Slider Value="50" Orientation="Vertical" />
           <Slider IsDirectionReversed="True" Value="50" Orientation="Vertical" />
           <Slider IsEnabled="False" Orientation="Vertical" Value="50" />
+          <Slider Value="50" TickPlacement="TopLeft" TickFrequency="10" Orientation="Vertical" />
+          <Slider Value="50" TickPlacement="BottomRight" TickFrequency="10" Orientation="Vertical" />
+          <Slider Value="50" TickPlacement="Outside" TickFrequency="10" Orientation="Vertical" />
         </StackPanel>
       </DockPanel>
     </Border>
@@ -103,7 +109,9 @@
                     Margin="{DynamicResource SliderTopHeaderMargin}"
                     TextElement.FontWeight="{DynamicResource SliderHeaderThemeFontWeight}"
                     TextElement.Foreground="{DynamicResource SliderHeaderForeground}" />
-                <Grid x:Name="SliderContainer" Grid.Row="1">
+                <Grid x:Name="SliderContainer"
+                      Grid.Row="1"
+                      Background="{DynamicResource SliderContainerBackground}">
                   <Grid.Styles>
                     <Style Selector="TickBar">
                       <Setter Property="ReservedSpace" Value="{Binding #PART_Track.Thumb.Bounds}" />
@@ -129,7 +137,9 @@
                         Height="{DynamicResource SliderOutsideTickBarThemeHeight}"
                         Margin="0,0,0,4"
                         VerticalAlignment="Bottom"
-                        Placement="Top" />
+                        Placement="Top" 
+                        IsVisible="False"
+                        Fill="{DynamicResource SliderTickBarFill}"/>
                     <TickBar
                         Name="BottomTickBar"
                         Grid.Row="2"
@@ -142,7 +152,9 @@
                         Height="{DynamicResource SliderOutsideTickBarThemeHeight}"
                         Margin="0,4,0,0"
                         VerticalAlignment="Top"
-                        Placement="Bottom" />
+                        Placement="Bottom"
+                        IsVisible="False"
+                        Fill="{DynamicResource SliderTickBarFill}" />
                     <Track
                         Name="PART_Track"
                         Grid.Row="1"
@@ -172,6 +184,7 @@
                           Height="{DynamicResource SliderHorizontalThumbHeight}"
                           Margin="0"
                           Padding="0"
+                          Background="{DynamicResource SliderThumbBackground}"
                           BorderThickness="0"
                           Theme="{StaticResource FluentSliderThumbTheme}"
                           DataContext="{TemplateBinding Value}"/>
@@ -202,7 +215,9 @@
                     Margin="{DynamicResource SliderTopHeaderMargin}"
                     TextElement.FontWeight="{DynamicResource SliderHeaderThemeFontWeight}"
                     TextElement.Foreground="{DynamicResource SliderHeaderForeground}" />
-                <Grid x:Name="SliderContainer" Grid.Row="1">
+                <Grid x:Name="SliderContainer"
+                      Grid.Row="1"
+                      Background="{DynamicResource SliderContainerBackground}">
                   <Grid.Styles>
                     <Style Selector="TickBar">
                       <Setter Property="ReservedSpace" Value="{Binding #PART_Track.Thumb.Bounds}" />
@@ -228,7 +243,9 @@
                         Width="{DynamicResource SliderOutsideTickBarThemeHeight}"
                         Margin="0,0,4,0"
                         HorizontalAlignment="Right"
-                        Placement="Left" />
+                        Placement="Left"
+                        IsVisible="False"
+                        Fill="{DynamicResource SliderTickBarFill}"/>
                     <TickBar
                         Name="RightTickBar"
                         Grid.RowSpan="3"
@@ -241,7 +258,9 @@
                         Width="{DynamicResource SliderOutsideTickBarThemeHeight}"
                         Margin="4,0,0,0"
                         HorizontalAlignment="Left"
-                        Placement="Right" />
+                        Placement="Right" 
+                        IsVisible="False"
+                        Fill="{DynamicResource SliderTickBarFill}"/>
                     <Track
                         Name="PART_Track"
                         Grid.RowSpan="3"
@@ -272,6 +291,7 @@
                           Height="{DynamicResource SliderVerticalThumbHeight}"
                           Margin="0"
                           Padding="0"
+                          Background="{DynamicResource SliderThumbBackground}"
                           BorderThickness="0"
                           Theme="{StaticResource FluentSliderThumbTheme}"
                           DataContext="{TemplateBinding Value}" />
@@ -285,19 +305,6 @@
       </Setter>
     </Style>
 
-    <!--  Normal State  -->
-
-    <Style Selector="^ /template/ Thumb">
-      <Setter Property="Background" Value="{DynamicResource SliderThumbBackground}" />
-    </Style>
-    <Style Selector="^ /template/ Grid#SliderContainer">
-      <Setter Property="Background" Value="{DynamicResource SliderContainerBackground}" />
-    </Style>
-    <Style Selector="^/template/ TickBar">
-      <Setter Property="IsVisible" Value="False" />
-      <Setter Property="Fill" Value="{DynamicResource SliderTickBarFill}" />
-    </Style>
-
     <!--  TickBar Placement States  -->
 
     <Style Selector="^[TickPlacement=TopLeft] /template/ TickBar#LeftTickBar, ^[TickPlacement=Outside] /template/ TickBar#LeftTickBar">
diff --git a/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml b/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml
index b5f177b985..0d1b416d7a 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml
@@ -309,10 +309,6 @@
     </Setter>
     
     <Style Selector="^ /template/ Panel">
-      <Style Selector="^ RepeatButton">
-        <Setter Property="IsVisible" Value="False" />
-      </Style>
-
       <Style Selector="^:pointerover RepeatButton">
         <Setter Property="IsVisible" Value="True" />
       </Style>

From 20b2bc21b6542fa6461e9a8c5b83a0c8caf8c9ba Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Mon, 11 Jul 2022 09:53:53 +0200
Subject: [PATCH 110/240] Prevent ComboBox borders getting cut off.

---
 src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml b/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml
index ec78bf6ab4..af3b5bc51e 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml
@@ -136,7 +136,6 @@
                       Background="{DynamicResource ComboBoxDropDownBackground}"
                       BorderBrush="{DynamicResource ComboBoxDropDownBorderBrush}"
                       BorderThickness="{DynamicResource ComboBoxDropdownBorderThickness}"
-                      Margin="0,-1,0,-1"
                       Padding="{DynamicResource ComboBoxDropdownBorderPadding}"
                       HorizontalAlignment="Stretch"
                       CornerRadius="{DynamicResource OverlayCornerRadius}">

From eb627f393cbfa1441cbdcefb52d79b2a2e82f070 Mon Sep 17 00:00:00 2001
From: Benedikt Stebner <Gillibald@users.noreply.github.com>
Date: Mon, 11 Jul 2022 15:27:59 +0200
Subject: [PATCH 111/240] More fixes

---
 samples/Sandbox/App.axaml                     |  2 +-
 samples/Sandbox/MainWindow.axaml              | 14 ++++-
 .../Media/TextFormatting/TextLayout.cs        | 46 +++++++--------
 .../Media/TextFormatting/TextLineImpl.cs      | 58 +++++++++++--------
 src/Avalonia.Controls/RichTextBlock.cs        | 57 +++++++++---------
 src/Avalonia.Controls/TextBlock.cs            |  7 ++-
 .../Media/TextFormatting/TextLayoutTests.cs   | 45 ++++++++++++++
 .../Media/TextFormatting/TextLineTests.cs     | 17 +++---
 8 files changed, 156 insertions(+), 90 deletions(-)

diff --git a/samples/Sandbox/App.axaml b/samples/Sandbox/App.axaml
index f601f9f78f..1c74c07b1d 100644
--- a/samples/Sandbox/App.axaml
+++ b/samples/Sandbox/App.axaml
@@ -3,6 +3,6 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:Class="Sandbox.App">
     <Application.Styles>
-        <FluentTheme Mode="Dark"/>
+        <FluentTheme Mode="Light"/>
     </Application.Styles>
 </Application>
diff --git a/samples/Sandbox/MainWindow.axaml b/samples/Sandbox/MainWindow.axaml
index 0c5a7a11e3..957616579a 100644
--- a/samples/Sandbox/MainWindow.axaml
+++ b/samples/Sandbox/MainWindow.axaml
@@ -1,5 +1,17 @@
 <Window xmlns="https://github.com/avaloniaui"
         xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
         x:Class="Sandbox.MainWindow">
-  <RichTextBlock Width="200" IsTextSelectionEnabled="True" Text="Multiline TextBlock with TextWrapping.&#xD;&#xD;Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus magna. Cras in mi at felis aliquet congue. Ut a est eget ligula molestie gravida. Curabitur massa. Donec eleifend, libero at sagittis mollis, tellus est malesuada tellus, at luctus turpis elit sit amet quam. Vivamus pretium ornare est." TextWrapping="Wrap" />
+  <RichTextBlock 
+    HorizontalAlignment="Center" 
+    VerticalAlignment="Center" 
+    Background="AliceBlue" 
+    Padding="5" 
+    IsTextSelectionEnabled="True" 
+    FontSize="18" 
+    FontWeight="Bold" 
+    SelectionStart="24" 
+    SelectionEnd="23">
+    <LineBreak/>
+    <Run>أَبْجَدِيَّة عَرَبِيَّة</Run>
+  </RichTextBlock>
 </Window>
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextLayout.cs b/src/Avalonia.Base/Media/TextFormatting/TextLayout.cs
index f3af240c58..8ab9591faf 100644
--- a/src/Avalonia.Base/Media/TextFormatting/TextLayout.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/TextLayout.cs
@@ -63,7 +63,7 @@ namespace Avalonia.Media.TextFormatting
 
             MaxHeight = maxHeight;
 
-            MaxLines = maxLines;      
+            MaxLines = maxLines;
 
             TextLines = CreateTextLines();
         }
@@ -80,7 +80,7 @@ namespace Avalonia.Media.TextFormatting
         /// <param name="maxLines">The maximum number of text lines.</param>
         public TextLayout(
             ITextSource textSource,
-            TextParagraphProperties paragraphProperties, 
+            TextParagraphProperties paragraphProperties,
             TextTrimming? textTrimming = null,
             double maxWidth = double.PositiveInfinity,
             double maxHeight = double.PositiveInfinity,
@@ -178,24 +178,18 @@ namespace Avalonia.Media.TextFormatting
                 return new Rect();
             }
 
-            if (textPosition < 0 || textPosition >= _textSourceLength)
+            if (textPosition < 0)
             {
-                var lastLine = TextLines[TextLines.Count - 1];
-
-                var lineX = lastLine.Width;
-
-                var lineY = Bounds.Bottom - lastLine.Height;
-
-                return new Rect(lineX, lineY, 0, lastLine.Height);
+                textPosition = _textSourceLength;
             }
 
             var currentY = 0.0;
 
             foreach (var textLine in TextLines)
             {
-                var end = textLine.FirstTextSourceIndex + textLine.Length - 1;
+                var end = textLine.FirstTextSourceIndex + textLine.Length;
 
-                if (end < textPosition)
+                if (end <= textPosition && end < _textSourceLength)
                 {
                     currentY += textLine.Height;
 
@@ -224,7 +218,7 @@ namespace Avalonia.Media.TextFormatting
             }
 
             var result = new List<Rect>(TextLines.Count);
-            
+
             var currentY = 0d;
 
             foreach (var textLine in TextLines)
@@ -239,7 +233,7 @@ namespace Avalonia.Media.TextFormatting
 
                 var textBounds = textLine.GetTextBounds(start, length);
 
-                if(textBounds.Count > 0)
+                if (textBounds.Count > 0)
                 {
                     foreach (var bounds in textBounds)
                     {
@@ -262,7 +256,7 @@ namespace Avalonia.Media.TextFormatting
                     }
                 }
 
-                if(textLine.FirstTextSourceIndex + textLine.Length >= start + length)
+                if (textLine.FirstTextSourceIndex + textLine.Length >= start + length)
                 {
                     break;
                 }
@@ -305,7 +299,7 @@ namespace Avalonia.Media.TextFormatting
             return GetHitTestResult(currentLine, characterHit, point);
         }
 
-        
+
         public int GetLineIndexFromCharacterIndex(int charIndex, bool trailingEdge)
         {
             if (charIndex < 0)
@@ -327,7 +321,7 @@ namespace Avalonia.Media.TextFormatting
                     continue;
                 }
 
-                if (charIndex >= textLine.FirstTextSourceIndex && 
+                if (charIndex >= textLine.FirstTextSourceIndex &&
                     charIndex <= textLine.FirstTextSourceIndex + textLine.Length - (trailingEdge ? 0 : 1))
                 {
                     return index;
@@ -398,7 +392,7 @@ namespace Avalonia.Media.TextFormatting
         /// <param name="left">The current left.</param>
         /// <param name="width">The current width.</param>
         /// <param name="height">The current height.</param>
-        private static void UpdateBounds(TextLine textLine,ref double left,  ref double width, ref double height)
+        private static void UpdateBounds(TextLine textLine, ref double left, ref double width, ref double height)
         {
             var lineWidth = textLine.WidthIncludingTrailingWhitespace;
 
@@ -421,7 +415,7 @@ namespace Avalonia.Media.TextFormatting
             {
                 var textLine = TextFormatterImpl.CreateEmptyTextLine(0, double.PositiveInfinity, _paragraphProperties);
 
-                Bounds = new Rect(0,0,0, textLine.Height);
+                Bounds = new Rect(0, 0, 0, textLine.Height);
 
                 return new List<TextLine> { textLine };
             }
@@ -439,9 +433,9 @@ namespace Avalonia.Media.TextFormatting
                 var textLine = TextFormatter.Current.FormatLine(_textSource, _textSourceLength, MaxWidth,
                     _paragraphProperties, previousLine?.TextLineBreak);
 
-                if(textLine == null || textLine.Length == 0 || textLine.TextRuns.Count == 0 && textLine.TextLineBreak?.TextEndOfLine is TextEndOfParagraph)
+                if (textLine == null || textLine.Length == 0 || textLine.TextRuns.Count == 0 && textLine.TextLineBreak?.TextEndOfLine is TextEndOfParagraph)
                 {
-                    if(previousLine != null && previousLine.NewLineLength  > 0)
+                    if (previousLine != null && previousLine.NewLineLength > 0)
                     {
                         var emptyTextLine = TextFormatterImpl.CreateEmptyTextLine(_textSourceLength, MaxWidth, _paragraphProperties);
 
@@ -454,7 +448,7 @@ namespace Avalonia.Media.TextFormatting
                 }
 
                 _textSourceLength += textLine.Length;
-                
+
                 //Fulfill max height constraint
                 if (textLines.Count > 0 && !double.IsPositiveInfinity(MaxHeight) && height + textLine.Height > MaxHeight)
                 {
@@ -490,7 +484,7 @@ namespace Avalonia.Media.TextFormatting
             }
 
             //Make sure the TextLayout always contains at least on empty line
-            if(textLines.Count == 0)
+            if (textLines.Count == 0)
             {
                 var textLine = TextFormatterImpl.CreateEmptyTextLine(0, MaxWidth, _paragraphProperties);
 
@@ -501,7 +495,7 @@ namespace Avalonia.Media.TextFormatting
 
             Bounds = new Rect(left, 0, width, height);
 
-            if(_paragraphProperties.TextAlignment == TextAlignment.Justify)
+            if (_paragraphProperties.TextAlignment == TextAlignment.Justify)
             {
                 var whitespaceWidth = 0d;
 
@@ -509,7 +503,7 @@ namespace Avalonia.Media.TextFormatting
                 {
                     var lineWhitespaceWidth = line.Width - line.WidthIncludingTrailingWhitespace;
 
-                    if(lineWhitespaceWidth > whitespaceWidth)
+                    if (lineWhitespaceWidth > whitespaceWidth)
                     {
                         whitespaceWidth = lineWhitespaceWidth;
                     }
@@ -517,7 +511,7 @@ namespace Avalonia.Media.TextFormatting
 
                 var justificationWidth = width - whitespaceWidth;
 
-                if(justificationWidth > 0)
+                if (justificationWidth > 0)
                 {
                     var justificationProperties = new InterWordJustification(justificationWidth);
 
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs b/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
index f4a0324d90..67c8f0c88c 100644
--- a/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
@@ -317,7 +317,7 @@ namespace Avalonia.Media.TextFormatting
                     {
                         currentGlyphRun = shapedTextCharacters.GlyphRun;
 
-                        if (currentPosition + remainingLength < currentPosition + currentRun.Text.Length)
+                        if (currentPosition + remainingLength <= currentPosition + currentRun.Text.Length)
                         {
                             characterHit = new CharacterHit(currentRun.Text.Start + remainingLength);
 
@@ -524,27 +524,30 @@ namespace Avalonia.Media.TextFormatting
                     characterLength = NewLineLength;
                 }
 
-                var runwidth = endX - startX;
-                var currentRunBounds = new TextRunBounds(new Rect(startX, 0, runwidth, Height), currentPosition, characterLength, currentRun);
+                var runWidth = endX - startX;
+                var currentRunBounds = new TextRunBounds(new Rect(startX, 0, runWidth, Height), currentPosition, characterLength, currentRun);
 
-                if (lastDirection == currentDirection && result.Count > 0 && MathUtilities.AreClose(currentRect.Right, startX))
+                if (!MathUtilities.IsZero(runWidth) || NewLineLength > 0)
                 {
-                    currentRect = currentRect.WithWidth(currentWidth + runwidth);
+                    if (lastDirection == currentDirection && result.Count > 0 && MathUtilities.AreClose(currentRect.Right, startX))
+                    {
+                        currentRect = currentRect.WithWidth(currentWidth + runWidth);
 
-                    var textBounds = result[result.Count - 1];
+                        var textBounds = result[result.Count - 1];
 
-                    textBounds.Rectangle = currentRect;
+                        textBounds.Rectangle = currentRect;
 
-                    textBounds.TextRunBounds.Add(currentRunBounds);
-                }
-                else
-                {
-                    currentRect = currentRunBounds.Rectangle;
+                        textBounds.TextRunBounds.Add(currentRunBounds);
+                    }
+                    else
+                    {
+                        currentRect = currentRunBounds.Rectangle;
 
-                    result.Add(new TextBounds(currentRect, currentDirection, new List<TextRunBounds> { currentRunBounds }));
+                        result.Add(new TextBounds(currentRect, currentDirection, new List<TextRunBounds> { currentRunBounds }));
+                    }
                 }
 
-                currentWidth += runwidth;
+                currentWidth += runWidth;
                 currentPosition += characterLength;
 
                 if (currentPosition > characterIndex)
@@ -671,22 +674,25 @@ namespace Avalonia.Media.TextFormatting
 
                 var currentRunBounds = new TextRunBounds(new Rect(Start + startX, 0, runWidth, Height), currentPosition, characterLength, currentRun);
 
-                if (lastDirection == currentDirection && result.Count > 0 && MathUtilities.AreClose(currentRect.Right, Start + startX))
+                if(!MathUtilities.IsZero(runWidth) || NewLineLength > 0)
                 {
-                    currentRect = currentRect.WithWidth(currentWidth + runWidth);
+                    if (lastDirection == currentDirection && result.Count > 0 && MathUtilities.AreClose(currentRect.Right, Start + startX))
+                    {
+                        currentRect = currentRect.WithWidth(currentWidth + runWidth);
 
-                    var textBounds = result[result.Count - 1];
+                        var textBounds = result[result.Count - 1];
 
-                    textBounds.Rectangle = currentRect;
+                        textBounds.Rectangle = currentRect;
 
-                    textBounds.TextRunBounds.Add(currentRunBounds);
-                }
-                else
-                {
-                    currentRect = currentRunBounds.Rectangle;
+                        textBounds.TextRunBounds.Add(currentRunBounds);
+                    }
+                    else
+                    {
+                        currentRect = currentRunBounds.Rectangle;
 
-                    result.Add(new TextBounds(currentRect, currentDirection, new List<TextRunBounds> { currentRunBounds }));
-                }
+                        result.Add(new TextBounds(currentRect, currentDirection, new List<TextRunBounds> { currentRunBounds }));
+                    }
+                }               
 
                 currentWidth += runWidth;
                 currentPosition += characterLength;
@@ -705,6 +711,8 @@ namespace Avalonia.Media.TextFormatting
                 }
             }
 
+            result.Reverse();
+
             return result;
         }
 
diff --git a/src/Avalonia.Controls/RichTextBlock.cs b/src/Avalonia.Controls/RichTextBlock.cs
index 2b84113497..6a40144137 100644
--- a/src/Avalonia.Controls/RichTextBlock.cs
+++ b/src/Avalonia.Controls/RichTextBlock.cs
@@ -41,9 +41,6 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<IBrush?> SelectionBrushProperty =
             AvaloniaProperty.Register<RichTextBlock, IBrush?>(nameof(SelectionBrush), Brushes.Blue);
 
-        public static readonly StyledProperty<IBrush?> SelectionForegroundBrushProperty =
-            AvaloniaProperty.Register<RichTextBlock, IBrush?>(nameof(SelectionForegroundBrush));
-
         /// <summary>
         /// Defines the <see cref="Inlines"/> property.
         /// </summary>
@@ -68,7 +65,7 @@ namespace Avalonia.Controls
         {
             FocusableProperty.OverrideDefaultValue(typeof(RichTextBlock), true);
 
-            AffectsRender<RichTextBlock>(SelectionStartProperty, SelectionEndProperty, SelectionForegroundBrushProperty, SelectionBrushProperty);
+            AffectsRender<RichTextBlock>(SelectionStartProperty, SelectionEndProperty, SelectionBrushProperty);
         }
 
         public RichTextBlock()
@@ -89,15 +86,6 @@ namespace Avalonia.Controls
             set => SetValue(SelectionBrushProperty, value);
         }
 
-        /// <summary>
-        /// Gets or sets a value that defines the brush used for selected text.
-        /// </summary>
-        public IBrush? SelectionForegroundBrush
-        {
-            get => GetValue(SelectionForegroundBrushProperty);
-            set => SetValue(SelectionForegroundBrushProperty, value);
-        }
-
         /// <summary>
         /// Gets or sets a character index for the beginning of the current selection.
         /// </summary>
@@ -198,7 +186,7 @@ namespace Avalonia.Controls
             }
         }
 
-        public override void Render(DrawingContext context)
+        protected override void RenderTextLayout(DrawingContext context, Point origin)
         {
             var selectionStart = SelectionStart;
             var selectionEnd = SelectionEnd;
@@ -213,13 +201,16 @@ namespace Avalonia.Controls
 
                 var rects = TextLayout.HitTestTextRange(start, length);
 
-                foreach (var rect in rects)
+                using (context.PushPostTransform(Matrix.CreateTranslation(origin)))
                 {
-                    context.FillRectangle(selectionBrush, PixelRect.FromRect(rect, 1).ToRect(1));
+                    foreach (var rect in rects)
+                    {
+                        context.FillRectangle(selectionBrush, PixelRect.FromRect(rect, 1).ToRect(1));
+                    }
                 }
             }
 
-            base.Render(context);
+            base.RenderTextLayout(context, origin);
         }
 
         /// <summary>
@@ -280,8 +271,9 @@ namespace Avalonia.Controls
         /// <returns>A <see cref="TextLayout"/> object.</returns>
         protected override TextLayout CreateTextLayout(string? text)
         {
+            var typeface = new Typeface(FontFamily, FontStyle, FontWeight, FontStretch);
             var defaultProperties = new GenericTextRunProperties(
-                new Typeface(FontFamily, FontStyle, FontWeight, FontStretch),
+                typeface,
                 FontSize,
                 TextDecorations,
                 Foreground);
@@ -328,6 +320,8 @@ namespace Avalonia.Controls
 
         protected override void OnKeyDown(KeyEventArgs e)
         {
+            base.OnKeyDown(e);
+
             var handled = false;
             var modifiers = e.KeyModifiers;
             var keymap = AvaloniaLocator.Current.GetRequiredService<PlatformHotkeyConfiguration>();
@@ -346,6 +340,8 @@ namespace Avalonia.Controls
 
         protected override void OnPointerPressed(PointerPressedEventArgs e)
         {
+            base.OnPointerPressed(e);
+
             if (!IsTextSelectionEnabled)
             {
                 return;
@@ -356,7 +352,9 @@ namespace Avalonia.Controls
 
             if (text != null && clickInfo.Properties.IsLeftButtonPressed)
             {
-                var point = e.GetPosition(this);
+                var padding = Padding;
+
+                var point = e.GetPosition(this) - new Point(padding.Left, padding.Top);
 
                 var clickToSelect = e.KeyModifiers.HasFlag(KeyModifiers.Shift);
 
@@ -403,6 +401,8 @@ namespace Avalonia.Controls
 
         protected override void OnPointerMoved(PointerEventArgs e)
         {
+            base.OnPointerMoved(e);
+
             if (!IsTextSelectionEnabled)
             {
                 return;
@@ -411,11 +411,13 @@ namespace Avalonia.Controls
             // selection should not change during pointer move if the user right clicks
             if (e.Pointer.Captured == this && e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
             {
-                var point = e.GetPosition(this);
+                var padding = Padding;
+
+                var point = e.GetPosition(this) - new Point(padding.Left, padding.Top);
 
                 point = new Point(
-                    MathUtilities.Clamp(point.X, 0, Math.Max(Bounds.Width - 1, 0)),
-                    MathUtilities.Clamp(point.Y, 0, Math.Max(Bounds.Height - 1, 0)));
+                    MathUtilities.Clamp(point.X, 0, Math.Max(TextLayout.Bounds.Width, 0)),
+                    MathUtilities.Clamp(point.Y, 0, Math.Max(TextLayout.Bounds.Width, 0)));
 
                 var hit = TextLayout.HitTestPoint(point);
 
@@ -425,6 +427,8 @@ namespace Avalonia.Controls
 
         protected override void OnPointerReleased(PointerReleasedEventArgs e)
         {
+            base.OnPointerReleased(e);
+
             if (!IsTextSelectionEnabled)
             {
                 return;
@@ -437,7 +441,9 @@ namespace Avalonia.Controls
 
             if (e.InitialPressMouseButton == MouseButton.Right)
             {
-                var point = e.GetPosition(this);
+                var padding = Padding;
+
+                var point = e.GetPosition(this) - new Point(padding.Left, padding.Top);
 
                 var hit = TextLayout.HitTestPoint(point);
 
@@ -470,11 +476,6 @@ namespace Avalonia.Controls
                         InvalidateTextLayout();
                         break;
                     }
-                case nameof(TextProperty):
-                    {
-                        InvalidateTextLayout();
-                        break;
-                    }
             }
         }
 
diff --git a/src/Avalonia.Controls/TextBlock.cs b/src/Avalonia.Controls/TextBlock.cs
index 52261d1c76..baa722a8fe 100644
--- a/src/Avalonia.Controls/TextBlock.cs
+++ b/src/Avalonia.Controls/TextBlock.cs
@@ -509,7 +509,12 @@ namespace Avalonia.Controls
                 }
             }
 
-            TextLayout.Draw(context, new Point(padding.Left, top));
+            RenderTextLayout(context, new Point(padding.Left, top));
+        }
+
+        protected virtual void RenderTextLayout(DrawingContext context, Point origin)
+        {
+            TextLayout.Draw(context, origin);
         }
 
         protected virtual string? GetText()
diff --git a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs
index 631d0881b0..1241141ccf 100644
--- a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs
+++ b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs
@@ -910,6 +910,51 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
             }
         }
 
+        [Fact]
+        public void Should_Get_CharacterHit_From_Distance_RTL()
+        {
+            using (Start())
+            { 
+                var text = "أَبْجَدِيَّة عَرَبِيَّة";
+
+                var layout = new TextLayout(
+                  text,
+                  Typeface.Default,
+                  12,
+                  Brushes.Black);
+
+                var textLine = layout.TextLines[0];
+
+                var firstRun = textLine.TextRuns[0] as ShapedTextCharacters;
+
+                var firstCluster = firstRun.ShapedBuffer.GlyphClusters[0];
+
+                var characterHit = textLine.GetCharacterHitFromDistance(0);
+
+                Assert.Equal(firstCluster, characterHit.FirstCharacterIndex);
+
+                Assert.Equal(text.Length, characterHit.FirstCharacterIndex + characterHit.TrailingLength);
+
+                var distance = textLine.GetDistanceFromCharacterHit(characterHit);
+
+                Assert.Equal(0, distance);
+
+                distance = textLine.GetDistanceFromCharacterHit(new CharacterHit(characterHit.FirstCharacterIndex));
+
+                var firstAdvance = firstRun.ShapedBuffer.GlyphAdvances[0];
+
+                Assert.Equal(firstAdvance, distance);
+
+                var rect = layout.HitTestTextPosition(22);
+
+                Assert.Equal(firstAdvance, rect.Left);
+
+                rect = layout.HitTestTextPosition(23);
+
+                Assert.Equal(0, rect.Left);
+            }
+        }
+
         private static IDisposable Start()
         {
             var disposable = UnitTestApplication.Start(TestServices.MockPlatformRenderInterface
diff --git a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLineTests.cs b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLineTests.cs
index 58cb84c4a4..d744ede87d 100644
--- a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLineTests.cs
+++ b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLineTests.cs
@@ -867,28 +867,29 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
 
                 var textBounds = textLine.GetTextBounds(0, 4);
 
-                var firstRun = textLine.TextRuns[1] as ShapedTextCharacters;
+                var secondRun = textLine.TextRuns[1] as ShapedTextCharacters;
 
                 Assert.Equal(1, textBounds.Count);
-                Assert.Equal(firstRun.Size.Width, textBounds.Sum(x => x.Rectangle.Width));
+                Assert.Equal(secondRun.Size.Width, textBounds.Sum(x => x.Rectangle.Width));
 
                 textBounds = textLine.GetTextBounds(4, 3);
 
-                var secondRun = textLine.TextRuns[0] as ShapedTextCharacters;
+                var firstRun = textLine.TextRuns[0] as ShapedTextCharacters;
 
                 Assert.Equal(1, textBounds.Count);
 
                 Assert.Equal(3, textBounds[0].TextRunBounds.Sum(x=> x.Length));
-                Assert.Equal(secondRun.Size.Width, textBounds.Sum(x => x.Rectangle.Width));
+                Assert.Equal(firstRun.Size.Width, textBounds.Sum(x => x.Rectangle.Width));
 
                 textBounds = textLine.GetTextBounds(0, 5);
 
                 Assert.Equal(2, textBounds.Count);
                 Assert.Equal(5, textBounds.Sum(x=> x.TextRunBounds.Sum(x => x.Length)));
 
-                Assert.Equal(firstRun.Size.Width, textBounds[0].Rectangle.Width);
-                Assert.Equal(7.201171875, textBounds[1].Rectangle.Width);
-                Assert.Equal(textLine.Start + 7.201171875, textBounds[1].Rectangle.Right);
+                Assert.Equal(secondRun.Size.Width, textBounds[1].Rectangle.Width);
+                Assert.Equal(7.201171875, textBounds[0].Rectangle.Width);
+                Assert.Equal(textLine.Start + 7.201171875, textBounds[0].Rectangle.Right);
+                Assert.Equal(textLine.Start + firstRun.Size.Width, textBounds[1].Rectangle.Left);
 
                 textBounds = textLine.GetTextBounds(0, text.Length);
 
@@ -896,7 +897,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                 Assert.Equal(7, textBounds.Sum(x => x.TextRunBounds.Sum(x => x.Length)));
                 Assert.Equal(textLine.WidthIncludingTrailingWhitespace, textBounds.Sum(x => x.Rectangle.Width));
             }
-        }
+        }       
 
         private class FixedRunsTextSource : ITextSource
         {

From 51469dcd585b3c4bc773612a7788dbfa36ebb2ce Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Mon, 11 Jul 2022 17:20:05 +0200
Subject: [PATCH 112/240] Fix ButtonSpinner borders.

---
 .../Controls/ButtonSpinner.xaml               | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml b/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml
index 980ea02a73..44cedd175a 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml
@@ -23,8 +23,7 @@
                        AllowSpin="False"/>
         <ButtonSpinner ShowButtonSpinner="False"
                        Content="Hide spinner" />
-        <ButtonSpinner Content="Error"
-                       AllowSpin="False">
+        <ButtonSpinner Content="Error">
           <DataValidationErrors.Error>
             <sys:Exception>
               <x:Arguments>
@@ -46,6 +45,9 @@
     <Setter Property="CornerRadius" Value="0"/>
     <Setter Property="MinWidth" Value="34" />
     <Setter Property="VerticalAlignment" Value="Stretch" />
+    <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="BorderBrush" Value="{TemplateBinding BorderBrush}" />
+    </Style>
   </ControlTheme>
 
   <ControlTheme x:Key="{x:Type ButtonSpinner}" TargetType="ButtonSpinner">
@@ -76,8 +78,10 @@
                           Orientation="Horizontal"
                           IsVisible="{TemplateBinding ShowButtonSpinner}">
                 <RepeatButton Name="PART_IncreaseButton"
+                              Theme="{StaticResource FluentButtonSpinnerRepeatButton}"
                               Background="{TemplateBinding Background}"
-                              BorderThickness="0"
+                              BorderBrush="{TemplateBinding BorderBrush}"
+                              BorderThickness="{TemplateBinding BorderThickness, Converter={StaticResource ButtonSpinnerLeftThickness}}"
                               CornerRadius="0"
                               VerticalAlignment="Stretch"
                               VerticalContentAlignment="Center"
@@ -93,13 +97,11 @@
                         Data="{StaticResource ButtonSpinnerIncreaseButtonIcon}" />
                 </RepeatButton>
 
-                <Border BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness, Converter={StaticResource ButtonSpinnerRightThickness}}"
-                        VerticalAlignment="Stretch"/>
-
                 <RepeatButton Name="PART_DecreaseButton"
+                              Theme="{StaticResource FluentButtonSpinnerRepeatButton}"
                               Background="{TemplateBinding Background}"
-                              BorderThickness="0"
+                              BorderBrush="{TemplateBinding BorderBrush}"
+                              BorderThickness="{TemplateBinding BorderThickness, Converter={StaticResource ButtonSpinnerLeftThickness}}"
                               CornerRadius="0"
                               VerticalAlignment="Stretch"
                               VerticalContentAlignment="Center"
@@ -118,8 +120,6 @@
 
               <ContentPresenter Name="PART_ContentPresenter"
                                 Grid.Column="1"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness, Converter={StaticResource ButtonSpinnerRightThickness}}"
                                 ContentTemplate="{TemplateBinding ContentTemplate}"
                                 Content="{TemplateBinding Content}"
                                 HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
@@ -134,8 +134,8 @@
       <Style Selector="^ /template/ StackPanel#PART_SpinnerPanel">
         <Setter Property="DockPanel.Dock" Value="Left"/>
       </Style>
-      <Style Selector="^ /template/ ContentPresenter">
-        <Setter Property="BorderThickness" Value="{TemplateBinding BorderThickness, Converter={StaticResource ButtonSpinnerLeftThickness}}" />
+      <Style Selector="^ /template/ RepeatButton">
+        <Setter Property="BorderThickness" Value="{TemplateBinding BorderThickness, Converter={StaticResource ButtonSpinnerRightThickness}}"/>
       </Style>
     </Style>
     <Style Selector="^:error">

From 84a3d9ca1f609d50b53f7878fbe327399ee21d92 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Mon, 11 Jul 2022 17:29:13 +0200
Subject: [PATCH 113/240] Use theme default CornerRadius.

When "Rounded" checkbox isn't checked.
---
 samples/ControlCatalog/ViewModels/ExpanderPageViewModel.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/samples/ControlCatalog/ViewModels/ExpanderPageViewModel.cs b/samples/ControlCatalog/ViewModels/ExpanderPageViewModel.cs
index 18511a6071..aa7f710ee0 100644
--- a/samples/ControlCatalog/ViewModels/ExpanderPageViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/ExpanderPageViewModel.cs
@@ -5,10 +5,10 @@ namespace ControlCatalog.ViewModels
 {
     public class ExpanderPageViewModel : ViewModelBase
     {
-        private CornerRadius _cornerRadius;
+        private object _cornerRadius = AvaloniaProperty.UnsetValue;
         private bool _rounded;
 
-        public CornerRadius CornerRadius
+        public object CornerRadius
         {
             get => _cornerRadius;
             private set => RaiseAndSetIfChanged(ref _cornerRadius, value);
@@ -20,7 +20,7 @@ namespace ControlCatalog.ViewModels
             set
             {
                 if (RaiseAndSetIfChanged(ref _rounded, value))
-                    CornerRadius = _rounded ? new CornerRadius(25) : default;
+                    CornerRadius = _rounded ? new CornerRadius(25) : AvaloniaProperty.UnsetValue;
             }
         }
     }

From a9925f928c7cfd817b1aac542a2242e0e6fa5238 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Mon, 11 Jul 2022 23:11:44 +0200
Subject: [PATCH 114/240] Make Separator look correct.

Previously there was a `MenuItem > Separator` selector, but I don't really see any reason to just apply this style directly to `Separator` itself. It's mainly used in menus and if one wants to use it elsewhere then they'd need to set these properties anyway.
---
 src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml  | 5 ++---
 src/Avalonia.Themes.Fluent/Controls/Separator.xaml | 4 ++++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml b/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
index 8f77d1bc1b..ed29addbc2 100644
--- a/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
@@ -26,6 +26,7 @@
           <MenuItem Header="Child 1"/>
           <MenuItem Header="Child 2"/>
           <MenuItem Header="Child 3"/>
+          <Separator/>
           <MenuItem Header="Child 4"/>
           <MenuItem Header="Child 5"/>
           <MenuItem Header="Child 6"/>
@@ -204,9 +205,7 @@
     <Style Selector="^:separator">
       <Setter Property="Template">
         <ControlTemplate>
-          <Separator Background="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
-                     Margin="{DynamicResource MenuFlyoutSeparatorThemePadding}"
-                     Height="{DynamicResource MenuFlyoutSeparatorThemeHeight}"/>
+          <Separator/>
         </ControlTemplate>
       </Setter>
     </Style>
diff --git a/src/Avalonia.Themes.Fluent/Controls/Separator.xaml b/src/Avalonia.Themes.Fluent/Controls/Separator.xaml
index afbc3770c1..d13bffe5e1 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Separator.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Separator.xaml
@@ -1,7 +1,11 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <ControlTheme x:Key="{x:Type Separator}" TargetType="Separator">
+    <Setter Property="Background" Value="{DynamicResource SystemControlForegroundBaseMediumLowBrush}" />
     <Setter Property="Focusable" Value="False" />
+    <Setter Property="Height" Value="{DynamicResource MenuFlyoutSeparatorThemeHeight}" />
+    <Setter Property="HorizontalAlignment" Value="Stretch" />
+    <Setter Property="Margin" Value="{DynamicResource MenuFlyoutSeparatorThemePadding}" />
     <Setter Property="Template">
       <ControlTemplate>
         <Border Padding="{TemplateBinding Margin}"

From 90a562c1f8b79431ad2bc66755a41078b6890056 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Wed, 13 Jul 2022 01:05:03 +0200
Subject: [PATCH 115/240] Fix ButtonSpinner disabled icon color.

---
 .../Controls/ButtonSpinner.xaml               | 21 +++++++------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml b/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml
index 44cedd175a..855dc5363e 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml
@@ -47,6 +47,7 @@
     <Setter Property="VerticalAlignment" Value="Stretch" />
     <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
       <Setter Property="BorderBrush" Value="{TemplateBinding BorderBrush}" />
+      <Setter Property="Foreground" Value="{DynamicResource RepeatButtonForegroundDisabled}"/>
     </Style>
   </ControlTheme>
 
@@ -88,13 +89,9 @@
                               Foreground="{TemplateBinding Foreground}"
                               FontSize="{TemplateBinding FontSize}"
                               MinWidth="34">
-                  <Path Fill="{TemplateBinding Foreground}"
-                        Width="16"
-                        Height="8"
-                        Stretch="Uniform"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        Data="{StaticResource ButtonSpinnerIncreaseButtonIcon}" />
+                  <PathIcon Width="16"
+                            Height="8"
+                            Data="{StaticResource ButtonSpinnerIncreaseButtonIcon}" />
                 </RepeatButton>
 
                 <RepeatButton Name="PART_DecreaseButton"
@@ -108,13 +105,9 @@
                               Foreground="{TemplateBinding Foreground}"
                               FontSize="{TemplateBinding FontSize}"
                               MinWidth="34">
-                  <Path Fill="{TemplateBinding Foreground}"
-                        Width="16"
-                        Height="8"
-                        Stretch="Uniform"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        Data="{StaticResource ButtonSpinnerDecreaseButtonIcon}" />
+                  <PathIcon Width="16"
+                            Height="8"
+                            Data="{StaticResource ButtonSpinnerDecreaseButtonIcon}" />
                 </RepeatButton>
               </StackPanel>
 

From 68ac06d3a740f7ffef488e7b4aa69607fd880f99 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Tue, 12 Jul 2022 21:21:09 -0400
Subject: [PATCH 116/240] Remove duplicated ItemsPanel on hamburger menu

---
 samples/SampleControls/HamburgerMenu/HamburgerMenu.xaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/samples/SampleControls/HamburgerMenu/HamburgerMenu.xaml b/samples/SampleControls/HamburgerMenu/HamburgerMenu.xaml
index 73f8e480f5..fbc51414e3 100644
--- a/samples/SampleControls/HamburgerMenu/HamburgerMenu.xaml
+++ b/samples/SampleControls/HamburgerMenu/HamburgerMenu.xaml
@@ -170,8 +170,7 @@
                   <ItemsPresenter Name="PART_ItemsPresenter"
                                   HorizontalAlignment="Stretch"
                                   ItemTemplate="{TemplateBinding ItemTemplate}"
-                                  Items="{TemplateBinding Items}"
-                                  ItemsPanel="{TemplateBinding ItemsPanel}">
+                                  Items="{TemplateBinding Items}">
                     <ItemsPresenter.ItemsPanel>
                       <ItemsPanelTemplate>
                         <StackPanel x:Name="HamburgerItemsPanel"

From 1eaf6cc607b54b87f691fb2d396c0f2cb13d9744 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Wed, 13 Jul 2022 10:24:47 +0200
Subject: [PATCH 117/240] Prevent crash when switching themes.

---
 src/Avalonia.Base/StyledElement.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Base/StyledElement.cs b/src/Avalonia.Base/StyledElement.cs
index ecf5d95ffc..3a42e9bdfe 100644
--- a/src/Avalonia.Base/StyledElement.cs
+++ b/src/Avalonia.Base/StyledElement.cs
@@ -873,9 +873,12 @@ namespace Avalonia
 
                     if (applied.Source == styles[i])
                     {
-                        applied.Dispose();
                         _appliedStyles.RemoveAt(j);
+                        applied.Dispose();
                     }
+
+                    if (j > _appliedStyles.Count)
+                        j = _appliedStyles.Count;
                 }
             }
         }

From fb49040fbed8c25f10649056193a41f14ba97008 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Wed, 13 Jul 2022 12:04:03 +0200
Subject: [PATCH 118/240] Added some ControlTheme benchmarks.

---
 .../Styling/ControlTheme_Apply.cs             | 147 ++++++++++++++++++
 1 file changed, 147 insertions(+)
 create mode 100644 tests/Avalonia.Benchmarks/Styling/ControlTheme_Apply.cs

diff --git a/tests/Avalonia.Benchmarks/Styling/ControlTheme_Apply.cs b/tests/Avalonia.Benchmarks/Styling/ControlTheme_Apply.cs
new file mode 100644
index 0000000000..0c9bcf412f
--- /dev/null
+++ b/tests/Avalonia.Benchmarks/Styling/ControlTheme_Apply.cs
@@ -0,0 +1,147 @@
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Templates;
+using Avalonia.Media;
+using Avalonia.Styling;
+using BenchmarkDotNet.Attributes;
+
+#nullable enable
+
+namespace Avalonia.Benchmarks.Styling
+{
+    [MemoryDiagnoser]
+    public class ControlTheme_Apply
+    {
+        private ControlTheme _theme;
+        private ControlTheme _otherTheme;
+        private List<Style> _styles = new();
+
+        public ControlTheme_Apply()
+        {
+            RuntimeHelpers.RunClassConstructor(typeof(TestControl).TypeHandle);
+
+            _theme = CreateControlTheme(Brushes.Red);
+            _otherTheme = CreateControlTheme(Brushes.Orange);
+
+            for (var i = 0; i < 100; ++i)
+            {
+                _styles.Add(new Style(x => x.OfType<TestControl>())
+                {
+                    Setters = { new Setter(TestControl.BackgroundProperty, Brushes.Yellow) }
+                });
+            }
+        }
+
+        [Benchmark]
+        public void Apply_Control_Theme()
+        {
+            var target = new TestControl();
+
+            target.BeginBatchUpdate();
+
+            _theme.TryAttach(target, null);
+            target.ApplyTemplate();
+            _theme.TryAttach(target.VisualChild, null);
+
+            target.EndBatchUpdate();
+        }
+
+
+        [Benchmark]
+        public void Apply_Remove_Control_Theme()
+        {
+            var target = new TestControl();
+
+            target.BeginBatchUpdate();
+
+            _theme.TryAttach(target, null);
+            target.ApplyTemplate();
+            _theme.TryAttach(target.VisualChild, null);
+
+            target.EndBatchUpdate();
+
+            // Switching to another theme will cause the current theme to be removed but won't
+            // immediately apply the new theme, so for the benefit of the benchmark it has the
+            // effect of simply removing the theme.
+            target.Theme = _otherTheme;
+        }
+
+        [Benchmark]
+        public void Apply_Control_Theme_With_Styles()
+        {
+            var target = new TestControl();
+
+            target.BeginBatchUpdate();
+
+            _theme.TryAttach(target, null);
+            target.ApplyTemplate();
+            _theme.TryAttach(target.VisualChild, null);
+
+            foreach (var style in _styles)
+                style.TryAttach(target, null);
+
+            target.EndBatchUpdate();
+        }
+
+        [Benchmark]
+        public void Apply_Remove_Control_Theme_With_Styles()
+        {
+            var target = new TestControl();
+
+            target.BeginBatchUpdate();
+
+            _theme.TryAttach(target, null);
+            target.ApplyTemplate();
+            _theme.TryAttach(target.VisualChild, null);
+
+            foreach (var style in _styles)
+                style.TryAttach(target, null);
+
+            target.EndBatchUpdate();
+
+            // Switching to another theme will cause the current theme to be removed but won't
+            // immediately apply the new theme, so for the benefit of the benchmark it has the
+            // effect of simply removing the theme.
+            target.Theme = _otherTheme;
+        }
+
+        private static ControlTheme CreateControlTheme(IBrush background)
+        {
+            return new ControlTheme(typeof(TestControl))
+            {
+                Setters =
+                {
+                    new Setter(TestControl.BackgroundProperty, Brushes.Transparent),
+                    new Setter(TestControl.TemplateProperty, new FuncControlTemplate<TestControl>((_, x) =>
+                        new Border())),
+                },
+                Children =
+                {
+                    new Style(x => x.Nesting().Template().OfType<Border>())
+                    {
+                        Setters = { new Setter(TestControl.BackgroundProperty, Brushes.Red), }
+                    },
+                    new Style(x => x.Nesting().Class(":pointerover").Template().OfType<Border>())
+                    {
+                        Setters = { new Setter(TestControl.BackgroundProperty, Brushes.Green), }
+                    },
+                    new Style(x => x.Nesting().Class(":pressed").Template().OfType<Border>())
+                    {
+                        Setters = { new Setter(TestControl.BackgroundProperty, Brushes.Blue), }
+                    },
+                }
+            };
+        }
+
+        private class TestControl : TemplatedControl
+        {
+            public IStyleable VisualChild => (IStyleable)VisualChildren[0];
+        }
+
+        private class TestClass2 : Control
+        {
+        }
+    }
+}

From 7df34acb3d8e01c03fe39dc0fc3aec3c012c7b60 Mon Sep 17 00:00:00 2001
From: Benedikt Stebner <Gillibald@users.noreply.github.com>
Date: Wed, 13 Jul 2022 12:14:10 +0200
Subject: [PATCH 119/240] Update src/Avalonia.Base/Media/GlyphRun.cs

---
 src/Avalonia.Base/Media/GlyphRun.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Base/Media/GlyphRun.cs b/src/Avalonia.Base/Media/GlyphRun.cs
index 703b56b0e8..da2143c188 100644
--- a/src/Avalonia.Base/Media/GlyphRun.cs
+++ b/src/Avalonia.Base/Media/GlyphRun.cs
@@ -652,7 +652,7 @@ namespace Avalonia.Media
                 for (var index = 0; index < glyphCount; index++)
                 {
                     width -= GetGlyphAdvance(index, out _);
-                }             
+                }
             }
             else
             {

From 199d74332ae8cabb7c2ce3f56e5956372cd1d7d4 Mon Sep 17 00:00:00 2001
From: Benedikt Stebner <Gillibald@users.noreply.github.com>
Date: Wed, 13 Jul 2022 12:26:58 +0200
Subject: [PATCH 120/240] Add arabic test typeface

---
 .../Assets/NotoKufiArabic-Regular.ttf          | Bin 0 -> 122736 bytes
 .../Media/CustomFontManagerImpl.cs             |   4 +++-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 tests/Avalonia.RenderTests/Assets/NotoKufiArabic-Regular.ttf

diff --git a/tests/Avalonia.RenderTests/Assets/NotoKufiArabic-Regular.ttf b/tests/Avalonia.RenderTests/Assets/NotoKufiArabic-Regular.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..6d2ad86f947a530de5dec09b9a230948d0f512c3
GIT binary patch
literal 122736
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
V75=m<G8a<f$L=36aJ0DO`adrr^@RWc

literal 0
HcmV?d00001

diff --git a/tests/Avalonia.Skia.UnitTests/Media/CustomFontManagerImpl.cs b/tests/Avalonia.Skia.UnitTests/Media/CustomFontManagerImpl.cs
index 04b408a666..13cc14b03e 100644
--- a/tests/Avalonia.Skia.UnitTests/Media/CustomFontManagerImpl.cs
+++ b/tests/Avalonia.Skia.UnitTests/Media/CustomFontManagerImpl.cs
@@ -15,6 +15,8 @@ namespace Avalonia.Skia.UnitTests.Media
 
         private readonly Typeface _defaultTypeface =
             new Typeface("resm:Avalonia.Skia.UnitTests.Assets?assembly=Avalonia.Skia.UnitTests#Noto Mono");
+        private readonly Typeface _arabicTypeface =
+           new Typeface("resm:Avalonia.Skia.UnitTests.Assets?assembly=Avalonia.Skia.UnitTests#Noto Kufi Arabic");
         private readonly Typeface _italicTypeface =
             new Typeface("resm:Avalonia.Skia.UnitTests.Assets?assembly=Avalonia.Skia.UnitTests#Noto Sans", FontStyle.Italic);
         private readonly Typeface _emojiTypeface =
@@ -22,7 +24,7 @@ namespace Avalonia.Skia.UnitTests.Media
 
         public CustomFontManagerImpl()
         {
-            _customTypefaces = new[] { _emojiTypeface, _italicTypeface, _defaultTypeface };
+            _customTypefaces = new[] { _emojiTypeface, _italicTypeface, _arabicTypeface, _defaultTypeface };
             _defaultFamilyName = _defaultTypeface.FontFamily.FamilyNames.PrimaryFamilyName;
         }
 

From 6a882d97dc922c05de19cbe08ab4f8549598d1c7 Mon Sep 17 00:00:00 2001
From: Benedikt <b.stebner@outlook.de>
Date: Thu, 14 Jul 2022 06:22:53 +0200
Subject: [PATCH 121/240] Fix unit tests on mac

---
 .../Avalonia.Skia.UnitTests/Media/FontManagerImplTests.cs | 8 ++------
 .../Media/TextFormatting/TextLayoutTests.cs               | 8 ++++----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/tests/Avalonia.Skia.UnitTests/Media/FontManagerImplTests.cs b/tests/Avalonia.Skia.UnitTests/Media/FontManagerImplTests.cs
index df286d709e..649e1fbf3d 100644
--- a/tests/Avalonia.Skia.UnitTests/Media/FontManagerImplTests.cs
+++ b/tests/Avalonia.Skia.UnitTests/Media/FontManagerImplTests.cs
@@ -33,15 +33,11 @@ namespace Avalonia.Skia.UnitTests.Media
         {
             var fontManager = new FontManagerImpl();
 
-            //we need to have a valid font name different from the default one
-            string fontName = fontManager.GetInstalledFontFamilyNames().First();
-
             var glyphTypeface = (GlyphTypefaceImpl)fontManager.CreateGlyphTypeface(
-                new Typeface(new FontFamily($"A, B, {fontName}"), weight: FontWeight.Bold));
+                new Typeface(new FontFamily($"A, B, Arial"), weight: FontWeight.Bold));
 
             var skTypeface = glyphTypeface.Typeface;
-
-            Assert.Equal(fontName, skTypeface.FamilyName);
+            
             Assert.True(skTypeface.FontWeight >= 600);
         }
 
diff --git a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs
index 1241141ccf..7d33f094fa 100644
--- a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs
+++ b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs
@@ -925,7 +925,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
 
                 var textLine = layout.TextLines[0];
 
-                var firstRun = textLine.TextRuns[0] as ShapedTextCharacters;
+                var firstRun = (ShapedTextCharacters)textLine.TextRuns[0];
 
                 var firstCluster = firstRun.ShapedBuffer.GlyphClusters[0];
 
@@ -943,15 +943,15 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
 
                 var firstAdvance = firstRun.ShapedBuffer.GlyphAdvances[0];
 
-                Assert.Equal(firstAdvance, distance);
+                Assert.Equal(firstAdvance, distance, 5);
 
                 var rect = layout.HitTestTextPosition(22);
 
-                Assert.Equal(firstAdvance, rect.Left);
+                Assert.Equal(firstAdvance, rect.Left, 5);
 
                 rect = layout.HitTestTextPosition(23);
 
-                Assert.Equal(0, rect.Left);
+                Assert.Equal(0, rect.Left, 5);
             }
         }
 

From 3ad71d4beafd110cdb1023124877b5d7fdcdf2c6 Mon Sep 17 00:00:00 2001
From: Benedikt Stebner <Gillibald@users.noreply.github.com>
Date: Mon, 18 Jul 2022 18:13:35 +0200
Subject: [PATCH 122/240] Use IAddChild for TextBlock and RichTextBlock

---
 samples/Sandbox/MainWindow.axaml              |  9 +++
 .../Metadata}/IAddChild.cs                    |  4 +-
 src/Avalonia.Controls/Documents/Inline.cs     | 34 +++++++++-
 .../Documents/InlineCollection.cs             | 60 +++--------------
 src/Avalonia.Controls/Documents/Span.cs       | 34 ++--------
 .../Documents/TextElement.cs                  | 12 ++--
 src/Avalonia.Controls/RichTextBlock.cs        | 65 ++++++++++++++++---
 src/Avalonia.Controls/TextBlock.cs            | 13 ++--
 .../AvaloniaXamlIlLanguage.cs                 |  4 +-
 .../Avalonia.Markup.Xaml.csproj               |  1 -
 10 files changed, 127 insertions(+), 109 deletions(-)
 rename src/{Markup/Avalonia.Markup.Xaml => Avalonia.Base/Metadata}/IAddChild.cs (61%)

diff --git a/samples/Sandbox/MainWindow.axaml b/samples/Sandbox/MainWindow.axaml
index 6929f192c7..03f80d8fc7 100644
--- a/samples/Sandbox/MainWindow.axaml
+++ b/samples/Sandbox/MainWindow.axaml
@@ -1,4 +1,13 @@
 <Window xmlns="https://github.com/avaloniaui"
         xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
         x:Class="Sandbox.MainWindow">
+  <RichTextBlock Margin="10" TextWrapping="Wrap">
+    This <Span FontWeight="Bold">is</Span> a
+    <Span Background="Silver" Foreground="Maroon">TextBlock</Span>
+    with <Span TextDecorations="Underline">several</Span>
+    <Span FontStyle="Italic">Span</Span> elements,
+    <Span Foreground="Blue">
+      using a <Bold>variety</Bold> of <Italic>styles</Italic>
+    </Span>.
+  </RichTextBlock>
 </Window>
diff --git a/src/Markup/Avalonia.Markup.Xaml/IAddChild.cs b/src/Avalonia.Base/Metadata/IAddChild.cs
similarity index 61%
rename from src/Markup/Avalonia.Markup.Xaml/IAddChild.cs
rename to src/Avalonia.Base/Metadata/IAddChild.cs
index 993eb6142d..8ef02912a6 100644
--- a/src/Markup/Avalonia.Markup.Xaml/IAddChild.cs
+++ b/src/Avalonia.Base/Metadata/IAddChild.cs
@@ -1,11 +1,11 @@
-namespace Avalonia.Markup.Xaml
+namespace Avalonia.Metadata
 {
     public interface IAddChild
     {
         void AddChild(object child);
     }
 
-    public interface IAddChild<T> : IAddChild
+    public interface IAddChild<T>
     {
         void AddChild(T child);
     }
diff --git a/src/Avalonia.Controls/Documents/Inline.cs b/src/Avalonia.Controls/Documents/Inline.cs
index b400625903..47581e87f1 100644
--- a/src/Avalonia.Controls/Documents/Inline.cs
+++ b/src/Avalonia.Controls/Documents/Inline.cs
@@ -50,8 +50,38 @@ namespace Avalonia.Controls.Documents
 
         protected TextRunProperties CreateTextRunProperties()
         {
-            return new GenericTextRunProperties(new Typeface(FontFamily, FontStyle, FontWeight), FontSize,
-                TextDecorations, Foreground, Background, BaselineAlignment);
+            var textDecorations = TextDecorations;
+            var background = Background;
+
+            if(Parent is Inline inline)
+            {
+                if(textDecorations == null)
+                {
+                    textDecorations = inline.TextDecorations;
+                }
+
+                if(background == null)
+                {
+                    background = inline.Background;
+                }
+            }
+            
+            var fontStyle = FontStyle;
+
+            if(Parent is Italic)
+            {
+                fontStyle = FontStyle.Italic;
+            }
+
+            var fontWeight = FontWeight;
+
+            if(Parent is Bold)
+            {
+                fontWeight = FontWeight.Bold;
+            }
+
+            return new GenericTextRunProperties(new Typeface(FontFamily, fontStyle, fontWeight), FontSize,
+                textDecorations, Foreground, background, BaselineAlignment);
         }
         
         protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
diff --git a/src/Avalonia.Controls/Documents/InlineCollection.cs b/src/Avalonia.Controls/Documents/InlineCollection.cs
index dc688fc359..3d7a4b58d1 100644
--- a/src/Avalonia.Controls/Documents/InlineCollection.cs
+++ b/src/Avalonia.Controls/Documents/InlineCollection.cs
@@ -14,7 +14,6 @@ namespace Avalonia.Controls.Documents
     {
         private ILogical? _parent;
         private IInlineHost? _inlineHost;
-        private string? _text = string.Empty;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="InlineCollection"/> class.
@@ -22,7 +21,7 @@ namespace Avalonia.Controls.Documents
         public InlineCollection()
         {
             ResetBehavior = ResetBehavior.Remove;
-            
+
             this.ForEachItem(
                 x =>
                 {
@@ -36,16 +35,16 @@ namespace Avalonia.Controls.Documents
                     x.InlineHost = InlineHost;
                     Invalidate();
                 },
-                () => throw new NotSupportedException());         
+                () => throw new NotSupportedException());
         }
 
-        internal ILogical? Parent 
+        internal ILogical? Parent
         {
             get => _parent;
             set
             {
                 _parent = value;
-              
+
                 OnParentChanged(value);
             }
         }
@@ -61,8 +60,6 @@ namespace Avalonia.Controls.Documents
             }
         }
 
-        public bool HasComplexContent => Count > 0;
-
         /// <summary>
         /// Gets or adds the text held by the inlines collection.
         /// <remarks>
@@ -73,11 +70,6 @@ namespace Avalonia.Controls.Documents
         {
             get
             {
-                if (!HasComplexContent)
-                {
-                    return _text;
-                }
-
                 var builder = new StringBuilder();
 
                 foreach (var inline in this)
@@ -87,17 +79,7 @@ namespace Avalonia.Controls.Documents
 
                 return builder.ToString();
             }
-            set
-            {
-                if (HasComplexContent)
-                {
-                    Add(new Run(value));
-                }
-                else
-                {
-                    _text = value;
-                }
-            }
+
         }
 
         /// <summary>
@@ -110,36 +92,12 @@ namespace Avalonia.Controls.Documents
         /// <param name="text"></param>
         public void Add(string text)
         {
-            if (HasComplexContent)
-            {
-                Add(new Run(text));
-            }
-            else
-            {
-                _text = text;
-            }
+            Add(new Run(text));
         }
 
         public void Add(IControl child)
         {
-            var implicitRun = new InlineUIContainer(child);
-
-            Add(implicitRun);
-        }
-
-        public override void Add(Inline item)
-        {
-            if (!HasComplexContent)
-            {
-                if (!string.IsNullOrEmpty(_text))
-                {
-                    base.Add(new Run(_text));
-                }
-                             
-                _text = null;
-            }
-            
-            base.Add(item);
+            Add(new InlineUIContainer(child));
         }
 
         /// <summary>
@@ -152,7 +110,7 @@ namespace Avalonia.Controls.Documents
         /// </summary>
         protected void Invalidate()
         {
-            if(InlineHost != null)
+            if (InlineHost != null)
             {
                 InlineHost.Invalidate();
             }
@@ -162,7 +120,7 @@ namespace Avalonia.Controls.Documents
 
         private void OnParentChanged(ILogical? parent)
         {
-            foreach(var child in this)
+            foreach (var child in this)
             {
                 ((ISetLogicalParent)child).SetParent(parent);
             }
diff --git a/src/Avalonia.Controls/Documents/Span.cs b/src/Avalonia.Controls/Documents/Span.cs
index c7289dbc3f..3560996727 100644
--- a/src/Avalonia.Controls/Documents/Span.cs
+++ b/src/Avalonia.Controls/Documents/Span.cs
@@ -38,41 +38,17 @@ namespace Avalonia.Controls.Documents
 
         internal override void BuildTextRun(IList<TextRun> textRuns)
         {
-            if (Inlines.HasComplexContent)
+            foreach (var inline in Inlines)
             {
-                foreach (var inline in Inlines)
-                {
-                    inline.BuildTextRun(textRuns);
-                }
-            }
-            else
-            {
-                if (Inlines.Text is string text)
-                {
-                    var textRunProperties = CreateTextRunProperties();
-
-                    var textCharacters = new TextCharacters(text.AsMemory(), textRunProperties);
-
-                    textRuns.Add(textCharacters);
-                }
+                inline.BuildTextRun(textRuns);
             }
         }
 
         internal override void AppendText(StringBuilder stringBuilder)
         {
-            if (Inlines.HasComplexContent)
-            {
-                foreach (var inline in Inlines)
-                {
-                    inline.AppendText(stringBuilder);
-                }
-            }
-            else
+            foreach (var inline in Inlines)
             {
-                if (Inlines.Text is string text)
-                {
-                    stringBuilder.Append(text);
-                }
+                inline.AppendText(stringBuilder);
             }
         }
 
@@ -93,7 +69,7 @@ namespace Avalonia.Controls.Documents
         {
             base.OnInlineHostChanged(oldValue, newValue);
 
-            if(Inlines is not null)
+            if (Inlines is not null)
             {
                 Inlines.InlineHost = newValue;
             }
diff --git a/src/Avalonia.Controls/Documents/TextElement.cs b/src/Avalonia.Controls/Documents/TextElement.cs
index 5bac3642ed..2034f05fc0 100644
--- a/src/Avalonia.Controls/Documents/TextElement.cs
+++ b/src/Avalonia.Controls/Documents/TextElement.cs
@@ -18,7 +18,7 @@ namespace Avalonia.Controls.Documents
         /// Defines the <see cref="FontFamily"/> property.
         /// </summary>
         public static readonly AttachedProperty<FontFamily> FontFamilyProperty =
-            AvaloniaProperty.RegisterAttached<TextElement, Control, FontFamily>(
+            AvaloniaProperty.RegisterAttached<TextElement, TextElement, FontFamily>(
                 nameof(FontFamily),
                 defaultValue: FontFamily.Default,
                 inherits: true);
@@ -27,7 +27,7 @@ namespace Avalonia.Controls.Documents
         /// Defines the <see cref="FontSize"/> property.
         /// </summary>
         public static readonly AttachedProperty<double> FontSizeProperty =
-            AvaloniaProperty.RegisterAttached<TextElement, Control, double>(
+            AvaloniaProperty.RegisterAttached<TextElement, TextElement, double>(
                 nameof(FontSize),
                 defaultValue: 12,
                 inherits: true);
@@ -36,7 +36,7 @@ namespace Avalonia.Controls.Documents
         /// Defines the <see cref="FontStyle"/> property.
         /// </summary>
         public static readonly AttachedProperty<FontStyle> FontStyleProperty =
-            AvaloniaProperty.RegisterAttached<TextElement, Control, FontStyle>(
+            AvaloniaProperty.RegisterAttached<TextElement, TextElement, FontStyle>(
                 nameof(FontStyle),
                 inherits: true);
 
@@ -44,7 +44,7 @@ namespace Avalonia.Controls.Documents
         /// Defines the <see cref="FontWeight"/> property.
         /// </summary>
         public static readonly AttachedProperty<FontWeight> FontWeightProperty =
-            AvaloniaProperty.RegisterAttached<TextElement, Control, FontWeight>(
+            AvaloniaProperty.RegisterAttached<TextElement, TextElement, FontWeight>(
                 nameof(FontWeight),
                 inherits: true,
                 defaultValue: FontWeight.Normal);
@@ -53,7 +53,7 @@ namespace Avalonia.Controls.Documents
         /// Defines the <see cref="FontStretch"/> property.
         /// </summary>
         public static readonly AttachedProperty<FontStretch> FontStretchProperty =
-            AvaloniaProperty.RegisterAttached<TextElement, Control, FontStretch>(
+            AvaloniaProperty.RegisterAttached<TextElement, TextElement, FontStretch>(
                 nameof(FontStretch),
                 inherits: true,
                 defaultValue: FontStretch.Normal);
@@ -62,7 +62,7 @@ namespace Avalonia.Controls.Documents
         /// Defines the <see cref="Foreground"/> property.
         /// </summary>
         public static readonly AttachedProperty<IBrush?> ForegroundProperty =
-            AvaloniaProperty.RegisterAttached<TextElement, Control, IBrush?>(
+            AvaloniaProperty.RegisterAttached<TextElement, TextElement, IBrush?>(
                 nameof(Foreground),
                 Brushes.Black,
                 inherits: true);
diff --git a/src/Avalonia.Controls/RichTextBlock.cs b/src/Avalonia.Controls/RichTextBlock.cs
index 2b84113497..abd6e7e807 100644
--- a/src/Avalonia.Controls/RichTextBlock.cs
+++ b/src/Avalonia.Controls/RichTextBlock.cs
@@ -16,7 +16,7 @@ namespace Avalonia.Controls
     /// <summary>
     /// A control that displays a block of formatted text.
     /// </summary>
-    public class RichTextBlock : TextBlock, IInlineHost
+    public class RichTextBlock : TextBlock, IInlineHost, IAddChild<string>, IAddChild<Inline>, IAddChild<IControl>
     {
         public static readonly StyledProperty<bool> IsTextSelectionEnabledProperty =
             AvaloniaProperty.Register<RichTextBlock, bool>(nameof(IsTextSelectionEnabled), false);
@@ -148,7 +148,6 @@ namespace Avalonia.Controls
         /// <summary>
         /// Gets or sets the inlines.
         /// </summary>
-        [Content]
         public InlineCollection Inlines
         {
             get => GetValue(InlinesProperty);
@@ -170,6 +169,8 @@ namespace Avalonia.Controls
             remove => RemoveHandler(CopyingToClipboardEvent, value);
         }
 
+        internal bool HasComplexContent => Inlines.Count > 0;
+
         /// <summary>
         /// Copies the current selection to the Clipboard.
         /// </summary>
@@ -251,25 +252,69 @@ namespace Avalonia.Controls
             SelectionEnd = SelectionStart;
         }
 
-        protected override string? GetText()
+        void IAddChild<string>.AddChild(string text)
         {
-            return _text ?? Inlines.Text;
+            AddText(text);
         }
 
-        protected override void SetText(string? text)
+        void IAddChild<Inline>.AddChild(Inline inline)
         {
-            var oldValue = _text ?? Inlines?.Text;
+            if (!HasComplexContent && !string.IsNullOrEmpty(_text))
+            {
+                Inlines.Add(_text);
+
+                _text = null;
+            }
+
+            Inlines.Add(inline);
+        }
 
-            if (Inlines is not null && Inlines.HasComplexContent)
+        void IAddChild<IControl>.AddChild(IControl child)
+        {
+            if (!HasComplexContent && !string.IsNullOrEmpty(_text))
             {
-                Inlines.Text = text;
+                Inlines.Add(_text);
 
                 _text = null;
             }
-            else
+
+            Inlines.Add(new InlineUIContainer(child));
+        }
+
+        protected void AddText(string? text)
+        {
+            if (string.IsNullOrEmpty(text))
+            {
+                return;
+            }
+
+            if (!HasComplexContent && string.IsNullOrEmpty(_text))
             {
                 _text = text;
             }
+            else
+            {
+                if (!string.IsNullOrEmpty(_text))
+                {
+                    Inlines.Add(_text);
+
+                    _text = null;
+                }
+
+                Inlines.Add(text);
+            }
+        }
+
+        protected override string? GetText()
+        {
+            return _text ?? Inlines.Text;
+        }
+
+        protected override void SetText(string? text)
+        {
+            var oldValue = _text ?? Inlines?.Text;
+      
+            AddText(text);        
 
             RaisePropertyChanged(TextProperty, oldValue, text);
         }
@@ -293,7 +338,7 @@ namespace Avalonia.Controls
 
             var inlines = Inlines;
 
-            if (inlines is not null && inlines.HasComplexContent)
+            if (HasComplexContent)
             {
                 var textRuns = new List<TextRun>();
 
diff --git a/src/Avalonia.Controls/TextBlock.cs b/src/Avalonia.Controls/TextBlock.cs
index 52261d1c76..8077c00faf 100644
--- a/src/Avalonia.Controls/TextBlock.cs
+++ b/src/Avalonia.Controls/TextBlock.cs
@@ -4,6 +4,7 @@ using Avalonia.Controls.Documents;
 using Avalonia.Layout;
 using Avalonia.Media;
 using Avalonia.Media.TextFormatting;
+using Avalonia.Metadata;
 using Avalonia.Utilities;
 
 namespace Avalonia.Controls
@@ -11,7 +12,7 @@ namespace Avalonia.Controls
     /// <summary>
     /// A control that displays a block of text.
     /// </summary>
-    public class TextBlock : Control
+    public class TextBlock : Control, IAddChild<string>
     {
         /// <summary>
         /// Defines the <see cref="Background"/> property.
@@ -473,11 +474,6 @@ namespace Avalonia.Controls
             control.SetValue(MaxLinesProperty, maxLines);
         }
 
-        public void Add(string text)
-        {
-            _text = text;
-        }
-
         /// <summary>
         /// Renders the <see cref="TextBlock"/> to a drawing context.
         /// </summary>
@@ -512,6 +508,11 @@ namespace Avalonia.Controls
             TextLayout.Draw(context, new Point(padding.Left, top));
         }
 
+        void IAddChild<string>.AddChild(string text)
+        {
+            _text = text;
+        }
+
         protected virtual string? GetText()
         {
             return _text;
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlLanguage.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlLanguage.cs
index 54eac8f59e..c8fced515d 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlLanguage.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlLanguage.cs
@@ -70,8 +70,8 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
                 },
                 InnerServiceProviderFactoryMethod =
                     runtimeHelpers.FindMethod(m => m.Name == "CreateInnerServiceProviderV1"),
-                IAddChild = typeSystem.GetType("Avalonia.Markup.Xaml.IAddChild"),
-                IAddChildOfT = typeSystem.GetType("Avalonia.Markup.Xaml.IAddChild`1")
+                IAddChild = typeSystem.GetType("Avalonia.Metadata.IAddChild"),
+                IAddChildOfT = typeSystem.GetType("Avalonia.Metadata.IAddChild`1")
             };
             rv.CustomAttributeResolver = new AttributeResolver(typeSystem, rv);
 
diff --git a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
index c35cbc35c0..30d321426f 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
+++ b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
@@ -15,7 +15,6 @@
         <Compile Include="Converters\FontFamilyTypeConverter.cs" />
         <Compile Include="Converters\TimeSpanTypeConverter.cs" />
         <Compile Include="Extensions.cs" />
-        <Compile Include="IAddChild.cs" />
         <Compile Include="MarkupExtension.cs" />
         <Compile Include="MarkupExtensions\CompiledBindingExtension.cs" />
         <Compile Include="MarkupExtensions\CompiledBindings\ArrayElementPlugin.cs" />

From 97bd8ff938b83fd385cda92b0f6d2fd16bd5c650 Mon Sep 17 00:00:00 2001
From: Benedikt Stebner <Gillibald@users.noreply.github.com>
Date: Mon, 18 Jul 2022 18:16:20 +0200
Subject: [PATCH 123/240] Remove test code

---
 samples/Sandbox/MainWindow.axaml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/samples/Sandbox/MainWindow.axaml b/samples/Sandbox/MainWindow.axaml
index 03f80d8fc7..6929f192c7 100644
--- a/samples/Sandbox/MainWindow.axaml
+++ b/samples/Sandbox/MainWindow.axaml
@@ -1,13 +1,4 @@
 <Window xmlns="https://github.com/avaloniaui"
         xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
         x:Class="Sandbox.MainWindow">
-  <RichTextBlock Margin="10" TextWrapping="Wrap">
-    This <Span FontWeight="Bold">is</Span> a
-    <Span Background="Silver" Foreground="Maroon">TextBlock</Span>
-    with <Span TextDecorations="Underline">several</Span>
-    <Span FontStyle="Italic">Span</Span> elements,
-    <Span Foreground="Blue">
-      using a <Bold>variety</Bold> of <Italic>styles</Italic>
-    </Span>.
-  </RichTextBlock>
 </Window>

From fdb19912b82aeeca2879f8c66b9a6b5d2bf6df0f Mon Sep 17 00:00:00 2001
From: Benedikt Stebner <Gillibald@users.noreply.github.com>
Date: Mon, 18 Jul 2022 18:39:20 +0200
Subject: [PATCH 124/240] Fix tests

---
 tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
index bed5f19ecb..9635ab285d 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
@@ -17,6 +17,7 @@ using System.Linq;
 using System.Xml;
 using Xunit;
 using Avalonia.Controls.Documents;
+using Avalonia.Metadata;
 
 namespace Avalonia.Markup.Xaml.UnitTests.Xaml
 {
@@ -1011,7 +1012,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         }
     }
 
-    public class ObjectWithAddChildOfT : IAddChild<string>
+    public class ObjectWithAddChildOfT : IAddChild, IAddChild<string>
     {
         public string Text { get; set; }
 

From dcd380442048e14951ed5921c109f1d7bdeaebd7 Mon Sep 17 00:00:00 2001
From: Benedikt Stebner <Gillibald@users.noreply.github.com>
Date: Fri, 22 Jul 2022 10:33:13 +0200
Subject: [PATCH 125/240] Make sure we always process inlines as whitespace
 significant

---
 .../Documents/InlineCollection.cs             | 38 ++++++++++++++++++-
 src/Avalonia.Controls/Documents/Span.cs       |  1 -
 src/Avalonia.Controls/RichTextBlock.cs        | 32 +---------------
 src/Avalonia.Controls/TextBlock.cs            |  2 +-
 .../Avalonia.Markup.Xaml.Loader/xamlil.github |  2 +-
 5 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/src/Avalonia.Controls/Documents/InlineCollection.cs b/src/Avalonia.Controls/Documents/InlineCollection.cs
index 3d7a4b58d1..565ed75ad9 100644
--- a/src/Avalonia.Controls/Documents/InlineCollection.cs
+++ b/src/Avalonia.Controls/Documents/InlineCollection.cs
@@ -92,12 +92,46 @@ namespace Avalonia.Controls.Documents
         /// <param name="text"></param>
         public void Add(string text)
         {
-            Add(new Run(text));
+            AddText(text);
+        }
+
+        public override void Add(Inline inline)
+        {
+            OnAdd();
+
+            base.Add(inline);
         }
 
         public void Add(IControl child)
         {
-            Add(new InlineUIContainer(child));
+            OnAdd();
+
+            base.Add(new InlineUIContainer(child));
+        }
+
+        private void AddText(string text)
+        {
+            if(Parent is RichTextBlock textBlock && !textBlock.HasComplexContent)
+            {
+                textBlock._text += text;
+            }
+            else
+            {
+                base.Add(new Run(text));
+            }
+        }
+
+        private void OnAdd()
+        {
+            if (Parent is RichTextBlock textBlock)
+            {
+                if (!textBlock.HasComplexContent && !string.IsNullOrEmpty(textBlock._text))
+                {
+                    base.Add(new Run(textBlock._text));
+
+                    textBlock._text = null;
+                }
+            }
         }
 
         /// <summary>
diff --git a/src/Avalonia.Controls/Documents/Span.cs b/src/Avalonia.Controls/Documents/Span.cs
index 3560996727..363ce1011b 100644
--- a/src/Avalonia.Controls/Documents/Span.cs
+++ b/src/Avalonia.Controls/Documents/Span.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Text;
 using Avalonia.Media.TextFormatting;
diff --git a/src/Avalonia.Controls/RichTextBlock.cs b/src/Avalonia.Controls/RichTextBlock.cs
index abd6e7e807..9b5afaef5d 100644
--- a/src/Avalonia.Controls/RichTextBlock.cs
+++ b/src/Avalonia.Controls/RichTextBlock.cs
@@ -16,7 +16,7 @@ namespace Avalonia.Controls
     /// <summary>
     /// A control that displays a block of formatted text.
     /// </summary>
-    public class RichTextBlock : TextBlock, IInlineHost, IAddChild<string>, IAddChild<Inline>, IAddChild<IControl>
+    public class RichTextBlock : TextBlock, IInlineHost
     {
         public static readonly StyledProperty<bool> IsTextSelectionEnabledProperty =
             AvaloniaProperty.Register<RichTextBlock, bool>(nameof(IsTextSelectionEnabled), false);
@@ -148,6 +148,7 @@ namespace Avalonia.Controls
         /// <summary>
         /// Gets or sets the inlines.
         /// </summary>
+        [Content]
         public InlineCollection Inlines
         {
             get => GetValue(InlinesProperty);
@@ -252,35 +253,6 @@ namespace Avalonia.Controls
             SelectionEnd = SelectionStart;
         }
 
-        void IAddChild<string>.AddChild(string text)
-        {
-            AddText(text);
-        }
-
-        void IAddChild<Inline>.AddChild(Inline inline)
-        {
-            if (!HasComplexContent && !string.IsNullOrEmpty(_text))
-            {
-                Inlines.Add(_text);
-
-                _text = null;
-            }
-
-            Inlines.Add(inline);
-        }
-
-        void IAddChild<IControl>.AddChild(IControl child)
-        {
-            if (!HasComplexContent && !string.IsNullOrEmpty(_text))
-            {
-                Inlines.Add(_text);
-
-                _text = null;
-            }
-
-            Inlines.Add(new InlineUIContainer(child));
-        }
-
         protected void AddText(string? text)
         {
             if (string.IsNullOrEmpty(text))
diff --git a/src/Avalonia.Controls/TextBlock.cs b/src/Avalonia.Controls/TextBlock.cs
index 8077c00faf..80edaf4f26 100644
--- a/src/Avalonia.Controls/TextBlock.cs
+++ b/src/Avalonia.Controls/TextBlock.cs
@@ -129,7 +129,7 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<TextDecorationCollection?> TextDecorationsProperty =
             AvaloniaProperty.Register<TextBlock, TextDecorationCollection?>(nameof(TextDecorations));
 
-        protected string? _text;
+        internal string? _text;
         protected TextLayout? _textLayout;
         protected Size _constraint;
 
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github b/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github
index a4e6be2d14..d990d63774 160000
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github
@@ -1 +1 @@
-Subproject commit a4e6be2d1407abec4f35fcb208848830ce513ead
+Subproject commit d990d63774a04d2a4b3d52e626a90ee68e19e2b6

From c921d1e097c1dced3b0ded4deb267929876a2fd9 Mon Sep 17 00:00:00 2001
From: Benedikt Stebner <Gillibald@users.noreply.github.com>
Date: Fri, 22 Jul 2022 15:34:14 +0200
Subject: [PATCH 126/240] Fix center alignment for RTL

---
 src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs b/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
index 67c8f0c88c..f3c62f4994 100644
--- a/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
@@ -1317,8 +1317,14 @@ namespace Avalonia.Media.TextFormatting
             switch (textAlignment)
             {
                 case TextAlignment.Center:
-                    return Math.Max(0, (_paragraphWidth - width) / 2);
+                    var start = (_paragraphWidth - width) / 2;
 
+                    if(paragraphFlowDirection == FlowDirection.RightToLeft)
+                    {
+                        start -= (widthIncludingTrailingWhitespace - width);
+                    }
+
+                    return Math.Max(0,  start);                         
                 case TextAlignment.Right:
                     return Math.Max(0, _paragraphWidth - widthIncludingTrailingWhitespace);
 

From 6802722051223ed11055841fc39324db6f3c94ba Mon Sep 17 00:00:00 2001
From: Benedikt Stebner <Gillibald@users.noreply.github.com>
Date: Fri, 22 Jul 2022 16:13:21 +0200
Subject: [PATCH 127/240] Add whole word shift selection

---
 samples/Sandbox/Sandbox.csproj         |  1 -
 src/Avalonia.Controls/RichTextBlock.cs | 33 ++++++++++++++++++++++----
 src/Avalonia.Controls/TextBox.cs       | 29 +++++++++++++++++++---
 3 files changed, 54 insertions(+), 9 deletions(-)

diff --git a/samples/Sandbox/Sandbox.csproj b/samples/Sandbox/Sandbox.csproj
index 20c7f29201..eab654acb6 100644
--- a/samples/Sandbox/Sandbox.csproj
+++ b/samples/Sandbox/Sandbox.csproj
@@ -10,7 +10,6 @@
     <ProjectReference Include="..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Controls.ColorPicker\Avalonia.Controls.ColorPicker.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Controls.DataGrid\Avalonia.Controls.DataGrid.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.NativeGraphics.Backend\Avalonia.NativeGraphics.Backend.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Themes.Fluent\Avalonia.Themes.Fluent.csproj" />
   </ItemGroup>
   
diff --git a/src/Avalonia.Controls/RichTextBlock.cs b/src/Avalonia.Controls/RichTextBlock.cs
index 6a40144137..3011cc7bd9 100644
--- a/src/Avalonia.Controls/RichTextBlock.cs
+++ b/src/Avalonia.Controls/RichTextBlock.cs
@@ -338,6 +338,8 @@ namespace Avalonia.Controls
             e.Handled = handled;
         }
 
+        private bool _hasWordSelection;
+
         protected override void OnPointerPressed(PointerPressedEventArgs e)
         {
             base.OnPointerPressed(e);
@@ -363,8 +365,6 @@ namespace Avalonia.Controls
                 var hit = TextLayout.HitTestPoint(point);
                 var index = hit.TextPosition;
 
-                SelectionStart = SelectionEnd = index;
-
 #pragma warning disable CS0618 // Type or member is obsolete
                 switch (e.ClickCount)
 #pragma warning restore CS0618 // Type or member is obsolete
@@ -372,16 +372,27 @@ namespace Avalonia.Controls
                     case 1:
                         if (clickToSelect)
                         {
-                            SelectionStart = Math.Min(oldIndex, index);
-                            SelectionEnd = Math.Max(oldIndex, index);
+                            if (_hasWordSelection)
+                            {
+                                SelectionEnd = StringUtils.NextWord(text, index);
+                            }
+                            else
+                            {
+                                SelectionStart = Math.Min(oldIndex, index);
+                                SelectionEnd = Math.Max(oldIndex, index);
+                            }
                         }
                         else
                         {
+                            _hasWordSelection = false;
+
                             SelectionStart = SelectionEnd = index;
                         }
 
                         break;
                     case 2:
+                        _hasWordSelection = true;
+
                         if (!StringUtils.IsStartOfWord(text, index))
                         {
                             SelectionStart = StringUtils.PreviousWord(text, index);
@@ -390,6 +401,8 @@ namespace Avalonia.Controls
                         SelectionEnd = StringUtils.NextWord(text, index);
                         break;
                     case 3:
+                        _hasWordSelection = false;
+
                         SelectAll();
                         break;
                 }
@@ -411,6 +424,7 @@ namespace Avalonia.Controls
             // selection should not change during pointer move if the user right clicks
             if (e.Pointer.Captured == this && e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
             {
+                var text = Text;
                 var padding = Padding;
 
                 var point = e.GetPosition(this) - new Point(padding.Left, padding.Top);
@@ -421,7 +435,16 @@ namespace Avalonia.Controls
 
                 var hit = TextLayout.HitTestPoint(point);
 
-                SelectionEnd = hit.TextPosition;
+                if (text != null && _hasWordSelection)
+                {
+                    SelectionEnd = StringUtils.NextWord(text, hit.TextPosition);
+                }
+                else
+                {
+                    SelectionEnd = hit.TextPosition;
+                }
+
+              
             }
         }
 
diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 9531f719b9..0946404f3b 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -202,6 +202,7 @@ namespace Avalonia.Controls
         private string _newLine = Environment.NewLine;
         private static readonly string[] invalidCharacters = new String[1] { "\u007f" };
 
+        private bool _hasWordSelection;
         private int _selectedTextChangesMadeSinceLastUndoSnapshot;
         private bool _hasDoneSnapshotOnce;
         private const int _maxCharsBeforeUndoSnapshot = 7;
@@ -1170,16 +1171,27 @@ namespace Avalonia.Controls
                     case 1:
                         if (clickToSelect)
                         {
-                            SelectionStart = Math.Min(oldIndex, index);
-                            SelectionEnd = Math.Max(oldIndex, index);
+                            if (_hasWordSelection)
+                            {
+                                SelectionEnd = StringUtils.NextWord(text, index);
+                            }
+                            else
+                            {
+                                SelectionStart = Math.Min(oldIndex, index);
+                                SelectionEnd = Math.Max(oldIndex, index);
+                            }                           
                         }
                         else
                         {
+                            _hasWordSelection = false;
+
                             SelectionStart = SelectionEnd = index;
                         }
 
                         break;
                     case 2:
+                        _hasWordSelection = true;
+
                         if (!StringUtils.IsStartOfWord(text, index))
                         {
                             SelectionStart = StringUtils.PreviousWord(text, index);
@@ -1188,6 +1200,8 @@ namespace Avalonia.Controls
                         SelectionEnd = StringUtils.NextWord(text, index);
                         break;
                     case 3:
+                        _hasWordSelection = false;
+
                         SelectAll();
                         break;
                 }
@@ -1215,7 +1229,16 @@ namespace Avalonia.Controls
 
                 _presenter.MoveCaretToPoint(point);
 
-                SelectionEnd = _presenter.CaretIndex;
+                var text = Text;
+
+                if (text != null && _hasWordSelection)
+                {
+                    SelectionEnd = StringUtils.NextWord(text, _presenter.CaretIndex);
+                }
+                else
+                {
+                    SelectionEnd = _presenter.CaretIndex;
+                }
             }
         }
 

From c7182ae12adf019f9644a68c0361e7cc9987a0fc Mon Sep 17 00:00:00 2001
From: Benedikt Stebner <Gillibald@users.noreply.github.com>
Date: Fri, 22 Jul 2022 18:03:30 +0200
Subject: [PATCH 128/240] Improve advanced word selection

---
 src/Avalonia.Controls/RichTextBlock.cs |  53 +++--
 src/Avalonia.Controls/TextBox.cs       | 276 ++++++++++++++-----------
 2 files changed, 193 insertions(+), 136 deletions(-)

diff --git a/src/Avalonia.Controls/RichTextBlock.cs b/src/Avalonia.Controls/RichTextBlock.cs
index 3011cc7bd9..b7c5cfa3bd 100644
--- a/src/Avalonia.Controls/RichTextBlock.cs
+++ b/src/Avalonia.Controls/RichTextBlock.cs
@@ -60,6 +60,7 @@ namespace Avalonia.Controls
         private bool _canCopy;
         private int _selectionStart;
         private int _selectionEnd;
+        private int _wordSelectionStart = -1;
 
         static RichTextBlock()
         {
@@ -338,8 +339,6 @@ namespace Avalonia.Controls
             e.Handled = handled;
         }
 
-        private bool _hasWordSelection;
-
         protected override void OnPointerPressed(PointerPressedEventArgs e)
         {
             base.OnPointerPressed(e);
@@ -372,9 +371,19 @@ namespace Avalonia.Controls
                     case 1:
                         if (clickToSelect)
                         {
-                            if (_hasWordSelection)
+                            if (_wordSelectionStart >= 0)
                             {
-                                SelectionEnd = StringUtils.NextWord(text, index);
+                                var previousWord = StringUtils.PreviousWord(text, index);
+
+                                if (index > _wordSelectionStart)
+                                {
+                                    SelectionEnd = StringUtils.NextWord(text, index);
+                                }
+
+                                if (index < _wordSelectionStart || previousWord == _wordSelectionStart)
+                                {
+                                    SelectionStart = previousWord;
+                                }
                             }
                             else
                             {
@@ -384,24 +393,27 @@ namespace Avalonia.Controls
                         }
                         else
                         {
-                            _hasWordSelection = false;
+                            if (_wordSelectionStart == -1 || index < SelectionStart || index > SelectionEnd)
+                            {
+                                SelectionStart = SelectionEnd = index;
 
-                            SelectionStart = SelectionEnd = index;
+                                _wordSelectionStart = -1;
+                            }
                         }
 
                         break;
                     case 2:
-                        _hasWordSelection = true;
-
                         if (!StringUtils.IsStartOfWord(text, index))
                         {
                             SelectionStart = StringUtils.PreviousWord(text, index);
                         }
 
+                        _wordSelectionStart = SelectionStart;
+
                         SelectionEnd = StringUtils.NextWord(text, index);
                         break;
                     case 3:
-                        _hasWordSelection = false;
+                        _wordSelectionStart = -1;
 
                         SelectAll();
                         break;
@@ -434,17 +446,32 @@ namespace Avalonia.Controls
                     MathUtilities.Clamp(point.Y, 0, Math.Max(TextLayout.Bounds.Width, 0)));
 
                 var hit = TextLayout.HitTestPoint(point);
+                var textPosition = hit.TextPosition;
 
-                if (text != null && _hasWordSelection)
+                if (text != null && _wordSelectionStart >= 0)
                 {
-                    SelectionEnd = StringUtils.NextWord(text, hit.TextPosition);
+                    var distance = textPosition - _wordSelectionStart;
+
+                    if (distance <= 0)
+                    {
+                        SelectionStart = StringUtils.PreviousWord(text, textPosition);
+                    }
+
+                    if (distance >= 0)
+                    {
+                        if (SelectionStart != _wordSelectionStart)
+                        {
+                            SelectionStart = _wordSelectionStart;
+                        }
+
+                        SelectionEnd = StringUtils.NextWord(text, textPosition);
+                    }
                 }
                 else
                 {
-                    SelectionEnd = hit.TextPosition;
+                    SelectionEnd = textPosition;
                 }
 
-              
             }
         }
 
diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 0946404f3b..1b268db2f7 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -53,7 +53,7 @@ namespace Avalonia.Controls
 
         public static readonly StyledProperty<char> PasswordCharProperty =
             AvaloniaProperty.Register<TextBox, char>(nameof(PasswordChar));
-            
+
         public static readonly StyledProperty<IBrush?> SelectionBrushProperty =
             AvaloniaProperty.Register<TextBox, IBrush?>(nameof(SelectionBrush));
 
@@ -80,7 +80,7 @@ namespace Avalonia.Controls
 
         public static readonly StyledProperty<int> MaxLinesProperty =
             AvaloniaProperty.Register<TextBox, int>(nameof(MaxLines), defaultValue: 0);
-        
+
         public static readonly DirectProperty<TextBox, string?> TextProperty =
             TextBlock.TextProperty.AddOwnerWithDataValidation<TextBox>(
                 o => o.Text,
@@ -105,7 +105,7 @@ namespace Avalonia.Controls
 
         public static readonly StyledProperty<TextWrapping> TextWrappingProperty =
             TextBlock.TextWrappingProperty.AddOwner<TextBox>();
-        
+
         /// <summary>
         /// Defines see <see cref="TextPresenter.LineHeight"/> property.
         /// </summary>
@@ -202,7 +202,7 @@ namespace Avalonia.Controls
         private string _newLine = Environment.NewLine;
         private static readonly string[] invalidCharacters = new String[1] { "\u007f" };
 
-        private bool _hasWordSelection;
+        private int _wordSelectionStart = -1;
         private int _selectedTextChangesMadeSinceLastUndoSnapshot;
         private bool _hasDoneSnapshotOnce;
         private const int _maxCharsBeforeUndoSnapshot = 7;
@@ -276,7 +276,7 @@ namespace Avalonia.Controls
             get => GetValue(IsReadOnlyProperty);
             set => SetValue(IsReadOnlyProperty, value);
         }
-        
+
         public char PasswordChar
         {
             get => GetValue(PasswordCharProperty);
@@ -308,7 +308,7 @@ namespace Avalonia.Controls
             {
                 value = CoerceCaretIndex(value);
                 var changed = SetAndRaise(SelectionStartProperty, ref _selectionStart, value);
-                
+
                 if (changed)
                 {
                     UpdateCommandStates();
@@ -328,12 +328,12 @@ namespace Avalonia.Controls
             {
                 value = CoerceCaretIndex(value);
                 var changed = SetAndRaise(SelectionEndProperty, ref _selectionEnd, value);
-                
+
                 if (changed)
                 {
                     UpdateCommandStates();
                 }
-                
+
                 if (SelectionStart == value && CaretIndex != value)
                 {
                     CaretIndex = value;
@@ -352,7 +352,7 @@ namespace Avalonia.Controls
             get => GetValue(MaxLinesProperty);
             set => SetValue(MaxLinesProperty, value);
         }
-        
+
         /// <summary>
         /// Gets or sets the line height.
         /// </summary>
@@ -371,7 +371,7 @@ namespace Avalonia.Controls
                 var caretIndex = CaretIndex;
                 var selectionStart = SelectionStart;
                 var selectionEnd = SelectionEnd;
-                    
+
                 CaretIndex = CoerceCaretIndex(caretIndex, value);
                 SelectionStart = CoerceCaretIndex(selectionStart, value);
                 SelectionEnd = CoerceCaretIndex(selectionEnd, value);
@@ -568,7 +568,7 @@ namespace Avalonia.Controls
             _presenter = e.NameScope.Get<TextPresenter>("PART_TextPresenter");
 
             _imClient.SetPresenter(_presenter, this);
-            
+
             if (IsFocused)
             {
                 _presenter?.ShowCaret();
@@ -578,7 +578,7 @@ namespace Avalonia.Controls
         protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
         {
             base.OnAttachedToVisualTree(e);
-            
+
             if (IsFocused)
             {
                 _presenter?.ShowCaret();
@@ -588,7 +588,7 @@ namespace Avalonia.Controls
         protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
         {
             base.OnDetachedFromVisualTree(e);
-            
+
             _imClient.SetPresenter(null, null);
         }
 
@@ -638,7 +638,7 @@ namespace Avalonia.Controls
             }
 
             UpdateCommandStates();
-            
+
             _imClient.SetPresenter(_presenter, this);
 
             _presenter?.ShowCaret();
@@ -658,7 +658,7 @@ namespace Avalonia.Controls
             UpdateCommandStates();
 
             _presenter?.HideCaret();
-            
+
             _imClient.SetPresenter(null, null);
         }
 
@@ -701,14 +701,14 @@ namespace Avalonia.Controls
 
                     if (grapheme.FirstCodepoint.IsBreakChar)
                     {
-                        if(lineCount + 1 > MaxLines)
+                        if (lineCount + 1 > MaxLines)
                         {
                             break;
                         }
                         else
                         {
                             lineCount++;
-                        }                       
+                        }
                     }
 
                     length += grapheme.Text.Length;
@@ -737,7 +737,7 @@ namespace Avalonia.Controls
                 text = Text ?? string.Empty;
                 SetTextInternal(text.Substring(0, caretIndex) + input + text.Substring(caretIndex));
                 ClearSelection();
-                    
+
                 if (IsUndoEnabled)
                 {
                     _undoRedoHelper.DiscardRedo();
@@ -747,7 +747,7 @@ namespace Avalonia.Controls
                 {
                     RaisePropertyChanged(TextProperty, oldText, _text);
                 }
-                    
+
                 CaretIndex = caretIndex + input.Length;
             }
         }
@@ -829,7 +829,7 @@ namespace Avalonia.Controls
             {
                 return;
             }
-            
+
             var text = Text ?? string.Empty;
             var caretIndex = CaretIndex;
             var movement = false;
@@ -986,87 +986,87 @@ namespace Avalonia.Controls
                         break;
 
                     case Key.Up:
-                    {
-                        selection = DetectSelection();
-                        
-                        _presenter.MoveCaretVertical(LogicalDirection.Backward);
-                        
-                        if (caretIndex != _presenter.CaretIndex)
                         {
-                            movement = true;
-                        }
+                            selection = DetectSelection();
 
-                        if (selection)
-                        {
-                            SelectionEnd = _presenter.CaretIndex;
-                        }
-                        else
-                        {
-                            CaretIndex = _presenter.CaretIndex;
+                            _presenter.MoveCaretVertical(LogicalDirection.Backward);
+
+                            if (caretIndex != _presenter.CaretIndex)
+                            {
+                                movement = true;
+                            }
+
+                            if (selection)
+                            {
+                                SelectionEnd = _presenter.CaretIndex;
+                            }
+                            else
+                            {
+                                CaretIndex = _presenter.CaretIndex;
+                            }
+
+                            break;
                         }
-                        
-                        break;
-                    }
                     case Key.Down:
-                    {
-                        selection = DetectSelection();
-                        
-                        _presenter.MoveCaretVertical();
-                        
-                        if (caretIndex != _presenter.CaretIndex)
-                        {
-                            movement = true;
-                        }
-  
-                        if (selection)
                         {
-                            SelectionEnd = _presenter.CaretIndex;
-                        }
-                        else
-                        {
-                            CaretIndex = _presenter.CaretIndex;
+                            selection = DetectSelection();
+
+                            _presenter.MoveCaretVertical();
+
+                            if (caretIndex != _presenter.CaretIndex)
+                            {
+                                movement = true;
+                            }
+
+                            if (selection)
+                            {
+                                SelectionEnd = _presenter.CaretIndex;
+                            }
+                            else
+                            {
+                                CaretIndex = _presenter.CaretIndex;
+                            }
+
+                            break;
                         }
-                        
-                        break;
-                    }
                     case Key.Back:
-                    {
-                        SnapshotUndoRedo();
-                        
-                        if (hasWholeWordModifiers && SelectionStart == SelectionEnd)
-                        {
-                            SetSelectionForControlBackspace();
-                        }
-
-                        if (!DeleteSelection())
                         {
-                            var characterHit = _presenter.GetNextCharacterHit(LogicalDirection.Backward);
+                            SnapshotUndoRedo();
 
-                            var backspacePosition = characterHit.FirstCharacterIndex + characterHit.TrailingLength;
+                            if (hasWholeWordModifiers && SelectionStart == SelectionEnd)
+                            {
+                                SetSelectionForControlBackspace();
+                            }
 
-                            if (caretIndex != backspacePosition)
+                            if (!DeleteSelection())
                             {
-                                var start = Math.Min(backspacePosition, caretIndex);
-                                var end = Math.Max(backspacePosition, caretIndex);
+                                var characterHit = _presenter.GetNextCharacterHit(LogicalDirection.Backward);
 
-                                var length = end - start;
+                                var backspacePosition = characterHit.FirstCharacterIndex + characterHit.TrailingLength;
 
-                                var editedText = text.Substring(0, start) + text.Substring(Math.Min(end, text.Length));
+                                if (caretIndex != backspacePosition)
+                                {
+                                    var start = Math.Min(backspacePosition, caretIndex);
+                                    var end = Math.Max(backspacePosition, caretIndex);
 
-                                SetTextInternal(editedText);
+                                    var length = end - start;
 
-                                CaretIndex = start;
-                            } 
-                        }
-                        
-                        SnapshotUndoRedo();
+                                    var editedText = text.Substring(0, start) + text.Substring(Math.Min(end, text.Length));
 
-                        handled = true;
-                        break;
-                    }
+                                    SetTextInternal(editedText);
+
+                                    CaretIndex = start;
+                                }
+                            }
+
+                            SnapshotUndoRedo();
+
+                            handled = true;
+                            break;
+                        }
                     case Key.Delete:
                         SnapshotUndoRedo();
-                        
+
                         if (hasWholeWordModifiers && SelectionStart == SelectionEnd)
                         {
                             SetSelectionForControlDelete();
@@ -1078,7 +1078,7 @@ namespace Avalonia.Controls
 
                             var nextPosition = characterHit.FirstCharacterIndex + characterHit.TrailingLength;
 
-                            if(nextPosition != caretIndex)
+                            if (nextPosition != caretIndex)
                             {
                                 var start = Math.Min(nextPosition, caretIndex);
                                 var end = Math.Max(nextPosition, caretIndex);
@@ -1145,7 +1145,7 @@ namespace Avalonia.Controls
             {
                 return;
             }
-            
+
             var text = Text;
             var clickInfo = e.GetCurrentPoint(this);
 
@@ -1171,36 +1171,49 @@ namespace Avalonia.Controls
                     case 1:
                         if (clickToSelect)
                         {
-                            if (_hasWordSelection)
+                            if (_wordSelectionStart >= 0)
                             {
-                                SelectionEnd = StringUtils.NextWord(text, index);
+                                var previousWord = StringUtils.PreviousWord(text, index);
+
+                                if (index > _wordSelectionStart)
+                                {
+                                    SelectionEnd = StringUtils.NextWord(text, index);
+                                }
+
+                                if (index < _wordSelectionStart || previousWord == _wordSelectionStart)
+                                {
+                                    SelectionStart = previousWord;
+                                }
                             }
                             else
                             {
                                 SelectionStart = Math.Min(oldIndex, index);
                                 SelectionEnd = Math.Max(oldIndex, index);
-                            }                           
+                            }
                         }
                         else
                         {
-                            _hasWordSelection = false;
-
-                            SelectionStart = SelectionEnd = index;
+                            if(_wordSelectionStart == -1 || index < SelectionStart || index > SelectionEnd)
+                            {
+                                SelectionStart = SelectionEnd = index;
+                                _wordSelectionStart = -1;
+                            }                           
                         }
 
                         break;
-                    case 2:
-                        _hasWordSelection = true;
+                    case 2:                       
 
                         if (!StringUtils.IsStartOfWord(text, index))
                         {
                             SelectionStart = StringUtils.PreviousWord(text, index);
                         }
 
+                        _wordSelectionStart = SelectionStart;
+
                         SelectionEnd = StringUtils.NextWord(text, index);
                         break;
                     case 3:
-                        _hasWordSelection = false;
+                        _wordSelectionStart = -1;
 
                         SelectAll();
                         break;
@@ -1217,7 +1230,7 @@ namespace Avalonia.Controls
             {
                 return;
             }
-            
+
             // selection should not change during pointer move if the user right clicks
             if (e.Pointer.Captured == _presenter && e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
             {
@@ -1229,11 +1242,27 @@ namespace Avalonia.Controls
 
                 _presenter.MoveCaretToPoint(point);
 
+                var caretIndex = _presenter.CaretIndex;
                 var text = Text;
 
-                if (text != null && _hasWordSelection)
+                if (text != null && _wordSelectionStart >= 0)
                 {
-                    SelectionEnd = StringUtils.NextWord(text, _presenter.CaretIndex);
+                    var distance = caretIndex - _wordSelectionStart;                 
+
+                    if (distance <= 0)
+                    {
+                        SelectionStart = StringUtils.PreviousWord(text, caretIndex);
+                    }
+
+                    if (distance >= 0)
+                    {
+                        if(SelectionStart != _wordSelectionStart)
+                        {
+                            SelectionStart = _wordSelectionStart;
+                        }
+
+                        SelectionEnd = StringUtils.NextWord(text, caretIndex);
+                    }
                 }
                 else
                 {
@@ -1257,9 +1286,9 @@ namespace Avalonia.Controls
             if (e.InitialPressMouseButton == MouseButton.Right)
             {
                 var point = e.GetPosition(_presenter);
-                    
+
                 _presenter.MoveCaretToPoint(point);
-                    
+
                 var caretIndex = _presenter.CaretIndex;
 
                 // see if mouse clicked inside current selection
@@ -1273,7 +1302,7 @@ namespace Avalonia.Controls
                     CaretIndex = SelectionEnd = SelectionStart = caretIndex;
                 }
             }
-            
+
             e.Pointer.Capture(null);
         }
 
@@ -1332,7 +1361,7 @@ namespace Avalonia.Controls
             {
                 return;
             }
-            
+
             var text = Text ?? string.Empty;
             var selectionStart = SelectionStart;
             var selectionEnd = SelectionEnd;
@@ -1342,11 +1371,11 @@ namespace Avalonia.Controls
                 if (isSelecting)
                 {
                     _presenter.MoveCaretToTextPosition(selectionEnd);
-                    
+
                     _presenter.MoveCaretHorizontal(direction > 0 ?
                         LogicalDirection.Forward :
                         LogicalDirection.Backward);
-                    
+
                     SelectionEnd = _presenter.CaretIndex;
                 }
                 else
@@ -1370,7 +1399,7 @@ namespace Avalonia.Controls
             else
             {
                 int offset;
-                
+
                 if (direction > 0)
                 {
                     offset = StringUtils.NextWord(text, selectionEnd) - selectionEnd;
@@ -1379,7 +1408,7 @@ namespace Avalonia.Controls
                 {
                     offset = StringUtils.PreviousWord(text, selectionEnd) - selectionEnd;
                 }
-                
+
                 SelectionEnd += offset;
 
                 _presenter.MoveCaretToTextPosition(SelectionEnd);
@@ -1401,7 +1430,7 @@ namespace Avalonia.Controls
             {
                 return;
             }
-            
+
             var caretIndex = CaretIndex;
 
             if (document)
@@ -1424,7 +1453,7 @@ namespace Avalonia.Controls
             {
                 return;
             }
-            
+
             var text = Text ?? string.Empty;
             var caretIndex = CaretIndex;
 
@@ -1455,8 +1484,9 @@ namespace Avalonia.Controls
 
         private bool DeleteSelection(bool raiseTextChanged = true)
         {
-            if (IsReadOnly) return true;
-            
+            if (IsReadOnly)
+                return true;
+
             var selectionStart = SelectionStart;
             var selectionEnd = SelectionEnd;
 
@@ -1467,40 +1497,40 @@ namespace Avalonia.Controls
                 var text = Text!;
 
                 SetTextInternal(text.Substring(0, start) + text.Substring(end), raiseTextChanged);
-                    
+
                 _presenter?.MoveCaretToTextPosition(start);
-                    
-                CaretIndex= start;
-                    
+
+                CaretIndex = start;
+
                 ClearSelection();
-                    
+
                 return true;
             }
-                
+
             CaretIndex = SelectionStart;
-            
+
             return false;
         }
 
         private string GetSelection()
         {
             var text = Text;
-            
+
             if (string.IsNullOrEmpty(text))
             {
                 return "";
             }
-               
+
             var selectionStart = SelectionStart;
             var selectionEnd = SelectionEnd;
             var start = Math.Min(selectionStart, selectionEnd);
             var end = Math.Max(selectionStart, selectionEnd);
-            
+
             if (start == end || (Text?.Length ?? 0) < end)
             {
                 return "";
             }
-            
+
             return text.Substring(start, end - start);
         }
 
@@ -1519,7 +1549,7 @@ namespace Avalonia.Controls
         private void SetSelectionForControlBackspace()
         {
             var selectionStart = CaretIndex;
-            
+
             MoveHorizontal(-1, true, false);
 
             SelectionStart = selectionStart;
@@ -1531,9 +1561,9 @@ namespace Avalonia.Controls
             {
                 return;
             }
-            
+
             SelectionStart = CaretIndex;
-            
+
             MoveHorizontal(1, true, true);
 
             if (SelectionEnd < _text.Length && _text[SelectionEnd] == ' ')

From 9f37910c97c8401e4694a7be9dbdbc1cf6890456 Mon Sep 17 00:00:00 2001
From: Benedikt Stebner <Gillibald@users.noreply.github.com>
Date: Fri, 22 Jul 2022 18:43:49 +0200
Subject: [PATCH 129/240] Fix TextDecoration width Fix LineBreak length

---
 samples/Sandbox/MainWindow.axaml             | 14 +-------------
 src/Avalonia.Base/Media/GlyphRun.cs          |  2 +-
 src/Avalonia.Base/Media/TextDecoration.cs    |  2 +-
 src/Avalonia.Controls/Documents/LineBreak.cs |  3 +--
 4 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/samples/Sandbox/MainWindow.axaml b/samples/Sandbox/MainWindow.axaml
index 957616579a..c305c57efb 100644
--- a/samples/Sandbox/MainWindow.axaml
+++ b/samples/Sandbox/MainWindow.axaml
@@ -1,17 +1,5 @@
 <Window xmlns="https://github.com/avaloniaui"
         xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
         x:Class="Sandbox.MainWindow">
-  <RichTextBlock 
-    HorizontalAlignment="Center" 
-    VerticalAlignment="Center" 
-    Background="AliceBlue" 
-    Padding="5" 
-    IsTextSelectionEnabled="True" 
-    FontSize="18" 
-    FontWeight="Bold" 
-    SelectionStart="24" 
-    SelectionEnd="23">
-    <LineBreak/>
-    <Run>أَبْجَدِيَّة عَرَبِيَّة</Run>
-  </RichTextBlock>
+  <TextBlock TextDecorations="Underline" Text="Underline "/>
 </Window>
diff --git a/src/Avalonia.Base/Media/GlyphRun.cs b/src/Avalonia.Base/Media/GlyphRun.cs
index da2143c188..2a7f3360ad 100644
--- a/src/Avalonia.Base/Media/GlyphRun.cs
+++ b/src/Avalonia.Base/Media/GlyphRun.cs
@@ -445,7 +445,7 @@ namespace Avalonia.Media
         /// </returns>
         public int FindGlyphIndex(int characterIndex)
         {
-            if (GlyphClusters == null)
+            if (GlyphClusters == null || GlyphClusters.Count == 0)
             {
                 return characterIndex;
             }
diff --git a/src/Avalonia.Base/Media/TextDecoration.cs b/src/Avalonia.Base/Media/TextDecoration.cs
index 8eeb86c555..4c9764af96 100644
--- a/src/Avalonia.Base/Media/TextDecoration.cs
+++ b/src/Avalonia.Base/Media/TextDecoration.cs
@@ -209,7 +209,7 @@ namespace Avalonia.Media
             var pen = new Pen(Stroke ?? defaultBrush, thickness,
                 new DashStyle(StrokeDashArray, StrokeDashOffset), StrokeLineCap);
 
-            drawingContext.DrawLine(pen, origin, origin + new Point(glyphRun.Size.Width, 0));
+            drawingContext.DrawLine(pen, origin, origin + new Point(glyphRun.Metrics.Width, 0));
         }
     }
 }
diff --git a/src/Avalonia.Controls/Documents/LineBreak.cs b/src/Avalonia.Controls/Documents/LineBreak.cs
index aeb81f7313..ef8bd35556 100644
--- a/src/Avalonia.Controls/Documents/LineBreak.cs
+++ b/src/Avalonia.Controls/Documents/LineBreak.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using Avalonia.LogicalTree;
 using Avalonia.Media.TextFormatting;
 using Avalonia.Metadata;
 
@@ -22,7 +21,7 @@ namespace Avalonia.Controls.Documents
 
         internal override void BuildTextRun(IList<TextRun> textRuns)
         {
-            textRuns.Add(new TextEndOfLine());
+            textRuns.Add(new TextEndOfLine(Environment.NewLine.Length));
         }
 
         internal override void AppendText(StringBuilder stringBuilder)

From 0372dd914cf45d70b21144ee046b58eddc432bea Mon Sep 17 00:00:00 2001
From: Benedikt Stebner <Gillibald@users.noreply.github.com>
Date: Fri, 22 Jul 2022 19:16:10 +0200
Subject: [PATCH 130/240] Show IBeam cursor for IsTextSelectionEnabled

---
 src/Avalonia.Controls/RichTextBlock.cs                 |  2 +-
 .../Avalonia.Themes.Default.csproj                     |  8 ++++++++
 .../Controls/RichTextBlock.xaml                        | 10 ++++++++++
 src/Avalonia.Themes.Default/DefaultTheme.xaml          |  1 +
 .../Avalonia.Themes.Fluent.csproj                      |  8 ++++++++
 .../Controls/FluentControls.xaml                       |  1 +
 src/Avalonia.Themes.Fluent/Controls/RichTextBlock.xaml | 10 ++++++++++
 7 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 src/Avalonia.Themes.Default/Controls/RichTextBlock.xaml
 create mode 100644 src/Avalonia.Themes.Fluent/Controls/RichTextBlock.xaml

diff --git a/src/Avalonia.Controls/RichTextBlock.cs b/src/Avalonia.Controls/RichTextBlock.cs
index 5006e8133b..0c8b1d125d 100644
--- a/src/Avalonia.Controls/RichTextBlock.cs
+++ b/src/Avalonia.Controls/RichTextBlock.cs
@@ -66,7 +66,7 @@ namespace Avalonia.Controls
         {
             FocusableProperty.OverrideDefaultValue(typeof(RichTextBlock), true);
 
-            AffectsRender<RichTextBlock>(SelectionStartProperty, SelectionEndProperty, SelectionBrushProperty);
+            AffectsRender<RichTextBlock>(SelectionStartProperty, SelectionEndProperty, SelectionBrushProperty, IsTextSelectionEnabledProperty);
         }
 
         public RichTextBlock()
diff --git a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
index 40ed4a0f87..ae0df89c60 100644
--- a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
+++ b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
@@ -9,6 +9,14 @@
     <ProjectReference Include="..\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
     <AvaloniaResource Include="**/*.xaml" />
   </ItemGroup>
+  <ItemGroup>
+    <None Remove="Controls\RichTextBlock.xaml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AvaloniaResource Update="Controls\RichTextBlock.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </AvaloniaResource>
+  </ItemGroup>
   <Import Project="..\..\build\BuildTargets.targets" />
   <Import Project="..\..\build\Rx.props" />
   <Import Project="..\..\build\ApiDiff.props" />
diff --git a/src/Avalonia.Themes.Default/Controls/RichTextBlock.xaml b/src/Avalonia.Themes.Default/Controls/RichTextBlock.xaml
new file mode 100644
index 0000000000..d7bf6e5cf9
--- /dev/null
+++ b/src/Avalonia.Themes.Default/Controls/RichTextBlock.xaml
@@ -0,0 +1,10 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Design.PreviewWith>
+        <RichTextBlock IsTextSelectionEnabled="True" Text="Preview"/>
+    </Design.PreviewWith>
+
+    <Style Selector="RichTextBlock[IsTextSelectionEnabled=true]">
+      <Setter Property="Cursor" Value="IBeam" />
+    </Style>
+</Styles>
diff --git a/src/Avalonia.Themes.Default/DefaultTheme.xaml b/src/Avalonia.Themes.Default/DefaultTheme.xaml
index 468b723f5b..f266402aef 100644
--- a/src/Avalonia.Themes.Default/DefaultTheme.xaml
+++ b/src/Avalonia.Themes.Default/DefaultTheme.xaml
@@ -66,4 +66,5 @@
   <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"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/RichTextBlock.xaml"/>
 </Styles>
diff --git a/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj b/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj
index 35603fe216..8acf12a0ff 100644
--- a/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj
+++ b/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj
@@ -10,6 +10,14 @@
     <AvaloniaResource Include="**/*.xaml" />
     <AvaloniaResource Include="Assets\*" />  
   </ItemGroup>
+  <ItemGroup>
+    <None Remove="Controls\RichTextBlock.xaml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AvaloniaResource Update="Controls\RichTextBlock.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </AvaloniaResource>
+  </ItemGroup>
   <Import Project="..\..\build\BuildTargets.targets" />
   <Import Project="..\..\build\Rx.props" />
   <Import Project="..\..\build\ApiDiff.props" />
diff --git a/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
index 5b217e4764..eb2d65150c 100644
--- a/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
@@ -67,4 +67,5 @@
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/MenuFlyoutPresenter.xaml"/>
   <!-- ManagedFileChooser comes last because it uses (and overrides) styles for a multitude of other controls...the dialogs were originally UserControls, after all-->
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ManagedFileChooser.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/RichTextBlock.xaml"/>
 </Styles>
diff --git a/src/Avalonia.Themes.Fluent/Controls/RichTextBlock.xaml b/src/Avalonia.Themes.Fluent/Controls/RichTextBlock.xaml
new file mode 100644
index 0000000000..d7bf6e5cf9
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/RichTextBlock.xaml
@@ -0,0 +1,10 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Design.PreviewWith>
+        <RichTextBlock IsTextSelectionEnabled="True" Text="Preview"/>
+    </Design.PreviewWith>
+
+    <Style Selector="RichTextBlock[IsTextSelectionEnabled=true]">
+      <Setter Property="Cursor" Value="IBeam" />
+    </Style>
+</Styles>

From 03b8b2eb5eb1e72523c7edbf6daf48f9f5e74839 Mon Sep 17 00:00:00 2001
From: Benedikt Stebner <Gillibald@users.noreply.github.com>
Date: Fri, 22 Jul 2022 19:45:25 +0200
Subject: [PATCH 131/240] Show ellipsis when MaxLines are reached

---
 samples/Sandbox/MainWindow.axaml                     | 1 -
 src/Avalonia.Base/Media/TextFormatting/TextLayout.cs | 5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/samples/Sandbox/MainWindow.axaml b/samples/Sandbox/MainWindow.axaml
index c305c57efb..6929f192c7 100644
--- a/samples/Sandbox/MainWindow.axaml
+++ b/samples/Sandbox/MainWindow.axaml
@@ -1,5 +1,4 @@
 <Window xmlns="https://github.com/avaloniaui"
         xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
         x:Class="Sandbox.MainWindow">
-  <TextBlock TextDecorations="Underline" Text="Underline "/>
 </Window>
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextLayout.cs b/src/Avalonia.Base/Media/TextFormatting/TextLayout.cs
index 8ab9591faf..f3e8b5969c 100644
--- a/src/Avalonia.Base/Media/TextFormatting/TextLayout.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/TextLayout.cs
@@ -479,6 +479,11 @@ namespace Avalonia.Media.TextFormatting
                 //Fulfill max lines constraint
                 if (MaxLines > 0 && textLines.Count >= MaxLines)
                 {
+                    if(textLine.TextLineBreak is TextLineBreak lineBreak && lineBreak.RemainingRuns != null)
+                    {
+                        textLines[textLines.Count - 1] = textLine.Collapse(GetCollapsingProperties(width));
+                    }
+
                     break;
                 }
             }

From 756a51b4bbfd1d9799cdf15eeb11d35857a4aa51 Mon Sep 17 00:00:00 2001
From: i3ym <deniso99@mail.ru>
Date: Sat, 23 Jul 2022 00:51:15 +0700
Subject: [PATCH 132/240] Fix loading window icons on X11

---
 src/Avalonia.X11/X11IconLoader.cs | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/Avalonia.X11/X11IconLoader.cs b/src/Avalonia.X11/X11IconLoader.cs
index 36939f4103..e8bc9ac9d7 100644
--- a/src/Avalonia.X11/X11IconLoader.cs
+++ b/src/Avalonia.X11/X11IconLoader.cs
@@ -48,12 +48,6 @@ namespace Avalonia.X11
             _width = Math.Min(bitmap.PixelSize.Width, 128);
             _height = Math.Min(bitmap.PixelSize.Height, 128);
             _bdata = new uint[_width * _height];
-            fixed (void* ptr = _bdata)
-            {
-                var iptr = (int*)ptr;
-                iptr[0] = _width;
-                iptr[1] = _height;
-            }
             using(var rt = AvaloniaLocator.Current.GetService<IPlatformRenderInterface>().CreateRenderTarget(new[]{this}))
             using (var ctx = rt.CreateDrawingContext(null))
                 ctx.DrawBitmap(bitmap.PlatformImpl, 1, new Rect(bitmap.Size),
@@ -65,7 +59,7 @@ namespace Avalonia.X11
             {
                 var r = y * _width;
                 for (var x = 0; x < _width; x++)
-                    Data[r + x] = new UIntPtr(_bdata[r + x]);
+                    Data[r + x + 2] = new UIntPtr(_bdata[r + x]);
             }
 
             _bdata = null;

From 6e59fe347e484fe758dcdcd27f5af68db6bc4fc7 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Thu, 21 Jul 2022 23:51:06 -0400
Subject: [PATCH 133/240] Add DataGrid fluent controltheme

# Conflicts:
#	src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
---
 .../ControlCatalog/Pages/DataGridPage.xaml    |    9 +-
 .../DataGridCell.cs                           |   10 +-
 .../DataGridColumn.cs                         |   20 +
 .../DataGridRowGroupHeader.cs                 |    1 -
 .../DataGridTextColumn.cs                     |   28 +-
 .../Themes/Fluent.xaml                        | 1078 ++++++++---------
 6 files changed, 559 insertions(+), 587 deletions(-)

diff --git a/samples/ControlCatalog/Pages/DataGridPage.xaml b/samples/ControlCatalog/Pages/DataGridPage.xaml
index 31b4039d33..27272a9ff7 100644
--- a/samples/ControlCatalog/Pages/DataGridPage.xaml
+++ b/samples/ControlCatalog/Pages/DataGridPage.xaml
@@ -10,11 +10,11 @@
         <TextBlock Text="{Binding}"/>
       </StackPanel>
     </DataTemplate>
+    <ControlTheme x:Key="GdpCell" TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
+      <Setter Property="Background" Value="{Binding Path=GDP, Mode=OneWay, Converter={StaticResource GDPConverter}}" />
+    </ControlTheme>
   </UserControl.Resources>
   <UserControl.Styles>
-    <Style Selector="DataGridCell.gdp">
-      <Setter Property="Background" Value="{Binding Path=GDP, Mode=OneWay, Converter={StaticResource GDPConverter}}" />
-    </Style>
     <Style Selector="DataGridColumnHeader:nth-last-child(1)">
       <Setter Property="FontWeight" Value="Bold" />
     </Style>
@@ -54,7 +54,8 @@
               <DataGridTextColumn Header="Region" Binding="{CompiledBinding Region}" Width="4*" x:DataType="local:Country" />
               <DataGridTextColumn Header="Population" Binding="{Binding Population}" Width="3*" />
               <DataGridTextColumn Header="Area" Binding="{Binding Area}" Width="3*" />
-              <DataGridTextColumn Header="GDP" Binding="{Binding GDP}" Width="3*" CellStyleClasses="gdp"
+              <DataGridTextColumn Header="GDP" Binding="{Binding GDP}" Width="3*"
+                                  CellTheme="{StaticResource GdpCell}"
                                   MinWidth="200"
                                   IsVisible="{Binding #ShowGDP.IsChecked}"/>
             </DataGrid.Columns>
diff --git a/src/Avalonia.Controls.DataGrid/DataGridCell.cs b/src/Avalonia.Controls.DataGrid/DataGridCell.cs
index f9685b3682..dd802678d4 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridCell.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridCell.cs
@@ -14,7 +14,7 @@ namespace Avalonia.Controls
     /// Represents an individual <see cref="T:Avalonia.Controls.DataGrid" /> cell.
     /// </summary>
     [TemplatePart(DATAGRIDCELL_elementRightGridLine, typeof(Rectangle))]
-    [PseudoClasses(":selected", ":current", ":edited", ":invalid")]
+    [PseudoClasses(":selected", ":current", ":edited", ":invalid", ":focus")]
     public class DataGridCell : ContentControl
     {
         private const string DATAGRIDCELL_elementRightGridLine = "PART_RightGridLine";
@@ -216,6 +216,8 @@ namespace Avalonia.Controls
             PseudoClasses.Set(":edited", IsEdited);
 
             PseudoClasses.Set(":invalid", !IsValid);
+            
+            PseudoClasses.Set(":focus", OwningGrid.IsFocused && IsCurrent);
         }
 
         // Makes sure the right gridline has the proper stroke and visibility. If lastVisibleColumn is specified, the 
@@ -245,9 +247,15 @@ namespace Avalonia.Controls
             if (column == null)
             {
                 Classes.Clear();
+                ClearValue(ThemeProperty);
             }
             else
             {
+                if (Theme != column.CellTheme)
+                {
+                    Theme = column.CellTheme;
+                }
+                
                 Classes.Replace(column.CellStyleClasses);
             }
         }
diff --git a/src/Avalonia.Controls.DataGrid/DataGridColumn.cs b/src/Avalonia.Controls.DataGrid/DataGridColumn.cs
index e57d6bbde2..fbdb979e24 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridColumn.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridColumn.cs
@@ -16,6 +16,7 @@ using Avalonia.Controls.Templates;
 using Avalonia.Controls.Utils;
 using Avalonia.Layout;
 using Avalonia.Markup.Xaml.MarkupExtensions;
+using Avalonia.Styling;
 
 namespace Avalonia.Controls
 {
@@ -36,6 +37,7 @@ namespace Avalonia.Controls
         private IControl _editingElement;
         private ICellEditBinding _editBinding;
         private IBinding _clipboardContentBinding;
+        private ControlTheme _cellTheme;
         private readonly Classes _cellStyleClasses = new Classes();
 
         /// <summary>
@@ -399,6 +401,24 @@ namespace Avalonia.Controls
                 }
             }
         }
+        
+        /// <summary>
+        ///    Backing field for CellTheme property.
+        /// </summary>
+        public static readonly DirectProperty<DataGridColumn, ControlTheme> CellThemeProperty =
+            AvaloniaProperty.RegisterDirect<DataGridColumn, ControlTheme>(
+                nameof(CellTheme),
+                o => o.CellTheme,
+                (o, v) => o.CellTheme = v);
+
+        /// <summary>
+        ///    Gets or sets the <see cref="DataGridColumnHeader"/> cell theme. 
+        /// </summary>
+        public ControlTheme CellTheme
+        {
+            get { return _cellTheme; }
+            set { SetAndRaise(CellThemeProperty, ref _cellTheme, value); }
+        }
 
         /// <summary>
         ///    Backing field for Header property
diff --git a/src/Avalonia.Controls.DataGrid/DataGridRowGroupHeader.cs b/src/Avalonia.Controls.DataGrid/DataGridRowGroupHeader.cs
index 9f37e8a6aa..d63c738133 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridRowGroupHeader.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridRowGroupHeader.cs
@@ -113,7 +113,6 @@ namespace Avalonia.Controls
         /// </summary>
         public DataGridRowGroupHeader()
         {
-            //DefaultStyleKey = typeof(DataGridRowGroupHeader);
             AddHandler(InputElement.PointerPressedEvent, (s, e) => DataGridRowGroupHeader_PointerPressed(e), handledEventsToo: true);
         }
 
diff --git a/src/Avalonia.Controls.DataGrid/DataGridTextColumn.cs b/src/Avalonia.Controls.DataGrid/DataGridTextColumn.cs
index bb8637cda2..79247aa87f 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridTextColumn.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridTextColumn.cs
@@ -11,6 +11,7 @@ using System.ComponentModel;
 using Avalonia.Layout;
 using Avalonia.Markup.Xaml.MarkupExtensions;
 using Avalonia.Controls.Documents;
+using Avalonia.Styling;
 
 namespace Avalonia.Controls
 {
@@ -19,12 +20,20 @@ namespace Avalonia.Controls
     /// </summary>
     public class DataGridTextColumn : DataGridBoundColumn
     {
+        private readonly Lazy<ControlTheme> _cellTextBoxTheme;
+        private readonly Lazy<ControlTheme> _cellTextBlockTheme;
+        
         /// <summary>
         /// Initializes a new instance of the <see cref="T:Avalonia.Controls.DataGridTextColumn" /> class.
         /// </summary>
         public DataGridTextColumn()
         {
             BindingTarget = TextBox.TextProperty;
+
+            _cellTextBoxTheme = new Lazy<ControlTheme>(() =>
+                OwningGrid.TryFindResource("DataGridCellTextBoxTheme", out var theme) ? (ControlTheme)theme : null);
+            _cellTextBlockTheme = new Lazy<ControlTheme>(() =>
+                OwningGrid.TryFindResource("DataGridCellTextBlockTheme", out var theme) ? (ControlTheme)theme : null);
         }
 
         /// <summary>
@@ -156,16 +165,19 @@ namespace Avalonia.Controls
         protected override IControl GenerateEditingElementDirect(DataGridCell cell, object dataItem)
         {
             var textBox = new TextBox
-            {
-                VerticalAlignment = VerticalAlignment.Stretch,
-                Background = new SolidColorBrush(Colors.Transparent)
+            {                
+                Name = "CellTextBox"
             };
+            if (_cellTextBoxTheme.Value is { } theme)
+            {
+                textBox.Theme = theme;
+            }
 
             SyncProperties(textBox);
 
             return textBox;
         }
-
+        
         /// <summary>
         /// Gets a read-only <see cref="T:Avalonia.Controls.TextBlock" /> element that is bound to the column's <see cref="P:Avalonia.Controls.DataGridBoundColumn.Binding" /> property value.
         /// </summary>
@@ -174,10 +186,14 @@ namespace Avalonia.Controls
         /// <returns>A new, read-only <see cref="T:Avalonia.Controls.TextBlock" /> element that is bound to the column's <see cref="P:Avalonia.Controls.DataGridBoundColumn.Binding" /> property value.</returns>
         protected override IControl GenerateElement(DataGridCell cell, object dataItem)
         {
-            TextBlock textBlockElement = new TextBlock
+            var textBlockElement = new TextBlock
             {
                 Name = "CellTextBlock"
             };
+            if (_cellTextBlockTheme.Value is { } theme)
+            {
+                textBlockElement.Theme = theme;
+            }
 
             SyncProperties(textBlockElement);
 
@@ -227,7 +243,7 @@ namespace Avalonia.Controls
         {
             if (element == null)
             {
-                throw new ArgumentNullException("element");
+                throw new ArgumentNullException(nameof(element));
             }
 
             if (element is AvaloniaObject content)
diff --git a/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml b/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
index fb032fec3e..a80cc2173c 100644
--- a/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
+++ b/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
@@ -1,8 +1,8 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        x:CompileBindings="True">
   <Styles.Resources>
     <x:Double x:Key="ListAccentLowOpacity">0.6</x:Double>
     <x:Double x:Key="ListAccentMediumOpacity">0.8</x:Double>
-    <Thickness x:Key="DataGridTextColumnCellTextBlockMargin">12,0,12,0</Thickness>
 
     <StreamGeometry x:Key="DataGridSortIconDescendingPath">M1875 1011l-787 787v-1798h-128v1798l-787 -787l-90 90l941 941l941 -941z</StreamGeometry>
     <StreamGeometry x:Key="DataGridSortIconAscendingPath">M1965 947l-941 -941l-941 941l90 90l787 -787v1798h128v-1798l787 787z</StreamGeometry>
@@ -13,10 +13,12 @@
     <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="DataGridColumnHeaderDraggedBackgroundBrush"
+                     Color="{DynamicResource SystemChromeMediumLowColor}" />
 
     <SolidColorBrush x:Key="DataGridRowGroupHeaderBackgroundBrush" Color="{DynamicResource SystemChromeMediumColor}" />
-    <SolidColorBrush x:Key="DataGridRowGroupHeaderPressedBackgroundBrush" Color="{DynamicResource SystemListMediumColor}" />
+    <SolidColorBrush x:Key="DataGridRowGroupHeaderPressedBackgroundBrush"
+                     Color="{DynamicResource SystemListMediumColor}" />
     <SolidColorBrush x:Key="DataGridRowGroupHeaderForegroundBrush" Color="{DynamicResource SystemBaseHighColor}" />
     <SolidColorBrush x:Key="DataGridRowGroupHeaderHoveredBackgroundBrush" Color="{DynamicResource SystemListLowColor}" />
 
@@ -27,14 +29,12 @@
     <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}" />
-
-    <SolidColorBrush x:Key="DataGridRowHeaderForegroundBrush" Color="{DynamicResource SystemBaseMediumColor}" />
-    <SolidColorBrush x:Key="DataGridRowHeaderBackgroundBrush" Color="{DynamicResource SystemAltHighColor}" />
-
+    
     <StaticResource x:Key="DataGridCellBackgroundBrush" ResourceKey="SystemControlTransparentBrush" />
     <SolidColorBrush x:Key="DataGridCellFocusVisualPrimaryBrush" Color="{DynamicResource SystemBaseHighColor}" />
     <SolidColorBrush x:Key="DataGridCellFocusVisualSecondaryBrush" Color="{DynamicResource SystemAltMediumColor}" />
@@ -44,157 +44,425 @@
                      Opacity="0.4"
                      Color="{DynamicResource SystemBaseMediumLowColor}" />
     <StaticResource x:Key="DataGridCurrencyVisualPrimaryBrush" ResourceKey="SystemControlTransparentBrush" />
-    <SolidColorBrush x:Key="DataGridDetailsPresenterBackgroundBrush" Color="{DynamicResource SystemChromeMediumLowColor}" />
+    <SolidColorBrush x:Key="DataGridDetailsPresenterBackgroundBrush"
+                     Color="{DynamicResource SystemChromeMediumLowColor}" />
     <StaticResource x:Key="DataGridFillerColumnGridLinesBrush" ResourceKey="SystemControlTransparentBrush" />
-  </Styles.Resources>
 
-  <Style Selector="DataGridCell">
-    <Setter Property="Background" Value="{DynamicResource DataGridCellBackgroundBrush}" />
-    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-    <Setter Property="VerticalContentAlignment" Value="Stretch" />
-    <Setter Property="FontSize" Value="15" />
-    <Setter Property="MinHeight" Value="32" />
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border x:Name="CellBorder"
-                Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}">
-          <Grid x:Name="PART_CellRoot" ColumnDefinitions="*,Auto">
-
-            <Rectangle x:Name="CurrencyVisual"
-                       HorizontalAlignment="Stretch"
-                       VerticalAlignment="Stretch"
-                       Fill="Transparent"
-                       IsHitTestVisible="False"
-                       Stroke="{DynamicResource DataGridCurrencyVisualPrimaryBrush}"
-                       StrokeThickness="1" />
-            <Grid x:Name="FocusVisual" IsHitTestVisible="False">
-              <Rectangle HorizontalAlignment="Stretch"
+    <ControlTheme x:Key="DataGridCellTextBlockTheme" TargetType="TextBlock">
+      <Setter Property="Margin" Value="12,0,12,0" />
+      <Setter Property="VerticalAlignment" Value="Center" />
+    </ControlTheme>
+    <ControlTheme x:Key="DataGridCellTextBoxTheme" TargetType="TextBox" BasedOn="{StaticResource {x:Type TextBox}}">
+      <Setter Property="Margin" Value="12,0,12,0" />
+      <Setter Property="VerticalAlignment" Value="Stretch" />
+      <Setter Property="Background" Value="Transparent" />
+      <Style Selector="^ /template/ DataValidationErrors">
+        <Setter Property="Template" Value="{DynamicResource TooltipDataValidationContentTemplate}" />
+        <Setter Property="ErrorTemplate" Value="{DynamicResource TooltipDataValidationErrorTemplate}" />
+      </Style>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type DataGridCell}" TargetType="DataGridCell">
+      <Setter Property="Background" Value="{DynamicResource DataGridCellBackgroundBrush}" />
+      <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+      <Setter Property="VerticalContentAlignment" Value="Stretch" />
+      <Setter Property="FontSize" Value="15" />
+      <Setter Property="MinHeight" Value="32" />
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border x:Name="CellBorder"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <Grid x:Name="PART_CellRoot" ColumnDefinitions="*,Auto">
+
+              <Rectangle x:Name="CurrencyVisual"
+                         IsVisible="False"
+                         HorizontalAlignment="Stretch"
                          VerticalAlignment="Stretch"
                          Fill="Transparent"
                          IsHitTestVisible="False"
-                         Stroke="{DynamicResource DataGridCellFocusVisualPrimaryBrush}"
-                         StrokeThickness="2" />
-              <Rectangle Margin="2"
+                         Stroke="{DynamicResource DataGridCurrencyVisualPrimaryBrush}"
+                         StrokeThickness="1" />
+              <Grid Grid.Column="0" x:Name="FocusVisual" IsHitTestVisible="False"
+                    IsVisible="False">
+                <Rectangle HorizontalAlignment="Stretch"
+                           VerticalAlignment="Stretch"
+                           Fill="Transparent"
+                           IsHitTestVisible="False"
+                           Stroke="{DynamicResource DataGridCellFocusVisualPrimaryBrush}"
+                           StrokeThickness="2" />
+                <Rectangle Margin="2"
+                           HorizontalAlignment="Stretch"
+                           VerticalAlignment="Stretch"
+                           Fill="Transparent"
+                           IsHitTestVisible="False"
+                           Stroke="{DynamicResource DataGridCellFocusVisualSecondaryBrush}"
+                           StrokeThickness="1" />
+              </Grid>
+
+              <ContentPresenter Grid.Column="0" Margin="{TemplateBinding Padding}"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                Foreground="{TemplateBinding Foreground}" />
+
+              <Rectangle Grid.Column="0" x:Name="InvalidVisualElement"
+                         IsVisible="False"
                          HorizontalAlignment="Stretch"
                          VerticalAlignment="Stretch"
-                         Fill="Transparent"
                          IsHitTestVisible="False"
-                         Stroke="{DynamicResource DataGridCellFocusVisualSecondaryBrush}"
+                         Stroke="{DynamicResource DataGridCellInvalidBrush}"
                          StrokeThickness="1" />
-            </Grid>
 
-            <ContentPresenter Margin="{TemplateBinding Padding}"
-                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                              Content="{TemplateBinding Content}"
-                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                              Foreground="{TemplateBinding Foreground}" />
+              <Rectangle Name="PART_RightGridLine"
+                         Grid.Column="1"
+                         Width="1"
+                         VerticalAlignment="Stretch"
+                         Fill="{DynamicResource DataGridFillerColumnGridLinesBrush}" />
+            </Grid>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+      <Style Selector="^:current /template/ Rectangle#CurrencyVisual">
+        <Setter Property="IsVisible" Value="True" />
+      </Style>
+      <Style Selector="^:focus /template/ Grid#FocusVisual">
+        <Setter Property="IsVisible" Value="True" />
+      </Style>
+      <Style Selector="^:invalid /template/ Rectangle#InvalidVisualElement">
+        <Setter Property="IsVisible" Value="True" />
+      </Style>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type DataGridColumnHeader}" TargetType="DataGridColumnHeader">
+      <Setter Property="Foreground" Value="{DynamicResource DataGridColumnHeaderForegroundBrush}" />
+      <Setter Property="Background" Value="{DynamicResource DataGridColumnHeaderBackgroundBrush}" />
+      <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="SeparatorBrush" Value="{DynamicResource DataGridGridLinesBrush}" />
+      <Setter Property="Padding" Value="12,0,0,0" />
+      <Setter Property="FontSize" Value="12" />
+      <Setter Property="MinHeight" Value="32" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border x:Name="HeaderBorder"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <Grid Name="PART_ColumnHeaderRoot" ColumnDefinitions="*,Auto">
+
+              <Grid Margin="{TemplateBinding Padding}"
+                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="*" />
+                  <ColumnDefinition Width="Auto" MinWidth="32" />
+                </Grid.ColumnDefinitions>
+
+                <ContentPresenter Content="{TemplateBinding Content}"
+                                  ContentTemplate="{TemplateBinding ContentTemplate}" />
+
+                <Path Name="SortIcon"
+                      IsVisible="False"
+                      Grid.Column="1"
+                      Height="12"
+                      HorizontalAlignment="Center"
+                      VerticalAlignment="Center"
+                      Fill="{TemplateBinding Foreground}"
+                      Stretch="Uniform" />
+              </Grid>
 
-            <Rectangle x:Name="InvalidVisualElement"
+              <Rectangle Name="VerticalSeparator"
+                         Grid.Column="1"
+                         Width="1"
+                         VerticalAlignment="Stretch"
+                         Fill="{TemplateBinding SeparatorBrush}"
+                         IsVisible="{TemplateBinding AreSeparatorsVisible}" />
+
+              <Grid x:Name="FocusVisual" IsHitTestVisible="False"
+                    IsVisible="False">
+                <Rectangle x:Name="FocusVisualPrimary"
+                           HorizontalAlignment="Stretch"
+                           VerticalAlignment="Stretch"
+                           Fill="Transparent"
+                           IsHitTestVisible="False"
+                           Stroke="{DynamicResource DataGridCellFocusVisualPrimaryBrush}"
+                           StrokeThickness="2" />
+                <Rectangle x:Name="FocusVisualSecondary"
+                           Margin="2"
+                           HorizontalAlignment="Stretch"
+                           VerticalAlignment="Stretch"
+                           Fill="Transparent"
+                           IsHitTestVisible="False"
+                           Stroke="{DynamicResource DataGridCellFocusVisualSecondaryBrush}"
+                           StrokeThickness="1" />
+              </Grid>
+            </Grid>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+
+      <Style Selector="^:focus-visible /template/ Grid#FocusVisual">
+        <Setter Property="IsVisible" Value="True" />
+      </Style>
+
+      <Style Selector="^:pointerover /template/ Grid#PART_ColumnHeaderRoot">
+        <Setter Property="Background" Value="{DynamicResource DataGridColumnHeaderHoveredBackgroundBrush}" />
+      </Style>
+
+      <Style Selector="^:pressed /template/ Grid#PART_ColumnHeaderRoot">
+        <Setter Property="Background" Value="{DynamicResource DataGridColumnHeaderPressedBackgroundBrush}" />
+      </Style>
+
+      <Style Selector="^:dragIndicator">
+        <Setter Property="Opacity" Value="0.5" />
+      </Style>
+
+      <Style Selector="^:sortascending /template/ Path#SortIcon">
+        <Setter Property="IsVisible" Value="True" />
+        <Setter Property="Data" Value="{StaticResource DataGridSortIconAscendingPath}" />
+      </Style>
+
+      <Style Selector="^:sortdescending /template/ Path#SortIcon">
+        <Setter Property="IsVisible" Value="True" />
+        <Setter Property="Data" Value="{StaticResource DataGridSortIconDescendingPath}" />
+      </Style>
+    </ControlTheme>
+    
+    <ControlTheme x:Key="DataGridTopLeftColumnHeader" TargetType="DataGridColumnHeader" BasedOn="{StaticResource {x:Type DataGridColumnHeader}}">
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Grid x:Name="TopLeftHeaderRoot"
+                RowDefinitions="*,*,Auto">
+            <Border Grid.RowSpan="2"
+                    BorderThickness="0,0,1,0"
+                    BorderBrush="{DynamicResource DataGridGridLinesBrush}" />
+            <Rectangle Grid.Row="0" Grid.RowSpan="2"
+                       VerticalAlignment="Bottom"
+                       StrokeThickness="1"
+                       Height="1"
+                       Fill="{DynamicResource DataGridGridLinesBrush}" />
+          </Grid>
+        </ControlTemplate>
+      </Setter>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type DataGridRowHeader}" TargetType="DataGridRowHeader">
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="SeparatorBrush" Value="{DynamicResource DataGridGridLinesBrush}" />
+      <Setter Property="AreSeparatorsVisible" Value="False" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Grid x:Name="PART_Root"
+                RowDefinitions="*,*,Auto"
+                ColumnDefinitions="Auto,*">
+            <Border Grid.RowSpan="3"
+                    Grid.ColumnSpan="2"
+                    BorderBrush="{TemplateBinding SeparatorBrush}"
+                    BorderThickness="0,0,1,0">
+              <Grid Background="{TemplateBinding Background}">
+                <Rectangle x:Name="RowInvalidVisualElement"
+                           Opacity="0"
+                           Fill="{DynamicResource DataGridRowInvalidBrush}"
+                           Stretch="Fill" />
+                <Rectangle x:Name="BackgroundRectangle"
+                           Fill="{DynamicResource DataGridRowBackgroundBrush}"
+                           Stretch="Fill" />
+              </Grid>
+            </Border>
+            <Rectangle x:Name="HorizontalSeparator"
+                       Grid.Row="2"
+                       Grid.ColumnSpan="2"
+                       Height="1"
+                       Margin="1,0,1,0"
                        HorizontalAlignment="Stretch"
-                       VerticalAlignment="Stretch"
-                       IsHitTestVisible="False"
-                       Stroke="{DynamicResource DataGridCellInvalidBrush}"
-                       StrokeThickness="1" />
+                       Fill="{TemplateBinding SeparatorBrush}"
+                       IsVisible="{TemplateBinding AreSeparatorsVisible}" />
 
-            <Rectangle Name="PART_RightGridLine"
-                       Grid.Column="1"
-                       Width="1"
-                       VerticalAlignment="Stretch"
-                       Fill="{DynamicResource DataGridFillerColumnGridLinesBrush}" />
+            <ContentPresenter Grid.RowSpan="2"
+                              Grid.Column="1"
+                              HorizontalAlignment="Center"
+                              VerticalAlignment="Center"
+                              Content="{TemplateBinding Content}" />
           </Grid>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="DataGridCell > TextBlock#CellTextBlock">
-    <Setter Property="Margin" Value="{DynamicResource DataGridTextColumnCellTextBlockMargin}" />
-    <Setter Property="VerticalAlignment" Value="Center" />
-  </Style>
-  
-  <Style Selector="DataGridCell /template/ Rectangle#CurrencyVisual">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-  <Style Selector="DataGridCell /template/ Grid#FocusVisual">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-  <Style Selector="DataGridCell:current /template/ Rectangle#CurrencyVisual">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
-  <Style Selector="DataGrid:focus DataGridCell:current /template/ Grid#FocusVisual">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
-  <Style Selector="DataGridCell /template/ Rectangle#InvalidVisualElement">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-  <Style Selector="DataGridCell:invalid /template/ Rectangle#InvalidVisualElement">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
-  <Style Selector="DataGridCell > TextBox DataValidationErrors">
-    <Setter Property="Template" Value="{DynamicResource TooltipDataValidationContentTemplate}" />
-    <Setter Property="ErrorTemplate" Value="{DynamicResource TooltipDataValidationErrorTemplate}" />
-  </Style>
-
-  <Style Selector="DataGridColumnHeader">
-    <Setter Property="Foreground" Value="{DynamicResource DataGridColumnHeaderForegroundBrush}" />
-    <Setter Property="Background" Value="{DynamicResource DataGridColumnHeaderBackgroundBrush}" />
-    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="SeparatorBrush" Value="{DynamicResource DataGridGridLinesBrush}" />
-    <Setter Property="Padding" Value="12,0,0,0" />
-    <Setter Property="FontSize" Value="12" />
-    <Setter Property="MinHeight" Value="32" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border x:Name="HeaderBorder"
-                Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}">
-          <Grid Name="PART_ColumnHeaderRoot" ColumnDefinitions="*,Auto">
-
-            <Grid Margin="{TemplateBinding Padding}"
-                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="Auto" MinWidth="32" />
-              </Grid.ColumnDefinitions>
-
-              <ContentPresenter Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
-
-              <Path Name="SortIcon"
-                    Grid.Column="1"
-                    Height="12"
-                    HorizontalAlignment="Center"
-                    VerticalAlignment="Center"
-                    Fill="{TemplateBinding Foreground}"
-                    Stretch="Uniform" />
-            </Grid>
+        </ControlTemplate>
+      </Setter>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type DataGridRow}" TargetType="DataGridRow">
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="Background" Value="{Binding $parent[DataGrid].RowBackground}" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border x:Name="RowBorder"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <DataGridFrozenGrid Name="PART_Root"
+                                ColumnDefinitions="Auto,*"
+                                RowDefinitions="*,Auto,Auto">
+
+              <Rectangle Name="BackgroundRectangle"
+                         Fill="{DynamicResource DataGridRowBackgroundBrush}"
+                         Grid.RowSpan="2"
+                         Grid.ColumnSpan="2" />
+              <Rectangle x:Name="InvalidVisualElement"
+                         Opacity="0"
+                         Grid.ColumnSpan="2"
+                         Fill="{DynamicResource DataGridRowInvalidBrush}" />
+
+              <DataGridRowHeader Name="PART_RowHeader"
+                                 Grid.RowSpan="3"
+                                 DataGridFrozenGrid.IsFrozen="True" />
+              <DataGridCellsPresenter Name="PART_CellsPresenter"
+                                      Grid.Column="1"
+                                      DataGridFrozenGrid.IsFrozen="True" />
+              <DataGridDetailsPresenter Name="PART_DetailsPresenter"
+                                        Grid.Row="1"
+                                        Grid.Column="1"
+                                        Background="{DynamicResource DataGridDetailsPresenterBackgroundBrush}" />
+              <Rectangle Name="PART_BottomGridLine"
+                         Grid.Row="2"
+                         Grid.Column="1"
+                         Height="1"
+                         HorizontalAlignment="Stretch" />
 
-            <Rectangle Name="VerticalSeparator"
-                       Grid.Column="1"
-                       Width="1"
-                       VerticalAlignment="Stretch"
-                       Fill="{TemplateBinding SeparatorBrush}"
-                       IsVisible="{TemplateBinding AreSeparatorsVisible}" />
+            </DataGridFrozenGrid>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+
+      <Style Selector="^:nth-child(even)">
+        <Setter Property="Background" Value="{Binding $parent[DataGrid].AlternatingRowBackground}" />
+      </Style>
+
+      <Style Selector="^:invalid">
+        <Style Selector="^ /template/ Rectangle#InvalidVisualElement">
+          <Setter Property="Opacity" Value="0.4" />
+        </Style>
+        <Style Selector="^ /template/ Rectangle#BackgroundRectangle">
+          <Setter Property="Opacity" Value="0" />
+        </Style>
+      </Style>
+
+      <Style Selector="^:pointerover /template/ Rectangle#BackgroundRectangle">
+        <Setter Property="Fill" Value="{DynamicResource DataGridRowHoveredBackgroundColor}" />
+      </Style>
+
+      <Style Selector="^:selected">
+        <Style Selector="^ /template/ Rectangle#BackgroundRectangle">
+          <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedUnfocusedBackgroundBrush}" />
+          <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedUnfocusedBackgroundOpacity}" />
+        </Style>
+        <Style Selector="^:pointerover /template/ Rectangle#BackgroundRectangle">
+          <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedHoveredUnfocusedBackgroundBrush}" />
+          <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedHoveredUnfocusedBackgroundOpacity}" />
+        </Style>
+        <Style Selector="^:focus /template/ Rectangle#BackgroundRectangle">
+          <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedBackgroundBrush}" />
+          <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedBackgroundOpacity}" />
+        </Style>
+        <Style Selector="^:pointerover:focus /template/ Rectangle#BackgroundRectangle">
+          <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedHoveredBackgroundBrush}" />
+          <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedHoveredBackgroundOpacity}" />
+        </Style>
+      </Style>
+    </ControlTheme>
+
+    <ControlTheme x:Key="FluentDataGridRowGroupExpanderButtonTheme" TargetType="ToggleButton">
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border Width="12"
+                  Height="12"
+                  Background="Transparent"
+                  HorizontalAlignment="Center"
+                  VerticalAlignment="Center">
+            <Path Fill="{TemplateBinding Foreground}"
+                  Data="{StaticResource DataGridRowGroupHeaderIconOpenedPath}"
+                  HorizontalAlignment="Right"
+                  VerticalAlignment="Center"
+                  Stretch="Uniform" />
+          </Border>
+        </ControlTemplate>
+      </Setter>
+      <Style Selector="^:checked /template/ Path">
+        <Setter Property="Data" Value="{StaticResource DataGridRowGroupHeaderIconClosedPath}" />
+      </Style>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type DataGridRowGroupHeader}" TargetType="DataGridRowGroupHeader">
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="Foreground" Value="{DynamicResource DataGridRowGroupHeaderForegroundBrush}" />
+      <Setter Property="Background" Value="{DynamicResource DataGridRowGroupHeaderBackgroundBrush}" />
+      <Setter Property="FontSize" Value="15" />
+      <Setter Property="MinHeight" Value="32" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <DataGridFrozenGrid Name="PART_Root"
+                              Background="{TemplateBinding Background}"
+                              MinHeight="{TemplateBinding MinHeight}"
+                              ColumnDefinitions="Auto,Auto,Auto,Auto,*"
+                              RowDefinitions="*,Auto">
+
+            <Rectangle Name="IndentSpacer"
+                       Grid.Column="1" />
+            <ToggleButton Name="ExpanderButton"
+                          Grid.Column="2"
+                          Width="12"
+                          Height="12"
+                          Margin="12,0,0,0"
+                          Theme="{StaticResource FluentDataGridRowGroupExpanderButtonTheme}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          Background="{TemplateBinding Background}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
+                          Focusable="False"
+                          Foreground="{TemplateBinding Foreground}" />
+
+            <StackPanel Grid.Column="3"
+                        Orientation="Horizontal"
+                        VerticalAlignment="Center"
+                        Margin="12,0,0,0">
+              <TextBlock Name="PropertyNameElement"
+                         Margin="4,0,0,0"
+                         IsVisible="{TemplateBinding IsPropertyNameVisible}"
+                         Foreground="{TemplateBinding Foreground}" />
+              <TextBlock Margin="4,0,0,0"
+                         Text="{ReflectionBinding Key}"
+                         Foreground="{TemplateBinding Foreground}" />
+              <TextBlock Name="ItemCountElement"
+                         Margin="4,0,0,0"
+                         IsVisible="{TemplateBinding IsItemCountVisible}"
+                         Foreground="{TemplateBinding Foreground}" />
+            </StackPanel>
 
-            <Grid x:Name="FocusVisual" IsHitTestVisible="False">
-              <Rectangle x:Name="FocusVisualPrimary"
-                         HorizontalAlignment="Stretch"
+            <Rectangle x:Name="CurrencyVisual"
+                       Grid.ColumnSpan="5"
+                       IsVisible="False"
+                       HorizontalAlignment="Stretch"
+                       VerticalAlignment="Stretch"
+                       Fill="Transparent"
+                       IsHitTestVisible="False"
+                       Stroke="{DynamicResource DataGridCurrencyVisualPrimaryBrush}"
+                       StrokeThickness="1" />
+            <Grid x:Name="FocusVisual"
+                  Grid.ColumnSpan="5"
+                  IsVisible="False"
+                  IsHitTestVisible="False">
+              <Rectangle HorizontalAlignment="Stretch"
                          VerticalAlignment="Stretch"
                          Fill="Transparent"
                          IsHitTestVisible="False"
                          Stroke="{DynamicResource DataGridCellFocusVisualPrimaryBrush}"
                          StrokeThickness="2" />
-              <Rectangle x:Name="FocusVisualSecondary"
-                         Margin="2"
+              <Rectangle Margin="2"
                          HorizontalAlignment="Stretch"
                          VerticalAlignment="Stretch"
                          Fill="Transparent"
@@ -202,447 +470,107 @@
                          Stroke="{DynamicResource DataGridCellFocusVisualSecondaryBrush}"
                          StrokeThickness="1" />
             </Grid>
-          </Grid>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="DataGridColumnHeader /template/ Grid#FocusVisual">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-  <Style Selector="DataGridColumnHeader:focus-visible /template/ Grid#FocusVisual">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
-
-  <Style Selector="DataGridColumnHeader:pointerover /template/ Grid#PART_ColumnHeaderRoot">
-    <Setter Property="Background" Value="{DynamicResource DataGridColumnHeaderHoveredBackgroundBrush}" />
-  </Style>
-  <Style Selector="DataGridColumnHeader:pressed /template/ Grid#PART_ColumnHeaderRoot">
-    <Setter Property="Background" Value="{DynamicResource DataGridColumnHeaderPressedBackgroundBrush}" />
-  </Style>
-
-  <Style Selector="DataGridColumnHeader:dragIndicator">
-    <Setter Property="Opacity" Value="0.5" />
-  </Style>
-
-  <Style Selector="DataGridColumnHeader /template/ Path#SortIcon">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-
-  <Style Selector="DataGridColumnHeader:sortascending /template/ Path#SortIcon">
-    <Setter Property="IsVisible" Value="True" />
-    <Setter Property="Data" Value="{StaticResource DataGridSortIconAscendingPath}" />
-  </Style>
-
-  <Style Selector="DataGridColumnHeader:sortdescending /template/ Path#SortIcon">
-    <Setter Property="IsVisible" Value="True" />
-    <Setter Property="Data" Value="{StaticResource DataGridSortIconDescendingPath}" />
-  </Style>
-
-  <Style Selector="DataGridRow">
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border x:Name="RowBorder"
-                Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}">
-          <DataGridFrozenGrid Name="PART_Root"
-                              ColumnDefinitions="Auto,*"
-                              RowDefinitions="*,Auto,Auto">
-
-            <Rectangle Name="BackgroundRectangle"
-                       Grid.RowSpan="2"
-                       Grid.ColumnSpan="2" />
-            <Rectangle x:Name="InvalidVisualElement"
-                       Grid.ColumnSpan="2"
-                       Fill="{DynamicResource DataGridRowInvalidBrush}" />
 
             <DataGridRowHeader Name="PART_RowHeader"
-                               Grid.RowSpan="3"
+                               Grid.RowSpan="2"
                                DataGridFrozenGrid.IsFrozen="True" />
-            <DataGridCellsPresenter Name="PART_CellsPresenter"
-                                    Grid.Column="1"
-                                    DataGridFrozenGrid.IsFrozen="True" />
-            <DataGridDetailsPresenter Name="PART_DetailsPresenter"
-                                      Grid.Row="1"
-                                      Grid.Column="1"
-                                      Background="{DynamicResource DataGridDetailsPresenterBackgroundBrush}" />
-            <Rectangle Name="PART_BottomGridLine"
-                       Grid.Row="2"
-                       Grid.Column="1"
-                       Height="1"
-                       HorizontalAlignment="Stretch" />
 
+            <Rectangle x:Name="PART_BottomGridLine"
+                       Grid.Row="1"
+                       Grid.ColumnSpan="5"
+                       Height="1" />
           </DataGridFrozenGrid>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="DataGridRow">
-    <Setter Property="Background" Value="{Binding $parent[DataGrid].RowBackground}" />
-  </Style>
-  <Style Selector="DataGridRow:nth-child(even)">
-    <Setter Property="Background" Value="{Binding $parent[DataGrid].AlternatingRowBackground}" />
-  </Style>
-
-  <Style Selector="DataGridRow /template/ Rectangle#InvalidVisualElement">
-    <Setter Property="Opacity" Value="0" />
-  </Style>
-  <Style Selector="DataGridRow:invalid /template/ Rectangle#InvalidVisualElement">
-    <Setter Property="Opacity" Value="0.4" />
-  </Style>
-  <Style Selector="DataGridRow:invalid /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Opacity" Value="0" />
-  </Style>
-
-  <Style Selector="DataGridRow /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Fill" Value="{DynamicResource DataGridRowBackgroundBrush}" />
-  </Style>
-  <Style Selector="DataGridRow:pointerover /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Fill" Value="{DynamicResource DataGridRowHoveredBackgroundColor}" />
-  </Style>
-  <Style Selector="DataGridRow:selected /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedUnfocusedBackgroundBrush}" />
-    <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedUnfocusedBackgroundOpacity}" />
-  </Style>
-  <Style Selector="DataGridRow:selected:pointerover /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedHoveredUnfocusedBackgroundBrush}" />
-    <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedHoveredUnfocusedBackgroundOpacity}" />
-  </Style>
-  <Style Selector="DataGridRow:selected:focus /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedBackgroundBrush}" />
-    <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedBackgroundOpacity}" />
-  </Style>
-  <Style Selector="DataGridRow:selected:pointerover:focus /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedHoveredBackgroundBrush}" />
-    <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedHoveredBackgroundOpacity}" />
-  </Style>
-
-  <Style Selector="DataGridRowHeader">
-    <Setter Property="Foreground" Value="{DynamicResource DataGridRowHeaderForegroundBrush}" />
-    <Setter Property="Background" Value="{DynamicResource DataGridRowHeaderBackgroundBrush}" />
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="SeparatorBrush" Value="{DynamicResource DataGridGridLinesBrush}" />
-    <Setter Property="AreSeparatorsVisible" Value="False" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Grid x:Name="PART_Root"
-              RowDefinitions="*,*,Auto"
-              ColumnDefinitions="Auto,*">
-          <Border Grid.RowSpan="3"
-                  Grid.ColumnSpan="2"
-                  BorderBrush="{TemplateBinding SeparatorBrush}"
-                  BorderThickness="0,0,1,0">
-            <Grid Background="{TemplateBinding Background}">
-              <Rectangle x:Name="RowInvalidVisualElement"
-                         Fill="{DynamicResource DataGridRowInvalidBrush}"
-                         Stretch="Fill" />
-              <Rectangle x:Name="BackgroundRectangle"
-                         Stretch="Fill" />
+        </ControlTemplate>
+      </Setter>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type DataGrid}" TargetType="DataGrid">
+      <Setter Property="RowBackground" Value="Transparent" />
+      <Setter Property="AlternatingRowBackground" Value="Transparent" />
+      <Setter Property="HeadersVisibility" Value="Column" />
+      <Setter Property="HorizontalScrollBarVisibility" Value="Auto" />
+      <Setter Property="VerticalScrollBarVisibility" Value="Auto" />
+      <Setter Property="SelectionMode" Value="Extended" />
+      <Setter Property="GridLinesVisibility" Value="None" />
+      <Setter Property="HorizontalGridLinesBrush" Value="{DynamicResource DataGridGridLinesBrush}" />
+      <Setter Property="VerticalGridLinesBrush" Value="{DynamicResource DataGridGridLinesBrush}" />
+      <Setter Property="DropLocationIndicatorTemplate">
+        <Template>
+          <Rectangle Fill="{DynamicResource DataGridDropLocationIndicatorBackground}"
+                     Width="2" />
+        </Template>
+      </Setter>
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border x:Name="DataGridBorder"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <Grid ColumnDefinitions="Auto,*,Auto" RowDefinitions="Auto,*,Auto,Auto">
+              <DataGridColumnHeader Name="PART_TopLeftCornerHeader"
+                                    Theme="{StaticResource DataGridTopLeftColumnHeader}" />
+              <DataGridColumnHeadersPresenter Name="PART_ColumnHeadersPresenter"
+                                              Grid.Column="1"
+                                              Grid.Row="0" Grid.ColumnSpan="2" />
+              <Rectangle Name="PART_ColumnHeadersAndRowsSeparator"
+                         Grid.Row="0" Grid.ColumnSpan="3" Grid.Column="0"
+                         VerticalAlignment="Bottom"
+                         Height="1"
+                         Fill="{DynamicResource DataGridGridLinesBrush}" />
+
+              <DataGridRowsPresenter Name="PART_RowsPresenter"
+                                     Grid.Row="1"
+                                     Grid.RowSpan="2"
+                                     Grid.ColumnSpan="3" Grid.Column="0">
+                <DataGridRowsPresenter.GestureRecognizers>
+                  <ScrollGestureRecognizer CanHorizontallyScroll="True" CanVerticallyScroll="True" />
+                </DataGridRowsPresenter.GestureRecognizers>
+              </DataGridRowsPresenter>
+              <Rectangle Name="PART_BottomRightCorner"
+                         Fill="{DynamicResource DataGridScrollBarsSeparatorBackground}"
+                         Grid.Column="2"
+                         Grid.Row="2" />
+              <ScrollBar Name="PART_VerticalScrollbar"
+                         Orientation="Vertical"
+                         Grid.Column="2"
+                         Grid.Row="1"
+                         Width="{DynamicResource ScrollBarSize}" />
+
+              <Grid Grid.Column="1"
+                    Grid.Row="2"
+                    ColumnDefinitions="Auto,*">
+                <Rectangle Name="PART_FrozenColumnScrollBarSpacer" />
+                <ScrollBar Name="PART_HorizontalScrollbar"
+                           Grid.Column="1"
+                           Orientation="Horizontal"
+                           Height="{DynamicResource ScrollBarSize}" />
+              </Grid>
+              <Border x:Name="PART_DisabledVisualElement"
+                      Grid.ColumnSpan="3" Grid.Column="0"
+                      Grid.Row="0" Grid.RowSpan="4"
+                      IsHitTestVisible="False"
+                      HorizontalAlignment="Stretch"
+                      VerticalAlignment="Stretch"
+                      CornerRadius="2"
+                      Background="{DynamicResource DataGridDisabledVisualElementBackground}"
+                      IsVisible="{Binding !$parent[DataGrid].IsEnabled}" />
             </Grid>
           </Border>
-          <Rectangle x:Name="HorizontalSeparator"
-                     Grid.Row="2"
-                     Grid.ColumnSpan="2"
-                     Height="1"
-                     Margin="1,0,1,0"
-                     HorizontalAlignment="Stretch"
-                     Fill="{TemplateBinding SeparatorBrush}"
-                     IsVisible="{TemplateBinding AreSeparatorsVisible}" />
-
-          <ContentPresenter Grid.RowSpan="2"
-                            Grid.Column="1"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            Content="{TemplateBinding Content}" />
-        </Grid>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="DataGridRowHeader /template/ Rectangle#RowInvalidVisualElement">
-    <Setter Property="Opacity" Value="0" />
-  </Style>
-  <Style Selector="DataGridRowHeader:invalid /template/ Rectangle#RowInvalidVisualElement">
-    <Setter Property="Opacity" Value="0.4" />
-  </Style>
-  <Style Selector="DataGridRowHeader:invalid /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Opacity" Value="0" />
-  </Style>
-
-  <Style Selector="DataGridRowHeader /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Fill" Value="{DynamicResource DataGridRowBackgroundBrush}" />
-  </Style>
-  <Style Selector="DataGridRow:pointerover DataGridRowHeader /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Fill" Value="{DynamicResource DataGridRowHoveredBackgroundColor}" />
-  </Style>
-  <Style Selector="DataGridRowHeader:selected /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedUnfocusedBackgroundBrush}" />
-    <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedUnfocusedBackgroundOpacity}" />
-  </Style>
-  <Style Selector="DataGridRow:pointerover DataGridRowHeader:selected /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedHoveredUnfocusedBackgroundBrush}" />
-    <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedHoveredUnfocusedBackgroundOpacity}" />
-  </Style>
-  <Style Selector="DataGridRowHeader:selected:focus /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedBackgroundBrush}" />
-    <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedBackgroundOpacity}" />
-  </Style>
-  <Style Selector="DataGridRow:pointerover DataGridRowHeader:selected:focus /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedHoveredBackgroundBrush}" />
-    <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedHoveredBackgroundOpacity}" />
-  </Style>
-
-  <Style Selector="DataGridRowGroupHeader">
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="Foreground" Value="{DynamicResource DataGridRowGroupHeaderForegroundBrush}" />
-    <Setter Property="Background" Value="{DynamicResource DataGridRowGroupHeaderBackgroundBrush}" />
-    <Setter Property="FontSize" Value="15" />
-    <Setter Property="MinHeight" Value="32" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <DataGridFrozenGrid Name="PART_Root"
-                            MinHeight="{TemplateBinding MinHeight}"
-                            ColumnDefinitions="Auto,Auto,Auto,Auto,*"
-                            RowDefinitions="*,Auto">
-
-          <Rectangle Name="IndentSpacer"
-                     Grid.Column="1" />
-          <ToggleButton Name="ExpanderButton"
-                        Grid.Column="2"
-                        Width="12"
-                        Height="12"
-                        Margin="12,0,0,0"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        Background="{TemplateBinding Background}"
-                        CornerRadius="{TemplateBinding CornerRadius}"
-                        Focusable="False"
-                        Foreground="{TemplateBinding Foreground}" />
-
-          <StackPanel Grid.Column="3"
-                      Orientation="Horizontal"
-                      VerticalAlignment="Center"
-                      Margin="12,0,0,0">
-            <TextBlock Name="PropertyNameElement"
-                       Margin="4,0,0,0"
-                       IsVisible="{TemplateBinding IsPropertyNameVisible}"
-                       Foreground="{TemplateBinding Foreground}" />
-            <TextBlock Margin="4,0,0,0"
-                       Text="{Binding Key}"
-                       Foreground="{TemplateBinding Foreground}" />
-            <TextBlock Name="ItemCountElement"
-                       Margin="4,0,0,0"
-                       IsVisible="{TemplateBinding IsItemCountVisible}"
-                       Foreground="{TemplateBinding Foreground}" />
-          </StackPanel>
-
-          <Rectangle x:Name="CurrencyVisual"
-                     Grid.ColumnSpan="5"
-                     HorizontalAlignment="Stretch"
-                     VerticalAlignment="Stretch"
-                     Fill="Transparent"
-                     IsHitTestVisible="False"
-                     Stroke="{DynamicResource DataGridCurrencyVisualPrimaryBrush}"
-                     StrokeThickness="1" />
-          <Grid x:Name="FocusVisual"
-                Grid.ColumnSpan="5"
-                IsHitTestVisible="False">
-            <Rectangle HorizontalAlignment="Stretch"
-                       VerticalAlignment="Stretch"
-                       Fill="Transparent"
-                       IsHitTestVisible="False"
-                       Stroke="{DynamicResource DataGridCellFocusVisualPrimaryBrush}"
-                       StrokeThickness="2" />
-            <Rectangle Margin="2"
-                       HorizontalAlignment="Stretch"
-                       VerticalAlignment="Stretch"
-                       Fill="Transparent"
-                       IsHitTestVisible="False"
-                       Stroke="{DynamicResource DataGridCellFocusVisualSecondaryBrush}"
-                       StrokeThickness="1" />
-          </Grid>
-
-          <DataGridRowHeader Name="PART_RowHeader"
-                             Grid.RowSpan="2"
-                             DataGridFrozenGrid.IsFrozen="True" />
-
-          <Rectangle x:Name="PART_BottomGridLine"
-                     Grid.Row="1"
-                     Grid.ColumnSpan="5"
-                     Height="1" />
-        </DataGridFrozenGrid>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="DataGridRowGroupHeader /template/ ToggleButton#ExpanderButton">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Grid.Column="0"
-                Width="12"
-                Height="12"
-                Background="Transparent"
-                HorizontalAlignment="Center"
-                VerticalAlignment="Center">
-          <Path Fill="{TemplateBinding Foreground}"
-                HorizontalAlignment="Right"
-                VerticalAlignment="Center"
-                Stretch="Uniform" />
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="DataGridRowGroupHeader /template/ ToggleButton#ExpanderButton /template/ Path">
-    <Setter Property="Data" Value="{StaticResource DataGridRowGroupHeaderIconClosedPath}" />
-    <Setter Property="Stretch" Value="Uniform" />
-  </Style>
-
-  <Style Selector="DataGridRowGroupHeader /template/ ToggleButton#ExpanderButton:checked /template/ Path">
-    <Setter Property="Data" Value="{StaticResource DataGridRowGroupHeaderIconOpenedPath}" />
-    <Setter Property="Stretch" Value="UniformToFill" />
-  </Style>
-
-  <Style Selector="DataGridRowGroupHeader /template/ DataGridFrozenGrid#PART_Root">
-    <Setter Property="Background" Value="{Binding $parent[DataGridRowGroupHeader].Background}" />
-  </Style>
-  <Style Selector="DataGridRowGroupHeader:pointerover /template/ DataGridFrozenGrid#PART_Root">
-    <Setter Property="Background" Value="{DynamicResource DataGridRowGroupHeaderHoveredBackgroundBrush}" />
-  </Style>
-  <Style Selector="DataGridRowGroupHeader:pressed /template/ DataGridFrozenGrid#PART_Root">
-    <Setter Property="Background" Value="{DynamicResource DataGridRowGroupHeaderPressedBackgroundBrush}" />
-  </Style>
-
-  <Style Selector="DataGridRowGroupHeader /template/ Rectangle#CurrencyVisual">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-  <Style Selector="DataGridRowGroupHeader /template/ Grid#FocusVisual">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-  <Style Selector="DataGridRowGroupHeader:current /template/ Rectangle#CurrencyVisual">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
-  <Style Selector="DataGrid:focus DataGridRowGroupHeader:current /template/ Grid#FocusVisual">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
-
-  <Style Selector="DataGrid">
-    <Setter Property="RowBackground" Value="Transparent" />
-    <Setter Property="AlternatingRowBackground" Value="Transparent" />
-    <Setter Property="HeadersVisibility" Value="Column" />
-    <Setter Property="HorizontalScrollBarVisibility" Value="Auto" />
-    <Setter Property="VerticalScrollBarVisibility" Value="Auto" />
-    <Setter Property="SelectionMode" Value="Extended" />
-    <Setter Property="GridLinesVisibility" Value="None" />
-    <Setter Property="HorizontalGridLinesBrush" Value="{DynamicResource DataGridGridLinesBrush}" />
-    <Setter Property="VerticalGridLinesBrush" Value="{DynamicResource DataGridGridLinesBrush}" />
-    <Setter Property="DropLocationIndicatorTemplate">
-      <Template>
-        <Rectangle Fill="{DynamicResource DataGridDropLocationIndicatorBackground}"
-                   Width="2" />
-      </Template>
-    </Setter>
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border x:Name="DataGridBorder"
-                Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}">
-          <Grid ColumnDefinitions="Auto,*,Auto" RowDefinitions="Auto,*,Auto,Auto">
-            <Grid.Resources>
-              <ControlTemplate x:Key="TopLeftHeaderTemplate"
-                               TargetType="DataGridColumnHeader">
-                <Grid x:Name="TopLeftHeaderRoot"
-                      RowDefinitions="*,*,Auto">
-                  <Border Grid.RowSpan="2"
-                          BorderThickness="0,0,1,0"
-                          BorderBrush="{DynamicResource DataGridGridLinesBrush}" />
-                  <Rectangle Grid.RowSpan="2"
-                             VerticalAlignment="Bottom"
-                             StrokeThickness="1"
-                             Height="1"
-                             Fill="{DynamicResource DataGridGridLinesBrush}" />
-                </Grid>
-              </ControlTemplate>
-              <ControlTemplate x:Key="TopRightHeaderTemplate"
-                               TargetType="DataGridColumnHeader">
-                <Grid x:Name="RootElement" />
-              </ControlTemplate>
-            </Grid.Resources>
-
-            <DataGridColumnHeader Name="PART_TopLeftCornerHeader"
-                                  Template="{StaticResource TopLeftHeaderTemplate}" />
-            <DataGridColumnHeadersPresenter Name="PART_ColumnHeadersPresenter"
-                                            Grid.Column="1"
-                                            Grid.ColumnSpan="2" />
-            <!--<DataGridColumnHeader Name="PART_TopRightCornerHeader"
-                                  Grid.Column="2"
-                                  Template="{StaticResource TopRightHeaderTemplate}" />-->
-            <Rectangle Name="PART_ColumnHeadersAndRowsSeparator"
-                       Grid.ColumnSpan="3"
-                       VerticalAlignment="Bottom"
-                       Height="1"
-                       Fill="{DynamicResource DataGridGridLinesBrush}" />
-
-            <DataGridRowsPresenter Name="PART_RowsPresenter"
-                                   Grid.Row="1"
-                                   Grid.RowSpan="2"
-                                   Grid.ColumnSpan="3">
-              <DataGridRowsPresenter.GestureRecognizers>
-                <ScrollGestureRecognizer CanHorizontallyScroll="True" CanVerticallyScroll="True" />
-              </DataGridRowsPresenter.GestureRecognizers>
-            </DataGridRowsPresenter>
-            <Rectangle Name="PART_BottomRightCorner"
-                       Fill="{DynamicResource DataGridScrollBarsSeparatorBackground}"
-                       Grid.Column="2"
-                       Grid.Row="2" />
-            <!--<Rectangle Name="BottomLeftCorner"
-                       Fill="{DynamicResource DataGridScrollBarsSeparatorBackground}"
-                       Grid.Row="2"
-                       Grid.ColumnSpan="2" />-->
-            <ScrollBar Name="PART_VerticalScrollbar"
-                       Orientation="Vertical"
-                       Grid.Column="2"
-                       Grid.Row="1"
-                       Width="{DynamicResource ScrollBarSize}" />
-
-            <Grid Grid.Column="1"
-                  Grid.Row="2"
-                  ColumnDefinitions="Auto,*">
-              <Rectangle Name="PART_FrozenColumnScrollBarSpacer" />
-              <ScrollBar Name="PART_HorizontalScrollbar"
-                         Grid.Column="1"
-                         Orientation="Horizontal"
-                         Height="{DynamicResource ScrollBarSize}" />
-            </Grid>
-            <Border x:Name="PART_DisabledVisualElement"
-                    Grid.ColumnSpan="3"
-                    Grid.RowSpan="4"
-                    IsHitTestVisible="False"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Stretch"
-                    CornerRadius="2"
-                    Background="{DynamicResource DataGridDisabledVisualElementBackground}"
-                    IsVisible="{Binding !$parent[DataGrid].IsEnabled}" />
-          </Grid>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="DataGrid:empty-columns /template/ DataGridColumnHeader#PART_TopLeftCornerHeader">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-  <Style Selector="DataGrid:empty-columns /template/ DataGridColumnHeadersPresenter#PART_ColumnHeadersPresenter">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-  <Style Selector="DataGrid:empty-columns /template/ Rectangle#PART_ColumnHeadersAndRowsSeparator">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
+        </ControlTemplate>
+      </Setter>
+
+      <Style Selector="^:empty-columns">
+        <Style Selector="^ /template/ DataGridColumnHeader#PART_TopLeftCornerHeader">
+          <Setter Property="IsVisible" Value="False" />
+        </Style>
+        <Style Selector="^ /template/ DataGridColumnHeadersPresenter#PART_ColumnHeadersPresenter">
+          <Setter Property="IsVisible" Value="False" />
+        </Style>
+        <Style Selector="^ /template/ Rectangle#PART_ColumnHeadersAndRowsSeparator">
+          <Setter Property="IsVisible" Value="False" />
+        </Style>
+      </Style>
+    </ControlTheme>
+  </Styles.Resources>
 </Styles>

From e5f2b145a7d926348376afa34dc9a944aeea9aff Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Sat, 23 Jul 2022 01:20:33 -0400
Subject: [PATCH 134/240] Avoid deprecated input API in tests

---
 .../Input/MouseDeviceTests.cs                 | 93 +++++++++++--------
 .../Input/PointerOverTests.cs                 | 88 +-----------------
 .../Input/PointerTestsBase.cs                 | 90 ++++++++++++++++++
 3 files changed, 143 insertions(+), 128 deletions(-)
 create mode 100644 tests/Avalonia.Base.UnitTests/Input/PointerTestsBase.cs

diff --git a/tests/Avalonia.Base.UnitTests/Input/MouseDeviceTests.cs b/tests/Avalonia.Base.UnitTests/Input/MouseDeviceTests.cs
index 88abb4a6fa..466aba43ee 100644
--- a/tests/Avalonia.Base.UnitTests/Input/MouseDeviceTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Input/MouseDeviceTests.cs
@@ -1,9 +1,12 @@
 using System;
 using System.Collections.Generic;
 using Avalonia.Controls;
+using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Templates;
 using Avalonia.Input;
 using Avalonia.Input.Raw;
 using Avalonia.Media;
+using Avalonia.Platform;
 using Avalonia.Rendering;
 using Avalonia.UnitTests;
 using Moq;
@@ -11,71 +14,79 @@ using Xunit;
 
 namespace Avalonia.Base.UnitTests.Input
 {
-    public class MouseDeviceTests
+    public class MouseDeviceTests : PointerTestsBase
     {
-#pragma warning disable CS0618 // Type or member is obsolete
         [Fact]
         public void Capture_Is_Transferred_To_Parent_When_Control_Removed()
         {
+            using var app = UnitTestApplication.Start(new TestServices(inputManager: new InputManager()));
+
+            var renderer = new Mock<IRenderer>();
+            var device = new MouseDevice();
+            var impl = CreateTopLevelImplMock(renderer.Object);
+
             Canvas control;
-            var root = new TestRoot
+            Panel rootChild;
+            var root = CreateInputRoot(impl.Object, rootChild = new Panel
+            {
+                Children =
+                {
+                    (control = new Canvas())
+                }
+            });
+
+            // Synthesize event to receive a pointer.
+            IPointer result = null;
+            root.PointerMoved += (_, a) =>
             {
-                Child = control = new Canvas(),
+                result = a.Pointer;
             };
-            var target = new MouseDevice();
+            SetHit(renderer, control);
+            impl.Object.Input!(CreateRawPointerMovedArgs(device, root));
 
-            target.Capture(control);
-            Assert.Same(control, target.Captured);
+            Assert.NotNull(result);
+            
+            result.Capture(control);
+            Assert.Same(control, result.Captured);
 
-            root.Child = null;
+            rootChild.Children.Clear();
 
-            Assert.Same(root, target.Captured);
+            Assert.Same(rootChild, result.Captured);
         }
-#pragma warning restore CS0618 // Type or member is obsolete
 
         [Fact]
         public void GetPosition_Should_Respect_Control_RenderTransform()
         {
+            using var app = UnitTestApplication.Start(new TestServices(inputManager: new InputManager()));
+
             var renderer = new Mock<IRenderer>();
+            var device = new MouseDevice();
+            var impl = CreateTopLevelImplMock(renderer.Object);
 
-            using (TestApplication(renderer.Object))
+            Border border;
+            var root = CreateInputRoot(impl.Object, new Panel
             {
-                var inputManager = InputManager.Instance;
-
-                var root = new TestRoot
+                Children =
                 {
-                    MouseDevice = new MouseDevice(),
-                    Child = new Border
+                    (border = new Border
                     {
                         Background = Brushes.Black,
                         RenderTransform = new TranslateTransform(10, 0),
-                    }
-                };
-
-                SendMouseMove(inputManager, root, new Point(11, 11));
-
-#pragma warning disable CS0618 // Type or member is obsolete
-                var result = root.MouseDevice.GetPosition(root.Child);
-#pragma warning restore CS0618 // Type or member is obsolete
-                Assert.Equal(new Point(1, 11), result);
-            }
-        }
+                    })
+                }
+            });
+            
+            
+            Point? result = null;
+            root.PointerMoved += (_, a) =>
+            {
+                result = a.GetPosition(border);
+            };
 
-        private void SendMouseMove(IInputManager inputManager, TestRoot root, Point p = new Point())
-        {
-            inputManager.ProcessInput(new RawPointerEventArgs(
-                root.MouseDevice,
-                0,
-                root,
-                RawPointerEventType.Move,
-                p,
-                RawInputModifiers.None));
-        }
+            SetHit(renderer, border);
+            impl.Object.Input!(CreateRawPointerMovedArgs(device, root, new Point(11, 11)));
 
-        private IDisposable TestApplication(IRenderer renderer)
-        {
-            return UnitTestApplication.Start(
-                new TestServices(inputManager: new InputManager()));
+            Assert.Equal(new Point(1, 11), result);
         }
     }
 }
diff --git a/tests/Avalonia.Base.UnitTests/Input/PointerOverTests.cs b/tests/Avalonia.Base.UnitTests/Input/PointerOverTests.cs
index a5ca2aef4a..a83b176484 100644
--- a/tests/Avalonia.Base.UnitTests/Input/PointerOverTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Input/PointerOverTests.cs
@@ -3,14 +3,10 @@ using System;
 using System.Collections.Generic;
 
 using Avalonia.Controls;
-using Avalonia.Controls.Presenters;
-using Avalonia.Controls.Templates;
 using Avalonia.Input;
 using Avalonia.Input.Raw;
-using Avalonia.Platform;
 using Avalonia.Rendering;
 using Avalonia.UnitTests;
-using Avalonia.VisualTree;
 
 using Moq;
 
@@ -18,7 +14,7 @@ using Xunit;
 
 namespace Avalonia.Base.UnitTests.Input
 {
-    public class PointerOverTests
+    public class PointerOverTests : PointerTestsBase
     {
         // https://github.com/AvaloniaUI/Avalonia/issues/2821
         [Fact]
@@ -448,87 +444,5 @@ namespace Avalonia.Base.UnitTests.Input
                 c.PointerMoved += handler;
             }
         }
-
-        private static void SetHit(Mock<IRenderer> renderer, IControl? hit)
-        {
-            renderer.Setup(x => x.HitTest(It.IsAny<Point>(), It.IsAny<IVisual>(), It.IsAny<Func<IVisual, bool>>()))
-                .Returns(hit is null ? Array.Empty<IControl>() : new[] { hit });
-
-            renderer.Setup(x => x.HitTestFirst(It.IsAny<Point>(), It.IsAny<IVisual>(), It.IsAny<Func<IVisual, bool>>()))
-                .Returns(hit);
-        }
-
-        private static void SetMove(Mock<IPointerDevice> deviceMock, IInputRoot root, IInputElement element)
-        {
-            deviceMock.Setup(d => d.ProcessRawEvent(It.IsAny<RawPointerEventArgs>()))
-                .Callback(() => element.RaiseEvent(CreatePointerMovedArgs(root, element)));
-        }
-
-        private static Mock<IWindowImpl> CreateTopLevelImplMock(IRenderer renderer)
-        {
-            var impl = new Mock<IWindowImpl>();
-            impl.DefaultValue = DefaultValue.Mock;
-            impl.SetupAllProperties();
-            impl.SetupGet(r => r.RenderScaling).Returns(1);
-            impl.Setup(r => r.CreateRenderer(It.IsAny<IRenderRoot>())).Returns(renderer);
-            impl.Setup(r => r.PointToScreen(It.IsAny<Point>())).Returns<Point>(p => new PixelPoint((int)p.X, (int)p.Y));
-            impl.Setup(r => r.PointToClient(It.IsAny<PixelPoint>())).Returns<PixelPoint>(p => new Point(p.X, p.Y));
-            return impl;
-        }
-
-        private static IInputRoot CreateInputRoot(IWindowImpl impl, IControl child)
-        {
-            var root = new Window(impl)
-            {
-                Width = 100,
-                Height = 100,
-                Content = child,
-                Template = new FuncControlTemplate<Window>((w, _) => new ContentPresenter
-                {
-                    Content = w.Content
-                })
-            };
-            root.Show();
-            return root;
-        }
-
-        private static IInputRoot CreateInputRoot(IRenderer renderer, IControl child)
-        {
-            return CreateInputRoot(CreateTopLevelImplMock(renderer).Object, child);
-        }
-
-        private static RawPointerEventArgs CreateRawPointerMovedArgs(
-            IPointerDevice pointerDevice,
-            IInputRoot root,
-            Point? positition = null)
-        {
-            return new RawPointerEventArgs(pointerDevice, 0, root, RawPointerEventType.Move,
-                positition ?? default, default);
-        }
-
-        private static PointerEventArgs CreatePointerMovedArgs(
-            IInputRoot root, IInputElement? source, Point? positition = null)
-        {
-            return new PointerEventArgs(InputElement.PointerMovedEvent, source, new Mock<IPointer>().Object, root,
-                positition ?? default, default, PointerPointProperties.None, KeyModifiers.None);
-        }
-
-        private static Mock<IPointerDevice> CreatePointerDeviceMock(
-            IPointer? pointer = null,
-            PointerType pointerType = PointerType.Mouse)
-        {
-            if (pointer is null)
-            {
-                var pointerMock = new Mock<IPointer>();
-                pointerMock.SetupGet(p => p.Type).Returns(pointerType);
-                pointer = pointerMock.Object;
-            }
-
-            var pointerDevice = new Mock<IPointerDevice>();
-            pointerDevice.Setup(d => d.TryGetPointer(It.IsAny<RawPointerEventArgs>()))
-                .Returns(pointer);
-
-            return pointerDevice;
-        }
     }
 }
diff --git a/tests/Avalonia.Base.UnitTests/Input/PointerTestsBase.cs b/tests/Avalonia.Base.UnitTests/Input/PointerTestsBase.cs
new file mode 100644
index 0000000000..1ca6678aef
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Input/PointerTestsBase.cs
@@ -0,0 +1,90 @@
+#nullable enable
+using System;
+using Avalonia.Controls;
+using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Templates;
+using Avalonia.Input;
+using Avalonia.Input.Raw;
+using Avalonia.Platform;
+using Avalonia.Rendering;
+using Avalonia.VisualTree;
+using Moq;
+
+namespace Avalonia.Base.UnitTests.Input;
+
+public abstract class PointerTestsBase
+{
+    protected static void SetHit(Mock<IRenderer> renderer, IControl? hit)
+    {
+        renderer.Setup(x => x.HitTest(It.IsAny<Point>(), It.IsAny<IVisual>(), It.IsAny<Func<IVisual, bool>>()))
+            .Returns(hit is null ? Array.Empty<IControl>() : new[] { hit });
+
+        renderer.Setup(x => x.HitTestFirst(It.IsAny<Point>(), It.IsAny<IVisual>(), It.IsAny<Func<IVisual, bool>>()))
+            .Returns(hit);
+    }
+
+    protected static void SetMove(Mock<IPointerDevice> deviceMock, IInputRoot root, IInputElement element)
+    {
+        deviceMock.Setup(d => d.ProcessRawEvent(It.IsAny<RawPointerEventArgs>()))
+            .Callback(() => element.RaiseEvent(CreatePointerMovedArgs(root, element)));
+    }
+
+    protected static Mock<IWindowImpl> CreateTopLevelImplMock(IRenderer renderer)
+    {
+        var impl = new Mock<IWindowImpl>();
+        impl.DefaultValue = DefaultValue.Mock;
+        impl.SetupAllProperties();
+        impl.SetupGet(r => r.RenderScaling).Returns(1);
+        impl.Setup(r => r.CreateRenderer(It.IsAny<IRenderRoot>())).Returns(renderer);
+        impl.Setup(r => r.PointToScreen(It.IsAny<Point>())).Returns<Point>(p => new PixelPoint((int)p.X, (int)p.Y));
+        impl.Setup(r => r.PointToClient(It.IsAny<PixelPoint>())).Returns<PixelPoint>(p => new Point(p.X, p.Y));
+        return impl;
+    }
+
+    protected static IInputRoot CreateInputRoot(IWindowImpl impl, IControl child)
+    {
+        var root = new Window(impl)
+        {
+            Width = 100,
+            Height = 100,
+            Content = child,
+            Template = new FuncControlTemplate<Window>((w, _) => new ContentPresenter { Content = w.Content })
+        };
+        root.Show();
+        return root;
+    }
+
+    protected static RawPointerEventArgs CreateRawPointerMovedArgs(
+        IPointerDevice pointerDevice,
+        IInputRoot root,
+        Point? positition = null)
+    {
+        return new RawPointerEventArgs(pointerDevice, 0, root, RawPointerEventType.Move,
+            positition ?? default, default);
+    }
+
+    protected static PointerEventArgs CreatePointerMovedArgs(
+        IInputRoot root, IInputElement? source, Point? positition = null)
+    {
+        return new PointerEventArgs(InputElement.PointerMovedEvent, source, new Mock<IPointer>().Object, root,
+            positition ?? default, default, PointerPointProperties.None, KeyModifiers.None);
+    }
+
+    protected static Mock<IPointerDevice> CreatePointerDeviceMock(
+        IPointer? pointer = null,
+        PointerType pointerType = PointerType.Mouse)
+    {
+        if (pointer is null)
+        {
+            var pointerMock = new Mock<IPointer>();
+            pointerMock.SetupGet(p => p.Type).Returns(pointerType);
+            pointer = pointerMock.Object;
+        }
+
+        var pointerDevice = new Mock<IPointerDevice>();
+        pointerDevice.Setup(d => d.TryGetPointer(It.IsAny<RawPointerEventArgs>()))
+            .Returns(pointer);
+
+        return pointerDevice;
+    }
+}

From 5d836f88efa1ae6a3ee031ef2a3176942cb7773e Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Sat, 23 Jul 2022 01:20:48 -0400
Subject: [PATCH 135/240] Avoid deprecated input API in win32 backend

---
 .../Input/WindowsMouseDevice.cs               | 21 +++++++++++++++----
 src/Windows/Avalonia.Win32/WindowImpl.cs      |  7 +++----
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/Windows/Avalonia.Win32/Input/WindowsMouseDevice.cs b/src/Windows/Avalonia.Win32/Input/WindowsMouseDevice.cs
index b1064ae25d..224ffdc3fd 100644
--- a/src/Windows/Avalonia.Win32/Input/WindowsMouseDevice.cs
+++ b/src/Windows/Avalonia.Win32/Input/WindowsMouseDevice.cs
@@ -8,15 +8,28 @@ namespace Avalonia.Win32.Input
 {
     class WindowsMouseDevice : MouseDevice
     {
-        public WindowsMouseDevice() : base(new WindowsMousePointer())
+        private readonly IPointer _pointer;
+        public WindowsMouseDevice() : base(WindowsMousePointer.CreatePointer(out var pointer))
         {
-            
+            _pointer = pointer;
+        }
+
+        // Normally user should use IPointer.Capture instead of MouseDevice.Capture,
+        // But on Windows we need to handle WM_MOUSE capture manually without having access to the Pointer. 
+        internal void Capture(IInputElement control)
+        {
+            _pointer.Capture(control);
         }
         
-        class WindowsMousePointer : Pointer
+        internal class WindowsMousePointer : Pointer
         {
-            public WindowsMousePointer() : base(Pointer.GetNextFreeId(),PointerType.Mouse, true)
+            private WindowsMousePointer() : base(Pointer.GetNextFreeId(),PointerType.Mouse, true)
+            {
+            }
+            
+            public static WindowsMousePointer CreatePointer(out WindowsMousePointer pointer)
             {
+                return pointer = new WindowsMousePointer();
             }
 
             protected override void PlatformCapture(IInputElement element)
diff --git a/src/Windows/Avalonia.Win32/WindowImpl.cs b/src/Windows/Avalonia.Win32/WindowImpl.cs
index 2f1a116af7..6d5cba9946 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.cs
@@ -72,7 +72,7 @@ namespace Avalonia.Win32
 
         private const WindowStyles WindowStateMask = (WindowStyles.WS_MAXIMIZE | WindowStyles.WS_MINIMIZE);
         private readonly TouchDevice _touchDevice;
-        private readonly MouseDevice _mouseDevice;
+        private readonly WindowsMouseDevice _mouseDevice;
         private readonly PenDevice _penDevice;
         private readonly ManagedDeferredRendererLock _rendererLock;
         private readonly FramebufferManager _framebuffer;
@@ -689,10 +689,9 @@ namespace Avalonia.Win32
 
         public void BeginMoveDrag(PointerPressedEventArgs e)
         {
-            _mouseDevice.Capture(null);
+            e.Pointer.Capture(null);
             DefWindowProc(_hwnd, (int)WindowsMessage.WM_NCLBUTTONDOWN,
                 new IntPtr((int)HitTestValues.HTCAPTION), IntPtr.Zero);
-            e.Pointer.Capture(null);
         }
 
         public void BeginResizeDrag(WindowEdge edge, PointerPressedEventArgs e)
@@ -702,7 +701,7 @@ namespace Avalonia.Win32
 #if USE_MANAGED_DRAG
                 _managedDrag.BeginResizeDrag(edge, ScreenToClient(MouseDevice.Position.ToPoint(_scaling)));
 #else
-                _mouseDevice.Capture(null);
+                e.Pointer.Capture(null);
                 DefWindowProc(_hwnd, (int)WindowsMessage.WM_NCLBUTTONDOWN,
                     new IntPtr((int)s_edgeLookup[edge]), IntPtr.Zero);
 #endif

From 88f3088031c874bc758288977990b34de6bc50a3 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Sat, 23 Jul 2022 01:20:57 -0400
Subject: [PATCH 136/240] Avoid deprecated input API in devtools

---
 .../Diagnostics/Views/MainWindow.xaml.cs              | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs b/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs
index 3b143d3b58..96dc929434 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs
@@ -19,8 +19,10 @@ namespace Avalonia.Diagnostics.Views
     internal class MainWindow : Window, IStyleHost
     {
         private readonly IDisposable? _keySubscription;
+        private readonly IDisposable? _pointerSubscription;
         private readonly Dictionary<Popup, IDisposable> _frozenPopupStates;
         private AvaloniaObject? _root;
+        private PixelPoint _lastPointerPosition;
 
         public MainWindow()
         {
@@ -30,6 +32,10 @@ namespace Avalonia.Diagnostics.Views
                 .OfType<RawKeyEventArgs>()
                 .Where(x => x.Type == RawKeyEventType.KeyDown)
                 .Subscribe(RawKeyDown);
+            _pointerSubscription = InputManager.Instance?.Process
+                .OfType<RawPointerEventArgs>()
+                .Subscribe(x => _lastPointerPosition = x.Root.PointToScreen(x.Position));
+
 
             _frozenPopupStates = new Dictionary<Popup, IDisposable>();
 
@@ -84,6 +90,7 @@ namespace Avalonia.Diagnostics.Views
         {
             base.OnClosed(e);
             _keySubscription?.Dispose();
+            _pointerSubscription?.Dispose();
 
             foreach (var state in _frozenPopupStates)
             {
@@ -108,9 +115,7 @@ namespace Avalonia.Diagnostics.Views
 
         private IControl? GetHoveredControl(TopLevel topLevel)
         {
-#pragma warning disable CS0618 // Type or member is obsolete
-            var point = (topLevel as IInputRoot)?.MouseDevice?.GetPosition(topLevel) ?? default;
-#pragma warning restore CS0618 // Type or member is obsolete
+            var point = topLevel.PointToClient(_lastPointerPosition);
 
             return (IControl?)topLevel.GetVisualsAt(point, x =>
                 {

From 6485fa145818e1dc7ec35241d8969c3aceb3ff44 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Sat, 23 Jul 2022 01:21:23 -0400
Subject: [PATCH 137/240] Add intertnal LastPointerPosition to be used in popup
 code

---
 .../Primitives/PopupPositioning/IPopupPositioner.cs   | 11 +++++------
 .../Remote/Server/RemoteServerTopLevelImpl.cs         |  1 -
 src/Avalonia.Controls/TopLevel.cs                     |  2 ++
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Avalonia.Controls/Primitives/PopupPositioning/IPopupPositioner.cs b/src/Avalonia.Controls/Primitives/PopupPositioning/IPopupPositioner.cs
index 8d35a91e00..d8de813d47 100644
--- a/src/Avalonia.Controls/Primitives/PopupPositioning/IPopupPositioner.cs
+++ b/src/Avalonia.Controls/Primitives/PopupPositioning/IPopupPositioner.cs
@@ -45,6 +45,7 @@ Copyright © 2019 Nikita Tsukanov
 */
 
 using System;
+using Avalonia.Input;
 using Avalonia.Metadata;
 using Avalonia.VisualTree;
 using Avalonia.Media;
@@ -452,16 +453,14 @@ namespace Avalonia.Controls.Primitives.PopupPositioning
             PopupPositionerConstraintAdjustment constraintAdjustment, Rect? rect,
             FlowDirection flowDirection)
         {
-            // We need a better way for tracking the last pointer position
-#pragma warning disable CS0618 // Type or member is obsolete
-            var pointer = topLevel.PointToClient(topLevel.PlatformImpl?.MouseDevice.Position ?? default);
-#pragma warning restore CS0618 // Type or member is obsolete
-
             positionerParameters.Offset = offset;
             positionerParameters.ConstraintAdjustment = constraintAdjustment;
             if (placement == PlacementMode.Pointer)
             {
-                positionerParameters.AnchorRectangle = new Rect(pointer, new Size(1, 1));
+                // We need a better way for tracking the last pointer position
+                var position = topLevel.PointToClient(topLevel.LastPointerPosition ?? default);
+
+                positionerParameters.AnchorRectangle = new Rect(position, new Size(1, 1));
                 positionerParameters.Anchor = PopupAnchor.TopLeft;
                 positionerParameters.Gravity = PopupGravity.BottomRight;
             }
diff --git a/src/Avalonia.Controls/Remote/Server/RemoteServerTopLevelImpl.cs b/src/Avalonia.Controls/Remote/Server/RemoteServerTopLevelImpl.cs
index e800f2f4b0..3bc0593813 100644
--- a/src/Avalonia.Controls/Remote/Server/RemoteServerTopLevelImpl.cs
+++ b/src/Avalonia.Controls/Remote/Server/RemoteServerTopLevelImpl.cs
@@ -12,7 +12,6 @@ using Avalonia.Remote.Protocol;
 using Avalonia.Remote.Protocol.Input;
 using Avalonia.Remote.Protocol.Viewport;
 using Avalonia.Threading;
-using InputModifiers = Avalonia.Input.InputModifiers;
 using Key = Avalonia.Input.Key;
 using PixelFormat = Avalonia.Platform.PixelFormat;
 using ProtocolPixelFormat = Avalonia.Remote.Protocol.Viewport.PixelFormat;
diff --git a/src/Avalonia.Controls/TopLevel.cs b/src/Avalonia.Controls/TopLevel.cs
index 5c5053b982..7d0a1d2c39 100644
--- a/src/Avalonia.Controls/TopLevel.cs
+++ b/src/Avalonia.Controls/TopLevel.cs
@@ -285,6 +285,8 @@ namespace Avalonia.Controls
         /// </summary>
         public IRenderer Renderer { get; private set; }
 
+        internal PixelPoint? LastPointerPosition => _pointerOverPreProcessor?.LastPosition;
+        
         /// <summary>
         /// Gets the access key handler for the window.
         /// </summary>

From 64738901397c494f8c24815ec73bd2bd3b2c1ebb Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Sat, 23 Jul 2022 01:21:38 -0400
Subject: [PATCH 138/240] Remove all obsolete members from Input namespace

---
 src/Avalonia.Base/Input/Cursor.cs             |  5 +-
 src/Avalonia.Base/Input/DragEventArgs.cs      | 18 ------
 src/Avalonia.Base/Input/GotFocusEventArgs.cs  | 11 ----
 src/Avalonia.Base/Input/IKeyboardDevice.cs    | 13 ----
 src/Avalonia.Base/Input/IMouseDevice.cs       | 12 ----
 src/Avalonia.Base/Input/IPointerDevice.cs     | 14 -----
 src/Avalonia.Base/Input/KeyEventArgs.cs       |  2 -
 src/Avalonia.Base/Input/KeyGesture.cs         | 12 +---
 src/Avalonia.Base/Input/MouseDevice.cs        | 54 +---------------
 src/Avalonia.Base/Input/PenDevice.cs          | 19 +-----
 src/Avalonia.Base/Input/PointerEventArgs.cs   | 62 +------------------
 .../Input/PointerOverPreProcessor.cs          |  2 +
 src/Avalonia.Base/Input/Raw/RawDragEvent.cs   |  5 --
 .../Input/Raw/RawTouchEventArgs.cs            |  3 -
 src/Avalonia.Base/Input/TouchDevice.cs        | 11 ----
 15 files changed, 9 insertions(+), 234 deletions(-)

diff --git a/src/Avalonia.Base/Input/Cursor.cs b/src/Avalonia.Base/Input/Cursor.cs
index 122838f682..98c4258a90 100644
--- a/src/Avalonia.Base/Input/Cursor.cs
+++ b/src/Avalonia.Base/Input/Cursor.cs
@@ -32,10 +32,7 @@ namespace Avalonia.Input
         DragCopy,
         DragLink,
         None,
-
-        [Obsolete("Use BottomSide")]
-        BottomSize = BottomSide
-
+        
         // Not available in GTK directly, see http://www.pixelbeat.org/programming/x_cursors/ 
         // We might enable them later, preferably, by loading pixmax directly from theme with fallback image
         // SizeNorthWestSouthEast,
diff --git a/src/Avalonia.Base/Input/DragEventArgs.cs b/src/Avalonia.Base/Input/DragEventArgs.cs
index 22ca8358ff..0e613c0f21 100644
--- a/src/Avalonia.Base/Input/DragEventArgs.cs
+++ b/src/Avalonia.Base/Input/DragEventArgs.cs
@@ -13,9 +13,6 @@ namespace Avalonia.Input
 
         public IDataObject Data { get; private set; }
 
-        [Obsolete("Use KeyModifiers")]
-        public InputModifiers Modifiers { get; private set; }
-
         public KeyModifiers KeyModifiers { get; private set; }
 
         public Point GetPosition(IVisual relativeTo)
@@ -35,17 +32,6 @@ namespace Avalonia.Input
             return point;
         }
 
-        [Obsolete("Use constructor taking KeyModifiers")]
-        public DragEventArgs(RoutedEvent<DragEventArgs> routedEvent, IDataObject data, Interactive target, Point targetLocation, InputModifiers modifiers)
-            : base(routedEvent)
-        {
-            Data = data;
-            _target = target;
-            _targetLocation = targetLocation;
-            Modifiers = modifiers;
-            KeyModifiers = (KeyModifiers)(((int)modifiers) & 0xF);
-        }
-
         public DragEventArgs(RoutedEvent<DragEventArgs> routedEvent, IDataObject data, Interactive target, Point targetLocation, KeyModifiers keyModifiers)
             : base(routedEvent)
         {
@@ -53,10 +39,6 @@ namespace Avalonia.Input
             _target = target;
             _targetLocation = targetLocation;
             KeyModifiers = keyModifiers;
-#pragma warning disable CS0618 // Type or member is obsolete
-            Modifiers = (InputModifiers)keyModifiers;
-#pragma warning restore CS0618 // Type or member is obsolete
         }
-
     }
 }
diff --git a/src/Avalonia.Base/Input/GotFocusEventArgs.cs b/src/Avalonia.Base/Input/GotFocusEventArgs.cs
index 9d958823fe..5cce138ee0 100644
--- a/src/Avalonia.Base/Input/GotFocusEventArgs.cs
+++ b/src/Avalonia.Base/Input/GotFocusEventArgs.cs
@@ -1,4 +1,3 @@
-using System;
 using Avalonia.Interactivity;
 
 namespace Avalonia.Input
@@ -13,16 +12,6 @@ namespace Avalonia.Input
         /// </summary>
         public NavigationMethod NavigationMethod { get; set; }
 
-        /// <summary>
-        /// Gets or sets any input modifiers active at the time of focus.
-        /// </summary>
-        [Obsolete("Use KeyModifiers")]
-        public InputModifiers InputModifiers
-        {
-            get => (InputModifiers)KeyModifiers;
-            set => KeyModifiers = (KeyModifiers)((int)value & 0xF);
-        }
-
         /// <summary>
         /// Gets or sets any key modifiers active at the time of focus.
         /// </summary>
diff --git a/src/Avalonia.Base/Input/IKeyboardDevice.cs b/src/Avalonia.Base/Input/IKeyboardDevice.cs
index 80aebc02bc..0b7b5aaecc 100644
--- a/src/Avalonia.Base/Input/IKeyboardDevice.cs
+++ b/src/Avalonia.Base/Input/IKeyboardDevice.cs
@@ -4,19 +4,6 @@ using Avalonia.Metadata;
 
 namespace Avalonia.Input
 {
-    [Flags, Obsolete("Use KeyModifiers and PointerPointProperties")]
-    public enum InputModifiers
-    {
-        None = 0,
-        Alt = 1,
-        Control = 2,
-        Shift = 4,
-        Windows = 8,
-        LeftMouseButton = 16,
-        RightMouseButton = 32,
-        MiddleMouseButton = 64
-    }
-
     [Flags]
     public enum KeyModifiers
     {
diff --git a/src/Avalonia.Base/Input/IMouseDevice.cs b/src/Avalonia.Base/Input/IMouseDevice.cs
index 2d66397d63..00c436bf21 100644
--- a/src/Avalonia.Base/Input/IMouseDevice.cs
+++ b/src/Avalonia.Base/Input/IMouseDevice.cs
@@ -1,4 +1,3 @@
-using System;
 using Avalonia.Metadata;
 
 namespace Avalonia.Input
@@ -9,16 +8,5 @@ namespace Avalonia.Input
     [NotClientImplementable]
     public interface IMouseDevice : IPointerDevice
     {
-        /// <summary>
-        /// Gets the mouse position, in screen coordinates.
-        /// </summary>
-        [Obsolete("Use PointerEventArgs.GetPosition")]
-        PixelPoint Position { get; }
-
-        [Obsolete]
-        void TopLevelClosed(IInputRoot root);
-
-        [Obsolete]
-        void SceneInvalidated(IInputRoot root, Rect rect);
     }
 }
diff --git a/src/Avalonia.Base/Input/IPointerDevice.cs b/src/Avalonia.Base/Input/IPointerDevice.cs
index 0993835feb..e0aebda9c5 100644
--- a/src/Avalonia.Base/Input/IPointerDevice.cs
+++ b/src/Avalonia.Base/Input/IPointerDevice.cs
@@ -1,5 +1,3 @@
-using System;
-using Avalonia.VisualTree;
 using Avalonia.Input.Raw;
 using Avalonia.Metadata;
 
@@ -8,18 +6,6 @@ namespace Avalonia.Input
     [NotClientImplementable]
     public interface IPointerDevice : IInputDevice
     {
-        /// <inheritdoc cref="IPointer.Captured" />
-        [Obsolete("Use IPointer")]
-        IInputElement? Captured { get; }
-
-        /// <inheritdoc cref="IPointer.Capture(IInputElement?)" />
-        [Obsolete("Use IPointer")]
-        void Capture(IInputElement? control);
-
-        /// <inheritdoc cref="PointerEventArgs.GetPosition(IVisual?)" />
-        [Obsolete("Use PointerEventArgs.GetPosition")]
-        Point GetPosition(IVisual relativeTo);
-
         /// <summary>
         /// Gets a pointer for specific event args.
         /// </summary>
diff --git a/src/Avalonia.Base/Input/KeyEventArgs.cs b/src/Avalonia.Base/Input/KeyEventArgs.cs
index 67cd5a520a..b8291e9096 100644
--- a/src/Avalonia.Base/Input/KeyEventArgs.cs
+++ b/src/Avalonia.Base/Input/KeyEventArgs.cs
@@ -9,8 +9,6 @@ namespace Avalonia.Input
 
         public Key Key { get; set; }
 
-        [Obsolete("Use KeyModifiers")]
-        public InputModifiers Modifiers => (InputModifiers)KeyModifiers;
         public KeyModifiers KeyModifiers { get; set; }
     }
 }
diff --git a/src/Avalonia.Base/Input/KeyGesture.cs b/src/Avalonia.Base/Input/KeyGesture.cs
index 3b7a828b86..e79e9341a9 100644
--- a/src/Avalonia.Base/Input/KeyGesture.cs
+++ b/src/Avalonia.Base/Input/KeyGesture.cs
@@ -15,13 +15,6 @@ namespace Avalonia.Input
             { "+", Key.OemPlus }, { "-", Key.OemMinus }, { ".", Key.OemPeriod }, { ",", Key.OemComma }
         };
 
-        [Obsolete("Use constructor taking KeyModifiers")]
-        public KeyGesture(Key key, InputModifiers modifiers)
-        {
-            Key = key;
-            KeyModifiers = (KeyModifiers)(((int)modifiers) & 0xf);
-        }
-
         public KeyGesture(Key key, KeyModifiers modifiers = KeyModifiers.None)
         {
             Key = key;
@@ -63,10 +56,7 @@ namespace Avalonia.Input
         }
 
         public Key Key { get; }
-
-        [Obsolete("Use KeyModifiers")]
-        public InputModifiers Modifiers => (InputModifiers)KeyModifiers;
-
+        
         public KeyModifiers KeyModifiers { get; }
 
         public static KeyGesture Parse(string gesture)
diff --git a/src/Avalonia.Base/Input/MouseDevice.cs b/src/Avalonia.Base/Input/MouseDevice.cs
index 5f8ab24b79..055c9cf1fd 100644
--- a/src/Avalonia.Base/Input/MouseDevice.cs
+++ b/src/Avalonia.Base/Input/MouseDevice.cs
@@ -21,7 +21,6 @@ namespace Avalonia.Input
 
         private readonly Pointer _pointer;
         private bool _disposed;
-        private PixelPoint? _position;
         private MouseButton _lastMouseDownButton;
 
         public MouseDevice(Pointer? pointer = null)
@@ -29,43 +28,6 @@ namespace Avalonia.Input
             _pointer = pointer ?? new Pointer(Pointer.GetNextFreeId(), PointerType.Mouse, true);
         }
 
-        [Obsolete("Use IPointer instead")]
-        public IInputElement? Captured => _pointer.Captured;
-
-        [Obsolete("Use events instead")]
-        public PixelPoint Position
-        {
-            get => _position ?? new PixelPoint(-1, -1);
-            protected set => _position = value;
-        }
-
-        [Obsolete("Use IPointer instead")]
-        public void Capture(IInputElement? control)
-        {
-            _pointer.Capture(control);
-        }
-
-        /// <summary>
-        /// Gets the mouse position relative to a control.
-        /// </summary>
-        /// <param name="relativeTo">The control.</param>
-        /// <returns>The mouse position in the control's coordinates.</returns>
-        public Point GetPosition(IVisual relativeTo)
-        {
-            relativeTo = relativeTo ?? throw new ArgumentNullException(nameof(relativeTo));
-
-            if (relativeTo.VisualRoot == null)
-            {
-                throw new InvalidOperationException("Control is not attached to visual tree.");
-            }
-
-#pragma warning disable CS0618 // Type or member is obsolete
-            var rootPoint = relativeTo.VisualRoot.PointToClient(Position);
-#pragma warning restore CS0618 // Type or member is obsolete
-            var transform = relativeTo.VisualRoot.TransformToVisual(relativeTo);
-            return rootPoint * transform!.Value;
-        }
-
         public void ProcessRawEvent(RawInputEventArgs e)
         {
             if (!e.Handled && e is RawPointerEventArgs margs)
@@ -96,7 +58,6 @@ namespace Avalonia.Input
             if(mouse._disposed)
                 return;
 
-            _position = e.Root.PointToScreen(e.Position);
             var props = CreateProperties(e);
             var keyModifiers = e.InputModifiers.ToKeyModifiers();
             switch (e.Type)
@@ -145,7 +106,6 @@ namespace Avalonia.Input
 
         private void LeaveWindow()
         {
-            _position = null;
         }
 
         PointerPointProperties CreateProperties(RawPointerEventArgs args)
@@ -324,19 +284,7 @@ namespace Avalonia.Input
             _disposed = true;
             _pointer?.Dispose();
         }
-
-        [Obsolete]
-        public void TopLevelClosed(IInputRoot root)
-        {
-            // no-op
-        }
-
-        [Obsolete]
-        public void SceneInvalidated(IInputRoot root, Rect rect)
-        {
-            // no-op
-        }
-
+        
         public IPointer? TryGetPointer(RawPointerEventArgs ev)
         {
             return _pointer;
diff --git a/src/Avalonia.Base/Input/PenDevice.cs b/src/Avalonia.Base/Input/PenDevice.cs
index d22b48562c..f5f0e90a45 100644
--- a/src/Avalonia.Base/Input/PenDevice.cs
+++ b/src/Avalonia.Base/Input/PenDevice.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reactive.Linq;
 using Avalonia.Input.Raw;
 using Avalonia.Platform;
-using Avalonia.VisualTree;
 
 namespace Avalonia.Input
 {
@@ -14,7 +12,6 @@ namespace Avalonia.Input
     public class PenDevice : IPenDevice, IDisposable
     {
         private readonly Dictionary<long, Pointer> _pointers = new();
-        private readonly Dictionary<long, PixelPoint> _lastPositions = new();
         private int _clickCount;
         private Rect _lastClickRect;
         private ulong _lastClickTime;
@@ -41,9 +38,7 @@ namespace Avalonia.Input
                 _pointers[e.RawPointerId] = pointer = new Pointer(Pointer.GetNextFreeId(),
                     PointerType.Pen, _pointers.Count == 0);
             }
-
-            _lastPositions[e.RawPointerId] = e.Root.PointToScreen(e.Position);
-
+            
             var props = new PointerPointProperties(e.InputModifiers, e.Type.ToUpdateKind(),
                 e.Point.Twist, e.Point.Pressure, e.Point.XTilt, e.Point.YTilt);
             var keyModifiers = e.InputModifiers.ToKeyModifiers();
@@ -69,7 +64,6 @@ namespace Avalonia.Input
             {
                 pointer.Dispose();
                 _pointers.Remove(e.RawPointerId);
-                _lastPositions.Remove(e.RawPointerId);
             }
         }
 
@@ -153,17 +147,6 @@ namespace Avalonia.Input
                 p.Dispose();
         }
 
-        [Obsolete]
-        IInputElement? IPointerDevice.Captured => _pointers.Values
-            .FirstOrDefault(p => p.IsPrimary)?.Captured;
-
-        [Obsolete]
-        void IPointerDevice.Capture(IInputElement? control) => _pointers.Values
-            .FirstOrDefault(p => p.IsPrimary)?.Capture(control);
-
-        [Obsolete]
-        Point IPointerDevice.GetPosition(IVisual relativeTo) => new Point(-1, -1);
-
         public IPointer? TryGetPointer(RawPointerEventArgs ev)
         {
             return _pointers.TryGetValue(ev.RawPointerId, out var pointer)
diff --git a/src/Avalonia.Base/Input/PointerEventArgs.cs b/src/Avalonia.Base/Input/PointerEventArgs.cs
index 058c2f9cc1..1f3c726e7b 100644
--- a/src/Avalonia.Base/Input/PointerEventArgs.cs
+++ b/src/Avalonia.Base/Input/PointerEventArgs.cs
@@ -11,7 +11,7 @@ namespace Avalonia.Input
         private readonly IVisual? _rootVisual;
         private readonly Point _rootVisualPosition;
         private readonly PointerPointProperties _properties;
-        private Lazy<IReadOnlyList<RawPointerPoint>?>? _previousPoints;
+        private readonly Lazy<IReadOnlyList<RawPointerPoint>?>? _previousPoints;
 
         public PointerEventArgs(RoutedEvent routedEvent,
             IInteractive? source,
@@ -43,29 +43,6 @@ namespace Avalonia.Input
         {
             _previousPoints = previousPoints;
         }
-        
-
-        class EmulatedDevice : IPointerDevice
-        {
-            private readonly PointerEventArgs _ev;
-
-            public EmulatedDevice(PointerEventArgs ev)
-            {
-                _ev = ev;
-            }
-            
-            public void ProcessRawEvent(RawInputEventArgs ev) => throw new NotSupportedException();
-
-            public IInputElement? Captured => _ev.Pointer.Captured;
-            public void Capture(IInputElement? control)
-            {
-                _ev.Pointer.Capture(control);
-            }
-
-            public Point GetPosition(IVisual relativeTo) => _ev.GetPosition(relativeTo);
-
-            public IPointer? TryGetPointer(RawPointerEventArgs ev) => _ev.Pointer;
-        }
 
         /// <summary>
         /// Gets specific pointer generated by input device.
@@ -77,28 +54,6 @@ namespace Avalonia.Input
         /// </summary>
         public ulong Timestamp { get; }
 
-        private IPointerDevice? _device;
-
-        [Obsolete("Use Pointer to get pointer-specific information")]
-        public IPointerDevice Device => _device ?? (_device = new EmulatedDevice(this));
-
-        [Obsolete("Use KeyModifiers and PointerPointProperties")]
-        public InputModifiers InputModifiers 
-        {
-            get
-            {
-                var mods = (InputModifiers)KeyModifiers;
-                if (_properties.IsLeftButtonPressed)
-                    mods |= InputModifiers.LeftMouseButton;
-                if (_properties.IsMiddleButtonPressed)
-                    mods |= InputModifiers.MiddleMouseButton;
-                if (_properties.IsRightButtonPressed)
-                    mods |= InputModifiers.RightMouseButton;
-                
-                return mods;
-            }
-        }
-
         /// <summary>
         /// Gets a value that indicates which key modifiers were active at the time that the pointer event was initiated.
         /// </summary>
@@ -120,9 +75,6 @@ namespace Avalonia.Input
         /// <returns>The pointer position in the control's coordinates.</returns>
         public Point GetPosition(IVisual? relativeTo) => GetPosition(_rootVisualPosition, relativeTo);
 
-        [Obsolete("Use GetCurrentPoint")]
-        public PointerPoint GetPointerPoint(IVisual? relativeTo) => GetCurrentPoint(relativeTo);
-        
         /// <summary>
         /// Returns the PointerPoint associated with the current event
         /// </summary>
@@ -171,8 +123,6 @@ namespace Avalonia.Input
 
     public class PointerPressedEventArgs : PointerEventArgs
     {
-        private readonly int _clickCount;
-
         public PointerPressedEventArgs(
             IInteractive source,
             IPointer pointer,
@@ -184,13 +134,10 @@ namespace Avalonia.Input
             : base(InputElement.PointerPressedEvent, source, pointer, rootVisual, rootVisualPosition,
                 timestamp, properties, modifiers)
         {
-            _clickCount = clickCount;
+            ClickCount = clickCount;
         }
 
-        public int ClickCount => _clickCount;
-
-        [Obsolete("Use PointerPressedEventArgs.GetCurrentPoint(this).Properties")]
-        public MouseButton MouseButton => Properties.PointerUpdateKind.GetMouseButton();
+        public int ClickCount { get; }
     }
 
     public class PointerReleasedEventArgs : PointerEventArgs
@@ -210,9 +157,6 @@ namespace Avalonia.Input
         /// Gets the mouse button that triggered the corresponding PointerPressed event
         /// </summary>
         public MouseButton InitialPressMouseButton { get; }
-
-        [Obsolete("Use InitialPressMouseButton")]
-        public MouseButton MouseButton => InitialPressMouseButton;
     }
 
     public class PointerCaptureLostEventArgs : RoutedEventArgs
diff --git a/src/Avalonia.Base/Input/PointerOverPreProcessor.cs b/src/Avalonia.Base/Input/PointerOverPreProcessor.cs
index 67d1eea7e3..a95d66346a 100644
--- a/src/Avalonia.Base/Input/PointerOverPreProcessor.cs
+++ b/src/Avalonia.Base/Input/PointerOverPreProcessor.cs
@@ -15,6 +15,8 @@ namespace Avalonia.Input
             _inputRoot = inputRoot ?? throw new ArgumentNullException(nameof(inputRoot));
         }
 
+        public PixelPoint? LastPosition => _lastPointer?.position;
+        
         public void OnCompleted()
         {
             ClearPointerOver();
diff --git a/src/Avalonia.Base/Input/Raw/RawDragEvent.cs b/src/Avalonia.Base/Input/Raw/RawDragEvent.cs
index 652bad7115..c903aad684 100644
--- a/src/Avalonia.Base/Input/Raw/RawDragEvent.cs
+++ b/src/Avalonia.Base/Input/Raw/RawDragEvent.cs
@@ -8,8 +8,6 @@ namespace Avalonia.Input.Raw
         public IDataObject Data { get; }
         public DragDropEffects Effects { get; set; }
         public RawDragEventType Type { get; }
-        [Obsolete("Use KeyModifiers")]
-        public InputModifiers Modifiers { get; }
         public KeyModifiers KeyModifiers { get; }
 
         public RawDragEvent(IDragDropDevice inputDevice, RawDragEventType type, 
@@ -21,9 +19,6 @@ namespace Avalonia.Input.Raw
             Data = data;
             Effects = effects;
             KeyModifiers = modifiers.ToKeyModifiers();
-#pragma warning disable CS0618 // Type or member is obsolete
-            Modifiers = (InputModifiers)modifiers;
-#pragma warning restore CS0618 // Type or member is obsolete
         }
     }
 }
diff --git a/src/Avalonia.Base/Input/Raw/RawTouchEventArgs.cs b/src/Avalonia.Base/Input/Raw/RawTouchEventArgs.cs
index 6706a45f48..3e842e6e3f 100644
--- a/src/Avalonia.Base/Input/Raw/RawTouchEventArgs.cs
+++ b/src/Avalonia.Base/Input/Raw/RawTouchEventArgs.cs
@@ -19,8 +19,5 @@ namespace Avalonia.Input.Raw
         {
             RawPointerId = rawPointerId;
         }
-
-        [Obsolete("Use RawPointerId")]
-        public long TouchPointId { get => RawPointerId; set => RawPointerId = value; }
     }
 }
diff --git a/src/Avalonia.Base/Input/TouchDevice.cs b/src/Avalonia.Base/Input/TouchDevice.cs
index e914d860fd..1d5b1d6bbf 100644
--- a/src/Avalonia.Base/Input/TouchDevice.cs
+++ b/src/Avalonia.Base/Input/TouchDevice.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using Avalonia.Input.Raw;
 using Avalonia.Platform;
-using Avalonia.VisualTree;
 
 namespace Avalonia.Input
 {
@@ -20,9 +19,6 @@ namespace Avalonia.Input
         private int _clickCount;
         private Rect _lastClickRect;
         private ulong _lastClickTime;
-        private Pointer? _lastPointer;
-
-        IInputElement? IPointerDevice.Captured => _lastPointer?.Captured;
 
         RawInputModifiers GetModifiers(RawInputModifiers modifiers, bool isLeftButtonDown)
         {
@@ -32,10 +28,6 @@ namespace Avalonia.Input
             return rv;
         }
 
-        void IPointerDevice.Capture(IInputElement? control) => _lastPointer?.Capture(control);
-
-        Point IPointerDevice.GetPosition(IVisual relativeTo) => default;
-
         public void ProcessRawEvent(RawInputEventArgs ev)
         {
             if (ev.Handled || _disposed)
@@ -51,7 +43,6 @@ namespace Avalonia.Input
                     PointerType.Touch, _pointers.Count == 0);
                 pointer.Capture(hit);
             }
-            _lastPointer = pointer;
 
             var target = pointer.Captured ?? args.Root;
             var updateKind = args.Type.ToUpdateKind();
@@ -96,7 +87,6 @@ namespace Avalonia.Input
                         new PointerPointProperties(GetModifiers(args.InputModifiers, false), updateKind),
                         keyModifier, MouseButton.Left));
                 }
-                _lastPointer = null;
             }
 
             if (args.Type == RawPointerEventType.TouchCancel)
@@ -104,7 +94,6 @@ namespace Avalonia.Input
                 _pointers.Remove(args.RawPointerId);
                 using (pointer)
                     pointer.Capture(null);
-                _lastPointer = null;
             }
 
             if (args.Type == RawPointerEventType.TouchUpdate)

From d1683c963efa7eab63c8a4d12143e151598d936d Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Sat, 23 Jul 2022 01:34:42 -0400
Subject: [PATCH 139/240] Remove MouseDevice from the TopLevel

---
 src/Avalonia.Base/Input/IInputRoot.cs             | 5 -----
 src/Avalonia.Controls/Platform/ITopLevelImpl.cs   | 9 +--------
 src/Avalonia.Controls/TopLevel.cs                 | 3 ---
 tests/Avalonia.UnitTests/MockWindowingPlatform.cs | 8 --------
 tests/Avalonia.UnitTests/TestRoot.cs              | 4 +---
 5 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/src/Avalonia.Base/Input/IInputRoot.cs b/src/Avalonia.Base/Input/IInputRoot.cs
index 7edc69df52..344a4eefd7 100644
--- a/src/Avalonia.Base/Input/IInputRoot.cs
+++ b/src/Avalonia.Base/Input/IInputRoot.cs
@@ -27,10 +27,5 @@ namespace Avalonia.Input
         /// Gets or sets a value indicating whether access keys are shown in the window.
         /// </summary>
         bool ShowAccessKeys { get; set; }
-
-        /// <summary>
-        /// Gets associated mouse device
-        /// </summary>
-        IMouseDevice? MouseDevice { get; }
     }
 }
diff --git a/src/Avalonia.Controls/Platform/ITopLevelImpl.cs b/src/Avalonia.Controls/Platform/ITopLevelImpl.cs
index bd0339f525..6bb94c6070 100644
--- a/src/Avalonia.Controls/Platform/ITopLevelImpl.cs
+++ b/src/Avalonia.Controls/Platform/ITopLevelImpl.cs
@@ -6,7 +6,6 @@ using Avalonia.Input.Raw;
 using Avalonia.Layout;
 using Avalonia.Metadata;
 using Avalonia.Rendering;
-using JetBrains.Annotations;
 
 namespace Avalonia.Platform
 {
@@ -151,13 +150,7 @@ namespace Avalonia.Platform
         /// Gets or sets a method called when the input focus is lost.
         /// </summary>
         Action? LostFocus { get; set; }
-
-        /// <summary>
-        /// Gets a mouse device associated with toplevel
-        /// </summary>
-        [CanBeNull]
-        IMouseDevice MouseDevice { get; }
-
+        
         IPopupImpl? CreatePopup();
 
         /// <summary>
diff --git a/src/Avalonia.Controls/TopLevel.cs b/src/Avalonia.Controls/TopLevel.cs
index 7d0a1d2c39..1c1df84431 100644
--- a/src/Avalonia.Controls/TopLevel.cs
+++ b/src/Avalonia.Controls/TopLevel.cs
@@ -304,9 +304,6 @@ namespace Avalonia.Controls
             set { SetValue(PointerOverElementProperty, value); }
         }
 
-        /// <inheritdoc/>
-        IMouseDevice? IInputRoot.MouseDevice => PlatformImpl?.MouseDevice;
-
         /// <summary>
         /// Gets or sets a value indicating whether access keys are shown in the window.
         /// </summary>
diff --git a/tests/Avalonia.UnitTests/MockWindowingPlatform.cs b/tests/Avalonia.UnitTests/MockWindowingPlatform.cs
index 339b87cf88..e30f0fa5f3 100644
--- a/tests/Avalonia.UnitTests/MockWindowingPlatform.cs
+++ b/tests/Avalonia.UnitTests/MockWindowingPlatform.cs
@@ -34,7 +34,6 @@ namespace Avalonia.UnitTests
             windowImpl.Setup(x => x.RenderScaling).Returns(1);
             windowImpl.Setup(x => x.Screen).Returns(CreateScreenMock().Object);
             windowImpl.Setup(x => x.Position).Returns(() => position);
-            SetupToplevel(windowImpl);
 
             windowImpl.Setup(x => x.CreatePopup()).Returns(() =>
             {
@@ -100,8 +99,6 @@ namespace Avalonia.UnitTests
             {
                 popupImpl.Object.Closed?.Invoke();
             });
-
-            SetupToplevel(popupImpl);
             
             return popupImpl;
         }
@@ -144,10 +141,5 @@ namespace Avalonia.UnitTests
         {
             return null;
         }
-
-        private static void SetupToplevel<T>(Mock<T> mock) where T : class, ITopLevelImpl
-        {
-            mock.SetupGet(x => x.MouseDevice).Returns(new MouseDevice());
-        }
     }
 }
diff --git a/tests/Avalonia.UnitTests/TestRoot.cs b/tests/Avalonia.UnitTests/TestRoot.cs
index 41e29a85c4..138958512f 100644
--- a/tests/Avalonia.UnitTests/TestRoot.cs
+++ b/tests/Avalonia.UnitTests/TestRoot.cs
@@ -58,9 +58,7 @@ namespace Avalonia.UnitTests
         public IKeyboardNavigationHandler KeyboardNavigationHandler => null;
 
         public IInputElement PointerOverElement { get; set; }
-
-        public IMouseDevice MouseDevice { get; set; }
-
+        
         public bool ShowAccessKeys { get; set; }
 
         public IStyleHost StylingParent { get; set; }

From 1e015450ad7b9ae60c8f99797af581f722906a1e Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Sat, 23 Jul 2022 01:49:02 -0400
Subject: [PATCH 140/240] Fix build

---
 src/Windows/Avalonia.Win32.Interop/Wpf/WpfTopLevelImpl.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Windows/Avalonia.Win32.Interop/Wpf/WpfTopLevelImpl.cs b/src/Windows/Avalonia.Win32.Interop/Wpf/WpfTopLevelImpl.cs
index d36db107e3..7435e3342e 100644
--- a/src/Windows/Avalonia.Win32.Interop/Wpf/WpfTopLevelImpl.cs
+++ b/src/Windows/Avalonia.Win32.Interop/Wpf/WpfTopLevelImpl.cs
@@ -101,7 +101,6 @@ namespace Avalonia.Win32.Interop.Wpf
 
         Size ITopLevelImpl.ClientSize => _finalSize;
         Size? ITopLevelImpl.FrameSize => null;
-        IMouseDevice ITopLevelImpl.MouseDevice => _mouse;
 
         double ITopLevelImpl.RenderScaling => PresentationSource.FromVisual(this)?.CompositionTarget?.TransformToDevice.M11 ?? 1;
 

From 8ebcd4982a49e6b27b93a1cf4b9f94fe98c170d6 Mon Sep 17 00:00:00 2001
From: i3ym <deniso99@mail.ru>
Date: Sat, 23 Jul 2022 16:37:45 +0700
Subject: [PATCH 141/240] Fix saving window icons on X11

---
 src/Avalonia.X11/X11IconLoader.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.X11/X11IconLoader.cs b/src/Avalonia.X11/X11IconLoader.cs
index e8bc9ac9d7..0357fdd94e 100644
--- a/src/Avalonia.X11/X11IconLoader.cs
+++ b/src/Avalonia.X11/X11IconLoader.cs
@@ -80,7 +80,7 @@ namespace Avalonia.X11
                         var r = y * _width;
                         var fbr = y * fb.RowBytes / 4;
                         for (var x = 0; x < _width; x++)
-                            fbp[fbr + x] = Data[r + x].ToUInt32();
+                            fbp[fbr + x] = Data[r + x + 2].ToUInt32();
                     }
                 }
                 wr.Save(outputStream);

From 8416b4a3a171936db68f38376e66b4a21e8ab29e Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Sat, 23 Jul 2022 20:41:38 +0300
Subject: [PATCH 142/240] Comment unused GL constants (dll size 320kb->70kb)

---
 src/Avalonia.OpenGL/Egl/EglConsts.cs |   376 +-
 src/Avalonia.OpenGL/GlConsts.cs      | 10783 ++++++++++++-------------
 2 files changed, 5579 insertions(+), 5580 deletions(-)

diff --git a/src/Avalonia.OpenGL/Egl/EglConsts.cs b/src/Avalonia.OpenGL/Egl/EglConsts.cs
index 530d3401f6..1268845f0f 100644
--- a/src/Avalonia.OpenGL/Egl/EglConsts.cs
+++ b/src/Avalonia.OpenGL/Egl/EglConsts.cs
@@ -4,212 +4,212 @@ namespace Avalonia.OpenGL.Egl
 {
     public static class EglConsts
     {
-        public const int EGL_ALPHA_SIZE = 0x3021;
-        public const int EGL_BAD_ACCESS = 0x3002;
-        public const int EGL_BAD_ALLOC = 0x3003;
-        public const int EGL_BAD_ATTRIBUTE = 0x3004;
-        public const int EGL_BAD_CONFIG = 0x3005;
-        public const int EGL_BAD_CONTEXT = 0x3006;
-        public const int EGL_BAD_CURRENT_SURFACE = 0x3007;
-        public const int EGL_BAD_DISPLAY = 0x3008;
-        public const int EGL_BAD_MATCH = 0x3009;
-        public const int EGL_BAD_NATIVE_PIXMAP = 0x300A;
-        public const int EGL_BAD_NATIVE_WINDOW = 0x300B;
-        public const int EGL_BAD_PARAMETER = 0x300C;
-        public const int EGL_BAD_SURFACE = 0x300D;
-        public const int EGL_BLUE_SIZE = 0x3022;
-        public const int EGL_BUFFER_SIZE = 0x3020;
-        public const int EGL_CONFIG_CAVEAT = 0x3027;
-        public const int EGL_CONFIG_ID = 0x3028;
-        public const int EGL_CORE_NATIVE_ENGINE = 0x305B;
-        public const int EGL_DEPTH_SIZE = 0x3025;
-        public const int EGL_DONT_CARE = -1;
-        public const int EGL_DRAW = 0x3059;
-        public const int EGL_EXTENSIONS = 0x3055;
-        public const int EGL_FALSE = 0;
-        public const int EGL_GREEN_SIZE = 0x3023;
-        public const int EGL_HEIGHT = 0x3056;
-        public const int EGL_LARGEST_PBUFFER = 0x3058;
-        public const int EGL_LEVEL = 0x3029;
-        public const int EGL_MAX_PBUFFER_HEIGHT = 0x302A;
-        public const int EGL_MAX_PBUFFER_PIXELS = 0x302B;
-        public const int EGL_MAX_PBUFFER_WIDTH = 0x302C;
-        public const int EGL_NATIVE_RENDERABLE = 0x302D;
-        public const int EGL_NATIVE_VISUAL_ID = 0x302E;
-        public const int EGL_NATIVE_VISUAL_TYPE = 0x302F;
-        public const int EGL_NONE = 0x3038;
-        public const int EGL_NON_CONFORMANT_CONFIG = 0x3051;
-        public const int EGL_NOT_INITIALIZED = 0x3001;
-        public const int EGL_NO_CONTEXT = 0;
-        public const int EGL_NO_DISPLAY = 0;
-        public const int EGL_NO_SURFACE = 0;
-        public const int EGL_PBUFFER_BIT = 0x0001;
-        public const int EGL_PIXMAP_BIT = 0x0002;
-        public const int EGL_READ = 0x305A;
-        public const int EGL_RED_SIZE = 0x3024;
-        public const int EGL_SAMPLES = 0x3031;
-        public const int EGL_SAMPLE_BUFFERS = 0x3032;
-        public const int EGL_SLOW_CONFIG = 0x3050;
-        public const int EGL_STENCIL_SIZE = 0x3026;
-        public const int EGL_SUCCESS = 0x3000;
-        public const int EGL_SURFACE_TYPE = 0x3033;
-        public const int EGL_TRANSPARENT_BLUE_VALUE = 0x3035;
-        public const int EGL_TRANSPARENT_GREEN_VALUE = 0x3036;
-        public const int EGL_TRANSPARENT_RED_VALUE = 0x3037;
-        public const int EGL_TRANSPARENT_RGB = 0x3052;
-        public const int EGL_TRANSPARENT_TYPE = 0x3034;
-        public const int EGL_TRUE = 1;
-        public const int EGL_VENDOR = 0x3053;
-        public const int EGL_VERSION = 0x3054;
-        public const int EGL_WIDTH = 0x3057;
-        public const int EGL_WINDOW_BIT = 0x0004;
+        public const int  EGL_ALPHA_SIZE = 0x3021;
+        public const int  EGL_BAD_ACCESS = 0x3002;
+        public const int  EGL_BAD_ALLOC = 0x3003;
+        public const int  EGL_BAD_ATTRIBUTE = 0x3004;
+        public const int  EGL_BAD_CONFIG = 0x3005;
+        public const int  EGL_BAD_CONTEXT = 0x3006;
+        public const int  EGL_BAD_CURRENT_SURFACE = 0x3007;
+        public const int  EGL_BAD_DISPLAY = 0x3008;
+        public const int  EGL_BAD_MATCH = 0x3009;
+        public const int  EGL_BAD_NATIVE_PIXMAP = 0x300A;
+        public const int  EGL_BAD_NATIVE_WINDOW = 0x300B;
+        public const int  EGL_BAD_PARAMETER = 0x300C;
+        public const int  EGL_BAD_SURFACE = 0x300D;
+        public const int  EGL_BLUE_SIZE = 0x3022;
+//        public const int  EGL_BUFFER_SIZE = 0x3020;
+//        public const int  EGL_CONFIG_CAVEAT = 0x3027;
+//        public const int  EGL_CONFIG_ID = 0x3028;
+        public const int  EGL_CORE_NATIVE_ENGINE = 0x305B;
+        public const int  EGL_DEPTH_SIZE = 0x3025;
+//        public const int  EGL_DONT_CARE = -1;
+        public const int  EGL_DRAW = 0x3059;
+        public const int  EGL_EXTENSIONS = 0x3055;
+        public const int  EGL_FALSE = 0;
+        public const int  EGL_GREEN_SIZE = 0x3023;
+        public const int  EGL_HEIGHT = 0x3056;
+//        public const int  EGL_LARGEST_PBUFFER = 0x3058;
+//        public const int  EGL_LEVEL = 0x3029;
+//        public const int  EGL_MAX_PBUFFER_HEIGHT = 0x302A;
+//        public const int  EGL_MAX_PBUFFER_PIXELS = 0x302B;
+//        public const int  EGL_MAX_PBUFFER_WIDTH = 0x302C;
+//        public const int  EGL_NATIVE_RENDERABLE = 0x302D;
+//        public const int  EGL_NATIVE_VISUAL_ID = 0x302E;
+//        public const int  EGL_NATIVE_VISUAL_TYPE = 0x302F;
+        public const int  EGL_NONE = 0x3038;
+//        public const int  EGL_NON_CONFORMANT_CONFIG = 0x3051;
+        public const int  EGL_NOT_INITIALIZED = 0x3001;
+        public const int  EGL_NO_CONTEXT = 0;
+        public const int  EGL_NO_DISPLAY = 0;
+        public const int  EGL_NO_SURFACE = 0;
+        public const int  EGL_PBUFFER_BIT = 0x0001;
+//        public const int  EGL_PIXMAP_BIT = 0x0002;
+        public const int  EGL_READ = 0x305A;
+        public const int  EGL_RED_SIZE = 0x3024;
+        public const int  EGL_SAMPLES = 0x3031;
+//        public const int  EGL_SAMPLE_BUFFERS = 0x3032;
+//        public const int  EGL_SLOW_CONFIG = 0x3050;
+        public const int  EGL_STENCIL_SIZE = 0x3026;
+        public const int  EGL_SUCCESS = 0x3000;
+        public const int  EGL_SURFACE_TYPE = 0x3033;
+//        public const int  EGL_TRANSPARENT_BLUE_VALUE = 0x3035;
+//        public const int  EGL_TRANSPARENT_GREEN_VALUE = 0x3036;
+//        public const int  EGL_TRANSPARENT_RED_VALUE = 0x3037;
+//        public const int  EGL_TRANSPARENT_RGB = 0x3052;
+//        public const int  EGL_TRANSPARENT_TYPE = 0x3034;
+        public const int  EGL_TRUE = 1;
+//        public const int  EGL_VENDOR = 0x3053;
+//        public const int  EGL_VERSION = 0x3054;
+        public const int  EGL_WIDTH = 0x3057;
+        public const int  EGL_WINDOW_BIT = 0x0004;
 
-        public const int EGL_BACK_BUFFER = 0x3084;
-        public const int EGL_BIND_TO_TEXTURE_RGB = 0x3039;
-        public const int EGL_BIND_TO_TEXTURE_RGBA = 0x303A;
-        public const int EGL_CONTEXT_LOST = 0x300E;
-        public const int EGL_MIN_SWAP_INTERVAL = 0x303B;
-        public const int EGL_MAX_SWAP_INTERVAL = 0x303C;
-        public const int EGL_MIPMAP_TEXTURE = 0x3082;
-        public const int EGL_MIPMAP_LEVEL = 0x3083;
-        public const int EGL_NO_TEXTURE = 0x305C;
-        public const int EGL_TEXTURE_2D = 0x305F;
-        public const int EGL_TEXTURE_FORMAT = 0x3080;
-        public const int EGL_TEXTURE_RGB = 0x305D;
-        public const int EGL_TEXTURE_RGBA = 0x305E;
-        public const int EGL_TEXTURE_TARGET = 0x3081;
+//        public const int  EGL_BACK_BUFFER = 0x3084;
+//        public const int  EGL_BIND_TO_TEXTURE_RGB = 0x3039;
+//        public const int  EGL_BIND_TO_TEXTURE_RGBA = 0x303A;
+        public const int  EGL_CONTEXT_LOST = 0x300E;
+//        public const int  EGL_MIN_SWAP_INTERVAL = 0x303B;
+//        public const int  EGL_MAX_SWAP_INTERVAL = 0x303C;
+//        public const int  EGL_MIPMAP_TEXTURE = 0x3082;
+//        public const int  EGL_MIPMAP_LEVEL = 0x3083;
+//        public const int  EGL_NO_TEXTURE = 0x305C;
+//        public const int  EGL_TEXTURE_2D = 0x305F;
+//        public const int  EGL_TEXTURE_FORMAT = 0x3080;
+//        public const int  EGL_TEXTURE_RGB = 0x305D;
+//        public const int  EGL_TEXTURE_RGBA = 0x305E;
+//        public const int  EGL_TEXTURE_TARGET = 0x3081;
 
-        public const int EGL_ALPHA_FORMAT = 0x3088;
-        public const int EGL_ALPHA_FORMAT_NONPRE = 0x308B;
-        public const int EGL_ALPHA_FORMAT_PRE = 0x308C;
-        public const int EGL_ALPHA_MASK_SIZE = 0x303E;
-        public const int EGL_BUFFER_PRESERVED = 0x3094;
-        public const int EGL_BUFFER_DESTROYED = 0x3095;
-        public const int EGL_CLIENT_APIS = 0x308D;
-        public const int EGL_COLORSPACE = 0x3087;
-        public const int EGL_COLORSPACE_sRGB = 0x3089;
-        public const int EGL_COLORSPACE_LINEAR = 0x308A;
-        public const int EGL_COLOR_BUFFER_TYPE = 0x303F;
-        public const int EGL_CONTEXT_CLIENT_TYPE = 0x3097;
-        public const int EGL_DISPLAY_SCALING = 10000;
-        public const int EGL_HORIZONTAL_RESOLUTION = 0x3090;
-        public const int EGL_LUMINANCE_BUFFER = 0x308F;
-        public const int EGL_LUMINANCE_SIZE = 0x303D;
-        public const int EGL_OPENGL_ES_BIT = 0x0001;
-        public const int EGL_OPENVG_BIT = 0x0002;
-        public const int EGL_OPENGL_ES_API = 0x30A0;
-        public const int EGL_OPENVG_API = 0x30A1;
-        public const int EGL_OPENVG_IMAGE = 0x3096;
-        public const int EGL_PIXEL_ASPECT_RATIO = 0x3092;
-        public const int EGL_RENDERABLE_TYPE = 0x3040;
-        public const int EGL_RENDER_BUFFER = 0x3086;
-        public const int EGL_RGB_BUFFER = 0x308E;
-        public const int EGL_SINGLE_BUFFER = 0x3085;
-        public const int EGL_SWAP_BEHAVIOR = 0x3093;
-        public const int EGL_UNKNOWN = -1;
-        public const int EGL_VERTICAL_RESOLUTION = 0x3091;
-        public const int EGL_CONFORMANT = 0x3042;
-        public const int EGL_CONTEXT_CLIENT_VERSION = 0x3098;
-        public const int EGL_MATCH_NATIVE_PIXMAP = 0x3041;
-        public const int EGL_OPENGL_ES2_BIT = 0x0004;
-        public const int EGL_VG_ALPHA_FORMAT = 0x3088;
-        public const int EGL_VG_ALPHA_FORMAT_NONPRE = 0x308B;
-        public const int EGL_VG_ALPHA_FORMAT_PRE = 0x308C;
-        public const int EGL_VG_ALPHA_FORMAT_PRE_BIT = 0x0040;
-        public const int EGL_VG_COLORSPACE = 0x3087;
-        public const int EGL_VG_COLORSPACE_sRGB = 0x3089;
-        public const int EGL_VG_COLORSPACE_LINEAR = 0x308A;
-        public const int EGL_VG_COLORSPACE_LINEAR_BIT = 0x0020;
-        public const int EGL_DEFAULT_DISPLAY = 0;
-        public const int EGL_MULTISAMPLE_RESOLVE_BOX_BIT = 0x0200;
-        public const int EGL_MULTISAMPLE_RESOLVE = 0x3099;
-        public const int EGL_MULTISAMPLE_RESOLVE_DEFAULT = 0x309A;
-        public const int EGL_MULTISAMPLE_RESOLVE_BOX = 0x309B;
-        public const int EGL_OPENGL_API = 0x30A2;
-        public const int EGL_OPENGL_BIT = 0x0008;
-        public const int EGL_SWAP_BEHAVIOR_PRESERVED_BIT = 0x0400;
-        public const int EGL_CONTEXT_MAJOR_VERSION = 0x3098;
-        public const int EGL_CONTEXT_MINOR_VERSION = 0x30FB;
-        public const int EGL_CONTEXT_OPENGL_PROFILE_MASK = 0x30FD;
-        public const int EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY = 0x31BD;
-        public const int EGL_NO_RESET_NOTIFICATION = 0x31BE;
-        public const int EGL_LOSE_CONTEXT_ON_RESET = 0x31BF;
-        public const int EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT = 0x00000001;
-        public const int EGL_CONTEXT_OPENGL_COMPATIBILITY_PROFILE_BIT = 0x00000002;
-        public const int EGL_CONTEXT_OPENGL_DEBUG = 0x31B0;
-        public const int EGL_CONTEXT_OPENGL_FORWARD_COMPATIBLE = 0x31B1;
-        public const int EGL_CONTEXT_OPENGL_ROBUST_ACCESS = 0x31B2;
-        public const int EGL_OPENGL_ES3_BIT = 0x00000040;
-        public const int EGL_CL_EVENT_HANDLE = 0x309C;
-        public const int EGL_SYNC_CL_EVENT = 0x30FE;
-        public const int EGL_SYNC_CL_EVENT_COMPLETE = 0x30FF;
-        public const int EGL_SYNC_PRIOR_COMMANDS_COMPLETE = 0x30F0;
-        public const int EGL_SYNC_TYPE = 0x30F7;
-        public const int EGL_SYNC_STATUS = 0x30F1;
-        public const int EGL_SYNC_CONDITION = 0x30F8;
-        public const int EGL_SIGNALED = 0x30F2;
-        public const int EGL_UNSIGNALED = 0x30F3;
+//        public const int  EGL_ALPHA_FORMAT = 0x3088;
+//        public const int  EGL_ALPHA_FORMAT_NONPRE = 0x308B;
+//        public const int  EGL_ALPHA_FORMAT_PRE = 0x308C;
+//        public const int  EGL_ALPHA_MASK_SIZE = 0x303E;
+//        public const int  EGL_BUFFER_PRESERVED = 0x3094;
+//        public const int  EGL_BUFFER_DESTROYED = 0x3095;
+//        public const int  EGL_CLIENT_APIS = 0x308D;
+//        public const int  EGL_COLORSPACE = 0x3087;
+//        public const int  EGL_COLORSPACE_sRGB = 0x3089;
+//        public const int  EGL_COLORSPACE_LINEAR = 0x308A;
+//        public const int  EGL_COLOR_BUFFER_TYPE = 0x303F;
+//        public const int  EGL_CONTEXT_CLIENT_TYPE = 0x3097;
+//        public const int  EGL_DISPLAY_SCALING = 10000;
+//        public const int  EGL_HORIZONTAL_RESOLUTION = 0x3090;
+//        public const int  EGL_LUMINANCE_BUFFER = 0x308F;
+//        public const int  EGL_LUMINANCE_SIZE = 0x303D;
+        public const int  EGL_OPENGL_ES_BIT = 0x0001;
+//        public const int  EGL_OPENVG_BIT = 0x0002;
+        public const int  EGL_OPENGL_ES_API = 0x30A0;
+//        public const int  EGL_OPENVG_API = 0x30A1;
+//        public const int  EGL_OPENVG_IMAGE = 0x3096;
+//        public const int  EGL_PIXEL_ASPECT_RATIO = 0x3092;
+        public const int  EGL_RENDERABLE_TYPE = 0x3040;
+//        public const int  EGL_RENDER_BUFFER = 0x3086;
+//        public const int  EGL_RGB_BUFFER = 0x308E;
+//        public const int  EGL_SINGLE_BUFFER = 0x3085;
+//        public const int  EGL_SWAP_BEHAVIOR = 0x3093;
+//        public const int  EGL_UNKNOWN = -1;
+//        public const int  EGL_VERTICAL_RESOLUTION = 0x3091;
+//        public const int  EGL_CONFORMANT = 0x3042;
+//        public const int  EGL_CONTEXT_CLIENT_VERSION = 0x3098;
+//        public const int  EGL_MATCH_NATIVE_PIXMAP = 0x3041;
+        public const int  EGL_OPENGL_ES2_BIT = 0x0004;
+//        public const int  EGL_VG_ALPHA_FORMAT = 0x3088;
+//        public const int  EGL_VG_ALPHA_FORMAT_NONPRE = 0x308B;
+//        public const int  EGL_VG_ALPHA_FORMAT_PRE = 0x308C;
+//        public const int  EGL_VG_ALPHA_FORMAT_PRE_BIT = 0x0040;
+//        public const int  EGL_VG_COLORSPACE = 0x3087;
+//        public const int  EGL_VG_COLORSPACE_sRGB = 0x3089;
+//        public const int  EGL_VG_COLORSPACE_LINEAR = 0x308A;
+//        public const int  EGL_VG_COLORSPACE_LINEAR_BIT = 0x0020;
+//        public const int  EGL_DEFAULT_DISPLAY = 0;
+//        public const int  EGL_MULTISAMPLE_RESOLVE_BOX_BIT = 0x0200;
+//        public const int  EGL_MULTISAMPLE_RESOLVE = 0x3099;
+//        public const int  EGL_MULTISAMPLE_RESOLVE_DEFAULT = 0x309A;
+//        public const int  EGL_MULTISAMPLE_RESOLVE_BOX = 0x309B;
+//        public const int  EGL_OPENGL_API = 0x30A2;
+//        public const int  EGL_OPENGL_BIT = 0x0008;
+//        public const int  EGL_SWAP_BEHAVIOR_PRESERVED_BIT = 0x0400;
+        public const int  EGL_CONTEXT_MAJOR_VERSION = 0x3098;
+        public const int  EGL_CONTEXT_MINOR_VERSION = 0x30FB;
+//        public const int  EGL_CONTEXT_OPENGL_PROFILE_MASK = 0x30FD;
+//        public const int  EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY = 0x31BD;
+//        public const int  EGL_NO_RESET_NOTIFICATION = 0x31BE;
+//        public const int  EGL_LOSE_CONTEXT_ON_RESET = 0x31BF;
+//        public const int  EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT = 0x00000001;
+//        public const int  EGL_CONTEXT_OPENGL_COMPATIBILITY_PROFILE_BIT = 0x00000002;
+//        public const int  EGL_CONTEXT_OPENGL_DEBUG = 0x31B0;
+//        public const int  EGL_CONTEXT_OPENGL_FORWARD_COMPATIBLE = 0x31B1;
+//        public const int  EGL_CONTEXT_OPENGL_ROBUST_ACCESS = 0x31B2;
+        public const int  EGL_OPENGL_ES3_BIT = 0x00000040;
+//        public const int  EGL_CL_EVENT_HANDLE = 0x309C;
+//        public const int  EGL_SYNC_CL_EVENT = 0x30FE;
+//        public const int  EGL_SYNC_CL_EVENT_COMPLETE = 0x30FF;
+//        public const int  EGL_SYNC_PRIOR_COMMANDS_COMPLETE = 0x30F0;
+//        public const int  EGL_SYNC_TYPE = 0x30F7;
+//        public const int  EGL_SYNC_STATUS = 0x30F1;
+//        public const int  EGL_SYNC_CONDITION = 0x30F8;
+//        public const int  EGL_SIGNALED = 0x30F2;
+//        public const int  EGL_UNSIGNALED = 0x30F3;
 
-        public const int EGL_SYNC_FLUSH_COMMANDS_BIT = 0x0001;
+//        public const int  EGL_SYNC_FLUSH_COMMANDS_BIT = 0x0001;
 
-        public const int EGL_TIMEOUT_EXPIRED = 0x30F5;
-        public const int EGL_CONDITION_SATISFIED = 0x30F6;
-        public const int EGL_NO_SYNC = 0;
-        public const int EGL_SYNC_FENCE = 0x30F9;
-        public const int EGL_GL_COLORSPACE = 0x309D;
-        public const int EGL_GL_COLORSPACE_SRGB = 0x3089;
-        public const int EGL_GL_COLORSPACE_LINEAR = 0x308A;
-        public const int EGL_GL_RENDERBUFFER = 0x30B9;
-        public const int EGL_GL_TEXTURE_2D = 0x30B1;
-        public const int EGL_GL_TEXTURE_LEVEL = 0x30BC;
-        public const int EGL_GL_TEXTURE_3D = 0x30B2;
-        public const int EGL_GL_TEXTURE_ZOFFSET = 0x30BD;
-        public const int EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_X = 0x30B3;
-        public const int EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_X = 0x30B4;
-        public const int EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Y = 0x30B5;
-        public const int EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Y = 0x30B6;
-        public const int EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Z = 0x30B7;
-        public const int EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Z = 0x30B8;
-        public const int EGL_IMAGE_PRESERVED = 0x30D2;
-        public const int EGL_NO_IMAGE = 0;
+//        public const int  EGL_TIMEOUT_EXPIRED = 0x30F5;
+//        public const int  EGL_CONDITION_SATISFIED = 0x30F6;
+//        public const int  EGL_NO_SYNC = 0;
+//        public const int  EGL_SYNC_FENCE = 0x30F9;
+//        public const int  EGL_GL_COLORSPACE = 0x309D;
+//        public const int  EGL_GL_COLORSPACE_SRGB = 0x3089;
+//        public const int  EGL_GL_COLORSPACE_LINEAR = 0x308A;
+//        public const int  EGL_GL_RENDERBUFFER = 0x30B9;
+//        public const int  EGL_GL_TEXTURE_2D = 0x30B1;
+//        public const int  EGL_GL_TEXTURE_LEVEL = 0x30BC;
+//        public const int  EGL_GL_TEXTURE_3D = 0x30B2;
+//        public const int  EGL_GL_TEXTURE_ZOFFSET = 0x30BD;
+//        public const int  EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_X = 0x30B3;
+//        public const int  EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_X = 0x30B4;
+//        public const int  EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Y = 0x30B5;
+//        public const int  EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Y = 0x30B6;
+//        public const int  EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Z = 0x30B7;
+//        public const int  EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Z = 0x30B8;
+//        public const int  EGL_IMAGE_PRESERVED = 0x30D2;
+//        public const int  EGL_NO_IMAGE = 0;
 
 
-        public const int EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE = 0x3207;
-        public const int EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE = 0x3208;
+        public const int  EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE = 0x3207;
+        public const int  EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE = 0x3208;
         
         //EGL_ANGLE_platform_angle
-        public const int EGL_PLATFORM_ANGLE_ANGLE = 0x3202;
-        public const int EGL_PLATFORM_ANGLE_TYPE_ANGLE = 0x3203;
-        public const int EGL_PLATFORM_ANGLE_MAX_VERSION_MAJOR_ANGLE = 0x3204;
-        public const int EGL_PLATFORM_ANGLE_MAX_VERSION_MINOR_ANGLE = 0x3205;
-        public const int EGL_PLATFORM_ANGLE_DEBUG_LAYERS_ENABLED = 0x3451;
-        public const int EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE = 0x3206;
-        public const int EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE = 0x320A;
-        public const int EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE = 0x345E;
+        public const int  EGL_PLATFORM_ANGLE_ANGLE = 0x3202;
+        public const int  EGL_PLATFORM_ANGLE_TYPE_ANGLE = 0x3203;
+//        public const int  EGL_PLATFORM_ANGLE_MAX_VERSION_MAJOR_ANGLE = 0x3204;
+//        public const int  EGL_PLATFORM_ANGLE_MAX_VERSION_MINOR_ANGLE = 0x3205;
+//        public const int  EGL_PLATFORM_ANGLE_DEBUG_LAYERS_ENABLED = 0x3451;
+//        public const int  EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE = 0x3206;
+//        public const int  EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE = 0x320A;
+//        public const int  EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE = 0x345E;
 
-        public const int EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE = 0x320D;
-        public const int EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE = 0x320E;
+//        public const int  EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE = 0x320D;
+//        public const int  EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE = 0x320E;
         
         //EGL_ANGLE_platform_angle_d3d
-        public const int EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE = 0x3209;
-        public const int EGL_PLATFORM_ANGLE_ENABLE_AUTOMATIC_TRIM_ANGLE = 0x320F;
-        public const int EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_WARP_ANGLE = 0x320B;
-        public const int EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_REFERENCE_ANGLE = 0x320C;
+//        public const int  EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE = 0x3209;
+//        public const int  EGL_PLATFORM_ANGLE_ENABLE_AUTOMATIC_TRIM_ANGLE = 0x320F;
+//        public const int  EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_WARP_ANGLE = 0x320B;
+//        public const int  EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_REFERENCE_ANGLE = 0x320C;
         
         //EXT_device_query
-        public const int EGL_DEVICE_EXT = 0x322C;
+        public const int  EGL_DEVICE_EXT = 0x322C;
 
         //ANGLE_device_d3d
-        public const int EGL_D3D9_DEVICE_ANGLE = 0x33A0;
-        public const int EGL_D3D11_DEVICE_ANGLE = 0x33A1;
+        public const int  EGL_D3D9_DEVICE_ANGLE = 0x33A0;
+        public const int  EGL_D3D11_DEVICE_ANGLE = 0x33A1;
 
-        public const int EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE = 0x3200;
-        public const int EGL_D3D_TEXTURE_ANGLE = 0x33A3;
+        public const int  EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE = 0x3200;
+        public const int  EGL_D3D_TEXTURE_ANGLE = 0x33A3;
 
 
-        public const int EGL_TEXTURE_OFFSET_X_ANGLE = 0x3490;
-        public const int EGL_TEXTURE_OFFSET_Y_ANGLE = 0x3491;
+        public const int  EGL_TEXTURE_OFFSET_X_ANGLE = 0x3490;
+        public const int  EGL_TEXTURE_OFFSET_Y_ANGLE = 0x3491;
 
-        public const int EGL_FLEXIBLE_SURFACE_COMPATIBILITY_SUPPORTED_ANGLE = 0x33A6;
+        public const int  EGL_FLEXIBLE_SURFACE_COMPATIBILITY_SUPPORTED_ANGLE = 0x33A6;
     }
 }
diff --git a/src/Avalonia.OpenGL/GlConsts.cs b/src/Avalonia.OpenGL/GlConsts.cs
index 2a6aa0d14d..3fdc147701 100644
--- a/src/Avalonia.OpenGL/GlConsts.cs
+++ b/src/Avalonia.OpenGL/GlConsts.cs
@@ -1,457 +1,456 @@
-// ReSharper disable UnusedMember.Global
 // ReSharper disable IdentifierTypo
 namespace Avalonia.OpenGL
 {
     public static class GlConsts
     {
-        public const int GL_BYTE = 0x1400;
+//        public const int GL_BYTE = 0x1400
         public const int GL_UNSIGNED_BYTE = 0x1401;
-        public const int GL_SHORT = 0x1402;
+//        public const int GL_SHORT = 0x1402;
         public const int GL_UNSIGNED_SHORT = 0x1403;
-        public const int GL_INT = 0x1404;
-        public const int GL_UNSIGNED_INT = 0x1405;
+//        public const int GL_INT = 0x1404;
+//        public const int GL_UNSIGNED_INT = 0x1405;
         public const int GL_FLOAT = 0x1406;
-        public const int GL_2_BYTES = 0x1407;
-        public const int GL_3_BYTES = 0x1408;
-        public const int GL_4_BYTES = 0x1409;
-        public const int GL_DOUBLE = 0x140A;
-        public const int GL_POINTS = 0x0000;
-        public const int GL_LINES = 0x0001;
-        public const int GL_LINE_LOOP = 0x0002;
-        public const int GL_LINE_STRIP = 0x0003;
+//        public const int GL_2_BYTES = 0x1407;
+//        public const int GL_3_BYTES = 0x1408;
+//        public const int GL_4_BYTES = 0x1409;
+//        public const int GL_DOUBLE = 0x140A;
+//        public const int GL_POINTS = 0x0000;
+//        public const int GL_LINES = 0x0001;
+//        public const int GL_LINE_LOOP = 0x0002;
+//        public const int GL_LINE_STRIP = 0x0003;
         public const int GL_TRIANGLES = 0x0004;
-        public const int GL_TRIANGLE_STRIP = 0x0005;
-        public const int GL_TRIANGLE_FAN = 0x0006;
-        public const int GL_QUADS = 0x0007;
-        public const int GL_QUAD_STRIP = 0x0008;
-        public const int GL_POLYGON = 0x0009;
-        public const int GL_VERTEX_ARRAY = 0x8074;
-        public const int GL_NORMAL_ARRAY = 0x8075;
-        public const int GL_COLOR_ARRAY = 0x8076;
-        public const int GL_INDEX_ARRAY = 0x8077;
-        public const int GL_TEXTURE_COORD_ARRAY = 0x8078;
-        public const int GL_EDGE_FLAG_ARRAY = 0x8079;
-        public const int GL_VERTEX_ARRAY_SIZE = 0x807A;
-        public const int GL_VERTEX_ARRAY_TYPE = 0x807B;
-        public const int GL_VERTEX_ARRAY_STRIDE = 0x807C;
-        public const int GL_NORMAL_ARRAY_TYPE = 0x807E;
-        public const int GL_NORMAL_ARRAY_STRIDE = 0x807F;
-        public const int GL_COLOR_ARRAY_SIZE = 0x8081;
-        public const int GL_COLOR_ARRAY_TYPE = 0x8082;
-        public const int GL_COLOR_ARRAY_STRIDE = 0x8083;
-        public const int GL_INDEX_ARRAY_TYPE = 0x8085;
-        public const int GL_INDEX_ARRAY_STRIDE = 0x8086;
-        public const int GL_TEXTURE_COORD_ARRAY_SIZE = 0x8088;
-        public const int GL_TEXTURE_COORD_ARRAY_TYPE = 0x8089;
-        public const int GL_TEXTURE_COORD_ARRAY_STRIDE = 0x808A;
-        public const int GL_EDGE_FLAG_ARRAY_STRIDE = 0x808C;
-        public const int GL_VERTEX_ARRAY_POINTER = 0x808E;
-        public const int GL_NORMAL_ARRAY_POINTER = 0x808F;
-        public const int GL_COLOR_ARRAY_POINTER = 0x8090;
-        public const int GL_INDEX_ARRAY_POINTER = 0x8091;
-        public const int GL_TEXTURE_COORD_ARRAY_POINTER = 0x8092;
-        public const int GL_EDGE_FLAG_ARRAY_POINTER = 0x8093;
-        public const int GL_V2F = 0x2A20;
-        public const int GL_V3F = 0x2A21;
-        public const int GL_C4UB_V2F = 0x2A22;
-        public const int GL_C4UB_V3F = 0x2A23;
-        public const int GL_C3F_V3F = 0x2A24;
-        public const int GL_N3F_V3F = 0x2A25;
-        public const int GL_C4F_N3F_V3F = 0x2A26;
-        public const int GL_T2F_V3F = 0x2A27;
-        public const int GL_T4F_V4F = 0x2A28;
-        public const int GL_T2F_C4UB_V3F = 0x2A29;
-        public const int GL_T2F_C3F_V3F = 0x2A2A;
-        public const int GL_T2F_N3F_V3F = 0x2A2B;
-        public const int GL_T2F_C4F_N3F_V3F = 0x2A2C;
-        public const int GL_T4F_C4F_N3F_V4F = 0x2A2D;
-        public const int GL_MATRIX_MODE = 0x0BA0;
-        public const int GL_MODELVIEW = 0x1700;
-        public const int GL_PROJECTION = 0x1701;
-        public const int GL_TEXTURE = 0x1702;
-        public const int GL_POINT_SMOOTH = 0x0B10;
-        public const int GL_POINT_SIZE = 0x0B11;
-        public const int GL_POINT_SIZE_GRANULARITY = 0x0B13;
-        public const int GL_POINT_SIZE_RANGE = 0x0B12;
-        public const int GL_LINE_SMOOTH = 0x0B20;
-        public const int GL_LINE_STIPPLE = 0x0B24;
-        public const int GL_LINE_STIPPLE_PATTERN = 0x0B25;
-        public const int GL_LINE_STIPPLE_REPEAT = 0x0B26;
-        public const int GL_LINE_WIDTH = 0x0B21;
-        public const int GL_LINE_WIDTH_GRANULARITY = 0x0B23;
-        public const int GL_LINE_WIDTH_RANGE = 0x0B22;
-        public const int GL_POINT = 0x1B00;
-        public const int GL_LINE = 0x1B01;
-        public const int GL_FILL = 0x1B02;
-        public const int GL_CW = 0x0900;
-        public const int GL_CCW = 0x0901;
-        public const int GL_FRONT = 0x0404;
-        public const int GL_BACK = 0x0405;
-        public const int GL_POLYGON_MODE = 0x0B40;
-        public const int GL_POLYGON_SMOOTH = 0x0B41;
-        public const int GL_POLYGON_STIPPLE = 0x0B42;
-        public const int GL_EDGE_FLAG = 0x0B43;
-        public const int GL_CULL_FACE = 0x0B44;
-        public const int GL_CULL_FACE_MODE = 0x0B45;
-        public const int GL_FRONT_FACE = 0x0B46;
-        public const int GL_POLYGON_OFFSET_FACTOR = 0x8038;
-        public const int GL_POLYGON_OFFSET_UNITS = 0x2A00;
-        public const int GL_POLYGON_OFFSET_POINT = 0x2A01;
-        public const int GL_POLYGON_OFFSET_LINE = 0x2A02;
-        public const int GL_POLYGON_OFFSET_FILL = 0x8037;
-        public const int GL_COMPILE = 0x1300;
-        public const int GL_COMPILE_AND_EXECUTE = 0x1301;
-        public const int GL_LIST_BASE = 0x0B32;
-        public const int GL_LIST_INDEX = 0x0B33;
-        public const int GL_LIST_MODE = 0x0B30;
-        public const int GL_NEVER = 0x0200;
-        public const int GL_LESS = 0x0201;
-        public const int GL_EQUAL = 0x0202;
-        public const int GL_LEQUAL = 0x0203;
-        public const int GL_GREATER = 0x0204;
-        public const int GL_NOTEQUAL = 0x0205;
-        public const int GL_GEQUAL = 0x0206;
-        public const int GL_ALWAYS = 0x0207;
+//        public const int GL_TRIANGLE_STRIP = 0x0005;
+//        public const int GL_TRIANGLE_FAN = 0x0006;
+//        public const int GL_QUADS = 0x0007;
+//        public const int GL_QUAD_STRIP = 0x0008;
+//        public const int GL_POLYGON = 0x0009;
+//        public const int GL_VERTEX_ARRAY = 0x8074;
+//        public const int GL_NORMAL_ARRAY = 0x8075;
+//        public const int GL_COLOR_ARRAY = 0x8076;
+//        public const int GL_INDEX_ARRAY = 0x8077;
+//        public const int GL_TEXTURE_COORD_ARRAY = 0x8078;
+//        public const int GL_EDGE_FLAG_ARRAY = 0x8079;
+//        public const int GL_VERTEX_ARRAY_SIZE = 0x807A;
+//        public const int GL_VERTEX_ARRAY_TYPE = 0x807B;
+//        public const int GL_VERTEX_ARRAY_STRIDE = 0x807C;
+//        public const int GL_NORMAL_ARRAY_TYPE = 0x807E;
+//        public const int GL_NORMAL_ARRAY_STRIDE = 0x807F;
+//        public const int GL_COLOR_ARRAY_SIZE = 0x8081;
+//        public const int GL_COLOR_ARRAY_TYPE = 0x8082;
+//        public const int GL_COLOR_ARRAY_STRIDE = 0x8083;
+//        public const int GL_INDEX_ARRAY_TYPE = 0x8085;
+//        public const int GL_INDEX_ARRAY_STRIDE = 0x8086;
+//        public const int GL_TEXTURE_COORD_ARRAY_SIZE = 0x8088;
+//        public const int GL_TEXTURE_COORD_ARRAY_TYPE = 0x8089;
+//        public const int GL_TEXTURE_COORD_ARRAY_STRIDE = 0x808A;
+//        public const int GL_EDGE_FLAG_ARRAY_STRIDE = 0x808C;
+//        public const int GL_VERTEX_ARRAY_POINTER = 0x808E;
+//        public const int GL_NORMAL_ARRAY_POINTER = 0x808F;
+//        public const int GL_COLOR_ARRAY_POINTER = 0x8090;
+//        public const int GL_INDEX_ARRAY_POINTER = 0x8091;
+//        public const int GL_TEXTURE_COORD_ARRAY_POINTER = 0x8092;
+//        public const int GL_EDGE_FLAG_ARRAY_POINTER = 0x8093;
+//        public const int GL_V2F = 0x2A20;
+//        public const int GL_V3F = 0x2A21;
+//        public const int GL_C4UB_V2F = 0x2A22;
+//        public const int GL_C4UB_V3F = 0x2A23;
+//        public const int GL_C3F_V3F = 0x2A24;
+//        public const int GL_N3F_V3F = 0x2A25;
+//        public const int GL_C4F_N3F_V3F = 0x2A26;
+//        public const int GL_T2F_V3F = 0x2A27;
+//        public const int GL_T4F_V4F = 0x2A28;
+//        public const int GL_T2F_C4UB_V3F = 0x2A29;
+//        public const int GL_T2F_C3F_V3F = 0x2A2A;
+//        public const int GL_T2F_N3F_V3F = 0x2A2B;
+//        public const int GL_T2F_C4F_N3F_V3F = 0x2A2C;
+//        public const int GL_T4F_C4F_N3F_V4F = 0x2A2D;
+//        public const int GL_MATRIX_MODE = 0x0BA0;
+//        public const int GL_MODELVIEW = 0x1700;
+//        public const int GL_PROJECTION = 0x1701;
+//        public const int GL_TEXTURE = 0x1702;
+//        public const int GL_POINT_SMOOTH = 0x0B10;
+//        public const int GL_POINT_SIZE = 0x0B11;
+//        public const int GL_POINT_SIZE_GRANULARITY = 0x0B13;
+//        public const int GL_POINT_SIZE_RANGE = 0x0B12;
+//        public const int GL_LINE_SMOOTH = 0x0B20;
+//        public const int GL_LINE_STIPPLE = 0x0B24;
+//        public const int GL_LINE_STIPPLE_PATTERN = 0x0B25;
+//        public const int GL_LINE_STIPPLE_REPEAT = 0x0B26;
+//        public const int GL_LINE_WIDTH = 0x0B21;
+//        public const int GL_LINE_WIDTH_GRANULARITY = 0x0B23;
+//        public const int GL_LINE_WIDTH_RANGE = 0x0B22;
+//        public const int GL_POINT = 0x1B00;
+//        public const int GL_LINE = 0x1B01;
+//        public const int GL_FILL = 0x1B02;
+//        public const int GL_CW = 0x0900;
+//        public const int GL_CCW = 0x0901;
+//        public const int GL_FRONT = 0x0404;
+//        public const int GL_BACK = 0x0405;
+//        public const int GL_POLYGON_MODE = 0x0B40;
+//        public const int GL_POLYGON_SMOOTH = 0x0B41;
+//        public const int GL_POLYGON_STIPPLE = 0x0B42;
+//        public const int GL_EDGE_FLAG = 0x0B43;
+//        public const int GL_CULL_FACE = 0x0B44;
+//        public const int GL_CULL_FACE_MODE = 0x0B45;
+//        public const int GL_FRONT_FACE = 0x0B46;
+//        public const int GL_POLYGON_OFFSET_FACTOR = 0x8038;
+//        public const int GL_POLYGON_OFFSET_UNITS = 0x2A00;
+//        public const int GL_POLYGON_OFFSET_POINT = 0x2A01;
+//        public const int GL_POLYGON_OFFSET_LINE = 0x2A02;
+//        public const int GL_POLYGON_OFFSET_FILL = 0x8037;
+//        public const int GL_COMPILE = 0x1300;
+//        public const int GL_COMPILE_AND_EXECUTE = 0x1301;
+//        public const int GL_LIST_BASE = 0x0B32;
+//        public const int GL_LIST_INDEX = 0x0B33;
+//        public const int GL_LIST_MODE = 0x0B30;
+//        public const int GL_NEVER = 0x0200;
+//        public const int GL_LESS = 0x0201;
+//        public const int GL_EQUAL = 0x0202;
+//        public const int GL_LEQUAL = 0x0203;
+//        public const int GL_GREATER = 0x0204;
+//        public const int GL_NOTEQUAL = 0x0205;
+//        public const int GL_GEQUAL = 0x0206;
+//        public const int GL_ALWAYS = 0x0207;
         public const int GL_DEPTH_TEST = 0x0B71;
-        public const int GL_DEPTH_BITS = 0x0D56;
-        public const int GL_DEPTH_CLEAR_VALUE = 0x0B73;
-        public const int GL_DEPTH_FUNC = 0x0B74;
-        public const int GL_DEPTH_RANGE = 0x0B70;
-        public const int GL_DEPTH_WRITEMASK = 0x0B72;
+//        public const int GL_DEPTH_BITS = 0x0D56;
+//        public const int GL_DEPTH_CLEAR_VALUE = 0x0B73;
+//        public const int GL_DEPTH_FUNC = 0x0B74;
+//        public const int GL_DEPTH_RANGE = 0x0B70;
+//        public const int GL_DEPTH_WRITEMASK = 0x0B72;
         public const int GL_DEPTH_COMPONENT = 0x1902;
-        public const int GL_LIGHTING = 0x0B50;
-        public const int GL_LIGHT0 = 0x4000;
-        public const int GL_LIGHT1 = 0x4001;
-        public const int GL_LIGHT2 = 0x4002;
-        public const int GL_LIGHT3 = 0x4003;
-        public const int GL_LIGHT4 = 0x4004;
-        public const int GL_LIGHT5 = 0x4005;
-        public const int GL_LIGHT6 = 0x4006;
-        public const int GL_LIGHT7 = 0x4007;
-        public const int GL_SPOT_EXPONENT = 0x1205;
-        public const int GL_SPOT_CUTOFF = 0x1206;
-        public const int GL_CONSTANT_ATTENUATION = 0x1207;
-        public const int GL_LINEAR_ATTENUATION = 0x1208;
-        public const int GL_QUADRATIC_ATTENUATION = 0x1209;
-        public const int GL_AMBIENT = 0x1200;
-        public const int GL_DIFFUSE = 0x1201;
-        public const int GL_SPECULAR = 0x1202;
-        public const int GL_SHININESS = 0x1601;
-        public const int GL_EMISSION = 0x1600;
-        public const int GL_POSITION = 0x1203;
-        public const int GL_SPOT_DIRECTION = 0x1204;
-        public const int GL_AMBIENT_AND_DIFFUSE = 0x1602;
-        public const int GL_COLOR_INDEXES = 0x1603;
-        public const int GL_LIGHT_MODEL_TWO_SIDE = 0x0B52;
-        public const int GL_LIGHT_MODEL_LOCAL_VIEWER = 0x0B51;
-        public const int GL_LIGHT_MODEL_AMBIENT = 0x0B53;
-        public const int GL_FRONT_AND_BACK = 0x0408;
-        public const int GL_SHADE_MODEL = 0x0B54;
-        public const int GL_FLAT = 0x1D00;
-        public const int GL_SMOOTH = 0x1D01;
-        public const int GL_COLOR_MATERIAL = 0x0B57;
-        public const int GL_COLOR_MATERIAL_FACE = 0x0B55;
-        public const int GL_COLOR_MATERIAL_PARAMETER = 0x0B56;
-        public const int GL_NORMALIZE = 0x0BA1;
-        public const int GL_CLIP_PLANE0 = 0x3000;
-        public const int GL_CLIP_PLANE1 = 0x3001;
-        public const int GL_CLIP_PLANE2 = 0x3002;
-        public const int GL_CLIP_PLANE3 = 0x3003;
-        public const int GL_CLIP_PLANE4 = 0x3004;
-        public const int GL_CLIP_PLANE5 = 0x3005;
-        public const int GL_ACCUM_RED_BITS = 0x0D58;
-        public const int GL_ACCUM_GREEN_BITS = 0x0D59;
-        public const int GL_ACCUM_BLUE_BITS = 0x0D5A;
-        public const int GL_ACCUM_ALPHA_BITS = 0x0D5B;
-        public const int GL_ACCUM_CLEAR_VALUE = 0x0B80;
-        public const int GL_ACCUM = 0x0100;
-        public const int GL_ADD = 0x0104;
-        public const int GL_LOAD = 0x0101;
-        public const int GL_MULT = 0x0103;
-        public const int GL_RETURN = 0x0102;
-        public const int GL_ALPHA_TEST = 0x0BC0;
-        public const int GL_ALPHA_TEST_REF = 0x0BC2;
-        public const int GL_ALPHA_TEST_FUNC = 0x0BC1;
-        public const int GL_BLEND = 0x0BE2;
-        public const int GL_BLEND_SRC = 0x0BE1;
-        public const int GL_BLEND_DST = 0x0BE0;
-        public const int GL_SRC_COLOR = 0x0300;
-        public const int GL_ONE_MINUS_SRC_COLOR = 0x0301;
-        public const int GL_SRC_ALPHA = 0x0302;
-        public const int GL_ONE_MINUS_SRC_ALPHA = 0x0303;
-        public const int GL_DST_ALPHA = 0x0304;
-        public const int GL_ONE_MINUS_DST_ALPHA = 0x0305;
-        public const int GL_DST_COLOR = 0x0306;
-        public const int GL_ONE_MINUS_DST_COLOR = 0x0307;
-        public const int GL_SRC_ALPHA_SATURATE = 0x0308;
-        public const int GL_FEEDBACK = 0x1C01;
-        public const int GL_RENDER = 0x1C00;
-        public const int GL_SELECT = 0x1C02;
-        public const int GL_2D = 0x0600;
-        public const int GL_3D = 0x0601;
-        public const int GL_3D_COLOR = 0x0602;
-        public const int GL_3D_COLOR_TEXTURE = 0x0603;
-        public const int GL_4D_COLOR_TEXTURE = 0x0604;
-        public const int GL_POINT_TOKEN = 0x0701;
-        public const int GL_LINE_TOKEN = 0x0702;
-        public const int GL_LINE_RESET_TOKEN = 0x0707;
-        public const int GL_POLYGON_TOKEN = 0x0703;
-        public const int GL_BITMAP_TOKEN = 0x0704;
-        public const int GL_DRAW_PIXEL_TOKEN = 0x0705;
-        public const int GL_COPY_PIXEL_TOKEN = 0x0706;
-        public const int GL_PASS_THROUGH_TOKEN = 0x0700;
-        public const int GL_FEEDBACK_BUFFER_POINTER = 0x0DF0;
-        public const int GL_FEEDBACK_BUFFER_SIZE = 0x0DF1;
-        public const int GL_FEEDBACK_BUFFER_TYPE = 0x0DF2;
-        public const int GL_SELECTION_BUFFER_POINTER = 0x0DF3;
-        public const int GL_SELECTION_BUFFER_SIZE = 0x0DF4;
-        public const int GL_FOG = 0x0B60;
-        public const int GL_FOG_MODE = 0x0B65;
-        public const int GL_FOG_DENSITY = 0x0B62;
-        public const int GL_FOG_COLOR = 0x0B66;
-        public const int GL_FOG_INDEX = 0x0B61;
-        public const int GL_FOG_START = 0x0B63;
-        public const int GL_FOG_END = 0x0B64;
+//        public const int GL_LIGHTING = 0x0B50;
+//        public const int GL_LIGHT0 = 0x4000;
+//        public const int GL_LIGHT1 = 0x4001;
+//        public const int GL_LIGHT2 = 0x4002;
+//        public const int GL_LIGHT3 = 0x4003;
+//        public const int GL_LIGHT4 = 0x4004;
+//        public const int GL_LIGHT5 = 0x4005;
+//        public const int GL_LIGHT6 = 0x4006;
+//        public const int GL_LIGHT7 = 0x4007;
+//        public const int GL_SPOT_EXPONENT = 0x1205;
+//        public const int GL_SPOT_CUTOFF = 0x1206;
+//        public const int GL_CONSTANT_ATTENUATION = 0x1207;
+//        public const int GL_LINEAR_ATTENUATION = 0x1208;
+//        public const int GL_QUADRATIC_ATTENUATION = 0x1209;
+//        public const int GL_AMBIENT = 0x1200;
+//        public const int GL_DIFFUSE = 0x1201;
+//        public const int GL_SPECULAR = 0x1202;
+//        public const int GL_SHININESS = 0x1601;
+//        public const int GL_EMISSION = 0x1600;
+//        public const int GL_POSITION = 0x1203;
+//        public const int GL_SPOT_DIRECTION = 0x1204;
+//        public const int GL_AMBIENT_AND_DIFFUSE = 0x1602;
+//        public const int GL_COLOR_INDEXES = 0x1603;
+//        public const int GL_LIGHT_MODEL_TWO_SIDE = 0x0B52;
+//        public const int GL_LIGHT_MODEL_LOCAL_VIEWER = 0x0B51;
+//        public const int GL_LIGHT_MODEL_AMBIENT = 0x0B53;
+//        public const int GL_FRONT_AND_BACK = 0x0408;
+//        public const int GL_SHADE_MODEL = 0x0B54;
+//        public const int GL_FLAT = 0x1D00;
+//        public const int GL_SMOOTH = 0x1D01;
+//        public const int GL_COLOR_MATERIAL = 0x0B57;
+//        public const int GL_COLOR_MATERIAL_FACE = 0x0B55;
+//        public const int GL_COLOR_MATERIAL_PARAMETER = 0x0B56;
+//        public const int GL_NORMALIZE = 0x0BA1;
+//        public const int GL_CLIP_PLANE0 = 0x3000;
+//        public const int GL_CLIP_PLANE1 = 0x3001;
+//        public const int GL_CLIP_PLANE2 = 0x3002;
+//        public const int GL_CLIP_PLANE3 = 0x3003;
+//        public const int GL_CLIP_PLANE4 = 0x3004;
+//        public const int GL_CLIP_PLANE5 = 0x3005;
+//        public const int GL_ACCUM_RED_BITS = 0x0D58;
+//        public const int GL_ACCUM_GREEN_BITS = 0x0D59;
+//        public const int GL_ACCUM_BLUE_BITS = 0x0D5A;
+//        public const int GL_ACCUM_ALPHA_BITS = 0x0D5B;
+//        public const int GL_ACCUM_CLEAR_VALUE = 0x0B80;
+//        public const int GL_ACCUM = 0x0100;
+//        public const int GL_ADD = 0x0104;
+//        public const int GL_LOAD = 0x0101;
+//        public const int GL_MULT = 0x0103;
+//        public const int GL_RETURN = 0x0102;
+//        public const int GL_ALPHA_TEST = 0x0BC0;
+//        public const int GL_ALPHA_TEST_REF = 0x0BC2;
+//        public const int GL_ALPHA_TEST_FUNC = 0x0BC1;
+//        public const int GL_BLEND = 0x0BE2;
+//        public const int GL_BLEND_SRC = 0x0BE1;
+//        public const int GL_BLEND_DST = 0x0BE0;
+//        public const int GL_SRC_COLOR = 0x0300;
+//        public const int GL_ONE_MINUS_SRC_COLOR = 0x0301;
+//        public const int GL_SRC_ALPHA = 0x0302;
+//        public const int GL_ONE_MINUS_SRC_ALPHA = 0x0303;
+//        public const int GL_DST_ALPHA = 0x0304;
+//        public const int GL_ONE_MINUS_DST_ALPHA = 0x0305;
+//        public const int GL_DST_COLOR = 0x0306;
+//        public const int GL_ONE_MINUS_DST_COLOR = 0x0307;
+//        public const int GL_SRC_ALPHA_SATURATE = 0x0308;
+//        public const int GL_FEEDBACK = 0x1C01;
+//        public const int GL_RENDER = 0x1C00;
+//        public const int GL_SELECT = 0x1C02;
+//        public const int GL_2D = 0x0600;
+//        public const int GL_3D = 0x0601;
+//        public const int GL_3D_COLOR = 0x0602;
+//        public const int GL_3D_COLOR_TEXTURE = 0x0603;
+//        public const int GL_4D_COLOR_TEXTURE = 0x0604;
+//        public const int GL_POINT_TOKEN = 0x0701;
+//        public const int GL_LINE_TOKEN = 0x0702;
+//        public const int GL_LINE_RESET_TOKEN = 0x0707;
+//        public const int GL_POLYGON_TOKEN = 0x0703;
+//        public const int GL_BITMAP_TOKEN = 0x0704;
+//        public const int GL_DRAW_PIXEL_TOKEN = 0x0705;
+//        public const int GL_COPY_PIXEL_TOKEN = 0x0706;
+//        public const int GL_PASS_THROUGH_TOKEN = 0x0700;
+//        public const int GL_FEEDBACK_BUFFER_POINTER = 0x0DF0;
+//        public const int GL_FEEDBACK_BUFFER_SIZE = 0x0DF1;
+//        public const int GL_FEEDBACK_BUFFER_TYPE = 0x0DF2;
+//        public const int GL_SELECTION_BUFFER_POINTER = 0x0DF3;
+//        public const int GL_SELECTION_BUFFER_SIZE = 0x0DF4;
+//        public const int GL_FOG = 0x0B60;
+//        public const int GL_FOG_MODE = 0x0B65;
+//        public const int GL_FOG_DENSITY = 0x0B62;
+//        public const int GL_FOG_COLOR = 0x0B66;
+//        public const int GL_FOG_INDEX = 0x0B61;
+//        public const int GL_FOG_START = 0x0B63;
+//        public const int GL_FOG_END = 0x0B64;
         public const int GL_LINEAR = 0x2601;
-        public const int GL_EXP = 0x0800;
-        public const int GL_EXP2 = 0x0801;
-        public const int GL_LOGIC_OP = 0x0BF1;
-        public const int GL_INDEX_LOGIC_OP = 0x0BF1;
-        public const int GL_COLOR_LOGIC_OP = 0x0BF2;
-        public const int GL_LOGIC_OP_MODE = 0x0BF0;
-        public const int GL_CLEAR = 0x1500;
-        public const int GL_SET = 0x150F;
-        public const int GL_COPY = 0x1503;
-        public const int GL_COPY_INVERTED = 0x150C;
-        public const int GL_NOOP = 0x1505;
-        public const int GL_INVERT = 0x150A;
-        public const int GL_AND = 0x1501;
-        public const int GL_NAND = 0x150E;
-        public const int GL_OR = 0x1507;
-        public const int GL_NOR = 0x1508;
-        public const int GL_XOR = 0x1506;
-        public const int GL_EQUIV = 0x1509;
-        public const int GL_AND_REVERSE = 0x1502;
-        public const int GL_AND_INVERTED = 0x1504;
-        public const int GL_OR_REVERSE = 0x150B;
-        public const int GL_OR_INVERTED = 0x150D;
+//        public const int GL_EXP = 0x0800;
+//        public const int GL_EXP2 = 0x0801;
+//        public const int GL_LOGIC_OP = 0x0BF1;
+//        public const int GL_INDEX_LOGIC_OP = 0x0BF1;
+//        public const int GL_COLOR_LOGIC_OP = 0x0BF2;
+//        public const int GL_LOGIC_OP_MODE = 0x0BF0;
+//        public const int GL_CLEAR = 0x1500;
+//        public const int GL_SET = 0x150F;
+//        public const int GL_COPY = 0x1503;
+//        public const int GL_COPY_INVERTED = 0x150C;
+//        public const int GL_NOOP = 0x1505;
+//        public const int GL_INVERT = 0x150A;
+//        public const int GL_AND = 0x1501;
+//        public const int GL_NAND = 0x150E;
+//        public const int GL_OR = 0x1507;
+//        public const int GL_NOR = 0x1508;
+//        public const int GL_XOR = 0x1506;
+//        public const int GL_EQUIV = 0x1509;
+//        public const int GL_AND_REVERSE = 0x1502;
+//        public const int GL_AND_INVERTED = 0x1504;
+//        public const int GL_OR_REVERSE = 0x150B;
+//        public const int GL_OR_INVERTED = 0x150D;
         public const int GL_STENCIL_BITS = 0x0D57;
-        public const int GL_STENCIL_TEST = 0x0B90;
-        public const int GL_STENCIL_CLEAR_VALUE = 0x0B91;
-        public const int GL_STENCIL_FUNC = 0x0B92;
-        public const int GL_STENCIL_VALUE_MASK = 0x0B93;
-        public const int GL_STENCIL_FAIL = 0x0B94;
-        public const int GL_STENCIL_PASS_DEPTH_FAIL = 0x0B95;
-        public const int GL_STENCIL_PASS_DEPTH_PASS = 0x0B96;
-        public const int GL_STENCIL_REF = 0x0B97;
-        public const int GL_STENCIL_WRITEMASK = 0x0B98;
-        public const int GL_STENCIL_INDEX = 0x1901;
-        public const int GL_KEEP = 0x1E00;
-        public const int GL_REPLACE = 0x1E01;
-        public const int GL_INCR = 0x1E02;
-        public const int GL_DECR = 0x1E03;
-        public const int GL_LEFT = 0x0406;
-        public const int GL_RIGHT = 0x0407;
-        public const int GL_FRONT_LEFT = 0x0400;
-        public const int GL_FRONT_RIGHT = 0x0401;
-        public const int GL_BACK_LEFT = 0x0402;
-        public const int GL_BACK_RIGHT = 0x0403;
-        public const int GL_AUX0 = 0x0409;
-        public const int GL_AUX1 = 0x040A;
-        public const int GL_AUX2 = 0x040B;
-        public const int GL_AUX3 = 0x040C;
-        public const int GL_COLOR_INDEX = 0x1900;
-        public const int GL_RED = 0x1903;
-        public const int GL_GREEN = 0x1904;
-        public const int GL_BLUE = 0x1905;
-        public const int GL_ALPHA = 0x1906;
-        public const int GL_LUMINANCE = 0x1909;
-        public const int GL_LUMINANCE_ALPHA = 0x190A;
-        public const int GL_ALPHA_BITS = 0x0D55;
-        public const int GL_RED_BITS = 0x0D52;
-        public const int GL_GREEN_BITS = 0x0D53;
-        public const int GL_BLUE_BITS = 0x0D54;
-        public const int GL_INDEX_BITS = 0x0D51;
-        public const int GL_SUBPIXEL_BITS = 0x0D50;
-        public const int GL_AUX_BUFFERS = 0x0C00;
-        public const int GL_READ_BUFFER = 0x0C02;
-        public const int GL_DRAW_BUFFER = 0x0C01;
-        public const int GL_DOUBLEBUFFER = 0x0C32;
-        public const int GL_STEREO = 0x0C33;
-        public const int GL_BITMAP = 0x1A00;
-        public const int GL_COLOR = 0x1800;
-        public const int GL_DEPTH = 0x1801;
-        public const int GL_STENCIL = 0x1802;
-        public const int GL_DITHER = 0x0BD0;
-        public const int GL_RGB = 0x1907;
+//        public const int GL_STENCIL_TEST = 0x0B90;
+//        public const int GL_STENCIL_CLEAR_VALUE = 0x0B91;
+//        public const int GL_STENCIL_FUNC = 0x0B92;
+//        public const int GL_STENCIL_VALUE_MASK = 0x0B93;
+//        public const int GL_STENCIL_FAIL = 0x0B94;
+//        public const int GL_STENCIL_PASS_DEPTH_FAIL = 0x0B95;
+//        public const int GL_STENCIL_PASS_DEPTH_PASS = 0x0B96;
+//        public const int GL_STENCIL_REF = 0x0B97;
+//        public const int GL_STENCIL_WRITEMASK = 0x0B98;
+//        public const int GL_STENCIL_INDEX = 0x1901;
+//        public const int GL_KEEP = 0x1E00;
+//        public const int GL_REPLACE = 0x1E01;
+//        public const int GL_INCR = 0x1E02;
+//        public const int GL_DECR = 0x1E03;
+//        public const int GL_LEFT = 0x0406;
+//        public const int GL_RIGHT = 0x0407;
+//        public const int GL_FRONT_LEFT = 0x0400;
+//        public const int GL_FRONT_RIGHT = 0x0401;
+//        public const int GL_BACK_LEFT = 0x0402;
+//        public const int GL_BACK_RIGHT = 0x0403;
+//        public const int GL_AUX0 = 0x0409;
+//        public const int GL_AUX1 = 0x040A;
+//        public const int GL_AUX2 = 0x040B;
+//        public const int GL_AUX3 = 0x040C;
+//        public const int GL_COLOR_INDEX = 0x1900;
+//        public const int GL_RED = 0x1903;
+//        public const int GL_GREEN = 0x1904;
+//        public const int GL_BLUE = 0x1905;
+//        public const int GL_ALPHA = 0x1906;
+//        public const int GL_LUMINANCE = 0x1909;
+//        public const int GL_LUMINANCE_ALPHA = 0x190A;
+//        public const int GL_ALPHA_BITS = 0x0D55;
+//        public const int GL_RED_BITS = 0x0D52;
+//        public const int GL_GREEN_BITS = 0x0D53;
+//        public const int GL_BLUE_BITS = 0x0D54;
+//        public const int GL_INDEX_BITS = 0x0D51;
+//        public const int GL_SUBPIXEL_BITS = 0x0D50;
+//        public const int GL_AUX_BUFFERS = 0x0C00;
+//        public const int GL_READ_BUFFER = 0x0C02;
+//        public const int GL_DRAW_BUFFER = 0x0C01;
+//        public const int GL_DOUBLEBUFFER = 0x0C32;
+//        public const int GL_STEREO = 0x0C33;
+//        public const int GL_BITMAP = 0x1A00;
+//        public const int GL_COLOR = 0x1800;
+//        public const int GL_DEPTH = 0x1801;
+//        public const int GL_STENCIL = 0x1802;
+//        public const int GL_DITHER = 0x0BD0;
+//        public const int GL_RGB = 0x1907;
         public const int GL_RGBA = 0x1908;
-        public const int GL_MAX_LIST_NESTING = 0x0B31;
-        public const int GL_MAX_EVAL_ORDER = 0x0D30;
-        public const int GL_MAX_LIGHTS = 0x0D31;
-        public const int GL_MAX_CLIP_PLANES = 0x0D32;
-        public const int GL_MAX_TEXTURE_SIZE = 0x0D33;
-        public const int GL_MAX_PIXEL_MAP_TABLE = 0x0D34;
-        public const int GL_MAX_ATTRIB_STACK_DEPTH = 0x0D35;
-        public const int GL_MAX_MODELVIEW_STACK_DEPTH = 0x0D36;
-        public const int GL_MAX_NAME_STACK_DEPTH = 0x0D37;
-        public const int GL_MAX_PROJECTION_STACK_DEPTH = 0x0D38;
-        public const int GL_MAX_TEXTURE_STACK_DEPTH = 0x0D39;
-        public const int GL_MAX_VIEWPORT_DIMS = 0x0D3A;
-        public const int GL_MAX_CLIENT_ATTRIB_STACK_DEPTH = 0x0D3B;
-        public const int GL_ATTRIB_STACK_DEPTH = 0x0BB0;
-        public const int GL_CLIENT_ATTRIB_STACK_DEPTH = 0x0BB1;
-        public const int GL_COLOR_CLEAR_VALUE = 0x0C22;
-        public const int GL_COLOR_WRITEMASK = 0x0C23;
-        public const int GL_CURRENT_INDEX = 0x0B01;
-        public const int GL_CURRENT_COLOR = 0x0B00;
-        public const int GL_CURRENT_NORMAL = 0x0B02;
-        public const int GL_CURRENT_RASTER_COLOR = 0x0B04;
-        public const int GL_CURRENT_RASTER_DISTANCE = 0x0B09;
-        public const int GL_CURRENT_RASTER_INDEX = 0x0B05;
-        public const int GL_CURRENT_RASTER_POSITION = 0x0B07;
-        public const int GL_CURRENT_RASTER_TEXTURE_COORDS = 0x0B06;
-        public const int GL_CURRENT_RASTER_POSITION_VALID = 0x0B08;
-        public const int GL_CURRENT_TEXTURE_COORDS = 0x0B03;
-        public const int GL_INDEX_CLEAR_VALUE = 0x0C20;
-        public const int GL_INDEX_MODE = 0x0C30;
-        public const int GL_INDEX_WRITEMASK = 0x0C21;
-        public const int GL_MODELVIEW_MATRIX = 0x0BA6;
-        public const int GL_MODELVIEW_STACK_DEPTH = 0x0BA3;
-        public const int GL_NAME_STACK_DEPTH = 0x0D70;
-        public const int GL_PROJECTION_MATRIX = 0x0BA7;
-        public const int GL_PROJECTION_STACK_DEPTH = 0x0BA4;
-        public const int GL_RENDER_MODE = 0x0C40;
-        public const int GL_RGBA_MODE = 0x0C31;
-        public const int GL_TEXTURE_MATRIX = 0x0BA8;
-        public const int GL_TEXTURE_STACK_DEPTH = 0x0BA5;
-        public const int GL_VIEWPORT = 0x0BA2;
-        public const int GL_AUTO_NORMAL = 0x0D80;
-        public const int GL_MAP1_COLOR_4 = 0x0D90;
-        public const int GL_MAP1_INDEX = 0x0D91;
-        public const int GL_MAP1_NORMAL = 0x0D92;
-        public const int GL_MAP1_TEXTURE_COORD_1 = 0x0D93;
-        public const int GL_MAP1_TEXTURE_COORD_2 = 0x0D94;
-        public const int GL_MAP1_TEXTURE_COORD_3 = 0x0D95;
-        public const int GL_MAP1_TEXTURE_COORD_4 = 0x0D96;
-        public const int GL_MAP1_VERTEX_3 = 0x0D97;
-        public const int GL_MAP1_VERTEX_4 = 0x0D98;
-        public const int GL_MAP2_COLOR_4 = 0x0DB0;
-        public const int GL_MAP2_INDEX = 0x0DB1;
-        public const int GL_MAP2_NORMAL = 0x0DB2;
-        public const int GL_MAP2_TEXTURE_COORD_1 = 0x0DB3;
-        public const int GL_MAP2_TEXTURE_COORD_2 = 0x0DB4;
-        public const int GL_MAP2_TEXTURE_COORD_3 = 0x0DB5;
-        public const int GL_MAP2_TEXTURE_COORD_4 = 0x0DB6;
-        public const int GL_MAP2_VERTEX_3 = 0x0DB7;
-        public const int GL_MAP2_VERTEX_4 = 0x0DB8;
-        public const int GL_MAP1_GRID_DOMAIN = 0x0DD0;
-        public const int GL_MAP1_GRID_SEGMENTS = 0x0DD1;
-        public const int GL_MAP2_GRID_DOMAIN = 0x0DD2;
-        public const int GL_MAP2_GRID_SEGMENTS = 0x0DD3;
-        public const int GL_COEFF = 0x0A00;
-        public const int GL_ORDER = 0x0A01;
-        public const int GL_DOMAIN = 0x0A02;
-        public const int GL_PERSPECTIVE_CORRECTION_HINT = 0x0C50;
-        public const int GL_POINT_SMOOTH_HINT = 0x0C51;
-        public const int GL_LINE_SMOOTH_HINT = 0x0C52;
-        public const int GL_POLYGON_SMOOTH_HINT = 0x0C53;
-        public const int GL_FOG_HINT = 0x0C54;
-        public const int GL_DONT_CARE = 0x1100;
-        public const int GL_FASTEST = 0x1101;
-        public const int GL_NICEST = 0x1102;
-        public const int GL_SCISSOR_BOX = 0x0C10;
-        public const int GL_SCISSOR_TEST = 0x0C11;
-        public const int GL_MAP_COLOR = 0x0D10;
-        public const int GL_MAP_STENCIL = 0x0D11;
-        public const int GL_INDEX_SHIFT = 0x0D12;
-        public const int GL_INDEX_OFFSET = 0x0D13;
-        public const int GL_RED_SCALE = 0x0D14;
-        public const int GL_RED_BIAS = 0x0D15;
-        public const int GL_GREEN_SCALE = 0x0D18;
-        public const int GL_GREEN_BIAS = 0x0D19;
-        public const int GL_BLUE_SCALE = 0x0D1A;
-        public const int GL_BLUE_BIAS = 0x0D1B;
-        public const int GL_ALPHA_SCALE = 0x0D1C;
-        public const int GL_ALPHA_BIAS = 0x0D1D;
-        public const int GL_DEPTH_SCALE = 0x0D1E;
-        public const int GL_DEPTH_BIAS = 0x0D1F;
-        public const int GL_PIXEL_MAP_S_TO_S_SIZE = 0x0CB1;
-        public const int GL_PIXEL_MAP_I_TO_I_SIZE = 0x0CB0;
-        public const int GL_PIXEL_MAP_I_TO_R_SIZE = 0x0CB2;
-        public const int GL_PIXEL_MAP_I_TO_G_SIZE = 0x0CB3;
-        public const int GL_PIXEL_MAP_I_TO_B_SIZE = 0x0CB4;
-        public const int GL_PIXEL_MAP_I_TO_A_SIZE = 0x0CB5;
-        public const int GL_PIXEL_MAP_R_TO_R_SIZE = 0x0CB6;
-        public const int GL_PIXEL_MAP_G_TO_G_SIZE = 0x0CB7;
-        public const int GL_PIXEL_MAP_B_TO_B_SIZE = 0x0CB8;
-        public const int GL_PIXEL_MAP_A_TO_A_SIZE = 0x0CB9;
-        public const int GL_PIXEL_MAP_S_TO_S = 0x0C71;
-        public const int GL_PIXEL_MAP_I_TO_I = 0x0C70;
-        public const int GL_PIXEL_MAP_I_TO_R = 0x0C72;
-        public const int GL_PIXEL_MAP_I_TO_G = 0x0C73;
-        public const int GL_PIXEL_MAP_I_TO_B = 0x0C74;
-        public const int GL_PIXEL_MAP_I_TO_A = 0x0C75;
-        public const int GL_PIXEL_MAP_R_TO_R = 0x0C76;
-        public const int GL_PIXEL_MAP_G_TO_G = 0x0C77;
-        public const int GL_PIXEL_MAP_B_TO_B = 0x0C78;
-        public const int GL_PIXEL_MAP_A_TO_A = 0x0C79;
-        public const int GL_PACK_ALIGNMENT = 0x0D05;
-        public const int GL_PACK_LSB_FIRST = 0x0D01;
-        public const int GL_PACK_ROW_LENGTH = 0x0D02;
-        public const int GL_PACK_SKIP_PIXELS = 0x0D04;
-        public const int GL_PACK_SKIP_ROWS = 0x0D03;
-        public const int GL_PACK_SWAP_BYTES = 0x0D00;
-        public const int GL_UNPACK_ALIGNMENT = 0x0CF5;
-        public const int GL_UNPACK_LSB_FIRST = 0x0CF1;
-        public const int GL_UNPACK_ROW_LENGTH = 0x0CF2;
-        public const int GL_UNPACK_SKIP_PIXELS = 0x0CF4;
-        public const int GL_UNPACK_SKIP_ROWS = 0x0CF3;
-        public const int GL_UNPACK_SWAP_BYTES = 0x0CF0;
-        public const int GL_ZOOM_X = 0x0D16;
-        public const int GL_ZOOM_Y = 0x0D17;
-        public const int GL_TEXTURE_ENV = 0x2300;
-        public const int GL_TEXTURE_ENV_MODE = 0x2200;
-        public const int GL_TEXTURE_1D = 0x0DE0;
+//        public const int GL_MAX_LIST_NESTING = 0x0B31;
+//        public const int GL_MAX_EVAL_ORDER = 0x0D30;
+//        public const int GL_MAX_LIGHTS = 0x0D31;
+//        public const int GL_MAX_CLIP_PLANES = 0x0D32;
+//        public const int GL_MAX_TEXTURE_SIZE = 0x0D33;
+//        public const int GL_MAX_PIXEL_MAP_TABLE = 0x0D34;
+//        public const int GL_MAX_ATTRIB_STACK_DEPTH = 0x0D35;
+//        public const int GL_MAX_MODELVIEW_STACK_DEPTH = 0x0D36;
+//        public const int GL_MAX_NAME_STACK_DEPTH = 0x0D37;
+//        public const int GL_MAX_PROJECTION_STACK_DEPTH = 0x0D38;
+//        public const int GL_MAX_TEXTURE_STACK_DEPTH = 0x0D39;
+//        public const int GL_MAX_VIEWPORT_DIMS = 0x0D3A;
+//        public const int GL_MAX_CLIENT_ATTRIB_STACK_DEPTH = 0x0D3B;
+//        public const int GL_ATTRIB_STACK_DEPTH = 0x0BB0;
+//        public const int GL_CLIENT_ATTRIB_STACK_DEPTH = 0x0BB1;
+//        public const int GL_COLOR_CLEAR_VALUE = 0x0C22;
+//        public const int GL_COLOR_WRITEMASK = 0x0C23;
+//        public const int GL_CURRENT_INDEX = 0x0B01;
+//        public const int GL_CURRENT_COLOR = 0x0B00;
+//        public const int GL_CURRENT_NORMAL = 0x0B02;
+//        public const int GL_CURRENT_RASTER_COLOR = 0x0B04;
+//        public const int GL_CURRENT_RASTER_DISTANCE = 0x0B09;
+//        public const int GL_CURRENT_RASTER_INDEX = 0x0B05;
+//        public const int GL_CURRENT_RASTER_POSITION = 0x0B07;
+//        public const int GL_CURRENT_RASTER_TEXTURE_COORDS = 0x0B06;
+//        public const int GL_CURRENT_RASTER_POSITION_VALID = 0x0B08;
+//        public const int GL_CURRENT_TEXTURE_COORDS = 0x0B03;
+//        public const int GL_INDEX_CLEAR_VALUE = 0x0C20;
+//        public const int GL_INDEX_MODE = 0x0C30;
+//        public const int GL_INDEX_WRITEMASK = 0x0C21;
+//        public const int GL_MODELVIEW_MATRIX = 0x0BA6;
+//        public const int GL_MODELVIEW_STACK_DEPTH = 0x0BA3;
+//        public const int GL_NAME_STACK_DEPTH = 0x0D70;
+//        public const int GL_PROJECTION_MATRIX = 0x0BA7;
+//        public const int GL_PROJECTION_STACK_DEPTH = 0x0BA4;
+//        public const int GL_RENDER_MODE = 0x0C40;
+//        public const int GL_RGBA_MODE = 0x0C31;
+//        public const int GL_TEXTURE_MATRIX = 0x0BA8;
+//        public const int GL_TEXTURE_STACK_DEPTH = 0x0BA5;
+//        public const int GL_VIEWPORT = 0x0BA2;
+//        public const int GL_AUTO_NORMAL = 0x0D80;
+//        public const int GL_MAP1_COLOR_4 = 0x0D90;
+//        public const int GL_MAP1_INDEX = 0x0D91;
+//        public const int GL_MAP1_NORMAL = 0x0D92;
+//        public const int GL_MAP1_TEXTURE_COORD_1 = 0x0D93;
+//        public const int GL_MAP1_TEXTURE_COORD_2 = 0x0D94;
+//        public const int GL_MAP1_TEXTURE_COORD_3 = 0x0D95;
+//        public const int GL_MAP1_TEXTURE_COORD_4 = 0x0D96;
+//        public const int GL_MAP1_VERTEX_3 = 0x0D97;
+//        public const int GL_MAP1_VERTEX_4 = 0x0D98;
+//        public const int GL_MAP2_COLOR_4 = 0x0DB0;
+//        public const int GL_MAP2_INDEX = 0x0DB1;
+//        public const int GL_MAP2_NORMAL = 0x0DB2;
+//        public const int GL_MAP2_TEXTURE_COORD_1 = 0x0DB3;
+//        public const int GL_MAP2_TEXTURE_COORD_2 = 0x0DB4;
+//        public const int GL_MAP2_TEXTURE_COORD_3 = 0x0DB5;
+//        public const int GL_MAP2_TEXTURE_COORD_4 = 0x0DB6;
+//        public const int GL_MAP2_VERTEX_3 = 0x0DB7;
+//        public const int GL_MAP2_VERTEX_4 = 0x0DB8;
+//        public const int GL_MAP1_GRID_DOMAIN = 0x0DD0;
+//        public const int GL_MAP1_GRID_SEGMENTS = 0x0DD1;
+//        public const int GL_MAP2_GRID_DOMAIN = 0x0DD2;
+//        public const int GL_MAP2_GRID_SEGMENTS = 0x0DD3;
+//        public const int GL_COEFF = 0x0A00;
+//        public const int GL_ORDER = 0x0A01;
+//        public const int GL_DOMAIN = 0x0A02;
+//        public const int GL_PERSPECTIVE_CORRECTION_HINT = 0x0C50;
+//        public const int GL_POINT_SMOOTH_HINT = 0x0C51;
+//        public const int GL_LINE_SMOOTH_HINT = 0x0C52;
+//        public const int GL_POLYGON_SMOOTH_HINT = 0x0C53;
+//        public const int GL_FOG_HINT = 0x0C54;
+//        public const int GL_DONT_CARE = 0x1100;
+//        public const int GL_FASTEST = 0x1101;
+//        public const int GL_NICEST = 0x1102;
+//        public const int GL_SCISSOR_BOX = 0x0C10;
+//        public const int GL_SCISSOR_TEST = 0x0C11;
+//        public const int GL_MAP_COLOR = 0x0D10;
+//        public const int GL_MAP_STENCIL = 0x0D11;
+//        public const int GL_INDEX_SHIFT = 0x0D12;
+//        public const int GL_INDEX_OFFSET = 0x0D13;
+//        public const int GL_RED_SCALE = 0x0D14;
+//        public const int GL_RED_BIAS = 0x0D15;
+//        public const int GL_GREEN_SCALE = 0x0D18;
+//        public const int GL_GREEN_BIAS = 0x0D19;
+//        public const int GL_BLUE_SCALE = 0x0D1A;
+//        public const int GL_BLUE_BIAS = 0x0D1B;
+//        public const int GL_ALPHA_SCALE = 0x0D1C;
+//        public const int GL_ALPHA_BIAS = 0x0D1D;
+//        public const int GL_DEPTH_SCALE = 0x0D1E;
+//        public const int GL_DEPTH_BIAS = 0x0D1F;
+//        public const int GL_PIXEL_MAP_S_TO_S_SIZE = 0x0CB1;
+//        public const int GL_PIXEL_MAP_I_TO_I_SIZE = 0x0CB0;
+//        public const int GL_PIXEL_MAP_I_TO_R_SIZE = 0x0CB2;
+//        public const int GL_PIXEL_MAP_I_TO_G_SIZE = 0x0CB3;
+//        public const int GL_PIXEL_MAP_I_TO_B_SIZE = 0x0CB4;
+//        public const int GL_PIXEL_MAP_I_TO_A_SIZE = 0x0CB5;
+//        public const int GL_PIXEL_MAP_R_TO_R_SIZE = 0x0CB6;
+//        public const int GL_PIXEL_MAP_G_TO_G_SIZE = 0x0CB7;
+//        public const int GL_PIXEL_MAP_B_TO_B_SIZE = 0x0CB8;
+//        public const int GL_PIXEL_MAP_A_TO_A_SIZE = 0x0CB9;
+//        public const int GL_PIXEL_MAP_S_TO_S = 0x0C71;
+//        public const int GL_PIXEL_MAP_I_TO_I = 0x0C70;
+//        public const int GL_PIXEL_MAP_I_TO_R = 0x0C72;
+//        public const int GL_PIXEL_MAP_I_TO_G = 0x0C73;
+//        public const int GL_PIXEL_MAP_I_TO_B = 0x0C74;
+//        public const int GL_PIXEL_MAP_I_TO_A = 0x0C75;
+//        public const int GL_PIXEL_MAP_R_TO_R = 0x0C76;
+//        public const int GL_PIXEL_MAP_G_TO_G = 0x0C77;
+//        public const int GL_PIXEL_MAP_B_TO_B = 0x0C78;
+//        public const int GL_PIXEL_MAP_A_TO_A = 0x0C79;
+//        public const int GL_PACK_ALIGNMENT = 0x0D05;
+//        public const int GL_PACK_LSB_FIRST = 0x0D01;
+//        public const int GL_PACK_ROW_LENGTH = 0x0D02;
+//        public const int GL_PACK_SKIP_PIXELS = 0x0D04;
+//        public const int GL_PACK_SKIP_ROWS = 0x0D03;
+//        public const int GL_PACK_SWAP_BYTES = 0x0D00;
+//        public const int GL_UNPACK_ALIGNMENT = 0x0CF5;
+//        public const int GL_UNPACK_LSB_FIRST = 0x0CF1;
+//        public const int GL_UNPACK_ROW_LENGTH = 0x0CF2;
+//        public const int GL_UNPACK_SKIP_PIXELS = 0x0CF4;
+//        public const int GL_UNPACK_SKIP_ROWS = 0x0CF3;
+//        public const int GL_UNPACK_SWAP_BYTES = 0x0CF0;
+//        public const int GL_ZOOM_X = 0x0D16;
+//        public const int GL_ZOOM_Y = 0x0D17;
+//        public const int GL_TEXTURE_ENV = 0x2300;
+//        public const int GL_TEXTURE_ENV_MODE = 0x2200;
+//        public const int GL_TEXTURE_1D = 0x0DE0;
         public const int GL_TEXTURE_2D = 0x0DE1;
-        public const int GL_TEXTURE_WRAP_S = 0x2802;
-        public const int GL_TEXTURE_WRAP_T = 0x2803;
+//        public const int GL_TEXTURE_WRAP_S = 0x2802;
+//        public const int GL_TEXTURE_WRAP_T = 0x2803;
         public const int GL_TEXTURE_MAG_FILTER = 0x2800;
         public const int GL_TEXTURE_MIN_FILTER = 0x2801;
-        public const int GL_TEXTURE_ENV_COLOR = 0x2201;
-        public const int GL_TEXTURE_GEN_S = 0x0C60;
-        public const int GL_TEXTURE_GEN_T = 0x0C61;
-        public const int GL_TEXTURE_GEN_R = 0x0C62;
-        public const int GL_TEXTURE_GEN_Q = 0x0C63;
-        public const int GL_TEXTURE_GEN_MODE = 0x2500;
-        public const int GL_TEXTURE_BORDER_COLOR = 0x1004;
-        public const int GL_TEXTURE_WIDTH = 0x1000;
-        public const int GL_TEXTURE_HEIGHT = 0x1001;
-        public const int GL_TEXTURE_BORDER = 0x1005;
-        public const int GL_TEXTURE_COMPONENTS = 0x1003;
-        public const int GL_TEXTURE_RED_SIZE = 0x805C;
-        public const int GL_TEXTURE_GREEN_SIZE = 0x805D;
-        public const int GL_TEXTURE_BLUE_SIZE = 0x805E;
-        public const int GL_TEXTURE_ALPHA_SIZE = 0x805F;
-        public const int GL_TEXTURE_LUMINANCE_SIZE = 0x8060;
-        public const int GL_TEXTURE_INTENSITY_SIZE = 0x8061;
-        public const int GL_NEAREST_MIPMAP_NEAREST = 0x2700;
-        public const int GL_NEAREST_MIPMAP_LINEAR = 0x2702;
-        public const int GL_LINEAR_MIPMAP_NEAREST = 0x2701;
-        public const int GL_LINEAR_MIPMAP_LINEAR = 0x2703;
-        public const int GL_OBJECT_LINEAR = 0x2401;
-        public const int GL_OBJECT_PLANE = 0x2501;
-        public const int GL_EYE_LINEAR = 0x2400;
-        public const int GL_EYE_PLANE = 0x2502;
-        public const int GL_SPHERE_MAP = 0x2402;
-        public const int GL_DECAL = 0x2101;
-        public const int GL_MODULATE = 0x2100;
+//        public const int GL_TEXTURE_ENV_COLOR = 0x2201;
+//        public const int GL_TEXTURE_GEN_S = 0x0C60;
+//        public const int GL_TEXTURE_GEN_T = 0x0C61;
+//        public const int GL_TEXTURE_GEN_R = 0x0C62;
+//        public const int GL_TEXTURE_GEN_Q = 0x0C63;
+//        public const int GL_TEXTURE_GEN_MODE = 0x2500;
+//        public const int GL_TEXTURE_BORDER_COLOR = 0x1004;
+//        public const int GL_TEXTURE_WIDTH = 0x1000;
+//        public const int GL_TEXTURE_HEIGHT = 0x1001;
+//        public const int GL_TEXTURE_BORDER = 0x1005;
+//        public const int GL_TEXTURE_COMPONENTS = 0x1003;
+//        public const int GL_TEXTURE_RED_SIZE = 0x805C;
+//        public const int GL_TEXTURE_GREEN_SIZE = 0x805D;
+//        public const int GL_TEXTURE_BLUE_SIZE = 0x805E;
+//        public const int GL_TEXTURE_ALPHA_SIZE = 0x805F;
+//        public const int GL_TEXTURE_LUMINANCE_SIZE = 0x8060;
+//        public const int GL_TEXTURE_INTENSITY_SIZE = 0x8061;
+//        public const int GL_NEAREST_MIPMAP_NEAREST = 0x2700;
+//        public const int GL_NEAREST_MIPMAP_LINEAR = 0x2702;
+//        public const int GL_LINEAR_MIPMAP_NEAREST = 0x2701;
+//        public const int GL_LINEAR_MIPMAP_LINEAR = 0x2703;
+//        public const int GL_OBJECT_LINEAR = 0x2401;
+//        public const int GL_OBJECT_PLANE = 0x2501;
+//        public const int GL_EYE_LINEAR = 0x2400;
+//        public const int GL_EYE_PLANE = 0x2502;
+//        public const int GL_SPHERE_MAP = 0x2402;
+//        public const int GL_DECAL = 0x2101;
+//        public const int GL_MODULATE = 0x2100;
         public const int GL_NEAREST = 0x2600;
-        public const int GL_REPEAT = 0x2901;
-        public const int GL_CLAMP = 0x2900;
-        public const int GL_S = 0x2000;
-        public const int GL_T = 0x2001;
-        public const int GL_R = 0x2002;
-        public const int GL_Q = 0x2003;
+//        public const int GL_REPEAT = 0x2901;
+//        public const int GL_CLAMP = 0x2900;
+//        public const int GL_S = 0x2000;
+//        public const int GL_T = 0x2001;
+//        public const int GL_R = 0x2002;
+//        public const int GL_Q = 0x2003;
         public const int GL_VENDOR = 0x1F00;
         public const int GL_RENDERER = 0x1F01;
         public const int GL_VERSION = 0x1F02;
@@ -465,5000 +464,5000 @@ namespace Avalonia.OpenGL
         public const int GL_OUT_OF_MEMORY = 0x0505;
         public const int GL_INVALID_FRAMEBUFFER_OPERATION = 0x0506;
         public const int GL_CONTEXT_LOST = 0x0507;
-        public const int GL_CURRENT_BIT = 0x00000001;
-        public const int GL_POINT_BIT = 0x00000002;
-        public const int GL_LINE_BIT = 0x00000004;
-        public const int GL_POLYGON_BIT = 0x00000008;
-        public const int GL_POLYGON_STIPPLE_BIT = 0x00000010;
-        public const int GL_PIXEL_MODE_BIT = 0x00000020;
-        public const int GL_LIGHTING_BIT = 0x00000040;
-        public const int GL_FOG_BIT = 0x00000080;
+//        public const int GL_CURRENT_BIT = 0x00000001;
+//        public const int GL_POINT_BIT = 0x00000002;
+//        public const int GL_LINE_BIT = 0x00000004;
+//        public const int GL_POLYGON_BIT = 0x00000008;
+//        public const int GL_POLYGON_STIPPLE_BIT = 0x00000010;
+//        public const int GL_PIXEL_MODE_BIT = 0x00000020;
+//        public const int GL_LIGHTING_BIT = 0x00000040;
+//        public const int GL_FOG_BIT = 0x00000080;
         public const int GL_DEPTH_BUFFER_BIT = 0x00000100;
-        public const int GL_ACCUM_BUFFER_BIT = 0x00000200;
+//        public const int GL_ACCUM_BUFFER_BIT = 0x00000200;
         public const int GL_STENCIL_BUFFER_BIT = 0x00000400;
-        public const int GL_VIEWPORT_BIT = 0x00000800;
-        public const int GL_TRANSFORM_BIT = 0x00001000;
-        public const int GL_ENABLE_BIT = 0x00002000;
+//        public const int GL_VIEWPORT_BIT = 0x00000800;
+//        public const int GL_TRANSFORM_BIT = 0x00001000;
+//        public const int GL_ENABLE_BIT = 0x00002000;
         public const int GL_COLOR_BUFFER_BIT = 0x00004000;
-        public const int GL_HINT_BIT = 0x00008000;
-        public const int GL_EVAL_BIT = 0x00010000;
-        public const int GL_LIST_BIT = 0x00020000;
-        public const int GL_TEXTURE_BIT = 0x00040000;
-        public const int GL_SCISSOR_BIT = 0x00080000;
-        public const int GL_ALL_ATTRIB_BITS = -1;
-        public const int GL_PROXY_TEXTURE_1D = 0x8063;
-        public const int GL_PROXY_TEXTURE_2D = 0x8064;
-        public const int GL_TEXTURE_PRIORITY = 0x8066;
-        public const int GL_TEXTURE_RESIDENT = 0x8067;
-        public const int GL_TEXTURE_BINDING_1D = 0x8068;
+//        public const int GL_HINT_BIT = 0x00008000;
+//        public const int GL_EVAL_BIT = 0x00010000;
+//        public const int GL_LIST_BIT = 0x00020000;
+//        public const int GL_TEXTURE_BIT = 0x00040000;
+//        public const int GL_SCISSOR_BIT = 0x00080000;
+//        public const int GL_ALL_ATTRIB_BITS = -1;
+//        public const int GL_PROXY_TEXTURE_1D = 0x8063;
+//        public const int GL_PROXY_TEXTURE_2D = 0x8064;
+//        public const int GL_TEXTURE_PRIORITY = 0x8066;
+//        public const int GL_TEXTURE_RESIDENT = 0x8067;
+//        public const int GL_TEXTURE_BINDING_1D = 0x8068;
         public const int GL_TEXTURE_BINDING_2D = 0x8069;
-        public const int GL_TEXTURE_INTERNAL_FORMAT = 0x1003;
-        public const int GL_ALPHA4 = 0x803B;
-        public const int GL_ALPHA8 = 0x803C;
-        public const int GL_ALPHA12 = 0x803D;
-        public const int GL_ALPHA16 = 0x803E;
-        public const int GL_LUMINANCE4 = 0x803F;
-        public const int GL_LUMINANCE8 = 0x8040;
-        public const int GL_LUMINANCE12 = 0x8041;
-        public const int GL_LUMINANCE16 = 0x8042;
-        public const int GL_LUMINANCE4_ALPHA4 = 0x8043;
-        public const int GL_LUMINANCE6_ALPHA2 = 0x8044;
-        public const int GL_LUMINANCE8_ALPHA8 = 0x8045;
-        public const int GL_LUMINANCE12_ALPHA4 = 0x8046;
-        public const int GL_LUMINANCE12_ALPHA12 = 0x8047;
-        public const int GL_LUMINANCE16_ALPHA16 = 0x8048;
-        public const int GL_INTENSITY = 0x8049;
-        public const int GL_INTENSITY4 = 0x804A;
-        public const int GL_INTENSITY8 = 0x804B;
-        public const int GL_INTENSITY12 = 0x804C;
-        public const int GL_INTENSITY16 = 0x804D;
-        public const int GL_R3_G3_B2 = 0x2A10;
-        public const int GL_RGB4 = 0x804F;
-        public const int GL_RGB5 = 0x8050;
-        public const int GL_RGB8 = 0x8051;
-        public const int GL_RGB10 = 0x8052;
-        public const int GL_RGB12 = 0x8053;
-        public const int GL_RGB16 = 0x8054;
-        public const int GL_RGBA2 = 0x8055;
-        public const int GL_RGBA4 = 0x8056;
-        public const int GL_RGB5_A1 = 0x8057;
+//        public const int GL_TEXTURE_INTERNAL_FORMAT = 0x1003;
+//        public const int GL_ALPHA4 = 0x803B;
+//        public const int GL_ALPHA8 = 0x803C;
+//        public const int GL_ALPHA12 = 0x803D;
+//        public const int GL_ALPHA16 = 0x803E;
+//        public const int GL_LUMINANCE4 = 0x803F;
+//        public const int GL_LUMINANCE8 = 0x8040;
+//        public const int GL_LUMINANCE12 = 0x8041;
+//        public const int GL_LUMINANCE16 = 0x8042;
+//        public const int GL_LUMINANCE4_ALPHA4 = 0x8043;
+//        public const int GL_LUMINANCE6_ALPHA2 = 0x8044;
+//        public const int GL_LUMINANCE8_ALPHA8 = 0x8045;
+//        public const int GL_LUMINANCE12_ALPHA4 = 0x8046;
+//        public const int GL_LUMINANCE12_ALPHA12 = 0x8047;
+//        public const int GL_LUMINANCE16_ALPHA16 = 0x8048;
+//        public const int GL_INTENSITY = 0x8049;
+//        public const int GL_INTENSITY4 = 0x804A;
+//        public const int GL_INTENSITY8 = 0x804B;
+//        public const int GL_INTENSITY12 = 0x804C;
+//        public const int GL_INTENSITY16 = 0x804D;
+//        public const int GL_R3_G3_B2 = 0x2A10;
+//        public const int GL_RGB4 = 0x804F;
+//        public const int GL_RGB5 = 0x8050;
+//        public const int GL_RGB8 = 0x8051;
+//        public const int GL_RGB10 = 0x8052;
+//        public const int GL_RGB12 = 0x8053;
+//        public const int GL_RGB16 = 0x8054;
+//        public const int GL_RGBA2 = 0x8055;
+//        public const int GL_RGBA4 = 0x8056;
+//        public const int GL_RGB5_A1 = 0x8057;
         public const int GL_RGBA8 = 0x8058;
-        public const int GL_RGB10_A2 = 0x8059;
-        public const int GL_RGBA12 = 0x805A;
-        public const int GL_RGBA16 = 0x805B;
-        public const int GL_CLIENT_PIXEL_STORE_BIT = 0x00000001;
-        public const int GL_CLIENT_VERTEX_ARRAY_BIT = 0x00000002;
-        public const int GL_ALL_CLIENT_ATTRIB_BITS = -1;
-        public const int GL_CLIENT_ALL_ATTRIB_BITS = -1;
-        public const int GL_RESCALE_NORMAL = 0x803A;
-        public const int GL_CLAMP_TO_EDGE = 0x812F;
-        public const int GL_MAX_ELEMENTS_VERTICES = 0x80E8;
-        public const int GL_MAX_ELEMENTS_INDICES = 0x80E9;
-        public const int GL_BGR = 0x80E0;
-        public const int GL_BGRA = 0x80E1;
-        public const int GL_UNSIGNED_BYTE_3_3_2 = 0x8032;
-        public const int GL_UNSIGNED_BYTE_2_3_3_REV = 0x8362;
-        public const int GL_UNSIGNED_SHORT_5_6_5 = 0x8363;
-        public const int GL_UNSIGNED_SHORT_5_6_5_REV = 0x8364;
-        public const int GL_UNSIGNED_SHORT_4_4_4_4 = 0x8033;
-        public const int GL_UNSIGNED_SHORT_4_4_4_4_REV = 0x8365;
-        public const int GL_UNSIGNED_SHORT_5_5_5_1 = 0x8034;
-        public const int GL_UNSIGNED_SHORT_1_5_5_5_REV = 0x8366;
-        public const int GL_UNSIGNED_INT_8_8_8_8 = 0x8035;
-        public const int GL_UNSIGNED_INT_8_8_8_8_REV = 0x8367;
-        public const int GL_UNSIGNED_INT_10_10_10_2 = 0x8036;
-        public const int GL_UNSIGNED_INT_2_10_10_10_REV = 0x8368;
-        public const int GL_LIGHT_MODEL_COLOR_CONTROL = 0x81F8;
-        public const int GL_SINGLE_COLOR = 0x81F9;
-        public const int GL_SEPARATE_SPECULAR_COLOR = 0x81FA;
-        public const int GL_TEXTURE_MIN_LOD = 0x813A;
-        public const int GL_TEXTURE_MAX_LOD = 0x813B;
-        public const int GL_TEXTURE_BASE_LEVEL = 0x813C;
-        public const int GL_TEXTURE_MAX_LEVEL = 0x813D;
-        public const int GL_SMOOTH_POINT_SIZE_RANGE = 0x0B12;
-        public const int GL_SMOOTH_POINT_SIZE_GRANULARITY = 0x0B13;
-        public const int GL_SMOOTH_LINE_WIDTH_RANGE = 0x0B22;
-        public const int GL_SMOOTH_LINE_WIDTH_GRANULARITY = 0x0B23;
-        public const int GL_ALIASED_POINT_SIZE_RANGE = 0x846D;
-        public const int GL_ALIASED_LINE_WIDTH_RANGE = 0x846E;
-        public const int GL_PACK_SKIP_IMAGES = 0x806B;
-        public const int GL_PACK_IMAGE_HEIGHT = 0x806C;
-        public const int GL_UNPACK_SKIP_IMAGES = 0x806D;
-        public const int GL_UNPACK_IMAGE_HEIGHT = 0x806E;
-        public const int GL_TEXTURE_3D = 0x806F;
-        public const int GL_PROXY_TEXTURE_3D = 0x8070;
-        public const int GL_TEXTURE_DEPTH = 0x8071;
-        public const int GL_TEXTURE_WRAP_R = 0x8072;
-        public const int GL_MAX_3D_TEXTURE_SIZE = 0x8073;
-        public const int GL_TEXTURE_BINDING_3D = 0x806A;
-        public const int GL_CONSTANT_COLOR = 0x8001;
-        public const int GL_ONE_MINUS_CONSTANT_COLOR = 0x8002;
-        public const int GL_CONSTANT_ALPHA = 0x8003;
-        public const int GL_ONE_MINUS_CONSTANT_ALPHA = 0x8004;
-        public const int GL_COLOR_TABLE = 0x80D0;
-        public const int GL_POST_CONVOLUTION_COLOR_TABLE = 0x80D1;
-        public const int GL_POST_COLOR_MATRIX_COLOR_TABLE = 0x80D2;
-        public const int GL_PROXY_COLOR_TABLE = 0x80D3;
-        public const int GL_PROXY_POST_CONVOLUTION_COLOR_TABLE = 0x80D4;
-        public const int GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE = 0x80D5;
-        public const int GL_COLOR_TABLE_SCALE = 0x80D6;
-        public const int GL_COLOR_TABLE_BIAS = 0x80D7;
-        public const int GL_COLOR_TABLE_FORMAT = 0x80D8;
-        public const int GL_COLOR_TABLE_WIDTH = 0x80D9;
-        public const int GL_COLOR_TABLE_RED_SIZE = 0x80DA;
-        public const int GL_COLOR_TABLE_GREEN_SIZE = 0x80DB;
-        public const int GL_COLOR_TABLE_BLUE_SIZE = 0x80DC;
-        public const int GL_COLOR_TABLE_ALPHA_SIZE = 0x80DD;
-        public const int GL_COLOR_TABLE_LUMINANCE_SIZE = 0x80DE;
-        public const int GL_COLOR_TABLE_INTENSITY_SIZE = 0x80DF;
-        public const int GL_CONVOLUTION_1D = 0x8010;
-        public const int GL_CONVOLUTION_2D = 0x8011;
-        public const int GL_SEPARABLE_2D = 0x8012;
-        public const int GL_CONVOLUTION_BORDER_MODE = 0x8013;
-        public const int GL_CONVOLUTION_FILTER_SCALE = 0x8014;
-        public const int GL_CONVOLUTION_FILTER_BIAS = 0x8015;
-        public const int GL_REDUCE = 0x8016;
-        public const int GL_CONVOLUTION_FORMAT = 0x8017;
-        public const int GL_CONVOLUTION_WIDTH = 0x8018;
-        public const int GL_CONVOLUTION_HEIGHT = 0x8019;
-        public const int GL_MAX_CONVOLUTION_WIDTH = 0x801A;
-        public const int GL_MAX_CONVOLUTION_HEIGHT = 0x801B;
-        public const int GL_POST_CONVOLUTION_RED_SCALE = 0x801C;
-        public const int GL_POST_CONVOLUTION_GREEN_SCALE = 0x801D;
-        public const int GL_POST_CONVOLUTION_BLUE_SCALE = 0x801E;
-        public const int GL_POST_CONVOLUTION_ALPHA_SCALE = 0x801F;
-        public const int GL_POST_CONVOLUTION_RED_BIAS = 0x8020;
-        public const int GL_POST_CONVOLUTION_GREEN_BIAS = 0x8021;
-        public const int GL_POST_CONVOLUTION_BLUE_BIAS = 0x8022;
-        public const int GL_POST_CONVOLUTION_ALPHA_BIAS = 0x8023;
-        public const int GL_CONSTANT_BORDER = 0x8151;
-        public const int GL_REPLICATE_BORDER = 0x8153;
-        public const int GL_CONVOLUTION_BORDER_COLOR = 0x8154;
-        public const int GL_COLOR_MATRIX = 0x80B1;
-        public const int GL_COLOR_MATRIX_STACK_DEPTH = 0x80B2;
-        public const int GL_MAX_COLOR_MATRIX_STACK_DEPTH = 0x80B3;
-        public const int GL_POST_COLOR_MATRIX_RED_SCALE = 0x80B4;
-        public const int GL_POST_COLOR_MATRIX_GREEN_SCALE = 0x80B5;
-        public const int GL_POST_COLOR_MATRIX_BLUE_SCALE = 0x80B6;
-        public const int GL_POST_COLOR_MATRIX_ALPHA_SCALE = 0x80B7;
-        public const int GL_POST_COLOR_MATRIX_RED_BIAS = 0x80B8;
-        public const int GL_POST_COLOR_MATRIX_GREEN_BIAS = 0x80B9;
-        public const int GL_POST_COLOR_MATRIX_BLUE_BIAS = 0x80BA;
-        public const int GL_POST_COLOR_MATRIX_ALPHA_BIAS = 0x80BB;
-        public const int GL_HISTOGRAM = 0x8024;
-        public const int GL_PROXY_HISTOGRAM = 0x8025;
-        public const int GL_HISTOGRAM_WIDTH = 0x8026;
-        public const int GL_HISTOGRAM_FORMAT = 0x8027;
-        public const int GL_HISTOGRAM_RED_SIZE = 0x8028;
-        public const int GL_HISTOGRAM_GREEN_SIZE = 0x8029;
-        public const int GL_HISTOGRAM_BLUE_SIZE = 0x802A;
-        public const int GL_HISTOGRAM_ALPHA_SIZE = 0x802B;
-        public const int GL_HISTOGRAM_LUMINANCE_SIZE = 0x802C;
-        public const int GL_HISTOGRAM_SINK = 0x802D;
-        public const int GL_MINMAX = 0x802E;
-        public const int GL_MINMAX_FORMAT = 0x802F;
-        public const int GL_MINMAX_SINK = 0x8030;
-        public const int GL_TABLE_TOO_LARGE = 0x8031;
-        public const int GL_BLEND_EQUATION = 0x8009;
-        public const int GL_MIN = 0x8007;
-        public const int GL_MAX = 0x8008;
-        public const int GL_FUNC_ADD = 0x8006;
-        public const int GL_FUNC_SUBTRACT = 0x800A;
-        public const int GL_FUNC_REVERSE_SUBTRACT = 0x800B;
-        public const int GL_BLEND_COLOR = 0x8005;
+//        public const int GL_RGB10_A2 = 0x8059;
+//        public const int GL_RGBA12 = 0x805A;
+//        public const int GL_RGBA16 = 0x805B;
+//        public const int GL_CLIENT_PIXEL_STORE_BIT = 0x00000001;
+//        public const int GL_CLIENT_VERTEX_ARRAY_BIT = 0x00000002;
+//        public const int GL_ALL_CLIENT_ATTRIB_BITS = -1;
+//        public const int GL_CLIENT_ALL_ATTRIB_BITS = -1;
+//        public const int GL_RESCALE_NORMAL = 0x803A;
+//        public const int GL_CLAMP_TO_EDGE = 0x812F;
+//        public const int GL_MAX_ELEMENTS_VERTICES = 0x80E8;
+//        public const int GL_MAX_ELEMENTS_INDICES = 0x80E9;
+//        public const int GL_BGR = 0x80E0;
+//        public const int GL_BGRA = 0x80E1;
+//        public const int GL_UNSIGNED_BYTE_3_3_2 = 0x8032;
+//        public const int GL_UNSIGNED_BYTE_2_3_3_REV = 0x8362;
+//        public const int GL_UNSIGNED_SHORT_5_6_5 = 0x8363;
+//        public const int GL_UNSIGNED_SHORT_5_6_5_REV = 0x8364;
+//        public const int GL_UNSIGNED_SHORT_4_4_4_4 = 0x8033;
+//        public const int GL_UNSIGNED_SHORT_4_4_4_4_REV = 0x8365;
+//        public const int GL_UNSIGNED_SHORT_5_5_5_1 = 0x8034;
+//        public const int GL_UNSIGNED_SHORT_1_5_5_5_REV = 0x8366;
+//        public const int GL_UNSIGNED_INT_8_8_8_8 = 0x8035;
+//        public const int GL_UNSIGNED_INT_8_8_8_8_REV = 0x8367;
+//        public const int GL_UNSIGNED_INT_10_10_10_2 = 0x8036;
+//        public const int GL_UNSIGNED_INT_2_10_10_10_REV = 0x8368;
+//        public const int GL_LIGHT_MODEL_COLOR_CONTROL = 0x81F8;
+//        public const int GL_SINGLE_COLOR = 0x81F9;
+//        public const int GL_SEPARATE_SPECULAR_COLOR = 0x81FA;
+//        public const int GL_TEXTURE_MIN_LOD = 0x813A;
+//        public const int GL_TEXTURE_MAX_LOD = 0x813B;
+//        public const int GL_TEXTURE_BASE_LEVEL = 0x813C;
+//        public const int GL_TEXTURE_MAX_LEVEL = 0x813D;
+//        public const int GL_SMOOTH_POINT_SIZE_RANGE = 0x0B12;
+//        public const int GL_SMOOTH_POINT_SIZE_GRANULARITY = 0x0B13;
+//        public const int GL_SMOOTH_LINE_WIDTH_RANGE = 0x0B22;
+//        public const int GL_SMOOTH_LINE_WIDTH_GRANULARITY = 0x0B23;
+//        public const int GL_ALIASED_POINT_SIZE_RANGE = 0x846D;
+//        public const int GL_ALIASED_LINE_WIDTH_RANGE = 0x846E;
+//        public const int GL_PACK_SKIP_IMAGES = 0x806B;
+//        public const int GL_PACK_IMAGE_HEIGHT = 0x806C;
+//        public const int GL_UNPACK_SKIP_IMAGES = 0x806D;
+//        public const int GL_UNPACK_IMAGE_HEIGHT = 0x806E;
+//        public const int GL_TEXTURE_3D = 0x806F;
+//        public const int GL_PROXY_TEXTURE_3D = 0x8070;
+//        public const int GL_TEXTURE_DEPTH = 0x8071;
+//        public const int GL_TEXTURE_WRAP_R = 0x8072;
+//        public const int GL_MAX_3D_TEXTURE_SIZE = 0x8073;
+//        public const int GL_TEXTURE_BINDING_3D = 0x806A;
+//        public const int GL_CONSTANT_COLOR = 0x8001;
+//        public const int GL_ONE_MINUS_CONSTANT_COLOR = 0x8002;
+//        public const int GL_CONSTANT_ALPHA = 0x8003;
+//        public const int GL_ONE_MINUS_CONSTANT_ALPHA = 0x8004;
+//        public const int GL_COLOR_TABLE = 0x80D0;
+//        public const int GL_POST_CONVOLUTION_COLOR_TABLE = 0x80D1;
+//        public const int GL_POST_COLOR_MATRIX_COLOR_TABLE = 0x80D2;
+//        public const int GL_PROXY_COLOR_TABLE = 0x80D3;
+//        public const int GL_PROXY_POST_CONVOLUTION_COLOR_TABLE = 0x80D4;
+//        public const int GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE = 0x80D5;
+//        public const int GL_COLOR_TABLE_SCALE = 0x80D6;
+//        public const int GL_COLOR_TABLE_BIAS = 0x80D7;
+//        public const int GL_COLOR_TABLE_FORMAT = 0x80D8;
+//        public const int GL_COLOR_TABLE_WIDTH = 0x80D9;
+//        public const int GL_COLOR_TABLE_RED_SIZE = 0x80DA;
+//        public const int GL_COLOR_TABLE_GREEN_SIZE = 0x80DB;
+//        public const int GL_COLOR_TABLE_BLUE_SIZE = 0x80DC;
+//        public const int GL_COLOR_TABLE_ALPHA_SIZE = 0x80DD;
+//        public const int GL_COLOR_TABLE_LUMINANCE_SIZE = 0x80DE;
+//        public const int GL_COLOR_TABLE_INTENSITY_SIZE = 0x80DF;
+//        public const int GL_CONVOLUTION_1D = 0x8010;
+//        public const int GL_CONVOLUTION_2D = 0x8011;
+//        public const int GL_SEPARABLE_2D = 0x8012;
+//        public const int GL_CONVOLUTION_BORDER_MODE = 0x8013;
+//        public const int GL_CONVOLUTION_FILTER_SCALE = 0x8014;
+//        public const int GL_CONVOLUTION_FILTER_BIAS = 0x8015;
+//        public const int GL_REDUCE = 0x8016;
+//        public const int GL_CONVOLUTION_FORMAT = 0x8017;
+//        public const int GL_CONVOLUTION_WIDTH = 0x8018;
+//        public const int GL_CONVOLUTION_HEIGHT = 0x8019;
+//        public const int GL_MAX_CONVOLUTION_WIDTH = 0x801A;
+//        public const int GL_MAX_CONVOLUTION_HEIGHT = 0x801B;
+//        public const int GL_POST_CONVOLUTION_RED_SCALE = 0x801C;
+//        public const int GL_POST_CONVOLUTION_GREEN_SCALE = 0x801D;
+//        public const int GL_POST_CONVOLUTION_BLUE_SCALE = 0x801E;
+//        public const int GL_POST_CONVOLUTION_ALPHA_SCALE = 0x801F;
+//        public const int GL_POST_CONVOLUTION_RED_BIAS = 0x8020;
+//        public const int GL_POST_CONVOLUTION_GREEN_BIAS = 0x8021;
+//        public const int GL_POST_CONVOLUTION_BLUE_BIAS = 0x8022;
+//        public const int GL_POST_CONVOLUTION_ALPHA_BIAS = 0x8023;
+//        public const int GL_CONSTANT_BORDER = 0x8151;
+//        public const int GL_REPLICATE_BORDER = 0x8153;
+//        public const int GL_CONVOLUTION_BORDER_COLOR = 0x8154;
+//        public const int GL_COLOR_MATRIX = 0x80B1;
+//        public const int GL_COLOR_MATRIX_STACK_DEPTH = 0x80B2;
+//        public const int GL_MAX_COLOR_MATRIX_STACK_DEPTH = 0x80B3;
+//        public const int GL_POST_COLOR_MATRIX_RED_SCALE = 0x80B4;
+//        public const int GL_POST_COLOR_MATRIX_GREEN_SCALE = 0x80B5;
+//        public const int GL_POST_COLOR_MATRIX_BLUE_SCALE = 0x80B6;
+//        public const int GL_POST_COLOR_MATRIX_ALPHA_SCALE = 0x80B7;
+//        public const int GL_POST_COLOR_MATRIX_RED_BIAS = 0x80B8;
+//        public const int GL_POST_COLOR_MATRIX_GREEN_BIAS = 0x80B9;
+//        public const int GL_POST_COLOR_MATRIX_BLUE_BIAS = 0x80BA;
+//        public const int GL_POST_COLOR_MATRIX_ALPHA_BIAS = 0x80BB;
+//        public const int GL_HISTOGRAM = 0x8024;
+//        public const int GL_PROXY_HISTOGRAM = 0x8025;
+//        public const int GL_HISTOGRAM_WIDTH = 0x8026;
+//        public const int GL_HISTOGRAM_FORMAT = 0x8027;
+//        public const int GL_HISTOGRAM_RED_SIZE = 0x8028;
+//        public const int GL_HISTOGRAM_GREEN_SIZE = 0x8029;
+//        public const int GL_HISTOGRAM_BLUE_SIZE = 0x802A;
+//        public const int GL_HISTOGRAM_ALPHA_SIZE = 0x802B;
+//        public const int GL_HISTOGRAM_LUMINANCE_SIZE = 0x802C;
+//        public const int GL_HISTOGRAM_SINK = 0x802D;
+//        public const int GL_MINMAX = 0x802E;
+//        public const int GL_MINMAX_FORMAT = 0x802F;
+//        public const int GL_MINMAX_SINK = 0x8030;
+//        public const int GL_TABLE_TOO_LARGE = 0x8031;
+//        public const int GL_BLEND_EQUATION = 0x8009;
+//        public const int GL_MIN = 0x8007;
+//        public const int GL_MAX = 0x8008;
+//        public const int GL_FUNC_ADD = 0x8006;
+//        public const int GL_FUNC_SUBTRACT = 0x800A;
+//        public const int GL_FUNC_REVERSE_SUBTRACT = 0x800B;
+//        public const int GL_BLEND_COLOR = 0x8005;
         public const int GL_TEXTURE0 = 0x84C0;
-        public const int GL_TEXTURE1 = 0x84C1;
-        public const int GL_TEXTURE2 = 0x84C2;
-        public const int GL_TEXTURE3 = 0x84C3;
-        public const int GL_TEXTURE4 = 0x84C4;
-        public const int GL_TEXTURE5 = 0x84C5;
-        public const int GL_TEXTURE6 = 0x84C6;
-        public const int GL_TEXTURE7 = 0x84C7;
-        public const int GL_TEXTURE8 = 0x84C8;
-        public const int GL_TEXTURE9 = 0x84C9;
-        public const int GL_TEXTURE10 = 0x84CA;
-        public const int GL_TEXTURE11 = 0x84CB;
-        public const int GL_TEXTURE12 = 0x84CC;
-        public const int GL_TEXTURE13 = 0x84CD;
-        public const int GL_TEXTURE14 = 0x84CE;
-        public const int GL_TEXTURE15 = 0x84CF;
-        public const int GL_TEXTURE16 = 0x84D0;
-        public const int GL_TEXTURE17 = 0x84D1;
-        public const int GL_TEXTURE18 = 0x84D2;
-        public const int GL_TEXTURE19 = 0x84D3;
-        public const int GL_TEXTURE20 = 0x84D4;
-        public const int GL_TEXTURE21 = 0x84D5;
-        public const int GL_TEXTURE22 = 0x84D6;
-        public const int GL_TEXTURE23 = 0x84D7;
-        public const int GL_TEXTURE24 = 0x84D8;
-        public const int GL_TEXTURE25 = 0x84D9;
-        public const int GL_TEXTURE26 = 0x84DA;
-        public const int GL_TEXTURE27 = 0x84DB;
-        public const int GL_TEXTURE28 = 0x84DC;
-        public const int GL_TEXTURE29 = 0x84DD;
-        public const int GL_TEXTURE30 = 0x84DE;
-        public const int GL_TEXTURE31 = 0x84DF;
+//        public const int GL_TEXTURE1 = 0x84C1;
+//        public const int GL_TEXTURE2 = 0x84C2;
+//        public const int GL_TEXTURE3 = 0x84C3;
+//        public const int GL_TEXTURE4 = 0x84C4;
+//        public const int GL_TEXTURE5 = 0x84C5;
+//        public const int GL_TEXTURE6 = 0x84C6;
+//        public const int GL_TEXTURE7 = 0x84C7;
+//        public const int GL_TEXTURE8 = 0x84C8;
+//        public const int GL_TEXTURE9 = 0x84C9;
+//        public const int GL_TEXTURE10 = 0x84CA;
+//        public const int GL_TEXTURE11 = 0x84CB;
+//        public const int GL_TEXTURE12 = 0x84CC;
+//        public const int GL_TEXTURE13 = 0x84CD;
+//        public const int GL_TEXTURE14 = 0x84CE;
+//        public const int GL_TEXTURE15 = 0x84CF;
+//        public const int GL_TEXTURE16 = 0x84D0;
+//        public const int GL_TEXTURE17 = 0x84D1;
+//        public const int GL_TEXTURE18 = 0x84D2;
+//        public const int GL_TEXTURE19 = 0x84D3;
+//        public const int GL_TEXTURE20 = 0x84D4;
+//        public const int GL_TEXTURE21 = 0x84D5;
+//        public const int GL_TEXTURE22 = 0x84D6;
+//        public const int GL_TEXTURE23 = 0x84D7;
+//        public const int GL_TEXTURE24 = 0x84D8;
+//        public const int GL_TEXTURE25 = 0x84D9;
+//        public const int GL_TEXTURE26 = 0x84DA;
+//        public const int GL_TEXTURE27 = 0x84DB;
+//        public const int GL_TEXTURE28 = 0x84DC;
+//        public const int GL_TEXTURE29 = 0x84DD;
+//        public const int GL_TEXTURE30 = 0x84DE;
+//        public const int GL_TEXTURE31 = 0x84DF;
         public const int GL_ACTIVE_TEXTURE = 0x84E0;
-        public const int GL_CLIENT_ACTIVE_TEXTURE = 0x84E1;
-        public const int GL_MAX_TEXTURE_UNITS = 0x84E2;
-        public const int GL_NORMAL_MAP = 0x8511;
-        public const int GL_REFLECTION_MAP = 0x8512;
-        public const int GL_TEXTURE_CUBE_MAP = 0x8513;
-        public const int GL_TEXTURE_BINDING_CUBE_MAP = 0x8514;
-        public const int GL_TEXTURE_CUBE_MAP_POSITIVE_X = 0x8515;
-        public const int GL_TEXTURE_CUBE_MAP_NEGATIVE_X = 0x8516;
-        public const int GL_TEXTURE_CUBE_MAP_POSITIVE_Y = 0x8517;
-        public const int GL_TEXTURE_CUBE_MAP_NEGATIVE_Y = 0x8518;
-        public const int GL_TEXTURE_CUBE_MAP_POSITIVE_Z = 0x8519;
-        public const int GL_TEXTURE_CUBE_MAP_NEGATIVE_Z = 0x851A;
-        public const int GL_PROXY_TEXTURE_CUBE_MAP = 0x851B;
-        public const int GL_MAX_CUBE_MAP_TEXTURE_SIZE = 0x851C;
-        public const int GL_COMPRESSED_ALPHA = 0x84E9;
-        public const int GL_COMPRESSED_LUMINANCE = 0x84EA;
-        public const int GL_COMPRESSED_LUMINANCE_ALPHA = 0x84EB;
-        public const int GL_COMPRESSED_INTENSITY = 0x84EC;
-        public const int GL_COMPRESSED_RGB = 0x84ED;
-        public const int GL_COMPRESSED_RGBA = 0x84EE;
-        public const int GL_TEXTURE_COMPRESSION_HINT = 0x84EF;
-        public const int GL_TEXTURE_COMPRESSED_IMAGE_SIZE = 0x86A0;
-        public const int GL_TEXTURE_COMPRESSED = 0x86A1;
-        public const int GL_NUM_COMPRESSED_TEXTURE_FORMATS = 0x86A2;
-        public const int GL_COMPRESSED_TEXTURE_FORMATS = 0x86A3;
-        public const int GL_MULTISAMPLE = 0x809D;
-        public const int GL_SAMPLE_ALPHA_TO_COVERAGE = 0x809E;
-        public const int GL_SAMPLE_ALPHA_TO_ONE = 0x809F;
-        public const int GL_SAMPLE_COVERAGE = 0x80A0;
-        public const int GL_SAMPLE_BUFFERS = 0x80A8;
+//        public const int GL_CLIENT_ACTIVE_TEXTURE = 0x84E1;
+//        public const int GL_MAX_TEXTURE_UNITS = 0x84E2;
+//        public const int GL_NORMAL_MAP = 0x8511;
+//        public const int GL_REFLECTION_MAP = 0x8512;
+//        public const int GL_TEXTURE_CUBE_MAP = 0x8513;
+//        public const int GL_TEXTURE_BINDING_CUBE_MAP = 0x8514;
+//        public const int GL_TEXTURE_CUBE_MAP_POSITIVE_X = 0x8515;
+//        public const int GL_TEXTURE_CUBE_MAP_NEGATIVE_X = 0x8516;
+//        public const int GL_TEXTURE_CUBE_MAP_POSITIVE_Y = 0x8517;
+//        public const int GL_TEXTURE_CUBE_MAP_NEGATIVE_Y = 0x8518;
+//        public const int GL_TEXTURE_CUBE_MAP_POSITIVE_Z = 0x8519;
+//        public const int GL_TEXTURE_CUBE_MAP_NEGATIVE_Z = 0x851A;
+//        public const int GL_PROXY_TEXTURE_CUBE_MAP = 0x851B;
+//        public const int GL_MAX_CUBE_MAP_TEXTURE_SIZE = 0x851C;
+//        public const int GL_COMPRESSED_ALPHA = 0x84E9;
+//        public const int GL_COMPRESSED_LUMINANCE = 0x84EA;
+//        public const int GL_COMPRESSED_LUMINANCE_ALPHA = 0x84EB;
+//        public const int GL_COMPRESSED_INTENSITY = 0x84EC;
+//        public const int GL_COMPRESSED_RGB = 0x84ED;
+//        public const int GL_COMPRESSED_RGBA = 0x84EE;
+//        public const int GL_TEXTURE_COMPRESSION_HINT = 0x84EF;
+//        public const int GL_TEXTURE_COMPRESSED_IMAGE_SIZE = 0x86A0;
+//        public const int GL_TEXTURE_COMPRESSED = 0x86A1;
+//        public const int GL_NUM_COMPRESSED_TEXTURE_FORMATS = 0x86A2;
+//        public const int GL_COMPRESSED_TEXTURE_FORMATS = 0x86A3;
+//        public const int GL_MULTISAMPLE = 0x809D;
+//        public const int GL_SAMPLE_ALPHA_TO_COVERAGE = 0x809E;
+//        public const int GL_SAMPLE_ALPHA_TO_ONE = 0x809F;
+//        public const int GL_SAMPLE_COVERAGE = 0x80A0;
+//        public const int GL_SAMPLE_BUFFERS = 0x80A8;
         public const int GL_SAMPLES = 0x80A9;
-        public const int GL_SAMPLE_COVERAGE_VALUE = 0x80AA;
-        public const int GL_SAMPLE_COVERAGE_INVERT = 0x80AB;
-        public const int GL_MULTISAMPLE_BIT = 0x20000000;
-        public const int GL_TRANSPOSE_MODELVIEW_MATRIX = 0x84E3;
-        public const int GL_TRANSPOSE_PROJECTION_MATRIX = 0x84E4;
-        public const int GL_TRANSPOSE_TEXTURE_MATRIX = 0x84E5;
-        public const int GL_TRANSPOSE_COLOR_MATRIX = 0x84E6;
-        public const int GL_COMBINE = 0x8570;
-        public const int GL_COMBINE_RGB = 0x8571;
-        public const int GL_COMBINE_ALPHA = 0x8572;
-        public const int GL_SOURCE0_RGB = 0x8580;
-        public const int GL_SOURCE1_RGB = 0x8581;
-        public const int GL_SOURCE2_RGB = 0x8582;
-        public const int GL_SOURCE0_ALPHA = 0x8588;
-        public const int GL_SOURCE1_ALPHA = 0x8589;
-        public const int GL_SOURCE2_ALPHA = 0x858A;
-        public const int GL_OPERAND0_RGB = 0x8590;
-        public const int GL_OPERAND1_RGB = 0x8591;
-        public const int GL_OPERAND2_RGB = 0x8592;
-        public const int GL_OPERAND0_ALPHA = 0x8598;
-        public const int GL_OPERAND1_ALPHA = 0x8599;
-        public const int GL_OPERAND2_ALPHA = 0x859A;
-        public const int GL_RGB_SCALE = 0x8573;
-        public const int GL_ADD_SIGNED = 0x8574;
-        public const int GL_INTERPOLATE = 0x8575;
-        public const int GL_SUBTRACT = 0x84E7;
-        public const int GL_CONSTANT = 0x8576;
-        public const int GL_PRIMARY_COLOR = 0x8577;
-        public const int GL_PREVIOUS = 0x8578;
-        public const int GL_DOT3_RGB = 0x86AE;
-        public const int GL_DOT3_RGBA = 0x86AF;
-        public const int GL_CLAMP_TO_BORDER = 0x812D;
-        public const int GL_TEXTURE0_ARB = 0x84C0;
-        public const int GL_TEXTURE1_ARB = 0x84C1;
-        public const int GL_TEXTURE2_ARB = 0x84C2;
-        public const int GL_TEXTURE3_ARB = 0x84C3;
-        public const int GL_TEXTURE4_ARB = 0x84C4;
-        public const int GL_TEXTURE5_ARB = 0x84C5;
-        public const int GL_TEXTURE6_ARB = 0x84C6;
-        public const int GL_TEXTURE7_ARB = 0x84C7;
-        public const int GL_TEXTURE8_ARB = 0x84C8;
-        public const int GL_TEXTURE9_ARB = 0x84C9;
-        public const int GL_TEXTURE10_ARB = 0x84CA;
-        public const int GL_TEXTURE11_ARB = 0x84CB;
-        public const int GL_TEXTURE12_ARB = 0x84CC;
-        public const int GL_TEXTURE13_ARB = 0x84CD;
-        public const int GL_TEXTURE14_ARB = 0x84CE;
-        public const int GL_TEXTURE15_ARB = 0x84CF;
-        public const int GL_TEXTURE16_ARB = 0x84D0;
-        public const int GL_TEXTURE17_ARB = 0x84D1;
-        public const int GL_TEXTURE18_ARB = 0x84D2;
-        public const int GL_TEXTURE19_ARB = 0x84D3;
-        public const int GL_TEXTURE20_ARB = 0x84D4;
-        public const int GL_TEXTURE21_ARB = 0x84D5;
-        public const int GL_TEXTURE22_ARB = 0x84D6;
-        public const int GL_TEXTURE23_ARB = 0x84D7;
-        public const int GL_TEXTURE24_ARB = 0x84D8;
-        public const int GL_TEXTURE25_ARB = 0x84D9;
-        public const int GL_TEXTURE26_ARB = 0x84DA;
-        public const int GL_TEXTURE27_ARB = 0x84DB;
-        public const int GL_TEXTURE28_ARB = 0x84DC;
-        public const int GL_TEXTURE29_ARB = 0x84DD;
-        public const int GL_TEXTURE30_ARB = 0x84DE;
-        public const int GL_TEXTURE31_ARB = 0x84DF;
-        public const int GL_ACTIVE_TEXTURE_ARB = 0x84E0;
-        public const int GL_CLIENT_ACTIVE_TEXTURE_ARB = 0x84E1;
-        public const int GL_MAX_TEXTURE_UNITS_ARB = 0x84E2;
-        public const int GL_DEPTH_STENCIL_MESA = 0x8750;
-        public const int GL_UNSIGNED_INT_24_8_MESA = 0x8751;
-        public const int GL_UNSIGNED_INT_8_24_REV_MESA = 0x8752;
-        public const int GL_UNSIGNED_SHORT_15_1_MESA = 0x8753;
-        public const int GL_UNSIGNED_SHORT_1_15_REV_MESA = 0x8754;
-        public const int GL_ALPHA_BLEND_EQUATION_ATI = 0x883D;
+//        public const int GL_SAMPLE_COVERAGE_VALUE = 0x80AA;
+//        public const int GL_SAMPLE_COVERAGE_INVERT = 0x80AB;
+//        public const int GL_MULTISAMPLE_BIT = 0x20000000;
+//        public const int GL_TRANSPOSE_MODELVIEW_MATRIX = 0x84E3;
+//        public const int GL_TRANSPOSE_PROJECTION_MATRIX = 0x84E4;
+//        public const int GL_TRANSPOSE_TEXTURE_MATRIX = 0x84E5;
+//        public const int GL_TRANSPOSE_COLOR_MATRIX = 0x84E6;
+//        public const int GL_COMBINE = 0x8570;
+//        public const int GL_COMBINE_RGB = 0x8571;
+//        public const int GL_COMBINE_ALPHA = 0x8572;
+//        public const int GL_SOURCE0_RGB = 0x8580;
+//        public const int GL_SOURCE1_RGB = 0x8581;
+//        public const int GL_SOURCE2_RGB = 0x8582;
+//        public const int GL_SOURCE0_ALPHA = 0x8588;
+//        public const int GL_SOURCE1_ALPHA = 0x8589;
+//        public const int GL_SOURCE2_ALPHA = 0x858A;
+//        public const int GL_OPERAND0_RGB = 0x8590;
+//        public const int GL_OPERAND1_RGB = 0x8591;
+//        public const int GL_OPERAND2_RGB = 0x8592;
+//        public const int GL_OPERAND0_ALPHA = 0x8598;
+//        public const int GL_OPERAND1_ALPHA = 0x8599;
+//        public const int GL_OPERAND2_ALPHA = 0x859A;
+//        public const int GL_RGB_SCALE = 0x8573;
+//        public const int GL_ADD_SIGNED = 0x8574;
+//        public const int GL_INTERPOLATE = 0x8575;
+//        public const int GL_SUBTRACT = 0x84E7;
+//        public const int GL_CONSTANT = 0x8576;
+//        public const int GL_PRIMARY_COLOR = 0x8577;
+//        public const int GL_PREVIOUS = 0x8578;
+//        public const int GL_DOT3_RGB = 0x86AE;
+//        public const int GL_DOT3_RGBA = 0x86AF;
+//        public const int GL_CLAMP_TO_BORDER = 0x812D;
+//        public const int GL_TEXTURE0_ARB = 0x84C0;
+//        public const int GL_TEXTURE1_ARB = 0x84C1;
+//        public const int GL_TEXTURE2_ARB = 0x84C2;
+//        public const int GL_TEXTURE3_ARB = 0x84C3;
+//        public const int GL_TEXTURE4_ARB = 0x84C4;
+//        public const int GL_TEXTURE5_ARB = 0x84C5;
+//        public const int GL_TEXTURE6_ARB = 0x84C6;
+//        public const int GL_TEXTURE7_ARB = 0x84C7;
+//        public const int GL_TEXTURE8_ARB = 0x84C8;
+//        public const int GL_TEXTURE9_ARB = 0x84C9;
+//        public const int GL_TEXTURE10_ARB = 0x84CA;
+//        public const int GL_TEXTURE11_ARB = 0x84CB;
+//        public const int GL_TEXTURE12_ARB = 0x84CC;
+//        public const int GL_TEXTURE13_ARB = 0x84CD;
+//        public const int GL_TEXTURE14_ARB = 0x84CE;
+//        public const int GL_TEXTURE15_ARB = 0x84CF;
+//        public const int GL_TEXTURE16_ARB = 0x84D0;
+//        public const int GL_TEXTURE17_ARB = 0x84D1;
+//        public const int GL_TEXTURE18_ARB = 0x84D2;
+//        public const int GL_TEXTURE19_ARB = 0x84D3;
+//        public const int GL_TEXTURE20_ARB = 0x84D4;
+//        public const int GL_TEXTURE21_ARB = 0x84D5;
+//        public const int GL_TEXTURE22_ARB = 0x84D6;
+//        public const int GL_TEXTURE23_ARB = 0x84D7;
+//        public const int GL_TEXTURE24_ARB = 0x84D8;
+//        public const int GL_TEXTURE25_ARB = 0x84D9;
+//        public const int GL_TEXTURE26_ARB = 0x84DA;
+//        public const int GL_TEXTURE27_ARB = 0x84DB;
+//        public const int GL_TEXTURE28_ARB = 0x84DC;
+//        public const int GL_TEXTURE29_ARB = 0x84DD;
+//        public const int GL_TEXTURE30_ARB = 0x84DE;
+//        public const int GL_TEXTURE31_ARB = 0x84DF;
+//        public const int GL_ACTIVE_TEXTURE_ARB = 0x84E0;
+//        public const int GL_CLIENT_ACTIVE_TEXTURE_ARB = 0x84E1;
+//        public const int GL_MAX_TEXTURE_UNITS_ARB = 0x84E2;
+//        public const int GL_DEPTH_STENCIL_MESA = 0x8750;
+//        public const int GL_UNSIGNED_INT_24_8_MESA = 0x8751;
+//        public const int GL_UNSIGNED_INT_8_24_REV_MESA = 0x8752;
+//        public const int GL_UNSIGNED_SHORT_15_1_MESA = 0x8753;
+//        public const int GL_UNSIGNED_SHORT_1_15_REV_MESA = 0x8754;
+//        public const int GL_ALPHA_BLEND_EQUATION_ATI = 0x883D;
 
         
         // glext.h
-        public const int GL_BLEND_DST_RGB = 0x80C8;
-        public const int GL_BLEND_SRC_RGB = 0x80C9;
-        public const int GL_BLEND_DST_ALPHA = 0x80CA;
-        public const int GL_BLEND_SRC_ALPHA = 0x80CB;
-        public const int GL_POINT_FADE_THRESHOLD_SIZE = 0x8128;
+//        public const int GL_BLEND_DST_RGB = 0x80C8;
+//        public const int GL_BLEND_SRC_RGB = 0x80C9;
+//        public const int GL_BLEND_DST_ALPHA = 0x80CA;
+//        public const int GL_BLEND_SRC_ALPHA = 0x80CB;
+//        public const int GL_POINT_FADE_THRESHOLD_SIZE = 0x8128;
         public const int GL_DEPTH_COMPONENT16 = 0x81A5;
-        public const int GL_DEPTH_COMPONENT24 = 0x81A6;
-        public const int GL_DEPTH_COMPONENT32 = 0x81A7;
-        public const int GL_MIRRORED_REPEAT = 0x8370;
-        public const int GL_MAX_TEXTURE_LOD_BIAS = 0x84FD;
-        public const int GL_TEXTURE_LOD_BIAS = 0x8501;
-        public const int GL_INCR_WRAP = 0x8507;
-        public const int GL_DECR_WRAP = 0x8508;
-        public const int GL_TEXTURE_DEPTH_SIZE = 0x884A;
-        public const int GL_TEXTURE_COMPARE_MODE = 0x884C;
-        public const int GL_TEXTURE_COMPARE_FUNC = 0x884D;
-        public const int GL_POINT_SIZE_MIN = 0x8126;
-        public const int GL_POINT_SIZE_MAX = 0x8127;
-        public const int GL_POINT_DISTANCE_ATTENUATION = 0x8129;
-        public const int GL_GENERATE_MIPMAP = 0x8191;
-        public const int GL_GENERATE_MIPMAP_HINT = 0x8192;
-        public const int GL_FOG_COORDINATE_SOURCE = 0x8450;
-        public const int GL_FOG_COORDINATE = 0x8451;
-        public const int GL_FRAGMENT_DEPTH = 0x8452;
-        public const int GL_CURRENT_FOG_COORDINATE = 0x8453;
-        public const int GL_FOG_COORDINATE_ARRAY_TYPE = 0x8454;
-        public const int GL_FOG_COORDINATE_ARRAY_STRIDE = 0x8455;
-        public const int GL_FOG_COORDINATE_ARRAY_POINTER = 0x8456;
-        public const int GL_FOG_COORDINATE_ARRAY = 0x8457;
-        public const int GL_COLOR_SUM = 0x8458;
-        public const int GL_CURRENT_SECONDARY_COLOR = 0x8459;
-        public const int GL_SECONDARY_COLOR_ARRAY_SIZE = 0x845A;
-        public const int GL_SECONDARY_COLOR_ARRAY_TYPE = 0x845B;
-        public const int GL_SECONDARY_COLOR_ARRAY_STRIDE = 0x845C;
-        public const int GL_SECONDARY_COLOR_ARRAY_POINTER = 0x845D;
-        public const int GL_SECONDARY_COLOR_ARRAY = 0x845E;
-        public const int GL_TEXTURE_FILTER_CONTROL = 0x8500;
-        public const int GL_DEPTH_TEXTURE_MODE = 0x884B;
-        public const int GL_COMPARE_R_TO_TEXTURE = 0x884E;
-        public const int GL_BUFFER_SIZE = 0x8764;
-        public const int GL_BUFFER_USAGE = 0x8765;
-        public const int GL_QUERY_COUNTER_BITS = 0x8864;
-        public const int GL_CURRENT_QUERY = 0x8865;
-        public const int GL_QUERY_RESULT = 0x8866;
-        public const int GL_QUERY_RESULT_AVAILABLE = 0x8867;
+//        public const int GL_DEPTH_COMPONENT24 = 0x81A6;
+//        public const int GL_DEPTH_COMPONENT32 = 0x81A7;
+//        public const int GL_MIRRORED_REPEAT = 0x8370;
+//        public const int GL_MAX_TEXTURE_LOD_BIAS = 0x84FD;
+//        public const int GL_TEXTURE_LOD_BIAS = 0x8501;
+//        public const int GL_INCR_WRAP = 0x8507;
+//        public const int GL_DECR_WRAP = 0x8508;
+//        public const int GL_TEXTURE_DEPTH_SIZE = 0x884A;
+//        public const int GL_TEXTURE_COMPARE_MODE = 0x884C;
+//        public const int GL_TEXTURE_COMPARE_FUNC = 0x884D;
+//        public const int GL_POINT_SIZE_MIN = 0x8126;
+//        public const int GL_POINT_SIZE_MAX = 0x8127;
+//        public const int GL_POINT_DISTANCE_ATTENUATION = 0x8129;
+//        public const int GL_GENERATE_MIPMAP = 0x8191;
+//        public const int GL_GENERATE_MIPMAP_HINT = 0x8192;
+//        public const int GL_FOG_COORDINATE_SOURCE = 0x8450;
+//        public const int GL_FOG_COORDINATE = 0x8451;
+//        public const int GL_FRAGMENT_DEPTH = 0x8452;
+//        public const int GL_CURRENT_FOG_COORDINATE = 0x8453;
+//        public const int GL_FOG_COORDINATE_ARRAY_TYPE = 0x8454;
+//        public const int GL_FOG_COORDINATE_ARRAY_STRIDE = 0x8455;
+//        public const int GL_FOG_COORDINATE_ARRAY_POINTER = 0x8456;
+//        public const int GL_FOG_COORDINATE_ARRAY = 0x8457;
+//        public const int GL_COLOR_SUM = 0x8458;
+//        public const int GL_CURRENT_SECONDARY_COLOR = 0x8459;
+//        public const int GL_SECONDARY_COLOR_ARRAY_SIZE = 0x845A;
+//        public const int GL_SECONDARY_COLOR_ARRAY_TYPE = 0x845B;
+//        public const int GL_SECONDARY_COLOR_ARRAY_STRIDE = 0x845C;
+//        public const int GL_SECONDARY_COLOR_ARRAY_POINTER = 0x845D;
+//        public const int GL_SECONDARY_COLOR_ARRAY = 0x845E;
+//        public const int GL_TEXTURE_FILTER_CONTROL = 0x8500;
+//        public const int GL_DEPTH_TEXTURE_MODE = 0x884B;
+//        public const int GL_COMPARE_R_TO_TEXTURE = 0x884E;
+//        public const int GL_BUFFER_SIZE = 0x8764;
+//        public const int GL_BUFFER_USAGE = 0x8765;
+//        public const int GL_QUERY_COUNTER_BITS = 0x8864;
+//        public const int GL_CURRENT_QUERY = 0x8865;
+//        public const int GL_QUERY_RESULT = 0x8866;
+//        public const int GL_QUERY_RESULT_AVAILABLE = 0x8867;
         public const int GL_ARRAY_BUFFER = 0x8892;
         public const int GL_ELEMENT_ARRAY_BUFFER = 0x8893;
-        public const int GL_ARRAY_BUFFER_BINDING = 0x8894;
-        public const int GL_ELEMENT_ARRAY_BUFFER_BINDING = 0x8895;
-        public const int GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING = 0x889F;
-        public const int GL_READ_ONLY = 0x88B8;
-        public const int GL_WRITE_ONLY = 0x88B9;
-        public const int GL_READ_WRITE = 0x88BA;
-        public const int GL_BUFFER_ACCESS = 0x88BB;
-        public const int GL_BUFFER_MAPPED = 0x88BC;
-        public const int GL_BUFFER_MAP_POINTER = 0x88BD;
-        public const int GL_STREAM_DRAW = 0x88E0;
-        public const int GL_STREAM_READ = 0x88E1;
-        public const int GL_STREAM_COPY = 0x88E2;
+//        public const int GL_ARRAY_BUFFER_BINDING = 0x8894;
+//        public const int GL_ELEMENT_ARRAY_BUFFER_BINDING = 0x8895;
+//        public const int GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING = 0x889F;
+//        public const int GL_READ_ONLY = 0x88B8;
+//        public const int GL_WRITE_ONLY = 0x88B9;
+//        public const int GL_READ_WRITE = 0x88BA;
+//        public const int GL_BUFFER_ACCESS = 0x88BB;
+//        public const int GL_BUFFER_MAPPED = 0x88BC;
+//        public const int GL_BUFFER_MAP_POINTER = 0x88BD;
+//        public const int GL_STREAM_DRAW = 0x88E0;
+//        public const int GL_STREAM_READ = 0x88E1;
+//        public const int GL_STREAM_COPY = 0x88E2;
         public const int GL_STATIC_DRAW = 0x88E4;
-        public const int GL_STATIC_READ = 0x88E5;
-        public const int GL_STATIC_COPY = 0x88E6;
-        public const int GL_DYNAMIC_DRAW = 0x88E8;
-        public const int GL_DYNAMIC_READ = 0x88E9;
-        public const int GL_DYNAMIC_COPY = 0x88EA;
-        public const int GL_SAMPLES_PASSED = 0x8914;
-        public const int GL_SRC1_ALPHA = 0x8589;
-        public const int GL_VERTEX_ARRAY_BUFFER_BINDING = 0x8896;
-        public const int GL_NORMAL_ARRAY_BUFFER_BINDING = 0x8897;
-        public const int GL_COLOR_ARRAY_BUFFER_BINDING = 0x8898;
-        public const int GL_INDEX_ARRAY_BUFFER_BINDING = 0x8899;
-        public const int GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING = 0x889A;
-        public const int GL_EDGE_FLAG_ARRAY_BUFFER_BINDING = 0x889B;
-        public const int GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING = 0x889C;
-        public const int GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING = 0x889D;
-        public const int GL_WEIGHT_ARRAY_BUFFER_BINDING = 0x889E;
-        public const int GL_FOG_COORD_SRC = 0x8450;
-        public const int GL_FOG_COORD = 0x8451;
-        public const int GL_CURRENT_FOG_COORD = 0x8453;
-        public const int GL_FOG_COORD_ARRAY_TYPE = 0x8454;
-        public const int GL_FOG_COORD_ARRAY_STRIDE = 0x8455;
-        public const int GL_FOG_COORD_ARRAY_POINTER = 0x8456;
-        public const int GL_FOG_COORD_ARRAY = 0x8457;
-        public const int GL_FOG_COORD_ARRAY_BUFFER_BINDING = 0x889D;
-        public const int GL_SRC0_RGB = 0x8580;
-        public const int GL_SRC1_RGB = 0x8581;
-        public const int GL_SRC2_RGB = 0x8582;
-        public const int GL_SRC0_ALPHA = 0x8588;
-        public const int GL_SRC2_ALPHA = 0x858A;
-        public const int GL_BLEND_EQUATION_RGB = 0x8009;
-        public const int GL_VERTEX_ATTRIB_ARRAY_ENABLED = 0x8622;
-        public const int GL_VERTEX_ATTRIB_ARRAY_SIZE = 0x8623;
-        public const int GL_VERTEX_ATTRIB_ARRAY_STRIDE = 0x8624;
-        public const int GL_VERTEX_ATTRIB_ARRAY_TYPE = 0x8625;
-        public const int GL_CURRENT_VERTEX_ATTRIB = 0x8626;
-        public const int GL_VERTEX_PROGRAM_POINT_SIZE = 0x8642;
-        public const int GL_VERTEX_ATTRIB_ARRAY_POINTER = 0x8645;
-        public const int GL_STENCIL_BACK_FUNC = 0x8800;
-        public const int GL_STENCIL_BACK_FAIL = 0x8801;
-        public const int GL_STENCIL_BACK_PASS_DEPTH_FAIL = 0x8802;
-        public const int GL_STENCIL_BACK_PASS_DEPTH_PASS = 0x8803;
-        public const int GL_MAX_DRAW_BUFFERS = 0x8824;
-        public const int GL_DRAW_BUFFER0 = 0x8825;
-        public const int GL_DRAW_BUFFER1 = 0x8826;
-        public const int GL_DRAW_BUFFER2 = 0x8827;
-        public const int GL_DRAW_BUFFER3 = 0x8828;
-        public const int GL_DRAW_BUFFER4 = 0x8829;
-        public const int GL_DRAW_BUFFER5 = 0x882A;
-        public const int GL_DRAW_BUFFER6 = 0x882B;
-        public const int GL_DRAW_BUFFER7 = 0x882C;
-        public const int GL_DRAW_BUFFER8 = 0x882D;
-        public const int GL_DRAW_BUFFER9 = 0x882E;
-        public const int GL_DRAW_BUFFER10 = 0x882F;
-        public const int GL_DRAW_BUFFER11 = 0x8830;
-        public const int GL_DRAW_BUFFER12 = 0x8831;
-        public const int GL_DRAW_BUFFER13 = 0x8832;
-        public const int GL_DRAW_BUFFER14 = 0x8833;
-        public const int GL_DRAW_BUFFER15 = 0x8834;
-        public const int GL_BLEND_EQUATION_ALPHA = 0x883D;
-        public const int GL_MAX_VERTEX_ATTRIBS = 0x8869;
-        public const int GL_VERTEX_ATTRIB_ARRAY_NORMALIZED = 0x886A;
-        public const int GL_MAX_TEXTURE_IMAGE_UNITS = 0x8872;
+//        public const int GL_STATIC_READ = 0x88E5;
+//        public const int GL_STATIC_COPY = 0x88E6;
+//        public const int GL_DYNAMIC_DRAW = 0x88E8;
+//        public const int GL_DYNAMIC_READ = 0x88E9;
+//        public const int GL_DYNAMIC_COPY = 0x88EA;
+//        public const int GL_SAMPLES_PASSED = 0x8914;
+//        public const int GL_SRC1_ALPHA = 0x8589;
+//        public const int GL_VERTEX_ARRAY_BUFFER_BINDING = 0x8896;
+//        public const int GL_NORMAL_ARRAY_BUFFER_BINDING = 0x8897;
+//        public const int GL_COLOR_ARRAY_BUFFER_BINDING = 0x8898;
+//        public const int GL_INDEX_ARRAY_BUFFER_BINDING = 0x8899;
+//        public const int GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING = 0x889A;
+//        public const int GL_EDGE_FLAG_ARRAY_BUFFER_BINDING = 0x889B;
+//        public const int GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING = 0x889C;
+//        public const int GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING = 0x889D;
+//        public const int GL_WEIGHT_ARRAY_BUFFER_BINDING = 0x889E;
+//        public const int GL_FOG_COORD_SRC = 0x8450;
+//        public const int GL_FOG_COORD = 0x8451;
+//        public const int GL_CURRENT_FOG_COORD = 0x8453;
+//        public const int GL_FOG_COORD_ARRAY_TYPE = 0x8454;
+//        public const int GL_FOG_COORD_ARRAY_STRIDE = 0x8455;
+//        public const int GL_FOG_COORD_ARRAY_POINTER = 0x8456;
+//        public const int GL_FOG_COORD_ARRAY = 0x8457;
+//        public const int GL_FOG_COORD_ARRAY_BUFFER_BINDING = 0x889D;
+//        public const int GL_SRC0_RGB = 0x8580;
+//        public const int GL_SRC1_RGB = 0x8581;
+//        public const int GL_SRC2_RGB = 0x8582;
+//        public const int GL_SRC0_ALPHA = 0x8588;
+//        public const int GL_SRC2_ALPHA = 0x858A;
+//        public const int GL_BLEND_EQUATION_RGB = 0x8009;
+//        public const int GL_VERTEX_ATTRIB_ARRAY_ENABLED = 0x8622;
+//        public const int GL_VERTEX_ATTRIB_ARRAY_SIZE = 0x8623;
+//        public const int GL_VERTEX_ATTRIB_ARRAY_STRIDE = 0x8624;
+//        public const int GL_VERTEX_ATTRIB_ARRAY_TYPE = 0x8625;
+//        public const int GL_CURRENT_VERTEX_ATTRIB = 0x8626;
+//        public const int GL_VERTEX_PROGRAM_POINT_SIZE = 0x8642;
+//        public const int GL_VERTEX_ATTRIB_ARRAY_POINTER = 0x8645;
+//        public const int GL_STENCIL_BACK_FUNC = 0x8800;
+//        public const int GL_STENCIL_BACK_FAIL = 0x8801;
+//        public const int GL_STENCIL_BACK_PASS_DEPTH_FAIL = 0x8802;
+//        public const int GL_STENCIL_BACK_PASS_DEPTH_PASS = 0x8803;
+//        public const int GL_MAX_DRAW_BUFFERS = 0x8824;
+//        public const int GL_DRAW_BUFFER0 = 0x8825;
+//        public const int GL_DRAW_BUFFER1 = 0x8826;
+//        public const int GL_DRAW_BUFFER2 = 0x8827;
+//        public const int GL_DRAW_BUFFER3 = 0x8828;
+//        public const int GL_DRAW_BUFFER4 = 0x8829;
+//        public const int GL_DRAW_BUFFER5 = 0x882A;
+//        public const int GL_DRAW_BUFFER6 = 0x882B;
+//        public const int GL_DRAW_BUFFER7 = 0x882C;
+//        public const int GL_DRAW_BUFFER8 = 0x882D;
+//        public const int GL_DRAW_BUFFER9 = 0x882E;
+//        public const int GL_DRAW_BUFFER10 = 0x882F;
+//        public const int GL_DRAW_BUFFER11 = 0x8830;
+//        public const int GL_DRAW_BUFFER12 = 0x8831;
+//        public const int GL_DRAW_BUFFER13 = 0x8832;
+//        public const int GL_DRAW_BUFFER14 = 0x8833;
+//        public const int GL_DRAW_BUFFER15 = 0x8834;
+//        public const int GL_BLEND_EQUATION_ALPHA = 0x883D;
+//        public const int GL_MAX_VERTEX_ATTRIBS = 0x8869;
+//        public const int GL_VERTEX_ATTRIB_ARRAY_NORMALIZED = 0x886A;
+//        public const int GL_MAX_TEXTURE_IMAGE_UNITS = 0x8872;
         public const int GL_FRAGMENT_SHADER = 0x8B30;
         public const int GL_VERTEX_SHADER = 0x8B31;
-        public const int GL_MAX_FRAGMENT_UNIFORM_COMPONENTS = 0x8B49;
-        public const int GL_MAX_VERTEX_UNIFORM_COMPONENTS = 0x8B4A;
-        public const int GL_MAX_VARYING_FLOATS = 0x8B4B;
-        public const int GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS = 0x8B4C;
-        public const int GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS = 0x8B4D;
-        public const int GL_SHADER_TYPE = 0x8B4F;
-        public const int GL_FLOAT_VEC2 = 0x8B50;
-        public const int GL_FLOAT_VEC3 = 0x8B51;
-        public const int GL_FLOAT_VEC4 = 0x8B52;
-        public const int GL_INT_VEC2 = 0x8B53;
-        public const int GL_INT_VEC3 = 0x8B54;
-        public const int GL_INT_VEC4 = 0x8B55;
-        public const int GL_BOOL = 0x8B56;
-        public const int GL_BOOL_VEC2 = 0x8B57;
-        public const int GL_BOOL_VEC3 = 0x8B58;
-        public const int GL_BOOL_VEC4 = 0x8B59;
-        public const int GL_FLOAT_MAT2 = 0x8B5A;
-        public const int GL_FLOAT_MAT3 = 0x8B5B;
-        public const int GL_FLOAT_MAT4 = 0x8B5C;
-        public const int GL_SAMPLER_1D = 0x8B5D;
-        public const int GL_SAMPLER_2D = 0x8B5E;
-        public const int GL_SAMPLER_3D = 0x8B5F;
-        public const int GL_SAMPLER_CUBE = 0x8B60;
-        public const int GL_SAMPLER_1D_SHADOW = 0x8B61;
-        public const int GL_SAMPLER_2D_SHADOW = 0x8B62;
-        public const int GL_DELETE_STATUS = 0x8B80;
+//        public const int GL_MAX_FRAGMENT_UNIFORM_COMPONENTS = 0x8B49;
+//        public const int GL_MAX_VERTEX_UNIFORM_COMPONENTS = 0x8B4A;
+//        public const int GL_MAX_VARYING_FLOATS = 0x8B4B;
+//        public const int GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS = 0x8B4C;
+//        public const int GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS = 0x8B4D;
+//        public const int GL_SHADER_TYPE = 0x8B4F;
+//        public const int GL_FLOAT_VEC2 = 0x8B50;
+//        public const int GL_FLOAT_VEC3 = 0x8B51;
+//        public const int GL_FLOAT_VEC4 = 0x8B52;
+//        public const int GL_INT_VEC2 = 0x8B53;
+//        public const int GL_INT_VEC3 = 0x8B54;
+//        public const int GL_INT_VEC4 = 0x8B55;
+//        public const int GL_BOOL = 0x8B56;
+//        public const int GL_BOOL_VEC2 = 0x8B57;
+//        public const int GL_BOOL_VEC3 = 0x8B58;
+//        public const int GL_BOOL_VEC4 = 0x8B59;
+//        public const int GL_FLOAT_MAT2 = 0x8B5A;
+//        public const int GL_FLOAT_MAT3 = 0x8B5B;
+//        public const int GL_FLOAT_MAT4 = 0x8B5C;
+//        public const int GL_SAMPLER_1D = 0x8B5D;
+//        public const int GL_SAMPLER_2D = 0x8B5E;
+//        public const int GL_SAMPLER_3D = 0x8B5F;
+//        public const int GL_SAMPLER_CUBE = 0x8B60;
+//        public const int GL_SAMPLER_1D_SHADOW = 0x8B61;
+//        public const int GL_SAMPLER_2D_SHADOW = 0x8B62;
+//        public const int GL_DELETE_STATUS = 0x8B80;
         public const int GL_COMPILE_STATUS = 0x8B81;
         public const int GL_LINK_STATUS = 0x8B82;
-        public const int GL_VALIDATE_STATUS = 0x8B83;
+//        public const int GL_VALIDATE_STATUS = 0x8B83;
         public const int GL_INFO_LOG_LENGTH = 0x8B84;
-        public const int GL_ATTACHED_SHADERS = 0x8B85;
-        public const int GL_ACTIVE_UNIFORMS = 0x8B86;
-        public const int GL_ACTIVE_UNIFORM_MAX_LENGTH = 0x8B87;
-        public const int GL_SHADER_SOURCE_LENGTH = 0x8B88;
-        public const int GL_ACTIVE_ATTRIBUTES = 0x8B89;
-        public const int GL_ACTIVE_ATTRIBUTE_MAX_LENGTH = 0x8B8A;
-        public const int GL_FRAGMENT_SHADER_DERIVATIVE_HINT = 0x8B8B;
-        public const int GL_SHADING_LANGUAGE_VERSION = 0x8B8C;
-        public const int GL_CURRENT_PROGRAM = 0x8B8D;
-        public const int GL_POINT_SPRITE_COORD_ORIGIN = 0x8CA0;
-        public const int GL_LOWER_LEFT = 0x8CA1;
-        public const int GL_UPPER_LEFT = 0x8CA2;
-        public const int GL_STENCIL_BACK_REF = 0x8CA3;
-        public const int GL_STENCIL_BACK_VALUE_MASK = 0x8CA4;
-        public const int GL_STENCIL_BACK_WRITEMASK = 0x8CA5;
-        public const int GL_VERTEX_PROGRAM_TWO_SIDE = 0x8643;
-        public const int GL_POINT_SPRITE = 0x8861;
-        public const int GL_COORD_REPLACE = 0x8862;
-        public const int GL_MAX_TEXTURE_COORDS = 0x8871;
-        public const int GL_VERSION_2_1 = 1;
-        public const int GL_PIXEL_PACK_BUFFER = 0x88EB;
-        public const int GL_PIXEL_UNPACK_BUFFER = 0x88EC;
-        public const int GL_PIXEL_PACK_BUFFER_BINDING = 0x88ED;
-        public const int GL_PIXEL_UNPACK_BUFFER_BINDING = 0x88EF;
-        public const int GL_FLOAT_MAT2x3 = 0x8B65;
-        public const int GL_FLOAT_MAT2x4 = 0x8B66;
-        public const int GL_FLOAT_MAT3x2 = 0x8B67;
-        public const int GL_FLOAT_MAT3x4 = 0x8B68;
-        public const int GL_FLOAT_MAT4x2 = 0x8B69;
-        public const int GL_FLOAT_MAT4x3 = 0x8B6A;
-        public const int GL_SRGB = 0x8C40;
-        public const int GL_SRGB8 = 0x8C41;
-        public const int GL_SRGB_ALPHA = 0x8C42;
-        public const int GL_SRGB8_ALPHA8 = 0x8C43;
-        public const int GL_COMPRESSED_SRGB = 0x8C48;
-        public const int GL_COMPRESSED_SRGB_ALPHA = 0x8C49;
-        public const int GL_CURRENT_RASTER_SECONDARY_COLOR = 0x845F;
-        public const int GL_SLUMINANCE_ALPHA = 0x8C44;
-        public const int GL_SLUMINANCE8_ALPHA8 = 0x8C45;
-        public const int GL_SLUMINANCE = 0x8C46;
-        public const int GL_SLUMINANCE8 = 0x8C47;
-        public const int GL_COMPRESSED_SLUMINANCE = 0x8C4A;
-        public const int GL_COMPRESSED_SLUMINANCE_ALPHA = 0x8C4B;
-        public const int GL_VERSION_3_0 = 1;
-        public const int GL_COMPARE_REF_TO_TEXTURE = 0x884E;
-        public const int GL_CLIP_DISTANCE0 = 0x3000;
-        public const int GL_CLIP_DISTANCE1 = 0x3001;
-        public const int GL_CLIP_DISTANCE2 = 0x3002;
-        public const int GL_CLIP_DISTANCE3 = 0x3003;
-        public const int GL_CLIP_DISTANCE4 = 0x3004;
-        public const int GL_CLIP_DISTANCE5 = 0x3005;
-        public const int GL_CLIP_DISTANCE6 = 0x3006;
-        public const int GL_CLIP_DISTANCE7 = 0x3007;
-        public const int GL_MAX_CLIP_DISTANCES = 0x0D32;
+//        public const int GL_ATTACHED_SHADERS = 0x8B85;
+//        public const int GL_ACTIVE_UNIFORMS = 0x8B86;
+//        public const int GL_ACTIVE_UNIFORM_MAX_LENGTH = 0x8B87;
+//        public const int GL_SHADER_SOURCE_LENGTH = 0x8B88;
+//        public const int GL_ACTIVE_ATTRIBUTES = 0x8B89;
+//        public const int GL_ACTIVE_ATTRIBUTE_MAX_LENGTH = 0x8B8A;
+//        public const int GL_FRAGMENT_SHADER_DERIVATIVE_HINT = 0x8B8B;
+//        public const int GL_SHADING_LANGUAGE_VERSION = 0x8B8C;
+//        public const int GL_CURRENT_PROGRAM = 0x8B8D;
+//        public const int GL_POINT_SPRITE_COORD_ORIGIN = 0x8CA0;
+//        public const int GL_LOWER_LEFT = 0x8CA1;
+//        public const int GL_UPPER_LEFT = 0x8CA2;
+//        public const int GL_STENCIL_BACK_REF = 0x8CA3;
+//        public const int GL_STENCIL_BACK_VALUE_MASK = 0x8CA4;
+//        public const int GL_STENCIL_BACK_WRITEMASK = 0x8CA5;
+//        public const int GL_VERTEX_PROGRAM_TWO_SIDE = 0x8643;
+//        public const int GL_POINT_SPRITE = 0x8861;
+//        public const int GL_COORD_REPLACE = 0x8862;
+//        public const int GL_MAX_TEXTURE_COORDS = 0x8871;
+//        public const int GL_VERSION_2_1 = 1;
+//        public const int GL_PIXEL_PACK_BUFFER = 0x88EB;
+//        public const int GL_PIXEL_UNPACK_BUFFER = 0x88EC;
+//        public const int GL_PIXEL_PACK_BUFFER_BINDING = 0x88ED;
+//        public const int GL_PIXEL_UNPACK_BUFFER_BINDING = 0x88EF;
+//        public const int GL_FLOAT_MAT2x3 = 0x8B65;
+//        public const int GL_FLOAT_MAT2x4 = 0x8B66;
+//        public const int GL_FLOAT_MAT3x2 = 0x8B67;
+//        public const int GL_FLOAT_MAT3x4 = 0x8B68;
+//        public const int GL_FLOAT_MAT4x2 = 0x8B69;
+//        public const int GL_FLOAT_MAT4x3 = 0x8B6A;
+//        public const int GL_SRGB = 0x8C40;
+//        public const int GL_SRGB8 = 0x8C41;
+//        public const int GL_SRGB_ALPHA = 0x8C42;
+//        public const int GL_SRGB8_ALPHA8 = 0x8C43;
+//        public const int GL_COMPRESSED_SRGB = 0x8C48;
+//        public const int GL_COMPRESSED_SRGB_ALPHA = 0x8C49;
+//        public const int GL_CURRENT_RASTER_SECONDARY_COLOR = 0x845F;
+//        public const int GL_SLUMINANCE_ALPHA = 0x8C44;
+//        public const int GL_SLUMINANCE8_ALPHA8 = 0x8C45;
+//        public const int GL_SLUMINANCE = 0x8C46;
+//        public const int GL_SLUMINANCE8 = 0x8C47;
+//        public const int GL_COMPRESSED_SLUMINANCE = 0x8C4A;
+//        public const int GL_COMPRESSED_SLUMINANCE_ALPHA = 0x8C4B;
+//        public const int GL_VERSION_3_0 = 1;
+//        public const int GL_COMPARE_REF_TO_TEXTURE = 0x884E;
+//        public const int GL_CLIP_DISTANCE0 = 0x3000;
+//        public const int GL_CLIP_DISTANCE1 = 0x3001;
+//        public const int GL_CLIP_DISTANCE2 = 0x3002;
+//        public const int GL_CLIP_DISTANCE3 = 0x3003;
+//        public const int GL_CLIP_DISTANCE4 = 0x3004;
+//        public const int GL_CLIP_DISTANCE5 = 0x3005;
+//        public const int GL_CLIP_DISTANCE6 = 0x3006;
+//        public const int GL_CLIP_DISTANCE7 = 0x3007;
+//        public const int GL_MAX_CLIP_DISTANCES = 0x0D32;
         public const int GL_MAJOR_VERSION = 0x821B;
         public const int GL_MINOR_VERSION = 0x821C;
         public const int GL_NUM_EXTENSIONS = 0x821D;
-        public const int GL_CONTEXT_FLAGS = 0x821E;
-        public const int GL_COMPRESSED_RED = 0x8225;
-        public const int GL_COMPRESSED_RG = 0x8226;
-        public const int GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT = 0x00000001;
-        public const int GL_RGBA32F = 0x8814;
-        public const int GL_RGB32F = 0x8815;
-        public const int GL_RGBA16F = 0x881A;
-        public const int GL_RGB16F = 0x881B;
-        public const int GL_VERTEX_ATTRIB_ARRAY_INTEGER = 0x88FD;
-        public const int GL_MAX_ARRAY_TEXTURE_LAYERS = 0x88FF;
-        public const int GL_MIN_PROGRAM_TEXEL_OFFSET = 0x8904;
-        public const int GL_MAX_PROGRAM_TEXEL_OFFSET = 0x8905;
-        public const int GL_CLAMP_READ_COLOR = 0x891C;
-        public const int GL_FIXED_ONLY = 0x891D;
-        public const int GL_MAX_VARYING_COMPONENTS = 0x8B4B;
-        public const int GL_TEXTURE_1D_ARRAY = 0x8C18;
-        public const int GL_PROXY_TEXTURE_1D_ARRAY = 0x8C19;
-        public const int GL_TEXTURE_2D_ARRAY = 0x8C1A;
-        public const int GL_PROXY_TEXTURE_2D_ARRAY = 0x8C1B;
-        public const int GL_TEXTURE_BINDING_1D_ARRAY = 0x8C1C;
-        public const int GL_TEXTURE_BINDING_2D_ARRAY = 0x8C1D;
-        public const int GL_R11F_G11F_B10F = 0x8C3A;
-        public const int GL_UNSIGNED_INT_10F_11F_11F_REV = 0x8C3B;
-        public const int GL_RGB9_E5 = 0x8C3D;
-        public const int GL_UNSIGNED_INT_5_9_9_9_REV = 0x8C3E;
-        public const int GL_TEXTURE_SHARED_SIZE = 0x8C3F;
-        public const int GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH = 0x8C76;
-        public const int GL_TRANSFORM_FEEDBACK_BUFFER_MODE = 0x8C7F;
-        public const int GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS = 0x8C80;
-        public const int GL_TRANSFORM_FEEDBACK_VARYINGS = 0x8C83;
-        public const int GL_TRANSFORM_FEEDBACK_BUFFER_START = 0x8C84;
-        public const int GL_TRANSFORM_FEEDBACK_BUFFER_SIZE = 0x8C85;
-        public const int GL_PRIMITIVES_GENERATED = 0x8C87;
-        public const int GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN = 0x8C88;
-        public const int GL_RASTERIZER_DISCARD = 0x8C89;
-        public const int GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS = 0x8C8A;
-        public const int GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS = 0x8C8B;
-        public const int GL_INTERLEAVED_ATTRIBS = 0x8C8C;
-        public const int GL_SEPARATE_ATTRIBS = 0x8C8D;
-        public const int GL_TRANSFORM_FEEDBACK_BUFFER = 0x8C8E;
-        public const int GL_TRANSFORM_FEEDBACK_BUFFER_BINDING = 0x8C8F;
-        public const int GL_RGBA32UI = 0x8D70;
-        public const int GL_RGB32UI = 0x8D71;
-        public const int GL_RGBA16UI = 0x8D76;
-        public const int GL_RGB16UI = 0x8D77;
-        public const int GL_RGBA8UI = 0x8D7C;
-        public const int GL_RGB8UI = 0x8D7D;
-        public const int GL_RGBA32I = 0x8D82;
-        public const int GL_RGB32I = 0x8D83;
-        public const int GL_RGBA16I = 0x8D88;
-        public const int GL_RGB16I = 0x8D89;
-        public const int GL_RGBA8I = 0x8D8E;
-        public const int GL_RGB8I = 0x8D8F;
-        public const int GL_RED_INTEGER = 0x8D94;
-        public const int GL_GREEN_INTEGER = 0x8D95;
-        public const int GL_BLUE_INTEGER = 0x8D96;
-        public const int GL_RGB_INTEGER = 0x8D98;
-        public const int GL_RGBA_INTEGER = 0x8D99;
-        public const int GL_BGR_INTEGER = 0x8D9A;
-        public const int GL_BGRA_INTEGER = 0x8D9B;
-        public const int GL_SAMPLER_1D_ARRAY = 0x8DC0;
-        public const int GL_SAMPLER_2D_ARRAY = 0x8DC1;
-        public const int GL_SAMPLER_1D_ARRAY_SHADOW = 0x8DC3;
-        public const int GL_SAMPLER_2D_ARRAY_SHADOW = 0x8DC4;
-        public const int GL_SAMPLER_CUBE_SHADOW = 0x8DC5;
-        public const int GL_UNSIGNED_INT_VEC2 = 0x8DC6;
-        public const int GL_UNSIGNED_INT_VEC3 = 0x8DC7;
-        public const int GL_UNSIGNED_INT_VEC4 = 0x8DC8;
-        public const int GL_INT_SAMPLER_1D = 0x8DC9;
-        public const int GL_INT_SAMPLER_2D = 0x8DCA;
-        public const int GL_INT_SAMPLER_3D = 0x8DCB;
-        public const int GL_INT_SAMPLER_CUBE = 0x8DCC;
-        public const int GL_INT_SAMPLER_1D_ARRAY = 0x8DCE;
-        public const int GL_INT_SAMPLER_2D_ARRAY = 0x8DCF;
-        public const int GL_UNSIGNED_INT_SAMPLER_1D = 0x8DD1;
-        public const int GL_UNSIGNED_INT_SAMPLER_2D = 0x8DD2;
-        public const int GL_UNSIGNED_INT_SAMPLER_3D = 0x8DD3;
-        public const int GL_UNSIGNED_INT_SAMPLER_CUBE = 0x8DD4;
-        public const int GL_UNSIGNED_INT_SAMPLER_1D_ARRAY = 0x8DD6;
-        public const int GL_UNSIGNED_INT_SAMPLER_2D_ARRAY = 0x8DD7;
-        public const int GL_QUERY_WAIT = 0x8E13;
-        public const int GL_QUERY_NO_WAIT = 0x8E14;
-        public const int GL_QUERY_BY_REGION_WAIT = 0x8E15;
-        public const int GL_QUERY_BY_REGION_NO_WAIT = 0x8E16;
-        public const int GL_BUFFER_ACCESS_FLAGS = 0x911F;
-        public const int GL_BUFFER_MAP_LENGTH = 0x9120;
-        public const int GL_BUFFER_MAP_OFFSET = 0x9121;
-        public const int GL_DEPTH_COMPONENT32F = 0x8CAC;
-        public const int GL_DEPTH32F_STENCIL8 = 0x8CAD;
-        public const int GL_FLOAT_32_UNSIGNED_INT_24_8_REV = 0x8DAD;
-        public const int GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING = 0x8210;
-        public const int GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE = 0x8211;
-        public const int GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE = 0x8212;
-        public const int GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE = 0x8213;
-        public const int GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE = 0x8214;
-        public const int GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE = 0x8215;
-        public const int GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE = 0x8216;
-        public const int GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE = 0x8217;
-        public const int GL_FRAMEBUFFER_DEFAULT = 0x8218;
-        public const int GL_FRAMEBUFFER_UNDEFINED = 0x8219;
-        public const int GL_DEPTH_STENCIL_ATTACHMENT = 0x821A;
-        public const int GL_MAX_RENDERBUFFER_SIZE = 0x84E8;
+//        public const int GL_CONTEXT_FLAGS = 0x821E;
+//        public const int GL_COMPRESSED_RED = 0x8225;
+//        public const int GL_COMPRESSED_RG = 0x8226;
+//        public const int GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT = 0x00000001;
+//        public const int GL_RGBA32F = 0x8814;
+//        public const int GL_RGB32F = 0x8815;
+//        public const int GL_RGBA16F = 0x881A;
+//        public const int GL_RGB16F = 0x881B;
+//        public const int GL_VERTEX_ATTRIB_ARRAY_INTEGER = 0x88FD;
+//        public const int GL_MAX_ARRAY_TEXTURE_LAYERS = 0x88FF;
+//        public const int GL_MIN_PROGRAM_TEXEL_OFFSET = 0x8904;
+//        public const int GL_MAX_PROGRAM_TEXEL_OFFSET = 0x8905;
+//        public const int GL_CLAMP_READ_COLOR = 0x891C;
+//        public const int GL_FIXED_ONLY = 0x891D;
+//        public const int GL_MAX_VARYING_COMPONENTS = 0x8B4B;
+//        public const int GL_TEXTURE_1D_ARRAY = 0x8C18;
+//        public const int GL_PROXY_TEXTURE_1D_ARRAY = 0x8C19;
+//        public const int GL_TEXTURE_2D_ARRAY = 0x8C1A;
+//        public const int GL_PROXY_TEXTURE_2D_ARRAY = 0x8C1B;
+//        public const int GL_TEXTURE_BINDING_1D_ARRAY = 0x8C1C;
+//        public const int GL_TEXTURE_BINDING_2D_ARRAY = 0x8C1D;
+//        public const int GL_R11F_G11F_B10F = 0x8C3A;
+//        public const int GL_UNSIGNED_INT_10F_11F_11F_REV = 0x8C3B;
+//        public const int GL_RGB9_E5 = 0x8C3D;
+//        public const int GL_UNSIGNED_INT_5_9_9_9_REV = 0x8C3E;
+//        public const int GL_TEXTURE_SHARED_SIZE = 0x8C3F;
+//        public const int GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH = 0x8C76;
+//        public const int GL_TRANSFORM_FEEDBACK_BUFFER_MODE = 0x8C7F;
+//        public const int GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS = 0x8C80;
+//        public const int GL_TRANSFORM_FEEDBACK_VARYINGS = 0x8C83;
+//        public const int GL_TRANSFORM_FEEDBACK_BUFFER_START = 0x8C84;
+//        public const int GL_TRANSFORM_FEEDBACK_BUFFER_SIZE = 0x8C85;
+//        public const int GL_PRIMITIVES_GENERATED = 0x8C87;
+//        public const int GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN = 0x8C88;
+//        public const int GL_RASTERIZER_DISCARD = 0x8C89;
+//        public const int GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS = 0x8C8A;
+//        public const int GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS = 0x8C8B;
+//        public const int GL_INTERLEAVED_ATTRIBS = 0x8C8C;
+//        public const int GL_SEPARATE_ATTRIBS = 0x8C8D;
+//        public const int GL_TRANSFORM_FEEDBACK_BUFFER = 0x8C8E;
+//        public const int GL_TRANSFORM_FEEDBACK_BUFFER_BINDING = 0x8C8F;
+//        public const int GL_RGBA32UI = 0x8D70;
+//        public const int GL_RGB32UI = 0x8D71;
+//        public const int GL_RGBA16UI = 0x8D76;
+//        public const int GL_RGB16UI = 0x8D77;
+//        public const int GL_RGBA8UI = 0x8D7C;
+//        public const int GL_RGB8UI = 0x8D7D;
+//        public const int GL_RGBA32I = 0x8D82;
+//        public const int GL_RGB32I = 0x8D83;
+//        public const int GL_RGBA16I = 0x8D88;
+//        public const int GL_RGB16I = 0x8D89;
+//        public const int GL_RGBA8I = 0x8D8E;
+//        public const int GL_RGB8I = 0x8D8F;
+//        public const int GL_RED_INTEGER = 0x8D94;
+//        public const int GL_GREEN_INTEGER = 0x8D95;
+//        public const int GL_BLUE_INTEGER = 0x8D96;
+//        public const int GL_RGB_INTEGER = 0x8D98;
+//        public const int GL_RGBA_INTEGER = 0x8D99;
+//        public const int GL_BGR_INTEGER = 0x8D9A;
+//        public const int GL_BGRA_INTEGER = 0x8D9B;
+//        public const int GL_SAMPLER_1D_ARRAY = 0x8DC0;
+//        public const int GL_SAMPLER_2D_ARRAY = 0x8DC1;
+//        public const int GL_SAMPLER_1D_ARRAY_SHADOW = 0x8DC3;
+//        public const int GL_SAMPLER_2D_ARRAY_SHADOW = 0x8DC4;
+//        public const int GL_SAMPLER_CUBE_SHADOW = 0x8DC5;
+//        public const int GL_UNSIGNED_INT_VEC2 = 0x8DC6;
+//        public const int GL_UNSIGNED_INT_VEC3 = 0x8DC7;
+//        public const int GL_UNSIGNED_INT_VEC4 = 0x8DC8;
+//        public const int GL_INT_SAMPLER_1D = 0x8DC9;
+//        public const int GL_INT_SAMPLER_2D = 0x8DCA;
+//        public const int GL_INT_SAMPLER_3D = 0x8DCB;
+//        public const int GL_INT_SAMPLER_CUBE = 0x8DCC;
+//        public const int GL_INT_SAMPLER_1D_ARRAY = 0x8DCE;
+//        public const int GL_INT_SAMPLER_2D_ARRAY = 0x8DCF;
+//        public const int GL_UNSIGNED_INT_SAMPLER_1D = 0x8DD1;
+//        public const int GL_UNSIGNED_INT_SAMPLER_2D = 0x8DD2;
+//        public const int GL_UNSIGNED_INT_SAMPLER_3D = 0x8DD3;
+//        public const int GL_UNSIGNED_INT_SAMPLER_CUBE = 0x8DD4;
+//        public const int GL_UNSIGNED_INT_SAMPLER_1D_ARRAY = 0x8DD6;
+//        public const int GL_UNSIGNED_INT_SAMPLER_2D_ARRAY = 0x8DD7;
+//        public const int GL_QUERY_WAIT = 0x8E13;
+//        public const int GL_QUERY_NO_WAIT = 0x8E14;
+//        public const int GL_QUERY_BY_REGION_WAIT = 0x8E15;
+//        public const int GL_QUERY_BY_REGION_NO_WAIT = 0x8E16;
+//        public const int GL_BUFFER_ACCESS_FLAGS = 0x911F;
+//        public const int GL_BUFFER_MAP_LENGTH = 0x9120;
+//        public const int GL_BUFFER_MAP_OFFSET = 0x9121;
+//        public const int GL_DEPTH_COMPONENT32F = 0x8CAC;
+//        public const int GL_DEPTH32F_STENCIL8 = 0x8CAD;
+//        public const int GL_FLOAT_32_UNSIGNED_INT_24_8_REV = 0x8DAD;
+//        public const int GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING = 0x8210;
+//        public const int GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE = 0x8211;
+//        public const int GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE = 0x8212;
+//        public const int GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE = 0x8213;
+//        public const int GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE = 0x8214;
+//        public const int GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE = 0x8215;
+//        public const int GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE = 0x8216;
+//        public const int GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE = 0x8217;
+//        public const int GL_FRAMEBUFFER_DEFAULT = 0x8218;
+//        public const int GL_FRAMEBUFFER_UNDEFINED = 0x8219;
+//        public const int GL_DEPTH_STENCIL_ATTACHMENT = 0x821A;
+//        public const int GL_MAX_RENDERBUFFER_SIZE = 0x84E8;
         public const int GL_DEPTH_STENCIL = 0x84F9;
-        public const int GL_UNSIGNED_INT_24_8 = 0x84FA;
+//        public const int GL_UNSIGNED_INT_24_8 = 0x84FA;
         public const int GL_DEPTH24_STENCIL8 = 0x88F0;
-        public const int GL_TEXTURE_STENCIL_SIZE = 0x88F1;
-        public const int GL_TEXTURE_RED_TYPE = 0x8C10;
-        public const int GL_TEXTURE_GREEN_TYPE = 0x8C11;
-        public const int GL_TEXTURE_BLUE_TYPE = 0x8C12;
-        public const int GL_TEXTURE_ALPHA_TYPE = 0x8C13;
-        public const int GL_TEXTURE_DEPTH_TYPE = 0x8C16;
-        public const int GL_UNSIGNED_NORMALIZED = 0x8C17;
+//        public const int GL_TEXTURE_STENCIL_SIZE = 0x88F1;
+//        public const int GL_TEXTURE_RED_TYPE = 0x8C10;
+//        public const int GL_TEXTURE_GREEN_TYPE = 0x8C11;
+//        public const int GL_TEXTURE_BLUE_TYPE = 0x8C12;
+//        public const int GL_TEXTURE_ALPHA_TYPE = 0x8C13;
+//        public const int GL_TEXTURE_DEPTH_TYPE = 0x8C16;
+//        public const int GL_UNSIGNED_NORMALIZED = 0x8C17;
         public const int GL_FRAMEBUFFER_BINDING = 0x8CA6;
-        public const int GL_DRAW_FRAMEBUFFER_BINDING = 0x8CA6;
+//        public const int GL_DRAW_FRAMEBUFFER_BINDING = 0x8CA6;
         public const int GL_RENDERBUFFER_BINDING = 0x8CA7;
         public const int GL_READ_FRAMEBUFFER = 0x8CA8;
         public const int GL_DRAW_FRAMEBUFFER = 0x8CA9;
         public const int GL_READ_FRAMEBUFFER_BINDING = 0x8CAA;
-        public const int GL_RENDERBUFFER_SAMPLES = 0x8CAB;
-        public const int GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE = 0x8CD0;
-        public const int GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME = 0x8CD1;
-        public const int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL = 0x8CD2;
-        public const int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE = 0x8CD3;
-        public const int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER = 0x8CD4;
+//        public const int GL_RENDERBUFFER_SAMPLES = 0x8CAB;
+//        public const int GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE = 0x8CD0;
+//        public const int GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME = 0x8CD1;
+//        public const int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL = 0x8CD2;
+//        public const int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE = 0x8CD3;
+//        public const int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER = 0x8CD4;
         public const int GL_FRAMEBUFFER_COMPLETE = 0x8CD5;
-        public const int GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT = 0x8CD6;
-        public const int GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT = 0x8CD7;
-        public const int GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER = 0x8CDB;
-        public const int GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER = 0x8CDC;
-        public const int GL_FRAMEBUFFER_UNSUPPORTED = 0x8CDD;
-        public const int GL_MAX_COLOR_ATTACHMENTS = 0x8CDF;
+//        public const int GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT = 0x8CD6;
+//        public const int GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT = 0x8CD7;
+//        public const int GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER = 0x8CDB;
+//        public const int GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER = 0x8CDC;
+//        public const int GL_FRAMEBUFFER_UNSUPPORTED = 0x8CDD;
+//        public const int GL_MAX_COLOR_ATTACHMENTS = 0x8CDF;
         public const int GL_COLOR_ATTACHMENT0 = 0x8CE0;
-        public const int GL_COLOR_ATTACHMENT1 = 0x8CE1;
-        public const int GL_COLOR_ATTACHMENT2 = 0x8CE2;
-        public const int GL_COLOR_ATTACHMENT3 = 0x8CE3;
-        public const int GL_COLOR_ATTACHMENT4 = 0x8CE4;
-        public const int GL_COLOR_ATTACHMENT5 = 0x8CE5;
-        public const int GL_COLOR_ATTACHMENT6 = 0x8CE6;
-        public const int GL_COLOR_ATTACHMENT7 = 0x8CE7;
-        public const int GL_COLOR_ATTACHMENT8 = 0x8CE8;
-        public const int GL_COLOR_ATTACHMENT9 = 0x8CE9;
-        public const int GL_COLOR_ATTACHMENT10 = 0x8CEA;
-        public const int GL_COLOR_ATTACHMENT11 = 0x8CEB;
-        public const int GL_COLOR_ATTACHMENT12 = 0x8CEC;
-        public const int GL_COLOR_ATTACHMENT13 = 0x8CED;
-        public const int GL_COLOR_ATTACHMENT14 = 0x8CEE;
-        public const int GL_COLOR_ATTACHMENT15 = 0x8CEF;
-        public const int GL_COLOR_ATTACHMENT16 = 0x8CF0;
-        public const int GL_COLOR_ATTACHMENT17 = 0x8CF1;
-        public const int GL_COLOR_ATTACHMENT18 = 0x8CF2;
-        public const int GL_COLOR_ATTACHMENT19 = 0x8CF3;
-        public const int GL_COLOR_ATTACHMENT20 = 0x8CF4;
-        public const int GL_COLOR_ATTACHMENT21 = 0x8CF5;
-        public const int GL_COLOR_ATTACHMENT22 = 0x8CF6;
-        public const int GL_COLOR_ATTACHMENT23 = 0x8CF7;
-        public const int GL_COLOR_ATTACHMENT24 = 0x8CF8;
-        public const int GL_COLOR_ATTACHMENT25 = 0x8CF9;
-        public const int GL_COLOR_ATTACHMENT26 = 0x8CFA;
-        public const int GL_COLOR_ATTACHMENT27 = 0x8CFB;
-        public const int GL_COLOR_ATTACHMENT28 = 0x8CFC;
-        public const int GL_COLOR_ATTACHMENT29 = 0x8CFD;
-        public const int GL_COLOR_ATTACHMENT30 = 0x8CFE;
-        public const int GL_COLOR_ATTACHMENT31 = 0x8CFF;
+//        public const int GL_COLOR_ATTACHMENT1 = 0x8CE1;
+//        public const int GL_COLOR_ATTACHMENT2 = 0x8CE2;
+//        public const int GL_COLOR_ATTACHMENT3 = 0x8CE3;
+//        public const int GL_COLOR_ATTACHMENT4 = 0x8CE4;
+//        public const int GL_COLOR_ATTACHMENT5 = 0x8CE5;
+//        public const int GL_COLOR_ATTACHMENT6 = 0x8CE6;
+//        public const int GL_COLOR_ATTACHMENT7 = 0x8CE7;
+//        public const int GL_COLOR_ATTACHMENT8 = 0x8CE8;
+//        public const int GL_COLOR_ATTACHMENT9 = 0x8CE9;
+//        public const int GL_COLOR_ATTACHMENT10 = 0x8CEA;
+//        public const int GL_COLOR_ATTACHMENT11 = 0x8CEB;
+//        public const int GL_COLOR_ATTACHMENT12 = 0x8CEC;
+//        public const int GL_COLOR_ATTACHMENT13 = 0x8CED;
+//        public const int GL_COLOR_ATTACHMENT14 = 0x8CEE;
+//        public const int GL_COLOR_ATTACHMENT15 = 0x8CEF;
+//        public const int GL_COLOR_ATTACHMENT16 = 0x8CF0;
+//        public const int GL_COLOR_ATTACHMENT17 = 0x8CF1;
+//        public const int GL_COLOR_ATTACHMENT18 = 0x8CF2;
+//        public const int GL_COLOR_ATTACHMENT19 = 0x8CF3;
+//        public const int GL_COLOR_ATTACHMENT20 = 0x8CF4;
+//        public const int GL_COLOR_ATTACHMENT21 = 0x8CF5;
+//        public const int GL_COLOR_ATTACHMENT22 = 0x8CF6;
+//        public const int GL_COLOR_ATTACHMENT23 = 0x8CF7;
+//        public const int GL_COLOR_ATTACHMENT24 = 0x8CF8;
+//        public const int GL_COLOR_ATTACHMENT25 = 0x8CF9;
+//        public const int GL_COLOR_ATTACHMENT26 = 0x8CFA;
+//        public const int GL_COLOR_ATTACHMENT27 = 0x8CFB;
+//        public const int GL_COLOR_ATTACHMENT28 = 0x8CFC;
+//        public const int GL_COLOR_ATTACHMENT29 = 0x8CFD;
+//        public const int GL_COLOR_ATTACHMENT30 = 0x8CFE;
+//        public const int GL_COLOR_ATTACHMENT31 = 0x8CFF;
         public const int GL_DEPTH_ATTACHMENT = 0x8D00;
         public const int GL_STENCIL_ATTACHMENT = 0x8D20;
         public const int GL_FRAMEBUFFER = 0x8D40;
         public const int GL_RENDERBUFFER = 0x8D41;
         public const int GL_RENDERBUFFER_WIDTH = 0x8D42;
         public const int GL_RENDERBUFFER_HEIGHT = 0x8D43;
-        public const int GL_RENDERBUFFER_INTERNAL_FORMAT = 0x8D44;
-        public const int GL_STENCIL_INDEX1 = 0x8D46;
-        public const int GL_STENCIL_INDEX4 = 0x8D47;
+//        public const int GL_RENDERBUFFER_INTERNAL_FORMAT = 0x8D44;
+//        public const int GL_STENCIL_INDEX1 = 0x8D46;
+//        public const int GL_STENCIL_INDEX4 = 0x8D47;
         public const int GL_STENCIL_INDEX8 = 0x8D48;
-        public const int GL_STENCIL_INDEX16 = 0x8D49;
-        public const int GL_RENDERBUFFER_RED_SIZE = 0x8D50;
-        public const int GL_RENDERBUFFER_GREEN_SIZE = 0x8D51;
-        public const int GL_RENDERBUFFER_BLUE_SIZE = 0x8D52;
-        public const int GL_RENDERBUFFER_ALPHA_SIZE = 0x8D53;
-        public const int GL_RENDERBUFFER_DEPTH_SIZE = 0x8D54;
-        public const int GL_RENDERBUFFER_STENCIL_SIZE = 0x8D55;
-        public const int GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE = 0x8D56;
-        public const int GL_MAX_SAMPLES = 0x8D57;
-        public const int GL_INDEX = 0x8222;
-        public const int GL_TEXTURE_LUMINANCE_TYPE = 0x8C14;
-        public const int GL_TEXTURE_INTENSITY_TYPE = 0x8C15;
-        public const int GL_FRAMEBUFFER_SRGB = 0x8DB9;
-        public const int GL_HALF_FLOAT = 0x140B;
-        public const int GL_MAP_READ_BIT = 0x0001;
-        public const int GL_MAP_WRITE_BIT = 0x0002;
-        public const int GL_MAP_INVALIDATE_RANGE_BIT = 0x0004;
-        public const int GL_MAP_INVALIDATE_BUFFER_BIT = 0x0008;
-        public const int GL_MAP_FLUSH_EXPLICIT_BIT = 0x0010;
-        public const int GL_MAP_UNSYNCHRONIZED_BIT = 0x0020;
-        public const int GL_COMPRESSED_RED_RGTC1 = 0x8DBB;
-        public const int GL_COMPRESSED_SIGNED_RED_RGTC1 = 0x8DBC;
-        public const int GL_COMPRESSED_RG_RGTC2 = 0x8DBD;
-        public const int GL_COMPRESSED_SIGNED_RG_RGTC2 = 0x8DBE;
-        public const int GL_RG = 0x8227;
-        public const int GL_RG_INTEGER = 0x8228;
-        public const int GL_R8 = 0x8229;
-        public const int GL_R16 = 0x822A;
-        public const int GL_RG8 = 0x822B;
-        public const int GL_RG16 = 0x822C;
-        public const int GL_R16F = 0x822D;
-        public const int GL_R32F = 0x822E;
-        public const int GL_RG16F = 0x822F;
-        public const int GL_RG32F = 0x8230;
-        public const int GL_R8I = 0x8231;
-        public const int GL_R8UI = 0x8232;
-        public const int GL_R16I = 0x8233;
-        public const int GL_R16UI = 0x8234;
-        public const int GL_R32I = 0x8235;
-        public const int GL_R32UI = 0x8236;
-        public const int GL_RG8I = 0x8237;
-        public const int GL_RG8UI = 0x8238;
-        public const int GL_RG16I = 0x8239;
-        public const int GL_RG16UI = 0x823A;
-        public const int GL_RG32I = 0x823B;
-        public const int GL_RG32UI = 0x823C;
-        public const int GL_VERTEX_ARRAY_BINDING = 0x85B5;
-        public const int GL_CLAMP_VERTEX_COLOR = 0x891A;
-        public const int GL_CLAMP_FRAGMENT_COLOR = 0x891B;
-        public const int GL_ALPHA_INTEGER = 0x8D97;
-        public const int GL_VERSION_3_1 = 1;
-        public const int GL_SAMPLER_2D_RECT = 0x8B63;
-        public const int GL_SAMPLER_2D_RECT_SHADOW = 0x8B64;
-        public const int GL_SAMPLER_BUFFER = 0x8DC2;
-        public const int GL_INT_SAMPLER_2D_RECT = 0x8DCD;
-        public const int GL_INT_SAMPLER_BUFFER = 0x8DD0;
-        public const int GL_UNSIGNED_INT_SAMPLER_2D_RECT = 0x8DD5;
-        public const int GL_UNSIGNED_INT_SAMPLER_BUFFER = 0x8DD8;
-        public const int GL_TEXTURE_BUFFER = 0x8C2A;
-        public const int GL_MAX_TEXTURE_BUFFER_SIZE = 0x8C2B;
-        public const int GL_TEXTURE_BINDING_BUFFER = 0x8C2C;
-        public const int GL_TEXTURE_BUFFER_DATA_STORE_BINDING = 0x8C2D;
-        public const int GL_TEXTURE_RECTANGLE = 0x84F5;
-        public const int GL_TEXTURE_BINDING_RECTANGLE = 0x84F6;
-        public const int GL_PROXY_TEXTURE_RECTANGLE = 0x84F7;
-        public const int GL_MAX_RECTANGLE_TEXTURE_SIZE = 0x84F8;
-        public const int GL_R8_SNORM = 0x8F94;
-        public const int GL_RG8_SNORM = 0x8F95;
-        public const int GL_RGB8_SNORM = 0x8F96;
-        public const int GL_RGBA8_SNORM = 0x8F97;
-        public const int GL_R16_SNORM = 0x8F98;
-        public const int GL_RG16_SNORM = 0x8F99;
-        public const int GL_RGB16_SNORM = 0x8F9A;
-        public const int GL_RGBA16_SNORM = 0x8F9B;
-        public const int GL_SIGNED_NORMALIZED = 0x8F9C;
-        public const int GL_PRIMITIVE_RESTART = 0x8F9D;
-        public const int GL_PRIMITIVE_RESTART_INDEX = 0x8F9E;
-        public const int GL_COPY_READ_BUFFER = 0x8F36;
-        public const int GL_COPY_WRITE_BUFFER = 0x8F37;
-        public const int GL_UNIFORM_BUFFER = 0x8A11;
-        public const int GL_UNIFORM_BUFFER_BINDING = 0x8A28;
-        public const int GL_UNIFORM_BUFFER_START = 0x8A29;
-        public const int GL_UNIFORM_BUFFER_SIZE = 0x8A2A;
-        public const int GL_MAX_VERTEX_UNIFORM_BLOCKS = 0x8A2B;
-        public const int GL_MAX_GEOMETRY_UNIFORM_BLOCKS = 0x8A2C;
-        public const int GL_MAX_FRAGMENT_UNIFORM_BLOCKS = 0x8A2D;
-        public const int GL_MAX_COMBINED_UNIFORM_BLOCKS = 0x8A2E;
-        public const int GL_MAX_UNIFORM_BUFFER_BINDINGS = 0x8A2F;
-        public const int GL_MAX_UNIFORM_BLOCK_SIZE = 0x8A30;
-        public const int GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS = 0x8A31;
-        public const int GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS = 0x8A32;
-        public const int GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS = 0x8A33;
-        public const int GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT = 0x8A34;
-        public const int GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH = 0x8A35;
-        public const int GL_ACTIVE_UNIFORM_BLOCKS = 0x8A36;
-        public const int GL_UNIFORM_TYPE = 0x8A37;
-        public const int GL_UNIFORM_SIZE = 0x8A38;
-        public const int GL_UNIFORM_NAME_LENGTH = 0x8A39;
-        public const int GL_UNIFORM_BLOCK_INDEX = 0x8A3A;
-        public const int GL_UNIFORM_OFFSET = 0x8A3B;
-        public const int GL_UNIFORM_ARRAY_STRIDE = 0x8A3C;
-        public const int GL_UNIFORM_MATRIX_STRIDE = 0x8A3D;
-        public const int GL_UNIFORM_IS_ROW_MAJOR = 0x8A3E;
-        public const int GL_UNIFORM_BLOCK_BINDING = 0x8A3F;
-        public const int GL_UNIFORM_BLOCK_DATA_SIZE = 0x8A40;
-        public const int GL_UNIFORM_BLOCK_NAME_LENGTH = 0x8A41;
-        public const int GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS = 0x8A42;
-        public const int GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES = 0x8A43;
-        public const int GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER = 0x8A44;
-        public const int GL_UNIFORM_BLOCK_REFERENCED_BY_GEOMETRY_SHADER = 0x8A45;
-        public const int GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER = 0x8A46;
-        public const int GL_INVALID_INDEX = -1;
-        public const int GL_VERSION_3_2 = 1;
-        public const int GL_CONTEXT_CORE_PROFILE_BIT = 0x00000001;
-        public const int GL_CONTEXT_COMPATIBILITY_PROFILE_BIT = 0x00000002;
-        public const int GL_LINES_ADJACENCY = 0x000A;
-        public const int GL_LINE_STRIP_ADJACENCY = 0x000B;
-        public const int GL_TRIANGLES_ADJACENCY = 0x000C;
-        public const int GL_TRIANGLE_STRIP_ADJACENCY = 0x000D;
-        public const int GL_PROGRAM_POINT_SIZE = 0x8642;
-        public const int GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS = 0x8C29;
-        public const int GL_FRAMEBUFFER_ATTACHMENT_LAYERED = 0x8DA7;
-        public const int GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS = 0x8DA8;
-        public const int GL_GEOMETRY_SHADER = 0x8DD9;
-        public const int GL_GEOMETRY_VERTICES_OUT = 0x8916;
-        public const int GL_GEOMETRY_INPUT_TYPE = 0x8917;
-        public const int GL_GEOMETRY_OUTPUT_TYPE = 0x8918;
-        public const int GL_MAX_GEOMETRY_UNIFORM_COMPONENTS = 0x8DDF;
-        public const int GL_MAX_GEOMETRY_OUTPUT_VERTICES = 0x8DE0;
-        public const int GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS = 0x8DE1;
-        public const int GL_MAX_VERTEX_OUTPUT_COMPONENTS = 0x9122;
-        public const int GL_MAX_GEOMETRY_INPUT_COMPONENTS = 0x9123;
-        public const int GL_MAX_GEOMETRY_OUTPUT_COMPONENTS = 0x9124;
-        public const int GL_MAX_FRAGMENT_INPUT_COMPONENTS = 0x9125;
-        public const int GL_CONTEXT_PROFILE_MASK = 0x9126;
-        public const int GL_DEPTH_CLAMP = 0x864F;
-        public const int GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION = 0x8E4C;
-        public const int GL_FIRST_VERTEX_CONVENTION = 0x8E4D;
-        public const int GL_LAST_VERTEX_CONVENTION = 0x8E4E;
-        public const int GL_PROVOKING_VERTEX = 0x8E4F;
-        public const int GL_TEXTURE_CUBE_MAP_SEAMLESS = 0x884F;
-        public const int GL_MAX_SERVER_WAIT_TIMEOUT = 0x9111;
-        public const int GL_OBJECT_TYPE = 0x9112;
-        public const int GL_SYNC_CONDITION = 0x9113;
-        public const int GL_SYNC_STATUS = 0x9114;
-        public const int GL_SYNC_FLAGS = 0x9115;
-        public const int GL_SYNC_FENCE = 0x9116;
-        public const int GL_SYNC_GPU_COMMANDS_COMPLETE = 0x9117;
-        public const int GL_UNSIGNALED = 0x9118;
-        public const int GL_SIGNALED = 0x9119;
-        public const int GL_ALREADY_SIGNALED = 0x911A;
-        public const int GL_TIMEOUT_EXPIRED = 0x911B;
-        public const int GL_CONDITION_SATISFIED = 0x911C;
-        public const int GL_WAIT_FAILED = 0x911D;
-        public const int GL_SYNC_FLUSH_COMMANDS_BIT = 0x00000001;
-        public const int GL_SAMPLE_POSITION = 0x8E50;
-        public const int GL_SAMPLE_MASK = 0x8E51;
-        public const int GL_SAMPLE_MASK_VALUE = 0x8E52;
-        public const int GL_MAX_SAMPLE_MASK_WORDS = 0x8E59;
-        public const int GL_TEXTURE_2D_MULTISAMPLE = 0x9100;
-        public const int GL_PROXY_TEXTURE_2D_MULTISAMPLE = 0x9101;
-        public const int GL_TEXTURE_2D_MULTISAMPLE_ARRAY = 0x9102;
-        public const int GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY = 0x9103;
-        public const int GL_TEXTURE_BINDING_2D_MULTISAMPLE = 0x9104;
-        public const int GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY = 0x9105;
-        public const int GL_TEXTURE_SAMPLES = 0x9106;
-        public const int GL_TEXTURE_FIXED_SAMPLE_LOCATIONS = 0x9107;
-        public const int GL_SAMPLER_2D_MULTISAMPLE = 0x9108;
-        public const int GL_INT_SAMPLER_2D_MULTISAMPLE = 0x9109;
-        public const int GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE = 0x910A;
-        public const int GL_SAMPLER_2D_MULTISAMPLE_ARRAY = 0x910B;
-        public const int GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY = 0x910C;
-        public const int GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY = 0x910D;
-        public const int GL_MAX_COLOR_TEXTURE_SAMPLES = 0x910E;
-        public const int GL_MAX_DEPTH_TEXTURE_SAMPLES = 0x910F;
-        public const int GL_MAX_INTEGER_SAMPLES = 0x9110;
-        public const int GL_VERSION_3_3 = 1;
-        public const int GL_VERTEX_ATTRIB_ARRAY_DIVISOR = 0x88FE;
-        public const int GL_SRC1_COLOR = 0x88F9;
-        public const int GL_ONE_MINUS_SRC1_COLOR = 0x88FA;
-        public const int GL_ONE_MINUS_SRC1_ALPHA = 0x88FB;
-        public const int GL_MAX_DUAL_SOURCE_DRAW_BUFFERS = 0x88FC;
-        public const int GL_ANY_SAMPLES_PASSED = 0x8C2F;
-        public const int GL_SAMPLER_BINDING = 0x8919;
-        public const int GL_RGB10_A2UI = 0x906F;
-        public const int GL_TEXTURE_SWIZZLE_R = 0x8E42;
-        public const int GL_TEXTURE_SWIZZLE_G = 0x8E43;
-        public const int GL_TEXTURE_SWIZZLE_B = 0x8E44;
-        public const int GL_TEXTURE_SWIZZLE_A = 0x8E45;
-        public const int GL_TEXTURE_SWIZZLE_RGBA = 0x8E46;
-        public const int GL_TIME_ELAPSED = 0x88BF;
-        public const int GL_TIMESTAMP = 0x8E28;
-        public const int GL_INT_2_10_10_10_REV = 0x8D9F;
-        public const int GL_VERSION_4_0 = 1;
-        public const int GL_SAMPLE_SHADING = 0x8C36;
-        public const int GL_MIN_SAMPLE_SHADING_VALUE = 0x8C37;
-        public const int GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET = 0x8E5E;
-        public const int GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET = 0x8E5F;
-        public const int GL_TEXTURE_CUBE_MAP_ARRAY = 0x9009;
-        public const int GL_TEXTURE_BINDING_CUBE_MAP_ARRAY = 0x900A;
-        public const int GL_PROXY_TEXTURE_CUBE_MAP_ARRAY = 0x900B;
-        public const int GL_SAMPLER_CUBE_MAP_ARRAY = 0x900C;
-        public const int GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW = 0x900D;
-        public const int GL_INT_SAMPLER_CUBE_MAP_ARRAY = 0x900E;
-        public const int GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY = 0x900F;
-        public const int GL_DRAW_INDIRECT_BUFFER = 0x8F3F;
-        public const int GL_DRAW_INDIRECT_BUFFER_BINDING = 0x8F43;
-        public const int GL_GEOMETRY_SHADER_INVOCATIONS = 0x887F;
-        public const int GL_MAX_GEOMETRY_SHADER_INVOCATIONS = 0x8E5A;
-        public const int GL_MIN_FRAGMENT_INTERPOLATION_OFFSET = 0x8E5B;
-        public const int GL_MAX_FRAGMENT_INTERPOLATION_OFFSET = 0x8E5C;
-        public const int GL_FRAGMENT_INTERPOLATION_OFFSET_BITS = 0x8E5D;
-        public const int GL_MAX_VERTEX_STREAMS = 0x8E71;
-        public const int GL_DOUBLE_VEC2 = 0x8FFC;
-        public const int GL_DOUBLE_VEC3 = 0x8FFD;
-        public const int GL_DOUBLE_VEC4 = 0x8FFE;
-        public const int GL_DOUBLE_MAT2 = 0x8F46;
-        public const int GL_DOUBLE_MAT3 = 0x8F47;
-        public const int GL_DOUBLE_MAT4 = 0x8F48;
-        public const int GL_DOUBLE_MAT2x3 = 0x8F49;
-        public const int GL_DOUBLE_MAT2x4 = 0x8F4A;
-        public const int GL_DOUBLE_MAT3x2 = 0x8F4B;
-        public const int GL_DOUBLE_MAT3x4 = 0x8F4C;
-        public const int GL_DOUBLE_MAT4x2 = 0x8F4D;
-        public const int GL_DOUBLE_MAT4x3 = 0x8F4E;
-        public const int GL_ACTIVE_SUBROUTINES = 0x8DE5;
-        public const int GL_ACTIVE_SUBROUTINE_UNIFORMS = 0x8DE6;
-        public const int GL_ACTIVE_SUBROUTINE_UNIFORM_LOCATIONS = 0x8E47;
-        public const int GL_ACTIVE_SUBROUTINE_MAX_LENGTH = 0x8E48;
-        public const int GL_ACTIVE_SUBROUTINE_UNIFORM_MAX_LENGTH = 0x8E49;
-        public const int GL_MAX_SUBROUTINES = 0x8DE7;
-        public const int GL_MAX_SUBROUTINE_UNIFORM_LOCATIONS = 0x8DE8;
-        public const int GL_NUM_COMPATIBLE_SUBROUTINES = 0x8E4A;
-        public const int GL_COMPATIBLE_SUBROUTINES = 0x8E4B;
-        public const int GL_PATCHES = 0x000E;
-        public const int GL_PATCH_VERTICES = 0x8E72;
-        public const int GL_PATCH_DEFAULT_INNER_LEVEL = 0x8E73;
-        public const int GL_PATCH_DEFAULT_OUTER_LEVEL = 0x8E74;
-        public const int GL_TESS_CONTROL_OUTPUT_VERTICES = 0x8E75;
-        public const int GL_TESS_GEN_MODE = 0x8E76;
-        public const int GL_TESS_GEN_SPACING = 0x8E77;
-        public const int GL_TESS_GEN_VERTEX_ORDER = 0x8E78;
-        public const int GL_TESS_GEN_POINT_MODE = 0x8E79;
-        public const int GL_ISOLINES = 0x8E7A;
-        public const int GL_FRACTIONAL_ODD = 0x8E7B;
-        public const int GL_FRACTIONAL_EVEN = 0x8E7C;
-        public const int GL_MAX_PATCH_VERTICES = 0x8E7D;
-        public const int GL_MAX_TESS_GEN_LEVEL = 0x8E7E;
-        public const int GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS = 0x8E7F;
-        public const int GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS = 0x8E80;
-        public const int GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS = 0x8E81;
-        public const int GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS = 0x8E82;
-        public const int GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS = 0x8E83;
-        public const int GL_MAX_TESS_PATCH_COMPONENTS = 0x8E84;
-        public const int GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS = 0x8E85;
-        public const int GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS = 0x8E86;
-        public const int GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS = 0x8E89;
-        public const int GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS = 0x8E8A;
-        public const int GL_MAX_TESS_CONTROL_INPUT_COMPONENTS = 0x886C;
-        public const int GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS = 0x886D;
-        public const int GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS = 0x8E1E;
-        public const int GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS = 0x8E1F;
-        public const int GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_CONTROL_SHADER = 0x84F0;
-        public const int GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_EVALUATION_SHADER = 0x84F1;
-        public const int GL_TESS_EVALUATION_SHADER = 0x8E87;
-        public const int GL_TESS_CONTROL_SHADER = 0x8E88;
-        public const int GL_TRANSFORM_FEEDBACK = 0x8E22;
-        public const int GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED = 0x8E23;
-        public const int GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE = 0x8E24;
-        public const int GL_TRANSFORM_FEEDBACK_BINDING = 0x8E25;
-        public const int GL_MAX_TRANSFORM_FEEDBACK_BUFFERS = 0x8E70;
-        public const int GL_VERSION_4_1 = 1;
-        public const int GL_FIXED = 0x140C;
-        public const int GL_IMPLEMENTATION_COLOR_READ_TYPE = 0x8B9A;
-        public const int GL_IMPLEMENTATION_COLOR_READ_FORMAT = 0x8B9B;
-        public const int GL_LOW_FLOAT = 0x8DF0;
-        public const int GL_MEDIUM_FLOAT = 0x8DF1;
-        public const int GL_HIGH_FLOAT = 0x8DF2;
-        public const int GL_LOW_INT = 0x8DF3;
-        public const int GL_MEDIUM_INT = 0x8DF4;
-        public const int GL_HIGH_INT = 0x8DF5;
-        public const int GL_SHADER_COMPILER = 0x8DFA;
-        public const int GL_SHADER_BINARY_FORMATS = 0x8DF8;
-        public const int GL_NUM_SHADER_BINARY_FORMATS = 0x8DF9;
-        public const int GL_MAX_VERTEX_UNIFORM_VECTORS = 0x8DFB;
-        public const int GL_MAX_VARYING_VECTORS = 0x8DFC;
-        public const int GL_MAX_FRAGMENT_UNIFORM_VECTORS = 0x8DFD;
-        public const int GL_RGB565 = 0x8D62;
-        public const int GL_PROGRAM_BINARY_RETRIEVABLE_HINT = 0x8257;
-        public const int GL_PROGRAM_BINARY_LENGTH = 0x8741;
-        public const int GL_NUM_PROGRAM_BINARY_FORMATS = 0x87FE;
-        public const int GL_PROGRAM_BINARY_FORMATS = 0x87FF;
-        public const int GL_VERTEX_SHADER_BIT = 0x00000001;
-        public const int GL_FRAGMENT_SHADER_BIT = 0x00000002;
-        public const int GL_GEOMETRY_SHADER_BIT = 0x00000004;
-        public const int GL_TESS_CONTROL_SHADER_BIT = 0x00000008;
-        public const int GL_TESS_EVALUATION_SHADER_BIT = 0x00000010;
-        public const int GL_ALL_SHADER_BITS = -1;
-        public const int GL_PROGRAM_SEPARABLE = 0x8258;
-        public const int GL_ACTIVE_PROGRAM = 0x8259;
-        public const int GL_PROGRAM_PIPELINE_BINDING = 0x825A;
-        public const int GL_MAX_VIEWPORTS = 0x825B;
-        public const int GL_VIEWPORT_SUBPIXEL_BITS = 0x825C;
-        public const int GL_VIEWPORT_BOUNDS_RANGE = 0x825D;
-        public const int GL_LAYER_PROVOKING_VERTEX = 0x825E;
-        public const int GL_VIEWPORT_INDEX_PROVOKING_VERTEX = 0x825F;
-        public const int GL_UNDEFINED_VERTEX = 0x8260;
-        public const int GL_VERSION_4_2 = 1;
-        public const int GL_COPY_READ_BUFFER_BINDING = 0x8F36;
-        public const int GL_COPY_WRITE_BUFFER_BINDING = 0x8F37;
-        public const int GL_TRANSFORM_FEEDBACK_ACTIVE = 0x8E24;
-        public const int GL_TRANSFORM_FEEDBACK_PAUSED = 0x8E23;
-        public const int GL_UNPACK_COMPRESSED_BLOCK_WIDTH = 0x9127;
-        public const int GL_UNPACK_COMPRESSED_BLOCK_HEIGHT = 0x9128;
-        public const int GL_UNPACK_COMPRESSED_BLOCK_DEPTH = 0x9129;
-        public const int GL_UNPACK_COMPRESSED_BLOCK_SIZE = 0x912A;
-        public const int GL_PACK_COMPRESSED_BLOCK_WIDTH = 0x912B;
-        public const int GL_PACK_COMPRESSED_BLOCK_HEIGHT = 0x912C;
-        public const int GL_PACK_COMPRESSED_BLOCK_DEPTH = 0x912D;
-        public const int GL_PACK_COMPRESSED_BLOCK_SIZE = 0x912E;
-        public const int GL_NUM_SAMPLE_COUNTS = 0x9380;
-        public const int GL_MIN_MAP_BUFFER_ALIGNMENT = 0x90BC;
-        public const int GL_ATOMIC_COUNTER_BUFFER = 0x92C0;
-        public const int GL_ATOMIC_COUNTER_BUFFER_BINDING = 0x92C1;
-        public const int GL_ATOMIC_COUNTER_BUFFER_START = 0x92C2;
-        public const int GL_ATOMIC_COUNTER_BUFFER_SIZE = 0x92C3;
-        public const int GL_ATOMIC_COUNTER_BUFFER_DATA_SIZE = 0x92C4;
-        public const int GL_ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTERS = 0x92C5;
-        public const int GL_ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTER_INDICES = 0x92C6;
-        public const int GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_VERTEX_SHADER = 0x92C7;
-        public const int GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_CONTROL_SHADER = 0x92C8;
-        public const int GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_EVALUATION_SHADER = 0x92C9;
-        public const int GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_GEOMETRY_SHADER = 0x92CA;
-        public const int GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_FRAGMENT_SHADER = 0x92CB;
-        public const int GL_MAX_VERTEX_ATOMIC_COUNTER_BUFFERS = 0x92CC;
-        public const int GL_MAX_TESS_CONTROL_ATOMIC_COUNTER_BUFFERS = 0x92CD;
-        public const int GL_MAX_TESS_EVALUATION_ATOMIC_COUNTER_BUFFERS = 0x92CE;
-        public const int GL_MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS = 0x92CF;
-        public const int GL_MAX_FRAGMENT_ATOMIC_COUNTER_BUFFERS = 0x92D0;
-        public const int GL_MAX_COMBINED_ATOMIC_COUNTER_BUFFERS = 0x92D1;
-        public const int GL_MAX_VERTEX_ATOMIC_COUNTERS = 0x92D2;
-        public const int GL_MAX_TESS_CONTROL_ATOMIC_COUNTERS = 0x92D3;
-        public const int GL_MAX_TESS_EVALUATION_ATOMIC_COUNTERS = 0x92D4;
-        public const int GL_MAX_GEOMETRY_ATOMIC_COUNTERS = 0x92D5;
-        public const int GL_MAX_FRAGMENT_ATOMIC_COUNTERS = 0x92D6;
-        public const int GL_MAX_COMBINED_ATOMIC_COUNTERS = 0x92D7;
-        public const int GL_MAX_ATOMIC_COUNTER_BUFFER_SIZE = 0x92D8;
-        public const int GL_MAX_ATOMIC_COUNTER_BUFFER_BINDINGS = 0x92DC;
-        public const int GL_ACTIVE_ATOMIC_COUNTER_BUFFERS = 0x92D9;
-        public const int GL_UNIFORM_ATOMIC_COUNTER_BUFFER_INDEX = 0x92DA;
-        public const int GL_UNSIGNED_INT_ATOMIC_COUNTER = 0x92DB;
-        public const int GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT = 0x00000001;
-        public const int GL_ELEMENT_ARRAY_BARRIER_BIT = 0x00000002;
-        public const int GL_UNIFORM_BARRIER_BIT = 0x00000004;
-        public const int GL_TEXTURE_FETCH_BARRIER_BIT = 0x00000008;
-        public const int GL_SHADER_IMAGE_ACCESS_BARRIER_BIT = 0x00000020;
-        public const int GL_COMMAND_BARRIER_BIT = 0x00000040;
-        public const int GL_PIXEL_BUFFER_BARRIER_BIT = 0x00000080;
-        public const int GL_TEXTURE_UPDATE_BARRIER_BIT = 0x00000100;
-        public const int GL_BUFFER_UPDATE_BARRIER_BIT = 0x00000200;
-        public const int GL_FRAMEBUFFER_BARRIER_BIT = 0x00000400;
-        public const int GL_TRANSFORM_FEEDBACK_BARRIER_BIT = 0x00000800;
-        public const int GL_ATOMIC_COUNTER_BARRIER_BIT = 0x00001000;
-        public const int GL_ALL_BARRIER_BITS = -1;
-        public const int GL_MAX_IMAGE_UNITS = 0x8F38;
-        public const int GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS = 0x8F39;
-        public const int GL_IMAGE_BINDING_NAME = 0x8F3A;
-        public const int GL_IMAGE_BINDING_LEVEL = 0x8F3B;
-        public const int GL_IMAGE_BINDING_LAYERED = 0x8F3C;
-        public const int GL_IMAGE_BINDING_LAYER = 0x8F3D;
-        public const int GL_IMAGE_BINDING_ACCESS = 0x8F3E;
-        public const int GL_IMAGE_1D = 0x904C;
-        public const int GL_IMAGE_2D = 0x904D;
-        public const int GL_IMAGE_3D = 0x904E;
-        public const int GL_IMAGE_2D_RECT = 0x904F;
-        public const int GL_IMAGE_CUBE = 0x9050;
-        public const int GL_IMAGE_BUFFER = 0x9051;
-        public const int GL_IMAGE_1D_ARRAY = 0x9052;
-        public const int GL_IMAGE_2D_ARRAY = 0x9053;
-        public const int GL_IMAGE_CUBE_MAP_ARRAY = 0x9054;
-        public const int GL_IMAGE_2D_MULTISAMPLE = 0x9055;
-        public const int GL_IMAGE_2D_MULTISAMPLE_ARRAY = 0x9056;
-        public const int GL_INT_IMAGE_1D = 0x9057;
-        public const int GL_INT_IMAGE_2D = 0x9058;
-        public const int GL_INT_IMAGE_3D = 0x9059;
-        public const int GL_INT_IMAGE_2D_RECT = 0x905A;
-        public const int GL_INT_IMAGE_CUBE = 0x905B;
-        public const int GL_INT_IMAGE_BUFFER = 0x905C;
-        public const int GL_INT_IMAGE_1D_ARRAY = 0x905D;
-        public const int GL_INT_IMAGE_2D_ARRAY = 0x905E;
-        public const int GL_INT_IMAGE_CUBE_MAP_ARRAY = 0x905F;
-        public const int GL_INT_IMAGE_2D_MULTISAMPLE = 0x9060;
-        public const int GL_INT_IMAGE_2D_MULTISAMPLE_ARRAY = 0x9061;
-        public const int GL_UNSIGNED_INT_IMAGE_1D = 0x9062;
-        public const int GL_UNSIGNED_INT_IMAGE_2D = 0x9063;
-        public const int GL_UNSIGNED_INT_IMAGE_3D = 0x9064;
-        public const int GL_UNSIGNED_INT_IMAGE_2D_RECT = 0x9065;
-        public const int GL_UNSIGNED_INT_IMAGE_CUBE = 0x9066;
-        public const int GL_UNSIGNED_INT_IMAGE_BUFFER = 0x9067;
-        public const int GL_UNSIGNED_INT_IMAGE_1D_ARRAY = 0x9068;
-        public const int GL_UNSIGNED_INT_IMAGE_2D_ARRAY = 0x9069;
-        public const int GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY = 0x906A;
-        public const int GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE = 0x906B;
-        public const int GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY = 0x906C;
-        public const int GL_MAX_IMAGE_SAMPLES = 0x906D;
-        public const int GL_IMAGE_BINDING_FORMAT = 0x906E;
-        public const int GL_IMAGE_FORMAT_COMPATIBILITY_TYPE = 0x90C7;
-        public const int GL_IMAGE_FORMAT_COMPATIBILITY_BY_SIZE = 0x90C8;
-        public const int GL_IMAGE_FORMAT_COMPATIBILITY_BY_CLASS = 0x90C9;
-        public const int GL_MAX_VERTEX_IMAGE_UNIFORMS = 0x90CA;
-        public const int GL_MAX_TESS_CONTROL_IMAGE_UNIFORMS = 0x90CB;
-        public const int GL_MAX_TESS_EVALUATION_IMAGE_UNIFORMS = 0x90CC;
-        public const int GL_MAX_GEOMETRY_IMAGE_UNIFORMS = 0x90CD;
-        public const int GL_MAX_FRAGMENT_IMAGE_UNIFORMS = 0x90CE;
-        public const int GL_MAX_COMBINED_IMAGE_UNIFORMS = 0x90CF;
-        public const int GL_COMPRESSED_RGBA_BPTC_UNORM = 0x8E8C;
-        public const int GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM = 0x8E8D;
-        public const int GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT = 0x8E8E;
-        public const int GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT = 0x8E8F;
-        public const int GL_TEXTURE_IMMUTABLE_FORMAT = 0x912F;
-        public const int GL_VERSION_4_3 = 1;
-        public const int GL_NUM_SHADING_LANGUAGE_VERSIONS = 0x82E9;
-        public const int GL_VERTEX_ATTRIB_ARRAY_LONG = 0x874E;
-        public const int GL_COMPRESSED_RGB8_ETC2 = 0x9274;
-        public const int GL_COMPRESSED_SRGB8_ETC2 = 0x9275;
-        public const int GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2 = 0x9276;
-        public const int GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2 = 0x9277;
-        public const int GL_COMPRESSED_RGBA8_ETC2_EAC = 0x9278;
-        public const int GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC = 0x9279;
-        public const int GL_COMPRESSED_R11_EAC = 0x9270;
-        public const int GL_COMPRESSED_SIGNED_R11_EAC = 0x9271;
-        public const int GL_COMPRESSED_RG11_EAC = 0x9272;
-        public const int GL_COMPRESSED_SIGNED_RG11_EAC = 0x9273;
-        public const int GL_PRIMITIVE_RESTART_FIXED_INDEX = 0x8D69;
-        public const int GL_ANY_SAMPLES_PASSED_CONSERVATIVE = 0x8D6A;
-        public const int GL_MAX_ELEMENT_INDEX = 0x8D6B;
-        public const int GL_COMPUTE_SHADER = 0x91B9;
-        public const int GL_MAX_COMPUTE_UNIFORM_BLOCKS = 0x91BB;
-        public const int GL_MAX_COMPUTE_TEXTURE_IMAGE_UNITS = 0x91BC;
-        public const int GL_MAX_COMPUTE_IMAGE_UNIFORMS = 0x91BD;
-        public const int GL_MAX_COMPUTE_SHARED_MEMORY_SIZE = 0x8262;
-        public const int GL_MAX_COMPUTE_UNIFORM_COMPONENTS = 0x8263;
-        public const int GL_MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS = 0x8264;
-        public const int GL_MAX_COMPUTE_ATOMIC_COUNTERS = 0x8265;
-        public const int GL_MAX_COMBINED_COMPUTE_UNIFORM_COMPONENTS = 0x8266;
-        public const int GL_MAX_COMPUTE_WORK_GROUP_INVOCATIONS = 0x90EB;
-        public const int GL_MAX_COMPUTE_WORK_GROUP_COUNT = 0x91BE;
-        public const int GL_MAX_COMPUTE_WORK_GROUP_SIZE = 0x91BF;
-        public const int GL_COMPUTE_WORK_GROUP_SIZE = 0x8267;
-        public const int GL_UNIFORM_BLOCK_REFERENCED_BY_COMPUTE_SHADER = 0x90EC;
-        public const int GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_COMPUTE_SHADER = 0x90ED;
-        public const int GL_DISPATCH_INDIRECT_BUFFER = 0x90EE;
-        public const int GL_DISPATCH_INDIRECT_BUFFER_BINDING = 0x90EF;
-        public const int GL_COMPUTE_SHADER_BIT = 0x00000020;
-        public const int GL_DEBUG_OUTPUT_SYNCHRONOUS = 0x8242;
-        public const int GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH = 0x8243;
-        public const int GL_DEBUG_CALLBACK_FUNCTION = 0x8244;
-        public const int GL_DEBUG_CALLBACK_USER_PARAM = 0x8245;
-        public const int GL_DEBUG_SOURCE_API = 0x8246;
-        public const int GL_DEBUG_SOURCE_WINDOW_SYSTEM = 0x8247;
-        public const int GL_DEBUG_SOURCE_SHADER_COMPILER = 0x8248;
-        public const int GL_DEBUG_SOURCE_THIRD_PARTY = 0x8249;
-        public const int GL_DEBUG_SOURCE_APPLICATION = 0x824A;
-        public const int GL_DEBUG_SOURCE_OTHER = 0x824B;
-        public const int GL_DEBUG_TYPE_ERROR = 0x824C;
-        public const int GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR = 0x824D;
-        public const int GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR = 0x824E;
-        public const int GL_DEBUG_TYPE_PORTABILITY = 0x824F;
-        public const int GL_DEBUG_TYPE_PERFORMANCE = 0x8250;
-        public const int GL_DEBUG_TYPE_OTHER = 0x8251;
-        public const int GL_MAX_DEBUG_MESSAGE_LENGTH = 0x9143;
-        public const int GL_MAX_DEBUG_LOGGED_MESSAGES = 0x9144;
-        public const int GL_DEBUG_LOGGED_MESSAGES = 0x9145;
-        public const int GL_DEBUG_SEVERITY_HIGH = 0x9146;
-        public const int GL_DEBUG_SEVERITY_MEDIUM = 0x9147;
-        public const int GL_DEBUG_SEVERITY_LOW = 0x9148;
-        public const int GL_DEBUG_TYPE_MARKER = 0x8268;
-        public const int GL_DEBUG_TYPE_PUSH_GROUP = 0x8269;
-        public const int GL_DEBUG_TYPE_POP_GROUP = 0x826A;
-        public const int GL_DEBUG_SEVERITY_NOTIFICATION = 0x826B;
-        public const int GL_MAX_DEBUG_GROUP_STACK_DEPTH = 0x826C;
-        public const int GL_DEBUG_GROUP_STACK_DEPTH = 0x826D;
-        public const int GL_BUFFER = 0x82E0;
-        public const int GL_SHADER = 0x82E1;
-        public const int GL_PROGRAM = 0x82E2;
-        public const int GL_QUERY = 0x82E3;
-        public const int GL_PROGRAM_PIPELINE = 0x82E4;
-        public const int GL_SAMPLER = 0x82E6;
-        public const int GL_MAX_LABEL_LENGTH = 0x82E8;
-        public const int GL_DEBUG_OUTPUT = 0x92E0;
-        public const int GL_CONTEXT_FLAG_DEBUG_BIT = 0x00000002;
-        public const int GL_MAX_UNIFORM_LOCATIONS = 0x826E;
-        public const int GL_FRAMEBUFFER_DEFAULT_WIDTH = 0x9310;
-        public const int GL_FRAMEBUFFER_DEFAULT_HEIGHT = 0x9311;
-        public const int GL_FRAMEBUFFER_DEFAULT_LAYERS = 0x9312;
-        public const int GL_FRAMEBUFFER_DEFAULT_SAMPLES = 0x9313;
-        public const int GL_FRAMEBUFFER_DEFAULT_FIXED_SAMPLE_LOCATIONS = 0x9314;
-        public const int GL_MAX_FRAMEBUFFER_WIDTH = 0x9315;
-        public const int GL_MAX_FRAMEBUFFER_HEIGHT = 0x9316;
-        public const int GL_MAX_FRAMEBUFFER_LAYERS = 0x9317;
-        public const int GL_MAX_FRAMEBUFFER_SAMPLES = 0x9318;
-        public const int GL_INTERNALFORMAT_SUPPORTED = 0x826F;
-        public const int GL_INTERNALFORMAT_PREFERRED = 0x8270;
-        public const int GL_INTERNALFORMAT_RED_SIZE = 0x8271;
-        public const int GL_INTERNALFORMAT_GREEN_SIZE = 0x8272;
-        public const int GL_INTERNALFORMAT_BLUE_SIZE = 0x8273;
-        public const int GL_INTERNALFORMAT_ALPHA_SIZE = 0x8274;
-        public const int GL_INTERNALFORMAT_DEPTH_SIZE = 0x8275;
-        public const int GL_INTERNALFORMAT_STENCIL_SIZE = 0x8276;
-        public const int GL_INTERNALFORMAT_SHARED_SIZE = 0x8277;
-        public const int GL_INTERNALFORMAT_RED_TYPE = 0x8278;
-        public const int GL_INTERNALFORMAT_GREEN_TYPE = 0x8279;
-        public const int GL_INTERNALFORMAT_BLUE_TYPE = 0x827A;
-        public const int GL_INTERNALFORMAT_ALPHA_TYPE = 0x827B;
-        public const int GL_INTERNALFORMAT_DEPTH_TYPE = 0x827C;
-        public const int GL_INTERNALFORMAT_STENCIL_TYPE = 0x827D;
-        public const int GL_MAX_WIDTH = 0x827E;
-        public const int GL_MAX_HEIGHT = 0x827F;
-        public const int GL_MAX_DEPTH = 0x8280;
-        public const int GL_MAX_LAYERS = 0x8281;
-        public const int GL_MAX_COMBINED_DIMENSIONS = 0x8282;
-        public const int GL_COLOR_COMPONENTS = 0x8283;
-        public const int GL_DEPTH_COMPONENTS = 0x8284;
-        public const int GL_STENCIL_COMPONENTS = 0x8285;
-        public const int GL_COLOR_RENDERABLE = 0x8286;
-        public const int GL_DEPTH_RENDERABLE = 0x8287;
-        public const int GL_STENCIL_RENDERABLE = 0x8288;
-        public const int GL_FRAMEBUFFER_RENDERABLE = 0x8289;
-        public const int GL_FRAMEBUFFER_RENDERABLE_LAYERED = 0x828A;
-        public const int GL_FRAMEBUFFER_BLEND = 0x828B;
-        public const int GL_READ_PIXELS = 0x828C;
-        public const int GL_READ_PIXELS_FORMAT = 0x828D;
-        public const int GL_READ_PIXELS_TYPE = 0x828E;
-        public const int GL_TEXTURE_IMAGE_FORMAT = 0x828F;
-        public const int GL_TEXTURE_IMAGE_TYPE = 0x8290;
-        public const int GL_GET_TEXTURE_IMAGE_FORMAT = 0x8291;
-        public const int GL_GET_TEXTURE_IMAGE_TYPE = 0x8292;
-        public const int GL_MIPMAP = 0x8293;
-        public const int GL_MANUAL_GENERATE_MIPMAP = 0x8294;
-        public const int GL_AUTO_GENERATE_MIPMAP = 0x8295;
-        public const int GL_COLOR_ENCODING = 0x8296;
-        public const int GL_SRGB_READ = 0x8297;
-        public const int GL_SRGB_WRITE = 0x8298;
-        public const int GL_FILTER = 0x829A;
-        public const int GL_VERTEX_TEXTURE = 0x829B;
-        public const int GL_TESS_CONTROL_TEXTURE = 0x829C;
-        public const int GL_TESS_EVALUATION_TEXTURE = 0x829D;
-        public const int GL_GEOMETRY_TEXTURE = 0x829E;
-        public const int GL_FRAGMENT_TEXTURE = 0x829F;
-        public const int GL_COMPUTE_TEXTURE = 0x82A0;
-        public const int GL_TEXTURE_SHADOW = 0x82A1;
-        public const int GL_TEXTURE_GATHER = 0x82A2;
-        public const int GL_TEXTURE_GATHER_SHADOW = 0x82A3;
-        public const int GL_SHADER_IMAGE_LOAD = 0x82A4;
-        public const int GL_SHADER_IMAGE_STORE = 0x82A5;
-        public const int GL_SHADER_IMAGE_ATOMIC = 0x82A6;
-        public const int GL_IMAGE_TEXEL_SIZE = 0x82A7;
-        public const int GL_IMAGE_COMPATIBILITY_CLASS = 0x82A8;
-        public const int GL_IMAGE_PIXEL_FORMAT = 0x82A9;
-        public const int GL_IMAGE_PIXEL_TYPE = 0x82AA;
-        public const int GL_SIMULTANEOUS_TEXTURE_AND_DEPTH_TEST = 0x82AC;
-        public const int GL_SIMULTANEOUS_TEXTURE_AND_STENCIL_TEST = 0x82AD;
-        public const int GL_SIMULTANEOUS_TEXTURE_AND_DEPTH_WRITE = 0x82AE;
-        public const int GL_SIMULTANEOUS_TEXTURE_AND_STENCIL_WRITE = 0x82AF;
-        public const int GL_TEXTURE_COMPRESSED_BLOCK_WIDTH = 0x82B1;
-        public const int GL_TEXTURE_COMPRESSED_BLOCK_HEIGHT = 0x82B2;
-        public const int GL_TEXTURE_COMPRESSED_BLOCK_SIZE = 0x82B3;
-        public const int GL_CLEAR_BUFFER = 0x82B4;
-        public const int GL_TEXTURE_VIEW = 0x82B5;
-        public const int GL_VIEW_COMPATIBILITY_CLASS = 0x82B6;
-        public const int GL_FULL_SUPPORT = 0x82B7;
-        public const int GL_CAVEAT_SUPPORT = 0x82B8;
-        public const int GL_IMAGE_CLASS_4_X_32 = 0x82B9;
-        public const int GL_IMAGE_CLASS_2_X_32 = 0x82BA;
-        public const int GL_IMAGE_CLASS_1_X_32 = 0x82BB;
-        public const int GL_IMAGE_CLASS_4_X_16 = 0x82BC;
-        public const int GL_IMAGE_CLASS_2_X_16 = 0x82BD;
-        public const int GL_IMAGE_CLASS_1_X_16 = 0x82BE;
-        public const int GL_IMAGE_CLASS_4_X_8 = 0x82BF;
-        public const int GL_IMAGE_CLASS_2_X_8 = 0x82C0;
-        public const int GL_IMAGE_CLASS_1_X_8 = 0x82C1;
-        public const int GL_IMAGE_CLASS_11_11_10 = 0x82C2;
-        public const int GL_IMAGE_CLASS_10_10_10_2 = 0x82C3;
-        public const int GL_VIEW_CLASS_128_BITS = 0x82C4;
-        public const int GL_VIEW_CLASS_96_BITS = 0x82C5;
-        public const int GL_VIEW_CLASS_64_BITS = 0x82C6;
-        public const int GL_VIEW_CLASS_48_BITS = 0x82C7;
-        public const int GL_VIEW_CLASS_32_BITS = 0x82C8;
-        public const int GL_VIEW_CLASS_24_BITS = 0x82C9;
-        public const int GL_VIEW_CLASS_16_BITS = 0x82CA;
-        public const int GL_VIEW_CLASS_8_BITS = 0x82CB;
-        public const int GL_VIEW_CLASS_S3TC_DXT1_RGB = 0x82CC;
-        public const int GL_VIEW_CLASS_S3TC_DXT1_RGBA = 0x82CD;
-        public const int GL_VIEW_CLASS_S3TC_DXT3_RGBA = 0x82CE;
-        public const int GL_VIEW_CLASS_S3TC_DXT5_RGBA = 0x82CF;
-        public const int GL_VIEW_CLASS_RGTC1_RED = 0x82D0;
-        public const int GL_VIEW_CLASS_RGTC2_RG = 0x82D1;
-        public const int GL_VIEW_CLASS_BPTC_UNORM = 0x82D2;
-        public const int GL_VIEW_CLASS_BPTC_FLOAT = 0x82D3;
-        public const int GL_UNIFORM = 0x92E1;
-        public const int GL_UNIFORM_BLOCK = 0x92E2;
-        public const int GL_PROGRAM_INPUT = 0x92E3;
-        public const int GL_PROGRAM_OUTPUT = 0x92E4;
-        public const int GL_BUFFER_VARIABLE = 0x92E5;
-        public const int GL_SHADER_STORAGE_BLOCK = 0x92E6;
-        public const int GL_VERTEX_SUBROUTINE = 0x92E8;
-        public const int GL_TESS_CONTROL_SUBROUTINE = 0x92E9;
-        public const int GL_TESS_EVALUATION_SUBROUTINE = 0x92EA;
-        public const int GL_GEOMETRY_SUBROUTINE = 0x92EB;
-        public const int GL_FRAGMENT_SUBROUTINE = 0x92EC;
-        public const int GL_COMPUTE_SUBROUTINE = 0x92ED;
-        public const int GL_VERTEX_SUBROUTINE_UNIFORM = 0x92EE;
-        public const int GL_TESS_CONTROL_SUBROUTINE_UNIFORM = 0x92EF;
-        public const int GL_TESS_EVALUATION_SUBROUTINE_UNIFORM = 0x92F0;
-        public const int GL_GEOMETRY_SUBROUTINE_UNIFORM = 0x92F1;
-        public const int GL_FRAGMENT_SUBROUTINE_UNIFORM = 0x92F2;
-        public const int GL_COMPUTE_SUBROUTINE_UNIFORM = 0x92F3;
-        public const int GL_TRANSFORM_FEEDBACK_VARYING = 0x92F4;
-        public const int GL_ACTIVE_RESOURCES = 0x92F5;
-        public const int GL_MAX_NAME_LENGTH = 0x92F6;
-        public const int GL_MAX_NUM_ACTIVE_VARIABLES = 0x92F7;
-        public const int GL_MAX_NUM_COMPATIBLE_SUBROUTINES = 0x92F8;
-        public const int GL_NAME_LENGTH = 0x92F9;
-        public const int GL_TYPE = 0x92FA;
-        public const int GL_ARRAY_SIZE = 0x92FB;
-        public const int GL_OFFSET = 0x92FC;
-        public const int GL_BLOCK_INDEX = 0x92FD;
-        public const int GL_ARRAY_STRIDE = 0x92FE;
-        public const int GL_MATRIX_STRIDE = 0x92FF;
-        public const int GL_IS_ROW_MAJOR = 0x9300;
-        public const int GL_ATOMIC_COUNTER_BUFFER_INDEX = 0x9301;
-        public const int GL_BUFFER_BINDING = 0x9302;
-        public const int GL_BUFFER_DATA_SIZE = 0x9303;
-        public const int GL_NUM_ACTIVE_VARIABLES = 0x9304;
-        public const int GL_ACTIVE_VARIABLES = 0x9305;
-        public const int GL_REFERENCED_BY_VERTEX_SHADER = 0x9306;
-        public const int GL_REFERENCED_BY_TESS_CONTROL_SHADER = 0x9307;
-        public const int GL_REFERENCED_BY_TESS_EVALUATION_SHADER = 0x9308;
-        public const int GL_REFERENCED_BY_GEOMETRY_SHADER = 0x9309;
-        public const int GL_REFERENCED_BY_FRAGMENT_SHADER = 0x930A;
-        public const int GL_REFERENCED_BY_COMPUTE_SHADER = 0x930B;
-        public const int GL_TOP_LEVEL_ARRAY_SIZE = 0x930C;
-        public const int GL_TOP_LEVEL_ARRAY_STRIDE = 0x930D;
-        public const int GL_LOCATION = 0x930E;
-        public const int GL_LOCATION_INDEX = 0x930F;
-        public const int GL_IS_PER_PATCH = 0x92E7;
-        public const int GL_SHADER_STORAGE_BUFFER = 0x90D2;
-        public const int GL_SHADER_STORAGE_BUFFER_BINDING = 0x90D3;
-        public const int GL_SHADER_STORAGE_BUFFER_START = 0x90D4;
-        public const int GL_SHADER_STORAGE_BUFFER_SIZE = 0x90D5;
-        public const int GL_MAX_VERTEX_SHADER_STORAGE_BLOCKS = 0x90D6;
-        public const int GL_MAX_GEOMETRY_SHADER_STORAGE_BLOCKS = 0x90D7;
-        public const int GL_MAX_TESS_CONTROL_SHADER_STORAGE_BLOCKS = 0x90D8;
-        public const int GL_MAX_TESS_EVALUATION_SHADER_STORAGE_BLOCKS = 0x90D9;
-        public const int GL_MAX_FRAGMENT_SHADER_STORAGE_BLOCKS = 0x90DA;
-        public const int GL_MAX_COMPUTE_SHADER_STORAGE_BLOCKS = 0x90DB;
-        public const int GL_MAX_COMBINED_SHADER_STORAGE_BLOCKS = 0x90DC;
-        public const int GL_MAX_SHADER_STORAGE_BUFFER_BINDINGS = 0x90DD;
-        public const int GL_MAX_SHADER_STORAGE_BLOCK_SIZE = 0x90DE;
-        public const int GL_SHADER_STORAGE_BUFFER_OFFSET_ALIGNMENT = 0x90DF;
-        public const int GL_SHADER_STORAGE_BARRIER_BIT = 0x00002000;
-        public const int GL_MAX_COMBINED_SHADER_OUTPUT_RESOURCES = 0x8F39;
-        public const int GL_DEPTH_STENCIL_TEXTURE_MODE = 0x90EA;
-        public const int GL_TEXTURE_BUFFER_OFFSET = 0x919D;
-        public const int GL_TEXTURE_BUFFER_SIZE = 0x919E;
-        public const int GL_TEXTURE_BUFFER_OFFSET_ALIGNMENT = 0x919F;
-        public const int GL_TEXTURE_VIEW_MIN_LEVEL = 0x82DB;
-        public const int GL_TEXTURE_VIEW_NUM_LEVELS = 0x82DC;
-        public const int GL_TEXTURE_VIEW_MIN_LAYER = 0x82DD;
-        public const int GL_TEXTURE_VIEW_NUM_LAYERS = 0x82DE;
-        public const int GL_TEXTURE_IMMUTABLE_LEVELS = 0x82DF;
-        public const int GL_VERTEX_ATTRIB_BINDING = 0x82D4;
-        public const int GL_VERTEX_ATTRIB_RELATIVE_OFFSET = 0x82D5;
-        public const int GL_VERTEX_BINDING_DIVISOR = 0x82D6;
-        public const int GL_VERTEX_BINDING_OFFSET = 0x82D7;
-        public const int GL_VERTEX_BINDING_STRIDE = 0x82D8;
-        public const int GL_MAX_VERTEX_ATTRIB_RELATIVE_OFFSET = 0x82D9;
-        public const int GL_MAX_VERTEX_ATTRIB_BINDINGS = 0x82DA;
-        public const int GL_VERTEX_BINDING_BUFFER = 0x8F4F;
-        public const int GL_DISPLAY_LIST = 0x82E7;
-        public const int GL_VERSION_4_4 = 1;
-        public const int GL_MAX_VERTEX_ATTRIB_STRIDE = 0x82E5;
-        public const int GL_PRIMITIVE_RESTART_FOR_PATCHES_SUPPORTED = 0x8221;
-        public const int GL_TEXTURE_BUFFER_BINDING = 0x8C2A;
-        public const int GL_MAP_PERSISTENT_BIT = 0x0040;
-        public const int GL_MAP_COHERENT_BIT = 0x0080;
-        public const int GL_DYNAMIC_STORAGE_BIT = 0x0100;
-        public const int GL_CLIENT_STORAGE_BIT = 0x0200;
-        public const int GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT = 0x00004000;
-        public const int GL_BUFFER_IMMUTABLE_STORAGE = 0x821F;
-        public const int GL_BUFFER_STORAGE_FLAGS = 0x8220;
-        public const int GL_CLEAR_TEXTURE = 0x9365;
-        public const int GL_LOCATION_COMPONENT = 0x934A;
-        public const int GL_TRANSFORM_FEEDBACK_BUFFER_INDEX = 0x934B;
-        public const int GL_TRANSFORM_FEEDBACK_BUFFER_STRIDE = 0x934C;
-        public const int GL_QUERY_BUFFER = 0x9192;
-        public const int GL_QUERY_BUFFER_BARRIER_BIT = 0x00008000;
-        public const int GL_QUERY_BUFFER_BINDING = 0x9193;
-        public const int GL_QUERY_RESULT_NO_WAIT = 0x9194;
-        public const int GL_MIRROR_CLAMP_TO_EDGE = 0x8743;
-        public const int GL_NEGATIVE_ONE_TO_ONE = 0x935E;
-        public const int GL_ZERO_TO_ONE = 0x935F;
-        public const int GL_CLIP_ORIGIN = 0x935C;
-        public const int GL_CLIP_DEPTH_MODE = 0x935D;
-        public const int GL_QUERY_WAIT_INVERTED = 0x8E17;
-        public const int GL_QUERY_NO_WAIT_INVERTED = 0x8E18;
-        public const int GL_QUERY_BY_REGION_WAIT_INVERTED = 0x8E19;
-        public const int GL_QUERY_BY_REGION_NO_WAIT_INVERTED = 0x8E1A;
-        public const int GL_MAX_CULL_DISTANCES = 0x82F9;
-        public const int GL_MAX_COMBINED_CLIP_AND_CULL_DISTANCES = 0x82FA;
-        public const int GL_TEXTURE_TARGET = 0x1006;
-        public const int GL_QUERY_TARGET = 0x82EA;
-        public const int GL_GUILTY_CONTEXT_RESET = 0x8253;
-        public const int GL_INNOCENT_CONTEXT_RESET = 0x8254;
-        public const int GL_UNKNOWN_CONTEXT_RESET = 0x8255;
-        public const int GL_RESET_NOTIFICATION_STRATEGY = 0x8256;
-        public const int GL_LOSE_CONTEXT_ON_RESET = 0x8252;
-        public const int GL_NO_RESET_NOTIFICATION = 0x8261;
-        public const int GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT = 0x00000004;
-        public const int GL_CONTEXT_RELEASE_BEHAVIOR = 0x82FB;
-        public const int GL_CONTEXT_RELEASE_BEHAVIOR_FLUSH = 0x82FC;
-        public const int GL_VERSION_4_6 = 1;
-        public const int GL_SHADER_BINARY_FORMAT_SPIR_V = 0x9551;
-        public const int GL_SPIR_V_BINARY = 0x9552;
-        public const int GL_PARAMETER_BUFFER = 0x80EE;
-        public const int GL_PARAMETER_BUFFER_BINDING = 0x80EF;
-        public const int GL_CONTEXT_FLAG_NO_ERROR_BIT = 0x00000008;
-        public const int GL_VERTICES_SUBMITTED = 0x82EE;
-        public const int GL_PRIMITIVES_SUBMITTED = 0x82EF;
-        public const int GL_VERTEX_SHADER_INVOCATIONS = 0x82F0;
-        public const int GL_TESS_CONTROL_SHADER_PATCHES = 0x82F1;
-        public const int GL_TESS_EVALUATION_SHADER_INVOCATIONS = 0x82F2;
-        public const int GL_GEOMETRY_SHADER_PRIMITIVES_EMITTED = 0x82F3;
-        public const int GL_FRAGMENT_SHADER_INVOCATIONS = 0x82F4;
-        public const int GL_COMPUTE_SHADER_INVOCATIONS = 0x82F5;
-        public const int GL_CLIPPING_INPUT_PRIMITIVES = 0x82F6;
-        public const int GL_CLIPPING_OUTPUT_PRIMITIVES = 0x82F7;
-        public const int GL_POLYGON_OFFSET_CLAMP = 0x8E1B;
-        public const int GL_SPIR_V_EXTENSIONS = 0x9553;
-        public const int GL_NUM_SPIR_V_EXTENSIONS = 0x9554;
-        public const int GL_TEXTURE_MAX_ANISOTROPY = 0x84FE;
-        public const int GL_MAX_TEXTURE_MAX_ANISOTROPY = 0x84FF;
-        public const int GL_TRANSFORM_FEEDBACK_OVERFLOW = 0x82EC;
-        public const int GL_TRANSFORM_FEEDBACK_STREAM_OVERFLOW = 0x82ED;
-        public const int GL_ARB_ES2_compatibility = 1;
-        public const int GL_ARB_ES3_1_compatibility = 1;
-        public const int GL_ARB_ES3_2_compatibility = 1;
-        public const int GL_PRIMITIVE_BOUNDING_BOX_ARB = 0x92BE;
-        public const int GL_MULTISAMPLE_LINE_WIDTH_RANGE_ARB = 0x9381;
-        public const int GL_MULTISAMPLE_LINE_WIDTH_GRANULARITY_ARB = 0x9382;
-        public const int GL_ARB_ES3_compatibility = 1;
-        public const int GL_ARB_arrays_of_arrays = 1;
-        public const int GL_ARB_base_instance = 1;
-        public const int GL_ARB_bindless_texture = 1;
-        public const int GL_UNSIGNED_INT64_ARB = 0x140F;
-        public const int GL_ARB_blend_func_extended = 1;
-        public const int GL_ARB_buffer_storage = 1;
-        public const int GL_ARB_cl_event = 1;
-        public const int GL_SYNC_CL_EVENT_ARB = 0x8240;
-        public const int GL_SYNC_CL_EVENT_COMPLETE_ARB = 0x8241;
-        public const int GL_ARB_clear_buffer_object = 1;
-        public const int GL_ARB_clear_texture = 1;
-        public const int GL_ARB_clip_control = 1;
-        public const int GL_ARB_color_buffer_float = 1;
-        public const int GL_RGBA_FLOAT_MODE_ARB = 0x8820;
-        public const int GL_CLAMP_VERTEX_COLOR_ARB = 0x891A;
-        public const int GL_CLAMP_FRAGMENT_COLOR_ARB = 0x891B;
-        public const int GL_CLAMP_READ_COLOR_ARB = 0x891C;
-        public const int GL_FIXED_ONLY_ARB = 0x891D;
-        public const int GL_ARB_compatibility = 1;
-        public const int GL_ARB_compressed_texture_pixel_storage = 1;
-        public const int GL_ARB_compute_shader = 1;
-        public const int GL_ARB_compute_variable_group_size = 1;
-        public const int GL_MAX_COMPUTE_VARIABLE_GROUP_INVOCATIONS_ARB = 0x9344;
-        public const int GL_MAX_COMPUTE_FIXED_GROUP_INVOCATIONS_ARB = 0x90EB;
-        public const int GL_MAX_COMPUTE_VARIABLE_GROUP_SIZE_ARB = 0x9345;
-        public const int GL_MAX_COMPUTE_FIXED_GROUP_SIZE_ARB = 0x91BF;
-        public const int GL_ARB_conditional_render_inverted = 1;
-        public const int GL_ARB_conservative_depth = 1;
-        public const int GL_ARB_copy_buffer = 1;
-        public const int GL_ARB_copy_image = 1;
-        public const int GL_ARB_cull_distance = 1;
-        public const int GL_ARB_debug_output = 1;
-        public const int GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB = 0x8242;
-        public const int GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_ARB = 0x8243;
-        public const int GL_DEBUG_CALLBACK_FUNCTION_ARB = 0x8244;
-        public const int GL_DEBUG_CALLBACK_USER_PARAM_ARB = 0x8245;
-        public const int GL_DEBUG_SOURCE_API_ARB = 0x8246;
-        public const int GL_DEBUG_SOURCE_WINDOW_SYSTEM_ARB = 0x8247;
-        public const int GL_DEBUG_SOURCE_SHADER_COMPILER_ARB = 0x8248;
-        public const int GL_DEBUG_SOURCE_THIRD_PARTY_ARB = 0x8249;
-        public const int GL_DEBUG_SOURCE_APPLICATION_ARB = 0x824A;
-        public const int GL_DEBUG_SOURCE_OTHER_ARB = 0x824B;
-        public const int GL_DEBUG_TYPE_ERROR_ARB = 0x824C;
-        public const int GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_ARB = 0x824D;
-        public const int GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_ARB = 0x824E;
-        public const int GL_DEBUG_TYPE_PORTABILITY_ARB = 0x824F;
-        public const int GL_DEBUG_TYPE_PERFORMANCE_ARB = 0x8250;
-        public const int GL_DEBUG_TYPE_OTHER_ARB = 0x8251;
-        public const int GL_MAX_DEBUG_MESSAGE_LENGTH_ARB = 0x9143;
-        public const int GL_MAX_DEBUG_LOGGED_MESSAGES_ARB = 0x9144;
-        public const int GL_DEBUG_LOGGED_MESSAGES_ARB = 0x9145;
-        public const int GL_DEBUG_SEVERITY_HIGH_ARB = 0x9146;
-        public const int GL_DEBUG_SEVERITY_MEDIUM_ARB = 0x9147;
-        public const int GL_DEBUG_SEVERITY_LOW_ARB = 0x9148;
-        public const int GL_ARB_depth_buffer_float = 1;
-        public const int GL_ARB_depth_clamp = 1;
-        public const int GL_ARB_depth_texture = 1;
-        public const int GL_DEPTH_COMPONENT16_ARB = 0x81A5;
-        public const int GL_DEPTH_COMPONENT24_ARB = 0x81A6;
-        public const int GL_DEPTH_COMPONENT32_ARB = 0x81A7;
-        public const int GL_TEXTURE_DEPTH_SIZE_ARB = 0x884A;
-        public const int GL_DEPTH_TEXTURE_MODE_ARB = 0x884B;
-        public const int GL_ARB_derivative_control = 1;
-        public const int GL_ARB_direct_state_access = 1;
-        public const int GL_ARB_draw_buffers = 1;
-        public const int GL_MAX_DRAW_BUFFERS_ARB = 0x8824;
-        public const int GL_DRAW_BUFFER0_ARB = 0x8825;
-        public const int GL_DRAW_BUFFER1_ARB = 0x8826;
-        public const int GL_DRAW_BUFFER2_ARB = 0x8827;
-        public const int GL_DRAW_BUFFER3_ARB = 0x8828;
-        public const int GL_DRAW_BUFFER4_ARB = 0x8829;
-        public const int GL_DRAW_BUFFER5_ARB = 0x882A;
-        public const int GL_DRAW_BUFFER6_ARB = 0x882B;
-        public const int GL_DRAW_BUFFER7_ARB = 0x882C;
-        public const int GL_DRAW_BUFFER8_ARB = 0x882D;
-        public const int GL_DRAW_BUFFER9_ARB = 0x882E;
-        public const int GL_DRAW_BUFFER10_ARB = 0x882F;
-        public const int GL_DRAW_BUFFER11_ARB = 0x8830;
-        public const int GL_DRAW_BUFFER12_ARB = 0x8831;
-        public const int GL_DRAW_BUFFER13_ARB = 0x8832;
-        public const int GL_DRAW_BUFFER14_ARB = 0x8833;
-        public const int GL_DRAW_BUFFER15_ARB = 0x8834;
-        public const int GL_ARB_draw_buffers_blend = 1;
-        public const int GL_ARB_draw_elements_base_vertex = 1;
-        public const int GL_ARB_draw_indirect = 1;
-        public const int GL_ARB_draw_instanced = 1;
-        public const int GL_ARB_enhanced_layouts = 1;
-        public const int GL_ARB_explicit_attrib_location = 1;
-        public const int GL_ARB_explicit_uniform_location = 1;
-        public const int GL_ARB_fragment_coord_conventions = 1;
-        public const int GL_ARB_fragment_layer_viewport = 1;
-        public const int GL_ARB_fragment_program = 1;
-        public const int GL_FRAGMENT_PROGRAM_ARB = 0x8804;
-        public const int GL_PROGRAM_FORMAT_ASCII_ARB = 0x8875;
-        public const int GL_PROGRAM_LENGTH_ARB = 0x8627;
-        public const int GL_PROGRAM_FORMAT_ARB = 0x8876;
-        public const int GL_PROGRAM_BINDING_ARB = 0x8677;
-        public const int GL_PROGRAM_INSTRUCTIONS_ARB = 0x88A0;
-        public const int GL_MAX_PROGRAM_INSTRUCTIONS_ARB = 0x88A1;
-        public const int GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB = 0x88A2;
-        public const int GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB = 0x88A3;
-        public const int GL_PROGRAM_TEMPORARIES_ARB = 0x88A4;
-        public const int GL_MAX_PROGRAM_TEMPORARIES_ARB = 0x88A5;
-        public const int GL_PROGRAM_NATIVE_TEMPORARIES_ARB = 0x88A6;
-        public const int GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB = 0x88A7;
-        public const int GL_PROGRAM_PARAMETERS_ARB = 0x88A8;
-        public const int GL_MAX_PROGRAM_PARAMETERS_ARB = 0x88A9;
-        public const int GL_PROGRAM_NATIVE_PARAMETERS_ARB = 0x88AA;
-        public const int GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB = 0x88AB;
-        public const int GL_PROGRAM_ATTRIBS_ARB = 0x88AC;
-        public const int GL_MAX_PROGRAM_ATTRIBS_ARB = 0x88AD;
-        public const int GL_PROGRAM_NATIVE_ATTRIBS_ARB = 0x88AE;
-        public const int GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB = 0x88AF;
-        public const int GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB = 0x88B4;
-        public const int GL_MAX_PROGRAM_ENV_PARAMETERS_ARB = 0x88B5;
-        public const int GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB = 0x88B6;
-        public const int GL_PROGRAM_ALU_INSTRUCTIONS_ARB = 0x8805;
-        public const int GL_PROGRAM_TEX_INSTRUCTIONS_ARB = 0x8806;
-        public const int GL_PROGRAM_TEX_INDIRECTIONS_ARB = 0x8807;
-        public const int GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB = 0x8808;
-        public const int GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB = 0x8809;
-        public const int GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB = 0x880A;
-        public const int GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB = 0x880B;
-        public const int GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB = 0x880C;
-        public const int GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB = 0x880D;
-        public const int GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB = 0x880E;
-        public const int GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB = 0x880F;
-        public const int GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB = 0x8810;
-        public const int GL_PROGRAM_STRING_ARB = 0x8628;
-        public const int GL_PROGRAM_ERROR_POSITION_ARB = 0x864B;
-        public const int GL_CURRENT_MATRIX_ARB = 0x8641;
-        public const int GL_TRANSPOSE_CURRENT_MATRIX_ARB = 0x88B7;
-        public const int GL_CURRENT_MATRIX_STACK_DEPTH_ARB = 0x8640;
-        public const int GL_MAX_PROGRAM_MATRICES_ARB = 0x862F;
-        public const int GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB = 0x862E;
-        public const int GL_MAX_TEXTURE_COORDS_ARB = 0x8871;
-        public const int GL_MAX_TEXTURE_IMAGE_UNITS_ARB = 0x8872;
-        public const int GL_PROGRAM_ERROR_STRING_ARB = 0x8874;
-        public const int GL_MATRIX0_ARB = 0x88C0;
-        public const int GL_MATRIX1_ARB = 0x88C1;
-        public const int GL_MATRIX2_ARB = 0x88C2;
-        public const int GL_MATRIX3_ARB = 0x88C3;
-        public const int GL_MATRIX4_ARB = 0x88C4;
-        public const int GL_MATRIX5_ARB = 0x88C5;
-        public const int GL_MATRIX6_ARB = 0x88C6;
-        public const int GL_MATRIX7_ARB = 0x88C7;
-        public const int GL_MATRIX8_ARB = 0x88C8;
-        public const int GL_MATRIX9_ARB = 0x88C9;
-        public const int GL_MATRIX10_ARB = 0x88CA;
-        public const int GL_MATRIX11_ARB = 0x88CB;
-        public const int GL_MATRIX12_ARB = 0x88CC;
-        public const int GL_MATRIX13_ARB = 0x88CD;
-        public const int GL_MATRIX14_ARB = 0x88CE;
-        public const int GL_MATRIX15_ARB = 0x88CF;
-        public const int GL_MATRIX16_ARB = 0x88D0;
-        public const int GL_MATRIX17_ARB = 0x88D1;
-        public const int GL_MATRIX18_ARB = 0x88D2;
-        public const int GL_MATRIX19_ARB = 0x88D3;
-        public const int GL_MATRIX20_ARB = 0x88D4;
-        public const int GL_MATRIX21_ARB = 0x88D5;
-        public const int GL_MATRIX22_ARB = 0x88D6;
-        public const int GL_MATRIX23_ARB = 0x88D7;
-        public const int GL_MATRIX24_ARB = 0x88D8;
-        public const int GL_MATRIX25_ARB = 0x88D9;
-        public const int GL_MATRIX26_ARB = 0x88DA;
-        public const int GL_MATRIX27_ARB = 0x88DB;
-        public const int GL_MATRIX28_ARB = 0x88DC;
-        public const int GL_MATRIX29_ARB = 0x88DD;
-        public const int GL_MATRIX30_ARB = 0x88DE;
-        public const int GL_MATRIX31_ARB = 0x88DF;
-        public const int GL_ARB_fragment_program_shadow = 1;
-        public const int GL_ARB_fragment_shader = 1;
-        public const int GL_FRAGMENT_SHADER_ARB = 0x8B30;
-        public const int GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB = 0x8B49;
-        public const int GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB = 0x8B8B;
-        public const int GL_ARB_fragment_shader_interlock = 1;
-        public const int GL_ARB_framebuffer_no_attachments = 1;
-        public const int GL_ARB_framebuffer_object = 1;
-        public const int GL_ARB_framebuffer_sRGB = 1;
-        public const int GL_ARB_geometry_shader4 = 1;
-        public const int GL_LINES_ADJACENCY_ARB = 0x000A;
-        public const int GL_LINE_STRIP_ADJACENCY_ARB = 0x000B;
-        public const int GL_TRIANGLES_ADJACENCY_ARB = 0x000C;
-        public const int GL_TRIANGLE_STRIP_ADJACENCY_ARB = 0x000D;
-        public const int GL_PROGRAM_POINT_SIZE_ARB = 0x8642;
-        public const int GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB = 0x8C29;
-        public const int GL_FRAMEBUFFER_ATTACHMENT_LAYERED_ARB = 0x8DA7;
-        public const int GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_ARB = 0x8DA8;
-        public const int GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB = 0x8DA9;
-        public const int GL_GEOMETRY_SHADER_ARB = 0x8DD9;
-        public const int GL_GEOMETRY_VERTICES_OUT_ARB = 0x8DDA;
-        public const int GL_GEOMETRY_INPUT_TYPE_ARB = 0x8DDB;
-        public const int GL_GEOMETRY_OUTPUT_TYPE_ARB = 0x8DDC;
-        public const int GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB = 0x8DDD;
-        public const int GL_MAX_VERTEX_VARYING_COMPONENTS_ARB = 0x8DDE;
-        public const int GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB = 0x8DDF;
-        public const int GL_MAX_GEOMETRY_OUTPUT_VERTICES_ARB = 0x8DE0;
-        public const int GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB = 0x8DE1;
-        public const int GL_ARB_get_program_binary = 1;
-        public const int GL_ARB_get_texture_sub_image = 1;
-        public const int GL_ARB_gl_spirv = 1;
-        public const int GL_SHADER_BINARY_FORMAT_SPIR_V_ARB = 0x9551;
-        public const int GL_SPIR_V_BINARY_ARB = 0x9552;
-        public const int GL_ARB_gpu_shader5 = 1;
-        public const int GL_ARB_gpu_shader_fp64 = 1;
-        public const int GL_ARB_gpu_shader_int64 = 1;
-        public const int GL_INT64_ARB = 0x140E;
-        public const int GL_INT64_VEC2_ARB = 0x8FE9;
-        public const int GL_INT64_VEC3_ARB = 0x8FEA;
-        public const int GL_INT64_VEC4_ARB = 0x8FEB;
-        public const int GL_UNSIGNED_INT64_VEC2_ARB = 0x8FF5;
-        public const int GL_UNSIGNED_INT64_VEC3_ARB = 0x8FF6;
-        public const int GL_UNSIGNED_INT64_VEC4_ARB = 0x8FF7;
-        public const int GL_ARB_half_float_pixel = 1;
-        public const int GL_HALF_FLOAT_ARB = 0x140B;
-        public const int GL_ARB_half_float_vertex = 1;
-        public const int GL_ARB_imaging = 1;
-        public const int GL_ARB_indirect_parameters = 1;
-        public const int GL_PARAMETER_BUFFER_ARB = 0x80EE;
-        public const int GL_PARAMETER_BUFFER_BINDING_ARB = 0x80EF;
-        public const int GL_ARB_instanced_arrays = 1;
-        public const int GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB = 0x88FE;
-        public const int GL_ARB_internalformat_query = 1;
-        public const int GL_ARB_internalformat_query2 = 1;
-        public const int GL_SRGB_DECODE_ARB = 0x8299;
-        public const int GL_ARB_invalidate_subdata = 1;
-        public const int GL_ARB_map_buffer_alignment = 1;
-        public const int GL_ARB_map_buffer_range = 1;
-        public const int GL_ARB_matrix_palette = 1;
-        public const int GL_MATRIX_PALETTE_ARB = 0x8840;
-        public const int GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB = 0x8841;
-        public const int GL_MAX_PALETTE_MATRICES_ARB = 0x8842;
-        public const int GL_CURRENT_PALETTE_MATRIX_ARB = 0x8843;
-        public const int GL_MATRIX_INDEX_ARRAY_ARB = 0x8844;
-        public const int GL_CURRENT_MATRIX_INDEX_ARB = 0x8845;
-        public const int GL_MATRIX_INDEX_ARRAY_SIZE_ARB = 0x8846;
-        public const int GL_MATRIX_INDEX_ARRAY_TYPE_ARB = 0x8847;
-        public const int GL_MATRIX_INDEX_ARRAY_STRIDE_ARB = 0x8848;
-        public const int GL_MATRIX_INDEX_ARRAY_POINTER_ARB = 0x8849;
-        public const int GL_ARB_multi_bind = 1;
-        public const int GL_ARB_multi_draw_indirect = 1;
-        public const int GL_ARB_multisample = 1;
-        public const int GL_MULTISAMPLE_ARB = 0x809D;
-        public const int GL_SAMPLE_ALPHA_TO_COVERAGE_ARB = 0x809E;
-        public const int GL_SAMPLE_ALPHA_TO_ONE_ARB = 0x809F;
-        public const int GL_SAMPLE_COVERAGE_ARB = 0x80A0;
-        public const int GL_SAMPLE_BUFFERS_ARB = 0x80A8;
-        public const int GL_SAMPLES_ARB = 0x80A9;
-        public const int GL_SAMPLE_COVERAGE_VALUE_ARB = 0x80AA;
-        public const int GL_SAMPLE_COVERAGE_INVERT_ARB = 0x80AB;
-        public const int GL_MULTISAMPLE_BIT_ARB = 0x20000000;
-        public const int GL_ARB_occlusion_query = 1;
-        public const int GL_QUERY_COUNTER_BITS_ARB = 0x8864;
-        public const int GL_CURRENT_QUERY_ARB = 0x8865;
-        public const int GL_QUERY_RESULT_ARB = 0x8866;
-        public const int GL_QUERY_RESULT_AVAILABLE_ARB = 0x8867;
-        public const int GL_SAMPLES_PASSED_ARB = 0x8914;
-        public const int GL_ARB_occlusion_query2 = 1;
-        public const int GL_ARB_parallel_shader_compile = 1;
-        public const int GL_MAX_SHADER_COMPILER_THREADS_ARB = 0x91B0;
-        public const int GL_COMPLETION_STATUS_ARB = 0x91B1;
-        public const int GL_ARB_pipeline_statistics_query = 1;
-        public const int GL_VERTICES_SUBMITTED_ARB = 0x82EE;
-        public const int GL_PRIMITIVES_SUBMITTED_ARB = 0x82EF;
-        public const int GL_VERTEX_SHADER_INVOCATIONS_ARB = 0x82F0;
-        public const int GL_TESS_CONTROL_SHADER_PATCHES_ARB = 0x82F1;
-        public const int GL_TESS_EVALUATION_SHADER_INVOCATIONS_ARB = 0x82F2;
-        public const int GL_GEOMETRY_SHADER_PRIMITIVES_EMITTED_ARB = 0x82F3;
-        public const int GL_FRAGMENT_SHADER_INVOCATIONS_ARB = 0x82F4;
-        public const int GL_COMPUTE_SHADER_INVOCATIONS_ARB = 0x82F5;
-        public const int GL_CLIPPING_INPUT_PRIMITIVES_ARB = 0x82F6;
-        public const int GL_CLIPPING_OUTPUT_PRIMITIVES_ARB = 0x82F7;
-        public const int GL_ARB_pixel_buffer_object = 1;
-        public const int GL_PIXEL_PACK_BUFFER_ARB = 0x88EB;
-        public const int GL_PIXEL_UNPACK_BUFFER_ARB = 0x88EC;
-        public const int GL_PIXEL_PACK_BUFFER_BINDING_ARB = 0x88ED;
-        public const int GL_PIXEL_UNPACK_BUFFER_BINDING_ARB = 0x88EF;
-        public const int GL_ARB_point_parameters = 1;
-        public const int GL_POINT_SIZE_MIN_ARB = 0x8126;
-        public const int GL_POINT_SIZE_MAX_ARB = 0x8127;
-        public const int GL_POINT_FADE_THRESHOLD_SIZE_ARB = 0x8128;
-        public const int GL_POINT_DISTANCE_ATTENUATION_ARB = 0x8129;
-        public const int GL_ARB_point_sprite = 1;
-        public const int GL_POINT_SPRITE_ARB = 0x8861;
-        public const int GL_COORD_REPLACE_ARB = 0x8862;
-        public const int GL_ARB_polygon_offset_clamp = 1;
-        public const int GL_ARB_post_depth_coverage = 1;
-        public const int GL_ARB_program_interface_query = 1;
-        public const int GL_ARB_provoking_vertex = 1;
-        public const int GL_ARB_query_buffer_object = 1;
-        public const int GL_ARB_robust_buffer_access_behavior = 1;
-        public const int GL_ARB_robustness = 1;
-        public const int GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT_ARB = 0x00000004;
-        public const int GL_LOSE_CONTEXT_ON_RESET_ARB = 0x8252;
-        public const int GL_GUILTY_CONTEXT_RESET_ARB = 0x8253;
-        public const int GL_INNOCENT_CONTEXT_RESET_ARB = 0x8254;
-        public const int GL_UNKNOWN_CONTEXT_RESET_ARB = 0x8255;
-        public const int GL_RESET_NOTIFICATION_STRATEGY_ARB = 0x8256;
-        public const int GL_NO_RESET_NOTIFICATION_ARB = 0x8261;
-        public const int GL_ARB_robustness_isolation = 1;
-        public const int GL_ARB_sample_locations = 1;
-        public const int GL_SAMPLE_LOCATION_SUBPIXEL_BITS_ARB = 0x933D;
-        public const int GL_SAMPLE_LOCATION_PIXEL_GRID_WIDTH_ARB = 0x933E;
-        public const int GL_SAMPLE_LOCATION_PIXEL_GRID_HEIGHT_ARB = 0x933F;
-        public const int GL_PROGRAMMABLE_SAMPLE_LOCATION_TABLE_SIZE_ARB = 0x9340;
-        public const int GL_SAMPLE_LOCATION_ARB = 0x8E50;
-        public const int GL_PROGRAMMABLE_SAMPLE_LOCATION_ARB = 0x9341;
-        public const int GL_FRAMEBUFFER_PROGRAMMABLE_SAMPLE_LOCATIONS_ARB = 0x9342;
-        public const int GL_FRAMEBUFFER_SAMPLE_LOCATION_PIXEL_GRID_ARB = 0x9343;
-        public const int GL_ARB_sample_shading = 1;
-        public const int GL_SAMPLE_SHADING_ARB = 0x8C36;
-        public const int GL_MIN_SAMPLE_SHADING_VALUE_ARB = 0x8C37;
-        public const int GL_ARB_sampler_objects = 1;
-        public const int GL_ARB_seamless_cube_map = 1;
-        public const int GL_ARB_seamless_cubemap_per_texture = 1;
-        public const int GL_ARB_separate_shader_objects = 1;
-        public const int GL_ARB_shader_atomic_counter_ops = 1;
-        public const int GL_ARB_shader_atomic_counters = 1;
-        public const int GL_ARB_shader_ballot = 1;
-        public const int GL_ARB_shader_bit_encoding = 1;
-        public const int GL_ARB_shader_clock = 1;
-        public const int GL_ARB_shader_draw_parameters = 1;
-        public const int GL_ARB_shader_group_vote = 1;
-        public const int GL_ARB_shader_image_load_store = 1;
-        public const int GL_ARB_shader_image_size = 1;
-        public const int GL_ARB_shader_objects = 1;
-        public const int GL_PROGRAM_OBJECT_ARB = 0x8B40;
-        public const int GL_SHADER_OBJECT_ARB = 0x8B48;
-        public const int GL_OBJECT_TYPE_ARB = 0x8B4E;
-        public const int GL_OBJECT_SUBTYPE_ARB = 0x8B4F;
-        public const int GL_FLOAT_VEC2_ARB = 0x8B50;
-        public const int GL_FLOAT_VEC3_ARB = 0x8B51;
-        public const int GL_FLOAT_VEC4_ARB = 0x8B52;
-        public const int GL_INT_VEC2_ARB = 0x8B53;
-        public const int GL_INT_VEC3_ARB = 0x8B54;
-        public const int GL_INT_VEC4_ARB = 0x8B55;
-        public const int GL_BOOL_ARB = 0x8B56;
-        public const int GL_BOOL_VEC2_ARB = 0x8B57;
-        public const int GL_BOOL_VEC3_ARB = 0x8B58;
-        public const int GL_BOOL_VEC4_ARB = 0x8B59;
-        public const int GL_FLOAT_MAT2_ARB = 0x8B5A;
-        public const int GL_FLOAT_MAT3_ARB = 0x8B5B;
-        public const int GL_FLOAT_MAT4_ARB = 0x8B5C;
-        public const int GL_SAMPLER_1D_ARB = 0x8B5D;
-        public const int GL_SAMPLER_2D_ARB = 0x8B5E;
-        public const int GL_SAMPLER_3D_ARB = 0x8B5F;
-        public const int GL_SAMPLER_CUBE_ARB = 0x8B60;
-        public const int GL_SAMPLER_1D_SHADOW_ARB = 0x8B61;
-        public const int GL_SAMPLER_2D_SHADOW_ARB = 0x8B62;
-        public const int GL_SAMPLER_2D_RECT_ARB = 0x8B63;
-        public const int GL_SAMPLER_2D_RECT_SHADOW_ARB = 0x8B64;
-        public const int GL_OBJECT_DELETE_STATUS_ARB = 0x8B80;
-        public const int GL_OBJECT_COMPILE_STATUS_ARB = 0x8B81;
-        public const int GL_OBJECT_LINK_STATUS_ARB = 0x8B82;
-        public const int GL_OBJECT_VALIDATE_STATUS_ARB = 0x8B83;
-        public const int GL_OBJECT_INFO_LOG_LENGTH_ARB = 0x8B84;
-        public const int GL_OBJECT_ATTACHED_OBJECTS_ARB = 0x8B85;
-        public const int GL_OBJECT_ACTIVE_UNIFORMS_ARB = 0x8B86;
-        public const int GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB = 0x8B87;
-        public const int GL_OBJECT_SHADER_SOURCE_LENGTH_ARB = 0x8B88;
-        public const int GL_ARB_shader_precision = 1;
-        public const int GL_ARB_shader_stencil_export = 1;
-        public const int GL_ARB_shader_storage_buffer_object = 1;
-        public const int GL_ARB_shader_subroutine = 1;
-        public const int GL_ARB_shader_texture_image_samples = 1;
-        public const int GL_ARB_shader_texture_lod = 1;
-        public const int GL_ARB_shader_viewport_layer_array = 1;
-        public const int GL_ARB_shading_language_100 = 1;
-        public const int GL_SHADING_LANGUAGE_VERSION_ARB = 0x8B8C;
-        public const int GL_ARB_shading_language_420pack = 1;
-        public const int GL_ARB_shading_language_include = 1;
-        public const int GL_SHADER_INCLUDE_ARB = 0x8DAE;
-        public const int GL_NAMED_STRING_LENGTH_ARB = 0x8DE9;
-        public const int GL_NAMED_STRING_TYPE_ARB = 0x8DEA;
-        public const int GL_ARB_shading_language_packing = 1;
-        public const int GL_ARB_shadow = 1;
-        public const int GL_TEXTURE_COMPARE_MODE_ARB = 0x884C;
-        public const int GL_TEXTURE_COMPARE_FUNC_ARB = 0x884D;
-        public const int GL_COMPARE_R_TO_TEXTURE_ARB = 0x884E;
-        public const int GL_ARB_shadow_ambient = 1;
-        public const int GL_TEXTURE_COMPARE_FAIL_VALUE_ARB = 0x80BF;
-        public const int GL_ARB_sparse_buffer = 1;
-        public const int GL_SPARSE_STORAGE_BIT_ARB = 0x0400;
-        public const int GL_SPARSE_BUFFER_PAGE_SIZE_ARB = 0x82F8;
-        public const int GL_ARB_sparse_texture = 1;
-        public const int GL_TEXTURE_SPARSE_ARB = 0x91A6;
-        public const int GL_VIRTUAL_PAGE_SIZE_INDEX_ARB = 0x91A7;
-        public const int GL_NUM_SPARSE_LEVELS_ARB = 0x91AA;
-        public const int GL_NUM_VIRTUAL_PAGE_SIZES_ARB = 0x91A8;
-        public const int GL_VIRTUAL_PAGE_SIZE_X_ARB = 0x9195;
-        public const int GL_VIRTUAL_PAGE_SIZE_Y_ARB = 0x9196;
-        public const int GL_VIRTUAL_PAGE_SIZE_Z_ARB = 0x9197;
-        public const int GL_MAX_SPARSE_TEXTURE_SIZE_ARB = 0x9198;
-        public const int GL_MAX_SPARSE_3D_TEXTURE_SIZE_ARB = 0x9199;
-        public const int GL_MAX_SPARSE_ARRAY_TEXTURE_LAYERS_ARB = 0x919A;
-        public const int GL_SPARSE_TEXTURE_FULL_ARRAY_CUBE_MIPMAPS_ARB = 0x91A9;
-        public const int GL_ARB_sparse_texture2 = 1;
-        public const int GL_ARB_sparse_texture_clamp = 1;
-        public const int GL_ARB_spirv_extensions = 1;
-        public const int GL_ARB_stencil_texturing = 1;
-        public const int GL_ARB_sync = 1;
-        public const int GL_ARB_tessellation_shader = 1;
-        public const int GL_ARB_texture_barrier = 1;
-        public const int GL_ARB_texture_border_clamp = 1;
-        public const int GL_CLAMP_TO_BORDER_ARB = 0x812D;
-        public const int GL_ARB_texture_buffer_object = 1;
-        public const int GL_TEXTURE_BUFFER_ARB = 0x8C2A;
-        public const int GL_MAX_TEXTURE_BUFFER_SIZE_ARB = 0x8C2B;
-        public const int GL_TEXTURE_BINDING_BUFFER_ARB = 0x8C2C;
-        public const int GL_TEXTURE_BUFFER_DATA_STORE_BINDING_ARB = 0x8C2D;
-        public const int GL_TEXTURE_BUFFER_FORMAT_ARB = 0x8C2E;
-        public const int GL_ARB_texture_buffer_object_rgb32 = 1;
-        public const int GL_ARB_texture_buffer_range = 1;
-        public const int GL_ARB_texture_compression = 1;
-        public const int GL_COMPRESSED_ALPHA_ARB = 0x84E9;
-        public const int GL_COMPRESSED_LUMINANCE_ARB = 0x84EA;
-        public const int GL_COMPRESSED_LUMINANCE_ALPHA_ARB = 0x84EB;
-        public const int GL_COMPRESSED_INTENSITY_ARB = 0x84EC;
-        public const int GL_COMPRESSED_RGB_ARB = 0x84ED;
-        public const int GL_COMPRESSED_RGBA_ARB = 0x84EE;
-        public const int GL_TEXTURE_COMPRESSION_HINT_ARB = 0x84EF;
-        public const int GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB = 0x86A0;
-        public const int GL_TEXTURE_COMPRESSED_ARB = 0x86A1;
-        public const int GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB = 0x86A2;
-        public const int GL_COMPRESSED_TEXTURE_FORMATS_ARB = 0x86A3;
-        public const int GL_ARB_texture_compression_bptc = 1;
-        public const int GL_COMPRESSED_RGBA_BPTC_UNORM_ARB = 0x8E8C;
-        public const int GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_ARB = 0x8E8D;
-        public const int GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_ARB = 0x8E8E;
-        public const int GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_ARB = 0x8E8F;
-        public const int GL_ARB_texture_compression_rgtc = 1;
-        public const int GL_ARB_texture_cube_map = 1;
-        public const int GL_NORMAL_MAP_ARB = 0x8511;
-        public const int GL_REFLECTION_MAP_ARB = 0x8512;
-        public const int GL_TEXTURE_CUBE_MAP_ARB = 0x8513;
-        public const int GL_TEXTURE_BINDING_CUBE_MAP_ARB = 0x8514;
-        public const int GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB = 0x8515;
-        public const int GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB = 0x8516;
-        public const int GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB = 0x8517;
-        public const int GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB = 0x8518;
-        public const int GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB = 0x8519;
-        public const int GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB = 0x851A;
-        public const int GL_PROXY_TEXTURE_CUBE_MAP_ARB = 0x851B;
-        public const int GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB = 0x851C;
-        public const int GL_ARB_texture_cube_map_array = 1;
-        public const int GL_TEXTURE_CUBE_MAP_ARRAY_ARB = 0x9009;
-        public const int GL_TEXTURE_BINDING_CUBE_MAP_ARRAY_ARB = 0x900A;
-        public const int GL_PROXY_TEXTURE_CUBE_MAP_ARRAY_ARB = 0x900B;
-        public const int GL_SAMPLER_CUBE_MAP_ARRAY_ARB = 0x900C;
-        public const int GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW_ARB = 0x900D;
-        public const int GL_INT_SAMPLER_CUBE_MAP_ARRAY_ARB = 0x900E;
-        public const int GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY_ARB = 0x900F;
-        public const int GL_ARB_texture_env_add = 1;
-        public const int GL_ARB_texture_env_combine = 1;
-        public const int GL_COMBINE_ARB = 0x8570;
-        public const int GL_COMBINE_RGB_ARB = 0x8571;
-        public const int GL_COMBINE_ALPHA_ARB = 0x8572;
-        public const int GL_SOURCE0_RGB_ARB = 0x8580;
-        public const int GL_SOURCE1_RGB_ARB = 0x8581;
-        public const int GL_SOURCE2_RGB_ARB = 0x8582;
-        public const int GL_SOURCE0_ALPHA_ARB = 0x8588;
-        public const int GL_SOURCE1_ALPHA_ARB = 0x8589;
-        public const int GL_SOURCE2_ALPHA_ARB = 0x858A;
-        public const int GL_OPERAND0_RGB_ARB = 0x8590;
-        public const int GL_OPERAND1_RGB_ARB = 0x8591;
-        public const int GL_OPERAND2_RGB_ARB = 0x8592;
-        public const int GL_OPERAND0_ALPHA_ARB = 0x8598;
-        public const int GL_OPERAND1_ALPHA_ARB = 0x8599;
-        public const int GL_OPERAND2_ALPHA_ARB = 0x859A;
-        public const int GL_RGB_SCALE_ARB = 0x8573;
-        public const int GL_ADD_SIGNED_ARB = 0x8574;
-        public const int GL_INTERPOLATE_ARB = 0x8575;
-        public const int GL_SUBTRACT_ARB = 0x84E7;
-        public const int GL_CONSTANT_ARB = 0x8576;
-        public const int GL_PRIMARY_COLOR_ARB = 0x8577;
-        public const int GL_PREVIOUS_ARB = 0x8578;
-        public const int GL_ARB_texture_env_crossbar = 1;
-        public const int GL_ARB_texture_env_dot3 = 1;
-        public const int GL_DOT3_RGB_ARB = 0x86AE;
-        public const int GL_DOT3_RGBA_ARB = 0x86AF;
-        public const int GL_ARB_texture_filter_anisotropic = 1;
-        public const int GL_ARB_texture_filter_minmax = 1;
-        public const int GL_TEXTURE_REDUCTION_MODE_ARB = 0x9366;
-        public const int GL_WEIGHTED_AVERAGE_ARB = 0x9367;
-        public const int GL_ARB_texture_float = 1;
-        public const int GL_TEXTURE_RED_TYPE_ARB = 0x8C10;
-        public const int GL_TEXTURE_GREEN_TYPE_ARB = 0x8C11;
-        public const int GL_TEXTURE_BLUE_TYPE_ARB = 0x8C12;
-        public const int GL_TEXTURE_ALPHA_TYPE_ARB = 0x8C13;
-        public const int GL_TEXTURE_LUMINANCE_TYPE_ARB = 0x8C14;
-        public const int GL_TEXTURE_INTENSITY_TYPE_ARB = 0x8C15;
-        public const int GL_TEXTURE_DEPTH_TYPE_ARB = 0x8C16;
-        public const int GL_UNSIGNED_NORMALIZED_ARB = 0x8C17;
-        public const int GL_RGBA32F_ARB = 0x8814;
-        public const int GL_RGB32F_ARB = 0x8815;
-        public const int GL_ALPHA32F_ARB = 0x8816;
-        public const int GL_INTENSITY32F_ARB = 0x8817;
-        public const int GL_LUMINANCE32F_ARB = 0x8818;
-        public const int GL_LUMINANCE_ALPHA32F_ARB = 0x8819;
-        public const int GL_RGBA16F_ARB = 0x881A;
-        public const int GL_RGB16F_ARB = 0x881B;
-        public const int GL_ALPHA16F_ARB = 0x881C;
-        public const int GL_INTENSITY16F_ARB = 0x881D;
-        public const int GL_LUMINANCE16F_ARB = 0x881E;
-        public const int GL_LUMINANCE_ALPHA16F_ARB = 0x881F;
-        public const int GL_ARB_texture_gather = 1;
-        public const int GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET_ARB = 0x8E5E;
-        public const int GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET_ARB = 0x8E5F;
-        public const int GL_MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS_ARB = 0x8F9F;
-        public const int GL_ARB_texture_mirror_clamp_to_edge = 1;
-        public const int GL_ARB_texture_mirrored_repeat = 1;
-        public const int GL_MIRRORED_REPEAT_ARB = 0x8370;
-        public const int GL_ARB_texture_multisample = 1;
-        public const int GL_ARB_texture_non_power_of_two = 1;
-        public const int GL_ARB_texture_query_levels = 1;
-        public const int GL_ARB_texture_query_lod = 1;
-        public const int GL_ARB_texture_rectangle = 1;
-        public const int GL_TEXTURE_RECTANGLE_ARB = 0x84F5;
-        public const int GL_TEXTURE_BINDING_RECTANGLE_ARB = 0x84F6;
-        public const int GL_PROXY_TEXTURE_RECTANGLE_ARB = 0x84F7;
-        public const int GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB = 0x84F8;
-        public const int GL_ARB_texture_rg = 1;
-        public const int GL_ARB_texture_rgb10_a2ui = 1;
-        public const int GL_ARB_texture_stencil8 = 1;
-        public const int GL_ARB_texture_storage = 1;
-        public const int GL_ARB_texture_storage_multisample = 1;
-        public const int GL_ARB_texture_swizzle = 1;
-        public const int GL_ARB_texture_view = 1;
-        public const int GL_ARB_timer_query = 1;
-        public const int GL_ARB_transform_feedback2 = 1;
-        public const int GL_ARB_transform_feedback3 = 1;
-        public const int GL_ARB_transform_feedback_instanced = 1;
-        public const int GL_ARB_transform_feedback_overflow_query = 1;
-        public const int GL_TRANSFORM_FEEDBACK_OVERFLOW_ARB = 0x82EC;
-        public const int GL_TRANSFORM_FEEDBACK_STREAM_OVERFLOW_ARB = 0x82ED;
-        public const int GL_ARB_transpose_matrix = 1;
-        public const int GL_TRANSPOSE_MODELVIEW_MATRIX_ARB = 0x84E3;
-        public const int GL_TRANSPOSE_PROJECTION_MATRIX_ARB = 0x84E4;
-        public const int GL_TRANSPOSE_TEXTURE_MATRIX_ARB = 0x84E5;
-        public const int GL_TRANSPOSE_COLOR_MATRIX_ARB = 0x84E6;
-        public const int GL_ARB_uniform_buffer_object = 1;
-        public const int GL_ARB_vertex_array_bgra = 1;
-        public const int GL_ARB_vertex_array_object = 1;
-        public const int GL_ARB_vertex_attrib_64bit = 1;
-        public const int GL_ARB_vertex_attrib_binding = 1;
-        public const int GL_ARB_vertex_blend = 1;
-        public const int GL_MAX_VERTEX_UNITS_ARB = 0x86A4;
-        public const int GL_ACTIVE_VERTEX_UNITS_ARB = 0x86A5;
-        public const int GL_WEIGHT_SUM_UNITY_ARB = 0x86A6;
-        public const int GL_VERTEX_BLEND_ARB = 0x86A7;
-        public const int GL_CURRENT_WEIGHT_ARB = 0x86A8;
-        public const int GL_WEIGHT_ARRAY_TYPE_ARB = 0x86A9;
-        public const int GL_WEIGHT_ARRAY_STRIDE_ARB = 0x86AA;
-        public const int GL_WEIGHT_ARRAY_SIZE_ARB = 0x86AB;
-        public const int GL_WEIGHT_ARRAY_POINTER_ARB = 0x86AC;
-        public const int GL_WEIGHT_ARRAY_ARB = 0x86AD;
-        public const int GL_MODELVIEW0_ARB = 0x1700;
-        public const int GL_MODELVIEW1_ARB = 0x850A;
-        public const int GL_MODELVIEW2_ARB = 0x8722;
-        public const int GL_MODELVIEW3_ARB = 0x8723;
-        public const int GL_MODELVIEW4_ARB = 0x8724;
-        public const int GL_MODELVIEW5_ARB = 0x8725;
-        public const int GL_MODELVIEW6_ARB = 0x8726;
-        public const int GL_MODELVIEW7_ARB = 0x8727;
-        public const int GL_MODELVIEW8_ARB = 0x8728;
-        public const int GL_MODELVIEW9_ARB = 0x8729;
-        public const int GL_MODELVIEW10_ARB = 0x872A;
-        public const int GL_MODELVIEW11_ARB = 0x872B;
-        public const int GL_MODELVIEW12_ARB = 0x872C;
-        public const int GL_MODELVIEW13_ARB = 0x872D;
-        public const int GL_MODELVIEW14_ARB = 0x872E;
-        public const int GL_MODELVIEW15_ARB = 0x872F;
-        public const int GL_MODELVIEW16_ARB = 0x8730;
-        public const int GL_MODELVIEW17_ARB = 0x8731;
-        public const int GL_MODELVIEW18_ARB = 0x8732;
-        public const int GL_MODELVIEW19_ARB = 0x8733;
-        public const int GL_MODELVIEW20_ARB = 0x8734;
-        public const int GL_MODELVIEW21_ARB = 0x8735;
-        public const int GL_MODELVIEW22_ARB = 0x8736;
-        public const int GL_MODELVIEW23_ARB = 0x8737;
-        public const int GL_MODELVIEW24_ARB = 0x8738;
-        public const int GL_MODELVIEW25_ARB = 0x8739;
-        public const int GL_MODELVIEW26_ARB = 0x873A;
-        public const int GL_MODELVIEW27_ARB = 0x873B;
-        public const int GL_MODELVIEW28_ARB = 0x873C;
-        public const int GL_MODELVIEW29_ARB = 0x873D;
-        public const int GL_MODELVIEW30_ARB = 0x873E;
-        public const int GL_MODELVIEW31_ARB = 0x873F;
-        public const int GL_ARB_vertex_buffer_object = 1;
-        public const int GL_BUFFER_SIZE_ARB = 0x8764;
-        public const int GL_BUFFER_USAGE_ARB = 0x8765;
-        public const int GL_ARRAY_BUFFER_ARB = 0x8892;
-        public const int GL_ELEMENT_ARRAY_BUFFER_ARB = 0x8893;
-        public const int GL_ARRAY_BUFFER_BINDING_ARB = 0x8894;
-        public const int GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB = 0x8895;
-        public const int GL_VERTEX_ARRAY_BUFFER_BINDING_ARB = 0x8896;
-        public const int GL_NORMAL_ARRAY_BUFFER_BINDING_ARB = 0x8897;
-        public const int GL_COLOR_ARRAY_BUFFER_BINDING_ARB = 0x8898;
-        public const int GL_INDEX_ARRAY_BUFFER_BINDING_ARB = 0x8899;
-        public const int GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB = 0x889A;
-        public const int GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB = 0x889B;
-        public const int GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB = 0x889C;
-        public const int GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB = 0x889D;
-        public const int GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB = 0x889E;
-        public const int GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB = 0x889F;
-        public const int GL_READ_ONLY_ARB = 0x88B8;
-        public const int GL_WRITE_ONLY_ARB = 0x88B9;
-        public const int GL_READ_WRITE_ARB = 0x88BA;
-        public const int GL_BUFFER_ACCESS_ARB = 0x88BB;
-        public const int GL_BUFFER_MAPPED_ARB = 0x88BC;
-        public const int GL_BUFFER_MAP_POINTER_ARB = 0x88BD;
-        public const int GL_STREAM_DRAW_ARB = 0x88E0;
-        public const int GL_STREAM_READ_ARB = 0x88E1;
-        public const int GL_STREAM_COPY_ARB = 0x88E2;
-        public const int GL_STATIC_DRAW_ARB = 0x88E4;
-        public const int GL_STATIC_READ_ARB = 0x88E5;
-        public const int GL_STATIC_COPY_ARB = 0x88E6;
-        public const int GL_DYNAMIC_DRAW_ARB = 0x88E8;
-        public const int GL_DYNAMIC_READ_ARB = 0x88E9;
-        public const int GL_DYNAMIC_COPY_ARB = 0x88EA;
-        public const int GL_ARB_vertex_program = 1;
-        public const int GL_COLOR_SUM_ARB = 0x8458;
-        public const int GL_VERTEX_PROGRAM_ARB = 0x8620;
-        public const int GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB = 0x8622;
-        public const int GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB = 0x8623;
-        public const int GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB = 0x8624;
-        public const int GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB = 0x8625;
-        public const int GL_CURRENT_VERTEX_ATTRIB_ARB = 0x8626;
-        public const int GL_VERTEX_PROGRAM_POINT_SIZE_ARB = 0x8642;
-        public const int GL_VERTEX_PROGRAM_TWO_SIDE_ARB = 0x8643;
-        public const int GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB = 0x8645;
-        public const int GL_MAX_VERTEX_ATTRIBS_ARB = 0x8869;
-        public const int GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB = 0x886A;
-        public const int GL_PROGRAM_ADDRESS_REGISTERS_ARB = 0x88B0;
-        public const int GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB = 0x88B1;
-        public const int GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB = 0x88B2;
-        public const int GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB = 0x88B3;
-        public const int GL_ARB_vertex_shader = 1;
-        public const int GL_VERTEX_SHADER_ARB = 0x8B31;
-        public const int GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB = 0x8B4A;
-        public const int GL_MAX_VARYING_FLOATS_ARB = 0x8B4B;
-        public const int GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB = 0x8B4C;
-        public const int GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB = 0x8B4D;
-        public const int GL_OBJECT_ACTIVE_ATTRIBUTES_ARB = 0x8B89;
-        public const int GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB = 0x8B8A;
-        public const int GL_ARB_vertex_type_10f_11f_11f_rev = 1;
-        public const int GL_ARB_vertex_type_2_10_10_10_rev = 1;
-        public const int GL_ARB_viewport_array = 1;
-        public const int GL_ARB_window_pos = 1;
-        public const int GL_KHR_blend_equation_advanced = 1;
-        public const int GL_MULTIPLY_KHR = 0x9294;
-        public const int GL_SCREEN_KHR = 0x9295;
-        public const int GL_OVERLAY_KHR = 0x9296;
-        public const int GL_DARKEN_KHR = 0x9297;
-        public const int GL_LIGHTEN_KHR = 0x9298;
-        public const int GL_COLORDODGE_KHR = 0x9299;
-        public const int GL_COLORBURN_KHR = 0x929A;
-        public const int GL_HARDLIGHT_KHR = 0x929B;
-        public const int GL_SOFTLIGHT_KHR = 0x929C;
-        public const int GL_DIFFERENCE_KHR = 0x929E;
-        public const int GL_EXCLUSION_KHR = 0x92A0;
-        public const int GL_HSL_HUE_KHR = 0x92AD;
-        public const int GL_HSL_SATURATION_KHR = 0x92AE;
-        public const int GL_HSL_COLOR_KHR = 0x92AF;
-        public const int GL_HSL_LUMINOSITY_KHR = 0x92B0;
-        public const int GL_KHR_blend_equation_advanced_coherent = 1;
-        public const int GL_BLEND_ADVANCED_COHERENT_KHR = 0x9285;
-        public const int GL_KHR_context_flush_control = 1;
-        public const int GL_KHR_debug = 1;
-        public const int GL_KHR_no_error = 1;
-        public const int GL_CONTEXT_FLAG_NO_ERROR_BIT_KHR = 0x00000008;
-        public const int GL_KHR_parallel_shader_compile = 1;
-        public const int GL_MAX_SHADER_COMPILER_THREADS_KHR = 0x91B0;
-        public const int GL_COMPLETION_STATUS_KHR = 0x91B1;
-        public const int GL_KHR_robust_buffer_access_behavior = 1;
-        public const int GL_KHR_robustness = 1;
-        public const int GL_CONTEXT_ROBUST_ACCESS = 0x90F3;
-        public const int GL_KHR_texture_compression_astc_hdr = 1;
-        public const int GL_COMPRESSED_RGBA_ASTC_4x4_KHR = 0x93B0;
-        public const int GL_COMPRESSED_RGBA_ASTC_5x4_KHR = 0x93B1;
-        public const int GL_COMPRESSED_RGBA_ASTC_5x5_KHR = 0x93B2;
-        public const int GL_COMPRESSED_RGBA_ASTC_6x5_KHR = 0x93B3;
-        public const int GL_COMPRESSED_RGBA_ASTC_6x6_KHR = 0x93B4;
-        public const int GL_COMPRESSED_RGBA_ASTC_8x5_KHR = 0x93B5;
-        public const int GL_COMPRESSED_RGBA_ASTC_8x6_KHR = 0x93B6;
-        public const int GL_COMPRESSED_RGBA_ASTC_8x8_KHR = 0x93B7;
-        public const int GL_COMPRESSED_RGBA_ASTC_10x5_KHR = 0x93B8;
-        public const int GL_COMPRESSED_RGBA_ASTC_10x6_KHR = 0x93B9;
-        public const int GL_COMPRESSED_RGBA_ASTC_10x8_KHR = 0x93BA;
-        public const int GL_COMPRESSED_RGBA_ASTC_10x10_KHR = 0x93BB;
-        public const int GL_COMPRESSED_RGBA_ASTC_12x10_KHR = 0x93BC;
-        public const int GL_COMPRESSED_RGBA_ASTC_12x12_KHR = 0x93BD;
-        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR = 0x93D0;
-        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR = 0x93D1;
-        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR = 0x93D2;
-        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR = 0x93D3;
-        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR = 0x93D4;
-        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR = 0x93D5;
-        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR = 0x93D6;
-        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR = 0x93D7;
-        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR = 0x93D8;
-        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR = 0x93D9;
-        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR = 0x93DA;
-        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR = 0x93DB;
-        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR = 0x93DC;
-        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR = 0x93DD;
-        public const int GL_KHR_texture_compression_astc_ldr = 1;
-        public const int GL_KHR_texture_compression_astc_sliced_3d = 1;
-        public const int GL_OES_byte_coordinates = 1;
-        public const int GL_OES_compressed_paletted_texture = 1;
-        public const int GL_PALETTE4_RGB8_OES = 0x8B90;
-        public const int GL_PALETTE4_RGBA8_OES = 0x8B91;
-        public const int GL_PALETTE4_R5_G6_B5_OES = 0x8B92;
-        public const int GL_PALETTE4_RGBA4_OES = 0x8B93;
-        public const int GL_PALETTE4_RGB5_A1_OES = 0x8B94;
-        public const int GL_PALETTE8_RGB8_OES = 0x8B95;
-        public const int GL_PALETTE8_RGBA8_OES = 0x8B96;
-        public const int GL_PALETTE8_R5_G6_B5_OES = 0x8B97;
-        public const int GL_PALETTE8_RGBA4_OES = 0x8B98;
-        public const int GL_PALETTE8_RGB5_A1_OES = 0x8B99;
-        public const int GL_OES_fixed_point = 1;
-        public const int GL_FIXED_OES = 0x140C;
-        public const int GL_OES_query_matrix = 1;
-        public const int GL_OES_read_format = 1;
-        public const int GL_IMPLEMENTATION_COLOR_READ_TYPE_OES = 0x8B9A;
-        public const int GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES = 0x8B9B;
-        public const int GL_OES_single_precision = 1;
-        public const int GL_3DFX_multisample = 1;
-        public const int GL_MULTISAMPLE_3DFX = 0x86B2;
-        public const int GL_SAMPLE_BUFFERS_3DFX = 0x86B3;
-        public const int GL_SAMPLES_3DFX = 0x86B4;
-        public const int GL_MULTISAMPLE_BIT_3DFX = 0x20000000;
-        public const int GL_3DFX_tbuffer = 1;
-        public const int GL_3DFX_texture_compression_FXT1 = 1;
-        public const int GL_COMPRESSED_RGB_FXT1_3DFX = 0x86B0;
-        public const int GL_COMPRESSED_RGBA_FXT1_3DFX = 0x86B1;
-        public const int GL_AMD_blend_minmax_factor = 1;
-        public const int GL_FACTOR_MIN_AMD = 0x901C;
-        public const int GL_FACTOR_MAX_AMD = 0x901D;
-        public const int GL_AMD_conservative_depth = 1;
-        public const int GL_AMD_debug_output = 1;
-        public const int GL_MAX_DEBUG_MESSAGE_LENGTH_AMD = 0x9143;
-        public const int GL_MAX_DEBUG_LOGGED_MESSAGES_AMD = 0x9144;
-        public const int GL_DEBUG_LOGGED_MESSAGES_AMD = 0x9145;
-        public const int GL_DEBUG_SEVERITY_HIGH_AMD = 0x9146;
-        public const int GL_DEBUG_SEVERITY_MEDIUM_AMD = 0x9147;
-        public const int GL_DEBUG_SEVERITY_LOW_AMD = 0x9148;
-        public const int GL_DEBUG_CATEGORY_API_ERROR_AMD = 0x9149;
-        public const int GL_DEBUG_CATEGORY_WINDOW_SYSTEM_AMD = 0x914A;
-        public const int GL_DEBUG_CATEGORY_DEPRECATION_AMD = 0x914B;
-        public const int GL_DEBUG_CATEGORY_UNDEFINED_BEHAVIOR_AMD = 0x914C;
-        public const int GL_DEBUG_CATEGORY_PERFORMANCE_AMD = 0x914D;
-        public const int GL_DEBUG_CATEGORY_SHADER_COMPILER_AMD = 0x914E;
-        public const int GL_DEBUG_CATEGORY_APPLICATION_AMD = 0x914F;
-        public const int GL_DEBUG_CATEGORY_OTHER_AMD = 0x9150;
-        public const int GL_AMD_depth_clamp_separate = 1;
-        public const int GL_DEPTH_CLAMP_NEAR_AMD = 0x901E;
-        public const int GL_DEPTH_CLAMP_FAR_AMD = 0x901F;
-        public const int GL_AMD_draw_buffers_blend = 1;
-        public const int GL_AMD_framebuffer_multisample_advanced = 1;
-        public const int GL_RENDERBUFFER_STORAGE_SAMPLES_AMD = 0x91B2;
-        public const int GL_MAX_COLOR_FRAMEBUFFER_SAMPLES_AMD = 0x91B3;
-        public const int GL_MAX_COLOR_FRAMEBUFFER_STORAGE_SAMPLES_AMD = 0x91B4;
-        public const int GL_MAX_DEPTH_STENCIL_FRAMEBUFFER_SAMPLES_AMD = 0x91B5;
-        public const int GL_NUM_SUPPORTED_MULTISAMPLE_MODES_AMD = 0x91B6;
-        public const int GL_SUPPORTED_MULTISAMPLE_MODES_AMD = 0x91B7;
-        public const int GL_AMD_framebuffer_sample_positions = 1;
-        public const int GL_SUBSAMPLE_DISTANCE_AMD = 0x883F;
-        public const int GL_PIXELS_PER_SAMPLE_PATTERN_X_AMD = 0x91AE;
-        public const int GL_PIXELS_PER_SAMPLE_PATTERN_Y_AMD = 0x91AF;
-        public const int GL_ALL_PIXELS_AMD = -1;
-        public const int GL_AMD_gcn_shader = 1;
-        public const int GL_AMD_gpu_shader_half_float = 1;
-        public const int GL_FLOAT16_NV = 0x8FF8;
-        public const int GL_FLOAT16_VEC2_NV = 0x8FF9;
-        public const int GL_FLOAT16_VEC3_NV = 0x8FFA;
-        public const int GL_FLOAT16_VEC4_NV = 0x8FFB;
-        public const int GL_FLOAT16_MAT2_AMD = 0x91C5;
-        public const int GL_FLOAT16_MAT3_AMD = 0x91C6;
-        public const int GL_FLOAT16_MAT4_AMD = 0x91C7;
-        public const int GL_FLOAT16_MAT2x3_AMD = 0x91C8;
-        public const int GL_FLOAT16_MAT2x4_AMD = 0x91C9;
-        public const int GL_FLOAT16_MAT3x2_AMD = 0x91CA;
-        public const int GL_FLOAT16_MAT3x4_AMD = 0x91CB;
-        public const int GL_FLOAT16_MAT4x2_AMD = 0x91CC;
-        public const int GL_FLOAT16_MAT4x3_AMD = 0x91CD;
-        public const int GL_AMD_gpu_shader_int16 = 1;
-        public const int GL_AMD_gpu_shader_int64 = 1;
-        public const int GL_INT64_NV = 0x140E;
-        public const int GL_UNSIGNED_INT64_NV = 0x140F;
-        public const int GL_INT8_NV = 0x8FE0;
-        public const int GL_INT8_VEC2_NV = 0x8FE1;
-        public const int GL_INT8_VEC3_NV = 0x8FE2;
-        public const int GL_INT8_VEC4_NV = 0x8FE3;
-        public const int GL_INT16_NV = 0x8FE4;
-        public const int GL_INT16_VEC2_NV = 0x8FE5;
-        public const int GL_INT16_VEC3_NV = 0x8FE6;
-        public const int GL_INT16_VEC4_NV = 0x8FE7;
-        public const int GL_INT64_VEC2_NV = 0x8FE9;
-        public const int GL_INT64_VEC3_NV = 0x8FEA;
-        public const int GL_INT64_VEC4_NV = 0x8FEB;
-        public const int GL_UNSIGNED_INT8_NV = 0x8FEC;
-        public const int GL_UNSIGNED_INT8_VEC2_NV = 0x8FED;
-        public const int GL_UNSIGNED_INT8_VEC3_NV = 0x8FEE;
-        public const int GL_UNSIGNED_INT8_VEC4_NV = 0x8FEF;
-        public const int GL_UNSIGNED_INT16_NV = 0x8FF0;
-        public const int GL_UNSIGNED_INT16_VEC2_NV = 0x8FF1;
-        public const int GL_UNSIGNED_INT16_VEC3_NV = 0x8FF2;
-        public const int GL_UNSIGNED_INT16_VEC4_NV = 0x8FF3;
-        public const int GL_UNSIGNED_INT64_VEC2_NV = 0x8FF5;
-        public const int GL_UNSIGNED_INT64_VEC3_NV = 0x8FF6;
-        public const int GL_UNSIGNED_INT64_VEC4_NV = 0x8FF7;
-        public const int GL_AMD_interleaved_elements = 1;
-        public const int GL_VERTEX_ELEMENT_SWIZZLE_AMD = 0x91A4;
-        public const int GL_VERTEX_ID_SWIZZLE_AMD = 0x91A5;
-        public const int GL_AMD_multi_draw_indirect = 1;
-        public const int GL_AMD_name_gen_delete = 1;
-        public const int GL_DATA_BUFFER_AMD = 0x9151;
-        public const int GL_PERFORMANCE_MONITOR_AMD = 0x9152;
-        public const int GL_QUERY_OBJECT_AMD = 0x9153;
-        public const int GL_VERTEX_ARRAY_OBJECT_AMD = 0x9154;
-        public const int GL_SAMPLER_OBJECT_AMD = 0x9155;
-        public const int GL_AMD_occlusion_query_event = 1;
-        public const int GL_OCCLUSION_QUERY_EVENT_MASK_AMD = 0x874F;
-        public const int GL_QUERY_DEPTH_PASS_EVENT_BIT_AMD = 0x00000001;
-        public const int GL_QUERY_DEPTH_FAIL_EVENT_BIT_AMD = 0x00000002;
-        public const int GL_QUERY_STENCIL_FAIL_EVENT_BIT_AMD = 0x00000004;
-        public const int GL_QUERY_DEPTH_BOUNDS_FAIL_EVENT_BIT_AMD = 0x00000008;
-        public const int GL_QUERY_ALL_EVENT_BITS_AMD = -1;
-        public const int GL_AMD_performance_monitor = 1;
-        public const int GL_COUNTER_TYPE_AMD = 0x8BC0;
-        public const int GL_COUNTER_RANGE_AMD = 0x8BC1;
-        public const int GL_UNSIGNED_INT64_AMD = 0x8BC2;
-        public const int GL_PERCENTAGE_AMD = 0x8BC3;
-        public const int GL_PERFMON_RESULT_AVAILABLE_AMD = 0x8BC4;
-        public const int GL_PERFMON_RESULT_SIZE_AMD = 0x8BC5;
-        public const int GL_PERFMON_RESULT_AMD = 0x8BC6;
-        public const int GL_AMD_pinned_memory = 1;
-        public const int GL_EXTERNAL_VIRTUAL_MEMORY_BUFFER_AMD = 0x9160;
-        public const int GL_AMD_query_buffer_object = 1;
-        public const int GL_QUERY_BUFFER_AMD = 0x9192;
-        public const int GL_QUERY_BUFFER_BINDING_AMD = 0x9193;
-        public const int GL_QUERY_RESULT_NO_WAIT_AMD = 0x9194;
-        public const int GL_AMD_sample_positions = 1;
-        public const int GL_AMD_seamless_cubemap_per_texture = 1;
-        public const int GL_AMD_shader_atomic_counter_ops = 1;
-        public const int GL_AMD_shader_ballot = 1;
-        public const int GL_AMD_shader_explicit_vertex_parameter = 1;
-        public const int GL_AMD_shader_gpu_shader_half_float_fetch = 1;
-        public const int GL_AMD_shader_image_load_store_lod = 1;
-        public const int GL_AMD_shader_stencil_export = 1;
-        public const int GL_AMD_shader_trinary_minmax = 1;
-        public const int GL_AMD_sparse_texture = 1;
-        public const int GL_VIRTUAL_PAGE_SIZE_X_AMD = 0x9195;
-        public const int GL_VIRTUAL_PAGE_SIZE_Y_AMD = 0x9196;
-        public const int GL_VIRTUAL_PAGE_SIZE_Z_AMD = 0x9197;
-        public const int GL_MAX_SPARSE_TEXTURE_SIZE_AMD = 0x9198;
-        public const int GL_MAX_SPARSE_3D_TEXTURE_SIZE_AMD = 0x9199;
-        public const int GL_MAX_SPARSE_ARRAY_TEXTURE_LAYERS = 0x919A;
-        public const int GL_MIN_SPARSE_LEVEL_AMD = 0x919B;
-        public const int GL_MIN_LOD_WARNING_AMD = 0x919C;
-        public const int GL_TEXTURE_STORAGE_SPARSE_BIT_AMD = 0x00000001;
-        public const int GL_AMD_stencil_operation_extended = 1;
-        public const int GL_SET_AMD = 0x874A;
-        public const int GL_REPLACE_VALUE_AMD = 0x874B;
-        public const int GL_STENCIL_OP_VALUE_AMD = 0x874C;
-        public const int GL_STENCIL_BACK_OP_VALUE_AMD = 0x874D;
-        public const int GL_AMD_texture_gather_bias_lod = 1;
-        public const int GL_AMD_texture_texture4 = 1;
-        public const int GL_AMD_transform_feedback3_lines_triangles = 1;
-        public const int GL_AMD_transform_feedback4 = 1;
-        public const int GL_STREAM_RASTERIZATION_AMD = 0x91A0;
-        public const int GL_AMD_vertex_shader_layer = 1;
-        public const int GL_AMD_vertex_shader_tessellator = 1;
-        public const int GL_SAMPLER_BUFFER_AMD = 0x9001;
-        public const int GL_INT_SAMPLER_BUFFER_AMD = 0x9002;
-        public const int GL_UNSIGNED_INT_SAMPLER_BUFFER_AMD = 0x9003;
-        public const int GL_TESSELLATION_MODE_AMD = 0x9004;
-        public const int GL_TESSELLATION_FACTOR_AMD = 0x9005;
-        public const int GL_DISCRETE_AMD = 0x9006;
-        public const int GL_CONTINUOUS_AMD = 0x9007;
-        public const int GL_AMD_vertex_shader_viewport_index = 1;
-        public const int GL_APPLE_aux_depth_stencil = 1;
-        public const int GL_AUX_DEPTH_STENCIL_APPLE = 0x8A14;
-        public const int GL_APPLE_client_storage = 1;
-        public const int GL_UNPACK_CLIENT_STORAGE_APPLE = 0x85B2;
-        public const int GL_APPLE_element_array = 1;
-        public const int GL_ELEMENT_ARRAY_APPLE = 0x8A0C;
-        public const int GL_ELEMENT_ARRAY_TYPE_APPLE = 0x8A0D;
-        public const int GL_ELEMENT_ARRAY_POINTER_APPLE = 0x8A0E;
-        public const int GL_APPLE_fence = 1;
-        public const int GL_DRAW_PIXELS_APPLE = 0x8A0A;
-        public const int GL_FENCE_APPLE = 0x8A0B;
-        public const int GL_APPLE_float_pixels = 1;
-        public const int GL_HALF_APPLE = 0x140B;
-        public const int GL_RGBA_FLOAT32_APPLE = 0x8814;
-        public const int GL_RGB_FLOAT32_APPLE = 0x8815;
-        public const int GL_ALPHA_FLOAT32_APPLE = 0x8816;
-        public const int GL_INTENSITY_FLOAT32_APPLE = 0x8817;
-        public const int GL_LUMINANCE_FLOAT32_APPLE = 0x8818;
-        public const int GL_LUMINANCE_ALPHA_FLOAT32_APPLE = 0x8819;
-        public const int GL_RGBA_FLOAT16_APPLE = 0x881A;
-        public const int GL_RGB_FLOAT16_APPLE = 0x881B;
-        public const int GL_ALPHA_FLOAT16_APPLE = 0x881C;
-        public const int GL_INTENSITY_FLOAT16_APPLE = 0x881D;
-        public const int GL_LUMINANCE_FLOAT16_APPLE = 0x881E;
-        public const int GL_LUMINANCE_ALPHA_FLOAT16_APPLE = 0x881F;
-        public const int GL_COLOR_FLOAT_APPLE = 0x8A0F;
-        public const int GL_APPLE_flush_buffer_range = 1;
-        public const int GL_BUFFER_SERIALIZED_MODIFY_APPLE = 0x8A12;
-        public const int GL_BUFFER_FLUSHING_UNMAP_APPLE = 0x8A13;
-        public const int GL_APPLE_object_purgeable = 1;
-        public const int GL_BUFFER_OBJECT_APPLE = 0x85B3;
-        public const int GL_RELEASED_APPLE = 0x8A19;
-        public const int GL_VOLATILE_APPLE = 0x8A1A;
-        public const int GL_RETAINED_APPLE = 0x8A1B;
-        public const int GL_UNDEFINED_APPLE = 0x8A1C;
-        public const int GL_PURGEABLE_APPLE = 0x8A1D;
-        public const int GL_APPLE_rgb_422 = 1;
-        public const int GL_RGB_422_APPLE = 0x8A1F;
-        public const int GL_UNSIGNED_SHORT_8_8_APPLE = 0x85BA;
-        public const int GL_UNSIGNED_SHORT_8_8_REV_APPLE = 0x85BB;
-        public const int GL_RGB_RAW_422_APPLE = 0x8A51;
-        public const int GL_APPLE_row_bytes = 1;
-        public const int GL_PACK_ROW_BYTES_APPLE = 0x8A15;
-        public const int GL_UNPACK_ROW_BYTES_APPLE = 0x8A16;
-        public const int GL_APPLE_specular_vector = 1;
-        public const int GL_LIGHT_MODEL_SPECULAR_VECTOR_APPLE = 0x85B0;
-        public const int GL_APPLE_texture_range = 1;
-        public const int GL_TEXTURE_RANGE_LENGTH_APPLE = 0x85B7;
-        public const int GL_TEXTURE_RANGE_POINTER_APPLE = 0x85B8;
-        public const int GL_TEXTURE_STORAGE_HINT_APPLE = 0x85BC;
-        public const int GL_STORAGE_PRIVATE_APPLE = 0x85BD;
-        public const int GL_STORAGE_CACHED_APPLE = 0x85BE;
-        public const int GL_STORAGE_SHARED_APPLE = 0x85BF;
-        public const int GL_APPLE_transform_hint = 1;
-        public const int GL_TRANSFORM_HINT_APPLE = 0x85B1;
-        public const int GL_APPLE_vertex_array_object = 1;
-        public const int GL_VERTEX_ARRAY_BINDING_APPLE = 0x85B5;
-        public const int GL_APPLE_vertex_array_range = 1;
-        public const int GL_VERTEX_ARRAY_RANGE_APPLE = 0x851D;
-        public const int GL_VERTEX_ARRAY_RANGE_LENGTH_APPLE = 0x851E;
-        public const int GL_VERTEX_ARRAY_STORAGE_HINT_APPLE = 0x851F;
-        public const int GL_VERTEX_ARRAY_RANGE_POINTER_APPLE = 0x8521;
-        public const int GL_STORAGE_CLIENT_APPLE = 0x85B4;
-        public const int GL_APPLE_vertex_program_evaluators = 1;
-        public const int GL_VERTEX_ATTRIB_MAP1_APPLE = 0x8A00;
-        public const int GL_VERTEX_ATTRIB_MAP2_APPLE = 0x8A01;
-        public const int GL_VERTEX_ATTRIB_MAP1_SIZE_APPLE = 0x8A02;
-        public const int GL_VERTEX_ATTRIB_MAP1_COEFF_APPLE = 0x8A03;
-        public const int GL_VERTEX_ATTRIB_MAP1_ORDER_APPLE = 0x8A04;
-        public const int GL_VERTEX_ATTRIB_MAP1_DOMAIN_APPLE = 0x8A05;
-        public const int GL_VERTEX_ATTRIB_MAP2_SIZE_APPLE = 0x8A06;
-        public const int GL_VERTEX_ATTRIB_MAP2_COEFF_APPLE = 0x8A07;
-        public const int GL_VERTEX_ATTRIB_MAP2_ORDER_APPLE = 0x8A08;
-        public const int GL_VERTEX_ATTRIB_MAP2_DOMAIN_APPLE = 0x8A09;
-        public const int GL_APPLE_ycbcr_422 = 1;
-        public const int GL_YCBCR_422_APPLE = 0x85B9;
-        public const int GL_ATI_draw_buffers = 1;
-        public const int GL_MAX_DRAW_BUFFERS_ATI = 0x8824;
-        public const int GL_DRAW_BUFFER0_ATI = 0x8825;
-        public const int GL_DRAW_BUFFER1_ATI = 0x8826;
-        public const int GL_DRAW_BUFFER2_ATI = 0x8827;
-        public const int GL_DRAW_BUFFER3_ATI = 0x8828;
-        public const int GL_DRAW_BUFFER4_ATI = 0x8829;
-        public const int GL_DRAW_BUFFER5_ATI = 0x882A;
-        public const int GL_DRAW_BUFFER6_ATI = 0x882B;
-        public const int GL_DRAW_BUFFER7_ATI = 0x882C;
-        public const int GL_DRAW_BUFFER8_ATI = 0x882D;
-        public const int GL_DRAW_BUFFER9_ATI = 0x882E;
-        public const int GL_DRAW_BUFFER10_ATI = 0x882F;
-        public const int GL_DRAW_BUFFER11_ATI = 0x8830;
-        public const int GL_DRAW_BUFFER12_ATI = 0x8831;
-        public const int GL_DRAW_BUFFER13_ATI = 0x8832;
-        public const int GL_DRAW_BUFFER14_ATI = 0x8833;
-        public const int GL_DRAW_BUFFER15_ATI = 0x8834;
-        public const int GL_ATI_element_array = 1;
-        public const int GL_ELEMENT_ARRAY_ATI = 0x8768;
-        public const int GL_ELEMENT_ARRAY_TYPE_ATI = 0x8769;
-        public const int GL_ELEMENT_ARRAY_POINTER_ATI = 0x876A;
-        public const int GL_ATI_envmap_bumpmap = 1;
-        public const int GL_BUMP_ROT_MATRIX_ATI = 0x8775;
-        public const int GL_BUMP_ROT_MATRIX_SIZE_ATI = 0x8776;
-        public const int GL_BUMP_NUM_TEX_UNITS_ATI = 0x8777;
-        public const int GL_BUMP_TEX_UNITS_ATI = 0x8778;
-        public const int GL_DUDV_ATI = 0x8779;
-        public const int GL_DU8DV8_ATI = 0x877A;
-        public const int GL_BUMP_ENVMAP_ATI = 0x877B;
-        public const int GL_BUMP_TARGET_ATI = 0x877C;
-        public const int GL_ATI_fragment_shader = 1;
-        public const int GL_FRAGMENT_SHADER_ATI = 0x8920;
-        public const int GL_REG_0_ATI = 0x8921;
-        public const int GL_REG_1_ATI = 0x8922;
-        public const int GL_REG_2_ATI = 0x8923;
-        public const int GL_REG_3_ATI = 0x8924;
-        public const int GL_REG_4_ATI = 0x8925;
-        public const int GL_REG_5_ATI = 0x8926;
-        public const int GL_REG_6_ATI = 0x8927;
-        public const int GL_REG_7_ATI = 0x8928;
-        public const int GL_REG_8_ATI = 0x8929;
-        public const int GL_REG_9_ATI = 0x892A;
-        public const int GL_REG_10_ATI = 0x892B;
-        public const int GL_REG_11_ATI = 0x892C;
-        public const int GL_REG_12_ATI = 0x892D;
-        public const int GL_REG_13_ATI = 0x892E;
-        public const int GL_REG_14_ATI = 0x892F;
-        public const int GL_REG_15_ATI = 0x8930;
-        public const int GL_REG_16_ATI = 0x8931;
-        public const int GL_REG_17_ATI = 0x8932;
-        public const int GL_REG_18_ATI = 0x8933;
-        public const int GL_REG_19_ATI = 0x8934;
-        public const int GL_REG_20_ATI = 0x8935;
-        public const int GL_REG_21_ATI = 0x8936;
-        public const int GL_REG_22_ATI = 0x8937;
-        public const int GL_REG_23_ATI = 0x8938;
-        public const int GL_REG_24_ATI = 0x8939;
-        public const int GL_REG_25_ATI = 0x893A;
-        public const int GL_REG_26_ATI = 0x893B;
-        public const int GL_REG_27_ATI = 0x893C;
-        public const int GL_REG_28_ATI = 0x893D;
-        public const int GL_REG_29_ATI = 0x893E;
-        public const int GL_REG_30_ATI = 0x893F;
-        public const int GL_REG_31_ATI = 0x8940;
-        public const int GL_CON_0_ATI = 0x8941;
-        public const int GL_CON_1_ATI = 0x8942;
-        public const int GL_CON_2_ATI = 0x8943;
-        public const int GL_CON_3_ATI = 0x8944;
-        public const int GL_CON_4_ATI = 0x8945;
-        public const int GL_CON_5_ATI = 0x8946;
-        public const int GL_CON_6_ATI = 0x8947;
-        public const int GL_CON_7_ATI = 0x8948;
-        public const int GL_CON_8_ATI = 0x8949;
-        public const int GL_CON_9_ATI = 0x894A;
-        public const int GL_CON_10_ATI = 0x894B;
-        public const int GL_CON_11_ATI = 0x894C;
-        public const int GL_CON_12_ATI = 0x894D;
-        public const int GL_CON_13_ATI = 0x894E;
-        public const int GL_CON_14_ATI = 0x894F;
-        public const int GL_CON_15_ATI = 0x8950;
-        public const int GL_CON_16_ATI = 0x8951;
-        public const int GL_CON_17_ATI = 0x8952;
-        public const int GL_CON_18_ATI = 0x8953;
-        public const int GL_CON_19_ATI = 0x8954;
-        public const int GL_CON_20_ATI = 0x8955;
-        public const int GL_CON_21_ATI = 0x8956;
-        public const int GL_CON_22_ATI = 0x8957;
-        public const int GL_CON_23_ATI = 0x8958;
-        public const int GL_CON_24_ATI = 0x8959;
-        public const int GL_CON_25_ATI = 0x895A;
-        public const int GL_CON_26_ATI = 0x895B;
-        public const int GL_CON_27_ATI = 0x895C;
-        public const int GL_CON_28_ATI = 0x895D;
-        public const int GL_CON_29_ATI = 0x895E;
-        public const int GL_CON_30_ATI = 0x895F;
-        public const int GL_CON_31_ATI = 0x8960;
-        public const int GL_MOV_ATI = 0x8961;
-        public const int GL_ADD_ATI = 0x8963;
-        public const int GL_MUL_ATI = 0x8964;
-        public const int GL_SUB_ATI = 0x8965;
-        public const int GL_DOT3_ATI = 0x8966;
-        public const int GL_DOT4_ATI = 0x8967;
-        public const int GL_MAD_ATI = 0x8968;
-        public const int GL_LERP_ATI = 0x8969;
-        public const int GL_CND_ATI = 0x896A;
-        public const int GL_CND0_ATI = 0x896B;
-        public const int GL_DOT2_ADD_ATI = 0x896C;
-        public const int GL_SECONDARY_INTERPOLATOR_ATI = 0x896D;
-        public const int GL_NUM_FRAGMENT_REGISTERS_ATI = 0x896E;
-        public const int GL_NUM_FRAGMENT_CONSTANTS_ATI = 0x896F;
-        public const int GL_NUM_PASSES_ATI = 0x8970;
-        public const int GL_NUM_INSTRUCTIONS_PER_PASS_ATI = 0x8971;
-        public const int GL_NUM_INSTRUCTIONS_TOTAL_ATI = 0x8972;
-        public const int GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI = 0x8973;
-        public const int GL_NUM_LOOPBACK_COMPONENTS_ATI = 0x8974;
-        public const int GL_COLOR_ALPHA_PAIRING_ATI = 0x8975;
-        public const int GL_SWIZZLE_STR_ATI = 0x8976;
-        public const int GL_SWIZZLE_STQ_ATI = 0x8977;
-        public const int GL_SWIZZLE_STR_DR_ATI = 0x8978;
-        public const int GL_SWIZZLE_STQ_DQ_ATI = 0x8979;
-        public const int GL_SWIZZLE_STRQ_ATI = 0x897A;
-        public const int GL_SWIZZLE_STRQ_DQ_ATI = 0x897B;
-        public const int GL_RED_BIT_ATI = 0x00000001;
-        public const int GL_GREEN_BIT_ATI = 0x00000002;
-        public const int GL_BLUE_BIT_ATI = 0x00000004;
-        public const int GL_2X_BIT_ATI = 0x00000001;
-        public const int GL_4X_BIT_ATI = 0x00000002;
-        public const int GL_8X_BIT_ATI = 0x00000004;
-        public const int GL_HALF_BIT_ATI = 0x00000008;
-        public const int GL_QUARTER_BIT_ATI = 0x00000010;
-        public const int GL_EIGHTH_BIT_ATI = 0x00000020;
-        public const int GL_SATURATE_BIT_ATI = 0x00000040;
-        public const int GL_COMP_BIT_ATI = 0x00000002;
-        public const int GL_NEGATE_BIT_ATI = 0x00000004;
-        public const int GL_BIAS_BIT_ATI = 0x00000008;
-        public const int GL_ATI_map_object_buffer = 1;
-        public const int GL_ATI_meminfo = 1;
-        public const int GL_VBO_FREE_MEMORY_ATI = 0x87FB;
-        public const int GL_TEXTURE_FREE_MEMORY_ATI = 0x87FC;
-        public const int GL_RENDERBUFFER_FREE_MEMORY_ATI = 0x87FD;
-        public const int GL_ATI_pixel_format_float = 1;
-        public const int GL_RGBA_FLOAT_MODE_ATI = 0x8820;
-        public const int GL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI = 0x8835;
-        public const int GL_ATI_pn_triangles = 1;
-        public const int GL_PN_TRIANGLES_ATI = 0x87F0;
-        public const int GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI = 0x87F1;
-        public const int GL_PN_TRIANGLES_POINT_MODE_ATI = 0x87F2;
-        public const int GL_PN_TRIANGLES_NORMAL_MODE_ATI = 0x87F3;
-        public const int GL_PN_TRIANGLES_TESSELATION_LEVEL_ATI = 0x87F4;
-        public const int GL_PN_TRIANGLES_POINT_MODE_LINEAR_ATI = 0x87F5;
-        public const int GL_PN_TRIANGLES_POINT_MODE_CUBIC_ATI = 0x87F6;
-        public const int GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI = 0x87F7;
-        public const int GL_PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI = 0x87F8;
-        public const int GL_ATI_separate_stencil = 1;
-        public const int GL_STENCIL_BACK_FUNC_ATI = 0x8800;
-        public const int GL_STENCIL_BACK_FAIL_ATI = 0x8801;
-        public const int GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI = 0x8802;
-        public const int GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI = 0x8803;
-        public const int GL_ATI_text_fragment_shader = 1;
-        public const int GL_TEXT_FRAGMENT_SHADER_ATI = 0x8200;
-        public const int GL_ATI_texture_env_combine3 = 1;
-        public const int GL_MODULATE_ADD_ATI = 0x8744;
-        public const int GL_MODULATE_SIGNED_ADD_ATI = 0x8745;
-        public const int GL_MODULATE_SUBTRACT_ATI = 0x8746;
-        public const int GL_ATI_texture_float = 1;
-        public const int GL_RGBA_FLOAT32_ATI = 0x8814;
-        public const int GL_RGB_FLOAT32_ATI = 0x8815;
-        public const int GL_ALPHA_FLOAT32_ATI = 0x8816;
-        public const int GL_INTENSITY_FLOAT32_ATI = 0x8817;
-        public const int GL_LUMINANCE_FLOAT32_ATI = 0x8818;
-        public const int GL_LUMINANCE_ALPHA_FLOAT32_ATI = 0x8819;
-        public const int GL_RGBA_FLOAT16_ATI = 0x881A;
-        public const int GL_RGB_FLOAT16_ATI = 0x881B;
-        public const int GL_ALPHA_FLOAT16_ATI = 0x881C;
-        public const int GL_INTENSITY_FLOAT16_ATI = 0x881D;
-        public const int GL_LUMINANCE_FLOAT16_ATI = 0x881E;
-        public const int GL_LUMINANCE_ALPHA_FLOAT16_ATI = 0x881F;
-        public const int GL_ATI_texture_mirror_once = 1;
-        public const int GL_MIRROR_CLAMP_ATI = 0x8742;
-        public const int GL_MIRROR_CLAMP_TO_EDGE_ATI = 0x8743;
-        public const int GL_ATI_vertex_array_object = 1;
-        public const int GL_STATIC_ATI = 0x8760;
-        public const int GL_DYNAMIC_ATI = 0x8761;
-        public const int GL_PRESERVE_ATI = 0x8762;
-        public const int GL_DISCARD_ATI = 0x8763;
-        public const int GL_OBJECT_BUFFER_SIZE_ATI = 0x8764;
-        public const int GL_OBJECT_BUFFER_USAGE_ATI = 0x8765;
-        public const int GL_ARRAY_OBJECT_BUFFER_ATI = 0x8766;
-        public const int GL_ARRAY_OBJECT_OFFSET_ATI = 0x8767;
-        public const int GL_ATI_vertex_attrib_array_object = 1;
-        public const int GL_ATI_vertex_streams = 1;
-        public const int GL_MAX_VERTEX_STREAMS_ATI = 0x876B;
-        public const int GL_VERTEX_STREAM0_ATI = 0x876C;
-        public const int GL_VERTEX_STREAM1_ATI = 0x876D;
-        public const int GL_VERTEX_STREAM2_ATI = 0x876E;
-        public const int GL_VERTEX_STREAM3_ATI = 0x876F;
-        public const int GL_VERTEX_STREAM4_ATI = 0x8770;
-        public const int GL_VERTEX_STREAM5_ATI = 0x8771;
-        public const int GL_VERTEX_STREAM6_ATI = 0x8772;
-        public const int GL_VERTEX_STREAM7_ATI = 0x8773;
-        public const int GL_VERTEX_SOURCE_ATI = 0x8774;
-        public const int GL_EXT_422_pixels = 1;
-        public const int GL_422_EXT = 0x80CC;
-        public const int GL_422_REV_EXT = 0x80CD;
-        public const int GL_422_AVERAGE_EXT = 0x80CE;
-        public const int GL_422_REV_AVERAGE_EXT = 0x80CF;
-        public const int GL_EXT_EGL_image_storage = 1;
-        public const int GL_EXT_abgr = 1;
-        public const int GL_ABGR_EXT = 0x8000;
-        public const int GL_EXT_bgra = 1;
-        public const int GL_BGR_EXT = 0x80E0;
-        public const int GL_BGRA_EXT = 0x80E1;
-        public const int GL_EXT_bindable_uniform = 1;
-        public const int GL_MAX_VERTEX_BINDABLE_UNIFORMS_EXT = 0x8DE2;
-        public const int GL_MAX_FRAGMENT_BINDABLE_UNIFORMS_EXT = 0x8DE3;
-        public const int GL_MAX_GEOMETRY_BINDABLE_UNIFORMS_EXT = 0x8DE4;
-        public const int GL_MAX_BINDABLE_UNIFORM_SIZE_EXT = 0x8DED;
-        public const int GL_UNIFORM_BUFFER_EXT = 0x8DEE;
-        public const int GL_UNIFORM_BUFFER_BINDING_EXT = 0x8DEF;
-        public const int GL_EXT_blend_color = 1;
-        public const int GL_CONSTANT_COLOR_EXT = 0x8001;
-        public const int GL_ONE_MINUS_CONSTANT_COLOR_EXT = 0x8002;
-        public const int GL_CONSTANT_ALPHA_EXT = 0x8003;
-        public const int GL_ONE_MINUS_CONSTANT_ALPHA_EXT = 0x8004;
-        public const int GL_BLEND_COLOR_EXT = 0x8005;
-        public const int GL_EXT_blend_equation_separate = 1;
-        public const int GL_BLEND_EQUATION_RGB_EXT = 0x8009;
-        public const int GL_BLEND_EQUATION_ALPHA_EXT = 0x883D;
-        public const int GL_EXT_blend_func_separate = 1;
-        public const int GL_BLEND_DST_RGB_EXT = 0x80C8;
-        public const int GL_BLEND_SRC_RGB_EXT = 0x80C9;
-        public const int GL_BLEND_DST_ALPHA_EXT = 0x80CA;
-        public const int GL_BLEND_SRC_ALPHA_EXT = 0x80CB;
-        public const int GL_EXT_blend_logic_op = 1;
-        public const int GL_EXT_blend_minmax = 1;
-        public const int GL_MIN_EXT = 0x8007;
-        public const int GL_MAX_EXT = 0x8008;
-        public const int GL_FUNC_ADD_EXT = 0x8006;
-        public const int GL_BLEND_EQUATION_EXT = 0x8009;
-        public const int GL_EXT_blend_subtract = 1;
-        public const int GL_FUNC_SUBTRACT_EXT = 0x800A;
-        public const int GL_FUNC_REVERSE_SUBTRACT_EXT = 0x800B;
-        public const int GL_EXT_clip_volume_hint = 1;
-        public const int GL_CLIP_VOLUME_CLIPPING_HINT_EXT = 0x80F0;
-        public const int GL_EXT_cmyka = 1;
-        public const int GL_CMYK_EXT = 0x800C;
-        public const int GL_CMYKA_EXT = 0x800D;
-        public const int GL_PACK_CMYK_HINT_EXT = 0x800E;
-        public const int GL_UNPACK_CMYK_HINT_EXT = 0x800F;
-        public const int GL_EXT_color_subtable = 1;
-        public const int GL_EXT_compiled_vertex_array = 1;
-        public const int GL_ARRAY_ELEMENT_LOCK_FIRST_EXT = 0x81A8;
-        public const int GL_ARRAY_ELEMENT_LOCK_COUNT_EXT = 0x81A9;
-        public const int GL_EXT_convolution = 1;
-        public const int GL_CONVOLUTION_1D_EXT = 0x8010;
-        public const int GL_CONVOLUTION_2D_EXT = 0x8011;
-        public const int GL_SEPARABLE_2D_EXT = 0x8012;
-        public const int GL_CONVOLUTION_BORDER_MODE_EXT = 0x8013;
-        public const int GL_CONVOLUTION_FILTER_SCALE_EXT = 0x8014;
-        public const int GL_CONVOLUTION_FILTER_BIAS_EXT = 0x8015;
-        public const int GL_REDUCE_EXT = 0x8016;
-        public const int GL_CONVOLUTION_FORMAT_EXT = 0x8017;
-        public const int GL_CONVOLUTION_WIDTH_EXT = 0x8018;
-        public const int GL_CONVOLUTION_HEIGHT_EXT = 0x8019;
-        public const int GL_MAX_CONVOLUTION_WIDTH_EXT = 0x801A;
-        public const int GL_MAX_CONVOLUTION_HEIGHT_EXT = 0x801B;
-        public const int GL_POST_CONVOLUTION_RED_SCALE_EXT = 0x801C;
-        public const int GL_POST_CONVOLUTION_GREEN_SCALE_EXT = 0x801D;
-        public const int GL_POST_CONVOLUTION_BLUE_SCALE_EXT = 0x801E;
-        public const int GL_POST_CONVOLUTION_ALPHA_SCALE_EXT = 0x801F;
-        public const int GL_POST_CONVOLUTION_RED_BIAS_EXT = 0x8020;
-        public const int GL_POST_CONVOLUTION_GREEN_BIAS_EXT = 0x8021;
-        public const int GL_POST_CONVOLUTION_BLUE_BIAS_EXT = 0x8022;
-        public const int GL_POST_CONVOLUTION_ALPHA_BIAS_EXT = 0x8023;
-        public const int GL_EXT_coordinate_frame = 1;
-        public const int GL_TANGENT_ARRAY_EXT = 0x8439;
-        public const int GL_BINORMAL_ARRAY_EXT = 0x843A;
-        public const int GL_CURRENT_TANGENT_EXT = 0x843B;
-        public const int GL_CURRENT_BINORMAL_EXT = 0x843C;
-        public const int GL_TANGENT_ARRAY_TYPE_EXT = 0x843E;
-        public const int GL_TANGENT_ARRAY_STRIDE_EXT = 0x843F;
-        public const int GL_BINORMAL_ARRAY_TYPE_EXT = 0x8440;
-        public const int GL_BINORMAL_ARRAY_STRIDE_EXT = 0x8441;
-        public const int GL_TANGENT_ARRAY_POINTER_EXT = 0x8442;
-        public const int GL_BINORMAL_ARRAY_POINTER_EXT = 0x8443;
-        public const int GL_MAP1_TANGENT_EXT = 0x8444;
-        public const int GL_MAP2_TANGENT_EXT = 0x8445;
-        public const int GL_MAP1_BINORMAL_EXT = 0x8446;
-        public const int GL_MAP2_BINORMAL_EXT = 0x8447;
-        public const int GL_EXT_copy_texture = 1;
-        public const int GL_EXT_cull_vertex = 1;
-        public const int GL_CULL_VERTEX_EXT = 0x81AA;
-        public const int GL_CULL_VERTEX_EYE_POSITION_EXT = 0x81AB;
-        public const int GL_CULL_VERTEX_OBJECT_POSITION_EXT = 0x81AC;
-        public const int GL_EXT_debug_label = 1;
-        public const int GL_PROGRAM_PIPELINE_OBJECT_EXT = 0x8A4F;
-        public const int GL_PROGRAM_OBJECT_EXT = 0x8B40;
-        public const int GL_SHADER_OBJECT_EXT = 0x8B48;
-        public const int GL_BUFFER_OBJECT_EXT = 0x9151;
-        public const int GL_QUERY_OBJECT_EXT = 0x9153;
-        public const int GL_VERTEX_ARRAY_OBJECT_EXT = 0x9154;
-        public const int GL_EXT_debug_marker = 1;
-        public const int GL_EXT_depth_bounds_test = 1;
-        public const int GL_DEPTH_BOUNDS_TEST_EXT = 0x8890;
-        public const int GL_DEPTH_BOUNDS_EXT = 0x8891;
-        public const int GL_EXT_direct_state_access = 1;
-        public const int GL_PROGRAM_MATRIX_EXT = 0x8E2D;
-        public const int GL_TRANSPOSE_PROGRAM_MATRIX_EXT = 0x8E2E;
-        public const int GL_PROGRAM_MATRIX_STACK_DEPTH_EXT = 0x8E2F;
-        public const int GL_EXT_draw_buffers2 = 1;
-        public const int GL_EXT_draw_instanced = 1;
-        public const int GL_EXT_draw_range_elements = 1;
-        public const int GL_MAX_ELEMENTS_VERTICES_EXT = 0x80E8;
-        public const int GL_MAX_ELEMENTS_INDICES_EXT = 0x80E9;
-        public const int GL_EXT_external_buffer = 1;
-        public const int GL_EXT_fog_coord = 1;
-        public const int GL_FOG_COORDINATE_SOURCE_EXT = 0x8450;
-        public const int GL_FOG_COORDINATE_EXT = 0x8451;
-        public const int GL_FRAGMENT_DEPTH_EXT = 0x8452;
-        public const int GL_CURRENT_FOG_COORDINATE_EXT = 0x8453;
-        public const int GL_FOG_COORDINATE_ARRAY_TYPE_EXT = 0x8454;
-        public const int GL_FOG_COORDINATE_ARRAY_STRIDE_EXT = 0x8455;
-        public const int GL_FOG_COORDINATE_ARRAY_POINTER_EXT = 0x8456;
-        public const int GL_FOG_COORDINATE_ARRAY_EXT = 0x8457;
-        public const int GL_EXT_framebuffer_blit = 1;
-        public const int GL_READ_FRAMEBUFFER_EXT = 0x8CA8;
-        public const int GL_DRAW_FRAMEBUFFER_EXT = 0x8CA9;
-        public const int GL_DRAW_FRAMEBUFFER_BINDING_EXT = 0x8CA6;
-        public const int GL_READ_FRAMEBUFFER_BINDING_EXT = 0x8CAA;
-        public const int GL_EXT_framebuffer_multisample = 1;
-        public const int GL_RENDERBUFFER_SAMPLES_EXT = 0x8CAB;
-        public const int GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT = 0x8D56;
-        public const int GL_MAX_SAMPLES_EXT = 0x8D57;
-        public const int GL_EXT_framebuffer_multisample_blit_scaled = 1;
-        public const int GL_SCALED_RESOLVE_FASTEST_EXT = 0x90BA;
-        public const int GL_SCALED_RESOLVE_NICEST_EXT = 0x90BB;
-        public const int GL_EXT_framebuffer_object = 1;
-        public const int GL_INVALID_FRAMEBUFFER_OPERATION_EXT = 0x0506;
-        public const int GL_MAX_RENDERBUFFER_SIZE_EXT = 0x84E8;
-        public const int GL_FRAMEBUFFER_BINDING_EXT = 0x8CA6;
-        public const int GL_RENDERBUFFER_BINDING_EXT = 0x8CA7;
-        public const int GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT = 0x8CD0;
-        public const int GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT = 0x8CD1;
-        public const int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT = 0x8CD2;
-        public const int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT = 0x8CD3;
-        public const int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT = 0x8CD4;
-        public const int GL_FRAMEBUFFER_COMPLETE_EXT = 0x8CD5;
-        public const int GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT = 0x8CD6;
-        public const int GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT = 0x8CD7;
-        public const int GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT = 0x8CD9;
-        public const int GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT = 0x8CDA;
-        public const int GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT = 0x8CDB;
-        public const int GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT = 0x8CDC;
-        public const int GL_FRAMEBUFFER_UNSUPPORTED_EXT = 0x8CDD;
-        public const int GL_MAX_COLOR_ATTACHMENTS_EXT = 0x8CDF;
-        public const int GL_COLOR_ATTACHMENT0_EXT = 0x8CE0;
-        public const int GL_COLOR_ATTACHMENT1_EXT = 0x8CE1;
-        public const int GL_COLOR_ATTACHMENT2_EXT = 0x8CE2;
-        public const int GL_COLOR_ATTACHMENT3_EXT = 0x8CE3;
-        public const int GL_COLOR_ATTACHMENT4_EXT = 0x8CE4;
-        public const int GL_COLOR_ATTACHMENT5_EXT = 0x8CE5;
-        public const int GL_COLOR_ATTACHMENT6_EXT = 0x8CE6;
-        public const int GL_COLOR_ATTACHMENT7_EXT = 0x8CE7;
-        public const int GL_COLOR_ATTACHMENT8_EXT = 0x8CE8;
-        public const int GL_COLOR_ATTACHMENT9_EXT = 0x8CE9;
-        public const int GL_COLOR_ATTACHMENT10_EXT = 0x8CEA;
-        public const int GL_COLOR_ATTACHMENT11_EXT = 0x8CEB;
-        public const int GL_COLOR_ATTACHMENT12_EXT = 0x8CEC;
-        public const int GL_COLOR_ATTACHMENT13_EXT = 0x8CED;
-        public const int GL_COLOR_ATTACHMENT14_EXT = 0x8CEE;
-        public const int GL_COLOR_ATTACHMENT15_EXT = 0x8CEF;
-        public const int GL_DEPTH_ATTACHMENT_EXT = 0x8D00;
-        public const int GL_STENCIL_ATTACHMENT_EXT = 0x8D20;
-        public const int GL_FRAMEBUFFER_EXT = 0x8D40;
-        public const int GL_RENDERBUFFER_EXT = 0x8D41;
-        public const int GL_RENDERBUFFER_WIDTH_EXT = 0x8D42;
-        public const int GL_RENDERBUFFER_HEIGHT_EXT = 0x8D43;
-        public const int GL_RENDERBUFFER_INTERNAL_FORMAT_EXT = 0x8D44;
-        public const int GL_STENCIL_INDEX1_EXT = 0x8D46;
-        public const int GL_STENCIL_INDEX4_EXT = 0x8D47;
-        public const int GL_STENCIL_INDEX8_EXT = 0x8D48;
-        public const int GL_STENCIL_INDEX16_EXT = 0x8D49;
-        public const int GL_RENDERBUFFER_RED_SIZE_EXT = 0x8D50;
-        public const int GL_RENDERBUFFER_GREEN_SIZE_EXT = 0x8D51;
-        public const int GL_RENDERBUFFER_BLUE_SIZE_EXT = 0x8D52;
-        public const int GL_RENDERBUFFER_ALPHA_SIZE_EXT = 0x8D53;
-        public const int GL_RENDERBUFFER_DEPTH_SIZE_EXT = 0x8D54;
-        public const int GL_RENDERBUFFER_STENCIL_SIZE_EXT = 0x8D55;
-        public const int GL_EXT_framebuffer_sRGB = 1;
-        public const int GL_FRAMEBUFFER_SRGB_EXT = 0x8DB9;
-        public const int GL_FRAMEBUFFER_SRGB_CAPABLE_EXT = 0x8DBA;
-        public const int GL_EXT_geometry_shader4 = 1;
-        public const int GL_GEOMETRY_SHADER_EXT = 0x8DD9;
-        public const int GL_GEOMETRY_VERTICES_OUT_EXT = 0x8DDA;
-        public const int GL_GEOMETRY_INPUT_TYPE_EXT = 0x8DDB;
-        public const int GL_GEOMETRY_OUTPUT_TYPE_EXT = 0x8DDC;
-        public const int GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT = 0x8C29;
-        public const int GL_MAX_GEOMETRY_VARYING_COMPONENTS_EXT = 0x8DDD;
-        public const int GL_MAX_VERTEX_VARYING_COMPONENTS_EXT = 0x8DDE;
-        public const int GL_MAX_VARYING_COMPONENTS_EXT = 0x8B4B;
-        public const int GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_EXT = 0x8DDF;
-        public const int GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT = 0x8DE0;
-        public const int GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_EXT = 0x8DE1;
-        public const int GL_LINES_ADJACENCY_EXT = 0x000A;
-        public const int GL_LINE_STRIP_ADJACENCY_EXT = 0x000B;
-        public const int GL_TRIANGLES_ADJACENCY_EXT = 0x000C;
-        public const int GL_TRIANGLE_STRIP_ADJACENCY_EXT = 0x000D;
-        public const int GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT = 0x8DA8;
-        public const int GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT = 0x8DA9;
-        public const int GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT = 0x8DA7;
-        public const int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT = 0x8CD4;
-        public const int GL_PROGRAM_POINT_SIZE_EXT = 0x8642;
-        public const int GL_EXT_gpu_program_parameters = 1;
-        public const int GL_EXT_gpu_shader4 = 1;
-        public const int GL_VERTEX_ATTRIB_ARRAY_INTEGER_EXT = 0x88FD;
-        public const int GL_SAMPLER_1D_ARRAY_EXT = 0x8DC0;
-        public const int GL_SAMPLER_2D_ARRAY_EXT = 0x8DC1;
-        public const int GL_SAMPLER_BUFFER_EXT = 0x8DC2;
-        public const int GL_SAMPLER_1D_ARRAY_SHADOW_EXT = 0x8DC3;
-        public const int GL_SAMPLER_2D_ARRAY_SHADOW_EXT = 0x8DC4;
-        public const int GL_SAMPLER_CUBE_SHADOW_EXT = 0x8DC5;
-        public const int GL_UNSIGNED_INT_VEC2_EXT = 0x8DC6;
-        public const int GL_UNSIGNED_INT_VEC3_EXT = 0x8DC7;
-        public const int GL_UNSIGNED_INT_VEC4_EXT = 0x8DC8;
-        public const int GL_INT_SAMPLER_1D_EXT = 0x8DC9;
-        public const int GL_INT_SAMPLER_2D_EXT = 0x8DCA;
-        public const int GL_INT_SAMPLER_3D_EXT = 0x8DCB;
-        public const int GL_INT_SAMPLER_CUBE_EXT = 0x8DCC;
-        public const int GL_INT_SAMPLER_2D_RECT_EXT = 0x8DCD;
-        public const int GL_INT_SAMPLER_1D_ARRAY_EXT = 0x8DCE;
-        public const int GL_INT_SAMPLER_2D_ARRAY_EXT = 0x8DCF;
-        public const int GL_INT_SAMPLER_BUFFER_EXT = 0x8DD0;
-        public const int GL_UNSIGNED_INT_SAMPLER_1D_EXT = 0x8DD1;
-        public const int GL_UNSIGNED_INT_SAMPLER_2D_EXT = 0x8DD2;
-        public const int GL_UNSIGNED_INT_SAMPLER_3D_EXT = 0x8DD3;
-        public const int GL_UNSIGNED_INT_SAMPLER_CUBE_EXT = 0x8DD4;
-        public const int GL_UNSIGNED_INT_SAMPLER_2D_RECT_EXT = 0x8DD5;
-        public const int GL_UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT = 0x8DD6;
-        public const int GL_UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT = 0x8DD7;
-        public const int GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT = 0x8DD8;
-        public const int GL_MIN_PROGRAM_TEXEL_OFFSET_EXT = 0x8904;
-        public const int GL_MAX_PROGRAM_TEXEL_OFFSET_EXT = 0x8905;
-        public const int GL_EXT_histogram = 1;
-        public const int GL_HISTOGRAM_EXT = 0x8024;
-        public const int GL_PROXY_HISTOGRAM_EXT = 0x8025;
-        public const int GL_HISTOGRAM_WIDTH_EXT = 0x8026;
-        public const int GL_HISTOGRAM_FORMAT_EXT = 0x8027;
-        public const int GL_HISTOGRAM_RED_SIZE_EXT = 0x8028;
-        public const int GL_HISTOGRAM_GREEN_SIZE_EXT = 0x8029;
-        public const int GL_HISTOGRAM_BLUE_SIZE_EXT = 0x802A;
-        public const int GL_HISTOGRAM_ALPHA_SIZE_EXT = 0x802B;
-        public const int GL_HISTOGRAM_LUMINANCE_SIZE_EXT = 0x802C;
-        public const int GL_HISTOGRAM_SINK_EXT = 0x802D;
-        public const int GL_MINMAX_EXT = 0x802E;
-        public const int GL_MINMAX_FORMAT_EXT = 0x802F;
-        public const int GL_MINMAX_SINK_EXT = 0x8030;
-        public const int GL_TABLE_TOO_LARGE_EXT = 0x8031;
-        public const int GL_EXT_index_array_formats = 1;
-        public const int GL_IUI_V2F_EXT = 0x81AD;
-        public const int GL_IUI_V3F_EXT = 0x81AE;
-        public const int GL_IUI_N3F_V2F_EXT = 0x81AF;
-        public const int GL_IUI_N3F_V3F_EXT = 0x81B0;
-        public const int GL_T2F_IUI_V2F_EXT = 0x81B1;
-        public const int GL_T2F_IUI_V3F_EXT = 0x81B2;
-        public const int GL_T2F_IUI_N3F_V2F_EXT = 0x81B3;
-        public const int GL_T2F_IUI_N3F_V3F_EXT = 0x81B4;
-        public const int GL_EXT_index_func = 1;
-        public const int GL_INDEX_TEST_EXT = 0x81B5;
-        public const int GL_INDEX_TEST_FUNC_EXT = 0x81B6;
-        public const int GL_INDEX_TEST_REF_EXT = 0x81B7;
-        public const int GL_EXT_index_material = 1;
-        public const int GL_INDEX_MATERIAL_EXT = 0x81B8;
-        public const int GL_INDEX_MATERIAL_PARAMETER_EXT = 0x81B9;
-        public const int GL_INDEX_MATERIAL_FACE_EXT = 0x81BA;
-        public const int GL_EXT_index_texture = 1;
-        public const int GL_EXT_light_texture = 1;
-        public const int GL_FRAGMENT_MATERIAL_EXT = 0x8349;
-        public const int GL_FRAGMENT_NORMAL_EXT = 0x834A;
-        public const int GL_FRAGMENT_COLOR_EXT = 0x834C;
-        public const int GL_ATTENUATION_EXT = 0x834D;
-        public const int GL_SHADOW_ATTENUATION_EXT = 0x834E;
-        public const int GL_TEXTURE_APPLICATION_MODE_EXT = 0x834F;
-        public const int GL_TEXTURE_LIGHT_EXT = 0x8350;
-        public const int GL_TEXTURE_MATERIAL_FACE_EXT = 0x8351;
-        public const int GL_TEXTURE_MATERIAL_PARAMETER_EXT = 0x8352;
-        public const int GL_EXT_memory_object = 1;
-        public const int GL_TEXTURE_TILING_EXT = 0x9580;
-        public const int GL_DEDICATED_MEMORY_OBJECT_EXT = 0x9581;
-        public const int GL_PROTECTED_MEMORY_OBJECT_EXT = 0x959B;
-        public const int GL_NUM_TILING_TYPES_EXT = 0x9582;
-        public const int GL_TILING_TYPES_EXT = 0x9583;
-        public const int GL_OPTIMAL_TILING_EXT = 0x9584;
-        public const int GL_LINEAR_TILING_EXT = 0x9585;
-        public const int GL_NUM_DEVICE_UUIDS_EXT = 0x9596;
-        public const int GL_DEVICE_UUID_EXT = 0x9597;
-        public const int GL_DRIVER_UUID_EXT = 0x9598;
-        public const int GL_UUID_SIZE_EXT = 16;
-        public const int GL_EXT_memory_object_fd = 1;
-        public const int GL_HANDLE_TYPE_OPAQUE_FD_EXT = 0x9586;
-        public const int GL_EXT_memory_object_win32 = 1;
-        public const int GL_HANDLE_TYPE_OPAQUE_WIN32_EXT = 0x9587;
-        public const int GL_HANDLE_TYPE_OPAQUE_WIN32_KMT_EXT = 0x9588;
-        public const int GL_DEVICE_LUID_EXT = 0x9599;
-        public const int GL_DEVICE_NODE_MASK_EXT = 0x959A;
-        public const int GL_LUID_SIZE_EXT = 8;
-        public const int GL_HANDLE_TYPE_D3D12_TILEPOOL_EXT = 0x9589;
-        public const int GL_HANDLE_TYPE_D3D12_RESOURCE_EXT = 0x958A;
-        public const int GL_HANDLE_TYPE_D3D11_IMAGE_EXT = 0x958B;
-        public const int GL_HANDLE_TYPE_D3D11_IMAGE_KMT_EXT = 0x958C;
-        public const int GL_EXT_misc_attribute = 1;
-        public const int GL_EXT_multi_draw_arrays = 1;
-        public const int GL_EXT_multisample = 1;
-        public const int GL_MULTISAMPLE_EXT = 0x809D;
-        public const int GL_SAMPLE_ALPHA_TO_MASK_EXT = 0x809E;
-        public const int GL_SAMPLE_ALPHA_TO_ONE_EXT = 0x809F;
-        public const int GL_SAMPLE_MASK_EXT = 0x80A0;
-        public const int GL_1PASS_EXT = 0x80A1;
-        public const int GL_2PASS_0_EXT = 0x80A2;
-        public const int GL_2PASS_1_EXT = 0x80A3;
-        public const int GL_4PASS_0_EXT = 0x80A4;
-        public const int GL_4PASS_1_EXT = 0x80A5;
-        public const int GL_4PASS_2_EXT = 0x80A6;
-        public const int GL_4PASS_3_EXT = 0x80A7;
-        public const int GL_SAMPLE_BUFFERS_EXT = 0x80A8;
-        public const int GL_SAMPLES_EXT = 0x80A9;
-        public const int GL_SAMPLE_MASK_VALUE_EXT = 0x80AA;
-        public const int GL_SAMPLE_MASK_INVERT_EXT = 0x80AB;
-        public const int GL_SAMPLE_PATTERN_EXT = 0x80AC;
-        public const int GL_MULTISAMPLE_BIT_EXT = 0x20000000;
-        public const int GL_EXT_packed_depth_stencil = 1;
-        public const int GL_DEPTH_STENCIL_EXT = 0x84F9;
-        public const int GL_UNSIGNED_INT_24_8_EXT = 0x84FA;
-        public const int GL_DEPTH24_STENCIL8_EXT = 0x88F0;
-        public const int GL_TEXTURE_STENCIL_SIZE_EXT = 0x88F1;
-        public const int GL_EXT_packed_float = 1;
-        public const int GL_R11F_G11F_B10F_EXT = 0x8C3A;
-        public const int GL_UNSIGNED_INT_10F_11F_11F_REV_EXT = 0x8C3B;
-        public const int GL_RGBA_SIGNED_COMPONENTS_EXT = 0x8C3C;
-        public const int GL_EXT_packed_pixels = 1;
-        public const int GL_UNSIGNED_BYTE_3_3_2_EXT = 0x8032;
-        public const int GL_UNSIGNED_SHORT_4_4_4_4_EXT = 0x8033;
-        public const int GL_UNSIGNED_SHORT_5_5_5_1_EXT = 0x8034;
-        public const int GL_UNSIGNED_INT_8_8_8_8_EXT = 0x8035;
-        public const int GL_UNSIGNED_INT_10_10_10_2_EXT = 0x8036;
-        public const int GL_EXT_paletted_texture = 1;
-        public const int GL_COLOR_INDEX1_EXT = 0x80E2;
-        public const int GL_COLOR_INDEX2_EXT = 0x80E3;
-        public const int GL_COLOR_INDEX4_EXT = 0x80E4;
-        public const int GL_COLOR_INDEX8_EXT = 0x80E5;
-        public const int GL_COLOR_INDEX12_EXT = 0x80E6;
-        public const int GL_COLOR_INDEX16_EXT = 0x80E7;
-        public const int GL_TEXTURE_INDEX_SIZE_EXT = 0x80ED;
-        public const int GL_EXT_pixel_buffer_object = 1;
-        public const int GL_PIXEL_PACK_BUFFER_EXT = 0x88EB;
-        public const int GL_PIXEL_UNPACK_BUFFER_EXT = 0x88EC;
-        public const int GL_PIXEL_PACK_BUFFER_BINDING_EXT = 0x88ED;
-        public const int GL_PIXEL_UNPACK_BUFFER_BINDING_EXT = 0x88EF;
-        public const int GL_EXT_pixel_transform = 1;
-        public const int GL_PIXEL_TRANSFORM_2D_EXT = 0x8330;
-        public const int GL_PIXEL_MAG_FILTER_EXT = 0x8331;
-        public const int GL_PIXEL_MIN_FILTER_EXT = 0x8332;
-        public const int GL_PIXEL_CUBIC_WEIGHT_EXT = 0x8333;
-        public const int GL_CUBIC_EXT = 0x8334;
-        public const int GL_AVERAGE_EXT = 0x8335;
-        public const int GL_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT = 0x8336;
-        public const int GL_MAX_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT = 0x8337;
-        public const int GL_PIXEL_TRANSFORM_2D_MATRIX_EXT = 0x8338;
-        public const int GL_EXT_pixel_transform_color_table = 1;
-        public const int GL_EXT_point_parameters = 1;
-        public const int GL_POINT_SIZE_MIN_EXT = 0x8126;
-        public const int GL_POINT_SIZE_MAX_EXT = 0x8127;
-        public const int GL_POINT_FADE_THRESHOLD_SIZE_EXT = 0x8128;
-        public const int GL_DISTANCE_ATTENUATION_EXT = 0x8129;
-        public const int GL_EXT_polygon_offset = 1;
-        public const int GL_POLYGON_OFFSET_EXT = 0x8037;
-        public const int GL_POLYGON_OFFSET_FACTOR_EXT = 0x8038;
-        public const int GL_POLYGON_OFFSET_BIAS_EXT = 0x8039;
-        public const int GL_EXT_polygon_offset_clamp = 1;
-        public const int GL_POLYGON_OFFSET_CLAMP_EXT = 0x8E1B;
-        public const int GL_EXT_post_depth_coverage = 1;
-        public const int GL_EXT_provoking_vertex = 1;
-        public const int GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT = 0x8E4C;
-        public const int GL_FIRST_VERTEX_CONVENTION_EXT = 0x8E4D;
-        public const int GL_LAST_VERTEX_CONVENTION_EXT = 0x8E4E;
-        public const int GL_PROVOKING_VERTEX_EXT = 0x8E4F;
-        public const int GL_EXT_raster_multisample = 1;
-        public const int GL_RASTER_MULTISAMPLE_EXT = 0x9327;
-        public const int GL_RASTER_SAMPLES_EXT = 0x9328;
-        public const int GL_MAX_RASTER_SAMPLES_EXT = 0x9329;
-        public const int GL_RASTER_FIXED_SAMPLE_LOCATIONS_EXT = 0x932A;
-        public const int GL_MULTISAMPLE_RASTERIZATION_ALLOWED_EXT = 0x932B;
-        public const int GL_EFFECTIVE_RASTER_SAMPLES_EXT = 0x932C;
-        public const int GL_EXT_rescale_normal = 1;
-        public const int GL_RESCALE_NORMAL_EXT = 0x803A;
-        public const int GL_EXT_secondary_color = 1;
-        public const int GL_COLOR_SUM_EXT = 0x8458;
-        public const int GL_CURRENT_SECONDARY_COLOR_EXT = 0x8459;
-        public const int GL_SECONDARY_COLOR_ARRAY_SIZE_EXT = 0x845A;
-        public const int GL_SECONDARY_COLOR_ARRAY_TYPE_EXT = 0x845B;
-        public const int GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT = 0x845C;
-        public const int GL_SECONDARY_COLOR_ARRAY_POINTER_EXT = 0x845D;
-        public const int GL_SECONDARY_COLOR_ARRAY_EXT = 0x845E;
-        public const int GL_EXT_semaphore = 1;
-        public const int GL_LAYOUT_GENERAL_EXT = 0x958D;
-        public const int GL_LAYOUT_COLOR_ATTACHMENT_EXT = 0x958E;
-        public const int GL_LAYOUT_DEPTH_STENCIL_ATTACHMENT_EXT = 0x958F;
-        public const int GL_LAYOUT_DEPTH_STENCIL_READ_ONLY_EXT = 0x9590;
-        public const int GL_LAYOUT_SHADER_READ_ONLY_EXT = 0x9591;
-        public const int GL_LAYOUT_TRANSFER_SRC_EXT = 0x9592;
-        public const int GL_LAYOUT_TRANSFER_DST_EXT = 0x9593;
-        public const int GL_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_EXT = 0x9530;
-        public const int GL_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_EXT = 0x9531;
-        public const int GL_EXT_semaphore_fd = 1;
-        public const int GL_EXT_semaphore_win32 = 1;
-        public const int GL_HANDLE_TYPE_D3D12_FENCE_EXT = 0x9594;
-        public const int GL_D3D12_FENCE_VALUE_EXT = 0x9595;
-        public const int GL_EXT_separate_shader_objects = 1;
-        public const int GL_ACTIVE_PROGRAM_EXT = 0x8B8D;
-        public const int GL_EXT_separate_specular_color = 1;
-        public const int GL_LIGHT_MODEL_COLOR_CONTROL_EXT = 0x81F8;
-        public const int GL_SINGLE_COLOR_EXT = 0x81F9;
-        public const int GL_SEPARATE_SPECULAR_COLOR_EXT = 0x81FA;
-        public const int GL_EXT_shader_framebuffer_fetch = 1;
-        public const int GL_FRAGMENT_SHADER_DISCARDS_SAMPLES_EXT = 0x8A52;
-        public const int GL_EXT_shader_framebuffer_fetch_non_coherent = 1;
-        public const int GL_EXT_shader_image_load_formatted = 1;
-        public const int GL_EXT_shader_image_load_store = 1;
-        public const int GL_MAX_IMAGE_UNITS_EXT = 0x8F38;
-        public const int GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS_EXT = 0x8F39;
-        public const int GL_IMAGE_BINDING_NAME_EXT = 0x8F3A;
-        public const int GL_IMAGE_BINDING_LEVEL_EXT = 0x8F3B;
-        public const int GL_IMAGE_BINDING_LAYERED_EXT = 0x8F3C;
-        public const int GL_IMAGE_BINDING_LAYER_EXT = 0x8F3D;
-        public const int GL_IMAGE_BINDING_ACCESS_EXT = 0x8F3E;
-        public const int GL_IMAGE_1D_EXT = 0x904C;
-        public const int GL_IMAGE_2D_EXT = 0x904D;
-        public const int GL_IMAGE_3D_EXT = 0x904E;
-        public const int GL_IMAGE_2D_RECT_EXT = 0x904F;
-        public const int GL_IMAGE_CUBE_EXT = 0x9050;
-        public const int GL_IMAGE_BUFFER_EXT = 0x9051;
-        public const int GL_IMAGE_1D_ARRAY_EXT = 0x9052;
-        public const int GL_IMAGE_2D_ARRAY_EXT = 0x9053;
-        public const int GL_IMAGE_CUBE_MAP_ARRAY_EXT = 0x9054;
-        public const int GL_IMAGE_2D_MULTISAMPLE_EXT = 0x9055;
-        public const int GL_IMAGE_2D_MULTISAMPLE_ARRAY_EXT = 0x9056;
-        public const int GL_INT_IMAGE_1D_EXT = 0x9057;
-        public const int GL_INT_IMAGE_2D_EXT = 0x9058;
-        public const int GL_INT_IMAGE_3D_EXT = 0x9059;
-        public const int GL_INT_IMAGE_2D_RECT_EXT = 0x905A;
-        public const int GL_INT_IMAGE_CUBE_EXT = 0x905B;
-        public const int GL_INT_IMAGE_BUFFER_EXT = 0x905C;
-        public const int GL_INT_IMAGE_1D_ARRAY_EXT = 0x905D;
-        public const int GL_INT_IMAGE_2D_ARRAY_EXT = 0x905E;
-        public const int GL_INT_IMAGE_CUBE_MAP_ARRAY_EXT = 0x905F;
-        public const int GL_INT_IMAGE_2D_MULTISAMPLE_EXT = 0x9060;
-        public const int GL_INT_IMAGE_2D_MULTISAMPLE_ARRAY_EXT = 0x9061;
-        public const int GL_UNSIGNED_INT_IMAGE_1D_EXT = 0x9062;
-        public const int GL_UNSIGNED_INT_IMAGE_2D_EXT = 0x9063;
-        public const int GL_UNSIGNED_INT_IMAGE_3D_EXT = 0x9064;
-        public const int GL_UNSIGNED_INT_IMAGE_2D_RECT_EXT = 0x9065;
-        public const int GL_UNSIGNED_INT_IMAGE_CUBE_EXT = 0x9066;
-        public const int GL_UNSIGNED_INT_IMAGE_BUFFER_EXT = 0x9067;
-        public const int GL_UNSIGNED_INT_IMAGE_1D_ARRAY_EXT = 0x9068;
-        public const int GL_UNSIGNED_INT_IMAGE_2D_ARRAY_EXT = 0x9069;
-        public const int GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY_EXT = 0x906A;
-        public const int GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_EXT = 0x906B;
-        public const int GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY_EXT = 0x906C;
-        public const int GL_MAX_IMAGE_SAMPLES_EXT = 0x906D;
-        public const int GL_IMAGE_BINDING_FORMAT_EXT = 0x906E;
-        public const int GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT_EXT = 0x00000001;
-        public const int GL_ELEMENT_ARRAY_BARRIER_BIT_EXT = 0x00000002;
-        public const int GL_UNIFORM_BARRIER_BIT_EXT = 0x00000004;
-        public const int GL_TEXTURE_FETCH_BARRIER_BIT_EXT = 0x00000008;
-        public const int GL_SHADER_IMAGE_ACCESS_BARRIER_BIT_EXT = 0x00000020;
-        public const int GL_COMMAND_BARRIER_BIT_EXT = 0x00000040;
-        public const int GL_PIXEL_BUFFER_BARRIER_BIT_EXT = 0x00000080;
-        public const int GL_TEXTURE_UPDATE_BARRIER_BIT_EXT = 0x00000100;
-        public const int GL_BUFFER_UPDATE_BARRIER_BIT_EXT = 0x00000200;
-        public const int GL_FRAMEBUFFER_BARRIER_BIT_EXT = 0x00000400;
-        public const int GL_TRANSFORM_FEEDBACK_BARRIER_BIT_EXT = 0x00000800;
-        public const int GL_ATOMIC_COUNTER_BARRIER_BIT_EXT = 0x00001000;
-        public const int GL_ALL_BARRIER_BITS_EXT = -1;
-        public const int GL_EXT_shader_integer_mix = 1;
-        public const int GL_EXT_shadow_funcs = 1;
-        public const int GL_EXT_shared_texture_palette = 1;
-        public const int GL_SHARED_TEXTURE_PALETTE_EXT = 0x81FB;
-        public const int GL_EXT_sparse_texture2 = 1;
-        public const int GL_EXT_stencil_clear_tag = 1;
-        public const int GL_STENCIL_TAG_BITS_EXT = 0x88F2;
-        public const int GL_STENCIL_CLEAR_TAG_VALUE_EXT = 0x88F3;
-        public const int GL_EXT_stencil_two_side = 1;
-        public const int GL_STENCIL_TEST_TWO_SIDE_EXT = 0x8910;
-        public const int GL_ACTIVE_STENCIL_FACE_EXT = 0x8911;
-        public const int GL_EXT_stencil_wrap = 1;
-        public const int GL_INCR_WRAP_EXT = 0x8507;
-        public const int GL_DECR_WRAP_EXT = 0x8508;
-        public const int GL_EXT_subtexture = 1;
-        public const int GL_EXT_texture = 1;
-        public const int GL_ALPHA4_EXT = 0x803B;
-        public const int GL_ALPHA8_EXT = 0x803C;
-        public const int GL_ALPHA12_EXT = 0x803D;
-        public const int GL_ALPHA16_EXT = 0x803E;
-        public const int GL_LUMINANCE4_EXT = 0x803F;
-        public const int GL_LUMINANCE8_EXT = 0x8040;
-        public const int GL_LUMINANCE12_EXT = 0x8041;
-        public const int GL_LUMINANCE16_EXT = 0x8042;
-        public const int GL_LUMINANCE4_ALPHA4_EXT = 0x8043;
-        public const int GL_LUMINANCE6_ALPHA2_EXT = 0x8044;
-        public const int GL_LUMINANCE8_ALPHA8_EXT = 0x8045;
-        public const int GL_LUMINANCE12_ALPHA4_EXT = 0x8046;
-        public const int GL_LUMINANCE12_ALPHA12_EXT = 0x8047;
-        public const int GL_LUMINANCE16_ALPHA16_EXT = 0x8048;
-        public const int GL_INTENSITY_EXT = 0x8049;
-        public const int GL_INTENSITY4_EXT = 0x804A;
-        public const int GL_INTENSITY8_EXT = 0x804B;
-        public const int GL_INTENSITY12_EXT = 0x804C;
-        public const int GL_INTENSITY16_EXT = 0x804D;
-        public const int GL_RGB2_EXT = 0x804E;
-        public const int GL_RGB4_EXT = 0x804F;
-        public const int GL_RGB5_EXT = 0x8050;
-        public const int GL_RGB8_EXT = 0x8051;
-        public const int GL_RGB10_EXT = 0x8052;
-        public const int GL_RGB12_EXT = 0x8053;
-        public const int GL_RGB16_EXT = 0x8054;
-        public const int GL_RGBA2_EXT = 0x8055;
-        public const int GL_RGBA4_EXT = 0x8056;
-        public const int GL_RGB5_A1_EXT = 0x8057;
-        public const int GL_RGBA8_EXT = 0x8058;
-        public const int GL_RGB10_A2_EXT = 0x8059;
-        public const int GL_RGBA12_EXT = 0x805A;
-        public const int GL_RGBA16_EXT = 0x805B;
-        public const int GL_TEXTURE_RED_SIZE_EXT = 0x805C;
-        public const int GL_TEXTURE_GREEN_SIZE_EXT = 0x805D;
-        public const int GL_TEXTURE_BLUE_SIZE_EXT = 0x805E;
-        public const int GL_TEXTURE_ALPHA_SIZE_EXT = 0x805F;
-        public const int GL_TEXTURE_LUMINANCE_SIZE_EXT = 0x8060;
-        public const int GL_TEXTURE_INTENSITY_SIZE_EXT = 0x8061;
-        public const int GL_REPLACE_EXT = 0x8062;
-        public const int GL_PROXY_TEXTURE_1D_EXT = 0x8063;
-        public const int GL_PROXY_TEXTURE_2D_EXT = 0x8064;
-        public const int GL_TEXTURE_TOO_LARGE_EXT = 0x8065;
-        public const int GL_EXT_texture3D = 1;
-        public const int GL_PACK_SKIP_IMAGES_EXT = 0x806B;
-        public const int GL_PACK_IMAGE_HEIGHT_EXT = 0x806C;
-        public const int GL_UNPACK_SKIP_IMAGES_EXT = 0x806D;
-        public const int GL_UNPACK_IMAGE_HEIGHT_EXT = 0x806E;
-        public const int GL_TEXTURE_3D_EXT = 0x806F;
-        public const int GL_PROXY_TEXTURE_3D_EXT = 0x8070;
-        public const int GL_TEXTURE_DEPTH_EXT = 0x8071;
-        public const int GL_TEXTURE_WRAP_R_EXT = 0x8072;
-        public const int GL_MAX_3D_TEXTURE_SIZE_EXT = 0x8073;
-        public const int GL_EXT_texture_array = 1;
-        public const int GL_TEXTURE_1D_ARRAY_EXT = 0x8C18;
-        public const int GL_PROXY_TEXTURE_1D_ARRAY_EXT = 0x8C19;
-        public const int GL_TEXTURE_2D_ARRAY_EXT = 0x8C1A;
-        public const int GL_PROXY_TEXTURE_2D_ARRAY_EXT = 0x8C1B;
-        public const int GL_TEXTURE_BINDING_1D_ARRAY_EXT = 0x8C1C;
-        public const int GL_TEXTURE_BINDING_2D_ARRAY_EXT = 0x8C1D;
-        public const int GL_MAX_ARRAY_TEXTURE_LAYERS_EXT = 0x88FF;
-        public const int GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT = 0x884E;
-        public const int GL_EXT_texture_buffer_object = 1;
-        public const int GL_TEXTURE_BUFFER_EXT = 0x8C2A;
-        public const int GL_MAX_TEXTURE_BUFFER_SIZE_EXT = 0x8C2B;
-        public const int GL_TEXTURE_BINDING_BUFFER_EXT = 0x8C2C;
-        public const int GL_TEXTURE_BUFFER_DATA_STORE_BINDING_EXT = 0x8C2D;
-        public const int GL_TEXTURE_BUFFER_FORMAT_EXT = 0x8C2E;
-        public const int GL_EXT_texture_compression_latc = 1;
-        public const int GL_COMPRESSED_LUMINANCE_LATC1_EXT = 0x8C70;
-        public const int GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT = 0x8C71;
-        public const int GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT = 0x8C72;
-        public const int GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT = 0x8C73;
-        public const int GL_EXT_texture_compression_rgtc = 1;
-        public const int GL_COMPRESSED_RED_RGTC1_EXT = 0x8DBB;
-        public const int GL_COMPRESSED_SIGNED_RED_RGTC1_EXT = 0x8DBC;
-        public const int GL_COMPRESSED_RED_GREEN_RGTC2_EXT = 0x8DBD;
-        public const int GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT = 0x8DBE;
-        public const int GL_EXT_texture_compression_s3tc = 1;
-        public const int GL_COMPRESSED_RGB_S3TC_DXT1_EXT = 0x83F0;
-        public const int GL_COMPRESSED_RGBA_S3TC_DXT1_EXT = 0x83F1;
-        public const int GL_COMPRESSED_RGBA_S3TC_DXT3_EXT = 0x83F2;
-        public const int GL_COMPRESSED_RGBA_S3TC_DXT5_EXT = 0x83F3;
-        public const int GL_EXT_texture_cube_map = 1;
-        public const int GL_NORMAL_MAP_EXT = 0x8511;
-        public const int GL_REFLECTION_MAP_EXT = 0x8512;
-        public const int GL_TEXTURE_CUBE_MAP_EXT = 0x8513;
-        public const int GL_TEXTURE_BINDING_CUBE_MAP_EXT = 0x8514;
-        public const int GL_TEXTURE_CUBE_MAP_POSITIVE_X_EXT = 0x8515;
-        public const int GL_TEXTURE_CUBE_MAP_NEGATIVE_X_EXT = 0x8516;
-        public const int GL_TEXTURE_CUBE_MAP_POSITIVE_Y_EXT = 0x8517;
-        public const int GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_EXT = 0x8518;
-        public const int GL_TEXTURE_CUBE_MAP_POSITIVE_Z_EXT = 0x8519;
-        public const int GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_EXT = 0x851A;
-        public const int GL_PROXY_TEXTURE_CUBE_MAP_EXT = 0x851B;
-        public const int GL_MAX_CUBE_MAP_TEXTURE_SIZE_EXT = 0x851C;
-        public const int GL_EXT_texture_env_add = 1;
-        public const int GL_EXT_texture_env_combine = 1;
-        public const int GL_COMBINE_EXT = 0x8570;
-        public const int GL_COMBINE_RGB_EXT = 0x8571;
-        public const int GL_COMBINE_ALPHA_EXT = 0x8572;
-        public const int GL_RGB_SCALE_EXT = 0x8573;
-        public const int GL_ADD_SIGNED_EXT = 0x8574;
-        public const int GL_INTERPOLATE_EXT = 0x8575;
-        public const int GL_CONSTANT_EXT = 0x8576;
-        public const int GL_PRIMARY_COLOR_EXT = 0x8577;
-        public const int GL_PREVIOUS_EXT = 0x8578;
-        public const int GL_SOURCE0_RGB_EXT = 0x8580;
-        public const int GL_SOURCE1_RGB_EXT = 0x8581;
-        public const int GL_SOURCE2_RGB_EXT = 0x8582;
-        public const int GL_SOURCE0_ALPHA_EXT = 0x8588;
-        public const int GL_SOURCE1_ALPHA_EXT = 0x8589;
-        public const int GL_SOURCE2_ALPHA_EXT = 0x858A;
-        public const int GL_OPERAND0_RGB_EXT = 0x8590;
-        public const int GL_OPERAND1_RGB_EXT = 0x8591;
-        public const int GL_OPERAND2_RGB_EXT = 0x8592;
-        public const int GL_OPERAND0_ALPHA_EXT = 0x8598;
-        public const int GL_OPERAND1_ALPHA_EXT = 0x8599;
-        public const int GL_OPERAND2_ALPHA_EXT = 0x859A;
-        public const int GL_EXT_texture_env_dot3 = 1;
-        public const int GL_DOT3_RGB_EXT = 0x8740;
-        public const int GL_DOT3_RGBA_EXT = 0x8741;
-        public const int GL_EXT_texture_filter_anisotropic = 1;
-        public const int GL_TEXTURE_MAX_ANISOTROPY_EXT = 0x84FE;
-        public const int GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT = 0x84FF;
-        public const int GL_EXT_texture_filter_minmax = 1;
-        public const int GL_TEXTURE_REDUCTION_MODE_EXT = 0x9366;
-        public const int GL_WEIGHTED_AVERAGE_EXT = 0x9367;
-        public const int GL_EXT_texture_integer = 1;
-        public const int GL_RGBA32UI_EXT = 0x8D70;
-        public const int GL_RGB32UI_EXT = 0x8D71;
-        public const int GL_ALPHA32UI_EXT = 0x8D72;
-        public const int GL_INTENSITY32UI_EXT = 0x8D73;
-        public const int GL_LUMINANCE32UI_EXT = 0x8D74;
-        public const int GL_LUMINANCE_ALPHA32UI_EXT = 0x8D75;
-        public const int GL_RGBA16UI_EXT = 0x8D76;
-        public const int GL_RGB16UI_EXT = 0x8D77;
-        public const int GL_ALPHA16UI_EXT = 0x8D78;
-        public const int GL_INTENSITY16UI_EXT = 0x8D79;
-        public const int GL_LUMINANCE16UI_EXT = 0x8D7A;
-        public const int GL_LUMINANCE_ALPHA16UI_EXT = 0x8D7B;
-        public const int GL_RGBA8UI_EXT = 0x8D7C;
-        public const int GL_RGB8UI_EXT = 0x8D7D;
-        public const int GL_ALPHA8UI_EXT = 0x8D7E;
-        public const int GL_INTENSITY8UI_EXT = 0x8D7F;
-        public const int GL_LUMINANCE8UI_EXT = 0x8D80;
-        public const int GL_LUMINANCE_ALPHA8UI_EXT = 0x8D81;
-        public const int GL_RGBA32I_EXT = 0x8D82;
-        public const int GL_RGB32I_EXT = 0x8D83;
-        public const int GL_ALPHA32I_EXT = 0x8D84;
-        public const int GL_INTENSITY32I_EXT = 0x8D85;
-        public const int GL_LUMINANCE32I_EXT = 0x8D86;
-        public const int GL_LUMINANCE_ALPHA32I_EXT = 0x8D87;
-        public const int GL_RGBA16I_EXT = 0x8D88;
-        public const int GL_RGB16I_EXT = 0x8D89;
-        public const int GL_ALPHA16I_EXT = 0x8D8A;
-        public const int GL_INTENSITY16I_EXT = 0x8D8B;
-        public const int GL_LUMINANCE16I_EXT = 0x8D8C;
-        public const int GL_LUMINANCE_ALPHA16I_EXT = 0x8D8D;
-        public const int GL_RGBA8I_EXT = 0x8D8E;
-        public const int GL_RGB8I_EXT = 0x8D8F;
-        public const int GL_ALPHA8I_EXT = 0x8D90;
-        public const int GL_INTENSITY8I_EXT = 0x8D91;
-        public const int GL_LUMINANCE8I_EXT = 0x8D92;
-        public const int GL_LUMINANCE_ALPHA8I_EXT = 0x8D93;
-        public const int GL_RED_INTEGER_EXT = 0x8D94;
-        public const int GL_GREEN_INTEGER_EXT = 0x8D95;
-        public const int GL_BLUE_INTEGER_EXT = 0x8D96;
-        public const int GL_ALPHA_INTEGER_EXT = 0x8D97;
-        public const int GL_RGB_INTEGER_EXT = 0x8D98;
-        public const int GL_RGBA_INTEGER_EXT = 0x8D99;
-        public const int GL_BGR_INTEGER_EXT = 0x8D9A;
-        public const int GL_BGRA_INTEGER_EXT = 0x8D9B;
-        public const int GL_LUMINANCE_INTEGER_EXT = 0x8D9C;
-        public const int GL_LUMINANCE_ALPHA_INTEGER_EXT = 0x8D9D;
-        public const int GL_RGBA_INTEGER_MODE_EXT = 0x8D9E;
-        public const int GL_EXT_texture_lod_bias = 1;
-        public const int GL_MAX_TEXTURE_LOD_BIAS_EXT = 0x84FD;
-        public const int GL_TEXTURE_FILTER_CONTROL_EXT = 0x8500;
-        public const int GL_TEXTURE_LOD_BIAS_EXT = 0x8501;
-        public const int GL_EXT_texture_mirror_clamp = 1;
-        public const int GL_MIRROR_CLAMP_EXT = 0x8742;
-        public const int GL_MIRROR_CLAMP_TO_EDGE_EXT = 0x8743;
-        public const int GL_MIRROR_CLAMP_TO_BORDER_EXT = 0x8912;
-        public const int GL_EXT_texture_object = 1;
-        public const int GL_TEXTURE_PRIORITY_EXT = 0x8066;
-        public const int GL_TEXTURE_RESIDENT_EXT = 0x8067;
-        public const int GL_TEXTURE_1D_BINDING_EXT = 0x8068;
-        public const int GL_TEXTURE_2D_BINDING_EXT = 0x8069;
-        public const int GL_TEXTURE_3D_BINDING_EXT = 0x806A;
-        public const int GL_EXT_texture_perturb_normal = 1;
-        public const int GL_PERTURB_EXT = 0x85AE;
-        public const int GL_TEXTURE_NORMAL_EXT = 0x85AF;
-        public const int GL_EXT_texture_sRGB = 1;
-        public const int GL_SRGB_EXT = 0x8C40;
-        public const int GL_SRGB8_EXT = 0x8C41;
-        public const int GL_SRGB_ALPHA_EXT = 0x8C42;
-        public const int GL_SRGB8_ALPHA8_EXT = 0x8C43;
-        public const int GL_SLUMINANCE_ALPHA_EXT = 0x8C44;
-        public const int GL_SLUMINANCE8_ALPHA8_EXT = 0x8C45;
-        public const int GL_SLUMINANCE_EXT = 0x8C46;
-        public const int GL_SLUMINANCE8_EXT = 0x8C47;
-        public const int GL_COMPRESSED_SRGB_EXT = 0x8C48;
-        public const int GL_COMPRESSED_SRGB_ALPHA_EXT = 0x8C49;
-        public const int GL_COMPRESSED_SLUMINANCE_EXT = 0x8C4A;
-        public const int GL_COMPRESSED_SLUMINANCE_ALPHA_EXT = 0x8C4B;
-        public const int GL_COMPRESSED_SRGB_S3TC_DXT1_EXT = 0x8C4C;
-        public const int GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT = 0x8C4D;
-        public const int GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT = 0x8C4E;
-        public const int GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT = 0x8C4F;
-        public const int GL_EXT_texture_sRGB_decode = 1;
-        public const int GL_TEXTURE_SRGB_DECODE_EXT = 0x8A48;
-        public const int GL_DECODE_EXT = 0x8A49;
-        public const int GL_SKIP_DECODE_EXT = 0x8A4A;
-        public const int GL_EXT_texture_shared_exponent = 1;
-        public const int GL_RGB9_E5_EXT = 0x8C3D;
-        public const int GL_UNSIGNED_INT_5_9_9_9_REV_EXT = 0x8C3E;
-        public const int GL_TEXTURE_SHARED_SIZE_EXT = 0x8C3F;
-        public const int GL_EXT_texture_snorm = 1;
-        public const int GL_ALPHA_SNORM = 0x9010;
-        public const int GL_LUMINANCE_SNORM = 0x9011;
-        public const int GL_LUMINANCE_ALPHA_SNORM = 0x9012;
-        public const int GL_INTENSITY_SNORM = 0x9013;
-        public const int GL_ALPHA8_SNORM = 0x9014;
-        public const int GL_LUMINANCE8_SNORM = 0x9015;
-        public const int GL_LUMINANCE8_ALPHA8_SNORM = 0x9016;
-        public const int GL_INTENSITY8_SNORM = 0x9017;
-        public const int GL_ALPHA16_SNORM = 0x9018;
-        public const int GL_LUMINANCE16_SNORM = 0x9019;
-        public const int GL_LUMINANCE16_ALPHA16_SNORM = 0x901A;
-        public const int GL_INTENSITY16_SNORM = 0x901B;
-        public const int GL_RED_SNORM = 0x8F90;
-        public const int GL_RG_SNORM = 0x8F91;
-        public const int GL_RGB_SNORM = 0x8F92;
-        public const int GL_RGBA_SNORM = 0x8F93;
-        public const int GL_EXT_texture_swizzle = 1;
-        public const int GL_TEXTURE_SWIZZLE_R_EXT = 0x8E42;
-        public const int GL_TEXTURE_SWIZZLE_G_EXT = 0x8E43;
-        public const int GL_TEXTURE_SWIZZLE_B_EXT = 0x8E44;
-        public const int GL_TEXTURE_SWIZZLE_A_EXT = 0x8E45;
-        public const int GL_TEXTURE_SWIZZLE_RGBA_EXT = 0x8E46;
-        public const int GL_EXT_timer_query = 1;
-        public const int GL_TIME_ELAPSED_EXT = 0x88BF;
-        public const int GL_EXT_transform_feedback = 1;
-        public const int GL_TRANSFORM_FEEDBACK_BUFFER_EXT = 0x8C8E;
-        public const int GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT = 0x8C84;
-        public const int GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT = 0x8C85;
-        public const int GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT = 0x8C8F;
-        public const int GL_INTERLEAVED_ATTRIBS_EXT = 0x8C8C;
-        public const int GL_SEPARATE_ATTRIBS_EXT = 0x8C8D;
-        public const int GL_PRIMITIVES_GENERATED_EXT = 0x8C87;
-        public const int GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT = 0x8C88;
-        public const int GL_RASTERIZER_DISCARD_EXT = 0x8C89;
-        public const int GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_EXT = 0x8C8A;
-        public const int GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_EXT = 0x8C8B;
-        public const int GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_EXT = 0x8C80;
-        public const int GL_TRANSFORM_FEEDBACK_VARYINGS_EXT = 0x8C83;
-        public const int GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT = 0x8C7F;
-        public const int GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT = 0x8C76;
-        public const int GL_EXT_vertex_array = 1;
-        public const int GL_VERTEX_ARRAY_EXT = 0x8074;
-        public const int GL_NORMAL_ARRAY_EXT = 0x8075;
-        public const int GL_COLOR_ARRAY_EXT = 0x8076;
-        public const int GL_INDEX_ARRAY_EXT = 0x8077;
-        public const int GL_TEXTURE_COORD_ARRAY_EXT = 0x8078;
-        public const int GL_EDGE_FLAG_ARRAY_EXT = 0x8079;
-        public const int GL_VERTEX_ARRAY_SIZE_EXT = 0x807A;
-        public const int GL_VERTEX_ARRAY_TYPE_EXT = 0x807B;
-        public const int GL_VERTEX_ARRAY_STRIDE_EXT = 0x807C;
-        public const int GL_VERTEX_ARRAY_COUNT_EXT = 0x807D;
-        public const int GL_NORMAL_ARRAY_TYPE_EXT = 0x807E;
-        public const int GL_NORMAL_ARRAY_STRIDE_EXT = 0x807F;
-        public const int GL_NORMAL_ARRAY_COUNT_EXT = 0x8080;
-        public const int GL_COLOR_ARRAY_SIZE_EXT = 0x8081;
-        public const int GL_COLOR_ARRAY_TYPE_EXT = 0x8082;
-        public const int GL_COLOR_ARRAY_STRIDE_EXT = 0x8083;
-        public const int GL_COLOR_ARRAY_COUNT_EXT = 0x8084;
-        public const int GL_INDEX_ARRAY_TYPE_EXT = 0x8085;
-        public const int GL_INDEX_ARRAY_STRIDE_EXT = 0x8086;
-        public const int GL_INDEX_ARRAY_COUNT_EXT = 0x8087;
-        public const int GL_TEXTURE_COORD_ARRAY_SIZE_EXT = 0x8088;
-        public const int GL_TEXTURE_COORD_ARRAY_TYPE_EXT = 0x8089;
-        public const int GL_TEXTURE_COORD_ARRAY_STRIDE_EXT = 0x808A;
-        public const int GL_TEXTURE_COORD_ARRAY_COUNT_EXT = 0x808B;
-        public const int GL_EDGE_FLAG_ARRAY_STRIDE_EXT = 0x808C;
-        public const int GL_EDGE_FLAG_ARRAY_COUNT_EXT = 0x808D;
-        public const int GL_VERTEX_ARRAY_POINTER_EXT = 0x808E;
-        public const int GL_NORMAL_ARRAY_POINTER_EXT = 0x808F;
-        public const int GL_COLOR_ARRAY_POINTER_EXT = 0x8090;
-        public const int GL_INDEX_ARRAY_POINTER_EXT = 0x8091;
-        public const int GL_TEXTURE_COORD_ARRAY_POINTER_EXT = 0x8092;
-        public const int GL_EDGE_FLAG_ARRAY_POINTER_EXT = 0x8093;
-        public const int GL_EXT_vertex_array_bgra = 1;
-        public const int GL_EXT_vertex_attrib_64bit = 1;
-        public const int GL_DOUBLE_VEC2_EXT = 0x8FFC;
-        public const int GL_DOUBLE_VEC3_EXT = 0x8FFD;
-        public const int GL_DOUBLE_VEC4_EXT = 0x8FFE;
-        public const int GL_DOUBLE_MAT2_EXT = 0x8F46;
-        public const int GL_DOUBLE_MAT3_EXT = 0x8F47;
-        public const int GL_DOUBLE_MAT4_EXT = 0x8F48;
-        public const int GL_DOUBLE_MAT2x3_EXT = 0x8F49;
-        public const int GL_DOUBLE_MAT2x4_EXT = 0x8F4A;
-        public const int GL_DOUBLE_MAT3x2_EXT = 0x8F4B;
-        public const int GL_DOUBLE_MAT3x4_EXT = 0x8F4C;
-        public const int GL_DOUBLE_MAT4x2_EXT = 0x8F4D;
-        public const int GL_DOUBLE_MAT4x3_EXT = 0x8F4E;
-        public const int GL_EXT_vertex_shader = 1;
-        public const int GL_VERTEX_SHADER_EXT = 0x8780;
-        public const int GL_VERTEX_SHADER_BINDING_EXT = 0x8781;
-        public const int GL_OP_INDEX_EXT = 0x8782;
-        public const int GL_OP_NEGATE_EXT = 0x8783;
-        public const int GL_OP_DOT3_EXT = 0x8784;
-        public const int GL_OP_DOT4_EXT = 0x8785;
-        public const int GL_OP_MUL_EXT = 0x8786;
-        public const int GL_OP_ADD_EXT = 0x8787;
-        public const int GL_OP_MADD_EXT = 0x8788;
-        public const int GL_OP_FRAC_EXT = 0x8789;
-        public const int GL_OP_MAX_EXT = 0x878A;
-        public const int GL_OP_MIN_EXT = 0x878B;
-        public const int GL_OP_SET_GE_EXT = 0x878C;
-        public const int GL_OP_SET_LT_EXT = 0x878D;
-        public const int GL_OP_CLAMP_EXT = 0x878E;
-        public const int GL_OP_FLOOR_EXT = 0x878F;
-        public const int GL_OP_ROUND_EXT = 0x8790;
-        public const int GL_OP_EXP_BASE_2_EXT = 0x8791;
-        public const int GL_OP_LOG_BASE_2_EXT = 0x8792;
-        public const int GL_OP_POWER_EXT = 0x8793;
-        public const int GL_OP_RECIP_EXT = 0x8794;
-        public const int GL_OP_RECIP_SQRT_EXT = 0x8795;
-        public const int GL_OP_SUB_EXT = 0x8796;
-        public const int GL_OP_CROSS_PRODUCT_EXT = 0x8797;
-        public const int GL_OP_MULTIPLY_MATRIX_EXT = 0x8798;
-        public const int GL_OP_MOV_EXT = 0x8799;
-        public const int GL_OUTPUT_VERTEX_EXT = 0x879A;
-        public const int GL_OUTPUT_COLOR0_EXT = 0x879B;
-        public const int GL_OUTPUT_COLOR1_EXT = 0x879C;
-        public const int GL_OUTPUT_TEXTURE_COORD0_EXT = 0x879D;
-        public const int GL_OUTPUT_TEXTURE_COORD1_EXT = 0x879E;
-        public const int GL_OUTPUT_TEXTURE_COORD2_EXT = 0x879F;
-        public const int GL_OUTPUT_TEXTURE_COORD3_EXT = 0x87A0;
-        public const int GL_OUTPUT_TEXTURE_COORD4_EXT = 0x87A1;
-        public const int GL_OUTPUT_TEXTURE_COORD5_EXT = 0x87A2;
-        public const int GL_OUTPUT_TEXTURE_COORD6_EXT = 0x87A3;
-        public const int GL_OUTPUT_TEXTURE_COORD7_EXT = 0x87A4;
-        public const int GL_OUTPUT_TEXTURE_COORD8_EXT = 0x87A5;
-        public const int GL_OUTPUT_TEXTURE_COORD9_EXT = 0x87A6;
-        public const int GL_OUTPUT_TEXTURE_COORD10_EXT = 0x87A7;
-        public const int GL_OUTPUT_TEXTURE_COORD11_EXT = 0x87A8;
-        public const int GL_OUTPUT_TEXTURE_COORD12_EXT = 0x87A9;
-        public const int GL_OUTPUT_TEXTURE_COORD13_EXT = 0x87AA;
-        public const int GL_OUTPUT_TEXTURE_COORD14_EXT = 0x87AB;
-        public const int GL_OUTPUT_TEXTURE_COORD15_EXT = 0x87AC;
-        public const int GL_OUTPUT_TEXTURE_COORD16_EXT = 0x87AD;
-        public const int GL_OUTPUT_TEXTURE_COORD17_EXT = 0x87AE;
-        public const int GL_OUTPUT_TEXTURE_COORD18_EXT = 0x87AF;
-        public const int GL_OUTPUT_TEXTURE_COORD19_EXT = 0x87B0;
-        public const int GL_OUTPUT_TEXTURE_COORD20_EXT = 0x87B1;
-        public const int GL_OUTPUT_TEXTURE_COORD21_EXT = 0x87B2;
-        public const int GL_OUTPUT_TEXTURE_COORD22_EXT = 0x87B3;
-        public const int GL_OUTPUT_TEXTURE_COORD23_EXT = 0x87B4;
-        public const int GL_OUTPUT_TEXTURE_COORD24_EXT = 0x87B5;
-        public const int GL_OUTPUT_TEXTURE_COORD25_EXT = 0x87B6;
-        public const int GL_OUTPUT_TEXTURE_COORD26_EXT = 0x87B7;
-        public const int GL_OUTPUT_TEXTURE_COORD27_EXT = 0x87B8;
-        public const int GL_OUTPUT_TEXTURE_COORD28_EXT = 0x87B9;
-        public const int GL_OUTPUT_TEXTURE_COORD29_EXT = 0x87BA;
-        public const int GL_OUTPUT_TEXTURE_COORD30_EXT = 0x87BB;
-        public const int GL_OUTPUT_TEXTURE_COORD31_EXT = 0x87BC;
-        public const int GL_OUTPUT_FOG_EXT = 0x87BD;
-        public const int GL_SCALAR_EXT = 0x87BE;
-        public const int GL_VECTOR_EXT = 0x87BF;
-        public const int GL_MATRIX_EXT = 0x87C0;
-        public const int GL_VARIANT_EXT = 0x87C1;
-        public const int GL_INVARIANT_EXT = 0x87C2;
-        public const int GL_LOCAL_CONSTANT_EXT = 0x87C3;
-        public const int GL_LOCAL_EXT = 0x87C4;
-        public const int GL_MAX_VERTEX_SHADER_INSTRUCTIONS_EXT = 0x87C5;
-        public const int GL_MAX_VERTEX_SHADER_VARIANTS_EXT = 0x87C6;
-        public const int GL_MAX_VERTEX_SHADER_INVARIANTS_EXT = 0x87C7;
-        public const int GL_MAX_VERTEX_SHADER_LOCAL_CONSTANTS_EXT = 0x87C8;
-        public const int GL_MAX_VERTEX_SHADER_LOCALS_EXT = 0x87C9;
-        public const int GL_MAX_OPTIMIZED_VERTEX_SHADER_INSTRUCTIONS_EXT = 0x87CA;
-        public const int GL_MAX_OPTIMIZED_VERTEX_SHADER_VARIANTS_EXT = 0x87CB;
-        public const int GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCAL_CONSTANTS_EXT = 0x87CC;
-        public const int GL_MAX_OPTIMIZED_VERTEX_SHADER_INVARIANTS_EXT = 0x87CD;
-        public const int GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCALS_EXT = 0x87CE;
-        public const int GL_VERTEX_SHADER_INSTRUCTIONS_EXT = 0x87CF;
-        public const int GL_VERTEX_SHADER_VARIANTS_EXT = 0x87D0;
-        public const int GL_VERTEX_SHADER_INVARIANTS_EXT = 0x87D1;
-        public const int GL_VERTEX_SHADER_LOCAL_CONSTANTS_EXT = 0x87D2;
-        public const int GL_VERTEX_SHADER_LOCALS_EXT = 0x87D3;
-        public const int GL_VERTEX_SHADER_OPTIMIZED_EXT = 0x87D4;
-        public const int GL_X_EXT = 0x87D5;
-        public const int GL_Y_EXT = 0x87D6;
-        public const int GL_Z_EXT = 0x87D7;
-        public const int GL_W_EXT = 0x87D8;
-        public const int GL_NEGATIVE_X_EXT = 0x87D9;
-        public const int GL_NEGATIVE_Y_EXT = 0x87DA;
-        public const int GL_NEGATIVE_Z_EXT = 0x87DB;
-        public const int GL_NEGATIVE_W_EXT = 0x87DC;
-        public const int GL_ZERO_EXT = 0x87DD;
-        public const int GL_ONE_EXT = 0x87DE;
-        public const int GL_NEGATIVE_ONE_EXT = 0x87DF;
-        public const int GL_NORMALIZED_RANGE_EXT = 0x87E0;
-        public const int GL_FULL_RANGE_EXT = 0x87E1;
-        public const int GL_CURRENT_VERTEX_EXT = 0x87E2;
-        public const int GL_MVP_MATRIX_EXT = 0x87E3;
-        public const int GL_VARIANT_VALUE_EXT = 0x87E4;
-        public const int GL_VARIANT_DATATYPE_EXT = 0x87E5;
-        public const int GL_VARIANT_ARRAY_STRIDE_EXT = 0x87E6;
-        public const int GL_VARIANT_ARRAY_TYPE_EXT = 0x87E7;
-        public const int GL_VARIANT_ARRAY_EXT = 0x87E8;
-        public const int GL_VARIANT_ARRAY_POINTER_EXT = 0x87E9;
-        public const int GL_INVARIANT_VALUE_EXT = 0x87EA;
-        public const int GL_INVARIANT_DATATYPE_EXT = 0x87EB;
-        public const int GL_LOCAL_CONSTANT_VALUE_EXT = 0x87EC;
-        public const int GL_LOCAL_CONSTANT_DATATYPE_EXT = 0x87ED;
-        public const int GL_EXT_vertex_weighting = 1;
-        public const int GL_MODELVIEW0_STACK_DEPTH_EXT = 0x0BA3;
-        public const int GL_MODELVIEW1_STACK_DEPTH_EXT = 0x8502;
-        public const int GL_MODELVIEW0_MATRIX_EXT = 0x0BA6;
-        public const int GL_MODELVIEW1_MATRIX_EXT = 0x8506;
-        public const int GL_VERTEX_WEIGHTING_EXT = 0x8509;
-        public const int GL_MODELVIEW0_EXT = 0x1700;
-        public const int GL_MODELVIEW1_EXT = 0x850A;
-        public const int GL_CURRENT_VERTEX_WEIGHT_EXT = 0x850B;
-        public const int GL_VERTEX_WEIGHT_ARRAY_EXT = 0x850C;
-        public const int GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT = 0x850D;
-        public const int GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT = 0x850E;
-        public const int GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT = 0x850F;
-        public const int GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT = 0x8510;
-        public const int GL_EXT_win32_keyed_mutex = 1;
-        public const int GL_EXT_window_rectangles = 1;
-        public const int GL_INCLUSIVE_EXT = 0x8F10;
-        public const int GL_EXCLUSIVE_EXT = 0x8F11;
-        public const int GL_WINDOW_RECTANGLE_EXT = 0x8F12;
-        public const int GL_WINDOW_RECTANGLE_MODE_EXT = 0x8F13;
-        public const int GL_MAX_WINDOW_RECTANGLES_EXT = 0x8F14;
-        public const int GL_NUM_WINDOW_RECTANGLES_EXT = 0x8F15;
-        public const int GL_EXT_x11_sync_object = 1;
-        public const int GL_SYNC_X11_FENCE_EXT = 0x90E1;
-        public const int GL_GREMEDY_frame_terminator = 1;
-        public const int GL_GREMEDY_string_marker = 1;
-        public const int GL_HP_convolution_border_modes = 1;
-        public const int GL_IGNORE_BORDER_HP = 0x8150;
-        public const int GL_CONSTANT_BORDER_HP = 0x8151;
-        public const int GL_REPLICATE_BORDER_HP = 0x8153;
-        public const int GL_CONVOLUTION_BORDER_COLOR_HP = 0x8154;
-        public const int GL_HP_image_transform = 1;
-        public const int GL_IMAGE_SCALE_X_HP = 0x8155;
-        public const int GL_IMAGE_SCALE_Y_HP = 0x8156;
-        public const int GL_IMAGE_TRANSLATE_X_HP = 0x8157;
-        public const int GL_IMAGE_TRANSLATE_Y_HP = 0x8158;
-        public const int GL_IMAGE_ROTATE_ANGLE_HP = 0x8159;
-        public const int GL_IMAGE_ROTATE_ORIGIN_X_HP = 0x815A;
-        public const int GL_IMAGE_ROTATE_ORIGIN_Y_HP = 0x815B;
-        public const int GL_IMAGE_MAG_FILTER_HP = 0x815C;
-        public const int GL_IMAGE_MIN_FILTER_HP = 0x815D;
-        public const int GL_IMAGE_CUBIC_WEIGHT_HP = 0x815E;
-        public const int GL_CUBIC_HP = 0x815F;
-        public const int GL_AVERAGE_HP = 0x8160;
-        public const int GL_IMAGE_TRANSFORM_2D_HP = 0x8161;
-        public const int GL_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP = 0x8162;
-        public const int GL_PROXY_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP = 0x8163;
-        public const int GL_HP_occlusion_test = 1;
-        public const int GL_OCCLUSION_TEST_HP = 0x8165;
-        public const int GL_OCCLUSION_TEST_RESULT_HP = 0x8166;
-        public const int GL_HP_texture_lighting = 1;
-        public const int GL_TEXTURE_LIGHTING_MODE_HP = 0x8167;
-        public const int GL_TEXTURE_POST_SPECULAR_HP = 0x8168;
-        public const int GL_TEXTURE_PRE_SPECULAR_HP = 0x8169;
-        public const int GL_IBM_cull_vertex = 1;
-        public const int GL_CULL_VERTEX_IBM = 103050;
-        public const int GL_IBM_multimode_draw_arrays = 1;
-        public const int GL_IBM_rasterpos_clip = 1;
-        public const int GL_RASTER_POSITION_UNCLIPPED_IBM = 0x19262;
-        public const int GL_IBM_static_data = 1;
-        public const int GL_ALL_STATIC_DATA_IBM = 103060;
-        public const int GL_STATIC_VERTEX_ARRAY_IBM = 103061;
-        public const int GL_IBM_texture_mirrored_repeat = 1;
-        public const int GL_MIRRORED_REPEAT_IBM = 0x8370;
-        public const int GL_IBM_vertex_array_lists = 1;
-        public const int GL_VERTEX_ARRAY_LIST_IBM = 103070;
-        public const int GL_NORMAL_ARRAY_LIST_IBM = 103071;
-        public const int GL_COLOR_ARRAY_LIST_IBM = 103072;
-        public const int GL_INDEX_ARRAY_LIST_IBM = 103073;
-        public const int GL_TEXTURE_COORD_ARRAY_LIST_IBM = 103074;
-        public const int GL_EDGE_FLAG_ARRAY_LIST_IBM = 103075;
-        public const int GL_FOG_COORDINATE_ARRAY_LIST_IBM = 103076;
-        public const int GL_SECONDARY_COLOR_ARRAY_LIST_IBM = 103077;
-        public const int GL_VERTEX_ARRAY_LIST_STRIDE_IBM = 103080;
-        public const int GL_NORMAL_ARRAY_LIST_STRIDE_IBM = 103081;
-        public const int GL_COLOR_ARRAY_LIST_STRIDE_IBM = 103082;
-        public const int GL_INDEX_ARRAY_LIST_STRIDE_IBM = 103083;
-        public const int GL_TEXTURE_COORD_ARRAY_LIST_STRIDE_IBM = 103084;
-        public const int GL_EDGE_FLAG_ARRAY_LIST_STRIDE_IBM = 103085;
-        public const int GL_FOG_COORDINATE_ARRAY_LIST_STRIDE_IBM = 103086;
-        public const int GL_SECONDARY_COLOR_ARRAY_LIST_STRIDE_IBM = 103087;
-        public const int GL_INGR_blend_func_separate = 1;
-        public const int GL_INGR_color_clamp = 1;
-        public const int GL_RED_MIN_CLAMP_INGR = 0x8560;
-        public const int GL_GREEN_MIN_CLAMP_INGR = 0x8561;
-        public const int GL_BLUE_MIN_CLAMP_INGR = 0x8562;
-        public const int GL_ALPHA_MIN_CLAMP_INGR = 0x8563;
-        public const int GL_RED_MAX_CLAMP_INGR = 0x8564;
-        public const int GL_GREEN_MAX_CLAMP_INGR = 0x8565;
-        public const int GL_BLUE_MAX_CLAMP_INGR = 0x8566;
-        public const int GL_ALPHA_MAX_CLAMP_INGR = 0x8567;
-        public const int GL_INGR_interlace_read = 1;
-        public const int GL_INTERLACE_READ_INGR = 0x8568;
-        public const int GL_INTEL_blackhole_render = 1;
-        public const int GL_BLACKHOLE_RENDER_INTEL = 0x83FC;
-        public const int GL_INTEL_conservative_rasterization = 1;
-        public const int GL_CONSERVATIVE_RASTERIZATION_INTEL = 0x83FE;
-        public const int GL_INTEL_fragment_shader_ordering = 1;
-        public const int GL_INTEL_framebuffer_CMAA = 1;
-        public const int GL_INTEL_map_texture = 1;
-        public const int GL_TEXTURE_MEMORY_LAYOUT_INTEL = 0x83FF;
-        public const int GL_LAYOUT_DEFAULT_INTEL = 0;
-        public const int GL_LAYOUT_LINEAR_INTEL = 1;
-        public const int GL_LAYOUT_LINEAR_CPU_CACHED_INTEL = 2;
-        public const int GL_INTEL_parallel_arrays = 1;
-        public const int GL_PARALLEL_ARRAYS_INTEL = 0x83F4;
-        public const int GL_VERTEX_ARRAY_PARALLEL_POINTERS_INTEL = 0x83F5;
-        public const int GL_NORMAL_ARRAY_PARALLEL_POINTERS_INTEL = 0x83F6;
-        public const int GL_COLOR_ARRAY_PARALLEL_POINTERS_INTEL = 0x83F7;
-        public const int GL_TEXTURE_COORD_ARRAY_PARALLEL_POINTERS_INTEL = 0x83F8;
-        public const int GL_INTEL_performance_query = 1;
-        public const int GL_PERFQUERY_SINGLE_CONTEXT_INTEL = 0x00000000;
-        public const int GL_PERFQUERY_GLOBAL_CONTEXT_INTEL = 0x00000001;
-        public const int GL_PERFQUERY_WAIT_INTEL = 0x83FB;
-        public const int GL_PERFQUERY_FLUSH_INTEL = 0x83FA;
-        public const int GL_PERFQUERY_DONOT_FLUSH_INTEL = 0x83F9;
-        public const int GL_PERFQUERY_COUNTER_EVENT_INTEL = 0x94F0;
-        public const int GL_PERFQUERY_COUNTER_DURATION_NORM_INTEL = 0x94F1;
-        public const int GL_PERFQUERY_COUNTER_DURATION_RAW_INTEL = 0x94F2;
-        public const int GL_PERFQUERY_COUNTER_THROUGHPUT_INTEL = 0x94F3;
-        public const int GL_PERFQUERY_COUNTER_RAW_INTEL = 0x94F4;
-        public const int GL_PERFQUERY_COUNTER_TIMESTAMP_INTEL = 0x94F5;
-        public const int GL_PERFQUERY_COUNTER_DATA_UINT32_INTEL = 0x94F8;
-        public const int GL_PERFQUERY_COUNTER_DATA_UINT64_INTEL = 0x94F9;
-        public const int GL_PERFQUERY_COUNTER_DATA_FLOAT_INTEL = 0x94FA;
-        public const int GL_PERFQUERY_COUNTER_DATA_DOUBLE_INTEL = 0x94FB;
-        public const int GL_PERFQUERY_COUNTER_DATA_BOOL32_INTEL = 0x94FC;
-        public const int GL_PERFQUERY_QUERY_NAME_LENGTH_MAX_INTEL = 0x94FD;
-        public const int GL_PERFQUERY_COUNTER_NAME_LENGTH_MAX_INTEL = 0x94FE;
-        public const int GL_PERFQUERY_COUNTER_DESC_LENGTH_MAX_INTEL = 0x94FF;
-        public const int GL_PERFQUERY_GPA_EXTENDED_COUNTERS_INTEL = 0x9500;
-        public const int GL_MESAX_texture_stack = 1;
-        public const int GL_TEXTURE_1D_STACK_MESAX = 0x8759;
-        public const int GL_TEXTURE_2D_STACK_MESAX = 0x875A;
-        public const int GL_PROXY_TEXTURE_1D_STACK_MESAX = 0x875B;
-        public const int GL_PROXY_TEXTURE_2D_STACK_MESAX = 0x875C;
-        public const int GL_TEXTURE_1D_STACK_BINDING_MESAX = 0x875D;
-        public const int GL_TEXTURE_2D_STACK_BINDING_MESAX = 0x875E;
-        public const int GL_MESA_pack_invert = 1;
-        public const int GL_PACK_INVERT_MESA = 0x8758;
-        public const int GL_MESA_program_binary_formats = 1;
-        public const int GL_PROGRAM_BINARY_FORMAT_MESA = 0x875F;
-        public const int GL_MESA_resize_buffers = 1;
-        public const int GL_MESA_shader_integer_functions = 1;
-        public const int GL_MESA_tile_raster_order = 1;
-        public const int GL_TILE_RASTER_ORDER_FIXED_MESA = 0x8BB8;
-        public const int GL_TILE_RASTER_ORDER_INCREASING_X_MESA = 0x8BB9;
-        public const int GL_TILE_RASTER_ORDER_INCREASING_Y_MESA = 0x8BBA;
-        public const int GL_MESA_window_pos = 1;
-        public const int GL_MESA_ycbcr_texture = 1;
-        public const int GL_UNSIGNED_SHORT_8_8_MESA = 0x85BA;
-        public const int GL_UNSIGNED_SHORT_8_8_REV_MESA = 0x85BB;
-        public const int GL_YCBCR_MESA = 0x8757;
-        public const int GL_NVX_blend_equation_advanced_multi_draw_buffers = 1;
-        public const int GL_NVX_conditional_render = 1;
-        public const int GL_NVX_gpu_memory_info = 1;
-        public const int GL_GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX = 0x9047;
-        public const int GL_GPU_MEMORY_INFO_TOTAL_AVAILABLE_MEMORY_NVX = 0x9048;
-        public const int GL_GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX = 0x9049;
-        public const int GL_GPU_MEMORY_INFO_EVICTION_COUNT_NVX = 0x904A;
-        public const int GL_GPU_MEMORY_INFO_EVICTED_MEMORY_NVX = 0x904B;
-        public const int GL_NVX_linked_gpu_multicast = 1;
-        public const int GL_LGPU_SEPARATE_STORAGE_BIT_NVX = 0x0800;
-        public const int GL_MAX_LGPU_GPUS_NVX = 0x92BA;
-        public const int GL_NV_alpha_to_coverage_dither_control = 1;
-        public const int GL_ALPHA_TO_COVERAGE_DITHER_DEFAULT_NV = 0x934D;
-        public const int GL_ALPHA_TO_COVERAGE_DITHER_ENABLE_NV = 0x934E;
-        public const int GL_ALPHA_TO_COVERAGE_DITHER_DISABLE_NV = 0x934F;
-        public const int GL_ALPHA_TO_COVERAGE_DITHER_MODE_NV = 0x92BF;
-        public const int GL_NV_bindless_multi_draw_indirect = 1;
-        public const int GL_NV_bindless_multi_draw_indirect_count = 1;
-        public const int GL_NV_bindless_texture = 1;
-        public const int GL_NV_blend_equation_advanced = 1;
-        public const int GL_BLEND_OVERLAP_NV = 0x9281;
-        public const int GL_BLEND_PREMULTIPLIED_SRC_NV = 0x9280;
-        public const int GL_BLUE_NV = 0x1905;
-        public const int GL_COLORBURN_NV = 0x929A;
-        public const int GL_COLORDODGE_NV = 0x9299;
-        public const int GL_CONJOINT_NV = 0x9284;
-        public const int GL_CONTRAST_NV = 0x92A1;
-        public const int GL_DARKEN_NV = 0x9297;
-        public const int GL_DIFFERENCE_NV = 0x929E;
-        public const int GL_DISJOINT_NV = 0x9283;
-        public const int GL_DST_ATOP_NV = 0x928F;
-        public const int GL_DST_IN_NV = 0x928B;
-        public const int GL_DST_NV = 0x9287;
-        public const int GL_DST_OUT_NV = 0x928D;
-        public const int GL_DST_OVER_NV = 0x9289;
-        public const int GL_EXCLUSION_NV = 0x92A0;
-        public const int GL_GREEN_NV = 0x1904;
-        public const int GL_HARDLIGHT_NV = 0x929B;
-        public const int GL_HARDMIX_NV = 0x92A9;
-        public const int GL_HSL_COLOR_NV = 0x92AF;
-        public const int GL_HSL_HUE_NV = 0x92AD;
-        public const int GL_HSL_LUMINOSITY_NV = 0x92B0;
-        public const int GL_HSL_SATURATION_NV = 0x92AE;
-        public const int GL_INVERT_OVG_NV = 0x92B4;
-        public const int GL_INVERT_RGB_NV = 0x92A3;
-        public const int GL_LIGHTEN_NV = 0x9298;
-        public const int GL_LINEARBURN_NV = 0x92A5;
-        public const int GL_LINEARDODGE_NV = 0x92A4;
-        public const int GL_LINEARLIGHT_NV = 0x92A7;
-        public const int GL_MINUS_CLAMPED_NV = 0x92B3;
-        public const int GL_MINUS_NV = 0x929F;
-        public const int GL_MULTIPLY_NV = 0x9294;
-        public const int GL_OVERLAY_NV = 0x9296;
-        public const int GL_PINLIGHT_NV = 0x92A8;
-        public const int GL_PLUS_CLAMPED_ALPHA_NV = 0x92B2;
-        public const int GL_PLUS_CLAMPED_NV = 0x92B1;
-        public const int GL_PLUS_DARKER_NV = 0x9292;
-        public const int GL_PLUS_NV = 0x9291;
-        public const int GL_RED_NV = 0x1903;
-        public const int GL_SCREEN_NV = 0x9295;
-        public const int GL_SOFTLIGHT_NV = 0x929C;
-        public const int GL_SRC_ATOP_NV = 0x928E;
-        public const int GL_SRC_IN_NV = 0x928A;
-        public const int GL_SRC_NV = 0x9286;
-        public const int GL_SRC_OUT_NV = 0x928C;
-        public const int GL_SRC_OVER_NV = 0x9288;
-        public const int GL_UNCORRELATED_NV = 0x9282;
-        public const int GL_VIVIDLIGHT_NV = 0x92A6;
-        public const int GL_XOR_NV = 0x1506;
-        public const int GL_NV_blend_equation_advanced_coherent = 1;
-        public const int GL_BLEND_ADVANCED_COHERENT_NV = 0x9285;
-        public const int GL_NV_blend_minmax_factor = 1;
-        public const int GL_NV_blend_square = 1;
-        public const int GL_NV_clip_space_w_scaling = 1;
-        public const int GL_VIEWPORT_POSITION_W_SCALE_NV = 0x937C;
-        public const int GL_VIEWPORT_POSITION_W_SCALE_X_COEFF_NV = 0x937D;
-        public const int GL_VIEWPORT_POSITION_W_SCALE_Y_COEFF_NV = 0x937E;
-        public const int GL_NV_command_list = 1;
-        public const int GL_TERMINATE_SEQUENCE_COMMAND_NV = 0x0000;
-        public const int GL_NOP_COMMAND_NV = 0x0001;
-        public const int GL_DRAW_ELEMENTS_COMMAND_NV = 0x0002;
-        public const int GL_DRAW_ARRAYS_COMMAND_NV = 0x0003;
-        public const int GL_DRAW_ELEMENTS_STRIP_COMMAND_NV = 0x0004;
-        public const int GL_DRAW_ARRAYS_STRIP_COMMAND_NV = 0x0005;
-        public const int GL_DRAW_ELEMENTS_INSTANCED_COMMAND_NV = 0x0006;
-        public const int GL_DRAW_ARRAYS_INSTANCED_COMMAND_NV = 0x0007;
-        public const int GL_ELEMENT_ADDRESS_COMMAND_NV = 0x0008;
-        public const int GL_ATTRIBUTE_ADDRESS_COMMAND_NV = 0x0009;
-        public const int GL_UNIFORM_ADDRESS_COMMAND_NV = 0x000A;
-        public const int GL_BLEND_COLOR_COMMAND_NV = 0x000B;
-        public const int GL_STENCIL_REF_COMMAND_NV = 0x000C;
-        public const int GL_LINE_WIDTH_COMMAND_NV = 0x000D;
-        public const int GL_POLYGON_OFFSET_COMMAND_NV = 0x000E;
-        public const int GL_ALPHA_REF_COMMAND_NV = 0x000F;
-        public const int GL_VIEWPORT_COMMAND_NV = 0x0010;
-        public const int GL_SCISSOR_COMMAND_NV = 0x0011;
-        public const int GL_FRONT_FACE_COMMAND_NV = 0x0012;
-        public const int GL_NV_compute_program5 = 1;
-        public const int GL_COMPUTE_PROGRAM_NV = 0x90FB;
-        public const int GL_COMPUTE_PROGRAM_PARAMETER_BUFFER_NV = 0x90FC;
-        public const int GL_NV_conditional_render = 1;
-        public const int GL_QUERY_WAIT_NV = 0x8E13;
-        public const int GL_QUERY_NO_WAIT_NV = 0x8E14;
-        public const int GL_QUERY_BY_REGION_WAIT_NV = 0x8E15;
-        public const int GL_QUERY_BY_REGION_NO_WAIT_NV = 0x8E16;
-        public const int GL_NV_conservative_raster = 1;
-        public const int GL_CONSERVATIVE_RASTERIZATION_NV = 0x9346;
-        public const int GL_SUBPIXEL_PRECISION_BIAS_X_BITS_NV = 0x9347;
-        public const int GL_SUBPIXEL_PRECISION_BIAS_Y_BITS_NV = 0x9348;
-        public const int GL_MAX_SUBPIXEL_PRECISION_BIAS_BITS_NV = 0x9349;
-        public const int GL_NV_conservative_raster_dilate = 1;
-        public const int GL_CONSERVATIVE_RASTER_DILATE_NV = 0x9379;
-        public const int GL_CONSERVATIVE_RASTER_DILATE_RANGE_NV = 0x937A;
-        public const int GL_CONSERVATIVE_RASTER_DILATE_GRANULARITY_NV = 0x937B;
-        public const int GL_NV_conservative_raster_pre_snap = 1;
-        public const int GL_CONSERVATIVE_RASTER_MODE_PRE_SNAP_NV = 0x9550;
-        public const int GL_NV_conservative_raster_pre_snap_triangles = 1;
-        public const int GL_CONSERVATIVE_RASTER_MODE_NV = 0x954D;
-        public const int GL_CONSERVATIVE_RASTER_MODE_POST_SNAP_NV = 0x954E;
-        public const int GL_CONSERVATIVE_RASTER_MODE_PRE_SNAP_TRIANGLES_NV = 0x954F;
-        public const int GL_NV_conservative_raster_underestimation = 1;
-        public const int GL_NV_copy_depth_to_color = 1;
-        public const int GL_DEPTH_STENCIL_TO_RGBA_NV = 0x886E;
-        public const int GL_DEPTH_STENCIL_TO_BGRA_NV = 0x886F;
-        public const int GL_NV_copy_image = 1;
-        public const int GL_NV_deep_texture3D = 1;
-        public const int GL_MAX_DEEP_3D_TEXTURE_WIDTH_HEIGHT_NV = 0x90D0;
-        public const int GL_MAX_DEEP_3D_TEXTURE_DEPTH_NV = 0x90D1;
-        public const int GL_NV_depth_buffer_float = 1;
-        public const int GL_DEPTH_COMPONENT32F_NV = 0x8DAB;
-        public const int GL_DEPTH32F_STENCIL8_NV = 0x8DAC;
-        public const int GL_FLOAT_32_UNSIGNED_INT_24_8_REV_NV = 0x8DAD;
-        public const int GL_DEPTH_BUFFER_FLOAT_MODE_NV = 0x8DAF;
-        public const int GL_NV_depth_clamp = 1;
-        public const int GL_DEPTH_CLAMP_NV = 0x864F;
-        public const int GL_NV_draw_texture = 1;
-        public const int GL_NV_draw_vulkan_image = 1;
-        public const int GL_NV_evaluators = 1;
-        public const int GL_EVAL_2D_NV = 0x86C0;
-        public const int GL_EVAL_TRIANGULAR_2D_NV = 0x86C1;
-        public const int GL_MAP_TESSELLATION_NV = 0x86C2;
-        public const int GL_MAP_ATTRIB_U_ORDER_NV = 0x86C3;
-        public const int GL_MAP_ATTRIB_V_ORDER_NV = 0x86C4;
-        public const int GL_EVAL_FRACTIONAL_TESSELLATION_NV = 0x86C5;
-        public const int GL_EVAL_VERTEX_ATTRIB0_NV = 0x86C6;
-        public const int GL_EVAL_VERTEX_ATTRIB1_NV = 0x86C7;
-        public const int GL_EVAL_VERTEX_ATTRIB2_NV = 0x86C8;
-        public const int GL_EVAL_VERTEX_ATTRIB3_NV = 0x86C9;
-        public const int GL_EVAL_VERTEX_ATTRIB4_NV = 0x86CA;
-        public const int GL_EVAL_VERTEX_ATTRIB5_NV = 0x86CB;
-        public const int GL_EVAL_VERTEX_ATTRIB6_NV = 0x86CC;
-        public const int GL_EVAL_VERTEX_ATTRIB7_NV = 0x86CD;
-        public const int GL_EVAL_VERTEX_ATTRIB8_NV = 0x86CE;
-        public const int GL_EVAL_VERTEX_ATTRIB9_NV = 0x86CF;
-        public const int GL_EVAL_VERTEX_ATTRIB10_NV = 0x86D0;
-        public const int GL_EVAL_VERTEX_ATTRIB11_NV = 0x86D1;
-        public const int GL_EVAL_VERTEX_ATTRIB12_NV = 0x86D2;
-        public const int GL_EVAL_VERTEX_ATTRIB13_NV = 0x86D3;
-        public const int GL_EVAL_VERTEX_ATTRIB14_NV = 0x86D4;
-        public const int GL_EVAL_VERTEX_ATTRIB15_NV = 0x86D5;
-        public const int GL_MAX_MAP_TESSELLATION_NV = 0x86D6;
-        public const int GL_MAX_RATIONAL_EVAL_ORDER_NV = 0x86D7;
-        public const int GL_NV_explicit_multisample = 1;
-        public const int GL_SAMPLE_POSITION_NV = 0x8E50;
-        public const int GL_SAMPLE_MASK_NV = 0x8E51;
-        public const int GL_SAMPLE_MASK_VALUE_NV = 0x8E52;
-        public const int GL_TEXTURE_BINDING_RENDERBUFFER_NV = 0x8E53;
-        public const int GL_TEXTURE_RENDERBUFFER_DATA_STORE_BINDING_NV = 0x8E54;
-        public const int GL_TEXTURE_RENDERBUFFER_NV = 0x8E55;
-        public const int GL_SAMPLER_RENDERBUFFER_NV = 0x8E56;
-        public const int GL_INT_SAMPLER_RENDERBUFFER_NV = 0x8E57;
-        public const int GL_UNSIGNED_INT_SAMPLER_RENDERBUFFER_NV = 0x8E58;
-        public const int GL_MAX_SAMPLE_MASK_WORDS_NV = 0x8E59;
-        public const int GL_NV_fence = 1;
-        public const int GL_ALL_COMPLETED_NV = 0x84F2;
-        public const int GL_FENCE_STATUS_NV = 0x84F3;
-        public const int GL_FENCE_CONDITION_NV = 0x84F4;
-        public const int GL_NV_fill_rectangle = 1;
-        public const int GL_FILL_RECTANGLE_NV = 0x933C;
-        public const int GL_NV_float_buffer = 1;
-        public const int GL_FLOAT_R_NV = 0x8880;
-        public const int GL_FLOAT_RG_NV = 0x8881;
-        public const int GL_FLOAT_RGB_NV = 0x8882;
-        public const int GL_FLOAT_RGBA_NV = 0x8883;
-        public const int GL_FLOAT_R16_NV = 0x8884;
-        public const int GL_FLOAT_R32_NV = 0x8885;
-        public const int GL_FLOAT_RG16_NV = 0x8886;
-        public const int GL_FLOAT_RG32_NV = 0x8887;
-        public const int GL_FLOAT_RGB16_NV = 0x8888;
-        public const int GL_FLOAT_RGB32_NV = 0x8889;
-        public const int GL_FLOAT_RGBA16_NV = 0x888A;
-        public const int GL_FLOAT_RGBA32_NV = 0x888B;
-        public const int GL_TEXTURE_FLOAT_COMPONENTS_NV = 0x888C;
-        public const int GL_FLOAT_CLEAR_COLOR_VALUE_NV = 0x888D;
-        public const int GL_FLOAT_RGBA_MODE_NV = 0x888E;
-        public const int GL_NV_fog_distance = 1;
-        public const int GL_FOG_DISTANCE_MODE_NV = 0x855A;
-        public const int GL_EYE_RADIAL_NV = 0x855B;
-        public const int GL_EYE_PLANE_ABSOLUTE_NV = 0x855C;
-        public const int GL_NV_fragment_coverage_to_color = 1;
-        public const int GL_FRAGMENT_COVERAGE_TO_COLOR_NV = 0x92DD;
-        public const int GL_FRAGMENT_COVERAGE_COLOR_NV = 0x92DE;
-        public const int GL_NV_fragment_program = 1;
-        public const int GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV = 0x8868;
-        public const int GL_FRAGMENT_PROGRAM_NV = 0x8870;
-        public const int GL_MAX_TEXTURE_COORDS_NV = 0x8871;
-        public const int GL_MAX_TEXTURE_IMAGE_UNITS_NV = 0x8872;
-        public const int GL_FRAGMENT_PROGRAM_BINDING_NV = 0x8873;
-        public const int GL_PROGRAM_ERROR_STRING_NV = 0x8874;
-        public const int GL_NV_fragment_program2 = 1;
-        public const int GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV = 0x88F4;
-        public const int GL_MAX_PROGRAM_CALL_DEPTH_NV = 0x88F5;
-        public const int GL_MAX_PROGRAM_IF_DEPTH_NV = 0x88F6;
-        public const int GL_MAX_PROGRAM_LOOP_DEPTH_NV = 0x88F7;
-        public const int GL_MAX_PROGRAM_LOOP_COUNT_NV = 0x88F8;
-        public const int GL_NV_fragment_program4 = 1;
-        public const int GL_NV_fragment_program_option = 1;
-        public const int GL_NV_fragment_shader_interlock = 1;
-        public const int GL_NV_framebuffer_mixed_samples = 1;
-        public const int GL_COVERAGE_MODULATION_TABLE_NV = 0x9331;
-        public const int GL_COLOR_SAMPLES_NV = 0x8E20;
-        public const int GL_DEPTH_SAMPLES_NV = 0x932D;
-        public const int GL_STENCIL_SAMPLES_NV = 0x932E;
-        public const int GL_MIXED_DEPTH_SAMPLES_SUPPORTED_NV = 0x932F;
-        public const int GL_MIXED_STENCIL_SAMPLES_SUPPORTED_NV = 0x9330;
-        public const int GL_COVERAGE_MODULATION_NV = 0x9332;
-        public const int GL_COVERAGE_MODULATION_TABLE_SIZE_NV = 0x9333;
-        public const int GL_NV_framebuffer_multisample_coverage = 1;
-        public const int GL_RENDERBUFFER_COVERAGE_SAMPLES_NV = 0x8CAB;
-        public const int GL_RENDERBUFFER_COLOR_SAMPLES_NV = 0x8E10;
-        public const int GL_MAX_MULTISAMPLE_COVERAGE_MODES_NV = 0x8E11;
-        public const int GL_MULTISAMPLE_COVERAGE_MODES_NV = 0x8E12;
-        public const int GL_NV_geometry_program4 = 1;
-        public const int GL_GEOMETRY_PROGRAM_NV = 0x8C26;
-        public const int GL_MAX_PROGRAM_OUTPUT_VERTICES_NV = 0x8C27;
-        public const int GL_MAX_PROGRAM_TOTAL_OUTPUT_COMPONENTS_NV = 0x8C28;
-        public const int GL_NV_geometry_shader4 = 1;
-        public const int GL_NV_geometry_shader_passthrough = 1;
-        public const int GL_NV_gpu_multicast = 1;
-        public const int GL_PER_GPU_STORAGE_BIT_NV = 0x0800;
-        public const int GL_MULTICAST_GPUS_NV = 0x92BA;
-        public const int GL_RENDER_GPU_MASK_NV = 0x9558;
-        public const int GL_PER_GPU_STORAGE_NV = 0x9548;
-        public const int GL_MULTICAST_PROGRAMMABLE_SAMPLE_LOCATION_NV = 0x9549;
-        public const int GL_NV_gpu_program4 = 1;
-        public const int GL_MIN_PROGRAM_TEXEL_OFFSET_NV = 0x8904;
-        public const int GL_MAX_PROGRAM_TEXEL_OFFSET_NV = 0x8905;
-        public const int GL_PROGRAM_ATTRIB_COMPONENTS_NV = 0x8906;
-        public const int GL_PROGRAM_RESULT_COMPONENTS_NV = 0x8907;
-        public const int GL_MAX_PROGRAM_ATTRIB_COMPONENTS_NV = 0x8908;
-        public const int GL_MAX_PROGRAM_RESULT_COMPONENTS_NV = 0x8909;
-        public const int GL_MAX_PROGRAM_GENERIC_ATTRIBS_NV = 0x8DA5;
-        public const int GL_MAX_PROGRAM_GENERIC_RESULTS_NV = 0x8DA6;
-        public const int GL_NV_gpu_program5 = 1;
-        public const int GL_MAX_GEOMETRY_PROGRAM_INVOCATIONS_NV = 0x8E5A;
-        public const int GL_MIN_FRAGMENT_INTERPOLATION_OFFSET_NV = 0x8E5B;
-        public const int GL_MAX_FRAGMENT_INTERPOLATION_OFFSET_NV = 0x8E5C;
-        public const int GL_FRAGMENT_PROGRAM_INTERPOLATION_OFFSET_BITS_NV = 0x8E5D;
-        public const int GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET_NV = 0x8E5E;
-        public const int GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET_NV = 0x8E5F;
-        public const int GL_MAX_PROGRAM_SUBROUTINE_PARAMETERS_NV = 0x8F44;
-        public const int GL_MAX_PROGRAM_SUBROUTINE_NUM_NV = 0x8F45;
-        public const int GL_NV_gpu_program5_mem_extended = 1;
-        public const int GL_NV_gpu_shader5 = 1;
-        public const int GL_NV_half_float = 1;
-        public const int GL_HALF_FLOAT_NV = 0x140B;
-        public const int GL_NV_internalformat_sample_query = 1;
-        public const int GL_MULTISAMPLES_NV = 0x9371;
-        public const int GL_SUPERSAMPLE_SCALE_X_NV = 0x9372;
-        public const int GL_SUPERSAMPLE_SCALE_Y_NV = 0x9373;
-        public const int GL_CONFORMANT_NV = 0x9374;
-        public const int GL_NV_light_max_exponent = 1;
-        public const int GL_MAX_SHININESS_NV = 0x8504;
-        public const int GL_MAX_SPOT_EXPONENT_NV = 0x8505;
-        public const int GL_NV_multisample_coverage = 1;
-        public const int GL_NV_multisample_filter_hint = 1;
-        public const int GL_MULTISAMPLE_FILTER_HINT_NV = 0x8534;
-        public const int GL_NV_occlusion_query = 1;
-        public const int GL_PIXEL_COUNTER_BITS_NV = 0x8864;
-        public const int GL_CURRENT_OCCLUSION_QUERY_ID_NV = 0x8865;
-        public const int GL_PIXEL_COUNT_NV = 0x8866;
-        public const int GL_PIXEL_COUNT_AVAILABLE_NV = 0x8867;
-        public const int GL_NV_packed_depth_stencil = 1;
-        public const int GL_DEPTH_STENCIL_NV = 0x84F9;
-        public const int GL_UNSIGNED_INT_24_8_NV = 0x84FA;
-        public const int GL_NV_parameter_buffer_object = 1;
-        public const int GL_MAX_PROGRAM_PARAMETER_BUFFER_BINDINGS_NV = 0x8DA0;
-        public const int GL_MAX_PROGRAM_PARAMETER_BUFFER_SIZE_NV = 0x8DA1;
-        public const int GL_VERTEX_PROGRAM_PARAMETER_BUFFER_NV = 0x8DA2;
-        public const int GL_GEOMETRY_PROGRAM_PARAMETER_BUFFER_NV = 0x8DA3;
-        public const int GL_FRAGMENT_PROGRAM_PARAMETER_BUFFER_NV = 0x8DA4;
-        public const int GL_NV_parameter_buffer_object2 = 1;
-        public const int GL_NV_path_rendering = 1;
-        public const int GL_PATH_FORMAT_SVG_NV = 0x9070;
-        public const int GL_PATH_FORMAT_PS_NV = 0x9071;
-        public const int GL_STANDARD_FONT_NAME_NV = 0x9072;
-        public const int GL_SYSTEM_FONT_NAME_NV = 0x9073;
-        public const int GL_FILE_NAME_NV = 0x9074;
-        public const int GL_PATH_STROKE_WIDTH_NV = 0x9075;
-        public const int GL_PATH_END_CAPS_NV = 0x9076;
-        public const int GL_PATH_INITIAL_END_CAP_NV = 0x9077;
-        public const int GL_PATH_TERMINAL_END_CAP_NV = 0x9078;
-        public const int GL_PATH_JOIN_STYLE_NV = 0x9079;
-        public const int GL_PATH_MITER_LIMIT_NV = 0x907A;
-        public const int GL_PATH_DASH_CAPS_NV = 0x907B;
-        public const int GL_PATH_INITIAL_DASH_CAP_NV = 0x907C;
-        public const int GL_PATH_TERMINAL_DASH_CAP_NV = 0x907D;
-        public const int GL_PATH_DASH_OFFSET_NV = 0x907E;
-        public const int GL_PATH_CLIENT_LENGTH_NV = 0x907F;
-        public const int GL_PATH_FILL_MODE_NV = 0x9080;
-        public const int GL_PATH_FILL_MASK_NV = 0x9081;
-        public const int GL_PATH_FILL_COVER_MODE_NV = 0x9082;
-        public const int GL_PATH_STROKE_COVER_MODE_NV = 0x9083;
-        public const int GL_PATH_STROKE_MASK_NV = 0x9084;
-        public const int GL_COUNT_UP_NV = 0x9088;
-        public const int GL_COUNT_DOWN_NV = 0x9089;
-        public const int GL_PATH_OBJECT_BOUNDING_BOX_NV = 0x908A;
-        public const int GL_CONVEX_HULL_NV = 0x908B;
-        public const int GL_BOUNDING_BOX_NV = 0x908D;
-        public const int GL_TRANSLATE_X_NV = 0x908E;
-        public const int GL_TRANSLATE_Y_NV = 0x908F;
-        public const int GL_TRANSLATE_2D_NV = 0x9090;
-        public const int GL_TRANSLATE_3D_NV = 0x9091;
-        public const int GL_AFFINE_2D_NV = 0x9092;
-        public const int GL_AFFINE_3D_NV = 0x9094;
-        public const int GL_TRANSPOSE_AFFINE_2D_NV = 0x9096;
-        public const int GL_TRANSPOSE_AFFINE_3D_NV = 0x9098;
-        public const int GL_UTF8_NV = 0x909A;
-        public const int GL_UTF16_NV = 0x909B;
-        public const int GL_BOUNDING_BOX_OF_BOUNDING_BOXES_NV = 0x909C;
-        public const int GL_PATH_COMMAND_COUNT_NV = 0x909D;
-        public const int GL_PATH_COORD_COUNT_NV = 0x909E;
-        public const int GL_PATH_DASH_ARRAY_COUNT_NV = 0x909F;
-        public const int GL_PATH_COMPUTED_LENGTH_NV = 0x90A0;
-        public const int GL_PATH_FILL_BOUNDING_BOX_NV = 0x90A1;
-        public const int GL_PATH_STROKE_BOUNDING_BOX_NV = 0x90A2;
-        public const int GL_SQUARE_NV = 0x90A3;
-        public const int GL_ROUND_NV = 0x90A4;
-        public const int GL_TRIANGULAR_NV = 0x90A5;
-        public const int GL_BEVEL_NV = 0x90A6;
-        public const int GL_MITER_REVERT_NV = 0x90A7;
-        public const int GL_MITER_TRUNCATE_NV = 0x90A8;
-        public const int GL_SKIP_MISSING_GLYPH_NV = 0x90A9;
-        public const int GL_USE_MISSING_GLYPH_NV = 0x90AA;
-        public const int GL_PATH_ERROR_POSITION_NV = 0x90AB;
-        public const int GL_ACCUM_ADJACENT_PAIRS_NV = 0x90AD;
-        public const int GL_ADJACENT_PAIRS_NV = 0x90AE;
-        public const int GL_FIRST_TO_REST_NV = 0x90AF;
-        public const int GL_PATH_GEN_MODE_NV = 0x90B0;
-        public const int GL_PATH_GEN_COEFF_NV = 0x90B1;
-        public const int GL_PATH_GEN_COMPONENTS_NV = 0x90B3;
-        public const int GL_PATH_STENCIL_FUNC_NV = 0x90B7;
-        public const int GL_PATH_STENCIL_REF_NV = 0x90B8;
-        public const int GL_PATH_STENCIL_VALUE_MASK_NV = 0x90B9;
-        public const int GL_PATH_STENCIL_DEPTH_OFFSET_FACTOR_NV = 0x90BD;
-        public const int GL_PATH_STENCIL_DEPTH_OFFSET_UNITS_NV = 0x90BE;
-        public const int GL_PATH_COVER_DEPTH_FUNC_NV = 0x90BF;
-        public const int GL_PATH_DASH_OFFSET_RESET_NV = 0x90B4;
-        public const int GL_MOVE_TO_RESETS_NV = 0x90B5;
-        public const int GL_MOVE_TO_CONTINUES_NV = 0x90B6;
-        public const int GL_CLOSE_PATH_NV = 0x00;
-        public const int GL_MOVE_TO_NV = 0x02;
-        public const int GL_RELATIVE_MOVE_TO_NV = 0x03;
-        public const int GL_LINE_TO_NV = 0x04;
-        public const int GL_RELATIVE_LINE_TO_NV = 0x05;
-        public const int GL_HORIZONTAL_LINE_TO_NV = 0x06;
-        public const int GL_RELATIVE_HORIZONTAL_LINE_TO_NV = 0x07;
-        public const int GL_VERTICAL_LINE_TO_NV = 0x08;
-        public const int GL_RELATIVE_VERTICAL_LINE_TO_NV = 0x09;
-        public const int GL_QUADRATIC_CURVE_TO_NV = 0x0A;
-        public const int GL_RELATIVE_QUADRATIC_CURVE_TO_NV = 0x0B;
-        public const int GL_CUBIC_CURVE_TO_NV = 0x0C;
-        public const int GL_RELATIVE_CUBIC_CURVE_TO_NV = 0x0D;
-        public const int GL_SMOOTH_QUADRATIC_CURVE_TO_NV = 0x0E;
-        public const int GL_RELATIVE_SMOOTH_QUADRATIC_CURVE_TO_NV = 0x0F;
-        public const int GL_SMOOTH_CUBIC_CURVE_TO_NV = 0x10;
-        public const int GL_RELATIVE_SMOOTH_CUBIC_CURVE_TO_NV = 0x11;
-        public const int GL_SMALL_CCW_ARC_TO_NV = 0x12;
-        public const int GL_RELATIVE_SMALL_CCW_ARC_TO_NV = 0x13;
-        public const int GL_SMALL_CW_ARC_TO_NV = 0x14;
-        public const int GL_RELATIVE_SMALL_CW_ARC_TO_NV = 0x15;
-        public const int GL_LARGE_CCW_ARC_TO_NV = 0x16;
-        public const int GL_RELATIVE_LARGE_CCW_ARC_TO_NV = 0x17;
-        public const int GL_LARGE_CW_ARC_TO_NV = 0x18;
-        public const int GL_RELATIVE_LARGE_CW_ARC_TO_NV = 0x19;
-        public const int GL_RESTART_PATH_NV = 0xF0;
-        public const int GL_DUP_FIRST_CUBIC_CURVE_TO_NV = 0xF2;
-        public const int GL_DUP_LAST_CUBIC_CURVE_TO_NV = 0xF4;
-        public const int GL_RECT_NV = 0xF6;
-        public const int GL_CIRCULAR_CCW_ARC_TO_NV = 0xF8;
-        public const int GL_CIRCULAR_CW_ARC_TO_NV = 0xFA;
-        public const int GL_CIRCULAR_TANGENT_ARC_TO_NV = 0xFC;
-        public const int GL_ARC_TO_NV = 0xFE;
-        public const int GL_RELATIVE_ARC_TO_NV = 0xFF;
-        public const int GL_BOLD_BIT_NV = 0x01;
-        public const int GL_ITALIC_BIT_NV = 0x02;
-        public const int GL_GLYPH_WIDTH_BIT_NV = 0x01;
-        public const int GL_GLYPH_HEIGHT_BIT_NV = 0x02;
-        public const int GL_GLYPH_HORIZONTAL_BEARING_X_BIT_NV = 0x04;
-        public const int GL_GLYPH_HORIZONTAL_BEARING_Y_BIT_NV = 0x08;
-        public const int GL_GLYPH_HORIZONTAL_BEARING_ADVANCE_BIT_NV = 0x10;
-        public const int GL_GLYPH_VERTICAL_BEARING_X_BIT_NV = 0x20;
-        public const int GL_GLYPH_VERTICAL_BEARING_Y_BIT_NV = 0x40;
-        public const int GL_GLYPH_VERTICAL_BEARING_ADVANCE_BIT_NV = 0x80;
-        public const int GL_GLYPH_HAS_KERNING_BIT_NV = 0x100;
-        public const int GL_FONT_X_MIN_BOUNDS_BIT_NV = 0x00010000;
-        public const int GL_FONT_Y_MIN_BOUNDS_BIT_NV = 0x00020000;
-        public const int GL_FONT_X_MAX_BOUNDS_BIT_NV = 0x00040000;
-        public const int GL_FONT_Y_MAX_BOUNDS_BIT_NV = 0x00080000;
-        public const int GL_FONT_UNITS_PER_EM_BIT_NV = 0x00100000;
-        public const int GL_FONT_ASCENDER_BIT_NV = 0x00200000;
-        public const int GL_FONT_DESCENDER_BIT_NV = 0x00400000;
-        public const int GL_FONT_HEIGHT_BIT_NV = 0x00800000;
-        public const int GL_FONT_MAX_ADVANCE_WIDTH_BIT_NV = 0x01000000;
-        public const int GL_FONT_MAX_ADVANCE_HEIGHT_BIT_NV = 0x02000000;
-        public const int GL_FONT_UNDERLINE_POSITION_BIT_NV = 0x04000000;
-        public const int GL_FONT_UNDERLINE_THICKNESS_BIT_NV = 0x08000000;
-        public const int GL_FONT_HAS_KERNING_BIT_NV = 0x10000000;
-        public const int GL_ROUNDED_RECT_NV = 0xE8;
-        public const int GL_RELATIVE_ROUNDED_RECT_NV = 0xE9;
-        public const int GL_ROUNDED_RECT2_NV = 0xEA;
-        public const int GL_RELATIVE_ROUNDED_RECT2_NV = 0xEB;
-        public const int GL_ROUNDED_RECT4_NV = 0xEC;
-        public const int GL_RELATIVE_ROUNDED_RECT4_NV = 0xED;
-        public const int GL_ROUNDED_RECT8_NV = 0xEE;
-        public const int GL_RELATIVE_ROUNDED_RECT8_NV = 0xEF;
-        public const int GL_RELATIVE_RECT_NV = 0xF7;
-        public const int GL_FONT_GLYPHS_AVAILABLE_NV = 0x9368;
-        public const int GL_FONT_TARGET_UNAVAILABLE_NV = 0x9369;
-        public const int GL_FONT_UNAVAILABLE_NV = 0x936A;
-        public const int GL_FONT_UNINTELLIGIBLE_NV = 0x936B;
-        public const int GL_CONIC_CURVE_TO_NV = 0x1A;
-        public const int GL_RELATIVE_CONIC_CURVE_TO_NV = 0x1B;
-        public const int GL_FONT_NUM_GLYPH_INDICES_BIT_NV = 0x20000000;
-        public const int GL_STANDARD_FONT_FORMAT_NV = 0x936C;
-        public const int GL_2_BYTES_NV = 0x1407;
-        public const int GL_3_BYTES_NV = 0x1408;
-        public const int GL_4_BYTES_NV = 0x1409;
-        public const int GL_EYE_LINEAR_NV = 0x2400;
-        public const int GL_OBJECT_LINEAR_NV = 0x2401;
-        public const int GL_CONSTANT_NV = 0x8576;
-        public const int GL_PATH_FOG_GEN_MODE_NV = 0x90AC;
-        public const int GL_PRIMARY_COLOR_NV = 0x852C;
-        public const int GL_SECONDARY_COLOR_NV = 0x852D;
-        public const int GL_PATH_GEN_COLOR_FORMAT_NV = 0x90B2;
-        public const int GL_PATH_PROJECTION_NV = 0x1701;
-        public const int GL_PATH_MODELVIEW_NV = 0x1700;
-        public const int GL_PATH_MODELVIEW_STACK_DEPTH_NV = 0x0BA3;
-        public const int GL_PATH_MODELVIEW_MATRIX_NV = 0x0BA6;
-        public const int GL_PATH_MAX_MODELVIEW_STACK_DEPTH_NV = 0x0D36;
-        public const int GL_PATH_TRANSPOSE_MODELVIEW_MATRIX_NV = 0x84E3;
-        public const int GL_PATH_PROJECTION_STACK_DEPTH_NV = 0x0BA4;
-        public const int GL_PATH_PROJECTION_MATRIX_NV = 0x0BA7;
-        public const int GL_PATH_MAX_PROJECTION_STACK_DEPTH_NV = 0x0D38;
-        public const int GL_PATH_TRANSPOSE_PROJECTION_MATRIX_NV = 0x84E4;
-        public const int GL_FRAGMENT_INPUT_NV = 0x936D;
-        public const int GL_NV_path_rendering_shared_edge = 1;
-        public const int GL_SHARED_EDGE_NV = 0xC0;
-        public const int GL_NV_pixel_data_range = 1;
-        public const int GL_WRITE_PIXEL_DATA_RANGE_NV = 0x8878;
-        public const int GL_READ_PIXEL_DATA_RANGE_NV = 0x8879;
-        public const int GL_WRITE_PIXEL_DATA_RANGE_LENGTH_NV = 0x887A;
-        public const int GL_READ_PIXEL_DATA_RANGE_LENGTH_NV = 0x887B;
-        public const int GL_WRITE_PIXEL_DATA_RANGE_POINTER_NV = 0x887C;
-        public const int GL_READ_PIXEL_DATA_RANGE_POINTER_NV = 0x887D;
-        public const int GL_NV_point_sprite = 1;
-        public const int GL_POINT_SPRITE_NV = 0x8861;
-        public const int GL_COORD_REPLACE_NV = 0x8862;
-        public const int GL_POINT_SPRITE_R_MODE_NV = 0x8863;
-        public const int GL_NV_present_video = 1;
-        public const int GL_FRAME_NV = 0x8E26;
-        public const int GL_FIELDS_NV = 0x8E27;
-        public const int GL_CURRENT_TIME_NV = 0x8E28;
-        public const int GL_NUM_FILL_STREAMS_NV = 0x8E29;
-        public const int GL_PRESENT_TIME_NV = 0x8E2A;
-        public const int GL_PRESENT_DURATION_NV = 0x8E2B;
-        public const int GL_NV_primitive_restart = 1;
-        public const int GL_PRIMITIVE_RESTART_NV = 0x8558;
-        public const int GL_PRIMITIVE_RESTART_INDEX_NV = 0x8559;
-        public const int GL_NV_query_resource = 1;
-        public const int GL_QUERY_RESOURCE_TYPE_VIDMEM_ALLOC_NV = 0x9540;
-        public const int GL_QUERY_RESOURCE_MEMTYPE_VIDMEM_NV = 0x9542;
-        public const int GL_QUERY_RESOURCE_SYS_RESERVED_NV = 0x9544;
-        public const int GL_QUERY_RESOURCE_TEXTURE_NV = 0x9545;
-        public const int GL_QUERY_RESOURCE_RENDERBUFFER_NV = 0x9546;
-        public const int GL_QUERY_RESOURCE_BUFFEROBJECT_NV = 0x9547;
-        public const int GL_NV_query_resource_tag = 1;
-        public const int GL_NV_register_combiners = 1;
-        public const int GL_REGISTER_COMBINERS_NV = 0x8522;
-        public const int GL_VARIABLE_A_NV = 0x8523;
-        public const int GL_VARIABLE_B_NV = 0x8524;
-        public const int GL_VARIABLE_C_NV = 0x8525;
-        public const int GL_VARIABLE_D_NV = 0x8526;
-        public const int GL_VARIABLE_E_NV = 0x8527;
-        public const int GL_VARIABLE_F_NV = 0x8528;
-        public const int GL_VARIABLE_G_NV = 0x8529;
-        public const int GL_CONSTANT_COLOR0_NV = 0x852A;
-        public const int GL_CONSTANT_COLOR1_NV = 0x852B;
-        public const int GL_SPARE0_NV = 0x852E;
-        public const int GL_SPARE1_NV = 0x852F;
-        public const int GL_DISCARD_NV = 0x8530;
-        public const int GL_E_TIMES_F_NV = 0x8531;
-        public const int GL_SPARE0_PLUS_SECONDARY_COLOR_NV = 0x8532;
-        public const int GL_UNSIGNED_IDENTITY_NV = 0x8536;
-        public const int GL_UNSIGNED_INVERT_NV = 0x8537;
-        public const int GL_EXPAND_NORMAL_NV = 0x8538;
-        public const int GL_EXPAND_NEGATE_NV = 0x8539;
-        public const int GL_HALF_BIAS_NORMAL_NV = 0x853A;
-        public const int GL_HALF_BIAS_NEGATE_NV = 0x853B;
-        public const int GL_SIGNED_IDENTITY_NV = 0x853C;
-        public const int GL_SIGNED_NEGATE_NV = 0x853D;
-        public const int GL_SCALE_BY_TWO_NV = 0x853E;
-        public const int GL_SCALE_BY_FOUR_NV = 0x853F;
-        public const int GL_SCALE_BY_ONE_HALF_NV = 0x8540;
-        public const int GL_BIAS_BY_NEGATIVE_ONE_HALF_NV = 0x8541;
-        public const int GL_COMBINER_INPUT_NV = 0x8542;
-        public const int GL_COMBINER_MAPPING_NV = 0x8543;
-        public const int GL_COMBINER_COMPONENT_USAGE_NV = 0x8544;
-        public const int GL_COMBINER_AB_DOT_PRODUCT_NV = 0x8545;
-        public const int GL_COMBINER_CD_DOT_PRODUCT_NV = 0x8546;
-        public const int GL_COMBINER_MUX_SUM_NV = 0x8547;
-        public const int GL_COMBINER_SCALE_NV = 0x8548;
-        public const int GL_COMBINER_BIAS_NV = 0x8549;
-        public const int GL_COMBINER_AB_OUTPUT_NV = 0x854A;
-        public const int GL_COMBINER_CD_OUTPUT_NV = 0x854B;
-        public const int GL_COMBINER_SUM_OUTPUT_NV = 0x854C;
-        public const int GL_MAX_GENERAL_COMBINERS_NV = 0x854D;
-        public const int GL_NUM_GENERAL_COMBINERS_NV = 0x854E;
-        public const int GL_COLOR_SUM_CLAMP_NV = 0x854F;
-        public const int GL_COMBINER0_NV = 0x8550;
-        public const int GL_COMBINER1_NV = 0x8551;
-        public const int GL_COMBINER2_NV = 0x8552;
-        public const int GL_COMBINER3_NV = 0x8553;
-        public const int GL_COMBINER4_NV = 0x8554;
-        public const int GL_COMBINER5_NV = 0x8555;
-        public const int GL_COMBINER6_NV = 0x8556;
-        public const int GL_COMBINER7_NV = 0x8557;
-        public const int GL_NV_register_combiners2 = 1;
-        public const int GL_PER_STAGE_CONSTANTS_NV = 0x8535;
-        public const int GL_NV_robustness_video_memory_purge = 1;
-        public const int GL_PURGED_CONTEXT_RESET_NV = 0x92BB;
-        public const int GL_NV_sample_locations = 1;
-        public const int GL_SAMPLE_LOCATION_SUBPIXEL_BITS_NV = 0x933D;
-        public const int GL_SAMPLE_LOCATION_PIXEL_GRID_WIDTH_NV = 0x933E;
-        public const int GL_SAMPLE_LOCATION_PIXEL_GRID_HEIGHT_NV = 0x933F;
-        public const int GL_PROGRAMMABLE_SAMPLE_LOCATION_TABLE_SIZE_NV = 0x9340;
-        public const int GL_SAMPLE_LOCATION_NV = 0x8E50;
-        public const int GL_PROGRAMMABLE_SAMPLE_LOCATION_NV = 0x9341;
-        public const int GL_FRAMEBUFFER_PROGRAMMABLE_SAMPLE_LOCATIONS_NV = 0x9342;
-        public const int GL_FRAMEBUFFER_SAMPLE_LOCATION_PIXEL_GRID_NV = 0x9343;
-        public const int GL_NV_sample_mask_override_coverage = 1;
-        public const int GL_NV_shader_atomic_counters = 1;
-        public const int GL_NV_shader_atomic_float = 1;
-        public const int GL_NV_shader_atomic_float64 = 1;
-        public const int GL_NV_shader_atomic_fp16_vector = 1;
-        public const int GL_NV_shader_atomic_int64 = 1;
-        public const int GL_NV_shader_buffer_load = 1;
-        public const int GL_BUFFER_GPU_ADDRESS_NV = 0x8F1D;
-        public const int GL_GPU_ADDRESS_NV = 0x8F34;
-        public const int GL_MAX_SHADER_BUFFER_ADDRESS_NV = 0x8F35;
-        public const int GL_NV_shader_buffer_store = 1;
-        public const int GL_SHADER_GLOBAL_ACCESS_BARRIER_BIT_NV = 0x00000010;
-        public const int GL_NV_shader_storage_buffer_object = 1;
-        public const int GL_NV_shader_thread_group = 1;
-        public const int GL_WARP_SIZE_NV = 0x9339;
-        public const int GL_WARPS_PER_SM_NV = 0x933A;
-        public const int GL_SM_COUNT_NV = 0x933B;
-        public const int GL_NV_shader_thread_shuffle = 1;
-        public const int GL_NV_stereo_view_rendering = 1;
-        public const int GL_NV_tessellation_program5 = 1;
-        public const int GL_MAX_PROGRAM_PATCH_ATTRIBS_NV = 0x86D8;
-        public const int GL_TESS_CONTROL_PROGRAM_NV = 0x891E;
-        public const int GL_TESS_EVALUATION_PROGRAM_NV = 0x891F;
-        public const int GL_TESS_CONTROL_PROGRAM_PARAMETER_BUFFER_NV = 0x8C74;
-        public const int GL_TESS_EVALUATION_PROGRAM_PARAMETER_BUFFER_NV = 0x8C75;
-        public const int GL_NV_texgen_emboss = 1;
-        public const int GL_EMBOSS_LIGHT_NV = 0x855D;
-        public const int GL_EMBOSS_CONSTANT_NV = 0x855E;
-        public const int GL_EMBOSS_MAP_NV = 0x855F;
-        public const int GL_NV_texgen_reflection = 1;
-        public const int GL_NORMAL_MAP_NV = 0x8511;
-        public const int GL_REFLECTION_MAP_NV = 0x8512;
-        public const int GL_NV_texture_barrier = 1;
-        public const int GL_NV_texture_compression_vtc = 1;
-        public const int GL_NV_texture_env_combine4 = 1;
-        public const int GL_COMBINE4_NV = 0x8503;
-        public const int GL_SOURCE3_RGB_NV = 0x8583;
-        public const int GL_SOURCE3_ALPHA_NV = 0x858B;
-        public const int GL_OPERAND3_RGB_NV = 0x8593;
-        public const int GL_OPERAND3_ALPHA_NV = 0x859B;
-        public const int GL_NV_texture_expand_normal = 1;
-        public const int GL_TEXTURE_UNSIGNED_REMAP_MODE_NV = 0x888F;
-        public const int GL_NV_texture_multisample = 1;
-        public const int GL_TEXTURE_COVERAGE_SAMPLES_NV = 0x9045;
-        public const int GL_TEXTURE_COLOR_SAMPLES_NV = 0x9046;
-        public const int GL_NV_texture_rectangle = 1;
-        public const int GL_TEXTURE_RECTANGLE_NV = 0x84F5;
-        public const int GL_TEXTURE_BINDING_RECTANGLE_NV = 0x84F6;
-        public const int GL_PROXY_TEXTURE_RECTANGLE_NV = 0x84F7;
-        public const int GL_MAX_RECTANGLE_TEXTURE_SIZE_NV = 0x84F8;
-        public const int GL_NV_texture_rectangle_compressed = 1;
-        public const int GL_NV_texture_shader = 1;
-        public const int GL_OFFSET_TEXTURE_RECTANGLE_NV = 0x864C;
-        public const int GL_OFFSET_TEXTURE_RECTANGLE_SCALE_NV = 0x864D;
-        public const int GL_DOT_PRODUCT_TEXTURE_RECTANGLE_NV = 0x864E;
-        public const int GL_RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV = 0x86D9;
-        public const int GL_UNSIGNED_INT_S8_S8_8_8_NV = 0x86DA;
-        public const int GL_UNSIGNED_INT_8_8_S8_S8_REV_NV = 0x86DB;
-        public const int GL_DSDT_MAG_INTENSITY_NV = 0x86DC;
-        public const int GL_SHADER_CONSISTENT_NV = 0x86DD;
-        public const int GL_TEXTURE_SHADER_NV = 0x86DE;
-        public const int GL_SHADER_OPERATION_NV = 0x86DF;
-        public const int GL_CULL_MODES_NV = 0x86E0;
-        public const int GL_OFFSET_TEXTURE_MATRIX_NV = 0x86E1;
-        public const int GL_OFFSET_TEXTURE_SCALE_NV = 0x86E2;
-        public const int GL_OFFSET_TEXTURE_BIAS_NV = 0x86E3;
-        public const int GL_OFFSET_TEXTURE_2D_MATRIX_NV = 0x86E1;
-        public const int GL_OFFSET_TEXTURE_2D_SCALE_NV = 0x86E2;
-        public const int GL_OFFSET_TEXTURE_2D_BIAS_NV = 0x86E3;
-        public const int GL_PREVIOUS_TEXTURE_INPUT_NV = 0x86E4;
-        public const int GL_CONST_EYE_NV = 0x86E5;
-        public const int GL_PASS_THROUGH_NV = 0x86E6;
-        public const int GL_CULL_FRAGMENT_NV = 0x86E7;
-        public const int GL_OFFSET_TEXTURE_2D_NV = 0x86E8;
-        public const int GL_DEPENDENT_AR_TEXTURE_2D_NV = 0x86E9;
-        public const int GL_DEPENDENT_GB_TEXTURE_2D_NV = 0x86EA;
-        public const int GL_DOT_PRODUCT_NV = 0x86EC;
-        public const int GL_DOT_PRODUCT_DEPTH_REPLACE_NV = 0x86ED;
-        public const int GL_DOT_PRODUCT_TEXTURE_2D_NV = 0x86EE;
-        public const int GL_DOT_PRODUCT_TEXTURE_CUBE_MAP_NV = 0x86F0;
-        public const int GL_DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV = 0x86F1;
-        public const int GL_DOT_PRODUCT_REFLECT_CUBE_MAP_NV = 0x86F2;
-        public const int GL_DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV = 0x86F3;
-        public const int GL_HILO_NV = 0x86F4;
-        public const int GL_DSDT_NV = 0x86F5;
-        public const int GL_DSDT_MAG_NV = 0x86F6;
-        public const int GL_DSDT_MAG_VIB_NV = 0x86F7;
-        public const int GL_HILO16_NV = 0x86F8;
-        public const int GL_SIGNED_HILO_NV = 0x86F9;
-        public const int GL_SIGNED_HILO16_NV = 0x86FA;
-        public const int GL_SIGNED_RGBA_NV = 0x86FB;
-        public const int GL_SIGNED_RGBA8_NV = 0x86FC;
-        public const int GL_SIGNED_RGB_NV = 0x86FE;
-        public const int GL_SIGNED_RGB8_NV = 0x86FF;
-        public const int GL_SIGNED_LUMINANCE_NV = 0x8701;
-        public const int GL_SIGNED_LUMINANCE8_NV = 0x8702;
-        public const int GL_SIGNED_LUMINANCE_ALPHA_NV = 0x8703;
-        public const int GL_SIGNED_LUMINANCE8_ALPHA8_NV = 0x8704;
-        public const int GL_SIGNED_ALPHA_NV = 0x8705;
-        public const int GL_SIGNED_ALPHA8_NV = 0x8706;
-        public const int GL_SIGNED_INTENSITY_NV = 0x8707;
-        public const int GL_SIGNED_INTENSITY8_NV = 0x8708;
-        public const int GL_DSDT8_NV = 0x8709;
-        public const int GL_DSDT8_MAG8_NV = 0x870A;
-        public const int GL_DSDT8_MAG8_INTENSITY8_NV = 0x870B;
-        public const int GL_SIGNED_RGB_UNSIGNED_ALPHA_NV = 0x870C;
-        public const int GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV = 0x870D;
-        public const int GL_HI_SCALE_NV = 0x870E;
-        public const int GL_LO_SCALE_NV = 0x870F;
-        public const int GL_DS_SCALE_NV = 0x8710;
-        public const int GL_DT_SCALE_NV = 0x8711;
-        public const int GL_MAGNITUDE_SCALE_NV = 0x8712;
-        public const int GL_VIBRANCE_SCALE_NV = 0x8713;
-        public const int GL_HI_BIAS_NV = 0x8714;
-        public const int GL_LO_BIAS_NV = 0x8715;
-        public const int GL_DS_BIAS_NV = 0x8716;
-        public const int GL_DT_BIAS_NV = 0x8717;
-        public const int GL_MAGNITUDE_BIAS_NV = 0x8718;
-        public const int GL_VIBRANCE_BIAS_NV = 0x8719;
-        public const int GL_TEXTURE_BORDER_VALUES_NV = 0x871A;
-        public const int GL_TEXTURE_HI_SIZE_NV = 0x871B;
-        public const int GL_TEXTURE_LO_SIZE_NV = 0x871C;
-        public const int GL_TEXTURE_DS_SIZE_NV = 0x871D;
-        public const int GL_TEXTURE_DT_SIZE_NV = 0x871E;
-        public const int GL_TEXTURE_MAG_SIZE_NV = 0x871F;
-        public const int GL_NV_texture_shader2 = 1;
-        public const int GL_DOT_PRODUCT_TEXTURE_3D_NV = 0x86EF;
-        public const int GL_NV_texture_shader3 = 1;
-        public const int GL_OFFSET_PROJECTIVE_TEXTURE_2D_NV = 0x8850;
-        public const int GL_OFFSET_PROJECTIVE_TEXTURE_2D_SCALE_NV = 0x8851;
-        public const int GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_NV = 0x8852;
-        public const int GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_SCALE_NV = 0x8853;
-        public const int GL_OFFSET_HILO_TEXTURE_2D_NV = 0x8854;
-        public const int GL_OFFSET_HILO_TEXTURE_RECTANGLE_NV = 0x8855;
-        public const int GL_OFFSET_HILO_PROJECTIVE_TEXTURE_2D_NV = 0x8856;
-        public const int GL_OFFSET_HILO_PROJECTIVE_TEXTURE_RECTANGLE_NV = 0x8857;
-        public const int GL_DEPENDENT_HILO_TEXTURE_2D_NV = 0x8858;
-        public const int GL_DEPENDENT_RGB_TEXTURE_3D_NV = 0x8859;
-        public const int GL_DEPENDENT_RGB_TEXTURE_CUBE_MAP_NV = 0x885A;
-        public const int GL_DOT_PRODUCT_PASS_THROUGH_NV = 0x885B;
-        public const int GL_DOT_PRODUCT_TEXTURE_1D_NV = 0x885C;
-        public const int GL_DOT_PRODUCT_AFFINE_DEPTH_REPLACE_NV = 0x885D;
-        public const int GL_HILO8_NV = 0x885E;
-        public const int GL_SIGNED_HILO8_NV = 0x885F;
-        public const int GL_FORCE_BLUE_TO_ONE_NV = 0x8860;
-        public const int GL_NV_transform_feedback = 1;
-        public const int GL_BACK_PRIMARY_COLOR_NV = 0x8C77;
-        public const int GL_BACK_SECONDARY_COLOR_NV = 0x8C78;
-        public const int GL_TEXTURE_COORD_NV = 0x8C79;
-        public const int GL_CLIP_DISTANCE_NV = 0x8C7A;
-        public const int GL_VERTEX_ID_NV = 0x8C7B;
-        public const int GL_PRIMITIVE_ID_NV = 0x8C7C;
-        public const int GL_GENERIC_ATTRIB_NV = 0x8C7D;
-        public const int GL_TRANSFORM_FEEDBACK_ATTRIBS_NV = 0x8C7E;
-        public const int GL_TRANSFORM_FEEDBACK_BUFFER_MODE_NV = 0x8C7F;
-        public const int GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_NV = 0x8C80;
-        public const int GL_ACTIVE_VARYINGS_NV = 0x8C81;
-        public const int GL_ACTIVE_VARYING_MAX_LENGTH_NV = 0x8C82;
-        public const int GL_TRANSFORM_FEEDBACK_VARYINGS_NV = 0x8C83;
-        public const int GL_TRANSFORM_FEEDBACK_BUFFER_START_NV = 0x8C84;
-        public const int GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_NV = 0x8C85;
-        public const int GL_TRANSFORM_FEEDBACK_RECORD_NV = 0x8C86;
-        public const int GL_PRIMITIVES_GENERATED_NV = 0x8C87;
-        public const int GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_NV = 0x8C88;
-        public const int GL_RASTERIZER_DISCARD_NV = 0x8C89;
-        public const int GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_NV = 0x8C8A;
-        public const int GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_NV = 0x8C8B;
-        public const int GL_INTERLEAVED_ATTRIBS_NV = 0x8C8C;
-        public const int GL_SEPARATE_ATTRIBS_NV = 0x8C8D;
-        public const int GL_TRANSFORM_FEEDBACK_BUFFER_NV = 0x8C8E;
-        public const int GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_NV = 0x8C8F;
-        public const int GL_LAYER_NV = 0x8DAA;
-        public const int GL_NEXT_BUFFER_NV = -2;
-        public const int GL_SKIP_COMPONENTS4_NV = -3;
-        public const int GL_SKIP_COMPONENTS3_NV = -4;
-        public const int GL_SKIP_COMPONENTS2_NV = -5;
-        public const int GL_SKIP_COMPONENTS1_NV = -6;
-        public const int GL_NV_transform_feedback2 = 1;
-        public const int GL_TRANSFORM_FEEDBACK_NV = 0x8E22;
-        public const int GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED_NV = 0x8E23;
-        public const int GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE_NV = 0x8E24;
-        public const int GL_TRANSFORM_FEEDBACK_BINDING_NV = 0x8E25;
-        public const int GL_NV_uniform_buffer_unified_memory = 1;
-        public const int GL_UNIFORM_BUFFER_UNIFIED_NV = 0x936E;
-        public const int GL_UNIFORM_BUFFER_ADDRESS_NV = 0x936F;
-        public const int GL_UNIFORM_BUFFER_LENGTH_NV = 0x9370;
-        public const int GL_NV_vdpau_interop = 1;
-        public const int GL_SURFACE_STATE_NV = 0x86EB;
-        public const int GL_SURFACE_REGISTERED_NV = 0x86FD;
-        public const int GL_SURFACE_MAPPED_NV = 0x8700;
-        public const int GL_WRITE_DISCARD_NV = 0x88BE;
-        public const int GL_NV_vertex_array_range = 1;
-        public const int GL_VERTEX_ARRAY_RANGE_NV = 0x851D;
-        public const int GL_VERTEX_ARRAY_RANGE_LENGTH_NV = 0x851E;
-        public const int GL_VERTEX_ARRAY_RANGE_VALID_NV = 0x851F;
-        public const int GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV = 0x8520;
-        public const int GL_VERTEX_ARRAY_RANGE_POINTER_NV = 0x8521;
-        public const int GL_NV_vertex_array_range2 = 1;
-        public const int GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV = 0x8533;
-        public const int GL_NV_vertex_attrib_integer_64bit = 1;
-        public const int GL_NV_vertex_buffer_unified_memory = 1;
-        public const int GL_VERTEX_ATTRIB_ARRAY_UNIFIED_NV = 0x8F1E;
-        public const int GL_ELEMENT_ARRAY_UNIFIED_NV = 0x8F1F;
-        public const int GL_VERTEX_ATTRIB_ARRAY_ADDRESS_NV = 0x8F20;
-        public const int GL_VERTEX_ARRAY_ADDRESS_NV = 0x8F21;
-        public const int GL_NORMAL_ARRAY_ADDRESS_NV = 0x8F22;
-        public const int GL_COLOR_ARRAY_ADDRESS_NV = 0x8F23;
-        public const int GL_INDEX_ARRAY_ADDRESS_NV = 0x8F24;
-        public const int GL_TEXTURE_COORD_ARRAY_ADDRESS_NV = 0x8F25;
-        public const int GL_EDGE_FLAG_ARRAY_ADDRESS_NV = 0x8F26;
-        public const int GL_SECONDARY_COLOR_ARRAY_ADDRESS_NV = 0x8F27;
-        public const int GL_FOG_COORD_ARRAY_ADDRESS_NV = 0x8F28;
-        public const int GL_ELEMENT_ARRAY_ADDRESS_NV = 0x8F29;
-        public const int GL_VERTEX_ATTRIB_ARRAY_LENGTH_NV = 0x8F2A;
-        public const int GL_VERTEX_ARRAY_LENGTH_NV = 0x8F2B;
-        public const int GL_NORMAL_ARRAY_LENGTH_NV = 0x8F2C;
-        public const int GL_COLOR_ARRAY_LENGTH_NV = 0x8F2D;
-        public const int GL_INDEX_ARRAY_LENGTH_NV = 0x8F2E;
-        public const int GL_TEXTURE_COORD_ARRAY_LENGTH_NV = 0x8F2F;
-        public const int GL_EDGE_FLAG_ARRAY_LENGTH_NV = 0x8F30;
-        public const int GL_SECONDARY_COLOR_ARRAY_LENGTH_NV = 0x8F31;
-        public const int GL_FOG_COORD_ARRAY_LENGTH_NV = 0x8F32;
-        public const int GL_ELEMENT_ARRAY_LENGTH_NV = 0x8F33;
-        public const int GL_DRAW_INDIRECT_UNIFIED_NV = 0x8F40;
-        public const int GL_DRAW_INDIRECT_ADDRESS_NV = 0x8F41;
-        public const int GL_DRAW_INDIRECT_LENGTH_NV = 0x8F42;
-        public const int GL_NV_vertex_program = 1;
-        public const int GL_VERTEX_PROGRAM_NV = 0x8620;
-        public const int GL_VERTEX_STATE_PROGRAM_NV = 0x8621;
-        public const int GL_ATTRIB_ARRAY_SIZE_NV = 0x8623;
-        public const int GL_ATTRIB_ARRAY_STRIDE_NV = 0x8624;
-        public const int GL_ATTRIB_ARRAY_TYPE_NV = 0x8625;
-        public const int GL_CURRENT_ATTRIB_NV = 0x8626;
-        public const int GL_PROGRAM_LENGTH_NV = 0x8627;
-        public const int GL_PROGRAM_STRING_NV = 0x8628;
-        public const int GL_MODELVIEW_PROJECTION_NV = 0x8629;
-        public const int GL_IDENTITY_NV = 0x862A;
-        public const int GL_INVERSE_NV = 0x862B;
-        public const int GL_TRANSPOSE_NV = 0x862C;
-        public const int GL_INVERSE_TRANSPOSE_NV = 0x862D;
-        public const int GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV = 0x862E;
-        public const int GL_MAX_TRACK_MATRICES_NV = 0x862F;
-        public const int GL_MATRIX0_NV = 0x8630;
-        public const int GL_MATRIX1_NV = 0x8631;
-        public const int GL_MATRIX2_NV = 0x8632;
-        public const int GL_MATRIX3_NV = 0x8633;
-        public const int GL_MATRIX4_NV = 0x8634;
-        public const int GL_MATRIX5_NV = 0x8635;
-        public const int GL_MATRIX6_NV = 0x8636;
-        public const int GL_MATRIX7_NV = 0x8637;
-        public const int GL_CURRENT_MATRIX_STACK_DEPTH_NV = 0x8640;
-        public const int GL_CURRENT_MATRIX_NV = 0x8641;
-        public const int GL_VERTEX_PROGRAM_POINT_SIZE_NV = 0x8642;
-        public const int GL_VERTEX_PROGRAM_TWO_SIDE_NV = 0x8643;
-        public const int GL_PROGRAM_PARAMETER_NV = 0x8644;
-        public const int GL_ATTRIB_ARRAY_POINTER_NV = 0x8645;
-        public const int GL_PROGRAM_TARGET_NV = 0x8646;
-        public const int GL_PROGRAM_RESIDENT_NV = 0x8647;
-        public const int GL_TRACK_MATRIX_NV = 0x8648;
-        public const int GL_TRACK_MATRIX_TRANSFORM_NV = 0x8649;
-        public const int GL_VERTEX_PROGRAM_BINDING_NV = 0x864A;
-        public const int GL_PROGRAM_ERROR_POSITION_NV = 0x864B;
-        public const int GL_VERTEX_ATTRIB_ARRAY0_NV = 0x8650;
-        public const int GL_VERTEX_ATTRIB_ARRAY1_NV = 0x8651;
-        public const int GL_VERTEX_ATTRIB_ARRAY2_NV = 0x8652;
-        public const int GL_VERTEX_ATTRIB_ARRAY3_NV = 0x8653;
-        public const int GL_VERTEX_ATTRIB_ARRAY4_NV = 0x8654;
-        public const int GL_VERTEX_ATTRIB_ARRAY5_NV = 0x8655;
-        public const int GL_VERTEX_ATTRIB_ARRAY6_NV = 0x8656;
-        public const int GL_VERTEX_ATTRIB_ARRAY7_NV = 0x8657;
-        public const int GL_VERTEX_ATTRIB_ARRAY8_NV = 0x8658;
-        public const int GL_VERTEX_ATTRIB_ARRAY9_NV = 0x8659;
-        public const int GL_VERTEX_ATTRIB_ARRAY10_NV = 0x865A;
-        public const int GL_VERTEX_ATTRIB_ARRAY11_NV = 0x865B;
-        public const int GL_VERTEX_ATTRIB_ARRAY12_NV = 0x865C;
-        public const int GL_VERTEX_ATTRIB_ARRAY13_NV = 0x865D;
-        public const int GL_VERTEX_ATTRIB_ARRAY14_NV = 0x865E;
-        public const int GL_VERTEX_ATTRIB_ARRAY15_NV = 0x865F;
-        public const int GL_MAP1_VERTEX_ATTRIB0_4_NV = 0x8660;
-        public const int GL_MAP1_VERTEX_ATTRIB1_4_NV = 0x8661;
-        public const int GL_MAP1_VERTEX_ATTRIB2_4_NV = 0x8662;
-        public const int GL_MAP1_VERTEX_ATTRIB3_4_NV = 0x8663;
-        public const int GL_MAP1_VERTEX_ATTRIB4_4_NV = 0x8664;
-        public const int GL_MAP1_VERTEX_ATTRIB5_4_NV = 0x8665;
-        public const int GL_MAP1_VERTEX_ATTRIB6_4_NV = 0x8666;
-        public const int GL_MAP1_VERTEX_ATTRIB7_4_NV = 0x8667;
-        public const int GL_MAP1_VERTEX_ATTRIB8_4_NV = 0x8668;
-        public const int GL_MAP1_VERTEX_ATTRIB9_4_NV = 0x8669;
-        public const int GL_MAP1_VERTEX_ATTRIB10_4_NV = 0x866A;
-        public const int GL_MAP1_VERTEX_ATTRIB11_4_NV = 0x866B;
-        public const int GL_MAP1_VERTEX_ATTRIB12_4_NV = 0x866C;
-        public const int GL_MAP1_VERTEX_ATTRIB13_4_NV = 0x866D;
-        public const int GL_MAP1_VERTEX_ATTRIB14_4_NV = 0x866E;
-        public const int GL_MAP1_VERTEX_ATTRIB15_4_NV = 0x866F;
-        public const int GL_MAP2_VERTEX_ATTRIB0_4_NV = 0x8670;
-        public const int GL_MAP2_VERTEX_ATTRIB1_4_NV = 0x8671;
-        public const int GL_MAP2_VERTEX_ATTRIB2_4_NV = 0x8672;
-        public const int GL_MAP2_VERTEX_ATTRIB3_4_NV = 0x8673;
-        public const int GL_MAP2_VERTEX_ATTRIB4_4_NV = 0x8674;
-        public const int GL_MAP2_VERTEX_ATTRIB5_4_NV = 0x8675;
-        public const int GL_MAP2_VERTEX_ATTRIB6_4_NV = 0x8676;
-        public const int GL_MAP2_VERTEX_ATTRIB7_4_NV = 0x8677;
-        public const int GL_MAP2_VERTEX_ATTRIB8_4_NV = 0x8678;
-        public const int GL_MAP2_VERTEX_ATTRIB9_4_NV = 0x8679;
-        public const int GL_MAP2_VERTEX_ATTRIB10_4_NV = 0x867A;
-        public const int GL_MAP2_VERTEX_ATTRIB11_4_NV = 0x867B;
-        public const int GL_MAP2_VERTEX_ATTRIB12_4_NV = 0x867C;
-        public const int GL_MAP2_VERTEX_ATTRIB13_4_NV = 0x867D;
-        public const int GL_MAP2_VERTEX_ATTRIB14_4_NV = 0x867E;
-        public const int GL_MAP2_VERTEX_ATTRIB15_4_NV = 0x867F;
-        public const int GL_NV_vertex_program1_1 = 1;
-        public const int GL_NV_vertex_program2 = 1;
-        public const int GL_NV_vertex_program2_option = 1;
-        public const int GL_NV_vertex_program3 = 1;
-        public const int GL_NV_vertex_program4 = 1;
-        public const int GL_VERTEX_ATTRIB_ARRAY_INTEGER_NV = 0x88FD;
-        public const int GL_NV_video_capture = 1;
-        public const int GL_VIDEO_BUFFER_NV = 0x9020;
-        public const int GL_VIDEO_BUFFER_BINDING_NV = 0x9021;
-        public const int GL_FIELD_UPPER_NV = 0x9022;
-        public const int GL_FIELD_LOWER_NV = 0x9023;
-        public const int GL_NUM_VIDEO_CAPTURE_STREAMS_NV = 0x9024;
-        public const int GL_NEXT_VIDEO_CAPTURE_BUFFER_STATUS_NV = 0x9025;
-        public const int GL_VIDEO_CAPTURE_TO_422_SUPPORTED_NV = 0x9026;
-        public const int GL_LAST_VIDEO_CAPTURE_STATUS_NV = 0x9027;
-        public const int GL_VIDEO_BUFFER_PITCH_NV = 0x9028;
-        public const int GL_VIDEO_COLOR_CONVERSION_MATRIX_NV = 0x9029;
-        public const int GL_VIDEO_COLOR_CONVERSION_MAX_NV = 0x902A;
-        public const int GL_VIDEO_COLOR_CONVERSION_MIN_NV = 0x902B;
-        public const int GL_VIDEO_COLOR_CONVERSION_OFFSET_NV = 0x902C;
-        public const int GL_VIDEO_BUFFER_INTERNAL_FORMAT_NV = 0x902D;
-        public const int GL_PARTIAL_SUCCESS_NV = 0x902E;
-        public const int GL_SUCCESS_NV = 0x902F;
-        public const int GL_FAILURE_NV = 0x9030;
-        public const int GL_YCBYCR8_422_NV = 0x9031;
-        public const int GL_YCBAYCR8A_4224_NV = 0x9032;
-        public const int GL_Z6Y10Z6CB10Z6Y10Z6CR10_422_NV = 0x9033;
-        public const int GL_Z6Y10Z6CB10Z6A10Z6Y10Z6CR10Z6A10_4224_NV = 0x9034;
-        public const int GL_Z4Y12Z4CB12Z4Y12Z4CR12_422_NV = 0x9035;
-        public const int GL_Z4Y12Z4CB12Z4A12Z4Y12Z4CR12Z4A12_4224_NV = 0x9036;
-        public const int GL_Z4Y12Z4CB12Z4CR12_444_NV = 0x9037;
-        public const int GL_VIDEO_CAPTURE_FRAME_WIDTH_NV = 0x9038;
-        public const int GL_VIDEO_CAPTURE_FRAME_HEIGHT_NV = 0x9039;
-        public const int GL_VIDEO_CAPTURE_FIELD_UPPER_HEIGHT_NV = 0x903A;
-        public const int GL_VIDEO_CAPTURE_FIELD_LOWER_HEIGHT_NV = 0x903B;
-        public const int GL_VIDEO_CAPTURE_SURFACE_ORIGIN_NV = 0x903C;
-        public const int GL_NV_viewport_array2 = 1;
-        public const int GL_NV_viewport_swizzle = 1;
-        public const int GL_VIEWPORT_SWIZZLE_POSITIVE_X_NV = 0x9350;
-        public const int GL_VIEWPORT_SWIZZLE_NEGATIVE_X_NV = 0x9351;
-        public const int GL_VIEWPORT_SWIZZLE_POSITIVE_Y_NV = 0x9352;
-        public const int GL_VIEWPORT_SWIZZLE_NEGATIVE_Y_NV = 0x9353;
-        public const int GL_VIEWPORT_SWIZZLE_POSITIVE_Z_NV = 0x9354;
-        public const int GL_VIEWPORT_SWIZZLE_NEGATIVE_Z_NV = 0x9355;
-        public const int GL_VIEWPORT_SWIZZLE_POSITIVE_W_NV = 0x9356;
-        public const int GL_VIEWPORT_SWIZZLE_NEGATIVE_W_NV = 0x9357;
-        public const int GL_VIEWPORT_SWIZZLE_X_NV = 0x9358;
-        public const int GL_VIEWPORT_SWIZZLE_Y_NV = 0x9359;
-        public const int GL_VIEWPORT_SWIZZLE_Z_NV = 0x935A;
-        public const int GL_VIEWPORT_SWIZZLE_W_NV = 0x935B;
-        public const int GL_OML_interlace = 1;
-        public const int GL_INTERLACE_OML = 0x8980;
-        public const int GL_INTERLACE_READ_OML = 0x8981;
-        public const int GL_OML_resample = 1;
-        public const int GL_PACK_RESAMPLE_OML = 0x8984;
-        public const int GL_UNPACK_RESAMPLE_OML = 0x8985;
-        public const int GL_RESAMPLE_REPLICATE_OML = 0x8986;
-        public const int GL_RESAMPLE_ZERO_FILL_OML = 0x8987;
-        public const int GL_RESAMPLE_AVERAGE_OML = 0x8988;
-        public const int GL_RESAMPLE_DECIMATE_OML = 0x8989;
-        public const int GL_OML_subsample = 1;
-        public const int GL_FORMAT_SUBSAMPLE_24_24_OML = 0x8982;
-        public const int GL_FORMAT_SUBSAMPLE_244_244_OML = 0x8983;
-        public const int GL_OVR_multiview = 1;
-        public const int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_NUM_VIEWS_OVR = 0x9630;
-        public const int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_BASE_VIEW_INDEX_OVR = 0x9632;
-        public const int GL_MAX_VIEWS_OVR = 0x9631;
-        public const int GL_FRAMEBUFFER_INCOMPLETE_VIEW_TARGETS_OVR = 0x9633;
-        public const int GL_OVR_multiview2 = 1;
-        public const int GL_PGI_misc_hints = 1;
-        public const int GL_PREFER_DOUBLEBUFFER_HINT_PGI = 0x1A1F8;
-        public const int GL_CONSERVE_MEMORY_HINT_PGI = 0x1A1FD;
-        public const int GL_RECLAIM_MEMORY_HINT_PGI = 0x1A1FE;
-        public const int GL_NATIVE_GRAPHICS_HANDLE_PGI = 0x1A202;
-        public const int GL_NATIVE_GRAPHICS_BEGIN_HINT_PGI = 0x1A203;
-        public const int GL_NATIVE_GRAPHICS_END_HINT_PGI = 0x1A204;
-        public const int GL_ALWAYS_FAST_HINT_PGI = 0x1A20C;
-        public const int GL_ALWAYS_SOFT_HINT_PGI = 0x1A20D;
-        public const int GL_ALLOW_DRAW_OBJ_HINT_PGI = 0x1A20E;
-        public const int GL_ALLOW_DRAW_WIN_HINT_PGI = 0x1A20F;
-        public const int GL_ALLOW_DRAW_FRG_HINT_PGI = 0x1A210;
-        public const int GL_ALLOW_DRAW_MEM_HINT_PGI = 0x1A211;
-        public const int GL_STRICT_DEPTHFUNC_HINT_PGI = 0x1A216;
-        public const int GL_STRICT_LIGHTING_HINT_PGI = 0x1A217;
-        public const int GL_STRICT_SCISSOR_HINT_PGI = 0x1A218;
-        public const int GL_FULL_STIPPLE_HINT_PGI = 0x1A219;
-        public const int GL_CLIP_NEAR_HINT_PGI = 0x1A220;
-        public const int GL_CLIP_FAR_HINT_PGI = 0x1A221;
-        public const int GL_WIDE_LINE_HINT_PGI = 0x1A222;
-        public const int GL_BACK_NORMALS_HINT_PGI = 0x1A223;
-        public const int GL_PGI_vertex_hints = 1;
-        public const int GL_VERTEX_DATA_HINT_PGI = 0x1A22A;
-        public const int GL_VERTEX_CONSISTENT_HINT_PGI = 0x1A22B;
-        public const int GL_MATERIAL_SIDE_HINT_PGI = 0x1A22C;
-        public const int GL_MAX_VERTEX_HINT_PGI = 0x1A22D;
-        public const int GL_COLOR3_BIT_PGI = 0x00010000;
-        public const int GL_COLOR4_BIT_PGI = 0x00020000;
-        public const int GL_EDGEFLAG_BIT_PGI = 0x00040000;
-        public const int GL_INDEX_BIT_PGI = 0x00080000;
-        public const int GL_MAT_AMBIENT_BIT_PGI = 0x00100000;
-        public const int GL_MAT_AMBIENT_AND_DIFFUSE_BIT_PGI = 0x00200000;
-        public const int GL_MAT_DIFFUSE_BIT_PGI = 0x00400000;
-        public const int GL_MAT_EMISSION_BIT_PGI = 0x00800000;
-        public const int GL_MAT_COLOR_INDEXES_BIT_PGI = 0x01000000;
-        public const int GL_MAT_SHININESS_BIT_PGI = 0x02000000;
-        public const int GL_MAT_SPECULAR_BIT_PGI = 0x04000000;
-        public const int GL_NORMAL_BIT_PGI = 0x08000000;
-        public const int GL_TEXCOORD1_BIT_PGI = 0x10000000;
-        public const int GL_TEXCOORD2_BIT_PGI = 0x20000000;
-        public const int GL_TEXCOORD3_BIT_PGI = 0x40000000;
-        public const int GL_TEXCOORD4_BIT_PGI = unchecked((int)0x80000000);
-        public const int GL_VERTEX23_BIT_PGI = 0x00000004;
-        public const int GL_VERTEX4_BIT_PGI = 0x00000008;
-        public const int GL_REND_screen_coordinates = 1;
-        public const int GL_SCREEN_COORDINATES_REND = 0x8490;
-        public const int GL_INVERTED_SCREEN_W_REND = 0x8491;
-        public const int GL_S3_s3tc = 1;
-        public const int GL_RGB_S3TC = 0x83A0;
-        public const int GL_RGB4_S3TC = 0x83A1;
-        public const int GL_RGBA_S3TC = 0x83A2;
-        public const int GL_RGBA4_S3TC = 0x83A3;
-        public const int GL_RGBA_DXT5_S3TC = 0x83A4;
-        public const int GL_RGBA4_DXT5_S3TC = 0x83A5;
-        public const int GL_SGIS_detail_texture = 1;
-        public const int GL_DETAIL_TEXTURE_2D_SGIS = 0x8095;
-        public const int GL_DETAIL_TEXTURE_2D_BINDING_SGIS = 0x8096;
-        public const int GL_LINEAR_DETAIL_SGIS = 0x8097;
-        public const int GL_LINEAR_DETAIL_ALPHA_SGIS = 0x8098;
-        public const int GL_LINEAR_DETAIL_COLOR_SGIS = 0x8099;
-        public const int GL_DETAIL_TEXTURE_LEVEL_SGIS = 0x809A;
-        public const int GL_DETAIL_TEXTURE_MODE_SGIS = 0x809B;
-        public const int GL_DETAIL_TEXTURE_FUNC_POINTS_SGIS = 0x809C;
-        public const int GL_SGIS_fog_function = 1;
-        public const int GL_FOG_FUNC_SGIS = 0x812A;
-        public const int GL_FOG_FUNC_POINTS_SGIS = 0x812B;
-        public const int GL_MAX_FOG_FUNC_POINTS_SGIS = 0x812C;
-        public const int GL_SGIS_generate_mipmap = 1;
-        public const int GL_GENERATE_MIPMAP_SGIS = 0x8191;
-        public const int GL_GENERATE_MIPMAP_HINT_SGIS = 0x8192;
-        public const int GL_SGIS_multisample = 1;
-        public const int GL_MULTISAMPLE_SGIS = 0x809D;
-        public const int GL_SAMPLE_ALPHA_TO_MASK_SGIS = 0x809E;
-        public const int GL_SAMPLE_ALPHA_TO_ONE_SGIS = 0x809F;
-        public const int GL_SAMPLE_MASK_SGIS = 0x80A0;
-        public const int GL_1PASS_SGIS = 0x80A1;
-        public const int GL_2PASS_0_SGIS = 0x80A2;
-        public const int GL_2PASS_1_SGIS = 0x80A3;
-        public const int GL_4PASS_0_SGIS = 0x80A4;
-        public const int GL_4PASS_1_SGIS = 0x80A5;
-        public const int GL_4PASS_2_SGIS = 0x80A6;
-        public const int GL_4PASS_3_SGIS = 0x80A7;
-        public const int GL_SAMPLE_BUFFERS_SGIS = 0x80A8;
-        public const int GL_SAMPLES_SGIS = 0x80A9;
-        public const int GL_SAMPLE_MASK_VALUE_SGIS = 0x80AA;
-        public const int GL_SAMPLE_MASK_INVERT_SGIS = 0x80AB;
-        public const int GL_SAMPLE_PATTERN_SGIS = 0x80AC;
-        public const int GL_SGIS_pixel_texture = 1;
-        public const int GL_PIXEL_TEXTURE_SGIS = 0x8353;
-        public const int GL_PIXEL_FRAGMENT_RGB_SOURCE_SGIS = 0x8354;
-        public const int GL_PIXEL_FRAGMENT_ALPHA_SOURCE_SGIS = 0x8355;
-        public const int GL_PIXEL_GROUP_COLOR_SGIS = 0x8356;
-        public const int GL_SGIS_point_line_texgen = 1;
-        public const int GL_EYE_DISTANCE_TO_POINT_SGIS = 0x81F0;
-        public const int GL_OBJECT_DISTANCE_TO_POINT_SGIS = 0x81F1;
-        public const int GL_EYE_DISTANCE_TO_LINE_SGIS = 0x81F2;
-        public const int GL_OBJECT_DISTANCE_TO_LINE_SGIS = 0x81F3;
-        public const int GL_EYE_POINT_SGIS = 0x81F4;
-        public const int GL_OBJECT_POINT_SGIS = 0x81F5;
-        public const int GL_EYE_LINE_SGIS = 0x81F6;
-        public const int GL_OBJECT_LINE_SGIS = 0x81F7;
-        public const int GL_SGIS_point_parameters = 1;
-        public const int GL_POINT_SIZE_MIN_SGIS = 0x8126;
-        public const int GL_POINT_SIZE_MAX_SGIS = 0x8127;
-        public const int GL_POINT_FADE_THRESHOLD_SIZE_SGIS = 0x8128;
-        public const int GL_DISTANCE_ATTENUATION_SGIS = 0x8129;
-        public const int GL_SGIS_sharpen_texture = 1;
-        public const int GL_LINEAR_SHARPEN_SGIS = 0x80AD;
-        public const int GL_LINEAR_SHARPEN_ALPHA_SGIS = 0x80AE;
-        public const int GL_LINEAR_SHARPEN_COLOR_SGIS = 0x80AF;
-        public const int GL_SHARPEN_TEXTURE_FUNC_POINTS_SGIS = 0x80B0;
-        public const int GL_SGIS_texture4D = 1;
-        public const int GL_PACK_SKIP_VOLUMES_SGIS = 0x8130;
-        public const int GL_PACK_IMAGE_DEPTH_SGIS = 0x8131;
-        public const int GL_UNPACK_SKIP_VOLUMES_SGIS = 0x8132;
-        public const int GL_UNPACK_IMAGE_DEPTH_SGIS = 0x8133;
-        public const int GL_TEXTURE_4D_SGIS = 0x8134;
-        public const int GL_PROXY_TEXTURE_4D_SGIS = 0x8135;
-        public const int GL_TEXTURE_4DSIZE_SGIS = 0x8136;
-        public const int GL_TEXTURE_WRAP_Q_SGIS = 0x8137;
-        public const int GL_MAX_4D_TEXTURE_SIZE_SGIS = 0x8138;
-        public const int GL_TEXTURE_4D_BINDING_SGIS = 0x814F;
-        public const int GL_SGIS_texture_border_clamp = 1;
-        public const int GL_CLAMP_TO_BORDER_SGIS = 0x812D;
-        public const int GL_SGIS_texture_color_mask = 1;
-        public const int GL_TEXTURE_COLOR_WRITEMASK_SGIS = 0x81EF;
-        public const int GL_SGIS_texture_edge_clamp = 1;
-        public const int GL_CLAMP_TO_EDGE_SGIS = 0x812F;
-        public const int GL_SGIS_texture_filter4 = 1;
-        public const int GL_FILTER4_SGIS = 0x8146;
-        public const int GL_TEXTURE_FILTER4_SIZE_SGIS = 0x8147;
-        public const int GL_SGIS_texture_lod = 1;
-        public const int GL_TEXTURE_MIN_LOD_SGIS = 0x813A;
-        public const int GL_TEXTURE_MAX_LOD_SGIS = 0x813B;
-        public const int GL_TEXTURE_BASE_LEVEL_SGIS = 0x813C;
-        public const int GL_TEXTURE_MAX_LEVEL_SGIS = 0x813D;
-        public const int GL_SGIS_texture_select = 1;
-        public const int GL_DUAL_ALPHA4_SGIS = 0x8110;
-        public const int GL_DUAL_ALPHA8_SGIS = 0x8111;
-        public const int GL_DUAL_ALPHA12_SGIS = 0x8112;
-        public const int GL_DUAL_ALPHA16_SGIS = 0x8113;
-        public const int GL_DUAL_LUMINANCE4_SGIS = 0x8114;
-        public const int GL_DUAL_LUMINANCE8_SGIS = 0x8115;
-        public const int GL_DUAL_LUMINANCE12_SGIS = 0x8116;
-        public const int GL_DUAL_LUMINANCE16_SGIS = 0x8117;
-        public const int GL_DUAL_INTENSITY4_SGIS = 0x8118;
-        public const int GL_DUAL_INTENSITY8_SGIS = 0x8119;
-        public const int GL_DUAL_INTENSITY12_SGIS = 0x811A;
-        public const int GL_DUAL_INTENSITY16_SGIS = 0x811B;
-        public const int GL_DUAL_LUMINANCE_ALPHA4_SGIS = 0x811C;
-        public const int GL_DUAL_LUMINANCE_ALPHA8_SGIS = 0x811D;
-        public const int GL_QUAD_ALPHA4_SGIS = 0x811E;
-        public const int GL_QUAD_ALPHA8_SGIS = 0x811F;
-        public const int GL_QUAD_LUMINANCE4_SGIS = 0x8120;
-        public const int GL_QUAD_LUMINANCE8_SGIS = 0x8121;
-        public const int GL_QUAD_INTENSITY4_SGIS = 0x8122;
-        public const int GL_QUAD_INTENSITY8_SGIS = 0x8123;
-        public const int GL_DUAL_TEXTURE_SELECT_SGIS = 0x8124;
-        public const int GL_QUAD_TEXTURE_SELECT_SGIS = 0x8125;
-        public const int GL_SGIX_async = 1;
-        public const int GL_ASYNC_MARKER_SGIX = 0x8329;
-        public const int GL_SGIX_async_histogram = 1;
-        public const int GL_ASYNC_HISTOGRAM_SGIX = 0x832C;
-        public const int GL_MAX_ASYNC_HISTOGRAM_SGIX = 0x832D;
-        public const int GL_SGIX_async_pixel = 1;
-        public const int GL_ASYNC_TEX_IMAGE_SGIX = 0x835C;
-        public const int GL_ASYNC_DRAW_PIXELS_SGIX = 0x835D;
-        public const int GL_ASYNC_READ_PIXELS_SGIX = 0x835E;
-        public const int GL_MAX_ASYNC_TEX_IMAGE_SGIX = 0x835F;
-        public const int GL_MAX_ASYNC_DRAW_PIXELS_SGIX = 0x8360;
-        public const int GL_MAX_ASYNC_READ_PIXELS_SGIX = 0x8361;
-        public const int GL_SGIX_blend_alpha_minmax = 1;
-        public const int GL_ALPHA_MIN_SGIX = 0x8320;
-        public const int GL_ALPHA_MAX_SGIX = 0x8321;
-        public const int GL_SGIX_calligraphic_fragment = 1;
-        public const int GL_CALLIGRAPHIC_FRAGMENT_SGIX = 0x8183;
-        public const int GL_SGIX_clipmap = 1;
-        public const int GL_LINEAR_CLIPMAP_LINEAR_SGIX = 0x8170;
-        public const int GL_TEXTURE_CLIPMAP_CENTER_SGIX = 0x8171;
-        public const int GL_TEXTURE_CLIPMAP_FRAME_SGIX = 0x8172;
-        public const int GL_TEXTURE_CLIPMAP_OFFSET_SGIX = 0x8173;
-        public const int GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX = 0x8174;
-        public const int GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX = 0x8175;
-        public const int GL_TEXTURE_CLIPMAP_DEPTH_SGIX = 0x8176;
-        public const int GL_MAX_CLIPMAP_DEPTH_SGIX = 0x8177;
-        public const int GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX = 0x8178;
-        public const int GL_NEAREST_CLIPMAP_NEAREST_SGIX = 0x844D;
-        public const int GL_NEAREST_CLIPMAP_LINEAR_SGIX = 0x844E;
-        public const int GL_LINEAR_CLIPMAP_NEAREST_SGIX = 0x844F;
-        public const int GL_SGIX_convolution_accuracy = 1;
-        public const int GL_CONVOLUTION_HINT_SGIX = 0x8316;
-        public const int GL_SGIX_depth_pass_instrument = 1;
-        public const int GL_SGIX_depth_texture = 1;
-        public const int GL_DEPTH_COMPONENT16_SGIX = 0x81A5;
-        public const int GL_DEPTH_COMPONENT24_SGIX = 0x81A6;
-        public const int GL_DEPTH_COMPONENT32_SGIX = 0x81A7;
-        public const int GL_SGIX_flush_raster = 1;
-        public const int GL_SGIX_fog_offset = 1;
-        public const int GL_FOG_OFFSET_SGIX = 0x8198;
-        public const int GL_FOG_OFFSET_VALUE_SGIX = 0x8199;
-        public const int GL_SGIX_fragment_lighting = 1;
-        public const int GL_FRAGMENT_LIGHTING_SGIX = 0x8400;
-        public const int GL_FRAGMENT_COLOR_MATERIAL_SGIX = 0x8401;
-        public const int GL_FRAGMENT_COLOR_MATERIAL_FACE_SGIX = 0x8402;
-        public const int GL_FRAGMENT_COLOR_MATERIAL_PARAMETER_SGIX = 0x8403;
-        public const int GL_MAX_FRAGMENT_LIGHTS_SGIX = 0x8404;
-        public const int GL_MAX_ACTIVE_LIGHTS_SGIX = 0x8405;
-        public const int GL_CURRENT_RASTER_NORMAL_SGIX = 0x8406;
-        public const int GL_LIGHT_ENV_MODE_SGIX = 0x8407;
-        public const int GL_FRAGMENT_LIGHT_MODEL_LOCAL_VIEWER_SGIX = 0x8408;
-        public const int GL_FRAGMENT_LIGHT_MODEL_TWO_SIDE_SGIX = 0x8409;
-        public const int GL_FRAGMENT_LIGHT_MODEL_AMBIENT_SGIX = 0x840A;
-        public const int GL_FRAGMENT_LIGHT_MODEL_NORMAL_INTERPOLATION_SGIX = 0x840B;
-        public const int GL_FRAGMENT_LIGHT0_SGIX = 0x840C;
-        public const int GL_FRAGMENT_LIGHT1_SGIX = 0x840D;
-        public const int GL_FRAGMENT_LIGHT2_SGIX = 0x840E;
-        public const int GL_FRAGMENT_LIGHT3_SGIX = 0x840F;
-        public const int GL_FRAGMENT_LIGHT4_SGIX = 0x8410;
-        public const int GL_FRAGMENT_LIGHT5_SGIX = 0x8411;
-        public const int GL_FRAGMENT_LIGHT6_SGIX = 0x8412;
-        public const int GL_FRAGMENT_LIGHT7_SGIX = 0x8413;
-        public const int GL_SGIX_framezoom = 1;
-        public const int GL_FRAMEZOOM_SGIX = 0x818B;
-        public const int GL_FRAMEZOOM_FACTOR_SGIX = 0x818C;
-        public const int GL_MAX_FRAMEZOOM_FACTOR_SGIX = 0x818D;
-        public const int GL_SGIX_igloo_interface = 1;
-        public const int GL_SGIX_instruments = 1;
-        public const int GL_INSTRUMENT_BUFFER_POINTER_SGIX = 0x8180;
-        public const int GL_INSTRUMENT_MEASUREMENTS_SGIX = 0x8181;
-        public const int GL_SGIX_interlace = 1;
-        public const int GL_INTERLACE_SGIX = 0x8094;
-        public const int GL_SGIX_ir_instrument1 = 1;
-        public const int GL_IR_INSTRUMENT1_SGIX = 0x817F;
-        public const int GL_SGIX_list_priority = 1;
-        public const int GL_LIST_PRIORITY_SGIX = 0x8182;
-        public const int GL_SGIX_pixel_texture = 1;
-        public const int GL_PIXEL_TEX_GEN_SGIX = 0x8139;
-        public const int GL_PIXEL_TEX_GEN_MODE_SGIX = 0x832B;
-        public const int GL_SGIX_pixel_tiles = 1;
-        public const int GL_PIXEL_TILE_BEST_ALIGNMENT_SGIX = 0x813E;
-        public const int GL_PIXEL_TILE_CACHE_INCREMENT_SGIX = 0x813F;
-        public const int GL_PIXEL_TILE_WIDTH_SGIX = 0x8140;
-        public const int GL_PIXEL_TILE_HEIGHT_SGIX = 0x8141;
-        public const int GL_PIXEL_TILE_GRID_WIDTH_SGIX = 0x8142;
-        public const int GL_PIXEL_TILE_GRID_HEIGHT_SGIX = 0x8143;
-        public const int GL_PIXEL_TILE_GRID_DEPTH_SGIX = 0x8144;
-        public const int GL_PIXEL_TILE_CACHE_SIZE_SGIX = 0x8145;
-        public const int GL_SGIX_polynomial_ffd = 1;
-        public const int GL_TEXTURE_DEFORMATION_BIT_SGIX = 0x00000001;
-        public const int GL_GEOMETRY_DEFORMATION_BIT_SGIX = 0x00000002;
-        public const int GL_GEOMETRY_DEFORMATION_SGIX = 0x8194;
-        public const int GL_TEXTURE_DEFORMATION_SGIX = 0x8195;
-        public const int GL_DEFORMATIONS_MASK_SGIX = 0x8196;
-        public const int GL_MAX_DEFORMATION_ORDER_SGIX = 0x8197;
-        public const int GL_SGIX_reference_plane = 1;
-        public const int GL_REFERENCE_PLANE_SGIX = 0x817D;
-        public const int GL_REFERENCE_PLANE_EQUATION_SGIX = 0x817E;
-        public const int GL_SGIX_resample = 1;
-        public const int GL_PACK_RESAMPLE_SGIX = 0x842E;
-        public const int GL_UNPACK_RESAMPLE_SGIX = 0x842F;
-        public const int GL_RESAMPLE_REPLICATE_SGIX = 0x8433;
-        public const int GL_RESAMPLE_ZERO_FILL_SGIX = 0x8434;
-        public const int GL_RESAMPLE_DECIMATE_SGIX = 0x8430;
-        public const int GL_SGIX_scalebias_hint = 1;
-        public const int GL_SCALEBIAS_HINT_SGIX = 0x8322;
-        public const int GL_SGIX_shadow = 1;
-        public const int GL_TEXTURE_COMPARE_SGIX = 0x819A;
-        public const int GL_TEXTURE_COMPARE_OPERATOR_SGIX = 0x819B;
-        public const int GL_TEXTURE_LEQUAL_R_SGIX = 0x819C;
-        public const int GL_TEXTURE_GEQUAL_R_SGIX = 0x819D;
-        public const int GL_SGIX_shadow_ambient = 1;
-        public const int GL_SHADOW_AMBIENT_SGIX = 0x80BF;
-        public const int GL_SGIX_sprite = 1;
-        public const int GL_SPRITE_SGIX = 0x8148;
-        public const int GL_SPRITE_MODE_SGIX = 0x8149;
-        public const int GL_SPRITE_AXIS_SGIX = 0x814A;
-        public const int GL_SPRITE_TRANSLATION_SGIX = 0x814B;
-        public const int GL_SPRITE_AXIAL_SGIX = 0x814C;
-        public const int GL_SPRITE_OBJECT_ALIGNED_SGIX = 0x814D;
-        public const int GL_SPRITE_EYE_ALIGNED_SGIX = 0x814E;
-        public const int GL_SGIX_subsample = 1;
-        public const int GL_PACK_SUBSAMPLE_RATE_SGIX = 0x85A0;
-        public const int GL_UNPACK_SUBSAMPLE_RATE_SGIX = 0x85A1;
-        public const int GL_PIXEL_SUBSAMPLE_4444_SGIX = 0x85A2;
-        public const int GL_PIXEL_SUBSAMPLE_2424_SGIX = 0x85A3;
-        public const int GL_PIXEL_SUBSAMPLE_4242_SGIX = 0x85A4;
-        public const int GL_SGIX_tag_sample_buffer = 1;
-        public const int GL_SGIX_texture_add_env = 1;
-        public const int GL_TEXTURE_ENV_BIAS_SGIX = 0x80BE;
-        public const int GL_SGIX_texture_coordinate_clamp = 1;
-        public const int GL_TEXTURE_MAX_CLAMP_S_SGIX = 0x8369;
-        public const int GL_TEXTURE_MAX_CLAMP_T_SGIX = 0x836A;
-        public const int GL_TEXTURE_MAX_CLAMP_R_SGIX = 0x836B;
-        public const int GL_SGIX_texture_lod_bias = 1;
-        public const int GL_TEXTURE_LOD_BIAS_S_SGIX = 0x818E;
-        public const int GL_TEXTURE_LOD_BIAS_T_SGIX = 0x818F;
-        public const int GL_TEXTURE_LOD_BIAS_R_SGIX = 0x8190;
-        public const int GL_SGIX_texture_multi_buffer = 1;
-        public const int GL_TEXTURE_MULTI_BUFFER_HINT_SGIX = 0x812E;
-        public const int GL_SGIX_texture_scale_bias = 1;
-        public const int GL_POST_TEXTURE_FILTER_BIAS_SGIX = 0x8179;
-        public const int GL_POST_TEXTURE_FILTER_SCALE_SGIX = 0x817A;
-        public const int GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX = 0x817B;
-        public const int GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX = 0x817C;
-        public const int GL_SGIX_vertex_preclip = 1;
-        public const int GL_VERTEX_PRECLIP_SGIX = 0x83EE;
-        public const int GL_VERTEX_PRECLIP_HINT_SGIX = 0x83EF;
-        public const int GL_SGIX_ycrcb = 1;
-        public const int GL_YCRCB_422_SGIX = 0x81BB;
-        public const int GL_YCRCB_444_SGIX = 0x81BC;
-        public const int GL_SGIX_ycrcb_subsample = 1;
-        public const int GL_SGIX_ycrcba = 1;
-        public const int GL_YCRCB_SGIX = 0x8318;
-        public const int GL_YCRCBA_SGIX = 0x8319;
-        public const int GL_SGI_color_matrix = 1;
-        public const int GL_COLOR_MATRIX_SGI = 0x80B1;
-        public const int GL_COLOR_MATRIX_STACK_DEPTH_SGI = 0x80B2;
-        public const int GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI = 0x80B3;
-        public const int GL_POST_COLOR_MATRIX_RED_SCALE_SGI = 0x80B4;
-        public const int GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI = 0x80B5;
-        public const int GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI = 0x80B6;
-        public const int GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI = 0x80B7;
-        public const int GL_POST_COLOR_MATRIX_RED_BIAS_SGI = 0x80B8;
-        public const int GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI = 0x80B9;
-        public const int GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI = 0x80BA;
-        public const int GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI = 0x80BB;
-        public const int GL_SGI_color_table = 1;
-        public const int GL_COLOR_TABLE_SGI = 0x80D0;
-        public const int GL_POST_CONVOLUTION_COLOR_TABLE_SGI = 0x80D1;
-        public const int GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI = 0x80D2;
-        public const int GL_PROXY_COLOR_TABLE_SGI = 0x80D3;
-        public const int GL_PROXY_POST_CONVOLUTION_COLOR_TABLE_SGI = 0x80D4;
-        public const int GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE_SGI = 0x80D5;
-        public const int GL_COLOR_TABLE_SCALE_SGI = 0x80D6;
-        public const int GL_COLOR_TABLE_BIAS_SGI = 0x80D7;
-        public const int GL_COLOR_TABLE_FORMAT_SGI = 0x80D8;
-        public const int GL_COLOR_TABLE_WIDTH_SGI = 0x80D9;
-        public const int GL_COLOR_TABLE_RED_SIZE_SGI = 0x80DA;
-        public const int GL_COLOR_TABLE_GREEN_SIZE_SGI = 0x80DB;
-        public const int GL_COLOR_TABLE_BLUE_SIZE_SGI = 0x80DC;
-        public const int GL_COLOR_TABLE_ALPHA_SIZE_SGI = 0x80DD;
-        public const int GL_COLOR_TABLE_LUMINANCE_SIZE_SGI = 0x80DE;
-        public const int GL_COLOR_TABLE_INTENSITY_SIZE_SGI = 0x80DF;
-        public const int GL_SGI_texture_color_table = 1;
-        public const int GL_TEXTURE_COLOR_TABLE_SGI = 0x80BC;
-        public const int GL_PROXY_TEXTURE_COLOR_TABLE_SGI = 0x80BD;
-        public const int GL_SUNX_constant_data = 1;
-        public const int GL_UNPACK_CONSTANT_DATA_SUNX = 0x81D5;
-        public const int GL_TEXTURE_CONSTANT_DATA_SUNX = 0x81D6;
-        public const int GL_SUN_convolution_border_modes = 1;
-        public const int GL_WRAP_BORDER_SUN = 0x81D4;
-        public const int GL_SUN_global_alpha = 1;
-        public const int GL_GLOBAL_ALPHA_SUN = 0x81D9;
-        public const int GL_GLOBAL_ALPHA_FACTOR_SUN = 0x81DA;
-        public const int GL_SUN_mesh_array = 1;
-        public const int GL_QUAD_MESH_SUN = 0x8614;
-        public const int GL_TRIANGLE_MESH_SUN = 0x8615;
-        public const int GL_SUN_slice_accum = 1;
-        public const int GL_SLICE_ACCUM_SUN = 0x85CC;
-        public const int GL_SUN_triangle_list = 1;
-        public const int GL_RESTART_SUN = 0x0001;
-        public const int GL_REPLACE_MIDDLE_SUN = 0x0002;
-        public const int GL_REPLACE_OLDEST_SUN = 0x0003;
-        public const int GL_TRIANGLE_LIST_SUN = 0x81D7;
-        public const int GL_REPLACEMENT_CODE_SUN = 0x81D8;
-        public const int GL_REPLACEMENT_CODE_ARRAY_SUN = 0x85C0;
-        public const int GL_REPLACEMENT_CODE_ARRAY_TYPE_SUN = 0x85C1;
-        public const int GL_REPLACEMENT_CODE_ARRAY_STRIDE_SUN = 0x85C2;
-        public const int GL_REPLACEMENT_CODE_ARRAY_POINTER_SUN = 0x85C3;
-        public const int GL_R1UI_V3F_SUN = 0x85C4;
-        public const int GL_R1UI_C4UB_V3F_SUN = 0x85C5;
-        public const int GL_R1UI_C3F_V3F_SUN = 0x85C6;
-        public const int GL_R1UI_N3F_V3F_SUN = 0x85C7;
-        public const int GL_R1UI_C4F_N3F_V3F_SUN = 0x85C8;
-        public const int GL_R1UI_T2F_V3F_SUN = 0x85C9;
-        public const int GL_R1UI_T2F_N3F_V3F_SUN = 0x85CA;
-        public const int GL_R1UI_T2F_C4F_N3F_V3F_SUN = 0x85CB;
-        public const int GL_SUN_vertex = 1;
-        public const int GL_WIN_phong_shading = 1;
-        public const int GL_PHONG_WIN = 0x80EA;
-        public const int GL_PHONG_HINT_WIN = 0x80EB;
-        public const int GL_WIN_specular_fog = 1;
-        public const int GL_FOG_SPECULAR_TEXTURE_WIN = 0x80EC;
+//        public const int GL_STENCIL_INDEX16 = 0x8D49;
+//        public const int GL_RENDERBUFFER_RED_SIZE = 0x8D50;
+//        public const int GL_RENDERBUFFER_GREEN_SIZE = 0x8D51;
+//        public const int GL_RENDERBUFFER_BLUE_SIZE = 0x8D52;
+//        public const int GL_RENDERBUFFER_ALPHA_SIZE = 0x8D53;
+//        public const int GL_RENDERBUFFER_DEPTH_SIZE = 0x8D54;
+//        public const int GL_RENDERBUFFER_STENCIL_SIZE = 0x8D55;
+//        public const int GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE = 0x8D56;
+//        public const int GL_MAX_SAMPLES = 0x8D57;
+//        public const int GL_INDEX = 0x8222;
+//        public const int GL_TEXTURE_LUMINANCE_TYPE = 0x8C14;
+//        public const int GL_TEXTURE_INTENSITY_TYPE = 0x8C15;
+//        public const int GL_FRAMEBUFFER_SRGB = 0x8DB9;
+//        public const int GL_HALF_FLOAT = 0x140B;
+//        public const int GL_MAP_READ_BIT = 0x0001;
+//        public const int GL_MAP_WRITE_BIT = 0x0002;
+//        public const int GL_MAP_INVALIDATE_RANGE_BIT = 0x0004;
+//        public const int GL_MAP_INVALIDATE_BUFFER_BIT = 0x0008;
+//        public const int GL_MAP_FLUSH_EXPLICIT_BIT = 0x0010;
+//        public const int GL_MAP_UNSYNCHRONIZED_BIT = 0x0020;
+//        public const int GL_COMPRESSED_RED_RGTC1 = 0x8DBB;
+//        public const int GL_COMPRESSED_SIGNED_RED_RGTC1 = 0x8DBC;
+//        public const int GL_COMPRESSED_RG_RGTC2 = 0x8DBD;
+//        public const int GL_COMPRESSED_SIGNED_RG_RGTC2 = 0x8DBE;
+//        public const int GL_RG = 0x8227;
+//        public const int GL_RG_INTEGER = 0x8228;
+//        public const int GL_R8 = 0x8229;
+//        public const int GL_R16 = 0x822A;
+//        public const int GL_RG8 = 0x822B;
+//        public const int GL_RG16 = 0x822C;
+//        public const int GL_R16F = 0x822D;
+//        public const int GL_R32F = 0x822E;
+//        public const int GL_RG16F = 0x822F;
+//        public const int GL_RG32F = 0x8230;
+//        public const int GL_R8I = 0x8231;
+//        public const int GL_R8UI = 0x8232;
+//        public const int GL_R16I = 0x8233;
+//        public const int GL_R16UI = 0x8234;
+//        public const int GL_R32I = 0x8235;
+//        public const int GL_R32UI = 0x8236;
+//        public const int GL_RG8I = 0x8237;
+//        public const int GL_RG8UI = 0x8238;
+//        public const int GL_RG16I = 0x8239;
+//        public const int GL_RG16UI = 0x823A;
+//        public const int GL_RG32I = 0x823B;
+//        public const int GL_RG32UI = 0x823C;
+//        public const int GL_VERTEX_ARRAY_BINDING = 0x85B5;
+//        public const int GL_CLAMP_VERTEX_COLOR = 0x891A;
+//        public const int GL_CLAMP_FRAGMENT_COLOR = 0x891B;
+//        public const int GL_ALPHA_INTEGER = 0x8D97;
+//        public const int GL_VERSION_3_1 = 1;
+//        public const int GL_SAMPLER_2D_RECT = 0x8B63;
+//        public const int GL_SAMPLER_2D_RECT_SHADOW = 0x8B64;
+//        public const int GL_SAMPLER_BUFFER = 0x8DC2;
+//        public const int GL_INT_SAMPLER_2D_RECT = 0x8DCD;
+//        public const int GL_INT_SAMPLER_BUFFER = 0x8DD0;
+//        public const int GL_UNSIGNED_INT_SAMPLER_2D_RECT = 0x8DD5;
+//        public const int GL_UNSIGNED_INT_SAMPLER_BUFFER = 0x8DD8;
+//        public const int GL_TEXTURE_BUFFER = 0x8C2A;
+//        public const int GL_MAX_TEXTURE_BUFFER_SIZE = 0x8C2B;
+//        public const int GL_TEXTURE_BINDING_BUFFER = 0x8C2C;
+//        public const int GL_TEXTURE_BUFFER_DATA_STORE_BINDING = 0x8C2D;
+//        public const int GL_TEXTURE_RECTANGLE = 0x84F5;
+//        public const int GL_TEXTURE_BINDING_RECTANGLE = 0x84F6;
+//        public const int GL_PROXY_TEXTURE_RECTANGLE = 0x84F7;
+//        public const int GL_MAX_RECTANGLE_TEXTURE_SIZE = 0x84F8;
+//        public const int GL_R8_SNORM = 0x8F94;
+//        public const int GL_RG8_SNORM = 0x8F95;
+//        public const int GL_RGB8_SNORM = 0x8F96;
+//        public const int GL_RGBA8_SNORM = 0x8F97;
+//        public const int GL_R16_SNORM = 0x8F98;
+//        public const int GL_RG16_SNORM = 0x8F99;
+//        public const int GL_RGB16_SNORM = 0x8F9A;
+//        public const int GL_RGBA16_SNORM = 0x8F9B;
+//        public const int GL_SIGNED_NORMALIZED = 0x8F9C;
+//        public const int GL_PRIMITIVE_RESTART = 0x8F9D;
+//        public const int GL_PRIMITIVE_RESTART_INDEX = 0x8F9E;
+//        public const int GL_COPY_READ_BUFFER = 0x8F36;
+//        public const int GL_COPY_WRITE_BUFFER = 0x8F37;
+//        public const int GL_UNIFORM_BUFFER = 0x8A11;
+//        public const int GL_UNIFORM_BUFFER_BINDING = 0x8A28;
+//        public const int GL_UNIFORM_BUFFER_START = 0x8A29;
+//        public const int GL_UNIFORM_BUFFER_SIZE = 0x8A2A;
+//        public const int GL_MAX_VERTEX_UNIFORM_BLOCKS = 0x8A2B;
+//        public const int GL_MAX_GEOMETRY_UNIFORM_BLOCKS = 0x8A2C;
+//        public const int GL_MAX_FRAGMENT_UNIFORM_BLOCKS = 0x8A2D;
+//        public const int GL_MAX_COMBINED_UNIFORM_BLOCKS = 0x8A2E;
+//        public const int GL_MAX_UNIFORM_BUFFER_BINDINGS = 0x8A2F;
+//        public const int GL_MAX_UNIFORM_BLOCK_SIZE = 0x8A30;
+//        public const int GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS = 0x8A31;
+//        public const int GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS = 0x8A32;
+//        public const int GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS = 0x8A33;
+//        public const int GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT = 0x8A34;
+//        public const int GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH = 0x8A35;
+//        public const int GL_ACTIVE_UNIFORM_BLOCKS = 0x8A36;
+//        public const int GL_UNIFORM_TYPE = 0x8A37;
+//        public const int GL_UNIFORM_SIZE = 0x8A38;
+//        public const int GL_UNIFORM_NAME_LENGTH = 0x8A39;
+//        public const int GL_UNIFORM_BLOCK_INDEX = 0x8A3A;
+//        public const int GL_UNIFORM_OFFSET = 0x8A3B;
+//        public const int GL_UNIFORM_ARRAY_STRIDE = 0x8A3C;
+//        public const int GL_UNIFORM_MATRIX_STRIDE = 0x8A3D;
+//        public const int GL_UNIFORM_IS_ROW_MAJOR = 0x8A3E;
+//        public const int GL_UNIFORM_BLOCK_BINDING = 0x8A3F;
+//        public const int GL_UNIFORM_BLOCK_DATA_SIZE = 0x8A40;
+//        public const int GL_UNIFORM_BLOCK_NAME_LENGTH = 0x8A41;
+//        public const int GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS = 0x8A42;
+//        public const int GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES = 0x8A43;
+//        public const int GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER = 0x8A44;
+//        public const int GL_UNIFORM_BLOCK_REFERENCED_BY_GEOMETRY_SHADER = 0x8A45;
+//        public const int GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER = 0x8A46;
+//        public const int GL_INVALID_INDEX = -1;
+//        public const int GL_VERSION_3_2 = 1;
+//        public const int GL_CONTEXT_CORE_PROFILE_BIT = 0x00000001;
+//        public const int GL_CONTEXT_COMPATIBILITY_PROFILE_BIT = 0x00000002;
+//        public const int GL_LINES_ADJACENCY = 0x000A;
+//        public const int GL_LINE_STRIP_ADJACENCY = 0x000B;
+//        public const int GL_TRIANGLES_ADJACENCY = 0x000C;
+//        public const int GL_TRIANGLE_STRIP_ADJACENCY = 0x000D;
+//        public const int GL_PROGRAM_POINT_SIZE = 0x8642;
+//        public const int GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS = 0x8C29;
+//        public const int GL_FRAMEBUFFER_ATTACHMENT_LAYERED = 0x8DA7;
+//        public const int GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS = 0x8DA8;
+//        public const int GL_GEOMETRY_SHADER = 0x8DD9;
+//        public const int GL_GEOMETRY_VERTICES_OUT = 0x8916;
+//        public const int GL_GEOMETRY_INPUT_TYPE = 0x8917;
+//        public const int GL_GEOMETRY_OUTPUT_TYPE = 0x8918;
+//        public const int GL_MAX_GEOMETRY_UNIFORM_COMPONENTS = 0x8DDF;
+//        public const int GL_MAX_GEOMETRY_OUTPUT_VERTICES = 0x8DE0;
+//        public const int GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS = 0x8DE1;
+//        public const int GL_MAX_VERTEX_OUTPUT_COMPONENTS = 0x9122;
+//        public const int GL_MAX_GEOMETRY_INPUT_COMPONENTS = 0x9123;
+//        public const int GL_MAX_GEOMETRY_OUTPUT_COMPONENTS = 0x9124;
+//        public const int GL_MAX_FRAGMENT_INPUT_COMPONENTS = 0x9125;
+//        public const int GL_CONTEXT_PROFILE_MASK = 0x9126;
+//        public const int GL_DEPTH_CLAMP = 0x864F;
+//        public const int GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION = 0x8E4C;
+//        public const int GL_FIRST_VERTEX_CONVENTION = 0x8E4D;
+//        public const int GL_LAST_VERTEX_CONVENTION = 0x8E4E;
+//        public const int GL_PROVOKING_VERTEX = 0x8E4F;
+//        public const int GL_TEXTURE_CUBE_MAP_SEAMLESS = 0x884F;
+//        public const int GL_MAX_SERVER_WAIT_TIMEOUT = 0x9111;
+//        public const int GL_OBJECT_TYPE = 0x9112;
+//        public const int GL_SYNC_CONDITION = 0x9113;
+//        public const int GL_SYNC_STATUS = 0x9114;
+//        public const int GL_SYNC_FLAGS = 0x9115;
+//        public const int GL_SYNC_FENCE = 0x9116;
+//        public const int GL_SYNC_GPU_COMMANDS_COMPLETE = 0x9117;
+//        public const int GL_UNSIGNALED = 0x9118;
+//        public const int GL_SIGNALED = 0x9119;
+//        public const int GL_ALREADY_SIGNALED = 0x911A;
+//        public const int GL_TIMEOUT_EXPIRED = 0x911B;
+//        public const int GL_CONDITION_SATISFIED = 0x911C;
+//        public const int GL_WAIT_FAILED = 0x911D;
+//        public const int GL_SYNC_FLUSH_COMMANDS_BIT = 0x00000001;
+//        public const int GL_SAMPLE_POSITION = 0x8E50;
+//        public const int GL_SAMPLE_MASK = 0x8E51;
+//        public const int GL_SAMPLE_MASK_VALUE = 0x8E52;
+//        public const int GL_MAX_SAMPLE_MASK_WORDS = 0x8E59;
+//        public const int GL_TEXTURE_2D_MULTISAMPLE = 0x9100;
+//        public const int GL_PROXY_TEXTURE_2D_MULTISAMPLE = 0x9101;
+//        public const int GL_TEXTURE_2D_MULTISAMPLE_ARRAY = 0x9102;
+//        public const int GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY = 0x9103;
+//        public const int GL_TEXTURE_BINDING_2D_MULTISAMPLE = 0x9104;
+//        public const int GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY = 0x9105;
+//        public const int GL_TEXTURE_SAMPLES = 0x9106;
+//        public const int GL_TEXTURE_FIXED_SAMPLE_LOCATIONS = 0x9107;
+//        public const int GL_SAMPLER_2D_MULTISAMPLE = 0x9108;
+//        public const int GL_INT_SAMPLER_2D_MULTISAMPLE = 0x9109;
+//        public const int GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE = 0x910A;
+//        public const int GL_SAMPLER_2D_MULTISAMPLE_ARRAY = 0x910B;
+//        public const int GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY = 0x910C;
+//        public const int GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY = 0x910D;
+//        public const int GL_MAX_COLOR_TEXTURE_SAMPLES = 0x910E;
+//        public const int GL_MAX_DEPTH_TEXTURE_SAMPLES = 0x910F;
+//        public const int GL_MAX_INTEGER_SAMPLES = 0x9110;
+//        public const int GL_VERSION_3_3 = 1;
+//        public const int GL_VERTEX_ATTRIB_ARRAY_DIVISOR = 0x88FE;
+//        public const int GL_SRC1_COLOR = 0x88F9;
+//        public const int GL_ONE_MINUS_SRC1_COLOR = 0x88FA;
+//        public const int GL_ONE_MINUS_SRC1_ALPHA = 0x88FB;
+//        public const int GL_MAX_DUAL_SOURCE_DRAW_BUFFERS = 0x88FC;
+//        public const int GL_ANY_SAMPLES_PASSED = 0x8C2F;
+//        public const int GL_SAMPLER_BINDING = 0x8919;
+//        public const int GL_RGB10_A2UI = 0x906F;
+//        public const int GL_TEXTURE_SWIZZLE_R = 0x8E42;
+//        public const int GL_TEXTURE_SWIZZLE_G = 0x8E43;
+//        public const int GL_TEXTURE_SWIZZLE_B = 0x8E44;
+//        public const int GL_TEXTURE_SWIZZLE_A = 0x8E45;
+//        public const int GL_TEXTURE_SWIZZLE_RGBA = 0x8E46;
+//        public const int GL_TIME_ELAPSED = 0x88BF;
+//        public const int GL_TIMESTAMP = 0x8E28;
+//        public const int GL_INT_2_10_10_10_REV = 0x8D9F;
+//        public const int GL_VERSION_4_0 = 1;
+//        public const int GL_SAMPLE_SHADING = 0x8C36;
+//        public const int GL_MIN_SAMPLE_SHADING_VALUE = 0x8C37;
+//        public const int GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET = 0x8E5E;
+//        public const int GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET = 0x8E5F;
+//        public const int GL_TEXTURE_CUBE_MAP_ARRAY = 0x9009;
+//        public const int GL_TEXTURE_BINDING_CUBE_MAP_ARRAY = 0x900A;
+//        public const int GL_PROXY_TEXTURE_CUBE_MAP_ARRAY = 0x900B;
+//        public const int GL_SAMPLER_CUBE_MAP_ARRAY = 0x900C;
+//        public const int GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW = 0x900D;
+//        public const int GL_INT_SAMPLER_CUBE_MAP_ARRAY = 0x900E;
+//        public const int GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY = 0x900F;
+//        public const int GL_DRAW_INDIRECT_BUFFER = 0x8F3F;
+//        public const int GL_DRAW_INDIRECT_BUFFER_BINDING = 0x8F43;
+//        public const int GL_GEOMETRY_SHADER_INVOCATIONS = 0x887F;
+//        public const int GL_MAX_GEOMETRY_SHADER_INVOCATIONS = 0x8E5A;
+//        public const int GL_MIN_FRAGMENT_INTERPOLATION_OFFSET = 0x8E5B;
+//        public const int GL_MAX_FRAGMENT_INTERPOLATION_OFFSET = 0x8E5C;
+//        public const int GL_FRAGMENT_INTERPOLATION_OFFSET_BITS = 0x8E5D;
+//        public const int GL_MAX_VERTEX_STREAMS = 0x8E71;
+//        public const int GL_DOUBLE_VEC2 = 0x8FFC;
+//        public const int GL_DOUBLE_VEC3 = 0x8FFD;
+//        public const int GL_DOUBLE_VEC4 = 0x8FFE;
+//        public const int GL_DOUBLE_MAT2 = 0x8F46;
+//        public const int GL_DOUBLE_MAT3 = 0x8F47;
+//        public const int GL_DOUBLE_MAT4 = 0x8F48;
+//        public const int GL_DOUBLE_MAT2x3 = 0x8F49;
+//        public const int GL_DOUBLE_MAT2x4 = 0x8F4A;
+//        public const int GL_DOUBLE_MAT3x2 = 0x8F4B;
+//        public const int GL_DOUBLE_MAT3x4 = 0x8F4C;
+//        public const int GL_DOUBLE_MAT4x2 = 0x8F4D;
+//        public const int GL_DOUBLE_MAT4x3 = 0x8F4E;
+//        public const int GL_ACTIVE_SUBROUTINES = 0x8DE5;
+//        public const int GL_ACTIVE_SUBROUTINE_UNIFORMS = 0x8DE6;
+//        public const int GL_ACTIVE_SUBROUTINE_UNIFORM_LOCATIONS = 0x8E47;
+//        public const int GL_ACTIVE_SUBROUTINE_MAX_LENGTH = 0x8E48;
+//        public const int GL_ACTIVE_SUBROUTINE_UNIFORM_MAX_LENGTH = 0x8E49;
+//        public const int GL_MAX_SUBROUTINES = 0x8DE7;
+//        public const int GL_MAX_SUBROUTINE_UNIFORM_LOCATIONS = 0x8DE8;
+//        public const int GL_NUM_COMPATIBLE_SUBROUTINES = 0x8E4A;
+//        public const int GL_COMPATIBLE_SUBROUTINES = 0x8E4B;
+//        public const int GL_PATCHES = 0x000E;
+//        public const int GL_PATCH_VERTICES = 0x8E72;
+//        public const int GL_PATCH_DEFAULT_INNER_LEVEL = 0x8E73;
+//        public const int GL_PATCH_DEFAULT_OUTER_LEVEL = 0x8E74;
+//        public const int GL_TESS_CONTROL_OUTPUT_VERTICES = 0x8E75;
+//        public const int GL_TESS_GEN_MODE = 0x8E76;
+//        public const int GL_TESS_GEN_SPACING = 0x8E77;
+//        public const int GL_TESS_GEN_VERTEX_ORDER = 0x8E78;
+//        public const int GL_TESS_GEN_POINT_MODE = 0x8E79;
+//        public const int GL_ISOLINES = 0x8E7A;
+//        public const int GL_FRACTIONAL_ODD = 0x8E7B;
+//        public const int GL_FRACTIONAL_EVEN = 0x8E7C;
+//        public const int GL_MAX_PATCH_VERTICES = 0x8E7D;
+//        public const int GL_MAX_TESS_GEN_LEVEL = 0x8E7E;
+//        public const int GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS = 0x8E7F;
+//        public const int GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS = 0x8E80;
+//        public const int GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS = 0x8E81;
+//        public const int GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS = 0x8E82;
+//        public const int GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS = 0x8E83;
+//        public const int GL_MAX_TESS_PATCH_COMPONENTS = 0x8E84;
+//        public const int GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS = 0x8E85;
+//        public const int GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS = 0x8E86;
+//        public const int GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS = 0x8E89;
+//        public const int GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS = 0x8E8A;
+//        public const int GL_MAX_TESS_CONTROL_INPUT_COMPONENTS = 0x886C;
+//        public const int GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS = 0x886D;
+//        public const int GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS = 0x8E1E;
+//        public const int GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS = 0x8E1F;
+//        public const int GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_CONTROL_SHADER = 0x84F0;
+//        public const int GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_EVALUATION_SHADER = 0x84F1;
+//        public const int GL_TESS_EVALUATION_SHADER = 0x8E87;
+//        public const int GL_TESS_CONTROL_SHADER = 0x8E88;
+//        public const int GL_TRANSFORM_FEEDBACK = 0x8E22;
+//        public const int GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED = 0x8E23;
+//        public const int GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE = 0x8E24;
+//        public const int GL_TRANSFORM_FEEDBACK_BINDING = 0x8E25;
+//        public const int GL_MAX_TRANSFORM_FEEDBACK_BUFFERS = 0x8E70;
+//        public const int GL_VERSION_4_1 = 1;
+//        public const int GL_FIXED = 0x140C;
+//        public const int GL_IMPLEMENTATION_COLOR_READ_TYPE = 0x8B9A;
+//        public const int GL_IMPLEMENTATION_COLOR_READ_FORMAT = 0x8B9B;
+//        public const int GL_LOW_FLOAT = 0x8DF0;
+//        public const int GL_MEDIUM_FLOAT = 0x8DF1;
+//        public const int GL_HIGH_FLOAT = 0x8DF2;
+//        public const int GL_LOW_INT = 0x8DF3;
+//        public const int GL_MEDIUM_INT = 0x8DF4;
+//        public const int GL_HIGH_INT = 0x8DF5;
+//        public const int GL_SHADER_COMPILER = 0x8DFA;
+//        public const int GL_SHADER_BINARY_FORMATS = 0x8DF8;
+//        public const int GL_NUM_SHADER_BINARY_FORMATS = 0x8DF9;
+//        public const int GL_MAX_VERTEX_UNIFORM_VECTORS = 0x8DFB;
+//        public const int GL_MAX_VARYING_VECTORS = 0x8DFC;
+//        public const int GL_MAX_FRAGMENT_UNIFORM_VECTORS = 0x8DFD;
+//        public const int GL_RGB565 = 0x8D62;
+//        public const int GL_PROGRAM_BINARY_RETRIEVABLE_HINT = 0x8257;
+//        public const int GL_PROGRAM_BINARY_LENGTH = 0x8741;
+//        public const int GL_NUM_PROGRAM_BINARY_FORMATS = 0x87FE;
+//        public const int GL_PROGRAM_BINARY_FORMATS = 0x87FF;
+//        public const int GL_VERTEX_SHADER_BIT = 0x00000001;
+//        public const int GL_FRAGMENT_SHADER_BIT = 0x00000002;
+//        public const int GL_GEOMETRY_SHADER_BIT = 0x00000004;
+//        public const int GL_TESS_CONTROL_SHADER_BIT = 0x00000008;
+//        public const int GL_TESS_EVALUATION_SHADER_BIT = 0x00000010;
+//        public const int GL_ALL_SHADER_BITS = -1;
+//        public const int GL_PROGRAM_SEPARABLE = 0x8258;
+//        public const int GL_ACTIVE_PROGRAM = 0x8259;
+//        public const int GL_PROGRAM_PIPELINE_BINDING = 0x825A;
+//        public const int GL_MAX_VIEWPORTS = 0x825B;
+//        public const int GL_VIEWPORT_SUBPIXEL_BITS = 0x825C;
+//        public const int GL_VIEWPORT_BOUNDS_RANGE = 0x825D;
+//        public const int GL_LAYER_PROVOKING_VERTEX = 0x825E;
+//        public const int GL_VIEWPORT_INDEX_PROVOKING_VERTEX = 0x825F;
+//        public const int GL_UNDEFINED_VERTEX = 0x8260;
+//        public const int GL_VERSION_4_2 = 1;
+//        public const int GL_COPY_READ_BUFFER_BINDING = 0x8F36;
+//        public const int GL_COPY_WRITE_BUFFER_BINDING = 0x8F37;
+//        public const int GL_TRANSFORM_FEEDBACK_ACTIVE = 0x8E24;
+//        public const int GL_TRANSFORM_FEEDBACK_PAUSED = 0x8E23;
+//        public const int GL_UNPACK_COMPRESSED_BLOCK_WIDTH = 0x9127;
+//        public const int GL_UNPACK_COMPRESSED_BLOCK_HEIGHT = 0x9128;
+//        public const int GL_UNPACK_COMPRESSED_BLOCK_DEPTH = 0x9129;
+//        public const int GL_UNPACK_COMPRESSED_BLOCK_SIZE = 0x912A;
+//        public const int GL_PACK_COMPRESSED_BLOCK_WIDTH = 0x912B;
+//        public const int GL_PACK_COMPRESSED_BLOCK_HEIGHT = 0x912C;
+//        public const int GL_PACK_COMPRESSED_BLOCK_DEPTH = 0x912D;
+//        public const int GL_PACK_COMPRESSED_BLOCK_SIZE = 0x912E;
+//        public const int GL_NUM_SAMPLE_COUNTS = 0x9380;
+//        public const int GL_MIN_MAP_BUFFER_ALIGNMENT = 0x90BC;
+//        public const int GL_ATOMIC_COUNTER_BUFFER = 0x92C0;
+//        public const int GL_ATOMIC_COUNTER_BUFFER_BINDING = 0x92C1;
+//        public const int GL_ATOMIC_COUNTER_BUFFER_START = 0x92C2;
+//        public const int GL_ATOMIC_COUNTER_BUFFER_SIZE = 0x92C3;
+//        public const int GL_ATOMIC_COUNTER_BUFFER_DATA_SIZE = 0x92C4;
+//        public const int GL_ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTERS = 0x92C5;
+//        public const int GL_ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTER_INDICES = 0x92C6;
+//        public const int GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_VERTEX_SHADER = 0x92C7;
+//        public const int GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_CONTROL_SHADER = 0x92C8;
+//        public const int GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_EVALUATION_SHADER = 0x92C9;
+//        public const int GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_GEOMETRY_SHADER = 0x92CA;
+//        public const int GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_FRAGMENT_SHADER = 0x92CB;
+//        public const int GL_MAX_VERTEX_ATOMIC_COUNTER_BUFFERS = 0x92CC;
+//        public const int GL_MAX_TESS_CONTROL_ATOMIC_COUNTER_BUFFERS = 0x92CD;
+//        public const int GL_MAX_TESS_EVALUATION_ATOMIC_COUNTER_BUFFERS = 0x92CE;
+//        public const int GL_MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS = 0x92CF;
+//        public const int GL_MAX_FRAGMENT_ATOMIC_COUNTER_BUFFERS = 0x92D0;
+//        public const int GL_MAX_COMBINED_ATOMIC_COUNTER_BUFFERS = 0x92D1;
+//        public const int GL_MAX_VERTEX_ATOMIC_COUNTERS = 0x92D2;
+//        public const int GL_MAX_TESS_CONTROL_ATOMIC_COUNTERS = 0x92D3;
+//        public const int GL_MAX_TESS_EVALUATION_ATOMIC_COUNTERS = 0x92D4;
+//        public const int GL_MAX_GEOMETRY_ATOMIC_COUNTERS = 0x92D5;
+//        public const int GL_MAX_FRAGMENT_ATOMIC_COUNTERS = 0x92D6;
+//        public const int GL_MAX_COMBINED_ATOMIC_COUNTERS = 0x92D7;
+//        public const int GL_MAX_ATOMIC_COUNTER_BUFFER_SIZE = 0x92D8;
+//        public const int GL_MAX_ATOMIC_COUNTER_BUFFER_BINDINGS = 0x92DC;
+//        public const int GL_ACTIVE_ATOMIC_COUNTER_BUFFERS = 0x92D9;
+//        public const int GL_UNIFORM_ATOMIC_COUNTER_BUFFER_INDEX = 0x92DA;
+//        public const int GL_UNSIGNED_INT_ATOMIC_COUNTER = 0x92DB;
+//        public const int GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT = 0x00000001;
+//        public const int GL_ELEMENT_ARRAY_BARRIER_BIT = 0x00000002;
+//        public const int GL_UNIFORM_BARRIER_BIT = 0x00000004;
+//        public const int GL_TEXTURE_FETCH_BARRIER_BIT = 0x00000008;
+//        public const int GL_SHADER_IMAGE_ACCESS_BARRIER_BIT = 0x00000020;
+//        public const int GL_COMMAND_BARRIER_BIT = 0x00000040;
+//        public const int GL_PIXEL_BUFFER_BARRIER_BIT = 0x00000080;
+//        public const int GL_TEXTURE_UPDATE_BARRIER_BIT = 0x00000100;
+//        public const int GL_BUFFER_UPDATE_BARRIER_BIT = 0x00000200;
+//        public const int GL_FRAMEBUFFER_BARRIER_BIT = 0x00000400;
+//        public const int GL_TRANSFORM_FEEDBACK_BARRIER_BIT = 0x00000800;
+//        public const int GL_ATOMIC_COUNTER_BARRIER_BIT = 0x00001000;
+//        public const int GL_ALL_BARRIER_BITS = -1;
+//        public const int GL_MAX_IMAGE_UNITS = 0x8F38;
+//        public const int GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS = 0x8F39;
+//        public const int GL_IMAGE_BINDING_NAME = 0x8F3A;
+//        public const int GL_IMAGE_BINDING_LEVEL = 0x8F3B;
+//        public const int GL_IMAGE_BINDING_LAYERED = 0x8F3C;
+//        public const int GL_IMAGE_BINDING_LAYER = 0x8F3D;
+//        public const int GL_IMAGE_BINDING_ACCESS = 0x8F3E;
+//        public const int GL_IMAGE_1D = 0x904C;
+//        public const int GL_IMAGE_2D = 0x904D;
+//        public const int GL_IMAGE_3D = 0x904E;
+//        public const int GL_IMAGE_2D_RECT = 0x904F;
+//        public const int GL_IMAGE_CUBE = 0x9050;
+//        public const int GL_IMAGE_BUFFER = 0x9051;
+//        public const int GL_IMAGE_1D_ARRAY = 0x9052;
+//        public const int GL_IMAGE_2D_ARRAY = 0x9053;
+//        public const int GL_IMAGE_CUBE_MAP_ARRAY = 0x9054;
+//        public const int GL_IMAGE_2D_MULTISAMPLE = 0x9055;
+//        public const int GL_IMAGE_2D_MULTISAMPLE_ARRAY = 0x9056;
+//        public const int GL_INT_IMAGE_1D = 0x9057;
+//        public const int GL_INT_IMAGE_2D = 0x9058;
+//        public const int GL_INT_IMAGE_3D = 0x9059;
+//        public const int GL_INT_IMAGE_2D_RECT = 0x905A;
+//        public const int GL_INT_IMAGE_CUBE = 0x905B;
+//        public const int GL_INT_IMAGE_BUFFER = 0x905C;
+//        public const int GL_INT_IMAGE_1D_ARRAY = 0x905D;
+//        public const int GL_INT_IMAGE_2D_ARRAY = 0x905E;
+//        public const int GL_INT_IMAGE_CUBE_MAP_ARRAY = 0x905F;
+//        public const int GL_INT_IMAGE_2D_MULTISAMPLE = 0x9060;
+//        public const int GL_INT_IMAGE_2D_MULTISAMPLE_ARRAY = 0x9061;
+//        public const int GL_UNSIGNED_INT_IMAGE_1D = 0x9062;
+//        public const int GL_UNSIGNED_INT_IMAGE_2D = 0x9063;
+//        public const int GL_UNSIGNED_INT_IMAGE_3D = 0x9064;
+//        public const int GL_UNSIGNED_INT_IMAGE_2D_RECT = 0x9065;
+//        public const int GL_UNSIGNED_INT_IMAGE_CUBE = 0x9066;
+//        public const int GL_UNSIGNED_INT_IMAGE_BUFFER = 0x9067;
+//        public const int GL_UNSIGNED_INT_IMAGE_1D_ARRAY = 0x9068;
+//        public const int GL_UNSIGNED_INT_IMAGE_2D_ARRAY = 0x9069;
+//        public const int GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY = 0x906A;
+//        public const int GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE = 0x906B;
+//        public const int GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY = 0x906C;
+//        public const int GL_MAX_IMAGE_SAMPLES = 0x906D;
+//        public const int GL_IMAGE_BINDING_FORMAT = 0x906E;
+//        public const int GL_IMAGE_FORMAT_COMPATIBILITY_TYPE = 0x90C7;
+//        public const int GL_IMAGE_FORMAT_COMPATIBILITY_BY_SIZE = 0x90C8;
+//        public const int GL_IMAGE_FORMAT_COMPATIBILITY_BY_CLASS = 0x90C9;
+//        public const int GL_MAX_VERTEX_IMAGE_UNIFORMS = 0x90CA;
+//        public const int GL_MAX_TESS_CONTROL_IMAGE_UNIFORMS = 0x90CB;
+//        public const int GL_MAX_TESS_EVALUATION_IMAGE_UNIFORMS = 0x90CC;
+//        public const int GL_MAX_GEOMETRY_IMAGE_UNIFORMS = 0x90CD;
+//        public const int GL_MAX_FRAGMENT_IMAGE_UNIFORMS = 0x90CE;
+//        public const int GL_MAX_COMBINED_IMAGE_UNIFORMS = 0x90CF;
+//        public const int GL_COMPRESSED_RGBA_BPTC_UNORM = 0x8E8C;
+//        public const int GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM = 0x8E8D;
+//        public const int GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT = 0x8E8E;
+//        public const int GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT = 0x8E8F;
+//        public const int GL_TEXTURE_IMMUTABLE_FORMAT = 0x912F;
+//        public const int GL_VERSION_4_3 = 1;
+//        public const int GL_NUM_SHADING_LANGUAGE_VERSIONS = 0x82E9;
+//        public const int GL_VERTEX_ATTRIB_ARRAY_LONG = 0x874E;
+//        public const int GL_COMPRESSED_RGB8_ETC2 = 0x9274;
+//        public const int GL_COMPRESSED_SRGB8_ETC2 = 0x9275;
+//        public const int GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2 = 0x9276;
+//        public const int GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2 = 0x9277;
+//        public const int GL_COMPRESSED_RGBA8_ETC2_EAC = 0x9278;
+//        public const int GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC = 0x9279;
+//        public const int GL_COMPRESSED_R11_EAC = 0x9270;
+//        public const int GL_COMPRESSED_SIGNED_R11_EAC = 0x9271;
+//        public const int GL_COMPRESSED_RG11_EAC = 0x9272;
+//        public const int GL_COMPRESSED_SIGNED_RG11_EAC = 0x9273;
+//        public const int GL_PRIMITIVE_RESTART_FIXED_INDEX = 0x8D69;
+//        public const int GL_ANY_SAMPLES_PASSED_CONSERVATIVE = 0x8D6A;
+//        public const int GL_MAX_ELEMENT_INDEX = 0x8D6B;
+//        public const int GL_COMPUTE_SHADER = 0x91B9;
+//        public const int GL_MAX_COMPUTE_UNIFORM_BLOCKS = 0x91BB;
+//        public const int GL_MAX_COMPUTE_TEXTURE_IMAGE_UNITS = 0x91BC;
+//        public const int GL_MAX_COMPUTE_IMAGE_UNIFORMS = 0x91BD;
+//        public const int GL_MAX_COMPUTE_SHARED_MEMORY_SIZE = 0x8262;
+//        public const int GL_MAX_COMPUTE_UNIFORM_COMPONENTS = 0x8263;
+//        public const int GL_MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS = 0x8264;
+//        public const int GL_MAX_COMPUTE_ATOMIC_COUNTERS = 0x8265;
+//        public const int GL_MAX_COMBINED_COMPUTE_UNIFORM_COMPONENTS = 0x8266;
+//        public const int GL_MAX_COMPUTE_WORK_GROUP_INVOCATIONS = 0x90EB;
+//        public const int GL_MAX_COMPUTE_WORK_GROUP_COUNT = 0x91BE;
+//        public const int GL_MAX_COMPUTE_WORK_GROUP_SIZE = 0x91BF;
+//        public const int GL_COMPUTE_WORK_GROUP_SIZE = 0x8267;
+//        public const int GL_UNIFORM_BLOCK_REFERENCED_BY_COMPUTE_SHADER = 0x90EC;
+//        public const int GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_COMPUTE_SHADER = 0x90ED;
+//        public const int GL_DISPATCH_INDIRECT_BUFFER = 0x90EE;
+//        public const int GL_DISPATCH_INDIRECT_BUFFER_BINDING = 0x90EF;
+//        public const int GL_COMPUTE_SHADER_BIT = 0x00000020;
+//        public const int GL_DEBUG_OUTPUT_SYNCHRONOUS = 0x8242;
+//        public const int GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH = 0x8243;
+//        public const int GL_DEBUG_CALLBACK_FUNCTION = 0x8244;
+//        public const int GL_DEBUG_CALLBACK_USER_PARAM = 0x8245;
+//        public const int GL_DEBUG_SOURCE_API = 0x8246;
+//        public const int GL_DEBUG_SOURCE_WINDOW_SYSTEM = 0x8247;
+//        public const int GL_DEBUG_SOURCE_SHADER_COMPILER = 0x8248;
+//        public const int GL_DEBUG_SOURCE_THIRD_PARTY = 0x8249;
+//        public const int GL_DEBUG_SOURCE_APPLICATION = 0x824A;
+//        public const int GL_DEBUG_SOURCE_OTHER = 0x824B;
+//        public const int GL_DEBUG_TYPE_ERROR = 0x824C;
+//        public const int GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR = 0x824D;
+//        public const int GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR = 0x824E;
+//        public const int GL_DEBUG_TYPE_PORTABILITY = 0x824F;
+//        public const int GL_DEBUG_TYPE_PERFORMANCE = 0x8250;
+//        public const int GL_DEBUG_TYPE_OTHER = 0x8251;
+//        public const int GL_MAX_DEBUG_MESSAGE_LENGTH = 0x9143;
+//        public const int GL_MAX_DEBUG_LOGGED_MESSAGES = 0x9144;
+//        public const int GL_DEBUG_LOGGED_MESSAGES = 0x9145;
+//        public const int GL_DEBUG_SEVERITY_HIGH = 0x9146;
+//        public const int GL_DEBUG_SEVERITY_MEDIUM = 0x9147;
+//        public const int GL_DEBUG_SEVERITY_LOW = 0x9148;
+//        public const int GL_DEBUG_TYPE_MARKER = 0x8268;
+//        public const int GL_DEBUG_TYPE_PUSH_GROUP = 0x8269;
+//        public const int GL_DEBUG_TYPE_POP_GROUP = 0x826A;
+//        public const int GL_DEBUG_SEVERITY_NOTIFICATION = 0x826B;
+//        public const int GL_MAX_DEBUG_GROUP_STACK_DEPTH = 0x826C;
+//        public const int GL_DEBUG_GROUP_STACK_DEPTH = 0x826D;
+//        public const int GL_BUFFER = 0x82E0;
+//        public const int GL_SHADER = 0x82E1;
+//        public const int GL_PROGRAM = 0x82E2;
+//        public const int GL_QUERY = 0x82E3;
+//        public const int GL_PROGRAM_PIPELINE = 0x82E4;
+//        public const int GL_SAMPLER = 0x82E6;
+//        public const int GL_MAX_LABEL_LENGTH = 0x82E8;
+//        public const int GL_DEBUG_OUTPUT = 0x92E0;
+//        public const int GL_CONTEXT_FLAG_DEBUG_BIT = 0x00000002;
+//        public const int GL_MAX_UNIFORM_LOCATIONS = 0x826E;
+//        public const int GL_FRAMEBUFFER_DEFAULT_WIDTH = 0x9310;
+//        public const int GL_FRAMEBUFFER_DEFAULT_HEIGHT = 0x9311;
+//        public const int GL_FRAMEBUFFER_DEFAULT_LAYERS = 0x9312;
+//        public const int GL_FRAMEBUFFER_DEFAULT_SAMPLES = 0x9313;
+//        public const int GL_FRAMEBUFFER_DEFAULT_FIXED_SAMPLE_LOCATIONS = 0x9314;
+//        public const int GL_MAX_FRAMEBUFFER_WIDTH = 0x9315;
+//        public const int GL_MAX_FRAMEBUFFER_HEIGHT = 0x9316;
+//        public const int GL_MAX_FRAMEBUFFER_LAYERS = 0x9317;
+//        public const int GL_MAX_FRAMEBUFFER_SAMPLES = 0x9318;
+//        public const int GL_INTERNALFORMAT_SUPPORTED = 0x826F;
+//        public const int GL_INTERNALFORMAT_PREFERRED = 0x8270;
+//        public const int GL_INTERNALFORMAT_RED_SIZE = 0x8271;
+//        public const int GL_INTERNALFORMAT_GREEN_SIZE = 0x8272;
+//        public const int GL_INTERNALFORMAT_BLUE_SIZE = 0x8273;
+//        public const int GL_INTERNALFORMAT_ALPHA_SIZE = 0x8274;
+//        public const int GL_INTERNALFORMAT_DEPTH_SIZE = 0x8275;
+//        public const int GL_INTERNALFORMAT_STENCIL_SIZE = 0x8276;
+//        public const int GL_INTERNALFORMAT_SHARED_SIZE = 0x8277;
+//        public const int GL_INTERNALFORMAT_RED_TYPE = 0x8278;
+//        public const int GL_INTERNALFORMAT_GREEN_TYPE = 0x8279;
+//        public const int GL_INTERNALFORMAT_BLUE_TYPE = 0x827A;
+//        public const int GL_INTERNALFORMAT_ALPHA_TYPE = 0x827B;
+//        public const int GL_INTERNALFORMAT_DEPTH_TYPE = 0x827C;
+//        public const int GL_INTERNALFORMAT_STENCIL_TYPE = 0x827D;
+//        public const int GL_MAX_WIDTH = 0x827E;
+//        public const int GL_MAX_HEIGHT = 0x827F;
+//        public const int GL_MAX_DEPTH = 0x8280;
+//        public const int GL_MAX_LAYERS = 0x8281;
+//        public const int GL_MAX_COMBINED_DIMENSIONS = 0x8282;
+//        public const int GL_COLOR_COMPONENTS = 0x8283;
+//        public const int GL_DEPTH_COMPONENTS = 0x8284;
+//        public const int GL_STENCIL_COMPONENTS = 0x8285;
+//        public const int GL_COLOR_RENDERABLE = 0x8286;
+//        public const int GL_DEPTH_RENDERABLE = 0x8287;
+//        public const int GL_STENCIL_RENDERABLE = 0x8288;
+//        public const int GL_FRAMEBUFFER_RENDERABLE = 0x8289;
+//        public const int GL_FRAMEBUFFER_RENDERABLE_LAYERED = 0x828A;
+//        public const int GL_FRAMEBUFFER_BLEND = 0x828B;
+//        public const int GL_READ_PIXELS = 0x828C;
+//        public const int GL_READ_PIXELS_FORMAT = 0x828D;
+//        public const int GL_READ_PIXELS_TYPE = 0x828E;
+//        public const int GL_TEXTURE_IMAGE_FORMAT = 0x828F;
+//        public const int GL_TEXTURE_IMAGE_TYPE = 0x8290;
+//        public const int GL_GET_TEXTURE_IMAGE_FORMAT = 0x8291;
+//        public const int GL_GET_TEXTURE_IMAGE_TYPE = 0x8292;
+//        public const int GL_MIPMAP = 0x8293;
+//        public const int GL_MANUAL_GENERATE_MIPMAP = 0x8294;
+//        public const int GL_AUTO_GENERATE_MIPMAP = 0x8295;
+//        public const int GL_COLOR_ENCODING = 0x8296;
+//        public const int GL_SRGB_READ = 0x8297;
+//        public const int GL_SRGB_WRITE = 0x8298;
+//        public const int GL_FILTER = 0x829A;
+//        public const int GL_VERTEX_TEXTURE = 0x829B;
+//        public const int GL_TESS_CONTROL_TEXTURE = 0x829C;
+//        public const int GL_TESS_EVALUATION_TEXTURE = 0x829D;
+//        public const int GL_GEOMETRY_TEXTURE = 0x829E;
+//        public const int GL_FRAGMENT_TEXTURE = 0x829F;
+//        public const int GL_COMPUTE_TEXTURE = 0x82A0;
+//        public const int GL_TEXTURE_SHADOW = 0x82A1;
+//        public const int GL_TEXTURE_GATHER = 0x82A2;
+//        public const int GL_TEXTURE_GATHER_SHADOW = 0x82A3;
+//        public const int GL_SHADER_IMAGE_LOAD = 0x82A4;
+//        public const int GL_SHADER_IMAGE_STORE = 0x82A5;
+//        public const int GL_SHADER_IMAGE_ATOMIC = 0x82A6;
+//        public const int GL_IMAGE_TEXEL_SIZE = 0x82A7;
+//        public const int GL_IMAGE_COMPATIBILITY_CLASS = 0x82A8;
+//        public const int GL_IMAGE_PIXEL_FORMAT = 0x82A9;
+//        public const int GL_IMAGE_PIXEL_TYPE = 0x82AA;
+//        public const int GL_SIMULTANEOUS_TEXTURE_AND_DEPTH_TEST = 0x82AC;
+//        public const int GL_SIMULTANEOUS_TEXTURE_AND_STENCIL_TEST = 0x82AD;
+//        public const int GL_SIMULTANEOUS_TEXTURE_AND_DEPTH_WRITE = 0x82AE;
+//        public const int GL_SIMULTANEOUS_TEXTURE_AND_STENCIL_WRITE = 0x82AF;
+//        public const int GL_TEXTURE_COMPRESSED_BLOCK_WIDTH = 0x82B1;
+//        public const int GL_TEXTURE_COMPRESSED_BLOCK_HEIGHT = 0x82B2;
+//        public const int GL_TEXTURE_COMPRESSED_BLOCK_SIZE = 0x82B3;
+//        public const int GL_CLEAR_BUFFER = 0x82B4;
+//        public const int GL_TEXTURE_VIEW = 0x82B5;
+//        public const int GL_VIEW_COMPATIBILITY_CLASS = 0x82B6;
+//        public const int GL_FULL_SUPPORT = 0x82B7;
+//        public const int GL_CAVEAT_SUPPORT = 0x82B8;
+//        public const int GL_IMAGE_CLASS_4_X_32 = 0x82B9;
+//        public const int GL_IMAGE_CLASS_2_X_32 = 0x82BA;
+//        public const int GL_IMAGE_CLASS_1_X_32 = 0x82BB;
+//        public const int GL_IMAGE_CLASS_4_X_16 = 0x82BC;
+//        public const int GL_IMAGE_CLASS_2_X_16 = 0x82BD;
+//        public const int GL_IMAGE_CLASS_1_X_16 = 0x82BE;
+//        public const int GL_IMAGE_CLASS_4_X_8 = 0x82BF;
+//        public const int GL_IMAGE_CLASS_2_X_8 = 0x82C0;
+//        public const int GL_IMAGE_CLASS_1_X_8 = 0x82C1;
+//        public const int GL_IMAGE_CLASS_11_11_10 = 0x82C2;
+//        public const int GL_IMAGE_CLASS_10_10_10_2 = 0x82C3;
+//        public const int GL_VIEW_CLASS_128_BITS = 0x82C4;
+//        public const int GL_VIEW_CLASS_96_BITS = 0x82C5;
+//        public const int GL_VIEW_CLASS_64_BITS = 0x82C6;
+//        public const int GL_VIEW_CLASS_48_BITS = 0x82C7;
+//        public const int GL_VIEW_CLASS_32_BITS = 0x82C8;
+//        public const int GL_VIEW_CLASS_24_BITS = 0x82C9;
+//        public const int GL_VIEW_CLASS_16_BITS = 0x82CA;
+//        public const int GL_VIEW_CLASS_8_BITS = 0x82CB;
+//        public const int GL_VIEW_CLASS_S3TC_DXT1_RGB = 0x82CC;
+//        public const int GL_VIEW_CLASS_S3TC_DXT1_RGBA = 0x82CD;
+//        public const int GL_VIEW_CLASS_S3TC_DXT3_RGBA = 0x82CE;
+//        public const int GL_VIEW_CLASS_S3TC_DXT5_RGBA = 0x82CF;
+//        public const int GL_VIEW_CLASS_RGTC1_RED = 0x82D0;
+//        public const int GL_VIEW_CLASS_RGTC2_RG = 0x82D1;
+//        public const int GL_VIEW_CLASS_BPTC_UNORM = 0x82D2;
+//        public const int GL_VIEW_CLASS_BPTC_FLOAT = 0x82D3;
+//        public const int GL_UNIFORM = 0x92E1;
+//        public const int GL_UNIFORM_BLOCK = 0x92E2;
+//        public const int GL_PROGRAM_INPUT = 0x92E3;
+//        public const int GL_PROGRAM_OUTPUT = 0x92E4;
+//        public const int GL_BUFFER_VARIABLE = 0x92E5;
+//        public const int GL_SHADER_STORAGE_BLOCK = 0x92E6;
+//        public const int GL_VERTEX_SUBROUTINE = 0x92E8;
+//        public const int GL_TESS_CONTROL_SUBROUTINE = 0x92E9;
+//        public const int GL_TESS_EVALUATION_SUBROUTINE = 0x92EA;
+//        public const int GL_GEOMETRY_SUBROUTINE = 0x92EB;
+//        public const int GL_FRAGMENT_SUBROUTINE = 0x92EC;
+//        public const int GL_COMPUTE_SUBROUTINE = 0x92ED;
+//        public const int GL_VERTEX_SUBROUTINE_UNIFORM = 0x92EE;
+//        public const int GL_TESS_CONTROL_SUBROUTINE_UNIFORM = 0x92EF;
+//        public const int GL_TESS_EVALUATION_SUBROUTINE_UNIFORM = 0x92F0;
+//        public const int GL_GEOMETRY_SUBROUTINE_UNIFORM = 0x92F1;
+//        public const int GL_FRAGMENT_SUBROUTINE_UNIFORM = 0x92F2;
+//        public const int GL_COMPUTE_SUBROUTINE_UNIFORM = 0x92F3;
+//        public const int GL_TRANSFORM_FEEDBACK_VARYING = 0x92F4;
+//        public const int GL_ACTIVE_RESOURCES = 0x92F5;
+//        public const int GL_MAX_NAME_LENGTH = 0x92F6;
+//        public const int GL_MAX_NUM_ACTIVE_VARIABLES = 0x92F7;
+//        public const int GL_MAX_NUM_COMPATIBLE_SUBROUTINES = 0x92F8;
+//        public const int GL_NAME_LENGTH = 0x92F9;
+//        public const int GL_TYPE = 0x92FA;
+//        public const int GL_ARRAY_SIZE = 0x92FB;
+//        public const int GL_OFFSET = 0x92FC;
+//        public const int GL_BLOCK_INDEX = 0x92FD;
+//        public const int GL_ARRAY_STRIDE = 0x92FE;
+//        public const int GL_MATRIX_STRIDE = 0x92FF;
+//        public const int GL_IS_ROW_MAJOR = 0x9300;
+//        public const int GL_ATOMIC_COUNTER_BUFFER_INDEX = 0x9301;
+//        public const int GL_BUFFER_BINDING = 0x9302;
+//        public const int GL_BUFFER_DATA_SIZE = 0x9303;
+//        public const int GL_NUM_ACTIVE_VARIABLES = 0x9304;
+//        public const int GL_ACTIVE_VARIABLES = 0x9305;
+//        public const int GL_REFERENCED_BY_VERTEX_SHADER = 0x9306;
+//        public const int GL_REFERENCED_BY_TESS_CONTROL_SHADER = 0x9307;
+//        public const int GL_REFERENCED_BY_TESS_EVALUATION_SHADER = 0x9308;
+//        public const int GL_REFERENCED_BY_GEOMETRY_SHADER = 0x9309;
+//        public const int GL_REFERENCED_BY_FRAGMENT_SHADER = 0x930A;
+//        public const int GL_REFERENCED_BY_COMPUTE_SHADER = 0x930B;
+//        public const int GL_TOP_LEVEL_ARRAY_SIZE = 0x930C;
+//        public const int GL_TOP_LEVEL_ARRAY_STRIDE = 0x930D;
+//        public const int GL_LOCATION = 0x930E;
+//        public const int GL_LOCATION_INDEX = 0x930F;
+//        public const int GL_IS_PER_PATCH = 0x92E7;
+//        public const int GL_SHADER_STORAGE_BUFFER = 0x90D2;
+//        public const int GL_SHADER_STORAGE_BUFFER_BINDING = 0x90D3;
+//        public const int GL_SHADER_STORAGE_BUFFER_START = 0x90D4;
+//        public const int GL_SHADER_STORAGE_BUFFER_SIZE = 0x90D5;
+//        public const int GL_MAX_VERTEX_SHADER_STORAGE_BLOCKS = 0x90D6;
+//        public const int GL_MAX_GEOMETRY_SHADER_STORAGE_BLOCKS = 0x90D7;
+//        public const int GL_MAX_TESS_CONTROL_SHADER_STORAGE_BLOCKS = 0x90D8;
+//        public const int GL_MAX_TESS_EVALUATION_SHADER_STORAGE_BLOCKS = 0x90D9;
+//        public const int GL_MAX_FRAGMENT_SHADER_STORAGE_BLOCKS = 0x90DA;
+//        public const int GL_MAX_COMPUTE_SHADER_STORAGE_BLOCKS = 0x90DB;
+//        public const int GL_MAX_COMBINED_SHADER_STORAGE_BLOCKS = 0x90DC;
+//        public const int GL_MAX_SHADER_STORAGE_BUFFER_BINDINGS = 0x90DD;
+//        public const int GL_MAX_SHADER_STORAGE_BLOCK_SIZE = 0x90DE;
+//        public const int GL_SHADER_STORAGE_BUFFER_OFFSET_ALIGNMENT = 0x90DF;
+//        public const int GL_SHADER_STORAGE_BARRIER_BIT = 0x00002000;
+//        public const int GL_MAX_COMBINED_SHADER_OUTPUT_RESOURCES = 0x8F39;
+//        public const int GL_DEPTH_STENCIL_TEXTURE_MODE = 0x90EA;
+//        public const int GL_TEXTURE_BUFFER_OFFSET = 0x919D;
+//        public const int GL_TEXTURE_BUFFER_SIZE = 0x919E;
+//        public const int GL_TEXTURE_BUFFER_OFFSET_ALIGNMENT = 0x919F;
+//        public const int GL_TEXTURE_VIEW_MIN_LEVEL = 0x82DB;
+//        public const int GL_TEXTURE_VIEW_NUM_LEVELS = 0x82DC;
+//        public const int GL_TEXTURE_VIEW_MIN_LAYER = 0x82DD;
+//        public const int GL_TEXTURE_VIEW_NUM_LAYERS = 0x82DE;
+//        public const int GL_TEXTURE_IMMUTABLE_LEVELS = 0x82DF;
+//        public const int GL_VERTEX_ATTRIB_BINDING = 0x82D4;
+//        public const int GL_VERTEX_ATTRIB_RELATIVE_OFFSET = 0x82D5;
+//        public const int GL_VERTEX_BINDING_DIVISOR = 0x82D6;
+//        public const int GL_VERTEX_BINDING_OFFSET = 0x82D7;
+//        public const int GL_VERTEX_BINDING_STRIDE = 0x82D8;
+//        public const int GL_MAX_VERTEX_ATTRIB_RELATIVE_OFFSET = 0x82D9;
+//        public const int GL_MAX_VERTEX_ATTRIB_BINDINGS = 0x82DA;
+//        public const int GL_VERTEX_BINDING_BUFFER = 0x8F4F;
+//        public const int GL_DISPLAY_LIST = 0x82E7;
+//        public const int GL_VERSION_4_4 = 1;
+//        public const int GL_MAX_VERTEX_ATTRIB_STRIDE = 0x82E5;
+//        public const int GL_PRIMITIVE_RESTART_FOR_PATCHES_SUPPORTED = 0x8221;
+//        public const int GL_TEXTURE_BUFFER_BINDING = 0x8C2A;
+//        public const int GL_MAP_PERSISTENT_BIT = 0x0040;
+//        public const int GL_MAP_COHERENT_BIT = 0x0080;
+//        public const int GL_DYNAMIC_STORAGE_BIT = 0x0100;
+//        public const int GL_CLIENT_STORAGE_BIT = 0x0200;
+//        public const int GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT = 0x00004000;
+//        public const int GL_BUFFER_IMMUTABLE_STORAGE = 0x821F;
+//        public const int GL_BUFFER_STORAGE_FLAGS = 0x8220;
+//        public const int GL_CLEAR_TEXTURE = 0x9365;
+//        public const int GL_LOCATION_COMPONENT = 0x934A;
+//        public const int GL_TRANSFORM_FEEDBACK_BUFFER_INDEX = 0x934B;
+//        public const int GL_TRANSFORM_FEEDBACK_BUFFER_STRIDE = 0x934C;
+//        public const int GL_QUERY_BUFFER = 0x9192;
+//        public const int GL_QUERY_BUFFER_BARRIER_BIT = 0x00008000;
+//        public const int GL_QUERY_BUFFER_BINDING = 0x9193;
+//        public const int GL_QUERY_RESULT_NO_WAIT = 0x9194;
+//        public const int GL_MIRROR_CLAMP_TO_EDGE = 0x8743;
+//        public const int GL_NEGATIVE_ONE_TO_ONE = 0x935E;
+//        public const int GL_ZERO_TO_ONE = 0x935F;
+//        public const int GL_CLIP_ORIGIN = 0x935C;
+//        public const int GL_CLIP_DEPTH_MODE = 0x935D;
+//        public const int GL_QUERY_WAIT_INVERTED = 0x8E17;
+//        public const int GL_QUERY_NO_WAIT_INVERTED = 0x8E18;
+//        public const int GL_QUERY_BY_REGION_WAIT_INVERTED = 0x8E19;
+//        public const int GL_QUERY_BY_REGION_NO_WAIT_INVERTED = 0x8E1A;
+//        public const int GL_MAX_CULL_DISTANCES = 0x82F9;
+//        public const int GL_MAX_COMBINED_CLIP_AND_CULL_DISTANCES = 0x82FA;
+//        public const int GL_TEXTURE_TARGET = 0x1006;
+//        public const int GL_QUERY_TARGET = 0x82EA;
+//        public const int GL_GUILTY_CONTEXT_RESET = 0x8253;
+//        public const int GL_INNOCENT_CONTEXT_RESET = 0x8254;
+//        public const int GL_UNKNOWN_CONTEXT_RESET = 0x8255;
+//        public const int GL_RESET_NOTIFICATION_STRATEGY = 0x8256;
+//        public const int GL_LOSE_CONTEXT_ON_RESET = 0x8252;
+//        public const int GL_NO_RESET_NOTIFICATION = 0x8261;
+//        public const int GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT = 0x00000004;
+//        public const int GL_CONTEXT_RELEASE_BEHAVIOR = 0x82FB;
+//        public const int GL_CONTEXT_RELEASE_BEHAVIOR_FLUSH = 0x82FC;
+//        public const int GL_VERSION_4_6 = 1;
+//        public const int GL_SHADER_BINARY_FORMAT_SPIR_V = 0x9551;
+//        public const int GL_SPIR_V_BINARY = 0x9552;
+//        public const int GL_PARAMETER_BUFFER = 0x80EE;
+//        public const int GL_PARAMETER_BUFFER_BINDING = 0x80EF;
+//        public const int GL_CONTEXT_FLAG_NO_ERROR_BIT = 0x00000008;
+//        public const int GL_VERTICES_SUBMITTED = 0x82EE;
+//        public const int GL_PRIMITIVES_SUBMITTED = 0x82EF;
+//        public const int GL_VERTEX_SHADER_INVOCATIONS = 0x82F0;
+//        public const int GL_TESS_CONTROL_SHADER_PATCHES = 0x82F1;
+//        public const int GL_TESS_EVALUATION_SHADER_INVOCATIONS = 0x82F2;
+//        public const int GL_GEOMETRY_SHADER_PRIMITIVES_EMITTED = 0x82F3;
+//        public const int GL_FRAGMENT_SHADER_INVOCATIONS = 0x82F4;
+//        public const int GL_COMPUTE_SHADER_INVOCATIONS = 0x82F5;
+//        public const int GL_CLIPPING_INPUT_PRIMITIVES = 0x82F6;
+//        public const int GL_CLIPPING_OUTPUT_PRIMITIVES = 0x82F7;
+//        public const int GL_POLYGON_OFFSET_CLAMP = 0x8E1B;
+//        public const int GL_SPIR_V_EXTENSIONS = 0x9553;
+//        public const int GL_NUM_SPIR_V_EXTENSIONS = 0x9554;
+//        public const int GL_TEXTURE_MAX_ANISOTROPY = 0x84FE;
+//        public const int GL_MAX_TEXTURE_MAX_ANISOTROPY = 0x84FF;
+//        public const int GL_TRANSFORM_FEEDBACK_OVERFLOW = 0x82EC;
+//        public const int GL_TRANSFORM_FEEDBACK_STREAM_OVERFLOW = 0x82ED;
+//        public const int GL_ARB_ES2_compatibility = 1;
+//        public const int GL_ARB_ES3_1_compatibility = 1;
+//        public const int GL_ARB_ES3_2_compatibility = 1;
+//        public const int GL_PRIMITIVE_BOUNDING_BOX_ARB = 0x92BE;
+//        public const int GL_MULTISAMPLE_LINE_WIDTH_RANGE_ARB = 0x9381;
+//        public const int GL_MULTISAMPLE_LINE_WIDTH_GRANULARITY_ARB = 0x9382;
+//        public const int GL_ARB_ES3_compatibility = 1;
+//        public const int GL_ARB_arrays_of_arrays = 1;
+//        public const int GL_ARB_base_instance = 1;
+//        public const int GL_ARB_bindless_texture = 1;
+//        public const int GL_UNSIGNED_INT64_ARB = 0x140F;
+//        public const int GL_ARB_blend_func_extended = 1;
+//        public const int GL_ARB_buffer_storage = 1;
+//        public const int GL_ARB_cl_event = 1;
+//        public const int GL_SYNC_CL_EVENT_ARB = 0x8240;
+//        public const int GL_SYNC_CL_EVENT_COMPLETE_ARB = 0x8241;
+//        public const int GL_ARB_clear_buffer_object = 1;
+//        public const int GL_ARB_clear_texture = 1;
+//        public const int GL_ARB_clip_control = 1;
+//        public const int GL_ARB_color_buffer_float = 1;
+//        public const int GL_RGBA_FLOAT_MODE_ARB = 0x8820;
+//        public const int GL_CLAMP_VERTEX_COLOR_ARB = 0x891A;
+//        public const int GL_CLAMP_FRAGMENT_COLOR_ARB = 0x891B;
+//        public const int GL_CLAMP_READ_COLOR_ARB = 0x891C;
+//        public const int GL_FIXED_ONLY_ARB = 0x891D;
+//        public const int GL_ARB_compatibility = 1;
+//        public const int GL_ARB_compressed_texture_pixel_storage = 1;
+//        public const int GL_ARB_compute_shader = 1;
+//        public const int GL_ARB_compute_variable_group_size = 1;
+//        public const int GL_MAX_COMPUTE_VARIABLE_GROUP_INVOCATIONS_ARB = 0x9344;
+//        public const int GL_MAX_COMPUTE_FIXED_GROUP_INVOCATIONS_ARB = 0x90EB;
+//        public const int GL_MAX_COMPUTE_VARIABLE_GROUP_SIZE_ARB = 0x9345;
+//        public const int GL_MAX_COMPUTE_FIXED_GROUP_SIZE_ARB = 0x91BF;
+//        public const int GL_ARB_conditional_render_inverted = 1;
+//        public const int GL_ARB_conservative_depth = 1;
+//        public const int GL_ARB_copy_buffer = 1;
+//        public const int GL_ARB_copy_image = 1;
+//        public const int GL_ARB_cull_distance = 1;
+//        public const int GL_ARB_debug_output = 1;
+//        public const int GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB = 0x8242;
+//        public const int GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_ARB = 0x8243;
+//        public const int GL_DEBUG_CALLBACK_FUNCTION_ARB = 0x8244;
+//        public const int GL_DEBUG_CALLBACK_USER_PARAM_ARB = 0x8245;
+//        public const int GL_DEBUG_SOURCE_API_ARB = 0x8246;
+//        public const int GL_DEBUG_SOURCE_WINDOW_SYSTEM_ARB = 0x8247;
+//        public const int GL_DEBUG_SOURCE_SHADER_COMPILER_ARB = 0x8248;
+//        public const int GL_DEBUG_SOURCE_THIRD_PARTY_ARB = 0x8249;
+//        public const int GL_DEBUG_SOURCE_APPLICATION_ARB = 0x824A;
+//        public const int GL_DEBUG_SOURCE_OTHER_ARB = 0x824B;
+//        public const int GL_DEBUG_TYPE_ERROR_ARB = 0x824C;
+//        public const int GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_ARB = 0x824D;
+//        public const int GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_ARB = 0x824E;
+//        public const int GL_DEBUG_TYPE_PORTABILITY_ARB = 0x824F;
+//        public const int GL_DEBUG_TYPE_PERFORMANCE_ARB = 0x8250;
+//        public const int GL_DEBUG_TYPE_OTHER_ARB = 0x8251;
+//        public const int GL_MAX_DEBUG_MESSAGE_LENGTH_ARB = 0x9143;
+//        public const int GL_MAX_DEBUG_LOGGED_MESSAGES_ARB = 0x9144;
+//        public const int GL_DEBUG_LOGGED_MESSAGES_ARB = 0x9145;
+//        public const int GL_DEBUG_SEVERITY_HIGH_ARB = 0x9146;
+//        public const int GL_DEBUG_SEVERITY_MEDIUM_ARB = 0x9147;
+//        public const int GL_DEBUG_SEVERITY_LOW_ARB = 0x9148;
+//        public const int GL_ARB_depth_buffer_float = 1;
+//        public const int GL_ARB_depth_clamp = 1;
+//        public const int GL_ARB_depth_texture = 1;
+//        public const int GL_DEPTH_COMPONENT16_ARB = 0x81A5;
+//        public const int GL_DEPTH_COMPONENT24_ARB = 0x81A6;
+//        public const int GL_DEPTH_COMPONENT32_ARB = 0x81A7;
+//        public const int GL_TEXTURE_DEPTH_SIZE_ARB = 0x884A;
+//        public const int GL_DEPTH_TEXTURE_MODE_ARB = 0x884B;
+//        public const int GL_ARB_derivative_control = 1;
+//        public const int GL_ARB_direct_state_access = 1;
+//        public const int GL_ARB_draw_buffers = 1;
+//        public const int GL_MAX_DRAW_BUFFERS_ARB = 0x8824;
+//        public const int GL_DRAW_BUFFER0_ARB = 0x8825;
+//        public const int GL_DRAW_BUFFER1_ARB = 0x8826;
+//        public const int GL_DRAW_BUFFER2_ARB = 0x8827;
+//        public const int GL_DRAW_BUFFER3_ARB = 0x8828;
+//        public const int GL_DRAW_BUFFER4_ARB = 0x8829;
+//        public const int GL_DRAW_BUFFER5_ARB = 0x882A;
+//        public const int GL_DRAW_BUFFER6_ARB = 0x882B;
+//        public const int GL_DRAW_BUFFER7_ARB = 0x882C;
+//        public const int GL_DRAW_BUFFER8_ARB = 0x882D;
+//        public const int GL_DRAW_BUFFER9_ARB = 0x882E;
+//        public const int GL_DRAW_BUFFER10_ARB = 0x882F;
+//        public const int GL_DRAW_BUFFER11_ARB = 0x8830;
+//        public const int GL_DRAW_BUFFER12_ARB = 0x8831;
+//        public const int GL_DRAW_BUFFER13_ARB = 0x8832;
+//        public const int GL_DRAW_BUFFER14_ARB = 0x8833;
+//        public const int GL_DRAW_BUFFER15_ARB = 0x8834;
+//        public const int GL_ARB_draw_buffers_blend = 1;
+//        public const int GL_ARB_draw_elements_base_vertex = 1;
+//        public const int GL_ARB_draw_indirect = 1;
+//        public const int GL_ARB_draw_instanced = 1;
+//        public const int GL_ARB_enhanced_layouts = 1;
+//        public const int GL_ARB_explicit_attrib_location = 1;
+//        public const int GL_ARB_explicit_uniform_location = 1;
+//        public const int GL_ARB_fragment_coord_conventions = 1;
+//        public const int GL_ARB_fragment_layer_viewport = 1;
+//        public const int GL_ARB_fragment_program = 1;
+//        public const int GL_FRAGMENT_PROGRAM_ARB = 0x8804;
+//        public const int GL_PROGRAM_FORMAT_ASCII_ARB = 0x8875;
+//        public const int GL_PROGRAM_LENGTH_ARB = 0x8627;
+//        public const int GL_PROGRAM_FORMAT_ARB = 0x8876;
+//        public const int GL_PROGRAM_BINDING_ARB = 0x8677;
+//        public const int GL_PROGRAM_INSTRUCTIONS_ARB = 0x88A0;
+//        public const int GL_MAX_PROGRAM_INSTRUCTIONS_ARB = 0x88A1;
+//        public const int GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB = 0x88A2;
+//        public const int GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB = 0x88A3;
+//        public const int GL_PROGRAM_TEMPORARIES_ARB = 0x88A4;
+//        public const int GL_MAX_PROGRAM_TEMPORARIES_ARB = 0x88A5;
+//        public const int GL_PROGRAM_NATIVE_TEMPORARIES_ARB = 0x88A6;
+//        public const int GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB = 0x88A7;
+//        public const int GL_PROGRAM_PARAMETERS_ARB = 0x88A8;
+//        public const int GL_MAX_PROGRAM_PARAMETERS_ARB = 0x88A9;
+//        public const int GL_PROGRAM_NATIVE_PARAMETERS_ARB = 0x88AA;
+//        public const int GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB = 0x88AB;
+//        public const int GL_PROGRAM_ATTRIBS_ARB = 0x88AC;
+//        public const int GL_MAX_PROGRAM_ATTRIBS_ARB = 0x88AD;
+//        public const int GL_PROGRAM_NATIVE_ATTRIBS_ARB = 0x88AE;
+//        public const int GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB = 0x88AF;
+//        public const int GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB = 0x88B4;
+//        public const int GL_MAX_PROGRAM_ENV_PARAMETERS_ARB = 0x88B5;
+//        public const int GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB = 0x88B6;
+//        public const int GL_PROGRAM_ALU_INSTRUCTIONS_ARB = 0x8805;
+//        public const int GL_PROGRAM_TEX_INSTRUCTIONS_ARB = 0x8806;
+//        public const int GL_PROGRAM_TEX_INDIRECTIONS_ARB = 0x8807;
+//        public const int GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB = 0x8808;
+//        public const int GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB = 0x8809;
+//        public const int GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB = 0x880A;
+//        public const int GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB = 0x880B;
+//        public const int GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB = 0x880C;
+//        public const int GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB = 0x880D;
+//        public const int GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB = 0x880E;
+//        public const int GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB = 0x880F;
+//        public const int GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB = 0x8810;
+//        public const int GL_PROGRAM_STRING_ARB = 0x8628;
+//        public const int GL_PROGRAM_ERROR_POSITION_ARB = 0x864B;
+//        public const int GL_CURRENT_MATRIX_ARB = 0x8641;
+//        public const int GL_TRANSPOSE_CURRENT_MATRIX_ARB = 0x88B7;
+//        public const int GL_CURRENT_MATRIX_STACK_DEPTH_ARB = 0x8640;
+//        public const int GL_MAX_PROGRAM_MATRICES_ARB = 0x862F;
+//        public const int GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB = 0x862E;
+//        public const int GL_MAX_TEXTURE_COORDS_ARB = 0x8871;
+//        public const int GL_MAX_TEXTURE_IMAGE_UNITS_ARB = 0x8872;
+//        public const int GL_PROGRAM_ERROR_STRING_ARB = 0x8874;
+//        public const int GL_MATRIX0_ARB = 0x88C0;
+//        public const int GL_MATRIX1_ARB = 0x88C1;
+//        public const int GL_MATRIX2_ARB = 0x88C2;
+//        public const int GL_MATRIX3_ARB = 0x88C3;
+//        public const int GL_MATRIX4_ARB = 0x88C4;
+//        public const int GL_MATRIX5_ARB = 0x88C5;
+//        public const int GL_MATRIX6_ARB = 0x88C6;
+//        public const int GL_MATRIX7_ARB = 0x88C7;
+//        public const int GL_MATRIX8_ARB = 0x88C8;
+//        public const int GL_MATRIX9_ARB = 0x88C9;
+//        public const int GL_MATRIX10_ARB = 0x88CA;
+//        public const int GL_MATRIX11_ARB = 0x88CB;
+//        public const int GL_MATRIX12_ARB = 0x88CC;
+//        public const int GL_MATRIX13_ARB = 0x88CD;
+//        public const int GL_MATRIX14_ARB = 0x88CE;
+//        public const int GL_MATRIX15_ARB = 0x88CF;
+//        public const int GL_MATRIX16_ARB = 0x88D0;
+//        public const int GL_MATRIX17_ARB = 0x88D1;
+//        public const int GL_MATRIX18_ARB = 0x88D2;
+//        public const int GL_MATRIX19_ARB = 0x88D3;
+//        public const int GL_MATRIX20_ARB = 0x88D4;
+//        public const int GL_MATRIX21_ARB = 0x88D5;
+//        public const int GL_MATRIX22_ARB = 0x88D6;
+//        public const int GL_MATRIX23_ARB = 0x88D7;
+//        public const int GL_MATRIX24_ARB = 0x88D8;
+//        public const int GL_MATRIX25_ARB = 0x88D9;
+//        public const int GL_MATRIX26_ARB = 0x88DA;
+//        public const int GL_MATRIX27_ARB = 0x88DB;
+//        public const int GL_MATRIX28_ARB = 0x88DC;
+//        public const int GL_MATRIX29_ARB = 0x88DD;
+//        public const int GL_MATRIX30_ARB = 0x88DE;
+//        public const int GL_MATRIX31_ARB = 0x88DF;
+//        public const int GL_ARB_fragment_program_shadow = 1;
+//        public const int GL_ARB_fragment_shader = 1;
+//        public const int GL_FRAGMENT_SHADER_ARB = 0x8B30;
+//        public const int GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB = 0x8B49;
+//        public const int GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB = 0x8B8B;
+//        public const int GL_ARB_fragment_shader_interlock = 1;
+//        public const int GL_ARB_framebuffer_no_attachments = 1;
+//        public const int GL_ARB_framebuffer_object = 1;
+//        public const int GL_ARB_framebuffer_sRGB = 1;
+//        public const int GL_ARB_geometry_shader4 = 1;
+//        public const int GL_LINES_ADJACENCY_ARB = 0x000A;
+//        public const int GL_LINE_STRIP_ADJACENCY_ARB = 0x000B;
+//        public const int GL_TRIANGLES_ADJACENCY_ARB = 0x000C;
+//        public const int GL_TRIANGLE_STRIP_ADJACENCY_ARB = 0x000D;
+//        public const int GL_PROGRAM_POINT_SIZE_ARB = 0x8642;
+//        public const int GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB = 0x8C29;
+//        public const int GL_FRAMEBUFFER_ATTACHMENT_LAYERED_ARB = 0x8DA7;
+//        public const int GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_ARB = 0x8DA8;
+//        public const int GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB = 0x8DA9;
+//        public const int GL_GEOMETRY_SHADER_ARB = 0x8DD9;
+//        public const int GL_GEOMETRY_VERTICES_OUT_ARB = 0x8DDA;
+//        public const int GL_GEOMETRY_INPUT_TYPE_ARB = 0x8DDB;
+//        public const int GL_GEOMETRY_OUTPUT_TYPE_ARB = 0x8DDC;
+//        public const int GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB = 0x8DDD;
+//        public const int GL_MAX_VERTEX_VARYING_COMPONENTS_ARB = 0x8DDE;
+//        public const int GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB = 0x8DDF;
+//        public const int GL_MAX_GEOMETRY_OUTPUT_VERTICES_ARB = 0x8DE0;
+//        public const int GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB = 0x8DE1;
+//        public const int GL_ARB_get_program_binary = 1;
+//        public const int GL_ARB_get_texture_sub_image = 1;
+//        public const int GL_ARB_gl_spirv = 1;
+//        public const int GL_SHADER_BINARY_FORMAT_SPIR_V_ARB = 0x9551;
+//        public const int GL_SPIR_V_BINARY_ARB = 0x9552;
+//        public const int GL_ARB_gpu_shader5 = 1;
+//        public const int GL_ARB_gpu_shader_fp64 = 1;
+//        public const int GL_ARB_gpu_shader_int64 = 1;
+//        public const int GL_INT64_ARB = 0x140E;
+//        public const int GL_INT64_VEC2_ARB = 0x8FE9;
+//        public const int GL_INT64_VEC3_ARB = 0x8FEA;
+//        public const int GL_INT64_VEC4_ARB = 0x8FEB;
+//        public const int GL_UNSIGNED_INT64_VEC2_ARB = 0x8FF5;
+//        public const int GL_UNSIGNED_INT64_VEC3_ARB = 0x8FF6;
+//        public const int GL_UNSIGNED_INT64_VEC4_ARB = 0x8FF7;
+//        public const int GL_ARB_half_float_pixel = 1;
+//        public const int GL_HALF_FLOAT_ARB = 0x140B;
+//        public const int GL_ARB_half_float_vertex = 1;
+//        public const int GL_ARB_imaging = 1;
+//        public const int GL_ARB_indirect_parameters = 1;
+//        public const int GL_PARAMETER_BUFFER_ARB = 0x80EE;
+//        public const int GL_PARAMETER_BUFFER_BINDING_ARB = 0x80EF;
+//        public const int GL_ARB_instanced_arrays = 1;
+//        public const int GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB = 0x88FE;
+//        public const int GL_ARB_internalformat_query = 1;
+//        public const int GL_ARB_internalformat_query2 = 1;
+//        public const int GL_SRGB_DECODE_ARB = 0x8299;
+//        public const int GL_ARB_invalidate_subdata = 1;
+//        public const int GL_ARB_map_buffer_alignment = 1;
+//        public const int GL_ARB_map_buffer_range = 1;
+//        public const int GL_ARB_matrix_palette = 1;
+//        public const int GL_MATRIX_PALETTE_ARB = 0x8840;
+//        public const int GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB = 0x8841;
+//        public const int GL_MAX_PALETTE_MATRICES_ARB = 0x8842;
+//        public const int GL_CURRENT_PALETTE_MATRIX_ARB = 0x8843;
+//        public const int GL_MATRIX_INDEX_ARRAY_ARB = 0x8844;
+//        public const int GL_CURRENT_MATRIX_INDEX_ARB = 0x8845;
+//        public const int GL_MATRIX_INDEX_ARRAY_SIZE_ARB = 0x8846;
+//        public const int GL_MATRIX_INDEX_ARRAY_TYPE_ARB = 0x8847;
+//        public const int GL_MATRIX_INDEX_ARRAY_STRIDE_ARB = 0x8848;
+//        public const int GL_MATRIX_INDEX_ARRAY_POINTER_ARB = 0x8849;
+//        public const int GL_ARB_multi_bind = 1;
+//        public const int GL_ARB_multi_draw_indirect = 1;
+//        public const int GL_ARB_multisample = 1;
+//        public const int GL_MULTISAMPLE_ARB = 0x809D;
+//        public const int GL_SAMPLE_ALPHA_TO_COVERAGE_ARB = 0x809E;
+//        public const int GL_SAMPLE_ALPHA_TO_ONE_ARB = 0x809F;
+//        public const int GL_SAMPLE_COVERAGE_ARB = 0x80A0;
+//        public const int GL_SAMPLE_BUFFERS_ARB = 0x80A8;
+//        public const int GL_SAMPLES_ARB = 0x80A9;
+//        public const int GL_SAMPLE_COVERAGE_VALUE_ARB = 0x80AA;
+//        public const int GL_SAMPLE_COVERAGE_INVERT_ARB = 0x80AB;
+//        public const int GL_MULTISAMPLE_BIT_ARB = 0x20000000;
+//        public const int GL_ARB_occlusion_query = 1;
+//        public const int GL_QUERY_COUNTER_BITS_ARB = 0x8864;
+//        public const int GL_CURRENT_QUERY_ARB = 0x8865;
+//        public const int GL_QUERY_RESULT_ARB = 0x8866;
+//        public const int GL_QUERY_RESULT_AVAILABLE_ARB = 0x8867;
+//        public const int GL_SAMPLES_PASSED_ARB = 0x8914;
+//        public const int GL_ARB_occlusion_query2 = 1;
+//        public const int GL_ARB_parallel_shader_compile = 1;
+//        public const int GL_MAX_SHADER_COMPILER_THREADS_ARB = 0x91B0;
+//        public const int GL_COMPLETION_STATUS_ARB = 0x91B1;
+//        public const int GL_ARB_pipeline_statistics_query = 1;
+//        public const int GL_VERTICES_SUBMITTED_ARB = 0x82EE;
+//        public const int GL_PRIMITIVES_SUBMITTED_ARB = 0x82EF;
+//        public const int GL_VERTEX_SHADER_INVOCATIONS_ARB = 0x82F0;
+//        public const int GL_TESS_CONTROL_SHADER_PATCHES_ARB = 0x82F1;
+//        public const int GL_TESS_EVALUATION_SHADER_INVOCATIONS_ARB = 0x82F2;
+//        public const int GL_GEOMETRY_SHADER_PRIMITIVES_EMITTED_ARB = 0x82F3;
+//        public const int GL_FRAGMENT_SHADER_INVOCATIONS_ARB = 0x82F4;
+//        public const int GL_COMPUTE_SHADER_INVOCATIONS_ARB = 0x82F5;
+//        public const int GL_CLIPPING_INPUT_PRIMITIVES_ARB = 0x82F6;
+//        public const int GL_CLIPPING_OUTPUT_PRIMITIVES_ARB = 0x82F7;
+//        public const int GL_ARB_pixel_buffer_object = 1;
+//        public const int GL_PIXEL_PACK_BUFFER_ARB = 0x88EB;
+//        public const int GL_PIXEL_UNPACK_BUFFER_ARB = 0x88EC;
+//        public const int GL_PIXEL_PACK_BUFFER_BINDING_ARB = 0x88ED;
+//        public const int GL_PIXEL_UNPACK_BUFFER_BINDING_ARB = 0x88EF;
+//        public const int GL_ARB_point_parameters = 1;
+//        public const int GL_POINT_SIZE_MIN_ARB = 0x8126;
+//        public const int GL_POINT_SIZE_MAX_ARB = 0x8127;
+//        public const int GL_POINT_FADE_THRESHOLD_SIZE_ARB = 0x8128;
+//        public const int GL_POINT_DISTANCE_ATTENUATION_ARB = 0x8129;
+//        public const int GL_ARB_point_sprite = 1;
+//        public const int GL_POINT_SPRITE_ARB = 0x8861;
+//        public const int GL_COORD_REPLACE_ARB = 0x8862;
+//        public const int GL_ARB_polygon_offset_clamp = 1;
+//        public const int GL_ARB_post_depth_coverage = 1;
+//        public const int GL_ARB_program_interface_query = 1;
+//        public const int GL_ARB_provoking_vertex = 1;
+//        public const int GL_ARB_query_buffer_object = 1;
+//        public const int GL_ARB_robust_buffer_access_behavior = 1;
+//        public const int GL_ARB_robustness = 1;
+//        public const int GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT_ARB = 0x00000004;
+//        public const int GL_LOSE_CONTEXT_ON_RESET_ARB = 0x8252;
+//        public const int GL_GUILTY_CONTEXT_RESET_ARB = 0x8253;
+//        public const int GL_INNOCENT_CONTEXT_RESET_ARB = 0x8254;
+//        public const int GL_UNKNOWN_CONTEXT_RESET_ARB = 0x8255;
+//        public const int GL_RESET_NOTIFICATION_STRATEGY_ARB = 0x8256;
+//        public const int GL_NO_RESET_NOTIFICATION_ARB = 0x8261;
+//        public const int GL_ARB_robustness_isolation = 1;
+//        public const int GL_ARB_sample_locations = 1;
+//        public const int GL_SAMPLE_LOCATION_SUBPIXEL_BITS_ARB = 0x933D;
+//        public const int GL_SAMPLE_LOCATION_PIXEL_GRID_WIDTH_ARB = 0x933E;
+//        public const int GL_SAMPLE_LOCATION_PIXEL_GRID_HEIGHT_ARB = 0x933F;
+//        public const int GL_PROGRAMMABLE_SAMPLE_LOCATION_TABLE_SIZE_ARB = 0x9340;
+//        public const int GL_SAMPLE_LOCATION_ARB = 0x8E50;
+//        public const int GL_PROGRAMMABLE_SAMPLE_LOCATION_ARB = 0x9341;
+//        public const int GL_FRAMEBUFFER_PROGRAMMABLE_SAMPLE_LOCATIONS_ARB = 0x9342;
+//        public const int GL_FRAMEBUFFER_SAMPLE_LOCATION_PIXEL_GRID_ARB = 0x9343;
+//        public const int GL_ARB_sample_shading = 1;
+//        public const int GL_SAMPLE_SHADING_ARB = 0x8C36;
+//        public const int GL_MIN_SAMPLE_SHADING_VALUE_ARB = 0x8C37;
+//        public const int GL_ARB_sampler_objects = 1;
+//        public const int GL_ARB_seamless_cube_map = 1;
+//        public const int GL_ARB_seamless_cubemap_per_texture = 1;
+//        public const int GL_ARB_separate_shader_objects = 1;
+//        public const int GL_ARB_shader_atomic_counter_ops = 1;
+//        public const int GL_ARB_shader_atomic_counters = 1;
+//        public const int GL_ARB_shader_ballot = 1;
+//        public const int GL_ARB_shader_bit_encoding = 1;
+//        public const int GL_ARB_shader_clock = 1;
+//        public const int GL_ARB_shader_draw_parameters = 1;
+//        public const int GL_ARB_shader_group_vote = 1;
+//        public const int GL_ARB_shader_image_load_store = 1;
+//        public const int GL_ARB_shader_image_size = 1;
+//        public const int GL_ARB_shader_objects = 1;
+//        public const int GL_PROGRAM_OBJECT_ARB = 0x8B40;
+//        public const int GL_SHADER_OBJECT_ARB = 0x8B48;
+//        public const int GL_OBJECT_TYPE_ARB = 0x8B4E;
+//        public const int GL_OBJECT_SUBTYPE_ARB = 0x8B4F;
+//        public const int GL_FLOAT_VEC2_ARB = 0x8B50;
+//        public const int GL_FLOAT_VEC3_ARB = 0x8B51;
+//        public const int GL_FLOAT_VEC4_ARB = 0x8B52;
+//        public const int GL_INT_VEC2_ARB = 0x8B53;
+//        public const int GL_INT_VEC3_ARB = 0x8B54;
+//        public const int GL_INT_VEC4_ARB = 0x8B55;
+//        public const int GL_BOOL_ARB = 0x8B56;
+//        public const int GL_BOOL_VEC2_ARB = 0x8B57;
+//        public const int GL_BOOL_VEC3_ARB = 0x8B58;
+//        public const int GL_BOOL_VEC4_ARB = 0x8B59;
+//        public const int GL_FLOAT_MAT2_ARB = 0x8B5A;
+//        public const int GL_FLOAT_MAT3_ARB = 0x8B5B;
+//        public const int GL_FLOAT_MAT4_ARB = 0x8B5C;
+//        public const int GL_SAMPLER_1D_ARB = 0x8B5D;
+//        public const int GL_SAMPLER_2D_ARB = 0x8B5E;
+//        public const int GL_SAMPLER_3D_ARB = 0x8B5F;
+//        public const int GL_SAMPLER_CUBE_ARB = 0x8B60;
+//        public const int GL_SAMPLER_1D_SHADOW_ARB = 0x8B61;
+//        public const int GL_SAMPLER_2D_SHADOW_ARB = 0x8B62;
+//        public const int GL_SAMPLER_2D_RECT_ARB = 0x8B63;
+//        public const int GL_SAMPLER_2D_RECT_SHADOW_ARB = 0x8B64;
+//        public const int GL_OBJECT_DELETE_STATUS_ARB = 0x8B80;
+//        public const int GL_OBJECT_COMPILE_STATUS_ARB = 0x8B81;
+//        public const int GL_OBJECT_LINK_STATUS_ARB = 0x8B82;
+//        public const int GL_OBJECT_VALIDATE_STATUS_ARB = 0x8B83;
+//        public const int GL_OBJECT_INFO_LOG_LENGTH_ARB = 0x8B84;
+//        public const int GL_OBJECT_ATTACHED_OBJECTS_ARB = 0x8B85;
+//        public const int GL_OBJECT_ACTIVE_UNIFORMS_ARB = 0x8B86;
+//        public const int GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB = 0x8B87;
+//        public const int GL_OBJECT_SHADER_SOURCE_LENGTH_ARB = 0x8B88;
+//        public const int GL_ARB_shader_precision = 1;
+//        public const int GL_ARB_shader_stencil_export = 1;
+//        public const int GL_ARB_shader_storage_buffer_object = 1;
+//        public const int GL_ARB_shader_subroutine = 1;
+//        public const int GL_ARB_shader_texture_image_samples = 1;
+//        public const int GL_ARB_shader_texture_lod = 1;
+//        public const int GL_ARB_shader_viewport_layer_array = 1;
+//        public const int GL_ARB_shading_language_100 = 1;
+//        public const int GL_SHADING_LANGUAGE_VERSION_ARB = 0x8B8C;
+//        public const int GL_ARB_shading_language_420pack = 1;
+//        public const int GL_ARB_shading_language_include = 1;
+//        public const int GL_SHADER_INCLUDE_ARB = 0x8DAE;
+//        public const int GL_NAMED_STRING_LENGTH_ARB = 0x8DE9;
+//        public const int GL_NAMED_STRING_TYPE_ARB = 0x8DEA;
+//        public const int GL_ARB_shading_language_packing = 1;
+//        public const int GL_ARB_shadow = 1;
+//        public const int GL_TEXTURE_COMPARE_MODE_ARB = 0x884C;
+//        public const int GL_TEXTURE_COMPARE_FUNC_ARB = 0x884D;
+//        public const int GL_COMPARE_R_TO_TEXTURE_ARB = 0x884E;
+//        public const int GL_ARB_shadow_ambient = 1;
+//        public const int GL_TEXTURE_COMPARE_FAIL_VALUE_ARB = 0x80BF;
+//        public const int GL_ARB_sparse_buffer = 1;
+//        public const int GL_SPARSE_STORAGE_BIT_ARB = 0x0400;
+//        public const int GL_SPARSE_BUFFER_PAGE_SIZE_ARB = 0x82F8;
+//        public const int GL_ARB_sparse_texture = 1;
+//        public const int GL_TEXTURE_SPARSE_ARB = 0x91A6;
+//        public const int GL_VIRTUAL_PAGE_SIZE_INDEX_ARB = 0x91A7;
+//        public const int GL_NUM_SPARSE_LEVELS_ARB = 0x91AA;
+//        public const int GL_NUM_VIRTUAL_PAGE_SIZES_ARB = 0x91A8;
+//        public const int GL_VIRTUAL_PAGE_SIZE_X_ARB = 0x9195;
+//        public const int GL_VIRTUAL_PAGE_SIZE_Y_ARB = 0x9196;
+//        public const int GL_VIRTUAL_PAGE_SIZE_Z_ARB = 0x9197;
+//        public const int GL_MAX_SPARSE_TEXTURE_SIZE_ARB = 0x9198;
+//        public const int GL_MAX_SPARSE_3D_TEXTURE_SIZE_ARB = 0x9199;
+//        public const int GL_MAX_SPARSE_ARRAY_TEXTURE_LAYERS_ARB = 0x919A;
+//        public const int GL_SPARSE_TEXTURE_FULL_ARRAY_CUBE_MIPMAPS_ARB = 0x91A9;
+//        public const int GL_ARB_sparse_texture2 = 1;
+//        public const int GL_ARB_sparse_texture_clamp = 1;
+//        public const int GL_ARB_spirv_extensions = 1;
+//        public const int GL_ARB_stencil_texturing = 1;
+//        public const int GL_ARB_sync = 1;
+//        public const int GL_ARB_tessellation_shader = 1;
+//        public const int GL_ARB_texture_barrier = 1;
+//        public const int GL_ARB_texture_border_clamp = 1;
+//        public const int GL_CLAMP_TO_BORDER_ARB = 0x812D;
+//        public const int GL_ARB_texture_buffer_object = 1;
+//        public const int GL_TEXTURE_BUFFER_ARB = 0x8C2A;
+//        public const int GL_MAX_TEXTURE_BUFFER_SIZE_ARB = 0x8C2B;
+//        public const int GL_TEXTURE_BINDING_BUFFER_ARB = 0x8C2C;
+//        public const int GL_TEXTURE_BUFFER_DATA_STORE_BINDING_ARB = 0x8C2D;
+//        public const int GL_TEXTURE_BUFFER_FORMAT_ARB = 0x8C2E;
+//        public const int GL_ARB_texture_buffer_object_rgb32 = 1;
+//        public const int GL_ARB_texture_buffer_range = 1;
+//        public const int GL_ARB_texture_compression = 1;
+//        public const int GL_COMPRESSED_ALPHA_ARB = 0x84E9;
+//        public const int GL_COMPRESSED_LUMINANCE_ARB = 0x84EA;
+//        public const int GL_COMPRESSED_LUMINANCE_ALPHA_ARB = 0x84EB;
+//        public const int GL_COMPRESSED_INTENSITY_ARB = 0x84EC;
+//        public const int GL_COMPRESSED_RGB_ARB = 0x84ED;
+//        public const int GL_COMPRESSED_RGBA_ARB = 0x84EE;
+//        public const int GL_TEXTURE_COMPRESSION_HINT_ARB = 0x84EF;
+//        public const int GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB = 0x86A0;
+//        public const int GL_TEXTURE_COMPRESSED_ARB = 0x86A1;
+//        public const int GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB = 0x86A2;
+//        public const int GL_COMPRESSED_TEXTURE_FORMATS_ARB = 0x86A3;
+//        public const int GL_ARB_texture_compression_bptc = 1;
+//        public const int GL_COMPRESSED_RGBA_BPTC_UNORM_ARB = 0x8E8C;
+//        public const int GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_ARB = 0x8E8D;
+//        public const int GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_ARB = 0x8E8E;
+//        public const int GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_ARB = 0x8E8F;
+//        public const int GL_ARB_texture_compression_rgtc = 1;
+//        public const int GL_ARB_texture_cube_map = 1;
+//        public const int GL_NORMAL_MAP_ARB = 0x8511;
+//        public const int GL_REFLECTION_MAP_ARB = 0x8512;
+//        public const int GL_TEXTURE_CUBE_MAP_ARB = 0x8513;
+//        public const int GL_TEXTURE_BINDING_CUBE_MAP_ARB = 0x8514;
+//        public const int GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB = 0x8515;
+//        public const int GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB = 0x8516;
+//        public const int GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB = 0x8517;
+//        public const int GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB = 0x8518;
+//        public const int GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB = 0x8519;
+//        public const int GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB = 0x851A;
+//        public const int GL_PROXY_TEXTURE_CUBE_MAP_ARB = 0x851B;
+//        public const int GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB = 0x851C;
+//        public const int GL_ARB_texture_cube_map_array = 1;
+//        public const int GL_TEXTURE_CUBE_MAP_ARRAY_ARB = 0x9009;
+//        public const int GL_TEXTURE_BINDING_CUBE_MAP_ARRAY_ARB = 0x900A;
+//        public const int GL_PROXY_TEXTURE_CUBE_MAP_ARRAY_ARB = 0x900B;
+//        public const int GL_SAMPLER_CUBE_MAP_ARRAY_ARB = 0x900C;
+//        public const int GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW_ARB = 0x900D;
+//        public const int GL_INT_SAMPLER_CUBE_MAP_ARRAY_ARB = 0x900E;
+//        public const int GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY_ARB = 0x900F;
+//        public const int GL_ARB_texture_env_add = 1;
+//        public const int GL_ARB_texture_env_combine = 1;
+//        public const int GL_COMBINE_ARB = 0x8570;
+//        public const int GL_COMBINE_RGB_ARB = 0x8571;
+//        public const int GL_COMBINE_ALPHA_ARB = 0x8572;
+//        public const int GL_SOURCE0_RGB_ARB = 0x8580;
+//        public const int GL_SOURCE1_RGB_ARB = 0x8581;
+//        public const int GL_SOURCE2_RGB_ARB = 0x8582;
+//        public const int GL_SOURCE0_ALPHA_ARB = 0x8588;
+//        public const int GL_SOURCE1_ALPHA_ARB = 0x8589;
+//        public const int GL_SOURCE2_ALPHA_ARB = 0x858A;
+//        public const int GL_OPERAND0_RGB_ARB = 0x8590;
+//        public const int GL_OPERAND1_RGB_ARB = 0x8591;
+//        public const int GL_OPERAND2_RGB_ARB = 0x8592;
+//        public const int GL_OPERAND0_ALPHA_ARB = 0x8598;
+//        public const int GL_OPERAND1_ALPHA_ARB = 0x8599;
+//        public const int GL_OPERAND2_ALPHA_ARB = 0x859A;
+//        public const int GL_RGB_SCALE_ARB = 0x8573;
+//        public const int GL_ADD_SIGNED_ARB = 0x8574;
+//        public const int GL_INTERPOLATE_ARB = 0x8575;
+//        public const int GL_SUBTRACT_ARB = 0x84E7;
+//        public const int GL_CONSTANT_ARB = 0x8576;
+//        public const int GL_PRIMARY_COLOR_ARB = 0x8577;
+//        public const int GL_PREVIOUS_ARB = 0x8578;
+//        public const int GL_ARB_texture_env_crossbar = 1;
+//        public const int GL_ARB_texture_env_dot3 = 1;
+//        public const int GL_DOT3_RGB_ARB = 0x86AE;
+//        public const int GL_DOT3_RGBA_ARB = 0x86AF;
+//        public const int GL_ARB_texture_filter_anisotropic = 1;
+//        public const int GL_ARB_texture_filter_minmax = 1;
+//        public const int GL_TEXTURE_REDUCTION_MODE_ARB = 0x9366;
+//        public const int GL_WEIGHTED_AVERAGE_ARB = 0x9367;
+//        public const int GL_ARB_texture_float = 1;
+//        public const int GL_TEXTURE_RED_TYPE_ARB = 0x8C10;
+//        public const int GL_TEXTURE_GREEN_TYPE_ARB = 0x8C11;
+//        public const int GL_TEXTURE_BLUE_TYPE_ARB = 0x8C12;
+//        public const int GL_TEXTURE_ALPHA_TYPE_ARB = 0x8C13;
+//        public const int GL_TEXTURE_LUMINANCE_TYPE_ARB = 0x8C14;
+//        public const int GL_TEXTURE_INTENSITY_TYPE_ARB = 0x8C15;
+//        public const int GL_TEXTURE_DEPTH_TYPE_ARB = 0x8C16;
+//        public const int GL_UNSIGNED_NORMALIZED_ARB = 0x8C17;
+//        public const int GL_RGBA32F_ARB = 0x8814;
+//        public const int GL_RGB32F_ARB = 0x8815;
+//        public const int GL_ALPHA32F_ARB = 0x8816;
+//        public const int GL_INTENSITY32F_ARB = 0x8817;
+//        public const int GL_LUMINANCE32F_ARB = 0x8818;
+//        public const int GL_LUMINANCE_ALPHA32F_ARB = 0x8819;
+//        public const int GL_RGBA16F_ARB = 0x881A;
+//        public const int GL_RGB16F_ARB = 0x881B;
+//        public const int GL_ALPHA16F_ARB = 0x881C;
+//        public const int GL_INTENSITY16F_ARB = 0x881D;
+//        public const int GL_LUMINANCE16F_ARB = 0x881E;
+//        public const int GL_LUMINANCE_ALPHA16F_ARB = 0x881F;
+//        public const int GL_ARB_texture_gather = 1;
+//        public const int GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET_ARB = 0x8E5E;
+//        public const int GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET_ARB = 0x8E5F;
+//        public const int GL_MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS_ARB = 0x8F9F;
+//        public const int GL_ARB_texture_mirror_clamp_to_edge = 1;
+//        public const int GL_ARB_texture_mirrored_repeat = 1;
+//        public const int GL_MIRRORED_REPEAT_ARB = 0x8370;
+//        public const int GL_ARB_texture_multisample = 1;
+//        public const int GL_ARB_texture_non_power_of_two = 1;
+//        public const int GL_ARB_texture_query_levels = 1;
+//        public const int GL_ARB_texture_query_lod = 1;
+//        public const int GL_ARB_texture_rectangle = 1;
+//        public const int GL_TEXTURE_RECTANGLE_ARB = 0x84F5;
+//        public const int GL_TEXTURE_BINDING_RECTANGLE_ARB = 0x84F6;
+//        public const int GL_PROXY_TEXTURE_RECTANGLE_ARB = 0x84F7;
+//        public const int GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB = 0x84F8;
+//        public const int GL_ARB_texture_rg = 1;
+//        public const int GL_ARB_texture_rgb10_a2ui = 1;
+//        public const int GL_ARB_texture_stencil8 = 1;
+//        public const int GL_ARB_texture_storage = 1;
+//        public const int GL_ARB_texture_storage_multisample = 1;
+//        public const int GL_ARB_texture_swizzle = 1;
+//        public const int GL_ARB_texture_view = 1;
+//        public const int GL_ARB_timer_query = 1;
+//        public const int GL_ARB_transform_feedback2 = 1;
+//        public const int GL_ARB_transform_feedback3 = 1;
+//        public const int GL_ARB_transform_feedback_instanced = 1;
+//        public const int GL_ARB_transform_feedback_overflow_query = 1;
+//        public const int GL_TRANSFORM_FEEDBACK_OVERFLOW_ARB = 0x82EC;
+//        public const int GL_TRANSFORM_FEEDBACK_STREAM_OVERFLOW_ARB = 0x82ED;
+//        public const int GL_ARB_transpose_matrix = 1;
+//        public const int GL_TRANSPOSE_MODELVIEW_MATRIX_ARB = 0x84E3;
+//        public const int GL_TRANSPOSE_PROJECTION_MATRIX_ARB = 0x84E4;
+//        public const int GL_TRANSPOSE_TEXTURE_MATRIX_ARB = 0x84E5;
+//        public const int GL_TRANSPOSE_COLOR_MATRIX_ARB = 0x84E6;
+//        public const int GL_ARB_uniform_buffer_object = 1;
+//        public const int GL_ARB_vertex_array_bgra = 1;
+//        public const int GL_ARB_vertex_array_object = 1;
+//        public const int GL_ARB_vertex_attrib_64bit = 1;
+//        public const int GL_ARB_vertex_attrib_binding = 1;
+//        public const int GL_ARB_vertex_blend = 1;
+//        public const int GL_MAX_VERTEX_UNITS_ARB = 0x86A4;
+//        public const int GL_ACTIVE_VERTEX_UNITS_ARB = 0x86A5;
+//        public const int GL_WEIGHT_SUM_UNITY_ARB = 0x86A6;
+//        public const int GL_VERTEX_BLEND_ARB = 0x86A7;
+//        public const int GL_CURRENT_WEIGHT_ARB = 0x86A8;
+//        public const int GL_WEIGHT_ARRAY_TYPE_ARB = 0x86A9;
+//        public const int GL_WEIGHT_ARRAY_STRIDE_ARB = 0x86AA;
+//        public const int GL_WEIGHT_ARRAY_SIZE_ARB = 0x86AB;
+//        public const int GL_WEIGHT_ARRAY_POINTER_ARB = 0x86AC;
+//        public const int GL_WEIGHT_ARRAY_ARB = 0x86AD;
+//        public const int GL_MODELVIEW0_ARB = 0x1700;
+//        public const int GL_MODELVIEW1_ARB = 0x850A;
+//        public const int GL_MODELVIEW2_ARB = 0x8722;
+//        public const int GL_MODELVIEW3_ARB = 0x8723;
+//        public const int GL_MODELVIEW4_ARB = 0x8724;
+//        public const int GL_MODELVIEW5_ARB = 0x8725;
+//        public const int GL_MODELVIEW6_ARB = 0x8726;
+//        public const int GL_MODELVIEW7_ARB = 0x8727;
+//        public const int GL_MODELVIEW8_ARB = 0x8728;
+//        public const int GL_MODELVIEW9_ARB = 0x8729;
+//        public const int GL_MODELVIEW10_ARB = 0x872A;
+//        public const int GL_MODELVIEW11_ARB = 0x872B;
+//        public const int GL_MODELVIEW12_ARB = 0x872C;
+//        public const int GL_MODELVIEW13_ARB = 0x872D;
+//        public const int GL_MODELVIEW14_ARB = 0x872E;
+//        public const int GL_MODELVIEW15_ARB = 0x872F;
+//        public const int GL_MODELVIEW16_ARB = 0x8730;
+//        public const int GL_MODELVIEW17_ARB = 0x8731;
+//        public const int GL_MODELVIEW18_ARB = 0x8732;
+//        public const int GL_MODELVIEW19_ARB = 0x8733;
+//        public const int GL_MODELVIEW20_ARB = 0x8734;
+//        public const int GL_MODELVIEW21_ARB = 0x8735;
+//        public const int GL_MODELVIEW22_ARB = 0x8736;
+//        public const int GL_MODELVIEW23_ARB = 0x8737;
+//        public const int GL_MODELVIEW24_ARB = 0x8738;
+//        public const int GL_MODELVIEW25_ARB = 0x8739;
+//        public const int GL_MODELVIEW26_ARB = 0x873A;
+//        public const int GL_MODELVIEW27_ARB = 0x873B;
+//        public const int GL_MODELVIEW28_ARB = 0x873C;
+//        public const int GL_MODELVIEW29_ARB = 0x873D;
+//        public const int GL_MODELVIEW30_ARB = 0x873E;
+//        public const int GL_MODELVIEW31_ARB = 0x873F;
+//        public const int GL_ARB_vertex_buffer_object = 1;
+//        public const int GL_BUFFER_SIZE_ARB = 0x8764;
+//        public const int GL_BUFFER_USAGE_ARB = 0x8765;
+//        public const int GL_ARRAY_BUFFER_ARB = 0x8892;
+//        public const int GL_ELEMENT_ARRAY_BUFFER_ARB = 0x8893;
+//        public const int GL_ARRAY_BUFFER_BINDING_ARB = 0x8894;
+//        public const int GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB = 0x8895;
+//        public const int GL_VERTEX_ARRAY_BUFFER_BINDING_ARB = 0x8896;
+//        public const int GL_NORMAL_ARRAY_BUFFER_BINDING_ARB = 0x8897;
+//        public const int GL_COLOR_ARRAY_BUFFER_BINDING_ARB = 0x8898;
+//        public const int GL_INDEX_ARRAY_BUFFER_BINDING_ARB = 0x8899;
+//        public const int GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB = 0x889A;
+//        public const int GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB = 0x889B;
+//        public const int GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB = 0x889C;
+//        public const int GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB = 0x889D;
+//        public const int GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB = 0x889E;
+//        public const int GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB = 0x889F;
+//        public const int GL_READ_ONLY_ARB = 0x88B8;
+//        public const int GL_WRITE_ONLY_ARB = 0x88B9;
+//        public const int GL_READ_WRITE_ARB = 0x88BA;
+//        public const int GL_BUFFER_ACCESS_ARB = 0x88BB;
+//        public const int GL_BUFFER_MAPPED_ARB = 0x88BC;
+//        public const int GL_BUFFER_MAP_POINTER_ARB = 0x88BD;
+//        public const int GL_STREAM_DRAW_ARB = 0x88E0;
+//        public const int GL_STREAM_READ_ARB = 0x88E1;
+//        public const int GL_STREAM_COPY_ARB = 0x88E2;
+//        public const int GL_STATIC_DRAW_ARB = 0x88E4;
+//        public const int GL_STATIC_READ_ARB = 0x88E5;
+//        public const int GL_STATIC_COPY_ARB = 0x88E6;
+//        public const int GL_DYNAMIC_DRAW_ARB = 0x88E8;
+//        public const int GL_DYNAMIC_READ_ARB = 0x88E9;
+//        public const int GL_DYNAMIC_COPY_ARB = 0x88EA;
+//        public const int GL_ARB_vertex_program = 1;
+//        public const int GL_COLOR_SUM_ARB = 0x8458;
+//        public const int GL_VERTEX_PROGRAM_ARB = 0x8620;
+//        public const int GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB = 0x8622;
+//        public const int GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB = 0x8623;
+//        public const int GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB = 0x8624;
+//        public const int GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB = 0x8625;
+//        public const int GL_CURRENT_VERTEX_ATTRIB_ARB = 0x8626;
+//        public const int GL_VERTEX_PROGRAM_POINT_SIZE_ARB = 0x8642;
+//        public const int GL_VERTEX_PROGRAM_TWO_SIDE_ARB = 0x8643;
+//        public const int GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB = 0x8645;
+//        public const int GL_MAX_VERTEX_ATTRIBS_ARB = 0x8869;
+//        public const int GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB = 0x886A;
+//        public const int GL_PROGRAM_ADDRESS_REGISTERS_ARB = 0x88B0;
+//        public const int GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB = 0x88B1;
+//        public const int GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB = 0x88B2;
+//        public const int GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB = 0x88B3;
+//        public const int GL_ARB_vertex_shader = 1;
+//        public const int GL_VERTEX_SHADER_ARB = 0x8B31;
+//        public const int GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB = 0x8B4A;
+//        public const int GL_MAX_VARYING_FLOATS_ARB = 0x8B4B;
+//        public const int GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB = 0x8B4C;
+//        public const int GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB = 0x8B4D;
+//        public const int GL_OBJECT_ACTIVE_ATTRIBUTES_ARB = 0x8B89;
+//        public const int GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB = 0x8B8A;
+//        public const int GL_ARB_vertex_type_10f_11f_11f_rev = 1;
+//        public const int GL_ARB_vertex_type_2_10_10_10_rev = 1;
+//        public const int GL_ARB_viewport_array = 1;
+//        public const int GL_ARB_window_pos = 1;
+//        public const int GL_KHR_blend_equation_advanced = 1;
+//        public const int GL_MULTIPLY_KHR = 0x9294;
+//        public const int GL_SCREEN_KHR = 0x9295;
+//        public const int GL_OVERLAY_KHR = 0x9296;
+//        public const int GL_DARKEN_KHR = 0x9297;
+//        public const int GL_LIGHTEN_KHR = 0x9298;
+//        public const int GL_COLORDODGE_KHR = 0x9299;
+//        public const int GL_COLORBURN_KHR = 0x929A;
+//        public const int GL_HARDLIGHT_KHR = 0x929B;
+//        public const int GL_SOFTLIGHT_KHR = 0x929C;
+//        public const int GL_DIFFERENCE_KHR = 0x929E;
+//        public const int GL_EXCLUSION_KHR = 0x92A0;
+//        public const int GL_HSL_HUE_KHR = 0x92AD;
+//        public const int GL_HSL_SATURATION_KHR = 0x92AE;
+//        public const int GL_HSL_COLOR_KHR = 0x92AF;
+//        public const int GL_HSL_LUMINOSITY_KHR = 0x92B0;
+//        public const int GL_KHR_blend_equation_advanced_coherent = 1;
+//        public const int GL_BLEND_ADVANCED_COHERENT_KHR = 0x9285;
+//        public const int GL_KHR_context_flush_control = 1;
+//        public const int GL_KHR_debug = 1;
+//        public const int GL_KHR_no_error = 1;
+//        public const int GL_CONTEXT_FLAG_NO_ERROR_BIT_KHR = 0x00000008;
+//        public const int GL_KHR_parallel_shader_compile = 1;
+//        public const int GL_MAX_SHADER_COMPILER_THREADS_KHR = 0x91B0;
+//        public const int GL_COMPLETION_STATUS_KHR = 0x91B1;
+//        public const int GL_KHR_robust_buffer_access_behavior = 1;
+//        public const int GL_KHR_robustness = 1;
+//        public const int GL_CONTEXT_ROBUST_ACCESS = 0x90F3;
+//        public const int GL_KHR_texture_compression_astc_hdr = 1;
+//        public const int GL_COMPRESSED_RGBA_ASTC_4x4_KHR = 0x93B0;
+//        public const int GL_COMPRESSED_RGBA_ASTC_5x4_KHR = 0x93B1;
+//        public const int GL_COMPRESSED_RGBA_ASTC_5x5_KHR = 0x93B2;
+//        public const int GL_COMPRESSED_RGBA_ASTC_6x5_KHR = 0x93B3;
+//        public const int GL_COMPRESSED_RGBA_ASTC_6x6_KHR = 0x93B4;
+//        public const int GL_COMPRESSED_RGBA_ASTC_8x5_KHR = 0x93B5;
+//        public const int GL_COMPRESSED_RGBA_ASTC_8x6_KHR = 0x93B6;
+//        public const int GL_COMPRESSED_RGBA_ASTC_8x8_KHR = 0x93B7;
+//        public const int GL_COMPRESSED_RGBA_ASTC_10x5_KHR = 0x93B8;
+//        public const int GL_COMPRESSED_RGBA_ASTC_10x6_KHR = 0x93B9;
+//        public const int GL_COMPRESSED_RGBA_ASTC_10x8_KHR = 0x93BA;
+//        public const int GL_COMPRESSED_RGBA_ASTC_10x10_KHR = 0x93BB;
+//        public const int GL_COMPRESSED_RGBA_ASTC_12x10_KHR = 0x93BC;
+//        public const int GL_COMPRESSED_RGBA_ASTC_12x12_KHR = 0x93BD;
+//        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR = 0x93D0;
+//        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR = 0x93D1;
+//        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR = 0x93D2;
+//        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR = 0x93D3;
+//        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR = 0x93D4;
+//        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR = 0x93D5;
+//        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR = 0x93D6;
+//        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR = 0x93D7;
+//        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR = 0x93D8;
+//        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR = 0x93D9;
+//        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR = 0x93DA;
+//        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR = 0x93DB;
+//        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR = 0x93DC;
+//        public const int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR = 0x93DD;
+//        public const int GL_KHR_texture_compression_astc_ldr = 1;
+//        public const int GL_KHR_texture_compression_astc_sliced_3d = 1;
+//        public const int GL_OES_byte_coordinates = 1;
+//        public const int GL_OES_compressed_paletted_texture = 1;
+//        public const int GL_PALETTE4_RGB8_OES = 0x8B90;
+//        public const int GL_PALETTE4_RGBA8_OES = 0x8B91;
+//        public const int GL_PALETTE4_R5_G6_B5_OES = 0x8B92;
+//        public const int GL_PALETTE4_RGBA4_OES = 0x8B93;
+//        public const int GL_PALETTE4_RGB5_A1_OES = 0x8B94;
+//        public const int GL_PALETTE8_RGB8_OES = 0x8B95;
+//        public const int GL_PALETTE8_RGBA8_OES = 0x8B96;
+//        public const int GL_PALETTE8_R5_G6_B5_OES = 0x8B97;
+//        public const int GL_PALETTE8_RGBA4_OES = 0x8B98;
+//        public const int GL_PALETTE8_RGB5_A1_OES = 0x8B99;
+//        public const int GL_OES_fixed_point = 1;
+//        public const int GL_FIXED_OES = 0x140C;
+//        public const int GL_OES_query_matrix = 1;
+//        public const int GL_OES_read_format = 1;
+//        public const int GL_IMPLEMENTATION_COLOR_READ_TYPE_OES = 0x8B9A;
+//        public const int GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES = 0x8B9B;
+//        public const int GL_OES_single_precision = 1;
+//        public const int GL_3DFX_multisample = 1;
+//        public const int GL_MULTISAMPLE_3DFX = 0x86B2;
+//        public const int GL_SAMPLE_BUFFERS_3DFX = 0x86B3;
+//        public const int GL_SAMPLES_3DFX = 0x86B4;
+//        public const int GL_MULTISAMPLE_BIT_3DFX = 0x20000000;
+//        public const int GL_3DFX_tbuffer = 1;
+//        public const int GL_3DFX_texture_compression_FXT1 = 1;
+//        public const int GL_COMPRESSED_RGB_FXT1_3DFX = 0x86B0;
+//        public const int GL_COMPRESSED_RGBA_FXT1_3DFX = 0x86B1;
+//        public const int GL_AMD_blend_minmax_factor = 1;
+//        public const int GL_FACTOR_MIN_AMD = 0x901C;
+//        public const int GL_FACTOR_MAX_AMD = 0x901D;
+//        public const int GL_AMD_conservative_depth = 1;
+//        public const int GL_AMD_debug_output = 1;
+//        public const int GL_MAX_DEBUG_MESSAGE_LENGTH_AMD = 0x9143;
+//        public const int GL_MAX_DEBUG_LOGGED_MESSAGES_AMD = 0x9144;
+//        public const int GL_DEBUG_LOGGED_MESSAGES_AMD = 0x9145;
+//        public const int GL_DEBUG_SEVERITY_HIGH_AMD = 0x9146;
+//        public const int GL_DEBUG_SEVERITY_MEDIUM_AMD = 0x9147;
+//        public const int GL_DEBUG_SEVERITY_LOW_AMD = 0x9148;
+//        public const int GL_DEBUG_CATEGORY_API_ERROR_AMD = 0x9149;
+//        public const int GL_DEBUG_CATEGORY_WINDOW_SYSTEM_AMD = 0x914A;
+//        public const int GL_DEBUG_CATEGORY_DEPRECATION_AMD = 0x914B;
+//        public const int GL_DEBUG_CATEGORY_UNDEFINED_BEHAVIOR_AMD = 0x914C;
+//        public const int GL_DEBUG_CATEGORY_PERFORMANCE_AMD = 0x914D;
+//        public const int GL_DEBUG_CATEGORY_SHADER_COMPILER_AMD = 0x914E;
+//        public const int GL_DEBUG_CATEGORY_APPLICATION_AMD = 0x914F;
+//        public const int GL_DEBUG_CATEGORY_OTHER_AMD = 0x9150;
+//        public const int GL_AMD_depth_clamp_separate = 1;
+//        public const int GL_DEPTH_CLAMP_NEAR_AMD = 0x901E;
+//        public const int GL_DEPTH_CLAMP_FAR_AMD = 0x901F;
+//        public const int GL_AMD_draw_buffers_blend = 1;
+//        public const int GL_AMD_framebuffer_multisample_advanced = 1;
+//        public const int GL_RENDERBUFFER_STORAGE_SAMPLES_AMD = 0x91B2;
+//        public const int GL_MAX_COLOR_FRAMEBUFFER_SAMPLES_AMD = 0x91B3;
+//        public const int GL_MAX_COLOR_FRAMEBUFFER_STORAGE_SAMPLES_AMD = 0x91B4;
+//        public const int GL_MAX_DEPTH_STENCIL_FRAMEBUFFER_SAMPLES_AMD = 0x91B5;
+//        public const int GL_NUM_SUPPORTED_MULTISAMPLE_MODES_AMD = 0x91B6;
+//        public const int GL_SUPPORTED_MULTISAMPLE_MODES_AMD = 0x91B7;
+//        public const int GL_AMD_framebuffer_sample_positions = 1;
+//        public const int GL_SUBSAMPLE_DISTANCE_AMD = 0x883F;
+//        public const int GL_PIXELS_PER_SAMPLE_PATTERN_X_AMD = 0x91AE;
+//        public const int GL_PIXELS_PER_SAMPLE_PATTERN_Y_AMD = 0x91AF;
+//        public const int GL_ALL_PIXELS_AMD = -1;
+//        public const int GL_AMD_gcn_shader = 1;
+//        public const int GL_AMD_gpu_shader_half_float = 1;
+//        public const int GL_FLOAT16_NV = 0x8FF8;
+//        public const int GL_FLOAT16_VEC2_NV = 0x8FF9;
+//        public const int GL_FLOAT16_VEC3_NV = 0x8FFA;
+//        public const int GL_FLOAT16_VEC4_NV = 0x8FFB;
+//        public const int GL_FLOAT16_MAT2_AMD = 0x91C5;
+//        public const int GL_FLOAT16_MAT3_AMD = 0x91C6;
+//        public const int GL_FLOAT16_MAT4_AMD = 0x91C7;
+//        public const int GL_FLOAT16_MAT2x3_AMD = 0x91C8;
+//        public const int GL_FLOAT16_MAT2x4_AMD = 0x91C9;
+//        public const int GL_FLOAT16_MAT3x2_AMD = 0x91CA;
+//        public const int GL_FLOAT16_MAT3x4_AMD = 0x91CB;
+//        public const int GL_FLOAT16_MAT4x2_AMD = 0x91CC;
+//        public const int GL_FLOAT16_MAT4x3_AMD = 0x91CD;
+//        public const int GL_AMD_gpu_shader_int16 = 1;
+//        public const int GL_AMD_gpu_shader_int64 = 1;
+//        public const int GL_INT64_NV = 0x140E;
+//        public const int GL_UNSIGNED_INT64_NV = 0x140F;
+//        public const int GL_INT8_NV = 0x8FE0;
+//        public const int GL_INT8_VEC2_NV = 0x8FE1;
+//        public const int GL_INT8_VEC3_NV = 0x8FE2;
+//        public const int GL_INT8_VEC4_NV = 0x8FE3;
+//        public const int GL_INT16_NV = 0x8FE4;
+//        public const int GL_INT16_VEC2_NV = 0x8FE5;
+//        public const int GL_INT16_VEC3_NV = 0x8FE6;
+//        public const int GL_INT16_VEC4_NV = 0x8FE7;
+//        public const int GL_INT64_VEC2_NV = 0x8FE9;
+//        public const int GL_INT64_VEC3_NV = 0x8FEA;
+//        public const int GL_INT64_VEC4_NV = 0x8FEB;
+//        public const int GL_UNSIGNED_INT8_NV = 0x8FEC;
+//        public const int GL_UNSIGNED_INT8_VEC2_NV = 0x8FED;
+//        public const int GL_UNSIGNED_INT8_VEC3_NV = 0x8FEE;
+//        public const int GL_UNSIGNED_INT8_VEC4_NV = 0x8FEF;
+//        public const int GL_UNSIGNED_INT16_NV = 0x8FF0;
+//        public const int GL_UNSIGNED_INT16_VEC2_NV = 0x8FF1;
+//        public const int GL_UNSIGNED_INT16_VEC3_NV = 0x8FF2;
+//        public const int GL_UNSIGNED_INT16_VEC4_NV = 0x8FF3;
+//        public const int GL_UNSIGNED_INT64_VEC2_NV = 0x8FF5;
+//        public const int GL_UNSIGNED_INT64_VEC3_NV = 0x8FF6;
+//        public const int GL_UNSIGNED_INT64_VEC4_NV = 0x8FF7;
+//        public const int GL_AMD_interleaved_elements = 1;
+//        public const int GL_VERTEX_ELEMENT_SWIZZLE_AMD = 0x91A4;
+//        public const int GL_VERTEX_ID_SWIZZLE_AMD = 0x91A5;
+//        public const int GL_AMD_multi_draw_indirect = 1;
+//        public const int GL_AMD_name_gen_delete = 1;
+//        public const int GL_DATA_BUFFER_AMD = 0x9151;
+//        public const int GL_PERFORMANCE_MONITOR_AMD = 0x9152;
+//        public const int GL_QUERY_OBJECT_AMD = 0x9153;
+//        public const int GL_VERTEX_ARRAY_OBJECT_AMD = 0x9154;
+//        public const int GL_SAMPLER_OBJECT_AMD = 0x9155;
+//        public const int GL_AMD_occlusion_query_event = 1;
+//        public const int GL_OCCLUSION_QUERY_EVENT_MASK_AMD = 0x874F;
+//        public const int GL_QUERY_DEPTH_PASS_EVENT_BIT_AMD = 0x00000001;
+//        public const int GL_QUERY_DEPTH_FAIL_EVENT_BIT_AMD = 0x00000002;
+//        public const int GL_QUERY_STENCIL_FAIL_EVENT_BIT_AMD = 0x00000004;
+//        public const int GL_QUERY_DEPTH_BOUNDS_FAIL_EVENT_BIT_AMD = 0x00000008;
+//        public const int GL_QUERY_ALL_EVENT_BITS_AMD = -1;
+//        public const int GL_AMD_performance_monitor = 1;
+//        public const int GL_COUNTER_TYPE_AMD = 0x8BC0;
+//        public const int GL_COUNTER_RANGE_AMD = 0x8BC1;
+//        public const int GL_UNSIGNED_INT64_AMD = 0x8BC2;
+//        public const int GL_PERCENTAGE_AMD = 0x8BC3;
+//        public const int GL_PERFMON_RESULT_AVAILABLE_AMD = 0x8BC4;
+//        public const int GL_PERFMON_RESULT_SIZE_AMD = 0x8BC5;
+//        public const int GL_PERFMON_RESULT_AMD = 0x8BC6;
+//        public const int GL_AMD_pinned_memory = 1;
+//        public const int GL_EXTERNAL_VIRTUAL_MEMORY_BUFFER_AMD = 0x9160;
+//        public const int GL_AMD_query_buffer_object = 1;
+//        public const int GL_QUERY_BUFFER_AMD = 0x9192;
+//        public const int GL_QUERY_BUFFER_BINDING_AMD = 0x9193;
+//        public const int GL_QUERY_RESULT_NO_WAIT_AMD = 0x9194;
+//        public const int GL_AMD_sample_positions = 1;
+//        public const int GL_AMD_seamless_cubemap_per_texture = 1;
+//        public const int GL_AMD_shader_atomic_counter_ops = 1;
+//        public const int GL_AMD_shader_ballot = 1;
+//        public const int GL_AMD_shader_explicit_vertex_parameter = 1;
+//        public const int GL_AMD_shader_gpu_shader_half_float_fetch = 1;
+//        public const int GL_AMD_shader_image_load_store_lod = 1;
+//        public const int GL_AMD_shader_stencil_export = 1;
+//        public const int GL_AMD_shader_trinary_minmax = 1;
+//        public const int GL_AMD_sparse_texture = 1;
+//        public const int GL_VIRTUAL_PAGE_SIZE_X_AMD = 0x9195;
+//        public const int GL_VIRTUAL_PAGE_SIZE_Y_AMD = 0x9196;
+//        public const int GL_VIRTUAL_PAGE_SIZE_Z_AMD = 0x9197;
+//        public const int GL_MAX_SPARSE_TEXTURE_SIZE_AMD = 0x9198;
+//        public const int GL_MAX_SPARSE_3D_TEXTURE_SIZE_AMD = 0x9199;
+//        public const int GL_MAX_SPARSE_ARRAY_TEXTURE_LAYERS = 0x919A;
+//        public const int GL_MIN_SPARSE_LEVEL_AMD = 0x919B;
+//        public const int GL_MIN_LOD_WARNING_AMD = 0x919C;
+//        public const int GL_TEXTURE_STORAGE_SPARSE_BIT_AMD = 0x00000001;
+//        public const int GL_AMD_stencil_operation_extended = 1;
+//        public const int GL_SET_AMD = 0x874A;
+//        public const int GL_REPLACE_VALUE_AMD = 0x874B;
+//        public const int GL_STENCIL_OP_VALUE_AMD = 0x874C;
+//        public const int GL_STENCIL_BACK_OP_VALUE_AMD = 0x874D;
+//        public const int GL_AMD_texture_gather_bias_lod = 1;
+//        public const int GL_AMD_texture_texture4 = 1;
+//        public const int GL_AMD_transform_feedback3_lines_triangles = 1;
+//        public const int GL_AMD_transform_feedback4 = 1;
+//        public const int GL_STREAM_RASTERIZATION_AMD = 0x91A0;
+//        public const int GL_AMD_vertex_shader_layer = 1;
+//        public const int GL_AMD_vertex_shader_tessellator = 1;
+//        public const int GL_SAMPLER_BUFFER_AMD = 0x9001;
+//        public const int GL_INT_SAMPLER_BUFFER_AMD = 0x9002;
+//        public const int GL_UNSIGNED_INT_SAMPLER_BUFFER_AMD = 0x9003;
+//        public const int GL_TESSELLATION_MODE_AMD = 0x9004;
+//        public const int GL_TESSELLATION_FACTOR_AMD = 0x9005;
+//        public const int GL_DISCRETE_AMD = 0x9006;
+//        public const int GL_CONTINUOUS_AMD = 0x9007;
+//        public const int GL_AMD_vertex_shader_viewport_index = 1;
+//        public const int GL_APPLE_aux_depth_stencil = 1;
+//        public const int GL_AUX_DEPTH_STENCIL_APPLE = 0x8A14;
+//        public const int GL_APPLE_client_storage = 1;
+//        public const int GL_UNPACK_CLIENT_STORAGE_APPLE = 0x85B2;
+//        public const int GL_APPLE_element_array = 1;
+//        public const int GL_ELEMENT_ARRAY_APPLE = 0x8A0C;
+//        public const int GL_ELEMENT_ARRAY_TYPE_APPLE = 0x8A0D;
+//        public const int GL_ELEMENT_ARRAY_POINTER_APPLE = 0x8A0E;
+//        public const int GL_APPLE_fence = 1;
+//        public const int GL_DRAW_PIXELS_APPLE = 0x8A0A;
+//        public const int GL_FENCE_APPLE = 0x8A0B;
+//        public const int GL_APPLE_float_pixels = 1;
+//        public const int GL_HALF_APPLE = 0x140B;
+//        public const int GL_RGBA_FLOAT32_APPLE = 0x8814;
+//        public const int GL_RGB_FLOAT32_APPLE = 0x8815;
+//        public const int GL_ALPHA_FLOAT32_APPLE = 0x8816;
+//        public const int GL_INTENSITY_FLOAT32_APPLE = 0x8817;
+//        public const int GL_LUMINANCE_FLOAT32_APPLE = 0x8818;
+//        public const int GL_LUMINANCE_ALPHA_FLOAT32_APPLE = 0x8819;
+//        public const int GL_RGBA_FLOAT16_APPLE = 0x881A;
+//        public const int GL_RGB_FLOAT16_APPLE = 0x881B;
+//        public const int GL_ALPHA_FLOAT16_APPLE = 0x881C;
+//        public const int GL_INTENSITY_FLOAT16_APPLE = 0x881D;
+//        public const int GL_LUMINANCE_FLOAT16_APPLE = 0x881E;
+//        public const int GL_LUMINANCE_ALPHA_FLOAT16_APPLE = 0x881F;
+//        public const int GL_COLOR_FLOAT_APPLE = 0x8A0F;
+//        public const int GL_APPLE_flush_buffer_range = 1;
+//        public const int GL_BUFFER_SERIALIZED_MODIFY_APPLE = 0x8A12;
+//        public const int GL_BUFFER_FLUSHING_UNMAP_APPLE = 0x8A13;
+//        public const int GL_APPLE_object_purgeable = 1;
+//        public const int GL_BUFFER_OBJECT_APPLE = 0x85B3;
+//        public const int GL_RELEASED_APPLE = 0x8A19;
+//        public const int GL_VOLATILE_APPLE = 0x8A1A;
+//        public const int GL_RETAINED_APPLE = 0x8A1B;
+//        public const int GL_UNDEFINED_APPLE = 0x8A1C;
+//        public const int GL_PURGEABLE_APPLE = 0x8A1D;
+//        public const int GL_APPLE_rgb_422 = 1;
+//        public const int GL_RGB_422_APPLE = 0x8A1F;
+//        public const int GL_UNSIGNED_SHORT_8_8_APPLE = 0x85BA;
+//        public const int GL_UNSIGNED_SHORT_8_8_REV_APPLE = 0x85BB;
+//        public const int GL_RGB_RAW_422_APPLE = 0x8A51;
+//        public const int GL_APPLE_row_bytes = 1;
+//        public const int GL_PACK_ROW_BYTES_APPLE = 0x8A15;
+//        public const int GL_UNPACK_ROW_BYTES_APPLE = 0x8A16;
+//        public const int GL_APPLE_specular_vector = 1;
+//        public const int GL_LIGHT_MODEL_SPECULAR_VECTOR_APPLE = 0x85B0;
+//        public const int GL_APPLE_texture_range = 1;
+//        public const int GL_TEXTURE_RANGE_LENGTH_APPLE = 0x85B7;
+//        public const int GL_TEXTURE_RANGE_POINTER_APPLE = 0x85B8;
+//        public const int GL_TEXTURE_STORAGE_HINT_APPLE = 0x85BC;
+//        public const int GL_STORAGE_PRIVATE_APPLE = 0x85BD;
+//        public const int GL_STORAGE_CACHED_APPLE = 0x85BE;
+//        public const int GL_STORAGE_SHARED_APPLE = 0x85BF;
+//        public const int GL_APPLE_transform_hint = 1;
+//        public const int GL_TRANSFORM_HINT_APPLE = 0x85B1;
+//        public const int GL_APPLE_vertex_array_object = 1;
+//        public const int GL_VERTEX_ARRAY_BINDING_APPLE = 0x85B5;
+//        public const int GL_APPLE_vertex_array_range = 1;
+//        public const int GL_VERTEX_ARRAY_RANGE_APPLE = 0x851D;
+//        public const int GL_VERTEX_ARRAY_RANGE_LENGTH_APPLE = 0x851E;
+//        public const int GL_VERTEX_ARRAY_STORAGE_HINT_APPLE = 0x851F;
+//        public const int GL_VERTEX_ARRAY_RANGE_POINTER_APPLE = 0x8521;
+//        public const int GL_STORAGE_CLIENT_APPLE = 0x85B4;
+//        public const int GL_APPLE_vertex_program_evaluators = 1;
+//        public const int GL_VERTEX_ATTRIB_MAP1_APPLE = 0x8A00;
+//        public const int GL_VERTEX_ATTRIB_MAP2_APPLE = 0x8A01;
+//        public const int GL_VERTEX_ATTRIB_MAP1_SIZE_APPLE = 0x8A02;
+//        public const int GL_VERTEX_ATTRIB_MAP1_COEFF_APPLE = 0x8A03;
+//        public const int GL_VERTEX_ATTRIB_MAP1_ORDER_APPLE = 0x8A04;
+//        public const int GL_VERTEX_ATTRIB_MAP1_DOMAIN_APPLE = 0x8A05;
+//        public const int GL_VERTEX_ATTRIB_MAP2_SIZE_APPLE = 0x8A06;
+//        public const int GL_VERTEX_ATTRIB_MAP2_COEFF_APPLE = 0x8A07;
+//        public const int GL_VERTEX_ATTRIB_MAP2_ORDER_APPLE = 0x8A08;
+//        public const int GL_VERTEX_ATTRIB_MAP2_DOMAIN_APPLE = 0x8A09;
+//        public const int GL_APPLE_ycbcr_422 = 1;
+//        public const int GL_YCBCR_422_APPLE = 0x85B9;
+//        public const int GL_ATI_draw_buffers = 1;
+//        public const int GL_MAX_DRAW_BUFFERS_ATI = 0x8824;
+//        public const int GL_DRAW_BUFFER0_ATI = 0x8825;
+//        public const int GL_DRAW_BUFFER1_ATI = 0x8826;
+//        public const int GL_DRAW_BUFFER2_ATI = 0x8827;
+//        public const int GL_DRAW_BUFFER3_ATI = 0x8828;
+//        public const int GL_DRAW_BUFFER4_ATI = 0x8829;
+//        public const int GL_DRAW_BUFFER5_ATI = 0x882A;
+//        public const int GL_DRAW_BUFFER6_ATI = 0x882B;
+//        public const int GL_DRAW_BUFFER7_ATI = 0x882C;
+//        public const int GL_DRAW_BUFFER8_ATI = 0x882D;
+//        public const int GL_DRAW_BUFFER9_ATI = 0x882E;
+//        public const int GL_DRAW_BUFFER10_ATI = 0x882F;
+//        public const int GL_DRAW_BUFFER11_ATI = 0x8830;
+//        public const int GL_DRAW_BUFFER12_ATI = 0x8831;
+//        public const int GL_DRAW_BUFFER13_ATI = 0x8832;
+//        public const int GL_DRAW_BUFFER14_ATI = 0x8833;
+//        public const int GL_DRAW_BUFFER15_ATI = 0x8834;
+//        public const int GL_ATI_element_array = 1;
+//        public const int GL_ELEMENT_ARRAY_ATI = 0x8768;
+//        public const int GL_ELEMENT_ARRAY_TYPE_ATI = 0x8769;
+//        public const int GL_ELEMENT_ARRAY_POINTER_ATI = 0x876A;
+//        public const int GL_ATI_envmap_bumpmap = 1;
+//        public const int GL_BUMP_ROT_MATRIX_ATI = 0x8775;
+//        public const int GL_BUMP_ROT_MATRIX_SIZE_ATI = 0x8776;
+//        public const int GL_BUMP_NUM_TEX_UNITS_ATI = 0x8777;
+//        public const int GL_BUMP_TEX_UNITS_ATI = 0x8778;
+//        public const int GL_DUDV_ATI = 0x8779;
+//        public const int GL_DU8DV8_ATI = 0x877A;
+//        public const int GL_BUMP_ENVMAP_ATI = 0x877B;
+//        public const int GL_BUMP_TARGET_ATI = 0x877C;
+//        public const int GL_ATI_fragment_shader = 1;
+//        public const int GL_FRAGMENT_SHADER_ATI = 0x8920;
+//        public const int GL_REG_0_ATI = 0x8921;
+//        public const int GL_REG_1_ATI = 0x8922;
+//        public const int GL_REG_2_ATI = 0x8923;
+//        public const int GL_REG_3_ATI = 0x8924;
+//        public const int GL_REG_4_ATI = 0x8925;
+//        public const int GL_REG_5_ATI = 0x8926;
+//        public const int GL_REG_6_ATI = 0x8927;
+//        public const int GL_REG_7_ATI = 0x8928;
+//        public const int GL_REG_8_ATI = 0x8929;
+//        public const int GL_REG_9_ATI = 0x892A;
+//        public const int GL_REG_10_ATI = 0x892B;
+//        public const int GL_REG_11_ATI = 0x892C;
+//        public const int GL_REG_12_ATI = 0x892D;
+//        public const int GL_REG_13_ATI = 0x892E;
+//        public const int GL_REG_14_ATI = 0x892F;
+//        public const int GL_REG_15_ATI = 0x8930;
+//        public const int GL_REG_16_ATI = 0x8931;
+//        public const int GL_REG_17_ATI = 0x8932;
+//        public const int GL_REG_18_ATI = 0x8933;
+//        public const int GL_REG_19_ATI = 0x8934;
+//        public const int GL_REG_20_ATI = 0x8935;
+//        public const int GL_REG_21_ATI = 0x8936;
+//        public const int GL_REG_22_ATI = 0x8937;
+//        public const int GL_REG_23_ATI = 0x8938;
+//        public const int GL_REG_24_ATI = 0x8939;
+//        public const int GL_REG_25_ATI = 0x893A;
+//        public const int GL_REG_26_ATI = 0x893B;
+//        public const int GL_REG_27_ATI = 0x893C;
+//        public const int GL_REG_28_ATI = 0x893D;
+//        public const int GL_REG_29_ATI = 0x893E;
+//        public const int GL_REG_30_ATI = 0x893F;
+//        public const int GL_REG_31_ATI = 0x8940;
+//        public const int GL_CON_0_ATI = 0x8941;
+//        public const int GL_CON_1_ATI = 0x8942;
+//        public const int GL_CON_2_ATI = 0x8943;
+//        public const int GL_CON_3_ATI = 0x8944;
+//        public const int GL_CON_4_ATI = 0x8945;
+//        public const int GL_CON_5_ATI = 0x8946;
+//        public const int GL_CON_6_ATI = 0x8947;
+//        public const int GL_CON_7_ATI = 0x8948;
+//        public const int GL_CON_8_ATI = 0x8949;
+//        public const int GL_CON_9_ATI = 0x894A;
+//        public const int GL_CON_10_ATI = 0x894B;
+//        public const int GL_CON_11_ATI = 0x894C;
+//        public const int GL_CON_12_ATI = 0x894D;
+//        public const int GL_CON_13_ATI = 0x894E;
+//        public const int GL_CON_14_ATI = 0x894F;
+//        public const int GL_CON_15_ATI = 0x8950;
+//        public const int GL_CON_16_ATI = 0x8951;
+//        public const int GL_CON_17_ATI = 0x8952;
+//        public const int GL_CON_18_ATI = 0x8953;
+//        public const int GL_CON_19_ATI = 0x8954;
+//        public const int GL_CON_20_ATI = 0x8955;
+//        public const int GL_CON_21_ATI = 0x8956;
+//        public const int GL_CON_22_ATI = 0x8957;
+//        public const int GL_CON_23_ATI = 0x8958;
+//        public const int GL_CON_24_ATI = 0x8959;
+//        public const int GL_CON_25_ATI = 0x895A;
+//        public const int GL_CON_26_ATI = 0x895B;
+//        public const int GL_CON_27_ATI = 0x895C;
+//        public const int GL_CON_28_ATI = 0x895D;
+//        public const int GL_CON_29_ATI = 0x895E;
+//        public const int GL_CON_30_ATI = 0x895F;
+//        public const int GL_CON_31_ATI = 0x8960;
+//        public const int GL_MOV_ATI = 0x8961;
+//        public const int GL_ADD_ATI = 0x8963;
+//        public const int GL_MUL_ATI = 0x8964;
+//        public const int GL_SUB_ATI = 0x8965;
+//        public const int GL_DOT3_ATI = 0x8966;
+//        public const int GL_DOT4_ATI = 0x8967;
+//        public const int GL_MAD_ATI = 0x8968;
+//        public const int GL_LERP_ATI = 0x8969;
+//        public const int GL_CND_ATI = 0x896A;
+//        public const int GL_CND0_ATI = 0x896B;
+//        public const int GL_DOT2_ADD_ATI = 0x896C;
+//        public const int GL_SECONDARY_INTERPOLATOR_ATI = 0x896D;
+//        public const int GL_NUM_FRAGMENT_REGISTERS_ATI = 0x896E;
+//        public const int GL_NUM_FRAGMENT_CONSTANTS_ATI = 0x896F;
+//        public const int GL_NUM_PASSES_ATI = 0x8970;
+//        public const int GL_NUM_INSTRUCTIONS_PER_PASS_ATI = 0x8971;
+//        public const int GL_NUM_INSTRUCTIONS_TOTAL_ATI = 0x8972;
+//        public const int GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI = 0x8973;
+//        public const int GL_NUM_LOOPBACK_COMPONENTS_ATI = 0x8974;
+//        public const int GL_COLOR_ALPHA_PAIRING_ATI = 0x8975;
+//        public const int GL_SWIZZLE_STR_ATI = 0x8976;
+//        public const int GL_SWIZZLE_STQ_ATI = 0x8977;
+//        public const int GL_SWIZZLE_STR_DR_ATI = 0x8978;
+//        public const int GL_SWIZZLE_STQ_DQ_ATI = 0x8979;
+//        public const int GL_SWIZZLE_STRQ_ATI = 0x897A;
+//        public const int GL_SWIZZLE_STRQ_DQ_ATI = 0x897B;
+//        public const int GL_RED_BIT_ATI = 0x00000001;
+//        public const int GL_GREEN_BIT_ATI = 0x00000002;
+//        public const int GL_BLUE_BIT_ATI = 0x00000004;
+//        public const int GL_2X_BIT_ATI = 0x00000001;
+//        public const int GL_4X_BIT_ATI = 0x00000002;
+//        public const int GL_8X_BIT_ATI = 0x00000004;
+//        public const int GL_HALF_BIT_ATI = 0x00000008;
+//        public const int GL_QUARTER_BIT_ATI = 0x00000010;
+//        public const int GL_EIGHTH_BIT_ATI = 0x00000020;
+//        public const int GL_SATURATE_BIT_ATI = 0x00000040;
+//        public const int GL_COMP_BIT_ATI = 0x00000002;
+//        public const int GL_NEGATE_BIT_ATI = 0x00000004;
+//        public const int GL_BIAS_BIT_ATI = 0x00000008;
+//        public const int GL_ATI_map_object_buffer = 1;
+//        public const int GL_ATI_meminfo = 1;
+//        public const int GL_VBO_FREE_MEMORY_ATI = 0x87FB;
+//        public const int GL_TEXTURE_FREE_MEMORY_ATI = 0x87FC;
+//        public const int GL_RENDERBUFFER_FREE_MEMORY_ATI = 0x87FD;
+//        public const int GL_ATI_pixel_format_float = 1;
+//        public const int GL_RGBA_FLOAT_MODE_ATI = 0x8820;
+//        public const int GL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI = 0x8835;
+//        public const int GL_ATI_pn_triangles = 1;
+//        public const int GL_PN_TRIANGLES_ATI = 0x87F0;
+//        public const int GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI = 0x87F1;
+//        public const int GL_PN_TRIANGLES_POINT_MODE_ATI = 0x87F2;
+//        public const int GL_PN_TRIANGLES_NORMAL_MODE_ATI = 0x87F3;
+//        public const int GL_PN_TRIANGLES_TESSELATION_LEVEL_ATI = 0x87F4;
+//        public const int GL_PN_TRIANGLES_POINT_MODE_LINEAR_ATI = 0x87F5;
+//        public const int GL_PN_TRIANGLES_POINT_MODE_CUBIC_ATI = 0x87F6;
+//        public const int GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI = 0x87F7;
+//        public const int GL_PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI = 0x87F8;
+//        public const int GL_ATI_separate_stencil = 1;
+//        public const int GL_STENCIL_BACK_FUNC_ATI = 0x8800;
+//        public const int GL_STENCIL_BACK_FAIL_ATI = 0x8801;
+//        public const int GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI = 0x8802;
+//        public const int GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI = 0x8803;
+//        public const int GL_ATI_text_fragment_shader = 1;
+//        public const int GL_TEXT_FRAGMENT_SHADER_ATI = 0x8200;
+//        public const int GL_ATI_texture_env_combine3 = 1;
+//        public const int GL_MODULATE_ADD_ATI = 0x8744;
+//        public const int GL_MODULATE_SIGNED_ADD_ATI = 0x8745;
+//        public const int GL_MODULATE_SUBTRACT_ATI = 0x8746;
+//        public const int GL_ATI_texture_float = 1;
+//        public const int GL_RGBA_FLOAT32_ATI = 0x8814;
+//        public const int GL_RGB_FLOAT32_ATI = 0x8815;
+//        public const int GL_ALPHA_FLOAT32_ATI = 0x8816;
+//        public const int GL_INTENSITY_FLOAT32_ATI = 0x8817;
+//        public const int GL_LUMINANCE_FLOAT32_ATI = 0x8818;
+//        public const int GL_LUMINANCE_ALPHA_FLOAT32_ATI = 0x8819;
+//        public const int GL_RGBA_FLOAT16_ATI = 0x881A;
+//        public const int GL_RGB_FLOAT16_ATI = 0x881B;
+//        public const int GL_ALPHA_FLOAT16_ATI = 0x881C;
+//        public const int GL_INTENSITY_FLOAT16_ATI = 0x881D;
+//        public const int GL_LUMINANCE_FLOAT16_ATI = 0x881E;
+//        public const int GL_LUMINANCE_ALPHA_FLOAT16_ATI = 0x881F;
+//        public const int GL_ATI_texture_mirror_once = 1;
+//        public const int GL_MIRROR_CLAMP_ATI = 0x8742;
+//        public const int GL_MIRROR_CLAMP_TO_EDGE_ATI = 0x8743;
+//        public const int GL_ATI_vertex_array_object = 1;
+//        public const int GL_STATIC_ATI = 0x8760;
+//        public const int GL_DYNAMIC_ATI = 0x8761;
+//        public const int GL_PRESERVE_ATI = 0x8762;
+//        public const int GL_DISCARD_ATI = 0x8763;
+//        public const int GL_OBJECT_BUFFER_SIZE_ATI = 0x8764;
+//        public const int GL_OBJECT_BUFFER_USAGE_ATI = 0x8765;
+//        public const int GL_ARRAY_OBJECT_BUFFER_ATI = 0x8766;
+//        public const int GL_ARRAY_OBJECT_OFFSET_ATI = 0x8767;
+//        public const int GL_ATI_vertex_attrib_array_object = 1;
+//        public const int GL_ATI_vertex_streams = 1;
+//        public const int GL_MAX_VERTEX_STREAMS_ATI = 0x876B;
+//        public const int GL_VERTEX_STREAM0_ATI = 0x876C;
+//        public const int GL_VERTEX_STREAM1_ATI = 0x876D;
+//        public const int GL_VERTEX_STREAM2_ATI = 0x876E;
+//        public const int GL_VERTEX_STREAM3_ATI = 0x876F;
+//        public const int GL_VERTEX_STREAM4_ATI = 0x8770;
+//        public const int GL_VERTEX_STREAM5_ATI = 0x8771;
+//        public const int GL_VERTEX_STREAM6_ATI = 0x8772;
+//        public const int GL_VERTEX_STREAM7_ATI = 0x8773;
+//        public const int GL_VERTEX_SOURCE_ATI = 0x8774;
+//        public const int GL_EXT_422_pixels = 1;
+//        public const int GL_422_EXT = 0x80CC;
+//        public const int GL_422_REV_EXT = 0x80CD;
+//        public const int GL_422_AVERAGE_EXT = 0x80CE;
+//        public const int GL_422_REV_AVERAGE_EXT = 0x80CF;
+//        public const int GL_EXT_EGL_image_storage = 1;
+//        public const int GL_EXT_abgr = 1;
+//        public const int GL_ABGR_EXT = 0x8000;
+//        public const int GL_EXT_bgra = 1;
+//        public const int GL_BGR_EXT = 0x80E0;
+//        public const int GL_BGRA_EXT = 0x80E1;
+//        public const int GL_EXT_bindable_uniform = 1;
+//        public const int GL_MAX_VERTEX_BINDABLE_UNIFORMS_EXT = 0x8DE2;
+//        public const int GL_MAX_FRAGMENT_BINDABLE_UNIFORMS_EXT = 0x8DE3;
+//        public const int GL_MAX_GEOMETRY_BINDABLE_UNIFORMS_EXT = 0x8DE4;
+//        public const int GL_MAX_BINDABLE_UNIFORM_SIZE_EXT = 0x8DED;
+//        public const int GL_UNIFORM_BUFFER_EXT = 0x8DEE;
+//        public const int GL_UNIFORM_BUFFER_BINDING_EXT = 0x8DEF;
+//        public const int GL_EXT_blend_color = 1;
+//        public const int GL_CONSTANT_COLOR_EXT = 0x8001;
+//        public const int GL_ONE_MINUS_CONSTANT_COLOR_EXT = 0x8002;
+//        public const int GL_CONSTANT_ALPHA_EXT = 0x8003;
+//        public const int GL_ONE_MINUS_CONSTANT_ALPHA_EXT = 0x8004;
+//        public const int GL_BLEND_COLOR_EXT = 0x8005;
+//        public const int GL_EXT_blend_equation_separate = 1;
+//        public const int GL_BLEND_EQUATION_RGB_EXT = 0x8009;
+//        public const int GL_BLEND_EQUATION_ALPHA_EXT = 0x883D;
+//        public const int GL_EXT_blend_func_separate = 1;
+//        public const int GL_BLEND_DST_RGB_EXT = 0x80C8;
+//        public const int GL_BLEND_SRC_RGB_EXT = 0x80C9;
+//        public const int GL_BLEND_DST_ALPHA_EXT = 0x80CA;
+//        public const int GL_BLEND_SRC_ALPHA_EXT = 0x80CB;
+//        public const int GL_EXT_blend_logic_op = 1;
+//        public const int GL_EXT_blend_minmax = 1;
+//        public const int GL_MIN_EXT = 0x8007;
+//        public const int GL_MAX_EXT = 0x8008;
+//        public const int GL_FUNC_ADD_EXT = 0x8006;
+//        public const int GL_BLEND_EQUATION_EXT = 0x8009;
+//        public const int GL_EXT_blend_subtract = 1;
+//        public const int GL_FUNC_SUBTRACT_EXT = 0x800A;
+//        public const int GL_FUNC_REVERSE_SUBTRACT_EXT = 0x800B;
+//        public const int GL_EXT_clip_volume_hint = 1;
+//        public const int GL_CLIP_VOLUME_CLIPPING_HINT_EXT = 0x80F0;
+//        public const int GL_EXT_cmyka = 1;
+//        public const int GL_CMYK_EXT = 0x800C;
+//        public const int GL_CMYKA_EXT = 0x800D;
+//        public const int GL_PACK_CMYK_HINT_EXT = 0x800E;
+//        public const int GL_UNPACK_CMYK_HINT_EXT = 0x800F;
+//        public const int GL_EXT_color_subtable = 1;
+//        public const int GL_EXT_compiled_vertex_array = 1;
+//        public const int GL_ARRAY_ELEMENT_LOCK_FIRST_EXT = 0x81A8;
+//        public const int GL_ARRAY_ELEMENT_LOCK_COUNT_EXT = 0x81A9;
+//        public const int GL_EXT_convolution = 1;
+//        public const int GL_CONVOLUTION_1D_EXT = 0x8010;
+//        public const int GL_CONVOLUTION_2D_EXT = 0x8011;
+//        public const int GL_SEPARABLE_2D_EXT = 0x8012;
+//        public const int GL_CONVOLUTION_BORDER_MODE_EXT = 0x8013;
+//        public const int GL_CONVOLUTION_FILTER_SCALE_EXT = 0x8014;
+//        public const int GL_CONVOLUTION_FILTER_BIAS_EXT = 0x8015;
+//        public const int GL_REDUCE_EXT = 0x8016;
+//        public const int GL_CONVOLUTION_FORMAT_EXT = 0x8017;
+//        public const int GL_CONVOLUTION_WIDTH_EXT = 0x8018;
+//        public const int GL_CONVOLUTION_HEIGHT_EXT = 0x8019;
+//        public const int GL_MAX_CONVOLUTION_WIDTH_EXT = 0x801A;
+//        public const int GL_MAX_CONVOLUTION_HEIGHT_EXT = 0x801B;
+//        public const int GL_POST_CONVOLUTION_RED_SCALE_EXT = 0x801C;
+//        public const int GL_POST_CONVOLUTION_GREEN_SCALE_EXT = 0x801D;
+//        public const int GL_POST_CONVOLUTION_BLUE_SCALE_EXT = 0x801E;
+//        public const int GL_POST_CONVOLUTION_ALPHA_SCALE_EXT = 0x801F;
+//        public const int GL_POST_CONVOLUTION_RED_BIAS_EXT = 0x8020;
+//        public const int GL_POST_CONVOLUTION_GREEN_BIAS_EXT = 0x8021;
+//        public const int GL_POST_CONVOLUTION_BLUE_BIAS_EXT = 0x8022;
+//        public const int GL_POST_CONVOLUTION_ALPHA_BIAS_EXT = 0x8023;
+//        public const int GL_EXT_coordinate_frame = 1;
+//        public const int GL_TANGENT_ARRAY_EXT = 0x8439;
+//        public const int GL_BINORMAL_ARRAY_EXT = 0x843A;
+//        public const int GL_CURRENT_TANGENT_EXT = 0x843B;
+//        public const int GL_CURRENT_BINORMAL_EXT = 0x843C;
+//        public const int GL_TANGENT_ARRAY_TYPE_EXT = 0x843E;
+//        public const int GL_TANGENT_ARRAY_STRIDE_EXT = 0x843F;
+//        public const int GL_BINORMAL_ARRAY_TYPE_EXT = 0x8440;
+//        public const int GL_BINORMAL_ARRAY_STRIDE_EXT = 0x8441;
+//        public const int GL_TANGENT_ARRAY_POINTER_EXT = 0x8442;
+//        public const int GL_BINORMAL_ARRAY_POINTER_EXT = 0x8443;
+//        public const int GL_MAP1_TANGENT_EXT = 0x8444;
+//        public const int GL_MAP2_TANGENT_EXT = 0x8445;
+//        public const int GL_MAP1_BINORMAL_EXT = 0x8446;
+//        public const int GL_MAP2_BINORMAL_EXT = 0x8447;
+//        public const int GL_EXT_copy_texture = 1;
+//        public const int GL_EXT_cull_vertex = 1;
+//        public const int GL_CULL_VERTEX_EXT = 0x81AA;
+//        public const int GL_CULL_VERTEX_EYE_POSITION_EXT = 0x81AB;
+//        public const int GL_CULL_VERTEX_OBJECT_POSITION_EXT = 0x81AC;
+//        public const int GL_EXT_debug_label = 1;
+//        public const int GL_PROGRAM_PIPELINE_OBJECT_EXT = 0x8A4F;
+//        public const int GL_PROGRAM_OBJECT_EXT = 0x8B40;
+//        public const int GL_SHADER_OBJECT_EXT = 0x8B48;
+//        public const int GL_BUFFER_OBJECT_EXT = 0x9151;
+//        public const int GL_QUERY_OBJECT_EXT = 0x9153;
+//        public const int GL_VERTEX_ARRAY_OBJECT_EXT = 0x9154;
+//        public const int GL_EXT_debug_marker = 1;
+//        public const int GL_EXT_depth_bounds_test = 1;
+//        public const int GL_DEPTH_BOUNDS_TEST_EXT = 0x8890;
+//        public const int GL_DEPTH_BOUNDS_EXT = 0x8891;
+//        public const int GL_EXT_direct_state_access = 1;
+//        public const int GL_PROGRAM_MATRIX_EXT = 0x8E2D;
+//        public const int GL_TRANSPOSE_PROGRAM_MATRIX_EXT = 0x8E2E;
+//        public const int GL_PROGRAM_MATRIX_STACK_DEPTH_EXT = 0x8E2F;
+//        public const int GL_EXT_draw_buffers2 = 1;
+//        public const int GL_EXT_draw_instanced = 1;
+//        public const int GL_EXT_draw_range_elements = 1;
+//        public const int GL_MAX_ELEMENTS_VERTICES_EXT = 0x80E8;
+//        public const int GL_MAX_ELEMENTS_INDICES_EXT = 0x80E9;
+//        public const int GL_EXT_external_buffer = 1;
+//        public const int GL_EXT_fog_coord = 1;
+//        public const int GL_FOG_COORDINATE_SOURCE_EXT = 0x8450;
+//        public const int GL_FOG_COORDINATE_EXT = 0x8451;
+//        public const int GL_FRAGMENT_DEPTH_EXT = 0x8452;
+//        public const int GL_CURRENT_FOG_COORDINATE_EXT = 0x8453;
+//        public const int GL_FOG_COORDINATE_ARRAY_TYPE_EXT = 0x8454;
+//        public const int GL_FOG_COORDINATE_ARRAY_STRIDE_EXT = 0x8455;
+//        public const int GL_FOG_COORDINATE_ARRAY_POINTER_EXT = 0x8456;
+//        public const int GL_FOG_COORDINATE_ARRAY_EXT = 0x8457;
+//        public const int GL_EXT_framebuffer_blit = 1;
+//        public const int GL_READ_FRAMEBUFFER_EXT = 0x8CA8;
+//        public const int GL_DRAW_FRAMEBUFFER_EXT = 0x8CA9;
+//        public const int GL_DRAW_FRAMEBUFFER_BINDING_EXT = 0x8CA6;
+//        public const int GL_READ_FRAMEBUFFER_BINDING_EXT = 0x8CAA;
+//        public const int GL_EXT_framebuffer_multisample = 1;
+//        public const int GL_RENDERBUFFER_SAMPLES_EXT = 0x8CAB;
+//        public const int GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT = 0x8D56;
+//        public const int GL_MAX_SAMPLES_EXT = 0x8D57;
+//        public const int GL_EXT_framebuffer_multisample_blit_scaled = 1;
+//        public const int GL_SCALED_RESOLVE_FASTEST_EXT = 0x90BA;
+//        public const int GL_SCALED_RESOLVE_NICEST_EXT = 0x90BB;
+//        public const int GL_EXT_framebuffer_object = 1;
+//        public const int GL_INVALID_FRAMEBUFFER_OPERATION_EXT = 0x0506;
+//        public const int GL_MAX_RENDERBUFFER_SIZE_EXT = 0x84E8;
+//        public const int GL_FRAMEBUFFER_BINDING_EXT = 0x8CA6;
+//        public const int GL_RENDERBUFFER_BINDING_EXT = 0x8CA7;
+//        public const int GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT = 0x8CD0;
+//        public const int GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT = 0x8CD1;
+//        public const int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT = 0x8CD2;
+//        public const int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT = 0x8CD3;
+//        public const int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT = 0x8CD4;
+//        public const int GL_FRAMEBUFFER_COMPLETE_EXT = 0x8CD5;
+//        public const int GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT = 0x8CD6;
+//        public const int GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT = 0x8CD7;
+//        public const int GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT = 0x8CD9;
+//        public const int GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT = 0x8CDA;
+//        public const int GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT = 0x8CDB;
+//        public const int GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT = 0x8CDC;
+//        public const int GL_FRAMEBUFFER_UNSUPPORTED_EXT = 0x8CDD;
+//        public const int GL_MAX_COLOR_ATTACHMENTS_EXT = 0x8CDF;
+//        public const int GL_COLOR_ATTACHMENT0_EXT = 0x8CE0;
+//        public const int GL_COLOR_ATTACHMENT1_EXT = 0x8CE1;
+//        public const int GL_COLOR_ATTACHMENT2_EXT = 0x8CE2;
+//        public const int GL_COLOR_ATTACHMENT3_EXT = 0x8CE3;
+//        public const int GL_COLOR_ATTACHMENT4_EXT = 0x8CE4;
+//        public const int GL_COLOR_ATTACHMENT5_EXT = 0x8CE5;
+//        public const int GL_COLOR_ATTACHMENT6_EXT = 0x8CE6;
+//        public const int GL_COLOR_ATTACHMENT7_EXT = 0x8CE7;
+//        public const int GL_COLOR_ATTACHMENT8_EXT = 0x8CE8;
+//        public const int GL_COLOR_ATTACHMENT9_EXT = 0x8CE9;
+//        public const int GL_COLOR_ATTACHMENT10_EXT = 0x8CEA;
+//        public const int GL_COLOR_ATTACHMENT11_EXT = 0x8CEB;
+//        public const int GL_COLOR_ATTACHMENT12_EXT = 0x8CEC;
+//        public const int GL_COLOR_ATTACHMENT13_EXT = 0x8CED;
+//        public const int GL_COLOR_ATTACHMENT14_EXT = 0x8CEE;
+//        public const int GL_COLOR_ATTACHMENT15_EXT = 0x8CEF;
+//        public const int GL_DEPTH_ATTACHMENT_EXT = 0x8D00;
+//        public const int GL_STENCIL_ATTACHMENT_EXT = 0x8D20;
+//        public const int GL_FRAMEBUFFER_EXT = 0x8D40;
+//        public const int GL_RENDERBUFFER_EXT = 0x8D41;
+//        public const int GL_RENDERBUFFER_WIDTH_EXT = 0x8D42;
+//        public const int GL_RENDERBUFFER_HEIGHT_EXT = 0x8D43;
+//        public const int GL_RENDERBUFFER_INTERNAL_FORMAT_EXT = 0x8D44;
+//        public const int GL_STENCIL_INDEX1_EXT = 0x8D46;
+//        public const int GL_STENCIL_INDEX4_EXT = 0x8D47;
+//        public const int GL_STENCIL_INDEX8_EXT = 0x8D48;
+//        public const int GL_STENCIL_INDEX16_EXT = 0x8D49;
+//        public const int GL_RENDERBUFFER_RED_SIZE_EXT = 0x8D50;
+//        public const int GL_RENDERBUFFER_GREEN_SIZE_EXT = 0x8D51;
+//        public const int GL_RENDERBUFFER_BLUE_SIZE_EXT = 0x8D52;
+//        public const int GL_RENDERBUFFER_ALPHA_SIZE_EXT = 0x8D53;
+//        public const int GL_RENDERBUFFER_DEPTH_SIZE_EXT = 0x8D54;
+//        public const int GL_RENDERBUFFER_STENCIL_SIZE_EXT = 0x8D55;
+//        public const int GL_EXT_framebuffer_sRGB = 1;
+//        public const int GL_FRAMEBUFFER_SRGB_EXT = 0x8DB9;
+//        public const int GL_FRAMEBUFFER_SRGB_CAPABLE_EXT = 0x8DBA;
+//        public const int GL_EXT_geometry_shader4 = 1;
+//        public const int GL_GEOMETRY_SHADER_EXT = 0x8DD9;
+//        public const int GL_GEOMETRY_VERTICES_OUT_EXT = 0x8DDA;
+//        public const int GL_GEOMETRY_INPUT_TYPE_EXT = 0x8DDB;
+//        public const int GL_GEOMETRY_OUTPUT_TYPE_EXT = 0x8DDC;
+//        public const int GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT = 0x8C29;
+//        public const int GL_MAX_GEOMETRY_VARYING_COMPONENTS_EXT = 0x8DDD;
+//        public const int GL_MAX_VERTEX_VARYING_COMPONENTS_EXT = 0x8DDE;
+//        public const int GL_MAX_VARYING_COMPONENTS_EXT = 0x8B4B;
+//        public const int GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_EXT = 0x8DDF;
+//        public const int GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT = 0x8DE0;
+//        public const int GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_EXT = 0x8DE1;
+//        public const int GL_LINES_ADJACENCY_EXT = 0x000A;
+//        public const int GL_LINE_STRIP_ADJACENCY_EXT = 0x000B;
+//        public const int GL_TRIANGLES_ADJACENCY_EXT = 0x000C;
+//        public const int GL_TRIANGLE_STRIP_ADJACENCY_EXT = 0x000D;
+//        public const int GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT = 0x8DA8;
+//        public const int GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT = 0x8DA9;
+//        public const int GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT = 0x8DA7;
+//        public const int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT = 0x8CD4;
+//        public const int GL_PROGRAM_POINT_SIZE_EXT = 0x8642;
+//        public const int GL_EXT_gpu_program_parameters = 1;
+//        public const int GL_EXT_gpu_shader4 = 1;
+//        public const int GL_VERTEX_ATTRIB_ARRAY_INTEGER_EXT = 0x88FD;
+//        public const int GL_SAMPLER_1D_ARRAY_EXT = 0x8DC0;
+//        public const int GL_SAMPLER_2D_ARRAY_EXT = 0x8DC1;
+//        public const int GL_SAMPLER_BUFFER_EXT = 0x8DC2;
+//        public const int GL_SAMPLER_1D_ARRAY_SHADOW_EXT = 0x8DC3;
+//        public const int GL_SAMPLER_2D_ARRAY_SHADOW_EXT = 0x8DC4;
+//        public const int GL_SAMPLER_CUBE_SHADOW_EXT = 0x8DC5;
+//        public const int GL_UNSIGNED_INT_VEC2_EXT = 0x8DC6;
+//        public const int GL_UNSIGNED_INT_VEC3_EXT = 0x8DC7;
+//        public const int GL_UNSIGNED_INT_VEC4_EXT = 0x8DC8;
+//        public const int GL_INT_SAMPLER_1D_EXT = 0x8DC9;
+//        public const int GL_INT_SAMPLER_2D_EXT = 0x8DCA;
+//        public const int GL_INT_SAMPLER_3D_EXT = 0x8DCB;
+//        public const int GL_INT_SAMPLER_CUBE_EXT = 0x8DCC;
+//        public const int GL_INT_SAMPLER_2D_RECT_EXT = 0x8DCD;
+//        public const int GL_INT_SAMPLER_1D_ARRAY_EXT = 0x8DCE;
+//        public const int GL_INT_SAMPLER_2D_ARRAY_EXT = 0x8DCF;
+//        public const int GL_INT_SAMPLER_BUFFER_EXT = 0x8DD0;
+//        public const int GL_UNSIGNED_INT_SAMPLER_1D_EXT = 0x8DD1;
+//        public const int GL_UNSIGNED_INT_SAMPLER_2D_EXT = 0x8DD2;
+//        public const int GL_UNSIGNED_INT_SAMPLER_3D_EXT = 0x8DD3;
+//        public const int GL_UNSIGNED_INT_SAMPLER_CUBE_EXT = 0x8DD4;
+//        public const int GL_UNSIGNED_INT_SAMPLER_2D_RECT_EXT = 0x8DD5;
+//        public const int GL_UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT = 0x8DD6;
+//        public const int GL_UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT = 0x8DD7;
+//        public const int GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT = 0x8DD8;
+//        public const int GL_MIN_PROGRAM_TEXEL_OFFSET_EXT = 0x8904;
+//        public const int GL_MAX_PROGRAM_TEXEL_OFFSET_EXT = 0x8905;
+//        public const int GL_EXT_histogram = 1;
+//        public const int GL_HISTOGRAM_EXT = 0x8024;
+//        public const int GL_PROXY_HISTOGRAM_EXT = 0x8025;
+//        public const int GL_HISTOGRAM_WIDTH_EXT = 0x8026;
+//        public const int GL_HISTOGRAM_FORMAT_EXT = 0x8027;
+//        public const int GL_HISTOGRAM_RED_SIZE_EXT = 0x8028;
+//        public const int GL_HISTOGRAM_GREEN_SIZE_EXT = 0x8029;
+//        public const int GL_HISTOGRAM_BLUE_SIZE_EXT = 0x802A;
+//        public const int GL_HISTOGRAM_ALPHA_SIZE_EXT = 0x802B;
+//        public const int GL_HISTOGRAM_LUMINANCE_SIZE_EXT = 0x802C;
+//        public const int GL_HISTOGRAM_SINK_EXT = 0x802D;
+//        public const int GL_MINMAX_EXT = 0x802E;
+//        public const int GL_MINMAX_FORMAT_EXT = 0x802F;
+//        public const int GL_MINMAX_SINK_EXT = 0x8030;
+//        public const int GL_TABLE_TOO_LARGE_EXT = 0x8031;
+//        public const int GL_EXT_index_array_formats = 1;
+//        public const int GL_IUI_V2F_EXT = 0x81AD;
+//        public const int GL_IUI_V3F_EXT = 0x81AE;
+//        public const int GL_IUI_N3F_V2F_EXT = 0x81AF;
+//        public const int GL_IUI_N3F_V3F_EXT = 0x81B0;
+//        public const int GL_T2F_IUI_V2F_EXT = 0x81B1;
+//        public const int GL_T2F_IUI_V3F_EXT = 0x81B2;
+//        public const int GL_T2F_IUI_N3F_V2F_EXT = 0x81B3;
+//        public const int GL_T2F_IUI_N3F_V3F_EXT = 0x81B4;
+//        public const int GL_EXT_index_func = 1;
+//        public const int GL_INDEX_TEST_EXT = 0x81B5;
+//        public const int GL_INDEX_TEST_FUNC_EXT = 0x81B6;
+//        public const int GL_INDEX_TEST_REF_EXT = 0x81B7;
+//        public const int GL_EXT_index_material = 1;
+//        public const int GL_INDEX_MATERIAL_EXT = 0x81B8;
+//        public const int GL_INDEX_MATERIAL_PARAMETER_EXT = 0x81B9;
+//        public const int GL_INDEX_MATERIAL_FACE_EXT = 0x81BA;
+//        public const int GL_EXT_index_texture = 1;
+//        public const int GL_EXT_light_texture = 1;
+//        public const int GL_FRAGMENT_MATERIAL_EXT = 0x8349;
+//        public const int GL_FRAGMENT_NORMAL_EXT = 0x834A;
+//        public const int GL_FRAGMENT_COLOR_EXT = 0x834C;
+//        public const int GL_ATTENUATION_EXT = 0x834D;
+//        public const int GL_SHADOW_ATTENUATION_EXT = 0x834E;
+//        public const int GL_TEXTURE_APPLICATION_MODE_EXT = 0x834F;
+//        public const int GL_TEXTURE_LIGHT_EXT = 0x8350;
+//        public const int GL_TEXTURE_MATERIAL_FACE_EXT = 0x8351;
+//        public const int GL_TEXTURE_MATERIAL_PARAMETER_EXT = 0x8352;
+//        public const int GL_EXT_memory_object = 1;
+//        public const int GL_TEXTURE_TILING_EXT = 0x9580;
+//        public const int GL_DEDICATED_MEMORY_OBJECT_EXT = 0x9581;
+//        public const int GL_PROTECTED_MEMORY_OBJECT_EXT = 0x959B;
+//        public const int GL_NUM_TILING_TYPES_EXT = 0x9582;
+//        public const int GL_TILING_TYPES_EXT = 0x9583;
+//        public const int GL_OPTIMAL_TILING_EXT = 0x9584;
+//        public const int GL_LINEAR_TILING_EXT = 0x9585;
+//        public const int GL_NUM_DEVICE_UUIDS_EXT = 0x9596;
+//        public const int GL_DEVICE_UUID_EXT = 0x9597;
+//        public const int GL_DRIVER_UUID_EXT = 0x9598;
+//        public const int GL_UUID_SIZE_EXT = 16;
+//        public const int GL_EXT_memory_object_fd = 1;
+//        public const int GL_HANDLE_TYPE_OPAQUE_FD_EXT = 0x9586;
+//        public const int GL_EXT_memory_object_win32 = 1;
+//        public const int GL_HANDLE_TYPE_OPAQUE_WIN32_EXT = 0x9587;
+//        public const int GL_HANDLE_TYPE_OPAQUE_WIN32_KMT_EXT = 0x9588;
+//        public const int GL_DEVICE_LUID_EXT = 0x9599;
+//        public const int GL_DEVICE_NODE_MASK_EXT = 0x959A;
+//        public const int GL_LUID_SIZE_EXT = 8;
+//        public const int GL_HANDLE_TYPE_D3D12_TILEPOOL_EXT = 0x9589;
+//        public const int GL_HANDLE_TYPE_D3D12_RESOURCE_EXT = 0x958A;
+//        public const int GL_HANDLE_TYPE_D3D11_IMAGE_EXT = 0x958B;
+//        public const int GL_HANDLE_TYPE_D3D11_IMAGE_KMT_EXT = 0x958C;
+//        public const int GL_EXT_misc_attribute = 1;
+//        public const int GL_EXT_multi_draw_arrays = 1;
+//        public const int GL_EXT_multisample = 1;
+//        public const int GL_MULTISAMPLE_EXT = 0x809D;
+//        public const int GL_SAMPLE_ALPHA_TO_MASK_EXT = 0x809E;
+//        public const int GL_SAMPLE_ALPHA_TO_ONE_EXT = 0x809F;
+//        public const int GL_SAMPLE_MASK_EXT = 0x80A0;
+//        public const int GL_1PASS_EXT = 0x80A1;
+//        public const int GL_2PASS_0_EXT = 0x80A2;
+//        public const int GL_2PASS_1_EXT = 0x80A3;
+//        public const int GL_4PASS_0_EXT = 0x80A4;
+//        public const int GL_4PASS_1_EXT = 0x80A5;
+//        public const int GL_4PASS_2_EXT = 0x80A6;
+//        public const int GL_4PASS_3_EXT = 0x80A7;
+//        public const int GL_SAMPLE_BUFFERS_EXT = 0x80A8;
+//        public const int GL_SAMPLES_EXT = 0x80A9;
+//        public const int GL_SAMPLE_MASK_VALUE_EXT = 0x80AA;
+//        public const int GL_SAMPLE_MASK_INVERT_EXT = 0x80AB;
+//        public const int GL_SAMPLE_PATTERN_EXT = 0x80AC;
+//        public const int GL_MULTISAMPLE_BIT_EXT = 0x20000000;
+//        public const int GL_EXT_packed_depth_stencil = 1;
+//        public const int GL_DEPTH_STENCIL_EXT = 0x84F9;
+//        public const int GL_UNSIGNED_INT_24_8_EXT = 0x84FA;
+//        public const int GL_DEPTH24_STENCIL8_EXT = 0x88F0;
+//        public const int GL_TEXTURE_STENCIL_SIZE_EXT = 0x88F1;
+//        public const int GL_EXT_packed_float = 1;
+//        public const int GL_R11F_G11F_B10F_EXT = 0x8C3A;
+//        public const int GL_UNSIGNED_INT_10F_11F_11F_REV_EXT = 0x8C3B;
+//        public const int GL_RGBA_SIGNED_COMPONENTS_EXT = 0x8C3C;
+//        public const int GL_EXT_packed_pixels = 1;
+//        public const int GL_UNSIGNED_BYTE_3_3_2_EXT = 0x8032;
+//        public const int GL_UNSIGNED_SHORT_4_4_4_4_EXT = 0x8033;
+//        public const int GL_UNSIGNED_SHORT_5_5_5_1_EXT = 0x8034;
+//        public const int GL_UNSIGNED_INT_8_8_8_8_EXT = 0x8035;
+//        public const int GL_UNSIGNED_INT_10_10_10_2_EXT = 0x8036;
+//        public const int GL_EXT_paletted_texture = 1;
+//        public const int GL_COLOR_INDEX1_EXT = 0x80E2;
+//        public const int GL_COLOR_INDEX2_EXT = 0x80E3;
+//        public const int GL_COLOR_INDEX4_EXT = 0x80E4;
+//        public const int GL_COLOR_INDEX8_EXT = 0x80E5;
+//        public const int GL_COLOR_INDEX12_EXT = 0x80E6;
+//        public const int GL_COLOR_INDEX16_EXT = 0x80E7;
+//        public const int GL_TEXTURE_INDEX_SIZE_EXT = 0x80ED;
+//        public const int GL_EXT_pixel_buffer_object = 1;
+//        public const int GL_PIXEL_PACK_BUFFER_EXT = 0x88EB;
+//        public const int GL_PIXEL_UNPACK_BUFFER_EXT = 0x88EC;
+//        public const int GL_PIXEL_PACK_BUFFER_BINDING_EXT = 0x88ED;
+//        public const int GL_PIXEL_UNPACK_BUFFER_BINDING_EXT = 0x88EF;
+//        public const int GL_EXT_pixel_transform = 1;
+//        public const int GL_PIXEL_TRANSFORM_2D_EXT = 0x8330;
+//        public const int GL_PIXEL_MAG_FILTER_EXT = 0x8331;
+//        public const int GL_PIXEL_MIN_FILTER_EXT = 0x8332;
+//        public const int GL_PIXEL_CUBIC_WEIGHT_EXT = 0x8333;
+//        public const int GL_CUBIC_EXT = 0x8334;
+//        public const int GL_AVERAGE_EXT = 0x8335;
+//        public const int GL_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT = 0x8336;
+//        public const int GL_MAX_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT = 0x8337;
+//        public const int GL_PIXEL_TRANSFORM_2D_MATRIX_EXT = 0x8338;
+//        public const int GL_EXT_pixel_transform_color_table = 1;
+//        public const int GL_EXT_point_parameters = 1;
+//        public const int GL_POINT_SIZE_MIN_EXT = 0x8126;
+//        public const int GL_POINT_SIZE_MAX_EXT = 0x8127;
+//        public const int GL_POINT_FADE_THRESHOLD_SIZE_EXT = 0x8128;
+//        public const int GL_DISTANCE_ATTENUATION_EXT = 0x8129;
+//        public const int GL_EXT_polygon_offset = 1;
+//        public const int GL_POLYGON_OFFSET_EXT = 0x8037;
+//        public const int GL_POLYGON_OFFSET_FACTOR_EXT = 0x8038;
+//        public const int GL_POLYGON_OFFSET_BIAS_EXT = 0x8039;
+//        public const int GL_EXT_polygon_offset_clamp = 1;
+//        public const int GL_POLYGON_OFFSET_CLAMP_EXT = 0x8E1B;
+//        public const int GL_EXT_post_depth_coverage = 1;
+//        public const int GL_EXT_provoking_vertex = 1;
+//        public const int GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT = 0x8E4C;
+//        public const int GL_FIRST_VERTEX_CONVENTION_EXT = 0x8E4D;
+//        public const int GL_LAST_VERTEX_CONVENTION_EXT = 0x8E4E;
+//        public const int GL_PROVOKING_VERTEX_EXT = 0x8E4F;
+//        public const int GL_EXT_raster_multisample = 1;
+//        public const int GL_RASTER_MULTISAMPLE_EXT = 0x9327;
+//        public const int GL_RASTER_SAMPLES_EXT = 0x9328;
+//        public const int GL_MAX_RASTER_SAMPLES_EXT = 0x9329;
+//        public const int GL_RASTER_FIXED_SAMPLE_LOCATIONS_EXT = 0x932A;
+//        public const int GL_MULTISAMPLE_RASTERIZATION_ALLOWED_EXT = 0x932B;
+//        public const int GL_EFFECTIVE_RASTER_SAMPLES_EXT = 0x932C;
+//        public const int GL_EXT_rescale_normal = 1;
+//        public const int GL_RESCALE_NORMAL_EXT = 0x803A;
+//        public const int GL_EXT_secondary_color = 1;
+//        public const int GL_COLOR_SUM_EXT = 0x8458;
+//        public const int GL_CURRENT_SECONDARY_COLOR_EXT = 0x8459;
+//        public const int GL_SECONDARY_COLOR_ARRAY_SIZE_EXT = 0x845A;
+//        public const int GL_SECONDARY_COLOR_ARRAY_TYPE_EXT = 0x845B;
+//        public const int GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT = 0x845C;
+//        public const int GL_SECONDARY_COLOR_ARRAY_POINTER_EXT = 0x845D;
+//        public const int GL_SECONDARY_COLOR_ARRAY_EXT = 0x845E;
+//        public const int GL_EXT_semaphore = 1;
+//        public const int GL_LAYOUT_GENERAL_EXT = 0x958D;
+//        public const int GL_LAYOUT_COLOR_ATTACHMENT_EXT = 0x958E;
+//        public const int GL_LAYOUT_DEPTH_STENCIL_ATTACHMENT_EXT = 0x958F;
+//        public const int GL_LAYOUT_DEPTH_STENCIL_READ_ONLY_EXT = 0x9590;
+//        public const int GL_LAYOUT_SHADER_READ_ONLY_EXT = 0x9591;
+//        public const int GL_LAYOUT_TRANSFER_SRC_EXT = 0x9592;
+//        public const int GL_LAYOUT_TRANSFER_DST_EXT = 0x9593;
+//        public const int GL_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_EXT = 0x9530;
+//        public const int GL_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_EXT = 0x9531;
+//        public const int GL_EXT_semaphore_fd = 1;
+//        public const int GL_EXT_semaphore_win32 = 1;
+//        public const int GL_HANDLE_TYPE_D3D12_FENCE_EXT = 0x9594;
+//        public const int GL_D3D12_FENCE_VALUE_EXT = 0x9595;
+//        public const int GL_EXT_separate_shader_objects = 1;
+//        public const int GL_ACTIVE_PROGRAM_EXT = 0x8B8D;
+//        public const int GL_EXT_separate_specular_color = 1;
+//        public const int GL_LIGHT_MODEL_COLOR_CONTROL_EXT = 0x81F8;
+//        public const int GL_SINGLE_COLOR_EXT = 0x81F9;
+//        public const int GL_SEPARATE_SPECULAR_COLOR_EXT = 0x81FA;
+//        public const int GL_EXT_shader_framebuffer_fetch = 1;
+//        public const int GL_FRAGMENT_SHADER_DISCARDS_SAMPLES_EXT = 0x8A52;
+//        public const int GL_EXT_shader_framebuffer_fetch_non_coherent = 1;
+//        public const int GL_EXT_shader_image_load_formatted = 1;
+//        public const int GL_EXT_shader_image_load_store = 1;
+//        public const int GL_MAX_IMAGE_UNITS_EXT = 0x8F38;
+//        public const int GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS_EXT = 0x8F39;
+//        public const int GL_IMAGE_BINDING_NAME_EXT = 0x8F3A;
+//        public const int GL_IMAGE_BINDING_LEVEL_EXT = 0x8F3B;
+//        public const int GL_IMAGE_BINDING_LAYERED_EXT = 0x8F3C;
+//        public const int GL_IMAGE_BINDING_LAYER_EXT = 0x8F3D;
+//        public const int GL_IMAGE_BINDING_ACCESS_EXT = 0x8F3E;
+//        public const int GL_IMAGE_1D_EXT = 0x904C;
+//        public const int GL_IMAGE_2D_EXT = 0x904D;
+//        public const int GL_IMAGE_3D_EXT = 0x904E;
+//        public const int GL_IMAGE_2D_RECT_EXT = 0x904F;
+//        public const int GL_IMAGE_CUBE_EXT = 0x9050;
+//        public const int GL_IMAGE_BUFFER_EXT = 0x9051;
+//        public const int GL_IMAGE_1D_ARRAY_EXT = 0x9052;
+//        public const int GL_IMAGE_2D_ARRAY_EXT = 0x9053;
+//        public const int GL_IMAGE_CUBE_MAP_ARRAY_EXT = 0x9054;
+//        public const int GL_IMAGE_2D_MULTISAMPLE_EXT = 0x9055;
+//        public const int GL_IMAGE_2D_MULTISAMPLE_ARRAY_EXT = 0x9056;
+//        public const int GL_INT_IMAGE_1D_EXT = 0x9057;
+//        public const int GL_INT_IMAGE_2D_EXT = 0x9058;
+//        public const int GL_INT_IMAGE_3D_EXT = 0x9059;
+//        public const int GL_INT_IMAGE_2D_RECT_EXT = 0x905A;
+//        public const int GL_INT_IMAGE_CUBE_EXT = 0x905B;
+//        public const int GL_INT_IMAGE_BUFFER_EXT = 0x905C;
+//        public const int GL_INT_IMAGE_1D_ARRAY_EXT = 0x905D;
+//        public const int GL_INT_IMAGE_2D_ARRAY_EXT = 0x905E;
+//        public const int GL_INT_IMAGE_CUBE_MAP_ARRAY_EXT = 0x905F;
+//        public const int GL_INT_IMAGE_2D_MULTISAMPLE_EXT = 0x9060;
+//        public const int GL_INT_IMAGE_2D_MULTISAMPLE_ARRAY_EXT = 0x9061;
+//        public const int GL_UNSIGNED_INT_IMAGE_1D_EXT = 0x9062;
+//        public const int GL_UNSIGNED_INT_IMAGE_2D_EXT = 0x9063;
+//        public const int GL_UNSIGNED_INT_IMAGE_3D_EXT = 0x9064;
+//        public const int GL_UNSIGNED_INT_IMAGE_2D_RECT_EXT = 0x9065;
+//        public const int GL_UNSIGNED_INT_IMAGE_CUBE_EXT = 0x9066;
+//        public const int GL_UNSIGNED_INT_IMAGE_BUFFER_EXT = 0x9067;
+//        public const int GL_UNSIGNED_INT_IMAGE_1D_ARRAY_EXT = 0x9068;
+//        public const int GL_UNSIGNED_INT_IMAGE_2D_ARRAY_EXT = 0x9069;
+//        public const int GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY_EXT = 0x906A;
+//        public const int GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_EXT = 0x906B;
+//        public const int GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY_EXT = 0x906C;
+//        public const int GL_MAX_IMAGE_SAMPLES_EXT = 0x906D;
+//        public const int GL_IMAGE_BINDING_FORMAT_EXT = 0x906E;
+//        public const int GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT_EXT = 0x00000001;
+//        public const int GL_ELEMENT_ARRAY_BARRIER_BIT_EXT = 0x00000002;
+//        public const int GL_UNIFORM_BARRIER_BIT_EXT = 0x00000004;
+//        public const int GL_TEXTURE_FETCH_BARRIER_BIT_EXT = 0x00000008;
+//        public const int GL_SHADER_IMAGE_ACCESS_BARRIER_BIT_EXT = 0x00000020;
+//        public const int GL_COMMAND_BARRIER_BIT_EXT = 0x00000040;
+//        public const int GL_PIXEL_BUFFER_BARRIER_BIT_EXT = 0x00000080;
+//        public const int GL_TEXTURE_UPDATE_BARRIER_BIT_EXT = 0x00000100;
+//        public const int GL_BUFFER_UPDATE_BARRIER_BIT_EXT = 0x00000200;
+//        public const int GL_FRAMEBUFFER_BARRIER_BIT_EXT = 0x00000400;
+//        public const int GL_TRANSFORM_FEEDBACK_BARRIER_BIT_EXT = 0x00000800;
+//        public const int GL_ATOMIC_COUNTER_BARRIER_BIT_EXT = 0x00001000;
+//        public const int GL_ALL_BARRIER_BITS_EXT = -1;
+//        public const int GL_EXT_shader_integer_mix = 1;
+//        public const int GL_EXT_shadow_funcs = 1;
+//        public const int GL_EXT_shared_texture_palette = 1;
+//        public const int GL_SHARED_TEXTURE_PALETTE_EXT = 0x81FB;
+//        public const int GL_EXT_sparse_texture2 = 1;
+//        public const int GL_EXT_stencil_clear_tag = 1;
+//        public const int GL_STENCIL_TAG_BITS_EXT = 0x88F2;
+//        public const int GL_STENCIL_CLEAR_TAG_VALUE_EXT = 0x88F3;
+//        public const int GL_EXT_stencil_two_side = 1;
+//        public const int GL_STENCIL_TEST_TWO_SIDE_EXT = 0x8910;
+//        public const int GL_ACTIVE_STENCIL_FACE_EXT = 0x8911;
+//        public const int GL_EXT_stencil_wrap = 1;
+//        public const int GL_INCR_WRAP_EXT = 0x8507;
+//        public const int GL_DECR_WRAP_EXT = 0x8508;
+//        public const int GL_EXT_subtexture = 1;
+//        public const int GL_EXT_texture = 1;
+//        public const int GL_ALPHA4_EXT = 0x803B;
+//        public const int GL_ALPHA8_EXT = 0x803C;
+//        public const int GL_ALPHA12_EXT = 0x803D;
+//        public const int GL_ALPHA16_EXT = 0x803E;
+//        public const int GL_LUMINANCE4_EXT = 0x803F;
+//        public const int GL_LUMINANCE8_EXT = 0x8040;
+//        public const int GL_LUMINANCE12_EXT = 0x8041;
+//        public const int GL_LUMINANCE16_EXT = 0x8042;
+//        public const int GL_LUMINANCE4_ALPHA4_EXT = 0x8043;
+//        public const int GL_LUMINANCE6_ALPHA2_EXT = 0x8044;
+//        public const int GL_LUMINANCE8_ALPHA8_EXT = 0x8045;
+//        public const int GL_LUMINANCE12_ALPHA4_EXT = 0x8046;
+//        public const int GL_LUMINANCE12_ALPHA12_EXT = 0x8047;
+//        public const int GL_LUMINANCE16_ALPHA16_EXT = 0x8048;
+//        public const int GL_INTENSITY_EXT = 0x8049;
+//        public const int GL_INTENSITY4_EXT = 0x804A;
+//        public const int GL_INTENSITY8_EXT = 0x804B;
+//        public const int GL_INTENSITY12_EXT = 0x804C;
+//        public const int GL_INTENSITY16_EXT = 0x804D;
+//        public const int GL_RGB2_EXT = 0x804E;
+//        public const int GL_RGB4_EXT = 0x804F;
+//        public const int GL_RGB5_EXT = 0x8050;
+//        public const int GL_RGB8_EXT = 0x8051;
+//        public const int GL_RGB10_EXT = 0x8052;
+//        public const int GL_RGB12_EXT = 0x8053;
+//        public const int GL_RGB16_EXT = 0x8054;
+//        public const int GL_RGBA2_EXT = 0x8055;
+//        public const int GL_RGBA4_EXT = 0x8056;
+//        public const int GL_RGB5_A1_EXT = 0x8057;
+//        public const int GL_RGBA8_EXT = 0x8058;
+//        public const int GL_RGB10_A2_EXT = 0x8059;
+//        public const int GL_RGBA12_EXT = 0x805A;
+//        public const int GL_RGBA16_EXT = 0x805B;
+//        public const int GL_TEXTURE_RED_SIZE_EXT = 0x805C;
+//        public const int GL_TEXTURE_GREEN_SIZE_EXT = 0x805D;
+//        public const int GL_TEXTURE_BLUE_SIZE_EXT = 0x805E;
+//        public const int GL_TEXTURE_ALPHA_SIZE_EXT = 0x805F;
+//        public const int GL_TEXTURE_LUMINANCE_SIZE_EXT = 0x8060;
+//        public const int GL_TEXTURE_INTENSITY_SIZE_EXT = 0x8061;
+//        public const int GL_REPLACE_EXT = 0x8062;
+//        public const int GL_PROXY_TEXTURE_1D_EXT = 0x8063;
+//        public const int GL_PROXY_TEXTURE_2D_EXT = 0x8064;
+//        public const int GL_TEXTURE_TOO_LARGE_EXT = 0x8065;
+//        public const int GL_EXT_texture3D = 1;
+//        public const int GL_PACK_SKIP_IMAGES_EXT = 0x806B;
+//        public const int GL_PACK_IMAGE_HEIGHT_EXT = 0x806C;
+//        public const int GL_UNPACK_SKIP_IMAGES_EXT = 0x806D;
+//        public const int GL_UNPACK_IMAGE_HEIGHT_EXT = 0x806E;
+//        public const int GL_TEXTURE_3D_EXT = 0x806F;
+//        public const int GL_PROXY_TEXTURE_3D_EXT = 0x8070;
+//        public const int GL_TEXTURE_DEPTH_EXT = 0x8071;
+//        public const int GL_TEXTURE_WRAP_R_EXT = 0x8072;
+//        public const int GL_MAX_3D_TEXTURE_SIZE_EXT = 0x8073;
+//        public const int GL_EXT_texture_array = 1;
+//        public const int GL_TEXTURE_1D_ARRAY_EXT = 0x8C18;
+//        public const int GL_PROXY_TEXTURE_1D_ARRAY_EXT = 0x8C19;
+//        public const int GL_TEXTURE_2D_ARRAY_EXT = 0x8C1A;
+//        public const int GL_PROXY_TEXTURE_2D_ARRAY_EXT = 0x8C1B;
+//        public const int GL_TEXTURE_BINDING_1D_ARRAY_EXT = 0x8C1C;
+//        public const int GL_TEXTURE_BINDING_2D_ARRAY_EXT = 0x8C1D;
+//        public const int GL_MAX_ARRAY_TEXTURE_LAYERS_EXT = 0x88FF;
+//        public const int GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT = 0x884E;
+//        public const int GL_EXT_texture_buffer_object = 1;
+//        public const int GL_TEXTURE_BUFFER_EXT = 0x8C2A;
+//        public const int GL_MAX_TEXTURE_BUFFER_SIZE_EXT = 0x8C2B;
+//        public const int GL_TEXTURE_BINDING_BUFFER_EXT = 0x8C2C;
+//        public const int GL_TEXTURE_BUFFER_DATA_STORE_BINDING_EXT = 0x8C2D;
+//        public const int GL_TEXTURE_BUFFER_FORMAT_EXT = 0x8C2E;
+//        public const int GL_EXT_texture_compression_latc = 1;
+//        public const int GL_COMPRESSED_LUMINANCE_LATC1_EXT = 0x8C70;
+//        public const int GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT = 0x8C71;
+//        public const int GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT = 0x8C72;
+//        public const int GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT = 0x8C73;
+//        public const int GL_EXT_texture_compression_rgtc = 1;
+//        public const int GL_COMPRESSED_RED_RGTC1_EXT = 0x8DBB;
+//        public const int GL_COMPRESSED_SIGNED_RED_RGTC1_EXT = 0x8DBC;
+//        public const int GL_COMPRESSED_RED_GREEN_RGTC2_EXT = 0x8DBD;
+//        public const int GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT = 0x8DBE;
+//        public const int GL_EXT_texture_compression_s3tc = 1;
+//        public const int GL_COMPRESSED_RGB_S3TC_DXT1_EXT = 0x83F0;
+//        public const int GL_COMPRESSED_RGBA_S3TC_DXT1_EXT = 0x83F1;
+//        public const int GL_COMPRESSED_RGBA_S3TC_DXT3_EXT = 0x83F2;
+//        public const int GL_COMPRESSED_RGBA_S3TC_DXT5_EXT = 0x83F3;
+//        public const int GL_EXT_texture_cube_map = 1;
+//        public const int GL_NORMAL_MAP_EXT = 0x8511;
+//        public const int GL_REFLECTION_MAP_EXT = 0x8512;
+//        public const int GL_TEXTURE_CUBE_MAP_EXT = 0x8513;
+//        public const int GL_TEXTURE_BINDING_CUBE_MAP_EXT = 0x8514;
+//        public const int GL_TEXTURE_CUBE_MAP_POSITIVE_X_EXT = 0x8515;
+//        public const int GL_TEXTURE_CUBE_MAP_NEGATIVE_X_EXT = 0x8516;
+//        public const int GL_TEXTURE_CUBE_MAP_POSITIVE_Y_EXT = 0x8517;
+//        public const int GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_EXT = 0x8518;
+//        public const int GL_TEXTURE_CUBE_MAP_POSITIVE_Z_EXT = 0x8519;
+//        public const int GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_EXT = 0x851A;
+//        public const int GL_PROXY_TEXTURE_CUBE_MAP_EXT = 0x851B;
+//        public const int GL_MAX_CUBE_MAP_TEXTURE_SIZE_EXT = 0x851C;
+//        public const int GL_EXT_texture_env_add = 1;
+//        public const int GL_EXT_texture_env_combine = 1;
+//        public const int GL_COMBINE_EXT = 0x8570;
+//        public const int GL_COMBINE_RGB_EXT = 0x8571;
+//        public const int GL_COMBINE_ALPHA_EXT = 0x8572;
+//        public const int GL_RGB_SCALE_EXT = 0x8573;
+//        public const int GL_ADD_SIGNED_EXT = 0x8574;
+//        public const int GL_INTERPOLATE_EXT = 0x8575;
+//        public const int GL_CONSTANT_EXT = 0x8576;
+//        public const int GL_PRIMARY_COLOR_EXT = 0x8577;
+//        public const int GL_PREVIOUS_EXT = 0x8578;
+//        public const int GL_SOURCE0_RGB_EXT = 0x8580;
+//        public const int GL_SOURCE1_RGB_EXT = 0x8581;
+//        public const int GL_SOURCE2_RGB_EXT = 0x8582;
+//        public const int GL_SOURCE0_ALPHA_EXT = 0x8588;
+//        public const int GL_SOURCE1_ALPHA_EXT = 0x8589;
+//        public const int GL_SOURCE2_ALPHA_EXT = 0x858A;
+//        public const int GL_OPERAND0_RGB_EXT = 0x8590;
+//        public const int GL_OPERAND1_RGB_EXT = 0x8591;
+//        public const int GL_OPERAND2_RGB_EXT = 0x8592;
+//        public const int GL_OPERAND0_ALPHA_EXT = 0x8598;
+//        public const int GL_OPERAND1_ALPHA_EXT = 0x8599;
+//        public const int GL_OPERAND2_ALPHA_EXT = 0x859A;
+//        public const int GL_EXT_texture_env_dot3 = 1;
+//        public const int GL_DOT3_RGB_EXT = 0x8740;
+//        public const int GL_DOT3_RGBA_EXT = 0x8741;
+//        public const int GL_EXT_texture_filter_anisotropic = 1;
+//        public const int GL_TEXTURE_MAX_ANISOTROPY_EXT = 0x84FE;
+//        public const int GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT = 0x84FF;
+//        public const int GL_EXT_texture_filter_minmax = 1;
+//        public const int GL_TEXTURE_REDUCTION_MODE_EXT = 0x9366;
+//        public const int GL_WEIGHTED_AVERAGE_EXT = 0x9367;
+//        public const int GL_EXT_texture_integer = 1;
+//        public const int GL_RGBA32UI_EXT = 0x8D70;
+//        public const int GL_RGB32UI_EXT = 0x8D71;
+//        public const int GL_ALPHA32UI_EXT = 0x8D72;
+//        public const int GL_INTENSITY32UI_EXT = 0x8D73;
+//        public const int GL_LUMINANCE32UI_EXT = 0x8D74;
+//        public const int GL_LUMINANCE_ALPHA32UI_EXT = 0x8D75;
+//        public const int GL_RGBA16UI_EXT = 0x8D76;
+//        public const int GL_RGB16UI_EXT = 0x8D77;
+//        public const int GL_ALPHA16UI_EXT = 0x8D78;
+//        public const int GL_INTENSITY16UI_EXT = 0x8D79;
+//        public const int GL_LUMINANCE16UI_EXT = 0x8D7A;
+//        public const int GL_LUMINANCE_ALPHA16UI_EXT = 0x8D7B;
+//        public const int GL_RGBA8UI_EXT = 0x8D7C;
+//        public const int GL_RGB8UI_EXT = 0x8D7D;
+//        public const int GL_ALPHA8UI_EXT = 0x8D7E;
+//        public const int GL_INTENSITY8UI_EXT = 0x8D7F;
+//        public const int GL_LUMINANCE8UI_EXT = 0x8D80;
+//        public const int GL_LUMINANCE_ALPHA8UI_EXT = 0x8D81;
+//        public const int GL_RGBA32I_EXT = 0x8D82;
+//        public const int GL_RGB32I_EXT = 0x8D83;
+//        public const int GL_ALPHA32I_EXT = 0x8D84;
+//        public const int GL_INTENSITY32I_EXT = 0x8D85;
+//        public const int GL_LUMINANCE32I_EXT = 0x8D86;
+//        public const int GL_LUMINANCE_ALPHA32I_EXT = 0x8D87;
+//        public const int GL_RGBA16I_EXT = 0x8D88;
+//        public const int GL_RGB16I_EXT = 0x8D89;
+//        public const int GL_ALPHA16I_EXT = 0x8D8A;
+//        public const int GL_INTENSITY16I_EXT = 0x8D8B;
+//        public const int GL_LUMINANCE16I_EXT = 0x8D8C;
+//        public const int GL_LUMINANCE_ALPHA16I_EXT = 0x8D8D;
+//        public const int GL_RGBA8I_EXT = 0x8D8E;
+//        public const int GL_RGB8I_EXT = 0x8D8F;
+//        public const int GL_ALPHA8I_EXT = 0x8D90;
+//        public const int GL_INTENSITY8I_EXT = 0x8D91;
+//        public const int GL_LUMINANCE8I_EXT = 0x8D92;
+//        public const int GL_LUMINANCE_ALPHA8I_EXT = 0x8D93;
+//        public const int GL_RED_INTEGER_EXT = 0x8D94;
+//        public const int GL_GREEN_INTEGER_EXT = 0x8D95;
+//        public const int GL_BLUE_INTEGER_EXT = 0x8D96;
+//        public const int GL_ALPHA_INTEGER_EXT = 0x8D97;
+//        public const int GL_RGB_INTEGER_EXT = 0x8D98;
+//        public const int GL_RGBA_INTEGER_EXT = 0x8D99;
+//        public const int GL_BGR_INTEGER_EXT = 0x8D9A;
+//        public const int GL_BGRA_INTEGER_EXT = 0x8D9B;
+//        public const int GL_LUMINANCE_INTEGER_EXT = 0x8D9C;
+//        public const int GL_LUMINANCE_ALPHA_INTEGER_EXT = 0x8D9D;
+//        public const int GL_RGBA_INTEGER_MODE_EXT = 0x8D9E;
+//        public const int GL_EXT_texture_lod_bias = 1;
+//        public const int GL_MAX_TEXTURE_LOD_BIAS_EXT = 0x84FD;
+//        public const int GL_TEXTURE_FILTER_CONTROL_EXT = 0x8500;
+//        public const int GL_TEXTURE_LOD_BIAS_EXT = 0x8501;
+//        public const int GL_EXT_texture_mirror_clamp = 1;
+//        public const int GL_MIRROR_CLAMP_EXT = 0x8742;
+//        public const int GL_MIRROR_CLAMP_TO_EDGE_EXT = 0x8743;
+//        public const int GL_MIRROR_CLAMP_TO_BORDER_EXT = 0x8912;
+//        public const int GL_EXT_texture_object = 1;
+//        public const int GL_TEXTURE_PRIORITY_EXT = 0x8066;
+//        public const int GL_TEXTURE_RESIDENT_EXT = 0x8067;
+//        public const int GL_TEXTURE_1D_BINDING_EXT = 0x8068;
+//        public const int GL_TEXTURE_2D_BINDING_EXT = 0x8069;
+//        public const int GL_TEXTURE_3D_BINDING_EXT = 0x806A;
+//        public const int GL_EXT_texture_perturb_normal = 1;
+//        public const int GL_PERTURB_EXT = 0x85AE;
+//        public const int GL_TEXTURE_NORMAL_EXT = 0x85AF;
+//        public const int GL_EXT_texture_sRGB = 1;
+//        public const int GL_SRGB_EXT = 0x8C40;
+//        public const int GL_SRGB8_EXT = 0x8C41;
+//        public const int GL_SRGB_ALPHA_EXT = 0x8C42;
+//        public const int GL_SRGB8_ALPHA8_EXT = 0x8C43;
+//        public const int GL_SLUMINANCE_ALPHA_EXT = 0x8C44;
+//        public const int GL_SLUMINANCE8_ALPHA8_EXT = 0x8C45;
+//        public const int GL_SLUMINANCE_EXT = 0x8C46;
+//        public const int GL_SLUMINANCE8_EXT = 0x8C47;
+//        public const int GL_COMPRESSED_SRGB_EXT = 0x8C48;
+//        public const int GL_COMPRESSED_SRGB_ALPHA_EXT = 0x8C49;
+//        public const int GL_COMPRESSED_SLUMINANCE_EXT = 0x8C4A;
+//        public const int GL_COMPRESSED_SLUMINANCE_ALPHA_EXT = 0x8C4B;
+//        public const int GL_COMPRESSED_SRGB_S3TC_DXT1_EXT = 0x8C4C;
+//        public const int GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT = 0x8C4D;
+//        public const int GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT = 0x8C4E;
+//        public const int GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT = 0x8C4F;
+//        public const int GL_EXT_texture_sRGB_decode = 1;
+//        public const int GL_TEXTURE_SRGB_DECODE_EXT = 0x8A48;
+//        public const int GL_DECODE_EXT = 0x8A49;
+//        public const int GL_SKIP_DECODE_EXT = 0x8A4A;
+//        public const int GL_EXT_texture_shared_exponent = 1;
+//        public const int GL_RGB9_E5_EXT = 0x8C3D;
+//        public const int GL_UNSIGNED_INT_5_9_9_9_REV_EXT = 0x8C3E;
+//        public const int GL_TEXTURE_SHARED_SIZE_EXT = 0x8C3F;
+//        public const int GL_EXT_texture_snorm = 1;
+//        public const int GL_ALPHA_SNORM = 0x9010;
+//        public const int GL_LUMINANCE_SNORM = 0x9011;
+//        public const int GL_LUMINANCE_ALPHA_SNORM = 0x9012;
+//        public const int GL_INTENSITY_SNORM = 0x9013;
+//        public const int GL_ALPHA8_SNORM = 0x9014;
+//        public const int GL_LUMINANCE8_SNORM = 0x9015;
+//        public const int GL_LUMINANCE8_ALPHA8_SNORM = 0x9016;
+//        public const int GL_INTENSITY8_SNORM = 0x9017;
+//        public const int GL_ALPHA16_SNORM = 0x9018;
+//        public const int GL_LUMINANCE16_SNORM = 0x9019;
+//        public const int GL_LUMINANCE16_ALPHA16_SNORM = 0x901A;
+//        public const int GL_INTENSITY16_SNORM = 0x901B;
+//        public const int GL_RED_SNORM = 0x8F90;
+//        public const int GL_RG_SNORM = 0x8F91;
+//        public const int GL_RGB_SNORM = 0x8F92;
+//        public const int GL_RGBA_SNORM = 0x8F93;
+//        public const int GL_EXT_texture_swizzle = 1;
+//        public const int GL_TEXTURE_SWIZZLE_R_EXT = 0x8E42;
+//        public const int GL_TEXTURE_SWIZZLE_G_EXT = 0x8E43;
+//        public const int GL_TEXTURE_SWIZZLE_B_EXT = 0x8E44;
+//        public const int GL_TEXTURE_SWIZZLE_A_EXT = 0x8E45;
+//        public const int GL_TEXTURE_SWIZZLE_RGBA_EXT = 0x8E46;
+//        public const int GL_EXT_timer_query = 1;
+//        public const int GL_TIME_ELAPSED_EXT = 0x88BF;
+//        public const int GL_EXT_transform_feedback = 1;
+//        public const int GL_TRANSFORM_FEEDBACK_BUFFER_EXT = 0x8C8E;
+//        public const int GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT = 0x8C84;
+//        public const int GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT = 0x8C85;
+//        public const int GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT = 0x8C8F;
+//        public const int GL_INTERLEAVED_ATTRIBS_EXT = 0x8C8C;
+//        public const int GL_SEPARATE_ATTRIBS_EXT = 0x8C8D;
+//        public const int GL_PRIMITIVES_GENERATED_EXT = 0x8C87;
+//        public const int GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT = 0x8C88;
+//        public const int GL_RASTERIZER_DISCARD_EXT = 0x8C89;
+//        public const int GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_EXT = 0x8C8A;
+//        public const int GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_EXT = 0x8C8B;
+//        public const int GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_EXT = 0x8C80;
+//        public const int GL_TRANSFORM_FEEDBACK_VARYINGS_EXT = 0x8C83;
+//        public const int GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT = 0x8C7F;
+//        public const int GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT = 0x8C76;
+//        public const int GL_EXT_vertex_array = 1;
+//        public const int GL_VERTEX_ARRAY_EXT = 0x8074;
+//        public const int GL_NORMAL_ARRAY_EXT = 0x8075;
+//        public const int GL_COLOR_ARRAY_EXT = 0x8076;
+//        public const int GL_INDEX_ARRAY_EXT = 0x8077;
+//        public const int GL_TEXTURE_COORD_ARRAY_EXT = 0x8078;
+//        public const int GL_EDGE_FLAG_ARRAY_EXT = 0x8079;
+//        public const int GL_VERTEX_ARRAY_SIZE_EXT = 0x807A;
+//        public const int GL_VERTEX_ARRAY_TYPE_EXT = 0x807B;
+//        public const int GL_VERTEX_ARRAY_STRIDE_EXT = 0x807C;
+//        public const int GL_VERTEX_ARRAY_COUNT_EXT = 0x807D;
+//        public const int GL_NORMAL_ARRAY_TYPE_EXT = 0x807E;
+//        public const int GL_NORMAL_ARRAY_STRIDE_EXT = 0x807F;
+//        public const int GL_NORMAL_ARRAY_COUNT_EXT = 0x8080;
+//        public const int GL_COLOR_ARRAY_SIZE_EXT = 0x8081;
+//        public const int GL_COLOR_ARRAY_TYPE_EXT = 0x8082;
+//        public const int GL_COLOR_ARRAY_STRIDE_EXT = 0x8083;
+//        public const int GL_COLOR_ARRAY_COUNT_EXT = 0x8084;
+//        public const int GL_INDEX_ARRAY_TYPE_EXT = 0x8085;
+//        public const int GL_INDEX_ARRAY_STRIDE_EXT = 0x8086;
+//        public const int GL_INDEX_ARRAY_COUNT_EXT = 0x8087;
+//        public const int GL_TEXTURE_COORD_ARRAY_SIZE_EXT = 0x8088;
+//        public const int GL_TEXTURE_COORD_ARRAY_TYPE_EXT = 0x8089;
+//        public const int GL_TEXTURE_COORD_ARRAY_STRIDE_EXT = 0x808A;
+//        public const int GL_TEXTURE_COORD_ARRAY_COUNT_EXT = 0x808B;
+//        public const int GL_EDGE_FLAG_ARRAY_STRIDE_EXT = 0x808C;
+//        public const int GL_EDGE_FLAG_ARRAY_COUNT_EXT = 0x808D;
+//        public const int GL_VERTEX_ARRAY_POINTER_EXT = 0x808E;
+//        public const int GL_NORMAL_ARRAY_POINTER_EXT = 0x808F;
+//        public const int GL_COLOR_ARRAY_POINTER_EXT = 0x8090;
+//        public const int GL_INDEX_ARRAY_POINTER_EXT = 0x8091;
+//        public const int GL_TEXTURE_COORD_ARRAY_POINTER_EXT = 0x8092;
+//        public const int GL_EDGE_FLAG_ARRAY_POINTER_EXT = 0x8093;
+//        public const int GL_EXT_vertex_array_bgra = 1;
+//        public const int GL_EXT_vertex_attrib_64bit = 1;
+//        public const int GL_DOUBLE_VEC2_EXT = 0x8FFC;
+//        public const int GL_DOUBLE_VEC3_EXT = 0x8FFD;
+//        public const int GL_DOUBLE_VEC4_EXT = 0x8FFE;
+//        public const int GL_DOUBLE_MAT2_EXT = 0x8F46;
+//        public const int GL_DOUBLE_MAT3_EXT = 0x8F47;
+//        public const int GL_DOUBLE_MAT4_EXT = 0x8F48;
+//        public const int GL_DOUBLE_MAT2x3_EXT = 0x8F49;
+//        public const int GL_DOUBLE_MAT2x4_EXT = 0x8F4A;
+//        public const int GL_DOUBLE_MAT3x2_EXT = 0x8F4B;
+//        public const int GL_DOUBLE_MAT3x4_EXT = 0x8F4C;
+//        public const int GL_DOUBLE_MAT4x2_EXT = 0x8F4D;
+//        public const int GL_DOUBLE_MAT4x3_EXT = 0x8F4E;
+//        public const int GL_EXT_vertex_shader = 1;
+//        public const int GL_VERTEX_SHADER_EXT = 0x8780;
+//        public const int GL_VERTEX_SHADER_BINDING_EXT = 0x8781;
+//        public const int GL_OP_INDEX_EXT = 0x8782;
+//        public const int GL_OP_NEGATE_EXT = 0x8783;
+//        public const int GL_OP_DOT3_EXT = 0x8784;
+//        public const int GL_OP_DOT4_EXT = 0x8785;
+//        public const int GL_OP_MUL_EXT = 0x8786;
+//        public const int GL_OP_ADD_EXT = 0x8787;
+//        public const int GL_OP_MADD_EXT = 0x8788;
+//        public const int GL_OP_FRAC_EXT = 0x8789;
+//        public const int GL_OP_MAX_EXT = 0x878A;
+//        public const int GL_OP_MIN_EXT = 0x878B;
+//        public const int GL_OP_SET_GE_EXT = 0x878C;
+//        public const int GL_OP_SET_LT_EXT = 0x878D;
+//        public const int GL_OP_CLAMP_EXT = 0x878E;
+//        public const int GL_OP_FLOOR_EXT = 0x878F;
+//        public const int GL_OP_ROUND_EXT = 0x8790;
+//        public const int GL_OP_EXP_BASE_2_EXT = 0x8791;
+//        public const int GL_OP_LOG_BASE_2_EXT = 0x8792;
+//        public const int GL_OP_POWER_EXT = 0x8793;
+//        public const int GL_OP_RECIP_EXT = 0x8794;
+//        public const int GL_OP_RECIP_SQRT_EXT = 0x8795;
+//        public const int GL_OP_SUB_EXT = 0x8796;
+//        public const int GL_OP_CROSS_PRODUCT_EXT = 0x8797;
+//        public const int GL_OP_MULTIPLY_MATRIX_EXT = 0x8798;
+//        public const int GL_OP_MOV_EXT = 0x8799;
+//        public const int GL_OUTPUT_VERTEX_EXT = 0x879A;
+//        public const int GL_OUTPUT_COLOR0_EXT = 0x879B;
+//        public const int GL_OUTPUT_COLOR1_EXT = 0x879C;
+//        public const int GL_OUTPUT_TEXTURE_COORD0_EXT = 0x879D;
+//        public const int GL_OUTPUT_TEXTURE_COORD1_EXT = 0x879E;
+//        public const int GL_OUTPUT_TEXTURE_COORD2_EXT = 0x879F;
+//        public const int GL_OUTPUT_TEXTURE_COORD3_EXT = 0x87A0;
+//        public const int GL_OUTPUT_TEXTURE_COORD4_EXT = 0x87A1;
+//        public const int GL_OUTPUT_TEXTURE_COORD5_EXT = 0x87A2;
+//        public const int GL_OUTPUT_TEXTURE_COORD6_EXT = 0x87A3;
+//        public const int GL_OUTPUT_TEXTURE_COORD7_EXT = 0x87A4;
+//        public const int GL_OUTPUT_TEXTURE_COORD8_EXT = 0x87A5;
+//        public const int GL_OUTPUT_TEXTURE_COORD9_EXT = 0x87A6;
+//        public const int GL_OUTPUT_TEXTURE_COORD10_EXT = 0x87A7;
+//        public const int GL_OUTPUT_TEXTURE_COORD11_EXT = 0x87A8;
+//        public const int GL_OUTPUT_TEXTURE_COORD12_EXT = 0x87A9;
+//        public const int GL_OUTPUT_TEXTURE_COORD13_EXT = 0x87AA;
+//        public const int GL_OUTPUT_TEXTURE_COORD14_EXT = 0x87AB;
+//        public const int GL_OUTPUT_TEXTURE_COORD15_EXT = 0x87AC;
+//        public const int GL_OUTPUT_TEXTURE_COORD16_EXT = 0x87AD;
+//        public const int GL_OUTPUT_TEXTURE_COORD17_EXT = 0x87AE;
+//        public const int GL_OUTPUT_TEXTURE_COORD18_EXT = 0x87AF;
+//        public const int GL_OUTPUT_TEXTURE_COORD19_EXT = 0x87B0;
+//        public const int GL_OUTPUT_TEXTURE_COORD20_EXT = 0x87B1;
+//        public const int GL_OUTPUT_TEXTURE_COORD21_EXT = 0x87B2;
+//        public const int GL_OUTPUT_TEXTURE_COORD22_EXT = 0x87B3;
+//        public const int GL_OUTPUT_TEXTURE_COORD23_EXT = 0x87B4;
+//        public const int GL_OUTPUT_TEXTURE_COORD24_EXT = 0x87B5;
+//        public const int GL_OUTPUT_TEXTURE_COORD25_EXT = 0x87B6;
+//        public const int GL_OUTPUT_TEXTURE_COORD26_EXT = 0x87B7;
+//        public const int GL_OUTPUT_TEXTURE_COORD27_EXT = 0x87B8;
+//        public const int GL_OUTPUT_TEXTURE_COORD28_EXT = 0x87B9;
+//        public const int GL_OUTPUT_TEXTURE_COORD29_EXT = 0x87BA;
+//        public const int GL_OUTPUT_TEXTURE_COORD30_EXT = 0x87BB;
+//        public const int GL_OUTPUT_TEXTURE_COORD31_EXT = 0x87BC;
+//        public const int GL_OUTPUT_FOG_EXT = 0x87BD;
+//        public const int GL_SCALAR_EXT = 0x87BE;
+//        public const int GL_VECTOR_EXT = 0x87BF;
+//        public const int GL_MATRIX_EXT = 0x87C0;
+//        public const int GL_VARIANT_EXT = 0x87C1;
+//        public const int GL_INVARIANT_EXT = 0x87C2;
+//        public const int GL_LOCAL_CONSTANT_EXT = 0x87C3;
+//        public const int GL_LOCAL_EXT = 0x87C4;
+//        public const int GL_MAX_VERTEX_SHADER_INSTRUCTIONS_EXT = 0x87C5;
+//        public const int GL_MAX_VERTEX_SHADER_VARIANTS_EXT = 0x87C6;
+//        public const int GL_MAX_VERTEX_SHADER_INVARIANTS_EXT = 0x87C7;
+//        public const int GL_MAX_VERTEX_SHADER_LOCAL_CONSTANTS_EXT = 0x87C8;
+//        public const int GL_MAX_VERTEX_SHADER_LOCALS_EXT = 0x87C9;
+//        public const int GL_MAX_OPTIMIZED_VERTEX_SHADER_INSTRUCTIONS_EXT = 0x87CA;
+//        public const int GL_MAX_OPTIMIZED_VERTEX_SHADER_VARIANTS_EXT = 0x87CB;
+//        public const int GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCAL_CONSTANTS_EXT = 0x87CC;
+//        public const int GL_MAX_OPTIMIZED_VERTEX_SHADER_INVARIANTS_EXT = 0x87CD;
+//        public const int GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCALS_EXT = 0x87CE;
+//        public const int GL_VERTEX_SHADER_INSTRUCTIONS_EXT = 0x87CF;
+//        public const int GL_VERTEX_SHADER_VARIANTS_EXT = 0x87D0;
+//        public const int GL_VERTEX_SHADER_INVARIANTS_EXT = 0x87D1;
+//        public const int GL_VERTEX_SHADER_LOCAL_CONSTANTS_EXT = 0x87D2;
+//        public const int GL_VERTEX_SHADER_LOCALS_EXT = 0x87D3;
+//        public const int GL_VERTEX_SHADER_OPTIMIZED_EXT = 0x87D4;
+//        public const int GL_X_EXT = 0x87D5;
+//        public const int GL_Y_EXT = 0x87D6;
+//        public const int GL_Z_EXT = 0x87D7;
+//        public const int GL_W_EXT = 0x87D8;
+//        public const int GL_NEGATIVE_X_EXT = 0x87D9;
+//        public const int GL_NEGATIVE_Y_EXT = 0x87DA;
+//        public const int GL_NEGATIVE_Z_EXT = 0x87DB;
+//        public const int GL_NEGATIVE_W_EXT = 0x87DC;
+//        public const int GL_ZERO_EXT = 0x87DD;
+//        public const int GL_ONE_EXT = 0x87DE;
+//        public const int GL_NEGATIVE_ONE_EXT = 0x87DF;
+//        public const int GL_NORMALIZED_RANGE_EXT = 0x87E0;
+//        public const int GL_FULL_RANGE_EXT = 0x87E1;
+//        public const int GL_CURRENT_VERTEX_EXT = 0x87E2;
+//        public const int GL_MVP_MATRIX_EXT = 0x87E3;
+//        public const int GL_VARIANT_VALUE_EXT = 0x87E4;
+//        public const int GL_VARIANT_DATATYPE_EXT = 0x87E5;
+//        public const int GL_VARIANT_ARRAY_STRIDE_EXT = 0x87E6;
+//        public const int GL_VARIANT_ARRAY_TYPE_EXT = 0x87E7;
+//        public const int GL_VARIANT_ARRAY_EXT = 0x87E8;
+//        public const int GL_VARIANT_ARRAY_POINTER_EXT = 0x87E9;
+//        public const int GL_INVARIANT_VALUE_EXT = 0x87EA;
+//        public const int GL_INVARIANT_DATATYPE_EXT = 0x87EB;
+//        public const int GL_LOCAL_CONSTANT_VALUE_EXT = 0x87EC;
+//        public const int GL_LOCAL_CONSTANT_DATATYPE_EXT = 0x87ED;
+//        public const int GL_EXT_vertex_weighting = 1;
+//        public const int GL_MODELVIEW0_STACK_DEPTH_EXT = 0x0BA3;
+//        public const int GL_MODELVIEW1_STACK_DEPTH_EXT = 0x8502;
+//        public const int GL_MODELVIEW0_MATRIX_EXT = 0x0BA6;
+//        public const int GL_MODELVIEW1_MATRIX_EXT = 0x8506;
+//        public const int GL_VERTEX_WEIGHTING_EXT = 0x8509;
+//        public const int GL_MODELVIEW0_EXT = 0x1700;
+//        public const int GL_MODELVIEW1_EXT = 0x850A;
+//        public const int GL_CURRENT_VERTEX_WEIGHT_EXT = 0x850B;
+//        public const int GL_VERTEX_WEIGHT_ARRAY_EXT = 0x850C;
+//        public const int GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT = 0x850D;
+//        public const int GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT = 0x850E;
+//        public const int GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT = 0x850F;
+//        public const int GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT = 0x8510;
+//        public const int GL_EXT_win32_keyed_mutex = 1;
+//        public const int GL_EXT_window_rectangles = 1;
+//        public const int GL_INCLUSIVE_EXT = 0x8F10;
+//        public const int GL_EXCLUSIVE_EXT = 0x8F11;
+//        public const int GL_WINDOW_RECTANGLE_EXT = 0x8F12;
+//        public const int GL_WINDOW_RECTANGLE_MODE_EXT = 0x8F13;
+//        public const int GL_MAX_WINDOW_RECTANGLES_EXT = 0x8F14;
+//        public const int GL_NUM_WINDOW_RECTANGLES_EXT = 0x8F15;
+//        public const int GL_EXT_x11_sync_object = 1;
+//        public const int GL_SYNC_X11_FENCE_EXT = 0x90E1;
+//        public const int GL_GREMEDY_frame_terminator = 1;
+//        public const int GL_GREMEDY_string_marker = 1;
+//        public const int GL_HP_convolution_border_modes = 1;
+//        public const int GL_IGNORE_BORDER_HP = 0x8150;
+//        public const int GL_CONSTANT_BORDER_HP = 0x8151;
+//        public const int GL_REPLICATE_BORDER_HP = 0x8153;
+//        public const int GL_CONVOLUTION_BORDER_COLOR_HP = 0x8154;
+//        public const int GL_HP_image_transform = 1;
+//        public const int GL_IMAGE_SCALE_X_HP = 0x8155;
+//        public const int GL_IMAGE_SCALE_Y_HP = 0x8156;
+//        public const int GL_IMAGE_TRANSLATE_X_HP = 0x8157;
+//        public const int GL_IMAGE_TRANSLATE_Y_HP = 0x8158;
+//        public const int GL_IMAGE_ROTATE_ANGLE_HP = 0x8159;
+//        public const int GL_IMAGE_ROTATE_ORIGIN_X_HP = 0x815A;
+//        public const int GL_IMAGE_ROTATE_ORIGIN_Y_HP = 0x815B;
+//        public const int GL_IMAGE_MAG_FILTER_HP = 0x815C;
+//        public const int GL_IMAGE_MIN_FILTER_HP = 0x815D;
+//        public const int GL_IMAGE_CUBIC_WEIGHT_HP = 0x815E;
+//        public const int GL_CUBIC_HP = 0x815F;
+//        public const int GL_AVERAGE_HP = 0x8160;
+//        public const int GL_IMAGE_TRANSFORM_2D_HP = 0x8161;
+//        public const int GL_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP = 0x8162;
+//        public const int GL_PROXY_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP = 0x8163;
+//        public const int GL_HP_occlusion_test = 1;
+//        public const int GL_OCCLUSION_TEST_HP = 0x8165;
+//        public const int GL_OCCLUSION_TEST_RESULT_HP = 0x8166;
+//        public const int GL_HP_texture_lighting = 1;
+//        public const int GL_TEXTURE_LIGHTING_MODE_HP = 0x8167;
+//        public const int GL_TEXTURE_POST_SPECULAR_HP = 0x8168;
+//        public const int GL_TEXTURE_PRE_SPECULAR_HP = 0x8169;
+//        public const int GL_IBM_cull_vertex = 1;
+//        public const int GL_CULL_VERTEX_IBM = 103050;
+//        public const int GL_IBM_multimode_draw_arrays = 1;
+//        public const int GL_IBM_rasterpos_clip = 1;
+//        public const int GL_RASTER_POSITION_UNCLIPPED_IBM = 0x19262;
+//        public const int GL_IBM_static_data = 1;
+//        public const int GL_ALL_STATIC_DATA_IBM = 103060;
+//        public const int GL_STATIC_VERTEX_ARRAY_IBM = 103061;
+//        public const int GL_IBM_texture_mirrored_repeat = 1;
+//        public const int GL_MIRRORED_REPEAT_IBM = 0x8370;
+//        public const int GL_IBM_vertex_array_lists = 1;
+//        public const int GL_VERTEX_ARRAY_LIST_IBM = 103070;
+//        public const int GL_NORMAL_ARRAY_LIST_IBM = 103071;
+//        public const int GL_COLOR_ARRAY_LIST_IBM = 103072;
+//        public const int GL_INDEX_ARRAY_LIST_IBM = 103073;
+//        public const int GL_TEXTURE_COORD_ARRAY_LIST_IBM = 103074;
+//        public const int GL_EDGE_FLAG_ARRAY_LIST_IBM = 103075;
+//        public const int GL_FOG_COORDINATE_ARRAY_LIST_IBM = 103076;
+//        public const int GL_SECONDARY_COLOR_ARRAY_LIST_IBM = 103077;
+//        public const int GL_VERTEX_ARRAY_LIST_STRIDE_IBM = 103080;
+//        public const int GL_NORMAL_ARRAY_LIST_STRIDE_IBM = 103081;
+//        public const int GL_COLOR_ARRAY_LIST_STRIDE_IBM = 103082;
+//        public const int GL_INDEX_ARRAY_LIST_STRIDE_IBM = 103083;
+//        public const int GL_TEXTURE_COORD_ARRAY_LIST_STRIDE_IBM = 103084;
+//        public const int GL_EDGE_FLAG_ARRAY_LIST_STRIDE_IBM = 103085;
+//        public const int GL_FOG_COORDINATE_ARRAY_LIST_STRIDE_IBM = 103086;
+//        public const int GL_SECONDARY_COLOR_ARRAY_LIST_STRIDE_IBM = 103087;
+//        public const int GL_INGR_blend_func_separate = 1;
+//        public const int GL_INGR_color_clamp = 1;
+//        public const int GL_RED_MIN_CLAMP_INGR = 0x8560;
+//        public const int GL_GREEN_MIN_CLAMP_INGR = 0x8561;
+//        public const int GL_BLUE_MIN_CLAMP_INGR = 0x8562;
+//        public const int GL_ALPHA_MIN_CLAMP_INGR = 0x8563;
+//        public const int GL_RED_MAX_CLAMP_INGR = 0x8564;
+//        public const int GL_GREEN_MAX_CLAMP_INGR = 0x8565;
+//        public const int GL_BLUE_MAX_CLAMP_INGR = 0x8566;
+//        public const int GL_ALPHA_MAX_CLAMP_INGR = 0x8567;
+//        public const int GL_INGR_interlace_read = 1;
+//        public const int GL_INTERLACE_READ_INGR = 0x8568;
+//        public const int GL_INTEL_blackhole_render = 1;
+//        public const int GL_BLACKHOLE_RENDER_INTEL = 0x83FC;
+//        public const int GL_INTEL_conservative_rasterization = 1;
+//        public const int GL_CONSERVATIVE_RASTERIZATION_INTEL = 0x83FE;
+//        public const int GL_INTEL_fragment_shader_ordering = 1;
+//        public const int GL_INTEL_framebuffer_CMAA = 1;
+//        public const int GL_INTEL_map_texture = 1;
+//        public const int GL_TEXTURE_MEMORY_LAYOUT_INTEL = 0x83FF;
+//        public const int GL_LAYOUT_DEFAULT_INTEL = 0;
+//        public const int GL_LAYOUT_LINEAR_INTEL = 1;
+//        public const int GL_LAYOUT_LINEAR_CPU_CACHED_INTEL = 2;
+//        public const int GL_INTEL_parallel_arrays = 1;
+//        public const int GL_PARALLEL_ARRAYS_INTEL = 0x83F4;
+//        public const int GL_VERTEX_ARRAY_PARALLEL_POINTERS_INTEL = 0x83F5;
+//        public const int GL_NORMAL_ARRAY_PARALLEL_POINTERS_INTEL = 0x83F6;
+//        public const int GL_COLOR_ARRAY_PARALLEL_POINTERS_INTEL = 0x83F7;
+//        public const int GL_TEXTURE_COORD_ARRAY_PARALLEL_POINTERS_INTEL = 0x83F8;
+//        public const int GL_INTEL_performance_query = 1;
+//        public const int GL_PERFQUERY_SINGLE_CONTEXT_INTEL = 0x00000000;
+//        public const int GL_PERFQUERY_GLOBAL_CONTEXT_INTEL = 0x00000001;
+//        public const int GL_PERFQUERY_WAIT_INTEL = 0x83FB;
+//        public const int GL_PERFQUERY_FLUSH_INTEL = 0x83FA;
+//        public const int GL_PERFQUERY_DONOT_FLUSH_INTEL = 0x83F9;
+//        public const int GL_PERFQUERY_COUNTER_EVENT_INTEL = 0x94F0;
+//        public const int GL_PERFQUERY_COUNTER_DURATION_NORM_INTEL = 0x94F1;
+//        public const int GL_PERFQUERY_COUNTER_DURATION_RAW_INTEL = 0x94F2;
+//        public const int GL_PERFQUERY_COUNTER_THROUGHPUT_INTEL = 0x94F3;
+//        public const int GL_PERFQUERY_COUNTER_RAW_INTEL = 0x94F4;
+//        public const int GL_PERFQUERY_COUNTER_TIMESTAMP_INTEL = 0x94F5;
+//        public const int GL_PERFQUERY_COUNTER_DATA_UINT32_INTEL = 0x94F8;
+//        public const int GL_PERFQUERY_COUNTER_DATA_UINT64_INTEL = 0x94F9;
+//        public const int GL_PERFQUERY_COUNTER_DATA_FLOAT_INTEL = 0x94FA;
+//        public const int GL_PERFQUERY_COUNTER_DATA_DOUBLE_INTEL = 0x94FB;
+//        public const int GL_PERFQUERY_COUNTER_DATA_BOOL32_INTEL = 0x94FC;
+//        public const int GL_PERFQUERY_QUERY_NAME_LENGTH_MAX_INTEL = 0x94FD;
+//        public const int GL_PERFQUERY_COUNTER_NAME_LENGTH_MAX_INTEL = 0x94FE;
+//        public const int GL_PERFQUERY_COUNTER_DESC_LENGTH_MAX_INTEL = 0x94FF;
+//        public const int GL_PERFQUERY_GPA_EXTENDED_COUNTERS_INTEL = 0x9500;
+//        public const int GL_MESAX_texture_stack = 1;
+//        public const int GL_TEXTURE_1D_STACK_MESAX = 0x8759;
+//        public const int GL_TEXTURE_2D_STACK_MESAX = 0x875A;
+//        public const int GL_PROXY_TEXTURE_1D_STACK_MESAX = 0x875B;
+//        public const int GL_PROXY_TEXTURE_2D_STACK_MESAX = 0x875C;
+//        public const int GL_TEXTURE_1D_STACK_BINDING_MESAX = 0x875D;
+//        public const int GL_TEXTURE_2D_STACK_BINDING_MESAX = 0x875E;
+//        public const int GL_MESA_pack_invert = 1;
+//        public const int GL_PACK_INVERT_MESA = 0x8758;
+//        public const int GL_MESA_program_binary_formats = 1;
+//        public const int GL_PROGRAM_BINARY_FORMAT_MESA = 0x875F;
+//        public const int GL_MESA_resize_buffers = 1;
+//        public const int GL_MESA_shader_integer_functions = 1;
+//        public const int GL_MESA_tile_raster_order = 1;
+//        public const int GL_TILE_RASTER_ORDER_FIXED_MESA = 0x8BB8;
+//        public const int GL_TILE_RASTER_ORDER_INCREASING_X_MESA = 0x8BB9;
+//        public const int GL_TILE_RASTER_ORDER_INCREASING_Y_MESA = 0x8BBA;
+//        public const int GL_MESA_window_pos = 1;
+//        public const int GL_MESA_ycbcr_texture = 1;
+//        public const int GL_UNSIGNED_SHORT_8_8_MESA = 0x85BA;
+//        public const int GL_UNSIGNED_SHORT_8_8_REV_MESA = 0x85BB;
+//        public const int GL_YCBCR_MESA = 0x8757;
+//        public const int GL_NVX_blend_equation_advanced_multi_draw_buffers = 1;
+//        public const int GL_NVX_conditional_render = 1;
+//        public const int GL_NVX_gpu_memory_info = 1;
+//        public const int GL_GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX = 0x9047;
+//        public const int GL_GPU_MEMORY_INFO_TOTAL_AVAILABLE_MEMORY_NVX = 0x9048;
+//        public const int GL_GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX = 0x9049;
+//        public const int GL_GPU_MEMORY_INFO_EVICTION_COUNT_NVX = 0x904A;
+//        public const int GL_GPU_MEMORY_INFO_EVICTED_MEMORY_NVX = 0x904B;
+//        public const int GL_NVX_linked_gpu_multicast = 1;
+//        public const int GL_LGPU_SEPARATE_STORAGE_BIT_NVX = 0x0800;
+//        public const int GL_MAX_LGPU_GPUS_NVX = 0x92BA;
+//        public const int GL_NV_alpha_to_coverage_dither_control = 1;
+//        public const int GL_ALPHA_TO_COVERAGE_DITHER_DEFAULT_NV = 0x934D;
+//        public const int GL_ALPHA_TO_COVERAGE_DITHER_ENABLE_NV = 0x934E;
+//        public const int GL_ALPHA_TO_COVERAGE_DITHER_DISABLE_NV = 0x934F;
+//        public const int GL_ALPHA_TO_COVERAGE_DITHER_MODE_NV = 0x92BF;
+//        public const int GL_NV_bindless_multi_draw_indirect = 1;
+//        public const int GL_NV_bindless_multi_draw_indirect_count = 1;
+//        public const int GL_NV_bindless_texture = 1;
+//        public const int GL_NV_blend_equation_advanced = 1;
+//        public const int GL_BLEND_OVERLAP_NV = 0x9281;
+//        public const int GL_BLEND_PREMULTIPLIED_SRC_NV = 0x9280;
+//        public const int GL_BLUE_NV = 0x1905;
+//        public const int GL_COLORBURN_NV = 0x929A;
+//        public const int GL_COLORDODGE_NV = 0x9299;
+//        public const int GL_CONJOINT_NV = 0x9284;
+//        public const int GL_CONTRAST_NV = 0x92A1;
+//        public const int GL_DARKEN_NV = 0x9297;
+//        public const int GL_DIFFERENCE_NV = 0x929E;
+//        public const int GL_DISJOINT_NV = 0x9283;
+//        public const int GL_DST_ATOP_NV = 0x928F;
+//        public const int GL_DST_IN_NV = 0x928B;
+//        public const int GL_DST_NV = 0x9287;
+//        public const int GL_DST_OUT_NV = 0x928D;
+//        public const int GL_DST_OVER_NV = 0x9289;
+//        public const int GL_EXCLUSION_NV = 0x92A0;
+//        public const int GL_GREEN_NV = 0x1904;
+//        public const int GL_HARDLIGHT_NV = 0x929B;
+//        public const int GL_HARDMIX_NV = 0x92A9;
+//        public const int GL_HSL_COLOR_NV = 0x92AF;
+//        public const int GL_HSL_HUE_NV = 0x92AD;
+//        public const int GL_HSL_LUMINOSITY_NV = 0x92B0;
+//        public const int GL_HSL_SATURATION_NV = 0x92AE;
+//        public const int GL_INVERT_OVG_NV = 0x92B4;
+//        public const int GL_INVERT_RGB_NV = 0x92A3;
+//        public const int GL_LIGHTEN_NV = 0x9298;
+//        public const int GL_LINEARBURN_NV = 0x92A5;
+//        public const int GL_LINEARDODGE_NV = 0x92A4;
+//        public const int GL_LINEARLIGHT_NV = 0x92A7;
+//        public const int GL_MINUS_CLAMPED_NV = 0x92B3;
+//        public const int GL_MINUS_NV = 0x929F;
+//        public const int GL_MULTIPLY_NV = 0x9294;
+//        public const int GL_OVERLAY_NV = 0x9296;
+//        public const int GL_PINLIGHT_NV = 0x92A8;
+//        public const int GL_PLUS_CLAMPED_ALPHA_NV = 0x92B2;
+//        public const int GL_PLUS_CLAMPED_NV = 0x92B1;
+//        public const int GL_PLUS_DARKER_NV = 0x9292;
+//        public const int GL_PLUS_NV = 0x9291;
+//        public const int GL_RED_NV = 0x1903;
+//        public const int GL_SCREEN_NV = 0x9295;
+//        public const int GL_SOFTLIGHT_NV = 0x929C;
+//        public const int GL_SRC_ATOP_NV = 0x928E;
+//        public const int GL_SRC_IN_NV = 0x928A;
+//        public const int GL_SRC_NV = 0x9286;
+//        public const int GL_SRC_OUT_NV = 0x928C;
+//        public const int GL_SRC_OVER_NV = 0x9288;
+//        public const int GL_UNCORRELATED_NV = 0x9282;
+//        public const int GL_VIVIDLIGHT_NV = 0x92A6;
+//        public const int GL_XOR_NV = 0x1506;
+//        public const int GL_NV_blend_equation_advanced_coherent = 1;
+//        public const int GL_BLEND_ADVANCED_COHERENT_NV = 0x9285;
+//        public const int GL_NV_blend_minmax_factor = 1;
+//        public const int GL_NV_blend_square = 1;
+//        public const int GL_NV_clip_space_w_scaling = 1;
+//        public const int GL_VIEWPORT_POSITION_W_SCALE_NV = 0x937C;
+//        public const int GL_VIEWPORT_POSITION_W_SCALE_X_COEFF_NV = 0x937D;
+//        public const int GL_VIEWPORT_POSITION_W_SCALE_Y_COEFF_NV = 0x937E;
+//        public const int GL_NV_command_list = 1;
+//        public const int GL_TERMINATE_SEQUENCE_COMMAND_NV = 0x0000;
+//        public const int GL_NOP_COMMAND_NV = 0x0001;
+//        public const int GL_DRAW_ELEMENTS_COMMAND_NV = 0x0002;
+//        public const int GL_DRAW_ARRAYS_COMMAND_NV = 0x0003;
+//        public const int GL_DRAW_ELEMENTS_STRIP_COMMAND_NV = 0x0004;
+//        public const int GL_DRAW_ARRAYS_STRIP_COMMAND_NV = 0x0005;
+//        public const int GL_DRAW_ELEMENTS_INSTANCED_COMMAND_NV = 0x0006;
+//        public const int GL_DRAW_ARRAYS_INSTANCED_COMMAND_NV = 0x0007;
+//        public const int GL_ELEMENT_ADDRESS_COMMAND_NV = 0x0008;
+//        public const int GL_ATTRIBUTE_ADDRESS_COMMAND_NV = 0x0009;
+//        public const int GL_UNIFORM_ADDRESS_COMMAND_NV = 0x000A;
+//        public const int GL_BLEND_COLOR_COMMAND_NV = 0x000B;
+//        public const int GL_STENCIL_REF_COMMAND_NV = 0x000C;
+//        public const int GL_LINE_WIDTH_COMMAND_NV = 0x000D;
+//        public const int GL_POLYGON_OFFSET_COMMAND_NV = 0x000E;
+//        public const int GL_ALPHA_REF_COMMAND_NV = 0x000F;
+//        public const int GL_VIEWPORT_COMMAND_NV = 0x0010;
+//        public const int GL_SCISSOR_COMMAND_NV = 0x0011;
+//        public const int GL_FRONT_FACE_COMMAND_NV = 0x0012;
+//        public const int GL_NV_compute_program5 = 1;
+//        public const int GL_COMPUTE_PROGRAM_NV = 0x90FB;
+//        public const int GL_COMPUTE_PROGRAM_PARAMETER_BUFFER_NV = 0x90FC;
+//        public const int GL_NV_conditional_render = 1;
+//        public const int GL_QUERY_WAIT_NV = 0x8E13;
+//        public const int GL_QUERY_NO_WAIT_NV = 0x8E14;
+//        public const int GL_QUERY_BY_REGION_WAIT_NV = 0x8E15;
+//        public const int GL_QUERY_BY_REGION_NO_WAIT_NV = 0x8E16;
+//        public const int GL_NV_conservative_raster = 1;
+//        public const int GL_CONSERVATIVE_RASTERIZATION_NV = 0x9346;
+//        public const int GL_SUBPIXEL_PRECISION_BIAS_X_BITS_NV = 0x9347;
+//        public const int GL_SUBPIXEL_PRECISION_BIAS_Y_BITS_NV = 0x9348;
+//        public const int GL_MAX_SUBPIXEL_PRECISION_BIAS_BITS_NV = 0x9349;
+//        public const int GL_NV_conservative_raster_dilate = 1;
+//        public const int GL_CONSERVATIVE_RASTER_DILATE_NV = 0x9379;
+//        public const int GL_CONSERVATIVE_RASTER_DILATE_RANGE_NV = 0x937A;
+//        public const int GL_CONSERVATIVE_RASTER_DILATE_GRANULARITY_NV = 0x937B;
+//        public const int GL_NV_conservative_raster_pre_snap = 1;
+//        public const int GL_CONSERVATIVE_RASTER_MODE_PRE_SNAP_NV = 0x9550;
+//        public const int GL_NV_conservative_raster_pre_snap_triangles = 1;
+//        public const int GL_CONSERVATIVE_RASTER_MODE_NV = 0x954D;
+//        public const int GL_CONSERVATIVE_RASTER_MODE_POST_SNAP_NV = 0x954E;
+//        public const int GL_CONSERVATIVE_RASTER_MODE_PRE_SNAP_TRIANGLES_NV = 0x954F;
+//        public const int GL_NV_conservative_raster_underestimation = 1;
+//        public const int GL_NV_copy_depth_to_color = 1;
+//        public const int GL_DEPTH_STENCIL_TO_RGBA_NV = 0x886E;
+//        public const int GL_DEPTH_STENCIL_TO_BGRA_NV = 0x886F;
+//        public const int GL_NV_copy_image = 1;
+//        public const int GL_NV_deep_texture3D = 1;
+//        public const int GL_MAX_DEEP_3D_TEXTURE_WIDTH_HEIGHT_NV = 0x90D0;
+//        public const int GL_MAX_DEEP_3D_TEXTURE_DEPTH_NV = 0x90D1;
+//        public const int GL_NV_depth_buffer_float = 1;
+//        public const int GL_DEPTH_COMPONENT32F_NV = 0x8DAB;
+//        public const int GL_DEPTH32F_STENCIL8_NV = 0x8DAC;
+//        public const int GL_FLOAT_32_UNSIGNED_INT_24_8_REV_NV = 0x8DAD;
+//        public const int GL_DEPTH_BUFFER_FLOAT_MODE_NV = 0x8DAF;
+//        public const int GL_NV_depth_clamp = 1;
+//        public const int GL_DEPTH_CLAMP_NV = 0x864F;
+//        public const int GL_NV_draw_texture = 1;
+//        public const int GL_NV_draw_vulkan_image = 1;
+//        public const int GL_NV_evaluators = 1;
+//        public const int GL_EVAL_2D_NV = 0x86C0;
+//        public const int GL_EVAL_TRIANGULAR_2D_NV = 0x86C1;
+//        public const int GL_MAP_TESSELLATION_NV = 0x86C2;
+//        public const int GL_MAP_ATTRIB_U_ORDER_NV = 0x86C3;
+//        public const int GL_MAP_ATTRIB_V_ORDER_NV = 0x86C4;
+//        public const int GL_EVAL_FRACTIONAL_TESSELLATION_NV = 0x86C5;
+//        public const int GL_EVAL_VERTEX_ATTRIB0_NV = 0x86C6;
+//        public const int GL_EVAL_VERTEX_ATTRIB1_NV = 0x86C7;
+//        public const int GL_EVAL_VERTEX_ATTRIB2_NV = 0x86C8;
+//        public const int GL_EVAL_VERTEX_ATTRIB3_NV = 0x86C9;
+//        public const int GL_EVAL_VERTEX_ATTRIB4_NV = 0x86CA;
+//        public const int GL_EVAL_VERTEX_ATTRIB5_NV = 0x86CB;
+//        public const int GL_EVAL_VERTEX_ATTRIB6_NV = 0x86CC;
+//        public const int GL_EVAL_VERTEX_ATTRIB7_NV = 0x86CD;
+//        public const int GL_EVAL_VERTEX_ATTRIB8_NV = 0x86CE;
+//        public const int GL_EVAL_VERTEX_ATTRIB9_NV = 0x86CF;
+//        public const int GL_EVAL_VERTEX_ATTRIB10_NV = 0x86D0;
+//        public const int GL_EVAL_VERTEX_ATTRIB11_NV = 0x86D1;
+//        public const int GL_EVAL_VERTEX_ATTRIB12_NV = 0x86D2;
+//        public const int GL_EVAL_VERTEX_ATTRIB13_NV = 0x86D3;
+//        public const int GL_EVAL_VERTEX_ATTRIB14_NV = 0x86D4;
+//        public const int GL_EVAL_VERTEX_ATTRIB15_NV = 0x86D5;
+//        public const int GL_MAX_MAP_TESSELLATION_NV = 0x86D6;
+//        public const int GL_MAX_RATIONAL_EVAL_ORDER_NV = 0x86D7;
+//        public const int GL_NV_explicit_multisample = 1;
+//        public const int GL_SAMPLE_POSITION_NV = 0x8E50;
+//        public const int GL_SAMPLE_MASK_NV = 0x8E51;
+//        public const int GL_SAMPLE_MASK_VALUE_NV = 0x8E52;
+//        public const int GL_TEXTURE_BINDING_RENDERBUFFER_NV = 0x8E53;
+//        public const int GL_TEXTURE_RENDERBUFFER_DATA_STORE_BINDING_NV = 0x8E54;
+//        public const int GL_TEXTURE_RENDERBUFFER_NV = 0x8E55;
+//        public const int GL_SAMPLER_RENDERBUFFER_NV = 0x8E56;
+//        public const int GL_INT_SAMPLER_RENDERBUFFER_NV = 0x8E57;
+//        public const int GL_UNSIGNED_INT_SAMPLER_RENDERBUFFER_NV = 0x8E58;
+//        public const int GL_MAX_SAMPLE_MASK_WORDS_NV = 0x8E59;
+//        public const int GL_NV_fence = 1;
+//        public const int GL_ALL_COMPLETED_NV = 0x84F2;
+//        public const int GL_FENCE_STATUS_NV = 0x84F3;
+//        public const int GL_FENCE_CONDITION_NV = 0x84F4;
+//        public const int GL_NV_fill_rectangle = 1;
+//        public const int GL_FILL_RECTANGLE_NV = 0x933C;
+//        public const int GL_NV_float_buffer = 1;
+//        public const int GL_FLOAT_R_NV = 0x8880;
+//        public const int GL_FLOAT_RG_NV = 0x8881;
+//        public const int GL_FLOAT_RGB_NV = 0x8882;
+//        public const int GL_FLOAT_RGBA_NV = 0x8883;
+//        public const int GL_FLOAT_R16_NV = 0x8884;
+//        public const int GL_FLOAT_R32_NV = 0x8885;
+//        public const int GL_FLOAT_RG16_NV = 0x8886;
+//        public const int GL_FLOAT_RG32_NV = 0x8887;
+//        public const int GL_FLOAT_RGB16_NV = 0x8888;
+//        public const int GL_FLOAT_RGB32_NV = 0x8889;
+//        public const int GL_FLOAT_RGBA16_NV = 0x888A;
+//        public const int GL_FLOAT_RGBA32_NV = 0x888B;
+//        public const int GL_TEXTURE_FLOAT_COMPONENTS_NV = 0x888C;
+//        public const int GL_FLOAT_CLEAR_COLOR_VALUE_NV = 0x888D;
+//        public const int GL_FLOAT_RGBA_MODE_NV = 0x888E;
+//        public const int GL_NV_fog_distance = 1;
+//        public const int GL_FOG_DISTANCE_MODE_NV = 0x855A;
+//        public const int GL_EYE_RADIAL_NV = 0x855B;
+//        public const int GL_EYE_PLANE_ABSOLUTE_NV = 0x855C;
+//        public const int GL_NV_fragment_coverage_to_color = 1;
+//        public const int GL_FRAGMENT_COVERAGE_TO_COLOR_NV = 0x92DD;
+//        public const int GL_FRAGMENT_COVERAGE_COLOR_NV = 0x92DE;
+//        public const int GL_NV_fragment_program = 1;
+//        public const int GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV = 0x8868;
+//        public const int GL_FRAGMENT_PROGRAM_NV = 0x8870;
+//        public const int GL_MAX_TEXTURE_COORDS_NV = 0x8871;
+//        public const int GL_MAX_TEXTURE_IMAGE_UNITS_NV = 0x8872;
+//        public const int GL_FRAGMENT_PROGRAM_BINDING_NV = 0x8873;
+//        public const int GL_PROGRAM_ERROR_STRING_NV = 0x8874;
+//        public const int GL_NV_fragment_program2 = 1;
+//        public const int GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV = 0x88F4;
+//        public const int GL_MAX_PROGRAM_CALL_DEPTH_NV = 0x88F5;
+//        public const int GL_MAX_PROGRAM_IF_DEPTH_NV = 0x88F6;
+//        public const int GL_MAX_PROGRAM_LOOP_DEPTH_NV = 0x88F7;
+//        public const int GL_MAX_PROGRAM_LOOP_COUNT_NV = 0x88F8;
+//        public const int GL_NV_fragment_program4 = 1;
+//        public const int GL_NV_fragment_program_option = 1;
+//        public const int GL_NV_fragment_shader_interlock = 1;
+//        public const int GL_NV_framebuffer_mixed_samples = 1;
+//        public const int GL_COVERAGE_MODULATION_TABLE_NV = 0x9331;
+//        public const int GL_COLOR_SAMPLES_NV = 0x8E20;
+//        public const int GL_DEPTH_SAMPLES_NV = 0x932D;
+//        public const int GL_STENCIL_SAMPLES_NV = 0x932E;
+//        public const int GL_MIXED_DEPTH_SAMPLES_SUPPORTED_NV = 0x932F;
+//        public const int GL_MIXED_STENCIL_SAMPLES_SUPPORTED_NV = 0x9330;
+//        public const int GL_COVERAGE_MODULATION_NV = 0x9332;
+//        public const int GL_COVERAGE_MODULATION_TABLE_SIZE_NV = 0x9333;
+//        public const int GL_NV_framebuffer_multisample_coverage = 1;
+//        public const int GL_RENDERBUFFER_COVERAGE_SAMPLES_NV = 0x8CAB;
+//        public const int GL_RENDERBUFFER_COLOR_SAMPLES_NV = 0x8E10;
+//        public const int GL_MAX_MULTISAMPLE_COVERAGE_MODES_NV = 0x8E11;
+//        public const int GL_MULTISAMPLE_COVERAGE_MODES_NV = 0x8E12;
+//        public const int GL_NV_geometry_program4 = 1;
+//        public const int GL_GEOMETRY_PROGRAM_NV = 0x8C26;
+//        public const int GL_MAX_PROGRAM_OUTPUT_VERTICES_NV = 0x8C27;
+//        public const int GL_MAX_PROGRAM_TOTAL_OUTPUT_COMPONENTS_NV = 0x8C28;
+//        public const int GL_NV_geometry_shader4 = 1;
+//        public const int GL_NV_geometry_shader_passthrough = 1;
+//        public const int GL_NV_gpu_multicast = 1;
+//        public const int GL_PER_GPU_STORAGE_BIT_NV = 0x0800;
+//        public const int GL_MULTICAST_GPUS_NV = 0x92BA;
+//        public const int GL_RENDER_GPU_MASK_NV = 0x9558;
+//        public const int GL_PER_GPU_STORAGE_NV = 0x9548;
+//        public const int GL_MULTICAST_PROGRAMMABLE_SAMPLE_LOCATION_NV = 0x9549;
+//        public const int GL_NV_gpu_program4 = 1;
+//        public const int GL_MIN_PROGRAM_TEXEL_OFFSET_NV = 0x8904;
+//        public const int GL_MAX_PROGRAM_TEXEL_OFFSET_NV = 0x8905;
+//        public const int GL_PROGRAM_ATTRIB_COMPONENTS_NV = 0x8906;
+//        public const int GL_PROGRAM_RESULT_COMPONENTS_NV = 0x8907;
+//        public const int GL_MAX_PROGRAM_ATTRIB_COMPONENTS_NV = 0x8908;
+//        public const int GL_MAX_PROGRAM_RESULT_COMPONENTS_NV = 0x8909;
+//        public const int GL_MAX_PROGRAM_GENERIC_ATTRIBS_NV = 0x8DA5;
+//        public const int GL_MAX_PROGRAM_GENERIC_RESULTS_NV = 0x8DA6;
+//        public const int GL_NV_gpu_program5 = 1;
+//        public const int GL_MAX_GEOMETRY_PROGRAM_INVOCATIONS_NV = 0x8E5A;
+//        public const int GL_MIN_FRAGMENT_INTERPOLATION_OFFSET_NV = 0x8E5B;
+//        public const int GL_MAX_FRAGMENT_INTERPOLATION_OFFSET_NV = 0x8E5C;
+//        public const int GL_FRAGMENT_PROGRAM_INTERPOLATION_OFFSET_BITS_NV = 0x8E5D;
+//        public const int GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET_NV = 0x8E5E;
+//        public const int GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET_NV = 0x8E5F;
+//        public const int GL_MAX_PROGRAM_SUBROUTINE_PARAMETERS_NV = 0x8F44;
+//        public const int GL_MAX_PROGRAM_SUBROUTINE_NUM_NV = 0x8F45;
+//        public const int GL_NV_gpu_program5_mem_extended = 1;
+//        public const int GL_NV_gpu_shader5 = 1;
+//        public const int GL_NV_half_float = 1;
+//        public const int GL_HALF_FLOAT_NV = 0x140B;
+//        public const int GL_NV_internalformat_sample_query = 1;
+//        public const int GL_MULTISAMPLES_NV = 0x9371;
+//        public const int GL_SUPERSAMPLE_SCALE_X_NV = 0x9372;
+//        public const int GL_SUPERSAMPLE_SCALE_Y_NV = 0x9373;
+//        public const int GL_CONFORMANT_NV = 0x9374;
+//        public const int GL_NV_light_max_exponent = 1;
+//        public const int GL_MAX_SHININESS_NV = 0x8504;
+//        public const int GL_MAX_SPOT_EXPONENT_NV = 0x8505;
+//        public const int GL_NV_multisample_coverage = 1;
+//        public const int GL_NV_multisample_filter_hint = 1;
+//        public const int GL_MULTISAMPLE_FILTER_HINT_NV = 0x8534;
+//        public const int GL_NV_occlusion_query = 1;
+//        public const int GL_PIXEL_COUNTER_BITS_NV = 0x8864;
+//        public const int GL_CURRENT_OCCLUSION_QUERY_ID_NV = 0x8865;
+//        public const int GL_PIXEL_COUNT_NV = 0x8866;
+//        public const int GL_PIXEL_COUNT_AVAILABLE_NV = 0x8867;
+//        public const int GL_NV_packed_depth_stencil = 1;
+//        public const int GL_DEPTH_STENCIL_NV = 0x84F9;
+//        public const int GL_UNSIGNED_INT_24_8_NV = 0x84FA;
+//        public const int GL_NV_parameter_buffer_object = 1;
+//        public const int GL_MAX_PROGRAM_PARAMETER_BUFFER_BINDINGS_NV = 0x8DA0;
+//        public const int GL_MAX_PROGRAM_PARAMETER_BUFFER_SIZE_NV = 0x8DA1;
+//        public const int GL_VERTEX_PROGRAM_PARAMETER_BUFFER_NV = 0x8DA2;
+//        public const int GL_GEOMETRY_PROGRAM_PARAMETER_BUFFER_NV = 0x8DA3;
+//        public const int GL_FRAGMENT_PROGRAM_PARAMETER_BUFFER_NV = 0x8DA4;
+//        public const int GL_NV_parameter_buffer_object2 = 1;
+//        public const int GL_NV_path_rendering = 1;
+//        public const int GL_PATH_FORMAT_SVG_NV = 0x9070;
+//        public const int GL_PATH_FORMAT_PS_NV = 0x9071;
+//        public const int GL_STANDARD_FONT_NAME_NV = 0x9072;
+//        public const int GL_SYSTEM_FONT_NAME_NV = 0x9073;
+//        public const int GL_FILE_NAME_NV = 0x9074;
+//        public const int GL_PATH_STROKE_WIDTH_NV = 0x9075;
+//        public const int GL_PATH_END_CAPS_NV = 0x9076;
+//        public const int GL_PATH_INITIAL_END_CAP_NV = 0x9077;
+//        public const int GL_PATH_TERMINAL_END_CAP_NV = 0x9078;
+//        public const int GL_PATH_JOIN_STYLE_NV = 0x9079;
+//        public const int GL_PATH_MITER_LIMIT_NV = 0x907A;
+//        public const int GL_PATH_DASH_CAPS_NV = 0x907B;
+//        public const int GL_PATH_INITIAL_DASH_CAP_NV = 0x907C;
+//        public const int GL_PATH_TERMINAL_DASH_CAP_NV = 0x907D;
+//        public const int GL_PATH_DASH_OFFSET_NV = 0x907E;
+//        public const int GL_PATH_CLIENT_LENGTH_NV = 0x907F;
+//        public const int GL_PATH_FILL_MODE_NV = 0x9080;
+//        public const int GL_PATH_FILL_MASK_NV = 0x9081;
+//        public const int GL_PATH_FILL_COVER_MODE_NV = 0x9082;
+//        public const int GL_PATH_STROKE_COVER_MODE_NV = 0x9083;
+//        public const int GL_PATH_STROKE_MASK_NV = 0x9084;
+//        public const int GL_COUNT_UP_NV = 0x9088;
+//        public const int GL_COUNT_DOWN_NV = 0x9089;
+//        public const int GL_PATH_OBJECT_BOUNDING_BOX_NV = 0x908A;
+//        public const int GL_CONVEX_HULL_NV = 0x908B;
+//        public const int GL_BOUNDING_BOX_NV = 0x908D;
+//        public const int GL_TRANSLATE_X_NV = 0x908E;
+//        public const int GL_TRANSLATE_Y_NV = 0x908F;
+//        public const int GL_TRANSLATE_2D_NV = 0x9090;
+//        public const int GL_TRANSLATE_3D_NV = 0x9091;
+//        public const int GL_AFFINE_2D_NV = 0x9092;
+//        public const int GL_AFFINE_3D_NV = 0x9094;
+//        public const int GL_TRANSPOSE_AFFINE_2D_NV = 0x9096;
+//        public const int GL_TRANSPOSE_AFFINE_3D_NV = 0x9098;
+//        public const int GL_UTF8_NV = 0x909A;
+//        public const int GL_UTF16_NV = 0x909B;
+//        public const int GL_BOUNDING_BOX_OF_BOUNDING_BOXES_NV = 0x909C;
+//        public const int GL_PATH_COMMAND_COUNT_NV = 0x909D;
+//        public const int GL_PATH_COORD_COUNT_NV = 0x909E;
+//        public const int GL_PATH_DASH_ARRAY_COUNT_NV = 0x909F;
+//        public const int GL_PATH_COMPUTED_LENGTH_NV = 0x90A0;
+//        public const int GL_PATH_FILL_BOUNDING_BOX_NV = 0x90A1;
+//        public const int GL_PATH_STROKE_BOUNDING_BOX_NV = 0x90A2;
+//        public const int GL_SQUARE_NV = 0x90A3;
+//        public const int GL_ROUND_NV = 0x90A4;
+//        public const int GL_TRIANGULAR_NV = 0x90A5;
+//        public const int GL_BEVEL_NV = 0x90A6;
+//        public const int GL_MITER_REVERT_NV = 0x90A7;
+//        public const int GL_MITER_TRUNCATE_NV = 0x90A8;
+//        public const int GL_SKIP_MISSING_GLYPH_NV = 0x90A9;
+//        public const int GL_USE_MISSING_GLYPH_NV = 0x90AA;
+//        public const int GL_PATH_ERROR_POSITION_NV = 0x90AB;
+//        public const int GL_ACCUM_ADJACENT_PAIRS_NV = 0x90AD;
+//        public const int GL_ADJACENT_PAIRS_NV = 0x90AE;
+//        public const int GL_FIRST_TO_REST_NV = 0x90AF;
+//        public const int GL_PATH_GEN_MODE_NV = 0x90B0;
+//        public const int GL_PATH_GEN_COEFF_NV = 0x90B1;
+//        public const int GL_PATH_GEN_COMPONENTS_NV = 0x90B3;
+//        public const int GL_PATH_STENCIL_FUNC_NV = 0x90B7;
+//        public const int GL_PATH_STENCIL_REF_NV = 0x90B8;
+//        public const int GL_PATH_STENCIL_VALUE_MASK_NV = 0x90B9;
+//        public const int GL_PATH_STENCIL_DEPTH_OFFSET_FACTOR_NV = 0x90BD;
+//        public const int GL_PATH_STENCIL_DEPTH_OFFSET_UNITS_NV = 0x90BE;
+//        public const int GL_PATH_COVER_DEPTH_FUNC_NV = 0x90BF;
+//        public const int GL_PATH_DASH_OFFSET_RESET_NV = 0x90B4;
+//        public const int GL_MOVE_TO_RESETS_NV = 0x90B5;
+//        public const int GL_MOVE_TO_CONTINUES_NV = 0x90B6;
+//        public const int GL_CLOSE_PATH_NV = 0x00;
+//        public const int GL_MOVE_TO_NV = 0x02;
+//        public const int GL_RELATIVE_MOVE_TO_NV = 0x03;
+//        public const int GL_LINE_TO_NV = 0x04;
+//        public const int GL_RELATIVE_LINE_TO_NV = 0x05;
+//        public const int GL_HORIZONTAL_LINE_TO_NV = 0x06;
+//        public const int GL_RELATIVE_HORIZONTAL_LINE_TO_NV = 0x07;
+//        public const int GL_VERTICAL_LINE_TO_NV = 0x08;
+//        public const int GL_RELATIVE_VERTICAL_LINE_TO_NV = 0x09;
+//        public const int GL_QUADRATIC_CURVE_TO_NV = 0x0A;
+//        public const int GL_RELATIVE_QUADRATIC_CURVE_TO_NV = 0x0B;
+//        public const int GL_CUBIC_CURVE_TO_NV = 0x0C;
+//        public const int GL_RELATIVE_CUBIC_CURVE_TO_NV = 0x0D;
+//        public const int GL_SMOOTH_QUADRATIC_CURVE_TO_NV = 0x0E;
+//        public const int GL_RELATIVE_SMOOTH_QUADRATIC_CURVE_TO_NV = 0x0F;
+//        public const int GL_SMOOTH_CUBIC_CURVE_TO_NV = 0x10;
+//        public const int GL_RELATIVE_SMOOTH_CUBIC_CURVE_TO_NV = 0x11;
+//        public const int GL_SMALL_CCW_ARC_TO_NV = 0x12;
+//        public const int GL_RELATIVE_SMALL_CCW_ARC_TO_NV = 0x13;
+//        public const int GL_SMALL_CW_ARC_TO_NV = 0x14;
+//        public const int GL_RELATIVE_SMALL_CW_ARC_TO_NV = 0x15;
+//        public const int GL_LARGE_CCW_ARC_TO_NV = 0x16;
+//        public const int GL_RELATIVE_LARGE_CCW_ARC_TO_NV = 0x17;
+//        public const int GL_LARGE_CW_ARC_TO_NV = 0x18;
+//        public const int GL_RELATIVE_LARGE_CW_ARC_TO_NV = 0x19;
+//        public const int GL_RESTART_PATH_NV = 0xF0;
+//        public const int GL_DUP_FIRST_CUBIC_CURVE_TO_NV = 0xF2;
+//        public const int GL_DUP_LAST_CUBIC_CURVE_TO_NV = 0xF4;
+//        public const int GL_RECT_NV = 0xF6;
+//        public const int GL_CIRCULAR_CCW_ARC_TO_NV = 0xF8;
+//        public const int GL_CIRCULAR_CW_ARC_TO_NV = 0xFA;
+//        public const int GL_CIRCULAR_TANGENT_ARC_TO_NV = 0xFC;
+//        public const int GL_ARC_TO_NV = 0xFE;
+//        public const int GL_RELATIVE_ARC_TO_NV = 0xFF;
+//        public const int GL_BOLD_BIT_NV = 0x01;
+//        public const int GL_ITALIC_BIT_NV = 0x02;
+//        public const int GL_GLYPH_WIDTH_BIT_NV = 0x01;
+//        public const int GL_GLYPH_HEIGHT_BIT_NV = 0x02;
+//        public const int GL_GLYPH_HORIZONTAL_BEARING_X_BIT_NV = 0x04;
+//        public const int GL_GLYPH_HORIZONTAL_BEARING_Y_BIT_NV = 0x08;
+//        public const int GL_GLYPH_HORIZONTAL_BEARING_ADVANCE_BIT_NV = 0x10;
+//        public const int GL_GLYPH_VERTICAL_BEARING_X_BIT_NV = 0x20;
+//        public const int GL_GLYPH_VERTICAL_BEARING_Y_BIT_NV = 0x40;
+//        public const int GL_GLYPH_VERTICAL_BEARING_ADVANCE_BIT_NV = 0x80;
+//        public const int GL_GLYPH_HAS_KERNING_BIT_NV = 0x100;
+//        public const int GL_FONT_X_MIN_BOUNDS_BIT_NV = 0x00010000;
+//        public const int GL_FONT_Y_MIN_BOUNDS_BIT_NV = 0x00020000;
+//        public const int GL_FONT_X_MAX_BOUNDS_BIT_NV = 0x00040000;
+//        public const int GL_FONT_Y_MAX_BOUNDS_BIT_NV = 0x00080000;
+//        public const int GL_FONT_UNITS_PER_EM_BIT_NV = 0x00100000;
+//        public const int GL_FONT_ASCENDER_BIT_NV = 0x00200000;
+//        public const int GL_FONT_DESCENDER_BIT_NV = 0x00400000;
+//        public const int GL_FONT_HEIGHT_BIT_NV = 0x00800000;
+//        public const int GL_FONT_MAX_ADVANCE_WIDTH_BIT_NV = 0x01000000;
+//        public const int GL_FONT_MAX_ADVANCE_HEIGHT_BIT_NV = 0x02000000;
+//        public const int GL_FONT_UNDERLINE_POSITION_BIT_NV = 0x04000000;
+//        public const int GL_FONT_UNDERLINE_THICKNESS_BIT_NV = 0x08000000;
+//        public const int GL_FONT_HAS_KERNING_BIT_NV = 0x10000000;
+//        public const int GL_ROUNDED_RECT_NV = 0xE8;
+//        public const int GL_RELATIVE_ROUNDED_RECT_NV = 0xE9;
+//        public const int GL_ROUNDED_RECT2_NV = 0xEA;
+//        public const int GL_RELATIVE_ROUNDED_RECT2_NV = 0xEB;
+//        public const int GL_ROUNDED_RECT4_NV = 0xEC;
+//        public const int GL_RELATIVE_ROUNDED_RECT4_NV = 0xED;
+//        public const int GL_ROUNDED_RECT8_NV = 0xEE;
+//        public const int GL_RELATIVE_ROUNDED_RECT8_NV = 0xEF;
+//        public const int GL_RELATIVE_RECT_NV = 0xF7;
+//        public const int GL_FONT_GLYPHS_AVAILABLE_NV = 0x9368;
+//        public const int GL_FONT_TARGET_UNAVAILABLE_NV = 0x9369;
+//        public const int GL_FONT_UNAVAILABLE_NV = 0x936A;
+//        public const int GL_FONT_UNINTELLIGIBLE_NV = 0x936B;
+//        public const int GL_CONIC_CURVE_TO_NV = 0x1A;
+//        public const int GL_RELATIVE_CONIC_CURVE_TO_NV = 0x1B;
+//        public const int GL_FONT_NUM_GLYPH_INDICES_BIT_NV = 0x20000000;
+//        public const int GL_STANDARD_FONT_FORMAT_NV = 0x936C;
+//        public const int GL_2_BYTES_NV = 0x1407;
+//        public const int GL_3_BYTES_NV = 0x1408;
+//        public const int GL_4_BYTES_NV = 0x1409;
+//        public const int GL_EYE_LINEAR_NV = 0x2400;
+//        public const int GL_OBJECT_LINEAR_NV = 0x2401;
+//        public const int GL_CONSTANT_NV = 0x8576;
+//        public const int GL_PATH_FOG_GEN_MODE_NV = 0x90AC;
+//        public const int GL_PRIMARY_COLOR_NV = 0x852C;
+//        public const int GL_SECONDARY_COLOR_NV = 0x852D;
+//        public const int GL_PATH_GEN_COLOR_FORMAT_NV = 0x90B2;
+//        public const int GL_PATH_PROJECTION_NV = 0x1701;
+//        public const int GL_PATH_MODELVIEW_NV = 0x1700;
+//        public const int GL_PATH_MODELVIEW_STACK_DEPTH_NV = 0x0BA3;
+//        public const int GL_PATH_MODELVIEW_MATRIX_NV = 0x0BA6;
+//        public const int GL_PATH_MAX_MODELVIEW_STACK_DEPTH_NV = 0x0D36;
+//        public const int GL_PATH_TRANSPOSE_MODELVIEW_MATRIX_NV = 0x84E3;
+//        public const int GL_PATH_PROJECTION_STACK_DEPTH_NV = 0x0BA4;
+//        public const int GL_PATH_PROJECTION_MATRIX_NV = 0x0BA7;
+//        public const int GL_PATH_MAX_PROJECTION_STACK_DEPTH_NV = 0x0D38;
+//        public const int GL_PATH_TRANSPOSE_PROJECTION_MATRIX_NV = 0x84E4;
+//        public const int GL_FRAGMENT_INPUT_NV = 0x936D;
+//        public const int GL_NV_path_rendering_shared_edge = 1;
+//        public const int GL_SHARED_EDGE_NV = 0xC0;
+//        public const int GL_NV_pixel_data_range = 1;
+//        public const int GL_WRITE_PIXEL_DATA_RANGE_NV = 0x8878;
+//        public const int GL_READ_PIXEL_DATA_RANGE_NV = 0x8879;
+//        public const int GL_WRITE_PIXEL_DATA_RANGE_LENGTH_NV = 0x887A;
+//        public const int GL_READ_PIXEL_DATA_RANGE_LENGTH_NV = 0x887B;
+//        public const int GL_WRITE_PIXEL_DATA_RANGE_POINTER_NV = 0x887C;
+//        public const int GL_READ_PIXEL_DATA_RANGE_POINTER_NV = 0x887D;
+//        public const int GL_NV_point_sprite = 1;
+//        public const int GL_POINT_SPRITE_NV = 0x8861;
+//        public const int GL_COORD_REPLACE_NV = 0x8862;
+//        public const int GL_POINT_SPRITE_R_MODE_NV = 0x8863;
+//        public const int GL_NV_present_video = 1;
+//        public const int GL_FRAME_NV = 0x8E26;
+//        public const int GL_FIELDS_NV = 0x8E27;
+//        public const int GL_CURRENT_TIME_NV = 0x8E28;
+//        public const int GL_NUM_FILL_STREAMS_NV = 0x8E29;
+//        public const int GL_PRESENT_TIME_NV = 0x8E2A;
+//        public const int GL_PRESENT_DURATION_NV = 0x8E2B;
+//        public const int GL_NV_primitive_restart = 1;
+//        public const int GL_PRIMITIVE_RESTART_NV = 0x8558;
+//        public const int GL_PRIMITIVE_RESTART_INDEX_NV = 0x8559;
+//        public const int GL_NV_query_resource = 1;
+//        public const int GL_QUERY_RESOURCE_TYPE_VIDMEM_ALLOC_NV = 0x9540;
+//        public const int GL_QUERY_RESOURCE_MEMTYPE_VIDMEM_NV = 0x9542;
+//        public const int GL_QUERY_RESOURCE_SYS_RESERVED_NV = 0x9544;
+//        public const int GL_QUERY_RESOURCE_TEXTURE_NV = 0x9545;
+//        public const int GL_QUERY_RESOURCE_RENDERBUFFER_NV = 0x9546;
+//        public const int GL_QUERY_RESOURCE_BUFFEROBJECT_NV = 0x9547;
+//        public const int GL_NV_query_resource_tag = 1;
+//        public const int GL_NV_register_combiners = 1;
+//        public const int GL_REGISTER_COMBINERS_NV = 0x8522;
+//        public const int GL_VARIABLE_A_NV = 0x8523;
+//        public const int GL_VARIABLE_B_NV = 0x8524;
+//        public const int GL_VARIABLE_C_NV = 0x8525;
+//        public const int GL_VARIABLE_D_NV = 0x8526;
+//        public const int GL_VARIABLE_E_NV = 0x8527;
+//        public const int GL_VARIABLE_F_NV = 0x8528;
+//        public const int GL_VARIABLE_G_NV = 0x8529;
+//        public const int GL_CONSTANT_COLOR0_NV = 0x852A;
+//        public const int GL_CONSTANT_COLOR1_NV = 0x852B;
+//        public const int GL_SPARE0_NV = 0x852E;
+//        public const int GL_SPARE1_NV = 0x852F;
+//        public const int GL_DISCARD_NV = 0x8530;
+//        public const int GL_E_TIMES_F_NV = 0x8531;
+//        public const int GL_SPARE0_PLUS_SECONDARY_COLOR_NV = 0x8532;
+//        public const int GL_UNSIGNED_IDENTITY_NV = 0x8536;
+//        public const int GL_UNSIGNED_INVERT_NV = 0x8537;
+//        public const int GL_EXPAND_NORMAL_NV = 0x8538;
+//        public const int GL_EXPAND_NEGATE_NV = 0x8539;
+//        public const int GL_HALF_BIAS_NORMAL_NV = 0x853A;
+//        public const int GL_HALF_BIAS_NEGATE_NV = 0x853B;
+//        public const int GL_SIGNED_IDENTITY_NV = 0x853C;
+//        public const int GL_SIGNED_NEGATE_NV = 0x853D;
+//        public const int GL_SCALE_BY_TWO_NV = 0x853E;
+//        public const int GL_SCALE_BY_FOUR_NV = 0x853F;
+//        public const int GL_SCALE_BY_ONE_HALF_NV = 0x8540;
+//        public const int GL_BIAS_BY_NEGATIVE_ONE_HALF_NV = 0x8541;
+//        public const int GL_COMBINER_INPUT_NV = 0x8542;
+//        public const int GL_COMBINER_MAPPING_NV = 0x8543;
+//        public const int GL_COMBINER_COMPONENT_USAGE_NV = 0x8544;
+//        public const int GL_COMBINER_AB_DOT_PRODUCT_NV = 0x8545;
+//        public const int GL_COMBINER_CD_DOT_PRODUCT_NV = 0x8546;
+//        public const int GL_COMBINER_MUX_SUM_NV = 0x8547;
+//        public const int GL_COMBINER_SCALE_NV = 0x8548;
+//        public const int GL_COMBINER_BIAS_NV = 0x8549;
+//        public const int GL_COMBINER_AB_OUTPUT_NV = 0x854A;
+//        public const int GL_COMBINER_CD_OUTPUT_NV = 0x854B;
+//        public const int GL_COMBINER_SUM_OUTPUT_NV = 0x854C;
+//        public const int GL_MAX_GENERAL_COMBINERS_NV = 0x854D;
+//        public const int GL_NUM_GENERAL_COMBINERS_NV = 0x854E;
+//        public const int GL_COLOR_SUM_CLAMP_NV = 0x854F;
+//        public const int GL_COMBINER0_NV = 0x8550;
+//        public const int GL_COMBINER1_NV = 0x8551;
+//        public const int GL_COMBINER2_NV = 0x8552;
+//        public const int GL_COMBINER3_NV = 0x8553;
+//        public const int GL_COMBINER4_NV = 0x8554;
+//        public const int GL_COMBINER5_NV = 0x8555;
+//        public const int GL_COMBINER6_NV = 0x8556;
+//        public const int GL_COMBINER7_NV = 0x8557;
+//        public const int GL_NV_register_combiners2 = 1;
+//        public const int GL_PER_STAGE_CONSTANTS_NV = 0x8535;
+//        public const int GL_NV_robustness_video_memory_purge = 1;
+//        public const int GL_PURGED_CONTEXT_RESET_NV = 0x92BB;
+//        public const int GL_NV_sample_locations = 1;
+//        public const int GL_SAMPLE_LOCATION_SUBPIXEL_BITS_NV = 0x933D;
+//        public const int GL_SAMPLE_LOCATION_PIXEL_GRID_WIDTH_NV = 0x933E;
+//        public const int GL_SAMPLE_LOCATION_PIXEL_GRID_HEIGHT_NV = 0x933F;
+//        public const int GL_PROGRAMMABLE_SAMPLE_LOCATION_TABLE_SIZE_NV = 0x9340;
+//        public const int GL_SAMPLE_LOCATION_NV = 0x8E50;
+//        public const int GL_PROGRAMMABLE_SAMPLE_LOCATION_NV = 0x9341;
+//        public const int GL_FRAMEBUFFER_PROGRAMMABLE_SAMPLE_LOCATIONS_NV = 0x9342;
+//        public const int GL_FRAMEBUFFER_SAMPLE_LOCATION_PIXEL_GRID_NV = 0x9343;
+//        public const int GL_NV_sample_mask_override_coverage = 1;
+//        public const int GL_NV_shader_atomic_counters = 1;
+//        public const int GL_NV_shader_atomic_float = 1;
+//        public const int GL_NV_shader_atomic_float64 = 1;
+//        public const int GL_NV_shader_atomic_fp16_vector = 1;
+//        public const int GL_NV_shader_atomic_int64 = 1;
+//        public const int GL_NV_shader_buffer_load = 1;
+//        public const int GL_BUFFER_GPU_ADDRESS_NV = 0x8F1D;
+//        public const int GL_GPU_ADDRESS_NV = 0x8F34;
+//        public const int GL_MAX_SHADER_BUFFER_ADDRESS_NV = 0x8F35;
+//        public const int GL_NV_shader_buffer_store = 1;
+//        public const int GL_SHADER_GLOBAL_ACCESS_BARRIER_BIT_NV = 0x00000010;
+//        public const int GL_NV_shader_storage_buffer_object = 1;
+//        public const int GL_NV_shader_thread_group = 1;
+//        public const int GL_WARP_SIZE_NV = 0x9339;
+//        public const int GL_WARPS_PER_SM_NV = 0x933A;
+//        public const int GL_SM_COUNT_NV = 0x933B;
+//        public const int GL_NV_shader_thread_shuffle = 1;
+//        public const int GL_NV_stereo_view_rendering = 1;
+//        public const int GL_NV_tessellation_program5 = 1;
+//        public const int GL_MAX_PROGRAM_PATCH_ATTRIBS_NV = 0x86D8;
+//        public const int GL_TESS_CONTROL_PROGRAM_NV = 0x891E;
+//        public const int GL_TESS_EVALUATION_PROGRAM_NV = 0x891F;
+//        public const int GL_TESS_CONTROL_PROGRAM_PARAMETER_BUFFER_NV = 0x8C74;
+//        public const int GL_TESS_EVALUATION_PROGRAM_PARAMETER_BUFFER_NV = 0x8C75;
+//        public const int GL_NV_texgen_emboss = 1;
+//        public const int GL_EMBOSS_LIGHT_NV = 0x855D;
+//        public const int GL_EMBOSS_CONSTANT_NV = 0x855E;
+//        public const int GL_EMBOSS_MAP_NV = 0x855F;
+//        public const int GL_NV_texgen_reflection = 1;
+//        public const int GL_NORMAL_MAP_NV = 0x8511;
+//        public const int GL_REFLECTION_MAP_NV = 0x8512;
+//        public const int GL_NV_texture_barrier = 1;
+//        public const int GL_NV_texture_compression_vtc = 1;
+//        public const int GL_NV_texture_env_combine4 = 1;
+//        public const int GL_COMBINE4_NV = 0x8503;
+//        public const int GL_SOURCE3_RGB_NV = 0x8583;
+//        public const int GL_SOURCE3_ALPHA_NV = 0x858B;
+//        public const int GL_OPERAND3_RGB_NV = 0x8593;
+//        public const int GL_OPERAND3_ALPHA_NV = 0x859B;
+//        public const int GL_NV_texture_expand_normal = 1;
+//        public const int GL_TEXTURE_UNSIGNED_REMAP_MODE_NV = 0x888F;
+//        public const int GL_NV_texture_multisample = 1;
+//        public const int GL_TEXTURE_COVERAGE_SAMPLES_NV = 0x9045;
+//        public const int GL_TEXTURE_COLOR_SAMPLES_NV = 0x9046;
+//        public const int GL_NV_texture_rectangle = 1;
+//        public const int GL_TEXTURE_RECTANGLE_NV = 0x84F5;
+//        public const int GL_TEXTURE_BINDING_RECTANGLE_NV = 0x84F6;
+//        public const int GL_PROXY_TEXTURE_RECTANGLE_NV = 0x84F7;
+//        public const int GL_MAX_RECTANGLE_TEXTURE_SIZE_NV = 0x84F8;
+//        public const int GL_NV_texture_rectangle_compressed = 1;
+//        public const int GL_NV_texture_shader = 1;
+//        public const int GL_OFFSET_TEXTURE_RECTANGLE_NV = 0x864C;
+//        public const int GL_OFFSET_TEXTURE_RECTANGLE_SCALE_NV = 0x864D;
+//        public const int GL_DOT_PRODUCT_TEXTURE_RECTANGLE_NV = 0x864E;
+//        public const int GL_RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV = 0x86D9;
+//        public const int GL_UNSIGNED_INT_S8_S8_8_8_NV = 0x86DA;
+//        public const int GL_UNSIGNED_INT_8_8_S8_S8_REV_NV = 0x86DB;
+//        public const int GL_DSDT_MAG_INTENSITY_NV = 0x86DC;
+//        public const int GL_SHADER_CONSISTENT_NV = 0x86DD;
+//        public const int GL_TEXTURE_SHADER_NV = 0x86DE;
+//        public const int GL_SHADER_OPERATION_NV = 0x86DF;
+//        public const int GL_CULL_MODES_NV = 0x86E0;
+//        public const int GL_OFFSET_TEXTURE_MATRIX_NV = 0x86E1;
+//        public const int GL_OFFSET_TEXTURE_SCALE_NV = 0x86E2;
+//        public const int GL_OFFSET_TEXTURE_BIAS_NV = 0x86E3;
+//        public const int GL_OFFSET_TEXTURE_2D_MATRIX_NV = 0x86E1;
+//        public const int GL_OFFSET_TEXTURE_2D_SCALE_NV = 0x86E2;
+//        public const int GL_OFFSET_TEXTURE_2D_BIAS_NV = 0x86E3;
+//        public const int GL_PREVIOUS_TEXTURE_INPUT_NV = 0x86E4;
+//        public const int GL_CONST_EYE_NV = 0x86E5;
+//        public const int GL_PASS_THROUGH_NV = 0x86E6;
+//        public const int GL_CULL_FRAGMENT_NV = 0x86E7;
+//        public const int GL_OFFSET_TEXTURE_2D_NV = 0x86E8;
+//        public const int GL_DEPENDENT_AR_TEXTURE_2D_NV = 0x86E9;
+//        public const int GL_DEPENDENT_GB_TEXTURE_2D_NV = 0x86EA;
+//        public const int GL_DOT_PRODUCT_NV = 0x86EC;
+//        public const int GL_DOT_PRODUCT_DEPTH_REPLACE_NV = 0x86ED;
+//        public const int GL_DOT_PRODUCT_TEXTURE_2D_NV = 0x86EE;
+//        public const int GL_DOT_PRODUCT_TEXTURE_CUBE_MAP_NV = 0x86F0;
+//        public const int GL_DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV = 0x86F1;
+//        public const int GL_DOT_PRODUCT_REFLECT_CUBE_MAP_NV = 0x86F2;
+//        public const int GL_DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV = 0x86F3;
+//        public const int GL_HILO_NV = 0x86F4;
+//        public const int GL_DSDT_NV = 0x86F5;
+//        public const int GL_DSDT_MAG_NV = 0x86F6;
+//        public const int GL_DSDT_MAG_VIB_NV = 0x86F7;
+//        public const int GL_HILO16_NV = 0x86F8;
+//        public const int GL_SIGNED_HILO_NV = 0x86F9;
+//        public const int GL_SIGNED_HILO16_NV = 0x86FA;
+//        public const int GL_SIGNED_RGBA_NV = 0x86FB;
+//        public const int GL_SIGNED_RGBA8_NV = 0x86FC;
+//        public const int GL_SIGNED_RGB_NV = 0x86FE;
+//        public const int GL_SIGNED_RGB8_NV = 0x86FF;
+//        public const int GL_SIGNED_LUMINANCE_NV = 0x8701;
+//        public const int GL_SIGNED_LUMINANCE8_NV = 0x8702;
+//        public const int GL_SIGNED_LUMINANCE_ALPHA_NV = 0x8703;
+//        public const int GL_SIGNED_LUMINANCE8_ALPHA8_NV = 0x8704;
+//        public const int GL_SIGNED_ALPHA_NV = 0x8705;
+//        public const int GL_SIGNED_ALPHA8_NV = 0x8706;
+//        public const int GL_SIGNED_INTENSITY_NV = 0x8707;
+//        public const int GL_SIGNED_INTENSITY8_NV = 0x8708;
+//        public const int GL_DSDT8_NV = 0x8709;
+//        public const int GL_DSDT8_MAG8_NV = 0x870A;
+//        public const int GL_DSDT8_MAG8_INTENSITY8_NV = 0x870B;
+//        public const int GL_SIGNED_RGB_UNSIGNED_ALPHA_NV = 0x870C;
+//        public const int GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV = 0x870D;
+//        public const int GL_HI_SCALE_NV = 0x870E;
+//        public const int GL_LO_SCALE_NV = 0x870F;
+//        public const int GL_DS_SCALE_NV = 0x8710;
+//        public const int GL_DT_SCALE_NV = 0x8711;
+//        public const int GL_MAGNITUDE_SCALE_NV = 0x8712;
+//        public const int GL_VIBRANCE_SCALE_NV = 0x8713;
+//        public const int GL_HI_BIAS_NV = 0x8714;
+//        public const int GL_LO_BIAS_NV = 0x8715;
+//        public const int GL_DS_BIAS_NV = 0x8716;
+//        public const int GL_DT_BIAS_NV = 0x8717;
+//        public const int GL_MAGNITUDE_BIAS_NV = 0x8718;
+//        public const int GL_VIBRANCE_BIAS_NV = 0x8719;
+//        public const int GL_TEXTURE_BORDER_VALUES_NV = 0x871A;
+//        public const int GL_TEXTURE_HI_SIZE_NV = 0x871B;
+//        public const int GL_TEXTURE_LO_SIZE_NV = 0x871C;
+//        public const int GL_TEXTURE_DS_SIZE_NV = 0x871D;
+//        public const int GL_TEXTURE_DT_SIZE_NV = 0x871E;
+//        public const int GL_TEXTURE_MAG_SIZE_NV = 0x871F;
+//        public const int GL_NV_texture_shader2 = 1;
+//        public const int GL_DOT_PRODUCT_TEXTURE_3D_NV = 0x86EF;
+//        public const int GL_NV_texture_shader3 = 1;
+//        public const int GL_OFFSET_PROJECTIVE_TEXTURE_2D_NV = 0x8850;
+//        public const int GL_OFFSET_PROJECTIVE_TEXTURE_2D_SCALE_NV = 0x8851;
+//        public const int GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_NV = 0x8852;
+//        public const int GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_SCALE_NV = 0x8853;
+//        public const int GL_OFFSET_HILO_TEXTURE_2D_NV = 0x8854;
+//        public const int GL_OFFSET_HILO_TEXTURE_RECTANGLE_NV = 0x8855;
+//        public const int GL_OFFSET_HILO_PROJECTIVE_TEXTURE_2D_NV = 0x8856;
+//        public const int GL_OFFSET_HILO_PROJECTIVE_TEXTURE_RECTANGLE_NV = 0x8857;
+//        public const int GL_DEPENDENT_HILO_TEXTURE_2D_NV = 0x8858;
+//        public const int GL_DEPENDENT_RGB_TEXTURE_3D_NV = 0x8859;
+//        public const int GL_DEPENDENT_RGB_TEXTURE_CUBE_MAP_NV = 0x885A;
+//        public const int GL_DOT_PRODUCT_PASS_THROUGH_NV = 0x885B;
+//        public const int GL_DOT_PRODUCT_TEXTURE_1D_NV = 0x885C;
+//        public const int GL_DOT_PRODUCT_AFFINE_DEPTH_REPLACE_NV = 0x885D;
+//        public const int GL_HILO8_NV = 0x885E;
+//        public const int GL_SIGNED_HILO8_NV = 0x885F;
+//        public const int GL_FORCE_BLUE_TO_ONE_NV = 0x8860;
+//        public const int GL_NV_transform_feedback = 1;
+//        public const int GL_BACK_PRIMARY_COLOR_NV = 0x8C77;
+//        public const int GL_BACK_SECONDARY_COLOR_NV = 0x8C78;
+//        public const int GL_TEXTURE_COORD_NV = 0x8C79;
+//        public const int GL_CLIP_DISTANCE_NV = 0x8C7A;
+//        public const int GL_VERTEX_ID_NV = 0x8C7B;
+//        public const int GL_PRIMITIVE_ID_NV = 0x8C7C;
+//        public const int GL_GENERIC_ATTRIB_NV = 0x8C7D;
+//        public const int GL_TRANSFORM_FEEDBACK_ATTRIBS_NV = 0x8C7E;
+//        public const int GL_TRANSFORM_FEEDBACK_BUFFER_MODE_NV = 0x8C7F;
+//        public const int GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_NV = 0x8C80;
+//        public const int GL_ACTIVE_VARYINGS_NV = 0x8C81;
+//        public const int GL_ACTIVE_VARYING_MAX_LENGTH_NV = 0x8C82;
+//        public const int GL_TRANSFORM_FEEDBACK_VARYINGS_NV = 0x8C83;
+//        public const int GL_TRANSFORM_FEEDBACK_BUFFER_START_NV = 0x8C84;
+//        public const int GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_NV = 0x8C85;
+//        public const int GL_TRANSFORM_FEEDBACK_RECORD_NV = 0x8C86;
+//        public const int GL_PRIMITIVES_GENERATED_NV = 0x8C87;
+//        public const int GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_NV = 0x8C88;
+//        public const int GL_RASTERIZER_DISCARD_NV = 0x8C89;
+//        public const int GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_NV = 0x8C8A;
+//        public const int GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_NV = 0x8C8B;
+//        public const int GL_INTERLEAVED_ATTRIBS_NV = 0x8C8C;
+//        public const int GL_SEPARATE_ATTRIBS_NV = 0x8C8D;
+//        public const int GL_TRANSFORM_FEEDBACK_BUFFER_NV = 0x8C8E;
+//        public const int GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_NV = 0x8C8F;
+//        public const int GL_LAYER_NV = 0x8DAA;
+//        public const int GL_NEXT_BUFFER_NV = -2;
+//        public const int GL_SKIP_COMPONENTS4_NV = -3;
+//        public const int GL_SKIP_COMPONENTS3_NV = -4;
+//        public const int GL_SKIP_COMPONENTS2_NV = -5;
+//        public const int GL_SKIP_COMPONENTS1_NV = -6;
+//        public const int GL_NV_transform_feedback2 = 1;
+//        public const int GL_TRANSFORM_FEEDBACK_NV = 0x8E22;
+//        public const int GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED_NV = 0x8E23;
+//        public const int GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE_NV = 0x8E24;
+//        public const int GL_TRANSFORM_FEEDBACK_BINDING_NV = 0x8E25;
+//        public const int GL_NV_uniform_buffer_unified_memory = 1;
+//        public const int GL_UNIFORM_BUFFER_UNIFIED_NV = 0x936E;
+//        public const int GL_UNIFORM_BUFFER_ADDRESS_NV = 0x936F;
+//        public const int GL_UNIFORM_BUFFER_LENGTH_NV = 0x9370;
+//        public const int GL_NV_vdpau_interop = 1;
+//        public const int GL_SURFACE_STATE_NV = 0x86EB;
+//        public const int GL_SURFACE_REGISTERED_NV = 0x86FD;
+//        public const int GL_SURFACE_MAPPED_NV = 0x8700;
+//        public const int GL_WRITE_DISCARD_NV = 0x88BE;
+//        public const int GL_NV_vertex_array_range = 1;
+//        public const int GL_VERTEX_ARRAY_RANGE_NV = 0x851D;
+//        public const int GL_VERTEX_ARRAY_RANGE_LENGTH_NV = 0x851E;
+//        public const int GL_VERTEX_ARRAY_RANGE_VALID_NV = 0x851F;
+//        public const int GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV = 0x8520;
+//        public const int GL_VERTEX_ARRAY_RANGE_POINTER_NV = 0x8521;
+//        public const int GL_NV_vertex_array_range2 = 1;
+//        public const int GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV = 0x8533;
+//        public const int GL_NV_vertex_attrib_integer_64bit = 1;
+//        public const int GL_NV_vertex_buffer_unified_memory = 1;
+//        public const int GL_VERTEX_ATTRIB_ARRAY_UNIFIED_NV = 0x8F1E;
+//        public const int GL_ELEMENT_ARRAY_UNIFIED_NV = 0x8F1F;
+//        public const int GL_VERTEX_ATTRIB_ARRAY_ADDRESS_NV = 0x8F20;
+//        public const int GL_VERTEX_ARRAY_ADDRESS_NV = 0x8F21;
+//        public const int GL_NORMAL_ARRAY_ADDRESS_NV = 0x8F22;
+//        public const int GL_COLOR_ARRAY_ADDRESS_NV = 0x8F23;
+//        public const int GL_INDEX_ARRAY_ADDRESS_NV = 0x8F24;
+//        public const int GL_TEXTURE_COORD_ARRAY_ADDRESS_NV = 0x8F25;
+//        public const int GL_EDGE_FLAG_ARRAY_ADDRESS_NV = 0x8F26;
+//        public const int GL_SECONDARY_COLOR_ARRAY_ADDRESS_NV = 0x8F27;
+//        public const int GL_FOG_COORD_ARRAY_ADDRESS_NV = 0x8F28;
+//        public const int GL_ELEMENT_ARRAY_ADDRESS_NV = 0x8F29;
+//        public const int GL_VERTEX_ATTRIB_ARRAY_LENGTH_NV = 0x8F2A;
+//        public const int GL_VERTEX_ARRAY_LENGTH_NV = 0x8F2B;
+//        public const int GL_NORMAL_ARRAY_LENGTH_NV = 0x8F2C;
+//        public const int GL_COLOR_ARRAY_LENGTH_NV = 0x8F2D;
+//        public const int GL_INDEX_ARRAY_LENGTH_NV = 0x8F2E;
+//        public const int GL_TEXTURE_COORD_ARRAY_LENGTH_NV = 0x8F2F;
+//        public const int GL_EDGE_FLAG_ARRAY_LENGTH_NV = 0x8F30;
+//        public const int GL_SECONDARY_COLOR_ARRAY_LENGTH_NV = 0x8F31;
+//        public const int GL_FOG_COORD_ARRAY_LENGTH_NV = 0x8F32;
+//        public const int GL_ELEMENT_ARRAY_LENGTH_NV = 0x8F33;
+//        public const int GL_DRAW_INDIRECT_UNIFIED_NV = 0x8F40;
+//        public const int GL_DRAW_INDIRECT_ADDRESS_NV = 0x8F41;
+//        public const int GL_DRAW_INDIRECT_LENGTH_NV = 0x8F42;
+//        public const int GL_NV_vertex_program = 1;
+//        public const int GL_VERTEX_PROGRAM_NV = 0x8620;
+//        public const int GL_VERTEX_STATE_PROGRAM_NV = 0x8621;
+//        public const int GL_ATTRIB_ARRAY_SIZE_NV = 0x8623;
+//        public const int GL_ATTRIB_ARRAY_STRIDE_NV = 0x8624;
+//        public const int GL_ATTRIB_ARRAY_TYPE_NV = 0x8625;
+//        public const int GL_CURRENT_ATTRIB_NV = 0x8626;
+//        public const int GL_PROGRAM_LENGTH_NV = 0x8627;
+//        public const int GL_PROGRAM_STRING_NV = 0x8628;
+//        public const int GL_MODELVIEW_PROJECTION_NV = 0x8629;
+//        public const int GL_IDENTITY_NV = 0x862A;
+//        public const int GL_INVERSE_NV = 0x862B;
+//        public const int GL_TRANSPOSE_NV = 0x862C;
+//        public const int GL_INVERSE_TRANSPOSE_NV = 0x862D;
+//        public const int GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV = 0x862E;
+//        public const int GL_MAX_TRACK_MATRICES_NV = 0x862F;
+//        public const int GL_MATRIX0_NV = 0x8630;
+//        public const int GL_MATRIX1_NV = 0x8631;
+//        public const int GL_MATRIX2_NV = 0x8632;
+//        public const int GL_MATRIX3_NV = 0x8633;
+//        public const int GL_MATRIX4_NV = 0x8634;
+//        public const int GL_MATRIX5_NV = 0x8635;
+//        public const int GL_MATRIX6_NV = 0x8636;
+//        public const int GL_MATRIX7_NV = 0x8637;
+//        public const int GL_CURRENT_MATRIX_STACK_DEPTH_NV = 0x8640;
+//        public const int GL_CURRENT_MATRIX_NV = 0x8641;
+//        public const int GL_VERTEX_PROGRAM_POINT_SIZE_NV = 0x8642;
+//        public const int GL_VERTEX_PROGRAM_TWO_SIDE_NV = 0x8643;
+//        public const int GL_PROGRAM_PARAMETER_NV = 0x8644;
+//        public const int GL_ATTRIB_ARRAY_POINTER_NV = 0x8645;
+//        public const int GL_PROGRAM_TARGET_NV = 0x8646;
+//        public const int GL_PROGRAM_RESIDENT_NV = 0x8647;
+//        public const int GL_TRACK_MATRIX_NV = 0x8648;
+//        public const int GL_TRACK_MATRIX_TRANSFORM_NV = 0x8649;
+//        public const int GL_VERTEX_PROGRAM_BINDING_NV = 0x864A;
+//        public const int GL_PROGRAM_ERROR_POSITION_NV = 0x864B;
+//        public const int GL_VERTEX_ATTRIB_ARRAY0_NV = 0x8650;
+//        public const int GL_VERTEX_ATTRIB_ARRAY1_NV = 0x8651;
+//        public const int GL_VERTEX_ATTRIB_ARRAY2_NV = 0x8652;
+//        public const int GL_VERTEX_ATTRIB_ARRAY3_NV = 0x8653;
+//        public const int GL_VERTEX_ATTRIB_ARRAY4_NV = 0x8654;
+//        public const int GL_VERTEX_ATTRIB_ARRAY5_NV = 0x8655;
+//        public const int GL_VERTEX_ATTRIB_ARRAY6_NV = 0x8656;
+//        public const int GL_VERTEX_ATTRIB_ARRAY7_NV = 0x8657;
+//        public const int GL_VERTEX_ATTRIB_ARRAY8_NV = 0x8658;
+//        public const int GL_VERTEX_ATTRIB_ARRAY9_NV = 0x8659;
+//        public const int GL_VERTEX_ATTRIB_ARRAY10_NV = 0x865A;
+//        public const int GL_VERTEX_ATTRIB_ARRAY11_NV = 0x865B;
+//        public const int GL_VERTEX_ATTRIB_ARRAY12_NV = 0x865C;
+//        public const int GL_VERTEX_ATTRIB_ARRAY13_NV = 0x865D;
+//        public const int GL_VERTEX_ATTRIB_ARRAY14_NV = 0x865E;
+//        public const int GL_VERTEX_ATTRIB_ARRAY15_NV = 0x865F;
+//        public const int GL_MAP1_VERTEX_ATTRIB0_4_NV = 0x8660;
+//        public const int GL_MAP1_VERTEX_ATTRIB1_4_NV = 0x8661;
+//        public const int GL_MAP1_VERTEX_ATTRIB2_4_NV = 0x8662;
+//        public const int GL_MAP1_VERTEX_ATTRIB3_4_NV = 0x8663;
+//        public const int GL_MAP1_VERTEX_ATTRIB4_4_NV = 0x8664;
+//        public const int GL_MAP1_VERTEX_ATTRIB5_4_NV = 0x8665;
+//        public const int GL_MAP1_VERTEX_ATTRIB6_4_NV = 0x8666;
+//        public const int GL_MAP1_VERTEX_ATTRIB7_4_NV = 0x8667;
+//        public const int GL_MAP1_VERTEX_ATTRIB8_4_NV = 0x8668;
+//        public const int GL_MAP1_VERTEX_ATTRIB9_4_NV = 0x8669;
+//        public const int GL_MAP1_VERTEX_ATTRIB10_4_NV = 0x866A;
+//        public const int GL_MAP1_VERTEX_ATTRIB11_4_NV = 0x866B;
+//        public const int GL_MAP1_VERTEX_ATTRIB12_4_NV = 0x866C;
+//        public const int GL_MAP1_VERTEX_ATTRIB13_4_NV = 0x866D;
+//        public const int GL_MAP1_VERTEX_ATTRIB14_4_NV = 0x866E;
+//        public const int GL_MAP1_VERTEX_ATTRIB15_4_NV = 0x866F;
+//        public const int GL_MAP2_VERTEX_ATTRIB0_4_NV = 0x8670;
+//        public const int GL_MAP2_VERTEX_ATTRIB1_4_NV = 0x8671;
+//        public const int GL_MAP2_VERTEX_ATTRIB2_4_NV = 0x8672;
+//        public const int GL_MAP2_VERTEX_ATTRIB3_4_NV = 0x8673;
+//        public const int GL_MAP2_VERTEX_ATTRIB4_4_NV = 0x8674;
+//        public const int GL_MAP2_VERTEX_ATTRIB5_4_NV = 0x8675;
+//        public const int GL_MAP2_VERTEX_ATTRIB6_4_NV = 0x8676;
+//        public const int GL_MAP2_VERTEX_ATTRIB7_4_NV = 0x8677;
+//        public const int GL_MAP2_VERTEX_ATTRIB8_4_NV = 0x8678;
+//        public const int GL_MAP2_VERTEX_ATTRIB9_4_NV = 0x8679;
+//        public const int GL_MAP2_VERTEX_ATTRIB10_4_NV = 0x867A;
+//        public const int GL_MAP2_VERTEX_ATTRIB11_4_NV = 0x867B;
+//        public const int GL_MAP2_VERTEX_ATTRIB12_4_NV = 0x867C;
+//        public const int GL_MAP2_VERTEX_ATTRIB13_4_NV = 0x867D;
+//        public const int GL_MAP2_VERTEX_ATTRIB14_4_NV = 0x867E;
+//        public const int GL_MAP2_VERTEX_ATTRIB15_4_NV = 0x867F;
+//        public const int GL_NV_vertex_program1_1 = 1;
+//        public const int GL_NV_vertex_program2 = 1;
+//        public const int GL_NV_vertex_program2_option = 1;
+//        public const int GL_NV_vertex_program3 = 1;
+//        public const int GL_NV_vertex_program4 = 1;
+//        public const int GL_VERTEX_ATTRIB_ARRAY_INTEGER_NV = 0x88FD;
+//        public const int GL_NV_video_capture = 1;
+//        public const int GL_VIDEO_BUFFER_NV = 0x9020;
+//        public const int GL_VIDEO_BUFFER_BINDING_NV = 0x9021;
+//        public const int GL_FIELD_UPPER_NV = 0x9022;
+//        public const int GL_FIELD_LOWER_NV = 0x9023;
+//        public const int GL_NUM_VIDEO_CAPTURE_STREAMS_NV = 0x9024;
+//        public const int GL_NEXT_VIDEO_CAPTURE_BUFFER_STATUS_NV = 0x9025;
+//        public const int GL_VIDEO_CAPTURE_TO_422_SUPPORTED_NV = 0x9026;
+//        public const int GL_LAST_VIDEO_CAPTURE_STATUS_NV = 0x9027;
+//        public const int GL_VIDEO_BUFFER_PITCH_NV = 0x9028;
+//        public const int GL_VIDEO_COLOR_CONVERSION_MATRIX_NV = 0x9029;
+//        public const int GL_VIDEO_COLOR_CONVERSION_MAX_NV = 0x902A;
+//        public const int GL_VIDEO_COLOR_CONVERSION_MIN_NV = 0x902B;
+//        public const int GL_VIDEO_COLOR_CONVERSION_OFFSET_NV = 0x902C;
+//        public const int GL_VIDEO_BUFFER_INTERNAL_FORMAT_NV = 0x902D;
+//        public const int GL_PARTIAL_SUCCESS_NV = 0x902E;
+//        public const int GL_SUCCESS_NV = 0x902F;
+//        public const int GL_FAILURE_NV = 0x9030;
+//        public const int GL_YCBYCR8_422_NV = 0x9031;
+//        public const int GL_YCBAYCR8A_4224_NV = 0x9032;
+//        public const int GL_Z6Y10Z6CB10Z6Y10Z6CR10_422_NV = 0x9033;
+//        public const int GL_Z6Y10Z6CB10Z6A10Z6Y10Z6CR10Z6A10_4224_NV = 0x9034;
+//        public const int GL_Z4Y12Z4CB12Z4Y12Z4CR12_422_NV = 0x9035;
+//        public const int GL_Z4Y12Z4CB12Z4A12Z4Y12Z4CR12Z4A12_4224_NV = 0x9036;
+//        public const int GL_Z4Y12Z4CB12Z4CR12_444_NV = 0x9037;
+//        public const int GL_VIDEO_CAPTURE_FRAME_WIDTH_NV = 0x9038;
+//        public const int GL_VIDEO_CAPTURE_FRAME_HEIGHT_NV = 0x9039;
+//        public const int GL_VIDEO_CAPTURE_FIELD_UPPER_HEIGHT_NV = 0x903A;
+//        public const int GL_VIDEO_CAPTURE_FIELD_LOWER_HEIGHT_NV = 0x903B;
+//        public const int GL_VIDEO_CAPTURE_SURFACE_ORIGIN_NV = 0x903C;
+//        public const int GL_NV_viewport_array2 = 1;
+//        public const int GL_NV_viewport_swizzle = 1;
+//        public const int GL_VIEWPORT_SWIZZLE_POSITIVE_X_NV = 0x9350;
+//        public const int GL_VIEWPORT_SWIZZLE_NEGATIVE_X_NV = 0x9351;
+//        public const int GL_VIEWPORT_SWIZZLE_POSITIVE_Y_NV = 0x9352;
+//        public const int GL_VIEWPORT_SWIZZLE_NEGATIVE_Y_NV = 0x9353;
+//        public const int GL_VIEWPORT_SWIZZLE_POSITIVE_Z_NV = 0x9354;
+//        public const int GL_VIEWPORT_SWIZZLE_NEGATIVE_Z_NV = 0x9355;
+//        public const int GL_VIEWPORT_SWIZZLE_POSITIVE_W_NV = 0x9356;
+//        public const int GL_VIEWPORT_SWIZZLE_NEGATIVE_W_NV = 0x9357;
+//        public const int GL_VIEWPORT_SWIZZLE_X_NV = 0x9358;
+//        public const int GL_VIEWPORT_SWIZZLE_Y_NV = 0x9359;
+//        public const int GL_VIEWPORT_SWIZZLE_Z_NV = 0x935A;
+//        public const int GL_VIEWPORT_SWIZZLE_W_NV = 0x935B;
+//        public const int GL_OML_interlace = 1;
+//        public const int GL_INTERLACE_OML = 0x8980;
+//        public const int GL_INTERLACE_READ_OML = 0x8981;
+//        public const int GL_OML_resample = 1;
+//        public const int GL_PACK_RESAMPLE_OML = 0x8984;
+//        public const int GL_UNPACK_RESAMPLE_OML = 0x8985;
+//        public const int GL_RESAMPLE_REPLICATE_OML = 0x8986;
+//        public const int GL_RESAMPLE_ZERO_FILL_OML = 0x8987;
+//        public const int GL_RESAMPLE_AVERAGE_OML = 0x8988;
+//        public const int GL_RESAMPLE_DECIMATE_OML = 0x8989;
+//        public const int GL_OML_subsample = 1;
+//        public const int GL_FORMAT_SUBSAMPLE_24_24_OML = 0x8982;
+//        public const int GL_FORMAT_SUBSAMPLE_244_244_OML = 0x8983;
+//        public const int GL_OVR_multiview = 1;
+//        public const int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_NUM_VIEWS_OVR = 0x9630;
+//        public const int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_BASE_VIEW_INDEX_OVR = 0x9632;
+//        public const int GL_MAX_VIEWS_OVR = 0x9631;
+//        public const int GL_FRAMEBUFFER_INCOMPLETE_VIEW_TARGETS_OVR = 0x9633;
+//        public const int GL_OVR_multiview2 = 1;
+//        public const int GL_PGI_misc_hints = 1;
+//        public const int GL_PREFER_DOUBLEBUFFER_HINT_PGI = 0x1A1F8;
+//        public const int GL_CONSERVE_MEMORY_HINT_PGI = 0x1A1FD;
+//        public const int GL_RECLAIM_MEMORY_HINT_PGI = 0x1A1FE;
+//        public const int GL_NATIVE_GRAPHICS_HANDLE_PGI = 0x1A202;
+//        public const int GL_NATIVE_GRAPHICS_BEGIN_HINT_PGI = 0x1A203;
+//        public const int GL_NATIVE_GRAPHICS_END_HINT_PGI = 0x1A204;
+//        public const int GL_ALWAYS_FAST_HINT_PGI = 0x1A20C;
+//        public const int GL_ALWAYS_SOFT_HINT_PGI = 0x1A20D;
+//        public const int GL_ALLOW_DRAW_OBJ_HINT_PGI = 0x1A20E;
+//        public const int GL_ALLOW_DRAW_WIN_HINT_PGI = 0x1A20F;
+//        public const int GL_ALLOW_DRAW_FRG_HINT_PGI = 0x1A210;
+//        public const int GL_ALLOW_DRAW_MEM_HINT_PGI = 0x1A211;
+//        public const int GL_STRICT_DEPTHFUNC_HINT_PGI = 0x1A216;
+//        public const int GL_STRICT_LIGHTING_HINT_PGI = 0x1A217;
+//        public const int GL_STRICT_SCISSOR_HINT_PGI = 0x1A218;
+//        public const int GL_FULL_STIPPLE_HINT_PGI = 0x1A219;
+//        public const int GL_CLIP_NEAR_HINT_PGI = 0x1A220;
+//        public const int GL_CLIP_FAR_HINT_PGI = 0x1A221;
+//        public const int GL_WIDE_LINE_HINT_PGI = 0x1A222;
+//        public const int GL_BACK_NORMALS_HINT_PGI = 0x1A223;
+//        public const int GL_PGI_vertex_hints = 1;
+//        public const int GL_VERTEX_DATA_HINT_PGI = 0x1A22A;
+//        public const int GL_VERTEX_CONSISTENT_HINT_PGI = 0x1A22B;
+//        public const int GL_MATERIAL_SIDE_HINT_PGI = 0x1A22C;
+//        public const int GL_MAX_VERTEX_HINT_PGI = 0x1A22D;
+//        public const int GL_COLOR3_BIT_PGI = 0x00010000;
+//        public const int GL_COLOR4_BIT_PGI = 0x00020000;
+//        public const int GL_EDGEFLAG_BIT_PGI = 0x00040000;
+//        public const int GL_INDEX_BIT_PGI = 0x00080000;
+//        public const int GL_MAT_AMBIENT_BIT_PGI = 0x00100000;
+//        public const int GL_MAT_AMBIENT_AND_DIFFUSE_BIT_PGI = 0x00200000;
+//        public const int GL_MAT_DIFFUSE_BIT_PGI = 0x00400000;
+//        public const int GL_MAT_EMISSION_BIT_PGI = 0x00800000;
+//        public const int GL_MAT_COLOR_INDEXES_BIT_PGI = 0x01000000;
+//        public const int GL_MAT_SHININESS_BIT_PGI = 0x02000000;
+//        public const int GL_MAT_SPECULAR_BIT_PGI = 0x04000000;
+//        public const int GL_NORMAL_BIT_PGI = 0x08000000;
+//        public const int GL_TEXCOORD1_BIT_PGI = 0x10000000;
+//        public const int GL_TEXCOORD2_BIT_PGI = 0x20000000;
+//        public const int GL_TEXCOORD3_BIT_PGI = 0x40000000;
+//        public const int GL_TEXCOORD4_BIT_PGI = unchecked((int)0x80000000);
+//        public const int GL_VERTEX23_BIT_PGI = 0x00000004;
+//        public const int GL_VERTEX4_BIT_PGI = 0x00000008;
+//        public const int GL_REND_screen_coordinates = 1;
+//        public const int GL_SCREEN_COORDINATES_REND = 0x8490;
+//        public const int GL_INVERTED_SCREEN_W_REND = 0x8491;
+//        public const int GL_S3_s3tc = 1;
+//        public const int GL_RGB_S3TC = 0x83A0;
+//        public const int GL_RGB4_S3TC = 0x83A1;
+//        public const int GL_RGBA_S3TC = 0x83A2;
+//        public const int GL_RGBA4_S3TC = 0x83A3;
+//        public const int GL_RGBA_DXT5_S3TC = 0x83A4;
+//        public const int GL_RGBA4_DXT5_S3TC = 0x83A5;
+//        public const int GL_SGIS_detail_texture = 1;
+//        public const int GL_DETAIL_TEXTURE_2D_SGIS = 0x8095;
+//        public const int GL_DETAIL_TEXTURE_2D_BINDING_SGIS = 0x8096;
+//        public const int GL_LINEAR_DETAIL_SGIS = 0x8097;
+//        public const int GL_LINEAR_DETAIL_ALPHA_SGIS = 0x8098;
+//        public const int GL_LINEAR_DETAIL_COLOR_SGIS = 0x8099;
+//        public const int GL_DETAIL_TEXTURE_LEVEL_SGIS = 0x809A;
+//        public const int GL_DETAIL_TEXTURE_MODE_SGIS = 0x809B;
+//        public const int GL_DETAIL_TEXTURE_FUNC_POINTS_SGIS = 0x809C;
+//        public const int GL_SGIS_fog_function = 1;
+//        public const int GL_FOG_FUNC_SGIS = 0x812A;
+//        public const int GL_FOG_FUNC_POINTS_SGIS = 0x812B;
+//        public const int GL_MAX_FOG_FUNC_POINTS_SGIS = 0x812C;
+//        public const int GL_SGIS_generate_mipmap = 1;
+//        public const int GL_GENERATE_MIPMAP_SGIS = 0x8191;
+//        public const int GL_GENERATE_MIPMAP_HINT_SGIS = 0x8192;
+//        public const int GL_SGIS_multisample = 1;
+//        public const int GL_MULTISAMPLE_SGIS = 0x809D;
+//        public const int GL_SAMPLE_ALPHA_TO_MASK_SGIS = 0x809E;
+//        public const int GL_SAMPLE_ALPHA_TO_ONE_SGIS = 0x809F;
+//        public const int GL_SAMPLE_MASK_SGIS = 0x80A0;
+//        public const int GL_1PASS_SGIS = 0x80A1;
+//        public const int GL_2PASS_0_SGIS = 0x80A2;
+//        public const int GL_2PASS_1_SGIS = 0x80A3;
+//        public const int GL_4PASS_0_SGIS = 0x80A4;
+//        public const int GL_4PASS_1_SGIS = 0x80A5;
+//        public const int GL_4PASS_2_SGIS = 0x80A6;
+//        public const int GL_4PASS_3_SGIS = 0x80A7;
+//        public const int GL_SAMPLE_BUFFERS_SGIS = 0x80A8;
+//        public const int GL_SAMPLES_SGIS = 0x80A9;
+//        public const int GL_SAMPLE_MASK_VALUE_SGIS = 0x80AA;
+//        public const int GL_SAMPLE_MASK_INVERT_SGIS = 0x80AB;
+//        public const int GL_SAMPLE_PATTERN_SGIS = 0x80AC;
+//        public const int GL_SGIS_pixel_texture = 1;
+//        public const int GL_PIXEL_TEXTURE_SGIS = 0x8353;
+//        public const int GL_PIXEL_FRAGMENT_RGB_SOURCE_SGIS = 0x8354;
+//        public const int GL_PIXEL_FRAGMENT_ALPHA_SOURCE_SGIS = 0x8355;
+//        public const int GL_PIXEL_GROUP_COLOR_SGIS = 0x8356;
+//        public const int GL_SGIS_point_line_texgen = 1;
+//        public const int GL_EYE_DISTANCE_TO_POINT_SGIS = 0x81F0;
+//        public const int GL_OBJECT_DISTANCE_TO_POINT_SGIS = 0x81F1;
+//        public const int GL_EYE_DISTANCE_TO_LINE_SGIS = 0x81F2;
+//        public const int GL_OBJECT_DISTANCE_TO_LINE_SGIS = 0x81F3;
+//        public const int GL_EYE_POINT_SGIS = 0x81F4;
+//        public const int GL_OBJECT_POINT_SGIS = 0x81F5;
+//        public const int GL_EYE_LINE_SGIS = 0x81F6;
+//        public const int GL_OBJECT_LINE_SGIS = 0x81F7;
+//        public const int GL_SGIS_point_parameters = 1;
+//        public const int GL_POINT_SIZE_MIN_SGIS = 0x8126;
+//        public const int GL_POINT_SIZE_MAX_SGIS = 0x8127;
+//        public const int GL_POINT_FADE_THRESHOLD_SIZE_SGIS = 0x8128;
+//        public const int GL_DISTANCE_ATTENUATION_SGIS = 0x8129;
+//        public const int GL_SGIS_sharpen_texture = 1;
+//        public const int GL_LINEAR_SHARPEN_SGIS = 0x80AD;
+//        public const int GL_LINEAR_SHARPEN_ALPHA_SGIS = 0x80AE;
+//        public const int GL_LINEAR_SHARPEN_COLOR_SGIS = 0x80AF;
+//        public const int GL_SHARPEN_TEXTURE_FUNC_POINTS_SGIS = 0x80B0;
+//        public const int GL_SGIS_texture4D = 1;
+//        public const int GL_PACK_SKIP_VOLUMES_SGIS = 0x8130;
+//        public const int GL_PACK_IMAGE_DEPTH_SGIS = 0x8131;
+//        public const int GL_UNPACK_SKIP_VOLUMES_SGIS = 0x8132;
+//        public const int GL_UNPACK_IMAGE_DEPTH_SGIS = 0x8133;
+//        public const int GL_TEXTURE_4D_SGIS = 0x8134;
+//        public const int GL_PROXY_TEXTURE_4D_SGIS = 0x8135;
+//        public const int GL_TEXTURE_4DSIZE_SGIS = 0x8136;
+//        public const int GL_TEXTURE_WRAP_Q_SGIS = 0x8137;
+//        public const int GL_MAX_4D_TEXTURE_SIZE_SGIS = 0x8138;
+//        public const int GL_TEXTURE_4D_BINDING_SGIS = 0x814F;
+//        public const int GL_SGIS_texture_border_clamp = 1;
+//        public const int GL_CLAMP_TO_BORDER_SGIS = 0x812D;
+//        public const int GL_SGIS_texture_color_mask = 1;
+//        public const int GL_TEXTURE_COLOR_WRITEMASK_SGIS = 0x81EF;
+//        public const int GL_SGIS_texture_edge_clamp = 1;
+//        public const int GL_CLAMP_TO_EDGE_SGIS = 0x812F;
+//        public const int GL_SGIS_texture_filter4 = 1;
+//        public const int GL_FILTER4_SGIS = 0x8146;
+//        public const int GL_TEXTURE_FILTER4_SIZE_SGIS = 0x8147;
+//        public const int GL_SGIS_texture_lod = 1;
+//        public const int GL_TEXTURE_MIN_LOD_SGIS = 0x813A;
+//        public const int GL_TEXTURE_MAX_LOD_SGIS = 0x813B;
+//        public const int GL_TEXTURE_BASE_LEVEL_SGIS = 0x813C;
+//        public const int GL_TEXTURE_MAX_LEVEL_SGIS = 0x813D;
+//        public const int GL_SGIS_texture_select = 1;
+//        public const int GL_DUAL_ALPHA4_SGIS = 0x8110;
+//        public const int GL_DUAL_ALPHA8_SGIS = 0x8111;
+//        public const int GL_DUAL_ALPHA12_SGIS = 0x8112;
+//        public const int GL_DUAL_ALPHA16_SGIS = 0x8113;
+//        public const int GL_DUAL_LUMINANCE4_SGIS = 0x8114;
+//        public const int GL_DUAL_LUMINANCE8_SGIS = 0x8115;
+//        public const int GL_DUAL_LUMINANCE12_SGIS = 0x8116;
+//        public const int GL_DUAL_LUMINANCE16_SGIS = 0x8117;
+//        public const int GL_DUAL_INTENSITY4_SGIS = 0x8118;
+//        public const int GL_DUAL_INTENSITY8_SGIS = 0x8119;
+//        public const int GL_DUAL_INTENSITY12_SGIS = 0x811A;
+//        public const int GL_DUAL_INTENSITY16_SGIS = 0x811B;
+//        public const int GL_DUAL_LUMINANCE_ALPHA4_SGIS = 0x811C;
+//        public const int GL_DUAL_LUMINANCE_ALPHA8_SGIS = 0x811D;
+//        public const int GL_QUAD_ALPHA4_SGIS = 0x811E;
+//        public const int GL_QUAD_ALPHA8_SGIS = 0x811F;
+//        public const int GL_QUAD_LUMINANCE4_SGIS = 0x8120;
+//        public const int GL_QUAD_LUMINANCE8_SGIS = 0x8121;
+//        public const int GL_QUAD_INTENSITY4_SGIS = 0x8122;
+//        public const int GL_QUAD_INTENSITY8_SGIS = 0x8123;
+//        public const int GL_DUAL_TEXTURE_SELECT_SGIS = 0x8124;
+//        public const int GL_QUAD_TEXTURE_SELECT_SGIS = 0x8125;
+//        public const int GL_SGIX_async = 1;
+//        public const int GL_ASYNC_MARKER_SGIX = 0x8329;
+//        public const int GL_SGIX_async_histogram = 1;
+//        public const int GL_ASYNC_HISTOGRAM_SGIX = 0x832C;
+//        public const int GL_MAX_ASYNC_HISTOGRAM_SGIX = 0x832D;
+//        public const int GL_SGIX_async_pixel = 1;
+//        public const int GL_ASYNC_TEX_IMAGE_SGIX = 0x835C;
+//        public const int GL_ASYNC_DRAW_PIXELS_SGIX = 0x835D;
+//        public const int GL_ASYNC_READ_PIXELS_SGIX = 0x835E;
+//        public const int GL_MAX_ASYNC_TEX_IMAGE_SGIX = 0x835F;
+//        public const int GL_MAX_ASYNC_DRAW_PIXELS_SGIX = 0x8360;
+//        public const int GL_MAX_ASYNC_READ_PIXELS_SGIX = 0x8361;
+//        public const int GL_SGIX_blend_alpha_minmax = 1;
+//        public const int GL_ALPHA_MIN_SGIX = 0x8320;
+//        public const int GL_ALPHA_MAX_SGIX = 0x8321;
+//        public const int GL_SGIX_calligraphic_fragment = 1;
+//        public const int GL_CALLIGRAPHIC_FRAGMENT_SGIX = 0x8183;
+//        public const int GL_SGIX_clipmap = 1;
+//        public const int GL_LINEAR_CLIPMAP_LINEAR_SGIX = 0x8170;
+//        public const int GL_TEXTURE_CLIPMAP_CENTER_SGIX = 0x8171;
+//        public const int GL_TEXTURE_CLIPMAP_FRAME_SGIX = 0x8172;
+//        public const int GL_TEXTURE_CLIPMAP_OFFSET_SGIX = 0x8173;
+//        public const int GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX = 0x8174;
+//        public const int GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX = 0x8175;
+//        public const int GL_TEXTURE_CLIPMAP_DEPTH_SGIX = 0x8176;
+//        public const int GL_MAX_CLIPMAP_DEPTH_SGIX = 0x8177;
+//        public const int GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX = 0x8178;
+//        public const int GL_NEAREST_CLIPMAP_NEAREST_SGIX = 0x844D;
+//        public const int GL_NEAREST_CLIPMAP_LINEAR_SGIX = 0x844E;
+//        public const int GL_LINEAR_CLIPMAP_NEAREST_SGIX = 0x844F;
+//        public const int GL_SGIX_convolution_accuracy = 1;
+//        public const int GL_CONVOLUTION_HINT_SGIX = 0x8316;
+//        public const int GL_SGIX_depth_pass_instrument = 1;
+//        public const int GL_SGIX_depth_texture = 1;
+//        public const int GL_DEPTH_COMPONENT16_SGIX = 0x81A5;
+//        public const int GL_DEPTH_COMPONENT24_SGIX = 0x81A6;
+//        public const int GL_DEPTH_COMPONENT32_SGIX = 0x81A7;
+//        public const int GL_SGIX_flush_raster = 1;
+//        public const int GL_SGIX_fog_offset = 1;
+//        public const int GL_FOG_OFFSET_SGIX = 0x8198;
+//        public const int GL_FOG_OFFSET_VALUE_SGIX = 0x8199;
+//        public const int GL_SGIX_fragment_lighting = 1;
+//        public const int GL_FRAGMENT_LIGHTING_SGIX = 0x8400;
+//        public const int GL_FRAGMENT_COLOR_MATERIAL_SGIX = 0x8401;
+//        public const int GL_FRAGMENT_COLOR_MATERIAL_FACE_SGIX = 0x8402;
+//        public const int GL_FRAGMENT_COLOR_MATERIAL_PARAMETER_SGIX = 0x8403;
+//        public const int GL_MAX_FRAGMENT_LIGHTS_SGIX = 0x8404;
+//        public const int GL_MAX_ACTIVE_LIGHTS_SGIX = 0x8405;
+//        public const int GL_CURRENT_RASTER_NORMAL_SGIX = 0x8406;
+//        public const int GL_LIGHT_ENV_MODE_SGIX = 0x8407;
+//        public const int GL_FRAGMENT_LIGHT_MODEL_LOCAL_VIEWER_SGIX = 0x8408;
+//        public const int GL_FRAGMENT_LIGHT_MODEL_TWO_SIDE_SGIX = 0x8409;
+//        public const int GL_FRAGMENT_LIGHT_MODEL_AMBIENT_SGIX = 0x840A;
+//        public const int GL_FRAGMENT_LIGHT_MODEL_NORMAL_INTERPOLATION_SGIX = 0x840B;
+//        public const int GL_FRAGMENT_LIGHT0_SGIX = 0x840C;
+//        public const int GL_FRAGMENT_LIGHT1_SGIX = 0x840D;
+//        public const int GL_FRAGMENT_LIGHT2_SGIX = 0x840E;
+//        public const int GL_FRAGMENT_LIGHT3_SGIX = 0x840F;
+//        public const int GL_FRAGMENT_LIGHT4_SGIX = 0x8410;
+//        public const int GL_FRAGMENT_LIGHT5_SGIX = 0x8411;
+//        public const int GL_FRAGMENT_LIGHT6_SGIX = 0x8412;
+//        public const int GL_FRAGMENT_LIGHT7_SGIX = 0x8413;
+//        public const int GL_SGIX_framezoom = 1;
+//        public const int GL_FRAMEZOOM_SGIX = 0x818B;
+//        public const int GL_FRAMEZOOM_FACTOR_SGIX = 0x818C;
+//        public const int GL_MAX_FRAMEZOOM_FACTOR_SGIX = 0x818D;
+//        public const int GL_SGIX_igloo_interface = 1;
+//        public const int GL_SGIX_instruments = 1;
+//        public const int GL_INSTRUMENT_BUFFER_POINTER_SGIX = 0x8180;
+//        public const int GL_INSTRUMENT_MEASUREMENTS_SGIX = 0x8181;
+//        public const int GL_SGIX_interlace = 1;
+//        public const int GL_INTERLACE_SGIX = 0x8094;
+//        public const int GL_SGIX_ir_instrument1 = 1;
+//        public const int GL_IR_INSTRUMENT1_SGIX = 0x817F;
+//        public const int GL_SGIX_list_priority = 1;
+//        public const int GL_LIST_PRIORITY_SGIX = 0x8182;
+//        public const int GL_SGIX_pixel_texture = 1;
+//        public const int GL_PIXEL_TEX_GEN_SGIX = 0x8139;
+//        public const int GL_PIXEL_TEX_GEN_MODE_SGIX = 0x832B;
+//        public const int GL_SGIX_pixel_tiles = 1;
+//        public const int GL_PIXEL_TILE_BEST_ALIGNMENT_SGIX = 0x813E;
+//        public const int GL_PIXEL_TILE_CACHE_INCREMENT_SGIX = 0x813F;
+//        public const int GL_PIXEL_TILE_WIDTH_SGIX = 0x8140;
+//        public const int GL_PIXEL_TILE_HEIGHT_SGIX = 0x8141;
+//        public const int GL_PIXEL_TILE_GRID_WIDTH_SGIX = 0x8142;
+//        public const int GL_PIXEL_TILE_GRID_HEIGHT_SGIX = 0x8143;
+//        public const int GL_PIXEL_TILE_GRID_DEPTH_SGIX = 0x8144;
+//        public const int GL_PIXEL_TILE_CACHE_SIZE_SGIX = 0x8145;
+//        public const int GL_SGIX_polynomial_ffd = 1;
+//        public const int GL_TEXTURE_DEFORMATION_BIT_SGIX = 0x00000001;
+//        public const int GL_GEOMETRY_DEFORMATION_BIT_SGIX = 0x00000002;
+//        public const int GL_GEOMETRY_DEFORMATION_SGIX = 0x8194;
+//        public const int GL_TEXTURE_DEFORMATION_SGIX = 0x8195;
+//        public const int GL_DEFORMATIONS_MASK_SGIX = 0x8196;
+//        public const int GL_MAX_DEFORMATION_ORDER_SGIX = 0x8197;
+//        public const int GL_SGIX_reference_plane = 1;
+//        public const int GL_REFERENCE_PLANE_SGIX = 0x817D;
+//        public const int GL_REFERENCE_PLANE_EQUATION_SGIX = 0x817E;
+//        public const int GL_SGIX_resample = 1;
+//        public const int GL_PACK_RESAMPLE_SGIX = 0x842E;
+//        public const int GL_UNPACK_RESAMPLE_SGIX = 0x842F;
+//        public const int GL_RESAMPLE_REPLICATE_SGIX = 0x8433;
+//        public const int GL_RESAMPLE_ZERO_FILL_SGIX = 0x8434;
+//        public const int GL_RESAMPLE_DECIMATE_SGIX = 0x8430;
+//        public const int GL_SGIX_scalebias_hint = 1;
+//        public const int GL_SCALEBIAS_HINT_SGIX = 0x8322;
+//        public const int GL_SGIX_shadow = 1;
+//        public const int GL_TEXTURE_COMPARE_SGIX = 0x819A;
+//        public const int GL_TEXTURE_COMPARE_OPERATOR_SGIX = 0x819B;
+//        public const int GL_TEXTURE_LEQUAL_R_SGIX = 0x819C;
+//        public const int GL_TEXTURE_GEQUAL_R_SGIX = 0x819D;
+//        public const int GL_SGIX_shadow_ambient = 1;
+//        public const int GL_SHADOW_AMBIENT_SGIX = 0x80BF;
+//        public const int GL_SGIX_sprite = 1;
+//        public const int GL_SPRITE_SGIX = 0x8148;
+//        public const int GL_SPRITE_MODE_SGIX = 0x8149;
+//        public const int GL_SPRITE_AXIS_SGIX = 0x814A;
+//        public const int GL_SPRITE_TRANSLATION_SGIX = 0x814B;
+//        public const int GL_SPRITE_AXIAL_SGIX = 0x814C;
+//        public const int GL_SPRITE_OBJECT_ALIGNED_SGIX = 0x814D;
+//        public const int GL_SPRITE_EYE_ALIGNED_SGIX = 0x814E;
+//        public const int GL_SGIX_subsample = 1;
+//        public const int GL_PACK_SUBSAMPLE_RATE_SGIX = 0x85A0;
+//        public const int GL_UNPACK_SUBSAMPLE_RATE_SGIX = 0x85A1;
+//        public const int GL_PIXEL_SUBSAMPLE_4444_SGIX = 0x85A2;
+//        public const int GL_PIXEL_SUBSAMPLE_2424_SGIX = 0x85A3;
+//        public const int GL_PIXEL_SUBSAMPLE_4242_SGIX = 0x85A4;
+//        public const int GL_SGIX_tag_sample_buffer = 1;
+//        public const int GL_SGIX_texture_add_env = 1;
+//        public const int GL_TEXTURE_ENV_BIAS_SGIX = 0x80BE;
+//        public const int GL_SGIX_texture_coordinate_clamp = 1;
+//        public const int GL_TEXTURE_MAX_CLAMP_S_SGIX = 0x8369;
+//        public const int GL_TEXTURE_MAX_CLAMP_T_SGIX = 0x836A;
+//        public const int GL_TEXTURE_MAX_CLAMP_R_SGIX = 0x836B;
+//        public const int GL_SGIX_texture_lod_bias = 1;
+//        public const int GL_TEXTURE_LOD_BIAS_S_SGIX = 0x818E;
+//        public const int GL_TEXTURE_LOD_BIAS_T_SGIX = 0x818F;
+//        public const int GL_TEXTURE_LOD_BIAS_R_SGIX = 0x8190;
+//        public const int GL_SGIX_texture_multi_buffer = 1;
+//        public const int GL_TEXTURE_MULTI_BUFFER_HINT_SGIX = 0x812E;
+//        public const int GL_SGIX_texture_scale_bias = 1;
+//        public const int GL_POST_TEXTURE_FILTER_BIAS_SGIX = 0x8179;
+//        public const int GL_POST_TEXTURE_FILTER_SCALE_SGIX = 0x817A;
+//        public const int GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX = 0x817B;
+//        public const int GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX = 0x817C;
+//        public const int GL_SGIX_vertex_preclip = 1;
+//        public const int GL_VERTEX_PRECLIP_SGIX = 0x83EE;
+//        public const int GL_VERTEX_PRECLIP_HINT_SGIX = 0x83EF;
+//        public const int GL_SGIX_ycrcb = 1;
+//        public const int GL_YCRCB_422_SGIX = 0x81BB;
+//        public const int GL_YCRCB_444_SGIX = 0x81BC;
+//        public const int GL_SGIX_ycrcb_subsample = 1;
+//        public const int GL_SGIX_ycrcba = 1;
+//        public const int GL_YCRCB_SGIX = 0x8318;
+//        public const int GL_YCRCBA_SGIX = 0x8319;
+//        public const int GL_SGI_color_matrix = 1;
+//        public const int GL_COLOR_MATRIX_SGI = 0x80B1;
+//        public const int GL_COLOR_MATRIX_STACK_DEPTH_SGI = 0x80B2;
+//        public const int GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI = 0x80B3;
+//        public const int GL_POST_COLOR_MATRIX_RED_SCALE_SGI = 0x80B4;
+//        public const int GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI = 0x80B5;
+//        public const int GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI = 0x80B6;
+//        public const int GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI = 0x80B7;
+//        public const int GL_POST_COLOR_MATRIX_RED_BIAS_SGI = 0x80B8;
+//        public const int GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI = 0x80B9;
+//        public const int GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI = 0x80BA;
+//        public const int GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI = 0x80BB;
+//        public const int GL_SGI_color_table = 1;
+//        public const int GL_COLOR_TABLE_SGI = 0x80D0;
+//        public const int GL_POST_CONVOLUTION_COLOR_TABLE_SGI = 0x80D1;
+//        public const int GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI = 0x80D2;
+//        public const int GL_PROXY_COLOR_TABLE_SGI = 0x80D3;
+//        public const int GL_PROXY_POST_CONVOLUTION_COLOR_TABLE_SGI = 0x80D4;
+//        public const int GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE_SGI = 0x80D5;
+//        public const int GL_COLOR_TABLE_SCALE_SGI = 0x80D6;
+//        public const int GL_COLOR_TABLE_BIAS_SGI = 0x80D7;
+//        public const int GL_COLOR_TABLE_FORMAT_SGI = 0x80D8;
+//        public const int GL_COLOR_TABLE_WIDTH_SGI = 0x80D9;
+//        public const int GL_COLOR_TABLE_RED_SIZE_SGI = 0x80DA;
+//        public const int GL_COLOR_TABLE_GREEN_SIZE_SGI = 0x80DB;
+//        public const int GL_COLOR_TABLE_BLUE_SIZE_SGI = 0x80DC;
+//        public const int GL_COLOR_TABLE_ALPHA_SIZE_SGI = 0x80DD;
+//        public const int GL_COLOR_TABLE_LUMINANCE_SIZE_SGI = 0x80DE;
+//        public const int GL_COLOR_TABLE_INTENSITY_SIZE_SGI = 0x80DF;
+//        public const int GL_SGI_texture_color_table = 1;
+//        public const int GL_TEXTURE_COLOR_TABLE_SGI = 0x80BC;
+//        public const int GL_PROXY_TEXTURE_COLOR_TABLE_SGI = 0x80BD;
+//        public const int GL_SUNX_constant_data = 1;
+//        public const int GL_UNPACK_CONSTANT_DATA_SUNX = 0x81D5;
+//        public const int GL_TEXTURE_CONSTANT_DATA_SUNX = 0x81D6;
+//        public const int GL_SUN_convolution_border_modes = 1;
+//        public const int GL_WRAP_BORDER_SUN = 0x81D4;
+//        public const int GL_SUN_global_alpha = 1;
+//        public const int GL_GLOBAL_ALPHA_SUN = 0x81D9;
+//        public const int GL_GLOBAL_ALPHA_FACTOR_SUN = 0x81DA;
+//        public const int GL_SUN_mesh_array = 1;
+//        public const int GL_QUAD_MESH_SUN = 0x8614;
+//        public const int GL_TRIANGLE_MESH_SUN = 0x8615;
+//        public const int GL_SUN_slice_accum = 1;
+//        public const int GL_SLICE_ACCUM_SUN = 0x85CC;
+//        public const int GL_SUN_triangle_list = 1;
+//        public const int GL_RESTART_SUN = 0x0001;
+//        public const int GL_REPLACE_MIDDLE_SUN = 0x0002;
+//        public const int GL_REPLACE_OLDEST_SUN = 0x0003;
+//        public const int GL_TRIANGLE_LIST_SUN = 0x81D7;
+//        public const int GL_REPLACEMENT_CODE_SUN = 0x81D8;
+//        public const int GL_REPLACEMENT_CODE_ARRAY_SUN = 0x85C0;
+//        public const int GL_REPLACEMENT_CODE_ARRAY_TYPE_SUN = 0x85C1;
+//        public const int GL_REPLACEMENT_CODE_ARRAY_STRIDE_SUN = 0x85C2;
+//        public const int GL_REPLACEMENT_CODE_ARRAY_POINTER_SUN = 0x85C3;
+//        public const int GL_R1UI_V3F_SUN = 0x85C4;
+//        public const int GL_R1UI_C4UB_V3F_SUN = 0x85C5;
+//        public const int GL_R1UI_C3F_V3F_SUN = 0x85C6;
+//        public const int GL_R1UI_N3F_V3F_SUN = 0x85C7;
+//        public const int GL_R1UI_C4F_N3F_V3F_SUN = 0x85C8;
+//        public const int GL_R1UI_T2F_V3F_SUN = 0x85C9;
+//        public const int GL_R1UI_T2F_N3F_V3F_SUN = 0x85CA;
+//        public const int GL_R1UI_T2F_C4F_N3F_V3F_SUN = 0x85CB;
+//        public const int GL_SUN_vertex = 1;
+//        public const int GL_WIN_phong_shading = 1;
+//        public const int GL_PHONG_WIN = 0x80EA;
+//        public const int GL_PHONG_HINT_WIN = 0x80EB;
+//        public const int GL_WIN_specular_fog = 1;
+//        public const int GL_FOG_SPECULAR_TEXTURE_WIN = 0x80EC;
     }
 }

From f0f69f1b5efa0365d607a3b93c18490960f59c77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wies=C5=82aw=20S=CC=8Colte=CC=81s?=
 <wieslaw.soltes@gmail.com>
Date: Sun, 24 Jul 2022 17:53:56 +0200
Subject: [PATCH 143/240] Fix render demo theme

---
 samples/RenderDemo/App.xaml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/samples/RenderDemo/App.xaml b/samples/RenderDemo/App.xaml
index 66d97a6444..8ea792de19 100644
--- a/samples/RenderDemo/App.xaml
+++ b/samples/RenderDemo/App.xaml
@@ -3,6 +3,12 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Application.Styles>
     <FluentTheme />
-    <StyleInclude Source="avares://ControlSamples/HamburgerMenu/HamburgerMenu.xaml" />
   </Application.Styles>
+  <Application.Resources>
+    <ResourceDictionary>
+      <ResourceDictionary.MergedDictionaries>
+        <ResourceInclude Source="avares://ControlSamples/HamburgerMenu/HamburgerMenu.xaml" />
+      </ResourceDictionary.MergedDictionaries>
+    </ResourceDictionary>
+  </Application.Resources>
 </Application>

From 11e3691b83d9bd3309b405fe485aa249fa8a471f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wies=C5=82aw=20S=CC=8Colte=CC=81s?=
 <wieslaw.soltes@gmail.com>
Date: Sun, 24 Jul 2022 18:00:18 +0200
Subject: [PATCH 144/240] Use fluent theme for BindingDemo

---
 samples/BindingDemo/App.xaml           | 4 ++--
 samples/BindingDemo/BindingDemo.csproj | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/samples/BindingDemo/App.xaml b/samples/BindingDemo/App.xaml
index 9260dd280f..3e312c8685 100644
--- a/samples/BindingDemo/App.xaml
+++ b/samples/BindingDemo/App.xaml
@@ -3,7 +3,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:Class="BindingDemo.App">
     <Application.Styles>
-        <StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml"/>
+        <FluentTheme />
         <StyleInclude Source="avares://Avalonia.Themes.Default/Accents/BaseLight.xaml"/>
     </Application.Styles>
-</Application>
\ No newline at end of file
+</Application>
diff --git a/samples/BindingDemo/BindingDemo.csproj b/samples/BindingDemo/BindingDemo.csproj
index bd6054327f..056d3bf552 100644
--- a/samples/BindingDemo/BindingDemo.csproj
+++ b/samples/BindingDemo/BindingDemo.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Themes.Fluent\Avalonia.Themes.Fluent.csproj" />
     <ProjectReference Include="..\..\src\Linux\Avalonia.LinuxFramebuffer\Avalonia.LinuxFramebuffer.csproj" />
     <ProjectReference Include="..\MiniMvvm\MiniMvvm.csproj" />
   </ItemGroup>

From df26a70594a20e59fe2ac80c9b140f71335d2fbc Mon Sep 17 00:00:00 2001
From: robloo <robloo@users.noreply.github.com>
Date: Sun, 24 Jul 2022 15:54:41 -0400
Subject: [PATCH 145/240] Convert ColorPicker Fluent styles to ControlThemes

---
 .../Themes/Default/Default.xaml               |   4 +
 .../Themes/Fluent/ColorPicker.xaml            |  25 +-
 .../Themes/Fluent/ColorPreviewer.xaml         |  23 +-
 .../Themes/Fluent/ColorSlider.xaml            | 346 +++++++++---------
 .../Themes/Fluent/ColorSpectrum.xaml          | 100 ++---
 .../Themes/Fluent/ColorView.xaml              | 165 +++++----
 .../Themes/Fluent/Fluent.xaml                 |  76 ++--
 7 files changed, 375 insertions(+), 364 deletions(-)

diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Default/Default.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Default/Default.xaml
index ebecd65cc3..db1fa3ee4e 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Default/Default.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Default/Default.xaml
@@ -37,4 +37,8 @@
   <StyleInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Default/ColorSlider.xaml" />
   <StyleInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Default/ColorSpectrum.xaml" />
 
+  <!-- Controls -->
+  <!-- Note the ColorPicker and ColorView are unsupported in the default theme -->
+  <!-- These controls depend on fluent styles for TabControl, Button, TextBox, etc. -->
+
 </Styles>
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPicker.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPicker.xaml
index a4d5ff673f..907b00dfff 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPicker.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPicker.xaml
@@ -1,14 +1,13 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:controls="using:Avalonia.Controls"
-        x:CompileBindings="True">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="using:Avalonia.Controls"
+                    x:CompileBindings="True">
 
-  <Styles.Resources>
-    <!-- This must follow OverlayCornerRadius -->
-    <CornerRadius x:Key="TopOverlayCornerRadius">5,5,0,0</CornerRadius>
-  </Styles.Resources>
+  <!-- This must follow OverlayCornerRadius -->
+  <CornerRadius x:Key="TopOverlayCornerRadius">5,5,0,0</CornerRadius>
 
-  <Style Selector="ColorPicker">
+  <ControlTheme x:Key="{x:Type ColorPicker}"
+                TargetType="ColorPicker">
     <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
     <Setter Property="Height" Value="32" />
     <Setter Property="Width" Value="64" />
@@ -80,12 +79,12 @@
         </DropDownButton>
       </ControlTemplate>
     </Setter>
-  </Style>
+  </ControlTheme>
 
   <!-- Adjust Background within Flyout -->
   <!-- Note: This is implemented but there seems to be an issue and the selector can't match across the Flyout -->
-  <Style Selector="ColorPicker /template/ ColorView#FlyoutColorView /template/ Border#TabBackgroundBorder">
+  <!--<Style Selector="ColorPicker /template/ ColorView#FlyoutColorView /template/ Border#TabBackgroundBorder">
     <Setter Property="CornerRadius" Value="{DynamicResource TopOverlayCornerRadius}" />
-  </Style>
+  </Style>-->
 
-</Styles>
+</ResourceDictionary>
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPreviewer.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPreviewer.xaml
index 74f33d1258..1c4a44d081 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPreviewer.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPreviewer.xaml
@@ -1,15 +1,14 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:pc="using:Avalonia.Controls.Primitives.Converters"
-        x:CompileBindings="True">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:pc="using:Avalonia.Controls.Primitives.Converters"
+                    x:CompileBindings="True">
 
-  <Styles.Resources>
-    <pc:AccentColorConverter x:Key="AccentColorConverter" />
-    <x:Double x:Key="ColorPreviewerAccentSectionWidth">80</x:Double>
-    <x:Double x:Key="ColorPreviewerAccentSectionHeight">40</x:Double>
-  </Styles.Resources>
+  <pc:AccentColorConverter x:Key="AccentColorConverter" />
+  <x:Double x:Key="ColorPreviewerAccentSectionWidth">80</x:Double>
+  <x:Double x:Key="ColorPreviewerAccentSectionHeight">40</x:Double>
 
-  <Style Selector="ColorPreviewer">
+  <ControlTheme x:Key="{x:Type ColorPreviewer}"
+                TargetType="ColorPreviewer">
     <Setter Property="Height" Value="70" />
     <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
     <Setter Property="Template">
@@ -97,6 +96,6 @@
         </Panel>
       </ControlTemplate>
     </Setter>
-  </Style>
+  </ControlTheme>
 
-</Styles>
+</ResourceDictionary>
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorSlider.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorSlider.xaml
index 162ac372de..eb67ada334 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorSlider.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorSlider.xaml
@@ -1,188 +1,190 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        x:CompileBindings="True">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    x:CompileBindings="True">
 
-  <Style Selector="Thumb.ColorSliderThumbStyle">
-    <Setter Property="BorderThickness" Value="0" />
+  <ControlTheme x:Key="ColorSliderThumbTheme"
+                TargetType="Thumb">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="BorderBrush" Value="{DynamicResource SystemControlForegroundBaseHighBrush}" />
+    <Setter Property="BorderThickness" Value="3" />
+    <Setter Property="CornerRadius" Value="10" />
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate>
           <Border Background="{TemplateBinding Background}"
                   BorderBrush="{TemplateBinding BorderBrush}"
                   BorderThickness="{TemplateBinding BorderThickness}"
-                  CornerRadius="10" />
+                  CornerRadius="{TemplateBinding CornerRadius}" />
         </ControlTemplate>
       </Setter.Value>
     </Setter>
-  </Style>
+  </ControlTheme>
 
-  <Style Selector="ColorSlider:horizontal">
-    <Setter Property="BorderThickness" Value="0" />
-    <Setter Property="CornerRadius" Value="10" />
-    <Setter Property="Height" Value="20" />
-    <Setter Property="Template">
-      <ControlTemplate TargetType="{x:Type ColorSlider}">
-        <Border BorderThickness="{TemplateBinding BorderThickness}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                CornerRadius="{TemplateBinding CornerRadius}">
-          <Grid Margin="{TemplateBinding Padding}">
-            <Rectangle HorizontalAlignment="Stretch"
-                       VerticalAlignment="Stretch"
-                       Fill="{StaticResource ColorControlCheckeredBackgroundBrush}"
-                       RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadiusConverter}}"
-                       RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadiusConverter}}" />
-            <Rectangle HorizontalAlignment="Stretch"
-                       VerticalAlignment="Stretch"
-                       Fill="{TemplateBinding Background}"
-                       RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadiusConverter}}"
-                       RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadiusConverter}}" />
-            <Track Name="PART_Track"
-                   HorizontalAlignment="Stretch"
-                   VerticalAlignment="Stretch"
-                   Minimum="{TemplateBinding Minimum}"
-                   Maximum="{TemplateBinding Maximum}"
-                   Value="{TemplateBinding Value, Mode=TwoWay}"
-                   IsDirectionReversed="{TemplateBinding IsDirectionReversed}"
-                   Orientation="Horizontal">
-              <Track.DecreaseButton>
-                <RepeatButton Name="PART_DecreaseButton"
-                              Background="Transparent"
-                              Focusable="False"
-                              HorizontalAlignment="Stretch"
-                              VerticalAlignment="Stretch">
-                  <RepeatButton.Template>
-                    <ControlTemplate>
-                      <Border Name="FocusTarget"
-                              Background="Transparent"
-                              Margin="0,-10" />
-                    </ControlTemplate>
-                  </RepeatButton.Template>
-                </RepeatButton>
-              </Track.DecreaseButton>
-              <Track.IncreaseButton>
-                <RepeatButton Name="PART_IncreaseButton"
-                              Background="Transparent"
-                              Focusable="False"
-                              HorizontalAlignment="Stretch"
-                              VerticalAlignment="Stretch">
-                  <RepeatButton.Template>
-                    <ControlTemplate>
-                      <Border Name="FocusTarget"
-                              Background="Transparent"
-                              Margin="0,-10" />
-                    </ControlTemplate>
-                  </RepeatButton.Template>
-                </RepeatButton>
-              </Track.IncreaseButton>
-              <Thumb Classes="ColorSliderThumbStyle"
-                     Name="ColorSliderThumb"
-                     Margin="0"
-                     Padding="0"
-                     DataContext="{TemplateBinding Value}"
-                     Height="{TemplateBinding Height}"
-                     Width="{TemplateBinding Height}" />
-            </Track>
-          </Grid>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
+  <ControlTheme x:Key="{x:Type ColorSlider}"
+                TargetType="ColorSlider">
 
-  <Style Selector="ColorSlider:vertical">
-    <Setter Property="BorderThickness" Value="0" />
-    <Setter Property="CornerRadius" Value="10" />
-    <Setter Property="Width" Value="20" />
-    <Setter Property="Template">
-      <ControlTemplate TargetType="{x:Type ColorSlider}">
-        <Border BorderThickness="{TemplateBinding BorderThickness}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                CornerRadius="{TemplateBinding CornerRadius}">
-          <Grid Margin="{TemplateBinding Padding}">
-            <Rectangle HorizontalAlignment="Stretch"
-                       VerticalAlignment="Stretch"
-                       Fill="{StaticResource ColorControlCheckeredBackgroundBrush}"
-                       RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadiusConverter}}"
-                       RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadiusConverter}}" />
-            <Rectangle HorizontalAlignment="Stretch"
-                       VerticalAlignment="Stretch"
-                       Fill="{TemplateBinding Background}"
-                       RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadiusConverter}}"
-                       RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadiusConverter}}" />
-            <Track Name="PART_Track"
-                   HorizontalAlignment="Stretch"
-                   VerticalAlignment="Stretch"
-                   Minimum="{TemplateBinding Minimum}"
-                   Maximum="{TemplateBinding Maximum}"
-                   Value="{TemplateBinding Value, Mode=TwoWay}"
-                   IsDirectionReversed="{TemplateBinding IsDirectionReversed}"
-                   Orientation="Vertical">
-              <Track.DecreaseButton>
-                <RepeatButton Name="PART_DecreaseButton"
-                              Background="Transparent"
-                              Focusable="False"
-                              HorizontalAlignment="Stretch"
-                              VerticalAlignment="Stretch">
-                  <RepeatButton.Template>
-                    <ControlTemplate>
-                      <Border Name="FocusTarget"
-                              Background="Transparent"
-                              Margin="0,-10" />
-                    </ControlTemplate>
-                  </RepeatButton.Template>
-                </RepeatButton>
-              </Track.DecreaseButton>
-              <Track.IncreaseButton>
-                <RepeatButton Name="PART_IncreaseButton"
-                              Background="Transparent"
-                              Focusable="False"
-                              HorizontalAlignment="Stretch"
-                              VerticalAlignment="Stretch">
-                  <RepeatButton.Template>
-                    <ControlTemplate>
-                      <Border Name="FocusTarget"
-                              Background="Transparent"
-                              Margin="0,-10" />
-                    </ControlTemplate>
-                  </RepeatButton.Template>
-                </RepeatButton>
-              </Track.IncreaseButton>
-              <Thumb Classes="ColorSliderThumbStyle"
-                     Name="ColorSliderThumb"
-                     Margin="0"
-                     Padding="0"
-                     DataContext="{TemplateBinding Value}"
-                     Height="{TemplateBinding Width}"
-                     Width="{TemplateBinding Width}" />
-            </Track>
-          </Grid>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
+    <Style Selector="^:horizontal">
+      <Setter Property="BorderThickness" Value="0" />
+      <Setter Property="CornerRadius" Value="10" />
+      <Setter Property="Height" Value="20" />
+      <Setter Property="Template">
+        <ControlTemplate TargetType="{x:Type ColorSlider}">
+          <Border BorderThickness="{TemplateBinding BorderThickness}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <Grid Margin="{TemplateBinding Padding}">
+              <Rectangle HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         Fill="{StaticResource ColorControlCheckeredBackgroundBrush}"
+                         RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadiusConverter}}"
+                         RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadiusConverter}}" />
+              <Rectangle HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         Fill="{TemplateBinding Background}"
+                         RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadiusConverter}}"
+                         RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadiusConverter}}" />
+              <Track Name="PART_Track"
+                     HorizontalAlignment="Stretch"
+                     VerticalAlignment="Stretch"
+                     Minimum="{TemplateBinding Minimum}"
+                     Maximum="{TemplateBinding Maximum}"
+                     Value="{TemplateBinding Value, Mode=TwoWay}"
+                     IsDirectionReversed="{TemplateBinding IsDirectionReversed}"
+                     Orientation="Horizontal">
+                <Track.DecreaseButton>
+                  <RepeatButton Name="PART_DecreaseButton"
+                                Background="Transparent"
+                                Focusable="False"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch">
+                    <RepeatButton.Template>
+                      <ControlTemplate>
+                        <Border Name="FocusTarget"
+                                Background="Transparent"
+                                Margin="0,-10" />
+                      </ControlTemplate>
+                    </RepeatButton.Template>
+                  </RepeatButton>
+                </Track.DecreaseButton>
+                <Track.IncreaseButton>
+                  <RepeatButton Name="PART_IncreaseButton"
+                                Background="Transparent"
+                                Focusable="False"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch">
+                    <RepeatButton.Template>
+                      <ControlTemplate>
+                        <Border Name="FocusTarget"
+                                Background="Transparent"
+                                Margin="0,-10" />
+                      </ControlTemplate>
+                    </RepeatButton.Template>
+                  </RepeatButton>
+                </Track.IncreaseButton>
+                <Thumb Name="ColorSliderThumb"
+                       Theme="{StaticResource ColorSliderThumbTheme}"
+                       Margin="0"
+                       Padding="0"
+                       DataContext="{TemplateBinding Value}"
+                       Height="{TemplateBinding Height}"
+                       Width="{TemplateBinding Height}" />
+              </Track>
+            </Grid>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+    </Style>
 
-  <!-- Normal State -->
-  <Style Selector="ColorSlider /template/ Thumb.ColorSliderThumbStyle">
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="BorderBrush" Value="{DynamicResource SystemControlForegroundBaseHighBrush}" />
-    <Setter Property="BorderThickness" Value="3" />
-  </Style>
+    <Style Selector="^:vertical">
+      <Setter Property="BorderThickness" Value="0" />
+      <Setter Property="CornerRadius" Value="10" />
+      <Setter Property="Width" Value="20" />
+      <Setter Property="Template">
+        <ControlTemplate TargetType="{x:Type ColorSlider}">
+          <Border BorderThickness="{TemplateBinding BorderThickness}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <Grid Margin="{TemplateBinding Padding}">
+              <Rectangle HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         Fill="{StaticResource ColorControlCheckeredBackgroundBrush}"
+                         RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadiusConverter}}"
+                         RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadiusConverter}}" />
+              <Rectangle HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         Fill="{TemplateBinding Background}"
+                         RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadiusConverter}}"
+                         RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadiusConverter}}" />
+              <Track Name="PART_Track"
+                     HorizontalAlignment="Stretch"
+                     VerticalAlignment="Stretch"
+                     Minimum="{TemplateBinding Minimum}"
+                     Maximum="{TemplateBinding Maximum}"
+                     Value="{TemplateBinding Value, Mode=TwoWay}"
+                     IsDirectionReversed="{TemplateBinding IsDirectionReversed}"
+                     Orientation="Vertical">
+                <Track.DecreaseButton>
+                  <RepeatButton Name="PART_DecreaseButton"
+                                Background="Transparent"
+                                Focusable="False"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch">
+                    <RepeatButton.Template>
+                      <ControlTemplate>
+                        <Border Name="FocusTarget"
+                                Background="Transparent"
+                                Margin="0,-10" />
+                      </ControlTemplate>
+                    </RepeatButton.Template>
+                  </RepeatButton>
+                </Track.DecreaseButton>
+                <Track.IncreaseButton>
+                  <RepeatButton Name="PART_IncreaseButton"
+                                Background="Transparent"
+                                Focusable="False"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch">
+                    <RepeatButton.Template>
+                      <ControlTemplate>
+                        <Border Name="FocusTarget"
+                                Background="Transparent"
+                                Margin="0,-10" />
+                      </ControlTemplate>
+                    </RepeatButton.Template>
+                  </RepeatButton>
+                </Track.IncreaseButton>
+                <Thumb Name="ColorSliderThumb"
+                       Theme="{StaticResource ColorSliderThumbTheme}"
+                       Margin="0"
+                       Padding="0"
+                       DataContext="{TemplateBinding Value}"
+                       Height="{TemplateBinding Width}"
+                       Width="{TemplateBinding Width}" />
+              </Track>
+            </Grid>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+    </Style>
+
+    <!-- Selector/Thumb Color -->
+    <Style Selector="^:pointerover /template/ Thumb#ColorSliderThumb">
+      <Setter Property="Opacity" Value="0.75" />
+    </Style>
+    <Style Selector="^:pointerover:dark-selector /template/ Thumb#ColorSliderThumb">
+      <Setter Property="Opacity" Value="0.7" />
+    </Style>
+    <Style Selector="^:pointerover:light-selector /template/ Thumb#ColorSliderThumb">
+      <Setter Property="Opacity" Value="0.8" />
+    </Style>
 
-  <!-- Selector/Thumb Color -->
-  <Style Selector="ColorSlider:pointerover /template/ Thumb.ColorSliderThumbStyle">
-    <Setter Property="Opacity" Value="0.75" />
-  </Style>
-  <Style Selector="ColorSlider:pointerover:dark-selector /template/ Thumb.ColorSliderThumbStyle">
-    <Setter Property="Opacity" Value="0.7" />
-  </Style>
-  <Style Selector="ColorSlider:pointerover:light-selector /template/ Thumb.ColorSliderThumbStyle">
-    <Setter Property="Opacity" Value="0.8" />
-  </Style>
+    <Style Selector="^:dark-selector /template/ Thumb#ColorSliderThumb">
+      <Setter Property="BorderBrush" Value="{DynamicResource SystemControlBackgroundChromeBlackHighBrush}" />
+    </Style>
+    <Style Selector="^:light-selector /template/ Thumb#ColorSliderThumb">
+      <Setter Property="BorderBrush" Value="{DynamicResource SystemControlBackgroundChromeWhiteBrush}" />
+    </Style>
 
-  <Style Selector="ColorSlider:dark-selector /template/ Thumb.ColorSliderThumbStyle">
-    <Setter Property="BorderBrush" Value="{DynamicResource SystemControlBackgroundChromeBlackHighBrush}" />
-  </Style>
-  <Style Selector="ColorSlider:light-selector /template/ Thumb.ColorSliderThumbStyle">
-    <Setter Property="BorderBrush" Value="{DynamicResource SystemControlBackgroundChromeWhiteBrush}" />
-  </Style>
+  </ControlTheme>
 
-</Styles>
+</ResourceDictionary>
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorSpectrum.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorSpectrum.xaml
index dba4ad19f5..f95721c881 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorSpectrum.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorSpectrum.xaml
@@ -1,9 +1,10 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:controls="using:Avalonia.Controls"
-        x:CompileBindings="True">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="using:Avalonia.Controls"
+                    x:CompileBindings="True">
 
-  <Style Selector="ColorSpectrum">
+  <ControlTheme x:Key="{x:Type ColorSpectrum}"
+                TargetType="ColorSpectrum">
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type ColorSpectrum}">
@@ -79,53 +80,54 @@
         </ControlTemplate>
       </Setter.Value>
     </Setter>
-  </Style>
 
-  <!-- Normal -->
-  <!-- Separating this allows easier customization in applications -->
-  <Style Selector="ColorSpectrum /template/ Ellipse#BorderEllipse,
-                   ColorSpectrum /template/ Rectangle#BorderRectangle">
-    <Setter Property="Stroke" Value="{DynamicResource SystemControlForegroundListLowBrush}" />
-    <Setter Property="StrokeThickness" Value="1" />
-  </Style>
+    <!-- Normal -->
+    <!-- Separating this allows easier customization in applications -->
+    <Style Selector="^ /template/ Ellipse#BorderEllipse,
+                     ^ /template/ Rectangle#BorderRectangle">
+      <Setter Property="Stroke" Value="{DynamicResource SystemControlForegroundListLowBrush}" />
+      <Setter Property="StrokeThickness" Value="1" />
+    </Style>
 
-  <!-- Focus -->
-  <Style Selector="ColorSpectrum /template/ Ellipse#FocusEllipse">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-  <Style Selector="ColorSpectrum:focus-visible /template/ Ellipse#FocusEllipse">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
+    <!-- Focus -->
+    <Style Selector="^ /template/ Ellipse#FocusEllipse">
+      <Setter Property="IsVisible" Value="False" />
+    </Style>
+    <Style Selector="^:focus-visible /template/ Ellipse#FocusEllipse">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
 
-  <!-- Selector Color -->
-  <Style Selector="ColorSpectrum /template/ Ellipse#FocusEllipse">
-    <Setter Property="Stroke" Value="{DynamicResource SystemControlBackgroundChromeWhiteBrush}" />
-  </Style>
-  <Style Selector="ColorSpectrum /template/ Ellipse#SelectionEllipse">
-    <Setter Property="Stroke" Value="{DynamicResource SystemControlBackgroundChromeBlackHighBrush}" />
-  </Style>
-  <Style Selector="ColorSpectrum:light-selector /template/ Ellipse#FocusEllipse">
-    <Setter Property="Stroke" Value="{DynamicResource SystemControlBackgroundChromeBlackHighBrush}" />
-  </Style>
-  <Style Selector="ColorSpectrum:light-selector /template/ Ellipse#SelectionEllipse">
-    <Setter Property="Stroke" Value="{DynamicResource SystemControlBackgroundChromeWhiteBrush}" />
-  </Style>
+    <!-- Selector Color -->
+    <Style Selector="^ /template/ Ellipse#FocusEllipse">
+      <Setter Property="Stroke" Value="{DynamicResource SystemControlBackgroundChromeWhiteBrush}" />
+    </Style>
+    <Style Selector="^ /template/ Ellipse#SelectionEllipse">
+      <Setter Property="Stroke" Value="{DynamicResource SystemControlBackgroundChromeBlackHighBrush}" />
+    </Style>
+    <Style Selector="^:light-selector /template/ Ellipse#FocusEllipse">
+      <Setter Property="Stroke" Value="{DynamicResource SystemControlBackgroundChromeBlackHighBrush}" />
+    </Style>
+    <Style Selector="^:light-selector /template/ Ellipse#SelectionEllipse">
+      <Setter Property="Stroke" Value="{DynamicResource SystemControlBackgroundChromeWhiteBrush}" />
+    </Style>
 
-  <Style Selector="ColorSpectrum:pointerover /template/ Ellipse#SelectionEllipse">
-    <Setter Property="Opacity" Value="0.7" />
-  </Style>
-  <Style Selector="ColorSpectrum:pointerover:light-selector /template/ Ellipse#SelectionEllipse">
-    <Setter Property="Opacity" Value="0.8" />
-  </Style>
+    <Style Selector="^:pointerover /template/ Ellipse#SelectionEllipse">
+      <Setter Property="Opacity" Value="0.7" />
+    </Style>
+    <Style Selector="^:pointerover:light-selector /template/ Ellipse#SelectionEllipse">
+      <Setter Property="Opacity" Value="0.8" />
+    </Style>
 
-  <!-- Selector Size -->
-  <Style Selector="ColorSpectrum /template/ Panel#PART_SelectionEllipsePanel">
-    <Setter Property="Width" Value="16" />
-    <Setter Property="Height" Value="16" />
-  </Style>
-  <Style Selector="ColorSpectrum:large-selector /template/ Panel#PART_SelectionEllipsePanel">
-    <Setter Property="Width" Value="48" />
-    <Setter Property="Height" Value="48" />
-  </Style>
+    <!-- Selector Size -->
+    <Style Selector="^ /template/ Panel#PART_SelectionEllipsePanel">
+      <Setter Property="Width" Value="16" />
+      <Setter Property="Height" Value="16" />
+    </Style>
+    <Style Selector="^:large-selector /template/ Panel#PART_SelectionEllipsePanel">
+      <Setter Property="Width" Value="48" />
+      <Setter Property="Height" Value="48" />
+    </Style>
 
-</Styles>
+  </ControlTheme>
+
+</ResourceDictionary>
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml
index e25e822f3f..993745b1e5 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml
@@ -1,86 +1,85 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:controls="using:Avalonia.Controls"
-        xmlns:converters="using:Avalonia.Controls.Converters"
-        xmlns:primitives="using:Avalonia.Controls.Primitives"
-        xmlns:pc="clr-namespace:Avalonia.Controls.Primitives.Converters;assembly=Avalonia.Controls.ColorPicker"
-        xmlns:globalization="clr-namespace:System.Globalization;assembly=mscorlib"
-        x:CompileBindings="True">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="using:Avalonia.Controls"
+                    xmlns:converters="using:Avalonia.Controls.Converters"
+                    xmlns:primitives="using:Avalonia.Controls.Primitives"
+                    xmlns:pc="clr-namespace:Avalonia.Controls.Primitives.Converters;assembly=Avalonia.Controls.ColorPicker"
+                    xmlns:globalization="clr-namespace:System.Globalization;assembly=mscorlib"
+                    x:CompileBindings="True">
 
-  <Styles.Resources>
-    <pc:ContrastBrushConverter x:Key="ContrastBrushConverter" />
-    <pc:ThirdComponentConverter x:Key="ThirdComponentConverter" />
-    <converters:ColorToDisplayNameConverter x:Key="ColorToDisplayNameConverter" />
-    <converters:ColorToHexConverter x:Key="ColorToHexConverter" />
-    <globalization:NumberFormatInfo x:Key="ColorViewComponentNumberFormat" NumberDecimalDigits="0" />
-    <x:Double x:Key="ColorViewTabStripHeight">48</x:Double>
-    <x:Double x:Key="ColorViewComponentLabelWidth">30</x:Double>
-    <x:Double x:Key="ColorViewComponentTextInputWidth">80</x:Double>
-    <!-- Fluent UI System Icons : ic_fluent_inking_tool_20_regular.svg -->
-    <PathGeometry x:Key="ColorViewSpectrumIconGeometry">
-      M3 2C3.27614 2 3.5 2.22386 3.5 2.5V5.5C3.5 5.77614 3.72386 6 4 6H16C16.2761 6 16.5 5.77614
-      16.5 5.5V2.5C16.5 2.22386 16.7239 2 17 2C17.2761 2 17.5 2.22386 17.5 2.5V5.5C17.5 6.32843
-      16.8284 7 16 7H15.809L12.2236 14.1708C12.0615 14.4951 11.7914 14.7431 11.4695
-      14.8802C11.4905 15.0808 11.5 15.2891 11.5 15.5C11.5 16.0818 11.4278 16.6623 11.2268
-      17.1165C11.019 17.5862 10.6266 18 10 18C9.37343 18 8.98105 17.5862 8.77323 17.1165C8.57222
-      16.6623 8.5 16.0818 8.5 15.5C8.5 15.2891 8.50952 15.0808 8.53051 14.8802C8.20863 14.7431
-      7.93851 14.4951 7.77639 14.1708L4.19098 7H4C3.17157 7 2.5 6.32843 2.5 5.5V2.5C2.5 2.22386
-      2.72386 2 3 2ZM9.11803 14H10.882C11.0714 14 11.2445 13.893 11.3292 13.7236L14.691
-      7H5.30902L8.67082 13.7236C8.75552 13.893 8.92865 14 9.11803 14ZM9.52346 15C9.50787 15.1549
-      9.5 15.3225 9.5 15.5C9.5 16.0228 9.56841 16.4423 9.6877 16.7119C9.8002 16.9661 9.90782 17
-      10 17C10.0922 17 10.1998 16.9661 10.3123 16.7119C10.4316 16.4423 10.5 16.0228 10.5
-      15.5C10.5 15.3225 10.4921 15.1549 10.4765 15H9.52346Z
-    </PathGeometry>
-    <!-- Fluent UI System Icons : ic_fluent_color_20_regular.svg -->
-    <PathGeometry x:Key="ColorViewPaletteIconGeometry">
-      M9.75003 6.5C10.1642 6.5 10.5 6.16421 10.5 5.75C10.5 5.33579 10.1642 5 9.75003 5C9.33582
-      5 9.00003 5.33579 9.00003 5.75C9.00003 6.16421 9.33582 6.5 9.75003 6.5ZM12.75 7.5C13.1642
-      7.5 13.5 7.16421 13.5 6.75C13.5 6.33579 13.1642 6 12.75 6C12.3358 6 12 6.33579 12 6.75C12
-      7.16421 12.3358 7.5 12.75 7.5ZM15.25 9C15.25 9.41421 14.9142 9.75 14.5 9.75C14.0858 9.75
-      13.75 9.41421 13.75 9C13.75 8.58579 14.0858 8.25 14.5 8.25C14.9142 8.25 15.25 8.58579
-      15.25 9ZM14.5 12.75C14.9142 12.75 15.25 12.4142 15.25 12C15.25 11.5858 14.9142 11.25 14.5
-      11.25C14.0858 11.25 13.75 11.5858 13.75 12C13.75 12.4142 14.0858 12.75 14.5 12.75ZM13.25
-      14C13.25 14.4142 12.9142 14.75 12.5 14.75C12.0858 14.75 11.75 14.4142 11.75 14C11.75
-      13.5858 12.0858 13.25 12.5 13.25C12.9142 13.25 13.25 13.5858 13.25 14ZM13.6972
-      2.99169C10.9426 1.57663 8.1432 1.7124 5.77007 3.16636C4.55909 3.9083 3.25331 5.46925
-      2.51605 7.05899C2.14542 7.85816 1.89915 8.70492 1.90238 9.49318C1.90566 10.2941 2.16983
-      11.0587 2.84039 11.6053C3.45058 12.1026 3.98165 12.353 4.49574 12.3784C5.01375 12.404
-      5.41804 12.1942 5.73429 12.0076C5.80382 11.9666 5.86891 11.927 5.93113 11.8892C6.17332
-      11.7421 6.37205 11.6214 6.62049 11.5426C6.90191 11.4534 7.2582 11.4205 7.77579
-      11.5787C7.96661 11.637 8.08161 11.7235 8.16212 11.8229C8.24792 11.9289 8.31662 12.0774
-      8.36788 12.2886C8.41955 12.5016 8.44767 12.7527 8.46868 13.0491C8.47651 13.1594 8.48379
-      13.2855 8.49142 13.4176C8.50252 13.6098 8.51437 13.8149 8.52974 14.0037C8.58435 14.6744
-      8.69971 15.4401 9.10362 16.1357C9.51764 16.8488 10.2047 17.439 11.307 17.8158C12.9093
-      18.3636 14.3731 17.9191 15.5126 17.0169C16.6391 16.125 17.4691 14.7761 17.8842
-      13.4272C19.1991 9.15377 17.6728 5.03394 13.6972 2.99169ZM6.29249 4.01905C8.35686 2.75426
-      10.7844 2.61959 13.2403 3.88119C16.7473 5.68275 18.1135 9.28161 16.9284 13.1332C16.5624
-      14.3227 15.8338 15.4871 14.8919 16.2329C13.963 16.9684 12.8486 17.286 11.6305
-      16.8696C10.7269 16.5607 10.2467 16.1129 9.96842 15.6336C9.68001 15.1369 9.57799 14.5556
-      9.52644 13.9225C9.51101 13.733 9.50132 13.5621 9.49147 13.3884C9.48399 13.2564 9.47642
-      13.1229 9.46618 12.9783C9.44424 12.669 9.41175 12.3499 9.33968 12.0529C9.26719 11.7541
-      9.14902 11.4527 8.93935 11.1937C8.72439 10.9282 8.43532 10.7346 8.06801 10.6223C7.36648
-      10.408 6.80266 10.4359 6.31839 10.5893C5.94331 10.7082 5.62016 10.9061 5.37179
-      11.0582C5.31992 11.0899 5.2713 11.1197 5.22616 11.1463C4.94094 11.3146 4.75357 11.39
-      4.54514 11.3796C4.33279 11.3691 4.00262 11.2625 3.47218 10.8301C3.0866 10.5158 2.90473
-      10.0668 2.90237 9.48908C2.89995 8.89865 3.08843 8.20165 3.42324 7.47971C4.09686 6.0272
-      5.28471 4.63649 6.29249 4.01905Z
-    </PathGeometry>
-    <!-- Fluent UI System Icons : ic_fluent_options_20_regular.svg -->
-    <PathGeometry x:Key="ColorViewComponentsIconGeometry">
-      M14.95 5C14.7184 3.85888 13.7095 3 12.5 3C11.2905 3 10.2816 3.85888 10.05 5H2.5C2.22386
-      5 2 5.22386 2 5.5C2 5.77614 2.22386 6 2.5 6H10.05C10.2816 7.14112 11.2905 8 12.5 8C13.7297
-      8 14.752 7.11217 14.961 5.94254C14.9575 5.96177 14.9539 5.98093 14.95 6H17.5C17.7761 6 18
-      5.77614 18 5.5C18 5.22386 17.7761 5 17.5 5H14.95ZM12.5 7C11.6716 7 11 6.32843 11 5.5C11
-      4.67157 11.6716 4 12.5 4C13.3284 4 14 4.67157 14 5.5C14 6.32843 13.3284 7 12.5 7ZM9.94999
-      14C9.71836 12.8589 8.70948 12 7.5 12C6.29052 12 5.28164 12.8589 5.05001 14H2.5C2.22386
-      14 2 14.2239 2 14.5C2 14.7761 2.22386 15 2.5 15H5.05001C5.28164 16.1411 6.29052 17 7.5
-      17C8.70948 17 9.71836 16.1411 9.94999 15H17.5C17.7761 15 18 14.7761 18 14.5C18 14.2239
-      17.7761 14 17.5 14H9.94999ZM7.5 16C6.67157 16 6 15.3284 6 14.5C6 13.6716 6.67157 13 7.5
-      13C8.32843 13 9 13.6716 9 14.5C9 15.3284 8.32843 16 7.5 16Z
-    </PathGeometry>
-  </Styles.Resources>
+  <pc:ContrastBrushConverter x:Key="ContrastBrushConverter" />
+  <pc:ThirdComponentConverter x:Key="ThirdComponentConverter" />
+  <converters:ColorToDisplayNameConverter x:Key="ColorToDisplayNameConverter" />
+  <converters:ColorToHexConverter x:Key="ColorToHexConverter" />
+  <globalization:NumberFormatInfo x:Key="ColorViewComponentNumberFormat" NumberDecimalDigits="0" />
+  <x:Double x:Key="ColorViewTabStripHeight">48</x:Double>
+  <x:Double x:Key="ColorViewComponentLabelWidth">30</x:Double>
+  <x:Double x:Key="ColorViewComponentTextInputWidth">80</x:Double>
+  <!-- Fluent UI System Icons : ic_fluent_inking_tool_20_regular.svg -->
+  <PathGeometry x:Key="ColorViewSpectrumIconGeometry">
+    M3 2C3.27614 2 3.5 2.22386 3.5 2.5V5.5C3.5 5.77614 3.72386 6 4 6H16C16.2761 6 16.5 5.77614
+    16.5 5.5V2.5C16.5 2.22386 16.7239 2 17 2C17.2761 2 17.5 2.22386 17.5 2.5V5.5C17.5 6.32843
+    16.8284 7 16 7H15.809L12.2236 14.1708C12.0615 14.4951 11.7914 14.7431 11.4695
+    14.8802C11.4905 15.0808 11.5 15.2891 11.5 15.5C11.5 16.0818 11.4278 16.6623 11.2268
+    17.1165C11.019 17.5862 10.6266 18 10 18C9.37343 18 8.98105 17.5862 8.77323 17.1165C8.57222
+    16.6623 8.5 16.0818 8.5 15.5C8.5 15.2891 8.50952 15.0808 8.53051 14.8802C8.20863 14.7431
+    7.93851 14.4951 7.77639 14.1708L4.19098 7H4C3.17157 7 2.5 6.32843 2.5 5.5V2.5C2.5 2.22386
+    2.72386 2 3 2ZM9.11803 14H10.882C11.0714 14 11.2445 13.893 11.3292 13.7236L14.691
+    7H5.30902L8.67082 13.7236C8.75552 13.893 8.92865 14 9.11803 14ZM9.52346 15C9.50787 15.1549
+    9.5 15.3225 9.5 15.5C9.5 16.0228 9.56841 16.4423 9.6877 16.7119C9.8002 16.9661 9.90782 17
+    10 17C10.0922 17 10.1998 16.9661 10.3123 16.7119C10.4316 16.4423 10.5 16.0228 10.5
+    15.5C10.5 15.3225 10.4921 15.1549 10.4765 15H9.52346Z
+  </PathGeometry>
+  <!-- Fluent UI System Icons : ic_fluent_color_20_regular.svg -->
+  <PathGeometry x:Key="ColorViewPaletteIconGeometry">
+    M9.75003 6.5C10.1642 6.5 10.5 6.16421 10.5 5.75C10.5 5.33579 10.1642 5 9.75003 5C9.33582
+    5 9.00003 5.33579 9.00003 5.75C9.00003 6.16421 9.33582 6.5 9.75003 6.5ZM12.75 7.5C13.1642
+    7.5 13.5 7.16421 13.5 6.75C13.5 6.33579 13.1642 6 12.75 6C12.3358 6 12 6.33579 12 6.75C12
+    7.16421 12.3358 7.5 12.75 7.5ZM15.25 9C15.25 9.41421 14.9142 9.75 14.5 9.75C14.0858 9.75
+    13.75 9.41421 13.75 9C13.75 8.58579 14.0858 8.25 14.5 8.25C14.9142 8.25 15.25 8.58579
+    15.25 9ZM14.5 12.75C14.9142 12.75 15.25 12.4142 15.25 12C15.25 11.5858 14.9142 11.25 14.5
+    11.25C14.0858 11.25 13.75 11.5858 13.75 12C13.75 12.4142 14.0858 12.75 14.5 12.75ZM13.25
+    14C13.25 14.4142 12.9142 14.75 12.5 14.75C12.0858 14.75 11.75 14.4142 11.75 14C11.75
+    13.5858 12.0858 13.25 12.5 13.25C12.9142 13.25 13.25 13.5858 13.25 14ZM13.6972
+    2.99169C10.9426 1.57663 8.1432 1.7124 5.77007 3.16636C4.55909 3.9083 3.25331 5.46925
+    2.51605 7.05899C2.14542 7.85816 1.89915 8.70492 1.90238 9.49318C1.90566 10.2941 2.16983
+    11.0587 2.84039 11.6053C3.45058 12.1026 3.98165 12.353 4.49574 12.3784C5.01375 12.404
+    5.41804 12.1942 5.73429 12.0076C5.80382 11.9666 5.86891 11.927 5.93113 11.8892C6.17332
+    11.7421 6.37205 11.6214 6.62049 11.5426C6.90191 11.4534 7.2582 11.4205 7.77579
+    11.5787C7.96661 11.637 8.08161 11.7235 8.16212 11.8229C8.24792 11.9289 8.31662 12.0774
+    8.36788 12.2886C8.41955 12.5016 8.44767 12.7527 8.46868 13.0491C8.47651 13.1594 8.48379
+    13.2855 8.49142 13.4176C8.50252 13.6098 8.51437 13.8149 8.52974 14.0037C8.58435 14.6744
+    8.69971 15.4401 9.10362 16.1357C9.51764 16.8488 10.2047 17.439 11.307 17.8158C12.9093
+    18.3636 14.3731 17.9191 15.5126 17.0169C16.6391 16.125 17.4691 14.7761 17.8842
+    13.4272C19.1991 9.15377 17.6728 5.03394 13.6972 2.99169ZM6.29249 4.01905C8.35686 2.75426
+    10.7844 2.61959 13.2403 3.88119C16.7473 5.68275 18.1135 9.28161 16.9284 13.1332C16.5624
+    14.3227 15.8338 15.4871 14.8919 16.2329C13.963 16.9684 12.8486 17.286 11.6305
+    16.8696C10.7269 16.5607 10.2467 16.1129 9.96842 15.6336C9.68001 15.1369 9.57799 14.5556
+    9.52644 13.9225C9.51101 13.733 9.50132 13.5621 9.49147 13.3884C9.48399 13.2564 9.47642
+    13.1229 9.46618 12.9783C9.44424 12.669 9.41175 12.3499 9.33968 12.0529C9.26719 11.7541
+    9.14902 11.4527 8.93935 11.1937C8.72439 10.9282 8.43532 10.7346 8.06801 10.6223C7.36648
+    10.408 6.80266 10.4359 6.31839 10.5893C5.94331 10.7082 5.62016 10.9061 5.37179
+    11.0582C5.31992 11.0899 5.2713 11.1197 5.22616 11.1463C4.94094 11.3146 4.75357 11.39
+    4.54514 11.3796C4.33279 11.3691 4.00262 11.2625 3.47218 10.8301C3.0866 10.5158 2.90473
+    10.0668 2.90237 9.48908C2.89995 8.89865 3.08843 8.20165 3.42324 7.47971C4.09686 6.0272
+    5.28471 4.63649 6.29249 4.01905Z
+  </PathGeometry>
+  <!-- Fluent UI System Icons : ic_fluent_options_20_regular.svg -->
+  <PathGeometry x:Key="ColorViewComponentsIconGeometry">
+    M14.95 5C14.7184 3.85888 13.7095 3 12.5 3C11.2905 3 10.2816 3.85888 10.05 5H2.5C2.22386
+    5 2 5.22386 2 5.5C2 5.77614 2.22386 6 2.5 6H10.05C10.2816 7.14112 11.2905 8 12.5 8C13.7297
+    8 14.752 7.11217 14.961 5.94254C14.9575 5.96177 14.9539 5.98093 14.95 6H17.5C17.7761 6 18
+    5.77614 18 5.5C18 5.22386 17.7761 5 17.5 5H14.95ZM12.5 7C11.6716 7 11 6.32843 11 5.5C11
+    4.67157 11.6716 4 12.5 4C13.3284 4 14 4.67157 14 5.5C14 6.32843 13.3284 7 12.5 7ZM9.94999
+    14C9.71836 12.8589 8.70948 12 7.5 12C6.29052 12 5.28164 12.8589 5.05001 14H2.5C2.22386
+    14 2 14.2239 2 14.5C2 14.7761 2.22386 15 2.5 15H5.05001C5.28164 16.1411 6.29052 17 7.5
+    17C8.70948 17 9.71836 16.1411 9.94999 15H17.5C17.7761 15 18 14.7761 18 14.5C18 14.2239
+    17.7761 14 17.5 14H9.94999ZM7.5 16C6.67157 16 6 15.3284 6 14.5C6 13.6716 6.67157 13 7.5
+    13C8.32843 13 9 13.6716 9 14.5C9 15.3284 8.32843 16 7.5 16Z
+  </PathGeometry>
 
-  <Style Selector="ColorView">
+  <ControlTheme x:Key="{x:Type ColorView}"
+                TargetType="ColorView">
     <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
     <Setter Property="Palette">
       <controls:FluentColorPalette />
@@ -645,6 +644,6 @@
         </Grid>
       </ControlTemplate>
     </Setter>
-  </Style>
+  </ControlTheme>
 
-</Styles>
+</ResourceDictionary>
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/Fluent.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/Fluent.xaml
index 186b6de9bc..a5a94a2322 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/Fluent.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/Fluent.xaml
@@ -3,42 +3,48 @@
         xmlns:converters="using:Avalonia.Controls.Converters">
 
   <Styles.Resources>
-    <!-- Shared Resources -->
-    <VisualBrush x:Key="ColorControlCheckeredBackgroundBrush"
-                 TileMode="Tile"
-                 Stretch="Uniform"
-                 DestinationRect="0,0,8,8">
-      <VisualBrush.Visual>
-        <DrawingPresenter Width="8"
-                          Height="8">
-          <DrawingGroup>
-            <GeometryDrawing Geometry="M0,0 L2,0 2,2, 0,2Z"
-                             Brush="Transparent" />
-            <GeometryDrawing Geometry="M0,1 L2,1 2,2, 1,2 1,0 0,0Z"
-                             Brush="#19808080" />
-          </DrawingGroup>
-        </DrawingPresenter>
-      </VisualBrush.Visual>
-    </VisualBrush>
-    
-    <!-- Shared Converters -->
-    <converters:EnumToBoolConverter x:Key="EnumToBoolConverter" />
-    <converters:ToBrushConverter x:Key="ToBrushConverter" />
-    <converters:CornerRadiusFilterConverter x:Key="LeftCornerRadiusFilterConverter" Filter="TopLeft, BottomLeft"/>
-    <converters:CornerRadiusFilterConverter x:Key="RightCornerRadiusFilterConverter" Filter="TopRight, BottomRight"/>
-    <converters:CornerRadiusFilterConverter x:Key="TopCornerRadiusFilterConverter" Filter="TopLeft, TopRight"/>
-    <converters:CornerRadiusFilterConverter x:Key="BottomCornerRadiusFilterConverter" Filter="BottomLeft, BottomRight"/>
-    <converters:CornerRadiusToDoubleConverter x:Key="TopLeftCornerRadiusConverter" Corner="TopLeft" />
-    <converters:CornerRadiusToDoubleConverter x:Key="BottomRightCornerRadiusConverter" Corner="BottomRight" />
-  </Styles.Resources>
+    <ResourceDictionary>
+
+      <!-- Shared Resources -->
+      <VisualBrush x:Key="ColorControlCheckeredBackgroundBrush"
+                   TileMode="Tile"
+                   Stretch="Uniform"
+                   DestinationRect="0,0,8,8">
+        <VisualBrush.Visual>
+          <DrawingPresenter Width="8"
+                            Height="8">
+            <DrawingGroup>
+              <GeometryDrawing Geometry="M0,0 L2,0 2,2, 0,2Z"
+                               Brush="Transparent" />
+              <GeometryDrawing Geometry="M0,1 L2,1 2,2, 1,2 1,0 0,0Z"
+                               Brush="#19808080" />
+            </DrawingGroup>
+          </DrawingPresenter>
+        </VisualBrush.Visual>
+      </VisualBrush>
+
+      <!-- Shared Converters -->
+      <converters:EnumToBoolConverter x:Key="EnumToBoolConverter" />
+      <converters:ToBrushConverter x:Key="ToBrushConverter" />
+      <converters:CornerRadiusFilterConverter x:Key="LeftCornerRadiusFilterConverter" Filter="TopLeft, BottomLeft"/>
+      <converters:CornerRadiusFilterConverter x:Key="RightCornerRadiusFilterConverter" Filter="TopRight, BottomRight"/>
+      <converters:CornerRadiusFilterConverter x:Key="TopCornerRadiusFilterConverter" Filter="TopLeft, TopRight"/>
+      <converters:CornerRadiusFilterConverter x:Key="BottomCornerRadiusFilterConverter" Filter="BottomLeft, BottomRight"/>
+      <converters:CornerRadiusToDoubleConverter x:Key="TopLeftCornerRadiusConverter" Corner="TopLeft" />
+      <converters:CornerRadiusToDoubleConverter x:Key="BottomRightCornerRadiusConverter" Corner="BottomRight" />
 
-  <!-- Primitives -->
-  <StyleInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPreviewer.xaml" />
-  <StyleInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Fluent/ColorSlider.xaml" />
-  <StyleInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Fluent/ColorSpectrum.xaml" />
+      <ResourceDictionary.MergedDictionaries>
 
-  <!-- Controls -->
-  <StyleInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPicker.xaml" />
-  <StyleInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml" />
+        <!-- Primitives -->
+        <ResourceInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPreviewer.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Fluent/ColorSlider.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Fluent/ColorSpectrum.xaml" />
 
+        <!-- Controls -->
+        <ResourceInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPicker.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml" />
+
+      </ResourceDictionary.MergedDictionaries>
+    </ResourceDictionary>
+  </Styles.Resources>
 </Styles>

From 952b80df2ae7ef2d3086d293a61516d9a0f3eaaa Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Mon, 25 Jul 2022 00:52:54 +0300
Subject: [PATCH 146/240] Use codegen to populate OpenGL functions

---
 .../ControlCatalog/Pages/OpenGlPage.xaml.cs   |  44 +-
 .../Angle/AngleWin32EglDisplay.cs             |   4 +-
 src/Avalonia.OpenGL/Avalonia.OpenGL.csproj    |   1 +
 .../Controls/OpenGlControlBase.cs             |  14 +-
 src/Avalonia.OpenGL/Egl/EglContext.cs         |   2 +-
 src/Avalonia.OpenGL/Egl/EglDisplay.cs         |   4 +-
 src/Avalonia.OpenGL/Egl/EglInterface.cs       | 225 +++-----
 src/Avalonia.OpenGL/GlBasicInfoInterface.cs   |  44 +-
 src/Avalonia.OpenGL/GlEntryPointAttribute.cs  | 103 +---
 src/Avalonia.OpenGL/GlInterface.cs            | 494 ++++++++----------
 src/Avalonia.OpenGL/GlInterfaceBase.cs        |  79 ---
 src/Avalonia.X11/Avalonia.X11.csproj          |   2 +-
 src/Avalonia.X11/Glx/Glx.cs                   | 111 ++--
 .../Output/DrmOutput.cs                       |   2 +-
 src/Shared/SourceGeneratorAttributes.cs       |  24 +
 .../Gpu/OpenGl/FboSkiaSurface.cs              |  28 +-
 .../Avalonia.Skia/Gpu/OpenGl/GlSkiaGpu.cs     |   2 +-
 .../Gpu/OpenGl/OpenGlBitmapImpl.cs            |  11 +-
 .../GetProcAddressInitialization.cs           | 346 ++++++++++++
 src/tools/DevGenerators/Helpers.cs            |  31 ++
 20 files changed, 821 insertions(+), 750 deletions(-)
 delete mode 100644 src/Avalonia.OpenGL/GlInterfaceBase.cs
 create mode 100644 src/tools/DevGenerators/GetProcAddressInitialization.cs
 create mode 100644 src/tools/DevGenerators/Helpers.cs

diff --git a/samples/ControlCatalog/Pages/OpenGlPage.xaml.cs b/samples/ControlCatalog/Pages/OpenGlPage.xaml.cs
index cb79bf219a..f37e0f8701 100644
--- a/samples/ControlCatalog/Pages/OpenGlPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/OpenGlPage.xaml.cs
@@ -90,7 +90,6 @@ namespace ControlCatalog.Pages
         private int _vertexBufferObject;
         private int _indexBufferObject;
         private int _vertexArrayObject;
-        private GlExtrasInterface _glExt;
 
         private string GetShader(bool fragment, string shader)
         {
@@ -258,7 +257,6 @@ namespace ControlCatalog.Pages
         protected unsafe override void OnOpenGlInit(GlInterface GL, int fb)
         {
             CheckError(GL);
-            _glExt = new GlExtrasInterface(GL);
 
             Info = $"Renderer: {GL.GetString(GL_RENDERER)} Version: {GL.GetString(GL_VERSION)}";
             
@@ -298,8 +296,8 @@ namespace ControlCatalog.Pages
                 GL.BufferData(GL_ELEMENT_ARRAY_BUFFER, new IntPtr(_indices.Length * sizeof(ushort)), new IntPtr(pdata),
                     GL_STATIC_DRAW);
             CheckError(GL);
-            _vertexArrayObject = _glExt.GenVertexArray();
-            _glExt.BindVertexArray(_vertexArrayObject);
+            _vertexArrayObject = GL.GenVertexArray();
+            GL.BindVertexArray(_vertexArrayObject);
             CheckError(GL);
             GL.VertexAttribPointer(positionLocation, 3, GL_FLOAT,
                 0, vertexSize, IntPtr.Zero);
@@ -316,12 +314,13 @@ namespace ControlCatalog.Pages
             // Unbind everything
             GL.BindBuffer(GL_ARRAY_BUFFER, 0);
             GL.BindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
-            _glExt.BindVertexArray(0);
+            GL.BindVertexArray(0);
             GL.UseProgram(0);
 
             // Delete all resources.
-            GL.DeleteBuffers(2, new[] { _vertexBufferObject, _indexBufferObject });
-            _glExt.DeleteVertexArrays(1, new[] { _vertexArrayObject });
+            GL.DeleteBuffer(_vertexBufferObject);
+            GL.DeleteBuffer(_indexBufferObject);
+            GL.DeleteVertexArray(_vertexArrayObject);
             GL.DeleteProgram(_shaderProgram);
             GL.DeleteShader(_fragmentShader);
             GL.DeleteShader(_vertexShader);
@@ -338,7 +337,7 @@ namespace ControlCatalog.Pages
 
             GL.BindBuffer(GL_ARRAY_BUFFER, _vertexBufferObject);
             GL.BindBuffer(GL_ELEMENT_ARRAY_BUFFER, _indexBufferObject);
-            _glExt.BindVertexArray(_vertexArrayObject);
+            GL.BindVertexArray(_vertexArrayObject);
             GL.UseProgram(_shaderProgram);
             CheckError(GL);
             var projection =
@@ -369,34 +368,5 @@ namespace ControlCatalog.Pages
             if (_disco > 0.01)
                 Dispatcher.UIThread.Post(InvalidateVisual, DispatcherPriority.Background);
         }
-
-        class GlExtrasInterface : GlInterfaceBase<GlInterface.GlContextInfo>
-        {
-            public GlExtrasInterface(GlInterface gl) : base(gl.GetProcAddress, gl.ContextInfo)
-            {
-            }
-            
-            public delegate void GlDeleteVertexArrays(int count, int[] buffers);
-            [GlMinVersionEntryPoint("glDeleteVertexArrays", 3,0)]
-            [GlExtensionEntryPoint("glDeleteVertexArraysOES", "GL_OES_vertex_array_object")]
-            public GlDeleteVertexArrays DeleteVertexArrays { get; }
-            
-            public delegate void GlBindVertexArray(int array);
-            [GlMinVersionEntryPoint("glBindVertexArray", 3,0)]
-            [GlExtensionEntryPoint("glBindVertexArrayOES", "GL_OES_vertex_array_object")]
-            public GlBindVertexArray BindVertexArray { get; }
-            public delegate void GlGenVertexArrays(int n, int[] rv);
-        
-            [GlMinVersionEntryPoint("glGenVertexArrays",3,0)]
-            [GlExtensionEntryPoint("glGenVertexArraysOES", "GL_OES_vertex_array_object")]
-            public GlGenVertexArrays GenVertexArrays { get; }
-            
-            public int GenVertexArray()
-            {
-                var rv = new int[1];
-                GenVertexArrays(1, rv);
-                return rv[0];
-            }
-        }
     }
 }
diff --git a/src/Avalonia.OpenGL/Angle/AngleWin32EglDisplay.cs b/src/Avalonia.OpenGL/Angle/AngleWin32EglDisplay.cs
index 94e7728d68..3a8fdb8491 100644
--- a/src/Avalonia.OpenGL/Angle/AngleWin32EglDisplay.cs
+++ b/src/Avalonia.OpenGL/Angle/AngleWin32EglDisplay.cs
@@ -21,7 +21,7 @@ namespace Avalonia.OpenGL.Angle
             var display = IntPtr.Zero;
             AngleOptions.PlatformApi angleApi = default;
             {
-                if (_egl.GetPlatformDisplayEXT == null)
+                if (!_egl.IsGetPlatformDisplayExtAvailable)
                     throw new OpenGlException("eglGetPlatformDisplayEXT is not supported by libegl.dll");
 
                 var allowedApis = AvaloniaLocator.Current.GetService<AngleOptions>()?.AllowedPlatformApis
@@ -37,7 +37,7 @@ namespace Avalonia.OpenGL.Angle
                     else
                         continue;
 
-                    display = _egl.GetPlatformDisplayEXT(EGL_PLATFORM_ANGLE_ANGLE, IntPtr.Zero,
+                    display = _egl.GetPlatformDisplayExt(EGL_PLATFORM_ANGLE_ANGLE, IntPtr.Zero,
                         new[] { EGL_PLATFORM_ANGLE_TYPE_ANGLE, dapi, EGL_NONE });
                     if (display != IntPtr.Zero)
                     {
diff --git a/src/Avalonia.OpenGL/Avalonia.OpenGL.csproj b/src/Avalonia.OpenGL/Avalonia.OpenGL.csproj
index 76924d060f..bacb10c792 100644
--- a/src/Avalonia.OpenGL/Avalonia.OpenGL.csproj
+++ b/src/Avalonia.OpenGL/Avalonia.OpenGL.csproj
@@ -11,4 +11,5 @@
     </ItemGroup>
 
     <Import Project="..\..\build\DevAnalyzers.props" />
+    <Import Project="..\..\build\SourceGenerators.props" />
 </Project>
diff --git a/src/Avalonia.OpenGL/Controls/OpenGlControlBase.cs b/src/Avalonia.OpenGL/Controls/OpenGlControlBase.cs
index b3469c212b..68442c1fd3 100644
--- a/src/Avalonia.OpenGL/Controls/OpenGlControlBase.cs
+++ b/src/Avalonia.OpenGL/Controls/OpenGlControlBase.cs
@@ -66,11 +66,9 @@ namespace Avalonia.OpenGL.Controls
                 return;
                     
             gl.GetIntegerv(GL_RENDERBUFFER_BINDING, out var oldRenderBuffer);
-            if (_depthBuffer != 0) gl.DeleteRenderbuffers(1, new[] { _depthBuffer });
+            if (_depthBuffer != 0) gl.DeleteRenderbuffer(_depthBuffer);
 
-            var oneArr = new int[1];
-            gl.GenRenderbuffers(1, oneArr);
-            _depthBuffer = oneArr[0];
+            _depthBuffer = gl.GenRenderbuffer();
             gl.BindRenderbuffer(GL_RENDERBUFFER, _depthBuffer);
             gl.RenderbufferStorage(GL_RENDERBUFFER,
                 GlVersion.Type == GlProfileType.OpenGLES ? GL_DEPTH_COMPONENT16 : GL_DEPTH_COMPONENT,
@@ -88,9 +86,9 @@ namespace Avalonia.OpenGL.Controls
                     var gl = _context.GlInterface;
                     gl.BindTexture(GL_TEXTURE_2D, 0);
                     gl.BindFramebuffer(GL_FRAMEBUFFER, 0);
-                    gl.DeleteFramebuffers(1, new[] { _fb });
+                    gl.DeleteFramebuffer(_fb);
                     _fb = 0;
-                    gl.DeleteRenderbuffers(1, new[] { _depthBuffer });
+                    gl.DeleteRenderbuffer(_depthBuffer);
                     _depthBuffer = 0;
                     _attachment?.Dispose();
                     _attachment = null;
@@ -174,9 +172,7 @@ namespace Avalonia.OpenGL.Controls
                 {
                     _depthBufferSize = GetPixelSize();
                     var gl = _context.GlInterface;
-                    var oneArr = new int[1];
-                    gl.GenFramebuffers(1, oneArr);
-                    _fb = oneArr[0];
+                    _fb = gl.GenFramebuffer();
                     gl.BindFramebuffer(GL_FRAMEBUFFER, _fb);
                     
                     EnsureDepthBufferAttachment(gl);
diff --git a/src/Avalonia.OpenGL/Egl/EglContext.cs b/src/Avalonia.OpenGL/Egl/EglContext.cs
index bc517c3e27..e7b5dc7c83 100644
--- a/src/Avalonia.OpenGL/Egl/EglContext.cs
+++ b/src/Avalonia.OpenGL/Egl/EglContext.cs
@@ -24,7 +24,7 @@ namespace Avalonia.OpenGL.Egl
             SampleCount = sampleCount;
             StencilSize = stencilSize;
             using (MakeCurrent())
-                GlInterface = GlInterface.FromNativeUtf8GetProcAddress(version, b => _egl.GetProcAddress(b));
+                GlInterface = GlInterface.FromNativeUtf8GetProcAddress(version, _egl.GetProcAddress);
         }
 
         public IntPtr Context { get; }
diff --git a/src/Avalonia.OpenGL/Egl/EglDisplay.cs b/src/Avalonia.OpenGL/Egl/EglDisplay.cs
index 623364866b..d3d85e8c83 100644
--- a/src/Avalonia.OpenGL/Egl/EglDisplay.cs
+++ b/src/Avalonia.OpenGL/Egl/EglDisplay.cs
@@ -34,9 +34,9 @@ namespace Avalonia.OpenGL.Egl
             }
             else
             {
-                if (egl.GetPlatformDisplayEXT == null)
+                if (!egl.IsGetPlatformDisplayExtAvailable)
                     throw new OpenGlException("eglGetPlatformDisplayEXT is not supported by libegl");
-                display = egl.GetPlatformDisplayEXT(platformType, platformDisplay, attrs);
+                display = egl.GetPlatformDisplayExt(platformType, platformDisplay, attrs);
             }
             
             if (display == IntPtr.Zero)
diff --git a/src/Avalonia.OpenGL/Egl/EglInterface.cs b/src/Avalonia.OpenGL/Egl/EglInterface.cs
index 6148e58440..4fec8e5356 100644
--- a/src/Avalonia.OpenGL/Egl/EglInterface.cs
+++ b/src/Avalonia.OpenGL/Egl/EglInterface.cs
@@ -2,31 +2,26 @@
 using System.Runtime.InteropServices;
 using Avalonia.Platform;
 using Avalonia.Platform.Interop;
+using Avalonia.SourceGenerator;
 
 namespace Avalonia.OpenGL.Egl
 {
-    public class EglInterface : GlInterfaceBase
+    public unsafe partial class EglInterface
     {
-        public EglInterface() : base(Load())
+        public EglInterface(Func<string, IntPtr> getProcAddress)
         {
-            
-        }
-
-        public EglInterface(Func<Utf8Buffer,IntPtr> getProcAddress) : base(getProcAddress)
-        {
-            
+            Initialize(getProcAddress);
         }
         
-        public EglInterface(Func<string, IntPtr> getProcAddress) : base(getProcAddress)
+        public EglInterface(string library) : this(Load(library))
         {
-            
         }
-        
-        public EglInterface(string library) : base(Load(library))
+
+        public EglInterface() : this(Load())
         {
+            
         }
 
-        
         static Func<string, IntPtr> Load()
         {
             var os = AvaloniaLocator.Current.GetService<IRuntimePlatform>().GetRuntimeInfo().OperatingSystem;
@@ -46,119 +41,75 @@ namespace Avalonia.OpenGL.Egl
         }
 
         // ReSharper disable UnassignedGetOnlyAutoProperty
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate int EglGetError();
-        [GlEntryPoint("eglGetError")]
-        public EglGetError GetError { get; }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate IntPtr EglGetDisplay(IntPtr nativeDisplay);
-        [GlEntryPoint("eglGetDisplay")]
-        public EglGetDisplay GetDisplay { get; }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate IntPtr EglGetPlatformDisplayEXT(int platform, IntPtr nativeDisplay, int[] attrs);
-        [GlEntryPoint("eglGetPlatformDisplayEXT")]
-        [GlOptionalEntryPoint]
-        public EglGetPlatformDisplayEXT GetPlatformDisplayEXT { get; }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate bool EglInitialize(IntPtr display, out int major, out int minor);
-        [GlEntryPoint("eglInitialize")]
-        public EglInitialize Initialize { get; }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate IntPtr EglGetProcAddress(Utf8Buffer proc);
-        [GlEntryPoint("eglGetProcAddress")]
-        public EglGetProcAddress GetProcAddress { get; }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate bool EglBindApi(int api);
-        [GlEntryPoint("eglBindAPI")]
-        public EglBindApi BindApi { get; }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate bool EglChooseConfig(IntPtr display, int[] attribs,
-            out IntPtr surfaceConfig, int numConfigs, out int choosenConfig);
-        [GlEntryPoint("eglChooseConfig")]
-        public EglChooseConfig ChooseConfig { get; }
+        
+        [GetProcAddress("eglGetError")]
+        public partial int GetError();
+        
+        [GetProcAddress("eglGetDisplay")]
+        public partial IntPtr GetDisplay(IntPtr nativeDisplay);
+        
+        [GetProcAddress("eglGetPlatformDisplayEXT", true)]
+        public partial IntPtr GetPlatformDisplayExt(int platform, IntPtr nativeDisplay, int[] attrs);
+
+        [GetProcAddress("eglInitialize")]        
+        public partial bool Initialize(IntPtr display, out int major, out int minor);
+
+        [GetProcAddress("eglGetProcAddress")]        
+        public partial IntPtr GetProcAddress(IntPtr proc);
 
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate IntPtr EglCreateContext(IntPtr display, IntPtr config,
+        [GetProcAddress("eglBindAPI")]
+        public partial bool BindApi(int api);
+
+        [GetProcAddress("eglChooseConfig")]
+        public partial bool ChooseConfig(IntPtr display, int[] attribs,
+            out IntPtr surfaceConfig, int numConfigs, out int choosenConfig);
+        
+        [GetProcAddress("eglCreateContext")]
+        public partial IntPtr CreateContext(IntPtr display, IntPtr config,
             IntPtr share, int[] attrs);
-        [GlEntryPoint("eglCreateContext")]
-        public EglCreateContext CreateContext { get; }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate bool EglDestroyContext(IntPtr display, IntPtr context);
-        [GlEntryPoint("eglDestroyContext")]
-        public EglDestroyContext DestroyContext { get; }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate IntPtr EglCreatePBufferSurface(IntPtr display, IntPtr config, int[] attrs);
-        [GlEntryPoint("eglCreatePbufferSurface")]
-        public EglCreatePBufferSurface CreatePBufferSurface { get; }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate bool EglMakeCurrent(IntPtr display, IntPtr draw, IntPtr read, IntPtr context);
-        [GlEntryPoint("eglMakeCurrent")]
-        public EglMakeCurrent MakeCurrent { get; }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate IntPtr EglGetCurrentContext();
-        [GlEntryPoint("eglGetCurrentContext")]
-        public EglGetCurrentContext GetCurrentContext { get; }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate IntPtr EglGetCurrentDisplay();
-        [GlEntryPoint("eglGetCurrentDisplay")]
-        public EglGetCurrentContext GetCurrentDisplay { get; }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate IntPtr EglGetCurrentSurface(int readDraw);
-        [GlEntryPoint("eglGetCurrentSurface")] 
-        public EglGetCurrentSurface GetCurrentSurface { get; }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void EglDisplaySurfaceVoidDelegate(IntPtr display, IntPtr surface);
-        [GlEntryPoint("eglDestroySurface")]
-        public EglDisplaySurfaceVoidDelegate DestroySurface { get; }
-        
-        [GlEntryPoint("eglSwapBuffers")]
-        public EglDisplaySurfaceVoidDelegate SwapBuffers { get; }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate IntPtr
-            EglCreateWindowSurface(IntPtr display, IntPtr config, IntPtr window, int[] attrs);
-        [GlEntryPoint("eglCreateWindowSurface")]
-        public EglCreateWindowSurface CreateWindowSurface { get; }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate bool EglGetConfigAttrib(IntPtr display, IntPtr config, int attr, out int rv);
-        [GlEntryPoint("eglGetConfigAttrib")]
-        public EglGetConfigAttrib GetConfigAttrib { get; }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate bool EglWaitGL();
-        [GlEntryPoint("eglWaitGL")]
-        public EglWaitGL WaitGL { get; }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate bool EglWaitClient();
-        [GlEntryPoint("eglWaitClient")]
-        public EglWaitGL WaitClient { get; }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate bool EglWaitNative(int engine);
-        [GlEntryPoint("eglWaitNative")]
-        public EglWaitNative WaitNative { get; }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate IntPtr EglQueryString(IntPtr display, int i);
-        
-        [GlEntryPoint("eglQueryString")]
-        public EglQueryString QueryStringNative { get; }
+        
+        [GetProcAddress("eglDestroyContext")]
+        public partial bool DestroyContext(IntPtr display, IntPtr context);
+        
+        [GetProcAddress("eglCreatePbufferSurface")]
+        public partial IntPtr CreatePBufferSurface(IntPtr display, IntPtr config, int[] attrs);
 
+        [GetProcAddress("eglMakeCurrent")]
+        public partial bool MakeCurrent(IntPtr display, IntPtr draw, IntPtr read, IntPtr context);
+        
+        [GetProcAddress("eglGetCurrentContext")]
+        public partial IntPtr GetCurrentContext();
+
+        [GetProcAddress("eglGetCurrentDisplay")]
+        public partial IntPtr GetCurrentDisplay();
+        
+        [GetProcAddress("eglGetCurrentSurface")] 
+        public partial IntPtr GetCurrentSurface(int readDraw);
+
+        [GetProcAddress("eglDestroySurface")]
+        public partial void DestroySurface(IntPtr display, IntPtr surface);
+
+        [GetProcAddress("eglSwapBuffers")]
+        public partial void SwapBuffers(IntPtr display, IntPtr surface);
+
+        [GetProcAddress("eglCreateWindowSurface")]
+        public partial IntPtr CreateWindowSurface(IntPtr display, IntPtr config, IntPtr window, int[] attrs);
+
+        [GetProcAddress("eglGetConfigAttrib")]
+        public partial bool GetConfigAttrib(IntPtr display, IntPtr config, int attr, out int rv);
+        
+        [GetProcAddress("eglWaitGL")]
+        public partial bool WaitGL();
+        
+        [GetProcAddress("eglWaitClient")]
+        public partial bool WaitClient();
+        
+        [GetProcAddress("eglWaitNative")]
+        public partial bool WaitNative(int engine);
+        
+        [GetProcAddress("eglQueryString")]
+        public partial IntPtr QueryStringNative(IntPtr display, int i);
+        
         public string QueryString(IntPtr display, int i)
         {
             var rv = QueryStringNative(display, i);
@@ -166,25 +117,15 @@ namespace Avalonia.OpenGL.Egl
                 return null;
             return Marshal.PtrToStringAnsi(rv);
         }
+        
+        [GetProcAddress("eglCreatePbufferFromClientBuffer")]
+        public partial IntPtr CreatePbufferFromClientBuffer(IntPtr display, int buftype, IntPtr buffer, IntPtr config, int[] attrib_list);
+        
+        [GetProcAddress("eglQueryDisplayAttribEXT", true)]
+        public partial bool QueryDisplayAttribExt(IntPtr display, int attr, out IntPtr res);
 
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate IntPtr EglCreatePbufferFromClientBuffer(IntPtr display, int buftype, IntPtr buffer, IntPtr config, int[] attrib_list);
-        [GlEntryPoint("eglCreatePbufferFromClientBuffer")]
-
-        public EglCreatePbufferFromClientBuffer CreatePbufferFromClientBuffer { get; }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate bool EglQueryDisplayAttribEXT(IntPtr display, int attr, out IntPtr res);
-
-        [GlEntryPoint("eglQueryDisplayAttribEXT"), GlOptionalEntryPoint]
-        public EglQueryDisplayAttribEXT QueryDisplayAttribExt { get; }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate bool EglQueryDeviceAttribEXT(IntPtr display, int attr, out IntPtr res);
-
-        [GlEntryPoint("eglQueryDeviceAttribEXT"), GlOptionalEntryPoint]
-        public EglQueryDisplayAttribEXT QueryDeviceAttribExt { get; }
-
-        // ReSharper restore UnassignedGetOnlyAutoProperty
+        
+        [GetProcAddress("eglQueryDeviceAttribEXT", true)]
+        public partial bool QueryDeviceAttribExt(IntPtr display, int attr, out IntPtr res);
     }
 }
diff --git a/src/Avalonia.OpenGL/GlBasicInfoInterface.cs b/src/Avalonia.OpenGL/GlBasicInfoInterface.cs
index aaba2ec09c..7a7110f15b 100644
--- a/src/Avalonia.OpenGL/GlBasicInfoInterface.cs
+++ b/src/Avalonia.OpenGL/GlBasicInfoInterface.cs
@@ -3,46 +3,24 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;
 using Avalonia.Platform.Interop;
+using Avalonia.SourceGenerator;
 
 namespace Avalonia.OpenGL
 {
-    public class GlBasicInfoInterface : GlBasicInfoInterface<object>
+    public unsafe partial class GlBasicInfoInterface
     {
-        public GlBasicInfoInterface(Func<string, IntPtr> getProcAddress) : base(getProcAddress, null)
-        {
-        }
-
-        public GlBasicInfoInterface(Func<Utf8Buffer, IntPtr> nativeGetProcAddress) : base(nativeGetProcAddress, null)
-        {
+        public GlBasicInfoInterface(Func<string, IntPtr> getProcAddress){
+            Initialize(getProcAddress);
         }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void GlGetIntegerv(int name, out int rv);
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate IntPtr GlGetString(int v);
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate IntPtr GlGetStringi(int v, int v1);
-    }
     
-    public class GlBasicInfoInterface<TContextInfo> : GlInterfaceBase<TContextInfo>
-    {
-        public GlBasicInfoInterface(Func<string, IntPtr> getProcAddress, TContextInfo context) : base(getProcAddress, context)
-        {
-        }
+        [GetProcAddress("glGetIntegerv")]
+        public partial void GetIntegerv(int name, out int rv);
 
-        public GlBasicInfoInterface(Func<Utf8Buffer, IntPtr> nativeGetProcAddress, TContextInfo context) : base(nativeGetProcAddress, context)
-        {
-        }
-        
-        [GlEntryPoint("glGetIntegerv")]
-        public GlBasicInfoInterface.GlGetIntegerv GetIntegerv { get; }
-        
-        
-        [GlEntryPoint("glGetString")]
-        public GlBasicInfoInterface.GlGetString GetStringNative { get; }
-        
-        [GlEntryPoint("glGetStringi")]
-        public GlBasicInfoInterface.GlGetStringi GetStringiNative { get; }
+        [GetProcAddress("glGetString")]
+        public partial IntPtr GetStringNative(int v);
+
+        [GetProcAddress("glGetStringi")]
+        public partial IntPtr GetStringiNative(int v, int v1);
 
         public string GetString(int v)
         {
diff --git a/src/Avalonia.OpenGL/GlEntryPointAttribute.cs b/src/Avalonia.OpenGL/GlEntryPointAttribute.cs
index 2ffdaca8fe..3e31de6995 100644
--- a/src/Avalonia.OpenGL/GlEntryPointAttribute.cs
+++ b/src/Avalonia.OpenGL/GlEntryPointAttribute.cs
@@ -2,117 +2,54 @@ using System;
 
 namespace Avalonia.OpenGL
 {
-    public interface IGlEntryPointAttribute
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    class GlMinVersionEntryPoint : Attribute
     {
-        IntPtr GetProcAddress(Func<string, IntPtr> getProcAddress);
-    }
-    
-    public interface IGlEntryPointAttribute<in TContext>
-    {
-        IntPtr GetProcAddress(TContext context, Func<string, IntPtr> getProcAddress);
-    }
-
-    [AttributeUsage(AttributeTargets.Property)]
-    public class GlOptionalEntryPoint : Attribute
-    {
-        
-    }
-    
-    [AttributeUsage(AttributeTargets.Property, AllowMultiple = true)]
-    public class GlEntryPointAttribute : Attribute, IGlEntryPointAttribute
-    {
-        public string[] EntryPoints { get; }
-
-        public GlEntryPointAttribute(string entryPoint)
-        {
-            EntryPoints = new []{entryPoint};
-        }
-/*
-        public GlEntryPointAttribute(params string[] entryPoints)
+        public GlMinVersionEntryPoint(string entry, int minVersionMajor, int minVersionMinor)
         {
-            EntryPoints = entryPoints;
-        }
-*/
-        public IntPtr GetProcAddress(Func<string, IntPtr> getProcAddress)
-        {
-            foreach (var name in EntryPoints)
-            {
-                var rv = getProcAddress(name);
-                if (rv != IntPtr.Zero)
-                    return rv;
-            }
-            return IntPtr.Zero;
-        }
-    }
-    
-    [AttributeUsage(AttributeTargets.Property, AllowMultiple = true)]
-    public class GlMinVersionEntryPoint : Attribute, IGlEntryPointAttribute<GlInterface.GlContextInfo>
-    {
-        private readonly string _entry;
-        private readonly GlProfileType? _profile;
-        private readonly int _minVersionMajor;
-        private readonly int _minVersionMinor;
-
-        public GlMinVersionEntryPoint(string entry, GlProfileType profile, int minVersionMajor,
-            int minVersionMinor)
-        {
-            _entry = entry;
-            _profile = profile;
-            _minVersionMajor = minVersionMajor;
-            _minVersionMinor = minVersionMinor;
         }
         
-        public GlMinVersionEntryPoint(string entry, int minVersionMajor,
-            int minVersionMinor)
+        public GlMinVersionEntryPoint(string entry, int minVersionMajor, int minVersionMinor, GlProfileType profile)
         {
-            _entry = entry;
-            _minVersionMajor = minVersionMajor;
-            _minVersionMinor = minVersionMinor;
         }
+
         
-        public IntPtr GetProcAddress(GlInterface.GlContextInfo context, Func<string, IntPtr> getProcAddress)
+        public static IntPtr GetProcAddress(Func<string, IntPtr> getProcAddress, GlInterface.GlContextInfo context,
+            string entry, int minVersionMajor, int minVersionMinor, GlProfileType? profile = null)
         {
-            if(_profile.HasValue && context.Version.Type != _profile)
+            if(profile.HasValue && context.Version.Type != profile)
                 return IntPtr.Zero;
-            if(context.Version.Major<_minVersionMajor)
+            if(context.Version.Major<minVersionMajor)
                 return IntPtr.Zero;
-            if (context.Version.Major == _minVersionMajor && context.Version.Minor < _minVersionMinor)
+            if (context.Version.Major == minVersionMajor && context.Version.Minor < minVersionMinor)
                 return IntPtr.Zero;
-            return getProcAddress(_entry);
+            return getProcAddress(entry);
         }
     }
     
-    [AttributeUsage(AttributeTargets.Property, AllowMultiple = true)]
-    public class GlExtensionEntryPoint : Attribute, IGlEntryPointAttribute<GlInterface.GlContextInfo>
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    class GlExtensionEntryPoint : Attribute
     {
-        private readonly string _entry;
-        private readonly GlProfileType? _profile;
-        private readonly string _extension;
-
-        public GlExtensionEntryPoint(string entry, GlProfileType profile, string extension)
+        public GlExtensionEntryPoint(string entry, string extension)
         {
-            _entry = entry;
-            _profile = profile;
-            _extension = extension;
         }
         
-        public GlExtensionEntryPoint(string entry, string extension)
+        public GlExtensionEntryPoint(string entry, string extension, GlProfileType profile)
         {
-            _entry = entry;
-            _extension = extension;
         }
         
-        public IntPtr GetProcAddress(GlInterface.GlContextInfo context, Func<string, IntPtr> getProcAddress)
+        public static IntPtr GetProcAddress(Func<string, IntPtr> getProcAddress, GlInterface.GlContextInfo context,
+            string entry, string extension, GlProfileType? profile = null)
         {
             // Ignore different profile type
-            if (_profile.HasValue && _profile != context.Version.Type)
+            if (profile.HasValue && profile != context.Version.Type)
                 return IntPtr.Zero;
 
             // Check if extension is supported by the current context
-            if (!context.Extensions.Contains(_extension))
+            if (!context.Extensions.Contains(extension))
                 return IntPtr.Zero;
 
-            return getProcAddress(_entry);
+            return getProcAddress(entry);
         }
     }
 }
diff --git a/src/Avalonia.OpenGL/GlInterface.cs b/src/Avalonia.OpenGL/GlInterface.cs
index 18bebe4cb5..d6eff9a35f 100644
--- a/src/Avalonia.OpenGL/GlInterface.cs
+++ b/src/Avalonia.OpenGL/GlInterface.cs
@@ -3,14 +3,14 @@ using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using System.Text;
 using Avalonia.Platform.Interop;
+using Avalonia.SourceGenerator;
 using static Avalonia.OpenGL.GlConsts;
 
 namespace Avalonia.OpenGL
 {
-    public delegate IntPtr GlGetProcAddressDelegate(string procName);
-    
-    public unsafe class GlInterface : GlBasicInfoInterface<GlInterface.GlContextInfo>
+    public unsafe partial class GlInterface : GlBasicInfoInterface
     {
+        private readonly Func<string, IntPtr> _getProcAddress;
         public string Version { get; }
         public string Vendor { get; }
         public string Renderer { get; }
@@ -35,12 +35,14 @@ namespace Avalonia.OpenGL
             }
         }
 
-        private GlInterface(GlContextInfo info, Func<string, IntPtr> getProcAddress) : base(getProcAddress, info)
+        private GlInterface(GlContextInfo info, Func<string, IntPtr> getProcAddress) : base(getProcAddress)
         {
+            _getProcAddress = getProcAddress;
             ContextInfo = info;
             Version = GetString(GlConsts.GL_VERSION);
             Renderer = GetString(GlConsts.GL_RENDERER);
-            Vendor = GetString(GlConsts.GL_VENDOR);   
+            Vendor = GetString(GlConsts.GL_VENDOR);
+            Initialize(getProcAddress, ContextInfo);
         }
 
         public GlInterface(GlVersion version, Func<string, IntPtr> getProcAddress) : this(
@@ -48,92 +50,58 @@ namespace Avalonia.OpenGL
         {
         }
 
-        public GlInterface(GlVersion version, Func<Utf8Buffer, IntPtr> n) : this(version, ConvertNative(n))
+        public IntPtr GetProcAddress(string proc) => _getProcAddress(proc);
+
+        [GetProcAddress("glGetError")]
+        public partial int GetError();
+
+        [GetProcAddress("glClearStencil")]
+        public partial void ClearStencil(int s);
+
+        [GetProcAddress("glClearColor")]
+        public partial void ClearColor(float r, float g, float b, float a);
+
+        [GetProcAddress("glClear")]
+        public partial void Clear(int bits);
+
+        [GetProcAddress("glViewport")]
+        public partial void Viewport(int x, int y, int width, int height);
+
+        [GetProcAddress("glFlush")]
+        public partial void Flush();
+
+        [GetProcAddress("glFinish")]
+        public partial void Finish();
+
+        [GetProcAddress("glGetIntegerv")]
+        public partial void GetIntegerv(int name, out int rv);
+
+        [GetProcAddress("glGenFramebuffers")]
+        public partial void GenFramebuffers(int count, int* res);
+
+        public int GenFramebuffer()
         {
-            
+            int rv = 0;
+            GenFramebuffers(1, &rv);
+            return rv;
         }
 
-        public static GlInterface FromNativeUtf8GetProcAddress(GlVersion version, Func<Utf8Buffer, IntPtr> getProcAddress) =>
-            new GlInterface(version, getProcAddress);
-
-        
-        public T GetProcAddress<T>(string proc) => Marshal.GetDelegateForFunctionPointer<T>(GetProcAddress(proc));
-
-        // ReSharper disable UnassignedGetOnlyAutoProperty
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate int GlGetError();
-        [GlEntryPoint("glGetError")]
-        public GlGetError GetError { get; }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void GlClearStencil(int s);
-        [GlEntryPoint("glClearStencil")]
-        public GlClearStencil ClearStencil { get; }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void GlClearColor(float r, float g, float b, float a);
-        [GlEntryPoint("glClearColor")]
-        public GlClearColor ClearColor { get; }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void GlClear(int bits);
-        [GlEntryPoint("glClear")]
-        public GlClear Clear { get; }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void GlViewport(int x, int y, int width, int height);
-        [GlEntryPoint("glViewport")]
-        public GlViewport Viewport { get; }
-        
-        [GlEntryPoint("glFlush")]
-        public UnmanagedAction Flush { get; }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void UnmanagedAction();
-        
-        [GlEntryPoint("glFinish")]
-        public UnmanagedAction Finish { get; }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate IntPtr GlGetString(int v);
-        [GlEntryPoint("glGetString")]
-        public GlGetString GetStringNative { get; }
-
-        public string GetString(int v)
+        [GetProcAddress("glDeleteFramebuffers")]
+        public partial void DeleteFramebuffers(int count, int* framebuffers);
+
+        public void DeleteFramebuffer(int fb)
         {
-            var ptr = GetStringNative(v);
-            if (ptr != IntPtr.Zero)
-                return Marshal.PtrToStringAnsi(ptr);
-            return null;
+            DeleteFramebuffers(1, &fb);
         }
 
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void GlGetIntegerv(int name, out int rv);
-        [GlEntryPoint("glGetIntegerv")]
-        public GlGetIntegerv GetIntegerv { get; }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void GlGenFramebuffers(int count, int[] res);
-        [GlEntryPoint("glGenFramebuffers")]
-        public GlGenFramebuffers GenFramebuffers { get; }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void GlDeleteFramebuffers(int count, int[] framebuffers);
-        [GlEntryPoint("glDeleteFramebuffers")]
-        public GlDeleteFramebuffers DeleteFramebuffers { get; }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void GlBindFramebuffer(int target, int fb);
-        [GlEntryPoint("glBindFramebuffer")]
-        public GlBindFramebuffer BindFramebuffer { get; }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate int GlCheckFramebufferStatus(int target);
-        [GlEntryPoint("glCheckFramebufferStatus")]
-        public GlCheckFramebufferStatus CheckFramebufferStatus { get; }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void GlBlitFramebuffer(int srcX0,
+        [GetProcAddress("glBindFramebuffer")]
+        public partial void BindFramebuffer(int target, int fb);
+
+        [GetProcAddress("glCheckFramebufferStatus")]
+        public partial int CheckFramebufferStatus(int target);
+
+        [GlMinVersionEntryPoint("glBlitFramebuffer", 3, 0), GetProcAddress(true)]
+        public partial void BlitFramebuffer(int srcX0,
             int srcY0,
             int srcX1,
             int srcY1,
@@ -143,89 +111,78 @@ namespace Avalonia.OpenGL
             int dstY1,
             int mask,
             int filter);
-        [GlMinVersionEntryPoint("glBlitFramebuffer", 3, 0), GlOptionalEntryPoint]
-        public GlBlitFramebuffer BlitFramebuffer { get; }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void GlGenRenderbuffers(int count, int[] res);
-        [GlEntryPoint("glGenRenderbuffers")]
-        public GlGenRenderbuffers GenRenderbuffers { get; }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void GlDeleteRenderbuffers(int count, int[] renderbuffers);
-        [GlEntryPoint("glDeleteRenderbuffers")]
-        public GlDeleteTextures DeleteRenderbuffers { get; }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void GlBindRenderbuffer(int target, int fb);
-        [GlEntryPoint("glBindRenderbuffer")]
-        public GlBindRenderbuffer BindRenderbuffer { get; }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void GlRenderbufferStorage(int target, int internalFormat, int width, int height);
-        [GlEntryPoint("glRenderbufferStorage")]
-        public GlRenderbufferStorage RenderbufferStorage { get; }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void GlFramebufferRenderbuffer(int target, int attachment,
+
+
+        [GetProcAddress("glGenRenderbuffers")]
+        public partial void GenRenderbuffers(int count, int* res);
+
+        public int GenRenderbuffer()
+        {
+            int rv = 0;
+            GenRenderbuffers(1, &rv);
+            return rv;
+        }
+
+        [GetProcAddress("glDeleteRenderbuffers")]
+        public partial void DeleteRenderbuffers(int count, int* renderbuffers);
+
+        public void DeleteRenderbuffer(int renderbuffer)
+        {
+            DeleteRenderbuffers(1, &renderbuffer);
+        }
+
+        [GetProcAddress("glBindRenderbuffer")]
+        public partial void BindRenderbuffer(int target, int fb);
+
+        [GetProcAddress("glRenderbufferStorage")]
+        public partial void RenderbufferStorage(int target, int internalFormat, int width, int height);
+
+        [GetProcAddress("glFramebufferRenderbuffer")]
+        public partial void FramebufferRenderbuffer(int target, int attachment,
             int renderbufferTarget, int renderbuffer);
-        [GlEntryPoint("glFramebufferRenderbuffer")]
-        public GlFramebufferRenderbuffer FramebufferRenderbuffer { get; }
 
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void GlGenTextures(int count, int[] res);
-        [GlEntryPoint("glGenTextures")]
-        public GlGenTextures GenTextures { get; }
+        [GetProcAddress("glGenTextures")]
+        public partial void GenTextures(int count, int* res);
+
+        public int GenTexture()
+        {
+            int rv = 0;
+            GenTextures(1, &rv);
+            return rv;
+        }
 
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void GlBindTexture(int target, int fb);
-        [GlEntryPoint("glBindTexture")]
-        public GlBindTexture BindTexture { get; }
+        [GetProcAddress("glBindTexture")]
+        public partial void BindTexture(int target, int fb);
 
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void GlActiveTexture(int texture);
-        [GlEntryPoint("glActiveTexture")]
-        public GlActiveTexture ActiveTexture { get; }
+        [GetProcAddress("glActiveTexture")]
+        public partial void ActiveTexture(int texture);
 
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void GlDeleteTextures(int count, int[] textures);
-        [GlEntryPoint("glDeleteTextures")]
-        public GlDeleteTextures DeleteTextures { get; }
+        [GetProcAddress("glDeleteTextures")]
+        public partial void DeleteTextures(int count, int* textures);
 
+        public void DeleteTexture(int texture) => DeleteTextures(1, &texture);
 
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void GlTexImage2D(int target, int level, int internalFormat, int width, int height, int border,
+        [GetProcAddress("glTexImage2D")]
+        public partial void TexImage2D(int target, int level, int internalFormat, int width, int height, int border,
             int format, int type, IntPtr data);
-        [GlEntryPoint("glTexImage2D")]
-        public GlTexImage2D TexImage2D { get; }
 
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void GlCopyTexSubImage2D(int target, int level, int xoffset, int yoffset, int x, int y,
+        [GetProcAddress("glCopyTexSubImage2D")]
+        public partial void CopyTexSubImage2D(int target, int level, int xoffset, int yoffset, int x, int y,
             int width, int height);
-        
-        [GlEntryPoint("glCopyTexSubImage2D")]
-        public GlCopyTexSubImage2D CopyTexSubImage2D { get; }
 
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void GlTexParameteri(int target, int name, int value);
-        [GlEntryPoint("glTexParameteri")]
-        public GlTexParameteri TexParameteri { get; }
+        [GetProcAddress("glTexParameteri")]
+        public partial void TexParameteri(int target, int name, int value);
 
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void GlFramebufferTexture2D(int target, int attachment,
+
+        [GetProcAddress("glFramebufferTexture2D")]
+        public partial void FramebufferTexture2D(int target, int attachment,
             int texTarget, int texture, int level);
-        [GlEntryPoint("glFramebufferTexture2D")]
-        public GlFramebufferTexture2D FramebufferTexture2D { get; }
 
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate int GlCreateShader(int shaderType);
-        [GlEntryPoint("glCreateShader")]
-        public GlCreateShader CreateShader { get; }
+        [GetProcAddress("glCreateShader")]
+        public partial int CreateShader(int shaderType);
 
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void GlShaderSource(int shader, int count, IntPtr strings, IntPtr lengths);
-        [GlEntryPoint("glShaderSource")]
-        public GlShaderSource ShaderSource { get; }
+        [GetProcAddress("glShaderSource")]
+        public partial void ShaderSource(int shader, int count, IntPtr strings, IntPtr lengths);
 
         public void ShaderSourceString(int shader, string source)
         {
@@ -237,20 +194,14 @@ namespace Avalonia.OpenGL
             }
         }
 
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void GlCompileShader(int shader);
-        [GlEntryPoint("glCompileShader")]
-        public GlCompileShader CompileShader { get; }
+        [GetProcAddress("glCompileShader")]
+        public partial void CompileShader(int shader);
 
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void GlGetShaderiv(int shader, int name, int* parameters);
-        [GlEntryPoint("glGetShaderiv")]
-        public GlGetShaderiv GetShaderiv { get; }
+        [GetProcAddress("glGetShaderiv")]
+        public partial void GetShaderiv(int shader, int name, int* parameters);
 
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void GlGetShaderInfoLog(int shader, int maxLength, out int length, void*infoLog);
-        [GlEntryPoint("glGetShaderInfoLog")]
-        public GlGetShaderInfoLog GetShaderInfoLog { get; }
+        [GetProcAddress("glGetShaderInfoLog")]
+        public partial void GetShaderInfoLog(int shader, int maxLength, out int length, void* infoLog);
 
         public unsafe string CompileShaderAndGetError(int shader, string source)
         {
@@ -268,33 +219,24 @@ namespace Avalonia.OpenGL
             int len;
             fixed (void* ptr = logData)
                 GetShaderInfoLog(shader, logLength, out len, ptr);
-            return Encoding.UTF8.GetString(logData,0, len);
+            return Encoding.UTF8.GetString(logData, 0, len);
         }
 
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate int GlCreateProgram();
-        [GlEntryPoint("glCreateProgram")]
-        public GlCreateProgram CreateProgram { get; }
 
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void GlAttachShader(int program, int shader);
-        [GlEntryPoint("glAttachShader")]
-        public GlAttachShader AttachShader { get; }
+        [GetProcAddress("glCreateProgram")]
+        public partial int CreateProgram();
+
+        [GetProcAddress("glAttachShader")]
+        public partial void AttachShader(int program, int shader);
 
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void GlLinkProgram(int program);
-        [GlEntryPoint("glLinkProgram")]
-        public GlLinkProgram LinkProgram { get; }
+        [GetProcAddress("glLinkProgram")]
+        public partial void LinkProgram(int program);
 
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void GlGetProgramiv(int program, int name, int* parameters);
-        [GlEntryPoint("glGetProgramiv")]
-        public GlGetProgramiv GetProgramiv { get; }
+        [GetProcAddress("glGetProgramiv")]
+        public partial void GetProgramiv(int program, int name, int* parameters);
 
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void GlGetProgramInfoLog(int program, int maxLength, out int len, void* infoLog);
-        [GlEntryPoint("glGetProgramInfoLog")]
-        public GlGetProgramInfoLog GetProgramInfoLog { get; }
+        [GetProcAddress("glGetProgramInfoLog")]
+        public partial void GetProgramInfoLog(int program, int maxLength, out int len, void* infoLog);
 
         public unsafe string LinkProgramAndGetError(int program)
         {
@@ -309,13 +251,11 @@ namespace Avalonia.OpenGL
             int len;
             fixed (void* ptr = logData)
                 GetProgramInfoLog(program, logLength, out len, ptr);
-            return Encoding.UTF8.GetString(logData,0, len);
+            return Encoding.UTF8.GetString(logData, 0, len);
         }
 
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void GlBindAttribLocation(int program, int index, IntPtr name);
-        [GlEntryPoint("glBindAttribLocation")]
-        public GlBindAttribLocation BindAttribLocation { get; }
+        [GetProcAddress("glBindAttribLocation")]
+        public partial void BindAttribLocation(int program, int index, IntPtr name);
 
         public void BindAttribLocationString(int program, int index, string name)
         {
@@ -323,32 +263,24 @@ namespace Avalonia.OpenGL
                 BindAttribLocation(program, index, b.DangerousGetHandle());
         }
 
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void GlGenBuffers(int len, int[] rv);
-        [GlEntryPoint("glGenBuffers")]
-        public GlGenBuffers GenBuffers { get; }
+        [GetProcAddress("glGenBuffers")]
+        public partial void GenBuffers(int len, int* rv);
 
         public int GenBuffer()
         {
-            var rv = new int[1];
-            GenBuffers(1, rv);
-            return rv[0];
+            int rv;
+            GenBuffers(1, &rv);
+            return rv;
         }
 
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void GlBindBuffer(int target, int buffer);
-        [GlEntryPoint("glBindBuffer")]
-        public GlBindBuffer BindBuffer { get; }
+        [GetProcAddress("glBindBuffer")]
+        public partial void BindBuffer(int target, int buffer);
 
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void GlBufferData(int target, IntPtr size, IntPtr data, int usage);
-        [GlEntryPoint("glBufferData")]
-        public GlBufferData BufferData { get; }
+        [GetProcAddress("glBufferData")]
+        public partial void BufferData(int target, IntPtr size, IntPtr data, int usage);
 
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate int GlGetAttribLocation(int program, IntPtr name);
-        [GlEntryPoint("glGetAttribLocation")]
-        public GlGetAttribLocation GetAttribLocation { get; }
+        [GetProcAddress("glGetAttribLocation")]
+        public partial int GetAttribLocation(int program, IntPtr name);
 
         public int GetAttribLocationString(int program, string name)
         {
@@ -356,36 +288,24 @@ namespace Avalonia.OpenGL
                 return GetAttribLocation(program, b.DangerousGetHandle());
         }
 
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void GlVertexAttribPointer(int index, int size, int type,
+        [GetProcAddress("glVertexAttribPointer")]
+        public partial void VertexAttribPointer(int index, int size, int type,
             int normalized, int stride, IntPtr pointer);
-        [GlEntryPoint("glVertexAttribPointer")]
-        public GlVertexAttribPointer VertexAttribPointer { get; }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void GlEnableVertexAttribArray(int index);
-        [GlEntryPoint("glEnableVertexAttribArray")]
-        public GlEnableVertexAttribArray EnableVertexAttribArray { get; }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void GlUseProgram(int program);
-        [GlEntryPoint("glUseProgram")]
-        public GlUseProgram UseProgram { get; }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void GlDrawArrays(int mode, int first, IntPtr count);
-        [GlEntryPoint("glDrawArrays")]
-        public GlDrawArrays DrawArrays { get; }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void GlDrawElements(int mode, int count, int type, IntPtr indices);
-        [GlEntryPoint("glDrawElements")]
-        public GlDrawElements DrawElements { get; }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate int GlGetUniformLocation(int program, IntPtr name);
-        [GlEntryPoint("glGetUniformLocation")]
-        public GlGetUniformLocation GetUniformLocation { get; }
+
+        [GetProcAddress("glEnableVertexAttribArray")]
+        public partial void EnableVertexAttribArray(int index);
+
+        [GetProcAddress("glUseProgram")]
+        public partial void UseProgram(int program);
+
+        [GetProcAddress("glDrawArrays")]
+        public partial void DrawArrays(int mode, int first, IntPtr count);
+
+        [GetProcAddress("glDrawElements")]
+        public partial void DrawElements(int mode, int count, int type, IntPtr indices);
+
+        [GetProcAddress("glGetUniformLocation")]
+        public partial int GetUniformLocation(int program, IntPtr name);
 
         public int GetUniformLocationString(int program, string name)
         {
@@ -393,41 +313,65 @@ namespace Avalonia.OpenGL
                 return GetUniformLocation(program, b.DangerousGetHandle());
         }
 
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void GlUniform1f(int location, float falue);
-        [GlEntryPoint("glUniform1f")]
-        public GlUniform1f Uniform1f { get; }
-
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void GlUniformMatrix4fv(int location, int count, bool transpose, void* value);
-        [GlEntryPoint("glUniformMatrix4fv")]
-        public GlUniformMatrix4fv UniformMatrix4fv { get; }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void GlEnable(int what);
-        [GlEntryPoint("glEnable")]
-        public GlEnable Enable { get; }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void GlDeleteBuffers(int count, int[] buffers);
-        [GlEntryPoint("glDeleteBuffers")]
-        public GlDeleteBuffers DeleteBuffers { get; }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void GlDeleteProgram(int program);
-        [GlEntryPoint("glDeleteProgram")]
-        public GlDeleteProgram DeleteProgram { get; }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void GlDeleteShader(int shader);
-        [GlEntryPoint("glDeleteShader")]
-        public GlDeleteShader DeleteShader { get; }
-        
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void GLGetRenderbufferParameteriv(int target, int name, int[] value);
-        [GlEntryPoint("glGetRenderbufferParameteriv")]
-        public GLGetRenderbufferParameteriv GetRenderbufferParameteriv { get; }
+        [GetProcAddress("glUniform1f")]
+        public partial void Uniform1f(int location, float falue);
+
+
+        [GetProcAddress("glUniformMatrix4fv")]
+        public partial void UniformMatrix4fv(int location, int count, bool transpose, void* value);
+
+        [GetProcAddress("glEnable")]
+        public partial void Enable(int what);
+
+        [GetProcAddress("glDeleteBuffers")]
+        public partial void DeleteBuffers(int count, int* buffers);
+
+        public void DeleteBuffer(int buffer) => DeleteBuffers(1, &buffer);
+
+        [GetProcAddress("glDeleteProgram")]
+        public partial void DeleteProgram(int program);
+
+        [GetProcAddress("glDeleteShader")]
+        public partial void DeleteShader(int shader);
+
+        [GetProcAddress("glGetRenderbufferParameteriv")]
+        public partial void GLGetRenderbufferParameteriv(int target, int name, int* value);
         // ReSharper restore UnassignedGetOnlyAutoProperty
+
+        [GetProcAddress(true)]
+        [GlMinVersionEntryPoint("glDeleteVertexArrays", 3, 0)]
+        [GlExtensionEntryPoint("glDeleteVertexArraysOES", "GL_OES_vertex_array_object")]
+        public partial void DeleteVertexArrays(int count, int* arrays);
+
+        public void DeleteVertexArray(int array) => DeleteVertexArrays(1, &array);
+
+        [GetProcAddress(true)]
+        [GlMinVersionEntryPoint("glBindVertexArray", 3, 0)]
+        [GlExtensionEntryPoint("glBindVertexArrayOES", "GL_OES_vertex_array_object")]
+        public partial void BindVertexArray(int array);
+
+
+        [GetProcAddress(true)]
+        [GlMinVersionEntryPoint("glGenVertexArrays", 3, 0)]
+        [GlExtensionEntryPoint("glGenVertexArraysOES", "GL_OES_vertex_array_object")]
+        public partial void GenVertexArrays(int n, int* rv);
+
+        public int GenVertexArray()
+        {
+            int rv = 0;
+            GenVertexArrays(1, &rv);
+            return rv;
+        }
+
+        public static GlInterface FromNativeUtf8GetProcAddress(GlVersion version, Func<IntPtr, IntPtr> getProcAddress)
+        {
+            return new GlInterface(version, s =>
+            {
+                var ptr = Marshal.StringToHGlobalAnsi(s);
+                var rv = getProcAddress(ptr);
+                Marshal.FreeHGlobal(ptr);
+                return rv;
+            });
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Avalonia.OpenGL/GlInterfaceBase.cs b/src/Avalonia.OpenGL/GlInterfaceBase.cs
deleted file mode 100644
index e7dd440e36..0000000000
--- a/src/Avalonia.OpenGL/GlInterfaceBase.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-using System;
-using System.Linq;
-using System.Reflection;
-using System.Runtime.InteropServices;
-using Avalonia.Platform.Interop;
-
-namespace Avalonia.OpenGL
-{
-    public class GlInterfaceBase : GlInterfaceBase<object>
-    {
-        public GlInterfaceBase(Func<string, IntPtr> getProcAddress) : base(getProcAddress, null)
-        {
-        }
-
-        public GlInterfaceBase(Func<Utf8Buffer, IntPtr> nativeGetProcAddress) : base(nativeGetProcAddress, null)
-        {
-        }
-    }
-
-    public class GlInterfaceBase<TContext>
-    {
-        private readonly Func<string, IntPtr> _getProcAddress;
-        public GlInterfaceBase(Func<string, IntPtr> getProcAddress, TContext context)
-        {
-            _getProcAddress = getProcAddress;
-            foreach (var prop in this.GetType().GetProperties())
-            {
-                var attrs = prop.GetCustomAttributes()
-                    .Where(a =>
-                        a is IGlEntryPointAttribute || a is IGlEntryPointAttribute<TContext>)
-                    .ToList();
-                if(attrs.Count == 0)
-                    continue;
-                
-                var isOptional = prop.GetCustomAttribute<GlOptionalEntryPoint>() != null;
-                
-                var fieldName = $"<{prop.Name}>k__BackingField";
-                var field = prop.DeclaringType.GetField(fieldName,
-                    BindingFlags.Instance | BindingFlags.NonPublic);
-                if (field == null)
-                    throw new InvalidProgramException($"Expected property {prop.Name} to have {fieldName}");
-                
-                
-                IntPtr proc = IntPtr.Zero;
-                foreach (var attr in attrs)
-                {
-                    if (attr is IGlEntryPointAttribute<TContext> typed)
-                        proc = typed.GetProcAddress(context, getProcAddress);
-                    else if (attr is IGlEntryPointAttribute untyped)
-                        proc = untyped.GetProcAddress(getProcAddress);
-                    if (proc != IntPtr.Zero)
-                        break;
-                }
-                
-                if (proc != IntPtr.Zero)
-                    field.SetValue(this, Marshal.GetDelegateForFunctionPointer(proc, prop.PropertyType));
-                else if (!isOptional)
-                    throw new OpenGlException("Unable to find a suitable GL function for " + prop.Name);
-            }
-        }
-
-        protected static Func<string, IntPtr> ConvertNative(Func<Utf8Buffer, IntPtr> func) =>
-            (proc) =>
-            {
-                using (var u = new Utf8Buffer(proc))
-                {
-                    var rv = func(u);
-                    return rv;
-                }
-            };
-        
-        public GlInterfaceBase(Func<Utf8Buffer, IntPtr> nativeGetProcAddress, TContext context) : this(ConvertNative(nativeGetProcAddress), context)
-        {
-            
-        }
-        
-        public IntPtr GetProcAddress(string proc) => _getProcAddress(proc);
-    }
-}
diff --git a/src/Avalonia.X11/Avalonia.X11.csproj b/src/Avalonia.X11/Avalonia.X11.csproj
index 45a76bc3d6..621e6fabd7 100644
--- a/src/Avalonia.X11/Avalonia.X11.csproj
+++ b/src/Avalonia.X11/Avalonia.X11.csproj
@@ -11,5 +11,5 @@
         <ProjectReference Include="..\Avalonia.FreeDesktop\Avalonia.FreeDesktop.csproj" />
         <Compile Include="..\Shared\RawEventGrouping.cs" />
     </ItemGroup>
-
+    <Import Project="..\..\build\SourceGenerators.props" />
 </Project>
diff --git a/src/Avalonia.X11/Glx/Glx.cs b/src/Avalonia.X11/Glx/Glx.cs
index 37ca7f5603..1a26d7d5f5 100644
--- a/src/Avalonia.X11/Glx/Glx.cs
+++ b/src/Avalonia.X11/Glx/Glx.cs
@@ -4,111 +4,97 @@ using System.Linq;
 using System.Runtime.InteropServices;
 using Avalonia.OpenGL;
 using Avalonia.Platform.Interop;
+using Avalonia.SourceGenerator;
+
 // ReSharper disable UnassignedGetOnlyAutoProperty
 
 namespace Avalonia.X11.Glx
 {
-    unsafe class GlxInterface : GlInterfaceBase
+    unsafe partial class GlxInterface
     {
         private const string libGL = "libGL.so.1";
-        [GlEntryPointAttribute("glXMakeContextCurrent")]
-        public GlxMakeContextCurrent MakeContextCurrent { get; }
-        public delegate bool GlxMakeContextCurrent(IntPtr display, IntPtr draw, IntPtr read, IntPtr context);
+        [GetProcAddress("glXMakeContextCurrent")]
+        public partial bool MakeContextCurrent(IntPtr display, IntPtr draw, IntPtr read, IntPtr context);
 
-        [GlEntryPoint("glXGetCurrentContext")]
-        public GlxGetCurrentContext GetCurrentContext { get; }
-        public delegate IntPtr GlxGetCurrentContext();
+        [GetProcAddress("glXGetCurrentContext")]
+        public partial IntPtr GetCurrentContext();
 
-        [GlEntryPoint("glXGetCurrentDisplay")]
-        public GlxGetCurrentDisplay GetCurrentDisplay { get; }
-        public delegate IntPtr GlxGetCurrentDisplay();
+        [GetProcAddress("glXGetCurrentDisplay")]
+        public partial IntPtr GetCurrentDisplay();
         
-        [GlEntryPoint("glXGetCurrentDrawable")]
-        public GlxGetCurrentDrawable GetCurrentDrawable { get; }
-        public delegate IntPtr GlxGetCurrentDrawable();
+        [GetProcAddress("glXGetCurrentDrawable")]
+        public partial IntPtr GetCurrentDrawable();
         
-        [GlEntryPoint("glXGetCurrentReadDrawable")]
-        public GlxGetCurrentReadDrawable GetCurrentReadDrawable { get; }
-        public delegate IntPtr GlxGetCurrentReadDrawable();
+        [GetProcAddress("glXGetCurrentReadDrawable")]
+        public partial IntPtr GetCurrentReadDrawable();
         
-        [GlEntryPoint("glXCreatePbuffer")]
-        public GlxCreatePbuffer CreatePbuffer { get; }
-        public delegate IntPtr GlxCreatePbuffer(IntPtr dpy, IntPtr fbc, int[] attrib_list);
+        [GetProcAddress("glXCreatePbuffer")]
+        public partial IntPtr CreatePbuffer(IntPtr dpy, IntPtr fbc, int[] attrib_list);
         
-        [GlEntryPoint("glXDestroyPbuffer")]
-        public GlxDestroyPbuffer DestroyPbuffer { get; }
-        public delegate IntPtr GlxDestroyPbuffer(IntPtr dpy, IntPtr fb);
+        [GetProcAddress("glXDestroyPbuffer")]
+        public partial IntPtr DestroyPbuffer(IntPtr dpy, IntPtr fb);
         
-        [GlEntryPointAttribute("glXChooseVisual")]
-        public GlxChooseVisual ChooseVisual { get; }
-        public delegate  XVisualInfo* GlxChooseVisual(IntPtr dpy, int screen, int[] attribList);
+        [GetProcAddress("glXChooseVisual")]
+        public partial  XVisualInfo* ChooseVisual(IntPtr dpy, int screen, int[] attribList);
         
         
-        [GlEntryPointAttribute("glXCreateContext")]
-        public GlxCreateContext CreateContext { get; }
-        public delegate  IntPtr GlxCreateContext(IntPtr dpy,  XVisualInfo* vis,  IntPtr shareList,  bool direct);
+        [GetProcAddress("glXCreateContext")]
+        public partial  IntPtr CreateContext(IntPtr dpy,  XVisualInfo* vis,  IntPtr shareList,  bool direct);
         
 
-        [GlEntryPointAttribute("glXCreateContextAttribsARB")]
-        public GlxCreateContextAttribsARB CreateContextAttribsARB { get; }
-        public delegate IntPtr GlxCreateContextAttribsARB(IntPtr dpy, IntPtr fbconfig, IntPtr shareList,
+        [GetProcAddress("glXCreateContextAttribsARB")]
+        public partial IntPtr CreateContextAttribsARB(IntPtr dpy, IntPtr fbconfig, IntPtr shareList,
             bool direct, int[] attribs);
         
 
         [DllImport(libGL, EntryPoint = "glXGetProcAddress")]
-        public static extern IntPtr GlxGetProcAddress(Utf8Buffer buffer);
+        public static extern IntPtr GlxGetProcAddress(string buffer);
 
         
-        [GlEntryPointAttribute("glXDestroyContext")]
-        public GlxDestroyContext DestroyContext { get; }
-        public delegate  void GlxDestroyContext(IntPtr dpy, IntPtr ctx);
+        [GetProcAddress("glXDestroyContext")]
+        public partial  void DestroyContext(IntPtr dpy, IntPtr ctx);
         
         
-        [GlEntryPointAttribute("glXChooseFBConfig")]
-        public GlxChooseFBConfig ChooseFBConfig { get; }
-        public delegate  IntPtr* GlxChooseFBConfig(IntPtr dpy,  int screen,  int[] attrib_list,  out int nelements);
+        [GetProcAddress("glXChooseFBConfig")]
+        public partial  IntPtr* ChooseFBConfig(IntPtr dpy,  int screen,  int[] attrib_list,  out int nelements);
         
         
-        public  IntPtr* GlxChooseFbConfig(IntPtr dpy, int screen, IEnumerable<int> attribs, out int nelements)
+        public  IntPtr* ChooseFbConfig(IntPtr dpy, int screen, IEnumerable<int> attribs, out int nelements)
         {
             var arr = attribs.Concat(new[]{0}).ToArray();
             return ChooseFBConfig(dpy, screen, arr, out nelements);
         }
         
-        [GlEntryPointAttribute("glXGetVisualFromFBConfig")]
-        public GlxGetVisualFromFBConfig GetVisualFromFBConfig { get; }
-        public delegate  XVisualInfo * GlxGetVisualFromFBConfig(IntPtr dpy,  IntPtr config);
+        [GetProcAddress("glXGetVisualFromFBConfig")]
+        public partial  XVisualInfo * GetVisualFromFBConfig(IntPtr dpy,  IntPtr config);
         
         
-        [GlEntryPointAttribute("glXGetFBConfigAttrib")]
-        public GlxGetFBConfigAttrib GetFBConfigAttrib { get; }
-        public delegate  int GlxGetFBConfigAttrib(IntPtr dpy, IntPtr config, int attribute, out int value);
+        [GetProcAddress("glXGetFBConfigAttrib")]
+        public partial  int GetFBConfigAttrib(IntPtr dpy, IntPtr config, int attribute, out int value);
         
         
-        [GlEntryPointAttribute("glXSwapBuffers")]
-        public GlxSwapBuffers SwapBuffers { get; }
-        public delegate  void GlxSwapBuffers(IntPtr dpy,  IntPtr drawable);
+        [GetProcAddress("glXSwapBuffers")]
+        public partial  void SwapBuffers(IntPtr dpy,  IntPtr drawable);
         
         
-        [GlEntryPointAttribute("glXWaitX")]
-        public GlxWaitX WaitX { get; }
-        public delegate  void GlxWaitX();
+        [GetProcAddress("glXWaitX")]
+        public partial  void WaitX();
         
         
-        [GlEntryPointAttribute("glXWaitGL")]
-        public GlxWaitGL WaitGL { get; }
-        public delegate void GlxWaitGL();
+        [GetProcAddress("glXWaitGL")]
+        public partial void WaitGL();
         
-        public delegate int GlGetError();
-        [GlEntryPoint("glGetError")]
-        public GlGetError GetError { get; }
 
-        public delegate IntPtr GlxQueryExtensionsString(IntPtr display, int screen);
-        [GlEntryPoint("glXQueryExtensionsString")]
-        public GlxQueryExtensionsString QueryExtensionsString { get; }
+        [GetProcAddress("glGetError")]
+        public partial int GlGetError();
+
+        
+        [GetProcAddress("glXQueryExtensionsString")]
+        public partial IntPtr QueryExtensionsString(IntPtr display, int screen);
 
-        public GlxInterface() : base(SafeGetProcAddress)
+        public GlxInterface()
         {
+            Initialize(SafeGetProcAddress);
         }
 
         // Ignores egl functions.
@@ -122,10 +108,9 @@ namespace Avalonia.X11.Glx
                 return IntPtr.Zero;
             }
 
-            return GlxConverted(proc);
+            return GlxGetProcAddress(proc);
         }
 
-        private static readonly Func<string, IntPtr> GlxConverted = ConvertNative(GlxGetProcAddress);
 
         public string[] GetExtensions(IntPtr display)
         {
diff --git a/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmOutput.cs b/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmOutput.cs
index 46a985c0e8..99c4b62716 100644
--- a/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmOutput.cs
+++ b/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmOutput.cs
@@ -50,7 +50,7 @@ namespace Avalonia.LinuxFramebuffer.Output
         }
 
         [DllImport("libEGL.so.1")]
-        static extern IntPtr eglGetProcAddress(Utf8Buffer proc);
+        static extern IntPtr eglGetProcAddress(string proc);
 
         private GbmBoUserDataDestroyCallbackDelegate FbDestroyDelegate;
         private drmModeModeInfo _mode;
diff --git a/src/Shared/SourceGeneratorAttributes.cs b/src/Shared/SourceGeneratorAttributes.cs
index fdb5977d23..ac7c82c469 100644
--- a/src/Shared/SourceGeneratorAttributes.cs
+++ b/src/Shared/SourceGeneratorAttributes.cs
@@ -14,4 +14,28 @@ namespace Avalonia.SourceGenerator
         public string Namespace { get; }
         public Type BaseType { get; }
     }
+    
+    
+    internal class GetProcAddressAttribute : Attribute
+    {
+        public GetProcAddressAttribute(string proc)
+        {
+            
+        }
+        
+        public GetProcAddressAttribute(string proc, bool optional = false)
+        {
+
+        }
+
+        public GetProcAddressAttribute(bool optional)
+        {
+
+        }
+
+        public GetProcAddressAttribute()
+        {
+
+        }
+    }
 }
diff --git a/src/Skia/Avalonia.Skia/Gpu/OpenGl/FboSkiaSurface.cs b/src/Skia/Avalonia.Skia/Gpu/OpenGl/FboSkiaSurface.cs
index 8ab275df63..984c1785b7 100644
--- a/src/Skia/Avalonia.Skia/Gpu/OpenGl/FboSkiaSurface.cs
+++ b/src/Skia/Avalonia.Skia/Gpu/OpenGl/FboSkiaSurface.cs
@@ -27,16 +27,13 @@ namespace Avalonia.Skia
             gl.GetIntegerv(GL_RENDERBUFFER_BINDING, out var oldRenderbuffer);
             gl.GetIntegerv(GL_TEXTURE_BINDING_2D, out var oldTexture);
 
-            var arr = new int[2];
-
+            
             // Generate FBO
-            gl.GenFramebuffers(1, arr);
-            _fbo = arr[0];
+            _fbo = gl.GenFramebuffer();
             gl.BindFramebuffer(GL_FRAMEBUFFER, _fbo);
 
             // Create a texture to render into
-            gl.GenTextures(1, arr);
-            _texture = arr[0];
+            _texture = gl.GenTexture();
             gl.BindTexture(GL_TEXTURE_2D, _texture);
             gl.TexImage2D(GL_TEXTURE_2D, 0,
                 InternalFormat, pixelSize.Width, pixelSize.Height,
@@ -48,8 +45,7 @@ namespace Avalonia.Skia
             var success = false;
             foreach (var useStencil8 in TrueFalse)
             {
-                gl.GenRenderbuffers(1, arr);
-                _depthStencil = arr[0];
+                _depthStencil = gl.GenRenderbuffer();
                 gl.BindRenderbuffer(GL_RENDERBUFFER, _depthStencil);
 
                 if (useStencil8)
@@ -73,7 +69,7 @@ namespace Avalonia.Skia
                 else
                 {
                     gl.BindRenderbuffer(GL_RENDERBUFFER, oldRenderbuffer);
-                    gl.DeleteRenderbuffers(1, arr);
+                    gl.DeleteRenderbuffer(_depthStencil);
                 }
             }
             
@@ -83,10 +79,8 @@ namespace Avalonia.Skia
 
             if (!success)
             {
-                arr[0] = _fbo;
-                gl.DeleteFramebuffers(1, arr);
-                arr[0] = _texture;
-                gl.DeleteTextures(1, arr);
+                gl.DeleteFramebuffer(_fbo);
+                gl.DeleteTexture(_texture);
                 throw new OpenGlException("Unable to create FBO with stencil");
             }
 
@@ -94,7 +88,7 @@ namespace Avalonia.Skia
                 new GRGlFramebufferInfo((uint)_fbo, SKColorType.Rgba8888.ToGlSizedFormat()));
             Surface = SKSurface.Create(_grContext, target,
                 surfaceOrigin, SKColorType.Rgba8888);
-            CanBlit = gl.BlitFramebuffer != null;
+            CanBlit = gl.IsBlitFramebufferAvailable;
         }
         
         public void Dispose()
@@ -106,9 +100,9 @@ namespace Avalonia.Skia
                 var gl = _glContext.GlInterface;
                 if (_fbo != 0)
                 {
-                    gl.DeleteFramebuffers(1, new[] { _fbo });
-                    gl.DeleteTextures(1, new[] { _texture });
-                    gl.DeleteRenderbuffers(1, new[] { _depthStencil });
+                    gl.DeleteFramebuffer(_fbo);
+                    gl.DeleteTexture(_texture);
+                    gl.DeleteRenderbuffer(_depthStencil);
                     _fbo = _texture = _depthStencil = 0;
                 }
             }
diff --git a/src/Skia/Avalonia.Skia/Gpu/OpenGl/GlSkiaGpu.cs b/src/Skia/Avalonia.Skia/Gpu/OpenGl/GlSkiaGpu.cs
index ec8a8436e1..08e0fbd808 100644
--- a/src/Skia/Avalonia.Skia/Gpu/OpenGl/GlSkiaGpu.cs
+++ b/src/Skia/Avalonia.Skia/Gpu/OpenGl/GlSkiaGpu.cs
@@ -54,7 +54,7 @@ namespace Avalonia.Skia
                 return null;
 
             // Blit feature requires glBlitFramebuffer
-            if (_glContext.GlInterface.BlitFramebuffer == null)
+            if (!_glContext.GlInterface.IsBlitFramebufferAvailable)
                 return null;
             
             size = new PixelSize(Math.Max(size.Width, 1), Math.Max(size.Height, 1));
diff --git a/src/Skia/Avalonia.Skia/Gpu/OpenGl/OpenGlBitmapImpl.cs b/src/Skia/Avalonia.Skia/Gpu/OpenGl/OpenGlBitmapImpl.cs
index 2ebf7c680b..a4617bb4d5 100644
--- a/src/Skia/Avalonia.Skia/Gpu/OpenGl/OpenGlBitmapImpl.cs
+++ b/src/Skia/Avalonia.Skia/Gpu/OpenGl/OpenGlBitmapImpl.cs
@@ -101,7 +101,7 @@ namespace Avalonia.Skia
         private bool _disposed;
         private readonly DisposableLock _lock = new DisposableLock();
 
-        public SharedOpenGlBitmapAttachment(GlOpenGlBitmapImpl bitmap, IGlContext context, Action presentCallback)
+        public unsafe SharedOpenGlBitmapAttachment(GlOpenGlBitmapImpl bitmap, IGlContext context, Action presentCallback)
         {
             _bitmap = bitmap;
             _context = context;
@@ -119,7 +119,8 @@ namespace Avalonia.Skia
                     var gl = _context.GlInterface;
                     
                     var textures = new int[2];
-                    gl.GenTextures(2, textures);
+                    fixed (int* ptex = textures)
+                        gl.GenTextures(2, ptex);
                     _texture = textures[0];
                     _frontBuffer = textures[1];
 
@@ -178,7 +179,7 @@ namespace Avalonia.Skia
             _presentCallback();
         }
 
-        public void Dispose()
+        public unsafe void Dispose()
         {
             var gl = _context.GlInterface;
             _bitmap.Present(null);
@@ -191,7 +192,9 @@ namespace Avalonia.Skia
                 if(_disposed)
                     return;
                 _disposed = true;
-                gl.DeleteTextures(2, new[] { _texture, _frontBuffer });
+                var tex = new[] { _texture, _frontBuffer };
+                fixed (int* ptex = tex)
+                    gl.DeleteTextures(2, ptex);
             }
         }
 
diff --git a/src/tools/DevGenerators/GetProcAddressInitialization.cs b/src/tools/DevGenerators/GetProcAddressInitialization.cs
new file mode 100644
index 0000000000..3b3871370c
--- /dev/null
+++ b/src/tools/DevGenerators/GetProcAddressInitialization.cs
@@ -0,0 +1,346 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+
+namespace Generator;
+
+[Generator(LanguageNames.CSharp)]
+public class GetProcAddressInitializationGenerator : IIncrementalGenerator
+{
+    const string GetProcAddressFullName = "global::Avalonia.SourceGenerator.GetProcAddressAttribute";
+    
+    public void Initialize(IncrementalGeneratorInitializationContext context)
+    {
+        /*
+        Console.WriteLine("PID: " + Process.GetCurrentProcess().Id);
+
+        File.WriteAllText("/tmp/pid", "PID: " + Process.GetCurrentProcess().Id);
+        while (!Debugger.IsAttached)
+        {
+            Thread.Sleep(1000);
+        }*/
+        var allMethodsWithAttributes = context.SyntaxProvider
+            .CreateSyntaxProvider(
+                static (s, _) => s is MethodDeclarationSyntax
+                {
+                    AttributeLists.Count: > 0,
+                } md && md.Modifiers.Any(m=>m.IsKind(SyntaxKind.PartialKeyword)),
+                static (context, _) =>
+                    (IMethodSymbol)context.SemanticModel.GetDeclaredSymbol(context.Node)!);
+
+        var fieldsWithAttribute = allMethodsWithAttributes
+            .Where(s => s.HasAttributeWithFullyQualifiedName(GetProcAddressFullName));
+
+        var all = fieldsWithAttribute.Collect();
+        context.RegisterSourceOutput(all, static (context, methods) =>
+        {
+            foreach (var typeGroup in methods.GroupBy(f => f.ContainingType))
+            {
+                var nextContext = 0;
+                var contexts = new Dictionary<string, int>();
+
+                string GetContextNameFromIndex(int c) => "context" + (c == 0 ? "" : c);
+                string GetContextName(string type)
+                {
+                    if (contexts.TryGetValue(type, out var idx))
+                        return GetContextNameFromIndex(idx);
+                    if (nextContext != 0)
+                        idx += nextContext;
+                    nextContext++;
+                    return GetContextNameFromIndex(contexts[type] = idx);
+                }
+                
+                var classBuilder = new StringBuilder();
+                if (typeGroup.Key.ContainingNamespace != null)
+                    classBuilder
+                        .AppendLine("using System;")
+                        .Append("namespace ")
+                        .Append(typeGroup.Key.ContainingNamespace)
+                        .AppendLine(";");
+                classBuilder
+                    .Append("unsafe partial class ")
+                    .AppendLine(typeGroup.Key.Name)
+                    .AppendLine("{");
+                var initializeBody = new StringBuilder()
+                    .Pad(2)
+                    .AppendLine("var addr = IntPtr.Zero;");
+                
+                foreach (var method in typeGroup)
+                {
+                    var isOptional = false;
+                    var first = true;
+                    var fieldName = "_addr_" + method.Name;
+                    var delegateType = BuildDelegateType(method);
+
+                    void AppendNextAddr()
+                    {
+                        if (first)
+                        {
+                            first = false;
+                            initializeBody.Pad(2);
+                        }
+                        else
+                            initializeBody
+                                .Pad(2)
+                                .Append("if(addr == IntPtr.Zero) ");
+                    }
+
+                    initializeBody
+                        .Pad(2).Append("// Initializing ").AppendLine(method.Name)
+                        .Pad(2)
+                        .AppendLine("addr = IntPtr.Zero;");
+                    foreach (var attr in method.GetAttributes())
+                    {
+                        if (attr.AttributeClass?.HasFullyQualifiedName(GetProcAddressFullName) == true)
+                        {
+                            string? primaryName = null;
+                            foreach (var arg in attr.ConstructorArguments)
+                            {
+                                if (arg.Value is string name)
+                                    primaryName = name;
+                                if (arg.Value is bool opt)
+                                    isOptional = opt;
+                            }
+
+                            if (primaryName != null)
+                            {
+                                AppendNextAddr();
+                                initializeBody
+                                    .Append("addr = getProcAddress(\"")
+                                    .Append(primaryName)
+                                    .AppendLine("\");");
+                            }
+                        }
+                        else
+                        {
+                            if (attr.AttributeClass != null
+                                && attr.AttributeClass.MemberNames.Contains("GetProcAddress"))
+                            {
+                                var getProcMethod = attr.AttributeClass.GetMembers()
+                                    .FirstOrDefault(m => m.Name == "GetProcAddress") as IMethodSymbol;
+                                if (getProcMethod == null || !getProcMethod.IsStatic || getProcMethod.Parameters.Length < 2)
+                                    continue;
+                                var contextName =
+                                    GetContextName(getProcMethod
+                                        .Parameters[1].Type
+                                        .ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat));
+                                AppendNextAddr();
+                                initializeBody
+                                    .Append("addr = ")
+                                    .Append(attr.AttributeClass.GetFullyQualifiedName())
+                                    .Append(".GetProcAddress(")
+                                    .Append("getProcAddress, ")
+                                    .Append(contextName);
+                                
+                                var syntaxNode = (AttributeSyntax)attr.ApplicationSyntaxReference.GetSyntax();
+                                foreach (var arg in syntaxNode.ArgumentList.Arguments)
+                                    initializeBody.Append(", ").Append(arg.GetText());
+                                initializeBody.AppendLine(");");
+                            }
+                        }
+                    }
+
+                    if (!isOptional)
+                    {
+                        initializeBody
+                            .Pad(2)
+                            .Append("if (addr == IntPtr.Zero) throw new System.EntryPointNotFoundException(\"")
+                            .Append(fieldName).AppendLine("\");");
+                    }
+
+                    initializeBody
+                        .Pad(2)
+                        .Append(fieldName)
+                        .Append(" = (")
+                        .Append(delegateType)
+                        .AppendLine(")addr;");
+
+                    classBuilder
+                        .Pad(1)
+                        .Append(delegateType);
+                    classBuilder
+                        .Append(fieldName)
+                        .AppendLine(";");
+
+                    classBuilder
+                        .Pad(1)
+                        .Append("public partial ")
+                        .Append(method.ReturnType.GetFullyQualifiedName())
+                        .Append(" ")
+                        .Append(method.Name)
+                        .Append("(");
+                    var firstArg = true;
+                    foreach (var p in method.Parameters)
+                    {
+                        if (firstArg)
+                            firstArg = false;
+                        else
+                            classBuilder.Append(", ");
+                        AppendRefKind(classBuilder, p.RefKind);
+                        classBuilder
+                            .Append(p.Type.GetFullyQualifiedName())
+                            .Append(" @")
+                            .Append(p.Name);
+                    }
+                    classBuilder
+                        .AppendLine(")")
+                        .Pad(1)
+                        .AppendLine("{");
+                    if (isOptional)
+                        classBuilder
+                            .Pad(2)
+                            .Append("if (")
+                            .Append(fieldName)
+                            .Append(" == null) throw new System.EntryPointNotFoundException(\"")
+                            .Append(method.Name)
+                            .AppendLine("\");");
+
+                    foreach(var p in method.Parameters)
+                        if (NeedsPin(p.Type))
+                            classBuilder.Pad(2)
+                                .Append("fixed(")
+                                .Append(MapToNative(p.Type))
+                                .Append(" @__p_")
+                                .Append(p.Name)
+                                .Append(" = ")
+                                .Append(p.Name)
+                                .AppendLine(")");
+                    
+                    classBuilder.Pad(2);
+                    if (!method.ReturnsVoid)
+                        classBuilder.Append("return ");
+
+                    var invokeBuilder = new StringBuilder();
+                    
+                    invokeBuilder
+                        .Append(fieldName)
+                        .Append("(");
+                    firstArg = true;
+                    foreach (var p in method.Parameters)
+                    {
+                        if (firstArg)
+                            firstArg = false;
+                        else
+                            invokeBuilder.Append(", ");
+                        AppendRefKind(invokeBuilder, p.RefKind);
+                        invokeBuilder
+                            .Append("@")
+                            .Append(ConvertToNative(p.Name, p.Type));
+                    }
+
+                    invokeBuilder.Append(")");
+                    classBuilder.Append(ConvertToManaged(method.ReturnType, invokeBuilder.ToString()));
+                    
+                    classBuilder.AppendLine(";").Pad(1).AppendLine("}");
+                    if (isOptional)
+                        classBuilder
+                            .Pad(1)
+                            .Append("public bool Is")
+                            .Append(method.Name)
+                            .Append("Available => ")
+                            .Append(fieldName)
+                            .AppendLine(" != null;");
+                }
+                
+                classBuilder
+                    .Pad(1)
+                    .Append("void Initialize(Func<string, IntPtr> getProcAddress");
+                foreach (var kv in contexts.OrderBy(x => x.Value))
+                { 
+                    classBuilder
+                        .Append(", ")
+                        .Append(kv.Key)
+                        .Append(" ")
+                        .Append(GetContextNameFromIndex(kv.Value));
+                }
+
+                classBuilder.AppendLine(")").Pad(1).AppendLine("{");
+                classBuilder.Append(initializeBody.ToString());
+                classBuilder.Append("}\n}");
+
+
+                context.AddSource(typeGroup.Key.GetFullyQualifiedName().Replace(":", ""), classBuilder.ToString());
+            }
+        });
+
+        
+    }
+
+    static StringBuilder AppendRefKind(StringBuilder sb, RefKind kind)
+    {
+        if (kind == RefKind.Ref)
+            sb.Append("ref ");
+        if (kind == RefKind.Out)
+            sb.Append("out ");
+        return sb;
+    }
+
+    static bool NeedsPin(ITypeSymbol type)
+    {
+        if (type.TypeKind == TypeKind.Array)
+            return true;
+        return false;
+    }
+
+    static string ConvertToNative(string name, ITypeSymbol type)
+    {
+        if (NeedsPin(type))
+            return "__p_" + name;
+        if (IsBool(type))
+            return $"{name} ? 1 : 0";
+        return name;
+    }
+
+    static string ConvertToManaged(ITypeSymbol type, string expr)
+    {
+        if (IsBool(type))
+            return expr + " != 0";
+        return expr;
+    }
+
+    static bool IsBool(ITypeSymbol type) => type.GetFullyQualifiedName() == "global::System.Boolean" ||
+                                            type.GetFullyQualifiedName() == "bool";
+    
+    static string MapToNative(ITypeSymbol type)
+    {
+        if (type.TypeKind == TypeKind.Array)
+            return ((IArrayTypeSymbol)type).ElementType.GetFullyQualifiedName() + "*";
+        if (IsBool(type))
+            return "int";
+        return type.GetFullyQualifiedName();
+    }
+
+    static string BuildDelegateType(IMethodSymbol method)
+    {
+        StringBuilder name = new("delegate* unmanaged[Stdcall]<");
+        var firstArg = true;
+
+        void AppendArg(string a, RefKind kind)
+        {
+            if (firstArg)
+                firstArg = false;
+            else
+                name.Append(",");
+            AppendRefKind(name, kind);
+            name.Append(a);
+        }
+
+        foreach (var p in method.Parameters)
+        {
+            AppendArg(MapToNative(p.Type), p.RefKind);
+        }
+
+        AppendArg(MapToNative(method.ReturnType), RefKind.None);
+        name.Append(">");
+        return name.ToString();
+    }
+
+}
\ No newline at end of file
diff --git a/src/tools/DevGenerators/Helpers.cs b/src/tools/DevGenerators/Helpers.cs
new file mode 100644
index 0000000000..3da89d2d0e
--- /dev/null
+++ b/src/tools/DevGenerators/Helpers.cs
@@ -0,0 +1,31 @@
+using System.Collections.Immutable;
+using System.Text;
+using Microsoft.CodeAnalysis;
+
+namespace Generator;
+
+static class Helpers
+{
+    public static StringBuilder Pad(this StringBuilder sb, int count) => sb.Append(' ', count * 4);
+
+    public static string GetFullyQualifiedName(this ISymbol symbol)
+    {
+        return symbol.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat);
+    }
+    
+    public static bool HasFullyQualifiedName(this ISymbol symbol, string name)
+    {
+        return symbol.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat) == name;
+    }
+
+    public static bool HasAttributeWithFullyQualifiedName(this ISymbol symbol, string name)
+    {
+        ImmutableArray<AttributeData> attributes = symbol.GetAttributes();
+
+        foreach (AttributeData attribute in attributes)
+            if (attribute.AttributeClass?.HasFullyQualifiedName(name) == true)
+                return true;
+
+        return false;
+    }
+}
\ No newline at end of file

From fd42381afd04e82aa436ceb81e03cd546ded3535 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Mon, 25 Jul 2022 01:30:01 +0300
Subject: [PATCH 147/240] Updated LayerFbo

---
 src/Avalonia.OpenGL/GlInterface.cs |  2 +-
 src/iOS/Avalonia.iOS/LayerFbo.cs   | 52 +++++++++++++-----------------
 2 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/src/Avalonia.OpenGL/GlInterface.cs b/src/Avalonia.OpenGL/GlInterface.cs
index d6eff9a35f..a9dd882e3b 100644
--- a/src/Avalonia.OpenGL/GlInterface.cs
+++ b/src/Avalonia.OpenGL/GlInterface.cs
@@ -335,7 +335,7 @@ namespace Avalonia.OpenGL
         public partial void DeleteShader(int shader);
 
         [GetProcAddress("glGetRenderbufferParameteriv")]
-        public partial void GLGetRenderbufferParameteriv(int target, int name, int* value);
+        public partial void GetRenderbufferParameteriv(int target, int name, out int value);
         // ReSharper restore UnassignedGetOnlyAutoProperty
 
         [GetProcAddress(true)]
diff --git a/src/iOS/Avalonia.iOS/LayerFbo.cs b/src/iOS/Avalonia.iOS/LayerFbo.cs
index 955aaef59f..9a93cdfb22 100644
--- a/src/iOS/Avalonia.iOS/LayerFbo.cs
+++ b/src/iOS/Avalonia.iOS/LayerFbo.cs
@@ -10,12 +10,12 @@ namespace Avalonia.iOS
         private readonly EAGLContext _context;
         private readonly GlInterface _gl;
         private readonly CAEAGLLayer _layer;
-        private int[] _framebuffer;
-        private int[] _renderbuffer;
-        private int[] _depthBuffer;
+        private int _framebuffer;
+        private int _renderbuffer;
+        private int _depthBuffer;
         private bool _disposed;
 
-        private LayerFbo(EAGLContext context, GlInterface gl, CAEAGLLayer layer, int[] framebuffer, int[] renderbuffer, int[] depthBuffer)
+        private LayerFbo(EAGLContext context, GlInterface gl, CAEAGLLayer layer, int framebuffer, int renderbuffer, int depthBuffer)
         {
             _context = context;
             _gl = gl;
@@ -30,42 +30,36 @@ namespace Avalonia.iOS
             if (context != EAGLContext.CurrentContext)
                 return null;
 
-            var fb = new int[2];
-            var rb = new int[2];
-            var db = new int[2];
-            
-            gl.GenRenderbuffers(1, rb);
-            gl.BindRenderbuffer(GlConsts.GL_RENDERBUFFER,  rb[0]);
+            var rb = gl.GenRenderbuffer();
+            gl.BindRenderbuffer(GlConsts.GL_RENDERBUFFER,  rb);
             context.RenderBufferStorage(GlConsts.GL_RENDERBUFFER, layer);
 
-            gl.GenFramebuffers(1, fb);
-            gl.BindFramebuffer(GlConsts.GL_FRAMEBUFFER, fb[0]);
-            gl.FramebufferRenderbuffer(GlConsts.GL_FRAMEBUFFER, GlConsts.GL_COLOR_ATTACHMENT0, GlConsts.GL_RENDERBUFFER, rb[0]);
-
-            int[] w = new int[1];
-            int[] h = new int[1];
-            gl.GetRenderbufferParameteriv(GlConsts.GL_RENDERBUFFER, GlConsts.GL_RENDERBUFFER_WIDTH, w);
-            gl.GetRenderbufferParameteriv(GlConsts.GL_RENDERBUFFER, GlConsts.GL_RENDERBUFFER_HEIGHT, h);
+            var fb = gl.GenFramebuffer();
+            gl.BindFramebuffer(GlConsts.GL_FRAMEBUFFER, fb);
+            gl.FramebufferRenderbuffer(GlConsts.GL_FRAMEBUFFER, GlConsts.GL_COLOR_ATTACHMENT0, GlConsts.GL_RENDERBUFFER, rb);
             
-            gl.GenRenderbuffers(1, db);
+            gl.GetRenderbufferParameteriv(GlConsts.GL_RENDERBUFFER, GlConsts.GL_RENDERBUFFER_WIDTH, out var w);
+            gl.GetRenderbufferParameteriv(GlConsts.GL_RENDERBUFFER, GlConsts.GL_RENDERBUFFER_HEIGHT, out var h);
+
+            var db = gl.GenRenderbuffer();
             
             //GL.BindRenderbuffer(RenderbufferTarget.Renderbuffer, depthBuffer);
             //GL.RenderbufferStorage(RenderbufferTarget.Renderbuffer, RenderbufferInternalFormat.DepthComponent16, w, h);
-            gl.FramebufferRenderbuffer(GlConsts.GL_FRAMEBUFFER, GlConsts.GL_DEPTH_ATTACHMENT, GlConsts.GL_RENDERBUFFER, db[0]);
+            gl.FramebufferRenderbuffer(GlConsts.GL_FRAMEBUFFER, GlConsts.GL_DEPTH_ATTACHMENT, GlConsts.GL_RENDERBUFFER, db);
 
             var frameBufferError = gl.CheckFramebufferStatus(GlConsts.GL_FRAMEBUFFER);
             if(frameBufferError != GlConsts.GL_FRAMEBUFFER_COMPLETE)
             {
-                gl.DeleteFramebuffers(1, fb);
-                gl.DeleteRenderbuffers(1, db);
-                gl.DeleteRenderbuffers(1, rb);
+                gl.DeleteFramebuffer(fb);
+                gl.DeleteRenderbuffer(db);
+                gl.DeleteRenderbuffer(rb);
                 return null;
             }
 
             return new LayerFbo(context, gl, layer, fb, rb, db)
             {
-                Width = w[0],
-                Height = h[0]
+                Width = w,
+                Height = h
             };
         }
         
@@ -74,7 +68,7 @@ namespace Avalonia.iOS
 
         public void Bind()
         {
-            _gl.BindFramebuffer(GlConsts.GL_FRAMEBUFFER, _framebuffer[0]);
+            _gl.BindFramebuffer(GlConsts.GL_FRAMEBUFFER, _framebuffer);
         }
 
         public void Present()
@@ -88,9 +82,9 @@ namespace Avalonia.iOS
             if(_disposed)
                 return;
             _disposed = true;
-            _gl.DeleteFramebuffers(1, _framebuffer);
-            _gl.DeleteRenderbuffers(1, _depthBuffer);
-            _gl.DeleteRenderbuffers(1, _renderbuffer);
+            _gl.DeleteFramebuffer(_framebuffer);
+            _gl.DeleteRenderbuffer(_depthBuffer);
+            _gl.DeleteRenderbuffer(_renderbuffer);
             if (_context != EAGLContext.CurrentContext)
                 throw new InvalidOperationException("Associated EAGLContext is not current");
         }

From fe4a5e7a5f15552f336ad1dfb2ab1c0b73577e6e Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Sun, 24 Jul 2022 19:08:17 -0400
Subject: [PATCH 148/240] Make android emulator work again on control catalog

---
 samples/ControlCatalog.Android/ControlCatalog.Android.csproj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/samples/ControlCatalog.Android/ControlCatalog.Android.csproj b/samples/ControlCatalog.Android/ControlCatalog.Android.csproj
index 54acdd9114..a43ea4539a 100644
--- a/samples/ControlCatalog.Android/ControlCatalog.Android.csproj
+++ b/samples/ControlCatalog.Android/ControlCatalog.Android.csproj
@@ -9,7 +9,6 @@
     <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
     <AndroidPackageFormat>apk</AndroidPackageFormat>
     <MSBuildEnableWorkloadResolver>true</MSBuildEnableWorkloadResolver>
-    <RuntimeIdentifiers>android-arm64;android-x64</RuntimeIdentifiers>
   </PropertyGroup>
   <ItemGroup>
     <AndroidResource Include="..\..\build\Assets\Icon.png">

From cdb9cc22ebfa3472260e972226f8f282b7ea9167 Mon Sep 17 00:00:00 2001
From: Markus Wenzl <markus.wenzl@outlook.de>
Date: Mon, 25 Jul 2022 08:42:51 +0200
Subject: [PATCH 149/240] Fix DrmCard creation for passed path

---
 src/Linux/Avalonia.LinuxFramebuffer/Output/DrmBindings.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmBindings.cs b/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmBindings.cs
index 64fafc65f3..de281245f1 100644
--- a/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmBindings.cs
+++ b/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmBindings.cs
@@ -164,7 +164,7 @@ namespace Avalonia.LinuxFramebuffer.Output
             else 
             {
                 Fd = open(path, 2, 0);
-                if(Fd != -1) throw new Win32Exception($"Couldn't open {path}");
+                if(Fd == -1) throw new Win32Exception($"Couldn't open {path}");
             }
         }
 

From 9e6deb238645cbf93b15adf619a90d19c1cdbf54 Mon Sep 17 00:00:00 2001
From: Tim <tim.uniewski@gmail.com>
Date: Wed, 13 Jul 2022 09:22:34 +0200
Subject: [PATCH 150/240] fix for ProgressBar not listening to size changes of
 parent

If the track for the progressbar changes its size the indicator needs to update as well.
---
 src/Avalonia.Controls/ProgressBar.cs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/ProgressBar.cs b/src/Avalonia.Controls/ProgressBar.cs
index d0e8e8f1a0..56b9caf085 100644
--- a/src/Avalonia.Controls/ProgressBar.cs
+++ b/src/Avalonia.Controls/ProgressBar.cs
@@ -100,6 +100,7 @@ namespace Avalonia.Controls
         private double _indeterminateStartingOffset;
         private double _indeterminateEndingOffset;
         private Border? _indicator;
+        private IDisposable? _trackSizeChangedListener;
 
         public static readonly StyledProperty<bool> IsIndeterminateProperty =
             AvaloniaProperty.Register<ProgressBar, bool>(nameof(IsIndeterminate));
@@ -195,8 +196,9 @@ namespace Avalonia.Controls
         /// <inheritdoc/>
         protected override Size ArrangeOverride(Size finalSize)
         {
+            var result = base.ArrangeOverride(finalSize);
             UpdateIndicator();
-            return base.ArrangeOverride(finalSize);
+            return result;
         }
 
         protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
@@ -216,8 +218,15 @@ namespace Avalonia.Controls
         /// <inheritdoc/>
         protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
+            // dispose any previous track size listener
+            _trackSizeChangedListener?.Dispose();
+            
             _indicator = e.NameScope.Get<Border>("PART_Indicator");
 
+            // listen to size changes of the indicators track (parent) and update the indicator there. 
+            _trackSizeChangedListener = _indicator.Parent?.GetPropertyChangedObservable(BoundsProperty)
+                .Subscribe(_ => UpdateIndicator());
+            
             UpdateIndicator();
         }
 

From 42d4d71aaf28f063209301b86636504fc64a671b Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Mon, 25 Jul 2022 12:08:17 +0300
Subject: [PATCH 151/240] Removed debug code

Co-authored-by: Max Katz <maxkatz6@outlook.com>
---
 src/tools/DevGenerators/GetProcAddressInitialization.cs | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/tools/DevGenerators/GetProcAddressInitialization.cs b/src/tools/DevGenerators/GetProcAddressInitialization.cs
index 3b3871370c..64698d1f2e 100644
--- a/src/tools/DevGenerators/GetProcAddressInitialization.cs
+++ b/src/tools/DevGenerators/GetProcAddressInitialization.cs
@@ -19,14 +19,6 @@ public class GetProcAddressInitializationGenerator : IIncrementalGenerator
     
     public void Initialize(IncrementalGeneratorInitializationContext context)
     {
-        /*
-        Console.WriteLine("PID: " + Process.GetCurrentProcess().Id);
-
-        File.WriteAllText("/tmp/pid", "PID: " + Process.GetCurrentProcess().Id);
-        while (!Debugger.IsAttached)
-        {
-            Thread.Sleep(1000);
-        }*/
         var allMethodsWithAttributes = context.SyntaxProvider
             .CreateSyntaxProvider(
                 static (s, _) => s is MethodDeclarationSyntax

From 4ff9225f002fa518ef16f0ab16567cf3c82b03ab Mon Sep 17 00:00:00 2001
From: Benedikt Stebner <Gillibald@users.noreply.github.com>
Date: Mon, 25 Jul 2022 11:08:57 +0200
Subject: [PATCH 152/240] Actually add Environment.NewLine to the TextLayout
 for LineBreak runs

---
 src/Avalonia.Controls/Documents/LineBreak.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Documents/LineBreak.cs b/src/Avalonia.Controls/Documents/LineBreak.cs
index ef8bd35556..108a38d86b 100644
--- a/src/Avalonia.Controls/Documents/LineBreak.cs
+++ b/src/Avalonia.Controls/Documents/LineBreak.cs
@@ -21,7 +21,13 @@ namespace Avalonia.Controls.Documents
 
         internal override void BuildTextRun(IList<TextRun> textRuns)
         {
-            textRuns.Add(new TextEndOfLine(Environment.NewLine.Length));
+            var text = Environment.NewLine.AsMemory();
+
+            var textRunProperties = CreateTextRunProperties();
+
+            var textCharacters = new TextCharacters(text, textRunProperties);
+
+            textRuns.Add(textCharacters);
         }
 
         internal override void AppendText(StringBuilder stringBuilder)

From 127e77a5433f92683c9697d73511b2ba94b226ff Mon Sep 17 00:00:00 2001
From: Benedikt Stebner <Gillibald@users.noreply.github.com>
Date: Mon, 25 Jul 2022 12:31:24 +0200
Subject: [PATCH 153/240] Update RichTextBlock ControlTheme

---
 .../Controls/FluentControls.xaml                       |  1 +
 src/Avalonia.Themes.Fluent/Controls/RichTextBlock.xaml | 10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
index bc2352d5d0..0499495239 100644
--- a/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
@@ -68,6 +68,7 @@
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/Slider.xaml" />
                 <!--  ManagedFileChooser comes last because it uses (and overrides) styles for a multitude of other controls...the dialogs were originally UserControls, after all  -->
                 <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/ManagedFileChooser.xaml" />
+                <ResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/RichTextBlock.xaml"/>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Styles.Resources>
diff --git a/src/Avalonia.Themes.Fluent/Controls/RichTextBlock.xaml b/src/Avalonia.Themes.Fluent/Controls/RichTextBlock.xaml
index d7bf6e5cf9..75af2efcb1 100644
--- a/src/Avalonia.Themes.Fluent/Controls/RichTextBlock.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/RichTextBlock.xaml
@@ -1,10 +1,14 @@
-<Styles xmlns="https://github.com/avaloniaui"
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Design.PreviewWith>
         <RichTextBlock IsTextSelectionEnabled="True" Text="Preview"/>
     </Design.PreviewWith>
 
-    <Style Selector="RichTextBlock[IsTextSelectionEnabled=true]">
+  <ControlTheme x:Key="{x:Type RichTextBlock}" TargetType="RichTextBlock">
+    <Style Selector="^[IsTextSelectionEnabled=True]">
       <Setter Property="Cursor" Value="IBeam" />
     </Style>
-</Styles>
+  </ControlTheme>
+
+
+</ResourceDictionary>

From a4679604981a1840b37e99578405ecfe776caf0f Mon Sep 17 00:00:00 2001
From: Benedikt Stebner <Gillibald@users.noreply.github.com>
Date: Mon, 25 Jul 2022 12:32:51 +0200
Subject: [PATCH 154/240] Revert change

---
 samples/Sandbox/App.axaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/Sandbox/App.axaml b/samples/Sandbox/App.axaml
index 1c74c07b1d..f601f9f78f 100644
--- a/samples/Sandbox/App.axaml
+++ b/samples/Sandbox/App.axaml
@@ -3,6 +3,6 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:Class="Sandbox.App">
     <Application.Styles>
-        <FluentTheme Mode="Light"/>
+        <FluentTheme Mode="Dark"/>
     </Application.Styles>
 </Application>

From fdd8e5bdb92e213d1295e95229ac81d3e779e3b8 Mon Sep 17 00:00:00 2001
From: Benedikt Stebner <Gillibald@users.noreply.github.com>
Date: Mon, 25 Jul 2022 12:33:48 +0200
Subject: [PATCH 155/240] Revert change

---
 .../Avalonia.Themes.Default.csproj                        | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
index ae0df89c60..40ed4a0f87 100644
--- a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
+++ b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
@@ -9,14 +9,6 @@
     <ProjectReference Include="..\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
     <AvaloniaResource Include="**/*.xaml" />
   </ItemGroup>
-  <ItemGroup>
-    <None Remove="Controls\RichTextBlock.xaml" />
-  </ItemGroup>
-  <ItemGroup>
-    <AvaloniaResource Update="Controls\RichTextBlock.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </AvaloniaResource>
-  </ItemGroup>
   <Import Project="..\..\build\BuildTargets.targets" />
   <Import Project="..\..\build\Rx.props" />
   <Import Project="..\..\build\ApiDiff.props" />

From 3e39ace557fd448814e508660afc301b90a15aa3 Mon Sep 17 00:00:00 2001
From: Benedikt Stebner <Gillibald@users.noreply.github.com>
Date: Mon, 25 Jul 2022 12:34:12 +0200
Subject: [PATCH 156/240] Revert change

---
 src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj b/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj
index 8acf12a0ff..35603fe216 100644
--- a/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj
+++ b/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj
@@ -10,14 +10,6 @@
     <AvaloniaResource Include="**/*.xaml" />
     <AvaloniaResource Include="Assets\*" />  
   </ItemGroup>
-  <ItemGroup>
-    <None Remove="Controls\RichTextBlock.xaml" />
-  </ItemGroup>
-  <ItemGroup>
-    <AvaloniaResource Update="Controls\RichTextBlock.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </AvaloniaResource>
-  </ItemGroup>
   <Import Project="..\..\build\BuildTargets.targets" />
   <Import Project="..\..\build\Rx.props" />
   <Import Project="..\..\build\ApiDiff.props" />

From 821e1b6e5ece05e66e53757e9fa6d222ab7c335e Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Tue, 26 Jul 2022 13:01:02 +0300
Subject: [PATCH 157/240] Set WM_CLASS property according to ICCCM spec

---
 src/Avalonia.X11/X11Platform.cs |  3 ++-
 src/Avalonia.X11/X11Window.cs   | 23 +++++++++++++++++------
 src/Avalonia.X11/XLib.cs        | 14 ++++++++++++++
 3 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/src/Avalonia.X11/X11Platform.cs b/src/Avalonia.X11/X11Platform.cs
index 7043c60ae7..cc9737668d 100644
--- a/src/Avalonia.X11/X11Platform.cs
+++ b/src/Avalonia.X11/X11Platform.cs
@@ -277,7 +277,8 @@ namespace Avalonia
             // and sometimes attempts to use GLX might cause a segfault
             "llvmpipe"
         };
-        public string WmClass { get; set; } = Assembly.GetEntryAssembly()?.GetName()?.Name ?? "AvaloniaApplication";
+
+        public string WmClass { get; set; } = Assembly.GetEntryAssembly()?.GetName()?.Name;
 
         /// <summary>
         /// Enables multitouch support. The default value is true.
diff --git a/src/Avalonia.X11/X11Window.cs b/src/Avalonia.X11/X11Window.cs
index 009ccb6159..7b34705b3b 100644
--- a/src/Avalonia.X11/X11Window.cs
+++ b/src/Avalonia.X11/X11Window.cs
@@ -168,8 +168,7 @@ namespace Avalonia.X11
             XChangeProperty(_x11.Display, _handle, _x11.Atoms._NET_WM_WINDOW_TYPE, _x11.Atoms.XA_ATOM,
                 32, PropertyMode.Replace, new[] {_x11.Atoms._NET_WM_WINDOW_TYPE_NORMAL}, 1);
 
-            if (platform.Options.WmClass != null)
-                SetWmClass(platform.Options.WmClass);
+            SetWmClass(_platform.Options.WmClass);
 
             var surfaces = new List<object>
             {
@@ -1082,12 +1081,24 @@ namespace Avalonia.X11
 
         public void SetWmClass(string wmClass)
         {
-            var data = Encoding.ASCII.GetBytes(wmClass);
-            fixed (void* pdata = data)
+            // See https://tronche.com/gui/x/icccm/sec-4.html#WM_CLASS
+            // We don't actually parse the application's command line, so we only use RESOURCE_NAME and argv[0]
+            var appId = Environment.GetEnvironmentVariable("RESOURCE_NAME") 
+                        ?? Process.GetCurrentProcess().ProcessName;
+            
+            var encodedAppId = Encoding.ASCII.GetBytes(appId);
+            var encodedWmClass = Encoding.ASCII.GetBytes(wmClass ?? appId);
+
+            var hint = XAllocClassHint();
+            fixed(byte* pAppId = encodedAppId)
+            fixed (byte* pWmClass = encodedWmClass)
             {
-                XChangeProperty(_x11.Display, _handle, _x11.Atoms.XA_WM_CLASS, _x11.Atoms.XA_STRING, 8,
-                    PropertyMode.Replace, pdata, data.Length);
+                hint->res_name = pAppId;
+                hint->res_class = pWmClass;
+                XSetClassHint(_x11.Display, _handle, hint);
             }
+
+            XFree(hint);
         }
 
         public void SetMinMaxSize(Size minSize, Size maxSize)
diff --git a/src/Avalonia.X11/XLib.cs b/src/Avalonia.X11/XLib.cs
index 464ec4f1c8..753d5f530c 100644
--- a/src/Avalonia.X11/XLib.cs
+++ b/src/Avalonia.X11/XLib.cs
@@ -109,6 +109,9 @@ namespace Avalonia.X11
 
         [DllImport(libX11)]
         public static extern int XFree(IntPtr data);
+        
+        [DllImport(libX11)]
+        public static extern int XFree(void* data);
 
         [DllImport(libX11)]
         public static extern int XRaiseWindow(IntPtr display, IntPtr window);
@@ -628,6 +631,12 @@ namespace Avalonia.X11
             return XISelectEvents(display, window, emasks, devices.Count);
 
         }
+        
+        [DllImport(libX11)]
+        public static extern XClassHint* XAllocClassHint();
+
+        [DllImport(libX11)]
+        public static extern int XSetClassHint(IntPtr display, IntPtr window, XClassHint* class_hints);
 
         public struct XGeometry
         {
@@ -639,6 +648,11 @@ namespace Avalonia.X11
             public int bw;
             public int d;
         }
+        public struct XClassHint
+        {
+            public byte* res_name;
+            public byte* res_class;
+        }
         
         public struct XSyncValue {
             public int Hi;

From e7e2516c07f46cd17e4d2299b4f7e78cd92d9267 Mon Sep 17 00:00:00 2001
From: Evgeny Gorbovoy <e.gorbovoy@staffwerke.de>
Date: Tue, 26 Jul 2022 13:43:39 +0200
Subject: [PATCH 158/240] Scene hittest now uses exclusive `Rect.Contains`.
 Fixes https://github.com/AvaloniaUI/Avalonia/issues/3079

---
 src/Avalonia.Base/Rendering/SceneGraph/Scene.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Base/Rendering/SceneGraph/Scene.cs b/src/Avalonia.Base/Rendering/SceneGraph/Scene.cs
index 20c23d7bee..c436299018 100644
--- a/src/Avalonia.Base/Rendering/SceneGraph/Scene.cs
+++ b/src/Avalonia.Base/Rendering/SceneGraph/Scene.cs
@@ -300,7 +300,7 @@ namespace Avalonia.Rendering.SceneGraph
                     if (node.ClipToBounds)
                     {
                         clip = clip == null ? node.ClipBounds : clip.Value.Intersect(node.ClipBounds);
-                        clipped = !clip.Value.Contains(_point);
+                        clipped = !clip.Value.ContainsExclusive(_point);
                     }
 
                     if (node.GeometryClip != null)

From fd28b7b5728f9e1899e244eb98e5e3ef00979717 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 26 Jul 2022 15:17:10 +0200
Subject: [PATCH 159/240] Work around mono/SkiaSharp/#1551

Use the workaround from https://github.com/mono/SkiaSharp/issues/1551#issuecomment-756685252 to load bitmaps.

Fixes #7773
---
 src/Skia/Avalonia.Skia/ImmutableBitmap.cs     | 3 ++-
 src/Skia/Avalonia.Skia/WriteableBitmapImpl.cs | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Skia/Avalonia.Skia/ImmutableBitmap.cs b/src/Skia/Avalonia.Skia/ImmutableBitmap.cs
index 5628ae177c..a80f406989 100644
--- a/src/Skia/Avalonia.Skia/ImmutableBitmap.cs
+++ b/src/Skia/Avalonia.Skia/ImmutableBitmap.cs
@@ -57,7 +57,8 @@ namespace Avalonia.Skia
         public ImmutableBitmap(Stream stream, int decodeSize, bool horizontal, BitmapInterpolationMode interpolationMode)
         {
             using (var skStream = new SKManagedStream(stream))
-            using (var codec = SKCodec.Create(skStream))
+            using (var skData = SKData.Create(skStream))
+            using (var codec = SKCodec.Create(skData))
             {
                 var info = codec.Info;
 
diff --git a/src/Skia/Avalonia.Skia/WriteableBitmapImpl.cs b/src/Skia/Avalonia.Skia/WriteableBitmapImpl.cs
index 506edf0627..80bfcc5973 100644
--- a/src/Skia/Avalonia.Skia/WriteableBitmapImpl.cs
+++ b/src/Skia/Avalonia.Skia/WriteableBitmapImpl.cs
@@ -4,7 +4,6 @@ using System.Threading;
 using Avalonia.Media.Imaging;
 using Avalonia.Platform;
 using Avalonia.Skia.Helpers;
-using Avalonia.Media.Imaging;
 using SkiaSharp;
 
 namespace Avalonia.Skia
@@ -25,8 +24,9 @@ namespace Avalonia.Skia
         public WriteableBitmapImpl(Stream stream)
         {
             using (var skiaStream = new SKManagedStream(stream))
+            using (var skData = SKData.Create(skiaStream))
             {
-                _bitmap = SKBitmap.Decode(skiaStream);
+                _bitmap = SKBitmap.Decode(skData);
 
                 if (_bitmap == null)
                 {
@@ -41,7 +41,8 @@ namespace Avalonia.Skia
         public WriteableBitmapImpl(Stream stream, int decodeSize, bool horizontal, BitmapInterpolationMode interpolationMode)
         {
             using (var skStream = new SKManagedStream(stream))
-            using (var codec = SKCodec.Create(skStream))
+            using (var skData = SKData.Create(skStream))
+            using (var codec = SKCodec.Create(skData))
             {
                 var info = codec.Info;
 

From 6b1de285ba35d967191f38063b5d632ad86488e6 Mon Sep 17 00:00:00 2001
From: Markus Wenzl <markus.wenzl@outlook.de>
Date: Tue, 26 Jul 2022 18:08:48 +0200
Subject: [PATCH 160/240] Added drmModeGetConnectorCurrent, added new
 StartLinuxDrm with LinuxDrmOptions

---
 .../LinuxDrmOptions.cs                        | 46 +++++++++++++++++++
 .../LinuxFramebufferPlatform.cs               |  8 ++++
 .../Avalonia.LinuxFramebuffer/Output/Drm.cs   |  2 +
 .../Output/DrmBindings.cs                     |  6 +--
 .../Output/DrmOutput.cs                       | 45 +++++++++++++-----
 5 files changed, 92 insertions(+), 15 deletions(-)
 create mode 100644 src/Linux/Avalonia.LinuxFramebuffer/LinuxDrmOptions.cs

diff --git a/src/Linux/Avalonia.LinuxFramebuffer/LinuxDrmOptions.cs b/src/Linux/Avalonia.LinuxFramebuffer/LinuxDrmOptions.cs
new file mode 100644
index 0000000000..a67d6f7d8b
--- /dev/null
+++ b/src/Linux/Avalonia.LinuxFramebuffer/LinuxDrmOptions.cs
@@ -0,0 +1,46 @@
+using Avalonia.LinuxFramebuffer.Output;
+using Avalonia.Media;
+using JetBrains.Annotations;
+
+namespace Avalonia.LinuxFramebuffer
+{
+    public class LinuxDrmOptions
+    {
+        /// <summary>
+        /// Path for DrmCard to use, if no <see cref="OutputBackend"/> is passed.
+        /// Default: null
+        /// </summary>
+        [CanBeNull] public string Card { get; set; }
+        
+        /// <summary>
+        /// True to call drmModeGetConnector for all available connectors, otherwise drmModeGetConnectorCurrent is called to get the kernel-cached connected connector.
+        /// Info: since some hardware might have incorrect connector information on startup for some reason, you may need to set this parameter to true.
+        /// Default: False
+        /// </summary>
+        public bool DrmConnectorsForceProbe { get; set; } = false;
+        
+        /// <summary>
+        /// Scaling factor.
+        /// Default: 1.0
+        /// </summary>
+        public double Scaling { get; set; } = 1.0;
+        
+        /// <summary>
+        /// If true an two cycle buffer swapping is processed at init.
+        /// Default: True
+        /// </summary>
+        public bool EnableInitialBufferSwapping { get; set; } = true;
+        
+        /// <summary>
+        /// Color for <see cref="EnableInitialBufferSwapping"/>
+        /// Default: R0 G0 B0 A0
+        /// </summary>
+        public Color InitialBufferSwappingColor { get; set; } = new Color(0, 0, 0, 0);
+        
+        /// <summary>
+        /// IOutputBackend. If Null, a new DrmOutput for <see cref="Card"/> with <see cref="Scaling"/> will be created.
+        /// Default: null
+        /// </summary>
+        [CanBeNull] public IOutputBackend OutputBackend { get; set; }
+    }
+}
diff --git a/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebufferPlatform.cs b/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebufferPlatform.cs
index 4add4c423b..bf29aed1a4 100644
--- a/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebufferPlatform.cs
+++ b/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebufferPlatform.cs
@@ -140,6 +140,14 @@ public static class LinuxFramebufferPlatformExtensions
 
     public static int StartLinuxDrm<T>(this T builder, string[] args, string card = null, double scaling = 1)
         where T : AppBuilderBase<T>, new() => StartLinuxDirect(builder, args, new DrmOutput(card) {Scaling = scaling});
+
+    public static int StartLinuxDrm<T>(this T builder, string[] args, [CanBeNull] LinuxDrmOptions drmOptions)
+        where T : AppBuilderBase<T>, new()
+    {
+        drmOptions ??= new LinuxDrmOptions();
+        drmOptions.OutputBackend ??= new DrmOutput(drmOptions) {Scaling = drmOptions.Scaling};
+        return StartLinuxDirect(builder, args, drmOptions.OutputBackend);
+    }
     
     public static int StartLinuxDirect<T>(this T builder, string[] args, IOutputBackend backend)
         where T : AppBuilderBase<T>, new()
diff --git a/src/Linux/Avalonia.LinuxFramebuffer/Output/Drm.cs b/src/Linux/Avalonia.LinuxFramebuffer/Output/Drm.cs
index 9c476b1b63..04bc2c1f67 100644
--- a/src/Linux/Avalonia.LinuxFramebuffer/Output/Drm.cs
+++ b/src/Linux/Avalonia.LinuxFramebuffer/Output/Drm.cs
@@ -162,6 +162,8 @@ namespace Avalonia.LinuxFramebuffer.Output
         [DllImport(libdrm, SetLastError = true)]
         public static extern drmModeConnector* drmModeGetConnector(int fd, uint connector);
         [DllImport(libdrm, SetLastError = true)]
+        public static extern drmModeConnector* drmModeGetConnectorCurrent(int fd, uint connector);
+        [DllImport(libdrm, SetLastError = true)]
         public static extern void drmModeFreeConnector(drmModeConnector* res);
         
         [DllImport(libdrm, SetLastError = true)]
diff --git a/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmBindings.cs b/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmBindings.cs
index de281245f1..070e1a95bc 100644
--- a/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmBindings.cs
+++ b/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmBindings.cs
@@ -84,7 +84,7 @@ namespace Avalonia.LinuxFramebuffer.Output
     {
         public List<DrmConnector> Connectors { get; }= new List<DrmConnector>();
         internal Dictionary<uint, DrmEncoder> Encoders { get; } = new Dictionary<uint, DrmEncoder>();
-        public DrmResources(int fd)
+        public DrmResources(int fd, bool connectorsForceProbe = false)
         {
             var res = drmModeGetResources(fd);
             if (res == null)
@@ -107,7 +107,7 @@ namespace Avalonia.LinuxFramebuffer.Output
             
             for (var c = 0; c < res->count_connectors; c++)
             {
-                var conn = drmModeGetConnector(fd, res->connectors[c]);
+                var conn = connectorsForceProbe ? drmModeGetConnector(fd, res->connectors[c]) : drmModeGetConnectorCurrent(fd, res->connectors[c]);
                 Connectors.Add(new DrmConnector(conn));
                 drmModeFreeConnector(conn);
             }
@@ -168,7 +168,7 @@ namespace Avalonia.LinuxFramebuffer.Output
             }
         }
 
-        public DrmResources GetResources() => new DrmResources(Fd);
+        public DrmResources GetResources(bool connectorsForceProbe = false) => new DrmResources(Fd, connectorsForceProbe);
         public void Dispose()
         {
             close(Fd);
diff --git a/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmOutput.cs b/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmOutput.cs
index 99c4b62716..85cf1fba76 100644
--- a/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmOutput.cs
+++ b/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmOutput.cs
@@ -15,20 +15,34 @@ namespace Avalonia.LinuxFramebuffer.Output
 {
     public unsafe class DrmOutput : IGlOutputBackend, IGlPlatformSurface
     {
+        private LinuxDrmOptions _options;
         private DrmCard _card;
         public PixelSize PixelSize => _mode.Resolution;
-        public double Scaling { get; set; }
+
+        public double Scaling
+        {
+            get => _options.Scaling;
+            set => _options.Scaling = value;
+        }
         public IGlContext PrimaryContext => _deferredContext;
 
         private EglPlatformOpenGlInterface _platformGl;
         public IPlatformOpenGlInterface PlatformOpenGlInterface => _platformGl;
 
-        public DrmOutput(string path = null)
+        public DrmOutput(LinuxDrmOptions drmOptions)
         {
-            var card = new DrmCard(path);
+            _options = drmOptions;
+            CreateDrmOutput(_options.Card, _options.DrmConnectorsForceProbe);
+        }
+        public DrmOutput(string path = null) : this(new LinuxDrmOptions() { Card = path })
+        {
+        }
 
-            var resources = card.GetResources();
+        private void CreateDrmOutput(string path = null, bool connectorsForceProbe = false)
+        {
+            var card = new DrmCard(path);
 
+            var resources = card.GetResources(connectorsForceProbe);
 
             var connector =
                 resources.Connectors.FirstOrDefault(x => x.Connection == DrmModeConnection.DRM_MODE_CONNECTED);
@@ -144,7 +158,9 @@ namespace Avalonia.LinuxFramebuffer.Output
 
             using (_deferredContext.MakeCurrent(_eglSurface))
             {
-                _deferredContext.GlInterface.ClearColor(0, 0, 0, 0);
+                _deferredContext.GlInterface.ClearColor(_options.InitialBufferSwappingColor.R,
+                    _options.InitialBufferSwappingColor.G, _options.InitialBufferSwappingColor.B,
+                    _options.InitialBufferSwappingColor.A);
                 _deferredContext.GlInterface.Clear(GlConsts.GL_COLOR_BUFFER_BIT | GlConsts.GL_STENCIL_BUFFER_BIT);
                 _eglSurface.SwapBuffers();
             }
@@ -162,13 +178,18 @@ namespace Avalonia.LinuxFramebuffer.Output
             _mode = mode;
             _currentBo = bo;
             
-            // Go trough two cycles of buffer swapping (there are render artifacts otherwise)
-            for(var c=0;c<2;c++)
-                using (CreateGlRenderTarget().BeginDraw())
-                {
-                    _deferredContext.GlInterface.ClearColor(0, 0, 0, 0);
-                    _deferredContext.GlInterface.Clear(GlConsts.GL_COLOR_BUFFER_BIT | GlConsts.GL_STENCIL_BUFFER_BIT);
-                }
+            if (_options.EnableInitialBufferSwapping)
+            {
+                //Go trough two cycles of buffer swapping (there are render artifacts otherwise)
+                for(var c=0;c<2;c++)
+                    using (CreateGlRenderTarget().BeginDraw())
+                    {
+                        _deferredContext.GlInterface.ClearColor(_options.InitialBufferSwappingColor.R,
+                            _options.InitialBufferSwappingColor.G, _options.InitialBufferSwappingColor.B,
+                            _options.InitialBufferSwappingColor.A);
+                        _deferredContext.GlInterface.Clear(GlConsts.GL_COLOR_BUFFER_BIT | GlConsts.GL_STENCIL_BUFFER_BIT);
+                    }
+            }
             
         }
 

From 0d232a96c767b883b2fd443559f03275fb9e26e5 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Tue, 26 Jul 2022 20:05:11 +0300
Subject: [PATCH 161/240] Don't throw exceptions for missing windowing platform
 since it's actually not mandatory for TrayIcon

---
 src/Avalonia.Controls/Platform/PlatformManager.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Avalonia.Controls/Platform/PlatformManager.cs b/src/Avalonia.Controls/Platform/PlatformManager.cs
index 92f6f1cb52..494c847012 100644
--- a/src/Avalonia.Controls/Platform/PlatformManager.cs
+++ b/src/Avalonia.Controls/Platform/PlatformManager.cs
@@ -25,9 +25,7 @@ namespace Avalonia.Controls.Platform
             var platform = AvaloniaLocator.Current.GetService<IWindowingPlatform>();
 
             if (platform == null)
-            {
-                throw new Exception("Could not CreateTrayIcon(): IWindowingPlatform is not registered.");
-            }
+                return null;
 
             return s_designerMode ? null : platform.CreateTrayIcon();
         }

From 1aff4967380179cbd0348887ffbaae7c625459a7 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Tue, 26 Jul 2022 20:38:42 +0300
Subject: [PATCH 162/240] More one liners for the god of one liners

---
 src/Avalonia.Controls/Platform/PlatformManager.cs | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/Avalonia.Controls/Platform/PlatformManager.cs b/src/Avalonia.Controls/Platform/PlatformManager.cs
index 494c847012..de7708e869 100644
--- a/src/Avalonia.Controls/Platform/PlatformManager.cs
+++ b/src/Avalonia.Controls/Platform/PlatformManager.cs
@@ -20,15 +20,8 @@ namespace Avalonia.Controls.Platform
         {
         }
 
-        public static ITrayIconImpl? CreateTrayIcon()
-        {
-            var platform = AvaloniaLocator.Current.GetService<IWindowingPlatform>();
-
-            if (platform == null)
-                return null;
-
-            return s_designerMode ? null : platform.CreateTrayIcon();
-        }
+        public static ITrayIconImpl? CreateTrayIcon() =>
+            s_designerMode ? null : AvaloniaLocator.Current.GetService<IWindowingPlatform>()?.CreateTrayIcon();
 
 
         public static IWindowImpl CreateWindow()

From 5d491894aa69f7938124f5079442f655a0519abe Mon Sep 17 00:00:00 2001
From: Markus Wenzl <markus.wenzl@outlook.de>
Date: Tue, 26 Jul 2022 20:00:28 +0200
Subject: [PATCH 163/240] Fixes single responsibility principle

---
 .../DrmOutputOptions.cs                       | 27 +++++++++++
 .../LinuxDrmOptions.cs                        | 46 -------------------
 .../LinuxFramebufferPlatform.cs               | 10 +---
 .../Output/DrmOutput.cs                       | 34 ++++++++------
 4 files changed, 49 insertions(+), 68 deletions(-)
 create mode 100644 src/Linux/Avalonia.LinuxFramebuffer/DrmOutputOptions.cs
 delete mode 100644 src/Linux/Avalonia.LinuxFramebuffer/LinuxDrmOptions.cs

diff --git a/src/Linux/Avalonia.LinuxFramebuffer/DrmOutputOptions.cs b/src/Linux/Avalonia.LinuxFramebuffer/DrmOutputOptions.cs
new file mode 100644
index 0000000000..e92ad02c7a
--- /dev/null
+++ b/src/Linux/Avalonia.LinuxFramebuffer/DrmOutputOptions.cs
@@ -0,0 +1,27 @@
+using Avalonia.LinuxFramebuffer.Output;
+using Avalonia.Media;
+using JetBrains.Annotations;
+
+namespace Avalonia.LinuxFramebuffer
+{
+    public class DrmOutputOptions
+    {
+        /// <summary>
+        /// Scaling factor.
+        /// Default: 1.0
+        /// </summary>
+        public double Scaling { get; set; } = 1.0;
+        
+        /// <summary>
+        /// If true an two cycle buffer swapping is processed at init.
+        /// Default: True
+        /// </summary>
+        public bool EnableInitialBufferSwapping { get; set; } = true;
+        
+        /// <summary>
+        /// Color for <see cref="EnableInitialBufferSwapping"/>
+        /// Default: R0 G0 B0 A0
+        /// </summary>
+        public Color InitialBufferSwappingColor { get; set; } = new Color(0, 0, 0, 0);
+    }
+}
diff --git a/src/Linux/Avalonia.LinuxFramebuffer/LinuxDrmOptions.cs b/src/Linux/Avalonia.LinuxFramebuffer/LinuxDrmOptions.cs
deleted file mode 100644
index a67d6f7d8b..0000000000
--- a/src/Linux/Avalonia.LinuxFramebuffer/LinuxDrmOptions.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using Avalonia.LinuxFramebuffer.Output;
-using Avalonia.Media;
-using JetBrains.Annotations;
-
-namespace Avalonia.LinuxFramebuffer
-{
-    public class LinuxDrmOptions
-    {
-        /// <summary>
-        /// Path for DrmCard to use, if no <see cref="OutputBackend"/> is passed.
-        /// Default: null
-        /// </summary>
-        [CanBeNull] public string Card { get; set; }
-        
-        /// <summary>
-        /// True to call drmModeGetConnector for all available connectors, otherwise drmModeGetConnectorCurrent is called to get the kernel-cached connected connector.
-        /// Info: since some hardware might have incorrect connector information on startup for some reason, you may need to set this parameter to true.
-        /// Default: False
-        /// </summary>
-        public bool DrmConnectorsForceProbe { get; set; } = false;
-        
-        /// <summary>
-        /// Scaling factor.
-        /// Default: 1.0
-        /// </summary>
-        public double Scaling { get; set; } = 1.0;
-        
-        /// <summary>
-        /// If true an two cycle buffer swapping is processed at init.
-        /// Default: True
-        /// </summary>
-        public bool EnableInitialBufferSwapping { get; set; } = true;
-        
-        /// <summary>
-        /// Color for <see cref="EnableInitialBufferSwapping"/>
-        /// Default: R0 G0 B0 A0
-        /// </summary>
-        public Color InitialBufferSwappingColor { get; set; } = new Color(0, 0, 0, 0);
-        
-        /// <summary>
-        /// IOutputBackend. If Null, a new DrmOutput for <see cref="Card"/> with <see cref="Scaling"/> will be created.
-        /// Default: null
-        /// </summary>
-        [CanBeNull] public IOutputBackend OutputBackend { get; set; }
-    }
-}
diff --git a/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebufferPlatform.cs b/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebufferPlatform.cs
index bf29aed1a4..a642766809 100644
--- a/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebufferPlatform.cs
+++ b/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebufferPlatform.cs
@@ -140,14 +140,8 @@ public static class LinuxFramebufferPlatformExtensions
 
     public static int StartLinuxDrm<T>(this T builder, string[] args, string card = null, double scaling = 1)
         where T : AppBuilderBase<T>, new() => StartLinuxDirect(builder, args, new DrmOutput(card) {Scaling = scaling});
-
-    public static int StartLinuxDrm<T>(this T builder, string[] args, [CanBeNull] LinuxDrmOptions drmOptions)
-        where T : AppBuilderBase<T>, new()
-    {
-        drmOptions ??= new LinuxDrmOptions();
-        drmOptions.OutputBackend ??= new DrmOutput(drmOptions) {Scaling = drmOptions.Scaling};
-        return StartLinuxDirect(builder, args, drmOptions.OutputBackend);
-    }
+    public static int StartLinuxDrm<T>(this T builder, string[] args, string card = null, bool connectorsForceProbe = false, [CanBeNull] DrmOutputOptions options = null)
+        where T : AppBuilderBase<T>, new() => StartLinuxDirect(builder, args, new DrmOutput(card, connectorsForceProbe, options));
     
     public static int StartLinuxDirect<T>(this T builder, string[] args, IOutputBackend backend)
         where T : AppBuilderBase<T>, new()
diff --git a/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmOutput.cs b/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmOutput.cs
index 85cf1fba76..509b0cee99 100644
--- a/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmOutput.cs
+++ b/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmOutput.cs
@@ -7,6 +7,7 @@ using Avalonia.OpenGL;
 using Avalonia.OpenGL.Egl;
 using Avalonia.OpenGL.Surfaces;
 using Avalonia.Platform.Interop;
+using JetBrains.Annotations;
 using static Avalonia.LinuxFramebuffer.NativeUnsafeMethods;
 using static Avalonia.LinuxFramebuffer.Output.LibDrm;
 using static Avalonia.LinuxFramebuffer.Output.LibDrm.GbmColorFormats;
@@ -15,27 +16,32 @@ namespace Avalonia.LinuxFramebuffer.Output
 {
     public unsafe class DrmOutput : IGlOutputBackend, IGlPlatformSurface
     {
-        private LinuxDrmOptions _options;
+        private DrmOutputOptions _outputOptions = new();
         private DrmCard _card;
         public PixelSize PixelSize => _mode.Resolution;
 
         public double Scaling
         {
-            get => _options.Scaling;
-            set => _options.Scaling = value;
+            get => _outputOptions.Scaling;
+            set => _outputOptions.Scaling = value;
         }
         public IGlContext PrimaryContext => _deferredContext;
 
         private EglPlatformOpenGlInterface _platformGl;
         public IPlatformOpenGlInterface PlatformOpenGlInterface => _platformGl;
 
-        public DrmOutput(LinuxDrmOptions drmOptions)
+        public DrmOutput(DrmCard card, DrmResources resources, DrmConnector connector, DrmModeInfo modeInfo,
+            DrmOutputOptions? options = null)
         {
-            _options = drmOptions;
-            CreateDrmOutput(_options.Card, _options.DrmConnectorsForceProbe);
+            if(options != null) 
+                _outputOptions = options;
+            Init(card, resources, connector, modeInfo);
         }
-        public DrmOutput(string path = null) : this(new LinuxDrmOptions() { Card = path })
+        public DrmOutput(string path = null, bool connectorsForceProbe = false, [CanBeNull] DrmOutputOptions options = null)
         {
+            if(options != null) 
+                _outputOptions = options;
+            CreateDrmOutput(path, connectorsForceProbe);
         }
 
         private void CreateDrmOutput(string path = null, bool connectorsForceProbe = false)
@@ -158,9 +164,9 @@ namespace Avalonia.LinuxFramebuffer.Output
 
             using (_deferredContext.MakeCurrent(_eglSurface))
             {
-                _deferredContext.GlInterface.ClearColor(_options.InitialBufferSwappingColor.R,
-                    _options.InitialBufferSwappingColor.G, _options.InitialBufferSwappingColor.B,
-                    _options.InitialBufferSwappingColor.A);
+                _deferredContext.GlInterface.ClearColor(_outputOptions.InitialBufferSwappingColor.R,
+                    _outputOptions.InitialBufferSwappingColor.G, _outputOptions.InitialBufferSwappingColor.B,
+                    _outputOptions.InitialBufferSwappingColor.A);
                 _deferredContext.GlInterface.Clear(GlConsts.GL_COLOR_BUFFER_BIT | GlConsts.GL_STENCIL_BUFFER_BIT);
                 _eglSurface.SwapBuffers();
             }
@@ -178,15 +184,15 @@ namespace Avalonia.LinuxFramebuffer.Output
             _mode = mode;
             _currentBo = bo;
             
-            if (_options.EnableInitialBufferSwapping)
+            if (_outputOptions.EnableInitialBufferSwapping)
             {
                 //Go trough two cycles of buffer swapping (there are render artifacts otherwise)
                 for(var c=0;c<2;c++)
                     using (CreateGlRenderTarget().BeginDraw())
                     {
-                        _deferredContext.GlInterface.ClearColor(_options.InitialBufferSwappingColor.R,
-                            _options.InitialBufferSwappingColor.G, _options.InitialBufferSwappingColor.B,
-                            _options.InitialBufferSwappingColor.A);
+                        _deferredContext.GlInterface.ClearColor(_outputOptions.InitialBufferSwappingColor.R,
+                            _outputOptions.InitialBufferSwappingColor.G, _outputOptions.InitialBufferSwappingColor.B,
+                            _outputOptions.InitialBufferSwappingColor.A);
                         _deferredContext.GlInterface.Clear(GlConsts.GL_COLOR_BUFFER_BIT | GlConsts.GL_STENCIL_BUFFER_BIT);
                     }
             }

From 30f14e45c0678498294010b1f4b59837a6c21250 Mon Sep 17 00:00:00 2001
From: Markus Wenzl <markus.wenzl@outlook.de>
Date: Wed, 27 Jul 2022 08:00:38 +0200
Subject: [PATCH 164/240] Fix InitialBufferSwappingColor convertion to float

---
 .../Avalonia.LinuxFramebuffer/Output/DrmOutput.cs  | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmOutput.cs b/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmOutput.cs
index 509b0cee99..6c1030925a 100644
--- a/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmOutput.cs
+++ b/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmOutput.cs
@@ -162,11 +162,14 @@ namespace Avalonia.LinuxFramebuffer.Output
 
             _deferredContext = _platformGl.PrimaryEglContext;
 
+            var initialBufferSwappingColorR = _outputOptions.InitialBufferSwappingColor.R / 255.0f;
+            var initialBufferSwappingColorG = _outputOptions.InitialBufferSwappingColor.G / 255.0f;
+            var initialBufferSwappingColorB = _outputOptions.InitialBufferSwappingColor.B / 255.0f;
+            var initialBufferSwappingColorA = _outputOptions.InitialBufferSwappingColor.A / 255.0f;
             using (_deferredContext.MakeCurrent(_eglSurface))
             {
-                _deferredContext.GlInterface.ClearColor(_outputOptions.InitialBufferSwappingColor.R,
-                    _outputOptions.InitialBufferSwappingColor.G, _outputOptions.InitialBufferSwappingColor.B,
-                    _outputOptions.InitialBufferSwappingColor.A);
+                _deferredContext.GlInterface.ClearColor(initialBufferSwappingColorR, initialBufferSwappingColorG, 
+                    initialBufferSwappingColorB, initialBufferSwappingColorA);
                 _deferredContext.GlInterface.Clear(GlConsts.GL_COLOR_BUFFER_BIT | GlConsts.GL_STENCIL_BUFFER_BIT);
                 _eglSurface.SwapBuffers();
             }
@@ -190,9 +193,8 @@ namespace Avalonia.LinuxFramebuffer.Output
                 for(var c=0;c<2;c++)
                     using (CreateGlRenderTarget().BeginDraw())
                     {
-                        _deferredContext.GlInterface.ClearColor(_outputOptions.InitialBufferSwappingColor.R,
-                            _outputOptions.InitialBufferSwappingColor.G, _outputOptions.InitialBufferSwappingColor.B,
-                            _outputOptions.InitialBufferSwappingColor.A);
+                        _deferredContext.GlInterface.ClearColor(initialBufferSwappingColorR, initialBufferSwappingColorG, 
+                            initialBufferSwappingColorB, initialBufferSwappingColorA);
                         _deferredContext.GlInterface.Clear(GlConsts.GL_COLOR_BUFFER_BIT | GlConsts.GL_STENCIL_BUFFER_BIT);
                     }
             }

From 406f9ced66f2355d6b67965baef1448d5132c9be Mon Sep 17 00:00:00 2001
From: Markus Wenzl <markus.wenzl@outlook.de>
Date: Wed, 27 Jul 2022 08:00:48 +0200
Subject: [PATCH 165/240] Clean up

---
 src/Linux/Avalonia.LinuxFramebuffer/Output/DrmOutput.cs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmOutput.cs b/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmOutput.cs
index 6c1030925a..ce210019c0 100644
--- a/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmOutput.cs
+++ b/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmOutput.cs
@@ -41,11 +41,7 @@ namespace Avalonia.LinuxFramebuffer.Output
         {
             if(options != null) 
                 _outputOptions = options;
-            CreateDrmOutput(path, connectorsForceProbe);
-        }
-
-        private void CreateDrmOutput(string path = null, bool connectorsForceProbe = false)
-        {
+            
             var card = new DrmCard(path);
 
             var resources = card.GetResources(connectorsForceProbe);

From fcef0659085ab7527b514b91bd7f4079912e30a5 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Wed, 27 Jul 2022 14:51:16 +0200
Subject: [PATCH 166/240] Fix flaky menu integration tests.

Move the mouse pointer out of the way of the menu when running integration tests on menu keys.
---
 .../MenuTests.cs                              | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/tests/Avalonia.IntegrationTests.Appium/MenuTests.cs b/tests/Avalonia.IntegrationTests.Appium/MenuTests.cs
index d1d231466f..3f1fe7de12 100644
--- a/tests/Avalonia.IntegrationTests.Appium/MenuTests.cs
+++ b/tests/Avalonia.IntegrationTests.Appium/MenuTests.cs
@@ -60,6 +60,8 @@ namespace Avalonia.IntegrationTests.Appium
         [PlatformFact(TestPlatforms.Windows)]
         public void Select_Child_With_Alt_Arrow_Keys()
         {
+            MovePointerOutOfTheWay();
+
             new Actions(_session)
                 .KeyDown(Keys.Alt).KeyUp(Keys.Alt)
                 .SendKeys(Keys.Down + Keys.Enter)
@@ -72,6 +74,8 @@ namespace Avalonia.IntegrationTests.Appium
         [PlatformFact(TestPlatforms.Windows)]
         public void Select_Grandchild_With_Alt_Arrow_Keys()
         {
+            MovePointerOutOfTheWay();
+
             new Actions(_session)
                 .KeyDown(Keys.Alt).KeyUp(Keys.Alt)
                 .SendKeys(Keys.Down + Keys.Down + Keys.Right + Keys.Enter)
@@ -84,6 +88,8 @@ namespace Avalonia.IntegrationTests.Appium
         [PlatformFact(TestPlatforms.Windows)]
         public void Select_Child_With_Alt_Access_Keys()
         {
+            MovePointerOutOfTheWay();
+
             new Actions(_session)
                 .KeyDown(Keys.Alt).KeyUp(Keys.Alt)
                 .SendKeys("rc")
@@ -96,6 +102,8 @@ namespace Avalonia.IntegrationTests.Appium
         [PlatformFact(TestPlatforms.Windows)]
         public void Select_Grandchild_With_Alt_Access_Keys()
         {
+            MovePointerOutOfTheWay();
+
             new Actions(_session)
                 .KeyDown(Keys.Alt).KeyUp(Keys.Alt)
                 .SendKeys("rhg")
@@ -111,6 +119,8 @@ namespace Avalonia.IntegrationTests.Appium
             var rootMenuItem = _session.FindElementByAccessibilityId("RootMenuItem");
             rootMenuItem.SendClick();
 
+            MovePointerOutOfTheWay();
+
             new Actions(_session)
                 .SendKeys(Keys.Down + Keys.Enter)
                 .Perform();
@@ -125,6 +135,8 @@ namespace Avalonia.IntegrationTests.Appium
             var rootMenuItem = _session.FindElementByAccessibilityId("RootMenuItem");
             rootMenuItem.SendClick();
 
+            MovePointerOutOfTheWay();
+
             new Actions(_session)
                 .SendKeys(Keys.Down + Keys.Down + Keys.Right + Keys.Enter)
                 .Perform();
@@ -159,5 +171,15 @@ namespace Avalonia.IntegrationTests.Appium
 
             Assert.True(textBox.GetIsFocused());
         }
+
+        private void MovePointerOutOfTheWay()
+        {
+            // Move the pointer to the menu tab item so that it's not over the menu in preparation
+            // for key press tests. This prevents the mouse accidentially selecting the wrong item
+            // by hovering.
+            var tabs = _session.FindElementByAccessibilityId("MainTabs");
+            var tab = tabs.FindElementByName("Menu");
+            tab.MovePointerOver();
+        }
     }
 }

From 276e4c596bb97eeecdc3920d8e0ac47b899b1876 Mon Sep 17 00:00:00 2001
From: Mario Uhlmann <Mario.Uhlmann@gmx.net>
Date: Wed, 27 Jul 2022 20:34:42 +0200
Subject: [PATCH 167/240] unused Stopwatch removed

---
 .../Composition/WinUICompositorConnection.cs     | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/Windows/Avalonia.Win32/WinRT/Composition/WinUICompositorConnection.cs b/src/Windows/Avalonia.Win32/WinRT/Composition/WinUICompositorConnection.cs
index 5334b90d62..84c3cc5c51 100644
--- a/src/Windows/Avalonia.Win32/WinRT/Composition/WinUICompositorConnection.cs
+++ b/src/Windows/Avalonia.Win32/WinRT/Composition/WinUICompositorConnection.cs
@@ -120,16 +120,14 @@ namespace Avalonia.Win32.WinRT.Composition
 
         private void RunLoop()
         {
+            using (var act = _compositor5.RequestCommitAsync())
+                act.SetCompleted(new RunLoopHandler(this));
+
+            while (true)
             {
-                var st = Stopwatch.StartNew();
-                using (var act = _compositor5.RequestCommitAsync())
-                    act.SetCompleted(new RunLoopHandler(this));
-                while (true)
-                {
-                    UnmanagedMethods.GetMessage(out var msg, IntPtr.Zero, 0, 0);
-                    lock (_pumpLock)
-                        UnmanagedMethods.DispatchMessage(ref msg);
-                }
+                UnmanagedMethods.GetMessage(out var msg, IntPtr.Zero, 0, 0);
+                lock (_pumpLock)
+                    UnmanagedMethods.DispatchMessage(ref msg);
             }
         }
 

From 01d040bf6ca6043fb42fcc6cecb04ea176df3819 Mon Sep 17 00:00:00 2001
From: Evgeny Gorbovoy <e.gorbovoy@staffwerke.de>
Date: Wed, 27 Jul 2022 23:25:43 +0200
Subject: [PATCH 168/240] + hit test attempt

---
 .../DeferredRendererTests_HitTesting.cs       | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/tests/Avalonia.Base.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs b/tests/Avalonia.Base.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs
index 33c7b3e0f8..e1b36c9d72 100644
--- a/tests/Avalonia.Base.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs
+++ b/tests/Avalonia.Base.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs
@@ -537,6 +537,37 @@ namespace Avalonia.Base.UnitTests.Rendering
             }
         }
 
+        [Fact]
+        public void HitTest_Should_Not_Hit_Controls_Next_Pixel()
+        {
+            using (TestApplication())
+            {
+                Button targetButton;
+
+                var root = new TestRoot
+                {
+                    Width = 300,
+                    Height = 200,
+                    Child = new StackPanel
+                    {
+                        Orientation = Orientation.Vertical,
+                        Children =
+                            {
+                                new Button { Width = 10, Height = 10 },
+                                { targetButton = new Button { Width = 10, Height = 10 } }
+                            }
+                    }
+                }; 
+
+                root.Renderer = new DeferredRenderer(root, null);
+                root.Measure(Size.Infinity);
+                root.Arrange(new Rect(root.DesiredSize));
+
+                var result = root.Renderer.HitTest(new Point(5, 10), root, null);
+                Assert.Equal(new[] { targetButton }, result);
+            }
+        }
+
         private IDisposable TestApplication()
         {
             return UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);

From d560fd28473df11cfe0824419cbf32bfb6f3ee88 Mon Sep 17 00:00:00 2001
From: Evgeny Gorbovoy <e.gorbovoy@staffwerke.de>
Date: Wed, 27 Jul 2022 23:28:34 +0200
Subject: [PATCH 169/240] + CompositorHitTesting test

---
 .../Rendering/CompositorHitTestingTests.cs    | 25 ++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/tests/Avalonia.Base.UnitTests/Rendering/CompositorHitTestingTests.cs b/tests/Avalonia.Base.UnitTests/Rendering/CompositorHitTestingTests.cs
index 705c8fad9c..6543649eb2 100644
--- a/tests/Avalonia.Base.UnitTests/Rendering/CompositorHitTestingTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Rendering/CompositorHitTestingTests.cs
@@ -408,10 +408,33 @@ public class CompositorHitTestingTests : CompositorTestsBase
             s.AssertHitTest(175, 100, null);
         }
     }
+    
+    [Fact]
+    public void HitTest_Should_Not_Hit_Controls_Next_Pixel()
+    {
+        using (var s = new CompositorServices(new Size(200, 200)))
+        {
+            Button targetButton;
+
+            var stackPanel = new StackPanel
+            {
+                Orientation = Orientation.Vertical,
+                Children =
+                {
+                    new Button { Width = 10, Height = 10 },
+                    { targetButton = new Button { Width = 10, Height = 10 } }
+                }
+            };
+
+            s.TopLevel.Content = stackPanel;
+            
+            s.AssertHitTest(new Point(5, 10), null, targetButton);
+        }
+    }
 
     private IDisposable TestApplication()
     {
         return UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
     }
 
-}
\ No newline at end of file
+}

From bd343a6290860e2ec546852f06d1b87105152d90 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Thu, 28 Jul 2022 10:41:44 +0100
Subject: [PATCH 170/240] update license for composition.

---
 .../Composition/Animations/AnimationInstanceBase.cs        | 3 ++-
 .../Composition/Animations/CompositionAnimation.cs         | 2 ++
 .../Composition/Animations/CompositionAnimationGroup.cs    | 2 ++
 .../Composition/Animations/ExpressionAnimation.cs          | 2 ++
 .../Composition/Animations/ExpressionAnimationInstance.cs  | 2 ++
 .../Rendering/Composition/Animations/IAnimationInstance.cs | 2 ++
 .../Composition/Animations/ICompositionAnimationBase.cs    | 2 ++
 .../Composition/Animations/ImplicitAnimationCollection.cs  | 2 ++
 .../Rendering/Composition/Animations/Interpolators.cs      | 2 ++
 .../Rendering/Composition/Animations/KeyFrameAnimation.cs  | 2 ++
 .../Composition/Animations/KeyFrameAnimationInstance.cs    | 2 ++
 .../Rendering/Composition/Animations/KeyFrames.cs          | 2 ++
 .../Composition/Animations/PropertySetSnapshot.cs          | 2 ++
 .../Rendering/Composition/CompositingRenderer.cs           | 2 ++
 .../Rendering/Composition/CompositionDrawListVisual.cs     | 2 ++
 .../Rendering/Composition/CompositionObject.cs             | 2 ++
 .../Rendering/Composition/CompositionPropertySet.cs        | 2 ++
 .../Rendering/Composition/CompositionTarget.cs             | 2 ++
 src/Avalonia.Base/Rendering/Composition/Compositor.cs      | 2 ++
 src/Avalonia.Base/Rendering/Composition/ContainerVisual.cs | 2 ++
 .../Rendering/Composition/Drawing/CompositionDrawList.cs   | 2 ++
 .../Composition/Drawing/CompositionDrawingContext.cs       | 3 +++
 .../Rendering/Composition/ElementCompositionPreview.cs     | 2 ++
 src/Avalonia.Base/Rendering/Composition/Enums.cs           | 2 ++
 .../Composition/Expressions/BuiltInExpressionFfi.cs        | 2 ++
 .../Composition/Expressions/DelegateExpressionFfi.cs       | 2 ++
 .../Rendering/Composition/Expressions/Expression.cs        | 2 ++
 .../Composition/Expressions/ExpressionEvaluationContext.cs | 2 ++
 .../Composition/Expressions/ExpressionParseException.cs    | 2 ++
 .../Rendering/Composition/Expressions/ExpressionParser.cs  | 2 ++
 .../Composition/Expressions/ExpressionTrackedValues.cs     | 2 ++
 .../Rendering/Composition/Expressions/ExpressionVariant.cs | 2 ++
 .../Rendering/Composition/Expressions/TokenParser.cs       | 2 ++
 .../Rendering/Composition/ICompositionTargetDebugEvents.cs | 2 ++
 src/Avalonia.Base/Rendering/Composition/License.md         | 7 +++++++
 src/Avalonia.Base/Rendering/Composition/MatrixUtils.cs     | 2 ++
 .../Rendering/Composition/Server/CompositionProperty.cs    | 2 ++
 .../Rendering/Composition/Server/DrawingContextProxy.cs    | 2 ++
 .../Rendering/Composition/Server/FpsCounter.cs             | 2 ++
 .../Rendering/Composition/Server/ReadbackIndices.cs        | 2 ++
 .../Composition/Server/ServerCompositionContainerVisual.cs | 2 ++
 .../Composition/Server/ServerCompositionDrawListVisual.cs  | 2 ++
 .../Composition/Server/ServerCompositionSurface.cs         | 2 ++
 .../Composition/Server/ServerCompositionTarget.cs          | 2 ++
 .../Server/ServerCompositionVisual.DirtyProperties.cs      | 2 ++
 .../Composition/Server/ServerCompositionVisual.cs          | 2 ++
 .../Rendering/Composition/Server/ServerCompositor.cs       | 2 ++
 .../Rendering/Composition/Server/ServerList.cs             | 2 ++
 .../Rendering/Composition/Server/ServerObject.cs           | 2 ++
 src/Avalonia.Base/Rendering/Composition/Transport/Batch.cs | 2 ++
 .../Rendering/Composition/Transport/BatchStream.cs         | 2 ++
 .../Composition/Transport/BatchStreamArrayPool.cs          | 2 ++
 .../Composition/Transport/BatchStreamDebugMarker.cs        | 2 ++
 .../Composition/Transport/ServerListProxyHelper.cs         | 2 ++
 src/Avalonia.Base/Rendering/Composition/Visual.cs          | 2 ++
 .../Rendering/Composition/VisualCollection.cs              | 2 ++
 .../CompositionGenerator/Generator.KeyFrameAnimation.cs    | 2 ++
 57 files changed, 120 insertions(+), 1 deletion(-)
 create mode 100644 src/Avalonia.Base/Rendering/Composition/License.md

diff --git a/src/Avalonia.Base/Rendering/Composition/Animations/AnimationInstanceBase.cs b/src/Avalonia.Base/Rendering/Composition/Animations/AnimationInstanceBase.cs
index 80e64118ee..b624f89a2d 100644
--- a/src/Avalonia.Base/Rendering/Composition/Animations/AnimationInstanceBase.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Animations/AnimationInstanceBase.cs
@@ -3,8 +3,9 @@ using System.Collections.Generic;
 using Avalonia.Rendering.Composition.Expressions;
 using Avalonia.Rendering.Composition.Server;
 
-namespace Avalonia.Rendering.Composition.Animations;
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
 
+namespace Avalonia.Rendering.Composition.Animations;
 
 /// <summary>
 /// The base class for both key-frame and expression animation instances
diff --git a/src/Avalonia.Base/Rendering/Composition/Animations/CompositionAnimation.cs b/src/Avalonia.Base/Rendering/Composition/Animations/CompositionAnimation.cs
index c5102a2d7d..cb5615a737 100644
--- a/src/Avalonia.Base/Rendering/Composition/Animations/CompositionAnimation.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Animations/CompositionAnimation.cs
@@ -8,6 +8,8 @@ using Avalonia.Rendering.Composition.Expressions;
 using Avalonia.Rendering.Composition.Server;
 using Avalonia.Rendering.Composition.Transport;
 
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition.Animations
 {
     /// <summary>
diff --git a/src/Avalonia.Base/Rendering/Composition/Animations/CompositionAnimationGroup.cs b/src/Avalonia.Base/Rendering/Composition/Animations/CompositionAnimationGroup.cs
index 89f8ba411d..e362b63887 100644
--- a/src/Avalonia.Base/Rendering/Composition/Animations/CompositionAnimationGroup.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Animations/CompositionAnimationGroup.cs
@@ -3,6 +3,8 @@ using System.Collections.Generic;
 using Avalonia.Rendering.Composition.Transport;
 
 
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition.Animations
 {
     public class CompositionAnimationGroup : CompositionObject, ICompositionAnimationBase
diff --git a/src/Avalonia.Base/Rendering/Composition/Animations/ExpressionAnimation.cs b/src/Avalonia.Base/Rendering/Composition/Animations/ExpressionAnimation.cs
index 163f4e99ba..c9b409fce4 100644
--- a/src/Avalonia.Base/Rendering/Composition/Animations/ExpressionAnimation.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Animations/ExpressionAnimation.cs
@@ -3,6 +3,8 @@ using System;
 using Avalonia.Rendering.Composition.Expressions;
 using Avalonia.Rendering.Composition.Server;
 
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition.Animations
 {
     /// <summary>
diff --git a/src/Avalonia.Base/Rendering/Composition/Animations/ExpressionAnimationInstance.cs b/src/Avalonia.Base/Rendering/Composition/Animations/ExpressionAnimationInstance.cs
index 764bac9931..cd912df81a 100644
--- a/src/Avalonia.Base/Rendering/Composition/Animations/ExpressionAnimationInstance.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Animations/ExpressionAnimationInstance.cs
@@ -3,6 +3,8 @@ using System.Collections.Generic;
 using Avalonia.Rendering.Composition.Expressions;
 using Avalonia.Rendering.Composition.Server;
 
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition.Animations
 {
     
diff --git a/src/Avalonia.Base/Rendering/Composition/Animations/IAnimationInstance.cs b/src/Avalonia.Base/Rendering/Composition/Animations/IAnimationInstance.cs
index 4e1972f2c6..bc9bfccc6b 100644
--- a/src/Avalonia.Base/Rendering/Composition/Animations/IAnimationInstance.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Animations/IAnimationInstance.cs
@@ -2,6 +2,8 @@ using System;
 using Avalonia.Rendering.Composition.Expressions;
 using Avalonia.Rendering.Composition.Server;
 
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition.Animations
 {
     internal interface IAnimationInstance
diff --git a/src/Avalonia.Base/Rendering/Composition/Animations/ICompositionAnimationBase.cs b/src/Avalonia.Base/Rendering/Composition/Animations/ICompositionAnimationBase.cs
index 87e5ad757a..51d23c296a 100644
--- a/src/Avalonia.Base/Rendering/Composition/Animations/ICompositionAnimationBase.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Animations/ICompositionAnimationBase.cs
@@ -2,6 +2,8 @@
 
 using Avalonia.Rendering.Composition.Server;
 
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition.Animations
 {
     /// <summary>
diff --git a/src/Avalonia.Base/Rendering/Composition/Animations/ImplicitAnimationCollection.cs b/src/Avalonia.Base/Rendering/Composition/Animations/ImplicitAnimationCollection.cs
index f4bcc6ff38..2e39bdc46e 100644
--- a/src/Avalonia.Base/Rendering/Composition/Animations/ImplicitAnimationCollection.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Animations/ImplicitAnimationCollection.cs
@@ -4,6 +4,8 @@ using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using Avalonia.Rendering.Composition.Transport;
 
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition.Animations
 {
     /// <summary>
diff --git a/src/Avalonia.Base/Rendering/Composition/Animations/Interpolators.cs b/src/Avalonia.Base/Rendering/Composition/Animations/Interpolators.cs
index a4eeacef32..960a76b1f8 100644
--- a/src/Avalonia.Base/Rendering/Composition/Animations/Interpolators.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Animations/Interpolators.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Numerics;
 
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition.Animations
 {
     /// <summary>
diff --git a/src/Avalonia.Base/Rendering/Composition/Animations/KeyFrameAnimation.cs b/src/Avalonia.Base/Rendering/Composition/Animations/KeyFrameAnimation.cs
index 49b3ab753a..13f02ade8c 100644
--- a/src/Avalonia.Base/Rendering/Composition/Animations/KeyFrameAnimation.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Animations/KeyFrameAnimation.cs
@@ -2,6 +2,8 @@ using System;
 using Avalonia.Animation;
 using Avalonia.Animation.Easings;
 
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition.Animations
 {
     
diff --git a/src/Avalonia.Base/Rendering/Composition/Animations/KeyFrameAnimationInstance.cs b/src/Avalonia.Base/Rendering/Composition/Animations/KeyFrameAnimationInstance.cs
index 0c0fcfaf2b..b0293b7996 100644
--- a/src/Avalonia.Base/Rendering/Composition/Animations/KeyFrameAnimationInstance.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Animations/KeyFrameAnimationInstance.cs
@@ -4,6 +4,8 @@ using Avalonia.Animation;
 using Avalonia.Rendering.Composition.Expressions;
 using Avalonia.Rendering.Composition.Server;
 
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition.Animations
 {
     /// <summary>
diff --git a/src/Avalonia.Base/Rendering/Composition/Animations/KeyFrames.cs b/src/Avalonia.Base/Rendering/Composition/Animations/KeyFrames.cs
index 369cc80b95..1a0d967380 100644
--- a/src/Avalonia.Base/Rendering/Composition/Animations/KeyFrames.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Animations/KeyFrames.cs
@@ -3,6 +3,8 @@ using System.Collections.Generic;
 using Avalonia.Animation.Easings;
 using Avalonia.Rendering.Composition.Expressions;
 
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition.Animations
 {
     
diff --git a/src/Avalonia.Base/Rendering/Composition/Animations/PropertySetSnapshot.cs b/src/Avalonia.Base/Rendering/Composition/Animations/PropertySetSnapshot.cs
index fc6cfc9f3d..f009d8dd11 100644
--- a/src/Avalonia.Base/Rendering/Composition/Animations/PropertySetSnapshot.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Animations/PropertySetSnapshot.cs
@@ -1,6 +1,8 @@
 using System.Collections.Generic;
 using Avalonia.Rendering.Composition.Expressions;
 
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition.Animations
 {
     /// <summary>
diff --git a/src/Avalonia.Base/Rendering/Composition/CompositingRenderer.cs b/src/Avalonia.Base/Rendering/Composition/CompositingRenderer.cs
index a571a0518b..64cb43646c 100644
--- a/src/Avalonia.Base/Rendering/Composition/CompositingRenderer.cs
+++ b/src/Avalonia.Base/Rendering/Composition/CompositingRenderer.cs
@@ -11,6 +11,8 @@ using Avalonia.Rendering.Composition.Server;
 using Avalonia.Threading;
 using Avalonia.VisualTree;
 
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition;
 
 /// <summary>
diff --git a/src/Avalonia.Base/Rendering/Composition/CompositionDrawListVisual.cs b/src/Avalonia.Base/Rendering/Composition/CompositionDrawListVisual.cs
index 49aea1c3dc..b64a5afc97 100644
--- a/src/Avalonia.Base/Rendering/Composition/CompositionDrawListVisual.cs
+++ b/src/Avalonia.Base/Rendering/Composition/CompositionDrawListVisual.cs
@@ -5,6 +5,8 @@ using Avalonia.Rendering.Composition.Server;
 using Avalonia.Rendering.Composition.Transport;
 using Avalonia.VisualTree;
 
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition;
 
 
diff --git a/src/Avalonia.Base/Rendering/Composition/CompositionObject.cs b/src/Avalonia.Base/Rendering/Composition/CompositionObject.cs
index f529ee9cff..9e42e4d182 100644
--- a/src/Avalonia.Base/Rendering/Composition/CompositionObject.cs
+++ b/src/Avalonia.Base/Rendering/Composition/CompositionObject.cs
@@ -5,6 +5,8 @@ using Avalonia.Rendering.Composition.Server;
 using Avalonia.Rendering.Composition.Transport;
 using Avalonia.Utilities;
 
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition
 {
     /// <summary>
diff --git a/src/Avalonia.Base/Rendering/Composition/CompositionPropertySet.cs b/src/Avalonia.Base/Rendering/Composition/CompositionPropertySet.cs
index ee4552d154..a61ab809de 100644
--- a/src/Avalonia.Base/Rendering/Composition/CompositionPropertySet.cs
+++ b/src/Avalonia.Base/Rendering/Composition/CompositionPropertySet.cs
@@ -5,6 +5,8 @@ using Avalonia.Rendering.Composition.Animations;
 using Avalonia.Rendering.Composition.Expressions;
 using Avalonia.Rendering.Composition.Transport;
 
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition
 {
     /// <summary>
diff --git a/src/Avalonia.Base/Rendering/Composition/CompositionTarget.cs b/src/Avalonia.Base/Rendering/Composition/CompositionTarget.cs
index 01b2d0d5d9..bb502e4d38 100644
--- a/src/Avalonia.Base/Rendering/Composition/CompositionTarget.cs
+++ b/src/Avalonia.Base/Rendering/Composition/CompositionTarget.cs
@@ -4,6 +4,8 @@ using System.Numerics;
 using Avalonia.Collections.Pooled;
 using Avalonia.VisualTree;
 
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition
 {
     /// <summary>
diff --git a/src/Avalonia.Base/Rendering/Composition/Compositor.cs b/src/Avalonia.Base/Rendering/Composition/Compositor.cs
index 1bdae44cb9..f3258bbdb0 100644
--- a/src/Avalonia.Base/Rendering/Composition/Compositor.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Compositor.cs
@@ -12,6 +12,8 @@ using Avalonia.Rendering.Composition.Transport;
 using Avalonia.Threading;
 
 
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition
 {
     /// <summary>
diff --git a/src/Avalonia.Base/Rendering/Composition/ContainerVisual.cs b/src/Avalonia.Base/Rendering/Composition/ContainerVisual.cs
index caf074dd6b..a4fadd3134 100644
--- a/src/Avalonia.Base/Rendering/Composition/ContainerVisual.cs
+++ b/src/Avalonia.Base/Rendering/Composition/ContainerVisual.cs
@@ -1,5 +1,7 @@
 using Avalonia.Rendering.Composition.Server;
 
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition
 {
     /// <summary>
diff --git a/src/Avalonia.Base/Rendering/Composition/Drawing/CompositionDrawList.cs b/src/Avalonia.Base/Rendering/Composition/Drawing/CompositionDrawList.cs
index 432a0832f2..02ab269d29 100644
--- a/src/Avalonia.Base/Rendering/Composition/Drawing/CompositionDrawList.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Drawing/CompositionDrawList.cs
@@ -4,6 +4,8 @@ using Avalonia.Rendering.Composition.Server;
 using Avalonia.Rendering.SceneGraph;
 using Avalonia.Utilities;
 
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition.Drawing;
 
 /// <summary>
diff --git a/src/Avalonia.Base/Rendering/Composition/Drawing/CompositionDrawingContext.cs b/src/Avalonia.Base/Rendering/Composition/Drawing/CompositionDrawingContext.cs
index d7c1ef125d..b8922244ae 100644
--- a/src/Avalonia.Base/Rendering/Composition/Drawing/CompositionDrawingContext.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Drawing/CompositionDrawingContext.cs
@@ -8,6 +8,9 @@ using Avalonia.Rendering.Composition.Drawing;
 using Avalonia.Rendering.SceneGraph;
 using Avalonia.Utilities;
 using Avalonia.VisualTree;
+
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition;
 
 /// <summary>
diff --git a/src/Avalonia.Base/Rendering/Composition/ElementCompositionPreview.cs b/src/Avalonia.Base/Rendering/Composition/ElementCompositionPreview.cs
index 1397a20fb6..dd77423eca 100644
--- a/src/Avalonia.Base/Rendering/Composition/ElementCompositionPreview.cs
+++ b/src/Avalonia.Base/Rendering/Composition/ElementCompositionPreview.cs
@@ -1,3 +1,5 @@
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition;
 
 /// <summary>
diff --git a/src/Avalonia.Base/Rendering/Composition/Enums.cs b/src/Avalonia.Base/Rendering/Composition/Enums.cs
index e349845cbf..0986e0b233 100644
--- a/src/Avalonia.Base/Rendering/Composition/Enums.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Enums.cs
@@ -1,5 +1,7 @@
 using System;
 
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition
 {
     public enum CompositionBlendMode
diff --git a/src/Avalonia.Base/Rendering/Composition/Expressions/BuiltInExpressionFfi.cs b/src/Avalonia.Base/Rendering/Composition/Expressions/BuiltInExpressionFfi.cs
index 44347d2c7a..e166279316 100644
--- a/src/Avalonia.Base/Rendering/Composition/Expressions/BuiltInExpressionFfi.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Expressions/BuiltInExpressionFfi.cs
@@ -4,6 +4,8 @@ using System.Numerics;
 using Avalonia.Rendering.Composition.Animations;
 using Avalonia.Utilities;
 
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition.Expressions
 {
     /// <summary>
diff --git a/src/Avalonia.Base/Rendering/Composition/Expressions/DelegateExpressionFfi.cs b/src/Avalonia.Base/Rendering/Composition/Expressions/DelegateExpressionFfi.cs
index 85c6141409..1e3ac77035 100644
--- a/src/Avalonia.Base/Rendering/Composition/Expressions/DelegateExpressionFfi.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Expressions/DelegateExpressionFfi.cs
@@ -5,6 +5,8 @@ using System.Linq;
 using System.Numerics;
 using Avalonia.Media;
 
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition.Expressions
 {
     /// <summary>
diff --git a/src/Avalonia.Base/Rendering/Composition/Expressions/Expression.cs b/src/Avalonia.Base/Rendering/Composition/Expressions/Expression.cs
index 5abba00365..cfe1260b22 100644
--- a/src/Avalonia.Base/Rendering/Composition/Expressions/Expression.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Expressions/Expression.cs
@@ -4,6 +4,8 @@ using System.Globalization;
 using System.Reflection;
 using Avalonia.Rendering.Composition.Server;
 
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition.Expressions
 {
     /// <summary>
diff --git a/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionEvaluationContext.cs b/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionEvaluationContext.cs
index 9d23551e43..3e4fba24bd 100644
--- a/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionEvaluationContext.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionEvaluationContext.cs
@@ -1,6 +1,8 @@
 using System.Collections.Generic;
 using Avalonia.Rendering.Composition.Server;
 
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition.Expressions
 {
     internal struct ExpressionEvaluationContext
diff --git a/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionParseException.cs b/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionParseException.cs
index 6a207a3bf7..33b94eca76 100644
--- a/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionParseException.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionParseException.cs
@@ -1,5 +1,7 @@
 using System;
 
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition.Expressions
 {
     internal class ExpressionParseException : Exception
diff --git a/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionParser.cs b/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionParser.cs
index 5924bb8f1b..901013a9ff 100644
--- a/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionParser.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionParser.cs
@@ -5,6 +5,8 @@ using System.Linq;
 
 // ReSharper disable StringLiteralTypo
 
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition.Expressions
 {
     internal class ExpressionParser
diff --git a/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionTrackedValues.cs b/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionTrackedValues.cs
index 334f975aa0..b3c2dfcee9 100644
--- a/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionTrackedValues.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionTrackedValues.cs
@@ -2,6 +2,8 @@ using System.Collections;
 using System.Collections.Generic;
 using Avalonia.Rendering.Composition.Server;
 
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition.Expressions;
 
 internal class ExpressionTrackedObjects : IEnumerable<IExpressionObject>
diff --git a/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionVariant.cs b/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionVariant.cs
index 7b900534d8..563c09c964 100644
--- a/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionVariant.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionVariant.cs
@@ -4,6 +4,8 @@ using System.Numerics;
 using System.Runtime.InteropServices;
 using Avalonia.Media;
 
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition.Expressions
 {
     internal enum VariantType
diff --git a/src/Avalonia.Base/Rendering/Composition/Expressions/TokenParser.cs b/src/Avalonia.Base/Rendering/Composition/Expressions/TokenParser.cs
index 27782c8c2c..cc20b3c870 100644
--- a/src/Avalonia.Base/Rendering/Composition/Expressions/TokenParser.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Expressions/TokenParser.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Globalization;
 
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition.Expressions
 {
     /// <summary>
diff --git a/src/Avalonia.Base/Rendering/Composition/ICompositionTargetDebugEvents.cs b/src/Avalonia.Base/Rendering/Composition/ICompositionTargetDebugEvents.cs
index 045a4f8cc6..45cc886cd0 100644
--- a/src/Avalonia.Base/Rendering/Composition/ICompositionTargetDebugEvents.cs
+++ b/src/Avalonia.Base/Rendering/Composition/ICompositionTargetDebugEvents.cs
@@ -1,3 +1,5 @@
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition;
 
 internal interface ICompositionTargetDebugEvents
diff --git a/src/Avalonia.Base/Rendering/Composition/License.md b/src/Avalonia.Base/Rendering/Composition/License.md
new file mode 100644
index 0000000000..d1b709859e
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/License.md
@@ -0,0 +1,7 @@
+Please note: Any code in this directory is excluded from the normal MIT license.
+
+This code is owned and copyright to Avalonia OU.
+
+This code may be used free of charge by any application that consumes Avalonia binary packages as a direct or indirect dependency.
+
+Explicit permission is required for any other use outside of Avalonia applications.
\ No newline at end of file
diff --git a/src/Avalonia.Base/Rendering/Composition/MatrixUtils.cs b/src/Avalonia.Base/Rendering/Composition/MatrixUtils.cs
index 2cb500cae4..66dc6e7987 100644
--- a/src/Avalonia.Base/Rendering/Composition/MatrixUtils.cs
+++ b/src/Avalonia.Base/Rendering/Composition/MatrixUtils.cs
@@ -1,5 +1,7 @@
 using System.Numerics;
 
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition
 {
     static class MatrixUtils
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/CompositionProperty.cs b/src/Avalonia.Base/Rendering/Composition/Server/CompositionProperty.cs
index 282c0e113d..f0aaa1d574 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/CompositionProperty.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/CompositionProperty.cs
@@ -1,6 +1,8 @@
 using System.Collections.Generic;
 using System.Threading;
 
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition.Server;
 
 internal class CompositionProperty
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/DrawingContextProxy.cs b/src/Avalonia.Base/Rendering/Composition/Server/DrawingContextProxy.cs
index e261507f60..6522af3706 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/DrawingContextProxy.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/DrawingContextProxy.cs
@@ -6,6 +6,8 @@ using Avalonia.Rendering.Composition.Drawing;
 using Avalonia.Rendering.SceneGraph;
 using Avalonia.Utilities;
 
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition.Server;
 
 /// <summary>
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/FpsCounter.cs b/src/Avalonia.Base/Rendering/Composition/Server/FpsCounter.cs
index 7585710540..d4fa02deef 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/FpsCounter.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/FpsCounter.cs
@@ -6,6 +6,8 @@ using Avalonia.Media.TextFormatting;
 using Avalonia.Platform;
 using Avalonia.Utilities;
 
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition.Server;
 
 /// <summary>
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ReadbackIndices.cs b/src/Avalonia.Base/Rendering/Composition/Server/ReadbackIndices.cs
index c9592b70ab..fbe9b66bb2 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ReadbackIndices.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ReadbackIndices.cs
@@ -1,3 +1,5 @@
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition.Server
 {
     /// <summary>
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionContainerVisual.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionContainerVisual.cs
index f7152293cc..1515a21fb1 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionContainerVisual.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionContainerVisual.cs
@@ -1,6 +1,8 @@
 using System.Numerics;
 using Avalonia.Platform;
 
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition.Server
 {
     /// <summary>
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionDrawListVisual.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionDrawListVisual.cs
index 93a5226f83..e1265f9eed 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionDrawListVisual.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionDrawListVisual.cs
@@ -7,6 +7,8 @@ using Avalonia.Rendering.Composition.Transport;
 using Avalonia.Rendering.SceneGraph;
 using Avalonia.Utilities;
 
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition.Server;
 
 /// <summary>
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionSurface.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionSurface.cs
index 462a193a86..a03dd0ef77 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionSurface.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionSurface.cs
@@ -1,3 +1,5 @@
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition.Server
 {
     internal abstract class ServerCompositionSurface : ServerObject
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs
index 882b66bf70..0760972534 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs
@@ -9,6 +9,8 @@ using Avalonia.Platform;
 using Avalonia.Rendering.Composition.Transport;
 using Avalonia.Utilities;
 
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition.Server
 {
     /// <summary>
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.DirtyProperties.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.DirtyProperties.cs
index c5af74e2dd..082650cdb8 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.DirtyProperties.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.DirtyProperties.cs
@@ -1,3 +1,5 @@
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition.Server;
 
 partial class ServerCompositionVisual
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.cs
index c0e487f209..49a54abf22 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.cs
@@ -6,6 +6,8 @@ using Avalonia.Rendering.Composition.Animations;
 using Avalonia.Rendering.Composition.Transport;
 using Avalonia.Utilities;
 
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition.Server
 {
     /// <summary>
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositor.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositor.cs
index 564f792ebe..ff30e45c31 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositor.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositor.cs
@@ -6,6 +6,8 @@ using Avalonia.Rendering.Composition.Animations;
 using Avalonia.Rendering.Composition.Expressions;
 using Avalonia.Rendering.Composition.Transport;
 
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition.Server
 {
     /// <summary>
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerList.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerList.cs
index 39d6a8dc70..1f8bf0bf53 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerList.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerList.cs
@@ -2,6 +2,8 @@ using System;
 using System.Collections.Generic;
 using Avalonia.Rendering.Composition.Transport;
 
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition.Server
 {
     /// <summary>
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerObject.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerObject.cs
index 93ea8e8dee..6bd6915bd7 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerObject.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerObject.cs
@@ -7,6 +7,8 @@ using Avalonia.Rendering.Composition.Expressions;
 using Avalonia.Rendering.Composition.Transport;
 using Avalonia.Utilities;
 
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition.Server
 {
     /// <summary>
diff --git a/src/Avalonia.Base/Rendering/Composition/Transport/Batch.cs b/src/Avalonia.Base/Rendering/Composition/Transport/Batch.cs
index e69768d3bf..c0f4b94bd3 100644
--- a/src/Avalonia.Base/Rendering/Composition/Transport/Batch.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Transport/Batch.cs
@@ -4,6 +4,8 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition.Transport
 {
     /// <summary>
diff --git a/src/Avalonia.Base/Rendering/Composition/Transport/BatchStream.cs b/src/Avalonia.Base/Rendering/Composition/Transport/BatchStream.cs
index 6db480a966..cb9804cdc3 100644
--- a/src/Avalonia.Base/Rendering/Composition/Transport/BatchStream.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Transport/BatchStream.cs
@@ -5,6 +5,8 @@ using System.Runtime.CompilerServices;
 using Avalonia.Rendering.Composition.Animations;
 using Avalonia.Rendering.Composition.Server;
 
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition.Transport;
 
 /// <summary>
diff --git a/src/Avalonia.Base/Rendering/Composition/Transport/BatchStreamArrayPool.cs b/src/Avalonia.Base/Rendering/Composition/Transport/BatchStreamArrayPool.cs
index b0a89c6f92..20a25fa769 100644
--- a/src/Avalonia.Base/Rendering/Composition/Transport/BatchStreamArrayPool.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Transport/BatchStreamArrayPool.cs
@@ -5,6 +5,8 @@ using System.Runtime.InteropServices;
 using Avalonia.Platform;
 using Avalonia.Threading;
 
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition.Transport;
 
 /// <summary>
diff --git a/src/Avalonia.Base/Rendering/Composition/Transport/BatchStreamDebugMarker.cs b/src/Avalonia.Base/Rendering/Composition/Transport/BatchStreamDebugMarker.cs
index 7d21b03f24..2f7c4559aa 100644
--- a/src/Avalonia.Base/Rendering/Composition/Transport/BatchStreamDebugMarker.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Transport/BatchStreamDebugMarker.cs
@@ -1,5 +1,7 @@
 using System;
 
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition.Transport;
 
 internal class BatchStreamDebugMarkers
diff --git a/src/Avalonia.Base/Rendering/Composition/Transport/ServerListProxyHelper.cs b/src/Avalonia.Base/Rendering/Composition/Transport/ServerListProxyHelper.cs
index e295c3c2c8..8872d0c96f 100644
--- a/src/Avalonia.Base/Rendering/Composition/Transport/ServerListProxyHelper.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Transport/ServerListProxyHelper.cs
@@ -2,6 +2,8 @@ using System.Collections;
 using System.Collections.Generic;
 using Avalonia.Rendering.Composition.Server;
 
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition.Transport
 {
     /// <summary>
diff --git a/src/Avalonia.Base/Rendering/Composition/Visual.cs b/src/Avalonia.Base/Rendering/Composition/Visual.cs
index 7ebbb0aa96..ebffa3396e 100644
--- a/src/Avalonia.Base/Rendering/Composition/Visual.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Visual.cs
@@ -3,6 +3,8 @@ using System.Numerics;
 using Avalonia.Media;
 using Avalonia.VisualTree;
 
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition
 {
     /// <summary>
diff --git a/src/Avalonia.Base/Rendering/Composition/VisualCollection.cs b/src/Avalonia.Base/Rendering/Composition/VisualCollection.cs
index 60ebd9271c..7db02148bf 100644
--- a/src/Avalonia.Base/Rendering/Composition/VisualCollection.cs
+++ b/src/Avalonia.Base/Rendering/Composition/VisualCollection.cs
@@ -1,6 +1,8 @@
 using System;
 using Avalonia.Rendering.Composition.Server;
 
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition
 {
     /// <summary>
diff --git a/src/tools/DevGenerators/CompositionGenerator/Generator.KeyFrameAnimation.cs b/src/tools/DevGenerators/CompositionGenerator/Generator.KeyFrameAnimation.cs
index 7ad40f68e4..464c5e4a23 100644
--- a/src/tools/DevGenerators/CompositionGenerator/Generator.KeyFrameAnimation.cs
+++ b/src/tools/DevGenerators/CompositionGenerator/Generator.KeyFrameAnimation.cs
@@ -8,6 +8,8 @@ namespace Avalonia.SourceGenerator.CompositionGenerator
 using Avalonia.Rendering.Composition.Animations;
 using Avalonia.Rendering.Composition.Expressions;
 
+// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+
 namespace Avalonia.Rendering.Composition
 {{
 ";

From f6f8e71f3fde734dd5a1e14d3431b601e99d8d29 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Thu, 28 Jul 2022 10:47:38 +0100
Subject: [PATCH 171/240] make license linkable

---
 .../Rendering/Composition/Animations/AnimationInstanceBase.cs | 4 ++--
 .../Rendering/Composition/Animations/CompositionAnimation.cs  | 4 ++--
 .../Composition/Animations/CompositionAnimationGroup.cs       | 4 ++--
 .../Rendering/Composition/Animations/ExpressionAnimation.cs   | 4 ++--
 .../Composition/Animations/ExpressionAnimationInstance.cs     | 4 ++--
 .../Rendering/Composition/Animations/IAnimationInstance.cs    | 4 ++--
 .../Composition/Animations/ICompositionAnimationBase.cs       | 4 ++--
 .../Composition/Animations/ImplicitAnimationCollection.cs     | 4 ++--
 .../Rendering/Composition/Animations/Interpolators.cs         | 4 ++--
 .../Rendering/Composition/Animations/KeyFrameAnimation.cs     | 4 ++--
 .../Composition/Animations/KeyFrameAnimationInstance.cs       | 4 ++--
 .../Rendering/Composition/Animations/KeyFrames.cs             | 4 ++--
 .../Rendering/Composition/Animations/PropertySetSnapshot.cs   | 4 ++--
 .../Rendering/Composition/CompositingRenderer.cs              | 2 +-
 .../Rendering/Composition/CompositionDrawListVisual.cs        | 4 ++--
 src/Avalonia.Base/Rendering/Composition/CompositionObject.cs  | 4 ++--
 .../Rendering/Composition/CompositionPropertySet.cs           | 4 ++--
 src/Avalonia.Base/Rendering/Composition/CompositionTarget.cs  | 4 ++--
 src/Avalonia.Base/Rendering/Composition/Compositor.cs         | 4 ++--
 src/Avalonia.Base/Rendering/Composition/ContainerVisual.cs    | 4 ++--
 .../Rendering/Composition/Drawing/CompositionDrawList.cs      | 4 ++--
 .../Composition/Drawing/CompositionDrawingContext.cs          | 4 ++--
 .../Rendering/Composition/ElementCompositionPreview.cs        | 4 ++--
 src/Avalonia.Base/Rendering/Composition/Enums.cs              | 4 ++--
 .../Rendering/Composition/Expressions/BuiltInExpressionFfi.cs | 4 ++--
 .../Composition/Expressions/DelegateExpressionFfi.cs          | 4 ++--
 .../Rendering/Composition/Expressions/Expression.cs           | 4 ++--
 .../Composition/Expressions/ExpressionEvaluationContext.cs    | 4 ++--
 .../Composition/Expressions/ExpressionParseException.cs       | 4 ++--
 .../Rendering/Composition/Expressions/ExpressionParser.cs     | 4 ++--
 .../Composition/Expressions/ExpressionTrackedValues.cs        | 4 ++--
 .../Rendering/Composition/Expressions/ExpressionVariant.cs    | 4 ++--
 .../Rendering/Composition/Expressions/TokenParser.cs          | 4 ++--
 .../Rendering/Composition/ICompositionTargetDebugEvents.cs    | 4 ++--
 src/Avalonia.Base/Rendering/Composition/MatrixUtils.cs        | 4 ++--
 .../Rendering/Composition/Server/CompositionProperty.cs       | 4 ++--
 .../Rendering/Composition/Server/DrawingContextProxy.cs       | 4 ++--
 src/Avalonia.Base/Rendering/Composition/Server/FpsCounter.cs  | 4 ++--
 .../Rendering/Composition/Server/ReadbackIndices.cs           | 4 ++--
 .../Composition/Server/ServerCompositionContainerVisual.cs    | 4 ++--
 .../Composition/Server/ServerCompositionDrawListVisual.cs     | 4 ++--
 .../Rendering/Composition/Server/ServerCompositionSurface.cs  | 4 ++--
 .../Rendering/Composition/Server/ServerCompositionTarget.cs   | 4 ++--
 .../Server/ServerCompositionVisual.DirtyProperties.cs         | 4 ++--
 .../Rendering/Composition/Server/ServerCompositionVisual.cs   | 4 ++--
 .../Rendering/Composition/Server/ServerCompositor.cs          | 4 ++--
 src/Avalonia.Base/Rendering/Composition/Server/ServerList.cs  | 4 ++--
 .../Rendering/Composition/Server/ServerObject.cs              | 4 ++--
 src/Avalonia.Base/Rendering/Composition/Transport/Batch.cs    | 4 ++--
 .../Rendering/Composition/Transport/BatchStream.cs            | 2 +-
 .../Rendering/Composition/Transport/BatchStreamArrayPool.cs   | 4 ++--
 .../Rendering/Composition/Transport/BatchStreamDebugMarker.cs | 4 ++--
 .../Rendering/Composition/Transport/ServerListProxyHelper.cs  | 4 ++--
 src/Avalonia.Base/Rendering/Composition/Visual.cs             | 4 ++--
 src/Avalonia.Base/Rendering/Composition/VisualCollection.cs   | 4 ++--
 .../CompositionGenerator/Generator.KeyFrameAnimation.cs       | 4 ++--
 56 files changed, 110 insertions(+), 110 deletions(-)

diff --git a/src/Avalonia.Base/Rendering/Composition/Animations/AnimationInstanceBase.cs b/src/Avalonia.Base/Rendering/Composition/Animations/AnimationInstanceBase.cs
index b624f89a2d..889c1d34c8 100644
--- a/src/Avalonia.Base/Rendering/Composition/Animations/AnimationInstanceBase.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Animations/AnimationInstanceBase.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using Avalonia.Rendering.Composition.Expressions;
 using Avalonia.Rendering.Composition.Server;
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition.Animations;
 
@@ -80,4 +80,4 @@ internal abstract class AnimationInstanceBase : IAnimationInstance
         _invalidated = true;
         TargetObject.NotifyAnimatedValueChanged(Property);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Animations/CompositionAnimation.cs b/src/Avalonia.Base/Rendering/Composition/Animations/CompositionAnimation.cs
index cb5615a737..19d316eb85 100644
--- a/src/Avalonia.Base/Rendering/Composition/Animations/CompositionAnimation.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Animations/CompositionAnimation.cs
@@ -8,7 +8,7 @@ using Avalonia.Rendering.Composition.Expressions;
 using Avalonia.Rendering.Composition.Server;
 using Avalonia.Rendering.Composition.Transport;
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition.Animations
 {
@@ -74,4 +74,4 @@ namespace Avalonia.Rendering.Composition.Animations
             
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Animations/CompositionAnimationGroup.cs b/src/Avalonia.Base/Rendering/Composition/Animations/CompositionAnimationGroup.cs
index e362b63887..bad3991f43 100644
--- a/src/Avalonia.Base/Rendering/Composition/Animations/CompositionAnimationGroup.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Animations/CompositionAnimationGroup.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using Avalonia.Rendering.Composition.Transport;
 
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition.Animations
 {
@@ -23,4 +23,4 @@ namespace Avalonia.Rendering.Composition.Animations
         {
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Animations/ExpressionAnimation.cs b/src/Avalonia.Base/Rendering/Composition/Animations/ExpressionAnimation.cs
index c9b409fce4..577910d975 100644
--- a/src/Avalonia.Base/Rendering/Composition/Animations/ExpressionAnimation.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Animations/ExpressionAnimation.cs
@@ -3,7 +3,7 @@ using System;
 using Avalonia.Rendering.Composition.Expressions;
 using Avalonia.Rendering.Composition.Server;
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition.Animations
 {
@@ -52,4 +52,4 @@ namespace Avalonia.Rendering.Composition.Animations
             => new ExpressionAnimationInstance(ParsedExpression,
                 targetObject, finalValue, CreateSnapshot());
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Animations/ExpressionAnimationInstance.cs b/src/Avalonia.Base/Rendering/Composition/Animations/ExpressionAnimationInstance.cs
index cd912df81a..6c7c556456 100644
--- a/src/Avalonia.Base/Rendering/Composition/Animations/ExpressionAnimationInstance.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Animations/ExpressionAnimationInstance.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using Avalonia.Rendering.Composition.Expressions;
 using Avalonia.Rendering.Composition.Server;
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition.Animations
 {
@@ -48,4 +48,4 @@ namespace Avalonia.Rendering.Composition.Animations
             _finalValue = finalValue;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Animations/IAnimationInstance.cs b/src/Avalonia.Base/Rendering/Composition/Animations/IAnimationInstance.cs
index bc9bfccc6b..8ec4ec19bc 100644
--- a/src/Avalonia.Base/Rendering/Composition/Animations/IAnimationInstance.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Animations/IAnimationInstance.cs
@@ -2,7 +2,7 @@ using System;
 using Avalonia.Rendering.Composition.Expressions;
 using Avalonia.Rendering.Composition.Server;
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition.Animations
 {
@@ -15,4 +15,4 @@ namespace Avalonia.Rendering.Composition.Animations
         void Deactivate();
         void Invalidate();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Animations/ICompositionAnimationBase.cs b/src/Avalonia.Base/Rendering/Composition/Animations/ICompositionAnimationBase.cs
index 51d23c296a..91b37a81af 100644
--- a/src/Avalonia.Base/Rendering/Composition/Animations/ICompositionAnimationBase.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Animations/ICompositionAnimationBase.cs
@@ -2,7 +2,7 @@
 
 using Avalonia.Rendering.Composition.Server;
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition.Animations
 {
@@ -14,4 +14,4 @@ namespace Avalonia.Rendering.Composition.Animations
         internal void InternalOnly();
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Animations/ImplicitAnimationCollection.cs b/src/Avalonia.Base/Rendering/Composition/Animations/ImplicitAnimationCollection.cs
index 2e39bdc46e..72be4edd07 100644
--- a/src/Avalonia.Base/Rendering/Composition/Animations/ImplicitAnimationCollection.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Animations/ImplicitAnimationCollection.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using Avalonia.Rendering.Composition.Transport;
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition.Animations
 {
@@ -81,4 +81,4 @@ namespace Avalonia.Rendering.Composition.Animations
             return rv;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Animations/Interpolators.cs b/src/Avalonia.Base/Rendering/Composition/Animations/Interpolators.cs
index 960a76b1f8..e19c0ff098 100644
--- a/src/Avalonia.Base/Rendering/Composition/Animations/Interpolators.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Animations/Interpolators.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Numerics;
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition.Animations
 {
@@ -75,4 +75,4 @@ namespace Avalonia.Rendering.Composition.Animations
         
         public static BooleanInterpolator Instance { get; } = new BooleanInterpolator();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Animations/KeyFrameAnimation.cs b/src/Avalonia.Base/Rendering/Composition/Animations/KeyFrameAnimation.cs
index 13f02ade8c..4692fde5e3 100644
--- a/src/Avalonia.Base/Rendering/Composition/Animations/KeyFrameAnimation.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Animations/KeyFrameAnimation.cs
@@ -2,7 +2,7 @@ using System;
 using Avalonia.Animation;
 using Avalonia.Animation.Easings;
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition.Animations
 {
@@ -133,4 +133,4 @@ namespace Avalonia.Rendering.Composition.Animations
         /// </summary>
         SetToFinalValue
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Animations/KeyFrameAnimationInstance.cs b/src/Avalonia.Base/Rendering/Composition/Animations/KeyFrameAnimationInstance.cs
index b0293b7996..e20a4a9ad8 100644
--- a/src/Avalonia.Base/Rendering/Composition/Animations/KeyFrameAnimationInstance.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Animations/KeyFrameAnimationInstance.cs
@@ -4,7 +4,7 @@ using Avalonia.Animation;
 using Avalonia.Rendering.Composition.Expressions;
 using Avalonia.Rendering.Composition.Server;
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition.Animations
 {
@@ -177,4 +177,4 @@ namespace Avalonia.Rendering.Composition.Animations
             base.Deactivate();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Animations/KeyFrames.cs b/src/Avalonia.Base/Rendering/Composition/Animations/KeyFrames.cs
index 1a0d967380..79045ccff8 100644
--- a/src/Avalonia.Base/Rendering/Composition/Animations/KeyFrames.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Animations/KeyFrames.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using Avalonia.Animation.Easings;
 using Avalonia.Rendering.Composition.Expressions;
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition.Animations
 {
@@ -88,4 +88,4 @@ namespace Avalonia.Rendering.Composition.Animations
     {
         public void InsertExpressionKeyFrame(float normalizedProgressKey, string value, IEasing easingFunction);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Animations/PropertySetSnapshot.cs b/src/Avalonia.Base/Rendering/Composition/Animations/PropertySetSnapshot.cs
index f009d8dd11..af3c344999 100644
--- a/src/Avalonia.Base/Rendering/Composition/Animations/PropertySetSnapshot.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Animations/PropertySetSnapshot.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Avalonia.Rendering.Composition.Expressions;
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition.Animations
 {
@@ -48,4 +48,4 @@ namespace Avalonia.Rendering.Composition.Animations
 
         public ExpressionVariant GetProperty(string name) => GetParameter(name);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/CompositingRenderer.cs b/src/Avalonia.Base/Rendering/Composition/CompositingRenderer.cs
index 64cb43646c..db773bc43c 100644
--- a/src/Avalonia.Base/Rendering/Composition/CompositingRenderer.cs
+++ b/src/Avalonia.Base/Rendering/Composition/CompositingRenderer.cs
@@ -11,7 +11,7 @@ using Avalonia.Rendering.Composition.Server;
 using Avalonia.Threading;
 using Avalonia.VisualTree;
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition;
 
diff --git a/src/Avalonia.Base/Rendering/Composition/CompositionDrawListVisual.cs b/src/Avalonia.Base/Rendering/Composition/CompositionDrawListVisual.cs
index b64a5afc97..77b392eee5 100644
--- a/src/Avalonia.Base/Rendering/Composition/CompositionDrawListVisual.cs
+++ b/src/Avalonia.Base/Rendering/Composition/CompositionDrawListVisual.cs
@@ -5,7 +5,7 @@ using Avalonia.Rendering.Composition.Server;
 using Avalonia.Rendering.Composition.Transport;
 using Avalonia.VisualTree;
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition;
 
@@ -74,4 +74,4 @@ internal class CompositionDrawListVisual : CompositionContainerVisual
                 return true;
         return false;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/CompositionObject.cs b/src/Avalonia.Base/Rendering/Composition/CompositionObject.cs
index 9e42e4d182..50332926ad 100644
--- a/src/Avalonia.Base/Rendering/Composition/CompositionObject.cs
+++ b/src/Avalonia.Base/Rendering/Composition/CompositionObject.cs
@@ -5,7 +5,7 @@ using Avalonia.Rendering.Composition.Server;
 using Avalonia.Rendering.Composition.Transport;
 using Avalonia.Utilities;
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition
 {
@@ -140,4 +140,4 @@ namespace Avalonia.Rendering.Composition
                 writer.Write((byte)(IsDisposed ? 1 : 0));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/CompositionPropertySet.cs b/src/Avalonia.Base/Rendering/Composition/CompositionPropertySet.cs
index a61ab809de..7d794af9a2 100644
--- a/src/Avalonia.Base/Rendering/Composition/CompositionPropertySet.cs
+++ b/src/Avalonia.Base/Rendering/Composition/CompositionPropertySet.cs
@@ -5,7 +5,7 @@ using Avalonia.Rendering.Composition.Animations;
 using Avalonia.Rendering.Composition.Expressions;
 using Avalonia.Rendering.Composition.Transport;
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition
 {
@@ -146,4 +146,4 @@ namespace Avalonia.Rendering.Composition
         TypeMismatch,
         NotFound
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/CompositionTarget.cs b/src/Avalonia.Base/Rendering/Composition/CompositionTarget.cs
index bb502e4d38..4e53e163ec 100644
--- a/src/Avalonia.Base/Rendering/Composition/CompositionTarget.cs
+++ b/src/Avalonia.Base/Rendering/Composition/CompositionTarget.cs
@@ -4,7 +4,7 @@ using System.Numerics;
 using Avalonia.Collections.Pooled;
 using Avalonia.VisualTree;
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition
 {
@@ -129,4 +129,4 @@ namespace Avalonia.Rendering.Composition
             Compositor.Server.Render();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Compositor.cs b/src/Avalonia.Base/Rendering/Composition/Compositor.cs
index f3258bbdb0..45212d0f36 100644
--- a/src/Avalonia.Base/Rendering/Composition/Compositor.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Compositor.cs
@@ -12,7 +12,7 @@ using Avalonia.Rendering.Composition.Transport;
 using Avalonia.Threading;
 
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition
 {
@@ -140,4 +140,4 @@ namespace Avalonia.Rendering.Composition
             _invokeOnNextCommit.Add(action);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/ContainerVisual.cs b/src/Avalonia.Base/Rendering/Composition/ContainerVisual.cs
index a4fadd3134..9b9c44b95f 100644
--- a/src/Avalonia.Base/Rendering/Composition/ContainerVisual.cs
+++ b/src/Avalonia.Base/Rendering/Composition/ContainerVisual.cs
@@ -1,6 +1,6 @@
 using Avalonia.Rendering.Composition.Server;
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition
 {
@@ -23,4 +23,4 @@ namespace Avalonia.Rendering.Composition
             base.OnRootChangedCore();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Drawing/CompositionDrawList.cs b/src/Avalonia.Base/Rendering/Composition/Drawing/CompositionDrawList.cs
index 02ab269d29..10a7c3e360 100644
--- a/src/Avalonia.Base/Rendering/Composition/Drawing/CompositionDrawList.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Drawing/CompositionDrawList.cs
@@ -4,7 +4,7 @@ using Avalonia.Rendering.Composition.Server;
 using Avalonia.Rendering.SceneGraph;
 using Avalonia.Utilities;
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition.Drawing;
 
@@ -101,4 +101,4 @@ internal class CompositionDrawListBuilder
         if (count < Count)
             _operations!.RemoveRange(count, _operations.Count - count);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Drawing/CompositionDrawingContext.cs b/src/Avalonia.Base/Rendering/Composition/Drawing/CompositionDrawingContext.cs
index b8922244ae..01216d19ed 100644
--- a/src/Avalonia.Base/Rendering/Composition/Drawing/CompositionDrawingContext.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Drawing/CompositionDrawingContext.cs
@@ -9,7 +9,7 @@ using Avalonia.Rendering.SceneGraph;
 using Avalonia.Utilities;
 using Avalonia.VisualTree;
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition;
 
@@ -391,4 +391,4 @@ internal class CompositionDrawingContext : IDrawingContextImpl, IDrawingContextW
         }
         return null;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/ElementCompositionPreview.cs b/src/Avalonia.Base/Rendering/Composition/ElementCompositionPreview.cs
index dd77423eca..5bd8e4a4d3 100644
--- a/src/Avalonia.Base/Rendering/Composition/ElementCompositionPreview.cs
+++ b/src/Avalonia.Base/Rendering/Composition/ElementCompositionPreview.cs
@@ -1,4 +1,4 @@
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition;
 
@@ -13,4 +13,4 @@ public static class ElementComposition
     /// <param name="visual"></param>
     /// <returns></returns>
     public static CompositionVisual? GetElementVisual(Visual visual) => visual.CompositionVisual;
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Enums.cs b/src/Avalonia.Base/Rendering/Composition/Enums.cs
index 0986e0b233..cc37b25701 100644
--- a/src/Avalonia.Base/Rendering/Composition/Enums.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Enums.cs
@@ -1,6 +1,6 @@
 using System;
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition
 {
@@ -119,4 +119,4 @@ namespace Avalonia.Rendering.Composition
         Fill = 1,
         //TODO: Uniform, UniformToFill
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Expressions/BuiltInExpressionFfi.cs b/src/Avalonia.Base/Rendering/Composition/Expressions/BuiltInExpressionFfi.cs
index e166279316..896ae4fc3a 100644
--- a/src/Avalonia.Base/Rendering/Composition/Expressions/BuiltInExpressionFfi.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Expressions/BuiltInExpressionFfi.cs
@@ -4,7 +4,7 @@ using System.Numerics;
 using Avalonia.Rendering.Composition.Animations;
 using Avalonia.Utilities;
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition.Expressions
 {
@@ -236,4 +236,4 @@ namespace Avalonia.Rendering.Composition.Expressions
 
         public static BuiltInExpressionFfi Instance { get; } = new BuiltInExpressionFfi();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Expressions/DelegateExpressionFfi.cs b/src/Avalonia.Base/Rendering/Composition/Expressions/DelegateExpressionFfi.cs
index 1e3ac77035..c15487065c 100644
--- a/src/Avalonia.Base/Rendering/Composition/Expressions/DelegateExpressionFfi.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Expressions/DelegateExpressionFfi.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Numerics;
 using Avalonia.Media;
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition.Expressions
 {
@@ -183,4 +183,4 @@ namespace Avalonia.Rendering.Composition.Expressions
             );
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Expressions/Expression.cs b/src/Avalonia.Base/Rendering/Composition/Expressions/Expression.cs
index cfe1260b22..ff2069e71e 100644
--- a/src/Avalonia.Base/Rendering/Composition/Expressions/Expression.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Expressions/Expression.cs
@@ -4,7 +4,7 @@ using System.Globalization;
 using System.Reflection;
 using Avalonia.Rendering.Composition.Server;
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition.Expressions
 {
@@ -376,4 +376,4 @@ namespace Avalonia.Rendering.Composition.Expressions
 
 
 
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionEvaluationContext.cs b/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionEvaluationContext.cs
index 3e4fba24bd..9086c59aad 100644
--- a/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionEvaluationContext.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionEvaluationContext.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Avalonia.Rendering.Composition.Server;
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition.Expressions
 {
@@ -31,4 +31,4 @@ namespace Avalonia.Rendering.Composition.Expressions
     {
         bool Call(string name, IReadOnlyList<ExpressionVariant> arguments, out ExpressionVariant result);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionParseException.cs b/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionParseException.cs
index 33b94eca76..c32a7832a6 100644
--- a/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionParseException.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionParseException.cs
@@ -1,6 +1,6 @@
 using System;
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition.Expressions
 {
@@ -13,4 +13,4 @@ namespace Avalonia.Rendering.Composition.Expressions
             Position = position;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionParser.cs b/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionParser.cs
index 901013a9ff..3937d48187 100644
--- a/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionParser.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionParser.cs
@@ -5,7 +5,7 @@ using System.Linq;
 
 // ReSharper disable StringLiteralTypo
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition.Expressions
 {
@@ -297,4 +297,4 @@ namespace Avalonia.Rendering.Composition.Expressions
             
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionTrackedValues.cs b/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionTrackedValues.cs
index b3c2dfcee9..e386e058df 100644
--- a/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionTrackedValues.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionTrackedValues.cs
@@ -2,7 +2,7 @@ using System.Collections;
 using System.Collections.Generic;
 using Avalonia.Rendering.Composition.Server;
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition.Expressions;
 
@@ -56,4 +56,4 @@ internal class ExpressionTrackedObjects : IEnumerable<IExpressionObject>
             _stack.Push(obj);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionVariant.cs b/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionVariant.cs
index 563c09c964..6e53a138cd 100644
--- a/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionVariant.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Expressions/ExpressionVariant.cs
@@ -4,7 +4,7 @@ using System.Numerics;
 using System.Runtime.InteropServices;
 using Avalonia.Media;
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition.Expressions
 {
@@ -729,4 +729,4 @@ namespace Avalonia.Rendering.Composition.Expressions
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Expressions/TokenParser.cs b/src/Avalonia.Base/Rendering/Composition/Expressions/TokenParser.cs
index cc20b3c870..bb7372c375 100644
--- a/src/Avalonia.Base/Rendering/Composition/Expressions/TokenParser.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Expressions/TokenParser.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Globalization;
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition.Expressions
 {
@@ -258,4 +258,4 @@ namespace Avalonia.Rendering.Composition.Expressions
         public override string ToString() => _s.ToString();
 
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/ICompositionTargetDebugEvents.cs b/src/Avalonia.Base/Rendering/Composition/ICompositionTargetDebugEvents.cs
index 45cc886cd0..131a51b5e6 100644
--- a/src/Avalonia.Base/Rendering/Composition/ICompositionTargetDebugEvents.cs
+++ b/src/Avalonia.Base/Rendering/Composition/ICompositionTargetDebugEvents.cs
@@ -1,8 +1,8 @@
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition;
 
 internal interface ICompositionTargetDebugEvents
 {
     void RectInvalidated(Rect rc);
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/MatrixUtils.cs b/src/Avalonia.Base/Rendering/Composition/MatrixUtils.cs
index 66dc6e7987..3d8d5bae78 100644
--- a/src/Avalonia.Base/Rendering/Composition/MatrixUtils.cs
+++ b/src/Avalonia.Base/Rendering/Composition/MatrixUtils.cs
@@ -1,6 +1,6 @@
 using System.Numerics;
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition
 {
@@ -65,4 +65,4 @@ namespace Avalonia.Rendering.Composition
                 matrix44.M42,
                 matrix44.M44);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/CompositionProperty.cs b/src/Avalonia.Base/Rendering/Composition/Server/CompositionProperty.cs
index f0aaa1d574..5d63c8a4b3 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/CompositionProperty.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/CompositionProperty.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Threading;
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition.Server;
 
@@ -14,4 +14,4 @@ internal class CompositionProperty
     {
         Id = Interlocked.Increment(ref s_NextId)
     };
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/DrawingContextProxy.cs b/src/Avalonia.Base/Rendering/Composition/Server/DrawingContextProxy.cs
index 6522af3706..7eb35a68ed 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/DrawingContextProxy.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/DrawingContextProxy.cs
@@ -6,7 +6,7 @@ using Avalonia.Rendering.Composition.Drawing;
 using Avalonia.Rendering.SceneGraph;
 using Avalonia.Utilities;
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition.Server;
 
@@ -178,4 +178,4 @@ internal class CompositorDrawingContextProxy : IDrawingContextImpl, IDrawingCont
         if (_impl is IDrawingContextWithAcrylicLikeSupport acrylic) 
             acrylic.DrawRectangle(material, rect);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/FpsCounter.cs b/src/Avalonia.Base/Rendering/Composition/Server/FpsCounter.cs
index d4fa02deef..b0b3982ed5 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/FpsCounter.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/FpsCounter.cs
@@ -6,7 +6,7 @@ using Avalonia.Media.TextFormatting;
 using Avalonia.Platform;
 using Avalonia.Utilities;
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition.Server;
 
@@ -75,4 +75,4 @@ internal class FpsCounter
             offset += run.Size.Width;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ReadbackIndices.cs b/src/Avalonia.Base/Rendering/Composition/Server/ReadbackIndices.cs
index fbe9b66bb2..d9df176e66 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ReadbackIndices.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ReadbackIndices.cs
@@ -1,4 +1,4 @@
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition.Server
 {
@@ -45,4 +45,4 @@ namespace Avalonia.Rendering.Composition.Server
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionContainerVisual.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionContainerVisual.cs
index 1515a21fb1..19349a5196 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionContainerVisual.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionContainerVisual.cs
@@ -1,7 +1,7 @@
 using System.Numerics;
 using Avalonia.Platform;
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition.Server
 {
@@ -43,4 +43,4 @@ namespace Avalonia.Rendering.Composition.Server
             Children = new ServerCompositionVisualCollection(Compositor);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionDrawListVisual.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionDrawListVisual.cs
index e1265f9eed..6cbd2797f9 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionDrawListVisual.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionDrawListVisual.cs
@@ -7,7 +7,7 @@ using Avalonia.Rendering.Composition.Transport;
 using Avalonia.Rendering.SceneGraph;
 using Avalonia.Utilities;
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition.Server;
 
@@ -74,4 +74,4 @@ internal class ServerCompositionDrawListVisual : ServerCompositionContainerVisua
         return UiVisual.GetType().ToString();
     }
 #endif
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionSurface.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionSurface.cs
index a03dd0ef77..32a99fa187 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionSurface.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionSurface.cs
@@ -1,4 +1,4 @@
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition.Server
 {
@@ -8,4 +8,4 @@ namespace Avalonia.Rendering.Composition.Server
         {
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs
index 0760972534..c20594aaca 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs
@@ -9,7 +9,7 @@ using Avalonia.Platform;
 using Avalonia.Rendering.Composition.Transport;
 using Avalonia.Utilities;
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition.Server
 {
@@ -220,4 +220,4 @@ namespace Avalonia.Rendering.Composition.Server
 
         public void EnqueueAdornerUpdate(ServerCompositionVisual visual) => _adornerUpdateQueue.Enqueue(visual);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.DirtyProperties.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.DirtyProperties.cs
index 082650cdb8..405c7879b7 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.DirtyProperties.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.DirtyProperties.cs
@@ -1,4 +1,4 @@
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition.Server;
 
@@ -75,4 +75,4 @@ partial class ServerCompositionVisual
             || offset == s_IdOfSizeProperty)
             _clipSizeDirty = true;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.cs
index 49a54abf22..b742f1d44a 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.cs
@@ -6,7 +6,7 @@ using Avalonia.Rendering.Composition.Animations;
 using Avalonia.Rendering.Composition.Transport;
 using Avalonia.Utilities;
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition.Server
 {
@@ -236,4 +236,4 @@ namespace Avalonia.Rendering.Composition.Server
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositor.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositor.cs
index ff30e45c31..621bc84f4a 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositor.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositor.cs
@@ -6,7 +6,7 @@ using Avalonia.Rendering.Composition.Animations;
 using Avalonia.Rendering.Composition.Expressions;
 using Avalonia.Rendering.Composition.Transport;
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition.Server
 {
@@ -139,4 +139,4 @@ namespace Avalonia.Rendering.Composition.Server
         public void RemoveFromClock(IAnimationInstance animationInstance) =>
             _activeAnimations.Remove(animationInstance);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerList.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerList.cs
index 1f8bf0bf53..08a3fdce22 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerList.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerList.cs
@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using Avalonia.Rendering.Composition.Transport;
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition.Server
 {
@@ -43,4 +43,4 @@ namespace Avalonia.Rendering.Composition.Server
         {
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerObject.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerObject.cs
index 6bd6915bd7..257d3b29a2 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerObject.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerObject.cs
@@ -7,7 +7,7 @@ using Avalonia.Rendering.Composition.Expressions;
 using Avalonia.Rendering.Composition.Transport;
 using Avalonia.Utilities;
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition.Server
 {
@@ -179,4 +179,4 @@ namespace Avalonia.Rendering.Composition.Server
             ItselfLastChangedBy = batch.SequenceId;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Transport/Batch.cs b/src/Avalonia.Base/Rendering/Composition/Transport/Batch.cs
index c0f4b94bd3..0cf1650ccf 100644
--- a/src/Avalonia.Base/Rendering/Composition/Transport/Batch.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Transport/Batch.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition.Transport
 {
@@ -38,4 +38,4 @@ namespace Avalonia.Rendering.Composition.Transport
 
         public Task Completed => _tcs.Task;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Transport/BatchStream.cs b/src/Avalonia.Base/Rendering/Composition/Transport/BatchStream.cs
index cb9804cdc3..8b68900994 100644
--- a/src/Avalonia.Base/Rendering/Composition/Transport/BatchStream.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Transport/BatchStream.cs
@@ -5,7 +5,7 @@ using System.Runtime.CompilerServices;
 using Avalonia.Rendering.Composition.Animations;
 using Avalonia.Rendering.Composition.Server;
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition.Transport;
 
diff --git a/src/Avalonia.Base/Rendering/Composition/Transport/BatchStreamArrayPool.cs b/src/Avalonia.Base/Rendering/Composition/Transport/BatchStreamArrayPool.cs
index 20a25fa769..f24f449551 100644
--- a/src/Avalonia.Base/Rendering/Composition/Transport/BatchStreamArrayPool.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Transport/BatchStreamArrayPool.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using Avalonia.Platform;
 using Avalonia.Threading;
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition.Transport;
 
@@ -155,4 +155,4 @@ internal sealed class BatchStreamMemoryPool : BatchStreamPoolBase<IntPtr>
     protected override IntPtr CreateItem() => Marshal.AllocHGlobal(BufferSize);
 
     protected override void DestroyItem(IntPtr item) => Marshal.FreeHGlobal(item);
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Transport/BatchStreamDebugMarker.cs b/src/Avalonia.Base/Rendering/Composition/Transport/BatchStreamDebugMarker.cs
index 2f7c4559aa..fed0f4d4aa 100644
--- a/src/Avalonia.Base/Rendering/Composition/Transport/BatchStreamDebugMarker.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Transport/BatchStreamDebugMarker.cs
@@ -1,6 +1,6 @@
 using System;
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition.Transport;
 
@@ -8,4 +8,4 @@ internal class BatchStreamDebugMarkers
 {
     public static object ObjectEndMarker = new object();
     public static Guid ObjectEndMagic = Guid.NewGuid();
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Transport/ServerListProxyHelper.cs b/src/Avalonia.Base/Rendering/Composition/Transport/ServerListProxyHelper.cs
index 8872d0c96f..603c7582a1 100644
--- a/src/Avalonia.Base/Rendering/Composition/Transport/ServerListProxyHelper.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Transport/ServerListProxyHelper.cs
@@ -2,7 +2,7 @@ using System.Collections;
 using System.Collections.Generic;
 using Avalonia.Rendering.Composition.Server;
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition.Transport
 {
@@ -97,4 +97,4 @@ namespace Avalonia.Rendering.Composition.Transport
             _changed = false;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/Visual.cs b/src/Avalonia.Base/Rendering/Composition/Visual.cs
index ebffa3396e..7356b7b9e8 100644
--- a/src/Avalonia.Base/Rendering/Composition/Visual.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Visual.cs
@@ -3,7 +3,7 @@ using System.Numerics;
 using Avalonia.Media;
 using Avalonia.VisualTree;
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition
 {
@@ -55,4 +55,4 @@ namespace Avalonia.Rendering.Composition
 
         internal virtual bool HitTest(Point point, Func<IVisual, bool>? filter) => true;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Rendering/Composition/VisualCollection.cs b/src/Avalonia.Base/Rendering/Composition/VisualCollection.cs
index 7db02148bf..6981dc39e3 100644
--- a/src/Avalonia.Base/Rendering/Composition/VisualCollection.cs
+++ b/src/Avalonia.Base/Rendering/Composition/VisualCollection.cs
@@ -1,7 +1,7 @@
 using System;
 using Avalonia.Rendering.Composition.Server;
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition
 {
@@ -72,4 +72,4 @@ namespace Avalonia.Rendering.Composition
             item.Parent = item;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/tools/DevGenerators/CompositionGenerator/Generator.KeyFrameAnimation.cs b/src/tools/DevGenerators/CompositionGenerator/Generator.KeyFrameAnimation.cs
index 464c5e4a23..00728d4579 100644
--- a/src/tools/DevGenerators/CompositionGenerator/Generator.KeyFrameAnimation.cs
+++ b/src/tools/DevGenerators/CompositionGenerator/Generator.KeyFrameAnimation.cs
@@ -8,7 +8,7 @@ namespace Avalonia.SourceGenerator.CompositionGenerator
 using Avalonia.Rendering.Composition.Animations;
 using Avalonia.Rendering.Composition.Expressions;
 
-// Special license applies, see //file: src/Avalonia.Base/Rendering/Composition/License.md
+// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
 namespace Avalonia.Rendering.Composition
 {{
@@ -58,4 +58,4 @@ namespace Avalonia.Rendering.Composition
             _output.AddSource("CompositionAnimations.cs", code);
         }
     }
-}
\ No newline at end of file
+}

From fa54d7ecde0af4119dc3d0785c3c11218752716d Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Thu, 28 Jul 2022 10:50:18 +0100
Subject: [PATCH 172/240] add a readme for the compostiion directory.

---
 src/Avalonia.Base/Rendering/Composition/readme.md | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 src/Avalonia.Base/Rendering/Composition/readme.md

diff --git a/src/Avalonia.Base/Rendering/Composition/readme.md b/src/Avalonia.Base/Rendering/Composition/readme.md
new file mode 100644
index 0000000000..27a23bb029
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/readme.md
@@ -0,0 +1,3 @@
+Please note the compostiong renderer is not subject to the usual MIT license.
+
+Please contact us for more details and see [License.md](https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md)

From ea58d04e60d06e9a51c8293bca0b34ef433279e7 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Thu, 28 Jul 2022 11:23:17 +0100
Subject: [PATCH 173/240] typo

---
 src/Avalonia.Base/Rendering/Composition/readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Base/Rendering/Composition/readme.md b/src/Avalonia.Base/Rendering/Composition/readme.md
index 27a23bb029..6c238db191 100644
--- a/src/Avalonia.Base/Rendering/Composition/readme.md
+++ b/src/Avalonia.Base/Rendering/Composition/readme.md
@@ -1,3 +1,3 @@
-Please note the compostiong renderer is not subject to the usual MIT license.
+Please note the composition renderer is not subject to the usual MIT license.
 
 Please contact us for more details and see [License.md](https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md)

From c226432e9b6e3392e93c38d1708ed6dc61cc291b Mon Sep 17 00:00:00 2001
From: Evgeny Gorbovoy <e.gorbovoy@staffwerke.de>
Date: Thu, 28 Jul 2022 14:40:38 +0200
Subject: [PATCH 174/240] Tests fixing

---
 .../Rendering/CompositorHitTestingTests.cs               | 9 +++++----
 .../Rendering/DeferredRendererTests_HitTesting.cs        | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/tests/Avalonia.Base.UnitTests/Rendering/CompositorHitTestingTests.cs b/tests/Avalonia.Base.UnitTests/Rendering/CompositorHitTestingTests.cs
index 6543649eb2..a584a859ec 100644
--- a/tests/Avalonia.Base.UnitTests/Rendering/CompositorHitTestingTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Rendering/CompositorHitTestingTests.cs
@@ -414,21 +414,22 @@ public class CompositorHitTestingTests : CompositorTestsBase
     {
         using (var s = new CompositorServices(new Size(200, 200)))
         {
-            Button targetButton;
+            Rectangle targetRectangle;
 
             var stackPanel = new StackPanel
             {
                 Orientation = Orientation.Vertical,
+                HorizontalAlignment = HorizontalAlignment.Left,
                 Children =
                 {
-                    new Button { Width = 10, Height = 10 },
-                    { targetButton = new Button { Width = 10, Height = 10 } }
+                    new Rectangle { Width = 10, Height = 10, Fill= Brushes.Red},
+                    { targetRectangle = new Rectangle { Width = 10, Height = 10, Fill = Brushes.Green} }
                 }
             };
 
             s.TopLevel.Content = stackPanel;
             
-            s.AssertHitTest(new Point(5, 10), null, targetButton);
+            s.AssertHitTest(new Point(5, 10), null, targetRectangle);
         }
     }
 
diff --git a/tests/Avalonia.Base.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs b/tests/Avalonia.Base.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs
index e1b36c9d72..7800ddfc8a 100644
--- a/tests/Avalonia.Base.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs
+++ b/tests/Avalonia.Base.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs
@@ -542,7 +542,7 @@ namespace Avalonia.Base.UnitTests.Rendering
         {
             using (TestApplication())
             {
-                Button targetButton;
+                Rectangle targetRectangle;
 
                 var root = new TestRoot
                 {
@@ -551,10 +551,11 @@ namespace Avalonia.Base.UnitTests.Rendering
                     Child = new StackPanel
                     {
                         Orientation = Orientation.Vertical,
+                        HorizontalAlignment = HorizontalAlignment.Left,
                         Children =
                             {
-                                new Button { Width = 10, Height = 10 },
-                                { targetButton = new Button { Width = 10, Height = 10 } }
+                                new Rectangle { Width = 10, Height = 10, Fill = Brushes.Red},
+                                { targetRectangle = new Rectangle { Width = 10, Height = 10, Fill = Brushes.Green} }
                             }
                     }
                 }; 
@@ -564,7 +565,7 @@ namespace Avalonia.Base.UnitTests.Rendering
                 root.Arrange(new Rect(root.DesiredSize));
 
                 var result = root.Renderer.HitTest(new Point(5, 10), root, null);
-                Assert.Equal(new[] { targetButton }, result);
+                Assert.Equal(new[] { targetRectangle }, result);
             }
         }
 

From 45d5a753edac3d87dcca6088435f87d723419f3c Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 28 Jul 2022 16:39:16 +0200
Subject: [PATCH 175/240] Fix broken build.

---
 .../CompositionGenerator/Generator.KeyFrameAnimation.cs         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tools/DevGenerators/CompositionGenerator/Generator.KeyFrameAnimation.cs b/src/tools/DevGenerators/CompositionGenerator/Generator.KeyFrameAnimation.cs
index 00728d4579..9455f5fac2 100644
--- a/src/tools/DevGenerators/CompositionGenerator/Generator.KeyFrameAnimation.cs
+++ b/src/tools/DevGenerators/CompositionGenerator/Generator.KeyFrameAnimation.cs
@@ -8,7 +8,7 @@ namespace Avalonia.SourceGenerator.CompositionGenerator
 using Avalonia.Rendering.Composition.Animations;
 using Avalonia.Rendering.Composition.Expressions;
 
-// Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
+// Special license applies <see href=""https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md\"">License.md</see>
 
 namespace Avalonia.Rendering.Composition
 {{

From 23b08b1f34734af2c8942f75ef0cf88181943fd9 Mon Sep 17 00:00:00 2001
From: Benedikt Stebner <Gillibald@users.noreply.github.com>
Date: Thu, 28 Jul 2022 17:11:39 +0200
Subject: [PATCH 176/240] Attempt to fix consistent hit testing results

GetCharacterHitFromDistance and GetDistanceFromCharacterHit should match all the time
---
 samples/Sandbox/MainWindow.axaml              |  10 +
 samples/Sandbox/MainWindow.axaml.cs           |  75 +++-
 src/Avalonia.Base/Media/GlyphRun.cs           |   2 +-
 .../TextFormatting/FormattedTextSource.cs     |  24 ++
 .../Media/TextFormatting/TextLineImpl.cs      | 339 ++++++++++++++----
 .../Presenters/TextPresenter.cs               |   5 +-
 src/Avalonia.Controls/TextBox.cs              |  10 +-
 .../Media/TextFormatting/TextLayoutTests.cs   |  68 +++-
 8 files changed, 453 insertions(+), 80 deletions(-)

diff --git a/samples/Sandbox/MainWindow.axaml b/samples/Sandbox/MainWindow.axaml
index 6929f192c7..0fc78795a6 100644
--- a/samples/Sandbox/MainWindow.axaml
+++ b/samples/Sandbox/MainWindow.axaml
@@ -1,4 +1,14 @@
 <Window xmlns="https://github.com/avaloniaui"
         xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
         x:Class="Sandbox.MainWindow">
+  <StackPanel>
+    <TextBox x:Name="txtBox" Text="أَبْجَدِيَّة عَرَبِيَّة" SelectionStart="19" SelectionEnd="23"/>
+    <NumericUpDown Value="{Binding #txtBox.SelectionStart, Mode=TwoWay}"/>
+    <NumericUpDown Value="{Binding #txtBox.SelectionEnd, Mode=TwoWay}"/>
+    <RichTextBlock x:Name="txtBlock" Text="أَبْجَدِيَّة عَرَبِيَّة" IsTextSelectionEnabled="True"/>
+    <NumericUpDown Value="{Binding Distance, Mode=TwoWay}"/>
+    <TextBlock Text="{Binding #txtBlock.SelectionStart}"/>
+    <TextBlock Text="{Binding #txtBlock.SelectionEnd}"/>
+  </StackPanel>
+ 
 </Window>
diff --git a/samples/Sandbox/MainWindow.axaml.cs b/samples/Sandbox/MainWindow.axaml.cs
index 3d54036d29..7a8b56bbb6 100644
--- a/samples/Sandbox/MainWindow.axaml.cs
+++ b/samples/Sandbox/MainWindow.axaml.cs
@@ -1,7 +1,11 @@
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Runtime.CompilerServices;
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Controls.Presenters;
 using Avalonia.Markup.Xaml;
-using Avalonia.Win32.WinRT.Composition;
+using Avalonia.VisualTree;
 
 namespace Sandbox
 {
@@ -11,6 +15,19 @@ namespace Sandbox
         {
             this.InitializeComponent();
             this.AttachDevTools();
+
+            var textBox = this.FindControl<TextBox>("txtBox");
+
+            textBox.TemplateApplied += TextBox_TemplateApplied;          
+        }
+
+        private void TextBox_TemplateApplied(object sender, Avalonia.Controls.Primitives.TemplateAppliedEventArgs e)
+        {
+            var textBox = sender as TextBox;
+
+            var textPresenter = e.NameScope.Find("PART_TextPresenter") as TextPresenter;
+
+            DataContext = new TestViewModel(textPresenter);
         }
 
         private void InitializeComponent()
@@ -18,4 +35,60 @@ namespace Sandbox
             AvaloniaXamlLoader.Load(this);
         }
     }
+
+    public class TestViewModel : ViewModelBase
+    {
+        private readonly TextPresenter _textPresenter;
+        private double _distance = 45;
+
+        public TestViewModel(TextPresenter textPresenter)
+        {
+            _textPresenter = textPresenter;
+        }
+
+        public double Distance 
+        { 
+            get => _distance; 
+            set
+            {
+                OnDistanceChanged(value);
+                RaisePropertyChanged();
+            }
+        }
+
+        private void OnDistanceChanged(double distance)
+        {
+            if(distance < 0)
+            {
+                distance = 0;
+            }
+
+            if(distance > _textPresenter.TextLayout.Bounds.Width)
+            {
+                distance = _textPresenter.TextLayout.Bounds.Width;
+            }
+
+            var height = _textPresenter.TextLayout.Bounds.Height;
+
+            var distanceY = height / 2;
+
+            _textPresenter.MoveCaretToPoint(new Point(distance, distanceY));
+
+            var caretIndex = _textPresenter.CaretIndex;
+
+            Debug.WriteLine(caretIndex);
+
+            _distance = distance;
+        }
+    }
+
+    public class ViewModelBase : INotifyPropertyChanged
+    {
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        protected void RaisePropertyChanged([CallerMemberName]string propertyName = "")
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+    }
 }
diff --git a/src/Avalonia.Base/Media/GlyphRun.cs b/src/Avalonia.Base/Media/GlyphRun.cs
index 2a7f3360ad..cae7a8fe75 100644
--- a/src/Avalonia.Base/Media/GlyphRun.cs
+++ b/src/Avalonia.Base/Media/GlyphRun.cs
@@ -265,7 +265,7 @@ namespace Avalonia.Media
                 //RightToLeft
                 var glyphIndex = FindGlyphIndex(characterIndex);
 
-                if (GlyphClusters != null)
+                if (GlyphClusters != null && GlyphClusters.Count > 0)
                 {
                     if (characterIndex > GlyphClusters[0])
                     {
diff --git a/src/Avalonia.Base/Media/TextFormatting/FormattedTextSource.cs b/src/Avalonia.Base/Media/TextFormatting/FormattedTextSource.cs
index 97df87d3d9..7ab67ea34d 100644
--- a/src/Avalonia.Base/Media/TextFormatting/FormattedTextSource.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/FormattedTextSource.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using Avalonia.Media.TextFormatting.Unicode;
 using Avalonia.Utilities;
 
 namespace Avalonia.Media.TextFormatting
@@ -116,7 +117,30 @@ namespace Avalonia.Media.TextFormatting
                 length = text.Length;
             }
 
+            length = CoerceLength(text, length);
+
             return new ValueSpan<TextRunProperties>(firstTextSourceIndex, length, currentProperties);
         }
+
+        private static int CoerceLength(ReadOnlySlice<char> text, int length)
+        {
+            var finalLength = 0;
+
+            var graphemeEnumerator = new GraphemeEnumerator(text);
+
+            while (graphemeEnumerator.MoveNext())
+            {
+                var grapheme = graphemeEnumerator.Current;
+
+                finalLength += grapheme.Text.Length;
+
+                if (finalLength >= length)
+                {
+                    return finalLength;
+                }
+            }
+
+            return length;
+        }
     }
 }
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs b/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
index f3c62f4994..0ee791d935 100644
--- a/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
@@ -183,8 +183,47 @@ namespace Avalonia.Media.TextFormatting
             var currentPosition = FirstTextSourceIndex;
             var currentDistance = 0.0;
 
-            foreach (var currentRun in _textRuns)
+            for (var i = 0; i < _textRuns.Count; i++)
             {
+                var currentRun = _textRuns[i];
+
+                if(currentRun is ShapedTextCharacters shapedRun && !shapedRun.ShapedBuffer.IsLeftToRight)
+                {
+                    var rightToLeftIndex = i;
+                    var rightToLeftDistance = shapedRun.Size.Width;
+
+                    while (rightToLeftIndex + 1 <= _textRuns.Count - 1)
+                    {
+                        var nextShaped = _textRuns[rightToLeftIndex + 1] as ShapedTextCharacters;
+
+                        if (nextShaped == null || nextShaped.ShapedBuffer.IsLeftToRight)
+                        {
+                            break;
+                        }
+
+                        rightToLeftIndex++;
+
+                        rightToLeftDistance += nextShaped.Size.Width;
+                    }
+
+                    for (var j = rightToLeftIndex; rightToLeftIndex >= 0; j--)
+                    {
+                        currentRun = _textRuns[j];
+
+                        if(distance <= currentDistance + rightToLeftDistance - currentRun.Size.Width)
+                        {
+                            currentPosition += currentRun.TextSourceLength;
+                            rightToLeftDistance -= currentRun.Size.Width;
+
+                            continue;
+                        }
+
+                        characterHit = GetRunCharacterHit(currentRun, currentPosition, distance - currentDistance);
+
+                        break;
+                    }
+                }
+
                 if (currentDistance + currentRun.Size.Width < distance)
                 {
                     currentDistance += currentRun.Size.Width;
@@ -255,6 +294,37 @@ namespace Avalonia.Media.TextFormatting
                 {
                     var currentRun = _textRuns[index];
 
+                    if (currentRun is ShapedTextCharacters shapedRun && !shapedRun.ShapedBuffer.IsLeftToRight)
+                    {
+                        var i = index;
+
+                        while (i + 1 <= _textRuns.Count - 1)
+                        {
+                            var nextRun = _textRuns[i + 1];
+
+                            if (nextRun is ShapedTextCharacters nextShapedRun)
+                            {
+                                if (nextShapedRun.ShapedBuffer.IsLeftToRight)
+                                {
+                                    break;
+                                }
+                            }
+
+                            i++;
+                        }
+
+                        while (i > index)
+                        {
+                            var rightToLeftRun = _textRuns[i];
+
+                            currentPosition += rightToLeftRun.TextSourceLength;
+
+                            remainingLength -= rightToLeftRun.TextSourceLength;
+
+                            i--;
+                        }
+                    }
+
                     if (TryGetDistanceFromCharacterHit(currentRun, characterHit, currentPosition, remainingLength,
                         flowDirection, out var distance, out _))
                     {
@@ -442,92 +512,130 @@ namespace Avalonia.Media.TextFormatting
                     continue;
                 }
 
-                if (currentPosition + currentRun.TextSourceLength <= firstTextSourceIndex)
-                {
-                    startX += currentRun.Size.Width;
-
-                    currentPosition += currentRun.TextSourceLength;
-
-                    continue;
-                }
-
                 var characterLength = 0;
                 var endX = startX;
+                var runWidth = 0.0;
+                TextRunBounds? currentRunBounds = null;
 
-                if (currentRun is ShapedTextCharacters currentShapedRun)
+                var currentShapedRun = currentRun as ShapedTextCharacters;
+
+                if (currentShapedRun != null && !currentShapedRun.ShapedBuffer.IsLeftToRight)
                 {
-                    var offset = Math.Max(0, firstTextSourceIndex - currentPosition);
+                    var rightToLeftIndex = index;
+                    startX += currentShapedRun.Size.Width;
 
-                    currentPosition += offset;
+                    while (rightToLeftIndex + 1 <= _textRuns.Count - 1)
+                    {
+                        var nextShapedRun = _textRuns[rightToLeftIndex + 1] as ShapedTextCharacters;
 
-                    var startIndex = currentRun.Text.Start + offset;
+                        if (nextShapedRun == null || nextShapedRun.ShapedBuffer.IsLeftToRight)
+                        {
+                            break;
+                        }
 
-                    double startOffset;
-                    double endOffset;
+                        startX += nextShapedRun.Size.Width;
 
-                    if (currentShapedRun.ShapedBuffer.IsLeftToRight)
+                        rightToLeftIndex++;
+                    }
+
+                    if (TryGetTextRunBoundsRightToLeft(startX, firstTextSourceIndex, characterIndex, rightToLeftIndex, ref currentPosition, ref remainingLength, out currentRunBounds))
                     {
-                        startOffset = currentShapedRun.GlyphRun.GetDistanceFromCharacterHit(new CharacterHit(startIndex));
+                        startX = currentRunBounds!.Rectangle.Left;
+                        endX = currentRunBounds.Rectangle.Right;
 
-                        endOffset = currentShapedRun.GlyphRun.GetDistanceFromCharacterHit(new CharacterHit(startIndex + remainingLength));
+                        runWidth = currentRunBounds.Rectangle.Width;
                     }
-                    else
+
+                    currentDirection = FlowDirection.RightToLeft;
+                }
+                else
+                {
+                    if (currentShapedRun != null)
                     {
-                        endOffset = currentShapedRun.GlyphRun.GetDistanceFromCharacterHit(new CharacterHit(startIndex));
+                        if (currentPosition + currentRun.TextSourceLength <= firstTextSourceIndex)
+                        {
+                            startX += currentRun.Size.Width;
 
-                        if (currentPosition < startIndex)
+                            currentPosition += currentRun.TextSourceLength;
+
+                            continue;
+                        }
+
+                        var offset = Math.Max(0, firstTextSourceIndex - currentPosition);
+
+                        currentPosition += offset;
+
+                        var startIndex = currentRun.Text.Start + offset;
+
+                        double startOffset;
+                        double endOffset;
+
+                        if (currentShapedRun.ShapedBuffer.IsLeftToRight)
                         {
-                            startOffset = endOffset;
+                            startOffset = currentShapedRun.GlyphRun.GetDistanceFromCharacterHit(new CharacterHit(startIndex));
+
+                            endOffset = currentShapedRun.GlyphRun.GetDistanceFromCharacterHit(new CharacterHit(startIndex + remainingLength));
                         }
                         else
                         {
-                            startOffset = currentShapedRun.GlyphRun.GetDistanceFromCharacterHit(new CharacterHit(startIndex + remainingLength));
+                            endOffset = currentShapedRun.GlyphRun.GetDistanceFromCharacterHit(new CharacterHit(startIndex));
+
+                            if (currentPosition < startIndex)
+                            {
+                                startOffset = endOffset;
+                            }
+                            else
+                            {
+                                startOffset = currentShapedRun.GlyphRun.GetDistanceFromCharacterHit(new CharacterHit(startIndex + remainingLength));
+                            }
                         }
-                    }
 
-                    startX += startOffset;
+                        startX += startOffset;
 
-                    endX += endOffset;
+                        endX += endOffset;
 
-                    var endHit = currentShapedRun.GlyphRun.GetCharacterHitFromDistance(endOffset, out _);
-                    var startHit = currentShapedRun.GlyphRun.GetCharacterHitFromDistance(startOffset, out _);
+                        var endHit = currentShapedRun.GlyphRun.GetCharacterHitFromDistance(endOffset, out _);
+                        var startHit = currentShapedRun.GlyphRun.GetCharacterHitFromDistance(startOffset, out _);
 
-                    characterLength = Math.Abs(endHit.FirstCharacterIndex + endHit.TrailingLength - startHit.FirstCharacterIndex - startHit.TrailingLength);
+                        characterLength = Math.Abs(endHit.FirstCharacterIndex + endHit.TrailingLength - startHit.FirstCharacterIndex - startHit.TrailingLength);
 
-                    currentDirection = currentShapedRun.ShapedBuffer.IsLeftToRight ?
-                        FlowDirection.LeftToRight :
-                        FlowDirection.RightToLeft;
-                }
-                else
-                {
-                    if (currentPosition < firstTextSourceIndex)
+                        currentDirection = FlowDirection.LeftToRight;
+                    }
+                    else
                     {
-                        startX += currentRun.Size.Width;
+                        if (currentPosition < firstTextSourceIndex)
+                        {
+                            startX += currentRun.Size.Width;
+                        }
+
+                        if (currentPosition + currentRun.TextSourceLength <= characterIndex)
+                        {
+                            endX += currentRun.Size.Width;
+
+                            characterLength = currentRun.TextSourceLength;
+                        }
                     }
 
-                    if (currentPosition + currentRun.TextSourceLength <= characterIndex)
+                    if (endX < startX)
                     {
-                        endX += currentRun.Size.Width;
+                        (endX, startX) = (startX, endX);
+                    }
 
-                        characterLength = currentRun.TextSourceLength;
+                    //Lines that only contain a linebreak need to be covered here
+                    if (characterLength == 0)
+                    {
+                        characterLength = NewLineLength;
                     }
-                }
 
-                if (endX < startX)
-                {
-                    (endX, startX) = (startX, endX);
-                }
+                    runWidth = endX - startX;
+                    currentRunBounds = new TextRunBounds(new Rect(startX, 0, runWidth, Height), currentPosition, characterLength, currentRun);
 
-                //Lines that only contain a linebreak need to be covered here
-                if (characterLength == 0)
-                {
-                    characterLength = NewLineLength;
-                }
+                    currentPosition += characterLength;
 
-                var runWidth = endX - startX;
-                var currentRunBounds = new TextRunBounds(new Rect(startX, 0, runWidth, Height), currentPosition, characterLength, currentRun);
+                    remainingLength -= characterLength;
+                }                 
 
-                if (!MathUtilities.IsZero(runWidth) || NewLineLength > 0)
+                if (currentRunBounds != null && !MathUtilities.IsZero(runWidth) || NewLineLength > 0)
                 {
                     if (lastDirection == currentDirection && result.Count > 0 && MathUtilities.AreClose(currentRect.Right, startX))
                     {
@@ -537,32 +645,26 @@ namespace Avalonia.Media.TextFormatting
 
                         textBounds.Rectangle = currentRect;
 
-                        textBounds.TextRunBounds.Add(currentRunBounds);
+                        textBounds.TextRunBounds.Add(currentRunBounds!);
                     }
                     else
                     {
-                        currentRect = currentRunBounds.Rectangle;
+                        currentRect = currentRunBounds!.Rectangle;
 
                         result.Add(new TextBounds(currentRect, currentDirection, new List<TextRunBounds> { currentRunBounds }));
                     }
                 }
 
                 currentWidth += runWidth;
-                currentPosition += characterLength;
+              
 
-                if (currentPosition > characterIndex)
+                if (remainingLength <= 0 || currentPosition >= characterIndex)
                 {
                     break;
                 }
 
                 startX = endX;
                 lastDirection = currentDirection;
-                remainingLength -= characterLength;
-
-                if (remainingLength <= 0)
-                {
-                    break;
-                }
             }
 
             return result;
@@ -674,7 +776,7 @@ namespace Avalonia.Media.TextFormatting
 
                 var currentRunBounds = new TextRunBounds(new Rect(Start + startX, 0, runWidth, Height), currentPosition, characterLength, currentRun);
 
-                if(!MathUtilities.IsZero(runWidth) || NewLineLength > 0)
+                if (!MathUtilities.IsZero(runWidth) || NewLineLength > 0)
                 {
                     if (lastDirection == currentDirection && result.Count > 0 && MathUtilities.AreClose(currentRect.Right, Start + startX))
                     {
@@ -692,7 +794,7 @@ namespace Avalonia.Media.TextFormatting
 
                         result.Add(new TextBounds(currentRect, currentDirection, new List<TextRunBounds> { currentRunBounds }));
                     }
-                }               
+                }
 
                 currentWidth += runWidth;
                 currentPosition += characterLength;
@@ -716,6 +818,107 @@ namespace Avalonia.Media.TextFormatting
             return result;
         }
 
+        private bool TryGetTextRunBoundsRightToLeft(double startX, int firstTextSourceIndex, int characterIndex, int runIndex, ref int currentPosition, ref int remainingLength, out TextRunBounds? textRunBounds)
+        {
+            textRunBounds = null;
+
+            for (var index = runIndex; index >= 0; index--)
+            {
+                if (TextRuns[index] is not DrawableTextRun currentRun)
+                {
+                    continue;
+                }
+
+                if (currentPosition + currentRun.TextSourceLength <= firstTextSourceIndex)
+                {
+                    startX -= currentRun.Size.Width;
+
+                    currentPosition += currentRun.TextSourceLength;
+
+                    continue;
+                }
+
+                var characterLength = 0;
+                var endX = startX;
+
+                if (currentRun is ShapedTextCharacters currentShapedRun)
+                {
+                    var offset = Math.Max(0, firstTextSourceIndex - currentPosition);
+
+                    currentPosition += offset;
+
+                    var startIndex = currentRun.Text.Start + offset;
+                    double startOffset;
+                    double endOffset;
+
+                    if (currentShapedRun.ShapedBuffer.IsLeftToRight)
+                    {
+                        if (currentPosition < startIndex)
+                        {
+                            startOffset = endOffset = 0;
+                        }
+                        else
+                        {
+                            endOffset = currentShapedRun.GlyphRun.GetDistanceFromCharacterHit(new CharacterHit(startIndex + remainingLength));
+
+                            startOffset = currentShapedRun.GlyphRun.GetDistanceFromCharacterHit(new CharacterHit(startIndex));
+                        }
+                    }
+                    else
+                    {
+                        endOffset = currentShapedRun.GlyphRun.GetDistanceFromCharacterHit(new CharacterHit(startIndex));
+
+                        startOffset = currentShapedRun.GlyphRun.GetDistanceFromCharacterHit(new CharacterHit(startIndex + remainingLength));
+                    }
+
+                    startX -= currentRun.Size.Width - startOffset;
+                    endX -= currentRun.Size.Width - endOffset;
+
+                    var endHit = currentShapedRun.GlyphRun.GetCharacterHitFromDistance(endOffset, out _);
+                    var startHit = currentShapedRun.GlyphRun.GetCharacterHitFromDistance(startOffset, out _);
+
+                    characterLength = Math.Abs(startHit.FirstCharacterIndex + startHit.TrailingLength - endHit.FirstCharacterIndex - endHit.TrailingLength);
+                }
+                else
+                {
+                    if (currentPosition + currentRun.TextSourceLength <= characterIndex)
+                    {
+                        endX -= currentRun.Size.Width;
+                    }
+
+                    if (currentPosition < firstTextSourceIndex)
+                    {
+                        startX -= currentRun.Size.Width;
+
+                        characterLength = currentRun.TextSourceLength;
+                    }
+                }
+
+                if (endX < startX)
+                {
+                    (endX, startX) = (startX, endX);
+                }
+
+                //Lines that only contain a linebreak need to be covered here
+                if (characterLength == 0)
+                {
+                    characterLength = NewLineLength;
+                }
+
+                var runWidth = endX - startX;
+
+                remainingLength -= characterLength;
+
+                currentPosition += characterLength;
+
+                textRunBounds = new TextRunBounds(new Rect(Start + startX, 0, runWidth, Height), currentPosition, characterLength, currentRun);
+
+                return true;
+            }
+
+            return false;
+        }
+
         public override IReadOnlyList<TextBounds> GetTextBounds(int firstTextSourceIndex, int textLength)
         {
             if (_paragraphProperties.FlowDirection == FlowDirection.LeftToRight)
@@ -1319,12 +1522,12 @@ namespace Avalonia.Media.TextFormatting
                 case TextAlignment.Center:
                     var start = (_paragraphWidth - width) / 2;
 
-                    if(paragraphFlowDirection == FlowDirection.RightToLeft)
+                    if (paragraphFlowDirection == FlowDirection.RightToLeft)
                     {
                         start -= (widthIncludingTrailingWhitespace - width);
                     }
 
-                    return Math.Max(0,  start);                         
+                    return Math.Max(0, start);
                 case TextAlignment.Right:
                     return Math.Max(0, _paragraphWidth - widthIncludingTrailingWhitespace);
 
diff --git a/src/Avalonia.Controls/Presenters/TextPresenter.cs b/src/Avalonia.Controls/Presenters/TextPresenter.cs
index e463bc5731..4f9be86641 100644
--- a/src/Avalonia.Controls/Presenters/TextPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/TextPresenter.cs
@@ -9,6 +9,7 @@ using Avalonia.VisualTree;
 using Avalonia.Layout;
 using Avalonia.Media.Immutable;
 using Avalonia.Controls.Documents;
+using Avalonia.Media.TextFormatting.Unicode;
 
 namespace Avalonia.Controls.Presenters
 {
@@ -496,14 +497,14 @@ namespace Avalonia.Controls.Presenters
             var length = Math.Max(selectionStart, selectionEnd) - start;
 
             IReadOnlyList<ValueSpan<TextRunProperties>>? textStyleOverrides = null;
-            
+
             if (length > 0)
             {
                 textStyleOverrides = new[]
                 {
                     new ValueSpan<TextRunProperties>(start, length,
                         new GenericTextRunProperties(typeface, FontSize,
-                            foregroundBrush: SelectionForegroundBrush ?? Brushes.White))
+                            foregroundBrush: SelectionForegroundBrush ?? Brushes.Red))
                 };
             }
 
diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 1b268db2f7..8490bfd3a0 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -17,6 +17,7 @@ using Avalonia.Controls.Metadata;
 using Avalonia.Media.TextFormatting;
 using Avalonia.Media.TextFormatting.Unicode;
 using Avalonia.Automation.Peers;
+using System.Diagnostics;
 
 namespace Avalonia.Controls
 {
@@ -1240,9 +1241,12 @@ namespace Avalonia.Controls
                     MathUtilities.Clamp(point.X, 0, Math.Max(_presenter.Bounds.Width - 1, 0)),
                     MathUtilities.Clamp(point.Y, 0, Math.Max(_presenter.Bounds.Height - 1, 0)));
 
-                _presenter.MoveCaretToPoint(point);
+                var hit = _presenter.TextLayout.HitTestPoint(point);    
+
+                var caretIndex = hit.TextPosition;
+
+                Debug.WriteLine($"TextPos: {caretIndex}, X: {point.X}");
 
-                var caretIndex = _presenter.CaretIndex;
                 var text = Text;
 
                 if (text != null && _wordSelectionStart >= 0)
@@ -1266,7 +1270,7 @@ namespace Avalonia.Controls
                 }
                 else
                 {
-                    SelectionEnd = _presenter.CaretIndex;
+                    SelectionEnd = caretIndex;
                 }
             }
         }
diff --git a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs
index 7d33f094fa..6d057d900e 100644
--- a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs
+++ b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using Avalonia.Media;
@@ -914,14 +915,14 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
         public void Should_Get_CharacterHit_From_Distance_RTL()
         {
             using (Start())
-            { 
+            {
                 var text = "أَبْجَدِيَّة عَرَبِيَّة";
 
                 var layout = new TextLayout(
-                  text,
-                  Typeface.Default,
-                  12,
-                  Brushes.Black);
+                    text,
+                    Typeface.Default,
+                    12,
+                    Brushes.Black);
 
                 var textLine = layout.TextLines[0];
 
@@ -952,6 +953,63 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
                 rect = layout.HitTestTextPosition(23);
 
                 Assert.Equal(0, rect.Left, 5);
+
+            }
+        }
+
+        [Fact]
+        public void Should_Get_CharacterHit_From_Distance_RTL_With_TextStyles()
+        {
+            using (Start())
+            {
+                var text = "أَبْجَدِيَّة عَرَبِيَّة";
+
+                var i = 0;
+
+                var graphemeEnumerator = new GraphemeEnumerator(text.AsMemory());
+
+                while (graphemeEnumerator.MoveNext())
+                {
+                    var grapheme = graphemeEnumerator.Current;
+
+                    var textStyleOverrides = new[] { new ValueSpan<TextRunProperties>(i, grapheme.Text.Length, new GenericTextRunProperties(Typeface.Default, 12, foregroundBrush: Brushes.Red)) };
+
+                    i += grapheme.Text.Length;
+
+                    var layout = new TextLayout(
+                        text,
+                        Typeface.Default,
+                        12,
+                        Brushes.Black,
+                        textStyleOverrides: textStyleOverrides);
+
+                    var textLine = layout.TextLines[0];
+
+                    var shapedRuns = textLine.TextRuns.Cast<ShapedTextCharacters>().ToList();
+
+                    var clusters = shapedRuns.SelectMany(x => x.ShapedBuffer.GlyphClusters).ToList();
+
+                    var glyphAdvances = shapedRuns.SelectMany(x => x.ShapedBuffer.GlyphAdvances).ToList();
+
+                    var currentX = 0.0;
+
+                    for (int j = 0; j < clusters.Count; j++)
+                    {
+                        var cluster = clusters[j];
+
+                        var characterHit = textLine.GetCharacterHitFromDistance(currentX);
+
+                        Assert.Equal(cluster, characterHit.FirstCharacterIndex + characterHit.TrailingLength);
+
+                        var distance = textLine.GetDistanceFromCharacterHit(new CharacterHit(cluster));
+
+                        Assert.Equal(currentX, distance);
+
+                        var glyphAdvance = glyphAdvances[j];
+
+                        currentX += glyphAdvance;
+                    }
+                }
             }
         }
 

From 1c1499c39961786f5b5046fc2fbd4c641f570566 Mon Sep 17 00:00:00 2001
From: Evgeny Gorbovoy <e.gorbovoy@staffwerke.de>
Date: Thu, 28 Jul 2022 19:00:19 +0200
Subject: [PATCH 177/240] More `ContainsExclusive`

---
 .../Rendering/SceneGraph/RectangleNode.cs              |  4 ++--
 .../Rendering/CompositorHitTestingTests.cs             |  6 +++---
 .../Rendering/DeferredRendererTests_HitTesting.cs      | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Avalonia.Base/Rendering/SceneGraph/RectangleNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/RectangleNode.cs
index 7b79c446f9..a9d1bf96e5 100644
--- a/src/Avalonia.Base/Rendering/SceneGraph/RectangleNode.cs
+++ b/src/Avalonia.Base/Rendering/SceneGraph/RectangleNode.cs
@@ -103,13 +103,13 @@ namespace Avalonia.Rendering.SceneGraph
                 if (Brush != null)
                 {
                     var rect = Rect.Rect.Inflate((Pen?.Thickness / 2) ?? 0);
-                    return rect.Contains(p);
+                    return rect.ContainsExclusive(p);
                 }
                 else
                 {
                     var borderRect = Rect.Rect.Inflate((Pen?.Thickness / 2) ?? 0);
                     var emptyRect = Rect.Rect.Deflate((Pen?.Thickness / 2) ?? 0);
-                    return borderRect.Contains(p) && !emptyRect.Contains(p);
+                    return borderRect.ContainsExclusive(p) && !emptyRect.ContainsExclusive(p);
                 }
             }
 
diff --git a/tests/Avalonia.Base.UnitTests/Rendering/CompositorHitTestingTests.cs b/tests/Avalonia.Base.UnitTests/Rendering/CompositorHitTestingTests.cs
index a584a859ec..02012bf62b 100644
--- a/tests/Avalonia.Base.UnitTests/Rendering/CompositorHitTestingTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Rendering/CompositorHitTestingTests.cs
@@ -414,7 +414,7 @@ public class CompositorHitTestingTests : CompositorTestsBase
     {
         using (var s = new CompositorServices(new Size(200, 200)))
         {
-            Rectangle targetRectangle;
+            Border targetRectangle;
 
             var stackPanel = new StackPanel
             {
@@ -422,8 +422,8 @@ public class CompositorHitTestingTests : CompositorTestsBase
                 HorizontalAlignment = HorizontalAlignment.Left,
                 Children =
                 {
-                    new Rectangle { Width = 10, Height = 10, Fill= Brushes.Red},
-                    { targetRectangle = new Rectangle { Width = 10, Height = 10, Fill = Brushes.Green} }
+                    new Border { Width = 10, Height = 10, Background= Brushes.Red},
+                    { targetRectangle = new Border { Width = 10, Height = 10, Background = Brushes.Green} }
                 }
             };
 
diff --git a/tests/Avalonia.Base.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs b/tests/Avalonia.Base.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs
index 7800ddfc8a..d3fdbb63db 100644
--- a/tests/Avalonia.Base.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs
+++ b/tests/Avalonia.Base.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs
@@ -542,11 +542,11 @@ namespace Avalonia.Base.UnitTests.Rendering
         {
             using (TestApplication())
             {
-                Rectangle targetRectangle;
+                Border targetRectangle;
 
                 var root = new TestRoot
                 {
-                    Width = 300,
+                    Width = 50,
                     Height = 200,
                     Child = new StackPanel
                     {
@@ -554,8 +554,8 @@ namespace Avalonia.Base.UnitTests.Rendering
                         HorizontalAlignment = HorizontalAlignment.Left,
                         Children =
                             {
-                                new Rectangle { Width = 10, Height = 10, Fill = Brushes.Red},
-                                { targetRectangle = new Rectangle { Width = 10, Height = 10, Fill = Brushes.Green} }
+                                new Border { Width = 50, Height = 50, Background = Brushes.Red},
+                                { targetRectangle = new Border { Width = 50, Height = 50, Background = Brushes.Green} }
                             }
                     }
                 }; 
@@ -564,7 +564,7 @@ namespace Avalonia.Base.UnitTests.Rendering
                 root.Measure(Size.Infinity);
                 root.Arrange(new Rect(root.DesiredSize));
 
-                var result = root.Renderer.HitTest(new Point(5, 10), root, null);
+                var result = root.Renderer.HitTest(new Point(25, 50), root, null);
                 Assert.Equal(new[] { targetRectangle }, result);
             }
         }

From b5e4a94c4f45c9d6ae7bea85aa6f75212b537e81 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Fri, 29 Jul 2022 02:46:41 -0400
Subject: [PATCH 178/240] Minor fluent theme fixes

---
 .../Controls/ContextMenu.xaml                 |  4 +-
 .../Controls/DataValidationErrors.xaml        | 84 +++++++++++--------
 .../Controls/FluentControls.xaml              |  1 -
 src/Avalonia.Themes.Fluent/Controls/Menu.xaml |  6 +-
 .../Controls/MenuFlyoutPresenter.xaml         |  1 +
 5 files changed, 53 insertions(+), 43 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/ContextMenu.xaml b/src/Avalonia.Themes.Fluent/Controls/ContextMenu.xaml
index 8365ee61d3..fdd79ed736 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ContextMenu.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ContextMenu.xaml
@@ -29,7 +29,7 @@
     </Border>
   </Design.PreviewWith>
 
-  <!-- Added missing resource -->
+  <!--  Added missing resource  -->
   <Thickness x:Key="MenuFlyoutScrollerMargin">0,4,0,4</Thickness>
 
   <ControlTheme x:Key="{x:Type ContextMenu}" TargetType="ContextMenu">
@@ -54,7 +54,7 @@
                 MinHeight="{TemplateBinding MinHeight}"
                 HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
                 CornerRadius="{TemplateBinding CornerRadius}">
-          <ScrollViewer Classes="menuscroller">
+          <ScrollViewer Theme="{StaticResource FluentMenuScrollViewer}">
             <ItemsPresenter Name="PART_ItemsPresenter"
                             Items="{TemplateBinding Items}"
                             ItemsPanel="{TemplateBinding ItemsPanel}"
diff --git a/src/Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml b/src/Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml
index cc55f84d80..a4055519b6 100644
--- a/src/Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml
@@ -14,8 +14,7 @@
         <TextBox Text="Sample">
           <TextBox.Styles>
             <Style Selector="DataValidationErrors">
-              <Setter Property="Template" Value="{DynamicResource TooltipDataValidationContentTemplate}" />
-              <Setter Property="ErrorTemplate" Value="{DynamicResource TooltipDataValidationErrorTemplate}" />
+              <Setter Property="Theme" Value="{DynamicResource TooltipDataValidationErrors}" />
             </Style>
           </TextBox.Styles>
           <DataValidationErrors.Error>
@@ -26,10 +25,33 @@
     </Border>
   </Design.PreviewWith>
 
-  <ControlTheme x:Key="{x:Type DataValidationErrors}" TargetType="DataValidationErrors">
-    <ControlTheme.Resources>
-      <DataTemplate x:Key="InlineDataValidationErrorTemplate">
-        <ItemsControl Items="{Binding}" x:DataType="DataValidationErrors" Foreground="{DynamicResource SystemControlErrorTextForegroundBrush}">
+  <ControlTheme x:Key="{x:Type DataValidationErrors}"
+                TargetType="DataValidationErrors">
+    <Setter Property="Template">
+      <ControlTemplate TargetType="DataValidationErrors">
+        <DockPanel LastChildFill="True">
+          <ContentControl x:Name="InlineDataValidationContentControl"
+                          Margin="0,4,0,0"
+                          Content="{Binding (DataValidationErrors.Errors)}"
+                          ContentTemplate="{TemplateBinding ErrorTemplate}"
+                          DataContext="{TemplateBinding Owner}"
+                          DockPanel.Dock="Bottom"
+                          IsVisible="{Binding (DataValidationErrors.HasErrors)}" />
+          <ContentPresenter Name="PART_ContentPresenter"
+                            Padding="{TemplateBinding Padding}"
+                            Background="{TemplateBinding Background}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Content="{TemplateBinding Content}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            CornerRadius="{TemplateBinding CornerRadius}" />
+        </DockPanel>
+      </ControlTemplate>
+    </Setter>
+    <Setter Property="ErrorTemplate">
+      <DataTemplate>
+        <ItemsControl x:DataType="DataValidationErrors"
+                      Foreground="{DynamicResource SystemControlErrorTextForegroundBrush}"
+                      Items="{Binding}">
           <ItemsControl.Styles>
             <Style Selector="TextBlock">
               <Setter Property="TextWrapping" Value="Wrap" />
@@ -37,27 +59,34 @@
           </ItemsControl.Styles>
         </ItemsControl>
       </DataTemplate>
-      <ControlTemplate x:Key="InlineDataValidationContentTemplate" TargetType="DataValidationErrors">
+    </Setter>
+  </ControlTheme>
+
+  <ControlTheme x:Key="TooltipDataValidationErrors"
+                TargetType="DataValidationErrors">
+    <Setter Property="Template">
+      <ControlTemplate TargetType="DataValidationErrors">
         <DockPanel LastChildFill="True">
-          <ContentControl x:Name="InlineDataValidationContentControl"
-                          Margin="0,4,0,0"
-                          Content="{Binding (DataValidationErrors.Errors)}"
+          <ContentControl Content="{Binding (DataValidationErrors.Errors)}"
                           ContentTemplate="{TemplateBinding ErrorTemplate}"
                           DataContext="{TemplateBinding Owner}"
-                          DockPanel.Dock="Bottom"
+                          DockPanel.Dock="Right"
                           IsVisible="{Binding (DataValidationErrors.HasErrors)}" />
           <ContentPresenter Name="PART_ContentPresenter"
                             Padding="{TemplateBinding Padding}"
                             Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding CornerRadius}"
                             Content="{TemplateBinding Content}"
-                            ContentTemplate="{TemplateBinding ContentTemplate}" />
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            CornerRadius="{TemplateBinding CornerRadius}" />
         </DockPanel>
       </ControlTemplate>
-
-      <DataTemplate x:DataType="DataValidationErrors" x:Key="TooltipDataValidationErrorTemplate">
-        <Panel Name="PART_InlineErrorTemplatePanel" Background="Transparent">
+    </Setter>
+    <Setter Property="ErrorTemplate">
+      <DataTemplate>
+        <Panel Name="PART_InlineErrorTemplatePanel"
+               Background="Transparent">
           <Panel.Styles>
             <Style Selector="Panel#PART_InlineErrorTemplatePanel">
               <Setter Property="Margin" Value="8,0" />
@@ -70,7 +99,7 @@
             </Style>
           </Panel.Styles>
           <ToolTip.Tip>
-            <ItemsControl Items="{Binding}" />
+            <ItemsControl Items="{ReflectionBinding}" />
           </ToolTip.Tip>
           <Path Width="14"
                 Height="14"
@@ -79,25 +108,6 @@
                 StrokeThickness="2" />
         </Panel>
       </DataTemplate>
-      <ControlTemplate x:Key="TooltipDataValidationContentTemplate" TargetType="DataValidationErrors">
-        <DockPanel LastChildFill="True">
-          <ContentControl Content="{Binding (DataValidationErrors.Errors)}"
-                          ContentTemplate="{TemplateBinding ErrorTemplate}"
-                          DataContext="{TemplateBinding Owner}"
-                          DockPanel.Dock="Right"
-                          IsVisible="{Binding (DataValidationErrors.HasErrors)}" />
-          <ContentPresenter Name="PART_ContentPresenter"
-                            Padding="{TemplateBinding Padding}"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding CornerRadius}"
-                            Content="{TemplateBinding Content}"
-                            ContentTemplate="{TemplateBinding ContentTemplate}" />
-        </DockPanel>
-      </ControlTemplate>
-    </ControlTheme.Resources>
-    <Setter Property="Template" Value="{StaticResource InlineDataValidationContentTemplate}" />
-    <Setter Property="ErrorTemplate" Value="{StaticResource InlineDataValidationErrorTemplate}" />
+    </Setter>
   </ControlTheme>
 </ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
index 0499495239..577539b26b 100644
--- a/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
@@ -75,5 +75,4 @@
 
     <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/FocusAdorner.xaml" />
     <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/UserControl.xaml" />
-    <Styles.Resources />
 </Styles>
diff --git a/src/Avalonia.Themes.Fluent/Controls/Menu.xaml b/src/Avalonia.Themes.Fluent/Controls/Menu.xaml
index 12d18ae644..f5fd69a67f 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Menu.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Menu.xaml
@@ -5,7 +5,7 @@
       <Menu>
         <MenuItem Header="_Standard" />
         <MenuItem Header="Selected" IsSelected="True" />
-        <MenuItem Header="Disabled" IsEnabled="False"/>
+        <MenuItem Header="Disabled" IsEnabled="False" />
       </Menu>
     </Border>
   </Design.PreviewWith>
@@ -46,7 +46,7 @@
                       MinHeight="{DynamicResource MenuFlyoutThemeMinHeight}"
                       HorizontalAlignment="Stretch"
                       CornerRadius="{DynamicResource OverlayCornerRadius}">
-                <ScrollViewer Classes="menuscroller">
+                <ScrollViewer Theme="{StaticResource FluentMenuScrollViewer}">
                   <ItemsPresenter Name="PART_ItemsPresenter"
                                   Items="{TemplateBinding Items}"
                                   ItemsPanel="{TemplateBinding ItemsPanel}"
@@ -91,7 +91,7 @@
   <ControlTheme x:Key="{x:Type Menu}" TargetType="Menu">
     <Setter Property="Background" Value="Transparent" />
     <Setter Property="Height" Value="{DynamicResource MenuBarHeight}" />
-    <Setter Property="ItemContainerTheme" Value="{StaticResource FluentTopLevelMenuItem}"/>
+    <Setter Property="ItemContainerTheme" Value="{StaticResource FluentTopLevelMenuItem}" />
     <Setter Property="Template">
       <ControlTemplate>
         <Border Background="{TemplateBinding Background}"
diff --git a/src/Avalonia.Themes.Fluent/Controls/MenuFlyoutPresenter.xaml b/src/Avalonia.Themes.Fluent/Controls/MenuFlyoutPresenter.xaml
index 264438390d..6bca00b219 100644
--- a/src/Avalonia.Themes.Fluent/Controls/MenuFlyoutPresenter.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/MenuFlyoutPresenter.xaml
@@ -19,6 +19,7 @@
                 Padding="{DynamicResource FlyoutBorderThemePadding}"
                 CornerRadius="{TemplateBinding CornerRadius}">
           <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                        Theme="{StaticResource FluentMenuScrollViewer}"
                         VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
             <ItemsPresenter Name="PART_ItemsPresenter"
                             Items="{TemplateBinding Items}"

From 707b7af6b3f9c83fa49770d0ad3461b8aa580a2c Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Fri, 29 Jul 2022 02:58:21 -0400
Subject: [PATCH 179/240] Port default theme to use ControlThemes + some
 formatting

---
 .../Controls/AutoCompleteBox.xaml             |  36 +-
 .../Controls/Button.xaml                      |  54 +-
 .../Controls/ButtonSpinner.xaml               | 188 +++----
 .../Controls/Calendar.xaml                    |  24 +-
 .../Controls/CalendarButton.xaml              |  90 ++--
 .../Controls/CalendarDatePicker.xaml          | 136 ++---
 .../Controls/CalendarDayButton.xaml           | 149 +++---
 .../Controls/CalendarItem.xaml                | 139 +++--
 .../Controls/CaptionButtons.xaml              | 153 +++---
 .../Controls/Carousel.xaml                    |  38 +-
 .../Controls/CheckBox.xaml                    |  95 ++--
 .../Controls/ComboBox.xaml                    |  81 ++-
 .../Controls/ComboBoxItem.xaml                |  63 ++-
 .../Controls/ContentControl.xaml              |  36 +-
 .../Controls/ContextMenu.xaml                 |  46 +-
 .../Controls/DataValidationErrors.xaml        |  91 ++--
 .../Controls/DatePicker.xaml                  | 496 +++++++++---------
 .../Controls/DateTimePickerShared.xaml        | 139 +++++
 .../Controls/DropDownButton.xaml              |  70 +--
 .../Controls/EmbeddableControlRoot.xaml       |  43 +-
 .../Controls/Expander.xaml                    | 382 ++++++++------
 .../Controls/FlyoutPresenter.xaml             |  20 +-
 .../Controls/FocusAdorner.xaml                |   9 +-
 .../Controls/GridSplitter.xaml                |  21 +-
 .../Controls/ItemsControl.xaml                |  36 +-
 .../Controls/Label.xaml                       |  40 +-
 .../Controls/ListBox.xaml                     |  71 +--
 .../Controls/ListBoxItem.xaml                 |  66 +--
 .../Controls/ManagedFileChooser.xaml          | 319 ++++++-----
 .../Controls/Menu.xaml                        | 100 +++-
 .../Controls/MenuFlyoutPresenter.xaml         |  21 +-
 .../Controls/MenuItem.xaml                    | 163 +++---
 .../Controls/NativeMenuBar.xaml               |  60 +--
 .../Controls/NotificationCard.xaml            | 171 +++---
 .../Controls/NumericUpDown.xaml               |  49 +-
 .../Controls/OverlayPopupHost.xaml            |  48 +-
 .../Controls/PathIcon.xaml                    |  21 +-
 .../Controls/PopupRoot.xaml                   |  57 +-
 .../Controls/ProgressBar.xaml                 | 155 +++---
 .../Controls/RadioButton.xaml                 |  87 +--
 .../Controls/RepeatButton.xaml                |  71 ++-
 .../Controls/RichTextBlock.xaml               |  18 +-
 .../Controls/ScrollBar.xaml                   | 283 +++++-----
 .../Controls/ScrollViewer.xaml                | 133 +++--
 .../Controls/Separator.xaml                   |  28 +-
 .../Controls/Slider.xaml                      | 213 ++++----
 .../Controls/SplitButton.xaml                 | 444 +++++++---------
 .../Controls/SplitView.xaml                   | 451 ++++++++--------
 .../Controls/TabControl.xaml                  | 101 ++--
 .../Controls/TabItem.xaml                     |  91 ++--
 .../Controls/TabStrip.xaml                    |  17 +-
 .../Controls/TabStripItem.xaml                |  33 +-
 .../Controls/TextBox.xaml                     | 338 ++++++------
 .../Controls/TimePicker.xaml                  | 467 +++++++++--------
 .../Controls/TitleBar.xaml                    |  80 +--
 .../Controls/ToggleButton.xaml                |  62 +--
 .../Controls/ToggleSwitch.xaml                | 483 ++++++++---------
 .../Controls/ToolTip.xaml                     |  40 +-
 .../Controls/TransitioningContentControl.xaml |  23 +-
 .../Controls/TreeView.xaml                    |  58 +-
 .../Controls/TreeViewItem.xaml                | 159 +++---
 .../Controls/UserControl.xaml                 |  39 +-
 .../Controls/Window.xaml                      |  59 ++-
 .../Controls/WindowNotificationManager.xaml   |  81 +--
 src/Avalonia.Themes.Default/DefaultTheme.xaml | 143 ++---
 65 files changed, 4201 insertions(+), 3777 deletions(-)
 create mode 100644 src/Avalonia.Themes.Default/Controls/DateTimePickerShared.xaml

diff --git a/src/Avalonia.Themes.Default/Controls/AutoCompleteBox.xaml b/src/Avalonia.Themes.Default/Controls/AutoCompleteBox.xaml
index fac8ca51f8..65dfaf982b 100644
--- a/src/Avalonia.Themes.Default/Controls/AutoCompleteBox.xaml
+++ b/src/Avalonia.Themes.Default/Controls/AutoCompleteBox.xaml
@@ -1,32 +1,34 @@
-<Styles xmlns="https://github.com/avaloniaui">
-  <Style Selector="AutoCompleteBox">
-    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
-    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}"/>
-    <Setter Property="Padding" Value="4"/>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type AutoCompleteBox}"
+                TargetType="AutoCompleteBox">
+    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}" />
+    <Setter Property="Padding" Value="4" />
     <Setter Property="Template">
       <ControlTemplate>
         <Panel>
           <TextBox Name="PART_TextBox"
-                   Background="{TemplateBinding Background}" 
-                   BorderBrush="{TemplateBinding BorderBrush}" 
+                   Padding="{TemplateBinding Padding}"
+                   Background="{TemplateBinding Background}"
+                   BorderBrush="{TemplateBinding BorderBrush}"
                    BorderThickness="{TemplateBinding BorderThickness}"
                    CornerRadius="{TemplateBinding CornerRadius}"
-                   Padding="{TemplateBinding Padding}"
-                   Watermark="{TemplateBinding Watermark}"
-                   DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}" />
-          
+                   DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
+                   Watermark="{TemplateBinding Watermark}" />
+
           <Popup Name="PART_Popup"
                  MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
                  MaxHeight="{TemplateBinding MaxDropDownHeight}"
-                 PlacementTarget="{TemplateBinding}"
-                 IsLightDismissEnabled="True">
+                 IsLightDismissEnabled="True"
+                 PlacementTarget="{TemplateBinding}">
             <Border Background="{DynamicResource ThemeBackgroundBrush}"
                     BorderBrush="{DynamicResource ThemeBorderMidBrush}"
                     BorderThickness="1">
               <ListBox Name="PART_SelectingItemsControl"
-                       BorderThickness="0"
                        Background="{TemplateBinding Background}"
+                       BorderThickness="0"
                        Foreground="{TemplateBinding Foreground}"
                        ItemTemplate="{TemplateBinding ItemTemplate}"
                        ScrollViewer.HorizontalScrollBarVisibility="Auto"
@@ -36,5 +38,5 @@
         </Panel>
       </ControlTemplate>
     </Setter>
-  </Style>
-</Styles>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/Button.xaml b/src/Avalonia.Themes.Default/Controls/Button.xaml
index a2971c3ff6..9018677ab6 100644
--- a/src/Avalonia.Themes.Default/Controls/Button.xaml
+++ b/src/Avalonia.Themes.Default/Controls/Button.xaml
@@ -1,36 +1,38 @@
-<Styles xmlns="https://github.com/avaloniaui">
-  <Style Selector="Button">
-    <Setter Property="Background" Value="{DynamicResource ThemeControlMidBrush}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderLowBrush}"/>
-    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}"/>
-    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
-    <Setter Property="HorizontalContentAlignment" Value="Center"/>
-    <Setter Property="VerticalContentAlignment" Value="Center"/>
-    <Setter Property="Padding" Value="4"/>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type Button}"
+                TargetType="Button">
+    <Setter Property="Background" Value="{DynamicResource ThemeControlMidBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderLowBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}" />
+    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+    <Setter Property="HorizontalContentAlignment" Value="Center" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Padding" Value="4" />
     <Setter Property="Template">
       <ControlTemplate>
         <ContentPresenter Name="PART_ContentPresenter"
+                          Padding="{TemplateBinding Padding}"
+                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                           Background="{TemplateBinding Background}"
                           BorderBrush="{TemplateBinding BorderBrush}"
                           BorderThickness="{TemplateBinding BorderThickness}"
-                          CornerRadius="{TemplateBinding CornerRadius}"
-                          ContentTemplate="{TemplateBinding ContentTemplate}"
                           Content="{TemplateBinding Content}"
-                          Padding="{TemplateBinding Padding}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
                           RecognizesAccessKey="True"
-                          TextElement.Foreground="{TemplateBinding Foreground}"
-                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                          TextElement.Foreground="{TemplateBinding Foreground}" />
       </ControlTemplate>
     </Setter>
-  </Style>
-  <Style Selector="Button:pointerover /template/ ContentPresenter">
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
-  </Style>
-  <Style Selector="Button:pressed  /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ThemeControlHighBrush}"/>
-  </Style>
-  <Style Selector="Button:disabled">
-    <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}"/>
-  </Style>
-</Styles>
+    <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
+    </Style>
+    <Style Selector="^:pressed  /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ThemeControlHighBrush}" />
+    </Style>
+    <Style Selector="^:disabled">
+      <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/ButtonSpinner.xaml b/src/Avalonia.Themes.Default/Controls/ButtonSpinner.xaml
index 561ca8bedd..4585fc8e56 100644
--- a/src/Avalonia.Themes.Default/Controls/ButtonSpinner.xaml
+++ b/src/Avalonia.Themes.Default/Controls/ButtonSpinner.xaml
@@ -1,107 +1,89 @@
-<Styles xmlns="https://github.com/avaloniaui">
-  <Style Selector="ButtonSpinner">
-    <Setter Property="Background" Value="Transparent"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
-    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}"/>
-    <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
-    <Setter Property="VerticalContentAlignment" Value="Center"/>
-    <Setter Property="Focusable" Value="True"/>
-  </Style>
-  <Style Selector="ButtonSpinner /template/ RepeatButton">
-    <Setter Property="Background" Value="Transparent"/>
-    <Setter Property="BorderBrush" Value="Transparent"/>
-  </Style>
-  <Style Selector="ButtonSpinner /template/ RepeatButton:pointerover">
-    <Setter Property="Background" Value="{DynamicResource ThemeControlMidBrush}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
-  </Style>
-  <Style Selector="ButtonSpinner /template/ RepeatButton#PART_IncreaseButton">
-    <Setter Property="Content">
-      <Template>
-        <Path Fill="{DynamicResource ThemeForegroundBrush}"
-              Width="8"
-              Height="4"
-              Stretch="Uniform"
-              HorizontalAlignment="Center"
-              VerticalAlignment="Center"
-              Data="M0,5 L4.5,.5 9,5 6,5 4.5,3.5 3,5 z"/>
-      </Template>
-    </Setter>
-  </Style>
-  <Style Selector="ButtonSpinner /template/ RepeatButton#PART_DecreaseButton">
-    <Setter Property="Content">
-      <Template>
-        <Path Fill="{DynamicResource ThemeForegroundBrush}"
-              Width="8"
-              Height="4"
-              Stretch="Uniform"
-              HorizontalAlignment="Center"
-              VerticalAlignment="Center"
-              Data="M0,0 L3,0 4.5,1.5 6,0 9,0 4.5,4.5 z"/>
-      </Template>
-    </Setter>
-  </Style>
-  <Style Selector="ButtonSpinner:right">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Name="border"
-                Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}"
-                Margin="{TemplateBinding Padding}"
-                HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                VerticalAlignment="{TemplateBinding VerticalAlignment}">
-          <Grid ColumnDefinitions="*,Auto">
-            <ContentPresenter Name="PART_ContentPresenter" Grid.Column="0"
-                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                              Content="{TemplateBinding Content}"
-                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                              Padding="{TemplateBinding Padding}"/>
-            <Grid Grid.Column="1" RowDefinitions="*,*" IsVisible="{TemplateBinding ShowButtonSpinner}">
-              <RepeatButton Grid.Row="0" Name="PART_IncreaseButton"/>
-              <RepeatButton Grid.Row="1" Name="PART_DecreaseButton"/>
-            </Grid>
-          </Grid>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-  <Style Selector="ButtonSpinner:left">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    x:CompileBindings="True">
+
+  <ControlTheme x:Key="DefaultButtonSpinnerRepeatButton"
+                BasedOn="{StaticResource {x:Type RepeatButton}}"
+                TargetType="RepeatButton">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="BorderBrush" Value="Transparent" />
+    <Style Selector="^ /template/ RepeatButton:pointerover">
+      <Setter Property="Background" Value="{DynamicResource ThemeControlMidBrush}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
+    </Style>
+  </ControlTheme>
+
+  <ControlTheme x:Key="{x:Type ButtonSpinner}"
+                TargetType="ButtonSpinner">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}" />
+    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Focusable" Value="True" />
     <Setter Property="Template">
       <ControlTemplate>
-        <Border Name="border"
-                Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}"
-                Margin="{TemplateBinding Padding}"
-                HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                VerticalAlignment="{TemplateBinding VerticalAlignment}">
-          <Grid ColumnDefinitions="Auto,*">
-            <Grid Grid.Column="0" RowDefinitions="*,*" IsVisible="{TemplateBinding ShowButtonSpinner}">
-              <RepeatButton Grid.Row="0" Name="PART_IncreaseButton"/>
-              <RepeatButton Grid.Row="1" Name="PART_DecreaseButton"/>
-            </Grid>
-            <ContentPresenter Name="PART_ContentPresenter" Grid.Column="1"
-                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                              Content="{TemplateBinding Content}"
-                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                              Padding="{TemplateBinding Padding}"/>
-          </Grid>
-        </Border>
+        <DataValidationErrors>
+          <Border Name="border"
+                  Margin="{TemplateBinding Padding}"
+                  HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                  VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <DockPanel>
+              <UniformGrid Name="PART_SpinnerPanel"
+                           DockPanel.Dock="Right"
+                           IsVisible="{TemplateBinding ShowButtonSpinner}"
+                           Rows="2">
+                <RepeatButton Name="PART_IncreaseButton"
+                              Theme="{StaticResource DefaultButtonSpinnerRepeatButton}">
+                  <Path Width="8"
+                        Height="4"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Data="M0,5 L4.5,.5 9,5 6,5 4.5,3.5 3,5 z"
+                        Fill="{DynamicResource ThemeForegroundBrush}"
+                        Stretch="Uniform" />
+                </RepeatButton>
+                <RepeatButton Name="PART_DecreaseButton"
+                              Theme="{StaticResource DefaultButtonSpinnerRepeatButton}">
+                  <Path Width="8"
+                        Height="4"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Data="M0,0 L3,0 4.5,1.5 6,0 9,0 4.5,4.5 z"
+                        Fill="{DynamicResource ThemeForegroundBrush}"
+                        Stretch="Uniform" />
+                </RepeatButton>
+              </UniformGrid>
+              <ContentPresenter Name="PART_ContentPresenter"
+                                Grid.Column="1"
+                                Padding="{TemplateBinding Padding}"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}" />
+            </DockPanel>
+          </Border>
+        </DataValidationErrors>
       </ControlTemplate>
     </Setter>
-  </Style>
-  <Style Selector="ButtonSpinner:pointerover /template/ Border#border">
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderHighBrush}"/>
-  </Style>
-  <Style Selector="ButtonSpinner:focus /template/ Border#border">
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderHighBrush}"/>
-  </Style>
-  <Style Selector="ButtonSpinner:error /template/ Border#border">
-    <Setter Property="BorderBrush" Value="{DynamicResource ErrorBrush}"/>
-  </Style>
-</Styles>
+    <Style Selector="^:left">
+      <Style Selector="^ /template/ StackPanel#PART_SpinnerPanel">
+        <Setter Property="DockPanel.Dock" Value="Left" />
+      </Style>
+    </Style>
+    <Style Selector="^:pointerover /template/ Border#border">
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderHighBrush}" />
+    </Style>
+    <Style Selector="^:focus /template/ Border#border">
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderHighBrush}" />
+    </Style>
+    <Style Selector="^:error /template/ Border#border">
+      <Setter Property="BorderBrush" Value="{DynamicResource ErrorBrush}" />
+    </Style>
+  </ControlTheme>
+
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/Calendar.xaml b/src/Avalonia.Themes.Default/Controls/Calendar.xaml
index 4b67aa232b..6f7267581b 100644
--- a/src/Avalonia.Themes.Default/Controls/Calendar.xaml
+++ b/src/Avalonia.Themes.Default/Controls/Calendar.xaml
@@ -1,12 +1,14 @@
 <!--
-// (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.
+  // (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.
 -->
 
-<Styles xmlns="https://github.com/avaloniaui">
-  <Style Selector="Calendar">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type Calendar}"
+                TargetType="Calendar">
     <!--<Setter Property="Focusable" Value="False" />-->
     <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}" />
     <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderHighBrush}" />
@@ -17,16 +19,14 @@
         <StackPanel Name="Root"
                     HorizontalAlignment="Center"
                     ClipToBounds="True">
-
-                    <CalendarItem Name="CalendarItem"
+          <CalendarItem Name="CalendarItem"
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
                         CornerRadius="{TemplateBinding CornerRadius}"
-                        HeaderBackground="{TemplateBinding HeaderBackground}"/>
-
+                        HeaderBackground="{TemplateBinding HeaderBackground}" />
         </StackPanel>
       </ControlTemplate>
     </Setter>
-  </Style>
-</Styles>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/CalendarButton.xaml b/src/Avalonia.Themes.Default/Controls/CalendarButton.xaml
index 3314534b3b..59fb24663f 100644
--- a/src/Avalonia.Themes.Default/Controls/CalendarButton.xaml
+++ b/src/Avalonia.Themes.Default/Controls/CalendarButton.xaml
@@ -1,81 +1,73 @@
 <!--
-// (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.
+  // (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.
 -->
 
-<Styles xmlns="https://github.com/avaloniaui">
-  <Style Selector="CalendarButton">
-    <Setter Property="Foreground" Value="{DynamicResource ThemeBorderHighBrush}" />
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type CalendarButton}"
+                TargetType="CalendarButton">
+    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
     <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush2}" />
     <Setter Property="FontSize" Value="{DynamicResource FontSizeSmall}" />
     <Setter Property="HorizontalContentAlignment" Value="Center" />
     <Setter Property="VerticalContentAlignment" Value="Center" />
     <Setter Property="MinWidth" Value="37" />
     <Setter Property="MinHeight" Value="38" />
-    <Setter Property="Focusable" Value="False"/>
+    <Setter Property="Focusable" Value="False" />
     <Setter Property="Template">
       <ControlTemplate>
         <Grid>
 
           <Rectangle Name="SelectedBackground"
-                     Opacity="0.75"
-                     Fill="{TemplateBinding Background}"/>
+                     Fill="{TemplateBinding Background}"
+                     IsVisible="False"
+                     Opacity="0.75" />
 
           <Rectangle Name="Background"
-                     Opacity="0.5"
-                     Fill="{TemplateBinding Background}"/>
+                     Fill="{TemplateBinding Background}"
+                     IsVisible="False"
+                     Opacity="0.5" />
 
-          <!--Focusable="False"-->
+          <!--  Focusable="False"  -->
           <ContentControl Name="Content"
-                          Foreground="{TemplateBinding Foreground}"
-                          ContentTemplate="{TemplateBinding ContentTemplate}"
-                          Content="{TemplateBinding Content}"
+                          Margin="1,0,1,1"
                           HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                           VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                          Content="{TemplateBinding Content}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
                           FontSize="{TemplateBinding FontSize}"
-                          Margin="1,0,1,1"/>
+                          Foreground="{TemplateBinding Foreground}" />
 
           <Rectangle Name="FocusVisual"
-                     StrokeThickness="1"
+                     IsHitTestVisible="False"
+                     IsVisible="False"
                      Stroke="{DynamicResource HighlightBrush}"
-                     IsHitTestVisible="False"/>
+                     StrokeThickness="1" />
 
         </Grid>
       </ControlTemplate>
     </Setter>
-  </Style>
-
-  <Style Selector="CalendarButton /template/ Rectangle#Background">
-    <Setter Property="IsVisible" Value="False"/>
-  </Style>
-  <Style Selector="CalendarButton:pointerover /template/ Rectangle#Background">
-    <Setter Property="IsVisible" Value="True"/>
-  </Style>
-  <Style Selector="CalendarButton:pressed /template/ Rectangle#Background">
-    <Setter Property="IsVisible" Value="True"/>
-  </Style>
 
-  <Style Selector="CalendarButton /template/ Rectangle#SelectedBackground">
-    <Setter Property="IsVisible" Value="False"/>
-  </Style>
-  <Style Selector="CalendarButton:selected /template/ Rectangle#SelectedBackground">
-    <Setter Property="IsVisible" Value="True"/>
-  </Style>
+    <Style Selector="^:pointerover /template/ Rectangle#Background">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
+    <Style Selector="^:pressed /template/ Rectangle#Background">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
 
-  <Style Selector="CalendarButton /template/ ContentControl#Content">
-    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
-  </Style>
-  <Style Selector="CalendarButton:inactive /template/ ContentControl#Content">
-    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundLowBrush}"/>
-  </Style>
+    <Style Selector="^:selected /template/ Rectangle#SelectedBackground">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
 
+    <Style Selector="^:inactive /template/ ContentControl#Content">
+      <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundLowBrush}" />
+    </Style>
 
-  <Style Selector="CalendarButton /template/ Rectangle#FocusVisual">
-    <Setter Property="IsVisible" Value="False"/>
-  </Style>
-  <Style Selector="CalendarButton:btnfocused /template/ Rectangle#FocusVisual">
-    <Setter Property="IsVisible" Value="True"/>
-  </Style>
-</Styles>
+    <Style Selector="^:btnfocused /template/ Rectangle#FocusVisual">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/CalendarDatePicker.xaml b/src/Avalonia.Themes.Default/Controls/CalendarDatePicker.xaml
index 3e2e497d2c..43fc8c7a34 100644
--- a/src/Avalonia.Themes.Default/Controls/CalendarDatePicker.xaml
+++ b/src/Avalonia.Themes.Default/Controls/CalendarDatePicker.xaml
@@ -1,20 +1,21 @@
 <!--
-// (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.
+  // (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.
 -->
 
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:sys="clr-namespace:System;assembly=netstandard">
-  <Style Selector="CalendarDatePicker">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:sys="using:System"
+                    x:CompileBindings="True">
+  <ControlTheme x:Key="{x:Type CalendarDatePicker}"
+                TargetType="CalendarDatePicker">
+    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}" />
+    <Setter Property="Padding" Value="4" />
 
-    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
-    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}"/>
-    <Setter Property="Padding" Value="4"/>
-    
     <Setter Property="Template">
       <ControlTemplate>
         <Grid ColumnDefinitions="*,Auto">
@@ -24,110 +25,115 @@
             <Style Selector="Button.CalendarDropDown">
               <Setter Property="Template">
                 <ControlTemplate>
-                  <Grid Height="18"
-                        Width="19"
+                  <Grid Width="19"
+                        Height="18"
+                        Margin="0"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
-                        Margin="0"
                         Background="{DynamicResource ThemeControlLowBrush}"
+                        ClipToBounds="False"
                         ColumnDefinitions="*,*,*,*"
-                        RowDefinitions="23*,19*,19*,19*"
-                        ClipToBounds="False">
+                        RowDefinitions="23*,19*,19*,19*">
 
                     <Border Name="Highlight"
-                            Margin="-1"
-                            Grid.ColumnSpan="4"
                             Grid.Row="0"
                             Grid.RowSpan="4"
-                            BorderThickness="1"
-                            BorderBrush="{DynamicResource HighlightBrush}" />
-                    <Border Name="Background"
-                            Margin="0,-1,0,0"
                             Grid.ColumnSpan="4"
+                            Margin="-1"
+                            BorderBrush="{DynamicResource HighlightBrush}"
+                            BorderThickness="1" />
+                    <Border Name="Background"
                             Grid.Row="1"
                             Grid.RowSpan="3"
-                            BorderThickness="1"
+                            Grid.ColumnSpan="4"
+                            Margin="0,-1,0,0"
                             BorderBrush="{DynamicResource ThemeBorderHighBrush}"
+                            BorderThickness="1"
                             CornerRadius=".5" />
-                    <Rectangle Grid.ColumnSpan="4"
-                               Grid.RowSpan="1"
-                               StrokeThickness="1"
+                    <Rectangle Grid.RowSpan="1"
+                               Grid.ColumnSpan="4"
+                               Fill="{DynamicResource ThemeAccentBrush}"
                                Stroke="{DynamicResource ThemeBorderHighBrush}"
-                               Fill="{DynamicResource ThemeAccentBrush}">
-                    </Rectangle>
-                    <TextBlock Margin="0,-1,0,0"
-                               VerticalAlignment="Center"
-                               HorizontalAlignment="Center"
+                               StrokeThickness="1" />
+                    <TextBlock Grid.Row="1"
+                               Grid.RowSpan="3"
                                Grid.Column="0"
-                               Grid.Row="1"
                                Grid.ColumnSpan="4"
-                               Grid.RowSpan="3"
+                               Margin="0,-1,0,0"
+                               HorizontalAlignment="Center"
+                               VerticalAlignment="Center"
                                FontSize="{DynamicResource FontSizeSmall}"
                                Foreground="{DynamicResource ThemeBorderHighBrush}"
-                               Text="{Binding Source={x:Static sys:DateTime.Today}, Path=Day}"/>
+                               Text="{Binding Source={x:Static sys:DateTime.Today}, Path=Day}" />
 
-                    <Ellipse HorizontalAlignment="Center" VerticalAlignment="Center" Fill="{DynamicResource ThemeControlLowBrush}" StrokeThickness="0" Grid.ColumnSpan="4" Width="3" Height="3"/>
+                    <Ellipse Grid.ColumnSpan="4"
+                             Width="3"
+                             Height="3"
+                             HorizontalAlignment="Center"
+                             VerticalAlignment="Center"
+                             Fill="{DynamicResource ThemeControlLowBrush}"
+                             StrokeThickness="0" />
                   </Grid>
                 </ControlTemplate>
               </Setter>
             </Style>
 
             <Style Selector="Button.CalendarDropDown /template/ Border#Highlight">
-              <Setter Property="IsVisible" Value="False"/>
+              <Setter Property="IsVisible" Value="False" />
             </Style>
             <Style Selector="Button.CalendarDropDown:pressed /template/ Border#Highlight">
-              <Setter Property="IsVisible" Value="True"/>
+              <Setter Property="IsVisible" Value="True" />
             </Style>
 
             <Style Selector="Button.CalendarDropDown:pointerover /template/ Border#Background">
-              <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush4}"/>
+              <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush4}" />
             </Style>
-            
+
           </Grid.Styles>
-          
+
           <TextBox Name="PART_TextBox"
-                   Background="{TemplateBinding Background}" 
-                   BorderBrush="{TemplateBinding BorderBrush}" 
+                   Grid.Column="0"
+                   Padding="{TemplateBinding Padding}"
+                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                   VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                   Background="{TemplateBinding Background}"
+                   BorderBrush="{TemplateBinding BorderBrush}"
                    BorderThickness="{TemplateBinding BorderThickness}"
                    CornerRadius="{TemplateBinding CornerRadius}"
-                   Padding="{TemplateBinding Padding}"
-                   Watermark="{TemplateBinding Watermark}"
-                   UseFloatingWatermark="{TemplateBinding UseFloatingWatermark}"
                    DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
-                   VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                   Grid.Column="0"/>
+                   UseFloatingWatermark="{TemplateBinding UseFloatingWatermark}"
+                   Watermark="{TemplateBinding Watermark}" />
 
           <Button Name="PART_Button"
                   Grid.Column="1"
                   Width="20"
-                  Classes="CalendarDropDown"
-                  Foreground="{TemplateBinding Foreground}"
-                  Background="Transparent"
-                  BorderThickness="0"
                   Margin="2,0,2,0"
                   Padding="0"
+                  Background="Transparent"
+                  BorderThickness="0"
+                  Classes="CalendarDropDown"
                   ClipToBounds="False"
-                  Focusable="False"/>
+                  Focusable="False"
+                  Foreground="{TemplateBinding Foreground}" />
 
           <Popup Name="PART_Popup"
                  PlacementTarget="{TemplateBinding}"
                  StaysOpen="False">
             <Calendar Name="PART_Calendar"
-                      FirstDayOfWeek="{TemplateBinding FirstDayOfWeek}"
-                      IsTodayHighlighted="{TemplateBinding IsTodayHighlighted}"
-                      SelectedDate="{TemplateBinding SelectedDate, Mode=TwoWay}"
                       DisplayDate="{TemplateBinding DisplayDate}"
+                      DisplayDateEnd="{TemplateBinding DisplayDateEnd}"
                       DisplayDateStart="{TemplateBinding DisplayDateStart}"
-                      DisplayDateEnd="{TemplateBinding DisplayDateEnd}" />
+                      FirstDayOfWeek="{TemplateBinding FirstDayOfWeek}"
+                      IsTodayHighlighted="{TemplateBinding IsTodayHighlighted}"
+                      SelectedDate="{TemplateBinding SelectedDate,
+                                                     Mode=TwoWay}" />
           </Popup>
         </Grid>
       </ControlTemplate>
     </Setter>
-  </Style>
 
-  <Style Selector="CalendarDatePicker:focus /template/ TextBox#PART_TextBox">
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderHighBrush}"/>
-  </Style>
-  
-</Styles>
+    <Style Selector="^:focus /template/ TextBox#PART_TextBox">
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderHighBrush}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/CalendarDayButton.xaml b/src/Avalonia.Themes.Default/Controls/CalendarDayButton.xaml
index 2d79e62a75..0973a3b752 100644
--- a/src/Avalonia.Themes.Default/Controls/CalendarDayButton.xaml
+++ b/src/Avalonia.Themes.Default/Controls/CalendarDayButton.xaml
@@ -1,116 +1,105 @@
 <!--
-// (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.
+  // (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.
 -->
 
-<Styles xmlns="https://github.com/avaloniaui">
-  <Style Selector="CalendarDayButton">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type CalendarDayButton}"
+                TargetType="CalendarDayButton">
     <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush2}" />
+    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
     <Setter Property="FontSize" Value="{DynamicResource FontSizeSmall}" />
     <Setter Property="HorizontalContentAlignment" Value="Center" />
     <Setter Property="VerticalContentAlignment" Value="Center" />
     <Setter Property="MinWidth" Value="5" />
     <Setter Property="MinHeight" Value="5" />
-    <Setter Property="Focusable" Value="False"/>
+    <Setter Property="Focusable" Value="False" />
     <Setter Property="Template">
       <ControlTemplate>
         <Panel Background="Transparent">
 
           <Rectangle Name="TodayBackground"
-                     Fill="{DynamicResource HighlightBrush}"/>
+                     Fill="{DynamicResource HighlightBrush}"
+                     IsVisible="False" />
 
           <Rectangle Name="SelectedBackground"
-                     Opacity="0.75"
-                     Fill="{TemplateBinding Background}"/>
+                     Fill="{TemplateBinding Background}"
+                     IsVisible="False"
+                     Opacity="0.75" />
 
           <Rectangle Name="Background"
-                     Opacity="0.5"
-                     Fill="{TemplateBinding Background}"/>
+                     Fill="{TemplateBinding Background}"
+                     IsVisible="False"
+                     Opacity="0.5" />
 
           <ContentControl Name="Content"
-                          ContentTemplate="{TemplateBinding ContentTemplate}"
-                          Content="{TemplateBinding Content}"
+                          Margin="5,1,5,1"
                           HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                           VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                          Content="{TemplateBinding Content}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
                           FontSize="{TemplateBinding FontSize}"
-                          Margin="5,1,5,1"/>
+                          Foreground="{TemplateBinding Foreground}"
+                          Opacity="1" />
 
           <Path Name="BlackoutVisual"
                 Margin="3"
                 HorizontalAlignment="Stretch"
                 VerticalAlignment="Stretch"
-                RenderTransformOrigin="0.5,0.5"
+                Data="M8.1772461,11.029181 L10.433105,11.029181 L11.700684,12.801641 L12.973633,11.029181 L15.191895,11.029181 L12.844727,13.999395 L15.21875,17.060919 L12.962891,17.060919 L11.673828,15.256231 L10.352539,17.060919 L8.1396484,17.060919 L10.519043,14.042364 z"
                 Fill="{DynamicResource ThemeForegroundBrush}"
-                Stretch="Fill"
-                Data="M8.1772461,11.029181 L10.433105,11.029181 L11.700684,12.801641 L12.973633,11.029181 L15.191895,11.029181 L12.844727,13.999395 L15.21875,17.060919 L12.962891,17.060919 L11.673828,15.256231 L10.352539,17.060919 L8.1396484,17.060919 L10.519043,14.042364 z" />
-          
+                IsVisible="False"
+                RenderTransformOrigin="0.5,0.5"
+                Stretch="Fill" />
+
           <Rectangle Name="FocusVisual"
-                     StrokeThickness="1"
+                     IsHitTestVisible="False"
+                     IsVisible="False"
                      Stroke="{DynamicResource HighlightBrush}"
-                     IsHitTestVisible="False"/>
+                     StrokeThickness="1" />
 
         </Panel>
       </ControlTemplate>
     </Setter>
-  </Style>
-
-  <Style Selector="CalendarDayButton /template/ Rectangle#Background">
-    <Setter Property="IsVisible" Value="False"/>
-  </Style>
-  <Style Selector="CalendarDayButton:pointerover /template/ Rectangle#Background">
-    <Setter Property="IsVisible" Value="True"/>
-  </Style>
-  <Style Selector="CalendarDayButton:pressed /template/ Rectangle#Background">
-    <Setter Property="IsVisible" Value="True"/>
-  </Style>
-
-  <Style Selector="CalendarDayButton /template/ Rectangle#SelectedBackground">
-    <Setter Property="IsVisible" Value="False"/>
-  </Style>
-  <Style Selector="CalendarDayButton:selected /template/ Rectangle#SelectedBackground">
-    <Setter Property="IsVisible" Value="True"/>
-  </Style>
-
-  <Style Selector="CalendarDayButton /template/ ContentControl#Content">
-    <Setter Property="Opacity" Value="1"/>
-    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
-  </Style>
-  <Style Selector="CalendarDayButton:disabled /template/ Rectangle#Background">
-    <Setter Property="IsVisible" Value="False"/>
-  </Style>
-  <Style Selector="CalendarDayButton:disabled /template/ ContentControl#Content">
-    <Setter Property="Opacity" Value="0.3"/>
-  </Style>
-
-  <Style Selector="CalendarDayButton /template/ Rectangle#FocusVisual">
-    <Setter Property="IsVisible" Value="False"/>
-  </Style>
-  <Style Selector="CalendarDayButton:dayfocused /template/ Rectangle#FocusVisual">
-    <Setter Property="IsVisible" Value="True"/>
-  </Style>
-
-  <Style Selector="CalendarDayButton /template/ Rectangle#TodayBackground">
-    <Setter Property="IsVisible" Value="False"/>
-  </Style>
-  <Style Selector="CalendarDayButton:today /template/ Rectangle#TodayBackground">
-    <Setter Property="IsVisible" Value="True"/>
-  </Style>
-
-
-  <Style Selector="CalendarDayButton:inactive /template/ ContentControl#Content">
-    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundLowBrush}"/>
-  </Style>
-  <Style Selector="CalendarDayButton:today /template/ ContentControl#Content">
-    <Setter Property="Foreground" Value="{DynamicResource ThemeControlLowBrush}"/>
-  </Style>
-
-  <Style Selector="CalendarDayButton /template/ Path#BlackoutVisual">
-    <Setter Property="Opacity" Value="0"/>
-  </Style>
-  <Style Selector="CalendarDayButton:blackout /template/ Path#BlackoutVisual">
-    <Setter Property="Opacity" Value="0.3"/>
-  </Style>  
 
-</Styles>
+    <Style Selector="^:pointerover /template/ Rectangle#Background">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
+    <Style Selector="^:pressed /template/ Rectangle#Background">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
+
+    <Style Selector="^:selected /template/ Rectangle#SelectedBackground">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
+
+    <Style Selector="^:disabled /template/ Rectangle#Background">
+      <Setter Property="IsVisible" Value="False" />
+    </Style>
+    <Style Selector="^:disabled /template/ ContentControl#Content">
+      <Setter Property="Opacity" Value="0.3" />
+    </Style>
+
+    <Style Selector="^:dayfocused /template/ Rectangle#FocusVisual">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
+
+    <Style Selector="^:today /template/ Rectangle#TodayBackground">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
+
+    <Style Selector="^:inactive /template/ ContentControl#Content">
+      <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundLowBrush}" />
+    </Style>
+    <Style Selector="^:today /template/ ContentControl#Content">
+      <Setter Property="Foreground" Value="{DynamicResource ThemeControlLowBrush}" />
+    </Style>
+
+    <Style Selector="^:blackout /template/ Path#BlackoutVisual">
+      <Setter Property="Opacity" Value="0.3" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/CalendarItem.xaml b/src/Avalonia.Themes.Default/Controls/CalendarItem.xaml
index 5b7ae5061a..e06034fe09 100644
--- a/src/Avalonia.Themes.Default/Controls/CalendarItem.xaml
+++ b/src/Avalonia.Themes.Default/Controls/CalendarItem.xaml
@@ -1,26 +1,27 @@
 <!--
-// (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.
+  // (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.
 -->
 
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Style Selector="CalendarItem">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type CalendarItem}"
+                TargetType="CalendarItem">
     <Setter Property="CornerRadius" Value="1" />
     <Setter Property="Template">
       <ControlTemplate>
         <Panel>
-          <Border BorderThickness="{TemplateBinding BorderThickness}"
-                  CornerRadius="{TemplateBinding CornerRadius}"
-                  BorderBrush="{TemplateBinding BorderBrush}"
+          <Border Margin="0,2,0,2"
                   Background="{TemplateBinding Background}"
-                  Margin="0,2,0,2">
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
 
-            <Border CornerRadius="1"
-                    BorderBrush="{DynamicResource ThemeBackgroundBrush}"
-                    BorderThickness="2">
+            <Border BorderBrush="{DynamicResource ThemeBackgroundBrush}"
+                    BorderThickness="2"
+                    CornerRadius="1">
               <Grid>
                 <Grid.RowDefinitions>
                   <RowDefinition Height="Auto" />
@@ -34,81 +35,81 @@
 
                 <Grid.Styles>
                   <Style Selector="Button.CalendarHeader">
-                    <Setter Property="Cursor" Value="Hand"/>
-                    <Setter Property="Background" Value="Transparent"/>
-                    <Setter Property="BorderThickness" Value="0"/>
+                    <Setter Property="Cursor" Value="Hand" />
+                    <Setter Property="Background" Value="Transparent" />
+                    <Setter Property="BorderThickness" Value="0" />
                   </Style>
-                    <Style Selector="Button.CalendarHeader:pressed  /template/ ContentPresenter">
-                    <Setter Property="Background" Value="Transparent"/>
+                  <Style Selector="Button.CalendarHeader:pressed  /template/ ContentPresenter">
+                    <Setter Property="Background" Value="Transparent" />
                   </Style>
 
                   <Style Selector="Button.CalendarNavigation">
-                    <Setter Property="Height" Value="20"/>
-                    <Setter Property="Width" Value="28"/>
+                    <Setter Property="Height" Value="20" />
+                    <Setter Property="Width" Value="28" />
                   </Style>
                   <Style Selector="Button.CalendarNavigation > Path">
-                    <Setter Property="Fill" Value="{DynamicResource ThemeForegroundBrush}"/>
+                    <Setter Property="Fill" Value="{DynamicResource ThemeForegroundBrush}" />
                   </Style>
                   <Style Selector="Button.CalendarNavigation:pointerover > Path">
-                    <Setter Property="Fill" Value="{DynamicResource HighlightBrush}"/>
+                    <Setter Property="Fill" Value="{DynamicResource HighlightBrush}" />
                   </Style>
 
                   <Style Selector="Button#HeaderButton:pointerover">
-                    <Setter Property="Foreground" Value="{DynamicResource HighlightBrush}"/>
+                    <Setter Property="Foreground" Value="{DynamicResource HighlightBrush}" />
                   </Style>
                 </Grid.Styles>
 
                 <Rectangle Grid.ColumnSpan="3"
-                           Fill="{TemplateBinding HeaderBackground}"
-                           Stretch="Fill"
+                           Height="22"
                            VerticalAlignment="Top"
-                           Height="22"/>
+                           Fill="{TemplateBinding HeaderBackground}"
+                           Stretch="Fill" />
 
                 <Button Name="PreviousButton"
+                        HorizontalAlignment="Left"
                         Classes="CalendarHeader CalendarNavigation"
-                        IsVisible="False"
-                        HorizontalAlignment="Left">
+                        IsVisible="False">
 
-                  <Path Margin="14,-6,0,0"
+                  <Path Width="6"
                         Height="10"
-                        Width="6"
-                        VerticalAlignment="Center"
+                        Margin="14,-6,0,0"
                         HorizontalAlignment="Left"
-                        Stretch="Fill"
-                        Data="M288.75,232.25 L288.75,240.625 L283,236.625 z" />
-                  
+                        VerticalAlignment="Center"
+                        Data="M288.75,232.25 L288.75,240.625 L283,236.625 z"
+                        Stretch="Fill" />
+
                 </Button>
-                
+
                 <Button Name="HeaderButton"
-                        Classes="CalendarHeader"
                         Grid.Column="1"
-                        FontWeight="Bold"
-                        FontSize="10.5"
+                        Padding="1,5,1,9"
                         HorizontalAlignment="Center"
-                        VerticalAlignment="Center" 
-                        Padding="1,5,1,9"/>
+                        VerticalAlignment="Center"
+                        Classes="CalendarHeader"
+                        FontSize="10.5"
+                        FontWeight="Bold" />
 
                 <Button Name="NextButton"
-                        Classes="CalendarHeader CalendarNavigation"
                         Grid.Column="2"
-                        IsVisible="False"
-                        HorizontalAlignment="Right" >
+                        HorizontalAlignment="Right"
+                        Classes="CalendarHeader CalendarNavigation"
+                        IsVisible="False">
 
-                  <Path Margin="0,-6,14,0"
+                  <Path Width="6"
                         Height="10"
-                        Width="6"
-                        Stretch="Fill"
-                        VerticalAlignment="Center"
+                        Margin="0,-6,14,0"
                         HorizontalAlignment="Right"
-                        Data="M282.875,231.875 L282.875,240.375 L288.625,236 z" />
-                  
+                        VerticalAlignment="Center"
+                        Data="M282.875,231.875 L282.875,240.375 L288.625,236 z"
+                        Stretch="Fill" />
+
                 </Button>
 
                 <Grid Name="MonthView"
                       Grid.Row="1"
                       Grid.ColumnSpan="3"
-                      IsVisible="False"
-                      Margin="6,-1,6,6">
+                      Margin="6,-1,6,6"
+                      IsVisible="False">
                   <Grid.RowDefinitions>
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
@@ -132,8 +133,8 @@
                 <Grid Name="YearView"
                       Grid.Row="1"
                       Grid.ColumnSpan="3"
-                      IsVisible="False"
-                      Margin="6,-3,7,6">
+                      Margin="6,-3,7,6"
+                      IsVisible="False">
                   <Grid.RowDefinitions>
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
@@ -146,39 +147,33 @@
                     <ColumnDefinition Width="Auto" />
                   </Grid.ColumnDefinitions>
                 </Grid>
-
               </Grid>
             </Border>
           </Border>
 
-
           <Rectangle Name="DisabledVisual"
-                     Stretch="Fill"
+                     Margin="0,2,0,2"
                      Fill="{DynamicResource ThemeControlLowBrush}"
+                     IsVisible="False"
                      Opacity="{DynamicResource ThemeDisabledOpacity}"
-                     Margin="0,2,0,2" />
+                     Stretch="Fill" />
 
         </Panel>
       </ControlTemplate>
     </Setter>
     <Setter Property="DayTitleTemplate">
       <Template>
-        <TextBlock FontWeight="Bold"
-                   FontSize="9.5"
-                   Margin="0,4,0,4"
+        <TextBlock Margin="0,4,0,4"
                    HorizontalAlignment="Center"
                    VerticalAlignment="Center"
+                   FontSize="9.5"
+                   FontWeight="Bold"
                    Text="{Binding}" />
       </Template>
-
     </Setter>
-  </Style>
-
-  <Style Selector="CalendarItem /template/ Rectangle#DisabledVisual">
-    <Setter Property="IsVisible" Value="False"/>
-  </Style>
-  <Style Selector="CalendarItem:calendardisabled /template/ Rectangle#DisabledVisual">
-    <Setter Property="IsVisible" Value="True"/>
-  </Style>
-  
-</Styles>
+
+    <Style Selector="^:calendardisabled /template/ Rectangle#DisabledVisual">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/CaptionButtons.xaml b/src/Avalonia.Themes.Default/Controls/CaptionButtons.xaml
index be6642467f..adc02b7c3c 100644
--- a/src/Avalonia.Themes.Default/Controls/CaptionButtons.xaml
+++ b/src/Avalonia.Themes.Default/Controls/CaptionButtons.xaml
@@ -1,73 +1,106 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Style Selector="CaptionButtons">
-    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>    
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Design.PreviewWith>
+    <Border Padding="20">
+      <StackPanel Spacing="20">
+        <CaptionButtons Height="30" />
+      </StackPanel>
+    </Border>
+  </Design.PreviewWith>
+
+  <ControlTheme x:Key="DefaultCaptionButton"
+                TargetType="Button">
+    <Setter Property="Background" Value="#ffe5e5e5" />
+    <!--  Reusing BorderBrush to define pressed background color, as it's not used otherwise  -->
+    <Setter Property="BorderBrush" Value="#ffcacaca" />
+    <Setter Property="Foreground" Value="Black" />
+    <Setter Property="Width" Value="45" />
+    <Setter Property="VerticalAlignment" Value="Stretch" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ContentPresenter Name="PART_ContentPresenter"
+                          Background="Transparent"
+                          Content="{TemplateBinding Content}" />
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^:pointerover /template/ ContentPresenter">
+      <Setter Property="Background" Value="{TemplateBinding Background}" />
+    </Style>
+
+    <Style Selector="^:pressed /template/ ContentPresenter">
+      <Setter Property="Background" Value="{TemplateBinding BorderBrush}" />
+    </Style>
+  </ControlTheme>
+
+  <ControlTheme x:Key="{x:Type CaptionButtons}"
+                TargetType="CaptionButtons">
     <Setter Property="MaxHeight" Value="30" />
     <Setter Property="Template">
       <ControlTemplate>
-        <StackPanel Spacing="2" VerticalAlignment="Stretch" TextElement.FontSize="10" Orientation="Horizontal">
-          <StackPanel.Styles>
-            <Style Selector="Panel">
-              <Setter Property="Width" Value="45" />
-              <Setter Property="Background" Value="Transparent" />
-            </Style>
-            <Style Selector="Panel:pointerover">
-              <Setter Property="Background" Value="#7F7f7f7f" />
-            </Style>
-            <Style Selector="Panel#PART_CloseButton:pointerover">
-              <Setter Property="Background" Value="#7FFF0000" />
-            </Style>
-            <Style Selector="Viewbox">
-              <Setter Property="Width" Value="11" />
-              <Setter Property="Margin" Value="2" />
-            </Style>
-          </StackPanel.Styles>
-          <Panel x:Name="PART_FullScreenButton">
-            <Viewbox>
-              <Path Stretch="UniformToFill" Fill="{TemplateBinding Foreground}" />
+        <StackPanel VerticalAlignment="Stretch"
+                    Orientation="Horizontal"
+                    Spacing="2"
+                    TextElement.FontSize="10">
+          <Button x:Name="PART_FullScreenButton"
+                  IsVisible="False"
+                  Theme="{StaticResource DefaultCaptionButton}">
+            <Viewbox Width="11"
+                     Margin="2">
+              <Path Name="FullScreenButtonPath"
+                    Data="M2048 2048v-819h-205v469l-1493 -1493h469v-205h-819v819h205v-469l1493 1493h-469v205h819z"
+                    Fill="{TemplateBinding Foreground}"
+                    Stretch="UniformToFill" />
             </Viewbox>
-          </Panel>
-
-          <Panel x:Name="PART_MinimiseButton">
-            <Viewbox>
-              <Path Stretch="UniformToFill" Fill="{TemplateBinding Foreground}" Data="M2048 1229v-205h-2048v205h2048z" />
+          </Button>
+          <Button x:Name="PART_MinimiseButton"
+                  Theme="{StaticResource DefaultCaptionButton}">
+            <Viewbox Width="11"
+                     Margin="2">
+              <Path Data="M2048 1229v-205h-2048v205h2048z"
+                    Fill="{TemplateBinding Foreground}"
+                    Stretch="UniformToFill" />
             </Viewbox>
-          </Panel>
-
-          <Panel x:Name="PART_RestoreButton">
-            <Viewbox>
+          </Button>
+          <Button x:Name="PART_RestoreButton"
+                  Theme="{StaticResource DefaultCaptionButton}">
+            <Viewbox Width="11"
+                     Margin="2">
               <Viewbox.RenderTransform>
                 <RotateTransform Angle="-90" />
               </Viewbox.RenderTransform>
-              <Path Stretch="UniformToFill" Fill="{TemplateBinding Foreground}"/>
+              <Path Name="RestoreButtonPath"
+                    Data="M2048 2048v-2048h-2048v2048h2048zM1843 1843h-1638v-1638h1638v1638z"
+                    Fill="{TemplateBinding Foreground}"
+                    Stretch="UniformToFill" />
             </Viewbox>
-          </Panel>
-
-          <Panel x:Name="PART_CloseButton">
-            <Viewbox>
-              <Path Stretch="UniformToFill" Fill="{TemplateBinding Foreground}" Data="M1169 1024l879 -879l-145 -145l-879 879l-879 -879l-145 145l879 879l-879 879l145 145l879 -879l879 879l145 -145z" />
+          </Button>
+          <Button x:Name="PART_CloseButton"
+                  Background="#ffe81123"
+                  BorderBrush="#fff1707a"
+                  Theme="{StaticResource DefaultCaptionButton}">
+            <Viewbox Width="11"
+                     Margin="2">
+              <Path Data="M1169 1024l879 -879l-145 -145l-879 879l-879 -879l-145 145l879 879l-879 879l145 145l879 -879l879 879l145 -145z"
+                    Fill="{TemplateBinding Foreground}"
+                    Stretch="UniformToFill" />
             </Viewbox>
-          </Panel>
+          </Button>
         </StackPanel>
       </ControlTemplate>
     </Setter>
-  </Style>
-  <Style Selector="CaptionButtons Panel#PART_RestoreButton Path">
-    <Setter Property="Data" Value="M2048 2048v-2048h-2048v2048h2048zM1843 1843h-1638v-1638h1638v1638z" />
-  </Style>
-  <Style Selector="CaptionButtons:maximized Panel#PART_RestoreButton Path">
-    <Setter Property="Data" Value="M2048 410h-410v-410h-1638v1638h410v410h1638v-1638zM1434 1434h-1229v-1229h1229v1229zM1843 1843h-1229v-205h1024v-1024h205v1229z" />
-  </Style>
-  <Style Selector="CaptionButtons Panel#PART_FullScreenButton">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-  <Style Selector="CaptionButtons Panel#PART_FullScreenButton Path">
-    <Setter Property="Data" Value="M2048 2048v-819h-205v469l-1493 -1493h469v-205h-819v819h205v-469l1493 1493h-469v205h819z" />
-  </Style>
-  <Style Selector="CaptionButtons:fullscreen Panel#PART_FullScreenButton Path">
-    <Setter Property="IsVisible" Value="True" />
-    <Setter Property="Data" Value="M205 1024h819v-819h-205v469l-674 -674l-145 145l674 674h-469v205zM1374 1229h469v-205h-819v819h205v-469l674 674l145 -145z" />
-  </Style>
-  <Style Selector="CaptionButtons:fullscreen Panel#PART_RestoreButton, CaptionButtons:fullscreen Panel#PART_MinimiseButton">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
- </Styles>
+    <Style Selector="^:maximized /template/ Path#RestoreButtonPath">
+      <Setter Property="Data" Value="M2048 410h-410v-410h-1638v1638h410v410h1638v-1638zM1434 1434h-1229v-1229h1229v1229zM1843 1843h-1229v-205h1024v-1024h205v1229z" />
+    </Style>
+    <Style Selector="^:fullscreen /template/ Path#PART_FullScreenButtonPath">
+      <Setter Property="IsVisible" Value="True" />
+      <Setter Property="Data" Value="M205 1024h819v-819h-205v469l-674 -674l-145 145l674 674h-469v205zM1374 1229h469v-205h-819v819h205v-469l674 674l145 -145z" />
+    </Style>
+    <Style Selector="^:fullscreen /template/ Panel#PART_RestoreButton">
+      <Setter Property="IsVisible" Value="False" />
+    </Style>
+    <Style Selector="^:fullscreen /template/ Panel#PART_MinimiseButton">
+      <Setter Property="IsVisible" Value="False" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/Carousel.xaml b/src/Avalonia.Themes.Default/Controls/Carousel.xaml
index baba0649aa..e79e3942c9 100644
--- a/src/Avalonia.Themes.Default/Controls/Carousel.xaml
+++ b/src/Avalonia.Themes.Default/Controls/Carousel.xaml
@@ -1,17 +1,21 @@
-<Style xmlns="https://github.com/avaloniaui" Selector="Carousel">
-  <Setter Property="Template">
-    <ControlTemplate>
-      <Border Background="{TemplateBinding Background}"
-              BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}"
-              CornerRadius="{TemplateBinding CornerRadius}">
-        <CarouselPresenter IsVirtualized="{TemplateBinding IsVirtualized}"
-                           Items="{TemplateBinding Items}"
-                           ItemsPanel="{TemplateBinding ItemsPanel}"
-                           Margin="{TemplateBinding Padding}"
-                           SelectedIndex="{TemplateBinding SelectedIndex}"
-                           PageTransition="{TemplateBinding PageTransition}"/>
-      </Border>
-    </ControlTemplate>
-  </Setter>
-</Style>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type Carousel}"
+                TargetType="Carousel">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <CarouselPresenter Margin="{TemplateBinding Padding}"
+                             IsVirtualized="{TemplateBinding IsVirtualized}"
+                             Items="{TemplateBinding Items}"
+                             ItemsPanel="{TemplateBinding ItemsPanel}"
+                             PageTransition="{TemplateBinding PageTransition}"
+                             SelectedIndex="{TemplateBinding SelectedIndex}" />
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/CheckBox.xaml b/src/Avalonia.Themes.Default/Controls/CheckBox.xaml
index 170ecdd5b8..10e0b883d5 100644
--- a/src/Avalonia.Themes.Default/Controls/CheckBox.xaml
+++ b/src/Avalonia.Themes.Default/Controls/CheckBox.xaml
@@ -1,72 +1,75 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Style Selector="CheckBox">
-    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
-    <Setter Property="Background" Value="Transparent"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
-    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}"/>
-    <Setter Property="Padding" Value="4,0,0,0"/>
-    <Setter Property="VerticalContentAlignment" Value="Center"/>
-    <Setter Property="HorizontalContentAlignment" Value="Left"/>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type CheckBox}"
+                TargetType="CheckBox">
+    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}" />
+    <Setter Property="Padding" Value="4,0,0,0" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="HorizontalContentAlignment" Value="Left" />
     <Setter Property="Template">
       <ControlTemplate>
         <Grid ColumnDefinitions="Auto,*">
           <Border Name="border"
+                  Width="18"
+                  Height="18"
+                  VerticalAlignment="Center"
                   Background="{TemplateBinding Background}"
                   BorderBrush="{TemplateBinding BorderBrush}"
                   BorderThickness="{TemplateBinding BorderThickness}"
-                  CornerRadius="{TemplateBinding CornerRadius}"
-                  Width="18"
-                  Height="18"
-                  VerticalAlignment="Center">
+                  CornerRadius="{TemplateBinding CornerRadius}">
             <Panel>
               <Path Name="checkMark"
-                    Fill="{DynamicResource HighlightBrush}"
                     Width="11"
                     Height="10"
-                    Stretch="Uniform"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
+                    Data="M 1145.607177734375,430 C1145.607177734375,430 1141.449951171875,435.0772705078125 1141.449951171875,435.0772705078125 1141.449951171875,435.0772705078125 1139.232177734375,433.0999755859375 1139.232177734375,433.0999755859375 1139.232177734375,433.0999755859375 1138,434.5538330078125 1138,434.5538330078125 1138,434.5538330078125 1141.482177734375,438 1141.482177734375,438 1141.482177734375,438 1141.96875,437.9375 1141.96875,437.9375 1141.96875,437.9375 1147,431.34619140625 1147,431.34619140625 1147,431.34619140625 1145.607177734375,430 1145.607177734375,430 z"
+                    Fill="{DynamicResource HighlightBrush}"
                     FlowDirection="LeftToRight"
-                    Data="M 1145.607177734375,430 C1145.607177734375,430 1141.449951171875,435.0772705078125 1141.449951171875,435.0772705078125 1141.449951171875,435.0772705078125 1139.232177734375,433.0999755859375 1139.232177734375,433.0999755859375 1139.232177734375,433.0999755859375 1138,434.5538330078125 1138,434.5538330078125 1138,434.5538330078125 1141.482177734375,438 1141.482177734375,438 1141.482177734375,438 1141.96875,437.9375 1141.96875,437.9375 1141.96875,437.9375 1147,431.34619140625 1147,431.34619140625 1147,431.34619140625 1145.607177734375,430 1145.607177734375,430 z"/>
+                    Stretch="Uniform" />
               <Rectangle Name="indeterminateMark"
-                         Fill="{DynamicResource HighlightBrush}"
                          Width="10"
                          Height="10"
-                         Stretch="Uniform"
                          HorizontalAlignment="Center"
-                         VerticalAlignment="Center"/>
+                         VerticalAlignment="Center"
+                         Fill="{DynamicResource HighlightBrush}"
+                         Stretch="Uniform" />
             </Panel>
           </Border>
           <ContentPresenter Name="PART_ContentPresenter"
-                            TextElement.Foreground="{TemplateBinding Foreground}"
-                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                            Content="{TemplateBinding Content}"
+                            Grid.Column="1"
                             Margin="{TemplateBinding Padding}"
-                            RecognizesAccessKey="True"
-                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            IsVisible="{TemplateBinding Content, Converter={x:Static ObjectConverters.IsNotNull}}"
-                            Grid.Column="1"/>
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            Content="{TemplateBinding Content}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            IsVisible="{TemplateBinding Content,
+                                                        Converter={x:Static ObjectConverters.IsNotNull}}"
+                            RecognizesAccessKey="True"
+                            TextElement.Foreground="{TemplateBinding Foreground}" />
         </Grid>
       </ControlTemplate>
     </Setter>
-  </Style>
-  <Style Selector="CheckBox:pointerover /template/ Border#border">
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderHighBrush}"/>
-  </Style>
-  <Style Selector="CheckBox /template/ Path#checkMark">
-    <Setter Property="IsVisible" Value="False"/>
-  </Style>
-  <Style Selector="CheckBox /template/ Rectangle#indeterminateMark">
-    <Setter Property="IsVisible" Value="False"/>
-  </Style>
-  <Style Selector="CheckBox:checked /template/ Path#checkMark">
-    <Setter Property="IsVisible" Value="True"/>
-  </Style>
-  <Style Selector="CheckBox:indeterminate /template/ Rectangle#indeterminateMark">
-    <Setter Property="IsVisible" Value="True"/>
-  </Style>
-  <Style Selector="CheckBox:disabled /template/ Border#border">
-    <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}"/>
-  </Style>
-</Styles>
+    <Style Selector="^:pointerover /template/ Border#border">
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderHighBrush}" />
+    </Style>
+    <Style Selector="^ /template/ Path#checkMark">
+      <Setter Property="IsVisible" Value="False" />
+    </Style>
+    <Style Selector="^ /template/ Rectangle#indeterminateMark">
+      <Setter Property="IsVisible" Value="False" />
+    </Style>
+    <Style Selector="^:checked /template/ Path#checkMark">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
+    <Style Selector="^:indeterminate /template/ Rectangle#indeterminateMark">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
+    <Style Selector="^:disabled /template/ Border#border">
+      <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/ComboBox.xaml b/src/Avalonia.Themes.Default/Controls/ComboBox.xaml
index 262f63e2d2..d7dabae516 100644
--- a/src/Avalonia.Themes.Default/Controls/ComboBox.xaml
+++ b/src/Avalonia.Themes.Default/Controls/ComboBox.xaml
@@ -1,23 +1,7 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Design.PreviewWith>
-    <Border Padding="20">
-      <StackPanel Spacing="10">
-        <ComboBox PlaceholderText="Select an item">
-          <ComboBoxItem>Item 1</ComboBoxItem>
-          <ComboBoxItem>Item 2</ComboBoxItem>
-        </ComboBox>
-        <ComboBox IsEnabled="False"
-                  Width="200"
-                  SelectedIndex="1"
-                  HorizontalContentAlignment="Center">
-          <ComboBoxItem>Item 1</ComboBoxItem>
-          <ComboBoxItem>Item 2</ComboBoxItem>
-        </ComboBox>
-      </StackPanel>
-    </Border>
-  </Design.PreviewWith>
-  <Style Selector="ComboBox">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type ComboBox}"
+                TargetType="ComboBox">
     <Setter Property="Background" Value="Transparent" />
     <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
     <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}" />
@@ -37,47 +21,50 @@
           <Grid ColumnDefinitions="*,Auto">
             <TextBlock Name="PlaceholderTextBlock"
                        Grid.Column="0"
+                       Margin="{TemplateBinding Padding}"
                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                       Margin="{TemplateBinding Padding}"
-                       Text="{TemplateBinding PlaceholderText}"
                        Foreground="{TemplateBinding PlaceholderForeground}"
-                       IsVisible="{TemplateBinding SelectionBoxItem, Converter={x:Static ObjectConverters.IsNull}}" />
-            <ContentControl Content="{TemplateBinding SelectionBoxItem}"
-                            ContentTemplate="{TemplateBinding ItemTemplate}"
-                            Margin="{TemplateBinding Padding}"
+                       IsVisible="{TemplateBinding SelectionBoxItem,
+                                                   Converter={x:Static ObjectConverters.IsNull}}"
+                       Text="{TemplateBinding PlaceholderText}" />
+            <ContentControl Margin="{TemplateBinding Padding}"
+                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                             VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" />
+                            Content="{TemplateBinding SelectionBoxItem}"
+                            ContentTemplate="{TemplateBinding ItemTemplate}" />
             <ToggleButton Name="toggle"
-                          BorderThickness="0"
+                          Grid.Column="1"
                           Background="Transparent"
+                          BorderThickness="0"
                           ClickMode="Press"
                           Focusable="False"
-                          IsChecked="{TemplateBinding IsDropDownOpen, Mode=TwoWay}"
-                          Grid.Column="1">
-              <Path Fill="{DynamicResource ThemeForegroundBrush}"
-                    Width="8"
+                          IsChecked="{TemplateBinding IsDropDownOpen,
+                                                      Mode=TwoWay}">
+              <Path Width="8"
                     Height="4"
-                    Stretch="Uniform"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
-                    Data="F1 M 301.14,-189.041L 311.57,-189.041L 306.355,-182.942L 301.14,-189.041 Z" />
+                    Data="F1 M 301.14,-189.041L 311.57,-189.041L 306.355,-182.942L 301.14,-189.041 Z"
+                    Fill="{DynamicResource ThemeForegroundBrush}"
+                    Stretch="Uniform" />
             </ToggleButton>
             <Popup Name="PART_Popup"
-                   IsOpen="{TemplateBinding IsDropDownOpen, Mode=TwoWay}"
                    MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
                    MaxHeight="{TemplateBinding MaxDropDownHeight}"
-                   PlacementTarget="{TemplateBinding}"
-                   IsLightDismissEnabled="True">
+                   IsLightDismissEnabled="True"
+                   IsOpen="{TemplateBinding IsDropDownOpen,
+                                            Mode=TwoWay}"
+                   PlacementTarget="{TemplateBinding}">
               <Border Background="{DynamicResource ThemeBackgroundBrush}"
-                      BorderBrush="{DynamicResource ThemeBorderMidBrush}"                      
+                      BorderBrush="{DynamicResource ThemeBorderMidBrush}"
                       BorderThickness="1">
                 <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
                               VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
                   <ItemsPresenter Name="PART_ItemsPresenter"
+                                  ItemTemplate="{TemplateBinding ItemTemplate}"
                                   Items="{TemplateBinding Items}"
                                   ItemsPanel="{TemplateBinding ItemsPanel}"
-                                  ItemTemplate="{TemplateBinding ItemTemplate}"
                                   VirtualizationMode="{TemplateBinding VirtualizationMode}" />
                 </ScrollViewer>
               </Border>
@@ -86,11 +73,11 @@
         </Border>
       </ControlTemplate>
     </Setter>
-  </Style>
-  <Style Selector="ComboBox:pointerover /template/ Border#border">
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderHighBrush}" />
-  </Style>
-  <Style Selector="ComboBox:disabled /template/ Border#border">
-    <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
-  </Style>
-</Styles>
+    <Style Selector="^:pointerover /template/ Border#border">
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderHighBrush}" />
+    </Style>
+    <Style Selector="^:disabled /template/ Border#border">
+      <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/ComboBoxItem.xaml b/src/Avalonia.Themes.Default/Controls/ComboBoxItem.xaml
index a694143bec..c3d8b6f900 100644
--- a/src/Avalonia.Themes.Default/Controls/ComboBoxItem.xaml
+++ b/src/Avalonia.Themes.Default/Controls/ComboBoxItem.xaml
@@ -1,42 +1,39 @@
-<Styles xmlns="https://github.com/avaloniaui">
-  <Style Selector="ComboBoxItem">
-    <Setter Property="Background" Value="Transparent"/>
-    <Setter Property="Padding" Value="2"/>
-    <Setter Property="HorizontalAlignment" Value="Stretch"/>
-    <Setter Property="HorizontalContentAlignment" Value="Left"/>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type ComboBoxItem}"
+                TargetType="ComboBoxItem">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="Padding" Value="2" />
+    <Setter Property="HorizontalAlignment" Value="Stretch" />
+    <Setter Property="HorizontalContentAlignment" Value="Left" />
     <Setter Property="Template">
       <ControlTemplate>
         <ContentPresenter Name="PART_ContentPresenter"
+                          Padding="{TemplateBinding Padding}"
+                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                           Background="{TemplateBinding Background}"
                           BorderBrush="{TemplateBinding BorderBrush}"
                           BorderThickness="{TemplateBinding BorderThickness}"
-                          CornerRadius="{TemplateBinding CornerRadius}"
-                          ContentTemplate="{TemplateBinding ContentTemplate}"
                           Content="{TemplateBinding Content}"
-                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                          Padding="{TemplateBinding Padding}"/>
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          CornerRadius="{TemplateBinding CornerRadius}" />
       </ControlTemplate>
     </Setter>
-  </Style>
-    
-  <Style Selector="ComboBoxItem:pointerover /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ThemeControlHighlightMidBrush}"/>
-  </Style>
-    
-  <Style Selector="ComboBoxItem:selected /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush4}"/>
-  </Style>
-    
-  <Style Selector="ComboBoxItem:selected:focus /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush3}"/>
-  </Style>
-    
-  <Style Selector="ComboBoxItem:selected:pointerover /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush3}"/>
-  </Style>
-
-  <Style Selector="ComboBoxItem:selected:focus:pointerover /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush2}"/>
-  </Style>
-</Styles>
+    <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ThemeControlHighlightMidBrush}" />
+    </Style>
+    <Style Selector="^:selected /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush4}" />
+    </Style>
+    <Style Selector="^:selected:focus /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush3}" />
+    </Style>
+    <Style Selector="^:selected:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush3}" />
+    </Style>
+    <Style Selector="^:selected:focus:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush2}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/ContentControl.xaml b/src/Avalonia.Themes.Default/Controls/ContentControl.xaml
index d32bc399b6..415b1dc721 100644
--- a/src/Avalonia.Themes.Default/Controls/ContentControl.xaml
+++ b/src/Avalonia.Themes.Default/Controls/ContentControl.xaml
@@ -1,16 +1,20 @@
-<Style xmlns="https://github.com/avaloniaui" Selector="ContentControl">
-  <Setter Property="Template">
-    <ControlTemplate>
-      <ContentPresenter Name="PART_ContentPresenter"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="{TemplateBinding CornerRadius}"
-                        ContentTemplate="{TemplateBinding ContentTemplate}"
-                        Content="{TemplateBinding Content}"
-                        Padding="{TemplateBinding Padding}"
-                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"/>
-    </ControlTemplate>
-  </Setter>
-</Style>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type ContentControl}"
+                TargetType="ContentControl">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ContentPresenter Name="PART_ContentPresenter"
+                          Padding="{TemplateBinding Padding}"
+                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          Content="{TemplateBinding Content}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          CornerRadius="{TemplateBinding CornerRadius}" />
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/ContextMenu.xaml b/src/Avalonia.Themes.Default/Controls/ContextMenu.xaml
index 987b72aaa2..baad686bd9 100644
--- a/src/Avalonia.Themes.Default/Controls/ContextMenu.xaml
+++ b/src/Avalonia.Themes.Default/Controls/ContextMenu.xaml
@@ -1,25 +1,29 @@
-<Style xmlns="https://github.com/avaloniaui" Selector="ContextMenu">
-    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
-    <Setter Property="BorderThickness" Value="1"/>
-    <Setter Property="Padding" Value="4,2"/>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type ContextMenu}"
+                TargetType="ContextMenu">
+    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="Padding" Value="4,2" />
     <Setter Property="TextBlock.FontSize" Value="{DynamicResource FontSizeNormal}" />
     <Setter Property="TextBlock.FontWeight" Value="Normal" />
     <Setter Property="Template">
-    <ControlTemplate>
-      <Border Background="{TemplateBinding Background}"
-              BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}"
-              CornerRadius="{TemplateBinding CornerRadius}"
-              Padding="{TemplateBinding Padding}">
-          <ScrollViewer Classes="menuscroller">
-              <ItemsPresenter Name="PART_ItemsPresenter"
-                              Items="{TemplateBinding Items}"
-                              ItemsPanel="{TemplateBinding ItemsPanel}"
-                              ItemTemplate="{TemplateBinding ItemTemplate}"
-                              KeyboardNavigation.TabNavigation="Continue"/>
+      <ControlTemplate>
+        <Border Padding="{TemplateBinding Padding}"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <ScrollViewer Theme="{StaticResource DefaultMenuScrollViewer}">
+            <ItemsPresenter Name="PART_ItemsPresenter"
+                            ItemTemplate="{TemplateBinding ItemTemplate}"
+                            Items="{TemplateBinding Items}"
+                            ItemsPanel="{TemplateBinding ItemsPanel}"
+                            KeyboardNavigation.TabNavigation="Continue" />
           </ScrollViewer>
-      </Border>
-    </ControlTemplate>
-  </Setter>
-</Style>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/DataValidationErrors.xaml b/src/Avalonia.Themes.Default/Controls/DataValidationErrors.xaml
index d7bf4bbbf1..da8ec03cd4 100644
--- a/src/Avalonia.Themes.Default/Controls/DataValidationErrors.xaml
+++ b/src/Avalonia.Themes.Default/Controls/DataValidationErrors.xaml
@@ -1,43 +1,48 @@
-<Style xmlns="https://github.com/avaloniaui" 
-       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-       Selector="DataValidationErrors"
-       x:CompileBindings="True"
-       x:DataType="DataValidationErrors">
-  <Setter Property="Template">
-    <ControlTemplate>
-      <DockPanel LastChildFill="True">
-        <ContentControl x:DataType="DataValidationErrors"
-                        DockPanel.Dock="Right"
-                        ContentTemplate="{TemplateBinding ErrorTemplate}"
-                        DataContext="{TemplateBinding Owner}"
-                        Content="{Binding (DataValidationErrors.Errors)}"
-                        IsVisible="{Binding (DataValidationErrors.HasErrors)}"/>
-        <ContentPresenter Name="PART_ContentPresenter"
-                          Background="{TemplateBinding Background}"
-                          BorderBrush="{TemplateBinding BorderBrush}"
-                          BorderThickness="{TemplateBinding BorderThickness}"
-                          CornerRadius="{TemplateBinding CornerRadius}"
-                          ContentTemplate="{TemplateBinding ContentTemplate}"
-                          Content="{TemplateBinding Content}"
-                          Padding="{TemplateBinding Padding}"/>
-      </DockPanel>
-    </ControlTemplate>
-  </Setter>
-  <Setter Property="ErrorTemplate">
-    <DataTemplate>
-      <Canvas Width="14" Height="14" Margin="4 0 1 0" 
-              Background="Transparent">
-        <Canvas.Styles>
-          <Style Selector="ToolTip">
-            <Setter Property="Background" Value="{DynamicResource ErrorLowBrush}"/>
-            <Setter Property="BorderBrush" Value="{DynamicResource ErrorBrush}"/>
-          </Style>
-        </Canvas.Styles>
-        <ToolTip.Tip>
-          <ItemsControl x:DataType="DataValidationErrors" Items="{Binding}"/>
-        </ToolTip.Tip>
-        <Path Data="M14,7 A7,7 0 0,0 0,7 M0,7 A7,7 0 1,0 14,7 M7,3l0,5 M7,9l0,2" Stroke="{DynamicResource ErrorBrush}" StrokeThickness="2"/>
-      </Canvas>
-    </DataTemplate>
-  </Setter>
-</Style>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type DataValidationErrors}"
+                TargetType="DataValidationErrors">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <DockPanel LastChildFill="True">
+          <ContentControl x:DataType="DataValidationErrors"
+                          Content="{Binding (DataValidationErrors.Errors)}"
+                          ContentTemplate="{TemplateBinding ErrorTemplate}"
+                          DataContext="{TemplateBinding Owner}"
+                          DockPanel.Dock="Right"
+                          IsVisible="{Binding (DataValidationErrors.HasErrors)}" />
+          <ContentPresenter Name="PART_ContentPresenter"
+                            Padding="{TemplateBinding Padding}"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Content="{TemplateBinding Content}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            CornerRadius="{TemplateBinding CornerRadius}" />
+        </DockPanel>
+      </ControlTemplate>
+    </Setter>
+    <Setter Property="ErrorTemplate">
+      <DataTemplate>
+        <Canvas Width="14"
+                Height="14"
+                Margin="4,0,1,0"
+                Background="Transparent">
+          <Canvas.Styles>
+            <Style Selector="ToolTip">
+              <Setter Property="Background" Value="{DynamicResource ErrorLowBrush}" />
+              <Setter Property="BorderBrush" Value="{DynamicResource ErrorBrush}" />
+            </Style>
+          </Canvas.Styles>
+          <ToolTip.Tip>
+            <ItemsControl x:DataType="DataValidationErrors"
+                          Items="{Binding}" />
+          </ToolTip.Tip>
+          <Path Data="M14,7 A7,7 0 0,0 0,7 M0,7 A7,7 0 1,0 14,7 M7,3l0,5 M7,9l0,2"
+                Stroke="{DynamicResource ErrorBrush}"
+                StrokeThickness="2" />
+        </Canvas>
+      </DataTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/DatePicker.xaml b/src/Avalonia.Themes.Default/Controls/DatePicker.xaml
index c1ee941416..8198158d5e 100644
--- a/src/Avalonia.Themes.Default/Controls/DatePicker.xaml
+++ b/src/Avalonia.Themes.Default/Controls/DatePicker.xaml
@@ -1,239 +1,186 @@
 <!--
-// (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.
+  // (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.
 -->
 
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:sys="clr-namespace:System;assembly=netstandard">
-  <Styles.Resources>
-    <Thickness x:Key="DatePickerTopHeaderMargin">0,0,0,4</Thickness>
-    <x:Double x:Key="DatePickerFlyoutPresenterHighlightHeight">40</x:Double>
-    <x:Double x:Key="DatePickerFlyoutPresenterItemHeight">40</x:Double>
-    <x:Double x:Key="DatePickerFlyoutPresenterAcceptDismissHostGridHeight">41</x:Double>
-    <x:Double x:Key="DatePickerThemeMinWidth">296</x:Double>
-    <x:Double x:Key="DatePickerThemeMaxWidth">456</x:Double>
-    <Thickness x:Key="DatePickerFlyoutPresenterItemPadding">0,3,0,6</Thickness>
-    <Thickness x:Key="DatePickerFlyoutPresenterMonthPadding">9,3,0,6</Thickness>
-    <Thickness x:Key="DatePickerHostPadding">0,3,0,6</Thickness>
-    <Thickness x:Key="DatePickerHostMonthPadding">9,3,0,6</Thickness>
-    <x:Double x:Key="DatePickerSpacerThemeWidth">1</x:Double>
-  </Styles.Resources>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:sys="clr-namespace:System;assembly=netstandard"
+                    x:CompileBindings="True">
+  <Design.PreviewWith>
+    <Border Height="500"
+            Padding="20">
+      <StackPanel VerticalAlignment="Center"
+                  Spacing="20">
+        <DatePicker />
+        <DatePicker CornerRadius="10" />
+        <DatePicker IsEnabled="False" />
+        <DatePicker>
+          <DataValidationErrors.Error>
+            <sys:Exception>
+              <x:Arguments>
+                <x:String>Error</x:String>
+              </x:Arguments>
+            </sys:Exception>
+          </DataValidationErrors.Error>
+        </DatePicker>
+      </StackPanel>
+    </Border>
+  </Design.PreviewWith>
 
-  <!-- Styles for the items displayed in the selectors -->
-  <Style Selector="ListBoxItem.DateTimePickerItem">
-    <Setter Property="Padding" Value="{DynamicResource DatePickerFlyoutPresenterItemPadding}"/>
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="HorizontalContentAlignment" Value="Center" />
-  </Style>
-  <Style Selector="ListBoxItem.DateTimePickerItem:selected">
-    <Setter Property="IsHitTestVisible" Value="False"/>
-  </Style>
-  <Style Selector="ListBoxItem.DateTimePickerItem:selected /template/ Rectangle#PressedBackground">
-    <Setter Property="Fill" Value="Transparent"/>
-  </Style>
-  <Style Selector="ListBoxItem.DateTimePickerItem:selected /template/ ContentPresenter">
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="TextElement.Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
-  </Style>
-  <Style Selector="ListBoxItem.DateTimePickerItem.MonthItem">
-    <Setter Property="Padding" Value="{DynamicResource DatePickerFlyoutPresenterMonthPadding}"/>
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="HorizontalContentAlignment" Value="Left" />
-  </Style>
+  <Thickness x:Key="DatePickerTopHeaderMargin">0,0,0,4</Thickness>
+  <x:Double x:Key="DatePickerFlyoutPresenterHighlightHeight">40</x:Double>
+  <x:Double x:Key="DatePickerFlyoutPresenterItemHeight">40</x:Double>
+  <x:Double x:Key="DatePickerFlyoutPresenterAcceptDismissHostGridHeight">41</x:Double>
+  <x:Double x:Key="DatePickerThemeMinWidth">296</x:Double>
+  <x:Double x:Key="DatePickerThemeMaxWidth">456</x:Double>
+  <Thickness x:Key="DatePickerFlyoutPresenterItemPadding">0,3,0,6</Thickness>
+  <Thickness x:Key="DatePickerFlyoutPresenterMonthPadding">9,3,0,6</Thickness>
+  <Thickness x:Key="DatePickerHostPadding">0,3,0,6</Thickness>
+  <Thickness x:Key="DatePickerHostMonthPadding">9,3,0,6</Thickness>
+  <x:Double x:Key="DatePickerSpacerThemeWidth">1</x:Double>
 
-
-  <!-- This is used for both the accept/dismiss & repeatbuttons in the presenter-->
-  <Style Selector=":is(Button).DateTimeFlyoutButtonStyle">
-    <Setter Property="Background" Value="{DynamicResource ThemeControlTransparentBrush}" />  
-    <Setter Property="HorizontalContentAlignment" Value="Center"/>
-    <Setter Property="VerticalContentAlignment" Value="Center"/>
+  <ControlTheme x:Key="DefaultDatePickerFlyoutButton"
+                TargetType="Button">
+    <Setter Property="RenderTransform" Value="none" />
     <Setter Property="Template">
       <ControlTemplate>
-        <Border Background="{TemplateBinding Background}">
-          <ContentPresenter x:Name="ContentPresenter"
-                  Background="{TemplateBinding Background}"
-                  BorderBrush="{DynamicResource ThemeControlTransparentBrush}"
-                  BorderThickness="{DynamicResource DateTimeFlyoutButtonBorderThickness}"
-                  Content="{TemplateBinding Content}"
-                  TextElement.Foreground="{DynamicResource ThemeForegroundBrush}"
-                  ContentTemplate="{TemplateBinding ContentTemplate}"
-                  Padding="{TemplateBinding Padding}"
-                  HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                  VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
-        </Border>
+        <ContentPresenter Name="PART_ContentPresenter"
+                          HorizontalContentAlignment="Stretch"
+                          VerticalContentAlignment="Stretch"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          Content="{TemplateBinding Content}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
+                          Foreground="{TemplateBinding Foreground}" />
       </ControlTemplate>
     </Setter>
-  </Style>
-
-  <Style Selector=":is(Button).DateTimeFlyoutButtonStyle:pointerover /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ThemeControlHighlightLowBrush}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeControlTransparentBrush}"/>
-    <Setter Property="TextElement.Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
-  </Style>
 
-  <Style Selector=":is(Button).DateTimeFlyoutButtonStyle:pressed /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ThemeControlHighlightMidBrush}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeControlTransparentBrush}"/>
-    <Setter Property="TextElement.Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
-  </Style>
+    <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeControlHighBrush}" />
+      <Setter Property="TextBlock.Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+    </Style>
 
+    <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeControlLowBrush}" />
+      <Setter Property="Background">
+        <SolidColorBrush Opacity="0.6"
+                         Color="{DynamicResource ThemeControlMidHighColor}" />
+      </Setter>
+      <Setter Property="TextBlock.Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+    </Style>
 
-  <Style Selector="RepeatButton.UpButton">
-    <Setter Property="VerticalAlignment" Value="Top"/>
-    <Setter Property="Height" Value="22" />
-    <Setter Property="HorizontalAlignment" Value="Stretch" />
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="Background" Value="{DynamicResource ThemeControlHighlightLowBrush}" />
-    <Setter Property="Content">
-      <Template>
-        <Viewbox Height="10" Width="10" HorizontalAlignment="Center" VerticalAlignment="Center">
-          <Path Stroke="{Binding $parent[RepeatButton].Foreground}" StrokeThickness="1" Data="M 0,9 L 9,0 L 18,9"/>
-        </Viewbox>
-      </Template>
-    </Setter>
-  </Style>
-  <Style Selector="RepeatButton.DownButton">
-    <Setter Property="VerticalAlignment" Value="Bottom"/>
-    <Setter Property="Height" Value="22" />
-    <Setter Property="HorizontalAlignment" Value="Stretch" />
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="Background" Value="{DynamicResource ThemeControlHighlightLowBrush}" />
-    <Setter Property="Content">
-      <Template>
-        <Viewbox Height="10" Width="10" HorizontalAlignment="Center" VerticalAlignment="Center">
-          <Path Stroke="{Binding $parent[RepeatButton].Foreground}" StrokeThickness="1" Data="M 0,0 L 9,9 L 18,0"/>
-        </Viewbox>
-      </Template>
-    </Setter>
-  </Style>
+    <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
+    </Style>
+  </ControlTheme>
 
-  <Style Selector="DatePicker">    
+  <ControlTheme x:Key="{x:Type DatePicker}"
+                TargetType="DatePicker">
     <Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}" />
     <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
-    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeControlHighlightMidBrush}"/>
-    <Setter Property="BorderThickness" Value="1"/>
+    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeControlHighlightMidBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
     <Setter Property="HorizontalAlignment" Value="Left" />
     <Setter Property="VerticalAlignment" Value="Center" />
     <Setter Property="Template">
       <ControlTemplate>
-        <Grid Name="LayoutRoot" Margin="{TemplateBinding Padding}" RowDefinitions="Auto,*">
-          <ContentPresenter Name="HeaderContentPresenter" Grid.Row="0"
-                            Content="{TemplateBinding Header}"
-                            ContentTemplate="{TemplateBinding HeaderTemplate}"
-                            Margin="{DynamicResource DatePickerTopHeaderMargin}"
-                            MaxWidth="{DynamicResource DatePickerThemeMaxWidth}"
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Top"/>
+        <DataValidationErrors>
+          <Grid Name="LayoutRoot"
+                Margin="{TemplateBinding Padding}"
+                RowDefinitions="Auto,*">
+            <ContentPresenter Name="HeaderContentPresenter"
+                              Grid.Row="0"
+                              MaxWidth="{DynamicResource DatePickerThemeMaxWidth}"
+                              Margin="{DynamicResource DatePickerTopHeaderMargin}"
+                              HorizontalAlignment="Stretch"
+                              VerticalAlignment="Top"
+                              Content="{TemplateBinding Header}"
+                              ContentTemplate="{TemplateBinding HeaderTemplate}" />
 
-          <Button Name="FlyoutButton" Grid.Row="1"
-                  Foreground="{TemplateBinding Foreground}"
-                  Background="{TemplateBinding Background}"
-                  BorderBrush="{TemplateBinding BorderBrush}"
-                  BorderThickness="{TemplateBinding BorderThickness}"
-                  CornerRadius="{TemplateBinding CornerRadius}"
-                  IsEnabled="{TemplateBinding IsEnabled}"
-                  MinWidth="{DynamicResource DatePickerThemeMinWidth}"
-                  MaxWidth="{DynamicResource DatePickerThemeMaxWidth}"
-                  HorizontalAlignment="Stretch"
-                  VerticalAlignment="Stretch"
-                  HorizontalContentAlignment="Stretch"
-                  VerticalContentAlignment="Stretch"
-                  TemplatedControl.IsTemplateFocusTarget="True">
-            <Button.Template>
-              <ControlTemplate>
-                <ContentPresenter Name="ContentPresenter"
-                                  BorderBrush="{TemplateBinding BorderBrush}"
-                                  Background="{TemplateBinding Background}"
-                                  BorderThickness="{TemplateBinding BorderThickness}"
-                                  CornerRadius="{TemplateBinding CornerRadius}"
-                                  Content="{TemplateBinding Content}"
-                                  TextElement.Foreground="{TemplateBinding Foreground}"
-                                  HorizontalContentAlignment="Stretch"
-                                  VerticalContentAlignment="Stretch"/>
-              </ControlTemplate>
-            </Button.Template>
-            <Grid Name="ButtonContentGrid" ColumnDefinitions="78*,Auto,132*,Auto,78*">
-              <TextBlock Name="DayText" Text="day" HorizontalAlignment="Center"
-                         Padding="{DynamicResource DatePickerHostPadding}"
-                         FontFamily="{TemplateBinding FontFamily}"
-                         FontWeight="{TemplateBinding FontWeight}"
-                         FontSize="{TemplateBinding FontSize}"/>
-              <TextBlock Name="MonthText" Text="month" TextAlignment="Left"
-                         Padding="{DynamicResource DatePickerHostMonthPadding}"
-                         FontFamily="{TemplateBinding FontFamily}"
-                         FontWeight="{TemplateBinding FontWeight}"
-                         FontSize="{TemplateBinding FontSize}"/>
-              <TextBlock Name="YearText" Text="year" HorizontalAlignment="Center"
-                         Padding="{DynamicResource DatePickerHostPadding}"
-                         FontFamily="{TemplateBinding FontFamily}"
-                         FontWeight="{TemplateBinding FontWeight}"
-                         FontSize="{TemplateBinding FontSize}"/>
-              <Rectangle x:Name="FirstSpacer"
-                    Fill="{DynamicResource ThemeControlMidHighBrush}"
-                    HorizontalAlignment="Center"
-                    Width="1"
-                    Grid.Column="1" />
-              <Rectangle x:Name="SecondSpacer"
-                    Fill="{DynamicResource ThemeControlMidHighBrush}"
-                    HorizontalAlignment="Center"
-                    Width="1"
-                    Grid.Column="3" />
-            </Grid>
-          </Button>
+            <Button Name="FlyoutButton"
+                    Grid.Row="1"
+                    MinWidth="{DynamicResource DatePickerThemeMinWidth}"
+                    MaxWidth="{DynamicResource DatePickerThemeMaxWidth}"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Stretch"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    CornerRadius="{TemplateBinding CornerRadius}"
+                    Foreground="{TemplateBinding Foreground}"
+                    IsEnabled="{TemplateBinding IsEnabled}"
+                    TemplatedControl.IsTemplateFocusTarget="True"
+                    Theme="{StaticResource DefaultDatePickerFlyoutButton}">
+              <Grid Name="ButtonContentGrid"
+                    ColumnDefinitions="78*,Auto,132*,Auto,78*">
+                <TextBlock Name="DayText"
+                           Padding="{DynamicResource DatePickerHostPadding}"
+                           HorizontalAlignment="Center"
+                           FontFamily="{TemplateBinding FontFamily}"
+                           FontSize="{TemplateBinding FontSize}"
+                           FontWeight="{TemplateBinding FontWeight}"
+                           Text="day" />
+                <TextBlock Name="MonthText"
+                           Padding="{DynamicResource DatePickerHostMonthPadding}"
+                           FontFamily="{TemplateBinding FontFamily}"
+                           FontSize="{TemplateBinding FontSize}"
+                           FontWeight="{TemplateBinding FontWeight}"
+                           Text="month"
+                           TextAlignment="Left" />
+                <TextBlock Name="YearText"
+                           Padding="{DynamicResource DatePickerHostPadding}"
+                           HorizontalAlignment="Center"
+                           FontFamily="{TemplateBinding FontFamily}"
+                           FontSize="{TemplateBinding FontSize}"
+                           FontWeight="{TemplateBinding FontWeight}"
+                           Text="year" />
+                <Rectangle x:Name="FirstSpacer"
+                           Grid.Column="1"
+                           Width="1"
+                           HorizontalAlignment="Center"
+                           Fill="{DynamicResource DatePickerSpacerFill}" />
+                <Rectangle x:Name="SecondSpacer"
+                           Grid.Column="3"
+                           Width="1"
+                           HorizontalAlignment="Center"
+                           Fill="{DynamicResource DatePickerSpacerFill}" />
+              </Grid>
+            </Button>
 
-          <Popup Name="Popup" WindowManagerAddShadowHint="False"
-                 StaysOpen="False" PlacementTarget="{TemplateBinding}"
-                 PlacementMode="Bottom">
-            <DatePickerPresenter Name="PickerPresenter" />
-          </Popup>
+            <Popup Name="Popup"
+                   IsLightDismissEnabled="True"
+                   PlacementMode="Bottom"
+                   PlacementTarget="{TemplateBinding}"
+                   WindowManagerAddShadowHint="False">
+              <DatePickerPresenter Name="PickerPresenter" />
+            </Popup>
 
-        </Grid>
+          </Grid>
+        </DataValidationErrors>
       </ControlTemplate>
     </Setter>
-  </Style>
-  <Style Selector="DatePicker /template/ ContentPresenter#HeaderContentPresenter">
-    <Setter Property="TextElement.Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
-  </Style>
-  <Style Selector="DatePicker:disabled /template/ Rectangle">
-    <!--<Setter Property="Fill" Value="{DynamicResource DatePickerSpacerFillDisabled}"/>-->
-    <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
-  </Style>
 
-  <Style Selector="DatePicker /template/ Button#FlyoutButton:pointerover /template/ ContentPresenter">
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeControlHighBrush}"/>
-    <!--<Setter Property="Background" Value="{DynamicResource DatePickerButtonBackgroundPointerOver}"/>-->
-    <Setter Property="TextElement.Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
-  </Style>
-
-  <Style Selector="DatePicker /template/ Button#FlyoutButton:pressed /template/ ContentPresenter">
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeControlLowBrush}"/>
-    <Setter Property="Background">
-      <SolidColorBrush Color="{DynamicResource ThemeControlMidHighColor}" Opacity="0.6" />
-    </Setter>
-    <Setter Property="TextElement.Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
-  </Style>
+    <Style Selector="^:disabled /template/ Rectangle">
+      <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
+    </Style>
 
-  <Style Selector="DatePicker /template/ Button#FlyoutButton:disabled /template/ ContentPresenter">
-    <!--<Setter Property="BorderBrush" Value="{DynamicResource DatePickerButtonBorderBrushDisabled}"/>
-    <Setter Property="Background" Value="{DynamicResource DatePickerButtonBackgroundDisabled}"/>
-    <Setter Property="TextElement.Foreground" Value="{DynamicResource DatePickerButtonForegroundDisabled}"/>-->
-    <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
-  </Style>
+    <!--  Changes foreground for watermark text when SelectedDate is null  -->
+    <Style Selector="^:hasnodate /template/ Button#FlyoutButton TextBlock">
+      <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundLowBrush}" />
+    </Style>
+  </ControlTheme>
 
-  <!-- Changes foreground for watermark text when SelectedDate is null-->
-  <Style Selector="DatePicker:hasnodate /template/ Button#FlyoutButton TextBlock">
-    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundLowBrush}"/>
-  </Style>
-
-  <!--WinUI: DatePickerFlyoutPresenter-->
-  <Style Selector="DatePickerPresenter">
+  <!--  WinUI: DatePickerFlyoutPresenter  -->
+  <ControlTheme x:Key="{x:Type DatePickerPresenter}"
+                TargetType="DatePickerPresenter">
     <Setter Property="Width" Value="296" />
     <Setter Property="MinWidth" Value="296" />
-    <Setter Property="MaxHeight" Value="398" />    
+    <Setter Property="MaxHeight" Value="398" />
     <Setter Property="FontWeight" Value="Normal" />
     <Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}" />
     <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
@@ -241,97 +188,126 @@
     <Setter Property="BorderThickness" Value="{DynamicResource DateTimeFlyoutBorderThickness}" />
     <Setter Property="Template">
       <ControlTemplate>
-        <Border Name="Background" Background="{TemplateBinding Background}"
+        <Border Name="Background"
+                MaxHeight="398"
+                Padding="{DynamicResource DateTimeFlyoutBorderPadding}"
+                Background="{TemplateBinding Background}"
                 BorderBrush="{TemplateBinding BorderBrush}"
                 BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}"
-                Padding="{DynamicResource DateTimeFlyoutBorderPadding}"
-                MaxHeight="398">
-          <Grid Name="ContentRoot" RowDefinitions="*,Auto">
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <Grid Name="ContentRoot"
+                RowDefinitions="*,Auto">
             <Grid Name="PickerContainer">
-              <!--Column Definitions set in code, ignore here-->
+              <Grid.Styles>
+                <Style Selector="DateTimePickerPanel > ListBoxItem">
+                  <Setter Property="Theme" Value="{StaticResource DefaultDateTimePickerItem}" />
+                </Style>
+              </Grid.Styles>
+              <!--  Column Definitions set in code, ignore here  -->
               <Panel Name="MonthHost">
                 <ScrollViewer HorizontalScrollBarVisibility="Disabled"
                               VerticalScrollBarVisibility="Hidden">
                   <DateTimePickerPanel Name="MonthSelector"
-                                      PanelType="Month"
-                                      ItemHeight="{DynamicResource DatePickerFlyoutPresenterItemHeight}"
-                                      ShouldLoop="True" />
+                                       ItemHeight="{DynamicResource DatePickerFlyoutPresenterItemHeight}"
+                                       PanelType="Month"
+                                       ShouldLoop="True" />
                 </ScrollViewer>
                 <RepeatButton Name="MonthUpButton"
-                              Classes="DateTimeFlyoutButtonStyle UpButton"/>
+                              Theme="{StaticResource DefaultDateTimePickerUpButton}" />
                 <RepeatButton Name="MonthDownButton"
-                              Classes="DateTimeFlyoutButtonStyle DownButton"/>
+                              Theme="{StaticResource DefaultDateTimePickerDownButton}" />
               </Panel>
               <Panel Name="DayHost">
                 <ScrollViewer HorizontalScrollBarVisibility="Disabled"
                               VerticalScrollBarVisibility="Hidden">
                   <DateTimePickerPanel Name="DaySelector"
-                                      PanelType="Day"
-                                      ItemHeight="{DynamicResource DatePickerFlyoutPresenterItemHeight}"
-                                      ShouldLoop="True" />
+                                       ItemHeight="{DynamicResource DatePickerFlyoutPresenterItemHeight}"
+                                       PanelType="Day"
+                                       ShouldLoop="True" />
                 </ScrollViewer>
                 <RepeatButton Name="DayUpButton"
-                              Classes="DateTimeFlyoutButtonStyle UpButton"/>
+                              Theme="{StaticResource DefaultDateTimePickerUpButton}" />
                 <RepeatButton Name="DayDownButton"
-                              Classes="DateTimeFlyoutButtonStyle DownButton"/>
+                              Theme="{StaticResource DefaultDateTimePickerDownButton}" />
               </Panel>
               <Panel Name="YearHost">
                 <ScrollViewer HorizontalScrollBarVisibility="Disabled"
                               VerticalScrollBarVisibility="Hidden">
                   <DateTimePickerPanel Name="YearSelector"
-                                      PanelType="Year"
-                                      ItemHeight="{DynamicResource DatePickerFlyoutPresenterItemHeight}"
-                                      ShouldLoop="False" />
+                                       ItemHeight="{DynamicResource DatePickerFlyoutPresenterItemHeight}"
+                                       PanelType="Year"
+                                       ShouldLoop="False" />
                 </ScrollViewer>
                 <RepeatButton Name="YearUpButton"
-                              Classes="DateTimeFlyoutButtonStyle UpButton"/>
+                              Theme="{StaticResource DefaultDateTimePickerUpButton}" />
                 <RepeatButton Name="YearDownButton"
-                              Classes="DateTimeFlyoutButtonStyle DownButton"/>
+                              Theme="{StaticResource DefaultDateTimePickerDownButton}" />
               </Panel>
-              <Rectangle Name="HighlightRect" IsHitTestVisible="False" ZIndex="-1"
-                         Fill="{DynamicResource DatePickerFlyoutPresenterHighlightFill}"
-                         Grid.Column="0" Grid.ColumnSpan="5" VerticalAlignment="Center"
-                         Height="{DynamicResource DatePickerFlyoutPresenterHighlightHeight}" />
+              <Rectangle Name="HighlightRect"
+                         Grid.Column="0"
+                         Grid.ColumnSpan="5"
+                         Height="{DynamicResource DatePickerFlyoutPresenterHighlightHeight}"
+                         VerticalAlignment="Center"
+                         IsHitTestVisible="False"
+                         ZIndex="-1">
+                <Rectangle.Fill>
+                  <SolidColorBrush Opacity="0.6"
+                                   Color="{DynamicResource ThemeAccentColor}" />
+                </Rectangle.Fill>
+              </Rectangle>
               <Rectangle Name="FirstSpacer"
-                         Fill="{DynamicResource ThemeControlMidHighBrush}"
-                         HorizontalAlignment="Center"
+                         Grid.Column="1"
                          Width="{DynamicResource DatePickerSpacerThemeWidth}"
-                         Grid.Column="1" />
-              <Rectangle Name="SecondSpacer"
-                         Fill="{DynamicResource ThemeControlMidHighBrush}"
                          HorizontalAlignment="Center"
+                         Fill="{DynamicResource ThemeControlMidHighBrush}" />
+              <Rectangle Name="SecondSpacer"
+                         Grid.Column="3"
                          Width="{DynamicResource DatePickerSpacerThemeWidth}"
-                         Grid.Column="3" />
+                         HorizontalAlignment="Center"
+                         Fill="{DynamicResource ThemeControlMidHighBrush}" />
             </Grid>
-            <Grid Grid.Row="1" Height="{DynamicResource DatePickerFlyoutPresenterAcceptDismissHostGridHeight}"
-                  Name="AcceptDismissGrid" ColumnDefinitions="*,*">
-              <Rectangle Height="{DynamicResource DatePickerSpacerThemeWidth}" VerticalAlignment="Top"
-                         Fill="{DynamicResource ThemeControlMidHighBrush}"
-                         Grid.ColumnSpan="2"/>
-              <Button Name="AcceptButton" Grid.Column="0" Classes="DateTimeFlyoutButtonStyle"
-                          HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                <Path Stroke="{Binding $parent[Button].Foreground}" StrokeLineCap="Round"
-                      StrokeThickness="0.75" Data="M0.5,8.5 5,13.5 15.5,3" />
+
+            <Grid Name="AcceptDismissGrid"
+                  Grid.Row="1"
+                  ColumnDefinitions="*,*">
+              <Rectangle Grid.ColumnSpan="2"
+                         Height="{DynamicResource DatePickerSpacerThemeWidth}"
+                         VerticalAlignment="Top"
+                         Fill="{DynamicResource ThemeControlMidHighBrush}" />
+              <Button Name="AcceptButton"
+                      Grid.Column="0"
+                      Height="{DynamicResource DatePickerFlyoutPresenterAcceptDismissHostGridHeight}"
+                      HorizontalAlignment="Stretch"
+                      VerticalAlignment="Stretch"
+                      Theme="{StaticResource DefaultDateTimePickerButton}">
+                <Path Data="M0.5,8.5 5,13.5 15.5,3"
+                      Stroke="{Binding $parent[Button].Foreground}"
+                      StrokeLineCap="Round"
+                      StrokeThickness="0.75" />
               </Button>
-              <Button Name="DismissButton" Grid.Column="1" Classes="DateTimeFlyoutButtonStyle"
-                         FontSize="16" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                <Path Stroke="{Binding $parent[Button].Foreground}" StrokeLineCap="Round"
-                      StrokeThickness="0.75" Data="M2,2 14,14 M2,14 14 2" />
+              <Button Name="DismissButton"
+                      Grid.Column="1"
+                      Height="{DynamicResource DatePickerFlyoutPresenterAcceptDismissHostGridHeight}"
+                      HorizontalAlignment="Stretch"
+                      VerticalAlignment="Stretch"
+                      Theme="{StaticResource DefaultDateTimePickerButton}">
+                <Path Data="M2,2 14,14 M2,14 14 2"
+                      Stroke="{Binding $parent[Button].Foreground}"
+                      StrokeLineCap="Round"
+                      StrokeThickness="0.75" />
               </Button>
             </Grid>
           </Grid>
         </Border>
       </ControlTemplate>
     </Setter>
-  </Style>
 
-  <Style Selector="DatePickerPresenter /template/ Panel RepeatButton">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
+    <Style Selector="^ /template/ Panel">
+      <Style Selector="^:pointerover RepeatButton">
+        <Setter Property="IsVisible" Value="True" />
+      </Style>
+    </Style>
+  </ControlTheme>
+
 
-  <Style Selector="DatePickerPresenter /template/ Panel:pointerover RepeatButton">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
-  
-</Styles>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/DateTimePickerShared.xaml b/src/Avalonia.Themes.Default/Controls/DateTimePickerShared.xaml
new file mode 100644
index 0000000000..1e4b50ca40
--- /dev/null
+++ b/src/Avalonia.Themes.Default/Controls/DateTimePickerShared.xaml
@@ -0,0 +1,139 @@
+<!--
+  // (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.
+-->
+
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:sys="clr-namespace:System;assembly=netstandard"
+                    x:CompileBindings="True">
+  <Design.PreviewWith>
+    <Border Width="200"
+            Padding="20">
+      <StackPanel Spacing="20">
+        <ListBoxItem Theme="{DynamicResource DefaultDateTimePickerItem}">Standard Item</ListBoxItem>
+        <ListBoxItem Theme="{DynamicResource DefaultDateTimePickerItem}" Classes="MonthItem">Month Item</ListBoxItem>
+        <RepeatButton Theme="{DynamicResource DefaultDateTimePickerButton}">Button</RepeatButton>
+        <RepeatButton Theme="{DynamicResource DefaultDateTimePickerUpButton}" IsVisible="True"/>
+        <RepeatButton Theme="{DynamicResource DefaultDateTimePickerDownButton}" IsVisible="True"/>
+      </StackPanel>
+    </Border>
+  </Design.PreviewWith>
+
+  <!--  Theme for the items displayed in the selectors  -->
+  <ControlTheme x:Key="DefaultDateTimePickerItem"
+                BasedOn="{StaticResource {x:Type ListBoxItem}}"
+                TargetType="ListBoxItem">
+    <Setter Property="Padding" Value="{DynamicResource DatePickerFlyoutPresenterItemPadding}" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="HorizontalContentAlignment" Value="Center" />
+
+    <Style Selector="^:selected">
+      <Setter Property="IsHitTestVisible" Value="False" />
+      <Style Selector="^/template/ Rectangle#PressedBackground">
+        <Setter Property="Fill" Value="Transparent" />
+      </Style>
+      <Style Selector="^/template/ ContentPresenter">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+      </Style>
+    </Style>
+    <Style Selector="^.MonthItem">
+      <Setter Property="Padding" Value="{DynamicResource DatePickerFlyoutPresenterMonthPadding}" />
+      <Setter Property="HorizontalContentAlignment" Value="Left" />
+    </Style>
+  </ControlTheme>
+
+  <!--  This is used for both the accept/dismiss & repeatbuttons in the presenter  -->
+  <ControlTheme x:Key="DefaultDateTimePickerButton"
+                TargetType="Button">
+    <Setter Property="Background" Value="{DynamicResource ThemeControlTransparentBrush}" />
+    <Setter Property="Height" Value="22" />
+    <Setter Property="HorizontalContentAlignment" Value="Center" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <!--
+          The background is doubled here for the loopingselector up/down repeat buttons
+          that appear opaque. Not sure how MS does it though I suspect this is it
+          but source isn't MIT yet, so this is my solution
+        -->
+        <Border Background="{TemplateBinding Background}">
+          <ContentPresenter x:Name="ContentPresenter"
+                            Padding="{TemplateBinding Padding}"
+                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{DynamicResource ThemeControlTransparentBrush}"
+                            BorderThickness="{DynamicResource DateTimeFlyoutButtonBorderThickness}"
+                            Content="{TemplateBinding Content}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            CornerRadius="{TemplateBinding CornerRadius}"
+                            Foreground="{DynamicResource ThemeForegroundBrush}" />
+        </Border>
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^:pointerover /template/ ContentPresenter">
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeControlHighBrush}" />
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+    </Style>
+
+    <Style Selector="^:pressed /template/ ContentPresenter">
+      <Setter Property="Background">
+        <SolidColorBrush Opacity="0.6"
+                         Color="{DynamicResource ThemeControlMidHighColor}" />
+      </Setter>
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeControlLowBrush}" />
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+    </Style>
+  </ControlTheme>
+
+  <ControlTheme x:Key="DefaultDateTimePickerUpButton"
+                BasedOn="{StaticResource DefaultDateTimePickerButton}"
+                TargetType="RepeatButton">
+    <Setter Property="VerticalAlignment" Value="Top" />
+    <Setter Property="Height" Value="22" />
+    <Setter Property="HorizontalAlignment" Value="Stretch" />
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="Background" Value="{DynamicResource ThemeControlHighlightLowBrush}" />
+    <Setter Property="IsVisible" Value="False" />
+    <Setter Property="Content">
+      <Template>
+        <Viewbox Width="10"
+                 Height="10"
+                 HorizontalAlignment="Center"
+                 VerticalAlignment="Center">
+          <Path Data="M 0,9 L 9,0 L 18,9"
+                Stroke="{Binding $parent[RepeatButton].Foreground}"
+                StrokeThickness="1" />
+        </Viewbox>
+      </Template>
+    </Setter>
+  </ControlTheme>
+
+  <ControlTheme x:Key="DefaultDateTimePickerDownButton"
+                BasedOn="{StaticResource DefaultDateTimePickerButton}"
+                TargetType="RepeatButton">
+    <Setter Property="VerticalAlignment" Value="Bottom" />
+    <Setter Property="Height" Value="22" />
+    <Setter Property="HorizontalAlignment" Value="Stretch" />
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="Background" Value="{DynamicResource ThemeControlHighlightLowBrush}" />
+    <Setter Property="IsVisible" Value="False" />
+    <Setter Property="Content">
+      <Template>
+        <Viewbox Width="10"
+                 Height="10"
+                 HorizontalAlignment="Center"
+                 VerticalAlignment="Center">
+          <Path Data="M 0,0 L 9,9 L 18,0"
+                Stroke="{Binding $parent[RepeatButton].Foreground}"
+                StrokeThickness="1" />
+        </Viewbox>
+      </Template>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/DropDownButton.xaml b/src/Avalonia.Themes.Default/Controls/DropDownButton.xaml
index 662c6379fb..6a50cd6e36 100644
--- a/src/Avalonia.Themes.Default/Controls/DropDownButton.xaml
+++ b/src/Avalonia.Themes.Default/Controls/DropDownButton.xaml
@@ -1,12 +1,14 @@
-<Styles xmlns="https://github.com/avaloniaui">
-  <Style Selector="DropDownButton">
-    <Setter Property="Background" Value="{DynamicResource ThemeControlMidBrush}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderLowBrush}"/>
-    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}"/>
-    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
-    <Setter Property="HorizontalContentAlignment" Value="Center"/>
-    <Setter Property="VerticalContentAlignment" Value="Center"/>
-    <Setter Property="Padding" Value="4"/>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type DropDownButton}"
+                TargetType="DropDownButton">
+    <Setter Property="Background" Value="{DynamicResource ThemeControlMidBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderLowBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}" />
+    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+    <Setter Property="HorizontalContentAlignment" Value="Center" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Padding" Value="4" />
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate>
@@ -14,8 +16,8 @@
                   Background="{TemplateBinding Background}"
                   BorderBrush="{TemplateBinding BorderBrush}"
                   BorderThickness="{TemplateBinding BorderThickness}"
-                  CornerRadius="{TemplateBinding CornerRadius}"
-                  ClipToBounds="True">
+                  ClipToBounds="True"
+                  CornerRadius="{TemplateBinding CornerRadius}">
             <Grid Name="InnerGrid">
               <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*" />
@@ -24,44 +26,44 @@
 
               <ContentPresenter Name="PART_ContentPresenter"
                                 Grid.Column="0"
-                                Content="{TemplateBinding Content}"
-                                ContentTemplate="{TemplateBinding ContentTemplate}"
                                 Padding="{TemplateBinding Padding}"
-                                RecognizesAccessKey="True"
                                 HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                RecognizesAccessKey="True" />
 
               <PathIcon Name="DropDownGlyph"
                         Grid.Column="1"
-                        UseLayoutRounding="False"
-                        IsHitTestVisible="False"
-                        Height="12"
                         Width="12"
+                        Height="12"
                         Margin="0,0,10,0"
                         HorizontalAlignment="Right"
-                        VerticalAlignment="Center" />
+                        VerticalAlignment="Center"
+                        IsHitTestVisible="False"
+                        UseLayoutRounding="False" />
 
             </Grid>
           </Border>
         </ControlTemplate>
       </Setter.Value>
     </Setter>
-  </Style>
 
-  <Style Selector="DropDownButton /template/ PathIcon#DropDownGlyph">
-    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
-    <Setter Property="Data" Value="M1939 486L2029 576L1024 1581L19 576L109 486L1024 1401L1939 486Z" />
-  </Style>
+    <Style Selector="^ /template/ PathIcon#DropDownGlyph">
+      <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+      <Setter Property="Data" Value="M1939 486L2029 576L1024 1581L19 576L109 486L1024 1401L1939 486Z" />
+    </Style>
 
-  <Style Selector="DropDownButton:pointerover /template/ Border#RootBorder">
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
-  </Style>
+    <Style Selector="^:pointerover /template/ Border#RootBorder">
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
+    </Style>
 
-  <Style Selector="DropDownButton:pressed  /template/ Border#RootBorder">
-    <Setter Property="Background" Value="{DynamicResource ThemeControlHighBrush}"/>
-  </Style>
+    <Style Selector="^:pressed  /template/ Border#RootBorder">
+      <Setter Property="Background" Value="{DynamicResource ThemeControlHighBrush}" />
+    </Style>
 
-  <Style Selector="DropDownButton:disabled">
-    <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}"/>
-  </Style>
-</Styles>
+    <Style Selector="^:disabled">
+      <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/EmbeddableControlRoot.xaml b/src/Avalonia.Themes.Default/Controls/EmbeddableControlRoot.xaml
index 9ffe51fae8..79d6c6d917 100644
--- a/src/Avalonia.Themes.Default/Controls/EmbeddableControlRoot.xaml
+++ b/src/Avalonia.Themes.Default/Controls/EmbeddableControlRoot.xaml
@@ -1,19 +1,24 @@
-<Style xmlns="https://github.com/avaloniaui" Selector="EmbeddableControlRoot">
-  <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>
-  <Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}"/>
-  <Setter Property="Template">
-    <ControlTemplate>
-      <Panel>
-        <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
-        <Border Background="{TemplateBinding Background}">
-          <VisualLayerManager>
-            <ContentPresenter Name="PART_ContentPresenter"
-                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                              Content="{TemplateBinding Content}"
-                              Margin="{TemplateBinding Padding}"/>
-          </VisualLayerManager>
-        </Border>
-      </Panel>
-    </ControlTemplate>
-  </Setter>
-</Style>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type EmbeddableControlRoot}"
+                TargetType="EmbeddableControlRoot">
+    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
+    <Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Panel>
+          <Border Name="PART_TransparencyFallback"
+                  IsHitTestVisible="False" />
+          <Border Background="{TemplateBinding Background}">
+            <VisualLayerManager>
+              <ContentPresenter Name="PART_ContentPresenter"
+                                Margin="{TemplateBinding Padding}"
+                                Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}" />
+            </VisualLayerManager>
+          </Border>
+        </Panel>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/Expander.xaml b/src/Avalonia.Themes.Default/Controls/Expander.xaml
index 2f18faf84a..bfa5fb3130 100644
--- a/src/Avalonia.Themes.Default/Controls/Expander.xaml
+++ b/src/Avalonia.Themes.Default/Controls/Expander.xaml
@@ -1,196 +1,256 @@
-<Styles xmlns="https://github.com/avaloniaui">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Design.PreviewWith>
     <Border Padding="20">
-      <StackPanel Orientation="Vertical" Spacing="20" Width="350">
-        <Expander ExpandDirection="Up" Header="Expand Up" CornerRadius="25">
+      <StackPanel Width="350"
+                  Orientation="Vertical"
+                  Spacing="20">
+        <Expander CornerRadius="25"
+                  ExpandDirection="Up">
           <Expander.Header>
             <Grid ColumnDefinitions="*, Auto">
-              <TextBlock Grid.Column="0" Text="Expand" />
-              <TextBlock Grid.Column="1" Text="Up" />
+              <TextBlock Grid.Column="0"
+                         Text="Expand" />
+              <TextBlock Grid.Column="1"
+                         Text="Up" />
             </Grid>
           </Expander.Header>
           <StackPanel>
-            <TextBlock>Expanded content</TextBlock>
+            <TextBlock Text="Expanded content" />
           </StackPanel>
         </Expander>
-        <Expander ExpandDirection="Down" Header="Expand Down" CornerRadius="25">
+        <Expander CornerRadius="25"
+                  ExpandDirection="Down"
+                  Header="Expand Down">
           <StackPanel>
-            <TextBlock>Expanded content</TextBlock>
+            <TextBlock Text="Expanded content" />
           </StackPanel>
         </Expander>
-        <Expander ExpandDirection="Left" Header="Expand Left" CornerRadius="25">
+        <Expander CornerRadius="25"
+                  ExpandDirection="Left"
+                  Header="Expand Left">
           <StackPanel>
-            <TextBlock>Expanded content</TextBlock>
+            <TextBlock Text="Expanded content" />
           </StackPanel>
         </Expander>
-        <Expander ExpandDirection="Right" Header="Expand Right" CornerRadius="25">
+        <Expander CornerRadius="25"
+                  ExpandDirection="Right"
+                  Header="Expand Right">
           <StackPanel>
-            <TextBlock>Expanded content</TextBlock>
+            <TextBlock Text="Expanded content" />
           </StackPanel>
         </Expander>
       </StackPanel>
     </Border>
   </Design.PreviewWith>
-  <Style Selector="Expander">
-    <Setter Property="ContentTransition">
-      <Setter.Value>
-        <CrossFade Duration="00:00:00.25" />
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style Selector="Expander[ExpandDirection=Down]">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}">
-          <Grid RowDefinitions="Auto,*">
-            <ToggleButton Name="PART_toggle" Grid.Row="0"
-                          HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                          VerticalAlignment="{TemplateBinding VerticalAlignment}"
-                          Content="{TemplateBinding Header}" IsChecked="{TemplateBinding IsExpanded, Mode=TwoWay}" />
-            <ContentPresenter Name="PART_ContentPresenter"
-                              Grid.Row="1"
-                              IsVisible="{TemplateBinding IsExpanded}"
-                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                              Content="{TemplateBinding Content}"
-                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                              Padding="{TemplateBinding Padding}" />
-          </Grid>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-  <Style Selector="Expander[ExpandDirection=Up]">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}">
-          <Grid RowDefinitions="*,Auto">
-            <ToggleButton Name="PART_toggle" Grid.Row="1"
-                          HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                          VerticalAlignment="{TemplateBinding VerticalAlignment}"
-                          Content="{TemplateBinding Header}" IsChecked="{TemplateBinding IsExpanded, Mode=TwoWay}" />
-            <ContentPresenter Name="PART_ContentPresenter"
-                              Grid.Row="0"
-                              IsVisible="{TemplateBinding IsExpanded}"
-                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                              Content="{TemplateBinding Content}"
-                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                              Padding="{TemplateBinding Padding}" />
-          </Grid>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-  <Style Selector="Expander[ExpandDirection=Right]">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}">
-          <Grid ColumnDefinitions="Auto,*">
-            <ToggleButton Name="PART_toggle" Grid.Column="0"
-                          HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                          VerticalAlignment="{TemplateBinding VerticalAlignment}"
-                          Content="{TemplateBinding Header}" IsChecked="{TemplateBinding IsExpanded, Mode=TwoWay}" />
-            <ContentPresenter Name="PART_ContentPresenter"
-                              Grid.Column="1"
-                              IsVisible="{TemplateBinding IsExpanded}"
-                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                              Content="{TemplateBinding Content}"
-                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                              Padding="{TemplateBinding Padding}" />
-          </Grid>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-  <Style Selector="Expander[ExpandDirection=Left]">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}">
-          <Grid ColumnDefinitions="*,Auto">
-            <ToggleButton Name="PART_toggle" Grid.Column="1"
-                          HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                          VerticalAlignment="{TemplateBinding VerticalAlignment}"
-                          Content="{TemplateBinding Header}" IsChecked="{TemplateBinding IsExpanded, Mode=TwoWay}" />
-            <ContentPresenter Name="PART_ContentPresenter"
-                              Grid.Column="0"
-                              IsVisible="{TemplateBinding IsExpanded}"
-                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                              Content="{TemplateBinding Content}"
-                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                              Padding="{TemplateBinding Padding}" />
-          </Grid>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-  <Style Selector="Expander /template/ ToggleButton#PART_toggle">
+
+  <ControlTheme x:Key="DefaultExpanderToggleButtonTheme"
+                TargetType="ToggleButton">
     <Setter Property="HorizontalContentAlignment" Value="Stretch" />
     <Setter Property="Background" Value="Transparent" />
     <Setter Property="Template">
       <ControlTemplate>
-        <Border BorderThickness="1" Background="{TemplateBinding Background}">
+        <Border Background="{TemplateBinding Background}"
+                BorderThickness="1">
           <Grid ColumnDefinitions="Auto,*">
-            <Border Grid.Column="0" Width="20" Height="20" HorizontalAlignment="Center" VerticalAlignment="Center">
-              <Path Fill="{DynamicResource ThemeForegroundBrush}"
-                      HorizontalAlignment="Center"
-                      VerticalAlignment="Center"
-                      Data="M 0 2 L 4 6 L 0 10 Z" />
+            <Border Grid.Column="0"
+                    Width="20"
+                    Height="20"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center">
+              <Path HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Data="M 0 2 L 4 6 L 0 10 Z"
+                    Fill="{DynamicResource ThemeForegroundBrush}" />
             </Border>
             <ContentPresenter Name="PART_ContentPresenter"
-                              Grid.Column="1" 
-                              Background="Transparent" 
-                              Content="{TemplateBinding Content}" 
-                              ContentTemplate="{Binding $parent[Expander].HeaderTemplate}"
-                              VerticalAlignment="Center" 
+                              Grid.Column="1"
+                              Padding="{TemplateBinding Padding}"
+                              VerticalAlignment="Center"
                               HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                               VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                              Padding="{TemplateBinding Padding}"/>
+                              Background="Transparent"
+                              Content="{TemplateBinding Content}"
+                              ContentTemplate="{Binding $parent[Expander].HeaderTemplate}" />
           </Grid>
         </Border>
       </ControlTemplate>
     </Setter>
-  </Style>
-  <Style Selector="Expander /template/ ToggleButton#PART_toggle:pointerover /template/ Border">
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderLowBrush}" />
-  </Style>
-  <Style Selector="Expander:down:expanded /template/ ToggleButton#PART_toggle /template/ Path">
-    <Setter Property="RenderTransform">
-      <RotateTransform Angle="90" />
-    </Setter>
-  </Style>
-  <Style Selector="Expander:up:expanded /template/ ToggleButton#PART_toggle /template/ Path">
-    <Setter Property="RenderTransform">
-      <RotateTransform Angle="-90" />
-    </Setter>
-  </Style>
-  <Style Selector="Expander:left:expanded /template/ ToggleButton#PART_toggle /template/ Path">
-    <Setter Property="RenderTransform">
-      <RotateTransform Angle="180" />
-    </Setter>
-  </Style>
-  <Style Selector="Expander:right /template/ ToggleButton#PART_toggle /template/ Path">
-    <Setter Property="RenderTransform">
-      <RotateTransform Angle="180" />
-    </Setter>
-  </Style>
-  <Style Selector="Expander:right:expanded /template/ ToggleButton#PART_toggle /template/ Path">
-    <Setter Property="RenderTransform">
-      <RotateTransform Angle="0" />
+    <Style Selector="^:pointerover /template/ Border">
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderLowBrush}" />
+    </Style>
+  </ControlTheme>
+  <ControlTheme x:Key="DefaultExpanderToggleButtonUpTheme"
+                BasedOn="{StaticResource DefaultExpanderToggleButtonTheme}"
+                TargetType="ToggleButton">
+    <Style Selector="^ /template/ Path">
+      <Setter Property="RenderTransform">
+        <RotateTransform Angle="-90" />
+      </Setter>
+    </Style>
+  </ControlTheme>
+  <ControlTheme x:Key="DefaultExpanderToggleButtonDownTheme"
+                BasedOn="{StaticResource DefaultExpanderToggleButtonTheme}"
+                TargetType="ToggleButton">
+    <Style Selector="^ /template/ Path">
+      <Setter Property="RenderTransform">
+        <RotateTransform Angle="90" />
+      </Setter>
+    </Style>
+  </ControlTheme>
+  <ControlTheme x:Key="DefaultExpanderToggleButtonLeftTheme"
+                BasedOn="{StaticResource DefaultExpanderToggleButtonTheme}"
+                TargetType="ToggleButton">
+    <Style Selector="^ /template/ Path">
+      <Setter Property="RenderTransform">
+        <RotateTransform Angle="180" />
+      </Setter>
+    </Style>
+  </ControlTheme>
+  <ControlTheme x:Key="DefaultExpanderToggleButtonRightTheme"
+                BasedOn="{StaticResource DefaultExpanderToggleButtonTheme}"
+                TargetType="ToggleButton">
+    <Style Selector="^ /template/ Path">
+      <Setter Property="RenderTransform">
+        <RotateTransform Angle="0" />
+      </Setter>
+    </Style>
+  </ControlTheme>
+
+  <ControlTheme x:Key="{x:Type Expander}"
+                TargetType="Expander">
+    <Setter Property="ContentTransition">
+      <Setter.Value>
+        <CrossFade Duration="00:00:00.25" />
+      </Setter.Value>
     </Setter>
-  </Style>
-</Styles>
+    <Style Selector="^[ExpandDirection=Down]">
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <Grid RowDefinitions="Auto,*">
+              <ToggleButton Name="PART_toggle"
+                            Grid.Row="0"
+                            HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                            Content="{TemplateBinding Header}"
+                            IsChecked="{TemplateBinding IsExpanded,
+                                                        Mode=TwoWay}"
+                            Theme="{StaticResource DefaultExpanderToggleButtonRightTheme}" />
+              <ContentPresenter Name="PART_ContentPresenter"
+                                Grid.Row="1"
+                                Padding="{TemplateBinding Padding}"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                IsVisible="{TemplateBinding IsExpanded}" />
+            </Grid>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+      <Style Selector="^:expanded /template/ ToggleButton#PART_toggle">
+        <Setter Property="Theme" Value="{StaticResource DefaultExpanderToggleButtonDownTheme}" />
+      </Style>
+    </Style>
+    <Style Selector="^[ExpandDirection=Up]">
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <Grid RowDefinitions="*,Auto">
+              <ToggleButton Name="PART_toggle"
+                            Grid.Row="1"
+                            HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                            Content="{TemplateBinding Header}"
+                            IsChecked="{TemplateBinding IsExpanded,
+                                                        Mode=TwoWay}"
+                            Theme="{StaticResource DefaultExpanderToggleButtonRightTheme}" />
+              <ContentPresenter Name="PART_ContentPresenter"
+                                Grid.Row="0"
+                                Padding="{TemplateBinding Padding}"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                IsVisible="{TemplateBinding IsExpanded}" />
+            </Grid>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+      <Style Selector="^:expanded /template/ ToggleButton#PART_toggle">
+        <Setter Property="Theme" Value="{StaticResource DefaultExpanderToggleButtonUpTheme}" />
+      </Style>
+    </Style>
+    <Style Selector="^[ExpandDirection=Right]">
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <Grid ColumnDefinitions="Auto,*">
+              <ToggleButton Name="PART_toggle"
+                            Grid.Column="0"
+                            HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                            Content="{TemplateBinding Header}"
+                            IsChecked="{TemplateBinding IsExpanded,
+                                                        Mode=TwoWay}"
+                            Theme="{StaticResource DefaultExpanderToggleButtonLeftTheme}" />
+              <ContentPresenter Name="PART_ContentPresenter"
+                                Grid.Column="1"
+                                Padding="{TemplateBinding Padding}"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                IsVisible="{TemplateBinding IsExpanded}" />
+            </Grid>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+      <Style Selector="^:expanded /template/ ToggleButton#PART_toggle">
+        <Setter Property="Theme" Value="{StaticResource DefaultExpanderToggleButtonRightTheme}" />
+      </Style>
+    </Style>
+    <Style Selector="^[ExpandDirection=Left]">
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <Grid ColumnDefinitions="*,Auto">
+              <ToggleButton Name="PART_toggle"
+                            Grid.Column="1"
+                            HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                            Content="{TemplateBinding Header}"
+                            IsChecked="{TemplateBinding IsExpanded,
+                                                        Mode=TwoWay}"
+                            Theme="{StaticResource DefaultExpanderToggleButtonRightTheme}" />
+              <ContentPresenter Name="PART_ContentPresenter"
+                                Grid.Column="0"
+                                Padding="{TemplateBinding Padding}"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                IsVisible="{TemplateBinding IsExpanded}" />
+            </Grid>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+      <Style Selector="^:expanded /template/ ToggleButton#PART_toggle">
+        <Setter Property="Theme" Value="{StaticResource DefaultExpanderToggleButtonLeftTheme}" />
+      </Style>
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/FlyoutPresenter.xaml b/src/Avalonia.Themes.Default/Controls/FlyoutPresenter.xaml
index 3bc5e085ff..08959cfbbe 100644
--- a/src/Avalonia.Themes.Default/Controls/FlyoutPresenter.xaml
+++ b/src/Avalonia.Themes.Default/Controls/FlyoutPresenter.xaml
@@ -1,8 +1,10 @@
-<Styles xmlns="https://github.com/avaloniaui">
-  <Style Selector="FlyoutPresenter">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type FlyoutPresenter}"
+                TargetType="FlyoutPresenter">
     <Setter Property="HorizontalContentAlignment" Value="Stretch" />
     <Setter Property="VerticalContentAlignment" Value="Stretch" />
-    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>
+    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
     <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
     <Setter Property="BorderThickness" Value="1" />
     <Setter Property="Padding" Value="4" />
@@ -17,16 +19,16 @@
                 CornerRadius="{TemplateBinding CornerRadius}">
           <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
                         VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
-            <ContentPresenter Content="{TemplateBinding Content}"
-                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                              Margin="{TemplateBinding Padding}"
+            <ContentPresenter Margin="{TemplateBinding Padding}"
                               HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                               VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                               HorizontalContentAlignment="Stretch"
-                              VerticalContentAlignment="Stretch" />
+                              VerticalContentAlignment="Stretch"
+                              Content="{TemplateBinding Content}"
+                              ContentTemplate="{TemplateBinding ContentTemplate}" />
           </ScrollViewer>
         </Border>
       </ControlTemplate>
     </Setter>
-  </Style>
-</Styles>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/FocusAdorner.xaml b/src/Avalonia.Themes.Default/Controls/FocusAdorner.xaml
index 2d5e369573..f1d5f5f2ac 100644
--- a/src/Avalonia.Themes.Default/Controls/FocusAdorner.xaml
+++ b/src/Avalonia.Themes.Default/Controls/FocusAdorner.xaml
@@ -1,10 +1,11 @@
-<Style xmlns="https://github.com/avaloniaui" Selector=":is(Control)">
+<Style xmlns="https://github.com/avaloniaui"
+       Selector=":is(Control)">
   <Setter Property="FocusAdorner">
     <FocusAdornerTemplate>
-      <Rectangle Stroke="Black"
-                 StrokeThickness="1"
+      <Rectangle Margin="1"
+                 Stroke="Black"
                  StrokeDashArray="1,2"
-                 Margin="1"/>
+                 StrokeThickness="1" />
     </FocusAdornerTemplate>
   </Setter>
 </Style>
diff --git a/src/Avalonia.Themes.Default/Controls/GridSplitter.xaml b/src/Avalonia.Themes.Default/Controls/GridSplitter.xaml
index 490ae01318..f2a3f01397 100644
--- a/src/Avalonia.Themes.Default/Controls/GridSplitter.xaml
+++ b/src/Avalonia.Themes.Default/Controls/GridSplitter.xaml
@@ -1,6 +1,7 @@
-<Styles xmlns="https://github.com/avaloniaui">
-
-  <Style Selector="GridSplitter">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type GridSplitter}"
+                TargetType="GridSplitter">
     <Setter Property="Focusable" Value="True" />
     <Setter Property="MinWidth" Value="1" />
     <Setter Property="MinHeight" Value="1" />
@@ -12,13 +13,11 @@
     </Setter>
     <Setter Property="Template">
       <ControlTemplate>
-        <Border 
-          BorderBrush="{TemplateBinding BorderBrush}"
-          BorderThickness="{TemplateBinding BorderThickness}"
-          CornerRadius="{TemplateBinding CornerRadius}"
-          Background="{TemplateBinding Background}"/>
+        <Border Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}" />
       </ControlTemplate>
     </Setter>
-  </Style>
-
-</Styles>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/ItemsControl.xaml b/src/Avalonia.Themes.Default/Controls/ItemsControl.xaml
index 19d13b6399..d8cdf96abd 100644
--- a/src/Avalonia.Themes.Default/Controls/ItemsControl.xaml
+++ b/src/Avalonia.Themes.Default/Controls/ItemsControl.xaml
@@ -1,16 +1,20 @@
-<Style xmlns="https://github.com/avaloniaui" Selector="ItemsControl">
-  <Setter Property="Template">
-    <ControlTemplate>
-      <Border Background="{TemplateBinding Background}"
-              BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}"
-              CornerRadius="{TemplateBinding CornerRadius}"
-              Padding="{TemplateBinding Padding}">
-        <ItemsPresenter Name="PART_ItemsPresenter"
-                        Items="{TemplateBinding Items}"
-                        ItemsPanel="{TemplateBinding ItemsPanel}"
-                        ItemTemplate="{TemplateBinding ItemTemplate}"/>
-      </Border>
-    </ControlTemplate>
-  </Setter>
-</Style>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type ItemsControl}"
+                TargetType="ItemsControl">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Padding="{TemplateBinding Padding}"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <ItemsPresenter Name="PART_ItemsPresenter"
+                          ItemTemplate="{TemplateBinding ItemTemplate}"
+                          Items="{TemplateBinding Items}"
+                          ItemsPanel="{TemplateBinding ItemsPanel}" />
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/Label.xaml b/src/Avalonia.Themes.Default/Controls/Label.xaml
index 1e04d05497..0faa4852f2 100644
--- a/src/Avalonia.Themes.Default/Controls/Label.xaml
+++ b/src/Avalonia.Themes.Default/Controls/Label.xaml
@@ -1,18 +1,22 @@
-<Style xmlns="https://github.com/avaloniaui" Selector="Label">
-  <Setter Property="Padding" Value="3"/>
-  <Setter Property="Template">
-    <ControlTemplate>
-      <ContentPresenter Name="PART_ContentPresenter"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="{TemplateBinding CornerRadius}"
-                        ContentTemplate="{TemplateBinding ContentTemplate}"
-                        Content="{TemplateBinding Content}"
-                        Padding="{TemplateBinding Padding}"
-                        RecognizesAccessKey="True"
-                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"/>
-    </ControlTemplate>
-  </Setter>
-</Style>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type Label}"
+                TargetType="Label">
+    <Setter Property="Padding" Value="3" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ContentPresenter Name="PART_ContentPresenter"
+                          Padding="{TemplateBinding Padding}"
+                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          Content="{TemplateBinding Content}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
+                          RecognizesAccessKey="True" />
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/ListBox.xaml b/src/Avalonia.Themes.Default/Controls/ListBox.xaml
index b1fcb830b3..7308738681 100644
--- a/src/Avalonia.Themes.Default/Controls/ListBox.xaml
+++ b/src/Avalonia.Themes.Default/Controls/ListBox.xaml
@@ -1,35 +1,38 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Style Selector="ListBox">
-  <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>
-  <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
-  <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}"/>
-  <Setter Property="Padding" Value="4"/>
-  <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
-  <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
-  <Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
-  <Setter Property="Template">
-    <ControlTemplate>
-      <Border Name="border" BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}"
-              CornerRadius="{TemplateBinding CornerRadius}">
-        <ScrollViewer Name="PART_ScrollViewer"
-                      Background="{TemplateBinding Background}"
-                      HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
-                      VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}"
-                      IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
-                      AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}">
-          <ItemsPresenter Name="PART_ItemsPresenter"
-                          Items="{TemplateBinding Items}"
-                          ItemsPanel="{TemplateBinding ItemsPanel}"
-                          ItemTemplate="{TemplateBinding ItemTemplate}"
-                          Margin="{TemplateBinding Padding}"
-                          VirtualizationMode="{TemplateBinding VirtualizationMode}"/>
-        </ScrollViewer>
-      </Border>
-    </ControlTemplate>
-  </Setter>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type ListBox}"
+                TargetType="ListBox">
+    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}" />
+    <Setter Property="Padding" Value="4" />
+    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+    <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+    <Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Name="border"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <ScrollViewer Name="PART_ScrollViewer"
+                        AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}"
+                        Background="{TemplateBinding Background}"
+                        HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
+                        IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
+                        VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
+            <ItemsPresenter Name="PART_ItemsPresenter"
+                            Margin="{TemplateBinding Padding}"
+                            ItemTemplate="{TemplateBinding ItemTemplate}"
+                            Items="{TemplateBinding Items}"
+                            ItemsPanel="{TemplateBinding ItemsPanel}"
+                            VirtualizationMode="{TemplateBinding VirtualizationMode}" />
+          </ScrollViewer>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+    <Style Selector="^:disabled /template/ Border#border">
+      <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
     </Style>
-    <Style Selector="ListBox:disabled /template/ Border#border">
-        <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
-    </Style>
-</Styles>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/ListBoxItem.xaml b/src/Avalonia.Themes.Default/Controls/ListBoxItem.xaml
index c1360c5d98..4d918326c8 100644
--- a/src/Avalonia.Themes.Default/Controls/ListBoxItem.xaml
+++ b/src/Avalonia.Themes.Default/Controls/ListBoxItem.xaml
@@ -1,42 +1,44 @@
-<Styles xmlns="https://github.com/avaloniaui">
-  <Style Selector="ListBoxItem">
-    <Setter Property="Background" Value="Transparent"/>
-    <Setter Property="BorderBrush" Value="Transparent"/>
-    <Setter Property="BorderThickness" Value="0"/>
-    <Setter Property="Padding" Value="2 1"/>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type ListBoxItem}"
+                TargetType="ListBoxItem">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="BorderBrush" Value="Transparent" />
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="Padding" Value="2 1" />
     <Setter Property="Template">
       <ControlTemplate>
         <ContentPresenter Name="PART_ContentPresenter"
+                          Padding="{TemplateBinding Padding}"
+                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                           Background="{TemplateBinding Background}"
                           BorderBrush="{TemplateBinding BorderBrush}"
                           BorderThickness="{TemplateBinding BorderThickness}"
-                          CornerRadius="{TemplateBinding CornerRadius}"
-                          ContentTemplate="{TemplateBinding ContentTemplate}"
                           Content="{TemplateBinding Content}"
-                          Padding="{TemplateBinding Padding}"
-                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"/>
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          CornerRadius="{TemplateBinding CornerRadius}" />
       </ControlTemplate>
     </Setter>
-  </Style>
-    
-  <Style Selector="ListBoxItem:pointerover /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ThemeControlHighlightMidBrush}"/>
-  </Style>
-    
-  <Style Selector="ListBoxItem:selected /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush4}"/>
-  </Style>
-    
-  <Style Selector="ListBoxItem:selected:focus /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush3}"/>
-  </Style>
-    
-  <Style Selector="ListBoxItem:selected:pointerover /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush3}"/>
-  </Style>
 
-  <Style Selector="ListBoxItem:selected:focus:pointerover /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush2}"/>
-  </Style>
-</Styles>
+    <Style Selector="^:pointerover /template/ ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ThemeControlHighlightMidBrush}" />
+    </Style>
+
+    <Style Selector="^:selected /template/ ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush4}" />
+    </Style>
+
+    <Style Selector="^:selected:focus /template/ ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush3}" />
+    </Style>
+
+    <Style Selector="^:selected:pointerover /template/ ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush3}" />
+    </Style>
+
+    <Style Selector="^:selected:focus:pointerover /template/ ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush2}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/ManagedFileChooser.xaml b/src/Avalonia.Themes.Default/Controls/ManagedFileChooser.xaml
index f9f77bf455..52d9000396 100644
--- a/src/Avalonia.Themes.Default/Controls/ManagedFileChooser.xaml
+++ b/src/Avalonia.Themes.Default/Controls/ManagedFileChooser.xaml
@@ -1,153 +1,196 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:dialogs="clr-namespace:Avalonia.Dialogs;assembly=Avalonia.Dialogs">
-  <Style Selector="dialogs|ManagedFileChooser">
-    <Style.Resources>
-        <ResourceDictionary>
-            <DrawingGroup x:Key="LevelUp">
-                <GeometryDrawing Brush="#00FFFFFF" Geometry="F1M16,16L0,16 0,0 16,0z" />
-                <GeometryDrawing Brush="#FFF6F6F6" Geometry="F1M14.5,0L6.39,0 5.39,2 2.504,2C1.677,2,1,2.673,1,3.5L1,10.582 1,10.586 1,15.414 3,13.414 3,16 7,16 7,13.414 9,15.414 9,13 14.5,13C15.327,13,16,12.327,16,11.5L16,1.5C16,0.673,15.327,0,14.5,0" />
-                <GeometryDrawing Brush="#FFDCB679" Geometry="F1M14,3L7.508,3 8.008,2 8.012,2 14,2z M14.5,1L7.008,1 6.008,3 2.504,3C2.227,3,2,3.224,2,3.5L2,9.582 4.998,6.586 9,10.586 9,12 14.5,12C14.775,12,15,11.776,15,11.5L15,1.5C15,1.224,14.775,1,14.5,1" />
-                <GeometryDrawing Brush="#FF00529C" Geometry="F1M8,11L5,8 2,11 2,13 4,11 4,15 6,15 6,11 8,13z" />
-                <GeometryDrawing Brush="#FFF0EFF1" Geometry="F1M8.0001,1.9996L7.5001,3.0006 14.0001,3.0006 14.0001,1.9996z" />
-            </DrawingGroup>
-            <dialogs:ResourceSelectorConverter x:Key="Icons">
-                <DrawingGroup x:Key="Icon_Folder">
-                    <GeometryDrawing Brush="#00FFFFFF" Geometry="F1M0,0L16,0 16,16 0,16z" />
-                    <GeometryDrawing Brush="#FFF6F6F6" Geometry="F1M1.5,1L9.61,1 10.61,3 13.496,3C14.323,3,14.996,3.673,14.996,4.5L14.996,12.5C14.996,13.327,14.323,14,13.496,14L1.5,14C0.673,14,0,13.327,0,12.5L0,2.5C0,1.673,0.673,1,1.5,1" />
-                    <GeometryDrawing Brush="#FFDCB67A" Geometry="F1M2,3L8.374,3 8.874,4 2,4z M13.496,4L10,4 9.992,4 8.992,2 1.5,2C1.225,2,1,2.224,1,2.5L1,12.5C1,12.776,1.225,13,1.5,13L13.496,13C13.773,13,13.996,12.776,13.996,12.5L13.996,4.5C13.996,4.224,13.773,4,13.496,4" />
-                    <GeometryDrawing Brush="#FFEFEFF0" Geometry="F1M2,3L8.374,3 8.874,4 2,4z" />
-                </DrawingGroup>
-                <DrawingGroup x:Key="Icon_File">
-                    <GeometryDrawing Brush="#00FFFFFF" Geometry="F1M16,16L0,16 0,0 16,0z" />
-                    <GeometryDrawing Brush="#FFF6F6F6" Geometry="F1M4,15C3.03,15,2,14.299,2,13L2,3C2,1.701,3.03,1,4,1L10.061,1 14,4.556 14,13C14,13.97,13.299,15,12,15z" />
-                    <GeometryDrawing Brush="#FF9B4E96" Geometry="F1M12,13L4,13 4,3 9,3 9,6 12,6z M9.641,2L3.964,2C3.964,2,3,2,3,3L3,13C3,14,3.964,14,3.964,14L11.965,14C12.965,14,13,13,13,13L13,5z" />
-                    <GeometryDrawing Brush="#FFF0EFF1" Geometry="F1M4,3L9,3 9,6 12,6 12,13 4,13z" />
-                </DrawingGroup>
-                <DrawingGroup x:Key="Icon_Volume">
-                    <GeometryDrawing Brush="#00FFFFFF" Geometry="F1M16,16L0,16 0,0 16,0z" />
-                    <GeometryDrawing Brush="#FFF6F6F6" Geometry="F1M0,12L0,6.5C0,5.122,1.122,4,2.5,4L13.5,4C14.879,4,16,5.122,16,6.5L16,12z" />
-                    <GeometryDrawing Brush="#FFEFEFF0" Geometry="F1M13,8L12,8 12,7 13,7z M11,8L10,8 10,7 11,7z M13.5,6L2.5,6C2.224,6,2,6.224,2,6.5L2,10 14,10 14,6.5C14,6.224,13.775,6,13.5,6" />
-                    <GeometryDrawing Brush="#FF424242" Geometry="F1M13,7L12,7 12,8 13,8z M11,7L10,7 10,8 11,8z M2,10L14,10 14,6.5C14,6.224,13.775,6,13.5,6L2.5,6C2.224,6,2,6.224,2,6.5z M15,11L1,11 1,6.5C1,5.673,1.673,5,2.5,5L13.5,5C14.327,5,15,5.673,15,6.5z" />
-                </DrawingGroup>
-            </dialogs:ResourceSelectorConverter>
-        </ResourceDictionary>
-    </Style.Resources>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:dialogs="clr-namespace:Avalonia.Dialogs;assembly=Avalonia.Dialogs">
+  <DrawingGroup x:Key="LevelUp">
+    <GeometryDrawing Brush="#00FFFFFF" Geometry="F1M16,16L0,16 0,0 16,0z" />
+    <GeometryDrawing Brush="#FFF6F6F6"
+                     Geometry="F1M14.5,0L6.39,0 5.39,2 2.504,2C1.677,2,1,2.673,1,3.5L1,10.582 1,10.586 1,15.414 3,13.414 3,16 7,16 7,13.414 9,15.414 9,13 14.5,13C15.327,13,16,12.327,16,11.5L16,1.5C16,0.673,15.327,0,14.5,0" />
+    <GeometryDrawing Brush="#FFDCB679"
+                     Geometry="F1M14,3L7.508,3 8.008,2 8.012,2 14,2z M14.5,1L7.008,1 6.008,3 2.504,3C2.227,3,2,3.224,2,3.5L2,9.582 4.998,6.586 9,10.586 9,12 14.5,12C14.775,12,15,11.776,15,11.5L15,1.5C15,1.224,14.775,1,14.5,1" />
+    <GeometryDrawing Brush="#FF00529C" Geometry="F1M8,11L5,8 2,11 2,13 4,11 4,15 6,15 6,11 8,13z" />
+    <GeometryDrawing Brush="#FFF0EFF1" Geometry="F1M8.0001,1.9996L7.5001,3.0006 14.0001,3.0006 14.0001,1.9996z" />
+  </DrawingGroup>
+  <dialogs:ResourceSelectorConverter x:Key="Icons">
+    <DrawingGroup x:Key="Icon_Folder">
+      <GeometryDrawing Brush="#00FFFFFF" Geometry="F1M0,0L16,0 16,16 0,16z" />
+      <GeometryDrawing Brush="#FFF6F6F6"
+                       Geometry="F1M1.5,1L9.61,1 10.61,3 13.496,3C14.323,3,14.996,3.673,14.996,4.5L14.996,12.5C14.996,13.327,14.323,14,13.496,14L1.5,14C0.673,14,0,13.327,0,12.5L0,2.5C0,1.673,0.673,1,1.5,1" />
+      <GeometryDrawing Brush="#FFDCB67A"
+                       Geometry="F1M2,3L8.374,3 8.874,4 2,4z M13.496,4L10,4 9.992,4 8.992,2 1.5,2C1.225,2,1,2.224,1,2.5L1,12.5C1,12.776,1.225,13,1.5,13L13.496,13C13.773,13,13.996,12.776,13.996,12.5L13.996,4.5C13.996,4.224,13.773,4,13.496,4" />
+      <GeometryDrawing Brush="#FFEFEFF0" Geometry="F1M2,3L8.374,3 8.874,4 2,4z" />
+    </DrawingGroup>
+    <DrawingGroup x:Key="Icon_File">
+      <GeometryDrawing Brush="#00FFFFFF" Geometry="F1M16,16L0,16 0,0 16,0z" />
+      <GeometryDrawing Brush="#FFF6F6F6"
+                       Geometry="F1M4,15C3.03,15,2,14.299,2,13L2,3C2,1.701,3.03,1,4,1L10.061,1 14,4.556 14,13C14,13.97,13.299,15,12,15z" />
+      <GeometryDrawing Brush="#FF9B4E96"
+                       Geometry="F1M12,13L4,13 4,3 9,3 9,6 12,6z M9.641,2L3.964,2C3.964,2,3,2,3,3L3,13C3,14,3.964,14,3.964,14L11.965,14C12.965,14,13,13,13,13L13,5z" />
+      <GeometryDrawing Brush="#FFF0EFF1" Geometry="F1M4,3L9,3 9,6 12,6 12,13 4,13z" />
+    </DrawingGroup>
+    <DrawingGroup x:Key="Icon_Volume">
+      <GeometryDrawing Brush="#00FFFFFF" Geometry="F1M16,16L0,16 0,0 16,0z" />
+      <GeometryDrawing Brush="#FFF6F6F6"
+                       Geometry="F1M0,12L0,6.5C0,5.122,1.122,4,2.5,4L13.5,4C14.879,4,16,5.122,16,6.5L16,12z" />
+      <GeometryDrawing Brush="#FFEFEFF0"
+                       Geometry="F1M13,8L12,8 12,7 13,7z M11,8L10,8 10,7 11,7z M13.5,6L2.5,6C2.224,6,2,6.224,2,6.5L2,10 14,10 14,6.5C14,6.224,13.775,6,13.5,6" />
+      <GeometryDrawing Brush="#FF424242"
+                       Geometry="F1M13,7L12,7 12,8 13,8z M11,7L10,7 10,8 11,8z M2,10L14,10 14,6.5C14,6.224,13.775,6,13.5,6L2.5,6C2.224,6,2,6.224,2,6.5z M15,11L1,11 1,6.5C1,5.673,1.673,5,2.5,5L13.5,5C14.327,5,15,5.673,15,6.5z" />
+    </DrawingGroup>
+  </dialogs:ResourceSelectorConverter>
+
+  <ControlTheme x:Key="{x:Type dialogs:ManagedFileChooser}"
+                TargetType="dialogs:ManagedFileChooser">
     <Setter Property="Template">
       <ControlTemplate>
         <DockPanel>
-          <DockPanel DockPanel.Dock="Top" Margin="0 0 0 5">
-              <dialogs:ChildFitter DockPanel.Dock="Right" Width="{Binding ElementName=Location, Path=Bounds.Height}">
-                  <Button Command="{Binding GoUp}">
-                      <DrawingPresenter Drawing="{StaticResource LevelUp}" Stretch="Fill"/>
-                  </Button>
-              </dialogs:ChildFitter>
-              <TextBox x:Name="Location" Text="{Binding Location}" Margin="0 0 5 0">
-                  <TextBox.KeyBindings>
-                      <KeyBinding Command="{Binding EnterPressed}" Gesture="Enter"/>
-                  </TextBox.KeyBindings>
-              </TextBox>
+          <DockPanel Margin="0,0,0,5"
+                     DockPanel.Dock="Top">
+            <dialogs:ChildFitter Width="{Binding ElementName=Location, Path=Bounds.Height}"
+                                 DockPanel.Dock="Right">
+              <Button Command="{Binding GoUp}">
+                <Image Stretch="Fill">
+                  <DrawingImage Drawing="{StaticResource LevelUp}" />
+                </Image>
+              </Button>
+            </dialogs:ChildFitter>
+            <TextBox x:Name="Location"
+                     Margin="0,0,5,0"
+                     Text="{Binding Location}">
+              <TextBox.KeyBindings>
+                <KeyBinding Command="{Binding EnterPressed}"
+                            Gesture="Enter" />
+              </TextBox.KeyBindings>
+            </TextBox>
           </DockPanel>
-          <DockPanel Margin="0 5 0 0"  DockPanel.Dock="Bottom">
-              <StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
-                  <CheckBox IsChecked="{Binding ShowHiddenFiles}">
-                      <TextBlock>Show hidden files</TextBlock>
-                  </CheckBox>
-              </StackPanel>
-              <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Spacing="10">
-                  <StackPanel.Styles>
-                      <Style Selector="Button">
-                          <Setter Property="Margin" Value="4"/>
-                      </Style>
-                  </StackPanel.Styles>
-                  <Button Command="{Binding Ok}">OK</Button>
-                  <Button Command="{Binding Cancel}">Cancel</Button>
-              </StackPanel>
+          <DockPanel Margin="0,5,0,0"
+                     DockPanel.Dock="Bottom">
+            <StackPanel DockPanel.Dock="Left"
+                        Orientation="Horizontal">
+              <CheckBox IsChecked="{Binding ShowHiddenFiles}">
+                <TextBlock>Show hidden files</TextBlock>
+              </CheckBox>
+            </StackPanel>
+            <StackPanel HorizontalAlignment="Right"
+                        Orientation="Horizontal"
+                        Spacing="10">
+              <StackPanel.Styles>
+                <Style Selector="Button">
+                  <Setter Property="Margin" Value="4" />
+                </Style>
+              </StackPanel.Styles>
+              <Button Command="{Binding Ok}">OK</Button>
+              <Button Command="{Binding Cancel}">Cancel</Button>
+            </StackPanel>
           </DockPanel>
 
-          <ComboBox DockPanel.Dock="Bottom" 
-                    IsVisible="{Binding ShowFilters}" 
+          <ComboBox Margin="0,5,0,0"
+                    DockPanel.Dock="Bottom"
+                    IsVisible="{Binding ShowFilters}"
                     Items="{Binding Filters}"
-                    SelectedItem="{Binding SelectedFilter}"
-                    Margin="0 5 0 0" />
+                    SelectedItem="{Binding SelectedFilter}" />
 
-          <TextBox Text="{Binding FileName}" Watermark="File name" DockPanel.Dock="Bottom" IsVisible="{Binding !SelectingFolder}" />
+          <TextBox DockPanel.Dock="Bottom"
+                   IsVisible="{Binding !SelectingFolder}"
+                   Text="{Binding FileName}"
+                   Watermark="File name" />
 
-          <ListBox Margin="0 0 5 5" BorderBrush="Transparent" x:Name="QuickLinks" Items="{Binding QuickLinks}"
-                  SelectedIndex="{Binding QuickLinksSelectedIndex}"
-                  DockPanel.Dock="Left" Focusable="False">
-              <ListBox.ItemTemplate>
-                  <DataTemplate>
-                      <StackPanel Spacing="4" Orientation="Horizontal" Background="Transparent">
-                          <DrawingPresenter Width="16" Height="16" Drawing="{Binding IconKey, Converter={StaticResource Icons}}"/>
-                          <TextBlock Text="{Binding DisplayName}"/>
-                      </StackPanel>
-                  </DataTemplate>
-              </ListBox.ItemTemplate>
+          <ListBox x:Name="QuickLinks"
+                   Margin="0,0,5,5"
+                   BorderBrush="Transparent"
+                   DockPanel.Dock="Left"
+                   Focusable="False"
+                   Items="{Binding QuickLinks}"
+                   SelectedIndex="{Binding QuickLinksSelectedIndex}">
+            <ListBox.ItemTemplate>
+              <DataTemplate>
+                <StackPanel Background="Transparent"
+                            Orientation="Horizontal"
+                            Spacing="4">
+                  <Image Width="16"
+                         Height="16">
+                    <DrawingImage Drawing="{Binding IconKey, Converter={StaticResource Icons}}" />
+                  </Image>
+                  <TextBlock Text="{Binding DisplayName}" />
+                </StackPanel>
+              </DataTemplate>
+            </ListBox.ItemTemplate>
           </ListBox>
           <DockPanel Grid.IsSharedSizeScope="True">
-              <Grid DockPanel.Dock="Top" Margin="15 5 0 0" HorizontalAlignment="Stretch">
-                  <Grid.ColumnDefinitions>
-                      <ColumnDefinition Width="20" SharedSizeGroup="Icon" />
-                      <ColumnDefinition Width="16" SharedSizeGroup="Splitter"  />
-                      <ColumnDefinition Width="400" SharedSizeGroup="Name" />
-                      <ColumnDefinition Width="16" SharedSizeGroup="Splitter" />
-                      <ColumnDefinition Width="200" SharedSizeGroup="Modified" />
-                      <ColumnDefinition Width="16" SharedSizeGroup="Splitter" />
-                      <ColumnDefinition Width="150" SharedSizeGroup="Type" />
-                      <ColumnDefinition Width="16" SharedSizeGroup="Splitter" />
-                      <ColumnDefinition Width="200" SharedSizeGroup="Size" />
-                  </Grid.ColumnDefinitions>
-                  <GridSplitter Grid.Column="1" />
-                  <TextBlock Grid.Column="2" Text="Name" />
-                  <GridSplitter Grid.Column="3" />
-                  <TextBlock Grid.Column="4" Text="Date Modified" />
-                  <GridSplitter Grid.Column="5" />
-                  <TextBlock Grid.Column="6" Text="Type" />
-                  <GridSplitter Grid.Column="7" />
-                  <TextBlock Grid.Column="8" Text="Size" />
-              </Grid>
-              <ListBox x:Name="Files"
-                  VirtualizationMode="Simple"
-                  Items="{Binding Items}"
-                  Margin="0 5"
-                  SelectionMode="{Binding SelectionMode}"
-                  SelectedItems="{Binding SelectedItems}"
-                  ScrollViewer.HorizontalScrollBarVisibility="Disabled">
-                  <ListBox.ItemTemplate>
-                      <DataTemplate>
-                          <Grid Background="Transparent">
-                              <Grid.ColumnDefinitions>
-                                  <ColumnDefinition SharedSizeGroup="Icon" />
-                                  <ColumnDefinition SharedSizeGroup="Splitter"  />
-                                  <ColumnDefinition SharedSizeGroup="Name" />
-                                  <ColumnDefinition SharedSizeGroup="Splitter" />
-                                  <ColumnDefinition SharedSizeGroup="Modified" />
-                                  <ColumnDefinition SharedSizeGroup="Splitter" />
-                                  <ColumnDefinition SharedSizeGroup="Type" />
-                                  <ColumnDefinition SharedSizeGroup="Splitter" />
-                                  <ColumnDefinition SharedSizeGroup="Size" />
-                              </Grid.ColumnDefinitions>
-                              <DrawingPresenter Width="16" Height="16" Drawing="{Binding IconKey, Converter={StaticResource Icons}}"/>
-                              <TextBlock Grid.Column="2" Text="{Binding DisplayName}"/>
-                              <TextBlock Grid.Column="4" Text="{Binding Modified}" />
-                              <TextBlock Grid.Column="6" Text="{Binding Type}" />
-                              <TextBlock Grid.Column="8">
-                                <TextBlock.Text>
-                                    <Binding Path="Size">
-                                        <Binding.Converter>
-                                            <dialogs:FileSizeStringConverter/>
-                                        </Binding.Converter>
-                                    </Binding>
-                                </TextBlock.Text>
-                              </TextBlock>
-                          </Grid>
-                      </DataTemplate>
-                  </ListBox.ItemTemplate>
-              </ListBox>
+            <Grid Margin="15,5,0,0"
+                  HorizontalAlignment="Stretch"
+                  DockPanel.Dock="Top">
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="20" SharedSizeGroup="Icon" />
+                <ColumnDefinition Width="16" SharedSizeGroup="Splitter" />
+                <ColumnDefinition Width="400" SharedSizeGroup="Name" />
+                <ColumnDefinition Width="16" SharedSizeGroup="Splitter" />
+                <ColumnDefinition Width="200" SharedSizeGroup="Modified" />
+                <ColumnDefinition Width="16" SharedSizeGroup="Splitter" />
+                <ColumnDefinition Width="150" SharedSizeGroup="Type" />
+                <ColumnDefinition Width="16" SharedSizeGroup="Splitter" />
+                <ColumnDefinition Width="200" SharedSizeGroup="Size" />
+              </Grid.ColumnDefinitions>
+              <GridSplitter Grid.Column="1" />
+              <TextBlock Grid.Column="2"
+                         Text="Name" />
+              <GridSplitter Grid.Column="3" />
+              <TextBlock Grid.Column="4"
+                         Text="Date Modified" />
+              <GridSplitter Grid.Column="5" />
+              <TextBlock Grid.Column="6"
+                         Text="Type" />
+              <GridSplitter Grid.Column="7" />
+              <TextBlock Grid.Column="8"
+                         Text="Size" />
+            </Grid>
+            <ListBox x:Name="Files"
+                     Margin="0,5"
+                     Items="{Binding Items}"
+                     ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                     SelectedItems="{Binding SelectedItems}"
+                     SelectionMode="{Binding SelectionMode}"
+                     VirtualizationMode="Simple">
+              <ListBox.ItemTemplate>
+                <DataTemplate>
+                  <Grid Background="Transparent">
+                    <Grid.ColumnDefinitions>
+                      <ColumnDefinition SharedSizeGroup="Icon" />
+                      <ColumnDefinition SharedSizeGroup="Splitter" />
+                      <ColumnDefinition SharedSizeGroup="Name" />
+                      <ColumnDefinition SharedSizeGroup="Splitter" />
+                      <ColumnDefinition SharedSizeGroup="Modified" />
+                      <ColumnDefinition SharedSizeGroup="Splitter" />
+                      <ColumnDefinition SharedSizeGroup="Type" />
+                      <ColumnDefinition SharedSizeGroup="Splitter" />
+                      <ColumnDefinition SharedSizeGroup="Size" />
+                    </Grid.ColumnDefinitions>
+                    <Image Grid.Column="0"
+                           Width="16"
+                           Height="16">
+                      <DrawingImage Drawing="{Binding IconKey, Converter={StaticResource Icons}}" />
+                    </Image>
+                    <TextBlock Grid.Column="2"
+                               Text="{Binding DisplayName}" />
+                    <TextBlock Grid.Column="4"
+                               Text="{Binding Modified}" />
+                    <TextBlock Grid.Column="6"
+                               Text="{Binding Type}" />
+                    <TextBlock Grid.Column="8">
+                      <TextBlock.Text>
+                        <Binding Path="Size">
+                          <Binding.Converter>
+                            <dialogs:FileSizeStringConverter />
+                          </Binding.Converter>
+                        </Binding>
+                      </TextBlock.Text>
+                    </TextBlock>
+                  </Grid>
+                </DataTemplate>
+              </ListBox.ItemTemplate>
+            </ListBox>
           </DockPanel>
         </DockPanel>
       </ControlTemplate>
     </Setter>
-  </Style>
-</Styles>
\ No newline at end of file
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/Menu.xaml b/src/Avalonia.Themes.Default/Controls/Menu.xaml
index 583add1017..c698343d83 100644
--- a/src/Avalonia.Themes.Default/Controls/Menu.xaml
+++ b/src/Avalonia.Themes.Default/Controls/Menu.xaml
@@ -1,17 +1,83 @@
-<Style xmlns="https://github.com/avaloniaui" Selector="Menu">
-  <Setter Property="Template">
-    <ControlTemplate>
-      <Border Background="{TemplateBinding Background}"
-              BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}"
-              CornerRadius="{TemplateBinding CornerRadius}"
-              Padding="{TemplateBinding Padding}">
-        <ItemsPresenter Name="PART_ItemsPresenter" 
-                        Items="{TemplateBinding Items}" 
-                        ItemsPanel="{TemplateBinding ItemsPanel}"
-                        ItemTemplate="{TemplateBinding ItemTemplate}"
-                        KeyboardNavigation.TabNavigation="Continue"/>
-      </Border>
-    </ControlTemplate>
-  </Setter>
-</Style>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:sys="using:System">
+
+  <ControlTheme x:Key="DefaultTopLevelMenuItem"
+                TargetType="MenuItem">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="Padding" Value="6 0" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Name="root"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <Panel>
+            <ContentPresenter Name="PART_HeaderPresenter"
+                              Margin="{TemplateBinding Padding}"
+                              Content="{TemplateBinding Header}">
+              <ContentPresenter.DataTemplates>
+                <DataTemplate DataType="sys:String">
+                  <AccessText Text="{Binding}" />
+                </DataTemplate>
+              </ContentPresenter.DataTemplates>
+            </ContentPresenter>
+            <Popup Name="PART_Popup"
+                   IsLightDismissEnabled="True"
+                   IsOpen="{TemplateBinding IsSubMenuOpen,
+                                            Mode=TwoWay}"
+                   OverlayInputPassThroughElement="{Binding $parent[Menu]}">
+              <Border Background="{DynamicResource ThemeBackgroundBrush}"
+                      BorderBrush="{DynamicResource ThemeBorderMidBrush}"
+                      BorderThickness="{TemplateBinding BorderThickness}">
+                <ScrollViewer Theme="{StaticResource DefaultMenuScrollViewer}">
+                  <ItemsPresenter Name="PART_ItemsPresenter"
+                                  Margin="2"
+                                  Grid.IsSharedSizeScope="True"
+                                  ItemTemplate="{TemplateBinding ItemTemplate}"
+                                  Items="{TemplateBinding Items}"
+                                  ItemsPanel="{TemplateBinding ItemsPanel}" />
+                </ScrollViewer>
+              </Border>
+            </Popup>
+          </Panel>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^:selected /template/ Border#root">
+      <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush4}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeAccentBrush}" />
+    </Style>
+
+    <Style Selector="^:empty /template/ Path#rightArrow">
+      <Setter Property="IsVisible" Value="False" />
+    </Style>
+
+    <Style Selector="^:disabled">
+      <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
+    </Style>
+  </ControlTheme>
+
+  <ControlTheme x:Key="{x:Type Menu}"
+                TargetType="Menu">
+    <Setter Property="ItemContainerTheme" Value="{StaticResource DefaultTopLevelMenuItem}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Padding="{TemplateBinding Padding}"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <ItemsPresenter Name="PART_ItemsPresenter"
+                          ItemTemplate="{TemplateBinding ItemTemplate}"
+                          Items="{TemplateBinding Items}"
+                          ItemsPanel="{TemplateBinding ItemsPanel}"
+                          KeyboardNavigation.TabNavigation="Continue" />
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/MenuFlyoutPresenter.xaml b/src/Avalonia.Themes.Default/Controls/MenuFlyoutPresenter.xaml
index d56b46b17c..78c3d767a3 100644
--- a/src/Avalonia.Themes.Default/Controls/MenuFlyoutPresenter.xaml
+++ b/src/Avalonia.Themes.Default/Controls/MenuFlyoutPresenter.xaml
@@ -1,6 +1,8 @@
-<Styles xmlns="https://github.com/avaloniaui">
-  <Style Selector="MenuFlyoutPresenter">
-    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type MenuFlyoutPresenter}"
+                TargetType="MenuFlyoutPresenter">
+    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
     <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
     <Setter Property="BorderThickness" Value="1" />
     <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
@@ -13,17 +15,18 @@
                 BorderThickness="{TemplateBinding BorderThickness}"
                 CornerRadius="{TemplateBinding CornerRadius}">
           <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                        Theme="{StaticResource DefaultMenuScrollViewer}"
                         VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
             <ItemsPresenter Name="PART_ItemsPresenter"
+                            Margin="{TemplateBinding Padding}"
+                            Grid.IsSharedSizeScope="True"
+                            ItemTemplate="{TemplateBinding ItemTemplate}"
                             Items="{TemplateBinding Items}"
                             ItemsPanel="{TemplateBinding ItemsPanel}"
-                            ItemTemplate="{TemplateBinding ItemTemplate}"
-                            Margin="{TemplateBinding Padding}"
-                            KeyboardNavigation.TabNavigation="Continue"
-                            Grid.IsSharedSizeScope="True" />
+                            KeyboardNavigation.TabNavigation="Continue" />
           </ScrollViewer>
         </Border>
       </ControlTemplate>
     </Setter>
-  </Style>
-</Styles>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/MenuItem.xaml b/src/Avalonia.Themes.Default/Controls/MenuItem.xaml
index 05c286c1f5..b2d0f3535a 100644
--- a/src/Avalonia.Themes.Default/Controls/MenuItem.xaml
+++ b/src/Avalonia.Themes.Default/Controls/MenuItem.xaml
@@ -1,14 +1,14 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:conv="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls"
-        xmlns:sys="clr-namespace:System;assembly=netstandard">
-  <Styles.Resources>
-    <conv:PlatformKeyGestureConverter x:Key="KeyGestureConverter"/>
-  </Styles.Resources>
-  <Style Selector="MenuItem">
-    <Setter Property="Background" Value="Transparent"/>
-    <Setter Property="BorderThickness" Value="1"/>
-    <Setter Property="Padding" Value="6 0"/>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:conv="using:Avalonia.Controls.Converters"
+                    xmlns:sys="using:System">
+  <conv:PlatformKeyGestureConverter x:Key="KeyGestureConverter" />
+
+  <ControlTheme x:Key="{x:Type MenuItem}"
+                TargetType="MenuItem">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="Padding" Value="6 0" />
     <Setter Property="Template">
       <ControlTemplate>
         <Border Name="root"
@@ -18,133 +18,90 @@
                 CornerRadius="{TemplateBinding CornerRadius}">
           <Grid>
             <Grid.ColumnDefinitions>
-              <ColumnDefinition Width="20"/>
-              <ColumnDefinition Width="5"/>
-              <ColumnDefinition Width="*"/>
-              <ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemIGT"/>
-              <ColumnDefinition Width="20"/>
+              <ColumnDefinition Width="20" />
+              <ColumnDefinition Width="5" />
+              <ColumnDefinition Width="*" />
+              <ColumnDefinition Width="Auto"
+                                SharedSizeGroup="MenuItemIGT" />
+              <ColumnDefinition Width="20" />
             </Grid.ColumnDefinitions>
             <ContentPresenter Name="icon"
-                              Content="{TemplateBinding Icon}"
                               Width="16"
                               Height="16"
                               Margin="3"
                               HorizontalAlignment="Center"
-                              VerticalAlignment="Center"/>
+                              VerticalAlignment="Center"
+                              Content="{TemplateBinding Icon}" />
             <Path Name="check"
-                  Fill="{TemplateBinding Foreground}"
-                  Data="F1M10,1.2L4.7,9.1 4.5,9.1 0,5.2 1.3,3.5 4.3,6.1 8.3,0 10,1.2z"
-                  IsVisible="False"
                   Margin="3"
-                  VerticalAlignment="Center"/>
+                  VerticalAlignment="Center"
+                  Data="F1M10,1.2L4.7,9.1 4.5,9.1 0,5.2 1.3,3.5 4.3,6.1 8.3,0 10,1.2z"
+                  Fill="{TemplateBinding Foreground}"
+                  IsVisible="False" />
             <ContentPresenter Name="PART_HeaderPresenter"
-                              Content="{TemplateBinding Header}"
+                              Grid.Column="2"
                               Margin="{TemplateBinding Padding}"
                               VerticalAlignment="Center"
-                              Grid.Column="2">
+                              Content="{TemplateBinding Header}">
               <ContentPresenter.DataTemplates>
                 <DataTemplate DataType="sys:String">
-                  <AccessText Text="{Binding}"/>
+                  <AccessText Text="{Binding}" />
                 </DataTemplate>
               </ContentPresenter.DataTemplates>
             </ContentPresenter>
             <TextBlock x:Name="PART_InputGestureText"
                        Grid.Column="3"
-                       Text="{TemplateBinding InputGesture, Converter={StaticResource KeyGestureConverter}}"
-                       VerticalAlignment="Center"/>
+                       VerticalAlignment="Center"
+                       Text="{TemplateBinding InputGesture,
+                                              Converter={StaticResource KeyGestureConverter}}" />
             <Path Name="rightArrow"
-                  Data="M0,0L4,3.5 0,7z"
-                  Fill="{DynamicResource ThemeForegroundBrush}"
+                  Grid.Column="4"
                   Margin="10,0,0,0"
                   VerticalAlignment="Center"
-                  Grid.Column="4"/>
+                  Data="M0,0L4,3.5 0,7z"
+                  Fill="{DynamicResource ThemeForegroundBrush}" />
             <Popup Name="PART_Popup"
-                   PlacementMode="Right"
                    IsLightDismissEnabled="False"
-                   IsOpen="{TemplateBinding IsSubMenuOpen, Mode=TwoWay}">
-              <Border Background="{DynamicResource ThemeBackgroundBrush}"
-                      BorderBrush="{DynamicResource ThemeBorderMidBrush}"
-                      BorderThickness="{TemplateBinding BorderThickness}">
-                <ScrollViewer Classes="menuscroller">                  
-                    <ItemsPresenter Name="PART_ItemsPresenter"
-                                    Items="{TemplateBinding Items}"
-                                    ItemsPanel="{TemplateBinding ItemsPanel}"
-                                    ItemTemplate="{TemplateBinding ItemTemplate}"
-                                    Grid.IsSharedSizeScope="True"/>
-                </ScrollViewer>
-              </Border>
-            </Popup>
-            </Grid>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="MenuItem:separator">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Separator Background="{DynamicResource ThemeControlMidBrush}"
-                   Margin="20,1,0,1"
-                   Height="1"/>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="Menu > MenuItem">
-    <Setter Property="Padding" Value="6 0"/>
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Name="root"
-                Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}">
-          <Panel>
-            <ContentPresenter Name="PART_HeaderPresenter"
-                              Content="{TemplateBinding Header}"
-                              Margin="{TemplateBinding Padding}">
-              <ContentPresenter.DataTemplates>
-                <DataTemplate DataType="sys:String">
-                  <AccessText Text="{Binding}"/>
-                </DataTemplate>
-              </ContentPresenter.DataTemplates>
-            </ContentPresenter>
-            <Popup Name="PART_Popup"
-                   IsLightDismissEnabled="True"
-                   OverlayInputPassThroughElement="{Binding $parent[Menu]}"
-                   IsOpen="{TemplateBinding IsSubMenuOpen, Mode=TwoWay}">
+                   IsOpen="{TemplateBinding IsSubMenuOpen,
+                                            Mode=TwoWay}"
+                   PlacementMode="Right">
               <Border Background="{DynamicResource ThemeBackgroundBrush}"
                       BorderBrush="{DynamicResource ThemeBorderMidBrush}"
                       BorderThickness="{TemplateBinding BorderThickness}">
-                <ScrollViewer Classes="menuscroller">
+                <ScrollViewer Theme="{StaticResource DefaultMenuScrollViewer}">
                   <ItemsPresenter Name="PART_ItemsPresenter"
-                                  Items="{TemplateBinding Items}"
-                                  ItemsPanel="{TemplateBinding ItemsPanel}"
+                                  Margin="2"
+                                  Grid.IsSharedSizeScope="True"
                                   ItemTemplate="{TemplateBinding ItemTemplate}"
-                                  Grid.IsSharedSizeScope="True"/>
+                                  Items="{TemplateBinding Items}"
+                                  ItemsPanel="{TemplateBinding ItemsPanel}" />
                 </ScrollViewer>
               </Border>
             </Popup>
-          </Panel>
+          </Grid>
         </Border>
       </ControlTemplate>
     </Setter>
-  </Style>
 
-  <Style Selector="MenuItem /template/ ItemsPresenter#PART_ItemsPresenter">
-    <Setter Property="Margin" Value="2"/>
-  </Style>
+    <Style Selector="^:separator">
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Separator />
+        </ControlTemplate>
+      </Setter>
+    </Style>
 
-  <Style Selector="MenuItem:selected /template/ Border#root">
-    <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush4}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeAccentBrush}"/>
-  </Style>
+    <Style Selector="^:selected /template/ Border#root">
+      <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush4}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeAccentBrush}" />
+    </Style>
 
-  <Style Selector="MenuItem:empty /template/ Path#rightArrow">
-    <Setter Property="IsVisible" Value="False"/>
-  </Style>
+    <Style Selector="^:empty /template/ Path#rightArrow">
+      <Setter Property="IsVisible" Value="False" />
+    </Style>
 
-  <Style Selector="MenuItem:disabled">
-    <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}"/>
-  </Style>
-</Styles>
+    <Style Selector="^:disabled">
+      <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/NativeMenuBar.xaml b/src/Avalonia.Themes.Default/Controls/NativeMenuBar.xaml
index 3b0019eea1..3c74e2743a 100644
--- a/src/Avalonia.Themes.Default/Controls/NativeMenuBar.xaml
+++ b/src/Avalonia.Themes.Default/Controls/NativeMenuBar.xaml
@@ -1,30 +1,30 @@
-<Style xmlns="https://github.com/avaloniaui"
-       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-       xmlns:local="clr-namespace:Avalonia.Themes.Default"
-       Selector="NativeMenuBar">
-  <Style.Resources>
-    <local:InverseBooleanValueConverter x:Key="AvaloniaThemesDefaultNativeMenuBarInverseBooleanValueConverter" Default="True"/>
-    <local:IBitmapToImageConverter x:Key="AvaloniaThemesDefaultNativeMenuBarIBitmapToImageConverterr"/>
-  </Style.Resources>
-  <Setter Property="Template">
-    <ControlTemplate>
-      <Menu
-        IsVisible="{Binding $parent[TopLevel].(NativeMenu.IsNativeMenuExported), Converter={StaticResource AvaloniaThemesDefaultNativeMenuBarInverseBooleanValueConverter}}"
-        Items="{Binding $parent[TopLevel].(NativeMenu.Menu).Items}">
-        <Menu.Styles>
-          <Style Selector="MenuItem">
-            <Setter Property="Header" Value="{Binding Header}"/>
-            <Setter Property="IsEnabled" Value="{Binding IsEnabled}"/>
-            <Setter Property="InputGesture" Value="{Binding Gesture}"/>
-            <Setter Property="Items" Value="{Binding Menu.Items}"/>
-            <Setter Property="Command" Value="{Binding Command}"/>
-            <Setter Property="CommandParameter" Value="{Binding CommandParameter}"/>
-            <Setter Property="(NativeMenuBar.EnableMenuItemClickForwarding)" Value="True"/>
-            <!--NativeMenuItem is IBitmap and MenuItem is Image-->
-            <Setter Property="Icon" Value="{Binding Icon , Converter={StaticResource AvaloniaThemesDefaultNativeMenuBarIBitmapToImageConverterr}}"/>
-          </Style>
-        </Menu.Styles>
-      </Menu>
-    </ControlTemplate>
-  </Setter>
-</Style>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:default="clr-namespace:Avalonia.Themes.Default">
+  <default:InverseBooleanValueConverter x:Key="AvaloniaThemesDefaultNativeMenuBarInverseBooleanValueConverter"
+                                        Default="True" />
+  <default:IBitmapToImageConverter x:Key="AvaloniaThemesDefaultNativeMenuBarIBitmapToImageConverter" />
+  <ControlTheme x:Key="{x:Type NativeMenuBar}"
+                TargetType="NativeMenuBar">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Menu IsVisible="{Binding $parent[TopLevel].(NativeMenu.IsNativeMenuExported), Converter={StaticResource AvaloniaThemesDefaultNativeMenuBarInverseBooleanValueConverter}}"
+              Items="{Binding $parent[TopLevel].(NativeMenu.Menu).Items}">
+          <Menu.Styles>
+            <Style Selector="MenuItem">
+              <Setter Property="Header" Value="{Binding Header}" />
+              <Setter Property="IsEnabled" Value="{Binding IsEnabled}" />
+              <Setter Property="InputGesture" Value="{Binding Gesture}" />
+              <Setter Property="Items" Value="{Binding Menu.Items}" />
+              <Setter Property="Command" Value="{Binding Command}" />
+              <Setter Property="CommandParameter" Value="{Binding CommandParameter}" />
+              <Setter Property="(NativeMenuBar.EnableMenuItemClickForwarding)" Value="True" />
+              <!--  NativeMenuItem is IBitmap and MenuItem is Image  -->
+              <Setter Property="Icon" Value="{Binding Icon, Converter={StaticResource AvaloniaThemesDefaultNativeMenuBarIBitmapToImageConverter}}" />
+            </Style>
+          </Menu.Styles>
+        </Menu>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/NotificationCard.xaml b/src/Avalonia.Themes.Default/Controls/NotificationCard.xaml
index c411fede11..524f964afc 100644
--- a/src/Avalonia.Themes.Default/Controls/NotificationCard.xaml
+++ b/src/Avalonia.Themes.Default/Controls/NotificationCard.xaml
@@ -1,93 +1,98 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Style Selector="NotificationCard">
-        <Setter Property="UseLayoutRounding" Value="True"/>
-        <Setter Property="Width" Value="350"/>
-        <Setter Property="FontSize" Value="14"/>
-        <Setter Property="Foreground" Value="White"/>
-        <Setter Property="RenderTransformOrigin" Value="50%,75%"/>
-        <Setter Property="Template">
-            <ControlTemplate>
-                <LayoutTransformControl Name="PART_LayoutTransformControl" UseRenderTransform="True">
-                    <Border Background="{TemplateBinding Background}" 
-                            BorderBrush="{TemplateBinding BorderBrush}" 
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding CornerRadius}"
-                            Margin="8,8,0,0">
-                        <ContentControl Name="PART_Content" Content="{TemplateBinding Content}" />
-                    </Border>
-                </LayoutTransformControl>
-            </ControlTemplate>
-        </Setter>
-
-        <Style.Animations>
-            <Animation Duration="0:0:0.45" Easing="QuadraticEaseIn" FillMode="Forward">
-                <KeyFrame Cue="0%">
-                    <Setter Property="Opacity" Value="0"/>
-                    <Setter Property="TranslateTransform.Y" Value="20"/>
-                    <Setter Property="ScaleTransform.ScaleX" Value="0.85"/>
-                    <Setter Property="ScaleTransform.ScaleY" Value="0.85"/>
-                </KeyFrame>
-                <KeyFrame Cue="30%">
-                    <Setter Property="TranslateTransform.Y" Value="-20"/>
-                </KeyFrame>
-                <KeyFrame Cue="100%">
-                    <Setter Property="Opacity" Value="1"/>
-                    <Setter Property="TranslateTransform.Y" Value="0"/>
-                    <Setter Property="ScaleTransform.ScaleX" Value="1"/>
-                    <Setter Property="ScaleTransform.ScaleY" Value="1"/>
-                </KeyFrame>
-            </Animation>
-        </Style.Animations>
-    </Style>
-
-    <Style Selector="NotificationCard/template/ ContentControl#PART_Content">
-        <Setter Property="MinHeight" Value="150" />
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type NotificationCard}"
+                TargetType="NotificationCard">
+    <Setter Property="Background" Value="{DynamicResource NotificationCardBackgroundBrush}" />
+    <Setter Property="UseLayoutRounding" Value="True" />
+    <Setter Property="Width" Value="350" />
+    <Setter Property="FontSize" Value="14" />
+    <Setter Property="Foreground" Value="White" />
+    <Setter Property="RenderTransformOrigin" Value="50%,75%" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <LayoutTransformControl Name="PART_LayoutTransformControl"
+                                UseRenderTransform="True">
+          <Border Margin="8,8,0,0"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <ContentControl Name="PART_Content"
+                            MinHeight="150"
+                            Content="{TemplateBinding Content}" />
+          </Border>
+        </LayoutTransformControl>
+      </ControlTemplate>
+    </Setter>
+    <Style Selector="^">
+      <Style.Animations>
+        <Animation Easing="QuadraticEaseIn"
+                   FillMode="Forward"
+                   Duration="0:0:0.45">
+          <KeyFrame Cue="0%">
+            <Setter Property="Opacity" Value="0" />
+            <Setter Property="TranslateTransform.Y" Value="20" />
+            <Setter Property="ScaleTransform.ScaleX" Value="0.85" />
+            <Setter Property="ScaleTransform.ScaleY" Value="0.85" />
+          </KeyFrame>
+          <KeyFrame Cue="30%">
+            <Setter Property="TranslateTransform.Y" Value="-20" />
+          </KeyFrame>
+          <KeyFrame Cue="100%">
+            <Setter Property="Opacity" Value="1" />
+            <Setter Property="TranslateTransform.Y" Value="0" />
+            <Setter Property="ScaleTransform.ScaleX" Value="1" />
+            <Setter Property="ScaleTransform.ScaleY" Value="1" />
+          </KeyFrame>
+        </Animation>
+      </Style.Animations>
     </Style>
 
-    <Style Selector="NotificationCard[IsClosing=true] /template/ LayoutTransformControl#PART_LayoutTransformControl">
-        <Setter Property="RenderTransformOrigin" Value="50%,0%"/>
-        <Style.Animations>
-            <Animation Duration="0:0:0.75" Easing="QuadraticEaseOut" FillMode="Forward">
-                <KeyFrame Cue="0%">
-                    <Setter Property="TranslateTransform.X" Value="0"/>
-                    <Setter Property="ScaleTransform.ScaleY" Value="1"/>
-                </KeyFrame>
-                <KeyFrame Cue="70%">
-                    <Setter Property="TranslateTransform.X" Value="800"/>
-                    <Setter Property="ScaleTransform.ScaleY" Value="1"/>
-                </KeyFrame>
-                <KeyFrame Cue="100%">
-                    <Setter Property="ScaleTransform.ScaleY" Value="0"/>
-                    <Setter Property="TranslateTransform.X" Value="800"/>
-                </KeyFrame>
-            </Animation>
-        </Style.Animations>
+    <Style Selector="^[IsClosing=true] /template/ LayoutTransformControl#PART_LayoutTransformControl">
+      <Setter Property="RenderTransformOrigin" Value="50%,0%" />
+      <Style.Animations>
+        <Animation Easing="QuadraticEaseOut"
+                   FillMode="Forward"
+                   Duration="0:0:0.75">
+          <KeyFrame Cue="0%">
+            <Setter Property="TranslateTransform.X" Value="0" />
+            <Setter Property="ScaleTransform.ScaleY" Value="1" />
+          </KeyFrame>
+          <KeyFrame Cue="70%">
+            <Setter Property="TranslateTransform.X" Value="800" />
+            <Setter Property="ScaleTransform.ScaleY" Value="1" />
+          </KeyFrame>
+          <KeyFrame Cue="100%">
+            <Setter Property="ScaleTransform.ScaleY" Value="0" />
+            <Setter Property="TranslateTransform.X" Value="800" />
+          </KeyFrame>
+        </Animation>
+      </Style.Animations>
     </Style>
 
-    <Style Selector="NotificationCard[IsClosing=true]">
-        <Style.Animations>
-            <Animation Duration="0:0:1.25" Easing="QuadraticEaseOut" FillMode="Forward">
-                <KeyFrame Cue="100%">
-                    <Setter Property="IsClosed" Value="True"/>
-                </KeyFrame>
-            </Animation>
-        </Style.Animations>
+    <Style Selector="^[IsClosing=true]">
+      <Style.Animations>
+        <Animation Easing="QuadraticEaseOut"
+                   FillMode="Forward"
+                   Duration="0:0:1.25">
+          <KeyFrame Cue="100%">
+            <Setter Property="IsClosed" Value="True" />
+          </KeyFrame>
+        </Animation>
+      </Style.Animations>
     </Style>
 
-    <Style Selector="NotificationCard">
-        <Setter Property="Background" Value="{DynamicResource NotificationCardBackgroundBrush}"/>
-    </Style>
-    <Style Selector="NotificationCard:information">
-        <Setter Property="Background" Value="{DynamicResource NotificationCardInformationBackgroundBrush}"/>
+    <Style Selector="^:information">
+      <Setter Property="Background" Value="{DynamicResource NotificationCardInformationBackgroundBrush}" />
     </Style>
-    <Style Selector="NotificationCard:success">
-        <Setter Property="Background" Value="{DynamicResource NotificationCardSuccessBackgroundBrush}"/>
+    <Style Selector="^:success">
+      <Setter Property="Background" Value="{DynamicResource NotificationCardSuccessBackgroundBrush}" />
     </Style>
-    <Style Selector="NotificationCard:warning">
-        <Setter Property="Background" Value="{DynamicResource NotificationCardWarningBackgroundBrush}"/>
+    <Style Selector="^:warning">
+      <Setter Property="Background" Value="{DynamicResource NotificationCardWarningBackgroundBrush}" />
     </Style>
-    <Style Selector="NotificationCard:error">
-        <Setter Property="Background" Value="{DynamicResource NotificationCardErrorBackgroundBrush}"/>
+    <Style Selector="^:error">
+      <Setter Property="Background" Value="{DynamicResource NotificationCardErrorBackgroundBrush}" />
     </Style>
-</Styles>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/NumericUpDown.xaml b/src/Avalonia.Themes.Default/Controls/NumericUpDown.xaml
index 6740be69bb..d3adfb31e0 100644
--- a/src/Avalonia.Themes.Default/Controls/NumericUpDown.xaml
+++ b/src/Avalonia.Themes.Default/Controls/NumericUpDown.xaml
@@ -1,40 +1,39 @@
-<Styles xmlns="https://github.com/avaloniaui">
-  <Style Selector="NumericUpDown">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type NumericUpDown}"
+                TargetType="NumericUpDown">
     <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
-    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}"/>
-    <Setter Property="Padding" Value="4"/>
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}" />
+    <Setter Property="Padding" Value="4" />
     <Setter Property="Template">
       <ControlTemplate>
         <ButtonSpinner Name="PART_Spinner"
-                       Background="{TemplateBinding Background}"
-                       BorderThickness="{TemplateBinding BorderThickness}"
-                       CornerRadius="{TemplateBinding CornerRadius}"
-                       BorderBrush="{TemplateBinding BorderBrush}"
                        HorizontalContentAlignment="Stretch"
                        VerticalContentAlignment="Stretch"
                        AllowSpin="{TemplateBinding AllowSpin}"
-                       ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}"
-                       ButtonSpinnerLocation="{TemplateBinding ButtonSpinnerLocation}">
+                       Background="{TemplateBinding Background}"
+                       BorderBrush="{TemplateBinding BorderBrush}"
+                       BorderThickness="{TemplateBinding BorderThickness}"
+                       ButtonSpinnerLocation="{TemplateBinding ButtonSpinnerLocation}"
+                       CornerRadius="{TemplateBinding CornerRadius}"
+                       ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
           <TextBox Name="PART_TextBox"
-                   BorderThickness="0"
-                   Background="{TemplateBinding Background}" 
+                   MinWidth="20"
+                   Margin="4"
                    Padding="{TemplateBinding Padding}"
-                   Watermark="{TemplateBinding Watermark}"
+                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                   VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                   AcceptsReturn="False"
+                   Background="{TemplateBinding Background}"
+                   BorderThickness="0"
                    DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
                    IsReadOnly="{TemplateBinding IsReadOnly}"
-                   VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                    Text="{TemplateBinding Text}"
-                   AcceptsReturn="False"
-                   TextWrapping="NoWrap">
-          </TextBox>
+                   TextWrapping="NoWrap"
+                   Watermark="{TemplateBinding Watermark}" />
         </ButtonSpinner>
       </ControlTemplate>
     </Setter>
-  </Style>
-  <Style Selector="NumericUpDown /template/ TextBox#PART_TextBox">
-    <Setter Property="Margin" Value="4"/>
-    <Setter Property="MinWidth" Value="20"/>
-  </Style>
-</Styles>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/OverlayPopupHost.xaml b/src/Avalonia.Themes.Default/Controls/OverlayPopupHost.xaml
index 07d905ea1d..d1f5585c02 100644
--- a/src/Avalonia.Themes.Default/Controls/OverlayPopupHost.xaml
+++ b/src/Avalonia.Themes.Default/Controls/OverlayPopupHost.xaml
@@ -1,23 +1,25 @@
-<Style xmlns="https://github.com/avaloniaui"
-       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-       Selector="OverlayPopupHost">
-  <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
-  <Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}" />
-  <Setter Property="FontFamily" Value="{x:Static FontFamily.Default}" />
-  <Setter Property="FontWeight" Value="400" />
-  <Setter Property="FontStyle" Value="Normal" />
-  <Setter Property="Template">
-    <ControlTemplate>
-      <!--  Do not forget to update Templated_Control_With_Popup_In_Template_Should_Set_TemplatedParent test  -->
-      <LayoutTransformControl LayoutTransform="{TemplateBinding Transform}">
-        <VisualLayerManager IsPopup="True">
-          <ContentPresenter Name="PART_ContentPresenter"
-                            Background="{TemplateBinding Background}"
-                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                            Content="{TemplateBinding Content}"
-                            Padding="{TemplateBinding Padding}"/>
-        </VisualLayerManager>
-      </LayoutTransformControl>
-    </ControlTemplate>
-  </Setter>
-</Style>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type OverlayPopupHost}"
+                TargetType="OverlayPopupHost">
+    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+    <Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}" />
+    <Setter Property="FontFamily" Value="{x:Static FontFamily.Default}" />
+    <Setter Property="FontWeight" Value="400" />
+    <Setter Property="FontStyle" Value="Normal" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <!--  Do not forget to update Templated_Control_With_Popup_In_Template_Should_Set_TemplatedParent test  -->
+        <LayoutTransformControl LayoutTransform="{TemplateBinding Transform}">
+          <VisualLayerManager IsPopup="True">
+            <ContentPresenter Name="PART_ContentPresenter"
+                              Padding="{TemplateBinding Padding}"
+                              Background="{TemplateBinding Background}"
+                              Content="{TemplateBinding Content}"
+                              ContentTemplate="{TemplateBinding ContentTemplate}" />
+          </VisualLayerManager>
+        </LayoutTransformControl>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/PathIcon.xaml b/src/Avalonia.Themes.Default/Controls/PathIcon.xaml
index 039f0ef10c..4116b5784e 100644
--- a/src/Avalonia.Themes.Default/Controls/PathIcon.xaml
+++ b/src/Avalonia.Themes.Default/Controls/PathIcon.xaml
@@ -1,21 +1,22 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Style Selector="PathIcon">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type PathIcon}"
+                TargetType="PathIcon">
     <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundColor}" />
     <Setter Property="Background" Value="Transparent" />
     <Setter Property="Height" Value="{DynamicResource IconElementThemeHeight}" />
     <Setter Property="Width" Value="{DynamicResource IconElementThemeWidth}" />
     <Setter Property="Template">
       <ControlTemplate>
-      <Border Background="{TemplateBinding Background}">
-          <Viewbox Height="{TemplateBinding Height}"
-                   Width="{TemplateBinding Width}">
-            <Path Fill="{TemplateBinding Foreground}"
-                  Data="{TemplateBinding Data}"
+        <Border Background="{TemplateBinding Background}">
+          <Viewbox Width="{TemplateBinding Width}"
+                   Height="{TemplateBinding Height}">
+            <Path Data="{TemplateBinding Data}"
+                  Fill="{TemplateBinding Foreground}"
                   Stretch="Uniform" />
           </Viewbox>
         </Border>
       </ControlTemplate>
     </Setter>
-  </Style>
-</Styles>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/PopupRoot.xaml b/src/Avalonia.Themes.Default/Controls/PopupRoot.xaml
index 5e8f3337ee..a5593e3a68 100644
--- a/src/Avalonia.Themes.Default/Controls/PopupRoot.xaml
+++ b/src/Avalonia.Themes.Default/Controls/PopupRoot.xaml
@@ -1,27 +1,30 @@
-<Style xmlns="https://github.com/avaloniaui"
-       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-       Selector="PopupRoot">
-  <Setter Property="Background" Value="{x:Null}"/>
-  <Setter Property="TransparencyLevelHint" Value="Transparent" />
-  <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
-  <Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}"/>
-  <Setter Property="FontFamily" Value="{x:Static FontFamily.Default}" />
-  <Setter Property="FontWeight" Value="400" />
-  <Setter Property="FontStyle" Value="Normal" />
-  <Setter Property="Template">
-    <ControlTemplate>
-      <LayoutTransformControl LayoutTransform="{TemplateBinding Transform}">
-        <Panel>
-          <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
-          <VisualLayerManager IsPopup="True">
-            <ContentPresenter Name="PART_ContentPresenter"
-                              Background="{TemplateBinding Background}"
-                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                              Content="{TemplateBinding Content}"
-                              Padding="{TemplateBinding Padding}"/>
-          </VisualLayerManager>
-        </Panel>
-      </LayoutTransformControl>
-    </ControlTemplate>
-  </Setter>
-</Style>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type PopupRoot}"
+                TargetType="PopupRoot">
+    <Setter Property="Background" Value="{x:Null}" />
+    <Setter Property="TransparencyLevelHint" Value="Transparent" />
+    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+    <Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}" />
+    <Setter Property="FontFamily" Value="{x:Static FontFamily.Default}" />
+    <Setter Property="FontWeight" Value="400" />
+    <Setter Property="FontStyle" Value="Normal" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <LayoutTransformControl LayoutTransform="{TemplateBinding Transform}">
+          <Panel>
+            <Border Name="PART_TransparencyFallback"
+                    IsHitTestVisible="False" />
+            <VisualLayerManager IsPopup="True">
+              <ContentPresenter Name="PART_ContentPresenter"
+                                Padding="{TemplateBinding Padding}"
+                                Background="{TemplateBinding Background}"
+                                Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}" />
+            </VisualLayerManager>
+          </Panel>
+        </LayoutTransformControl>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/ProgressBar.xaml b/src/Avalonia.Themes.Default/Controls/ProgressBar.xaml
index 3f684f3936..5adb5bde7e 100644
--- a/src/Avalonia.Themes.Default/Controls/ProgressBar.xaml
+++ b/src/Avalonia.Themes.Default/Controls/ProgressBar.xaml
@@ -1,6 +1,6 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:converters="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:converters="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls">
   <Design.PreviewWith>
     <Border Padding="20">
       <StackPanel Spacing="10">
@@ -12,30 +12,42 @@
       </StackPanel>
     </Border>
   </Design.PreviewWith>
-  <Style Selector="ProgressBar">
-    <Style.Resources>
-      <converters:StringFormatConverter x:Key="StringFormatConverter"/>
-    </Style.Resources>
-    <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush4}"/>
-    <Setter Property="Foreground" Value="{DynamicResource ThemeAccentBrush}"/>
+
+  <converters:StringFormatConverter x:Key="StringFormatConverter" />
+
+  <ControlTheme x:Key="{x:Type ProgressBar}"
+                TargetType="ProgressBar">
+    <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush4}" />
+    <Setter Property="Foreground" Value="{DynamicResource ThemeAccentBrush}" />
     <Setter Property="Template">
       <ControlTemplate TargetType="ProgressBar">
         <Grid>
-          <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}">
+          <Border Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
             <Panel>
-              <Border Name="PART_Indicator" Background="{TemplateBinding Foreground}" IsVisible="{Binding !IsIndeterminate, RelativeSource={RelativeSource TemplatedParent}}"/>
-              <Border Name="PART_IndeterminateIndicator" Background="{TemplateBinding Foreground}" IsVisible="{Binding IsIndeterminate, RelativeSource={RelativeSource TemplatedParent}}"/>
+              <Border Name="PART_Indicator"
+                      Background="{TemplateBinding Foreground}"
+                      IsVisible="{Binding !IsIndeterminate, RelativeSource={RelativeSource TemplatedParent}}" />
+              <Border Name="PART_IndeterminateIndicator"
+                      Background="{TemplateBinding Foreground}"
+                      IsVisible="{Binding IsIndeterminate, RelativeSource={RelativeSource TemplatedParent}}" />
             </Panel>
           </Border>
-          <LayoutTransformControl HorizontalAlignment="Center" VerticalAlignment="Center" IsVisible="{Binding ShowProgressText, RelativeSource={RelativeSource TemplatedParent}}" Name="PART_LayoutTransformControl">
+          <LayoutTransformControl Name="PART_LayoutTransformControl"
+                                  HorizontalAlignment="Center"
+                                  VerticalAlignment="Center"
+                                  IsVisible="{Binding ShowProgressText, RelativeSource={RelativeSource TemplatedParent}}">
             <TextBlock Foreground="{DynamicResource ThemeForegroundBrush}">
               <TextBlock.Text>
                 <MultiBinding Converter="{StaticResource StringFormatConverter}">
-                  <TemplateBinding Property="ProgressTextFormat"/>
-                  <Binding Path="Value" RelativeSource="{RelativeSource TemplatedParent}"/>
-                  <TemplateBinding Property="Percentage"/>
-                  <TemplateBinding Property="Minimum"/>
-                  <TemplateBinding Property="Maximum"/>
+                  <TemplateBinding Property="ProgressTextFormat" />
+                  <Binding Path="Value"
+                           RelativeSource="{RelativeSource TemplatedParent}" />
+                  <TemplateBinding Property="Percentage" />
+                  <TemplateBinding Property="Minimum" />
+                  <TemplateBinding Property="Maximum" />
                 </MultiBinding>
               </TextBlock.Text>
             </TextBlock>
@@ -43,55 +55,60 @@
         </Grid>
       </ControlTemplate>
     </Setter>
-  </Style>
-  <Style Selector="ProgressBar:horizontal /template/ Border#PART_Indicator">
-    <Setter Property="HorizontalAlignment" Value="Left"/>
-    <Setter Property="VerticalAlignment" Value="Stretch"/>
-  </Style>
-  <Style Selector="ProgressBar:vertical /template/ Border#PART_Indicator">
-    <Setter Property="HorizontalAlignment" Value="Stretch"/>
-    <Setter Property="VerticalAlignment" Value="Bottom"/>
-  </Style>
-  <Style Selector="ProgressBar:horizontal">
-    <Setter Property="MinWidth" Value="200"/>
-    <Setter Property="MinHeight" Value="16"/>
-  </Style>
-  <Style Selector="ProgressBar:vertical">
-    <Setter Property="MinWidth" Value="16"/>
-    <Setter Property="MinHeight" Value="200"/>
-  </Style>
-  <Style Selector="ProgressBar:vertical /template/ LayoutTransformControl#PART_LayoutTransformControl">
-    <Setter Property="LayoutTransform">
-      <Setter.Value>
-        <RotateTransform Angle="90"/>
-      </Setter.Value>
-    </Setter>
-  </Style>
 
-  <Style Selector="ProgressBar:horizontal:indeterminate /template/ Border#PART_IndeterminateIndicator">
-    <Style.Animations>
-      <Animation Duration="0:0:3" IterationCount="Infinite" Easing="LinearEasing">
-        <KeyFrame Cue="0%">
-          <Setter Property="TranslateTransform.X" Value="{Binding IndeterminateStartingOffset, RelativeSource={RelativeSource TemplatedParent}}" />
-        </KeyFrame>
-        <KeyFrame Cue="100%">
-          <Setter Property="TranslateTransform.X" Value="{Binding IndeterminateEndingOffset, RelativeSource={RelativeSource TemplatedParent}}" />
-        </KeyFrame>
-      </Animation>
-    </Style.Animations>
-    <Setter Property="Width" Value="{Binding TemplateProperties.ContainerWidth, RelativeSource={RelativeSource TemplatedParent}}" />
-  </Style>
-  <Style Selector="ProgressBar:vertical:indeterminate /template/ Border#PART_IndeterminateIndicator">
-    <Style.Animations>
-      <Animation Duration="0:0:3" IterationCount="Infinite" Easing="LinearEasing">
-        <KeyFrame Cue="0%">
-          <Setter Property="TranslateTransform.Y" Value="{Binding IndeterminateStartingOffset, RelativeSource={RelativeSource TemplatedParent}}" />
-        </KeyFrame>
-        <KeyFrame Cue="100%">
-          <Setter Property="TranslateTransform.Y" Value="{Binding IndeterminateEndingOffset, RelativeSource={RelativeSource TemplatedParent}}" />
-        </KeyFrame>
-      </Animation>
-    </Style.Animations>
-    <Setter Property="Height" Value="{Binding TemplateProperties.ContainerWidth, RelativeSource={RelativeSource TemplatedParent}}" />
-  </Style>
-</Styles>
+    <Style Selector="^:horizontal /template/ Border#PART_Indicator">
+      <Setter Property="HorizontalAlignment" Value="Left" />
+      <Setter Property="VerticalAlignment" Value="Stretch" />
+    </Style>
+    <Style Selector="^:vertical /template/ Border#PART_Indicator">
+      <Setter Property="HorizontalAlignment" Value="Stretch" />
+      <Setter Property="VerticalAlignment" Value="Bottom" />
+    </Style>
+    <Style Selector="^:horizontal">
+      <Setter Property="MinWidth" Value="200" />
+      <Setter Property="MinHeight" Value="16" />
+    </Style>
+    <Style Selector="^:vertical">
+      <Setter Property="MinWidth" Value="16" />
+      <Setter Property="MinHeight" Value="200" />
+    </Style>
+    <Style Selector="^:vertical /template/ LayoutTransformControl#PART_LayoutTransformControl">
+      <Setter Property="LayoutTransform">
+        <Setter.Value>
+          <RotateTransform Angle="90" />
+        </Setter.Value>
+      </Setter>
+    </Style>
+
+    <Style Selector="^:horizontal:indeterminate /template/ Border#PART_IndeterminateIndicator">
+      <Style.Animations>
+        <Animation Easing="LinearEasing"
+                   IterationCount="Infinite"
+                   Duration="0:0:3">
+          <KeyFrame Cue="0%">
+            <Setter Property="TranslateTransform.X" Value="{Binding IndeterminateStartingOffset, RelativeSource={RelativeSource TemplatedParent}}" />
+          </KeyFrame>
+          <KeyFrame Cue="100%">
+            <Setter Property="TranslateTransform.X" Value="{Binding IndeterminateEndingOffset, RelativeSource={RelativeSource TemplatedParent}}" />
+          </KeyFrame>
+        </Animation>
+      </Style.Animations>
+      <Setter Property="Width" Value="{Binding TemplateProperties.ContainerWidth, RelativeSource={RelativeSource TemplatedParent}}" />
+    </Style>
+    <Style Selector="^:vertical:indeterminate /template/ Border#PART_IndeterminateIndicator">
+      <Style.Animations>
+        <Animation Easing="LinearEasing"
+                   IterationCount="Infinite"
+                   Duration="0:0:3">
+          <KeyFrame Cue="0%">
+            <Setter Property="TranslateTransform.Y" Value="{Binding IndeterminateStartingOffset, RelativeSource={RelativeSource TemplatedParent}}" />
+          </KeyFrame>
+          <KeyFrame Cue="100%">
+            <Setter Property="TranslateTransform.Y" Value="{Binding IndeterminateEndingOffset, RelativeSource={RelativeSource TemplatedParent}}" />
+          </KeyFrame>
+        </Animation>
+      </Style.Animations>
+      <Setter Property="Height" Value="{Binding TemplateProperties.ContainerWidth, RelativeSource={RelativeSource TemplatedParent}}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/RadioButton.xaml b/src/Avalonia.Themes.Default/Controls/RadioButton.xaml
index ae33946009..c837b44402 100644
--- a/src/Avalonia.Themes.Default/Controls/RadioButton.xaml
+++ b/src/Avalonia.Themes.Default/Controls/RadioButton.xaml
@@ -1,61 +1,64 @@
-<Styles xmlns="https://github.com/avaloniaui">
-  <Style Selector="RadioButton">
-    <Setter Property="Background" Value="Transparent"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
-    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}"/>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type RadioButton}"
+                TargetType="RadioButton">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}" />
     <Setter Property="Template">
       <ControlTemplate>
-        <Grid ColumnDefinitions="Auto,*" Background="{TemplateBinding Background}">
+        <Grid Background="{TemplateBinding Background}"
+              ColumnDefinitions="Auto,*">
           <Ellipse Name="border"
-                   Stroke="{TemplateBinding BorderBrush}"
-                   StrokeThickness="1"
                    Width="18"
                    Height="18"
-                   VerticalAlignment="Center"/>
+                   VerticalAlignment="Center"
+                   Stroke="{TemplateBinding BorderBrush}"
+                   StrokeThickness="1" />
           <Ellipse Name="checkMark"
                    Width="10"
                    Height="10"
-                   Stretch="Uniform"
-                   UseLayoutRounding="False"
                    HorizontalAlignment="Center"
-                   VerticalAlignment="Center"/>
+                   VerticalAlignment="Center"
+                   Stretch="Uniform"
+                   UseLayoutRounding="False" />
           <Ellipse Name="indeterminateMark"
-                   Fill="{DynamicResource ThemeAccentBrush}"
                    Width="10"
                    Height="10"
-                   Stretch="Uniform"
-                   UseLayoutRounding="False"
                    HorizontalAlignment="Center"
-                   VerticalAlignment="Center"/>
+                   VerticalAlignment="Center"
+                   Fill="{DynamicResource ThemeAccentBrush}"
+                   Stretch="Uniform"
+                   UseLayoutRounding="False" />
           <ContentPresenter Name="PART_ContentPresenter"
-                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                            Content="{TemplateBinding Content}"
+                            Grid.Column="1"
                             Margin="4,0,0,0"
-                            RecognizesAccessKey="True"
                             VerticalAlignment="Center"
-                            Grid.Column="1"/>
+                            Content="{TemplateBinding Content}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            RecognizesAccessKey="True" />
         </Grid>
       </ControlTemplate>
     </Setter>
-  </Style>
-  
-  <Style Selector="RadioButton:pointerover /template/ Ellipse#border">
-    <Setter Property="Stroke" Value="{DynamicResource ThemeBorderHighBrush}"/>
-  </Style>
-  <Style Selector="RadioButton /template/ Ellipse#checkMark">
-    <Setter Property="Fill" Value="{DynamicResource HighlightBrush}"/>
-    <Setter Property="IsVisible" Value="False"/>
-  </Style>
-  <Style Selector="RadioButton /template/ Ellipse#indeterminateMark">
-    <Setter Property="IsVisible" Value="False"/>
-  </Style>
-  <Style Selector="RadioButton:checked /template/ Ellipse#checkMark">
-    <Setter Property="IsVisible" Value="True"/>
-  </Style>
-  <Style Selector="RadioButton:indeterminate /template/ Ellipse#indeterminateMark">
-    <Setter Property="IsVisible" Value="True"/>
-  </Style>
-  <Style Selector="RadioButton:disabled /template/ Ellipse#border">
-    <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}"/>
-  </Style>
-</Styles>
+
+    <Style Selector="^:pointerover /template/ Ellipse#border">
+      <Setter Property="Stroke" Value="{DynamicResource ThemeBorderHighBrush}" />
+    </Style>
+    <Style Selector="^ /template/ Ellipse#checkMark">
+      <Setter Property="Fill" Value="{DynamicResource HighlightBrush}" />
+      <Setter Property="IsVisible" Value="False" />
+    </Style>
+    <Style Selector="^ /template/ Ellipse#indeterminateMark">
+      <Setter Property="IsVisible" Value="False" />
+    </Style>
+    <Style Selector="^:checked /template/ Ellipse#checkMark">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
+    <Style Selector="^:indeterminate /template/ Ellipse#indeterminateMark">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
+    <Style Selector="^:disabled /template/ Ellipse#border">
+      <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/RepeatButton.xaml b/src/Avalonia.Themes.Default/Controls/RepeatButton.xaml
index 47398966f7..73cfd4d810 100644
--- a/src/Avalonia.Themes.Default/Controls/RepeatButton.xaml
+++ b/src/Avalonia.Themes.Default/Controls/RepeatButton.xaml
@@ -1,41 +1,34 @@
-<Styles xmlns="https://github.com/avaloniaui">
-    <Style Selector="RepeatButton">
-        <Setter Property="Background"
-                Value="{DynamicResource ThemeControlMidBrush}" />
-        <Setter Property="BorderBrush"
-                Value="{DynamicResource ThemeBorderLowBrush}" />
-        <Setter Property="BorderThickness"
-                Value="{DynamicResource ThemeBorderThickness}" />
-        <Setter Property="Foreground"
-                Value="{DynamicResource ThemeForegroundBrush}" />
-        <Setter Property="HorizontalContentAlignment"
-                Value="Center" />
-        <Setter Property="VerticalContentAlignment"
-                Value="Center" />
-        <Setter Property="Padding"
-                Value="4" />
-        <Setter Property="Template">
-            <ControlTemplate>
-                <ContentPresenter Name="PART_ContentPresenter"
-                                  Background="{TemplateBinding Background}"
-                                  BorderBrush="{TemplateBinding BorderBrush}"
-                                  BorderThickness="{TemplateBinding BorderThickness}"
-                                  CornerRadius="{TemplateBinding CornerRadius}"
-                                  ContentTemplate="{TemplateBinding ContentTemplate}"
-                                  Content="{TemplateBinding Content}"
-                                  Padding="{TemplateBinding Padding}"
-                                  TextElement.Foreground="{TemplateBinding Foreground}"
-                                  HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                  VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
-            </ControlTemplate>
-        </Setter>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type RepeatButton}"
+                TargetType="RepeatButton">
+    <Setter Property="Background" Value="{DynamicResource ThemeControlMidBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderLowBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}" />
+    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+    <Setter Property="HorizontalContentAlignment" Value="Center" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Padding" Value="4" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ContentPresenter Name="PART_ContentPresenter"
+                          Padding="{TemplateBinding Padding}"
+                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          Content="{TemplateBinding Content}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
+                          TextElement.Foreground="{TemplateBinding Foreground}" />
+      </ControlTemplate>
+    </Setter>
+    <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
     </Style>
-    <Style Selector="RepeatButton:pointerover /template/ ContentPresenter">
-        <Setter Property="BorderBrush"
-                Value="{DynamicResource ThemeBorderMidBrush}" />
+    <Style Selector="^:disabled">
+      <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
     </Style>
-    <Style Selector="RepeatButton:disabled">
-        <Setter Property="Opacity"
-                Value="{DynamicResource ThemeDisabledOpacity}" />
-    </Style>
-</Styles>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/RichTextBlock.xaml b/src/Avalonia.Themes.Default/Controls/RichTextBlock.xaml
index d7bf6e5cf9..c0570282cb 100644
--- a/src/Avalonia.Themes.Default/Controls/RichTextBlock.xaml
+++ b/src/Avalonia.Themes.Default/Controls/RichTextBlock.xaml
@@ -1,10 +1,14 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Design.PreviewWith>
-        <RichTextBlock IsTextSelectionEnabled="True" Text="Preview"/>
-    </Design.PreviewWith>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Design.PreviewWith>
+    <RichTextBlock IsTextSelectionEnabled="True"
+                   Text="Preview" />
+  </Design.PreviewWith>
 
-    <Style Selector="RichTextBlock[IsTextSelectionEnabled=true]">
+  <ControlTheme x:Key="{x:Type RichTextBlock}"
+                TargetType="RichTextBlock">
+    <Style Selector="^[IsTextSelectionEnabled=True]">
       <Setter Property="Cursor" Value="IBeam" />
     </Style>
-</Styles>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/ScrollBar.xaml b/src/Avalonia.Themes.Default/Controls/ScrollBar.xaml
index 0f8fa4986d..d28ba66f6d 100644
--- a/src/Avalonia.Themes.Default/Controls/ScrollBar.xaml
+++ b/src/Avalonia.Themes.Default/Controls/ScrollBar.xaml
@@ -1,142 +1,151 @@
-<Styles xmlns="https://github.com/avaloniaui">
-  <Style Selector="ScrollBar">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type ScrollBar}"
+                TargetType="ScrollBar">
     <Setter Property="Cursor" Value="Arrow" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Background="{DynamicResource ThemeControlMidBrush}"
-                UseLayoutRounding="False">
-          <Grid RowDefinitions="Auto,*,Auto">
-            <RepeatButton Name="PART_LineUpButton" HorizontalAlignment="Center"
-                          Classes="repeat"
-                          Grid.Row="0"
-                          Focusable="False"
-                          MinHeight="{DynamicResource ScrollBarThickness}">
-              <Path Data="M 0 4 L 8 4 L 4 0 Z" />
-            </RepeatButton>
-            <Track Grid.Row="1"
-                   Grid.Column="1"
-                   Minimum="{TemplateBinding Minimum}"
-                   Maximum="{TemplateBinding Maximum}"
-                   Value="{TemplateBinding Value, Mode=TwoWay}"
-                   ViewportSize="{TemplateBinding ViewportSize}"
-                   Orientation="{TemplateBinding Orientation}"
-                   IsDirectionReversed="True">
-              <Track.DecreaseButton>
-                <RepeatButton Name="PART_PageUpButton"
-                              Classes="repeattrack"
-                              Focusable="False"/>
-              </Track.DecreaseButton>
-              <Track.IncreaseButton>
-                <RepeatButton Name="PART_PageDownButton"
-                              Classes="repeattrack"
-                              Focusable="False"/>
-              </Track.IncreaseButton>
-              <Thumb Name="thumb"/>
-            </Track>
-            <RepeatButton Name="PART_LineDownButton" HorizontalAlignment="Center"
-                          Classes="repeat"
-                          Grid.Row="2"
-                          Grid.Column="2"
-                          Focusable="False"
-                          MinHeight="{DynamicResource ScrollBarThickness}">
-              <Path Data="M 0 0 L 4 4 L 8 0 Z" />
-            </RepeatButton>
-          </Grid>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-  <Style Selector="ScrollBar:horizontal">
-    <Setter Property="Height" Value="{DynamicResource ScrollBarThickness}" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Background="{DynamicResource ThemeControlMidBrush}"
-                UseLayoutRounding="False">
-          <Grid ColumnDefinitions="Auto,*,Auto">
-            <RepeatButton Name="PART_LineUpButton" VerticalAlignment="Center"
-                          Classes="repeat"
-                          Grid.Row="0"
-                          Grid.Column="0"
-                          Focusable="False"
-                          MinWidth="{DynamicResource ScrollBarThickness}">
-              <Path Data="M 4 0 L 4 8 L 0 4 Z" />
-            </RepeatButton>
-            <Track Grid.Row="1"
-                   Grid.Column="1"
-                   Minimum="{TemplateBinding Minimum}"
-                   Maximum="{TemplateBinding Maximum}"
-                   Value="{TemplateBinding Value, Mode=TwoWay}"
-                   ViewportSize="{TemplateBinding ViewportSize}"
-                   Orientation="{TemplateBinding Orientation}">
-              <Track.DecreaseButton>
-                <RepeatButton Name="PART_PageUpButton"
-                              Classes="repeattrack"
-                              Focusable="False"/>
-              </Track.DecreaseButton>
-              <Track.IncreaseButton>
-                <RepeatButton Name="PART_PageDownButton"
-                              Classes="repeattrack"
-                              Focusable="False"/>
-              </Track.IncreaseButton>
-              <Thumb Name="thumb"/>
-            </Track>
-            <RepeatButton Name="PART_LineDownButton" VerticalAlignment="Center"
-                          Classes="repeat"
-                          Grid.Row="2"
-                          Grid.Column="2"
-                          Focusable="False"
-                          MinWidth="{DynamicResource ScrollBarThickness}">
-              <Path Data="M 0 0 L 4 4 L 0 8 Z"  />
-            </RepeatButton>
-          </Grid>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-  <Style Selector="ScrollBar /template/ Thumb#thumb">
-    <Setter Property="Background" Value="{DynamicResource ThemeControlMidHighBrush}"/>
-    <Setter Property="Template">
-      <Setter.Value>
+
+    <Style Selector="^:horizontal">
+      <Setter Property="Height" Value="{DynamicResource ScrollBarThickness}" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border Background="{DynamicResource ThemeControlMidBrush}"
+                  UseLayoutRounding="False">
+            <Grid ColumnDefinitions="Auto,*,Auto">
+              <RepeatButton Name="PART_LineUpButton"
+                            Grid.Row="0"
+                            Grid.Column="0"
+                            MinWidth="{DynamicResource ScrollBarThickness}"
+                            VerticalAlignment="Center"
+                            Classes="repeat"
+                            Focusable="False">
+                <Path Data="M 4 0 L 4 8 L 0 4 Z" />
+              </RepeatButton>
+              <Track Grid.Row="1"
+                     Grid.Column="1"
+                     Maximum="{TemplateBinding Maximum}"
+                     Minimum="{TemplateBinding Minimum}"
+                     Orientation="{TemplateBinding Orientation}"
+                     ViewportSize="{TemplateBinding ViewportSize}"
+                     Value="{TemplateBinding Value,
+                                             Mode=TwoWay}">
+                <Track.DecreaseButton>
+                  <RepeatButton Name="PART_PageUpButton"
+                                Classes="repeattrack"
+                                Focusable="False" />
+                </Track.DecreaseButton>
+                <Track.IncreaseButton>
+                  <RepeatButton Name="PART_PageDownButton"
+                                Classes="repeattrack"
+                                Focusable="False" />
+                </Track.IncreaseButton>
+                <Thumb Name="thumb" />
+              </Track>
+              <RepeatButton Name="PART_LineDownButton"
+                            Grid.Row="2"
+                            Grid.Column="2"
+                            MinWidth="{DynamicResource ScrollBarThickness}"
+                            VerticalAlignment="Center"
+                            Classes="repeat"
+                            Focusable="False">
+                <Path Data="M 0 0 L 4 4 L 0 8 Z" />
+              </RepeatButton>
+            </Grid>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+    </Style>
+    <Style Selector="^:vertical">
+      <Setter Property="Width" Value="{DynamicResource ScrollBarThickness}" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border Background="{DynamicResource ThemeControlMidBrush}"
+                  UseLayoutRounding="False">
+            <Grid RowDefinitions="Auto,*,Auto">
+              <RepeatButton Name="PART_LineUpButton"
+                            Grid.Row="0"
+                            MinHeight="{DynamicResource ScrollBarThickness}"
+                            HorizontalAlignment="Center"
+                            Classes="repeat"
+                            Focusable="False">
+                <Path Data="M 0 4 L 8 4 L 4 0 Z" />
+              </RepeatButton>
+              <Track Grid.Row="1"
+                     Grid.Column="1"
+                     IsDirectionReversed="True"
+                     Maximum="{TemplateBinding Maximum}"
+                     Minimum="{TemplateBinding Minimum}"
+                     Orientation="{TemplateBinding Orientation}"
+                     ViewportSize="{TemplateBinding ViewportSize}"
+                     Value="{TemplateBinding Value,
+                                             Mode=TwoWay}">
+                <Track.DecreaseButton>
+                  <RepeatButton Name="PART_PageUpButton"
+                                Classes="repeattrack"
+                                Focusable="False" />
+                </Track.DecreaseButton>
+                <Track.IncreaseButton>
+                  <RepeatButton Name="PART_PageDownButton"
+                                Classes="repeattrack"
+                                Focusable="False" />
+                </Track.IncreaseButton>
+                <Thumb Name="thumb" />
+              </Track>
+              <RepeatButton Name="PART_LineDownButton"
+                            Grid.Row="2"
+                            Grid.Column="2"
+                            MinHeight="{DynamicResource ScrollBarThickness}"
+                            HorizontalAlignment="Center"
+                            Classes="repeat"
+                            Focusable="False">
+                <Path Data="M 0 0 L 4 4 L 8 0 Z" />
+              </RepeatButton>
+            </Grid>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+    </Style>
+    <Style Selector="^ /template/ Thumb#thumb">
+      <Setter Property="Background" Value="{DynamicResource ThemeControlMidHighBrush}" />
+      <Setter Property="Template">
+        <Setter.Value>
+          <ControlTemplate>
+            <Border Background="{TemplateBinding Background}" />
+          </ControlTemplate>
+        </Setter.Value>
+      </Setter>
+    </Style>
+    <Style Selector="^ /template/ Thumb#thumb:pointerover">
+      <Setter Property="Background" Value="{DynamicResource ThemeControlHighBrush}" />
+    </Style>
+    <Style Selector="^ /template/ Thumb#thumb:pressed">
+      <Setter Property="Background" Value="{DynamicResource ThemeControlVeryHighBrush}" />
+    </Style>
+    <Style Selector="^:horizontal /template/ Thumb#thumb">
+      <Setter Property="MinWidth" Value="{DynamicResource ScrollBarThickness}" />
+      <Setter Property="Height" Value="{DynamicResource ScrollBarThumbThickness}" />
+    </Style>
+    <Style Selector="^:vertical /template/ Thumb#thumb">
+      <Setter Property="MinHeight" Value="{DynamicResource ScrollBarThickness}" />
+      <Setter Property="Width" Value="{DynamicResource ScrollBarThumbThickness}" />
+    </Style>
+    <Style Selector="^ /template/ RepeatButton.repeat">
+      <Setter Property="Padding" Value="2" />
+      <Setter Property="BorderThickness" Value="0" />
+    </Style>
+    <Style Selector="^ /template/ RepeatButton.repeattrack">
+      <Setter Property="Template">
         <ControlTemplate>
-          <Border Background="{TemplateBinding Background}"/>
+          <Border Background="{TemplateBinding Background}" />
         </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style Selector="ScrollBar /template/ Thumb#thumb:pointerover">
-    <Setter Property="Background" Value="{DynamicResource ThemeControlHighBrush}"/>
-  </Style>
-  <Style Selector="ScrollBar /template/ Thumb#thumb:pressed">
-    <Setter Property="Background" Value="{DynamicResource ThemeControlVeryHighBrush}"/>
-  </Style>
-  <Style Selector="ScrollBar:horizontal /template/ Thumb#thumb">
-    <Setter Property="MinWidth" Value="{DynamicResource ScrollBarThickness}" />
-    <Setter Property="Height" Value="{DynamicResource ScrollBarThumbThickness}" />
-  </Style>
-  <Style Selector="ScrollBar:vertical">
-    <Setter Property="Width" Value="{DynamicResource ScrollBarThickness}" />
-  </Style>
-  <Style Selector="ScrollBar:vertical /template/ Thumb#thumb">
-    <Setter Property="MinHeight" Value="{DynamicResource ScrollBarThickness}" />
-    <Setter Property="Width" Value="{DynamicResource ScrollBarThumbThickness}" />
-  </Style>
-  <Style Selector="ScrollBar /template/ RepeatButton.repeat">
-    <Setter Property="Padding" Value="2" />
-    <Setter Property="BorderThickness" Value="0" />
-  </Style>
-  <Style Selector="ScrollBar /template/ RepeatButton.repeattrack">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Background="{TemplateBinding Background}" />
-      </ControlTemplate>
-    </Setter>
-  </Style>
+      </Setter>
+    </Style>
 
-  <Style Selector="ScrollBar /template/ RepeatButton > Path">
-    <Setter Property="Fill" Value="{DynamicResource ThemeForegroundLowBrush}" />
-  </Style>
+    <Style Selector="^ /template/ RepeatButton > Path">
+      <Setter Property="Fill" Value="{DynamicResource ThemeForegroundLowBrush}" />
+    </Style>
 
-  <Style Selector="ScrollBar /template/ RepeatButton:pointerover > Path">
-    <Setter Property="Fill" Value="{DynamicResource ThemeAccentBrush}" />
-  </Style>
-</Styles>
+    <Style Selector="^ /template/ RepeatButton:pointerover > Path">
+      <Setter Property="Fill" Value="{DynamicResource ThemeAccentBrush}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/ScrollViewer.xaml b/src/Avalonia.Themes.Default/Controls/ScrollViewer.xaml
index aab1b76259..83b3330fcf 100644
--- a/src/Avalonia.Themes.Default/Controls/ScrollViewer.xaml
+++ b/src/Avalonia.Themes.Default/Controls/ScrollViewer.xaml
@@ -1,106 +1,125 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:converters="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls">
-  <Style Selector="ScrollViewer">
-    <Setter Property="Background"
-            Value="Transparent" />
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:converters="using:Avalonia.Controls.Converters">
+  <ControlTheme x:Key="{x:Type ScrollViewer}"
+                TargetType="ScrollViewer">
+    <Setter Property="Background" Value="Transparent" />
     <Setter Property="Template">
       <ControlTemplate>
-        <Grid ColumnDefinitions="*,Auto" RowDefinitions="*,Auto">
+        <Grid ColumnDefinitions="*,Auto"
+              RowDefinitions="*,Auto">
           <ScrollContentPresenter Name="PART_ContentPresenter"
+                                  Padding="{TemplateBinding Padding}"
                                   Background="{TemplateBinding Background}"
                                   CanHorizontallyScroll="{TemplateBinding CanHorizontallyScroll}"
                                   CanVerticallyScroll="{TemplateBinding CanVerticallyScroll}"
                                   Content="{TemplateBinding Content}"
-                                  Extent="{TemplateBinding Extent, Mode=TwoWay}"
-                                  Padding="{TemplateBinding Padding}"
-                                  Offset="{TemplateBinding Offset, Mode=TwoWay}"
-                                  Viewport="{TemplateBinding Viewport, Mode=TwoWay}"
-                                  IsScrollChainingEnabled="{TemplateBinding IsScrollChainingEnabled}">
+                                  Extent="{TemplateBinding Extent,
+                                                           Mode=TwoWay}"
+                                  IsScrollChainingEnabled="{TemplateBinding IsScrollChainingEnabled}"
+                                  Viewport="{TemplateBinding Viewport,
+                                                             Mode=TwoWay}"
+                                  Offset="{TemplateBinding Offset,
+                                                           Mode=TwoWay}">
             <ScrollContentPresenter.GestureRecognizers>
-              <ScrollGestureRecognizer
-                CanHorizontallyScroll="{TemplateBinding CanHorizontallyScroll}"
-                CanVerticallyScroll="{TemplateBinding CanVerticallyScroll}"
-            />
+              <ScrollGestureRecognizer CanHorizontallyScroll="{TemplateBinding CanHorizontallyScroll}"
+                                       CanVerticallyScroll="{TemplateBinding CanVerticallyScroll}" />
             </ScrollContentPresenter.GestureRecognizers>
           </ScrollContentPresenter>
           <ScrollBar Name="horizontalScrollBar"
-                     Orientation="Horizontal"
+                     Grid.Row="1"
+                     Focusable="False"
                      LargeChange="{Binding LargeChange.Width, RelativeSource={RelativeSource TemplatedParent}}"
-                     SmallChange="{Binding SmallChange.Width, RelativeSource={RelativeSource TemplatedParent}}"
                      Maximum="{TemplateBinding HorizontalScrollBarMaximum}"
-                     Value="{TemplateBinding HorizontalScrollBarValue, Mode=TwoWay}"
+                     Orientation="Horizontal"
+                     SmallChange="{Binding SmallChange.Width, RelativeSource={RelativeSource TemplatedParent}}"
                      ViewportSize="{TemplateBinding HorizontalScrollBarViewportSize}"
                      Visibility="{TemplateBinding HorizontalScrollBarVisibility}"
-                     Grid.Row="1"
-                     Focusable="False"/>
+                     Value="{TemplateBinding HorizontalScrollBarValue,
+                                             Mode=TwoWay}" />
           <ScrollBar Name="verticalScrollBar"
-                     Orientation="Vertical"
+                     Grid.Column="1"
+                     Focusable="False"
                      LargeChange="{Binding LargeChange.Height, RelativeSource={RelativeSource TemplatedParent}}"
-                     SmallChange="{Binding SmallChange.Height, RelativeSource={RelativeSource TemplatedParent}}"
                      Maximum="{TemplateBinding VerticalScrollBarMaximum}"
-                     Value="{TemplateBinding VerticalScrollBarValue, Mode=TwoWay}"
+                     Orientation="Vertical"
+                     SmallChange="{Binding SmallChange.Height, RelativeSource={RelativeSource TemplatedParent}}"
                      ViewportSize="{TemplateBinding VerticalScrollBarViewportSize}"
                      Visibility="{TemplateBinding VerticalScrollBarVisibility}"
-                     Grid.Column="1"
-                     Focusable="False"/>
-          <Panel Grid.Row="1" Grid.Column="1" Background="{DynamicResource ThemeControlMidBrush}"/>
+                     Value="{TemplateBinding VerticalScrollBarValue,
+                                             Mode=TwoWay}" />
+          <Panel Grid.Row="1"
+                 Grid.Column="1"
+                 Background="{DynamicResource ThemeControlMidBrush}" />
         </Grid>
       </ControlTemplate>
     </Setter>
-  </Style>
+  </ControlTheme>
 
-  <Style Selector="ScrollViewer.menuscroller">
+  <ControlTheme x:Key="DefaultMenuScrollViewer"
+                TargetType="ScrollViewer">
+    <Setter Property="Background" Value="Transparent" />
     <Setter Property="Template">
       <ControlTemplate>
         <DockPanel>
-          <RepeatButton DockPanel.Dock="Top"
+          <RepeatButton Background="Transparent"
                         BorderThickness="0"
-                        Background="Transparent"
-                        Command="{Binding LineUp, RelativeSource={RelativeSource TemplatedParent}}">
+                        Command="{Binding LineUp, RelativeSource={RelativeSource TemplatedParent}}"
+                        DockPanel.Dock="Top">
             <RepeatButton.IsVisible>
               <MultiBinding Converter="{x:Static converters:MenuScrollingVisibilityConverter.Instance}"
                             ConverterParameter="0">
-                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="VerticalScrollBarVisibility"/>
-                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Offset.Y"/>
-                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Extent.Height"/>
-                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Viewport.Height"/>
+                <Binding Path="VerticalScrollBarVisibility"
+                         RelativeSource="{RelativeSource TemplatedParent}" />
+                <Binding Path="Offset.Y"
+                         RelativeSource="{RelativeSource TemplatedParent}" />
+                <Binding Path="Extent.Height"
+                         RelativeSource="{RelativeSource TemplatedParent}" />
+                <Binding Path="Viewport.Height"
+                         RelativeSource="{RelativeSource TemplatedParent}" />
               </MultiBinding>
             </RepeatButton.IsVisible>
-            <Path Data="M 0 4 L 8 4 L 4 0 Z"/>
+            <Path Data="M 0 4 L 8 4 L 4 0 Z" />
           </RepeatButton>
-          <RepeatButton DockPanel.Dock="Bottom"
+          <RepeatButton Background="Transparent"
                         BorderThickness="0"
-                        Background="Transparent"
-                        Command="{Binding LineDown, RelativeSource={RelativeSource TemplatedParent}}">
+                        Command="{Binding LineDown, RelativeSource={RelativeSource TemplatedParent}}"
+                        DockPanel.Dock="Bottom">
             <RepeatButton.IsVisible>
               <MultiBinding Converter="{x:Static converters:MenuScrollingVisibilityConverter.Instance}"
                             ConverterParameter="100">
-                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="VerticalScrollBarVisibility"/>
-                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Offset.Y"/>
-                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Extent.Height"/>
-                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Viewport.Height"/>
+                <Binding Path="VerticalScrollBarVisibility"
+                         RelativeSource="{RelativeSource TemplatedParent}" />
+                <Binding Path="Offset.Y"
+                         RelativeSource="{RelativeSource TemplatedParent}" />
+                <Binding Path="Extent.Height"
+                         RelativeSource="{RelativeSource TemplatedParent}" />
+                <Binding Path="Viewport.Height"
+                         RelativeSource="{RelativeSource TemplatedParent}" />
               </MultiBinding>
             </RepeatButton.IsVisible>
-            <Path Data="M 0 0 L 4 4 L 8 0 Z"/>
+            <Path Data="M 0 0 L 4 4 L 8 0 Z" />
           </RepeatButton>
           <ScrollContentPresenter Name="PART_ContentPresenter"
+                                  Margin="{TemplateBinding Padding}"
                                   CanHorizontallyScroll="{TemplateBinding CanHorizontallyScroll}"
                                   CanVerticallyScroll="{TemplateBinding CanVerticallyScroll}"
                                   Content="{TemplateBinding Content}"
-                                  Extent="{TemplateBinding Extent, Mode=TwoWay}"
-                                  Margin="{TemplateBinding Padding}"
-                                  Offset="{TemplateBinding Offset, Mode=TwoWay}"
-                                  Viewport="{TemplateBinding Viewport, Mode=TwoWay}"/>
+                                  Extent="{TemplateBinding Extent,
+                                                           Mode=TwoWay}"
+                                  Viewport="{TemplateBinding Viewport,
+                                                             Mode=TwoWay}"
+                                  Offset="{TemplateBinding Offset,
+                                                           Mode=TwoWay}" />
         </DockPanel>
       </ControlTemplate>
     </Setter>
-  </Style>
-  <Style Selector="ScrollViewer.menuscroller /template/ RepeatButton > Path">
-    <Setter Property="Fill" Value="{DynamicResource ThemeForegroundLowBrush}" />
-  </Style>
+    <Style Selector="^ /template/ RepeatButton > Path">
+      <Setter Property="Fill" Value="{DynamicResource ThemeForegroundLowBrush}" />
+    </Style>
 
-  <Style Selector="ScrollViewer.menuscroller /template/ RepeatButton:pointerover > Path">
-    <Setter Property="Fill" Value="{DynamicResource ThemeAccentBrush}" />
-  </Style>
-</Styles>
+    <Style Selector="^ /template/ RepeatButton:pointerover > Path">
+      <Setter Property="Fill" Value="{DynamicResource ThemeAccentBrush}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/Separator.xaml b/src/Avalonia.Themes.Default/Controls/Separator.xaml
index 6a318d2e85..e142cf29ad 100644
--- a/src/Avalonia.Themes.Default/Controls/Separator.xaml
+++ b/src/Avalonia.Themes.Default/Controls/Separator.xaml
@@ -1,21 +1,19 @@
-<Styles xmlns="https://github.com/avaloniaui">
-
-  <Style Selector="Separator">
-    <Setter Property="Focusable" Value="False"/>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type Separator}"
+                TargetType="Separator">
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="Background" Value="{DynamicResource ThemeControlMidBrush}" />
+    <Setter Property="Margin" Value="29,1,0,1" />
+    <Setter Property="Height" Value="1" />
     <Setter Property="Template">
       <ControlTemplate>
-        <Border BorderBrush="{TemplateBinding BorderBrush}"
+        <Border Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
                 BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}"
-                Background="{TemplateBinding Background}"/>
+                CornerRadius="{TemplateBinding CornerRadius}" />
       </ControlTemplate>
     </Setter>
-  </Style>
-
-  <Style Selector="MenuItem > Separator, ContextMenu > Separator">
-    <Setter Property="Background" Value="{DynamicResource ThemeControlMidBrush}"/>
-    <Setter Property="Margin" Value="29,1,0,1"/>
-    <Setter Property="Height" Value="1"/>
-  </Style>
+  </ControlTheme>
 
-</Styles>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/Slider.xaml b/src/Avalonia.Themes.Default/Controls/Slider.xaml
index bcb330f188..851ee1b78a 100644
--- a/src/Avalonia.Themes.Default/Controls/Slider.xaml
+++ b/src/Avalonia.Themes.Default/Controls/Slider.xaml
@@ -1,97 +1,128 @@
-<Styles xmlns="https://github.com/avaloniaui">
-  <Style Selector="Slider:horizontal">
-    <Setter Property="MinWidth" Value="40"/>
-    <Setter Property="MinHeight" Value="20"/>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="SliderRepeatTrackTheme"
+                TargetType="RepeatButton">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="Foreground" Value="{DynamicResource ThemeBorderLowBrush}" />
     <Setter Property="Template">
       <ControlTemplate>
-        <Grid Name="grid">
-          <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto" MinHeight="20"/>
-            <RowDefinition Height="Auto"/>
-          </Grid.RowDefinitions>
-          <Border Name="TrackBackground" Grid.Row="1" Height="4" Margin="6,0" VerticalAlignment="Center"/>
-          <Track Name="PART_Track" Grid.Row="1" IsDirectionReversed="{TemplateBinding IsDirectionReversed}" Orientation="Horizontal">
-            <Track.DecreaseButton>
-               <RepeatButton Name="PART_DecreaseButton"
-                             Classes="repeattrack" />
-            </Track.DecreaseButton>
-            <Track.IncreaseButton>
-               <RepeatButton Name="PART_IncreaseButton"
-                             Classes="repeattrack" />
-            </Track.IncreaseButton>
-            <Thumb Name="thumb" MinWidth="20" MinHeight="20">
-              <Thumb.Template>
-                <ControlTemplate>
-                  <Grid>
-                    <Ellipse Width="12" Height="12" Fill="{DynamicResource ThemeAccentBrush}"/>
-                  </Grid>
-                </ControlTemplate>
-              </Thumb.Template>
-            </Thumb>
-          </Track>
-        </Grid>
+        <Border Background="{TemplateBinding Background}" />
       </ControlTemplate>
     </Setter>
-  </Style>
-  <Style Selector="Slider:vertical">
-    <Setter Property="MinWidth" Value="20"/>
-    <Setter Property="MinHeight" Value="40"/>
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Grid>
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="Auto" MinWidth="26"/>
-            <ColumnDefinition Width="Auto"/>
-          </Grid.ColumnDefinitions>
-          <Border Name="TrackBackground" Grid.Column="1" Width="4" Margin="0,6" HorizontalAlignment="Center"/>
-          <Track Name="PART_Track" Grid.Column="1" IsDirectionReversed="{TemplateBinding IsDirectionReversed}" Orientation="Vertical">
-            <Track.DecreaseButton>
-               <RepeatButton Name="PART_DecreaseButton"
-                             Classes="repeattrack" />
-            </Track.DecreaseButton>
-            <Track.IncreaseButton>
-               <RepeatButton Name="PART_IncreaseButton"
-                             Classes="repeattrack" />
-            </Track.IncreaseButton>
-            <Thumb Name="thumb" MinWidth="20" MinHeight="20">
-              <Thumb.Template>
-                <ControlTemplate>
-                  <Grid>
-                    <Ellipse Width="12" Height="12" Fill="{DynamicResource ThemeAccentBrush}"/>
-                  </Grid>
-                </ControlTemplate>
-              </Thumb.Template>
-            </Thumb>
-          </Track>
-        </Grid>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-  <Style Selector="Slider /template/ Track#PART_Track">
-    <Setter Property="Minimum" Value="{TemplateBinding Minimum}"/>
-    <Setter Property="Maximum" Value="{TemplateBinding Maximum}"/>
-    <Setter Property="Value" Value="{TemplateBinding Value, Mode=TwoWay}"/>
-  </Style>
-  <Style Selector="Slider /template/ Border#TrackBackground">
-    <Setter Property="BorderThickness" Value="2"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderLowBrush}"/>
-  </Style>
-  <Style Selector="Slider /template/ RepeatButton.repeattrack">
-    <Setter Property="Background" Value="Transparent"/>
-    <Setter Property="Focusable" Value="False"/>
-    <Setter Property="Foreground" Value="{DynamicResource ThemeBorderLowBrush}"/>
-    <Setter Property="Template">
+  </ControlTheme>
+
+  <ControlTheme x:Key="{x:Type Slider}"
+                TargetType="Slider">
+    <Style Selector="^:horizontal">
+      <Setter Property="MinWidth" Value="40" />
+      <Setter Property="MinHeight" Value="20" />
+      <Setter Property="Template">
         <ControlTemplate>
-            <Border Background="{TemplateBinding Background}" />
+          <Grid Name="grid">
+            <Grid.RowDefinitions>
+              <RowDefinition Height="Auto" />
+              <RowDefinition Height="Auto"
+                             MinHeight="20" />
+              <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Border Name="TrackBackground"
+                    Grid.Row="1"
+                    Height="4"
+                    Margin="6,0"
+                    VerticalAlignment="Center" />
+            <Track Name="PART_Track"
+                   Grid.Row="1"
+                   IsDirectionReversed="{TemplateBinding IsDirectionReversed}"
+                   Orientation="Horizontal">
+              <Track.DecreaseButton>
+                <RepeatButton Name="PART_DecreaseButton"
+                              Theme="{StaticResource SliderRepeatTrackTheme}" />
+              </Track.DecreaseButton>
+              <Track.IncreaseButton>
+                <RepeatButton Name="PART_IncreaseButton"
+                              Theme="{StaticResource SliderRepeatTrackTheme}" />
+              </Track.IncreaseButton>
+              <Thumb Name="thumb"
+                     MinWidth="20"
+                     MinHeight="20">
+                <Thumb.Template>
+                  <ControlTemplate>
+                    <Grid>
+                      <Ellipse Width="12"
+                               Height="12"
+                               Fill="{DynamicResource ThemeAccentBrush}" />
+                    </Grid>
+                  </ControlTemplate>
+                </Thumb.Template>
+              </Thumb>
+            </Track>
+          </Grid>
         </ControlTemplate>
-    </Setter>
-  </Style>
-  <Style Selector="Slider /template/ TickBar">
-    <Setter Property="Ticks" Value="{TemplateBinding Ticks}" />
-  </Style>
-  <Style Selector="Slider:disabled /template/ Grid#grid">
-    <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
-  </Style>
-</Styles>
+      </Setter>
+    </Style>
+    <Style Selector="^:vertical">
+      <Setter Property="MinWidth" Value="20" />
+      <Setter Property="MinHeight" Value="40" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Grid>
+            <Grid.ColumnDefinitions>
+              <ColumnDefinition Width="Auto" />
+              <ColumnDefinition Width="Auto"
+                                MinWidth="26" />
+              <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
+            <Border Name="TrackBackground"
+                    Grid.Column="1"
+                    Width="4"
+                    Margin="0,6"
+                    HorizontalAlignment="Center" />
+            <Track Name="PART_Track"
+                   Grid.Column="1"
+                   IsDirectionReversed="{TemplateBinding IsDirectionReversed}"
+                   Orientation="Vertical">
+              <Track.DecreaseButton>
+                <RepeatButton Name="PART_DecreaseButton"
+                              Theme="{StaticResource SliderRepeatTrackTheme}" />
+              </Track.DecreaseButton>
+              <Track.IncreaseButton>
+                <RepeatButton Name="PART_IncreaseButton"
+                              Theme="{StaticResource SliderRepeatTrackTheme}" />
+              </Track.IncreaseButton>
+              <Thumb Name="thumb"
+                     MinWidth="20"
+                     MinHeight="20">
+                <Thumb.Template>
+                  <ControlTemplate>
+                    <Grid>
+                      <Ellipse Width="12"
+                               Height="12"
+                               Fill="{DynamicResource ThemeAccentBrush}" />
+                    </Grid>
+                  </ControlTemplate>
+                </Thumb.Template>
+              </Thumb>
+            </Track>
+          </Grid>
+        </ControlTemplate>
+      </Setter>
+    </Style>
+
+    <Style Selector="^ /template/ Track#PART_Track">
+      <Setter Property="Minimum" Value="{TemplateBinding Minimum}" />
+      <Setter Property="Maximum" Value="{TemplateBinding Maximum}" />
+      <Setter Property="Value" Value="{TemplateBinding Value, Mode=TwoWay}" />
+    </Style>
+    <Style Selector="^ /template/ Border#TrackBackground">
+      <Setter Property="BorderThickness" Value="2" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderLowBrush}" />
+    </Style>
+    <Style Selector="^ /template/ TickBar">
+      <Setter Property="Ticks" Value="{TemplateBinding Ticks}" />
+    </Style>
+    <Style Selector="^:disabled /template/ Grid#grid">
+      <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/SplitButton.xaml b/src/Avalonia.Themes.Default/Controls/SplitButton.xaml
index 0c46ce3724..aa71d0e7c7 100644
--- a/src/Avalonia.Themes.Default/Controls/SplitButton.xaml
+++ b/src/Avalonia.Themes.Default/Controls/SplitButton.xaml
@@ -1,9 +1,9 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        x:CompileBindings="True"
-        xmlns:converters="using:Avalonia.Controls.Converters">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    x:CompileBindings="True"
+                    xmlns:converters="using:Avalonia.Controls.Converters">
 
-  <!-- This style is heavily based on the Fluent v1 style.
+  <!-- This style is heavily based on the Default v1 style.
        The base resources are switched out along with a few minor changes such as Padding, CornerRadius. -->
 
   <Design.PreviewWith>
@@ -12,50 +12,127 @@
     </Border>
   </Design.PreviewWith>
 
-  <Styles.Resources>
-    <x:Double x:Key="SplitButtonPrimaryButtonSize">24</x:Double>
-    <x:Double x:Key="SplitButtonSecondaryButtonSize">24</x:Double>
-    <x:Double x:Key="SplitButtonSeparatorWidth">1</x:Double>
-    <x:Double x:Key="SplitButtonMinHeight">24</x:Double>
-    <Thickness x:Key="SplitButtonBorderThemeThickness">1</Thickness>
-
-    <converters:MarginMultiplierConverter x:Key="PrimaryButtonBorderMultiplier" Left="True" Top="True" Bottom="True" Indent="1" />
-    <converters:MarginMultiplierConverter x:Key="SecondaryButtonBorderMultiplier" Right="True" Top="True" Bottom="True" Indent="1" />
-    <converters:MarginMultiplierConverter x:Key="SeparatorBorderMultiplier" Top="True" Bottom="True" Indent="1" />
-    <converters:CornerRadiusFilterConverter x:Key="TopCornerRadiusFilterConverter" Filter="TopLeft, TopRight"/>
-    <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}" />
-  </Styles.Resources>
+  <x:Double x:Key="SplitButtonPrimaryButtonSize">24</x:Double>
+  <x:Double x:Key="SplitButtonSecondaryButtonSize">24</x:Double>
+  <x:Double x:Key="SplitButtonSeparatorWidth">1</x:Double>
+  <x:Double x:Key="SplitButtonMinHeight">24</x:Double>
+  <Thickness x:Key="SplitButtonBorderThemeThickness">1</Thickness>
+
+  <converters:MarginMultiplierConverter x:Key="PrimaryButtonBorderMultiplier" Left="True" Top="True" Bottom="True"
+                                        Indent="1" />
+  <converters:MarginMultiplierConverter x:Key="SecondaryButtonBorderMultiplier" Right="True" Top="True" Bottom="True"
+                                        Indent="1" />
+  <converters:MarginMultiplierConverter x:Key="SeparatorBorderMultiplier" Top="True" Bottom="True" Indent="1" />
+  <converters:CornerRadiusFilterConverter x:Key="TopCornerRadiusFilterConverter" Filter="TopLeft, TopRight" />
+  <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="DefaultSplitButtonComponent" TargetType="Button">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ContentPresenter x:Name="PART_ContentPresenter"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
+                          Content="{TemplateBinding Content}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          Padding="{TemplateBinding Padding}"
+                          RecognizesAccessKey="True"
+                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+      </ControlTemplate>
+    </Setter>
 
-  <Style Selector="SplitButton">
+    <Style Selector="^:pointerover /template/ ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource SplitButtonBackgroundPointerOver}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushPointerOver}" />
+      <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundPointerOver}" />
+    </Style>
+
+    <Style Selector="^:pressed /template/ ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource SplitButtonBackgroundPressed}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushPressed}" />
+      <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
+    </Style>
+
+    <Style Selector="^:disabled /template/ ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource SplitButtonBackgroundDisabled}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushDisabled}" />
+      <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundDisabled}" />
+    </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}" />
+    </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}" />
+      </Style>
+
+      <Style Selector="^:pointerover /template/ ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource SplitButtonBackgroundCheckedPointerOver}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedPointerOver}" />
+        <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPointerOver}" />
+      </Style>
+
+      <Style Selector="^:pressed /template/ ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource SplitButtonBackgroundCheckedPressed}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedPressed}" />
+        <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
+      </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}" />
+      </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}" />
+    </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}" />
@@ -65,211 +142,82 @@
     <Setter Property="VerticalAlignment" Value="Center" />
     <Setter Property="HorizontalContentAlignment" Value="Stretch" />
     <Setter Property="VerticalContentAlignment" Value="Center" />
-    <!--<Setter Property="UseSystemFocusVisuals" Value="True" />
-    <Setter Property="FocusVisualMargin" Value="-3" />-->
     <Setter Property="KeyboardNavigation.IsTabStop" Value="True" />
     <Setter Property="Focusable" Value="True" />
     <Setter Property="Padding" Value="4" />
-    <Setter Property="CornerRadius" Value="0" />
     <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate>
-          <Grid>
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition Width="*" />
-              <ColumnDefinition Width="Auto" />
-              <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-
-            <Button x:Name="PART_PrimaryButton"
-                    Grid.Column="0"
-                    MinWidth="{DynamicResource SplitButtonPrimaryButtonSize}"
-                    Foreground="{TemplateBinding Foreground}"
-                    Background="{TemplateBinding Background}"
-                    BorderThickness="{TemplateBinding BorderThickness, Converter={StaticResource PrimaryButtonBorderMultiplier}}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    Content="{TemplateBinding Content}"
-                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                    Command="{TemplateBinding Command}"
-                    CommandParameter="{TemplateBinding CommandParameter}"
-                    FontFamily="{TemplateBinding FontFamily}"
-                    FontSize="{TemplateBinding FontSize}"
-                    FontWeight="{TemplateBinding FontWeight}"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Stretch"
-                    HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                    VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                    Padding="{TemplateBinding Padding}"
-                    Focusable="False"
-                    KeyboardNavigation.IsTabStop="False" />
-
-            <Border x:Name="SeparatorBorder"
-                    Grid.Column="1"
-                    Background="Transparent"
-                    Width="{DynamicResource SplitButtonSeparatorWidth}"
-                    BorderThickness="{TemplateBinding BorderThickness, Converter={StaticResource SeparatorBorderMultiplier}}"
-                    BorderBrush="{TemplateBinding BorderBrush}" />
-
-            <Button x:Name="PART_SecondaryButton"
-                    Grid.Column="2"
-                    MinWidth="{DynamicResource SplitButtonSecondaryButtonSize}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    Foreground="{TemplateBinding Foreground}"
-                    Background="{TemplateBinding Background}"
-                    BorderThickness="{TemplateBinding BorderThickness, Converter={StaticResource SecondaryButtonBorderMultiplier}}"
-                    Padding="0"
-                    HorizontalContentAlignment="Center"
-                    VerticalContentAlignment="Center"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Stretch"
-                    Focusable="False"
-                    KeyboardNavigation.IsTabStop="False" />
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
+      <ControlTemplate>
+        <Grid>
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="Auto" />
+          </Grid.ColumnDefinitions>
+
+          <Button x:Name="PART_PrimaryButton"
+                  Grid.Column="0"
+                  Theme="{StaticResource DefaultSplitButtonComponent}"
+                  MinWidth="{DynamicResource SplitButtonPrimaryButtonSize}"
+                  Foreground="{TemplateBinding Foreground}"
+                  Background="{TemplateBinding Background}"
+                  BorderThickness="{TemplateBinding BorderThickness, Converter={StaticResource PrimaryButtonBorderMultiplier}}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  Content="{TemplateBinding Content}"
+                  ContentTemplate="{TemplateBinding ContentTemplate}"
+                  Command="{TemplateBinding Command}"
+                  CommandParameter="{TemplateBinding CommandParameter}"
+                  CornerRadius="{TemplateBinding CornerRadius, Converter={StaticResource LeftCornerRadiusFilterConverter}}"
+                  FontFamily="{TemplateBinding FontFamily}"
+                  FontSize="{TemplateBinding FontSize}"
+                  FontWeight="{TemplateBinding FontWeight}"
+                  HorizontalAlignment="Stretch"
+                  VerticalAlignment="Stretch"
+                  HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                  VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                  Padding="{TemplateBinding Padding}"
+                  Focusable="False"
+                  KeyboardNavigation.IsTabStop="False" />
+
+          <Border x:Name="SeparatorBorder"
+                  Grid.Column="1"
+                  Background="Transparent"
+                  Width="{DynamicResource SplitButtonSeparatorWidth}"
+                  BorderThickness="{TemplateBinding BorderThickness, Converter={StaticResource SeparatorBorderMultiplier}}"
+                  BorderBrush="{TemplateBinding BorderBrush}" />
+
+          <Button x:Name="PART_SecondaryButton"
+                  Grid.Column="2"
+                  Theme="{StaticResource DefaultSplitButtonComponent}"
+                  MinWidth="{DynamicResource SplitButtonSecondaryButtonSize}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  Foreground="{TemplateBinding Foreground}"
+                  Background="{TemplateBinding Background}"
+                  BorderThickness="{TemplateBinding BorderThickness, Converter={StaticResource SecondaryButtonBorderMultiplier}}"
+                  CornerRadius="{TemplateBinding CornerRadius, Converter={StaticResource RightCornerRadiusFilterConverter}}"
+                  Padding="0"
+                  HorizontalContentAlignment="Center"
+                  VerticalContentAlignment="Center"
+                  HorizontalAlignment="Stretch"
+                  VerticalAlignment="Stretch"
+                  Focusable="False"
+                  KeyboardNavigation.IsTabStop="False">
+            <PathIcon Height="12" Width="12"
+                      Data="M1939 486L2029 576L1024 1581L19 576L109 486L1024 1401L1939 486Z" />
+          </Button>
+        </Grid>
+      </ControlTemplate>
     </Setter>
-  </Style>
-
-  <!-- Default overridable styles -->
-  <Style Selector="SplitButton /template/ Button#PART_PrimaryButton">
-    <Setter Property="CornerRadius" Value="{TemplateBinding CornerRadius, Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
-  </Style>
-  <Style Selector="SplitButton /template/ Button#PART_SecondaryButton">
-    <Setter Property="CornerRadius" Value="{TemplateBinding CornerRadius, Converter={StaticResource RightCornerRadiusFilterConverter}}" />
-    <Setter Property="Content">
-      <Template>
-        <PathIcon Height="12"
-                  Width="12"
-                  Data="M1939 486L2029 576L1024 1581L19 576L109 486L1024 1401L1939 486Z" />
-      </Template>
-    </Setter>
-  </Style>
-
-  <!-- Primary and Secondary buttons PointerOver State -->
-  <Style Selector="SplitButton /template/ Button#PART_PrimaryButton:pointerover /template/ ContentPresenter,
-         SplitButton /template/ Button#PART_SecondaryButton:pointerover /template/ ContentPresenter">
-    <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundPointerOver}" />
-    <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushPointerOver}" />
-    <Setter Property="TextElement.Foreground" Value="{DynamicResource SplitButtonForegroundPointerOver}" />
-  </Style>
-  <Style Selector="SplitButton /template/ Button#PART_SecondaryButton:pointerover PathIcon">
-    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundPointerOver}" />
-  </Style>
-
-  <!-- Primary and Secondary buttons Pressed State -->
-  <Style Selector="SplitButton /template/ Button#PART_PrimaryButton:pressed /template/ ContentPresenter,
-         SplitButton /template/ Button#PART_SecondaryButton:pressed /template/ ContentPresenter">
-    <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundPressed}" />
-    <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushPressed}" />
-    <Setter Property="TextElement.Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
-  </Style>
-  <Style Selector="SplitButton /template/ Button#PART_SecondaryButton:pressed PathIcon">
-    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
-  </Style>
-
-  <!-- SplitButton Pressed State -->
-  <Style Selector="SplitButton:pressed /template/ Button#PART_PrimaryButton /template/ ContentPresenter,
-         SplitButton:pressed /template/ Button#PART_SecondaryButton /template/ ContentPresenter,
-         SplitButton:pressed /template/ Border#SeparatorBorder">
-    <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundPressed}" />
-    <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushPressed}" />
-    <Setter Property="TextElement.Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
-  </Style>
-  <Style Selector="SplitButton:pressed /template/ Button#PART_SecondaryButton PathIcon">
-    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
-  </Style>
-
-  <!-- Primary and Secondary buttons Flyout Open State -->
-  <Style Selector="SplitButton:flyout-open /template/ Button#PART_PrimaryButton /template/ ContentPresenter,
-         SplitButton:flyout-open /template/ Button#PART_SecondaryButton /template/ ContentPresenter,
-         SplitButton:flyout-open /template/ Border#SeparatorBorder">
-    <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundPressed}" />
-    <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushPressed}" />
-    <Setter Property="TextElement.Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
-  </Style>
-  <Style Selector="SplitButton:flyout-open /template/ Button#PART_SecondaryButton PathIcon">
-    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundPressed}" />
-  </Style>
-
-  <!-- Disabled State -->
-  <Style Selector="SplitButton:disabled /template/ Button#PART_PrimaryButton /template/ ContentPresenter,
-         SplitButton:disabled /template/ Button#PART_SecondaryButton /template/ ContentPresenter,
-         SplitButton:disabled /template/ Border#SeparatorBorder">
-    <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundDisabled}" />
-    <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushDisabled}" />
-    <Setter Property="TextElement.Foreground" Value="{DynamicResource SplitButtonForegroundDisabled}" />
-  </Style>
-  <Style Selector="SplitButton:disabled /template/ Button#PART_SecondaryButton PathIcon">
-    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundDisabled}" />
-  </Style>
-
-  <!-- Checked State -->
-  <Style Selector="SplitButton:checked /template/ Button#PART_PrimaryButton /template/ ContentPresenter,
-         SplitButton:checked /template/ Button#PART_SecondaryButton /template/ ContentPresenter,
-         SplitButton:checked /template/ Border#SeparatorBorder">
-    <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundChecked}" />
-    <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushChecked}" />
-    <Setter Property="TextElement.Foreground" Value="{DynamicResource SplitButtonForegroundChecked}" />
-  </Style>
-  <Style Selector="SplitButton:checked /template/ Button#PART_SecondaryButton PathIcon">
-    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundChecked}" />
-  </Style>
-
-  <!-- Checked PointerOver State -->
-  <Style Selector="SplitButton:checked /template/ Button#PART_PrimaryButton:pointerover /template/ ContentPresenter,
-         SplitButton:checked /template/ Button#PART_SecondaryButton:pointerover /template/ ContentPresenter">
-    <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundCheckedPointerOver}" />
-    <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedPointerOver}" />
-    <Setter Property="TextElement.Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPointerOver}" />
-  </Style>
-  <Style Selector="SplitButton:checked /template/ Button#PART_SecondaryButton:pointerover PathIcon">
-    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPointerOver}" />
-  </Style>
-
-  <!-- Checked Pressed State -->
-  <Style Selector="SplitButton:checked /template/ Button#PART_PrimaryButton:pressed /template/ ContentPresenter,
-         SplitButton:checked /template/ Button#PART_SecondaryButton:pressed /template/ ContentPresenter">
-    <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundCheckedPressed}" />
-    <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedPressed}" />
-    <Setter Property="TextElement.Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
-  </Style>
-  <Style Selector="SplitButton:checked /template/ Button#PART_SecondaryButton:pressed PathIcon">
-    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
-  </Style>
 
-  <!-- SplitButton Checked Pressed State -->
-  <Style Selector="SplitButton:pressed:checked /template/ Button#PART_PrimaryButton /template/ ContentPresenter,
-         SplitButton:pressed:checked /template/ Button#PART_SecondaryButton /template/ ContentPresenter,
-         SplitButton:pressed:checked /template/ Border#SeparatorBorder">
-    <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundCheckedPressed}" />
-    <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedPressed}" />
-    <Setter Property="TextElement.Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
-  </Style>
-  <Style Selector="SplitButton:pressed:checked /template/ Button#PART_SecondaryButton PathIcon">
-    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
-  </Style>
+    <Style Selector="^:flyout-open /template/ Button">
+      <Setter Property="Tag" Value="flyout-open" />
+    </Style>
 
-  <!-- Checked Flyout Open State -->
-  <Style Selector="SplitButton:checked:flyout-open /template/ Button#PART_PrimaryButton /template/ ContentPresenter,
-         SplitButton:checked:flyout-open /template/ Button#PART_SecondaryButton /template/ ContentPresenter,
-         SplitButton:checked:flyout-open /template/ Border#SeparatorBorder">
-    <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundCheckedPressed}" />
-    <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedPressed}" />
-    <Setter Property="TextElement.Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
-  </Style>
-  <Style Selector="SplitButton:checked:flyout-open /template/ Button#PART_SecondaryButton PathIcon">
-    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedPressed}" />
-  </Style>
+    <Style Selector="^:checked /template/ Button">
+      <Setter Property="Tag" Value="checked" />
+    </Style>
 
-  <!-- Disabled Checked State -->
-  <Style Selector="SplitButton:checked:disabled /template/ Button#PART_PrimaryButton /template/ ContentPresenter,
-         SplitButton:checked:disabled /template/ Button#PART_SecondaryButton /template/ ContentPresenter,
-         SplitButton:checked:disabled /template/ Border#SeparatorBorder">
-    <Setter Property="Border.Background" Value="{DynamicResource SplitButtonBackgroundCheckedDisabled}" />
-    <Setter Property="Border.BorderBrush" Value="{DynamicResource SplitButtonBorderBrushCheckedDisabled}" />
-    <Setter Property="TextElement.Foreground" Value="{DynamicResource SplitButtonForegroundCheckedDisabled}" />
-  </Style>
-  <Style Selector="SplitButton:checked:disabled /template/ Button#PART_SecondaryButton PathIcon">
-    <Setter Property="Foreground" Value="{DynamicResource SplitButtonForegroundCheckedDisabled}" />
-  </Style>
-</Styles>
+    <Style Selector="^:checked:flyout-open /template/ Button">
+      <Setter Property="Tag" Value="checked-flyout-open" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/SplitView.xaml b/src/Avalonia.Themes.Default/Controls/SplitView.xaml
index 10eda2d9cd..b0e4d0b096 100644
--- a/src/Avalonia.Themes.Default/Controls/SplitView.xaml
+++ b/src/Avalonia.Themes.Default/Controls/SplitView.xaml
@@ -1,6 +1,6 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:sys="using:System">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:sys="using:System">
   <Design.PreviewWith>
     <Border Width="400" Height="400">
       <SplitView DisplayMode="Inline"
@@ -15,220 +15,241 @@
     </Border>
   </Design.PreviewWith>
 
-  <Styles.Resources>
-    <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>
-    <!-- Not used here (directly), but preserving for reference
+  <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>
+  <!-- Not used here (directly), but preserving for reference
         <x:String x:Key="SplitViewPaneAnimationOpenPreDuration">00:00:00.19999</x:String>-->
-  </Styles.Resources>
 
-  <Style Selector="SplitView">
+  <ControlTheme x:Key="{x:Type SplitView}"
+                TargetType="SplitView">
     <Setter Property="OpenPaneLength" Value="{DynamicResource SplitViewOpenPaneThemeLength}" />
     <Setter Property="CompactPaneLength" Value="{DynamicResource SplitViewCompactPaneThemeLength}" />
     <Setter Property="PaneBackground" Value="{DynamicResource ThemeControlHighlightLowBrush}" />
-  </Style>
-
-  <!-- Left -->
-  <Style Selector="SplitView:left">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Grid Name="Container" Background="{TemplateBinding Background}">
-          <Grid.ColumnDefinitions>
-            <!-- why is this throwing a binding error? -->
-            <ColumnDefinition Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.PaneColumnGridLength}"/>
-            <ColumnDefinition Width="*"/>
-          </Grid.ColumnDefinitions>
-
-          <Panel Name="PART_PaneRoot" Background="{TemplateBinding PaneBackground}"
-                 ClipToBounds="True"
-                 HorizontalAlignment="Left"
-                 ZIndex="100">
-            <ContentPresenter x:Name="PART_PanePresenter" Content="{TemplateBinding Pane}" ContentTemplate="{TemplateBinding PaneTemplate}" />
-            <Rectangle Name="HCPaneBorder" Fill="{DynamicResource SystemControlForegroundTransparentBrush}" Width="1" HorizontalAlignment="Right"  />
-          </Panel>
-
-          <Panel Name="ContentRoot">
-            <ContentPresenter x:Name="PART_ContentPresenter" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
-            <Rectangle Name="LightDismissLayer"/>
-          </Panel>
-
-        </Grid>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <!-- Overlay -->
-  <Style Selector="SplitView:overlay:left /template/ Panel#PART_PaneRoot">
-    <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
-    <!-- ColumnSpan should be 2 -->
-    <Setter Property="Grid.ColumnSpan" Value="1"/>
-    <Setter Property="Grid.Column" Value="0"/>
-  </Style>
-  <Style Selector="SplitView:overlay:left /template/ Panel#ContentRoot">
-    <Setter Property="Grid.Column" Value="1"/>
-    <Setter Property="Grid.ColumnSpan" Value="2"/>
-  </Style>
-
-  <!-- CompactInline -->
-  <Style Selector="SplitView:compactinline:left /template/ Panel#PART_PaneRoot">
-    <Setter Property="Grid.ColumnSpan" Value="1"/>
-    <Setter Property="Grid.Column" Value="0"/>
-    <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
-  </Style>
-  <Style Selector="SplitView:compactinline:left /template/ Panel#ContentRoot">
-    <Setter Property="Grid.Column" Value="1"/>
-    <Setter Property="Grid.ColumnSpan" Value="1"/>
-  </Style>
-
-  <!-- CompactOverlay -->
-  <Style Selector="SplitView:compactoverlay:left /template/ Panel#PART_PaneRoot">
-    <!-- ColumnSpan should be 2 -->
-    <Setter Property="Grid.ColumnSpan" Value="1"/>
-    <Setter Property="Grid.Column" Value="0"/>
-    <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
-  </Style>
-  <Style Selector="SplitView:compactoverlay:left /template/ Panel#ContentRoot">
-    <Setter Property="Grid.Column" Value="1"/>
-    <Setter Property="Grid.ColumnSpan" Value="1"/>
-  </Style>
-
-  <!-- Inline -->
-  <Style Selector="SplitView:inline:left /template/ Panel#PART_PaneRoot">
-    <Setter Property="Grid.ColumnSpan" Value="1"/>
-    <Setter Property="Grid.Column" Value="0"/>
-    <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
-  </Style>
-  <Style Selector="SplitView:inline:left /template/ Panel#ContentRoot">
-    <Setter Property="Grid.Column" Value="1"/>
-    <Setter Property="Grid.ColumnSpan" Value="1"/>
-  </Style>
-
-  <!-- Right -->
-  <Style Selector="SplitView:right">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Grid Name="Container" Background="{TemplateBinding Background}">
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*"/>
-            <ColumnDefinition Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.PaneColumnGridLength}"/>
-          </Grid.ColumnDefinitions>
-
-          <Panel Name="PART_PaneRoot" Background="{TemplateBinding PaneBackground}"
-                 ClipToBounds="True"
-                 HorizontalAlignment="Right"
-                 ZIndex="100">
-            <ContentPresenter x:Name="PART_PanePresenter" Content="{TemplateBinding Pane}" ContentTemplate="{TemplateBinding PaneTemplate}"/>
-            <Rectangle Name="HCPaneBorder"
-                       Fill="{DynamicResource SystemControlForegroundTransparentBrush}"
-                       Width="1" HorizontalAlignment="Left"  />
-          </Panel>
-
-          <Panel Name="ContentRoot">
-            <ContentPresenter x:Name="PART_ContentPresenter" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
-            <Rectangle Name="LightDismissLayer"/>
-          </Panel>
-
-        </Grid>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <!-- Overlay -->
-  <Style Selector="SplitView:overlay:right /template/ Panel#PART_PaneRoot">
-    <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
-    <Setter Property="Grid.ColumnSpan" Value="2"/>
-    <Setter Property="Grid.Column" Value="1"/>
-  </Style>
-  <Style Selector="SplitView:overlay:right /template/ Panel#ContentRoot">
-    <Setter Property="Grid.Column" Value="0"/>
-    <Setter Property="Grid.ColumnSpan" Value="2"/>
-  </Style>
-
-  <!-- CompactInline -->
-  <Style Selector="SplitView:compactinline:right /template/ Panel#PART_PaneRoot">
-    <Setter Property="Grid.ColumnSpan" Value="1"/>
-    <Setter Property="Grid.Column" Value="1"/>
-    <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
-  </Style>
-  <Style Selector="SplitView:compactinline:right /template/ Panel#ContentRoot">
-    <Setter Property="Grid.Column" Value="0"/>
-    <Setter Property="Grid.ColumnSpan" Value="1"/>
-  </Style>
-
-  <!-- CompactOverlay -->
-  <Style Selector="SplitView:compactoverlay:right /template/ Panel#PART_PaneRoot">
-    <Setter Property="Grid.ColumnSpan" Value="2"/>
-    <Setter Property="Grid.Column" Value="1"/>
-    <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
-  </Style>
-  <Style Selector="SplitView:compactoverlay:right /template/ Panel#ContentRoot">
-    <Setter Property="Grid.Column" Value="0"/>
-    <Setter Property="Grid.ColumnSpan" Value="1"/>
-  </Style>
-
-  <!-- Inline -->
-  <Style Selector="SplitView:inline:right /template/ Panel#PART_PaneRoot">
-    <Setter Property="Grid.ColumnSpan" Value="1"/>
-    <Setter Property="Grid.Column" Value="1"/>
-    <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
-  </Style>
-  <Style Selector="SplitView:inline:right /template/ Panel#ContentRoot">
-    <Setter Property="Grid.Column" Value="0"/>
-    <Setter Property="Grid.ColumnSpan" Value="1"/>
-  </Style>
-
-  <!-- Open/Close Pane animation  -->
-  <Style Selector="SplitView:open /template/ Panel#PART_PaneRoot">
-    <Setter Property="Transitions">
-      <Transitions>
-        <DoubleTransition Property="Width" Duration="{StaticResource SplitViewPaneAnimationOpenDuration}" Easing="{StaticResource SplitViewPaneAnimationEasing}" />
-      </Transitions>
-    </Setter>
-    <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=OpenPaneLength}" />
-  </Style>
-  <Style Selector="SplitView:open /template/ Rectangle#LightDismissLayer">
-    <Setter Property="Transitions">
-      <Transitions>
-        <DoubleTransition Property="Opacity" Duration="{StaticResource SplitViewPaneAnimationOpenDuration}" Easing="{StaticResource SplitViewPaneAnimationEasing}" />
-      </Transitions>
-    </Setter>
-    <Setter Property="Opacity" Value="1.0"/>
-  </Style>
-
-  <Style Selector="SplitView:closed /template/ Panel#PART_PaneRoot">
-    <Setter Property="Transitions">
-      <Transitions>
-        <DoubleTransition Property="Width" Duration="{StaticResource SplitViewPaneAnimationCloseDuration}" Easing="{StaticResource SplitViewPaneAnimationEasing}" />
-      </Transitions>
-    </Setter>
-    <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
-  </Style>
-  <Style Selector="SplitView:closed /template/ Rectangle#LightDismissLayer">
-    <Setter Property="Transitions">
-      <Transitions>
-        <DoubleTransition Property="Opacity" Duration="{StaticResource SplitViewPaneAnimationCloseDuration}" Easing="{StaticResource SplitViewPaneAnimationEasing}" />
-      </Transitions>
-    </Setter>
-    <Setter Property="Opacity" Value="0.0"/>
-  </Style>
-
-  <Style Selector="SplitView /template/ Rectangle#LightDismissLayer">
-    <Setter Property="IsVisible" Value="False"/>
-    <Setter Property="Fill" Value="Transparent" />
-  </Style>
-  <Style Selector="SplitView:lightdismiss /template/ Rectangle#LightDismissLayer">
-    <Setter Property="Fill" Value="{DynamicResource SplitViewLightDismissOverlayBackground}" />
-  </Style>
-
-  <Style Selector="SplitView:overlay:open /template/ Rectangle#LightDismissLayer">
-    <Setter Property="IsVisible" Value="True"/>
-  </Style>
-  <Style Selector="SplitView:compactoverlay:open /template/ Rectangle#LightDismissLayer">
-    <Setter Property="IsVisible" Value="True"/>
-  </Style>
-
-</Styles>
+
+    <!-- Left -->
+    <Style Selector="^:left">
+      <Setter Property="Template">
+        <ControlTemplate x:CompileBindings="True"
+                         TargetType="SplitView">
+          <Grid Name="Container"
+                Background="{TemplateBinding Background}">
+            <Grid.ColumnDefinitions>
+              <ColumnDefinition
+                Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.PaneColumnGridLength}" />
+              <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+
+            <Panel Name="PART_PaneRoot" Background="{TemplateBinding PaneBackground}"
+                   ClipToBounds="True"
+                   HorizontalAlignment="Left"
+                   ZIndex="100">
+              <ContentPresenter x:Name="PART_PanePresenter" Content="{TemplateBinding Pane}"
+                                ContentTemplate="{TemplateBinding PaneTemplate}" />
+              <Rectangle Name="HCPaneBorder" Fill="Transparent" Width="1"
+                         HorizontalAlignment="Right" />
+            </Panel>
+
+            <Panel Name="ContentRoot">
+              <ContentPresenter x:Name="PART_ContentPresenter" Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}" />
+              <Rectangle Name="LightDismissLayer" />
+            </Panel>
+
+          </Grid>
+        </ControlTemplate>
+      </Setter>
+    </Style>
+
+    <!-- Overlay -->
+    <Style Selector="^:overlay:left /template/ Panel#PART_PaneRoot">
+      <Setter Property="Width"
+              Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
+      <!-- ColumnSpan should be 2 -->
+      <Setter Property="Grid.ColumnSpan" Value="1" />
+      <Setter Property="Grid.Column" Value="0" />
+    </Style>
+    <Style Selector="^:overlay:left /template/ Panel#ContentRoot">
+      <Setter Property="Grid.Column" Value="1" />
+      <Setter Property="Grid.ColumnSpan" Value="2" />
+    </Style>
+
+    <!-- CompactInline -->
+    <Style Selector="^:compactinline:left /template/ Panel#PART_PaneRoot">
+      <Setter Property="Grid.ColumnSpan" Value="1" />
+      <Setter Property="Grid.Column" Value="0" />
+      <Setter Property="Width"
+              Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
+    </Style>
+    <Style Selector="^:compactinline:left /template/ Panel#ContentRoot">
+      <Setter Property="Grid.Column" Value="1" />
+      <Setter Property="Grid.ColumnSpan" Value="1" />
+    </Style>
+
+    <!-- CompactOverlay -->
+    <Style Selector="^:compactoverlay:left /template/ Panel#PART_PaneRoot">
+      <!-- ColumnSpan should be 2 -->
+      <Setter Property="Grid.ColumnSpan" Value="1" />
+      <Setter Property="Grid.Column" Value="0" />
+      <Setter Property="Width"
+              Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
+    </Style>
+    <Style Selector="^:compactoverlay:left /template/ Panel#ContentRoot">
+      <Setter Property="Grid.Column" Value="1" />
+      <Setter Property="Grid.ColumnSpan" Value="1" />
+    </Style>
+
+    <!-- Inline -->
+    <Style Selector="^:inline:left /template/ Panel#PART_PaneRoot">
+      <Setter Property="Grid.ColumnSpan" Value="1" />
+      <Setter Property="Grid.Column" Value="0" />
+      <Setter Property="Width"
+              Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
+    </Style>
+    <Style Selector="^:inline:left /template/ Panel#ContentRoot">
+      <Setter Property="Grid.Column" Value="1" />
+      <Setter Property="Grid.ColumnSpan" Value="1" />
+    </Style>
+
+    <!-- Right -->
+    <Style Selector="^:right">
+      <Setter Property="Template">
+        <ControlTemplate TargetType="SplitView"
+                         x:CompileBindings="True">
+          <Grid Name="Container" Background="{TemplateBinding Background}">
+            <Grid.ColumnDefinitions>
+              <ColumnDefinition Width="*" />
+              <ColumnDefinition
+                Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.PaneColumnGridLength}" />
+            </Grid.ColumnDefinitions>
+
+            <Panel Name="PART_PaneRoot" Background="{TemplateBinding PaneBackground}"
+                   ClipToBounds="True"
+                   HorizontalAlignment="Right"
+                   ZIndex="100">
+              <ContentPresenter x:Name="PART_PanePresenter" Content="{TemplateBinding Pane}"
+                                ContentTemplate="{TemplateBinding PaneTemplate}" />
+              <Rectangle Name="HCPaneBorder"
+                         Fill="Transparent"
+                         Width="1" HorizontalAlignment="Left" />
+            </Panel>
+
+            <Panel Name="ContentRoot">
+              <ContentPresenter x:Name="PART_ContentPresenter" Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}" />
+              <Rectangle Name="LightDismissLayer" />
+            </Panel>
+
+          </Grid>
+        </ControlTemplate>
+      </Setter>
+    </Style>
+
+    <!-- Overlay -->
+    <Style Selector="^:overlay:right /template/ Panel#PART_PaneRoot">
+      <Setter Property="Width"
+              Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
+      <Setter Property="Grid.ColumnSpan" Value="2" />
+      <Setter Property="Grid.Column" Value="1" />
+    </Style>
+    <Style Selector="^:overlay:right /template/ Panel#ContentRoot">
+      <Setter Property="Grid.Column" Value="0" />
+      <Setter Property="Grid.ColumnSpan" Value="2" />
+    </Style>
+
+    <!-- CompactInline -->
+    <Style Selector="^:compactinline:right /template/ Panel#PART_PaneRoot">
+      <Setter Property="Grid.ColumnSpan" Value="1" />
+      <Setter Property="Grid.Column" Value="1" />
+      <Setter Property="Width"
+              Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
+    </Style>
+    <Style Selector="^:compactinline:right /template/ Panel#ContentRoot">
+      <Setter Property="Grid.Column" Value="0" />
+      <Setter Property="Grid.ColumnSpan" Value="1" />
+    </Style>
+
+    <!-- CompactOverlay -->
+    <Style Selector="^:compactoverlay:right /template/ Panel#PART_PaneRoot">
+      <Setter Property="Grid.ColumnSpan" Value="2" />
+      <Setter Property="Grid.Column" Value="1" />
+      <Setter Property="Width"
+              Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
+    </Style>
+    <Style Selector="^:compactoverlay:right /template/ Panel#ContentRoot">
+      <Setter Property="Grid.Column" Value="0" />
+      <Setter Property="Grid.ColumnSpan" Value="1" />
+    </Style>
+
+    <!-- Inline -->
+    <Style Selector="^:inline:right /template/ Panel#PART_PaneRoot">
+      <Setter Property="Grid.ColumnSpan" Value="1" />
+      <Setter Property="Grid.Column" Value="1" />
+      <Setter Property="Width"
+              Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
+    </Style>
+    <Style Selector="^:inline:right /template/ Panel#ContentRoot">
+      <Setter Property="Grid.Column" Value="0" />
+      <Setter Property="Grid.ColumnSpan" Value="1" />
+    </Style>
+
+    <!-- Open/Close Pane animation  -->
+    <Style Selector="^:open /template/ Panel#PART_PaneRoot">
+      <Setter Property="Transitions">
+        <Transitions>
+          <DoubleTransition Property="Width" Duration="{StaticResource SplitViewPaneAnimationOpenDuration}"
+                            Easing="{StaticResource SplitViewPaneAnimationEasing}" />
+        </Transitions>
+      </Setter>
+      <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=OpenPaneLength}" />
+    </Style>
+    <Style Selector="^:open /template/ Rectangle#LightDismissLayer">
+      <Setter Property="Transitions">
+        <Transitions>
+          <DoubleTransition Property="Opacity" Duration="{StaticResource SplitViewPaneAnimationOpenDuration}"
+                            Easing="{StaticResource SplitViewPaneAnimationEasing}" />
+        </Transitions>
+      </Setter>
+      <Setter Property="Opacity" Value="1.0" />
+    </Style>
+
+    <Style Selector="^:closed /template/ Panel#PART_PaneRoot">
+      <Setter Property="Transitions">
+        <Transitions>
+          <DoubleTransition Property="Width" Duration="{StaticResource SplitViewPaneAnimationCloseDuration}"
+                            Easing="{StaticResource SplitViewPaneAnimationEasing}" />
+        </Transitions>
+      </Setter>
+      <Setter Property="Width"
+              Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
+    </Style>
+    <Style Selector="^:closed /template/ Rectangle#LightDismissLayer">
+      <Setter Property="Transitions">
+        <Transitions>
+          <DoubleTransition Property="Opacity" Duration="{StaticResource SplitViewPaneAnimationCloseDuration}"
+                            Easing="{StaticResource SplitViewPaneAnimationEasing}" />
+        </Transitions>
+      </Setter>
+      <Setter Property="Opacity" Value="0.0" />
+    </Style>
+
+    <Style Selector="^ /template/ Rectangle#LightDismissLayer">
+      <Setter Property="IsVisible" Value="False" />
+      <Setter Property="Fill" Value="Transparent" />
+    </Style>
+    <Style Selector="^:lightdismiss /template/ Rectangle#LightDismissLayer">
+      <Setter Property="Fill" Value="{DynamicResource SplitViewLightDismissOverlayBackground}" />
+    </Style>
+
+    <Style Selector="^:overlay:open /template/ Rectangle#LightDismissLayer">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
+    <Style Selector="^:compactoverlay:open /template/ Rectangle#LightDismissLayer">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/TabControl.xaml b/src/Avalonia.Themes.Default/Controls/TabControl.xaml
index afb5010baa..4d1fcc0336 100644
--- a/src/Avalonia.Themes.Default/Controls/TabControl.xaml
+++ b/src/Avalonia.Themes.Default/Controls/TabControl.xaml
@@ -1,62 +1,61 @@
-<Styles xmlns="https://github.com/avaloniaui"  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Style Selector="TabControl">        
-        <Setter Property="Template">
-            <ControlTemplate>
-                <Border
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    CornerRadius="{TemplateBinding CornerRadius}"
-                    Background="{TemplateBinding Background}"
-                    HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                    VerticalAlignment="{TemplateBinding VerticalAlignment}">
-                    <DockPanel>
-                        <ItemsPresenter
-                            Name="PART_ItemsPresenter"
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type TabControl}"
+                TargetType="TabControl">
+    <Setter Property="Padding" Value="8" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Padding="{TemplateBinding Padding}"
+                HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <DockPanel>
+            <ItemsPresenter Name="PART_ItemsPresenter"
+                            ItemTemplate="{TemplateBinding ItemTemplate}"
                             Items="{TemplateBinding Items}"
-                            ItemsPanel="{TemplateBinding ItemsPanel}"
-                            ItemTemplate="{TemplateBinding ItemTemplate}">
-                        </ItemsPresenter>
-                        <ContentPresenter
-                            Name="PART_SelectedContentHost"
-                            Margin="{TemplateBinding Padding}"
-                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                            Content="{TemplateBinding SelectedContent}"
-                            ContentTemplate="{TemplateBinding SelectedContentTemplate}">
-                        </ContentPresenter>
-                    </DockPanel>
-                </Border>
-            </ControlTemplate>
-        </Setter>
+                            ItemsPanel="{TemplateBinding ItemsPanel}" />
+            <ContentPresenter Name="PART_SelectedContentHost"
+                              Margin="{TemplateBinding Padding}"
+                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                              Content="{TemplateBinding SelectedContent}"
+                              ContentTemplate="{TemplateBinding SelectedContentTemplate}" />
+          </DockPanel>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+    <Style Selector="^[TabStripPlacement=Top]">
+      <Setter Property="Padding" Value="0 4 0 0" />
     </Style>
-    <Style Selector="TabControl[TabStripPlacement=Top]">
-        <Setter Property="Padding" Value="0 4 0 0"/>
+    <Style Selector="^[TabStripPlacement=Top] /template/ ItemsPresenter#PART_ItemsPresenter">
+      <Setter Property="DockPanel.Dock" Value="Top" />
     </Style>
-    <Style Selector="TabControl[TabStripPlacement=Top] /template/ ItemsPresenter#PART_ItemsPresenter">
-        <Setter Property="DockPanel.Dock" Value="Top"/>
+    <Style Selector="^[TabStripPlacement=Bottom] /template/ ItemsPresenter#PART_ItemsPresenter">
+      <Setter Property="DockPanel.Dock" Value="Bottom" />
     </Style>
-    <Style Selector="TabControl[TabStripPlacement=Bottom] /template/ ItemsPresenter#PART_ItemsPresenter">
-        <Setter Property="DockPanel.Dock" Value="Bottom"/>
+    <Style Selector="^[TabStripPlacement=Bottom]">
+      <Setter Property="Padding" Value="0 0 0 4" />
     </Style>
-    <Style Selector="TabControl[TabStripPlacement=Bottom]">
-        <Setter Property="Padding" Value="0 0 0 4"/>
+    <Style Selector="^[TabStripPlacement=Left] /template/ ItemsPresenter#PART_ItemsPresenter">
+      <Setter Property="DockPanel.Dock" Value="Left" />
     </Style>
-    <Style Selector="TabControl[TabStripPlacement=Left] /template/ ItemsPresenter#PART_ItemsPresenter">
-        <Setter Property="DockPanel.Dock" Value="Left"/>
+    <Style Selector="^[TabStripPlacement=Left] /template/ ItemsPresenter#PART_ItemsPresenter > WrapPanel">
+      <Setter Property="Orientation" Value="Vertical" />
     </Style>
-    <Style Selector="TabControl[TabStripPlacement=Left] /template/ ItemsPresenter#PART_ItemsPresenter > WrapPanel">
-        <Setter Property="Orientation" Value="Vertical"/>
+    <Style Selector="^[TabStripPlacement=Left]">
+      <Setter Property="Padding" Value="4 0 0 0" />
     </Style>
-    <Style Selector="TabControl[TabStripPlacement=Left]">
-        <Setter Property="Padding" Value="4 0 0 0"/>
+    <Style Selector="^[TabStripPlacement=Right] /template/ ItemsPresenter#PART_ItemsPresenter">
+      <Setter Property="DockPanel.Dock" Value="Right" />
     </Style>
-    <Style Selector="TabControl[TabStripPlacement=Right] /template/ ItemsPresenter#PART_ItemsPresenter">
-        <Setter Property="DockPanel.Dock" Value="Right"/>
+    <Style Selector="^[TabStripPlacement=Right] /template/ ItemsPresenter#PART_ItemsPresenter > WrapPanel">
+      <Setter Property="Orientation" Value="Vertical" />
     </Style>
-    <Style Selector="TabControl[TabStripPlacement=Right] /template/ ItemsPresenter#PART_ItemsPresenter > WrapPanel">
-        <Setter Property="Orientation" Value="Vertical"/>
+    <Style Selector="^[TabStripPlacement=Right]">
+      <Setter Property="Padding" Value="0 0 4 0" />
     </Style>
-    <Style Selector="TabControl[TabStripPlacement=Right]">
-        <Setter Property="Padding" Value="0 0 4 0"/>
-    </Style>
-</Styles>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/TabItem.xaml b/src/Avalonia.Themes.Default/Controls/TabItem.xaml
index c7748299a0..7b6a1d1116 100644
--- a/src/Avalonia.Themes.Default/Controls/TabItem.xaml
+++ b/src/Avalonia.Themes.Default/Controls/TabItem.xaml
@@ -1,45 +1,46 @@
-<Styles xmlns="https://github.com/avaloniaui">
-    <Style Selector="TabItem">
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="FontSize" Value="{DynamicResource FontSizeLarge}"/>
-        <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundLowBrush}"/>
-        <Setter Property="HorizontalContentAlignment" Value="Left"/>
-        <Setter Property="Padding" Value="8"/>
-        <Setter Property="Template">
-            <ControlTemplate>
-                <ContentPresenter
-                    Name="PART_ContentPresenter"
-                    Background="{TemplateBinding Background}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    CornerRadius="{TemplateBinding CornerRadius}"
-                    ContentTemplate="{TemplateBinding HeaderTemplate}"
-                    Content="{TemplateBinding Header}"
-                    HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                    VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                    Padding="{TemplateBinding Padding}"/>
-            </ControlTemplate>
-        </Setter>
-    </Style>
-    <Style Selector="TabItem:disabled">
-        <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}"/>
-    </Style>
-    <Style Selector="TabItem:pointerover">
-        <Setter Property="Background" Value="{DynamicResource ThemeControlHighlightMidBrush}"/>
-    </Style>
-    <Style Selector="TabItem:selected">
-        <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush4}"/>
-    </Style>
-    <Style Selector="TabItem:selected:focus">
-        <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush3}"/>
-    </Style>
-    <Style Selector="TabItem:selected:pointerover">
-        <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush3}"/>
-    </Style>
-    <Style Selector="TabItem:selected:focus:pointerover">
-        <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush2}"/>
-    </Style>
-    <Style Selector="TabItem[TabStripPlacement=Right]">
-        <Setter Property="HorizontalContentAlignment" Value="Right"/>
-    </Style>
-</Styles>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type TabItem}"
+                TargetType="TabItem">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="FontSize" Value="{DynamicResource FontSizeLarge}" />
+    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundLowBrush}" />
+    <Setter Property="HorizontalContentAlignment" Value="Left" />
+    <Setter Property="Padding" Value="8" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ContentPresenter Name="PART_ContentPresenter"
+                          Padding="{TemplateBinding Padding}"
+                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          Content="{TemplateBinding Header}"
+                          ContentTemplate="{TemplateBinding HeaderTemplate}"
+                          CornerRadius="{TemplateBinding CornerRadius}" />
+      </ControlTemplate>
+    </Setter>
+    <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
+    </Style>
+    <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ThemeControlHighlightMidBrush}" />
+    </Style>
+    <Style Selector="^:selected /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush4}" />
+    </Style>
+    <Style Selector="^:selected:focus /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush3}" />
+    </Style>
+    <Style Selector="^:selected:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush3}" />
+    </Style>
+    <Style Selector="^:selected:focus:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush2}" />
+    </Style>
+    <Style Selector="^[TabStripPlacement=Right]">
+      <Setter Property="HorizontalContentAlignment" Value="Right" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/TabStrip.xaml b/src/Avalonia.Themes.Default/Controls/TabStrip.xaml
index 29ca1e7c94..3960c1d275 100644
--- a/src/Avalonia.Themes.Default/Controls/TabStrip.xaml
+++ b/src/Avalonia.Themes.Default/Controls/TabStrip.xaml
@@ -1,11 +1,13 @@
-<Styles xmlns="https://github.com/avaloniaui">
-  <Style Selector="TabStrip">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type TabStrip}"
+                TargetType="TabStrip">
     <Setter Property="Template">
       <ControlTemplate>
         <ItemsPresenter Name="PART_ItemsPresenter"
+                        ItemTemplate="{TemplateBinding ItemTemplate}"
                         Items="{TemplateBinding Items}"
-                        ItemsPanel="{TemplateBinding ItemsPanel}"
-                        ItemTemplate="{TemplateBinding ItemTemplate}"/>
+                        ItemsPanel="{TemplateBinding ItemsPanel}" />
       </ControlTemplate>
     </Setter>
     <Setter Property="ItemsPanel">
@@ -13,8 +15,5 @@
         <WrapPanel />
       </ItemsPanelTemplate>
     </Setter>
-  </Style>
-  <Style Selector="TabStrip > TabStripItem">
-    <Setter Property="Margin" Value="16"/>
-  </Style>
-</Styles>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/TabStripItem.xaml b/src/Avalonia.Themes.Default/Controls/TabStripItem.xaml
index 61eecc0395..b4d7218ec3 100644
--- a/src/Avalonia.Themes.Default/Controls/TabStripItem.xaml
+++ b/src/Avalonia.Themes.Default/Controls/TabStripItem.xaml
@@ -1,24 +1,27 @@
-<Styles xmlns="https://github.com/avaloniaui">
-  <Style Selector="TabStripItem">
-    <Setter Property="Background" Value="Transparent"/>
-    <Setter Property="FontSize" Value="{DynamicResource FontSizeLarge}"/>
-    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundLowBrush}"/>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type TabStripItem}"
+                TargetType="TabStripItem">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="Margin" Value="16" />
+    <Setter Property="FontSize" Value="{DynamicResource FontSizeLarge}" />
+    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundLowBrush}" />
     <Setter Property="Template">
       <ControlTemplate>
         <ContentPresenter Name="PART_ContentPresenter"
+                          Padding="{TemplateBinding Padding}"
+                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                           Background="{TemplateBinding Background}"
                           BorderBrush="{TemplateBinding BorderBrush}"
                           BorderThickness="{TemplateBinding BorderThickness}"
-                          CornerRadius="{TemplateBinding CornerRadius}"
-                          ContentTemplate="{TemplateBinding ContentTemplate}"
                           Content="{TemplateBinding Content}"
-                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                          Padding="{TemplateBinding Padding}"/>
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          CornerRadius="{TemplateBinding CornerRadius}" />
       </ControlTemplate>
     </Setter>
-  </Style>
-  <Style Selector="TabStripItem:selected">
-    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
-  </Style>
-</Styles>
+    <Style Selector="^:selected /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/TextBox.xaml b/src/Avalonia.Themes.Default/Controls/TextBox.xaml
index 1885d3b65b..3cc8bc5421 100644
--- a/src/Avalonia.Themes.Default/Controls/TextBox.xaml
+++ b/src/Avalonia.Themes.Default/Controls/TextBox.xaml
@@ -1,29 +1,101 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Styles.Resources>
-    <StreamGeometry x:Key="TextBoxClearButtonData">M 11.416016,10 20,1.4160156 18.583984,0 10,8.5839846 1.4160156,0 0,1.4160156 8.5839844,10 0,18.583985 1.4160156,20 10,11.416015 18.583984,20 20,18.583985 Z</StreamGeometry>
-    <StreamGeometry x:Key="PasswordBoxRevealButtonData">m10.051 7.0032c2.215 0 4.0105 1.7901 4.0105 3.9984s-1.7956 3.9984-4.0105 3.9984c-2.215 0-4.0105-1.7901-4.0105-3.9984s1.7956-3.9984 4.0105-3.9984zm0 1.4994c-1.3844 0-2.5066 1.1188-2.5066 2.499s1.1222 2.499 2.5066 2.499 2.5066-1.1188 2.5066-2.499-1.1222-2.499-2.5066-2.499zm0-5.0026c4.6257 0 8.6188 3.1487 9.7267 7.5613 0.10085 0.40165-0.14399 0.80877-0.54686 0.90931-0.40288 0.10054-0.81122-0.14355-0.91208-0.54521-0.94136-3.7492-4.3361-6.4261-8.2678-6.4261-3.9334 0-7.3292 2.6792-8.2689 6.4306-0.10063 0.40171-0.50884 0.64603-0.91177 0.54571s-0.648-0.5073-0.54737-0.90901c1.106-4.4152 5.1003-7.5667 9.728-7.5667z</StreamGeometry>
-    <StreamGeometry x:Key="PasswordBoxHideButtonData">m0.21967 0.21965c-0.26627 0.26627-0.29047 0.68293-0.07262 0.97654l0.07262 0.08412 4.0346 4.0346c-1.922 1.3495-3.3585 3.365-3.9554 5.7495-0.10058 0.4018 0.14362 0.8091 0.54543 0.9097 0.40182 0.1005 0.80909-0.1436 0.90968-0.5455 0.52947-2.1151 1.8371-3.8891 3.5802-5.0341l1.8096 1.8098c-0.70751 0.7215-1.1438 1.71-1.1438 2.8003 0 2.2092 1.7909 4 4 4 1.0904 0 2.0788-0.4363 2.8004-1.1438l5.9193 5.9195c0.2929 0.2929 0.7677 0.2929 1.0606 0 0.2663-0.2662 0.2905-0.6829 0.0726-0.9765l-0.0726-0.0841-6.1135-6.1142 0.0012-0.0015-1.2001-1.1979-2.8699-2.8693 2e-3 -8e-4 -2.8812-2.8782 0.0012-0.0018-1.1333-1.1305-4.3064-4.3058c-0.29289-0.29289-0.76777-0.29289-1.0607 0zm7.9844 9.0458 3.5351 3.5351c-0.45 0.4358-1.0633 0.704-1.7392 0.704-1.3807 0-2.5-1.1193-2.5-2.5 0-0.6759 0.26824-1.2892 0.7041-1.7391zm1.7959-5.7655c-1.0003 0-1.9709 0.14807-2.8889 0.425l1.237 1.2362c0.5358-0.10587 1.0883-0.16119 1.6519-0.16119 3.9231 0 7.3099 2.6803 8.2471 6.4332 0.1004 0.4018 0.5075 0.6462 0.9094 0.5459 0.4019-0.1004 0.6463-0.5075 0.5459-0.9094-1.103-4.417-5.0869-7.5697-9.7024-7.5697zm0.1947 3.5093 3.8013 3.8007c-0.1018-2.0569-1.7488-3.7024-3.8013-3.8007z</StreamGeometry>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <StreamGeometry x:Key="TextBoxClearButtonData">M 11.416016,10 20,1.4160156 18.583984,0 10,8.5839846 1.4160156,0 0,1.4160156 8.5839844,10 0,18.583985 1.4160156,20 10,11.416015 18.583984,20 20,18.583985 Z</StreamGeometry>
+  <StreamGeometry x:Key="PasswordBoxRevealButtonData">m10.051 7.0032c2.215 0 4.0105 1.7901 4.0105 3.9984s-1.7956 3.9984-4.0105 3.9984c-2.215 0-4.0105-1.7901-4.0105-3.9984s1.7956-3.9984 4.0105-3.9984zm0 1.4994c-1.3844 0-2.5066 1.1188-2.5066 2.499s1.1222 2.499 2.5066 2.499 2.5066-1.1188 2.5066-2.499-1.1222-2.499-2.5066-2.499zm0-5.0026c4.6257 0 8.6188 3.1487 9.7267 7.5613 0.10085 0.40165-0.14399 0.80877-0.54686 0.90931-0.40288 0.10054-0.81122-0.14355-0.91208-0.54521-0.94136-3.7492-4.3361-6.4261-8.2678-6.4261-3.9334 0-7.3292 2.6792-8.2689 6.4306-0.10063 0.40171-0.50884 0.64603-0.91177 0.54571s-0.648-0.5073-0.54737-0.90901c1.106-4.4152 5.1003-7.5667 9.728-7.5667z</StreamGeometry>
+  <StreamGeometry x:Key="PasswordBoxHideButtonData">m0.21967 0.21965c-0.26627 0.26627-0.29047 0.68293-0.07262 0.97654l0.07262 0.08412 4.0346 4.0346c-1.922 1.3495-3.3585 3.365-3.9554 5.7495-0.10058 0.4018 0.14362 0.8091 0.54543 0.9097 0.40182 0.1005 0.80909-0.1436 0.90968-0.5455 0.52947-2.1151 1.8371-3.8891 3.5802-5.0341l1.8096 1.8098c-0.70751 0.7215-1.1438 1.71-1.1438 2.8003 0 2.2092 1.7909 4 4 4 1.0904 0 2.0788-0.4363 2.8004-1.1438l5.9193 5.9195c0.2929 0.2929 0.7677 0.2929 1.0606 0 0.2663-0.2662 0.2905-0.6829 0.0726-0.9765l-0.0726-0.0841-6.1135-6.1142 0.0012-0.0015-1.2001-1.1979-2.8699-2.8693 2e-3 -8e-4 -2.8812-2.8782 0.0012-0.0018-1.1333-1.1305-4.3064-4.3058c-0.29289-0.29289-0.76777-0.29289-1.0607 0zm7.9844 9.0458 3.5351 3.5351c-0.45 0.4358-1.0633 0.704-1.7392 0.704-1.3807 0-2.5-1.1193-2.5-2.5 0-0.6759 0.26824-1.2892 0.7041-1.7391zm1.7959-5.7655c-1.0003 0-1.9709 0.14807-2.8889 0.425l1.237 1.2362c0.5358-0.10587 1.0883-0.16119 1.6519-0.16119 3.9231 0 7.3099 2.6803 8.2471 6.4332 0.1004 0.4018 0.5075 0.6462 0.9094 0.5459 0.4019-0.1004 0.6463-0.5075 0.5459-0.9094-1.103-4.417-5.0869-7.5697-9.7024-7.5697zm0.1947 3.5093 3.8013 3.8007c-0.1018-2.0569-1.7488-3.7024-3.8013-3.8007z</StreamGeometry>
 
-    <MenuFlyout x:Key="DefaultTextBoxContextFlyout" Placement="Bottom">
-      <MenuItem x:Name="TextBoxContextFlyoutCutItem" Header="Cut" Command="{Binding $parent[TextBox].Cut}" IsEnabled="{Binding $parent[TextBox].CanCut}" InputGesture="{x:Static TextBox.CutGesture}" />
-      <MenuItem x:Name="TextBoxContextFlyoutCopyItem" Header="Copy" Command="{Binding $parent[TextBox].Copy}" IsEnabled="{Binding $parent[TextBox].CanCopy}" InputGesture="{x:Static TextBox.CopyGesture}"/>
-      <MenuItem x:Name="TextBoxContextFlyoutPasteItem" Header="Paste" Command="{Binding $parent[TextBox].Paste}" IsEnabled="{Binding $parent[TextBox].CanPaste}" InputGesture="{x:Static TextBox.PasteGesture}"/>
-    </MenuFlyout>
+  <MenuFlyout x:Key="DefaultTextBoxContextFlyout" Placement="Bottom">
+    <MenuItem x:Name="TextBoxContextFlyoutCutItem" Header="Cut" Command="{Binding $parent[TextBox].Cut}"
+              IsEnabled="{Binding $parent[TextBox].CanCut}" InputGesture="{x:Static TextBox.CutGesture}" />
+    <MenuItem x:Name="TextBoxContextFlyoutCopyItem" Header="Copy" Command="{Binding $parent[TextBox].Copy}"
+              IsEnabled="{Binding $parent[TextBox].CanCopy}" InputGesture="{x:Static TextBox.CopyGesture}" />
+    <MenuItem x:Name="TextBoxContextFlyoutPasteItem" Header="Paste" Command="{Binding $parent[TextBox].Paste}"
+              IsEnabled="{Binding $parent[TextBox].CanPaste}" InputGesture="{x:Static TextBox.PasteGesture}" />
+  </MenuFlyout>
 
-    <ContextMenu x:Key="DefaultTextBoxContextMenu" x:Name="TextBoxContextMenu">
-      <MenuItem x:Name="TextBoxContextMenuCutItem" Header="Cut" Command="{Binding $parent[TextBox].Cut}" IsEnabled="{Binding $parent[TextBox].CanCut}" InputGesture="{x:Static TextBox.CutGesture}" />
-      <MenuItem x:Name="TextBoxContextMenuCopyItem" Header="Copy" Command="{Binding $parent[TextBox].Copy}" IsEnabled="{Binding $parent[TextBox].CanCopy}" InputGesture="{x:Static TextBox.CopyGesture}"/>
-      <MenuItem x:Name="TextBoxContextMenuPasteItem" Header="Paste" Command="{Binding $parent[TextBox].Paste}" IsEnabled="{Binding $parent[TextBox].CanPaste}" InputGesture="{x:Static TextBox.PasteGesture}"/>
-    </ContextMenu>
-  </Styles.Resources>
-  <Style Selector="TextBox">
+  <ContextMenu x:Key="DefaultTextBoxContextMenu" x:Name="TextBoxContextMenu">
+    <MenuItem x:Name="TextBoxContextMenuCutItem" Header="Cut" Command="{Binding $parent[TextBox].Cut}"
+              IsEnabled="{Binding $parent[TextBox].CanCut}" InputGesture="{x:Static TextBox.CutGesture}" />
+    <MenuItem x:Name="TextBoxContextMenuCopyItem" Header="Copy" Command="{Binding $parent[TextBox].Copy}"
+              IsEnabled="{Binding $parent[TextBox].CanCopy}" InputGesture="{x:Static TextBox.CopyGesture}" />
+    <MenuItem x:Name="TextBoxContextMenuPasteItem" Header="Paste" Command="{Binding $parent[TextBox].Paste}"
+              IsEnabled="{Binding $parent[TextBox].CanPaste}" InputGesture="{x:Static TextBox.PasteGesture}" />
+  </ContextMenu>
+
+  <ControlTheme x:Key="DefaultTextBoxClearButtonTheme"
+                BasedOn="{StaticResource {x:Type Button}}"
+                TargetType="Button">
+    <Setter Property="Cursor" Value="Arrow" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="Button">
+          <Border x:Name="PART_ButtonLayoutBorder"
+                  Background="Transparent"
+                  BorderThickness="{TemplateBinding BorderThickness}">
+            <Path x:Name="PART_GlyphElement"
+                  Width="10"
+                  Height="10"
+                  HorizontalAlignment="Center"
+                  VerticalAlignment="Center"
+                  Data="{StaticResource TextBoxClearButtonData}"
+                  Fill="{DynamicResource ThemeForegroundColor}"
+                  Stretch="Uniform" />
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </ControlTheme>
+
+  <ControlTheme x:Key="DefaultPasswordBoxRevealButtonTheme"
+                BasedOn="{StaticResource {x:Type Button}}"
+                TargetType="ToggleButton">
+    <Setter Property="Cursor" Value="Arrow" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ToggleButton">
+          <Border x:Name="PART_ButtonLayoutBorder"
+                  Width="12"
+                  Background="Transparent">
+            <Panel>
+              <Path x:Name="PART_GlyphElement_Reveal"
+                    Width="12"
+                    Height="8"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Data="{DynamicResource PasswordBoxRevealButtonData}"
+                    Fill="{DynamicResource ThemeForegroundColor}"
+                    Stretch="Uniform" />
+              <Path x:Name="PART_GlyphElement_Hide"
+                    Width="12"
+                    Height="12"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Data="{DynamicResource PasswordBoxHideButtonData}"
+                    Fill="{DynamicResource ThemeForegroundColor}"
+                    Stretch="Uniform" />
+            </Panel>
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+
+    <Style Selector="^:unchecked /template/ Path#PART_GlyphElement_Hide">
+      <Setter Property="IsVisible" Value="False" />
+    </Style>
+    <Style Selector="^:checked /template/ Path#PART_GlyphElement_Reveal">
+      <Setter Property="IsVisible" Value="False" />
+    </Style>
+  </ControlTheme>
+
+  <ControlTheme x:Key="{x:Type TextBox}"
+                TargetType="TextBox">
     <Setter Property="CaretBrush" Value="{DynamicResource ThemeForegroundBrush}" />
-    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
-    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}"/>
-    <Setter Property="SelectionBrush" Value="{DynamicResource HighlightBrush}"/>
-    <Setter Property="SelectionForegroundBrush" Value="{DynamicResource HighlightForegroundBrush}"/>
-    <Setter Property="Padding" Value="4"/>
+    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}" />
+    <Setter Property="SelectionBrush" Value="{DynamicResource HighlightBrush}" />
+    <Setter Property="SelectionForegroundBrush" Value="{DynamicResource HighlightForegroundBrush}" />
+    <Setter Property="Padding" Value="4" />
     <Setter Property="ContextFlyout" Value="{StaticResource DefaultTextBoxContextFlyout}" />
     <Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
     <Setter Property="Template">
@@ -38,17 +110,17 @@
                      VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
 
             <TextBlock Name="floatingWatermark"
-                       Foreground="{DynamicResource ThemeAccentBrush}"
+                       DockPanel.Dock="Top"
                        FontSize="{DynamicResource FontSizeSmall}"
-                       Text="{TemplateBinding Watermark}"
-                       DockPanel.Dock="Top">
+                       Foreground="{DynamicResource ThemeAccentBrush}"
+                       Text="{TemplateBinding Watermark}">
               <TextBlock.IsVisible>
                 <MultiBinding Converter="{x:Static BoolConverters.And}">
-                  <Binding RelativeSource="{RelativeSource TemplatedParent}"
-                           Path="UseFloatingWatermark"/>
-                  <Binding RelativeSource="{RelativeSource TemplatedParent}"
+                  <Binding Path="UseFloatingWatermark"
+                           RelativeSource="{RelativeSource TemplatedParent}" />
+                  <Binding Converter="{x:Static StringConverters.IsNotNullOrEmpty}"
                            Path="Text"
-                           Converter="{x:Static StringConverters.IsNotNullOrEmpty}"/>
+                           RelativeSource="{RelativeSource TemplatedParent}" />
                 </MultiBinding>
               </TextBlock.IsVisible>
             </TextBlock>
@@ -56,148 +128,94 @@
             <DataValidationErrors>
 
               <Grid ColumnDefinitions="Auto,*,Auto">
-                <ContentPresenter Grid.Column="0" Grid.ColumnSpan="1" Content="{TemplateBinding InnerLeftContent}"/>
-                <ScrollViewer Grid.Column="1" Grid.ColumnSpan="1"
+                <ContentPresenter Grid.Column="0"
+                                  Grid.ColumnSpan="1"
+                                  Content="{TemplateBinding InnerLeftContent}" />
+                <ScrollViewer Grid.Column="1"
+                              Grid.ColumnSpan="1"
+                              AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}"
                               HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
-                              VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}"
                               IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
-                              AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}">
+                              VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
                   <Panel>
                     <TextBlock Name="watermark"
-                              Opacity="0.5"
-                              Text="{TemplateBinding Watermark}"
-                              TextAlignment="{TemplateBinding TextAlignment}"
-                              TextWrapping="{TemplateBinding TextWrapping}"
-                              IsVisible="{TemplateBinding Text, Converter={x:Static StringConverters.IsNullOrEmpty}}"/>
+                               IsVisible="{TemplateBinding Text,
+                                                           Converter={x:Static StringConverters.IsNullOrEmpty}}"
+                               Opacity="0.5"
+                               Text="{TemplateBinding Watermark}"
+                               TextAlignment="{TemplateBinding TextAlignment}"
+                               TextWrapping="{TemplateBinding TextWrapping}" />
                     <TextPresenter Name="PART_TextPresenter"
-                                    Text="{TemplateBinding Text, Mode=TwoWay}"
-                                    CaretIndex="{TemplateBinding CaretIndex}"
-                                    SelectionStart="{TemplateBinding SelectionStart}"
-                                    SelectionEnd="{TemplateBinding SelectionEnd}"
-                                    TextAlignment="{TemplateBinding TextAlignment}"
-                                    TextWrapping="{TemplateBinding TextWrapping}"
-                                    LineHeight="{TemplateBinding LineHeight}"
-                                    PasswordChar="{TemplateBinding PasswordChar}"
-                                    RevealPassword="{TemplateBinding RevealPassword}"
-                                    SelectionBrush="{TemplateBinding SelectionBrush}"
-                                    SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
-                                    CaretBrush="{TemplateBinding CaretBrush}" />
+                                   CaretBrush="{TemplateBinding CaretBrush}"
+                                   CaretIndex="{TemplateBinding CaretIndex}"
+                                   LineHeight="{TemplateBinding LineHeight}"
+                                   PasswordChar="{TemplateBinding PasswordChar}"
+                                   RevealPassword="{TemplateBinding RevealPassword}"
+                                   SelectionBrush="{TemplateBinding SelectionBrush}"
+                                   SelectionEnd="{TemplateBinding SelectionEnd}"
+                                   SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
+                                   SelectionStart="{TemplateBinding SelectionStart}"
+                                   Text="{TemplateBinding Text,
+                                                          Mode=TwoWay}"
+                                   TextAlignment="{TemplateBinding TextAlignment}"
+                                   TextWrapping="{TemplateBinding TextWrapping}" />
                   </Panel>
                 </ScrollViewer>
-                <ContentPresenter Grid.Column="2" Grid.ColumnSpan="1" Content="{TemplateBinding InnerRightContent}"/>             
+                <ContentPresenter Grid.Column="2"
+                                  Grid.ColumnSpan="1"
+                                  Content="{TemplateBinding InnerRightContent}" />
               </Grid>
             </DataValidationErrors>
           </DockPanel>
         </Border>
       </ControlTemplate>
     </Setter>
-  </Style>
-  <Style Selector="TextBox:pointerover /template/ Border#border">
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderHighBrush}"/>
-  </Style>
-  <Style Selector="TextBox:focus /template/ Border#border">
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderHighBrush}"/>
-  </Style>
-  <Style Selector="TextBox:error /template/ Border#border">
-    <Setter Property="BorderBrush" Value="{DynamicResource ErrorBrush}"/>
-  </Style>
-  <Style Selector="TextBox /template/ DockPanel">
-    <Setter Property="Cursor" Value="IBeam" />
-  </Style>
-  <Style Selector="TextBox:disabled /template/ Border#border">
+
+    <Style Selector="^:pointerover /template/ Border#border">
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderHighBrush}" />
+    </Style>
+    <Style Selector="^:focus /template/ Border#border">
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderHighBrush}" />
+    </Style>
+    <Style Selector="^:error /template/ Border#border">
+      <Setter Property="BorderBrush" Value="{DynamicResource ErrorBrush}" />
+    </Style>
+    <Style Selector="^ /template/ DockPanel">
+      <Setter Property="Cursor" Value="IBeam" />
+    </Style>
+    <Style Selector="^:disabled /template/ Border#border">
       <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
-  </Style>
-  
-  <Style Selector="TextBox.clearButton[AcceptsReturn=False][IsReadOnly=False]:focus:not(TextBox:empty)">
-    <Setter Property="InnerRightContent">
-      <Template>
-        <Button Classes="textBoxClearButton"
-                Command="{Binding $parent[TextBox].Clear}" />
-      </Template>
-    </Setter>
-  </Style>
-  
-  <Style Selector="Button.textBoxClearButton">
-    <Setter Property="Cursor" Value="Arrow" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="Button">
-          <Border x:Name="PART_ButtonLayoutBorder"
-                  BorderThickness="{TemplateBinding BorderThickness}" 
-                  Background="Transparent">
-            <Path x:Name="PART_GlyphElement"
-                  Fill="{DynamicResource ThemeForegroundColor}"
-                  Data="{StaticResource TextBoxClearButtonData}"
-                  Height="10"
-                  Width="10"
-                  Stretch="Uniform"
-                  VerticalAlignment="Center"
-                  HorizontalAlignment="Center"/>
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  
-  <Style Selector="TextBox.revealPasswordButton[AcceptsReturn=False][IsReadOnly=False]:not(TextBox:empty)">
-    <Setter Property="InnerRightContent">
-      <Template>
-        <Panel Margin="4,0">
-          <Panel.Styles>
-            <Style Selector="ToggleButton[IsChecked=True]">
-              <Setter Property="(ToolTip.Tip)" Value="Hide Password" />
-            </Style>
-            <Style Selector="ToggleButton[IsChecked=False]">
-              <Setter Property="(ToolTip.Tip)" Value="Show Password" />
-            </Style>
-          </Panel.Styles>
-          <ToggleButton Classes="passwordBoxRevealButton" Background="Transparent" IsChecked="{Binding $parent[TextBox].RevealPassword, Mode=TwoWay}" />
-        </Panel>
-      </Template>
-    </Setter>
-  </Style>
-  
-  <Style Selector="ToggleButton.passwordBoxRevealButton">
-    <Setter Property="Cursor" Value="Arrow" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ToggleButton">
-          <Border x:Name="PART_ButtonLayoutBorder"
-                  Background="Transparent"
-                  Width="12">
-            <Panel>
-              <Path x:Name="PART_GlyphElement_Reveal"
-                    Fill="{DynamicResource ThemeForegroundColor}"
-                    Data="{DynamicResource PasswordBoxRevealButtonData}"
-                    Height="8"
-                    Width="12"
-                    Stretch="Uniform"
-                    VerticalAlignment="Center"
-                    HorizontalAlignment="Center" />
-              <Path x:Name="PART_GlyphElement_Hide"
-                    Fill="{DynamicResource ThemeForegroundColor}"
-                    Data="{DynamicResource PasswordBoxHideButtonData}"
-                    Height="12"
-                    Width="12"
-                    Stretch="Uniform"
-                    VerticalAlignment="Center"
-                    HorizontalAlignment="Center" />
-            </Panel>
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  
-  <Style Selector="ToggleButton.passwordBoxRevealButton:not(ToggleButton:checked) /template/ Path#PART_GlyphElement_Hide">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-  
-  <Style Selector="ToggleButton.passwordBoxRevealButton:checked /template/ Path#PART_GlyphElement_Reveal">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
+    </Style>
+
+    <Style Selector="^.clearButton[AcceptsReturn=False][IsReadOnly=False]:focus:not(TextBox:empty)">
+      <Setter Property="InnerRightContent">
+        <Template>
+          <Button Command="{Binding $parent[TextBox].Clear}"
+                  Focusable="False"
+                  Theme="{StaticResource DefaultTextBoxClearButtonTheme}" />
+        </Template>
+      </Setter>
+    </Style>
 
-  <Style Selector="Button.textBoxClearButton, ToggleButton.passwordBoxRevealButton">    
-    <Setter Property="Focusable" Value="False" />
-  </Style>
-</Styles>
+    <Style Selector="^.revealPasswordButton[AcceptsReturn=False][IsReadOnly=False]:not(TextBox:empty)">
+      <Setter Property="InnerRightContent">
+        <Template>
+          <Panel Margin="4,0">
+            <Panel.Styles>
+              <Style Selector="ToggleButton[IsChecked=True]">
+                <Setter Property="(ToolTip.Tip)" Value="Hide Password" />
+              </Style>
+              <Style Selector="ToggleButton[IsChecked=False]">
+                <Setter Property="(ToolTip.Tip)" Value="Show Password" />
+              </Style>
+            </Panel.Styles>
+            <ToggleButton Background="Transparent"
+                          Focusable="False"
+                          IsChecked="{Binding $parent[TextBox].RevealPassword, Mode=TwoWay}"
+                          Theme="{StaticResource DefaultPasswordBoxRevealButtonTheme}" />
+          </Panel>
+        </Template>
+      </Setter>
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/TimePicker.xaml b/src/Avalonia.Themes.Default/Controls/TimePicker.xaml
index 0a5147e335..b0ffc97e68 100644
--- a/src/Avalonia.Themes.Default/Controls/TimePicker.xaml
+++ b/src/Avalonia.Themes.Default/Controls/TimePicker.xaml
@@ -1,175 +1,204 @@
 <!--
-// (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.
+  // (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.
 -->
 
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:sys="clr-namespace:System;assembly=netstandard">
-  <Styles.Resources>
-    <x:Double x:Key="TimePickerFlyoutPresenterItemHeight">40</x:Double>
-    <x:Double x:Key="TimePickerSpacerThemeWidth">1</x:Double>
-    <Thickness x:Key="TimePickerBorderThemeThickness">1</Thickness>
-    <Thickness x:Key="TimePickerTopHeaderMargin">0,0,0,4</Thickness>
-    <x:Double x:Key="TimePickerFlyoutPresenterHighlightHeight">40</x:Double>
-    <x:Double x:Key="TimePickerFlyoutPresenterAcceptDismissHostGridHeight">41</x:Double>
-    <x:Double x:Key="TimePickerThemeMinWidth">242</x:Double>
-    <x:Double x:Key="TimePickerThemeMaxWidth">456</x:Double>
-    <Thickness x:Key="TimePickerFlyoutPresenterItemPadding">0,3,0,6</Thickness>
-    <Thickness x:Key="TimePickerHostPadding">0,3,0,6</Thickness>
-  </Styles.Resources>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:sys="clr-namespace:System;assembly=netstandard"
+                    x:CompileBindings="True">
+  <Design.PreviewWith>
+    <Border Height="500"
+            Padding="20">
+      <StackPanel VerticalAlignment="Center"
+                  Spacing="20">
+        <TimePicker />
+        <TimePicker CornerRadius="10" />
+        <TimePicker IsEnabled="False" />
+        <TimePicker>
+          <DataValidationErrors.Error>
+            <sys:Exception>
+              <x:Arguments>
+                <x:String>Error</x:String>
+              </x:Arguments>
+            </sys:Exception>
+          </DataValidationErrors.Error>
+        </TimePicker>
+      </StackPanel>
+    </Border>
+  </Design.PreviewWith>
 
-  <Style Selector="ListBoxItem.DateTimePickerItem.HourItem">
-    <Setter Property="Padding" Value="{DynamicResource TimePickerFlyoutPresenterItemPadding}" />
-  </Style>
-  <Style Selector="ListBoxItem.DateTimePickerItem.MinuteItem">
-    <Setter Property="Padding" Value="{DynamicResource TimePickerFlyoutPresenterItemPadding}" />
-  </Style>
-  <Style Selector="ListBoxItem.DateTimePickerItem.TimePeriodItem">
-    <Setter Property="Padding" Value="{DynamicResource TimePickerFlyoutPresenterItemPadding}" />
-  </Style>
+  <x:Double x:Key="TimePickerFlyoutPresenterItemHeight">40</x:Double>
+  <x:Double x:Key="TimePickerSpacerThemeWidth">1</x:Double>
+  <Thickness x:Key="TimePickerBorderThemeThickness">1</Thickness>
+  <Thickness x:Key="TimePickerTopHeaderMargin">0,0,0,4</Thickness>
+  <x:Double x:Key="TimePickerFlyoutPresenterHighlightHeight">40</x:Double>
+  <x:Double x:Key="TimePickerFlyoutPresenterAcceptDismissHostGridHeight">41</x:Double>
+  <x:Double x:Key="TimePickerThemeMinWidth">242</x:Double>
+  <x:Double x:Key="TimePickerThemeMaxWidth">456</x:Double>
+  <Thickness x:Key="TimePickerFlyoutPresenterItemPadding">0,3,0,6</Thickness>
+  <Thickness x:Key="TimePickerHostPadding">0,3,0,6</Thickness>
 
-  <Style Selector="TimePicker">    
+  <ControlTheme x:Key="DefaultTimePickerFlyoutButton"
+                TargetType="Button">
+    <Setter Property="RenderTransform" Value="none" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ContentPresenter Name="PART_ContentPresenter"
+                          HorizontalContentAlignment="Stretch"
+                          VerticalContentAlignment="Stretch"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          Content="{TemplateBinding Content}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
+                          Foreground="{TemplateBinding Foreground}" />
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeControlHighBrush}" />
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+    </Style>
+
+    <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background">
+        <SolidColorBrush Opacity="0.6"
+                         Color="{DynamicResource ThemeControlMidHighColor}" />
+      </Setter>
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeControlLowBrush}" />
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+    </Style>
+
+    <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
+    </Style>
+  </ControlTheme>
+
+  <ControlTheme x:Key="{x:Type TimePicker}"
+                TargetType="TimePicker">
     <Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}" />
     <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
-    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeControlHighlightMidBrush}"/>
-    <Setter Property="BorderThickness" Value="{DynamicResource TimePickerBorderThemeThickness}"/>
+    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeControlHighlightMidBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource TimePickerBorderThemeThickness}" />
     <Setter Property="HorizontalAlignment" Value="Left" />
     <Setter Property="VerticalAlignment" Value="Center" />
     <Setter Property="Template">
       <ControlTemplate>
-        <Grid Name="LayoutRoot" Margin="{TemplateBinding Padding}" RowDefinitions="Auto,*">
-          <ContentPresenter x:Name="HeaderContentPresenter"
-                 Grid.Row="0"
-                 Content="{TemplateBinding Header}"
-                 ContentTemplate="{TemplateBinding HeaderTemplate}"
-                 Margin="{DynamicResource TimePickerTopHeaderMargin}"
-                 MaxWidth="{DynamicResource TimePickerThemeMaxWidth}"
-                 TextElement.Foreground="{DynamicResource ThemeForegroundColor}"
-                 HorizontalAlignment="Stretch"
-                 VerticalAlignment="Top" />
+        <DataValidationErrors>
+          <Grid Name="LayoutRoot"
+                Margin="{TemplateBinding Padding}"
+                RowDefinitions="Auto,*">
+            <ContentPresenter x:Name="HeaderContentPresenter"
+                              Grid.Row="0"
+                              MaxWidth="{DynamicResource TimePickerThemeMaxWidth}"
+                              Margin="{DynamicResource TimePickerTopHeaderMargin}"
+                              HorizontalAlignment="Stretch"
+                              VerticalAlignment="Top"
+                              Content="{TemplateBinding Header}"
+                              ContentTemplate="{TemplateBinding HeaderTemplate}"
+                              Foreground="{DynamicResource ThemeForegroundColor}" />
 
-          <Button x:Name="FlyoutButton"
-                  Grid.Row="1"
-                  Foreground="{TemplateBinding Foreground}"
-                  Background="{TemplateBinding Background}"
-                  BorderBrush="{TemplateBinding BorderBrush}"
-                  BorderThickness="{TemplateBinding BorderThickness}"
-                  CornerRadius="{TemplateBinding CornerRadius}"
-                  IsEnabled="{TemplateBinding IsEnabled}"
-                  MinWidth="{DynamicResource TimePickerThemeMinWidth}"
-                  MaxWidth="{DynamicResource TimePickerThemeMaxWidth}"
-                  HorizontalAlignment="Stretch"
-                  HorizontalContentAlignment="Stretch"
-                  VerticalAlignment="Top"
-                  VerticalContentAlignment="Stretch">
-            <Button.Template>
-              <ControlTemplate>
-                <ContentPresenter Name="ContentPresenter"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                Background="{TemplateBinding Background}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="{TemplateBinding CornerRadius}"
-                                Content="{TemplateBinding Content}"
-                                TextElement.Foreground="{TemplateBinding Foreground}"
-                                HorizontalContentAlignment="Stretch"
-                                VerticalContentAlignment="Stretch" />
-              </ControlTemplate>
-            </Button.Template>
+            <Button x:Name="FlyoutButton"
+                    Grid.Row="1"
+                    MinWidth="{DynamicResource TimePickerThemeMinWidth}"
+                    MaxWidth="{DynamicResource TimePickerThemeMaxWidth}"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Top"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    CornerRadius="{TemplateBinding CornerRadius}"
+                    Foreground="{TemplateBinding Foreground}"
+                    IsEnabled="{TemplateBinding IsEnabled}"
+                    Theme="{StaticResource DefaultTimePickerFlyoutButton}">
 
-            <Grid Name="FlyoutButtonContentGrid">
-              <!--Ignore col defs here, set in code-->
-              <Border x:Name="FirstPickerHost" Grid.Column="0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                <TextBlock x:Name="HourTextBlock"
-                    HorizontalAlignment="Center"
-                    Padding="{DynamicResource TimePickerHostPadding}"
-                    FontFamily="{TemplateBinding FontFamily}"
-                    FontWeight="{TemplateBinding FontWeight}"
-                    FontSize="{TemplateBinding FontSize}" />
-              </Border>
+              <Grid Name="FlyoutButtonContentGrid">
+                <!--  Ignore col defs here, set in code  -->
+                <Border x:Name="FirstPickerHost"
+                        Grid.Column="0"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch">
+                  <TextBlock x:Name="HourTextBlock"
+                             Padding="{DynamicResource TimePickerHostPadding}"
+                             HorizontalAlignment="Center"
+                             FontFamily="{TemplateBinding FontFamily}"
+                             FontSize="{TemplateBinding FontSize}"
+                             FontWeight="{TemplateBinding FontWeight}" />
+                </Border>
 
-              <Rectangle Name="FirstColumnDivider"
-                  Fill="{DynamicResource ThemeControlMidHighBrush}"
-                  HorizontalAlignment="Center"
-                  Width="{DynamicResource TimePickerSpacerThemeWidth}"
-                  Grid.Column="1" />
+                <Rectangle Name="FirstColumnDivider"
+                           Grid.Column="1"
+                           Width="{DynamicResource TimePickerSpacerThemeWidth}"
+                           HorizontalAlignment="Center"
+                           Fill="{DynamicResource TimePickerSpacerFill}" />
 
-              <Border x:Name="SecondPickerHost" Grid.Column="2" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                <TextBlock x:Name="MinuteTextBlock"
-                    HorizontalAlignment="Center"
-                    Padding="{DynamicResource TimePickerHostPadding}"
-                    FontFamily="{TemplateBinding FontFamily}"
-                    FontWeight="{TemplateBinding FontWeight}"
-                    FontSize="{TemplateBinding FontSize}"/>
-              </Border>
+                <Border x:Name="SecondPickerHost"
+                        Grid.Column="2"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch">
+                  <TextBlock x:Name="MinuteTextBlock"
+                             Padding="{DynamicResource TimePickerHostPadding}"
+                             HorizontalAlignment="Center"
+                             FontFamily="{TemplateBinding FontFamily}"
+                             FontSize="{TemplateBinding FontSize}"
+                             FontWeight="{TemplateBinding FontWeight}" />
+                </Border>
 
-              <Rectangle Name="SecondColumnDivider"
-                  Fill="{DynamicResource ThemeControlMidHighBrush}"
-                  HorizontalAlignment="Center"
-                  Width="{DynamicResource TimePickerSpacerThemeWidth}"
-                  Grid.Column="3" />
+                <Rectangle Name="SecondColumnDivider"
+                           Grid.Column="3"
+                           Width="{DynamicResource TimePickerSpacerThemeWidth}"
+                           HorizontalAlignment="Center"
+                           Fill="{DynamicResource TimePickerSpacerFill}" />
 
-              <Border x:Name="ThirdPickerHost" Grid.Column="4" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                <TextBlock x:Name="PeriodTextBlock"
-                    HorizontalAlignment="Center"
-                    Padding="{DynamicResource TimePickerHostPadding}"
-                    FontFamily="{TemplateBinding FontFamily}"
-                    FontWeight="{TemplateBinding FontWeight}"
-                    FontSize="{TemplateBinding FontSize}" />
-              </Border>
-            </Grid>
-          </Button>
+                <Border x:Name="ThirdPickerHost"
+                        Grid.Column="4"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch">
+                  <TextBlock x:Name="PeriodTextBlock"
+                             Padding="{DynamicResource TimePickerHostPadding}"
+                             HorizontalAlignment="Center"
+                             FontFamily="{TemplateBinding FontFamily}"
+                             FontSize="{TemplateBinding FontSize}"
+                             FontWeight="{TemplateBinding FontWeight}" />
+                </Border>
+              </Grid>
+            </Button>
 
-          <Popup Name="Popup" WindowManagerAddShadowHint="False"
-                 StaysOpen="False" PlacementTarget="{TemplateBinding}"
-                 PlacementMode="Bottom">
-            <TimePickerPresenter Name="PickerPresenter" />
-          </Popup>
+            <Popup Name="Popup"
+                   IsLightDismissEnabled="True"
+                   PlacementMode="Bottom"
+                   PlacementTarget="{TemplateBinding}"
+                   WindowManagerAddShadowHint="False">
+              <TimePickerPresenter Name="PickerPresenter" />
+            </Popup>
 
-        </Grid>
+          </Grid>
+        </DataValidationErrors>
       </ControlTemplate>
     </Setter>
-  </Style>
-
-  <Style Selector="TimePicker:disabled /template/ ContentPresenter#HeaderContentPresenter">
-    <Setter Property="TextElement.Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
-  </Style>
-  <Style Selector="TimePicker:disabled /template/ Rectangle">
-    <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}"/>
-  </Style>
 
-  <Style Selector="TimePicker /template/ Button#FlyoutButton:pointerover /template/ ContentPresenter">
-    <!--<Setter Property="Background" Value="{DynamicResource TimePickerButtonBackgroundPointerOver}"/>-->
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeControlHighBrush}"/>
-    <Setter Property="TextElement.Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
-  </Style>
+    <Style Selector="^:disabled /template/ ContentPresenter#HeaderContentPresenter">
+      <Setter Property="TextElement.Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+    </Style>
 
-  <Style Selector="TimePicker /template/ Button:pressed /template/ ContentPresenter">
-    <Setter Property="Background">
-      <SolidColorBrush Color="{DynamicResource ThemeControlMidHighColor}" Opacity="0.6" />
-    </Setter>
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeControlLowBrush}"/>
-    <Setter Property="TextElement.Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
-  </Style>
+    <Style Selector="^:disabled /template/ Rectangle">
+      <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
+    </Style>
 
-  <Style Selector="TimePicker /template/ Button:disabled /template/ ContentPresenter">
-    <!--<Setter Property="Background" Value="{DynamicResource TimePickerButtonBackgroundDisabled}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource TimePickerButtonBorderBrushDisabled}"/>
-    <Setter Property="TextElement.Foreground" Value="{DynamicResource TimePickerButtonForegroundDisabled}"/>-->
-    <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
-  </Style>
+    <Style Selector="^:hasnotime /template/ Button#FlyoutButton TextBlock">
+      <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundLowBrush}" />
+    </Style>
+  </ControlTheme>
 
-  <Style Selector="TimePicker:hasnotime /template/ Button#FlyoutButton TextBlock">
-    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundLowBrush}"/>
-  </Style>
-
-  <Style Selector="TimePickerPresenter">
+  <ControlTheme x:Key="{x:Type TimePickerPresenter}"
+                TargetType="TimePickerPresenter">
     <Setter Property="Width" Value="242" />
     <Setter Property="MinWidth" Value="242" />
-    <Setter Property="MaxHeight" Value="398" />    
+    <Setter Property="MaxHeight" Value="398" />
     <Setter Property="FontWeight" Value="Normal" />
     <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
     <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
@@ -177,110 +206,124 @@
     <Setter Property="Template">
       <ControlTemplate>
         <Border Name="Background"
+                MaxHeight="398"
+                Padding="{DynamicResource DateTimeFlyoutBorderPadding}"
                 Background="{TemplateBinding Background}"
                 BorderBrush="{TemplateBinding BorderBrush}"
                 BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}"
-                Padding="{DynamicResource DateTimeFlyoutBorderPadding}"
-                MaxHeight="398">
-          <Grid Name="ContentPanel" RowDefinitions="*,Auto">
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <Grid Name="ContentPanel"
+                RowDefinitions="*,Auto">
             <Grid Name="PickerContainer">
-              <!--Ignore col defs here, set in code-->
-              <Panel Name="HourHost" Grid.Column="0">
+              <!--  Ignore col defs here, set in code  -->
+              <Panel Name="HourHost"
+                     Grid.Column="0">
                 <ScrollViewer HorizontalScrollBarVisibility="Disabled"
                               VerticalScrollBarVisibility="Hidden">
                   <DateTimePickerPanel Name="HourSelector"
-                                          PanelType="Hour"
-                                          ShouldLoop="True"
-                                          ItemHeight="{DynamicResource TimePickerFlyoutPresenterItemHeight}"/>
+                                       ItemHeight="{DynamicResource TimePickerFlyoutPresenterItemHeight}"
+                                       PanelType="Hour"
+                                       ShouldLoop="True" />
                 </ScrollViewer>
                 <RepeatButton Name="HourUpButton"
-                              Classes="DateTimeFlyoutButtonStyle UpButton"/>
+                              Theme="{StaticResource DefaultDateTimePickerUpButton}" />
                 <RepeatButton Name="HourDownButton"
-                              Classes="DateTimeFlyoutButtonStyle DownButton"/>
-
+                              Theme="{StaticResource DefaultDateTimePickerDownButton}" />
               </Panel>
 
-              <Panel Name="MinuteHost" Grid.Column="2">
+              <Panel Name="MinuteHost"
+                     Grid.Column="2">
                 <ScrollViewer HorizontalScrollBarVisibility="Disabled"
                               VerticalScrollBarVisibility="Hidden">
                   <DateTimePickerPanel Name="MinuteSelector"
-                                          PanelType="Minute"
-                                          ShouldLoop="True"
-                                          ItemHeight="{DynamicResource TimePickerFlyoutPresenterItemHeight}"/>
+                                       ItemHeight="{DynamicResource TimePickerFlyoutPresenterItemHeight}"
+                                       PanelType="Minute"
+                                       ShouldLoop="True" />
                 </ScrollViewer>
                 <RepeatButton Name="MinuteUpButton"
-                              Classes="DateTimeFlyoutButtonStyle UpButton"/>
+                              Theme="{StaticResource DefaultDateTimePickerUpButton}" />
                 <RepeatButton Name="MinuteDownButton"
-                              Classes="DateTimeFlyoutButtonStyle DownButton"/>
-
+                              Theme="{StaticResource DefaultDateTimePickerDownButton}" />
               </Panel>
 
-              <Panel Name="PeriodHost" Grid.Column="4">
+              <Panel Name="PeriodHost"
+                     Grid.Column="4">
                 <ScrollViewer HorizontalScrollBarVisibility="Disabled"
                               VerticalScrollBarVisibility="Hidden">
                   <DateTimePickerPanel Name="PeriodSelector"
-                                          PanelType="TimePeriod"
-                                          ShouldLoop="False"
-                                          ItemHeight="{DynamicResource TimePickerFlyoutPresenterItemHeight}"/>
+                                       ItemHeight="{DynamicResource TimePickerFlyoutPresenterItemHeight}"
+                                       PanelType="TimePeriod"
+                                       ShouldLoop="False" />
                 </ScrollViewer>
                 <RepeatButton Name="PeriodUpButton"
-                              Classes="DateTimeFlyoutButtonStyle UpButton"/>
+                              Theme="{StaticResource DefaultDateTimePickerUpButton}" />
                 <RepeatButton Name="PeriodDownButton"
-                              Classes="DateTimeFlyoutButtonStyle DownButton"/>
-
+                              Theme="{StaticResource DefaultDateTimePickerDownButton}" />
               </Panel>
 
-              <Rectangle x:Name="HighlightRect" ZIndex="-1"
-                      Fill="{DynamicResource TimePickerFlyoutPresenterHighlightFill}"
-                      Grid.Column="0"
-                      Grid.ColumnSpan="5"
-                      VerticalAlignment="Center"
-                      Height="{DynamicResource TimePickerFlyoutPresenterHighlightHeight}" />
-
+              <Rectangle x:Name="HighlightRect"
+                         Grid.Column="0"
+                         Grid.ColumnSpan="5"
+                         Height="{DynamicResource TimePickerFlyoutPresenterHighlightHeight}"
+                         VerticalAlignment="Center"
+                         ZIndex="-1">
+                <Rectangle.Fill>
+                  <SolidColorBrush Opacity="0.6"
+                                   Color="{DynamicResource ThemeAccentColor}" />
+                </Rectangle.Fill>
+              </Rectangle>
               <Rectangle Name="FirstSpacer"
-                  Fill="{DynamicResource ThemeControlMidHighBrush}"
-                  HorizontalAlignment="Center"
-                  Width="{DynamicResource TimePickerSpacerThemeWidth}"
-                  Grid.Column="1" />
-
+                         Grid.Column="1"
+                         Width="{DynamicResource TimePickerSpacerThemeWidth}"
+                         HorizontalAlignment="Center"
+                         Fill="{DynamicResource ThemeControlMidHighBrush}" />
               <Rectangle Name="SecondSpacer"
-                  Fill="{DynamicResource ThemeControlMidHighBrush}"
-                  HorizontalAlignment="Center"
-                  Width="{DynamicResource TimePickerSpacerThemeWidth}"
-                  Grid.Column="3" />
+                         Grid.Column="3"
+                         Width="{DynamicResource TimePickerSpacerThemeWidth}"
+                         HorizontalAlignment="Center"
+                         Fill="{DynamicResource ThemeControlMidHighBrush}" />
             </Grid>
 
-            <Grid Grid.Row="1" Height="{DynamicResource TimePickerFlyoutPresenterAcceptDismissHostGridHeight}"
-                  Name="AcceptDismissHostGrid" ColumnDefinitions="*,*">
-              <Rectangle Height="{DynamicResource TimePickerSpacerThemeWidth}"
-                      VerticalAlignment="Top"
-                      Fill="{DynamicResource ThemeControlMidHighBrush}"
-                      Grid.ColumnSpan="2" />
-              <Button Name="AcceptButton" Grid.Column="0" Classes="DateTimeFlyoutButtonStyle"
-                          HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                <Path Stroke="{Binding $parent[Button].Foreground}" StrokeLineCap="Round"
-                      StrokeThickness="0.75" Data="M0.5,8.5 5,13.5 15.5,3" />
+            <Grid Name="AcceptDismissGrid"
+                  Grid.Row="1"
+                  ColumnDefinitions="*,*">
+              <Rectangle Grid.ColumnSpan="2"
+                         Height="{DynamicResource TimePickerSpacerThemeWidth}"
+                         VerticalAlignment="Top"
+                         Fill="{DynamicResource ThemeControlMidHighBrush}" />
+              <Button Name="AcceptButton"
+                      Grid.Column="0"
+                      Height="{DynamicResource TimePickerFlyoutPresenterAcceptDismissHostGridHeight}"
+                      HorizontalAlignment="Stretch"
+                      VerticalAlignment="Stretch"
+                      Theme="{StaticResource DefaultDateTimePickerButton}">
+                <Path Data="M0.5,8.5 5,13.5 15.5,3"
+                      Stroke="{Binding $parent[Button].Foreground}"
+                      StrokeLineCap="Round"
+                      StrokeThickness="0.75" />
               </Button>
-              <Button Name="DismissButton" Grid.Column="1" Classes="DateTimeFlyoutButtonStyle"
-                         FontSize="16" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                <Path Stroke="{Binding $parent[Button].Foreground}" StrokeLineCap="Round"
-                      StrokeThickness="0.75" Data="M2,2 14,14 M2,14 14 2" />
+              <Button Name="DismissButton"
+                      Grid.Column="1"
+                      Height="{DynamicResource TimePickerFlyoutPresenterAcceptDismissHostGridHeight}"
+                      HorizontalAlignment="Stretch"
+                      VerticalAlignment="Stretch"
+                      FontSize="16"
+                      Theme="{StaticResource DefaultDateTimePickerButton}">
+                <Path Data="M2,2 14,14 M2,14 14 2"
+                      Stroke="{Binding $parent[Button].Foreground}"
+                      StrokeLineCap="Round"
+                      StrokeThickness="0.75" />
               </Button>
             </Grid>
-
           </Grid>
         </Border>
       </ControlTemplate>
     </Setter>
-  </Style>
-
-  <Style Selector="TimePickerPresenter /template/ Panel RepeatButton">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
 
-  <Style Selector="TimePickerPresenter /template/ Panel:pointerover RepeatButton">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
-  
-</Styles>
+    <Style Selector="^ /template/ Panel">
+      <Style Selector="^:pointerover RepeatButton">
+        <Setter Property="IsVisible" Value="True" />
+      </Style>
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/TitleBar.xaml b/src/Avalonia.Themes.Default/Controls/TitleBar.xaml
index 7f8ed24076..a06dfbb834 100644
--- a/src/Avalonia.Themes.Default/Controls/TitleBar.xaml
+++ b/src/Avalonia.Themes.Default/Controls/TitleBar.xaml
@@ -1,53 +1,65 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Design.PreviewWith>
     <Border>
-      <TitleBar Background="SkyBlue" Height="30" Width="300" Foreground="Black" />
+      <TitleBar Width="300"
+                Height="30"
+                Background="SkyBlue"
+                Foreground="Black" />
     </Border>
   </Design.PreviewWith>
-  <Style Selector="TitleBar">
-    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>    
+  <ControlTheme x:Key="{x:Type TitleBar}"
+                TargetType="TitleBar">
+    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
     <Setter Property="VerticalAlignment" Value="Top" />
     <Setter Property="HorizontalAlignment" Value="Stretch" />
     <Setter Property="Background" Value="Transparent" />
     <Setter Property="Template">
       <ControlTemplate>
-        <Panel HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="Stretch">
-          <Panel x:Name="PART_MouseTracker" Height="1" VerticalAlignment="Top" />
+        <Panel HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+               VerticalAlignment="Stretch">
+          <Panel x:Name="PART_MouseTracker"
+                 Height="1"
+                 VerticalAlignment="Top" />
           <Panel x:Name="PART_Container">
-            <Border x:Name="PART_Background" Background="{TemplateBinding Background}" />
-            <CaptionButtons x:Name="PART_CaptionButtons" VerticalAlignment="Top" HorizontalAlignment="Right" Foreground="{TemplateBinding Foreground}" />
+            <Border x:Name="PART_Background"
+                    Background="{TemplateBinding Background}" />
+            <CaptionButtons x:Name="PART_CaptionButtons"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Top"
+                            Foreground="{TemplateBinding Foreground}" />
           </Panel>
         </Panel>
       </ControlTemplate>
     </Setter>
-  </Style>
+    <Style Selector="^:fullscreen">
+      <Setter Property="Background" Value="{DynamicResource ThemeAccentColor}" />
+    </Style>
 
-  <Style Selector="TitleBar:fullscreen">
-    <Setter Property="Background" Value="{DynamicResource ThemeAccentColor}" />
-  </Style>
+    <Style Selector="^ /template/ Border#PART_Background">
+      <Setter Property="IsHitTestVisible" Value="False" />
+    </Style>
 
-  <Style Selector="TitleBar /template/ Border#PART_Background">
-    <Setter Property="IsHitTestVisible" Value="False" />
-  </Style>
+    <Style Selector="^:fullscreen /template/ Border#PART_Background">
+      <Setter Property="IsHitTestVisible" Value="True" />
+    </Style>
 
-  <Style Selector="TitleBar:fullscreen /template/ Border#PART_Background">
-    <Setter Property="IsHitTestVisible" Value="True" />
-  </Style>
+    <Style Selector="^:fullscreen /template/ Panel#PART_MouseTracker">
+      <Setter Property="Background" Value="Transparent" />
+    </Style>
 
-  <Style Selector="TitleBar:fullscreen /template/ Panel#PART_MouseTracker">
-    <Setter Property="Background" Value="Transparent" />
-  </Style>
-
-  <Style Selector="TitleBar:fullscreen /template/ Panel#PART_Container">
-    <Setter Property="RenderTransform" Value="translateY(-30px)" />
-    <Setter Property="Transitions">
-      <Transitions>
-        <TransformOperationsTransition Property="RenderTransform" Duration="0:0:.25" />
-      </Transitions>
-    </Setter>
-  </Style>
+    <Style Selector="^:fullscreen /template/ Panel#PART_Container">
+      <Setter Property="RenderTransform" Value="translateY(-30px)" />
+      <Setter Property="Transitions">
+        <Transitions>
+          <TransformOperationsTransition Property="RenderTransform"
+                                         Duration="0:0:.25" />
+        </Transitions>
+      </Setter>
+    </Style>
 
-  <Style Selector="TitleBar:fullscreen:pointerover /template/ Panel#PART_Container">
-    <Setter Property="RenderTransform" Value="none" />
-  </Style>
-</Styles>
+    <Style Selector="^:fullscreen:pointerover /template/ Panel#PART_Container">
+      <Setter Property="RenderTransform" Value="none" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/ToggleButton.xaml b/src/Avalonia.Themes.Default/Controls/ToggleButton.xaml
index 17fb2af16c..2cfbcf6b7a 100644
--- a/src/Avalonia.Themes.Default/Controls/ToggleButton.xaml
+++ b/src/Avalonia.Themes.Default/Controls/ToggleButton.xaml
@@ -1,40 +1,42 @@
-<Styles xmlns="https://github.com/avaloniaui">
-  <Style Selector="ToggleButton">
-    <Setter Property="Background" Value="{DynamicResource ThemeControlMidBrush}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderLowBrush}"/>
-    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}"/>
-    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
-    <Setter Property="Padding" Value="4"/>
-    <Setter Property="HorizontalContentAlignment" Value="Center"/>
-    <Setter Property="VerticalContentAlignment" Value="Center"/>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type ToggleButton}"
+                TargetType="ToggleButton">
+    <Setter Property="Background" Value="{DynamicResource ThemeControlMidBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderLowBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}" />
+    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+    <Setter Property="Padding" Value="4" />
+    <Setter Property="HorizontalContentAlignment" Value="Center" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
     <Setter Property="Template">
       <ControlTemplate>
         <ContentPresenter Name="PART_ContentPresenter"
+                          Padding="{TemplateBinding Padding}"
+                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                           Background="{TemplateBinding Background}"
                           BorderBrush="{TemplateBinding BorderBrush}"
                           BorderThickness="{TemplateBinding BorderThickness}"
-                          CornerRadius="{TemplateBinding CornerRadius}"
-                          ContentTemplate="{TemplateBinding ContentTemplate}"
                           Content="{TemplateBinding Content}"
-                          Padding="{TemplateBinding Padding}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
                           RecognizesAccessKey="True"
-                          TextElement.Foreground="{TemplateBinding Foreground}"
-                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                          TextElement.Foreground="{TemplateBinding Foreground}" />
       </ControlTemplate>
     </Setter>
-  </Style>
-  <Style Selector="ToggleButton:checked /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ThemeControlHighBrush}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
-  </Style>
-  <Style Selector="ToggleButton:pointerover /template/ ContentPresenter">
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
-  </Style>
-  <Style Selector="ToggleButton:pressed  /template/ ContentPresenter">
-    <Setter Property="Background" Value="{DynamicResource ThemeControlHighBrush}"/>
-  </Style>
-  <Style Selector="ToggleButton:disabled">
-    <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}"/>
-  </Style>
-</Styles>
+    <Style Selector="^:checked /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ThemeControlHighBrush}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
+    </Style>
+    <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
+    </Style>
+    <Style Selector="^:pressed  /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ThemeControlHighBrush}" />
+    </Style>
+    <Style Selector="^:disabled">
+      <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/ToggleSwitch.xaml b/src/Avalonia.Themes.Default/Controls/ToggleSwitch.xaml
index 2c831cf360..d00358951a 100644
--- a/src/Avalonia.Themes.Default/Controls/ToggleSwitch.xaml
+++ b/src/Avalonia.Themes.Default/Controls/ToggleSwitch.xaml
@@ -1,69 +1,28 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:sys="clr-namespace:System;assembly=netstandard">
-  <Styles.Resources>
-    <Thickness x:Key="ToggleSwitchTopHeaderMargin">0,0,0,6</Thickness>
-    <GridLength x:Key="ToggleSwitchPreContentMargin">6</GridLength>
-    <GridLength x:Key="ToggleSwitchPostContentMargin">6</GridLength>
-    <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}" />
-  </Styles.Resources>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Design.PreviewWith>
-    <StackPanel Margin="20" Width="250" Spacing="24" >
-      <StackPanel Spacing="12" >
+    <StackPanel Margin="20" Width="250" Spacing="24">
+      <StackPanel Spacing="12">
         <TextBlock
           Text="Automatic updates"
-          Classes="h1"/>
+          Classes="h1" />
         <TextBlock
           Text="Updates will be automaticly Downloaded and installed shile the computer is shutting down or restarting"
-          TextWrapping="Wrap"/>
+          TextWrapping="Wrap" />
         <ToggleSwitch HorizontalContentAlignment="Left"
-          Content="Enable automatic Updates?"
-          OffContent="Uit"
-          OnContent="Aan"
-          VerticalAlignment="Bottom"/>
+                      Content="Enable automatic Updates?"
+                      OffContent="Uit"
+                      OnContent="Aan"
+                      VerticalAlignment="Bottom" />
       </StackPanel>
 
       <StackPanel Spacing="12">
         <TextBlock
           Text="Previewer"
-          Classes="h1"/>
+          Classes="h1" />
         <TextBlock
           Text="The previewer Shows a preview off your code, this could slow down your system"
-          TextWrapping="Wrap"/>
+          TextWrapping="Wrap" />
         <ToggleSwitch
           Content="Previewer"
           IsChecked="True" />
@@ -71,29 +30,71 @@
     </StackPanel>
   </Design.PreviewWith>
 
-  <Style Selector="ToggleSwitch">
+  <Thickness x:Key="ToggleSwitchTopHeaderMargin">0,0,0,6</Thickness>
+  <GridLength x:Key="ToggleSwitchPreContentMargin">6</GridLength>
+  <GridLength x:Key="ToggleSwitchPostContentMargin">6</GridLength>
+  <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="HorizontalAlignment" Value="Left" />
     <Setter Property="VerticalAlignment" Value="Center" />
     <Setter Property="HorizontalContentAlignment" Value="Left" />
     <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+    <Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}" />
     <Setter Property="Template">
       <ControlTemplate>
         <Grid Background="{TemplateBinding Background}"
-          RowDefinitions="Auto,*">
+              RowDefinitions="Auto,*">
 
           <ContentPresenter x:Name="PART_ContentPresenter"
-            Grid.Row="0"
-            Content="{TemplateBinding Content}"
-            ContentTemplate="{TemplateBinding ContentTemplate}"
-            RecognizesAccessKey="True"
-            VerticalAlignment="Top"/>
+                            Grid.Row="0"
+                            Margin="{DynamicResource ToggleSwitchTopHeaderMargin}"
+                            Content="{TemplateBinding Content}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            RecognizesAccessKey="True"
+                            VerticalAlignment="Top" />
 
           <Grid Grid.Row="1"
-            MinWidth="{StaticResource ToggleSwitchThemeMinWidth}"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top">
+                MinWidth="{StaticResource ToggleSwitchThemeMinWidth}"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Top">
 
             <Grid.RowDefinitions>
               <RowDefinition Height="{DynamicResource ToggleSwitchPreContentMargin}" />
@@ -108,52 +109,64 @@
             </Grid.ColumnDefinitions>
 
             <Grid x:Name="SwitchAreaGrid"
-              Grid.RowSpan="3"
-              Grid.ColumnSpan="3"
-              TemplatedControl.IsTemplateFocusTarget="True"
-              Margin="0,5" />
+                  Grid.RowSpan="3"
+                  Grid.ColumnSpan="3"
+                  Background="{DynamicResource ToggleSwitchContainerBackground}"
+                  TemplatedControl.IsTemplateFocusTarget="True"
+                  Margin="0,5" />
 
             <ContentPresenter x:Name="PART_OffContentPresenter"
-              Grid.RowSpan="3"
-              Grid.Column="2"
-              Content="{TemplateBinding OffContent}"
-              ContentTemplate="{TemplateBinding OffContentTemplate}"
-              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                              Grid.RowSpan="3"
+                              Grid.Column="2"
+                              Content="{TemplateBinding OffContent}"
+                              ContentTemplate="{TemplateBinding OffContentTemplate}"
+                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
 
             <ContentPresenter x:Name="PART_OnContentPresenter"
-              Grid.RowSpan="3"
-              Grid.Column="2"
-              Content="{TemplateBinding OnContent}"
-              ContentTemplate="{TemplateBinding OnContentTemplate}"
-              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                              Grid.RowSpan="3"
+                              Grid.Column="2"
+                              Content="{TemplateBinding OnContent}"
+                              ContentTemplate="{TemplateBinding OnContentTemplate}"
+                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
 
             <Border x:Name="OuterBorder"
-              Grid.Row="1"
-              Height="20"
-              Width="40"
-              CornerRadius="10"
-              BorderThickness="{DynamicResource ToggleSwitchOuterBorderStrokeThickness}" />
+                    Grid.Row="1"
+                    Height="20"
+                    Width="40"
+                    CornerRadius="10"
+                    Background="{DynamicResource ToggleSwitchFillOff}"
+                    BorderBrush="{DynamicResource ToggleSwitchStrokeOff}"
+                    BorderThickness="{DynamicResource ToggleSwitchOuterBorderStrokeThickness}" />
 
             <Border x:Name="SwitchKnobBounds"
-              Grid.Row="1"
-              Height="20"
-              Width="40"
-              CornerRadius="10"
-              BorderThickness="{DynamicResource ToggleSwitchOnStrokeThickness}"/>
+                    Grid.Row="1"
+                    Height="20"
+                    Width="40"
+                    CornerRadius="10"
+                    Background="{DynamicResource ToggleSwitchFillOn}"
+                    BorderBrush="{DynamicResource ToggleSwitchStrokeOn}"
+                    BorderThickness="{DynamicResource ToggleSwitchOnStrokeThickness}" />
 
             <Canvas x:Name="SwitchKnob" Grid.Row="1"
-               HorizontalAlignment="Left"
-               Width="20" Height="20">
+                    HorizontalAlignment="Left"
+                    Width="20" Height="20">
 
               <Grid x:Name="MovingKnobs"
-                Width="20" Height="20">
+                    Width="20" Height="20">
+                <Grid.Transitions>
+                  <Transitions>
+                    <DoubleTransition Property="Canvas.Left" Duration="0:0:0.2" Easing="CubicEaseOut" />
+                  </Transitions>
+                </Grid.Transitions>
 
                 <Ellipse x:Name="SwitchKnobOn"
+                         Fill="{DynamicResource ToggleSwitchKnobFillOn}"
                          Width="10" Height="10" />
 
                 <Ellipse x:Name="SwitchKnobOff"
+                         Fill="{DynamicResource ToggleSwitchKnobFillOff}"
                          Width="10" Height="10" />
               </Grid>
             </Canvas>
@@ -161,162 +174,128 @@
         </Grid>
       </ControlTemplate>
     </Setter>
-  </Style>
-
-  <Style Selector="ToggleSwitch /template/ ContentPresenter#PART_ContentPresenter">
-    <Setter Property="Margin" Value="{DynamicResource ToggleSwitchTopHeaderMargin}" />
-  </Style>
-  <Style Selector="ToggleSwitch /template/ ContentPresenter#PART_ContentPresenter:empty">
-    <Setter Property="Margin" Value="0" />
-  </Style>
-
-  <!-- NormalState -->
-  <Style Selector="ToggleSwitch /template/ Grid#SwitchAreaGrid">
-    <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerBackground}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch /template/ Border#OuterBorder">
-    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOff}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOff}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch /template/ Border#SwitchKnobBounds">
-    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOn}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOn}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch /template/ Ellipse#SwitchKnobOn">
-    <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOn}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch /template/ Ellipse#SwitchKnobOff">
-    <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOff}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch /template/ Grid#MovingKnobs">
-    <Setter Property="Transitions">
-      <Transitions>
-        <DoubleTransition Property="Canvas.Left" Duration="0:0:0.2" Easing="CubicEaseOut"/>
-      </Transitions>
-    </Setter>
-  </Style>
-
-  <!-- PointerOverState -->
-  <Style Selector="ToggleSwitch:pointerover /template/ Border#OuterBorder">
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOffPointerOver}"/>
-    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOffPointerOver}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:pointerover /template/ Ellipse#SwitchKnobOff">
-    <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOffPointerOver}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:pointerover /template/ Ellipse#SwitchKnobOn">
-    <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOnPointerOver}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:pointerover /template/ Border#SwitchKnobBounds">
-    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOnPointerOver}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOnPointerOver}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:pointerover /template/ Grid#SwitchAreaGrid">
-    <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerBackgroundPointerOver}"/>
-  </Style>
-
-  <!-- PressedState -->
-  <Style Selector="ToggleSwitch:pressed /template/ Border#OuterBorder">
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOffPressed}"/>
-    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOffPressed}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:pressed /template/ Border#SwitchKnobBounds">
-    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOnPressed}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOnPressed}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:pressed /template/ Ellipse#SwitchKnobOff">
-    <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOffPressed}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:pressed /template/ Ellipse#SwitchKnobOn">
-    <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOnPressed}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:pressed /template/ Grid#SwitchAreaGrid">
-    <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerBackgroundPressed}"/>
-  </Style>
-
-  <!-- DisabledState -->
-  <Style Selector="ToggleSwitch:disabled">
-    <Setter Property="Foreground" Value="{DynamicResource ToggleSwitchHeaderForegroundDisabled}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:disabled /template/ Border#OuterBorder">
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOffDisabled}"/>
-    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOffDisabled}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:disabled /template/ Ellipse#SwitchKnobOff">
-    <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOffDisabled}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:disabled /template/ Ellipse#SwitchKnobOn">
-    <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOnDisabled}"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:disabled /template/ Border#SwitchKnobBounds">
-    <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOnDisabled}"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOnDisabled}"/>
-  </Style>
-
-  <!-- CheckedState -->
-  <Style Selector="ToggleSwitch:checked /template/ Border#OuterBorder">
-    <Setter Property="Opacity" Value="0"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:checked  /template/ Ellipse#SwitchKnobOff">
-    <Setter Property="Opacity" Value="0"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:checked  /template/ Border#SwitchKnobBounds">
-    <Setter Property="Opacity" Value="1"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:checked /template/ Ellipse#SwitchKnobOn">
-    <Setter Property="Opacity" Value="1"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:checked /template/ ContentPresenter#PART_OffContentPresenter">
-    <Setter Property="Opacity" Value="0"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:checked /template/ ContentPresenter#PART_OnContentPresenter">
-    <Setter Property="Opacity" Value="1"/>
-  </Style>
-
-  <!--UncheckedState -->
-  <Style Selector="ToggleSwitch:unchecked /template/ Border#OuterBorder">
-    <Setter Property="Opacity" Value="1"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:unchecked /template/ Ellipse#SwitchKnobOff">
-    <Setter Property="Opacity" Value="1"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:unchecked /template/ Ellipse#SwitchKnobOn">
-    <Setter Property="Opacity" Value="0"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:unchecked  /template/ Border#SwitchKnobBounds">
-    <Setter Property="Opacity" Value="0"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:unchecked /template/ ContentPresenter#PART_OffContentPresenter">
-    <Setter Property="Opacity" Value="1"/>
-  </Style>
-
-  <Style Selector="ToggleSwitch:unchecked /template/ ContentPresenter#PART_OnContentPresenter">
-    <Setter Property="Opacity" Value="0"/>
-  </Style>
-</Styles>
+
+    <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter:empty">
+      <Setter Property="Margin" Value="0" />
+    </Style>
+
+    <!-- PointerOverState -->
+    <Style Selector="^:pointerover /template/ Border#OuterBorder">
+      <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOffPointerOver}" />
+      <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOffPointerOver}" />
+    </Style>
+
+    <Style Selector="^:pointerover /template/ Ellipse#SwitchKnobOff">
+      <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOffPointerOver}" />
+    </Style>
+
+    <Style Selector="^:pointerover /template/ Ellipse#SwitchKnobOn">
+      <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOnPointerOver}" />
+    </Style>
+
+    <Style Selector="^:pointerover /template/ Border#SwitchKnobBounds">
+      <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOnPointerOver}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOnPointerOver}" />
+    </Style>
+
+    <Style Selector="^:pointerover /template/ Grid#SwitchAreaGrid">
+      <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerBackgroundPointerOver}" />
+    </Style>
+
+    <!-- PressedState -->
+    <Style Selector="^:pressed /template/ Border#OuterBorder">
+      <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOffPressed}" />
+      <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOffPressed}" />
+    </Style>
+
+    <Style Selector="^:pressed /template/ Border#SwitchKnobBounds">
+      <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOnPressed}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOnPressed}" />
+    </Style>
+
+    <Style Selector="^:pressed /template/ Ellipse#SwitchKnobOff">
+      <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOffPressed}" />
+    </Style>
+
+    <Style Selector="^:pressed /template/ Ellipse#SwitchKnobOn">
+      <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOnPressed}" />
+    </Style>
+
+    <Style Selector="^:pressed /template/ Grid#SwitchAreaGrid">
+      <Setter Property="Background" Value="{DynamicResource ToggleSwitchContainerBackgroundPressed}" />
+    </Style>
+
+    <!-- DisabledState -->
+    <Style Selector="^:disabled">
+      <Setter Property="Foreground" Value="{DynamicResource ToggleSwitchHeaderForegroundDisabled}" />
+    </Style>
+
+    <Style Selector="^:disabled /template/ Border#OuterBorder">
+      <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOffDisabled}" />
+      <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOffDisabled}" />
+    </Style>
+
+    <Style Selector="^:disabled /template/ Ellipse#SwitchKnobOff">
+      <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOffDisabled}" />
+    </Style>
+
+    <Style Selector="^:disabled /template/ Ellipse#SwitchKnobOn">
+      <Setter Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOnDisabled}" />
+    </Style>
+
+    <Style Selector="^:disabled /template/ Border#SwitchKnobBounds">
+      <Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOnDisabled}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOnDisabled}" />
+    </Style>
+
+    <!-- CheckedState -->
+    <Style Selector="^:checked /template/ Border#OuterBorder">
+      <Setter Property="Opacity" Value="0" />
+    </Style>
+
+    <Style Selector="^:checked  /template/ Ellipse#SwitchKnobOff">
+      <Setter Property="Opacity" Value="0" />
+    </Style>
+
+    <Style Selector="^:checked  /template/ Border#SwitchKnobBounds">
+      <Setter Property="Opacity" Value="1" />
+    </Style>
+
+    <Style Selector="^:checked /template/ Ellipse#SwitchKnobOn">
+      <Setter Property="Opacity" Value="1" />
+    </Style>
+
+    <Style Selector="^:checked /template/ ContentPresenter#PART_OffContentPresenter">
+      <Setter Property="Opacity" Value="0" />
+    </Style>
+
+    <Style Selector="^:checked /template/ ContentPresenter#PART_OnContentPresenter">
+      <Setter Property="Opacity" Value="1" />
+    </Style>
+
+    <!--UncheckedState -->
+    <Style Selector="^:unchecked /template/ Border#OuterBorder">
+      <Setter Property="Opacity" Value="1" />
+    </Style>
+
+    <Style Selector="^:unchecked /template/ Ellipse#SwitchKnobOff">
+      <Setter Property="Opacity" Value="1" />
+    </Style>
+
+    <Style Selector="^:unchecked /template/ Ellipse#SwitchKnobOn">
+      <Setter Property="Opacity" Value="0" />
+    </Style>
+
+    <Style Selector="^:unchecked  /template/ Border#SwitchKnobBounds">
+      <Setter Property="Opacity" Value="0" />
+    </Style>
+
+    <Style Selector="^:unchecked /template/ ContentPresenter#PART_OffContentPresenter">
+      <Setter Property="Opacity" Value="1" />
+    </Style>
+
+    <Style Selector="^:unchecked /template/ ContentPresenter#PART_OnContentPresenter">
+      <Setter Property="Opacity" Value="0" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/ToolTip.xaml b/src/Avalonia.Themes.Default/Controls/ToolTip.xaml
index 35c1dceb8d..c4fddd8c4c 100644
--- a/src/Avalonia.Themes.Default/Controls/ToolTip.xaml
+++ b/src/Avalonia.Themes.Default/Controls/ToolTip.xaml
@@ -1,18 +1,22 @@
-<Style xmlns="https://github.com/avaloniaui" Selector="ToolTip">
-  <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>
-  <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
-  <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}"/>
-  <Setter Property="Padding" Value="4,2"/>
-  <Setter Property="Template">
-    <ControlTemplate>
-      <ContentPresenter Name="PART_ContentPresenter"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="{TemplateBinding CornerRadius}"
-                        ContentTemplate="{TemplateBinding ContentTemplate}"
-                        Content="{TemplateBinding Content}" 
-                        Padding="{TemplateBinding Padding}"/>
-    </ControlTemplate>
-  </Setter>
-</Style>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type ToolTip}"
+                TargetType="ToolTip">
+    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}" />
+    <Setter Property="Padding" Value="4,2" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ContentPresenter Name="PART_ContentPresenter"
+                          Padding="{TemplateBinding Padding}"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          Content="{TemplateBinding Content}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          CornerRadius="{TemplateBinding CornerRadius}" />
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/TransitioningContentControl.xaml b/src/Avalonia.Themes.Default/Controls/TransitioningContentControl.xaml
index 6a4d56ccb7..63185e11e6 100644
--- a/src/Avalonia.Themes.Default/Controls/TransitioningContentControl.xaml
+++ b/src/Avalonia.Themes.Default/Controls/TransitioningContentControl.xaml
@@ -1,20 +1,21 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Style Selector="TransitioningContentControl">
-    <!-- Set Defaults -->
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type TransitioningContentControl}"
+                TargetType="TransitioningContentControl">
+    <!--  Set Defaults  -->
     <Setter Property="Template">
       <ControlTemplate>
         <ContentPresenter Name="PART_ContentPresenter"
+                          Padding="{TemplateBinding Padding}"
+                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                           Background="{TemplateBinding Background}"
                           BorderBrush="{TemplateBinding BorderBrush}"
                           BorderThickness="{TemplateBinding BorderThickness}"
-                          CornerRadius="{TemplateBinding CornerRadius}"
-                          ContentTemplate="{TemplateBinding ContentTemplate}"
                           Content="{TemplateBinding CurrentContent}"
-                          Padding="{TemplateBinding Padding}"
-                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"/>
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          CornerRadius="{TemplateBinding CornerRadius}" />
       </ControlTemplate>
     </Setter>
-  </Style>
-</Styles>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/TreeView.xaml b/src/Avalonia.Themes.Default/Controls/TreeView.xaml
index 67a683dad9..2bc38a0673 100644
--- a/src/Avalonia.Themes.Default/Controls/TreeView.xaml
+++ b/src/Avalonia.Themes.Default/Controls/TreeView.xaml
@@ -1,27 +1,31 @@
-<Style xmlns="https://github.com/avaloniaui" Selector="TreeView">
-  <Setter Property="Background" Value="Transparent"/>
-  <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
-  <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}"/>
-  <Setter Property="Padding" Value="4"/>
-  <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
-  <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
-  <Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
-  <Setter Property="Template">
-    <ControlTemplate>
-      <Border BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}"
-              CornerRadius="{TemplateBinding CornerRadius}">
-        <ScrollViewer Background="{TemplateBinding Background}"
-                      HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
-                      VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}"
-                      IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
-                      AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}">
-          <ItemsPresenter Name="PART_ItemsPresenter"
-                          Items="{TemplateBinding Items}"
-                          ItemsPanel="{TemplateBinding ItemsPanel}"
-                          Margin="{TemplateBinding Padding}"/>
-        </ScrollViewer>
-      </Border>
-    </ControlTemplate>
-  </Setter>
-</Style>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type TreeView}"
+                TargetType="TreeView">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}" />
+    <Setter Property="Padding" Value="4" />
+    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+    <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+    <Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <ScrollViewer AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}"
+                        Background="{TemplateBinding Background}"
+                        HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
+                        IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
+                        VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
+            <ItemsPresenter Name="PART_ItemsPresenter"
+                            Margin="{TemplateBinding Padding}"
+                            Items="{TemplateBinding Items}"
+                            ItemsPanel="{TemplateBinding ItemsPanel}" />
+          </ScrollViewer>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/TreeViewItem.xaml b/src/Avalonia.Themes.Default/Controls/TreeViewItem.xaml
index 1996756001..7baf0ef2a6 100644
--- a/src/Avalonia.Themes.Default/Controls/TreeViewItem.xaml
+++ b/src/Avalonia.Themes.Default/Controls/TreeViewItem.xaml
@@ -1,93 +1,100 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:converters="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls">
-    <Style Selector="TreeViewItem">
-        <Style.Resources>
-            <converters:MarginMultiplierConverter Indent="16" Left="True" x:Key="LeftMarginConverter" />
-        </Style.Resources>
-        <Setter Property="Padding" Value="2"/>
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="Template">
-            <ControlTemplate>
-                <StackPanel>
-                    <Border Name="SelectionBorder"
-                            Focusable="True"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding CornerRadius}"
-                            TemplatedControl.IsTemplateFocusTarget="True">
-                        <Grid Name="PART_Header"
-                              ColumnDefinitions="16, *"
-                              Margin="{TemplateBinding Level, Mode=OneWay, Converter={StaticResource LeftMarginConverter}}" >
-                            <ToggleButton Name="expander"
-                                          Focusable="False"
-                                          IsChecked="{TemplateBinding IsExpanded, Mode=TwoWay}"/>
-                            <ContentPresenter Name="PART_HeaderPresenter"
-                                              Focusable="False"
-                                              Content="{TemplateBinding Header}"
-                                              HorizontalContentAlignment="{TemplateBinding HorizontalAlignment}"
-                                              Padding="{TemplateBinding Padding}"
-                                              Grid.Column="1"/>
-                        </Grid>
-                    </Border>
-                    <ItemsPresenter Name="PART_ItemsPresenter"
-                                    IsVisible="{TemplateBinding IsExpanded}"
-                                    Items="{TemplateBinding Items}"
-                                    ItemsPanel="{TemplateBinding ItemsPanel}"/>
-                </StackPanel>
-            </ControlTemplate>
-        </Setter>
-    </Style>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:converters="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls">
+  <converters:MarginMultiplierConverter x:Key="LeftMarginConverter"
+                                        Indent="16"
+                                        Left="True" />
 
-    <Style Selector="TreeViewItem /template/ ToggleButton#expander">
-        <Setter Property="Template">
-            <ControlTemplate>
-                <Border Background="Transparent"
-                        Width="14"
-                        Height="12"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center">
-                    <Path Fill="{DynamicResource ThemeForegroundBrush}"
-                          HorizontalAlignment="Center"
-                          VerticalAlignment="Center"
-                          Data="M 0 2 L 4 6 L 0 10 Z"/>
-                </Border>
-            </ControlTemplate>
-        </Setter>
-    </Style>
+  <ControlTheme x:Key="DefaultTreeViewItemToggleButtonTheme"
+                TargetType="ToggleButton">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Width="14"
+                Height="12"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Background="Transparent">
+          <Path HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Data="M 0 2 L 4 6 L 0 10 Z"
+                Fill="{DynamicResource ThemeForegroundBrush}" />
+        </Border>
+      </ControlTemplate>
+    </Setter>
 
-    <Style Selector="TreeViewItem /template/ ContentPresenter#PART_HeaderPresenter">
-        <Setter Property="Padding" Value="2"/>
+    <Style Selector="^:checked">
+      <Setter Property="RenderTransform">
+        <RotateTransform Angle="45" />
+      </Setter>
     </Style>
+  </ControlTheme>
+
+  <ControlTheme x:Key="{x:Type TreeViewItem}"
+                TargetType="TreeViewItem">
+    <Setter Property="Padding" Value="2" />
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <StackPanel>
+          <Border Name="SelectionBorder"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}"
+                  Focusable="True"
+                  TemplatedControl.IsTemplateFocusTarget="True">
+            <Grid Name="PART_Header"
+                  Margin="{TemplateBinding Level,
+                                           Mode=OneWay,
+                                           Converter={StaticResource LeftMarginConverter}}"
+                  ColumnDefinitions="16, *">
+              <ToggleButton Name="PART_ExpandCollapseChevron"
+                            Focusable="False"
+                            IsChecked="{TemplateBinding IsExpanded,
+                                                        Mode=TwoWay}"
+                            Theme="{StaticResource DefaultTreeViewItemToggleButtonTheme}" />
+              <ContentPresenter Name="PART_HeaderPresenter"
+                                Grid.Column="1"
+                                Padding="{TemplateBinding Padding}"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalAlignment}"
+                                Content="{TemplateBinding Header}"
+                                Focusable="False" />
+            </Grid>
+          </Border>
+          <ItemsPresenter Name="PART_ItemsPresenter"
+                          IsVisible="{TemplateBinding IsExpanded}"
+                          Items="{TemplateBinding Items}"
+                          ItemsPanel="{TemplateBinding ItemsPanel}" />
+        </StackPanel>
+      </ControlTemplate>
+    </Setter>
 
-    <Style Selector="TreeViewItem /template/ Border#SelectionBorder:pointerover">
-        <Setter Property="Background" Value="{DynamicResource ThemeControlHighlightMidBrush}"/>
+    <Style Selector="^ /template/ ContentPresenter#PART_HeaderPresenter">
+      <Setter Property="Padding" Value="2" />
     </Style>
 
-    <Style Selector="TreeViewItem:selected /template/ Border#SelectionBorder">
-        <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush4}"/>
+    <Style Selector="^ /template/ Border#SelectionBorder:pointerover">
+      <Setter Property="Background" Value="{DynamicResource ThemeControlHighlightMidBrush}" />
     </Style>
 
-    <Style Selector="TreeViewItem:selected /template/ Border#SelectionBorder:focus">
-        <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush3}"/>
+    <Style Selector="^:selected /template/ Border#SelectionBorder">
+      <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush4}" />
     </Style>
 
-    <Style Selector="TreeViewItem:selected /template/ Border#SelectionBorder:pointerover">
-        <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush3}"/>
+    <Style Selector="^:selected /template/ Border#SelectionBorder:focus">
+      <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush3}" />
     </Style>
 
-    <Style Selector="TreeViewItem:selected /template/ Border#SelectionBorder:pointerover:focus">
-        <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush2}"/>
+    <Style Selector="^:selected /template/ Border#SelectionBorder:pointerover">
+      <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush3}" />
     </Style>
 
-    <Style Selector="TreeViewItem /template/ ToggleButton#expander:checked">
-        <Setter Property="RenderTransform">
-            <RotateTransform Angle="45"/>
-        </Setter>
+    <Style Selector="^:selected /template/ Border#SelectionBorder:pointerover:focus">
+      <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush2}" />
     </Style>
 
-    <Style Selector="TreeViewItem:empty /template/ ToggleButton#expander">
-        <Setter Property="IsVisible" Value="False"/>
+    <Style Selector="^:empty /template/ ToggleButton#PART_ExpandCollapseChevron">
+      <Setter Property="IsVisible" Value="False" />
     </Style>
-</Styles>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/UserControl.xaml b/src/Avalonia.Themes.Default/Controls/UserControl.xaml
index d6028daff8..56248f8c5f 100644
--- a/src/Avalonia.Themes.Default/Controls/UserControl.xaml
+++ b/src/Avalonia.Themes.Default/Controls/UserControl.xaml
@@ -1,16 +1,25 @@
-<Style xmlns="https://github.com/avaloniaui" Selector=":is(UserControl)">
-  <Setter Property="Template">
-    <ControlTemplate>
-      <ContentPresenter Name="PART_ContentPresenter"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="{TemplateBinding CornerRadius}"
-                        ContentTemplate="{TemplateBinding ContentTemplate}"
-                        Content="{TemplateBinding Content}"
-                        Padding="{TemplateBinding Padding}"
-                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"/>
-    </ControlTemplate>
-  </Setter>
+<Style xmlns="https://github.com/avaloniaui"
+       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+       Selector=":is(UserControl)">
+  <Style.Resources>
+    <ControlTheme x:Key="DefaultUserControl"
+                  TargetType="UserControl">
+      <Setter Property="Template">
+        <ControlTemplate>
+          <ContentPresenter Name="PART_ContentPresenter"
+                            Padding="{TemplateBinding Padding}"
+                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Content="{TemplateBinding Content}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            CornerRadius="{TemplateBinding CornerRadius}" />
+        </ControlTemplate>
+      </Setter>
+    </ControlTheme>
+  </Style.Resources>
+
+  <Setter Property="Theme" Value="{StaticResource DefaultUserControl}" />
 </Style>
diff --git a/src/Avalonia.Themes.Default/Controls/Window.xaml b/src/Avalonia.Themes.Default/Controls/Window.xaml
index 9c515ebe30..00b108343e 100644
--- a/src/Avalonia.Themes.Default/Controls/Window.xaml
+++ b/src/Avalonia.Themes.Default/Controls/Window.xaml
@@ -1,26 +1,33 @@
-<Style xmlns="https://github.com/avaloniaui" Selector="Window">
-  <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>  
-  <Setter Property="TransparencyBackgroundFallback" Value="{DynamicResource HighlightForegroundColor}" />
-  <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
-  <Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}"/>  
-  <Setter Property="Template">
-    <ControlTemplate>
-      <Panel>
-        <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
-        <Border Background="{TemplateBinding Background}" IsHitTestVisible="False" />
-        <Panel Background="Transparent" Margin="{TemplateBinding WindowDecorationMargin}" />
-        <VisualLayerManager>
-          <VisualLayerManager.ChromeOverlayLayer>
-            <TitleBar />
-          </VisualLayerManager.ChromeOverlayLayer>
-          <ContentPresenter Name="PART_ContentPresenter"
-                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                            Content="{TemplateBinding Content}"
-                            Margin="{TemplateBinding Padding}"
-                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
-        </VisualLayerManager>
-      </Panel>
-    </ControlTemplate>
-  </Setter>
-</Style>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type Window}"
+                TargetType="Window">
+    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
+    <Setter Property="TransparencyBackgroundFallback" Value="{DynamicResource HighlightForegroundColor}" />
+    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+    <Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Panel>
+          <Border Name="PART_TransparencyFallback"
+                  IsHitTestVisible="False" />
+          <Border Background="{TemplateBinding Background}"
+                  IsHitTestVisible="False" />
+          <Panel Margin="{TemplateBinding WindowDecorationMargin}"
+                 Background="Transparent" />
+          <VisualLayerManager>
+            <VisualLayerManager.ChromeOverlayLayer>
+              <TitleBar />
+            </VisualLayerManager.ChromeOverlayLayer>
+            <ContentPresenter Name="PART_ContentPresenter"
+                              Margin="{TemplateBinding Padding}"
+                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                              Content="{TemplateBinding Content}"
+                              ContentTemplate="{TemplateBinding ContentTemplate}" />
+          </VisualLayerManager>
+        </Panel>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/Controls/WindowNotificationManager.xaml b/src/Avalonia.Themes.Default/Controls/WindowNotificationManager.xaml
index 7c1efa2e82..6dacf63be5 100644
--- a/src/Avalonia.Themes.Default/Controls/WindowNotificationManager.xaml
+++ b/src/Avalonia.Themes.Default/Controls/WindowNotificationManager.xaml
@@ -1,45 +1,52 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Style Selector="WindowNotificationManager">
-        <Setter Property="Margin" Value="0 0 8 8"/>
-        <Setter Property="Template">
-            <ControlTemplate>
-                <ReversibleStackPanel Name="PART_Items">
-                    <ReversibleStackPanel.DataTemplates>
-                        <DataTemplate DataType="INotification">
-                            <StackPanel Spacing="8" Margin="12">
-                                <TextBlock Text="{Binding Title}" FontWeight="Medium" />
-                                <TextBlock MaxHeight="80" Text="{Binding Message}" TextWrapping="Wrap" Margin="0,0,12,0"/>
-                            </StackPanel>
-                        </DataTemplate>
-                        <DataTemplate DataType="x:String">
-                            <TextBlock Text="{Binding }" Margin="12" />
-                        </DataTemplate>
-                    </ReversibleStackPanel.DataTemplates>
-                </ReversibleStackPanel>
-            </ControlTemplate>
-        </Setter>
-    </Style>
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type WindowNotificationManager}"
+                TargetType="WindowNotificationManager">
+    <Setter Property="Margin" Value="0 0 8 8" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ReversibleStackPanel Name="PART_Items">
+          <ReversibleStackPanel.DataTemplates>
+            <DataTemplate DataType="INotification">
+              <StackPanel Margin="12"
+                          Spacing="8">
+                <TextBlock FontWeight="Medium"
+                           Text="{Binding Title}" />
+                <TextBlock MaxHeight="80"
+                           Margin="0,0,12,0"
+                           Text="{Binding Message}"
+                           TextWrapping="Wrap" />
+              </StackPanel>
+            </DataTemplate>
+            <DataTemplate DataType="x:String">
+              <TextBlock Margin="12"
+                         Text="{Binding}" />
+            </DataTemplate>
+          </ReversibleStackPanel.DataTemplates>
+        </ReversibleStackPanel>
+      </ControlTemplate>
+    </Setter>
 
-    <Style Selector="WindowNotificationManager:topleft /template/ ReversibleStackPanel#PART_Items">
-        <Setter Property="VerticalAlignment" Value="Top"/>
-        <Setter Property="HorizontalAlignment" Value="Left"/>
+    <Style Selector="^:topleft /template/ ReversibleStackPanel#PART_Items">
+      <Setter Property="VerticalAlignment" Value="Top" />
+      <Setter Property="HorizontalAlignment" Value="Left" />
     </Style>
 
-    <Style Selector="WindowNotificationManager:topright /template/ ReversibleStackPanel#PART_Items">
-        <Setter Property="VerticalAlignment" Value="Top"/>
-        <Setter Property="HorizontalAlignment" Value="Right"/>
+    <Style Selector="^:topright /template/ ReversibleStackPanel#PART_Items">
+      <Setter Property="VerticalAlignment" Value="Top" />
+      <Setter Property="HorizontalAlignment" Value="Right" />
     </Style>
 
-    <Style Selector="WindowNotificationManager:bottomleft /template/ ReversibleStackPanel#PART_Items">
-        <Setter Property="ReverseOrder" Value="True"/>
-        <Setter Property="VerticalAlignment" Value="Bottom"/>
-        <Setter Property="HorizontalAlignment" Value="Left"/>
+    <Style Selector="^:bottomleft /template/ ReversibleStackPanel#PART_Items">
+      <Setter Property="ReverseOrder" Value="True" />
+      <Setter Property="VerticalAlignment" Value="Bottom" />
+      <Setter Property="HorizontalAlignment" Value="Left" />
     </Style>
 
-    <Style Selector="WindowNotificationManager:bottomright /template/ ReversibleStackPanel#PART_Items">
-        <Setter Property="ReverseOrder" Value="True"/>
-        <Setter Property="VerticalAlignment" Value="Bottom"/>
-        <Setter Property="HorizontalAlignment" Value="Right"/>
+    <Style Selector="^:bottomright /template/ ReversibleStackPanel#PART_Items">
+      <Setter Property="ReverseOrder" Value="True" />
+      <Setter Property="VerticalAlignment" Value="Bottom" />
+      <Setter Property="HorizontalAlignment" Value="Right" />
     </Style>
-</Styles>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Default/DefaultTheme.xaml b/src/Avalonia.Themes.Default/DefaultTheme.xaml
index f266402aef..8f5bea557c 100644
--- a/src/Avalonia.Themes.Default/DefaultTheme.xaml
+++ b/src/Avalonia.Themes.Default/DefaultTheme.xaml
@@ -1,70 +1,75 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        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="avares://Avalonia.Themes.Default/Controls/ToolTip.xaml"/>
-  <!-- PathIcon also needs to be defined early so it can be overriden by other styles (e.g. ComboBox) -->
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/PathIcon.xaml" />
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/DataValidationErrors.xaml"/>
-  <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/DropDownButton.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/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="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/TransitioningContentControl.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/SplitButton.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"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/RichTextBlock.xaml"/>
+<Styles x:Class="Avalonia.Themes.Default.DefaultTheme"
+        xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Styles.Resources>
+    <ResourceDictionary>
+      <ResourceDictionary.MergedDictionaries>
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/Button.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/RadioButton.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/Expander.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/RepeatButton.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/ToggleSwitch.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/ButtonSpinner.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/ToggleButton.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/DropDownButton.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/PathIcon.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/CheckBox.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/ToolTip.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/Label.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/ComboBoxItem.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/ComboBox.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/Window.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/Carousel.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/CaptionButtons.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/TitleBar.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/TextBox.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/AutoCompleteBox.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/DataValidationErrors.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/ContentControl.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/FlyoutPresenter.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/MenuFlyoutPresenter.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/GridSplitter.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/ItemsControl.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/ListBoxItem.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/ListBox.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/ScrollBar.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/ScrollViewer.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/TabStrip.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/TabStripItem.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/TabControl.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/TabItem.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/PopupRoot.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/OverlayPopupHost.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/WindowNotificationManager.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/EmbeddableControlRoot.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/TransitioningContentControl.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/TreeView.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/TreeViewItem.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/ProgressBar.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/Separator.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/Menu.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/MenuItem.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/ContextMenu.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/CalendarButton.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/CalendarDayButton.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/CalendarItem.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/Calendar.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/CalendarDatePicker.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/Slider.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/NotificationCard.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/NativeMenuBar.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/NumericUpDown.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/DateTimePickerShared.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/DatePicker.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/TimePicker.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/SplitView.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/ManagedFileChooser.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/SplitButton.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/RichTextBlock.xaml" />
+      </ResourceDictionary.MergedDictionaries>
+    </ResourceDictionary>
+  </Styles.Resources>
+
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/FocusAdorner.xaml" />
+  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/UserControl.xaml" />
 </Styles>

From 5b8cb5284bf81e1a846ea84a64828c6e7284732b Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Fri, 29 Jul 2022 02:59:43 -0400
Subject: [PATCH 180/240] Port default theme DataGrid to control themes

---
 .../Themes/Default.xaml                       | 652 ++++++++++--------
 .../Themes/Fluent.xaml                        |   3 +-
 .../Diagnostics/Views/MainWindow.xaml         |   5 +-
 3 files changed, 364 insertions(+), 296 deletions(-)

diff --git a/src/Avalonia.Controls.DataGrid/Themes/Default.xaml b/src/Avalonia.Controls.DataGrid/Themes/Default.xaml
index 0d1fe43eb6..83d9332613 100644
--- a/src/Avalonia.Controls.DataGrid/Themes/Default.xaml
+++ b/src/Avalonia.Controls.DataGrid/Themes/Default.xaml
@@ -1,305 +1,377 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <!--TODO: Validation and Focus-->
-
   <Styles.Resources>
     <Thickness x:Key="DataGridTextColumnCellTextBlockMargin">4</Thickness>
-  </Styles.Resources>
-  
-  <Style Selector="DataGridCell">
-    <Setter Property="Background" Value="Transparent"/>
-    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-    <Setter Property="VerticalContentAlignment" Value="Stretch" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border x:Name="CellBorder"
-                Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}">
-          <Grid ColumnDefinitions="*,Auto">
-            <ContentPresenter ContentTemplate="{TemplateBinding ContentTemplate}"
-                              Content="{TemplateBinding Content}"
-                              Margin="{TemplateBinding Padding}"
-                              Foreground="{TemplateBinding Foreground}"
-                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-
-            <Rectangle Name="PART_RightGridLine"
-                       Grid.Column="1"
-                       VerticalAlignment="Stretch"
-                       Width="1" />
-          </Grid>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-  <Style Selector="DataGridCell > TextBlock#CellTextBlock">
-    <Setter Property="Margin" Value="{DynamicResource DataGridTextColumnCellTextBlockMargin}" />
-    <Setter Property="VerticalAlignment" Value="Center" />
-  </Style>
-
-  <Style Selector="DataGridColumnHeader">
-    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
-    <Setter Property="HorizontalContentAlignment" Value="Left" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="SeparatorBrush" Value="{DynamicResource ThemeControlLowColor}" />
-    <Setter Property="Padding" Value="4" />
-    <Setter Property="Background" Value="{DynamicResource ThemeControlMidBrush}"/>
-
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border x:Name="HeaderBorder"
-                Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}">
-          <Grid ColumnDefinitions="*,Auto">
-
-            <Grid ColumnDefinitions="*,Auto"
-                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                  Margin="{TemplateBinding Padding}">
-              <ContentPresenter Content="{TemplateBinding Content}"
-                                ContentTemplate="{TemplateBinding ContentTemplate}" />
-
-              <Path Name="SortIcon"
-                    Grid.Column="1"
-                    Fill="{TemplateBinding Foreground}"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Center"
-                    Stretch="Uniform"
-                    Width="8"
-                    Margin="4,0,0,0"
-                    Data="F1 M -5.215,6.099L 5.215,6.099L 0,0L -5.215,6.099 Z "/>
-
+    <ControlTheme x:Key="DataGridCellTextBlockTheme"
+                  TargetType="TextBlock">
+      <Setter Property="Margin" Value="{DynamicResource DataGridTextColumnCellTextBlockMargin}" />
+      <Setter Property="VerticalAlignment" Value="Center" />
+    </ControlTheme>
+    <ControlTheme x:Key="DataGridCellTextBoxTheme"
+                  BasedOn="{StaticResource {x:Type TextBox}}"
+                  TargetType="TextBox">
+      <Setter Property="VerticalAlignment" Value="Stretch" />
+      <Setter Property="Background" Value="Transparent" />
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type DataGridCell}"
+                  TargetType="DataGridCell">
+      <Setter Property="Background" Value="Transparent" />
+      <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+      <Setter Property="VerticalContentAlignment" Value="Stretch" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border x:Name="CellBorder"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <Grid ColumnDefinitions="*,Auto">
+              <ContentPresenter Margin="{TemplateBinding Padding}"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                Foreground="{TemplateBinding Foreground}" />
+
+              <Rectangle Name="PART_RightGridLine"
+                         Grid.Column="1"
+                         Width="1"
+                         VerticalAlignment="Stretch" />
             </Grid>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type DataGridColumnHeader}"
+                  TargetType="DataGridColumnHeader">
+      <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+      <Setter Property="HorizontalContentAlignment" Value="Left" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="SeparatorBrush" Value="{DynamicResource ThemeControlLowColor}" />
+      <Setter Property="Padding" Value="4" />
+      <Setter Property="Background" Value="{DynamicResource ThemeControlMidBrush}" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border x:Name="HeaderBorder"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <Grid ColumnDefinitions="*,Auto">
+
+              <Grid Margin="{TemplateBinding Padding}"
+                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                    ColumnDefinitions="*,Auto">
+                <ContentPresenter Content="{TemplateBinding Content}"
+                                  ContentTemplate="{TemplateBinding ContentTemplate}" />
+
+                <Path Name="SortIcon"
+                      Grid.Column="1"
+                      Width="8"
+                      Margin="4,0,0,0"
+                      HorizontalAlignment="Left"
+                      VerticalAlignment="Center"
+                      Data="F1 M -5.215,6.099L 5.215,6.099L 0,0L -5.215,6.099 Z "
+                      Fill="{TemplateBinding Foreground}"
+                      IsVisible="False"
+                      Stretch="Uniform" />
+
+              </Grid>
+
+              <Rectangle Name="VerticalSeparator"
+                         Grid.Column="1"
+                         Width="1"
+                         VerticalAlignment="Stretch"
+                         Fill="{TemplateBinding SeparatorBrush}"
+                         IsVisible="{TemplateBinding AreSeparatorsVisible}" />
 
-            <Rectangle Name="VerticalSeparator"
-                       Grid.Column="1" Width="1"
-                       VerticalAlignment="Stretch"
+            </Grid>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+
+      <Style Selector="^:focus-visible /template/ Grid#FocusVisual">
+        <Setter Property="IsVisible" Value="True" />
+      </Style>
+
+      <Style Selector="^:pointerover /template/ Grid#PART_ColumnHeaderRoot">
+        <Setter Property="Background" Value="{DynamicResource DataGridColumnHeaderHoveredBackgroundBrush}" />
+      </Style>
+
+      <Style Selector="^:pressed /template/ Grid#PART_ColumnHeaderRoot">
+        <Setter Property="Background" Value="{DynamicResource DataGridColumnHeaderPressedBackgroundBrush}" />
+      </Style>
+
+      <Style Selector="^:dragIndicator">
+        <Setter Property="Opacity" Value="0.5" />
+      </Style>
+
+      <Style Selector="^:sortascending /template/ Path#SortIcon">
+        <Setter Property="IsVisible" Value="True" />
+      </Style>
+
+      <Style Selector="^:sortdescending /template/ Path#SortIcon">
+        <Setter Property="IsVisible" Value="True" />
+        <Setter Property="RenderTransform">
+          <Setter.Value>
+            <ScaleTransform ScaleX="1" ScaleY="-1" />
+          </Setter.Value>
+        </Setter>
+      </Style>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type DataGridRowHeader}"
+                  TargetType="DataGridRowHeader">
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Grid x:Name="PART_Root"
+                ColumnDefinitions="Auto,*"
+                RowDefinitions="*,*,Auto">
+            <Border Grid.RowSpan="3"
+                    Grid.ColumnSpan="2"
+                    BorderBrush="{TemplateBinding SeparatorBrush}"
+                    BorderThickness="0,0,1,0">
+              <Grid Background="{TemplateBinding Background}">
+                <Rectangle x:Name="RowInvalidVisualElement"
+                           Stretch="Fill" />
+                <Rectangle x:Name="BackgroundRectangle"
+                           Stretch="Fill" />
+              </Grid>
+            </Border>
+            <Rectangle x:Name="HorizontalSeparator"
+                       Grid.Row="2"
+                       Grid.ColumnSpan="2"
+                       Height="1"
+                       Margin="1,0,1,0"
+                       HorizontalAlignment="Stretch"
                        Fill="{TemplateBinding SeparatorBrush}"
                        IsVisible="{TemplateBinding AreSeparatorsVisible}" />
 
+            <ContentPresenter Grid.RowSpan="2"
+                              Grid.Column="1"
+                              HorizontalAlignment="Center"
+                              VerticalAlignment="Center"
+                              Content="{TemplateBinding Content}" />
           </Grid>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="DataGridColumnHeader:dragIndicator">
-    <Setter Property="Opacity" Value="0.5"/>
-  </Style>
-
-  <Style Selector="DataGridColumnHeader /template/ Path#SortIcon">
-    <Setter Property="IsVisible" Value="False"/>
-    <Setter Property="RenderTransform">
-      <Setter.Value>
-        <ScaleTransform ScaleX="0.9" ScaleY="0.9" />
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style Selector="DataGridColumnHeader:sortascending /template/ Path#SortIcon">
-    <Setter Property="IsVisible" Value="True"/>
-  </Style>
-
-  <Style Selector="DataGridColumnHeader:sortdescending /template/ Path#SortIcon">
-    <Setter Property="IsVisible" Value="True"/>
-    <Setter Property="RenderTransform">
-      <Setter.Value>
-        <ScaleTransform ScaleX="0.9" ScaleY="-0.9" />
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style Selector="DataGridRow">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border x:Name="RowBorder"
-                Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}">
-          <DataGridFrozenGrid Name="PART_Root"
-                              RowDefinitions="*,Auto,Auto"
-                              ColumnDefinitions="Auto,*">
-
-            <Rectangle Name="BackgroundRectangle" Grid.RowSpan="2" Grid.ColumnSpan="2"/>
-
-            <DataGridRowHeader Grid.RowSpan="3" Name="PART_RowHeader" DataGridFrozenGrid.IsFrozen="True" />
-            <DataGridCellsPresenter Grid.Column="1" Name="PART_CellsPresenter" DataGridFrozenGrid.IsFrozen="True" />
-            <DataGridDetailsPresenter Grid.Row="1" Grid.Column="1" Name="PART_DetailsPresenter"/>
-            <Rectangle Grid.Row="2" Grid.Column="1" Name="PART_BottomGridLine" HorizontalAlignment="Stretch" Height="1" />
+        </ControlTemplate>
+      </Setter>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type DataGridRow}"
+                  TargetType="DataGridRow">
+      <Setter Property="Background" Value="{Binding $parent[DataGrid].RowBackground}" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border x:Name="RowBorder"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <DataGridFrozenGrid Name="PART_Root"
+                                ColumnDefinitions="Auto,*"
+                                RowDefinitions="*,Auto,Auto">
+
+              <Rectangle Name="BackgroundRectangle"
+                         Grid.RowSpan="2"
+                         Grid.ColumnSpan="2" />
+
+              <DataGridRowHeader Name="PART_RowHeader"
+                                 Grid.RowSpan="3"
+                                 DataGridFrozenGrid.IsFrozen="True" />
+              <DataGridCellsPresenter Name="PART_CellsPresenter"
+                                      Grid.Column="1"
+                                      DataGridFrozenGrid.IsFrozen="True" />
+              <DataGridDetailsPresenter Name="PART_DetailsPresenter"
+                                        Grid.Row="1"
+                                        Grid.Column="1" />
+              <Rectangle Name="PART_BottomGridLine"
+                         Grid.Row="2"
+                         Grid.Column="1"
+                         Height="1"
+                         HorizontalAlignment="Stretch" />
+
+            </DataGridFrozenGrid>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+
+      <Style Selector="^:nth-child(even)">
+        <Setter Property="Background" Value="{Binding $parent[DataGrid].AlternatingRowBackground}" />
+      </Style>
+
+      <Style Selector="^ /template/ Rectangle#BackgroundRectangle">
+        <Setter Property="IsVisible" Value="False" />
+        <Setter Property="Fill" Value="{DynamicResource HighlightBrush}" />
+      </Style>
+
+      <Style Selector="^:pointerover /template/ Rectangle#BackgroundRectangle">
+        <Setter Property="IsVisible" Value="True" />
+        <Setter Property="Opacity" Value="0.5" />
+      </Style>
+
+      <Style Selector="^:selected /template/ Rectangle#BackgroundRectangle">
+        <Setter Property="IsVisible" Value="True" />
+        <Setter Property="Opacity" Value="1" />
+      </Style>
+
+      <Style Selector="^:selected">
+        <Setter Property="Foreground" Value="{DynamicResource HighlightForegroundBrush}" />
+      </Style>
+    </ControlTheme>
+
+    <ControlTheme x:Key="DefaultDataGridRowGroupExpanderButtonTheme"
+                  TargetType="ToggleButton">
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border Grid.Column="0"
+                  Width="20"
+                  Height="20"
+                  HorizontalAlignment="Center"
+                  VerticalAlignment="Center"
+                  Background="Transparent">
+            <Path HorizontalAlignment="Center"
+                  VerticalAlignment="Center"
+                  Data="M 0 2 L 4 6 L 0 10 Z"
+                  Fill="{TemplateBinding Foreground}" />
+          </Border>
+        </ControlTemplate>
+      </Setter>
+      <Style Selector="^:checked /template/ Path">
+        <Setter Property="RenderTransform">
+          <RotateTransform Angle="90" />
+        </Setter>
+      </Style>
+    </ControlTheme>
+
+
+    <ControlTheme x:Key="{x:Type DataGridRowGroupHeader}"
+                  TargetType="DataGridRowGroupHeader">
+      <Setter Property="Background" Value="{DynamicResource ThemeControlMidHighBrush}" />
+      <Setter Property="Height" Value="20" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <DataGridFrozenGrid Name="Root"
+                              ColumnDefinitions="Auto,Auto,Auto,Auto"
+                              RowDefinitions="Auto,*,Auto">
+
+            <Rectangle Name="IndentSpacer"
+                       Grid.Row="1"
+                       Grid.Column="1" />
+            <ToggleButton Name="ExpanderButton"
+                          Grid.Row="1"
+                          Grid.Column="2"
+                          Margin="2,0,0,0"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
+                          Foreground="{TemplateBinding Foreground}"
+                          Theme="{StaticResource DefaultDataGridRowGroupExpanderButtonTheme}" />
+
+            <StackPanel Grid.Row="1"
+                        Grid.Column="3"
+                        Margin="0,1,0,1"
+                        VerticalAlignment="Center"
+                        Orientation="Horizontal">
+              <TextBlock Name="PropertyNameElement"
+                         Margin="4,0,0,0"
+                         IsVisible="{TemplateBinding IsPropertyNameVisible}" />
+              <TextBlock Margin="4,0,0,0"
+                         Text="{Binding Key}" />
+              <TextBlock Name="ItemCountElement"
+                         Margin="4,0,0,0"
+                         IsVisible="{TemplateBinding IsItemCountVisible}" />
+            </StackPanel>
+
+            <DataGridRowHeader Name="RowHeader"
+                               Grid.RowSpan="3"
+                               DataGridFrozenGrid.IsFrozen="True" />
 
           </DataGridFrozenGrid>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="DataGridRow">
-    <Setter Property="Background" Value="{Binding $parent[DataGrid].RowBackground}" />
-  </Style>
-  <Style Selector="DataGridRow:nth-child(even)">
-    <Setter Property="Background" Value="{Binding $parent[DataGrid].AlternatingRowBackground}" />
-  </Style>
-
-  <Style Selector="DataGridRow /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="IsVisible" Value="False"/>
-    <Setter Property="Fill" Value="{DynamicResource HighlightBrush}" />
-  </Style>
-
-  <Style Selector="DataGridRow:pointerover /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="IsVisible" Value="True"/>
-    <Setter Property="Opacity" Value="0.5"/>
-  </Style>
-
-  <Style Selector="DataGridRow:selected /template/ Rectangle#BackgroundRectangle">
-    <Setter Property="IsVisible" Value="True"/>
-    <Setter Property="Opacity" Value="1"/>
-  </Style>
-
-  <Style Selector="DataGridRow:selected">
-    <Setter Property="Foreground" Value="{DynamicResource HighlightForegroundBrush}" />
-  </Style>
-
-  <Style Selector="DataGridRowHeader">
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Grid x:Name="PART_Root"
-              RowDefinitions="*,*,Auto"
-              ColumnDefinitions="Auto,*">
-          <Border Grid.RowSpan="3"
-                  Grid.ColumnSpan="2"
-                  BorderBrush="{TemplateBinding SeparatorBrush}"
-                  BorderThickness="0,0,1,0">
-            <Grid Background="{TemplateBinding Background}">
-              <Rectangle x:Name="RowInvalidVisualElement"
-                         Stretch="Fill" />
-              <Rectangle x:Name="BackgroundRectangle"
-                         Stretch="Fill" />
+        </ControlTemplate>
+      </Setter>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type DataGrid}"
+                  TargetType="DataGrid">
+      <Setter Property="RowBackground" Value="{DynamicResource ThemeAccentBrush4}" />
+      <Setter Property="AlternatingRowBackground" Value="#00FFFFFF" />
+      <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
+      <Setter Property="HeadersVisibility" Value="Column" />
+      <Setter Property="HorizontalScrollBarVisibility" Value="Auto" />
+      <Setter Property="VerticalScrollBarVisibility" Value="Auto" />
+      <Setter Property="SelectionMode" Value="Extended" />
+      <Setter Property="HorizontalGridLinesBrush" Value="{DynamicResource ThemeBorderHighColor}" />
+      <Setter Property="VerticalGridLinesBrush" Value="{DynamicResource ThemeBorderHighColor}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderLowColor}" />
+      <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}" />
+      <Setter Property="DropLocationIndicatorTemplate">
+        <Template>
+          <Rectangle Width="2"
+                     Fill="{DynamicResource ThemeBorderHighColor}" />
+        </Template>
+      </Setter>
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border x:Name="DataGridBorder"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <Grid ColumnDefinitions="Auto,*,Auto"
+                  RowDefinitions="Auto,*,Auto,Auto">
+              <DataGridColumnHeader Name="PART_TopLeftCornerHeader"
+                                    Width="22" />
+              <DataGridColumnHeadersPresenter Name="PART_ColumnHeadersPresenter"
+                                              Grid.Column="1" />
+              <DataGridColumnHeader Name="PART_TopRightCornerHeader"
+                                    Grid.Column="2" />
+              <Rectangle Name="PART_ColumnHeadersAndRowsSeparator"
+                         Grid.ColumnSpan="3"
+                         Height="1"
+                         VerticalAlignment="Bottom"
+                         Fill="{DynamicResource ThemeControlMidHighBrush}"
+                         StrokeThickness="1" />
+
+              <DataGridRowsPresenter Name="PART_RowsPresenter"
+                                     Grid.Row="1"
+                                     Grid.ColumnSpan="2">
+                <DataGridRowsPresenter.GestureRecognizers>
+                  <ScrollGestureRecognizer CanHorizontallyScroll="True"
+                                           CanVerticallyScroll="True" />
+                </DataGridRowsPresenter.GestureRecognizers>
+              </DataGridRowsPresenter>
+              <Rectangle Name="PART_BottomRightCorner"
+                         Grid.Row="2"
+                         Grid.Column="2"
+                         Fill="{DynamicResource ThemeControlMidHighBrush}" />
+              <Rectangle Name="BottomLeftCorner"
+                         Grid.Row="2"
+                         Grid.ColumnSpan="2"
+                         Fill="{DynamicResource ThemeControlMidHighBrush}" />
+              <ScrollBar Name="PART_VerticalScrollbar"
+                         Grid.Row="1"
+                         Grid.Column="2"
+                         Width="{DynamicResource ScrollBarThickness}"
+                         Orientation="Vertical" />
+
+              <Grid Grid.Row="2"
+                    Grid.Column="1"
+                    ColumnDefinitions="Auto,*">
+                <Rectangle Name="PART_FrozenColumnScrollBarSpacer" />
+                <ScrollBar Name="PART_HorizontalScrollbar"
+                           Grid.Column="1"
+                           Height="{DynamicResource ScrollBarThickness}"
+                           Orientation="Horizontal" />
+              </Grid>
             </Grid>
           </Border>
-          <Rectangle x:Name="HorizontalSeparator"
-                     Grid.Row="2"
-                     Grid.ColumnSpan="2"
-                     Height="1"
-                     Margin="1,0,1,0"
-                     HorizontalAlignment="Stretch"
-                     Fill="{TemplateBinding SeparatorBrush}"
-                     IsVisible="{TemplateBinding AreSeparatorsVisible}" />
-
-          <ContentPresenter Grid.RowSpan="2"
-                            Grid.Column="1"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            Content="{TemplateBinding Content}" />
-        </Grid>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="DataGridRowGroupHeader">
-    <Setter Property="Background" Value="{DynamicResource ThemeControlMidHighBrush}" />
-    <Setter Property="Height" Value="20"/>
-    <Setter Property="Template">
-      <ControlTemplate>
-        <DataGridFrozenGrid Name="Root"
-                            ColumnDefinitions="Auto,Auto,Auto,Auto"
-                            RowDefinitions="Auto,*,Auto">
-
-          <Rectangle Grid.Column="1" Grid.Row="1" Name="IndentSpacer" />
-          <ToggleButton Grid.Column="2" Grid.Row="1"
-                        Name="ExpanderButton"
-                        Margin="2,0,0,0"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        Background="{TemplateBinding Background}"
-                        CornerRadius="{TemplateBinding CornerRadius}"
-                        Foreground="{TemplateBinding Foreground}" />
-
-          <StackPanel Grid.Column="3" Grid.Row="1" Orientation="Horizontal" VerticalAlignment="Center" Margin="0,1,0,1">
-            <TextBlock Name="PropertyNameElement" Margin="4,0,0,0" IsVisible="{TemplateBinding IsPropertyNameVisible}"/>
-            <TextBlock Margin="4,0,0,0" Text="{Binding Key}" />
-            <TextBlock Name="ItemCountElement" Margin="4,0,0,0" IsVisible="{TemplateBinding IsItemCountVisible}"/>
-          </StackPanel>
-
-          <DataGridRowHeader Name="RowHeader" Grid.RowSpan="3" DataGridFrozenGrid.IsFrozen="True"/>
-
-        </DataGridFrozenGrid>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="DataGridRowGroupHeader /template/ ToggleButton#ExpanderButton">
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Grid.Column="0" Width="20" Height="20" Background="Transparent" HorizontalAlignment="Center" VerticalAlignment="Center">
-          <Path Fill="{TemplateBinding Foreground}"
-                HorizontalAlignment="Center"
-                VerticalAlignment="Center"
-                Data="M 0 2 L 4 6 L 0 10 Z" />
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-
-  <Style Selector="DataGridRowGroupHeader /template/ ToggleButton#ExpanderButton:checked /template/ Path">
-    <Setter Property="RenderTransform">
-      <RotateTransform Angle="90" />
-    </Setter>
-  </Style>
-
-  <Style Selector="DataGrid">
-    <Setter Property="RowBackground" Value="{DynamicResource ThemeAccentBrush4}" />
-    <Setter Property="AlternatingRowBackground" Value="#00FFFFFF" />
-    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
-    <Setter Property="HeadersVisibility" Value="Column" />
-    <Setter Property="HorizontalScrollBarVisibility" Value="Auto" />
-    <Setter Property="VerticalScrollBarVisibility" Value="Auto" />
-    <Setter Property="SelectionMode" Value="Extended" />
-    <Setter Property="HorizontalGridLinesBrush" Value="{DynamicResource ThemeBorderHighColor}" />
-    <Setter Property="VerticalGridLinesBrush" Value="{DynamicResource ThemeBorderHighColor}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderLowColor}"/>
-    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}" />
-    <Setter Property="DropLocationIndicatorTemplate">
-      <Template>
-        <Rectangle Fill="{DynamicResource ThemeBorderHighColor}" Width="2"/>
-      </Template>
-    </Setter>
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border x:Name="DataGridBorder"
-                Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}">
-          <Grid RowDefinitions="Auto,*,Auto,Auto" ColumnDefinitions="Auto,*,Auto">
-
-            <DataGridColumnHeader Name="PART_TopLeftCornerHeader" Width="22" />
-            <DataGridColumnHeadersPresenter Name="PART_ColumnHeadersPresenter" Grid.Column="1"/>
-            <DataGridColumnHeader Name="PART_TopRightCornerHeader" Grid.Column="2"/>
-            <Rectangle Name="PART_ColumnHeadersAndRowsSeparator" Grid.ColumnSpan="3" VerticalAlignment="Bottom" StrokeThickness="1" Height="1" Fill="{DynamicResource ThemeControlMidHighBrush}"/>
-
-            <DataGridRowsPresenter Name="PART_RowsPresenter" Grid.ColumnSpan="2" Grid.Row="1">
-              <DataGridRowsPresenter.GestureRecognizers>
-                <ScrollGestureRecognizer CanHorizontallyScroll="True" CanVerticallyScroll="True" />
-              </DataGridRowsPresenter.GestureRecognizers>
-            </DataGridRowsPresenter>
-            <Rectangle Name="PART_BottomRightCorner" Fill="{DynamicResource ThemeControlMidHighBrush}" Grid.Column="2" Grid.Row="2" />
-            <Rectangle Name="BottomLeftCorner" Fill="{DynamicResource ThemeControlMidHighBrush}" Grid.Row="2" Grid.ColumnSpan="2" />
-            <ScrollBar Name="PART_VerticalScrollbar" Orientation="Vertical" Grid.Column="2" Grid.Row="1" Width="{DynamicResource ScrollBarThickness}"/>
-
-            <Grid Grid.Column="1" Grid.Row="2"
-                  ColumnDefinitions="Auto,*">
-              <Rectangle Name="PART_FrozenColumnScrollBarSpacer" />
-              <ScrollBar Name="PART_HorizontalScrollbar" Grid.Column="1" Orientation="Horizontal" Height="{DynamicResource ScrollBarThickness}"/>
-            </Grid>
-          </Grid>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
+        </ControlTemplate>
+      </Setter>
+    </ControlTheme>
+  </Styles.Resources>
 </Styles>
diff --git a/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml b/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
index a80cc2173c..5ae83427b5 100644
--- a/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
+++ b/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
@@ -57,8 +57,7 @@
       <Setter Property="VerticalAlignment" Value="Stretch" />
       <Setter Property="Background" Value="Transparent" />
       <Style Selector="^ /template/ DataValidationErrors">
-        <Setter Property="Template" Value="{DynamicResource TooltipDataValidationContentTemplate}" />
-        <Setter Property="ErrorTemplate" Value="{DynamicResource TooltipDataValidationErrorTemplate}" />
+        <Setter Property="Theme" Value="{StaticResource TooltipDataValidationErrors}" />
       </Style>
     </ControlTheme>
 
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml
index c32638f6ca..680424122b 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml
@@ -11,10 +11,7 @@
   
   <Window.Styles>
     <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"/>
-    </Style>
+    <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Default.xaml"/>
     <StyleInclude Source="avares://Avalonia.Diagnostics/Diagnostics/Controls/ThicknessEditor.axaml" />
     <StyleInclude Source="avares://Avalonia.Diagnostics/Diagnostics/Controls/FilterTextBox.axaml" />
   </Window.Styles>

From ceb59fc475cd8774f03ef472c5becfa81ecfab90 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Fri, 29 Jul 2022 03:09:22 -0400
Subject: [PATCH 181/240] Workaround dev tools issue

---
 samples/ControlCatalog/App.xaml.cs                       | 9 ++++++---
 .../Diagnostics/Views/MainWindow.xaml                    | 3 ++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/samples/ControlCatalog/App.xaml.cs b/samples/ControlCatalog/App.xaml.cs
index 7ebb87094a..a5535ea52d 100644
--- a/samples/ControlCatalog/App.xaml.cs
+++ b/samples/ControlCatalog/App.xaml.cs
@@ -78,9 +78,12 @@ namespace ControlCatalog
 
         public override void Initialize()
         {
-            Styles.Insert(0, Fluent);
-            Styles.Insert(1, ColorPickerFluent);
-            Styles.Insert(2, DataGridFluent);
+            Styles.Insert(0, DefaultLight);
+            Styles.Insert(1, ColorPickerDefault);
+            Styles.Insert(2, DataGridDefault);
+            //Styles.Insert(0, Fluent);
+            //Styles.Insert(1, ColorPickerFluent);
+            //Styles.Insert(2, DataGridFluent);
             AvaloniaXamlLoader.Load(this);
         }
 
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml
index 680424122b..004518598c 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml
@@ -4,7 +4,8 @@
         xmlns:diag="clr-namespace:Avalonia.Diagnostics"
         xmlns:default="using:Avalonia.Themes.Default"
         Title="Avalonia DevTools"
-        x:Class="Avalonia.Diagnostics.Views.MainWindow">
+        x:Class="Avalonia.Diagnostics.Views.MainWindow"
+        Theme="{StaticResource {x:Type Window}}">
   <Window.DataTemplates>
     <diag:ViewLocator/>
   </Window.DataTemplates>

From 44b8df516c461dbbc38f825c5dab9aa01ee94dd2 Mon Sep 17 00:00:00 2001
From: Luis von der Eltz <luis@gritworld.com>
Date: Fri, 29 Jul 2022 11:26:55 +0200
Subject: [PATCH 182/240] Set OverlayDismissEventPassThrough to false, add
 OverlayInputPassThroughElement property

---
 src/Avalonia.Controls/Flyouts/FlyoutBase.cs | 50 ++++++++++-----------
 1 file changed, 24 insertions(+), 26 deletions(-)

diff --git a/src/Avalonia.Controls/Flyouts/FlyoutBase.cs b/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
index a0f3407b7a..bf938abc79 100644
--- a/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
+++ b/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
@@ -16,8 +16,8 @@ namespace Avalonia.Controls.Primitives
         /// Defines the <see cref="IsOpen"/> property
         /// </summary>
         public static readonly DirectProperty<FlyoutBase, bool> IsOpenProperty =
-           AvaloniaProperty.RegisterDirect<FlyoutBase, bool>(nameof(IsOpen),
-               x => x.IsOpen);
+            AvaloniaProperty.RegisterDirect<FlyoutBase, bool>(nameof(IsOpen),
+                x => x.IsOpen);
 
         /// <summary>
         /// Defines the <see cref="Target"/> property
@@ -39,16 +39,18 @@ namespace Avalonia.Controls.Primitives
                 x => x.ShowMode, (x, v) => x.ShowMode = v);
 
         /// <summary>
-        /// Defines the AttachedFlyout property
+        /// Defines the <see cref="OverlayInputPassThroughElement"/> property
         /// </summary>
-        public static readonly AttachedProperty<FlyoutBase?> AttachedFlyoutProperty =
-            AvaloniaProperty.RegisterAttached<FlyoutBase, Control, FlyoutBase?>("AttachedFlyout", null);
+        public static readonly DirectProperty<FlyoutBase, IInputElement?> OverlayInputPassThroughElementProperty =
+            Popup.OverlayInputPassThroughElementProperty.AddOwner<FlyoutBase>(
+                o => o._overlayInputPassThroughElement,
+                (o, v) => o._overlayInputPassThroughElement = v);
 
         /// <summary>
-        /// Defines the OverlayDismissEventPassThrough property
+        /// Defines the AttachedFlyout property
         /// </summary>
-        public static readonly StyledProperty<bool> OverlayDismissEventPassThroughProperty =
-            Popup.OverlayDismissEventPassThroughProperty.AddOwner<FlyoutBase>();
+        public static readonly AttachedProperty<FlyoutBase?> AttachedFlyoutProperty =
+            AvaloniaProperty.RegisterAttached<FlyoutBase, Control, FlyoutBase?>("AttachedFlyout", null);
 
         private readonly Lazy<Popup> _popupLazy;
         private bool _isOpen;
@@ -58,10 +60,10 @@ namespace Avalonia.Controls.Primitives
         private PixelRect? _enlargePopupRectScreenPixelRect;
         private IDisposable? _transientDisposable;
         private Action<IPopupHost?>? _popupHostChangedHandler;
+        private IInputElement? _overlayInputPassThroughElement;
 
         static FlyoutBase()
         {
-            OverlayDismissEventPassThroughProperty.OverrideDefaultValue<FlyoutBase>(true);
             Control.ContextFlyoutProperty.Changed.Subscribe(OnContextFlyoutPropertyChanged);
         }
 
@@ -109,25 +111,20 @@ namespace Avalonia.Controls.Primitives
         }
 
         /// <summary>
-        /// Gets or sets a value indicating whether the event that closes the flyout is passed
-        /// through to the parent window.
+        /// Gets or sets an element that should receive pointer input events even when underneath
+        /// the flyout's overlay.
         /// </summary>
-        /// <remarks>
-        /// Clicks outside the the flyout cause the flyout to close. When <see cref="OverlayDismissEventPassThrough"/> is set to
-        /// false, these clicks will be handled by the flyout and not be registered by the parent
-        /// window. When set to true, the events will be passed through to the parent window.
-        /// </remarks>
-        public bool OverlayDismissEventPassThrough
+        public IInputElement? OverlayInputPassThroughElement
         {
-            get => GetValue(OverlayDismissEventPassThroughProperty);
-            set => SetValue(OverlayDismissEventPassThroughProperty, value);
+            get => _overlayInputPassThroughElement;
+            set => SetAndRaise(OverlayInputPassThroughElementProperty, ref _overlayInputPassThroughElement, value);
         }
 
         IPopupHost? IPopupHostProvider.PopupHost => Popup?.Host;
 
-        event Action<IPopupHost?>? IPopupHostProvider.PopupHostChanged 
-        { 
-            add => _popupHostChangedHandler += value; 
+        event Action<IPopupHost?>? IPopupHostProvider.PopupHostChanged
+        {
+            add => _popupHostChangedHandler += value;
             remove => _popupHostChangedHandler -= value;
         }
 
@@ -200,7 +197,7 @@ namespace Avalonia.Controls.Primitives
             Popup.OverlayInputPassThroughElement = null;
 
             ((ISetLogicalParent)Popup).SetParent(null);
-            
+
             // Ensure this isn't active
             _transientDisposable?.Dispose();
             _transientDisposable = null;
@@ -255,8 +252,7 @@ namespace Avalonia.Controls.Primitives
                 Popup.Child = CreatePresenter();
             }
 
-            Popup.OverlayInputPassThroughElement = placementTarget;
-            Popup.OverlayDismissEventPassThrough = OverlayDismissEventPassThrough;
+            Popup.OverlayInputPassThroughElement = OverlayInputPassThroughElement;
 
             if (CancelOpening())
             {
@@ -386,7 +382,9 @@ namespace Avalonia.Controls.Primitives
             var popup = new Popup
             {
                 WindowManagerAddShadowHint = false,
-                IsLightDismissEnabled = true
+                IsLightDismissEnabled = true,
+                //Note: This is required to prevent Button.Flyout from opening the flyout again after dismiss.
+                OverlayDismissEventPassThrough = false
             };
 
             popup.Opened += OnPopupOpened;

From 29d957282ece12d6f497027ed4fa9d28cfce33fd Mon Sep 17 00:00:00 2001
From: Luis von der Eltz <luis@gritworld.com>
Date: Fri, 29 Jul 2022 11:28:19 +0200
Subject: [PATCH 183/240] Remove unsetting

---
 src/Avalonia.Controls/Flyouts/FlyoutBase.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Avalonia.Controls/Flyouts/FlyoutBase.cs b/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
index bf938abc79..00ebcab70e 100644
--- a/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
+++ b/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
@@ -194,7 +194,6 @@ namespace Avalonia.Controls.Primitives
 
             IsOpen = false;
             Popup.IsOpen = false;
-            Popup.OverlayInputPassThroughElement = null;
 
             ((ISetLogicalParent)Popup).SetParent(null);
 

From 81b0dce302f3e588ce2e6e5e16a9d1eb0b5d69ea Mon Sep 17 00:00:00 2001
From: Benedikt Stebner <Gillibald@users.noreply.github.com>
Date: Fri, 29 Jul 2022 11:55:52 +0200
Subject: [PATCH 184/240] Fix RichTextBlock Inlines update handling

---
 samples/Sandbox/MainWindow.axaml              | 15 ++++++
 samples/Sandbox/MainWindow.axaml.cs           | 46 ++++++++++++++++++-
 .../Media/TextFormatting/TextLayout.cs        |  7 ++-
 .../Media/TextFormatting/TextLine.cs          |  2 +-
 .../Media/TextFormatting/TextLineImpl.cs      |  7 ++-
 src/Avalonia.Controls/RichTextBlock.cs        | 22 ++++-----
 .../RichTextBlockTests.cs                     | 44 ++++++++++++++++++
 .../Media/TextFormatting/TextLayoutTests.cs   | 12 +++--
 8 files changed, 135 insertions(+), 20 deletions(-)

diff --git a/samples/Sandbox/MainWindow.axaml b/samples/Sandbox/MainWindow.axaml
index 0fc78795a6..cf2ce63c1f 100644
--- a/samples/Sandbox/MainWindow.axaml
+++ b/samples/Sandbox/MainWindow.axaml
@@ -9,6 +9,21 @@
     <NumericUpDown Value="{Binding Distance, Mode=TwoWay}"/>
     <TextBlock Text="{Binding #txtBlock.SelectionStart}"/>
     <TextBlock Text="{Binding #txtBlock.SelectionEnd}"/>
+    <DockPanel DockPanel.Dock="Top" LastChildFill="False">
+      <RichTextBlock Name="RichTextBlock"
+                     TextAlignment="Left"
+                     Margin="4,4,4,8"
+                     ClipToBounds="True"
+                     FontSize="30"
+                     MaxLines="3"
+                     TextWrapping="Wrap"
+                     FontWeight="DemiBold"
+                     Text="{Binding Text}"
+                     Inlines="{Binding InlineCollection, Mode=OneWay}">
+      </RichTextBlock>
+      <Button Click="Button_OnClick">Update inlines</Button>
+      <Button Click="TextButton_OnClick">Update text</Button>
+    </DockPanel>
   </StackPanel>
  
 </Window>
diff --git a/samples/Sandbox/MainWindow.axaml.cs b/samples/Sandbox/MainWindow.axaml.cs
index 7a8b56bbb6..3040385708 100644
--- a/samples/Sandbox/MainWindow.axaml.cs
+++ b/samples/Sandbox/MainWindow.axaml.cs
@@ -3,7 +3,9 @@ using System.Diagnostics;
 using System.Runtime.CompilerServices;
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Controls.Documents;
 using Avalonia.Controls.Presenters;
+using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
 using Avalonia.VisualTree;
 
@@ -11,6 +13,8 @@ namespace Sandbox
 {
     public class MainWindow : Window
     {
+        private TestViewModel _dc;
+
         public MainWindow()
         {
             this.InitializeComponent();
@@ -27,13 +31,30 @@ namespace Sandbox
 
             var textPresenter = e.NameScope.Find("PART_TextPresenter") as TextPresenter;
 
-            DataContext = new TestViewModel(textPresenter);
+            _dc = new TestViewModel(textPresenter);
+
+            DataContext = _dc;
         }
 
         private void InitializeComponent()
         {
             AvaloniaXamlLoader.Load(this);
         }
+
+        private void Button_OnClick(object? sender, RoutedEventArgs e)
+        {
+            _dc.InlineCollection = new InlineCollection
+        {
+            new Run(""),
+            new Run("test3") {FontWeight = Avalonia.Media.FontWeight.Bold},
+        };
+            // _dc.Text = "nununu";
+        }
+
+        private void TextButton_OnClick(object? sender, RoutedEventArgs e)
+        {
+            _dc.Text = "nununu";
+        }
     }
 
     public class TestViewModel : ViewModelBase
@@ -46,6 +67,29 @@ namespace Sandbox
             _textPresenter = textPresenter;
         }
 
+        private InlineCollection _inlineCollection;
+        private string _text;
+
+        public string Text
+        {
+            get => _text;
+            set
+            {
+                _text = value;
+                RaisePropertyChanged();
+            }
+        }
+
+        public InlineCollection InlineCollection
+        {
+            get => _inlineCollection;
+            set
+            {
+                _inlineCollection = value;
+                RaisePropertyChanged();
+            }
+        }
+
         public double Distance 
         { 
             get => _distance; 
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextLayout.cs b/src/Avalonia.Base/Media/TextFormatting/TextLayout.cs
index f3e8b5969c..0828b6518a 100644
--- a/src/Avalonia.Base/Media/TextFormatting/TextLayout.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/TextLayout.cs
@@ -537,8 +537,13 @@ namespace Avalonia.Media.TextFormatting
         /// </summary>
         /// <param name="width">The collapsing width.</param>
         /// <returns>The <see cref="TextCollapsingProperties"/>.</returns>
-        private TextCollapsingProperties GetCollapsingProperties(double width)
+        private TextCollapsingProperties? GetCollapsingProperties(double width)
         {
+            if(_textTrimming == TextTrimming.None)
+            {
+                return null;
+            }
+
             return _textTrimming.CreateCollapsingProperties(new TextCollapsingCreateInfo(width, _paragraphProperties.DefaultTextRunProperties));
         }
     }
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextLine.cs b/src/Avalonia.Base/Media/TextFormatting/TextLine.cs
index c8a23097db..61b24dc8c5 100644
--- a/src/Avalonia.Base/Media/TextFormatting/TextLine.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/TextLine.cs
@@ -153,7 +153,7 @@ namespace Avalonia.Media.TextFormatting
         /// <returns>
         /// A <see cref="TextLine"/> value that represents a collapsed line that can be displayed.
         /// </returns>
-        public abstract TextLine Collapse(params TextCollapsingProperties[] collapsingPropertiesList);
+        public abstract TextLine Collapse(params TextCollapsingProperties?[] collapsingPropertiesList);
 
         /// <summary>
         /// Create a justified line based on justification text properties.
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs b/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
index 0ee791d935..a0aae76fad 100644
--- a/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
@@ -119,7 +119,7 @@ namespace Avalonia.Media.TextFormatting
         }
 
         /// <inheritdoc/>
-        public override TextLine Collapse(params TextCollapsingProperties[] collapsingPropertiesList)
+        public override TextLine Collapse(params TextCollapsingProperties?[] collapsingPropertiesList)
         {
             if (collapsingPropertiesList.Length == 0)
             {
@@ -128,6 +128,11 @@ namespace Avalonia.Media.TextFormatting
 
             var collapsingProperties = collapsingPropertiesList[0];
 
+            if(collapsingProperties is null)
+            {
+                return this;
+            }
+
             var collapsedRuns = collapsingProperties.Collapse(this);
 
             if (collapsedRuns is null)
diff --git a/src/Avalonia.Controls/RichTextBlock.cs b/src/Avalonia.Controls/RichTextBlock.cs
index 0c8b1d125d..2f8bed3be7 100644
--- a/src/Avalonia.Controls/RichTextBlock.cs
+++ b/src/Avalonia.Controls/RichTextBlock.cs
@@ -44,8 +44,8 @@ namespace Avalonia.Controls
         /// <summary>
         /// Defines the <see cref="Inlines"/> property.
         /// </summary>
-        public static readonly StyledProperty<InlineCollection> InlinesProperty =
-            AvaloniaProperty.Register<RichTextBlock, InlineCollection>(
+        public static readonly StyledProperty<InlineCollection?> InlinesProperty =
+            AvaloniaProperty.Register<RichTextBlock, InlineCollection?>(
                 nameof(Inlines));
 
         public static readonly DirectProperty<TextBox, bool> CanCopyProperty =
@@ -138,7 +138,7 @@ namespace Avalonia.Controls
         /// Gets or sets the inlines.
         /// </summary>
         [Content]
-        public InlineCollection Inlines
+        public InlineCollection? Inlines
         {
             get => GetValue(InlinesProperty);
             set => SetValue(InlinesProperty, value);
@@ -159,7 +159,7 @@ namespace Avalonia.Controls
             remove => RemoveHandler(CopyingToClipboardEvent, value);
         }
 
-        internal bool HasComplexContent => Inlines.Count > 0;
+        internal bool HasComplexContent => Inlines != null && Inlines.Count > 0;
 
         /// <summary>
         /// Copies the current selection to the Clipboard.
@@ -260,18 +260,18 @@ namespace Avalonia.Controls
             {
                 if (!string.IsNullOrEmpty(_text))
                 {
-                    Inlines.Add(_text);
+                    Inlines?.Add(_text);
 
                     _text = null;
                 }
 
-                Inlines.Add(text);
+                Inlines?.Add(text);
             }
         }
 
         protected override string? GetText()
         {
-            return _text ?? Inlines.Text;
+            return _text ?? Inlines?.Text;
         }
 
         protected override void SetText(string? text)
@@ -301,10 +301,10 @@ namespace Avalonia.Controls
 
             ITextSource textSource;
 
-            var inlines = Inlines;
-
             if (HasComplexContent)
             {
+                var inlines = Inlines!;
+
                 var textRuns = new List<TextRun>();
 
                 foreach (var inline in inlines)
@@ -537,7 +537,7 @@ namespace Avalonia.Controls
 
             switch (change.Property.Name)
             {
-                case nameof(InlinesProperty):
+                case nameof(Inlines):
                     {
                         OnInlinesChanged(change.OldValue as InlineCollection, change.NewValue as InlineCollection);
                         InvalidateTextLayout();
@@ -553,7 +553,7 @@ namespace Avalonia.Controls
                 return "";
             }
 
-            var text = Inlines.Text ?? Text;
+            var text = GetText();
 
             if (string.IsNullOrEmpty(text))
             {
diff --git a/tests/Avalonia.Controls.UnitTests/RichTextBlockTests.cs b/tests/Avalonia.Controls.UnitTests/RichTextBlockTests.cs
index eb4b88956d..c74f13b808 100644
--- a/tests/Avalonia.Controls.UnitTests/RichTextBlockTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/RichTextBlockTests.cs
@@ -48,5 +48,49 @@ namespace Avalonia.Controls.UnitTests
                 Assert.False(target.IsMeasureValid);
             }
         }
+
+        [Fact]
+        public void Changing_Inlines_Should_Invalidate_Measure()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var target = new RichTextBlock();
+
+                var inlines = new InlineCollection { new Run("Hello") };
+
+                target.Measure(Size.Infinity);
+
+                Assert.True(target.IsMeasureValid);
+
+                target.Inlines = inlines;
+
+                Assert.False(target.IsMeasureValid);
+            }
+        }
+
+        [Fact]
+        public void Changing_Inlines_Should_Reset_Inlines_Parent()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var target = new RichTextBlock();
+
+                var run = new Run("Hello");
+
+                target.Inlines.Add(run);
+
+                target.Measure(Size.Infinity);
+
+                Assert.True(target.IsMeasureValid);
+
+                target.Inlines = null;
+
+                Assert.Null(run.Parent);
+
+                target.Inlines = new InlineCollection { run };
+
+                Assert.Equal(target, run.Parent);
+            }
+        }
     }
 }
diff --git a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs
index 6d057d900e..c457a96299 100644
--- a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs
+++ b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs
@@ -993,9 +993,11 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
 
                     var currentX = 0.0;
 
-                    for (int j = 0; j < clusters.Count; j++)
-                    {
-                        var cluster = clusters[j];
+                    var cluster = text.Length;
+
+                    for (int j = 0; j < clusters.Count - 1; j++)
+                    {                     
+                        var glyphAdvance = glyphAdvances[j];
 
                         var characterHit = textLine.GetCharacterHitFromDistance(currentX);
 
@@ -1005,9 +1007,9 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
 
                         Assert.Equal(currentX, distance);
 
-                        var glyphAdvance = glyphAdvances[j];
-
                         currentX += glyphAdvance;
+
+                        cluster = clusters[j];
                     }
                 }
             }

From e7be7cb88de6cbea64f8492b6899d53b4878030d Mon Sep 17 00:00:00 2001
From: Benedikt Stebner <Gillibald@users.noreply.github.com>
Date: Fri, 29 Jul 2022 16:29:36 +0200
Subject: [PATCH 185/240] Fix that thing

---
 .../Media/TextFormatting/TextLineImpl.cs      | 89 +++++++++++++------
 1 file changed, 61 insertions(+), 28 deletions(-)

diff --git a/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs b/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
index a0aae76fad..94095cf82b 100644
--- a/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
@@ -176,7 +176,7 @@ namespace Avalonia.Media.TextFormatting
                 return GetRunCharacterHit(firstRun, FirstTextSourceIndex, 0);
             }
 
-            if (distance > WidthIncludingTrailingWhitespace)
+            if (distance >= WidthIncludingTrailingWhitespace)
             {
                 var lastRun = _textRuns[_textRuns.Count - 1];
 
@@ -195,7 +195,7 @@ namespace Avalonia.Media.TextFormatting
                 if(currentRun is ShapedTextCharacters shapedRun && !shapedRun.ShapedBuffer.IsLeftToRight)
                 {
                     var rightToLeftIndex = i;
-                    var rightToLeftDistance = shapedRun.Size.Width;
+                    currentPosition += currentRun.TextSourceLength;
 
                     while (rightToLeftIndex + 1 <= _textRuns.Count - 1)
                     {
@@ -206,19 +206,24 @@ namespace Avalonia.Media.TextFormatting
                             break;
                         }
 
-                        rightToLeftIndex++;
+                        currentPosition += nextShaped.TextSourceLength;
 
-                        rightToLeftDistance += nextShaped.Size.Width;
+                        rightToLeftIndex++;
                     }
 
-                    for (var j = rightToLeftIndex; rightToLeftIndex >= 0; j--)
+                    for (var j = i; i <= rightToLeftIndex; j++)
                     {
+                        if(j > _textRuns.Count - 1)
+                        {
+                            break;
+                        }
+
                         currentRun = _textRuns[j];
 
-                        if(distance <= currentDistance + rightToLeftDistance - currentRun.Size.Width)
+                        if(currentDistance + currentRun.Size.Width <= distance)
                         {
-                            currentPosition += currentRun.TextSourceLength;
-                            rightToLeftDistance -= currentRun.Size.Width;
+                            currentDistance += currentRun.Size.Width;
+                            currentPosition -= currentRun.TextSourceLength;
 
                             continue;
                         }
@@ -255,14 +260,18 @@ namespace Avalonia.Media.TextFormatting
                     {
                         characterHit = shapedRun.GlyphRun.GetCharacterHitFromDistance(distance, out _);
 
-                        var offset = Math.Max(0, currentPosition - shapedRun.Text.Start);
+                        //var offset = 0;
 
-                        if (!shapedRun.GlyphRun.IsLeftToRight)
-                        {
-                            offset = Math.Max(0, offset - shapedRun.Text.End);
-                        }
+                        //if (shapedRun.GlyphRun.IsLeftToRight)
+                        //{
+                        //    offset = Math.Max(0, currentPosition - shapedRun.Text.Start);
+                        //}
+                        //else
+                        //{
+                        //    offset = Math.Max(0, currentPosition - shapedRun.Text.Start + shapedRun.Text.Length);
+                        //}
 
-                        characterHit = new CharacterHit(characterHit.FirstCharacterIndex + offset, characterHit.TrailingLength);
+                        //characterHit = new CharacterHit(characterHit.FirstCharacterIndex + offset, characterHit.TrailingLength);
 
                         break;
                     }
@@ -303,35 +312,50 @@ namespace Avalonia.Media.TextFormatting
                     {
                         var i = index;
 
+                        var rightToLeftWidth = currentRun.Size.Width;
+
                         while (i + 1 <= _textRuns.Count - 1)
                         {
                             var nextRun = _textRuns[i + 1];
 
-                            if (nextRun is ShapedTextCharacters nextShapedRun)
+                            if (nextRun is ShapedTextCharacters nextShapedRun && !nextShapedRun.ShapedBuffer.IsLeftToRight)
                             {
-                                if (nextShapedRun.ShapedBuffer.IsLeftToRight)
-                                {
-                                    break;
-                                }
-                            }
+                                i++;
+
+                                rightToLeftWidth += nextRun.Size.Width;
 
-                            i++;
+                                continue;
+                            }
+                            
+                            break;
                         }
 
-                        while (i > index)
+                        if(i > index)
                         {
-                            var rightToLeftRun = _textRuns[i];
+                            while (i >= index)
+                            {
+                                currentRun = _textRuns[i];
+
+                                rightToLeftWidth -= currentRun.Size.Width;
 
-                            currentPosition += rightToLeftRun.TextSourceLength;
+                                if (currentPosition + currentRun.TextSourceLength >= characterIndex)
+                                {
+                                    break;
+                                }
 
-                            remainingLength -= rightToLeftRun.TextSourceLength;
+                                currentPosition += currentRun.TextSourceLength;
 
-                            i--;
+                                remainingLength -= currentRun.TextSourceLength;
+
+                                i--;
+                            }
+
+                            currentDistance += rightToLeftWidth;
                         }
                     }
 
-                    if (TryGetDistanceFromCharacterHit(currentRun, characterHit, currentPosition, remainingLength,
-                        flowDirection, out var distance, out _))
+                    if (currentPosition + currentRun.TextSourceLength >= characterIndex && 
+                        TryGetDistanceFromCharacterHit(currentRun, characterHit, currentPosition, remainingLength, flowDirection, out var distance, out _))
                     {
                         return currentDistance + distance;
                     }
@@ -608,6 +632,15 @@ namespace Avalonia.Media.TextFormatting
                     }
                     else
                     {
+                        if (currentPosition + currentRun.TextSourceLength <= firstTextSourceIndex)
+                        {
+                            startX += currentRun.Size.Width;
+
+                            currentPosition += currentRun.TextSourceLength;
+
+                            continue;
+                        }
+
                         if (currentPosition < firstTextSourceIndex)
                         {
                             startX += currentRun.Size.Width;

From d524dc9cdbc498ff2c8a468fe7cdcdc125ce37c9 Mon Sep 17 00:00:00 2001
From: Benedikt Stebner <Gillibald@users.noreply.github.com>
Date: Fri, 29 Jul 2022 16:56:43 +0200
Subject: [PATCH 186/240] Only apply the font fallback to regions of missing
 glyphs

---
 samples/Sandbox/MainWindow.axaml              |  26 +---
 samples/Sandbox/MainWindow.axaml.cs           | 115 +-----------------
 .../Media/TextFormatting/TextCharacters.cs    |  26 ++--
 .../Presenters/TextPresenter.cs               |   4 +-
 src/Avalonia.Controls/TextBox.cs              |   2 -
 5 files changed, 18 insertions(+), 155 deletions(-)

diff --git a/samples/Sandbox/MainWindow.axaml b/samples/Sandbox/MainWindow.axaml
index cf2ce63c1f..d429777eeb 100644
--- a/samples/Sandbox/MainWindow.axaml
+++ b/samples/Sandbox/MainWindow.axaml
@@ -1,29 +1,5 @@
 <Window xmlns="https://github.com/avaloniaui"
         xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
         x:Class="Sandbox.MainWindow">
-  <StackPanel>
-    <TextBox x:Name="txtBox" Text="أَبْجَدِيَّة عَرَبِيَّة" SelectionStart="19" SelectionEnd="23"/>
-    <NumericUpDown Value="{Binding #txtBox.SelectionStart, Mode=TwoWay}"/>
-    <NumericUpDown Value="{Binding #txtBox.SelectionEnd, Mode=TwoWay}"/>
-    <RichTextBlock x:Name="txtBlock" Text="أَبْجَدِيَّة عَرَبِيَّة" IsTextSelectionEnabled="True"/>
-    <NumericUpDown Value="{Binding Distance, Mode=TwoWay}"/>
-    <TextBlock Text="{Binding #txtBlock.SelectionStart}"/>
-    <TextBlock Text="{Binding #txtBlock.SelectionEnd}"/>
-    <DockPanel DockPanel.Dock="Top" LastChildFill="False">
-      <RichTextBlock Name="RichTextBlock"
-                     TextAlignment="Left"
-                     Margin="4,4,4,8"
-                     ClipToBounds="True"
-                     FontSize="30"
-                     MaxLines="3"
-                     TextWrapping="Wrap"
-                     FontWeight="DemiBold"
-                     Text="{Binding Text}"
-                     Inlines="{Binding InlineCollection, Mode=OneWay}">
-      </RichTextBlock>
-      <Button Click="Button_OnClick">Update inlines</Button>
-      <Button Click="TextButton_OnClick">Update text</Button>
-    </DockPanel>
-  </StackPanel>
- 
+    <TextBox Text="C:\привет мир\幸福\幸福"/>
 </Window>
diff --git a/samples/Sandbox/MainWindow.axaml.cs b/samples/Sandbox/MainWindow.axaml.cs
index 3040385708..2d36ed6d28 100644
--- a/samples/Sandbox/MainWindow.axaml.cs
+++ b/samples/Sandbox/MainWindow.axaml.cs
@@ -13,126 +13,15 @@ namespace Sandbox
 {
     public class MainWindow : Window
     {
-        private TestViewModel _dc;
-
         public MainWindow()
         {
             this.InitializeComponent();
-            this.AttachDevTools();
-
-            var textBox = this.FindControl<TextBox>("txtBox");
-
-            textBox.TemplateApplied += TextBox_TemplateApplied;          
-        }
-
-        private void TextBox_TemplateApplied(object sender, Avalonia.Controls.Primitives.TemplateAppliedEventArgs e)
-        {
-            var textBox = sender as TextBox;
-
-            var textPresenter = e.NameScope.Find("PART_TextPresenter") as TextPresenter;
-
-            _dc = new TestViewModel(textPresenter);
-
-            DataContext = _dc;
+            this.AttachDevTools();        
         }
 
         private void InitializeComponent()
         {
             AvaloniaXamlLoader.Load(this);
         }
-
-        private void Button_OnClick(object? sender, RoutedEventArgs e)
-        {
-            _dc.InlineCollection = new InlineCollection
-        {
-            new Run(""),
-            new Run("test3") {FontWeight = Avalonia.Media.FontWeight.Bold},
-        };
-            // _dc.Text = "nununu";
-        }
-
-        private void TextButton_OnClick(object? sender, RoutedEventArgs e)
-        {
-            _dc.Text = "nununu";
-        }
-    }
-
-    public class TestViewModel : ViewModelBase
-    {
-        private readonly TextPresenter _textPresenter;
-        private double _distance = 45;
-
-        public TestViewModel(TextPresenter textPresenter)
-        {
-            _textPresenter = textPresenter;
-        }
-
-        private InlineCollection _inlineCollection;
-        private string _text;
-
-        public string Text
-        {
-            get => _text;
-            set
-            {
-                _text = value;
-                RaisePropertyChanged();
-            }
-        }
-
-        public InlineCollection InlineCollection
-        {
-            get => _inlineCollection;
-            set
-            {
-                _inlineCollection = value;
-                RaisePropertyChanged();
-            }
-        }
-
-        public double Distance 
-        { 
-            get => _distance; 
-            set
-            {
-                OnDistanceChanged(value);
-                RaisePropertyChanged();
-            }
-        }
-
-        private void OnDistanceChanged(double distance)
-        {
-            if(distance < 0)
-            {
-                distance = 0;
-            }
-
-            if(distance > _textPresenter.TextLayout.Bounds.Width)
-            {
-                distance = _textPresenter.TextLayout.Bounds.Width;
-            }
-
-            var height = _textPresenter.TextLayout.Bounds.Height;
-
-            var distanceY = height / 2;
-
-            _textPresenter.MoveCaretToPoint(new Point(distance, distanceY));
-
-            var caretIndex = _textPresenter.CaretIndex;
-
-            Debug.WriteLine(caretIndex);
-
-            _distance = distance;
-        }
-    }
-
-    public class ViewModelBase : INotifyPropertyChanged
-    {
-        public event PropertyChangedEventHandler PropertyChanged;
-
-        protected void RaisePropertyChanged([CallerMemberName]string propertyName = "")
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-        }
-    }
+    }    
 }
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextCharacters.cs b/src/Avalonia.Base/Media/TextFormatting/TextCharacters.cs
index ab72601c3e..6611357ee7 100644
--- a/src/Avalonia.Base/Media/TextFormatting/TextCharacters.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/TextCharacters.cs
@@ -38,7 +38,7 @@ namespace Avalonia.Media.TextFormatting
         /// Gets a list of <see cref="ShapeableTextCharacters"/>.
         /// </summary>
         /// <returns>The shapeable text characters.</returns>
-        internal IReadOnlyList<ShapeableTextCharacters> GetShapeableCharacters(ReadOnlySlice<char> runText, sbyte biDiLevel, 
+        internal IReadOnlyList<ShapeableTextCharacters> GetShapeableCharacters(ReadOnlySlice<char> runText, sbyte biDiLevel,
             ref TextRunProperties? previousProperties)
         {
             var shapeableCharacters = new List<ShapeableTextCharacters>(2);
@@ -65,7 +65,7 @@ namespace Avalonia.Media.TextFormatting
         /// <param name="biDiLevel">The bidi level of the run.</param>
         /// <param name="previousProperties"></param>
         /// <returns>A list of shapeable text runs.</returns>
-        private static ShapeableTextCharacters CreateShapeableRun(ReadOnlySlice<char> text, 
+        private static ShapeableTextCharacters CreateShapeableRun(ReadOnlySlice<char> text,
             TextRunProperties defaultProperties, sbyte biDiLevel, ref TextRunProperties? previousProperties)
         {
             var defaultTypeface = defaultProperties.Typeface;
@@ -76,7 +76,7 @@ namespace Avalonia.Media.TextFormatting
             {
                 if (script == Script.Common && previousTypeface is not null)
                 {
-                    if(TryGetShapeableLength(text, previousTypeface.Value, defaultTypeface, out var fallbackCount, out _))
+                    if (TryGetShapeableLength(text, previousTypeface.Value, defaultTypeface, out var fallbackCount, out _))
                     {
                         return new ShapeableTextCharacters(text.Take(fallbackCount),
                             defaultProperties.WithTypeface(previousTypeface.Value), biDiLevel);
@@ -86,10 +86,10 @@ namespace Avalonia.Media.TextFormatting
                 return new ShapeableTextCharacters(text.Take(count), defaultProperties.WithTypeface(currentTypeface),
                     biDiLevel);
             }
-            
+
             if (previousTypeface is not null)
             {
-                if(TryGetShapeableLength(text, previousTypeface.Value, defaultTypeface, out count, out _))
+                if (TryGetShapeableLength(text, previousTypeface.Value, defaultTypeface, out count, out _))
                 {
                     return new ShapeableTextCharacters(text.Take(count),
                         defaultProperties.WithTypeface(previousTypeface.Value), biDiLevel);
@@ -106,12 +106,12 @@ namespace Avalonia.Media.TextFormatting
                 {
                     continue;
                 }
-                
+
                 codepoint = codepointEnumerator.Current;
-                    
+
                 break;
             }
-            
+
             //ToDo: Fix FontFamily fallback
             var matchFound =
                 FontManager.Current.TryMatchCharacter(codepoint, defaultTypeface.Style, defaultTypeface.Weight,
@@ -157,14 +157,14 @@ namespace Avalonia.Media.TextFormatting
         /// <param name="script"></param>
         /// <returns></returns>
         protected static bool TryGetShapeableLength(
-            ReadOnlySlice<char> text, 
-            Typeface typeface, 
+            ReadOnlySlice<char> text,
+            Typeface typeface,
             Typeface? defaultTypeface,
             out int length,
             out Script script)
         {
             length = 0;
-            script = Script.Unknown;         
+            script = Script.Unknown;
 
             if (text.Length == 0)
             {
@@ -182,7 +182,7 @@ namespace Avalonia.Media.TextFormatting
 
                 var currentScript = currentGrapheme.FirstCodepoint.Script;
 
-                if (currentScript != Script.Common && defaultFont != null && defaultFont.TryGetGlyph(currentGrapheme.FirstCodepoint, out _))
+                if (defaultFont != null && defaultFont.TryGetGlyph(currentGrapheme.FirstCodepoint, out _))
                 {
                     break;
                 }
@@ -192,7 +192,7 @@ namespace Avalonia.Media.TextFormatting
                 {
                     break;
                 }
-                
+
                 if (currentScript != script)
                 {
                     if (script is Script.Unknown || currentScript != Script.Common &&
diff --git a/src/Avalonia.Controls/Presenters/TextPresenter.cs b/src/Avalonia.Controls/Presenters/TextPresenter.cs
index 4f9be86641..e540f58195 100644
--- a/src/Avalonia.Controls/Presenters/TextPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/TextPresenter.cs
@@ -498,13 +498,13 @@ namespace Avalonia.Controls.Presenters
 
             IReadOnlyList<ValueSpan<TextRunProperties>>? textStyleOverrides = null;
 
-            if (length > 0)
+            if (length > 0 && SelectionForegroundBrush != null)
             {
                 textStyleOverrides = new[]
                 {
                     new ValueSpan<TextRunProperties>(start, length,
                         new GenericTextRunProperties(typeface, FontSize,
-                            foregroundBrush: SelectionForegroundBrush ?? Brushes.Red))
+                            foregroundBrush: SelectionForegroundBrush))
                 };
             }
 
diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 8490bfd3a0..1773163acc 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -1245,8 +1245,6 @@ namespace Avalonia.Controls
 
                 var caretIndex = hit.TextPosition;
 
-                Debug.WriteLine($"TextPos: {caretIndex}, X: {point.X}");
-
                 var text = Text;
 
                 if (text != null && _wordSelectionStart >= 0)

From ca84dda76b168c0181819df735df3bfa1512b924 Mon Sep 17 00:00:00 2001
From: Benedikt Stebner <Gillibald@users.noreply.github.com>
Date: Fri, 29 Jul 2022 16:59:46 +0200
Subject: [PATCH 187/240] Revert changes

---
 samples/Sandbox/MainWindow.axaml    |  1 -
 samples/Sandbox/MainWindow.axaml.cs | 12 +++---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/samples/Sandbox/MainWindow.axaml b/samples/Sandbox/MainWindow.axaml
index d429777eeb..6929f192c7 100644
--- a/samples/Sandbox/MainWindow.axaml
+++ b/samples/Sandbox/MainWindow.axaml
@@ -1,5 +1,4 @@
 <Window xmlns="https://github.com/avaloniaui"
         xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
         x:Class="Sandbox.MainWindow">
-    <TextBox Text="C:\привет мир\幸福\幸福"/>
 </Window>
diff --git a/samples/Sandbox/MainWindow.axaml.cs b/samples/Sandbox/MainWindow.axaml.cs
index 2d36ed6d28..3d54036d29 100644
--- a/samples/Sandbox/MainWindow.axaml.cs
+++ b/samples/Sandbox/MainWindow.axaml.cs
@@ -1,13 +1,7 @@
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Runtime.CompilerServices;
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Controls.Documents;
-using Avalonia.Controls.Presenters;
-using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
-using Avalonia.VisualTree;
+using Avalonia.Win32.WinRT.Composition;
 
 namespace Sandbox
 {
@@ -16,12 +10,12 @@ namespace Sandbox
         public MainWindow()
         {
             this.InitializeComponent();
-            this.AttachDevTools();        
+            this.AttachDevTools();
         }
 
         private void InitializeComponent()
         {
             AvaloniaXamlLoader.Load(this);
         }
-    }    
+    }
 }

From 6fefe5c8031a2aa24050c477535dff5297ca2f38 Mon Sep 17 00:00:00 2001
From: Benedikt Stebner <Gillibald@users.noreply.github.com>
Date: Fri, 29 Jul 2022 17:27:39 +0200
Subject: [PATCH 188/240] Align justified text to the natural start

---
 .../TextFormatting/InterWordJustification.cs    | 17 ++++++++++++-----
 .../Media/TextFormatting/TextLineImpl.cs        |  5 +++++
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/Avalonia.Base/Media/TextFormatting/InterWordJustification.cs b/src/Avalonia.Base/Media/TextFormatting/InterWordJustification.cs
index df83ada34a..a49e4ef13b 100644
--- a/src/Avalonia.Base/Media/TextFormatting/InterWordJustification.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/InterWordJustification.cs
@@ -15,6 +15,13 @@ namespace Avalonia.Media.TextFormatting
 
         public override void Justify(TextLine textLine)
         {
+            var lineImpl = textLine as TextLineImpl;
+
+            if(lineImpl is null)
+            {
+                return;
+            }
+
             var paragraphWidth = Width;
 
             if (double.IsInfinity(paragraphWidth))
@@ -22,12 +29,12 @@ namespace Avalonia.Media.TextFormatting
                 return;
             }
 
-            if (textLine.NewLineLength > 0)
+            if (lineImpl.NewLineLength > 0)
             {
                 return;
             }
 
-            var textLineBreak = textLine.TextLineBreak;
+            var textLineBreak = lineImpl.TextLineBreak;
 
             if (textLineBreak is not null && textLineBreak.TextEndOfLine is not null)
             {
@@ -39,7 +46,7 @@ namespace Avalonia.Media.TextFormatting
 
             var breakOportunities = new Queue<int>();
 
-            foreach (var textRun in textLine.TextRuns)
+            foreach (var textRun in lineImpl.TextRuns)
             {
                 var text = textRun.Text;
 
@@ -68,10 +75,10 @@ namespace Avalonia.Media.TextFormatting
                 return;
             }
 
-            var remainingSpace = Math.Max(0, paragraphWidth - textLine.WidthIncludingTrailingWhitespace);
+            var remainingSpace = Math.Max(0, paragraphWidth - lineImpl.WidthIncludingTrailingWhitespace);
             var spacing = remainingSpace / breakOportunities.Count;
 
-            foreach (var textRun in textLine.TextRuns)
+            foreach (var textRun in lineImpl.TextRuns)
             {
                 var text = textRun.Text;
 
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs b/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
index 94095cf82b..2c4e553355 100644
--- a/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
@@ -1536,6 +1536,11 @@ namespace Avalonia.Media.TextFormatting
             var textAlignment = _paragraphProperties.TextAlignment;
             var paragraphFlowDirection = _paragraphProperties.FlowDirection;
 
+            if(textAlignment == TextAlignment.Justify)
+            {
+                textAlignment = TextAlignment.Start;
+            }
+
             switch (textAlignment)
             {
                 case TextAlignment.Start:

From 2cf660b601c69ad28656dfb36de0be96c5a4783b Mon Sep 17 00:00:00 2001
From: Benedikt Stebner <Gillibald@users.noreply.github.com>
Date: Fri, 29 Jul 2022 19:53:44 +0200
Subject: [PATCH 189/240] Second attempt to fix the font fallback

---
 src/Avalonia.Base/Media/TextFormatting/TextCharacters.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Base/Media/TextFormatting/TextCharacters.cs b/src/Avalonia.Base/Media/TextFormatting/TextCharacters.cs
index 6611357ee7..42a9e61c36 100644
--- a/src/Avalonia.Base/Media/TextFormatting/TextCharacters.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/TextCharacters.cs
@@ -182,7 +182,7 @@ namespace Avalonia.Media.TextFormatting
 
                 var currentScript = currentGrapheme.FirstCodepoint.Script;
 
-                if (defaultFont != null && defaultFont.TryGetGlyph(currentGrapheme.FirstCodepoint, out _))
+                if (!currentGrapheme.FirstCodepoint.IsWhiteSpace && defaultFont != null && defaultFont.TryGetGlyph(currentGrapheme.FirstCodepoint, out _))
                 {
                     break;
                 }

From d5084eaf7582b83630c7a7b1c90b88f17503ce8e Mon Sep 17 00:00:00 2001
From: Benedikt Stebner <Gillibald@users.noreply.github.com>
Date: Fri, 29 Jul 2022 20:14:48 +0200
Subject: [PATCH 190/240] Fix GetCharacterHitFromDistance

---
 .../Media/TextFormatting/TextLineImpl.cs      | 24 +++++++++----------
 src/Avalonia.Controls/RichTextBlock.cs        |  2 +-
 src/Avalonia.Controls/TextBox.cs              |  4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs b/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
index 2c4e553355..b9147c0f65 100644
--- a/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
@@ -260,18 +260,18 @@ namespace Avalonia.Media.TextFormatting
                     {
                         characterHit = shapedRun.GlyphRun.GetCharacterHitFromDistance(distance, out _);
 
-                        //var offset = 0;
-
-                        //if (shapedRun.GlyphRun.IsLeftToRight)
-                        //{
-                        //    offset = Math.Max(0, currentPosition - shapedRun.Text.Start);
-                        //}
-                        //else
-                        //{
-                        //    offset = Math.Max(0, currentPosition - shapedRun.Text.Start + shapedRun.Text.Length);
-                        //}
-
-                        //characterHit = new CharacterHit(characterHit.FirstCharacterIndex + offset, characterHit.TrailingLength);
+                        var offset = 0;
+
+                        if (shapedRun.GlyphRun.IsLeftToRight)
+                        {
+                            offset = Math.Max(0, currentPosition - shapedRun.Text.Start);
+                        }
+                        else
+                        {
+                            offset = Math.Max(0, currentPosition - shapedRun.Text.Start + shapedRun.Text.Length);
+                        }
+
+                        characterHit = new CharacterHit(characterHit.FirstCharacterIndex + offset, characterHit.TrailingLength);
 
                         break;
                     }
diff --git a/src/Avalonia.Controls/RichTextBlock.cs b/src/Avalonia.Controls/RichTextBlock.cs
index 2f8bed3be7..1f8abbc30d 100644
--- a/src/Avalonia.Controls/RichTextBlock.cs
+++ b/src/Avalonia.Controls/RichTextBlock.cs
@@ -276,7 +276,7 @@ namespace Avalonia.Controls
 
         protected override void SetText(string? text)
         {
-            var oldValue = _text ?? Inlines?.Text;
+            var oldValue = GetText();
       
             AddText(text);        
 
diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 1773163acc..4c9e9327d4 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -1241,9 +1241,9 @@ namespace Avalonia.Controls
                     MathUtilities.Clamp(point.X, 0, Math.Max(_presenter.Bounds.Width - 1, 0)),
                     MathUtilities.Clamp(point.Y, 0, Math.Max(_presenter.Bounds.Height - 1, 0)));
 
-                var hit = _presenter.TextLayout.HitTestPoint(point);    
+                _presenter.MoveCaretToPoint(point);  
 
-                var caretIndex = hit.TextPosition;
+                var caretIndex = _presenter.CaretIndex;
 
                 var text = Text;
 

From adc81678ca6049def8124965642b3ad90b34e462 Mon Sep 17 00:00:00 2001
From: Benedikt Stebner <Gillibald@users.noreply.github.com>
Date: Fri, 29 Jul 2022 21:56:27 +0200
Subject: [PATCH 191/240] Only add offsets for LeftToRight runs

---
 src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs b/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
index b9147c0f65..6c6939d2a0 100644
--- a/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
@@ -266,10 +266,10 @@ namespace Avalonia.Media.TextFormatting
                         {
                             offset = Math.Max(0, currentPosition - shapedRun.Text.Start);
                         }
-                        else
-                        {
-                            offset = Math.Max(0, currentPosition - shapedRun.Text.Start + shapedRun.Text.Length);
-                        }
+                        //else
+                        //{
+                        //    offset = Math.Max(0, currentPosition - shapedRun.Text.Start + shapedRun.Text.Length);
+                        //}
 
                         characterHit = new CharacterHit(characterHit.FirstCharacterIndex + offset, characterHit.TrailingLength);
 

From c94120c065a69838399f87814b8bbcc0340e5789 Mon Sep 17 00:00:00 2001
From: Benedikt Stebner <Gillibald@users.noreply.github.com>
Date: Sat, 30 Jul 2022 09:53:07 +0200
Subject: [PATCH 192/240] Try to fix tests on mac

---
 .../Media/TextFormatting/TextLayoutTests.cs                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs
index c457a96299..43948e9229 100644
--- a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs
+++ b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs
@@ -1005,7 +1005,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
 
                         var distance = textLine.GetDistanceFromCharacterHit(new CharacterHit(cluster));
 
-                        Assert.Equal(currentX, distance);
+                        Assert.Equal(currentX, distance, 5);
 
                         currentX += glyphAdvance;
 

From 2a5760921761d819264d190a381a2314b09a0516 Mon Sep 17 00:00:00 2001
From: Evgeny Gorbovoy <e.gorbovoy@staffwerke.de>
Date: Sat, 30 Jul 2022 17:16:16 +0200
Subject: [PATCH 193/240] + more `ContainsExclusive` for nodes

---
 .../Rendering/SceneGraph/ExperimentalAcrylicNode.cs             | 2 +-
 src/Avalonia.Base/Rendering/SceneGraph/GlyphRunNode.cs          | 2 +-
 src/Avalonia.Base/Rendering/SceneGraph/ImageNode.cs             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Avalonia.Base/Rendering/SceneGraph/ExperimentalAcrylicNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/ExperimentalAcrylicNode.cs
index 59ebcf5109..12b67105e9 100644
--- a/src/Avalonia.Base/Rendering/SceneGraph/ExperimentalAcrylicNode.cs
+++ b/src/Avalonia.Base/Rendering/SceneGraph/ExperimentalAcrylicNode.cs
@@ -83,7 +83,7 @@ namespace Avalonia.Rendering.SceneGraph
                 if (Material != null)
                 {
                     var rect = Rect.Rect;
-                    return rect.Contains(p);
+                    return rect.ContainsExclusive(p);
                 }
             }
 
diff --git a/src/Avalonia.Base/Rendering/SceneGraph/GlyphRunNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/GlyphRunNode.cs
index 9199611ed6..1f58111ecf 100644
--- a/src/Avalonia.Base/Rendering/SceneGraph/GlyphRunNode.cs
+++ b/src/Avalonia.Base/Rendering/SceneGraph/GlyphRunNode.cs
@@ -73,6 +73,6 @@ namespace Avalonia.Rendering.SceneGraph
         }
 
         /// <inheritdoc/>
-        public override bool HitTest(Point p) => Bounds.Contains(p);
+        public override bool HitTest(Point p) => Bounds.ContainsExclusive(p);
     }
 }
diff --git a/src/Avalonia.Base/Rendering/SceneGraph/ImageNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/ImageNode.cs
index 23267166a5..339881e675 100644
--- a/src/Avalonia.Base/Rendering/SceneGraph/ImageNode.cs
+++ b/src/Avalonia.Base/Rendering/SceneGraph/ImageNode.cs
@@ -109,7 +109,7 @@ namespace Avalonia.Rendering.SceneGraph
         }
 
         /// <inheritdoc/>
-        public override bool HitTest(Point p) => Bounds.Contains(p);
+        public override bool HitTest(Point p) => Bounds.ContainsExclusive(p);
 
         public override void Dispose()
         {

From 86265f49aa8c9b13d2e420f505a65ad9df16f5b2 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Sat, 30 Jul 2022 16:03:48 -0400
Subject: [PATCH 194/240] Update samples/ControlCatalog/App.xaml.cs

---
 samples/ControlCatalog/App.xaml.cs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/samples/ControlCatalog/App.xaml.cs b/samples/ControlCatalog/App.xaml.cs
index a5535ea52d..7ebb87094a 100644
--- a/samples/ControlCatalog/App.xaml.cs
+++ b/samples/ControlCatalog/App.xaml.cs
@@ -78,12 +78,9 @@ namespace ControlCatalog
 
         public override void Initialize()
         {
-            Styles.Insert(0, DefaultLight);
-            Styles.Insert(1, ColorPickerDefault);
-            Styles.Insert(2, DataGridDefault);
-            //Styles.Insert(0, Fluent);
-            //Styles.Insert(1, ColorPickerFluent);
-            //Styles.Insert(2, DataGridFluent);
+            Styles.Insert(0, Fluent);
+            Styles.Insert(1, ColorPickerFluent);
+            Styles.Insert(2, DataGridFluent);
             AvaloniaXamlLoader.Load(this);
         }
 

From 33931e99bb9222339b50994b514f960d4b3c34b2 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Sat, 30 Jul 2022 23:57:00 -0400
Subject: [PATCH 195/240] Fix unit tests

---
 tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
index 0bb6c01041..29148e6f2e 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
@@ -466,7 +466,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
                 var xaml = @"
 <Styles xmlns='https://github.com/avaloniaui'
         xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
-    <StyleInclude Source='avares://Avalonia.Themes.Default/Controls/ContextMenu.xaml'/>
+    <StyleInclude Source='avares://Avalonia.Themes.Default/Controls/UserControl.xaml'/>
 </Styles>";
 
                 var styles = AvaloniaRuntimeXamlLoader.Parse<Styles>(xaml);

From 195ef79e0a3151007eaa3d3b64a8a79d269ee915 Mon Sep 17 00:00:00 2001
From: robloo <robloo@users.noreply.github.com>
Date: Sun, 31 Jul 2022 00:19:34 -0400
Subject: [PATCH 196/240] Convert ColorPicker default styles to ControlThemes

---
 .../Themes/Default/ColorPreviewer.xaml        |  23 +-
 .../Themes/Default/ColorSlider.xaml           | 346 +++++++++---------
 .../Themes/Default/ColorSpectrum.xaml         |  94 ++---
 .../Themes/Default/Default.xaml               |  76 ++--
 4 files changed, 274 insertions(+), 265 deletions(-)

diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Default/ColorPreviewer.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Default/ColorPreviewer.xaml
index c3bc7df4a4..e067fe4ab5 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Default/ColorPreviewer.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Default/ColorPreviewer.xaml
@@ -1,15 +1,14 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:pc="using:Avalonia.Controls.Primitives.Converters"
-        x:CompileBindings="True">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:pc="using:Avalonia.Controls.Primitives.Converters"
+                    x:CompileBindings="True">
 
-  <Styles.Resources>
-    <pc:AccentColorConverter x:Key="AccentColorConverter" />
-    <x:Double x:Key="ColorPreviewerAccentSectionWidth">80</x:Double>
-    <x:Double x:Key="ColorPreviewerAccentSectionHeight">40</x:Double>
-  </Styles.Resources>
+  <pc:AccentColorConverter x:Key="AccentColorConverter" />
+  <x:Double x:Key="ColorPreviewerAccentSectionWidth">80</x:Double>
+  <x:Double x:Key="ColorPreviewerAccentSectionHeight">40</x:Double>
 
-  <Style Selector="ColorPreviewer">
+  <ControlTheme x:Key="{x:Type ColorPreviewer}"
+                TargetType="ColorPreviewer">
     <Setter Property="Height" Value="70" />
     <Setter Property="CornerRadius" Value="0" />
     <Setter Property="Template">
@@ -97,6 +96,6 @@
         </Panel>
       </ControlTemplate>
     </Setter>
-  </Style>
+  </ControlTheme>
 
-</Styles>
+</ResourceDictionary>
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Default/ColorSlider.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Default/ColorSlider.xaml
index 35cd7a9faa..9aa2dcd9f9 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Default/ColorSlider.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Default/ColorSlider.xaml
@@ -1,188 +1,190 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        x:CompileBindings="True">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    x:CompileBindings="True">
 
-  <Style Selector="Thumb.ColorSliderThumbStyle">
-    <Setter Property="BorderThickness" Value="0" />
+  <ControlTheme x:Key="ColorSliderThumbTheme"
+                TargetType="Thumb">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeForegroundBrush}" />
+    <Setter Property="BorderThickness" Value="3" />
+    <Setter Property="CornerRadius" Value="10" />
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate>
           <Border Background="{TemplateBinding Background}"
                   BorderBrush="{TemplateBinding BorderBrush}"
                   BorderThickness="{TemplateBinding BorderThickness}"
-                  CornerRadius="10" />
+                  CornerRadius="{TemplateBinding CornerRadius}" />
         </ControlTemplate>
       </Setter.Value>
     </Setter>
-  </Style>
+  </ControlTheme>
 
-  <Style Selector="ColorSlider:horizontal">
-    <Setter Property="BorderThickness" Value="0" />
-    <Setter Property="CornerRadius" Value="10" />
-    <Setter Property="Height" Value="20" />
-    <Setter Property="Template">
-      <ControlTemplate TargetType="{x:Type ColorSlider}">
-        <Border BorderThickness="{TemplateBinding BorderThickness}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                CornerRadius="{TemplateBinding CornerRadius}">
-          <Grid Margin="{TemplateBinding Padding}">
-            <Rectangle HorizontalAlignment="Stretch"
-                       VerticalAlignment="Stretch"
-                       Fill="{StaticResource ColorControlCheckeredBackgroundBrush}"
-                       RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadiusConverter}}"
-                       RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadiusConverter}}" />
-            <Rectangle HorizontalAlignment="Stretch"
-                       VerticalAlignment="Stretch"
-                       Fill="{TemplateBinding Background}"
-                       RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadiusConverter}}"
-                       RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadiusConverter}}" />
-            <Track Name="PART_Track"
-                   HorizontalAlignment="Stretch"
-                   VerticalAlignment="Stretch"
-                   Minimum="{TemplateBinding Minimum}"
-                   Maximum="{TemplateBinding Maximum}"
-                   Value="{TemplateBinding Value, Mode=TwoWay}"
-                   IsDirectionReversed="{TemplateBinding IsDirectionReversed}"
-                   Orientation="Horizontal">
-              <Track.DecreaseButton>
-                <RepeatButton Name="PART_DecreaseButton"
-                              Background="Transparent"
-                              Focusable="False"
-                              HorizontalAlignment="Stretch"
-                              VerticalAlignment="Stretch">
-                  <RepeatButton.Template>
-                    <ControlTemplate>
-                      <Border Name="FocusTarget"
-                              Background="Transparent"
-                              Margin="0,-10" />
-                    </ControlTemplate>
-                  </RepeatButton.Template>
-                </RepeatButton>
-              </Track.DecreaseButton>
-              <Track.IncreaseButton>
-                <RepeatButton Name="PART_IncreaseButton"
-                              Background="Transparent"
-                              Focusable="False"
-                              HorizontalAlignment="Stretch"
-                              VerticalAlignment="Stretch">
-                  <RepeatButton.Template>
-                    <ControlTemplate>
-                      <Border Name="FocusTarget"
-                              Background="Transparent"
-                              Margin="0,-10" />
-                    </ControlTemplate>
-                  </RepeatButton.Template>
-                </RepeatButton>
-              </Track.IncreaseButton>
-              <Thumb Classes="ColorSliderThumbStyle"
-                     Name="ColorSliderThumb"
-                     Margin="0"
-                     Padding="0"
-                     DataContext="{TemplateBinding Value}"
-                     Height="{TemplateBinding Height}"
-                     Width="{TemplateBinding Height}" />
-            </Track>
-          </Grid>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
+  <ControlTheme x:Key="{x:Type ColorSlider}"
+                TargetType="ColorSlider">
 
-  <Style Selector="ColorSlider:vertical">
-    <Setter Property="BorderThickness" Value="0" />
-    <Setter Property="CornerRadius" Value="10" />
-    <Setter Property="Width" Value="20" />
-    <Setter Property="Template">
-      <ControlTemplate TargetType="{x:Type ColorSlider}">
-        <Border BorderThickness="{TemplateBinding BorderThickness}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                CornerRadius="{TemplateBinding CornerRadius}">
-          <Grid Margin="{TemplateBinding Padding}">
-            <Rectangle HorizontalAlignment="Stretch"
-                       VerticalAlignment="Stretch"
-                       Fill="{StaticResource ColorControlCheckeredBackgroundBrush}"
-                       RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadiusConverter}}"
-                       RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadiusConverter}}" />
-            <Rectangle HorizontalAlignment="Stretch"
-                       VerticalAlignment="Stretch"
-                       Fill="{TemplateBinding Background}"
-                       RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadiusConverter}}"
-                       RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadiusConverter}}" />
-            <Track Name="PART_Track"
-                   HorizontalAlignment="Stretch"
-                   VerticalAlignment="Stretch"
-                   Minimum="{TemplateBinding Minimum}"
-                   Maximum="{TemplateBinding Maximum}"
-                   Value="{TemplateBinding Value, Mode=TwoWay}"
-                   IsDirectionReversed="{TemplateBinding IsDirectionReversed}"
-                   Orientation="Vertical">
-              <Track.DecreaseButton>
-                <RepeatButton Name="PART_DecreaseButton"
-                              Background="Transparent"
-                              Focusable="False"
-                              HorizontalAlignment="Stretch"
-                              VerticalAlignment="Stretch">
-                  <RepeatButton.Template>
-                    <ControlTemplate>
-                      <Border Name="FocusTarget"
-                              Background="Transparent"
-                              Margin="0,-10" />
-                    </ControlTemplate>
-                  </RepeatButton.Template>
-                </RepeatButton>
-              </Track.DecreaseButton>
-              <Track.IncreaseButton>
-                <RepeatButton Name="PART_IncreaseButton"
-                              Background="Transparent"
-                              Focusable="False"
-                              HorizontalAlignment="Stretch"
-                              VerticalAlignment="Stretch">
-                  <RepeatButton.Template>
-                    <ControlTemplate>
-                      <Border Name="FocusTarget"
-                              Background="Transparent"
-                              Margin="0,-10" />
-                    </ControlTemplate>
-                  </RepeatButton.Template>
-                </RepeatButton>
-              </Track.IncreaseButton>
-              <Thumb Classes="ColorSliderThumbStyle"
-                     Name="ColorSliderThumb"
-                     Margin="0"
-                     Padding="0"
-                     DataContext="{TemplateBinding Value}"
-                     Height="{TemplateBinding Width}"
-                     Width="{TemplateBinding Width}" />
-            </Track>
-          </Grid>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
+    <Style Selector="^:horizontal">
+      <Setter Property="BorderThickness" Value="0" />
+      <Setter Property="CornerRadius" Value="10" />
+      <Setter Property="Height" Value="20" />
+      <Setter Property="Template">
+        <ControlTemplate TargetType="{x:Type ColorSlider}">
+          <Border BorderThickness="{TemplateBinding BorderThickness}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <Grid Margin="{TemplateBinding Padding}">
+              <Rectangle HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         Fill="{StaticResource ColorControlCheckeredBackgroundBrush}"
+                         RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadiusConverter}}"
+                         RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadiusConverter}}" />
+              <Rectangle HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         Fill="{TemplateBinding Background}"
+                         RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadiusConverter}}"
+                         RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadiusConverter}}" />
+              <Track Name="PART_Track"
+                     HorizontalAlignment="Stretch"
+                     VerticalAlignment="Stretch"
+                     Minimum="{TemplateBinding Minimum}"
+                     Maximum="{TemplateBinding Maximum}"
+                     Value="{TemplateBinding Value, Mode=TwoWay}"
+                     IsDirectionReversed="{TemplateBinding IsDirectionReversed}"
+                     Orientation="Horizontal">
+                <Track.DecreaseButton>
+                  <RepeatButton Name="PART_DecreaseButton"
+                                Background="Transparent"
+                                Focusable="False"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch">
+                    <RepeatButton.Template>
+                      <ControlTemplate>
+                        <Border Name="FocusTarget"
+                                Background="Transparent"
+                                Margin="0,-10" />
+                      </ControlTemplate>
+                    </RepeatButton.Template>
+                  </RepeatButton>
+                </Track.DecreaseButton>
+                <Track.IncreaseButton>
+                  <RepeatButton Name="PART_IncreaseButton"
+                                Background="Transparent"
+                                Focusable="False"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch">
+                    <RepeatButton.Template>
+                      <ControlTemplate>
+                        <Border Name="FocusTarget"
+                                Background="Transparent"
+                                Margin="0,-10" />
+                      </ControlTemplate>
+                    </RepeatButton.Template>
+                  </RepeatButton>
+                </Track.IncreaseButton>
+                <Thumb Name="ColorSliderThumb"
+                       Theme="{StaticResource ColorSliderThumbTheme}"
+                       Margin="0"
+                       Padding="0"
+                       DataContext="{TemplateBinding Value}"
+                       Height="{TemplateBinding Height}"
+                       Width="{TemplateBinding Height}" />
+              </Track>
+            </Grid>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+    </Style>
 
-  <!-- Normal State -->
-  <Style Selector="ColorSlider /template/ Thumb.ColorSliderThumbStyle">
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeForegroundBrush}" />
-    <Setter Property="BorderThickness" Value="3" />
-  </Style>
+    <Style Selector="^:vertical">
+      <Setter Property="BorderThickness" Value="0" />
+      <Setter Property="CornerRadius" Value="10" />
+      <Setter Property="Width" Value="20" />
+      <Setter Property="Template">
+        <ControlTemplate TargetType="{x:Type ColorSlider}">
+          <Border BorderThickness="{TemplateBinding BorderThickness}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <Grid Margin="{TemplateBinding Padding}">
+              <Rectangle HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         Fill="{StaticResource ColorControlCheckeredBackgroundBrush}"
+                         RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadiusConverter}}"
+                         RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadiusConverter}}" />
+              <Rectangle HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         Fill="{TemplateBinding Background}"
+                         RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadiusConverter}}"
+                         RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadiusConverter}}" />
+              <Track Name="PART_Track"
+                     HorizontalAlignment="Stretch"
+                     VerticalAlignment="Stretch"
+                     Minimum="{TemplateBinding Minimum}"
+                     Maximum="{TemplateBinding Maximum}"
+                     Value="{TemplateBinding Value, Mode=TwoWay}"
+                     IsDirectionReversed="{TemplateBinding IsDirectionReversed}"
+                     Orientation="Vertical">
+                <Track.DecreaseButton>
+                  <RepeatButton Name="PART_DecreaseButton"
+                                Background="Transparent"
+                                Focusable="False"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch">
+                    <RepeatButton.Template>
+                      <ControlTemplate>
+                        <Border Name="FocusTarget"
+                                Background="Transparent"
+                                Margin="0,-10" />
+                      </ControlTemplate>
+                    </RepeatButton.Template>
+                  </RepeatButton>
+                </Track.DecreaseButton>
+                <Track.IncreaseButton>
+                  <RepeatButton Name="PART_IncreaseButton"
+                                Background="Transparent"
+                                Focusable="False"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch">
+                    <RepeatButton.Template>
+                      <ControlTemplate>
+                        <Border Name="FocusTarget"
+                                Background="Transparent"
+                                Margin="0,-10" />
+                      </ControlTemplate>
+                    </RepeatButton.Template>
+                  </RepeatButton>
+                </Track.IncreaseButton>
+                <Thumb Name="ColorSliderThumb"
+                       Theme="{StaticResource ColorSliderThumbTheme}"
+                       Margin="0"
+                       Padding="0"
+                       DataContext="{TemplateBinding Value}"
+                       Height="{TemplateBinding Width}"
+                       Width="{TemplateBinding Width}" />
+              </Track>
+            </Grid>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+    </Style>
+
+    <!-- Selector/Thumb Color -->
+    <Style Selector="^:pointerover /template/ Thumb#ColorSliderThumb">
+      <Setter Property="Opacity" Value="0.75" />
+    </Style>
+    <Style Selector="^:pointerover:dark-selector /template/ Thumb#ColorSliderThumb">
+      <Setter Property="Opacity" Value="0.7" />
+    </Style>
+    <Style Selector="^:pointerover:light-selector /template/ Thumb#ColorSliderThumb">
+      <Setter Property="Opacity" Value="0.8" />
+    </Style>
 
-  <!-- Selector/Thumb Color -->
-  <Style Selector="ColorSlider:pointerover /template/ Thumb.ColorSliderThumbStyle">
-    <Setter Property="Opacity" Value="0.75" />
-  </Style>
-  <Style Selector="ColorSlider:pointerover:dark-selector /template/ Thumb.ColorSliderThumbStyle">
-    <Setter Property="Opacity" Value="0.7" />
-  </Style>
-  <Style Selector="ColorSlider:pointerover:light-selector /template/ Thumb.ColorSliderThumbStyle">
-    <Setter Property="Opacity" Value="0.8" />
-  </Style>
+    <Style Selector="^:dark-selector /template/ Thumb#ColorSliderThumb">
+      <Setter Property="BorderBrush" Value="Black" />
+    </Style>
+    <Style Selector="^:light-selector /template/ Thumb#ColorSliderThumb">
+      <Setter Property="BorderBrush" Value="White" />
+    </Style>
 
-  <Style Selector="ColorSlider:dark-selector /template/ Thumb.ColorSliderThumbStyle">
-    <Setter Property="BorderBrush" Value="Black" />
-  </Style>
-  <Style Selector="ColorSlider:light-selector /template/ Thumb.ColorSliderThumbStyle">
-    <Setter Property="BorderBrush" Value="White" />
-  </Style>
+  </ControlTheme>
 
-</Styles>
+</ResourceDictionary>
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Default/ColorSpectrum.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Default/ColorSpectrum.xaml
index 0e57f6b483..0e137c89c6 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Default/ColorSpectrum.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Default/ColorSpectrum.xaml
@@ -1,9 +1,10 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:controls="using:Avalonia.Controls"
-        x:CompileBindings="True">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="using:Avalonia.Controls"
+                    x:CompileBindings="True">
 
-  <Style Selector="ColorSpectrum">
+  <ControlTheme x:Key="{x:Type ColorSpectrum}"
+                TargetType="ColorSpectrum">
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type ColorSpectrum}">
@@ -79,50 +80,51 @@
         </ControlTemplate>
       </Setter.Value>
     </Setter>
-  </Style>
 
-  <!-- Normal -->
-  <!-- Separating this allows easier customization in applications -->
-  <Style Selector="ColorSpectrum /template/ Ellipse#BorderEllipse,
-                   ColorSpectrum /template/ Rectangle#BorderRectangle">
-    <Setter Property="Stroke" Value="{DynamicResource ThemeBorderLowBrush}" />
-    <Setter Property="StrokeThickness" Value="1" />
-  </Style>
+    <!-- Normal -->
+    <!-- Separating this allows easier customization in applications -->
+    <Style Selector="^ /template/ Ellipse#BorderEllipse,
+                     ^ /template/ Rectangle#BorderRectangle">
+      <Setter Property="Stroke" Value="{DynamicResource ThemeBorderLowBrush}" />
+      <Setter Property="StrokeThickness" Value="1" />
+    </Style>
 
-  <!-- Focus -->
-  <Style Selector="ColorSpectrum /template/ Ellipse#FocusEllipse">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-  <Style Selector="ColorSpectrum:focus-visible /template/ Ellipse#FocusEllipse">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
+    <!-- Focus -->
+    <Style Selector="^ /template/ Ellipse#FocusEllipse">
+      <Setter Property="IsVisible" Value="False" />
+    </Style>
+    <Style Selector="^:focus-visible /template/ Ellipse#FocusEllipse">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
 
-  <!-- Selector Color -->
-  <Style Selector="ColorSpectrum /template/ Ellipse#FocusEllipse">
-    <Setter Property="Stroke" Value="White" />
-  </Style>
-  <Style Selector="ColorSpectrum /template/ Ellipse#SelectionEllipse">
-    <Setter Property="Stroke" Value="Black" />
-  </Style>
-  <Style Selector="ColorSpectrum:light-selector /template/ Ellipse#FocusEllipse">
-    <Setter Property="Stroke" Value="Black" />
-  </Style>
-  <Style Selector="ColorSpectrum:light-selector /template/ Ellipse#SelectionEllipse">
-    <Setter Property="Stroke" Value="White" />
-  </Style>
+    <!-- Selector Color -->
+    <Style Selector="^ /template/ Ellipse#FocusEllipse">
+      <Setter Property="Stroke" Value="White" />
+    </Style>
+    <Style Selector="^ /template/ Ellipse#SelectionEllipse">
+      <Setter Property="Stroke" Value="Black" />
+    </Style>
+    <Style Selector="^:light-selector /template/ Ellipse#FocusEllipse">
+      <Setter Property="Stroke" Value="Black" />
+    </Style>
+    <Style Selector="^:light-selector /template/ Ellipse#SelectionEllipse">
+      <Setter Property="Stroke" Value="White" />
+    </Style>
 
-  <Style Selector="ColorSpectrum:pointerover /template/ Ellipse#SelectionEllipse">
-    <Setter Property="Opacity" Value="0.8" />
-  </Style>
+    <Style Selector="^:pointerover /template/ Ellipse#SelectionEllipse">
+      <Setter Property="Opacity" Value="0.8" />
+    </Style>
 
-  <!-- Selector Size -->
-  <Style Selector="ColorSpectrum /template/ Panel#PART_SelectionEllipsePanel">
-    <Setter Property="Width" Value="16" />
-    <Setter Property="Height" Value="16" />
-  </Style>
-  <Style Selector="ColorSpectrum:large-selector /template/ Panel#PART_SelectionEllipsePanel">
-    <Setter Property="Width" Value="48" />
-    <Setter Property="Height" Value="48" />
-  </Style>
+    <!-- Selector Size -->
+    <Style Selector="^ /template/ Panel#PART_SelectionEllipsePanel">
+      <Setter Property="Width" Value="16" />
+      <Setter Property="Height" Value="16" />
+    </Style>
+    <Style Selector="^:large-selector /template/ Panel#PART_SelectionEllipsePanel">
+      <Setter Property="Width" Value="48" />
+      <Setter Property="Height" Value="48" />
+    </Style>
 
-</Styles>
+  </ControlTheme>
+
+</ResourceDictionary>
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Default/Default.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Default/Default.xaml
index db1fa3ee4e..b452e34394 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Default/Default.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Default/Default.xaml
@@ -3,42 +3,48 @@
         xmlns:converters="using:Avalonia.Controls.Converters">
 
   <Styles.Resources>
-    <!-- Shared Resources -->
-    <VisualBrush x:Key="ColorControlCheckeredBackgroundBrush"
-                 TileMode="Tile"
-                 Stretch="Uniform"
-                 DestinationRect="0,0,8,8">
-      <VisualBrush.Visual>
-        <DrawingPresenter Width="8"
-                          Height="8">
-          <DrawingGroup>
-            <GeometryDrawing Geometry="M0,0 L2,0 2,2, 0,2Z"
-                             Brush="Transparent" />
-            <GeometryDrawing Geometry="M0,1 L2,1 2,2, 1,2 1,0 0,0Z"
-                             Brush="#19808080" />
-          </DrawingGroup>
-        </DrawingPresenter>
-      </VisualBrush.Visual>
-    </VisualBrush>
-    
-    <!-- Shared Converters -->
-    <converters:EnumToBoolConverter x:Key="EnumToBoolConverter" />
-    <converters:ToBrushConverter x:Key="ToBrushConverter" />
-    <converters:CornerRadiusFilterConverter x:Key="LeftCornerRadiusFilterConverter" Filter="TopLeft, BottomLeft"/>
-    <converters:CornerRadiusFilterConverter x:Key="RightCornerRadiusFilterConverter" Filter="TopRight, BottomRight"/>
-    <converters:CornerRadiusFilterConverter x:Key="TopCornerRadiusFilterConverter" Filter="TopLeft, TopRight"/>
-    <converters:CornerRadiusFilterConverter x:Key="BottomCornerRadiusFilterConverter" Filter="BottomLeft, BottomRight"/>
-    <converters:CornerRadiusToDoubleConverter x:Key="TopLeftCornerRadiusConverter" Corner="TopLeft" />
-    <converters:CornerRadiusToDoubleConverter x:Key="BottomRightCornerRadiusConverter" Corner="BottomRight" />
-  </Styles.Resources>
+    <ResourceDictionary>
+
+      <!-- Shared Resources -->
+      <VisualBrush x:Key="ColorControlCheckeredBackgroundBrush"
+                   TileMode="Tile"
+                   Stretch="Uniform"
+                   DestinationRect="0,0,8,8">
+        <VisualBrush.Visual>
+          <DrawingPresenter Width="8"
+                            Height="8">
+            <DrawingGroup>
+              <GeometryDrawing Geometry="M0,0 L2,0 2,2, 0,2Z"
+                               Brush="Transparent" />
+              <GeometryDrawing Geometry="M0,1 L2,1 2,2, 1,2 1,0 0,0Z"
+                               Brush="#19808080" />
+            </DrawingGroup>
+          </DrawingPresenter>
+        </VisualBrush.Visual>
+      </VisualBrush>
+
+      <!-- Shared Converters -->
+      <converters:EnumToBoolConverter x:Key="EnumToBoolConverter" />
+      <converters:ToBrushConverter x:Key="ToBrushConverter" />
+      <converters:CornerRadiusFilterConverter x:Key="LeftCornerRadiusFilterConverter" Filter="TopLeft, BottomLeft"/>
+      <converters:CornerRadiusFilterConverter x:Key="RightCornerRadiusFilterConverter" Filter="TopRight, BottomRight"/>
+      <converters:CornerRadiusFilterConverter x:Key="TopCornerRadiusFilterConverter" Filter="TopLeft, TopRight"/>
+      <converters:CornerRadiusFilterConverter x:Key="BottomCornerRadiusFilterConverter" Filter="BottomLeft, BottomRight"/>
+      <converters:CornerRadiusToDoubleConverter x:Key="TopLeftCornerRadiusConverter" Corner="TopLeft" />
+      <converters:CornerRadiusToDoubleConverter x:Key="BottomRightCornerRadiusConverter" Corner="BottomRight" />
 
-  <!-- Primitives -->
-  <StyleInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Default/ColorPreviewer.xaml" />
-  <StyleInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Default/ColorSlider.xaml" />
-  <StyleInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Default/ColorSpectrum.xaml" />
+      <ResourceDictionary.MergedDictionaries>
 
-  <!-- Controls -->
-  <!-- Note the ColorPicker and ColorView are unsupported in the default theme -->
-  <!-- These controls depend on fluent styles for TabControl, Button, TextBox, etc. -->
+        <!-- Primitives -->
+        <ResourceInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Default/ColorPreviewer.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Default/ColorSlider.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Default/ColorSpectrum.xaml" />
 
+        <!-- Controls -->
+        <!-- Note the ColorPicker and ColorView are unsupported in the default theme -->
+        <!-- These controls depend on fluent styles for TabControl, Button, TextBox, etc. -->
+
+      </ResourceDictionary.MergedDictionaries>
+    </ResourceDictionary>
+  </Styles.Resources>
 </Styles>

From bdd451cdf96179dc9c28659ee21db3cec8b8ee0b Mon Sep 17 00:00:00 2001
From: robloo <robloo@users.noreply.github.com>
Date: Sun, 31 Jul 2022 00:39:45 -0400
Subject: [PATCH 197/240] Adjust ColorPicker tab background corner radius

---
 .../Themes/Fluent/ColorPicker.xaml                | 15 ++++-----------
 .../Themes/Fluent/ColorView.xaml                  |  8 ++++++++
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPicker.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPicker.xaml
index 907b00dfff..50c5c06479 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPicker.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPicker.xaml
@@ -3,9 +3,6 @@
                     xmlns:controls="using:Avalonia.Controls"
                     x:CompileBindings="True">
 
-  <!-- This must follow OverlayCornerRadius -->
-  <CornerRadius x:Key="TopOverlayCornerRadius">5,5,0,0</CornerRadius>
-
   <ControlTheme x:Key="{x:Type ColorPicker}"
                 TargetType="ColorPicker">
     <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
@@ -25,7 +22,7 @@
                         Padding="0,0,10,0"
                         UseLayoutRounding="False">
           <DropDownButton.Styles>
-            <Style Selector="FlyoutPresenter.NoPadding">
+            <Style Selector="FlyoutPresenter.nopadding">
               <Setter Property="Padding" Value="0" />
             </Style>
           </DropDownButton.Styles>
@@ -45,8 +42,10 @@
             </Panel>
           </DropDownButton.Content>
           <DropDownButton.Flyout>
-            <Flyout FlyoutPresenterClasses="NoPadding">
+            <Flyout FlyoutPresenterClasses="nopadding"
+                    Placement="Bottom">
               <ColorView x:Name="FlyoutColorView"
+                         Classes="topoverlay"
                          Color="{Binding Color, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
                          ColorModel="{Binding ColorModel, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
                          ColorSpectrumComponents="{TemplateBinding ColorSpectrumComponents}"
@@ -81,10 +80,4 @@
     </Setter>
   </ControlTheme>
 
-  <!-- Adjust Background within Flyout -->
-  <!-- Note: This is implemented but there seems to be an issue and the selector can't match across the Flyout -->
-  <!--<Style Selector="ColorPicker /template/ ColorView#FlyoutColorView /template/ Border#TabBackgroundBorder">
-    <Setter Property="CornerRadius" Value="{DynamicResource TopOverlayCornerRadius}" />
-  </Style>-->
-
 </ResourceDictionary>
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml
index 993745b1e5..153b4422ea 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml
@@ -77,6 +77,8 @@
     17.7761 14 17.5 14H9.94999ZM7.5 16C6.67157 16 6 15.3284 6 14.5C6 13.6716 6.67157 13 7.5
     13C8.32843 13 9 13.6716 9 14.5C9 15.3284 8.32843 16 7.5 16Z
   </PathGeometry>
+  <!-- This must follow OverlayCornerRadius -->
+  <CornerRadius x:Key="TopOverlayCornerRadius">5,5,0,0</CornerRadius>
 
   <ControlTheme x:Key="{x:Type ColorView}"
                 TargetType="ColorView">
@@ -644,6 +646,12 @@
         </Grid>
       </ControlTemplate>
     </Setter>
+
+    <!-- Special style used to customize the top tab area corner radius -->
+    <Style Selector="^.topoverlay /template/ Border#TabBackgroundBorder">
+      <Setter Property="CornerRadius" Value="{DynamicResource TopOverlayCornerRadius}" />
+    </Style>
+
   </ControlTheme>
 
 </ResourceDictionary>

From b3bd2e54ecb5fe274164f9ddd96be7482b4a1173 Mon Sep 17 00:00:00 2001
From: Takoooooo <tako0qq@gmail.com>
Date: Mon, 1 Aug 2022 16:19:41 +0300
Subject: [PATCH 198/240] Use correct ToggleModifier in ListBox multiselection
 on MacOS.

---
 src/Avalonia.Controls/ListBox.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/ListBox.cs b/src/Avalonia.Controls/ListBox.cs
index 79285bb86b..80b5259a53 100644
--- a/src/Avalonia.Controls/ListBox.cs
+++ b/src/Avalonia.Controls/ListBox.cs
@@ -6,6 +6,7 @@ using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Selection;
 using Avalonia.Controls.Templates;
 using Avalonia.Input;
+using Avalonia.Input.Platform;
 using Avalonia.VisualTree;
 
 namespace Avalonia.Controls
@@ -157,7 +158,7 @@ namespace Avalonia.Controls
                         e.Source,
                         true,
                         e.KeyModifiers.HasAllFlags(KeyModifiers.Shift),
-                        e.KeyModifiers.HasAllFlags(KeyModifiers.Control),
+                        e.KeyModifiers.HasAllFlags(AvaloniaLocator.Current.GetRequiredService<PlatformHotkeyConfiguration>().CommandModifiers),
                         point.Properties.IsRightButtonPressed);
                 }
             }

From 9f031603424cbcd7b1f4f5bcc5ce38c0c2b93152 Mon Sep 17 00:00:00 2001
From: Tako <53405089+Takoooooo@users.noreply.github.com>
Date: Mon, 1 Aug 2022 18:27:15 +0300
Subject: [PATCH 199/240] Update MacOS vmImage because current one is
 deprecated

https://github.com/actions/virtual-environments/issues/5583
---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index edf3c3d819..dde1da1446 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -59,7 +59,7 @@ jobs:
   variables:
     SolutionDir: '$(Build.SourcesDirectory)'
   pool:
-    vmImage: 'macOS-10.15'
+    vmImage: 'macos-12'
   steps:
   - task: UseDotNet@2
     displayName: 'Use .NET Core SDK 3.1.418'

From 8d3984b929e21e44cda15c420d5818ff925dbd4e Mon Sep 17 00:00:00 2001
From: Tako <53405089+Takoooooo@users.noreply.github.com>
Date: Mon, 1 Aug 2022 18:31:34 +0300
Subject: [PATCH 200/240] macos-12 is in beta,use macos-11 instead

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index dde1da1446..78012b9041 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -59,7 +59,7 @@ jobs:
   variables:
     SolutionDir: '$(Build.SourcesDirectory)'
   pool:
-    vmImage: 'macos-12'
+    vmImage: 'macos-11'
   steps:
   - task: UseDotNet@2
     displayName: 'Use .NET Core SDK 3.1.418'

From 326fffc9fe14aafb571abc794331fe357423df7b Mon Sep 17 00:00:00 2001
From: Tako <53405089+Takoooooo@users.noreply.github.com>
Date: Mon, 1 Aug 2022 18:45:11 +0300
Subject: [PATCH 201/240] WIP

---
 azure-pipelines.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 78012b9041..1d2fe88341 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -59,7 +59,7 @@ jobs:
   variables:
     SolutionDir: '$(Build.SourcesDirectory)'
   pool:
-    vmImage: 'macos-11'
+    vmImage: 'macos-12'
   steps:
   - task: UseDotNet@2
     displayName: 'Use .NET Core SDK 3.1.418'
@@ -91,7 +91,7 @@ jobs:
     inputs:
       actions: 'build'
       scheme: ''
-      sdk: 'macosx11.1'
+      sdk: 'macosx13.1'
       configuration: 'Release'
       xcWorkspacePath: '**/*.xcodeproj/project.xcworkspace'
       xcodeVersion: '12' # Options: 8, 9, default, specifyPath

From a62c7936690d28cb8a42ac2304b5a30de50b1afc Mon Sep 17 00:00:00 2001
From: Tako <53405089+Takoooooo@users.noreply.github.com>
Date: Mon, 1 Aug 2022 18:52:59 +0300
Subject: [PATCH 202/240] WIP

---
 azure-pipelines.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 1d2fe88341..2a6e1b5475 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -59,7 +59,7 @@ jobs:
   variables:
     SolutionDir: '$(Build.SourcesDirectory)'
   pool:
-    vmImage: 'macos-12'
+    vmImage: 'macos-11'
   steps:
   - task: UseDotNet@2
     displayName: 'Use .NET Core SDK 3.1.418'
@@ -91,7 +91,7 @@ jobs:
     inputs:
       actions: 'build'
       scheme: ''
-      sdk: 'macosx13.1'
+      sdk: 'macosx12.2'
       configuration: 'Release'
       xcWorkspacePath: '**/*.xcodeproj/project.xcworkspace'
       xcodeVersion: '12' # Options: 8, 9, default, specifyPath

From ebb8ffed1969c5d9156b6affa381a0ebf8c55e4f Mon Sep 17 00:00:00 2001
From: Tako <53405089+Takoooooo@users.noreply.github.com>
Date: Mon, 1 Aug 2022 19:10:25 +0300
Subject: [PATCH 203/240] WIP

---
 azure-pipelines.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 2a6e1b5475..7e4ba64fb9 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -59,7 +59,7 @@ jobs:
   variables:
     SolutionDir: '$(Build.SourcesDirectory)'
   pool:
-    vmImage: 'macos-11'
+    vmImage: 'macos-12'
   steps:
   - task: UseDotNet@2
     displayName: 'Use .NET Core SDK 3.1.418'
@@ -91,10 +91,10 @@ jobs:
     inputs:
       actions: 'build'
       scheme: ''
-      sdk: 'macosx12.2'
+      sdk: 'macosx12.3'
       configuration: 'Release'
       xcWorkspacePath: '**/*.xcodeproj/project.xcworkspace'
-      xcodeVersion: '12' # Options: 8, 9, default, specifyPath
+      xcodeVersion: '13.3' # Options: 8, 9, default, specifyPath
       args: '-derivedDataPath ./'
 
   - task: CmdLine@2

From 3d845206cd8d6c7a4395000b0892015354e0bc99 Mon Sep 17 00:00:00 2001
From: Tako <53405089+Takoooooo@users.noreply.github.com>
Date: Mon, 1 Aug 2022 19:31:40 +0300
Subject: [PATCH 204/240] WIP

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 7e4ba64fb9..52fc8db53c 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -94,7 +94,7 @@ jobs:
       sdk: 'macosx12.3'
       configuration: 'Release'
       xcWorkspacePath: '**/*.xcodeproj/project.xcworkspace'
-      xcodeVersion: '13.3' # Options: 8, 9, default, specifyPath
+      xcodeVersion: '13' # Options: 8, 9, default, specifyPath
       args: '-derivedDataPath ./'
 
   - task: CmdLine@2

From f87052311bd6e3448a198000fd1fe1915c5ab7c6 Mon Sep 17 00:00:00 2001
From: robloo <robloo@users.noreply.github.com>
Date: Mon, 1 Aug 2022 22:01:38 -0400
Subject: [PATCH 205/240] Use resources to adjust tab background corner radius
 in ColorPicker

---
 .../Themes/Fluent/ColorPicker.xaml                   |  8 ++++++--
 .../Themes/Fluent/ColorView.xaml                     | 12 +++---------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPicker.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPicker.xaml
index 50c5c06479..797d6c90d7 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPicker.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPicker.xaml
@@ -45,7 +45,6 @@
             <Flyout FlyoutPresenterClasses="nopadding"
                     Placement="Bottom">
               <ColorView x:Name="FlyoutColorView"
-                         Classes="topoverlay"
                          Color="{Binding Color, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
                          ColorModel="{Binding ColorModel, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
                          ColorSpectrumComponents="{TemplateBinding ColorSpectrumComponents}"
@@ -72,7 +71,12 @@
                          PaletteColors="{TemplateBinding PaletteColors}"
                          PaletteColumnCount="{TemplateBinding PaletteColumnCount}"
                          Palette="{TemplateBinding Palette}"
-                         SelectedIndex="{Binding SelectedIndex, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}" />
+                         SelectedIndex="{Binding SelectedIndex, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}">
+                <ColorView.Resources>
+                  <!-- This radius must follow OverlayCornerRadius -->
+                  <CornerRadius x:Key="ColorViewTabBackgroundCornerRadius">5,5,0,0</CornerRadius>
+                </ColorView.Resources>
+              </ColorView>
             </Flyout>
           </DropDownButton.Flyout>
         </DropDownButton>
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml
index 153b4422ea..59cc48975f 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml
@@ -77,8 +77,8 @@
     17.7761 14 17.5 14H9.94999ZM7.5 16C6.67157 16 6 15.3284 6 14.5C6 13.6716 6.67157 13 7.5
     13C8.32843 13 9 13.6716 9 14.5C9 15.3284 8.32843 16 7.5 16Z
   </PathGeometry>
-  <!-- This must follow OverlayCornerRadius -->
-  <CornerRadius x:Key="TopOverlayCornerRadius">5,5,0,0</CornerRadius>
+  <!-- This radius should follow ControlCornerRadius -->
+  <CornerRadius x:Key="ColorViewTabBackgroundCornerRadius">3</CornerRadius>
 
   <ControlTheme x:Key="{x:Type ColorView}"
                 TargetType="ColorView">
@@ -99,7 +99,7 @@
                   HorizontalAlignment="Stretch"
                   VerticalAlignment="Top"
                   Background="{DynamicResource SystemControlBackgroundBaseLowBrush}"
-                  CornerRadius="{TemplateBinding CornerRadius}" />
+                  CornerRadius="{DynamicResource ColorViewTabBackgroundCornerRadius}" />
           <Border x:Name="ContentBackgroundBorder"
                   Grid.Row="0"
                   Grid.RowSpan="2"
@@ -646,12 +646,6 @@
         </Grid>
       </ControlTemplate>
     </Setter>
-
-    <!-- Special style used to customize the top tab area corner radius -->
-    <Style Selector="^.topoverlay /template/ Border#TabBackgroundBorder">
-      <Setter Property="CornerRadius" Value="{DynamicResource TopOverlayCornerRadius}" />
-    </Style>
-
   </ControlTheme>
 
 </ResourceDictionary>

From 53e7a741c9a476e83a4a0c89956715bac8cf42cc Mon Sep 17 00:00:00 2001
From: robloo <robloo@users.noreply.github.com>
Date: Mon, 1 Aug 2022 22:01:55 -0400
Subject: [PATCH 206/240] Switch back to default flyout placement in
 ColorPicker

---
 .../Themes/Fluent/ColorPicker.xaml                             | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPicker.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPicker.xaml
index 797d6c90d7..74a1df4991 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPicker.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPicker.xaml
@@ -42,8 +42,7 @@
             </Panel>
           </DropDownButton.Content>
           <DropDownButton.Flyout>
-            <Flyout FlyoutPresenterClasses="nopadding"
-                    Placement="Bottom">
+            <Flyout FlyoutPresenterClasses="nopadding">
               <ColorView x:Name="FlyoutColorView"
                          Color="{Binding Color, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
                          ColorModel="{Binding ColorModel, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"

From b38a50009ec409a788c38a0220694918258ca0dc Mon Sep 17 00:00:00 2001
From: Giuseppe Lippolis <workgroupengineering@outlook.com>
Date: Tue, 2 Aug 2022 11:48:20 +0200
Subject: [PATCH 207/240] fix: XML Comment

---
 src/Avalonia.Base/Media/TextFormatting/Unicode/Codepoint.cs   | 2 +-
 .../Rendering/Composition/Animations/CompositionAnimation.cs  | 4 ++--
 .../Rendering/Composition/Animations/ExpressionAnimation.cs   | 2 +-
 .../Rendering/Composition/Animations/KeyFrameAnimation.cs     | 4 ++--
 src/Avalonia.Base/Rendering/SceneGraph/GeometryNode.cs        | 2 +-
 src/Avalonia.Base/Rendering/SceneGraph/GlyphRunNode.cs        | 2 +-
 src/Avalonia.Base/Rendering/SceneGraph/LineNode.cs            | 2 +-
 src/Avalonia.Base/Rendering/SceneGraph/OpacityMaskNode.cs     | 2 +-
 src/Avalonia.Base/Rendering/SceneGraph/RectangleNode.cs       | 2 +-
 src/Avalonia.Base/Utilities/MathUtilities.cs                  | 2 +-
 10 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/Avalonia.Base/Media/TextFormatting/Unicode/Codepoint.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/Codepoint.cs
index 56a90f31ea..ab17263806 100644
--- a/src/Avalonia.Base/Media/TextFormatting/Unicode/Codepoint.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/Unicode/Codepoint.cs
@@ -224,7 +224,7 @@ namespace Avalonia.Media.TextFormatting.Unicode
         }
 
         /// <summary>
-        /// Returns <see langword="true"/> if <paramref name="value"/> is between
+        /// Returns <see langword="true"/> if <paramref name="cp"/> is between
         /// <paramref name="lowerBound"/> and <paramref name="upperBound"/>, inclusive.
         /// </summary>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
diff --git a/src/Avalonia.Base/Rendering/Composition/Animations/CompositionAnimation.cs b/src/Avalonia.Base/Rendering/Composition/Animations/CompositionAnimation.cs
index 19d316eb85..23f2aeaf90 100644
--- a/src/Avalonia.Base/Rendering/Composition/Animations/CompositionAnimation.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Animations/CompositionAnimation.cs
@@ -16,10 +16,10 @@ namespace Avalonia.Rendering.Composition.Animations
     /// This is the base class for ExpressionAnimation and KeyFrameAnimation.
     /// </summary>
     /// <remarks>
-    /// Use the <see cref="CompositionObject.StartAnimation"/> method to start the animation.
+    /// Use the <see cref="CompositionObject.StartAnimation(string , CompositionAnimation)"/> method to start the animation.
     /// Value parameters (as opposed to reference parameters which are set using <see cref="SetReferenceParameter"/>)
     /// are copied and "embedded" into an expression at the time CompositionObject.StartAnimation is called.
-    /// Changing the value of the variable after <see cref="CompositionObject.StartAnimation"/> is called will not affect
+    /// Changing the value of the variable after <see cref="CompositionObject.StartAnimation(string , CompositionAnimation)"/> is called will not affect
     /// the value of the ExpressionAnimation.
     /// See the remarks section of ExpressionAnimation for additional information.
     /// </remarks>
diff --git a/src/Avalonia.Base/Rendering/Composition/Animations/ExpressionAnimation.cs b/src/Avalonia.Base/Rendering/Composition/Animations/ExpressionAnimation.cs
index 577910d975..ec2972044e 100644
--- a/src/Avalonia.Base/Rendering/Composition/Animations/ExpressionAnimation.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Animations/ExpressionAnimation.cs
@@ -16,7 +16,7 @@ namespace Avalonia.Rendering.Composition.Animations
     /// This contrasts <see cref="KeyFrameAnimation"/>s, which use an interpolator to define how the animating
     /// property changes over time. The mathematical equation can be defined using references to properties
     /// of Composition objects, mathematical functions and operators and Input.
-    /// Use the <see cref="CompositionObject.StartAnimation"/> method to start the animation.
+    /// Use the <see cref="CompositionObject.StartAnimation(string , CompositionAnimation)"/> method to start the animation.
     /// </remarks>
     public class ExpressionAnimation : CompositionAnimation
     {
diff --git a/src/Avalonia.Base/Rendering/Composition/Animations/KeyFrameAnimation.cs b/src/Avalonia.Base/Rendering/Composition/Animations/KeyFrameAnimation.cs
index 4692fde5e3..d21a4d06e3 100644
--- a/src/Avalonia.Base/Rendering/Composition/Animations/KeyFrameAnimation.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Animations/KeyFrameAnimation.cs
@@ -24,9 +24,9 @@ namespace Avalonia.Rendering.Composition.Animations
         /// The delay behavior of the key frame animation.
         /// </summary>
         public AnimationDelayBehavior DelayBehavior { get; set; }
-        
+
         /// <summary>
-        /// Delay before the animation starts after <see cref="CompositionObject.StartAnimation"/> is called.
+        /// Delay before the animation starts after <see cref="CompositionObject.StartAnimation(string , CompositionAnimation)"/> is called.
         /// </summary>
         public System.TimeSpan DelayTime { get; set; }
         
diff --git a/src/Avalonia.Base/Rendering/SceneGraph/GeometryNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/GeometryNode.cs
index 4b43f93aee..e1d43b4268 100644
--- a/src/Avalonia.Base/Rendering/SceneGraph/GeometryNode.cs
+++ b/src/Avalonia.Base/Rendering/SceneGraph/GeometryNode.cs
@@ -19,7 +19,7 @@ namespace Avalonia.Rendering.SceneGraph
         /// <param name="brush">The fill brush.</param>
         /// <param name="pen">The stroke pen.</param>
         /// <param name="geometry">The geometry.</param>
-        /// <param name="childScenes">Child scenes for drawing visual brushes.</param>
+        /// <param name="aux">Auxiliary data required to draw the brush.</param>
         public GeometryNode(Matrix transform,
             IBrush? brush,
             IPen? pen,
diff --git a/src/Avalonia.Base/Rendering/SceneGraph/GlyphRunNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/GlyphRunNode.cs
index 1f58111ecf..b23b0684d3 100644
--- a/src/Avalonia.Base/Rendering/SceneGraph/GlyphRunNode.cs
+++ b/src/Avalonia.Base/Rendering/SceneGraph/GlyphRunNode.cs
@@ -19,7 +19,7 @@ namespace Avalonia.Rendering.SceneGraph
         /// <param name="transform">The transform.</param>
         /// <param name="foreground">The foreground brush.</param>
         /// <param name="glyphRun">The glyph run to draw.</param>
-        /// <param name="childScenes">Child scenes for drawing visual brushes.</param>
+        /// <param name="aux">Auxiliary data required to draw the brush.</param>
         public GlyphRunNode(
             Matrix transform,
             IBrush foreground,
diff --git a/src/Avalonia.Base/Rendering/SceneGraph/LineNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/LineNode.cs
index ee5ec0a5fc..b027e43378 100644
--- a/src/Avalonia.Base/Rendering/SceneGraph/LineNode.cs
+++ b/src/Avalonia.Base/Rendering/SceneGraph/LineNode.cs
@@ -19,7 +19,7 @@ namespace Avalonia.Rendering.SceneGraph
         /// <param name="pen">The stroke pen.</param>
         /// <param name="p1">The start point of the line.</param>
         /// <param name="p2">The end point of the line.</param>
-        /// <param name="childScenes">Child scenes for drawing visual brushes.</param>
+        /// <param name="aux">Auxiliary data required to draw the brush.</param>
         public LineNode(
             Matrix transform,
             IPen pen,
diff --git a/src/Avalonia.Base/Rendering/SceneGraph/OpacityMaskNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/OpacityMaskNode.cs
index 549c1fd7de..5fd200ddff 100644
--- a/src/Avalonia.Base/Rendering/SceneGraph/OpacityMaskNode.cs
+++ b/src/Avalonia.Base/Rendering/SceneGraph/OpacityMaskNode.cs
@@ -17,7 +17,7 @@ namespace Avalonia.Rendering.SceneGraph
         /// </summary>
         /// <param name="mask">The opacity mask to push.</param>
         /// <param name="bounds">The bounds of the mask.</param>
-        /// <param name="childScenes">Child scenes for drawing visual brushes.</param>
+        /// <param name="aux">Auxiliary data required to draw the brush.</param>
         public OpacityMaskNode(IBrush mask, Rect bounds, IDisposable? aux = null)
             : base(Rect.Empty, Matrix.Identity, aux)
         {
diff --git a/src/Avalonia.Base/Rendering/SceneGraph/RectangleNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/RectangleNode.cs
index a9d1bf96e5..f2ffd7411c 100644
--- a/src/Avalonia.Base/Rendering/SceneGraph/RectangleNode.cs
+++ b/src/Avalonia.Base/Rendering/SceneGraph/RectangleNode.cs
@@ -20,7 +20,7 @@ namespace Avalonia.Rendering.SceneGraph
         /// <param name="pen">The stroke pen.</param>
         /// <param name="rect">The rectangle to draw.</param>
         /// <param name="boxShadows">The box shadow parameters</param>
-        /// <param name="childScenes">Child scenes for drawing visual brushes.</param>
+        /// <param name="aux">Auxiliary data required to draw the brush.</param>
         public RectangleNode(
             Matrix transform,
             IBrush? brush,
diff --git a/src/Avalonia.Base/Utilities/MathUtilities.cs b/src/Avalonia.Base/Utilities/MathUtilities.cs
index 3d5be806e1..d381979c1e 100644
--- a/src/Avalonia.Base/Utilities/MathUtilities.cs
+++ b/src/Avalonia.Base/Utilities/MathUtilities.cs
@@ -255,7 +255,7 @@ namespace Avalonia.Utilities
         /// <summary>
         /// Clamps a value between a minimum and maximum value.
         /// </summary>
-        /// <param name="val">The value.</param>
+        /// <param name="value">The value.</param>
         /// <param name="min">The minimum value.</param>
         /// <param name="max">The maximum value.</param>
         /// <returns>The clamped value.</returns>

From 89c0ef56371bddf68590f8f21efe61672d1084fc Mon Sep 17 00:00:00 2001
From: Giuseppe Lippolis <workgroupengineering@outlook.com>
Date: Tue, 2 Aug 2022 12:02:04 +0200
Subject: [PATCH 208/240] refactoring: removed some unused namespace

---
 .../Rendering/Composition/Animations/CompositionAnimation.cs  | 3 ---
 src/Avalonia.Base/Rendering/SceneGraph/GeometryNode.cs        | 2 --
 src/Avalonia.Base/Rendering/SceneGraph/GlyphRunNode.cs        | 4 ----
 src/Avalonia.Base/Rendering/SceneGraph/LineNode.cs            | 2 --
 src/Skia/Avalonia.Skia/ImmutableBitmap.cs                     | 3 ---
 src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs           | 2 --
 6 files changed, 16 deletions(-)

diff --git a/src/Avalonia.Base/Rendering/Composition/Animations/CompositionAnimation.cs b/src/Avalonia.Base/Rendering/Composition/Animations/CompositionAnimation.cs
index 19d316eb85..5499e1119a 100644
--- a/src/Avalonia.Base/Rendering/Composition/Animations/CompositionAnimation.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Animations/CompositionAnimation.cs
@@ -1,12 +1,9 @@
 // ReSharper disable InconsistentNaming
 // ReSharper disable CheckNamespace
 
-using System;
-using System.Collections.Generic;
 using System.Numerics;
 using Avalonia.Rendering.Composition.Expressions;
 using Avalonia.Rendering.Composition.Server;
-using Avalonia.Rendering.Composition.Transport;
 
 // Special license applies <see href="https://raw.githubusercontent.com/AvaloniaUI/Avalonia/master/src/Avalonia.Base/Rendering/Composition/License.md">License.md</see>
 
diff --git a/src/Avalonia.Base/Rendering/SceneGraph/GeometryNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/GeometryNode.cs
index 4b43f93aee..747e96f130 100644
--- a/src/Avalonia.Base/Rendering/SceneGraph/GeometryNode.cs
+++ b/src/Avalonia.Base/Rendering/SceneGraph/GeometryNode.cs
@@ -1,9 +1,7 @@
 using System;
-using System.Collections.Generic;
 using Avalonia.Media;
 using Avalonia.Media.Immutable;
 using Avalonia.Platform;
-using Avalonia.VisualTree;
 
 namespace Avalonia.Rendering.SceneGraph
 {
diff --git a/src/Avalonia.Base/Rendering/SceneGraph/GlyphRunNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/GlyphRunNode.cs
index 1f58111ecf..ed45e54f57 100644
--- a/src/Avalonia.Base/Rendering/SceneGraph/GlyphRunNode.cs
+++ b/src/Avalonia.Base/Rendering/SceneGraph/GlyphRunNode.cs
@@ -1,10 +1,6 @@
 using System;
-using System.Collections.Generic;
-
 using Avalonia.Media;
-using Avalonia.Media.Immutable;
 using Avalonia.Platform;
-using Avalonia.VisualTree;
 
 namespace Avalonia.Rendering.SceneGraph
 {
diff --git a/src/Avalonia.Base/Rendering/SceneGraph/LineNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/LineNode.cs
index ee5ec0a5fc..973b28dead 100644
--- a/src/Avalonia.Base/Rendering/SceneGraph/LineNode.cs
+++ b/src/Avalonia.Base/Rendering/SceneGraph/LineNode.cs
@@ -1,9 +1,7 @@
 using System;
-using System.Collections.Generic;
 using Avalonia.Media;
 using Avalonia.Media.Immutable;
 using Avalonia.Platform;
-using Avalonia.VisualTree;
 
 namespace Avalonia.Rendering.SceneGraph
 {
diff --git a/src/Skia/Avalonia.Skia/ImmutableBitmap.cs b/src/Skia/Avalonia.Skia/ImmutableBitmap.cs
index a80f406989..6400d67fde 100644
--- a/src/Skia/Avalonia.Skia/ImmutableBitmap.cs
+++ b/src/Skia/Avalonia.Skia/ImmutableBitmap.cs
@@ -1,11 +1,8 @@
 using System;
 using System.IO;
-using System.Runtime.CompilerServices;
-using System.Security.Cryptography;
 using Avalonia.Media.Imaging;
 using Avalonia.Platform;
 using Avalonia.Skia.Helpers;
-using Avalonia.Media.Imaging;
 using SkiaSharp;
 
 namespace Avalonia.Skia
diff --git a/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs b/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs
index 7f1af46e97..81fa8c4bce 100644
--- a/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs
+++ b/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
 using Avalonia.Controls;
@@ -9,7 +8,6 @@ using Avalonia.Direct2D1.Media.Imaging;
 using Avalonia.Media;
 using Avalonia.Media.Imaging;
 using Avalonia.Platform;
-using Avalonia.Media.Imaging;
 using SharpDX.DirectWrite;
 using GlyphRun = Avalonia.Media.GlyphRun;
 using TextAlignment = Avalonia.Media.TextAlignment;

From bf9a0d8656d787fc67a7ba8aea3f9c6097624f0c Mon Sep 17 00:00:00 2001
From: Benedikt Stebner <Gillibald@users.noreply.github.com>
Date: Tue, 2 Aug 2022 13:17:01 +0200
Subject: [PATCH 209/240] Use a different arabic font for tests

---
 .../Assets/NotoKufiArabic-Regular.ttf          | Bin 122736 -> 0 bytes
 .../Assets/NotoSansArabic-Regular.ttf          | Bin 0 -> 177004 bytes
 .../Media/CustomFontManagerImpl.cs             |   8 +++++++-
 .../Media/TextFormatting/TextLayoutTests.cs    |   2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)
 delete mode 100644 tests/Avalonia.RenderTests/Assets/NotoKufiArabic-Regular.ttf
 create mode 100644 tests/Avalonia.RenderTests/Assets/NotoSansArabic-Regular.ttf

diff --git a/tests/Avalonia.RenderTests/Assets/NotoKufiArabic-Regular.ttf b/tests/Avalonia.RenderTests/Assets/NotoKufiArabic-Regular.ttf
deleted file mode 100644
index 6d2ad86f947a530de5dec09b9a230948d0f512c3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 122736
zcmdqK3w#^Zl|Mc+vMfikWyyM5k}X-5<@Zar<+tP5PMkP#oH$N!$ol~V!XqRh1SpUO
z`Ywgi0)5dfg?5*=3$&%}mUovHw(a&^O6h~PyL7wVZejZaN|$K-JNGf8JENJ=$maL?
z{6Bw4VreYR{ho8r>z;e=8II>T&dJ@#S-5@cCa2aO`pD%Tj{nC)9LMikH@A7d)qnD4
zj(^}uj*HK&n_pP-!rdo-&+$KW!I#!-p6}?s`GWa#9Dn9FaF>1a+s3zDeZ@uZ<M<c1
z!TZR;OZQ)K<!J9`IsWadInL60;nC9<Jk|N&Y53irIR5f&7aiVzDD=eF;rCYs;acBC
zaKY}e!uvCi!u$G*E<JJel~t+x;rDYK=Qw)w@`L*?`usoN!SPq@<2dWrF5Q3i6~e3B
zoA7=$d_H#B{!0&k?Bb_W9Dnmsjw{`B#pTCO@PBOH#_{j{F2~h<m=n0}rOiTv@DxyM
z<G3B}xH}nl$GiDg#Yz4q@w$gBSDw42-y#6<-1yR8`ET$a;p#c=R9|1Fp`o`Y)7O{o
z_6KYY4T-u^pVuGAj0$OAozr3)_qY2Z_0^$0qxHiff2cD!IFg9?(=(k8@20)`HhEWD
z%PgJ^t-~!X?Ul}%ii(k;h7qTwbXCa~o1>zl1dRtA=N=Q@0A$>J+MPJGxG21lEu+8T
z*TQdBaopi<pU;~}xYKTa+-m*R;%v#36+X6oX^Crv@Bg>uk<tcXGrY11cXJ=$IC7m|
zi?7cruBXK}xL1WYN*jPH==1k-ci_*%bu=1W2PD#UPFVT{ynDs+2-n5+0z#)HQP+^d
zjIgDEJ(w|me;Tn##iUUoV*`R-sc1;m+3h}u-DPzIDgurwTV;jSX}4F|oxZ+KZ@i+?
z9;)=$R92QXHrwB~xM(S}l$Kg7B_$;ehtFA6vI@Oi74tWD+REBWOGDMJKpAf>6W*4c
z<On`QC*T`e4!$(uY_TYBf>|&R^n);6FeghdivO$N{l^IJ(RBsyrR#qMG3d7Jljrs^
z?!9QPmeBRJ_&S+ed>!Vk0<QCxJ3wMwoEOOx7F?e%k?BFAYeVx<(e55-Xli@)DR)&>
zZJ87J-I-4Jb+)%ht80TN5KqZ{*3$b_Yu|_RO?@}a7sU-J?MTk~2ZhIETJGkzE(su~
zx$9I;(RHMUFu4!&FL6~Icf1ZsS6?PwinK2s2Q@gi{cvfyZO&HK)68GEaM4bGrq^3P
zoybh`cZy;1ZOa&Z8|;h5w+VRVJ#MyImA5&9CXHWu9dPf3J5_Sr!Mfhwo^%?9CpWNK
ztv4;c9sZpvfnjr>=bnepgVyFgk3UI176!c=U+TxSIk*~*o5IwAf$@1uQ~8wgpQ^5@
zsSZb@Pbx@$wl*5AjfcbWXO*bKz&3P$OuYkHu>$uer09$SOwk(%lMDLy`cgmUkAs7u
zcPMC4a_cjcj&D(}<!;RI58sb_5%}lee0ul$EWOh+=uYa}gt-!KTzru7H^3#hK8_n#
z;G(t)_?>31CpCEgF@H^s-&b3ENgy5%RM$j5h(?B=;>(K35Ff0LMyt`^Ya+4QXe<(r
zqv=6EpHoi{Mn`7{p&MQ{Iy!SEF~U@uhlwY*Wa)MBLH;&87YJz@ECItWBCAAhm3&mr
z`;YW^_*JX*p2a(iVKJh?5j;^DPg}8gZqY;Xrq%l7q7io_)dkx)E}oTTt66{UbTt{I
zC#<Q_;#o;%9@f`wJiaVFokfk$YPv28Bqjxc5Z$+ce4M4aAK+5@vyoESO>7Am1d>J2
z8ki9PJRbLJI{$Gq<7tkhKTMdj!u-BZp5Fx5!L3p9n3Z%r4bYnVbRbgW^VZb7(-)2U
zg5k&)Rqy{(X;9u5sg6`vN1~xnG#WzxepY?qU)6?%V3%bBVV{0Wuv57yjshe{MH4~f
z$_jGzKF02JaAV53HZuoFmCRkQ;<uXr;&&u#WCArKlpI0pm90_-H&8s<oQ8}P!1*dR
zRi-h9AzGvnOlc{K3CVjDp}>3au*jmJNK4oa9yh?LEE>yci-v!!Cw{T!c52aHQAjcW
zQY03OAY&#OG%=hfwRn8X7#&|_(F%-DCDRxMNMd0ivPFYv?>6C4%nOx8W3lim>AF(I
z2k|K?O~Ry_1=&Yg=>eMtBVIvARM|A`5#OsG>+g|B=nn*88CbQYeasy98Cf-rdA71{
zzq_v&uO=WA=Z!fpzSuo9+|@lg+8wN|4F+q&h36sscl}*m{R17HgWV*cieQ_(w2zUH
zVI#Yyfu2aoGHF0|Y-iDAAaT;71fu1AjC`eyESp-!Y&w&mD|?TrVC##B4qRm00B=q@
z+l*{m4zC_kZOMJRX_#8VfueoJevxP&ucaVS0jtIg^E$!2){qnaMm9c#6&H>6YdlJ;
z_M8;#zZ2<pJd8qqV&bx&R+~4BPL^E~?K3EfKu2wzIgH5WnTLsuA4J#4_F4L|?IY2?
zDWuA1|Jyn|+#?yphjh7j?pf9{5<FMPcu=%o6rSJdAh`;g%fc|gZc4KC3(6DKN|Kdx
z)>doD*4wqvfQ-GNkS*a-#GP;?T1{n(EF{r7U#!-XtrsXd)k?AmbX2y?VFcL{j_Siy
zd3c3v4KT9BSTjAOIg3I7KC8pSoVWdsE-r=Jm1Il8qgqK8#`9Y}B*YgNh5>OIwOc=c
zj4R~0AmjQ`{*I+jlj~qH&~*=co$6;BWYAt9*SQ}{@f^Rwg0BCZUVj;WN^#xCFwa$S
zU5eqpmb9Lx@tm|$y-Ojb{AE%+C$Chqzfw!56xWgQRdHQ`@u@r-qd+#UFc2(%B+9zY
zat!lA71t@TD6QGQsQB=ok`<fG=YWm1UU)?A*K|ZxT&F#vlpm9Lj#tHk{y-$I!@lnh
zs#nWet!mAGcQA}rtKpl_YBdlEe@XRTxmxAVqQz+_S{+fWR@n>LygV4hq#&eYLJs>f
zR;wD=sq7R-0g|QSiNLZ2F%tHh7szw4jMb{z(p|0Mx0?Ur4<tdHFU<N<MlcE5y_Ou>
zWvo_nXm2Zo6LNg8HZczpXKx{U{We%nySXUWgm#^dV{3)-|5Ey&4dz+T%f6=R{mPzZ
zp<^NYIMw7k=}#Qnf&V3DYkD2oIe=txB!;}Lq~6kd91AS<m)HOo%7u2I-KKn8MEHtE
z2jZ6<Far=toDoKpjTa6A#!AS>r%=Y0>_MO{6Z6=tpbaN*X0{b&>3~ZN*YNwCL={9+
z0%%r2rXkLOm(8Iu!y|;_!9{UShcg63*Z=`q_rgw#AjNOkK2GKNK9a+>G1pl+(y%f7
zjTBNyCk{|Xb%2oU)mVCU<CFaG4zJo_9|ycW%FNJw-dlj4TFByP01?fR(W6g>R``e4
zk^Qi?km9YpjGi&?rM)qwZ`O+jkJGvN56ML8M`Pz+m1c%rdZ1NrKYt~IR%Ij2pv~nU
z|4m0mj!~TAIcy_~KuK06>OHP0W_1)`UbCxS5_u?gQu&(@zF;JB8Okd$tKNVj=G%j&
zye3o~g&i)m=p`l+vF~|x<fpO2wM=YOQq3U*2{jE;T9v5xw{|dm)90a54*x}mf4iyt
z8Gy=}QSdK#x2*@PCDC@Umc^m@j1G=LBwhtUfJ~K=eN&o=B|Z-J<ju^TrwH4rH=Ax%
zUQ?M%)+a!COr2uY$TDNvm^=*f-%zXc7SmQhUX3X<l;6TcVv*)b$(}9ECzCmx(ch1-
zEJNPa`Nm^9awo~ZM%qz-GM{Hug3uym9|<i}Zxt=-T;vyYsKDB@91>_GD`(wtW|H;Z
z`7s9Zb6WAnv`RN_qQ2vE3LE{bS`maVNd7HfCBRCfDiK-RRoNqgf*@j%CgoUM4#ug}
zzmH<ttHLV&NdXeXoPSAzm7P~ZR+Y05sRr8!9$DI#!MRDc(uBpw;<l)EX|7TsJ4q2s
ztNJ|tS;}Rgid`FmCoXFlvekwbknl0LZW>l00oRIae8j&YV{HNl&L4??Ks(iP{^)l8
zW9Lqw{E_$vv<ocfkLY!<41Ykos&fA5cJ7<#^Y}XKU&{HT+qs+0oj_GYIJa;O_=OPc
zBij<GbReT4oI=@UqnFQ)jX$B7X5pG=o;h<S`wn$*K<*22hwfWzbYCJ?+II&b(jI`w
z3se!|H97KWetC=>`>Djv6X4=&)KgnHjG1F>5V_NFD2XhEnmUOKxjXU4={<gmCQf++
zRO!_wJ|Rr-FN05Ct*pd?7!q$!K$T<zQ&0(l5~vYSscFh7*hsxwcV8yp6nI#RVHw#l
zzPr216Wn(5{t~;jVtS<hP%6=IvVZR}S6OvKxHsJ3>_2}hP+z}cb7*~+qhq4?eo2V$
zY}+vs8>~)@4n!;3Vw*QbeN&;jBNz9~W~!$Ajn$R0cvbaCV)bxY*_7R0LeXD=(Sr|R
zZ5LR996)~>AuKITC`f7-P{kqChyqFe0REGve3vNUYm>uWp2mrO|C-VGL@$DyzOWI<
z^LRqrZ{B0ITURBAnkap%cMUkoT(-)tl+|jLNxI+HnsE62_V}i@mP|DOcT^xEhpH1}
z17UYtq<5+gQ`xa+ZReV*WD?fTq-IT+#&p37nblkpwa43qR67*9O7PK)z#oGCKP6TD
zD;TmbR0KR_Hea+kT(`a<(Q;mQZQ2`dtX@^-3%e$m6%$%sRCKNHY#vU!z22#a&*7--
zSl`#PWx$m~WWk79G!X&2S%xBh0wSLhjHkB3UelG#L22r&u=~R<dEtg&c+OuxI9WqM
z__uEv+S*gO5q3Iql8V-vb0F)CMI-Bmd~bkcx3rYXsj*1&??fI}qn6GG61(l{M1B3_
zq{mRS#owYe2>P2>W%m$>ufMw*q<3_5lfIOrEDoZR$TXsJmpM9>q|upxB5<{6BNfOo
zM3>}qS~4D5yE&;4ax2n~q22K{qmz>cw0~Sf;N8_OM&dz7TyYnu$ml3tXHe-!98g7v
zdNXZ8GhWu2VDY1cHKjoDoq_J)b(27J2hlU3j1UXZqoY^Gr0D5c0V1?D&#KbA4z*0O
z(TyH8P?4V#JEgG7wffYx@D~)QFtVH0$8V@>((;PbK5bSn2^VsD*}+|;)J!v6uxdG=
z!dhC0A>vELt7~D_++UR1LQV?m5{b`3Qr^MsP|CR({+Q6=PZkgk@qQD!Y_2-ZK&J_{
zIi2p{;B3o0<By7<R!76l5vr@{=14TuczN}Zr|}+!Qaz0?#`9We$Z|r*K%3V1+-~H#
zkL&v4FBYlu3?EcFuSYx2@COzoOdM_6Gk;Kr72*=*RlIne|BWt7gg;6l__=F~QhSs+
z7oQZS86K(ho-D{nWTwY26MFv=CA(UWFP|=~_l$I0r^||O8Arl|UJFC7O7n}LS4Z>B
zk*cTpris+neT%}|Z&a?TSgU62#I@FkO{$#2tA@d}#yasc>Rimn^do7l^&+87^5Gz-
z?23`4ErX(DX?a`p>QPPS$>lC0^XUD|G8U5@RC>T3qvV-k@1I>yvQ(SU!jG$_P`tCS
z*5xIO3am8=Udgv+3gXq#B5kO8TB8ZljE2B*M7?!rF&^+;$h<KpPA)MW<35QjH#*2A
zmpa{P*1swB!C*zL)OFK7Oik2hig#K0)P1Em{{+$m=b;$spJ#kC>yJ!G{~uM8B)(o)
z`gP9o7{rzYF(dy45bMalHdsCR*MX_60le%ZdT`Xs#5d~2oQ5CB7Hjs!CyF!kaJp8?
zp@6m9zY<$6T(Df*y&Ox8&+=kfg$h7giDH!LgFIuQ1fOv*LrxFl+yrF0>4-Y=ga^|T
zAKkPaWczX6&Qb~4{;P5I=iS^dm$uRCSK#ZX+3P4XE==R=*W_Kd;Op1su0s_mxj(6#
zgm^_yTRe(5+=QGyPa{sL+|gdF+~y)N*)+fTt>Q$PT4-9Osfw&w>jf*0<wq=PO8Mi<
zm3j@5v$kcZ0@y$-1!Pu1i}hxe?4TLu!`0NiQCMp<$uL$Wg4jZ53Zj+*h;_6~6Re)r
z>A}>t+Ei2M%0;CqX~rumSF9#9<$hIEc(Qm+QAhS<8ESqjh}r>ZFJ7f7EOnlhXo{NB
zSC_9SYKpUuE?-aRoT~JMrJ8IA8tRFfHu2qN6eXVwQ+h%XtMo(zv5uZ-gVk3QO_<tx
zLU)?v>bmokx(u-}=_I4-&QP@0yu@ZQq_Q^nxwB~PF{sSL*&Op~M0cNL+7FteeMR0!
zj}Lt1vXx7pA<NP-*ulZxNU9E1?MUfKgbAI~qg}k$gzgzpX{>~(mJcYh$n&h)lPW-w
zj!qgAqpO<*$k0|&W<S`;RYMj2cAU*Ys)_gW<yJK$@faY%pY$saP+)RbSSWQxJ?^lx
zGU`cu!PgM?dQ-8o+@+&t*XdvOL|v63mnTx`ua75vp1P#hTlaD1B0pqu*`C`WCX^p2
zhH{u$X0>K^C0~FE_kqRAtB5e%EiTB7s^V7pWRF!^<>NhL^R=mlUh((HN^2A!UsG5?
zjf)5kG5{Jo#zj!0qn(C?=qaZ$3EHYjYl^UkU#;{XMf=FV(lwZ`XrCw_ODj5(B=|`r
zsj~Dd@^ca`{I+HLHJPYoxiM5%g!~wu8K^6oXCfIBzDmL`LN#Kcv_o!Xf{(Qt$U4D9
z_EVs;NCT6OJS*Yo39t%?w!}id2&(aZAk;y>N$yk}282HuRK65%<2PB|j>!HEu}#M}
zxy9YH4U@HV*LQ7fyy+_^U<rl4DNMjOJ<4yAQY`d!o8J}PwI;Ud#EkoLI7RjHY{$0b
z)MafOn{ImeN>o~fs@U-8uR{$U>Sf2wiba9tVX6$DR$&sZmp1RRKTyEKcLsFm&XC{H
zyEDbg++K~D9YF~n<#7;tOE=_qK7{i!ALYIdyMp+-FoCasICmY^X$eg28~7AKgA!F*
zm-h2jOU&2RJh(A0!vCIv7kFIY1sPW*X?o*Q&S(st$03dJm7GE=RHzX~Qije?0Ofl7
zFuY>czo4RA{F;jNysZn~uc92r#WIS<1<K8gODWeHTur*h_)5x=EI^kIpj?)bN4V^{
zPI4U~gX=^_@O7jSGN(Wz*j+lMM(|SM!2hUuB58z*7x>PU7oZV(cc#>{x6h+GH-eH{
z6qzFQmh-Vbr#LuSt~ZV^?n(EieR2~_(znLuV+U54pXSQO@?<ob{QhUFe1UqWTsNsC
zQ@HOdH$>}OS~s?Ys;grOJFY53GJrAFLPu6Ov#N)Q(q0&tnj`wylnl~Bhi!u8B-V@s
z*R8Y)daDtoEIg#MoK{;3iw$l4Yj&{6DoqB=B;W$BNw`$m3NyGUHx0n4*=UGQ$w@S?
zNo;+uU^vH|n8`4&*;95(&V5;nbKq<IDy0(sQ!1Ls>nn5a*9wzEZ~^BeT!?cF7Bjdg
z=M2E9IcJDZ%{i#&!<@^VGl$Ys)<d#BA;tJ5_PUafhYFlE|D&3pCQhAiQ}Pv~2EOJ{
zt5)tTIy0y#mrX#=<F*;}Dz1aY2mb@MaY*(Aw{s8R?#^%>=t9?tC&1U?gmD{ma3r=A
z`OGxxM#|0-OQUi&v<(=pM`!lgf2Nufl@Zg}7A;_EF=C(uS%2hh`_U;CGl=O-n1-#M
z4>QP>)1fxR$REQA9M(_Y&ixIa*n#T`KaH=$?&0%GF76dL5eg?yAgV}ZpwTvTUxTy!
z-qO<1U^-kKj8(Ozw>8bZ;&e_pO4knyf@qo858KB0yZkZuF6w{`=^Au8gSi1=$16>9
z1G(E=XSD|5%eh<O!!!a$@i)Axi70su>rLjCFve3fguXj>)26xH8sXe`bN9wD@xA$D
z_}<W|n4L$r9_F9YG1Sm=!(<=TAOp@h0XO-8r37@~K^ieXy7V)8{g|a3u0KSte{1PQ
zSk0l&&sm&s@+SaQDDwFyCCU68IRNxcmSl?)9V9v@sK}-FJcjQH@sV^-JyQ8Y<lZSY
zt@QqX(V<hklb^=tzX+X=a6f<ZLPRHA2Z@mB#Mcof@er0W2dA1}(0(PcH&fmpV2KqE
zNwM1JHRu%&VJXC&sM-1T=n?%9I>xY?=-fE`$2ABCI<jx_s6PigUwI_(Hp0{E6eN5D
z&DX37KDi^(A@-!2E^t0f?p&7#9N(QE)d0;|814tSMx_pbe#v_wHodu+r~GPG5G2nD
z|8Z${@@xbio6b%E#nJ5iuw$nS&DBK|!@KiH*TA8{20(&z4cmb{E~FVQ<XIfrm|Jc@
z`WnlH{A0U$7Kn^YEKnW~6eH{L;0DzKa)+7+`6x6ER0-z6HhIs0)c&yZFTYmcQp?3R
zwZcu<_xhWHGy1y%c`Sn63^Y5(WMrxs0VGo!nI6Y}u7mLWJkIH()MO##MG(>n%T5}v
zcc4?3tW>j{1Jj_5Tg}mvg#u3nXV(>M$aJnwWoRhwV+?NSg;g|eJ$}Et0RD}6d@oEx
zwn{^dsV`k4ye|9L+qox}9+7-3zD|7X?c9%-9)bK`o%kd_3>MZ05e_`9qSu0A8(Z3!
zfc>KsJn|t?_im`4S`dWcS<l*ZrlH4q?0kpMF8H%AJA<nRTDP{3)n>pw^PCgzglu&b
zGKD0%NdQCGTlJCwUV%90I`)Qm1oT9eR(Lvzbjtxe3bM}-gPo&wCo22QN>H9<dYalq
zslMq`3Mr9O&2sJ1xqw<KsBNNStL!s7wysN3V{qrqbUu!(O@C%X!r$bXy_<VvX;hwB
zbe+sBz7F#-zT_&o8Rnx4*9gLXU?Sm#zjT9)KFWiJv*-sTYP?<>M7Zer8kYalHq#VX
z-+l7xGt;9xyL{exw|jE5YsZ#_qn&*Vd}z3BWT7Ti+i=x2Bgf}PukUQRYGz^g<~jbO
z;#XJq{Pe#{%1T=6q$hzaxvVb00X=-6R*}I0S!mFI>7gPjB&9xzgoqN0C)OWm>Ci;<
z4y%=bs&dsHo6UpubBD`@Vd1zMS0h^P1!Pc-NRh>vh6RKpDjdQ)+cq}(*QdqLTCE?T
zyclX9SwJH<)}~-vnqQAu@IslptR<m%Dv2coV?igv!ei-;qBBGoa<6!{ssCQDtl4HG
ziHu?f4EUdugtb(UYU$5A3QI<ADZn&%G9@mA603_+vc)VVMahx@MTW9vK$aPS16u|s
z6)g8s+Mt?gobiAfvs6$T`QNGL<`!M))W&WgvJ`EIq6O_;K3e`)Dx9}#<17ZG)PoD#
zIMT6cL5Y#I&}`hX3>_F}BPK|%NROdeU04^4&Lo>s3Ea&KTTnvf?&VNflzy0?)=*Ch
zlWay^aFqbI&xG!oqUbKHJBlcnnbToy*#rx3NSA>s5lWEtCzL=BC03UT$f*G(e33LP
zg8<S+2_gx3^`X)-8)L&*E%OxbX%uqDR1BKXGQnu2VoJ>*rw=~V>XPYH>6tk?i_){T
ztW{y?9m-i1Lp?J=v>8Ps)pC}5Wy)2WR)BH?`6RI${|g;D2X!^gm@)%ZqqKx%T2#8W
zd|LPybf_58reZlHfKNjmQ(0~6;Pxx6g&qYO@k253{)`TFQj^U0<z!NCJzzj_v0)(Q
z0;7u^+>w=Xp(xEPf*Z@#&^(ryQB^pdjUq@{x^Wi@)|V6^9fkGwCpt25C5`6p(w2Pi
zlqN;NK#>WhIX&*+RBM5^hEiUS#)~P9w`$Y4A_Bwk3|x3ZBI8q0H_UY$oD(Z{E>k+*
zcNsCRp3GmzN&yomt;{Q*!%wh48}50%q@FY9uQ3l5HUjbR%>OGMz9sg<1TU9uPYN>B
zjDg{7aGv-<g@r*}z5Ffb>hi76r8@GcAGaGRs}a`>%oF7kYo8FGmf@ueXs`jFbZu9W
z9C~Zn12GJG{w=iCgKm0pR1X1_Sow)2A8rff^Ti=2$&<RUQYZ|wD}#&LZ5Iw5J0X@{
zeMY!@Zfno3xx_2VeB&Q}Hgl-^+Oz+2`V>F<$z418k1cGI#{U6~--J5w?<Z+bEd`cP
zkU%vh;}B*b@0l15G`28#Mgj)B+b;-|)2F<i*kv<JnvtUUbjg%;HirgPC0jNDngGiF
zkyFT!W7QiQ4kBN(P`hve5DpJ>{`r<I>0MhAD6x3@pD?Y`-3P8**b21bn&+qC?r!w_
z-@Lo$XkzZWkayGnL3qg>@j3|49$Kvqpnh&_EgieYvznh-;RV$;UG}0vQ=M0M*=S<!
z33@d52>m$fuBV4SxeU2bQz8C?2|>vt<XLl~19=08_K@TtTJUo%b!m|j*LqULkE{9r
z7cDu<hpH=i7@dG5523@FW*S{iDh+W_IW+{uNG@4BP07*m6zW=LCZgia%dtf-Ov-L5
zB+o{6_Pd2en^5-ynYvA=1Dz@AikEX;D#cq&$h!fd*+<QZKI*%Ltfoxu5NC2F&ll8$
zSJ?o9NxNh}tfdi##ONspMlU=qqwht}nKU(5YV?ezn88go#w_TZ@{k>*DV*(Z<Dj0E
zMO&19(1la>-h%od?|q&#A^voa>jxNN9zXfz$T&qRzGOzGWw2&N7<WvtY{GaGs2W$v
zQThxEU3)EU9g7i7sbt{j2_f3SfdJuYj3A13ISmmolJ?IMXQH{WCCSnrI44Lbk1D=a
zLL`aC5A3*Xo+?>{-CaX51tj_Uha%+bA*lu{T-eSM{6x-Z1fhq2IZ~&lL;Pb=(sxcK
zg?E@UrD*rzH7bWRiqNG;ZGF^nF)tOEO0yt_a}tt^R+)V~2ClB0VuVyqX(VA9AtSX$
z*z%;8<s$=(kz)Zpty}mVoT$Q)^>K+eZn|<w#--&#2=jn0Rrvenws!B@iXwL5e$h{s
zCwMh*<#t#Z)qq#q0r&KxSEo>^1?i9L^ATRhlhR#%HTxIPl4ItA9^mY`?+WLW8_&|)
z_8r?HEd~0o+`g5p1Yn-ufM|?eXGnO}bIGg+ax=%GmhO(11$3PuaYJ5bNO#Z819M->
zb@rw?23rY#SKuS1v2!!Q>-xwqY0Xg~H<>?yke|mhD5LIIKgnA!FUcFuwLb8#X-k0t
zbkVLOAuErmB#x_PNq2K3`+%l>FxstSr9~lvBqm%@R3+ihNvkR3lJzhPJ1682wMbUP
z0hMujK3KxVNb(;fAMDqZT%{Y%7gUREX&hXPQ$2mQfGmDn8hSuS_T<5JMUBKB*cv(D
zl$l=iBhj5FPcj5Ty($}$^Dp@LwM@N2T%_m+oro>Wc}60%#+D>Nrd&C2Zo;ANPJDv@
zBdm&halC~xUwxT&0sVkp9e(s=5qPi#dUlUL0Kb99cG#q+jKDj1%!nI$0YnE{YEs_u
z%hyJGS}Mb}gOSdOL}l31w4*iHx;e3Ka%R@ul8K>bi{R#g$;q*3^~k!W>BD_x6=gFO
z6^S(+iIHx%H&L;{5v{7<+B!Z|0*}W<4;4Y#IrIbu!3vdu<52ZU@TIUDLTFIkUANEY
z#ifE!u7@7^NuGd`fN;%IV+r6#rXV8r#3p(>Hg(&Q+jn=2-PkGY-Vq*%p0-*~h9)K>
z>jpP$POVQkI>&pWK+;5MxT(7)J((;?OeZ4)12;BrT%T;a_-JQcSGY00?@N=8a!8vw
zgOzRbZL5dvr3h^Mc406&IyMkYY+mg3R8_!XS>lIw0s3Y*dnDD;C5UqdnB;IfAqEb_
z<fuskvkB{MH3I*;=KbxhySq+Ut;g$!1D-~2WB)2jMa!1{NG1YQh(F#mV<liC_SV%Q
z_z!H8-R^7*_gvG5VNabonzB0p_Xm33wiN;NwC~tRx(@QsfegSI6Y42t319^vo%VsZ
z{HQNhHFU{z%lZJC>5j2jZ6^6e7^$jnvSH?u0e3k}XmWj~XSNj{28W_kkT2Q)EGnaV
zJ?{fickz-qq_a@|cu^8+;Hhx$ieiKpav(@{W$G8W!{+GcS0LrkxrTXg3X?DpA6kL@
z8?Yriygc0?S%+ORcV^X3ve1(bsaB_0ElTMyW_|J6WyFq0&8r@%|KOjKc>vjKb}gaD
z0h%?^(^7pAnAOo=Lwa<S8(U`nk9fTfmYK!9EdA}Getf7neU*J&(dvnEG}yQNJNVoY
zZj*|JmFS>E%b!=Gaz~{!K-RlF4I?qdE&<Wk$EkW_FIS7CXV2Zg46Vsg^da*~f_*6e
z9F{ZKpJU~$kRHUP(C`U8xtFB}M@X7J3`+@>^FW@IFcl4;t;Kt-846K4_pz`{>CaY4
z(t;k_R*aXzJ{lq{BqafEJqJFT-5FssU@P)VYD&d7R-hd66WuI+iSFfU3E3GUS`vWu
z@tjh|So)<pm0~?lJ)LApckWw>?wtFsMDercl?bhHpbrYsqJTPM&eBLaucvi=i<%bk
z@q)U=6p!in63{WoG<_25coLm0Rcbj=D|!eB8pPq{N!p!qOKX#~Ae}A9E-}xQoT>~~
zthsjK>_W@Xwzis)c6KGkJZaM1-5;4fJ|>1|`Ss14`_mJ300to{siIb=&m<zU6iKFK
zV8*yEgRuR@Jp^0<Z0HbB4j!@W2Qj(?*RDbby**$-L~Ai*ZY5+;X?~0fBwtd(TeF|A
zTJLfP$|tVfrok!EZV{$RVBS34negW0qv8=@(p-NxFbSjJU&SaQI@tnw_*9N5e4k{O
z;qg#tWHd)#(%=IfRXsNlS0ibWqoxrK&OfpeqaQb!kfcB8go)XEj3mn_*<vhe|8J>z
zQI8t-S-^REvO;P~s^qzu;9wcJqPfY}siJ67=va|-DV2_9^bX3j4RLGD(dH?vk$M~T
zpVCuMeNqfG7O%PZS7i!%irned)Mh>C;;4pp>%+zo7&0<Sb%#DESlgi!MXB&SblkvC
z8ZN1V^C`6`Q+OOlVDiDtoOj5Rn{yia%SwlankoeVd;(Osd=j6G!Cs1ulVEocC(jJM
z)Ss#0%l;n?ERvU!`-rg*x7P7dOZ}J=4yarMA7u(p9$y4QR4j)Kk*Rov;tk;-<`wo(
zEH=KdK8#BqO3+aN84K^%bx<_wc@?9;9*RYwjC3HJU_6vGy!gp{8J0)J&&SOZSe*4j
za)SM00P>d50fDuE%4o}k)JU;Sr5WkT#Su){r6Jl(umdXqBu5l)2JI2Cd}8tPdQz@0
zRVfLzR%E6rUF>tzHIOR>4dqafq*3%8+@L<UO~{=T8HEbTpBA4DL=mH;u@dT80+pWn
zGJ&ftG;OUEIk_l2E&0?!rX#8-L-`=JXy`eid686#S>Lj?lu11~U}JK{Nh+omKl^}z
z^)ov4ry&fC7^Blja83bv2DFkz&-PWt9z|1=FV#iS#7cLObSZ@#{I>WYwWf%&yvRe3
zG82(UKN}%3v-D*h!)rhYU$1M5F$Fxa#E62t$U~0;BP*>3UEGpywGCiDr?bu|rR$7b
zf4}t{6l}A4%j$$41-dqq)s=S@=(>`9%0OoX6W#wxjg<$}3UPam*3I0`w~*F+O<ESk
ztVS)DYNcv%rMT|wAVc{&4ocPMbu6FWEEm?amkUhsqdE#_hR$ueibv>!m_IkOtJP0&
zHz&oqUa1ga;$pr!njxxGM=$Y-4NCy*d>z`WpQ^*Il5Ne>o1nQ^Xb%ImmL4Yc(VjVP
zB#zHXY~TFt1KW3PxS(h9+WE8B-|+V|N%Ts5^<rlA$xP?*i7n@C+-&Q)V8iAUqoVKR
zNq!WkK6)l%(#|f5Zv%jWJ6tfL753;%@2u|Bk<2%;nJ(tEgjQSt`?BghiXrdb1NZC%
zF9Nvn-Z}0Cm8i=*bOK#vfRpqxlmtM8oC}gIH(RZj^&i{zr@8*lUWudQTN-w?Oodz8
zE1j_$w#!)^)Gw)Y_M)Cd&Bbda-qua_+NxZU1Cz<s;n4}2S3=B1@u<rZpb_1mx|W)i
zR=$|I7ecC21>&Yc!jRvM?c8@w$p@j~J(PxNZeHJ(dR8z8LW_!|51OBoeA+~NG1EkL
zFO`wEp4BXD9si~x<P$pTqJ>&lgCOdLW?v*jNuzE(gvz}n#cEIuO&rWuw|rPS`3zDS
zPNlmY^_gPhiQ?q>khBVTps*ZEn+7K37v(x!79zjHa8^)>awQTgf#yq#5mgC(aUu#U
z0%S?#eAimD=dz2Nhofu=&6Zru6`U9Se3-e3A{4$yrf?g#S2<TUoj7JiR!5Iu=rd;4
zBN&t%6gS5>A1FKwwZ2ija|Cr$kcdlnqvAE#AA*7~C;?0RoE95NWaLtXP|nQPbhxYf
z+dXk-r7!BQaaWWzHLvmx4Rw^&oxiWtQ8r^M>uu*RT;LDe95HWmr>(55JXGxtmI|fT
zF5XsFDv1BGd%M4_Es$6p?H&~F&z8{)rDY5d1(ALqSFM#{SP~8M8c;I`D-^3inVs#N
z0s?s3?7yqfy6tr_o3)|E(b8#E!q^U$JP))*uv)q-R-x3!qn^*`yv22vc36!`Pn$*6
z+=*VOJ%c|1;23aGD)ojCgTHU*p8H*Gk%9NEiM8+EI_BPS_C0Th>r*9Pn_0WHZcTjr
zg3!jQfvF9Nqlcb>@#z@+YcK}%StPY(xDH)ChFj<Enzt7J3-t>G?7t$|34f*VkKP}u
z{v-n2z(>cbIXsge01Dz)ynAh|ZTHsI2><Tw)iZTXW4@jtM8o8n3#vC(^{+(~z%XPS
z%OMyCDi1Wr(d3nCKv!$D|NU#^A%SJeQ6<iiaWUthQzD(6(o!ByW0CiWlkgt8l#(ns
zaG(cr9UV%ICt_~E4}K^08>bBzBRndZ-0Y+hu8K)m|A0pbiRvVlCK64K=|Re8ojxuN
zHj?_w>m)9*zTbj3@inE99&WgVa_POglFwq%6jh=HB#wU#qi9mDEDcb&3yfcIa1daK
zLb0CQ##O-6j8bUb2hj$#kA8^y<<%^D6OexeZ#3tQ)hd48QDyhL9d1V;?)H-x7oc}8
zS0M0RL&;iIRq6NQf6hQ*F?rRF-=nwZ{>M<>FijwD5=|tsUOr9Q@>m3MS~6N3g&LBJ
zBUiA_5|uD>AiXB3L@RY8$v$K-bH6r__Ciz{=m3etUz6#9^RaIMJ?>>tB0Rb*GKe-o
z78ZFOl3#|XcnTaOBp9%V4=}IU=erOcGqT4YMe(D?V-4F3w8-FLfQIUWYqB52K8;WT
zr_Ps6g|_aPBqv{QOw**HFlaRjvxDLpd3JU%Gon8`g|y{QI<s@5uBI5!p|2tsKaQ0M
zez4pt#P2Q=d9kojghZn6Us>*;amc6z$6bZJhr>O&^H68BZQuFpz0C%4F5D2Gn_J_Z
zaE;8))n^|ymTf5(L1<7cVuVIpb`4<V%c~(aEg6;K5z4K38DAk8OfuY>(v>?E9(`Gp
zA`*lHMI?oBxJ@81Gdz+RTw4cr6pfDh5Xtjo#a%e@s>2<}HkGxSXla6g;&U=6c7ZnF
zuwKDSJf595KHN5BjkP%;yccU3(Q4c>c7Jfwo+CZ6s_L?6-EdE^wl)~7jVN$Ww70;y
z78L$7qSn2-c5C{;d6V9aW#uJ~u0+RBH+pJWBwQUO)POxj)J)(W9+aC5HPUfeO`1Ru
zQCw9FS+Io2enLeVh-Y$fcdHrNP*|#>4y3hZX27jQA6<#avn5H37JZT&(`BR{U92$i
zA$hhCS#Y|SzYon6EHoR=1A5%ms|@C<W-v+?n@HHvG)aWm%B`x2Le(I!q<am|R4<B*
zB}#ZwD~UoT4dCG2;b0k-N(&=$3K||3A)BR%TPE(~TGED-gqpb9TQF&SjVx$re;Y^h
z=Rndz`1xC?rwWxes7*E*9ior1dWF=ASuHD6DP#~SevJ`8^|D%_QvX&U;Ccrmi}{Oi
zOf~3Nj%t+QdMl_d>;Z}(zkqirk_Q^jgPfPTj^P8$z9hlsXJ67#y*v*q)<)$2*qj$C
zNVmR|BK4M_ueq6ru9|Nl#R{Lc3|fm5a!o?P9rEbRbxED@K@PSR_rrb`JnYy)mTz&Q
zn1U^i@^JjM?H3%{7Pcn_hBo#IcbvaF`}_E@cTdGePwx%z&zyaa11hQ8Ryk~z2q@9i
znM2`?p>6v+jvhLV@>pn$kHQ#mrdu&aLqa(S%}gqXYTP=i8tb^#ni~$8U1q!%l={Qj
z#gb+i5i)-l;>9Qogn~m#4H+nIx9r=wC;R*0#=YQ{M^5j<l)&TM-~8b$B7->H(EI_Q
zBX?iR=it5p?fYuq@!U+_?M}<FYdd7nU@sIhBa)pjGWrn4Wh-wk;NXi5G6+_@YRjM=
zcMR6$#ug0dBEks?c~Kz*JqL}}W@=8$=q0<P;eZu^-lEKEGtmOTEha*c;^KCQis3~3
z{^i64{A=c80llCl-}#f68SQeQh+SP#s<Dw^u;+0-O>ADP+D*{e`w(uFGQr|YMeKrL
z#CR73J<U(m4~?u3b76?-JrQ0458*GfKXY?|&5;}p*&B=8D3R7|=;^tTX)i8^d>3W)
z*Yv&R8xnW3WtuKRnL|b>ipU`s7+)wfIQS=szaXzdBo9^YjdQ9RI5~$5YqB(6;h=3J
z$RHOdmG5LXQJFf#Uzn3pgZe&U$h_EMYN^yBYKJ-1lNI!+CD)fD(Rzeui;{2y`kyOO
z;x#g9tkmmqfK+N4<(*&CnPTxny6Ry>mcF`Z<kD71f%|WI*l*RwUNmr&89`M;{WLRz
zq>sssco@xMwTx6^n_bV<tEz0oKbl>{oqIJBi$##FlI+#9hRZfW3(bolT2OaWx@s$m
zmcpyFLPQl<niZr>V=+cg9bAWV33R5Um5DxeQjB9}?R7{!Qy<WlGl+r|>ktiU4D|#~
z1(S>jqJqhZEQ1Qgdg`zm|1H}1mjxc_3dx2%ELXnd`6Zi<#@LGUONuV|OmWW-%=smQ
zI+qvCyCp)cWlW|v&oAjwyZlH?kMO?~<(CZTN7;O~bf$343fOhXfL&*~hAW5t>_%=Q
z6OSo(u+ckU36l~t*lMSXkV~D_fl7N-d2pA*TM=}@Kh+n@uXMy0)X&lqaXJI#9)~j!
zclsU9pws7YhGugwvy+Azh;xz>MR1~YUXt4tP~=_?Ez2c@dM=!s{2s)obY>W9kEQ`P
z6w{cMV$zY<JG_nx&#H2-BYGvgtgdu;$|G}TT^Qfz3Y4vKJ6yh1Zr?n-b_QUos=ViZ
zUeJ@lro|zPL>r2KbDpe7+6ucfGej0}X=W+a@oZSfBx;e4nWMHC_ohkYCE6}R?c(&Q
zE39V{RY=cPNR`6f6+@50<rPT`)iv>K;V6-f)5&YIQR3Ussuh-CQd635nANazV<<R`
zMZ$6ULB)lmMDc9lD6t?dh1IG6Q3W)rFl9Qr1T$4IN@S@kyozEo^pC4%O8lKU71AO{
zUwLqC#o5AfqDeXwit|ru3jRZz0)^6;h7an3pDiuSK;|rj&oyIvEolOMjx&_-;D@=a
z@>Ix=j=uT~dU{LK!fcE_E?RgqTYmaldcViveo!~NA3dmAIw2!3{^72Dy>dzm#=iQ7
z>AJySW1D>c!435baF*@VX-`$`@{RH!iFLg&3W|duD8RdwdtsbPsdg4M<t2G@sF%HI
z5$qz&8Ppu(FW}E}&%@_ev7g7EBp)k7S>z>`@Hxw0xl**-Fm6kv(t!+5;v^P6LJv$4
zK6lyZ<+Ees;^(1#xeOkjt9|tu%U_>)=FFKlLz+Ay<2;VXLET)*I2JR^q9b~Ac}504
zx5|ijB#*lnkMGZoPx>~=Oys)=b^l43DczZ2D#={)t@utZjXUwJ<R1Ty?xDN^sRRdp
zFIc_+QBe}UEk$+^1{pA2Y7-^?D4*-S((3!oUl?*8jR@IFc0`XE_Df?M@Lz^-?mK4Y
z03m^A{m4-*$_%O|;&U`h`W<N^m?4<Sz_ZHz26NM=cgMe{_j(pjNZyUga9+YCTx)q1
zaG^Eth>}Y-W{%R#YlHa;R8@Ihm45$>$Ln`P@#_)#Q~XT+{C(Ez@xsS_ReO9szZcFX
zc%+|iKBGCI6z}6QUX&AJaOvSSrEGf0L;BjMPr$ja8i)g4x$%2tDxm)XD-pU>s3k>*
z)mce$jNmb%M9!}9B{Cj3M_L@7ztcei4=MsfP#6YS2gvq`0qmJHB@y=Y$w3y-81OOj
zYw)sqK5T}9YNrzTZu--gCx~J|62$G207^eUtt*Fs7WqB7zLJ$gJ+!<DtHbNz=38|I
z(SQK{b^}2qb)r1-tAq}fBm#G3PP6(?`w+;^;~(_$!M~xRSRer`xowK4MaH9&#KL$!
zu7~8m5t70%h@TRl6sGxKKp%GS8mP;58Vea51WI=Y{5YF}C$iM%OMp-XaEODe@8G1;
zc<o@Lr>d$dxi>x9*^zcSqZduQD^b7gD=z=KwvpIWSM5-Em1VGbB;K*Tp>-}%TOW>G
zu)1*~Ixte7{Hw5`eP>V8=7F&}pV!xlVidsgCBV|gjiOUGXh=6g#6a>>Ol<pa*t}0z
z)X;tjFlsaPHVUsc6YNOa9sa&%h>NVfGl|%?_DdBg0T5r>G*Txabyfh>*ibkgf~YK7
zACK{N1zftfeG%YoM5nz@<@lxtlI$vH)KE_;G5UI2a~M%v|B!?;HWDl=neAFgVpd83
zW7QNOn7KzKh=D4^Q5;ET0bw;d$8?a`)Ev&-{N}L_5L~C8S(#rL2aF~mkta3BA~HUX
zI%kC4pmC}w$dZ5NoQ9tKG<D>Qo6?B}e7t;OtP6*p{7X_0lx=CNJv2Uid3Vbt<6F+#
zJjee*tc4Jr#<`E<5mnt06;Tkg3}6CwdFVeN>ysP_HZ)1&)3`l{Kn$Nc?eo-LI3a;Z
ztn1_dLqt6$DBt(uGvEaxAVt)I@*T>?wEUgS9l3wQchrr56wy@vjl!s6Rh$ODgXRPE
zr&7cdBwtK+a8re6Cq`#!o53udJ1EW9vzpUI@Q~RG81-*5Gj|gdke~k4okMY2LS^}c
z^vY;9Ne5Ljn*mfu#l{OtuAxL&ZmlNGZIU8_hN*b%mYW);Qx~X{G})+Lb*Z2G4ecQi
zH#4H<SOx=uSkm<|bcDd`<Gdaal0Mq=X80A&*(CRS9PS5wF%;`#ZEYjVV=XPy)hyH#
z5Y|;Q!pBM*_)oxTNSp9ce#_Ej^!nrY`rWzfIMO;sB|ZrfuZsEgtq>cRD$0=bty83X
zXt=9;bhMk)`-XG2Lfcw>vcIdVf1smt5K79?6Q(0DCnz#J2C){>(00%WRi8;SdccG+
zn!xq-;%&MF7^sJMET0UB`Iq)Vr1dCJ5eAJ>MOx}rpdPO!nZ_$Ru#I0-;me6PuBN8y
z^LILUxZhLj8ArWilsYWwttli23c?6$VW5(G5ZhkUt51Ci<<o5V$LvpjEKgtg*N}XL
zBhl)2qP_fhI2@M@U-lkNT}Jf?E|5bBtx67AKC!W~8Tr(M{TW@KtB+p%psuMPvB2ws
z7oKn8Mo&1ILW+UIT7RHMfTb1D4s?zL^$OsdF1x0-=IEN*!Ek*~<f`NArt8MrnpQVV
z+fQG<e)ZUTPgQ7UvE$gOO`A52oY&cX-q5B^q&8F7FVu5YDATc@uFulxUMXFNJAI)?
z)9_<+R}Mp?<uwaeTCLBF?L4qBo4IiP<|{|W#AXN?pu_X7`I*fma<B{v7n3?f5>t{5
zG+&w=da;pb;7G^wX{93lB@E@iBi7J+{=oS5mb2I1)U~TMP&+Z*@acy@f6jdiGOPnz
z2l~?kiLqJl#*UHmdph?{-}Lmm&Qv-#*`2lr|L(hh1w7Ho4U?k-En{^w#{ClDNuc$C
z5gsU=#rr@7kz}U}!VrJYg22`tX42vStN&SS-S6frm*z-^SYbcD{`bo3OL*qt%sl!$
z&vk=1+`*qgwZq5Z%mZv1NHdghm)f8-xjWR>=<c~@ZVwzo`PFz!w7b8)V|Fw!u@Dgd
z6?npTgkt`|T^n$AcBxF5;%1T8l)5OPOmKok*YLa~Sex_;tHIgtIq)_=Bzym{w5mKb
z(~Vjoz45kdfwJbQNT%-%a<5+Qcf<qlz=pdoL+=CY%>;g^QQG(3=H68S?_m@@w02dw
zC%@C(;I2!dr~H7)3y;*6`(~j}0B9`YQIO$Lcxg9W$FvJyfb0KAdGs~$FI0Aa2s0bw
zT7fIQc#%c)1NDAT3Y$C0OzZgZSVOpacLs^rb!R(w6A`=Ti{hEB{R1FdqqDx5j*<5E
zG#0LR-$;b(flrCQpFO#LiU<}N-*O&|kNmQsWJ#sMy|}~-AN%sBzbs2R3js;_pZS9X
zMl;5-OAQ0bxD15!S3nvEvhoj7zXbs#9^T)N-s7`3qUCH!1AqSvia2iPpWvp+b<25{
zv%uFcW4_+be*|4eYc9(mz7F@ppFb^K7runA!+oXeILim~Mq|Aubb68XO{{grv8KKS
zdq!1wbAgUQ)96_AMSU9wo&a=bKh07!tNWL#@ZtQFru~Cv0de#=&f94){GmL1DBP$n
zG|S$oWh0Sq`u{S=EL7umVNb8h#k2h4H7ya}r{a{@lW&{&e^>KLjA+{{yd%T^5^PKW
z?fih1NoBx5!Fe{+;SHB(pdBCFDGxcS*U~#vjj^ew$xR0?Ie{AFovv?LJUBV^N_A+$
z9aujcJ$d<Ncw~a*f-6y1ygl1y*GsGJG>j4FVAn@AhBOG-z)FDU)f{czA>5B|tJS)-
z@1pg}F;Oc%7!)n8gOmHyxsfg0I`K(NT`go`dSFEhrX4rRLw$hydXz+#+GH{V%z-}M
zvdXh6SXY(q4AfWfl<c~71Dh}izo$A}<qZYIr7~BUHP}$y-c??1v0Az@BeE}dES}%R
z-$Gci6!HdrA+Ilp&bk6J0r4aS-HA}$zCJRBGesaooH9l!lnQAwU5In7I!JM>$N!RA
zpbqrBIs*$-KzdZN`>c*M<=dch-_;i|5{;%Q!U5E$+9X0l+0)0WA&W+c^~4kM8%r+A
z*#z>kY~CEKxiK&K4r(eFbeSkc@kY!;Ss#ey3HRDiw|D~-M*PykqsgdzRC)};Q44Sg
zM{rMIuP8@$2s6I^WbQgd4U)bit>Sjz;xY)h0<iB+dw;_D7i7?EDbP2_X+U^y%b+%(
z$hiGub;4U->j~D`ODqQfd&BhMv9p^NGRd?vQWJCABkm`$&L8x;Y_?Snp(0e?1=xr7
zPSj^#UUzoGSWR!hUS4J^dybkuj7Jy(EpJDjI}cB94~COd@WQYzIe}5_v|4u-Kz8zS
z1PoinRxNO3=7GDzu<KugGFQ@md_mEBgluk~){#8RFs=dkiN4B8QisQG#JNUV3!og^
zP~h@WXvmuyOF>x+LBvL6?E&7s)JkL!WDQ*>vc_Bo?g{eeKMtSw$)88p$>*8t@cAM6
z^SASm`H(-4u9MH>>!`99SqHhYcS!xDHoaALVauVn#(q#|J`HMhjZ6!s05~^5a~fz>
zq_8d~DKHcQ6SQbZg(-^kL<MIuE%l()aN-j31_&R`VWOwbf~|pm0bpBFr2jCeIDTYq
zyMT<16LJf95lD7dpuT8qXQ#Vr-c?>R*!*;Qrm;Q~t!XZI`5k_LbZ$pepu44_zAP3i
z_qBLyI-~A*DB0txt$W9{uM8dC(6g<zd2?^yOk=3MHqe}OS4A8Z(U`ktEZ#bms;F8u
zQBr1gIXqoGK}RT3>2GjGC+oNEp}Ael_xOX{f-VKAb_=2lqemu`tX!$70-_Ot_)ntF
zkfyJ9%(Ntv$>HXJyDG4HL(*MSQQck_>-1E{JZK{;(%T!hR(pdD&dTZvUwdN+HWKU8
zl{K|zZd8yMYzq0J4!b|nQXB0LC;DnjOUpa@dPbe)=#jhbM6@&!scSEHl!sF7UZ=OR
z)b6plTEYhpB3mO)<M~4S8s{rzkd3%gE1k<GRm|`o%bZ(rS{=VXyMoy!^rP8E^j}&u
z{VS0KBaW;<G72zg1+s$nR`}aMw-K+vCz8Ai+4o{)MZNETm1^q6$E?<S7VofHpUs;}
zl9|C<fn+a-kJIsBFQ@Q$!|IX#YPCMOs5eZQdKi%Z{{;{8QxYw4e-p=u=K(8#u0NN%
zPWLBovs6NbA?%XUePOx6L2ge<9|8^bEP&gSLSs<SXH2yC96kk;3Rl`gm8gGeWkp@B
z&C}Wqx-Rcz374aTE-f9EZKb8Sc`EKh%3DjzN+^b5z_1EdZVU$b^r-gePcD9>z{p{v
zVNu=*Is@19uR}}(>AYM-v@#?A2@)`^U8X(YUq=B|wtD$SfY9|lOxLbLbge|;zfLGU
z$WXchJ=Y?9`O1xIYLIqA)QPma21&P`zImh?SZVWzcs{k72MM_%ly_-sdr1kJx^qwG
z#Gax!CZhoPHjP59{Fl=4f2L^zl!J$<#zW)+*-NklvIRH@?~w%{d)fcLvVM@=_ku=$
zj6`dP@n(*0ltyfdI-G$-7!E-*wp501cRFdH*4Q7Ufm$Fsx4kJj?X7oas)Hi~4Z(zq
z25CQo0=v=*#}{3%{!8nA8mI+Zl9h@;EnG2Sv&VXd!<EsHT?*1b)f1WSNV<DJp`c_6
z{5L##g~pqG2n_TFL&2mJb1KxfMkp#`J0k;azyu<lt#3#UxA^6#&0UiS#JW7rxE!|G
zLLPuy8Np$j)n4Z4OpXkau#IA0O{gX+>+naL<k+n&*qUU5H(OmK)>ctb9%^j!mX_N~
zY#v8dZxVtx6uo7CsTaLL#3onetvGtS6Sb>_I$an2`3c5`6%(0fe+eGZ;|ch^H=w??
z=<mbJx7>t&o#@R3{R*ilGLARm$O^1_AqK6$!h;19&$96wn+a5MOKI32LD@9sY|}5K
zNaifcS1FG!F}9qH2gMxNqd@$oH(oAY{5RD|A`~e<xhU$6L+d^QvJND;3zac^hS36&
zwU_F&R=76(kWSt3o@Hu=L2>S<m#-m^{}lsxHH*A@f;+t;?yN*#%<yXkdSjM-%hw;Y
zKPf(l^ry6xi;(?Jcpt^@qYxqRT-#DF?3E8e?;aYppe~h=OhqZyw9kun%b_bG_Dt!x
z@9F8ytL)Cs>CT28XV|w`=}1lvw)8tAfq0nz$#*73y@|>|L%qipvU@t)Q>nrFU}Iy@
zU0vpmhy77V7t!$`a|D|vbU&RWYvaB+_RBDEnt#95dTZ~RScLzH*xosrsEJ-Qi1yQ)
zW5Muj&0te=BGHJV9fJK1SnvD~UGF@W{e^se5w8D*UjIe*ZW0{{ql)bFZ%ADMWS`0P
zC&}k|e0}ME<?ASem=f+r*I_UB0q*@v0pM-!_vm|hzb9)C!NRQ5ek<a=WQbtChp$WP
zH0e59$AI%~B{y3}u`NOs8T*x*z^-3eTgYDbKmrz3bi>&K8uu{edF1dKnP{&KMINv!
z6#iD=0cPvkW|{))yH8$yW*VXlTrxX3ib{5mcJ?jsq2acX1)(KU9jOjMm0Ktp4Mjtt
z=x5azvh6jg+J>vHfl~;h*LTvhcl<}iudeR->3@}!m9*BOatGZ1Vaa86F<dyZQZ7KA
zE0^L!(H6^xQXl05Ss)a{jaYx6r9+b+?|@QY^DL=y)gGJ8W6IARE*oYF$u!_Tk(PTI
zzU){wUq~$vDP<+npyC4m?gBC~)3&kEzdkL(lVLtU<zT3NWWhAujkPJ{h1cWhf1%7>
z){>CxV+o}phEnJc$?j^g@?Jm>3@GIbJ*jY`HjU;cR+~VOZ<Nh@g8w7k?cAh{I9SRo
z(z1m<84f3*@s1Z>H3YzB!vca@YRFon9*n<M<(57?zPmd*&{C7~j$ghu+S5`Qh9=0J
z6N$>Or)fuPuyu1{-Q>)yyCoBIbWHSWY=U0fwqqnYITo!RS=TguxUa0DY^I_jv8E$2
z((U#pDmFNxRrOn2$A?O6)+xKa1Xs8|AzVSJThA@()5pWv57^8n^=^m~yb{9Ctpm!z
zh@maLZcG-kWS$yJ06Z08fSOM6Yq5#mj!oUR<o4YiV>fmRyLW^KqNlCalc9;p$hyG|
zn^Wr(j?VF(C@^HAG~Co(lb%eLB&L&*fq{Iov%}3B*C*R9KH6E=6>g00`_iNXC8?dk
z%C`Bo)x-8uL~HwYVK6#6HV{l~UhMT$Ra8TLFYaTqi&DRao71OWveTrj49Fzuc#^J%
z8j2h@lE5ZHwXG&^f`^;;x3})@I$^aQuOAM08oiDEt0)gzw)96b5#WLN<4rSGLTbd`
zx>|$WM?>%*=%d~4Yz+5Y(}$^^I&(B-cL3QR=y}^#M4zX92Q-a<h#B1abCgDddM2Kb
zCQC0_oJ&hyU)~fhSgjxR#j1ubnQmDhKyunK7OTx9zo>;5uvYa=Hq2Zy;4TM&Os>!L
z%(l)F>Er)s>8BnPq;H&gRzQY%%|6Ki=7J;$WUS~RQ&Q<D+I`N~G=4;@J{Oh-Q^l#=
zL#TEa{iU_Lkr-O9pucavvq;^8_(25Slc`_e4x6LjvI0%i<-=tw(MWx+oSR;jYLYI?
zyJX(Xawv<+$b+72@HCz(Qcw9N9r56sm!Yu+?0D9^>XNg%&&fPM{bo&YfY$TNy1}YO
zI_=XHfFJ7Vvk^5qiY<9f%Q39k;5FHJfQ<o`<2B{d7pXDIKyf-OAL@Eos*QQ`TSe+F
zS_329CG=sxsY~HXv{foPk|_PtO0+be?sM;4mUdFVNvX$vQ;+&(`pvv4zH1q3m``uk
zW?uay&q=8S&#6aa0neF7i};Y9s%atCQ8847*KheG&4hKKnnrx40v%6)qE0q4P10KS
zG|duF(*O@w%{`D=__!(*&E943r1SjUPvgg$<GSkpk}8TegK7qgMoSia$=s8V&0&U;
zfAPgV<f+o8aHI7boB(Ow+@GGPBfCcedcriyc6Fe0k-ED_z<HlHLDw)cmlHWI|4zl^
zFY7#AHxDQ8*L}Dy-QPmbr$z`HQBAlWLYftop`~)n{F4frxGw+cx_Pjk1>y8`XTq~k
z4jj($3`I5%%Cd=0S53owGrlXpyk;XiQ<C~?<f=6u(<OeuKw=FZs$?v>m=;-b6HtQ$
zX|fg3k}t<aQN+q~aa1V<8$H(nI!a5Doq*o^aIVY@Wqd(7=LdD>i2tyT#OqVSH|UB!
zrhu0uKLHizW9BGGDb_lQr%dZY|6aa6=!1S<TQP841RWmmYOI+)?Lgj9Ln~~ixdLn`
zf+2^50b~X>`#s1{>lD9hs`G;&yO-?S%{76bc)x`44&Vw6X79s-VJ*8Sgbe>9#Wsgv
z2zj*FMiF>DEL?;s>OuYR=UIwK=25C+M(k&^94J#utb1P9h$UJb{^_E+N8|_*?Na-O
z!i^+oWRk@+G^o!g(P$(`NluRP`btQs#orceFp-0bkM~Mw^_opck`CQ29B>L{2=tQS
zbFx@TKS0?lK5a_UpOpgpTZ)r&j26o|i#D}FIhVkHs#rOf$#`}dQVt!=Q8yF^SVfR>
zmL5w^HvCjLOiDS=(|NeBC^47m;Qf-^n3Hm-9zy+69PpGah`(7HXe5)P#6Zer)Z&W;
z#axDpLK_LJo{*ze;AL_LkGxalYzz+TT-nYWoFb3XT8Ja`=N`)M{O&8_Wm2(&^wV-m
zl6vh92c)0DWwf6G+PPJoBiF-g<{Y^maQ*%U2KWsc9MEX@Hf;M44F=J!lIP0$19f59
zNy=zwLa1F>W+|7s`zVNpy!%0F+~P8xylw`$d1v{Xt55hn9r>H;036qu=FF~kM|r#n
zht`77hr@C!Xi5^!JA$=k*Q)yRW`VQuKJ4wFxl@K7GWN-hck-p~^2)~YWHg!l{%5Ov
zfqG}5rW%%Sf8~Z~eM{@cmQZzdEMdp%K<H$Ek+uWQNhMM<l4cB9U*4Mapc_b=@PZmY
z&Zh6R{2VwPhP4))l~%+LB(BWW?rMTnchV4ltAv)DbGDO)C83GMj<NWl%M0|B(#E1a
z%L){qD1;!KH$3w2Sn3Wy?QRu5PbZ%#GGpp~L`o?~bS<3a04n7qg*vE7hMrX;I3BkU
z9K9e>`8do7mI{!rB&l&3$PbOw_FA3*d8tC3c-R@DHLo;bD+`S@F_#erNo`ScQo&z~
zYh1?}GemZIy68AiNn$vT)(CpH4?|4|n&(^L%sJFsjU$OpLnpXg!Gd%chwRiR_^WPQ
zn3^KR2TZTp8-<z|UKl`q!IXUs`9IL}G2oZpK+jZ?M<DCu1YZAOKhF*XH34)aSPx%@
znw7A<6`?;E9S^N}Pn~9mgyz0@Orps!W`N@+B&x`mG=l>p+_*SC4qXhyPeHo}=8l;2
zfE(W<1ov<=_mEmfkZ=Dg_f1lZPxJ=rMtVRd0vsIJW^FZ_8}}4l8)Df&wMohs-(sQ`
z#3ng5IUSyzG*|n9H4kb(2qmgre|<`dsqZkN$he+EpDa`L8(5>DeuK~kd4&SAB*_fw
zWTIW8@w{qoKBQf*@D8X&(ZsG@qCl!m2-*-uJFpV8yh)tJfP^{<(ii(-$euZ%zeqQ!
z8$dDHgI4RqRx2tW1Fb@~03s;Jkl=pXr_z?RhZX>V!HKv1=FILh;ojcG!`sBWXN5%e
zSA&B>U-t3&gY<jfC*LELYw=$EbyPF;ZFn%<LG<OD7tu)gtElxSu2MteS#B?F5Wt&5
z_1N9q-!DCns?^~6_wjY;*}`5Ie}M4GpTC#iKt2!GVSKnwK98@%$(sKm_lH<v9OlJo
zf$9j*0CYGJ9g0TzdRV)VybpR!cCyhaA1I%&s2ISPRy3sQ>~^2S?y@=p6#++;t+K-E
zwA-ufPG4WAH(o)G0996&rCRJiXZa=k#!^~pv6PgQI2=A_Rmm#!a#hUV+-WPrM}pu{
z9K5wm$c`u&ODO<OEQ<mjPjzl8ill&lIyZCX31Fuf&7}Av#f*JSp0OV(W=y*7$1_$h
z&+ud1{Yy{7ebDvqThMhf!}vPbbLb@i5;O;Ar(9eNd~aF~sYz>A^(?lwy9XMY+FpIi
zT~$?Ec1STve@v(QI@{Z$)wRLwA;m<HalUUbj+)oXafAVem5O0lcI7nUfK310{E?;4
z${Mj(rvGmKlBIj$3>VUr&y+YI4g?O-=!;iLuJ9QW&SZbWl3U`yq0EGWP<qGjtM2Gg
zNs@HOV>z;<+bIYl_~tBM#4)?Vj^}|4QX8H9UlyfhP;!x3uO?Ehd*{KG?tNztFMDGJ
z<`T@)>n&tY2d{Ej|6^ma32Eka9zE4M?Xk1pQqXso)P*{)9lDBOg6sRm;>zQN9<GB7
zZ;U`Gm<6lKHrUBPK7&-GLr#F@78{8eaf=^ii$IuXUy5&Ixn<DGnXgxf2f>AWQgOIc
zg072;ug<Z{5S4;m#KXQHP(kD?N88A~5`T&6Z4><Q>lUY`kej8XUq|BiAI=}7ewR-$
zK9{`{jiIUYrFViLnmS;5BfJ@fxW(T|o~mYjtfUs6j~#_o#%h!o*iWmx(h!@YwGsY5
zDfJHFVds(u$wxKtq<<3oqBK#LDz(5eCD-WhPmAXkvu@n#uOzj&n4L_u^tgh4e@B%!
z?CEK3ZVv{_1_tB~SAsYDC-{3eZ3PIiLYZ(&cgI*?I1&h)H(Bis)ohsW=&tGJZ@Uld
zl^1qj|H)zl`&WzCUaDR)P<P`k%|J^OTqL>6S6}I>h`1s(sm89M?%s}ys)l4Z!oTFO
zhs(;MK}Tz6N9H??9XFm$L4Qc#GTfba2oIyKhGbm_X8<texSrI8Z<_YaRl_m=aCKRI
zWjx{wTg#pHNBEaQ;XuseaQoaYSFqM!Ugj*ZSK961q<HQS{IeGFR;!T5q7O7l99l#z
z_k>5Y9|W19pW+^aPg(G%;P;F0OPC&k>w>;t4&kSq6P;WbhZ;x-Y+&J!0vf-SObRq+
z0Gdk$N9RS`Pap5NXkqT+9`X8#Ept;f(12+?%3pB&zVrV13n%W~vE$wow}0@q4;?r&
zK7IzUK_wu6Q1~`i0dj!5j%R>WID(hv4{qlL-c{}0*#6Xd{{KW96CRh}Jvwv;!U{cT
zgfihLAVcuX=w8Gm;(tlaD%wqhoA}~Fnb`P9--d>@{XLtTIwBLB+a~t)wr|aRm_M@q
zvA%6vI)_H;V?)6PfBV8v|AD=Ix0k@Z+kjdN+#AlYB3f-whK}xsg1KG@-*5w~26&<*
zyh05r5ZNfc17`65T|d#becRyaz5V-I+b-(dx6rY3Y-;V$=BBm74Wqr`)`nx#S6nJ2
zI@h+YDzTrpZghX2+rQNxnpxA9sh+7DY3v!O3|9@;w8Df5oDcqK6u!sV(W}D=Ujq8@
zfik2Mi1is*E!!+Y<3$VN{rued7d<8jd`Vf*@!UQ4+%v=fR!sah(bwVkv{s7WNBkPY
zG<_SzEKpgNPY;e!J#g~F*4M{-)*l^OeQH}~f4u&}j?MeG?~Y9STf_VX;!AG#Ape!_
z-4h!w8Sr}M0r=*%Gj?l)-!k`oOBuqPfpIE;cXc>l)-!4Wt^|BYHsJJ18rRSgUbYKz
zComA|8X@Cu-f(P-FYT&o3ry|m4O&Vo+s9jWU)g_nZTh^4<X^^Sr=~jAraY+uzH9XA
zOXfRDtTUyh?Q<8Q**kX8hNFWGv!_0_WnpqIH5`kt?!$7AqBRG|Rw?vZ<m0_@AO9{s
zDc-=pDE?ZwW^OWj4aho@Z95>Y0Y8kgsgyfV(Mu;CbDPvrz^)pd{#42-c(9J6;2orZ
zkB;rjBuA62(=CHX)*ZjDX)=`<i1+VX+^}i=rsPDst97{c!<lu7;rc`-zE=22YGZ%P
z>MoD3cWu}3j?Tm9cTM+HdDClJGc%3Z-}X#RWfHy3?ov-{KmVoP?qqkuRau{|?}n6@
zz;y#+B>R}h<6g4Nz>*2eh=dcGp-|<l5zu}X#teemE(m47<SVy$d)-x?{<Y`#1qH<9
z)?LR2E|^N6w<h_Q(ajTUJAug!gZxKEP6Lyzz+_wd<|BgvVDg1CM+Z~0SAA;hw#m&6
z!?D;nFd1cxZs1<vPJonhJK*_l=>W*(c&XD_ZrN|EXs$gI8eco+cXXbdLZ9W{$GrgE
zK;g5e)SoSHseNB)%@lmL<K$ZS>>=)P?j`;-u|~ecp)+Ur(~scm99XG)SSxi;7I$8O
z*pz=1egm^T4|5&&B-;27h(G+%KH>azTe1(pcTw~jgHJ&BiTN~Iia~WZ=x~~B{&wTn
zFzZOuiN3=v_O_L{Dx5ypoL^j3ZueKDT(+{s>G_%tw<G9udTk%tE8KIZVDWgWh8xrC
zt1Xs<d!)sA<%Q)AhXc|{P(;LY3rnx_kHc9d=#vLKTO=t0O|qmuFt~;posEX0#lSsU
zhz;0$aC$rv=?S!Vx6h^1p@vX}+vOkM+7Wg)czwO8s?_R^p>=j|D4MSA+7zkXVlT5*
z_S6P9Y)dtH>%x9pWxX%b+giEN>UNYT>&mR&y1s^y_2q#kXNAAqVc+0@1v=_qfVw(<
zj`N^r1(2OL-~>E{0;vF?A^m#sLY6ey;hV0x%;kz*vU<EXk&c8y2Nq`5*jIU1r|M(C
z^$Ghs-`Rhp`_L5wsT1#=-a9nhzv;mK&c&uJ+uLgP9Ut0%0C5EV<39j10gh)J6capr
zpZIP51B=3zEijqj2jTbU;P;iFxsVtD#(?q2c+!?1Ji6<&&9TbDm#lJ>p56_TAohh?
zn|=P4Hb4Ju^>^pfo`eNXGJsatEQudn{@Cu*r4G9V8V@>br*{b;IQ+MRZLJ<pb9+ea
z176g?xX%cm2X7PtWJHsYm-D$37SJH-*7@VdE<JV0&bh-K+xYUD{<hxXb?f+w%MS0p
zeDc;~;z#)NhxSe;Cx+Loft3`MV{na7*Nop|`Gxnp@p~$@@E(MiuDn1-;r(93BrLN&
z@XC_R25^EDnN^ZLKnfl}LQDj=A%$c%=ITj$y}eykH4qy>2ElEwt!-+W-?5`M(;K=Q
zB=&NfdsRhaq^Z+t&6HTmJg!K6nQgGAd~qinsu!bJD*lG0B7pi5LX{cVl$=yh6#>bB
zOfAwQYy&}{ksl$F{Qb_c+Iaku(Xrk{Pjq5KH0><!a#eaA{AwW>@CGX2NW-dNZPHg&
zSLv(sSSv!do{Kjhzx3$ok)|6yJahHQ+Un}sSx-Zxr8&|u5bfU6mYPUML)CRht{bTx
zY_A5+K#qlf3g)T-WCVnRmb$@YF`U7vl>qcl8TWKgbYwQBdiM+my4pQ8q26$+r#d#)
z;Z7u~Vj~AO^j41S+uB&(zdbXyquu6QwV|S-Cex4_Y$$UEeXC{?8|Qa+q4}Yb3G)L-
z=oRn5X~TOeLGb&-(){uN1@q@Y@r@-@V}Z%a_&^@vSP9>}^V3^m9Zjv_<o0xYb-ypR
z&?6jQ?~c|qRJW~(p6~4&scGDRqVELI`bBEn(iSjoy|3;25#Iql>+i`vuw@-sLofFp
zzKg$su0IsJ0(xu6d)P$~)5x56>$WZD;5op-rHe}HEhj)Xs~|E7LabT?k$gSmMmoTQ
zt^>WX`4YBNqBoW4O=kj7i0*?B9v~+?y*4X6{mvHPQ#NZVZgU6XnM}%;#3q;QB-wC4
zMVwYi{hdF%3;x{ovpetlS$6vU?-y>r<(6B--yAw5wjVmg{|Ns6<5S|xPd&xEpL*9p
z@y*fJma(yx*3tT=Xtc308g1e)yX(2Tq(9>4;rs7@fA-S%zduR8{iDN&UwY~(@y|~_
z`R+r{9%>yOZAE{hP4NAurXuo~Ac^1uU&DS4X#~hyV%*spnXoy_9oGGh-jl0iqa(v0
z8ra%$zZX71qB^E}(;|KGhT7Wt>gxI{pvBe%@uT*-y82kGev*G|=;R>y)6oFF&tLej
zK@?Dnb^}kLzGzqha)tqTh#Ri^5&<S}kS(uI)OYwV+}*shqqc6kxp&ah7>(CEC!^K%
zweVl;$B|T1Z9Fs5vh6@Hw9Xys?@DwwS4X=t$*SjL^>y%HtRC5=x}{OePUvb0ar;yp
z28csTGw@!%v}I?uq^3qV5w4!``7ZlLs<C^at~EAV3*Twvdw3C6qfYR@8R)W+O4~94
zTfmmG9l7eO&L@0_eBY?}r>l2t-^3sMq;pT-lTY^TaelJnfd|ldO-o(YuL7UJN=|{f
zqj5Jr6Afm%0pc;_w((i5L>+i7_(ROMbjlX{dc+>=_etWOMgXvWfM1|^&t`3iCClxu
z&Na>H=~mmxhlX6ykfS`&<ny#wy91>*yVd2ic`N)K)x+sh+d5d0`8`ozReL<p<_*-i
zywS?JWOdKqUD9(wPs>E7GtnMOH{IiID7QOoPJ4yh!TbGiUaP9w8HrQ{psACiH0X{-
z`v*Kt{y@s<^#&5rXe3foT^aRucE(~ppTlooRbJW<j&`-61p%y1MoMml^FuDQ_L)L!
zd1>{GEFTH@z;i>Ex#ZSx{M^4T98EV&wGHeVcl|yV4_8;U_typ2o@h?iuj^|Zsp~l~
z@y=+pDq^>-vaVZ=?(c<pUCVtP?hhUi$tSEhe3(B_@|>idz-@CiHUGBIzH3*<%mqDS
zDSzMG)`_=|ej}CQT~~FjiT54bas6!T?(JJ(qX^F&k7{Wl*w~NP0cf$5<|n{!H^iMA
z>W|H4g58_@s@`)3(+9;XxAKjIzQd;IOHH=*?;3Xlebv?O_QATq+Rd20rjdBh{z;j>
zDJVq;{S%)Ow!$fOY^e@|rjli>&r1XdL;&Eyu|6<I+AamzZwt6NX(=dFt+{wptEFdO
zOY5f2n*L3lW0%HVb?$b5v&UjtGm&U=k6$qrO}Du4$+?O8XkEiX$3ojed*!;!;JTih
z-5o;{$@==lXiNQ2qra=g6?1n6n%t1`A3oX<?iom|yC8SEvvo8A&2YpYHYO7FP089M
z@;Kw!SNU)7A1Q4BUZb<`pWs9|pKe1xmrikIV6P`jW-M1hBryQb_u9Z+z+K6m;?9Dd
zMgku|#y3U(HuQqa!=$HrPy|T-`h7sHg|W=32GB9qRP#L$GQ)l1_(rAR;L%s(`1|bV
zQgMH}JIUOsWTt)F0N)VyxKF<0=96wuxPjl%l|HmXdFi}^KM7Q#1~Qd_BNv{$>cR+m
z6{vLkg<mdia=ODFvDOoIJ7*X9&!BhwZ_&HY+%11cTzBDBC&dr?-RN7c0Ka?gjvKq2
z;ReU(sG}k5oH=sI)u(<s;|wS5qoejDTzHP}aQX4qL%qGLDg%BOj4obs$>S4cUT@jt
zQy2d7R`lZ5e{uQ!0L5?X9YwF;J4oUimk#iiB&RVicd!g38X6imuG==bZr#NE^bB8h
z=64Hwes}7`Z+FfA3cgbV-?5VKz`WQJ*v6$GxZ<rF*Uhh)UOTmI-A4G*ueR=d@#<5*
z+q3Xn7-{LxkU#m6r5$;mc}SYT0R(qCmHE-d!HKsg?wbe--#ijroxM-EehivC@JsFR
zX*c=wDflQDUNFDlo6oEXTzqk0&Ap4l`KyCRjs(Zxvmb`fUIL#5TMeIuPr_%3v978g
z4{qBQoS#SkjxP!mYXb9I(d(`Afi)CU6?_xrkpNFsy`??d0@)*|pA!Fre-&aO2jr1b
z$Zw4^o{3hoYMod>We9v9P1uX~=a*-rqr!6H9u;lnA62;T8&U^@m%#%Cxfo<9M$n!-
ztaz}*(=#(@fe#5t&<e=4#Nk!k3VtO+v>pGVG|8Y=WSQ;CE(}+n;qPDMOBTfq!gwGZ
zsrJ-+T6?xN&56UP9S#b(XdxJS?s2Zm0D0`O<qz5IsO0Mvr*oog)%1uUh?a@{J&m=|
z2-xv(Txx#Efu-!`T47yV&DkI(3qVAWf=Da_74qx2&D;)dFLbrJ95nt0r14O)(39>?
z(Vqd;PwBdiUgzo0r0Tu;_tJame$su^@A(&lp-^yrpt?G6Iur~A-GNXjfUj)}1%n~J
z4*e_MfnN{G9~FNcsD{s?_rFH}{44qgz8?%t<4-;buLAJ*Hn@CgFc^FWem0{UeG~rq
zc`#5dejZ+|4+KKIoqptX_<0O2-Wm$vuX2zz02L8dTe`twy5V&#tSew`wm+V6r+D7x
z_M~h9w=JG>XKWzUD0qSQY1KPnb@uryuHe1A_lgaF{_};i{Qa}(^}k#H^*ipkW8{lf
zEjPAYvSrJb`o$ag*!8?m{IBc9-|%<8{PGF$yE}LCJtyYHtN8cKe;qzODZZV*ezHUS
z5P!7e(o5&(8^wG0J=E5tr$#~_liP@`=Z_Fu5BqkfK;vMy5;9&WJ7Porb{-TbndafI
zFLB_=5q{Su@x&&6_{b4q-;vK{_k8^bvI^G;C%ChgA(S_nfc#A&WxMIJ=F2C?#)T7T
z%MNyh_X_88H&_nCDg^F7fwhGOTG(5XpbD+JAPPgvQ3yCeV~{5GW+1BiNZI5D9<ooq
zpzHru_a5L;Ro&kBE>l91naQ+FGD#pL5JG??q|78p%cOuvlP)3>dIv)hX(G}DL_|bH
zq)P`OA|U!IBBCM!A|fI-R8&M%L_~y{@3;5aLk_6-{oZ@;_kW)MBx~(**4cHfwbwak
zpLJ55R!62QEz@LlS-p6$UEQC`*tSR~E>SHGS4wSmw=K3#V~;V?kQ^TwnHUwFk(QWP
zEiuAgt(qs<V~#RJnT!eM>TxR~*QaMeqx56F$zy!Bv{veh9iqipy+y5ZRmWCGlRx}L
z6|GTKt&-1*@C3tUnr)AYOmSu;)u{EX#WEq*k&x!tB$^aqGmAEjt7i4YTG{NFm_$qG
z$c8oIGE%duH?hUS5yvF7#=uo`{)mc>i;IqeH<~%Y3uH`aBCY|qW0qLxQFefo<BCbz
zRR7$<-l83jy0HI6JKR_c9qfRrHOY%wlN!rfF=xx!2jm`<n1LQcHR<;hX!j`8Ri?0s
zHIoK|l3}z(SR<oqCq&_vfYo7fR;w0MBPObLU3;Y6jC(|)dhQ0ZyDW)G24j*r#vWzk
zEYh58tY+edXm>TynAk|vKbq|z6L_K6Cnoyim;Z9Ms|HxrZ8AMvEw+xs7FR7IvU-Hw
z9-Weq=x|4vqs`VLw!>{O<NkxuXpKmWjE{EMo$--%lan#_(S`^xFbmCPt;yZI0j@h?
z{>t53;i<i`i*@uZTN>}bW&0%BdwcLI=@~j8__ym{_GS3gRlzNHRs<*GzCuq+?ev@X
zVMLfM=D*#DVNTD8`thc%7e<5OZ}(o9u{hGuSG*oc<Ufj)vKSJYR9MJ=+$ZvblSpEy
znaFRU<-d;Ai-w+MKa!sOWpR(8STj*!WI^oIl#9z4H!Rvd|LCZdC;YQxSi!d}NX8gm
z#Z&)v<g(lcLnudn8+MIsHv9|u8_3ThKXi>ULC<@F9$z?OTSym;o?Jx!Fm51E7`7q*
zd2&VN|AzbpxLzG$fThY_CTnCqC7+3Y1+U22LBCpr`xU;6qs>CDTRcGMlXc6^7jwOO
z=BT`8KFcZdt=n77#)igfX3_dNK{urF9BSP}hNIRsxKEQL^COWz9QoVHMV0RW$IZc`
zj4=kY)S(z>w;AfhJmwsJyjfRYxAg#VwnhaRUnga}4UZ<9F_&I(7ZuO$>cC`@M#GH`
zNf%y_6z$s8?K0NNOsbpQ*6WLnv>L3=ob)<b9$N!{UAQ;I$IW?kY<$hM7O8kA&XE<H
z)}VfBdWt96-oldVvAJBXB&-G@RVUi8LAGHI_y&6CZ(1JQp=-HDg|jx{EUNW{FOpoS
z^;GsV+(*6$lv`x^!_dbk(8oA&KdShKS)}Wsxa`(-u|Z<4C&`&=7rH(sCp|sWVoB&;
z&#O9UkIAq^bAziMx|dng0gJS5D{F1L=w1!fu4+T=xB(#AscBUy6<Rw#L8ru#a-K$3
z@C&f%M63S!NwLs{ZPGLH9I@f2!S(8SYDGn-^R$N9&3x74#RK02r#DGF@U_|E<IxIL
zHd;|B?(ZQTK~@+}f@><t8F0<I&<XNB^4mgowitHE{FBJv0Gs|TLC<o@c78$Ti@jx=
zNMpVe`8`FO4YP0LZwY-sE=l?z@^{@RM?AMUDDxj9J2*T_quywgvz;{KD@DF6=j|Ki
zECu~1;Nk^58?wga{XjV?;(|`x<IryBYbt}@@<~OW{nw8;q7GFS#^7Z+6GLG^uj9R>
zM%FH$#gh~m&`|k88JQOv8)U?0*SEV|<_02~Ro~%un%R|Xh=e;%!<e`IY%a-xPQyK<
zj^Z*DHyd2Jcnp)DlL&WZ?wT<X5$wmDthBT&JpMwT-eY4(2`sc2@f^A%?l$4F6g?6r
z;*ls=56VJV9eHWF_V~1jxEiS*SA0Tdy1`(J#6=v>iMPc^Mbvb_!CidythCP1;}(2z
zB+`YpEM^nPU|fGe=XNxw`Uj_POl1e#wZoB7xLYuf?Uv7#wEgDuv<*&dx3G^eJ`-6a
zd6>PA@p*zQ!WnOePU5b4dtrff)?F*83mBO2Ni~ECj~)$UZ6HyZ*iDe4X^rq2gl@?@
z47jHzESm5YbA$M-*arDoxTzKs6BTbwshyO$&=MVMi*d!WHjz=TveeZ24bo!kxePo$
zqh>2C?{23v#txOlL(^C^nGDU$ag`wU7nsd{zpiz#kF;B`sCshxu~Z-KM&SXMt5}8X
zc)RxP{C1bqZg;xu&pVtV;&g~Lx(4<{e9P~F%?yvr#o9ARtXtZ&h+Q4{tlf>bPwHr$
zF}t61xuT<Ae%YJisuh=At02YgPszmh3u-21C9qPvJ;qj}dU9-%^^ZRuY?xfLVSdXR
z>9tdm8;JMxo1ngTP+t;k^c>+2p`$izxtLhV1GiSLaeMAxwg*Y`uW@8llZJW0y*D-I
zfIT%mApr(xbW}BqrEyfWCpL=pjjCzS_U+TRZCb6=8r9#4#xKfZ0W~bZXpG1bv~Unx
zjl1%g*JABm5$!TlNnvUoSQi?v;#P{OFJn0o5fSF<_3G5msarq7oRpZ5;EInm(r;KI
zv!}+`lWpGY^vr@G&f3n@)VLJ86}7BDEhBg;xCawloTpiV{%{SV(|FhCrg}`h@<cT?
zGHPe$)b&|yHCv*p>hXzAuN!+F+Tw#fvZk!MS$><f&kv|9y}CEqZgzmHpGIvXxm!Gw
zE6%NxD_gHUc1j&^S8naxs91MuozzE};ge6|JZHX5u8S6~!#R^+<;ZV@byU{}LRmm~
zg|ZNL+3E<Lp>|N<&ZS5HxME;jL~<cU*pg&7#MZIL*LD|oG#jhO)vRrGWVzDnn|V}B
z<VZYfjjCp~vcWD}H4naa=ixljfG=0XrxnKIuC_~DM`XB?W6k}-6D8!~S^6#M%N9rt
ziS_JG9slc_pufWZhdp+z^dEQCVceQx3@&2FP?jd)c*z?oOB0Upy=lP+LQ1s2<-(Q|
zDK@*EH7%~RtcE#BwdzMi)HIvo6P&5ZDfL~hl!!Q2Tna0-S`)Lgp)a$XF<CW|>(oeI
z^RU;|xf?fgn{Ab_CErFb3)sCv7wLPbbP@gbhBCsvQJcX)b{Q^XhPAy-QmtaukhjLg
z!#;>E=1O}&-Mf127+YF0u)TJ5dyLT-V~?>Ljdp_}#g~*+Sf{2hIk_OUVSGxo1@~oZ
zTB1{MLz#vaVl?_=6@*hZB^UX+Ye{t}=^o73CUdmW6zj1h#aL^m*Q#SO+9IVe(1==z
zsn|W0=&aMAW<~^_D}<VcV#q~k0*r81al!MSjBtGQ$k<x{Ji_xGk>LThXD4X`oZ#%-
z8GbRXF&JRfzK<1<=C}^Ut-oTq8hV7?r<OyFxtlU)jL}*xGMZbA4(1T?YS9L(krlYy
z*qUv0IAd|8U=UI^6ywuJ+W}TAITBX=Uw43Y`;T^jvCvACdLQ?rjhf{q<W6_POA}+R
zlK`7yIImYQTvnbT(jqk>{U#?1k2+%NdsAxGNPc5)b`DL^gi7kYt-;qwhmiO(j2Uww
z?l0mtNeBFL@%u?dpcl5%uSf?rQ==1iF7<RQUl8Wx;Bp>1E;yfz2pxvaDb^MkF-nd8
zvz8M!Xs?8Lq32?1xo=f;*htTK@DFd2v!+mW7E4&yVNZq7b=4xE?8I{ds0iV6CtmpD
z9VJKR#*o#lx=C5(@#Wfo;gjUQc07VvzYInaI}5Qxug{G)3-Nep?_Kf*B)DJIXv7x;
zpnt1qu!6x6P5A2|8nJv)grXClkZG`$#$cBPQo0|PX*X#DzxTu7)p<I3oIFc@q{Xxy
zy_*i8qv%ugb^0Ftm|kH?ET6St_p>eRL-so_<InJ~47CmY44VvJ8QsQF#*a*yrpcxm
zrg^5rW|z5*d5Zb-h?0n<5f`d8skWfnsmR30A(4BdBBEMFb&2X7H9Ts3)ShS(T^Kzy
z`k*D#GTm~*nqnPoec5`=cDHSBj3;JL%r4xC=wN@sK^<cppEz%G&USv`N_P!*jde|R
z&2uer9dKQ7C%GHDpNTccwvT<>WAx1MT!?EM_kMhN{7G*M@4E^2Bz%}yn)pIeX3~tL
z6V-34zNLn#M%Nnal6i9D<YCDVBu`I%Jo(w0(KTn){4ymcWo2q&>X_66wMuFosa;U}
z>9p9i6}WioU*|x2Zu+G3*V0d?2kX|Wdr#d#b;s1*UiV@~X2yt&2^ljpc4VBbmtF6{
zdhgaxtUs{+OATBNMmLz!U~YqNGK(|YW!|0nK<2W{Ls=}#n&r(Z$r_tAHEUkhD_Iw_
z6SCW6&&fX8(9*C&!{rSx<+RV)k+V1FP|h#8Nx66DuFTz%`%>=pyjFQr^0wu>^B>MX
z<*Vmg=J)y^^nX^+q2Neie&Lgi;u@{FE&jGyjWZg5*kn+X-<$fIPHwuT>4|3f&7Ns?
zu6b_rRYmbd<BHx7qy)wXUJhI??o#|}iLIo2$+VKnk}pdmOZ%0+QI=XZsqCe)KUy?u
zF{Z_VmbF{n-}1TJYu)}rtNd0^w7PUh-#gxFZEk&k>)+c9Zu3%G*7nY}3)>!T=Wn;H
zeRTU_?cZvD<j&|jJKeeJ&Tl#-cNo{<qmCIJ$8<d1>Gn<=I~zKW@BDk00bP!Eb#yK1
zI=t)NZYkXscKhb8th=V(^-cFK-9NfJ`R-A7KX>>0J&Zj9JzDkX(Br8d-`taaPrrMP
z^bGXecyIK*BkujA*KNHP_4>5DLHT{<+j@I?&+L7^PwPH!^}VC-{(k;`gZi!NcevlB
z{;m3N=zo1cs{yMAng_NTICEfd(3C-64sJ4d^$^F9F+)BW+G^-~!+gV*438N8;P7)J
z+K<>dvi8VFMt*yr?Y`ps?!Ir>eJk(#vcgnRyP{{s>WV`ZKaFZJYU8Mjqw_}38U523
z|Ck5Hyf)S|cHr3cW52w=*8OenA9?@oaZ%$+#@#<|`MCGTeLC*@2Z|n8^T7G>nd7IA
z|8_#$grW(LOgJ>*<b<y$oS*2JSTM2Y#K9BCPTV>1>LfNPa#HN1lu4PB8cmu#>4V9s
zlLt>;I{D)V(;l4g;Grq$Q-(}=Y08^Z-hU|mp@9#redwo${+w!_>YQ3*YQ3rcsf!;r
zJlyZ$)6;rPyEr{#dXMP?r;nb#bNa;@J!gD5v)0V=nS*BDH*>?xPi8fq_3|UPJ#uVz
z<m@K156!8VGk(t0IeX@OG3Wf8D{~EVW9BB$&7RwMZp*pt=YH_$y^kKBS3Ixsv4)SW
ze(aa|Bj*PnpYr%;3)(Jt?}_G5Jod!dg~baOF8uV#;wQH)vM(CEXx~%yo_h4D&lmd^
zFMFCiedp5~mP9S-xa7$t=bmZx%=~ALE_E&Ky>!vi{Y!s)HtX3tpB?(_`^%awTeR%k
zWq&UBEYDruZ229_yDsmueE*7CE3#KKUeR(zrxmkSyt3l$6~|XxUs-Eqhn1689$e*K
zRlaKTs`pp@wz~7`X{(=Ky>IoA)z{a=ttneGd(E~rUq4sxxhBsodhXNbeqCE_t$S_C
z+T67x*1o#-%DRYkY3oYX4O=&6-K2HX*FC!Ko%P=Jo!8&9zTf&`>*udux&Fk4J2u?A
zVa$f7H+;O|*Nyg#Pi}m3<AqJeP5GOaZQ8ndz~+ZGFI9gpY<_3++0DO-zb$!NmTwJg
zUAT44)>pS4c|P&^0nd+ke)01sw^_DjZ=0}f=C&ucy|L}cwokTwyY1I)q3xO58*MM!
ze%JQ$?aypqy?y8QSGT{r{e#NLN=Idl$~KjqE6Xc~RX$KTz4GzOXDc^U9;y7O^3NBX
zFBHAd_Jw<281TZx7b;))e1~Vpz#Y%*IJV>bi;Z3!{^FJw-+1x2oi%p$+&O*cww+(^
zyt2!(>-Jq!b}iVoQEG1HO)~Zk-E*(4@o$84yjDxd#~)>$5aB2L8iYbMuAesk1UpVV
z)nFnQYe6@XL(h>ST9fppjR7@DeT4N9<|53cHAA1!#(<ik&k=r(@OOm2<G2OKE#dQc
zBq`$gC`asR#7^mdOwYvevH$+~U&^`ly#I}~zMbLnj-emdNfEmXyB`5J`Vl@J?&tqf
znoT1OSbsoM)K>!d|9P5TM_&p_gTDz=k)QfE`M1)C>1u<%wvN6Y()Dy{?Yz>^Njd=V
z|12aabO5p5TE5{FDKeVCD@(v5!$X(<*VFS!k>LQ!FGl$`l>a|W<8FY9w;|PKdGMO{
z@6yZz8R!q_0G`CV#s6uVUqbsMlpNiT`jGy+JVEnM`BDbexwn>eQ+lYbo+&5~X^!y5
z`6?aG=kYiWUBxQUujXi5I?~<$ze^j25f|puWk^Qdm;a{zTibVQ`quXTyW_Xe<Gwkb
zuqj>L7-R51O+SM2HUN5}ETP9%=*kyw&HO_;oF5LuIzOCdol#C#%uP1NC<5iEv<$@^
z;@hy6h&M|_KGL}3UBuf~(esWsr~h(3-p6Kj0S!qDge?$;)3=7=*nf5WCVJii_3j6#
zkcQU^eR>@Fq)&@A@z(UK;E~%Px3}isl4eEFw_@E0hd25Wy2|Q?u7=MS{l8UD{cp&%
zUKZJ{yl`te%nNEv!gGD=+}}vw!kf3YpKQYXuR`D71pFlo{leY^ROQElE*9zf2<z+e
z|Ka?b%Qe-+)&G0MMe&xRvX%O>#-t(OE<iS*0l*Dt2Ji#w1H|zhngDqdaJ#gz`qIxq
z+XnOYCFv~Yh5ia#EQYuw)Fjn!rNh&r29oXqcvMHn;!wutSXWEID~)kC1mhv=se>}V
z0T0e4DJ+eo8!wQ$&^ZnGRJ6TVi?ato1KZEghs4na*oE5w^>)G?2Y~j&J~D#cVFbIr
zNazB^j(YK9(8;C}w4(!Lup5b!bKXQeL&q~l62kilp?-ilfJXt#0iywP0oYd+`bxpG
z2n9_W6%IqV01(a>$HE|J!gS$05sGsJh<LdU+NwBq1>ck}$`>#cupjUqU@>46K(zgB
zfGBSo0QWjWO#n*(D*#Ue)&WHOngT#8?zw~(sx)r;$#PdB+^S%OSlfiXD|7(C-4-Le
zj&e*Tp&G#p#-Buv{)am=2KF$WFW!G)voW@W+@Xco=95EFyZ)CPPDF@Ei+1f=kmiI0
zCu?;W85<x8aFmZXTtPe;?@6Oz0G?*y8H9Gf$3+Z04(Sq{ZIl!iP!^IECT?<@5==Er
zjZF8N2AM{gelY!H`ok154@<VyKJ@3XYkjUayMFQdwcyBLMR0U*Y;as~d~jlLGWMQ|
zpC~08r4UmTN~vzDX=-ljWg2W6WBSqbv+1h2eR32^8H`ez{(UKIE}P8yvSjcve%J06
zn2<lOsc@_oo_+)4+0|HLxXZA>P;lcf(cm{Uy=i<KiP0e)NGCD_;XZPl?gg*!qlXxF
zIN=%CKmOP_Hl9sj6WOC|44Z^DJ;<J7i`hc<Bzu}IVHNCt)Duk%^etk7uR=y*>C5uT
zMlUjs%qI)+>~9;XB!}@Xz**dnzDgN2Q7g-)u{57Hp_B0SuP5m``WpR^e#F+X4Qvzc
zsy)xPvr6_d`xjfr*05*UYw(V=m%YyRu{YR$_9lCVEnwZ*-RuG4pbgnl?8l72ZqFF{
z8~vUBfv1d(u^Xg5#@~xxr;v$c3K@yF@n+$@qk&{GSw>cnRb&ZSiv1RA$$GMb>?FIf
zyZaTqUAGrwv!5IzC&(Fcj$9x?8cA#5i^;XAm)4~XXd%6g7SVfXIqgU9ql4(3v@;z;
zhtUV<UGyP3ojyVzrBBmm>2kV~K1W|5L+K{Eg>I++!o9<H=)1Uoc!a)B-=H7Rujse*
zbNVLzp8iOGp}(@x^iOtxy~W;U2id#q5POe3#742h@X&FTy~EyT$5?CDhJC<}!xz<u
z>;(IWY$OM;Q{*yruqo_ux(htqlC;JX)=s1wz85hK?-gz)TglsaXN)id-j0lBF|?H4
zPTSxerZ_x7OJ=oLIyp!VvHENVB<&G4lg*+DG?7-PNnnT=ln*H};Qp(4!$8F;IJ>8c
zGmQLX73c73K3ByJ82iI2Zp17ERosMY>o^rRlK?GI@d)VU87f|lw4_T^Jd*UMXH-0j
zG-WMSJeo9SVR{Q&#P+FtE6Fo<)8Z6w<rwF}U-byg{R7zDJqSBK2Z9Tdp{uj8&$SS-
z7C1Tr`9tyUKr+UzHRv-DD?-jtgdJ|2HA<%Xkx`(mAY+01g0d~n9t}t)ci@h4e^85a
zE3o^pH{yM8em|5x24$5aHwR}lMBTzeq1c7m4*0ekWrR!6pWon?68>F%qQ&|eyU5m#
zLR&^)myhUqxCP;o{<B&Kq5sL~OEP*bdf6A{50iZxg1iwJfxjQqzZ>T^vQ1+A9>5HV
z@h<@uZ5<%n+6k$0lwMyRDaV)(LVd}kD?%|lVvpxA(Cg0<vyzOle*pOZwtUf_;qtr^
z#Qv!k!8xPR&PI5imW6%8;x7{|t>T|d%=ZYiC=0p$K%0e9HSWlgeD~M0huty)RV9qV
z`D4%~F>jr4wl?l%l3s9dN5uMr=6<xeLXMqAAx5PS(!(X6im@0Y`zCl+%-KLm+Yvjw
zTO-|0j=SKCs*+pZRDu}$TY0FV<RKv?|4GY4Uqr8j9QH=5Mx!O7eHvei8AyhvE<(?e
z(YlU^Cqtizv`C3|bVaNaG+aB<8KFoQf!jL(w?+DPc=;9QwnI)bq_`b&OXL~1%eZ!|
z495ihT?p^MQ9&ch?uS-sqa((tA6BlBa$HBD&7zGWcM#@wq~tqI_Qfpp!{2{rT$3?-
zTB+eV871eU4{8xwqz_6JI%Bxh9_5mwL_39?RG=MVEW=VQS{UYFG5_M|XylAWC`MNt
z7knyoRt3_7WU0xJkr9{&(X%n25&h8QSG4Hg@muCC96bsx7BeeW*-_vR(YB!oMIQ%1
z654^oT4Tn<IBQy1v&68dgqA`p{ml>7Ac3ubcbcgY7K52a&}vwVqi8g>P%E|37;2{u
z>ckU5H*5(Hjid2cqs8i#g!QWiO~$I7LQ`oitlep}4o%1Uok8o-`dGy?X%@}Ko1r;0
zm*&9^@lii5z}nsjt9xTuB~58F+8pbA08jr)ux6Ig7PKW+&Q|me+M2eZZShR7J=XpX
zv?J{V3!n?_O1r@V=#D3aJzyR5r1#QZun~IGKC~|^h5mScI1tvtU^;{jg|#r8j-Vr9
zKUCnU;%L|pW9j{L9Bhd3bON0Sn`kn9kWPU;F_k_{r@^Y2L1)5C!y|MyokQos!k9-N
zqw`@oEuc@(g|MF%;o0P3*d0sgGju7ek7ckwR=@&TMOV``utV0u!dg!^(2cN0Hp3p-
zN}s3OV3kzT7w8W9BHc-M(cSbVx`)0@UxBUiD(tbnuvqrNQrQn1<p6z)z76~3AS{?e
zuwf3via829<{0dl<FMRL(2wXzJQ+PjKcT1Tr}Q&eHeb*$=^0o#U&DLLS=c(?!O}TL
zf1u}K?_8ii(Vt=UT%^C^`vt$z%dp$7&_C!^`X{{xpVvVeg3W^M@z{T3U`A$QX4o&)
z;FBT>R*Z#NnT^FTJ9986Y#BF;Wgb{G@yyE-VAmwE>Z}H=o0=?zrNYLk&C*yMcnzt`
zGFUy>It^GR%VOEAA<JR8EDz6eeaz1aSRre~ZexvE6V{Y9W6fC+3$S8V!b({gp7yq6
zx3gC8b}g*1wyYg%&+cR$SVz{0b!J^ySJsW)C2i6k>>k#W-OGBha@L#mfeqh}^=AX%
zbAJ#U%!aU`Y#1BPM&PT1_rZD|#YV%f9*bwm<Jber($=i(DX{;hvWM9;HXYU(EHl_=
zv)LS67d*=5vBzKqJ`OAR32BKhk~X=p$Dd(KVJ|OZ%h?LHlC5H^VLv~|*21!058HYp
ztn1CNueZX&-X?AA7uXK=BHPJ!vEA$?wg)!%E3mp>g~hG6w>7);og0>^W|az?RM?}^
z8f7Qh$LtjQgq>!evd`G(><jiKJHx(WU$bx6S@tdaj(yM0u^-rZ_9MH%equkfU)V+V
zE4##gW0%?Q><asXU1fi=YwS7;vJfZmNWeH8_HiROVe3u=uf`*J6vuWEZsj%}!|mL`
zo!rIUJeGTS9FON-p1>1%60go{@MK<-r|?u>i`V99ybe$2b$JG_$LsS3Jd<bfY~GOP
zz%^YS&*whw=LNiwH{!SP#=Hq{%A4`#yod*QF)!hzc*5U;x8%3;R{Rd$nz!L?c{|=7
zZ?C(E8~e;WxbqMXD>niA*6-vUct_recjjGqSKf`^#k=#nc@KUM@5%4wy?8nA&HM1a
zydUq+2k?P>5FgBk@S%JdAI?W`d{K*6@KJm;AH&D;`}sKj0Ea&oK7mi<llWx*AfLkF
zABa!o5A$h!I-kL3@>%>5KAX?sbNQou9)FC_=a2IR{0Y90Kgk#Ir}$$2G+%-p3QPI3
zd>LQPSMZg56<-bCp3m{Md>voUH}H*o6W`3Y@U8rLzKw6^mHY+1gTKgk@?Cs4e~Itm
zFY{OUzxb>CHNKa>&iC;*_<sH-KfvGOZ}WHfLH;g3#NXqG`4RJ&;e)b$ISp0l7hzdx
zL8(gTs&t-8=c{yqmiFgF%k%v?nf(V1FISnlDl=D?nUkZ=lwr2dFKa9d<g1$f`Rb&6
z-ATSuEz?&jGjAk@_3Jz6Mq<$LL8G;bb7ZT^N(-~Kx(ZdDh2c76uTZDf%RqjiqzmMS
zdlOJ;t=EBkt+#=E)%yai+(3Squ0+unYhkG>uT+(nQzY|C3w<gKw@=oOF(_7jF4lF=
zUz}OhJtV5S=Pyy@C3^A_J$Z?aJV$F~X<@h(S}RKnWj<<Gt@WwV@P*Ui(a_Ed<d<o^
z^Qjs0$x*=h;e0h(J~diCZM6LP*|NC^tC}kkH+m-$H+tvKZ>Y!{>d71G$s6j)HO}+r
zYn-Rf&C!$R=*cyngfj<y>A8CHTs?W7Dlkt^o~I|z)01n=>(AGiSDl-$C(qZD`xJ#w
zU%F3E?yDmA<%B0rW8c!EFnh}h$o3Uz>=p1Uw)88u^vm;bTupFz!V1(xYV4ft3zW&`
zAgpSRNZgnxk+?BYz5+Gh{&2C1Z~TgH3grBk1^i(;#TR}hMLAmYN{f_q7HRaQMUo!P
z)ffSxt~p3lH3tb@bCe1y&@qA!2_5-OjNn&e@2@J|pYN|C7YSYIN-Y)WX4Z#<uJoH`
zwm_9$pfA0kirk-HpesEmJfliM6e$H!q!dJsCSs*UQWUd&xoYN%!ZWMU2MXjAVCXbX
z2^7d7M_O@$Hf2Z`YBOC>D4Qqb8kt2Zvq+yAP?-UJrqZ7pL*Y!tI0YKxXvGz3V(%-|
z#9qrRRf@b+Q{*z!pRctBVO1Uee62MIt1^AL8poCv$p&B?6zc?(D$*2uSwQP=wy#j}
zM4^6JDpbo-p?+B^)CApEs0q62f|~R~{aRG039YYC6Iw;7ag(o5<0h3Eo)x8N3)QF>
z>iX#`RbyAG8#{l#HtGngI`8+XOy5nJ+S1|oX-kJzajqtDrGfD9D9H*a$tqMcU8s$%
zHp56%F*6cXykDqzpirw=kq7kT0Udd6xHiSi0maM##mr@@_A-6#NL1C1gsyhAI2P&`
zM<lAqk*Ffi)wE1$K&^HGr8EQKNl=Stp?>j1LRXxA@hnsfTd21@kkFBr>T3`8SqXHp
z64ZcF(Pe5V%k)EuL{)J}=sKgR*3x1%k;Q6gi^CJCn5R&$v5}}M4hdaxY9@+RD~rQv
zH8Z)I1}`mEV^^%ku2_v-krL@5-Ae95qN+M1bk&86QG-#U2BSDU7;0wA^fQY@RdGmE
z6_=-kzeEj2i5iR&H5h9B2>7&W13tA3`jqnXDP>ut)|Db{UC~6QNNI{9{px{4Ra=m#
zYD<yQAw@bf!iR*8TxUl3ij*QL(yty!=*V@ehp$MRpMXzO`+=~H>{n{er>5PfpJ^mS
z`!wl9qRI}>3lEr@_7XMiC2HD>l=3RlE3YDL1@jeYE0{J)c}lUAsF^KM3{nzi5M=@s
zsD_92v1W*8`+dq-^XWzznN{N;5;sN}FaOBiAe6nik+?Bz;)sr18EZbhv4(_>TxYEL
zio%W5Iu$5X_DP}SE0{xy+XH%TN8(0tps1?d7f>rmKvz35_2f6zuC!p0UJD{oRXP$k
z`sOQAila!cIFQhh>lH_l60IV=Xd$5^*Naw>(sD(5Er*1TT(9K<N>~EAY4jmcMUI57
z?MeWZzy?YbdzUEdB%th2?SiB%P^jn&mB4Dt7V<T17${U+Rw(&6+m{zs1WM18Dm_!8
z^h`iWUqCN?Na&iYm%e~n-~&3V+=qmYTyK>Jl=K92hNKS(9l73+3@Et@=qy7Y5;}6d
zWtgXyvr;9)rK+!`O6lb(nJx{7O14XtYzLIh5zuT7O*<f=tFBNtRch4?6o!XR>ChrM
zMUV-_R{=d=A)zZy&sPDp*ao!4Rw)r}8cR!+5-C+mq*N&pwPps26nhja_Rx&svOtlV
ze$7bE_7y8`EY=%&0gV>|Md1!8o(fycWlDvX=~qr9syc#16$|I6l`*Uvik1E^*4vPI
z;jx!>qhU%T6zgruVkP&*db_q*wWe6FwsX`}YnOE>PU)voH5Y0X4`|95$CY?!>K$pV
zIRQ;cBdx|Q%sSetUKR+8NuKIsnObG?)clkw)+<x(DO0SMqgbv$(W#4$(t_|jDy34a
zS1L$U4KWf`L#&LAK$)7UGNqo&!lS8psaVfT%A^RChQ~&YfhG>wz7n<8m*}q{k*I0|
z5>;(brbR$o8gRN=8Z-@sTOCR@`1Q8GUnu~;e);q(G5712Po?nu`I;0V)U9hs+-Q|J
za-&uLe68mQ_2fE}RUFZgYvb<E*NwYK=t|d(yFXv!J%swwb&?>CRF&>icXRNy4`E@b
zHCeYR`f)@@uI}debQ9o5qN*`S=*Tryjko6YrR!9+IHDt0H&A>!RSk~~`qFi(+V9h5
z3ZcGqovIc`bfv3{c%M#H`;pMKU8k!3K6M%E)2Uiy>dAGg*6-640YZIabOwMpqHBy|
z0-v4<kkB<o#{|ASIZb7y;&Nith@nFBA|d$>A$nPrDSL@bG_ESMC~0W<uzSmg_UqrZ
zeCz`Q%ZH6GFYi5KY`^jfN%hZ11ylU>XzzYQN8JC9=Z24l848WTELSzg=c;PVsG;Sm
zoWEp>)8ho?z(E5B$|e_~{fhc;4~R3|IHQZ~o9wP4|7)(G^?<fy#OS|J|6RVI7X#60
zU`4-veMgKQ^_R2$`RHHHl_R8Y-%aP<bX1({K)r$T3jGPUWC<$C6eXH^&-Q656rs;1
zrXA;w9@ty5ram2>m297Od4*6}Y2n+!+U;TF%Vh(hS}xS>V7zy&nE~)|0j9)pWvTd-
zHK*Nv&h~|up)$4Hh1(fkezfHXbgH~ERbH7YuS}I!rYxYcyv#8beaC1P5F|h(v=%f}
zD@;i^lnY(9FI)Ajp<2)yDx)Ynd>JNJD$uDGW~&}&s~%^EkE?RC)%n^Aht)+}=}L0t
z@v@R!?Rd6!UpFT^Th@zE9!DsTBb4VMEM~<Wv@U3*WhG^@$vOGjVv5O>YdQu=HNjV8
z?=z^P&zNEThxQwnSzb}zdr%)W2&(Z7wI#3AFIV+!UqjW|hN_bd)!;PDx7{Ds4EIU~
z)XE88qvosW$j@_EX^(sRmyaG;KDvB(d4)c=Z~3rcTCU?(+VTp0mL$A6Yt)z_V^Ew{
zd49fDtR@gc%12e`i`C_ZPsr2E!_si8^W^xImHO3a<Y`k>8op<pr%hF<U-d3eP6_B0
zv*oMN(w=4^zt}!%V0quZ<+`4Wrj`}wYb6z{rz*vo_>>i^rz^#p_#myADPOh-C90Xs
z59fz#R&1|5%gXlUtNGKOQ6a6EIbSiQRzH|f^(1^VAZ$Hq7aTaQI4EpohA;KQR%O_F
z)GoTfaf(mER;G5rf_&A!@G~*Z`bWMJuF{g2{{05t3q?7!->6Yi`@4EqWe9a7SHr(#
ziUm;YL!sEiYDG8>@CD*_f)8i|5?K^Bq*z!sa6@(nVc2y!1@TAOW5AEI$APgcmT)|a
z$Noh;hhGQ00q=%zJayj$yagVkIG(&e4~+e-z&qeOh~s(tN7%F22+xm8uuJAYg-&Rr
z)*{h%e5-}tslwhUH3EBcV~{rsPmK{8o|gR+9?J>d;in`Ly9Klz0-MmLH?Yt2L$n4X
zAp1gOUl{tbl$fxqU^RR!twX;ovR_u&Bb)3|4EF0*61(h?13lVDyx6IGlq6%1z;W!}
zKfz95=Oaa}k#cV?FDYx?iPRUGgVZ0`uXhFZVX<N56+=kkupz^Splt@wrC|?I0sh2K
z?A#XTV`B*VCH8Vt9K~L7ggJPp6TO4yZSi)eh!p^YZ%FMdS}h&5vuYLCxk{@gR_lRy
z|Hw{+Mox~L47@0EFYv*r6hfn>M3><#vz&DzW}SM)tYhy9<{LXl9>rf4_Fp`PJj}Y-
zMUvRab0~UvLNI!G^yujE(dVP5M9+wx8@(WUarCn2HArvtEREh4y)*ii=zY;|BYimf
zc=RcRr=q`zK8x_8XQ?GJc8P%KVDy#fpv7Q`w8Th=wIo_nEa~tIkSC$JrIDq%rOeXW
z(!tWr($liS(ibq;GSV{EGSM>CGRrd0ve2@`vLfLW;H+h>ZM0>xrP8uHexc=6%YMrx
z%R$Rg%L&VA%NfgemJ60kIDXX=ZQT>U&`NAGtR~xNYc$dhYh3(pYjtZaYlb!3>a#Ys
z2I6<)c+1!&*0z97pzoe=*4hj7{gEDubOnx&vre;42F$k3w=S|SwXU+Rw{ErWu<o($
zwV$*eupYA>0-UsdX8qcF&ib?UGQ1oxTZGMObJ@JMWLui8zJwfGfvu^n#Ma8zUP2dJ
z4_j~BK-+NJXbI!v7uu%SX2igWngH8e+XCBS+p?G?F-JA9t%+G8VI#tAfSrI>Z2N3)
z+YZO9upPI3VLN5}LPviV$Im0ZLV)d}?TRfJV+fZIPsVE{B%=J3nDm&;m{~D-F$-fF
zA>BNtET%Qm9gyyZbkCT+F@upFiS$^cr^ZYK%!-+Zv?zaV%;uQNnB6h2#_W$dh~p<>
zPRE>y`7Y){%%zyCb|S!TvPat;_VxBS`yP9BgtZW6Ak4Opv-|9g?E!mBds}-adv|*;
zdw=^-dj;|*+o#!Q+vnRCfo>`2S0OxvaI1ZX4ENd(AUtM2Y5&arwf&p`M}5aB`_F*O
zfNPFZ@WgV;VRg715i0aLk{tz(G|=TBZ0aa+v~sj}baC`>^mYt%40ntM-FU|o#|(sX
z9Sa<b5iWDAaco4m&9T$*iesOIw;hKa0*)ge;7m-6m5`p8?#xR}cYNVE>p1VY=(yqt
zIt|W9XN(iaohi<AXQngH*~r=4S>|l*?BML??CI=_a|Sy{I>$OEIyXC~I%hfOITt#Y
zI9E8=B3<d+?R?d_-+55N(by$U0VkZNC7f}7=M-?kc}c=m7jXhyCRen};fixrchz!b
zxUyY7S7QkQS4)=w@Vtaho@iHh&jD92*Em;y*HBjlLIIOq({8|Q*L>F^?`N*1fK{<;
zUF!i`U0+Ms;l1qIlfYbikv;%8g!D0_Pa^&q;GFAc*Jal=cZ8b(tZtWkpWB<*&7JH{
zbJuq_b>|>0pupWUAtJ$=5aBKn;BMvaEup=;i(5bsqyacKP=I^5d$fDJdy0F8d#;29
zC_}(v_p-#Y#BKsa+`Y!V(Y?*R)BOsLy^XxX?&I!L?l0VD-RIpG-B;Yf*d+pD^E`pr
zMxN@i>4<0Q(gwr@MB;c%>{@sgTmndpO+j41t@N!u8L=HazS!oVFGG3ZbT_1XBHb6q
z2jloiq{kvXF?OniS+VnC1uR7Q0#=}G0h>J}w$c+FyBqWZUX9%^;b831*b}j*W6#8X
zC*eZurC0%1J;Y=3M0*^bfG5sV-BZhx;mP*+JdKeS(9+XZLMKo6<Ool%go_F1J^d5T
zCmIrhiH5{T&upXx3{5!YsqifIj6+<&WTdAd9X>uE=|xDd@~oGz)w9F1$Fn!Fr{{ox
z_!Q3}0iI)?&pamqUwh7Zeoi=>FvD|MKpgX2i(_#San^+65?pcKxa7FBxcYGgaXEmJ
zxTb(saqZ)}#Px{l9XAkj+9B?6+_uDS5{7#h#f^>|A2$Wz4CKv?TM)N6Zdu$Kq&LQ0
ziQ5L+ojQ00@qK`|6&#N{757El*|_tdzZiEVKE>N#gZT9Ll=$?xptmC4fV@aR3?LSe
z2*5E3nTY2B8UdOE$^fka9c~71bo@~P@!jHk#`ldM96vICZ2ZLdsqwSo4@#I9zc7AD
z{EGOsNN)yICM=8J9sg?l{`iCP+_?A?-dYJ8<4?z*L0Z6ffD7KZ_)GCuy~G>sH31x6
ze2>&y%bVfN_WHbyy`8)PZ%c1mgx$UUy}bZKy%pYZ-pSr+-q{l7dl%uGg|QM66Vnq@
z64Sj)y{o+Iy`OovdUtsDc=vh_Abv=~WiMpfdlK=lz303?doO#hB`_hcVOdM?Cb$5}
z326!S6LJy?5}GEIB(zFspU@?thk(SM3B3UW6NV>@P8gpsC1FOwf`qw%#R<z2)+B69
z*p_fSVJF~~gi{Ioz$b4bei-lt(qAAAJ_TF}^XaW^Ps~irOKg<b9PMeH*a5uKGqEr1
zp2%D5zICwsgbnMEHmp-xd@gD6xup#oD=oe_X~QPtd|`>Uf)#cfA@2GbxbQxpYX@Kt
zU@zbR+&aNOp*s!nLx5v|lYq|vU*lK+&=P?67+vQiP#50Hl<}XDkGLD}^||27!-e<Z
z+_3RP+6}AS?E=7ynmZYQ^22SAA@-TOVHdi(Bg8w5?h-%`0NU#wsN&;Qx;?@!Dz7)f
zfjF-h!r_3?fbmH8M>qxHP~vqAbe1?O922n$&UY-q>bKRg8|&U7#|f-!=Ny+DL9A*K
zP6t-BG-ozevl3?sEY!cZz9WhFFcNW^0I<`AJ4q+rQIt>}VJ$!gAe%%wqfus@vpT%!
zXP{i4v#~RPS@?fry~7vYE!^?nyDB(@tAfM0HmEDF4eHBlgDkumMI2WZOhh;pFbgmb
zun=$wumrFIuokcxPzl(rgI5th0oV^X2so<JrxBh3d<VDy5M_nyLim@_7NaXh9M=<a
zq+6==&7-d!Z;WFBfS_qhvK{jr3&8;^9BUn$9hKmMR~`Eu2OUSj38x)r9N#%EfE%tl
zF}r^^cg~j1w$4t@?)dBF?C%`vtZ<HVPIgX%zpweuMb4$pRp6QhJP-JdP$lr=9KNE-
zY!11=ciXib$PRft_!00j>{12}ekgMIcQQxd$GLbr^l_QLjNc*h@kvaP|19uqz8Ls9
zRT{30$n#np9<M<o<BNDS;%jAm0gFfcK@rD$3Mikh3t5o!6oZF0vLS@)X0i_NYE!aW
z<m3H?w}6)hry=LK#P6^y#OH}P-fVaU__<&k;AiMzfrH&~bW`wd;FZB{$eB*jBRV};
zE@?z*lY+f*^fg(|{@`7Re<0)2gZ;$0B2K5XmB6Fn-ICI2vgP~PFF1Nq;&rn93q#pB
zI+iU2ekRlqNB6Uf0*7*e&%iG)B~OcdI)Oa}Jc-Rh&S%)Ajq*8s=F&;rB<T5I;MZg=
zFUpdqb7)6;zl_g>uV6~&%A@;ve^9<7^Cv(mC>?_<W>LaCVC>aK&IEQ0crw0wD)I#n
ze9XmIU8e_u-<4y25&ps{UC0^$2V{Jvm=_um!c3uU5x^5dXd9i$F(Y)AoR|H4q$pF+
zkZ<JCDZv?no*n?66nq%@Z?Syf*JS*C8Q&!07|&+}4n6`rip`evb3wU>eGU9}a60hE
zGX88(jL&@xIdo~Lrlk2C_@IoRWFo#;#PN2^AA%-`IYl`hK_la*Wqg{5(*bM+@N_kL
z8KC)?3;eRod5_(O`1c_r@DV2X{9C+CK*^6mF`fs5i-BL0_`Bc`#J>-U5%@#4^MK3`
zvagWy9s3gaGl{>F`R659e;bNL{&AKBd^Xq?_#GAi{z1myU_Qj(2!hARd#pL|L3~Am
zlHI%s@Q;$)xAT^WZ<8{3oIi>95p7PzD4{Q6eve6fP1cTgBarjEJo>wA=SB7taz5jI
zFb-6f`IY3r8gc~A%6N*5A7rVbOxgZl<;Vns6Or>iYX<yf5bGEDf%$<?2d4smFKWbR
zIK(JjW)~3m%6fkiHPR?q=I=5;PR2K3wa2+K{t~Z^_;nfI!G-K>;=O>M6YT-6F0qiK
z`FOh@@{X?oqF<pn;2EqV@Nc04;H9iD@HHWcWVXns#t<ZntY?!E=kRMv@wI6&n;{v0
zL&PZ$3hnfq)Lo&_HpI8`O~B8~oUH=WB-ysD9MVmGknxbp5iPtX<IfAp!pz<ad_=bV
zd!dWSGfd3&<=|f6U91-H9`+mXhjK<%OUhkb^zL;zzda=1u4akIIU2lQ;<3P6WX|+p
znV^*AEDE+je6{4L`>vms`DwuOuD=1ik<|fyDA*Wy2g?I~HYmn+3p)jTn0*V}GWY@T
zF5Uz9BR&GSi_CeALpH%nqDOZG4+Fo*>jUrS(1+yqp!mkpHpwBqgV1JVryQ}t!A}t1
z%^-=Sw}|srLPB}-5af}U3hCg1kQL*3f}H{WJmdxbl$`}WE#kbn&`7*Fyp)Q#D4|qp
z3A{N5n)iZpfKSqQ1-+0;ym`|fxQQ5lynlm{=XZ!WJu33)doup6q-iGl$Zwam6!8v-
zx0bcPC-J)?hkhuJHj_u2$?}WjSw$jF-xG2Ak&M49;~z?zrh=1sJz3Wp84rk=;<W^i
z(Ml1g3q>4n1&KD)l9U%@2}ebow-j>0>&v+C;7+-eLAsCqfOA(#`jzZw#AivG0x^TU
zAP8-b@)4&8WPA-fjrcyHJ?KmsKQC+fQQ{|LIVWX&fsCJE-+)rC#qj4K;!9<IEK5PW
zHtP;-gC7=3?ShwRo;<gP#2FID3Ld7(Voj$`4*f=J%ABSW=gGDHjo_om$0rzoGvt^g
z$+jhn(Pl?Pjd<(pBJiiO_S+bEfToKQ*lCUxneCS}hh&X%M(~apIGG)i`Da58(EEk{
z#9L%v0Dq%$5T`{V&W;I=q6LD6X3BU##tTH8y(#nn+b3)H3!caOdV+FS@NLBV2_B|9
zgBV-*v$%rzYr%cMcgQ|AkY}}#_1-0Q;7-B$c$ZIb_1++6hYb`mjuKD~8z$CG<cp(S
z<T|^YcZ0k<4Zlmm?kX4gLWk2cqGWt2Na&v~_~wnsN1Uu-zXLB}*MV0{30*HRT_|hW
zBK65*63>=7bq!c?Xr>_n^z95ntG6(S`F$5(dqq!W`@4uZ-KFA!i)L!IOHFl2=8xcF
zen$z6uLKE+=*rT79}!YOPU5RFlw1uy4tzw$e-UxomyZHo5^^GcmWY$9B2Guh*?d%%
zJPBVu5muAv?*m+X>tQ^9206*{=t6!K@r5$JT-d90i==#&V;pFq%<nCGx-8fq=kAkz
z56bxO5?^9RkpGkc{6>};YN6Lr{C&h%a!3%y9GFEJY9hW#(MU>BGAO}mwDtAN;;6Kr
zH_84kla|9WsSO6n_5@{1+OtKVZ^D)fEM}i<kYl)A(yR~`BW)ZMR>w-g|74|*U-FdH
zLbWA7w8uByC~Y4UQqWz-y9Yl*yi8h3Wo#1SIl&G%Ym;2{Rti2O6(J$@8Iq>Gq|btP
zFG`Dp-vdVoekQ+jfv>@f8>Ld)P>-C!F48KFpjd@zYr*s6K}o+rSc5oAXn@rWIv;%a
z4)7?6U*v*ko)VfLT=Bd(Do3Cu+~iPNUB-LzY{c8hxKoy}0Dh{`7nxHg)*y`4hrp>a
zURRDr2tMwyVsbz7?Xo48f*S>m(D1Z|l%ROAR#LabMlml~$OWz=?b07;Ys9AnT`1>0
zS|H<Me&1xt!26|D@DYne{LxS~;Ez~!;H4atI4bz?6={c5%63*0M`;~NvqxIp9}Dg!
zPe?1`J(?-Ye;s&c@KsrY3HVDo82l42a_BSH_W(aGFxe(~@@3{g{No_XLH>D39}p!-
zPTMb!Zj)>45xMR^5`?{nH`2xE%?y4C`b+RU1HD0Ck~z@cWGlW{ERI6|(D&smzsAuv
za!Ka27V}8{l)T}V^5T{@$!=B`^izUD!+3-(LAAB4vAljcF0J~yQnO{snbOv;Z1x^X
z`%aEeq0nHou3U4oc^AZMOH1huY3<jLx*}IthM<vHo|PfvOvLf-FF2D)Ymj{-D51$Q
zJM0sAW!FHA25lf^t+tF8%Xq2a7WkM%3AC-SE@(Fqhg~W(f0oSeBUhYzrF?lMFI|`M
z7!jvb9xY>25N|AT`yluV*KR_l_RIOjo5+YiA}PD`ouKS4I3E_#HQ-GG)An*a8%sSL
zkUX$Swq&Kec795>q>IeIB-g$Ua^&SI46bX6az+XoygS?#I8V|a<DF3Q5owvcE=%hs
zW}j$%{6knuBzXNZ(A1WF$qquNAwEE0twxzY2s8|DAh*Yx#dv<nFYrse8y<r){xv^`
zH;ykOc8Y(&&*GY&@uU0%Kh0Ysb^veYw&W)fdj;?9mhi)fRpPDQS9x>9*5jSu9pEU2
zcZ1j99q4U{EyVl6d3-Hmv+*`@HeZU^6ufI(pD#dcEZ#*<=d%zSig%T3@yUoK<4xw_
zd^BQ-c+a^nu6-Ha$L@r8pL-$Z(prsJ3`V9*wkjL%aX04pvJ~FscHzBk+&jd%DJWTR
zItkq=@tYC{C7vqr41wV}gyK6VLMxDvh?9_58AuRg1`N3Yc1s*7@o0&KY?07O8NVVi
zv=JyD7JlS~U53FFT9XL92+w(?BF=@rA?zG-t_h0<Ijv-lpr>rF%&|x;>Z0tDqy#<u
z!$BfJpC<D~P652`fd>5+`9eDqc2(m0L_URX4u$AtnImhVupHqVNz_Z}2f%e?oJib9
z-uof&fG5g<9E5(6ahsMyFCynB-VgXHz6MA`zhj1IC@Asoyb$qU#R?w^;p<g2bRFMN
zLpg>+h+i{6iy*#B;={ny@S2R9#Zf_z_Ainct2cTC=?T4Jcu$@SOse6_Q#ACkVY@gg
z@==<YFKYNwVg?*3t`0+g%6lr+c#g=&w}u4Xjr<UU9H17-58}=W-h;mfm|+(JB@yu9
zN{Nw+S$4>gq~g8~#sO;!>0`hchOT4Rg($5z;@{%y5u#OCi$DYUgKL2@;QSC)Jo1FR
z<MOGDSMWEGQ^BE+$rnM42Jk-M`C@GZ7J52AxDz-Ktduz;B_0I)vb0&AgWo}6C5gVw
z;21X+X+SSnEdLPL!!a5x(O>{hf&5a|H6+UP1#uSalw#m+B8NOK*Jpq5G2}$b{6d*O
zU*wZ7q%P6+Q*<HPeu|-TKSgi3pJFJfR*uasq(`4V!$y+65)bY>bkG1&AvW!iabiy>
znLKnvpP^)$-25`TLL8k>BH^KDFg&-6CsWC6vVbgsx3rC9DWRP^lqAEO+a5?D1`&X<
z1c;c}m7(PbZ()?+-Ze0~2Q2*UVXlD17ce65r=2%jJ3_5u*9u19jFwL!LE;Q5WfXlE
zbAU8op_OO2gs>VoDI5kN)gke14YWY)3^B@D!g->8k!KPVpwn6wrelWF@D{}7Io0qz
z7z?}_+R2mTDe^RVhCEA_la*vOd5)|j8^|WIg*;ETlNZQ~WEXjfyiEQ@UL&uQH^`gh
zE%FX|7dA>Ve8@D0|CJT+xw0AlRbGKFmA&wzvL8NF-iH5_L-3t)6n;~V!yn2;_&&J|
zzb9AW3#2!L28hfcLky=3XAI{I7Y$d9%ou5O7`?_6V}>!u*vJ?#wla1wb~pAm4mMU8
z#~Y^_XB!t7ml#(WHySIAdyM;x2aU&!r;KNe=ZqJPS53?mX>ypnrW8|#DF=QG1EyA{
z4yNv=-ta?MVH$6mYMO0YU|M2YW!h+}H0?3%GaWP?Go3P>F`YAAgpWdIjx;;WUUP~$
z!<=JoWDb~HnLC)fn|qrFn=8!Y%~Q>@%?r#+%&W{B&6Vao=6&Xa=40kl<}>DV=8NX5
z5iBAy!V%$(NQub6zM9q~(%c1S_csqUk2H@qk26oicQK|BW`>6gH3AI#bcVpEMm)58
zO?<zp9()Jo5<i|MHNz~mAa}r%P)E|0+>P(|_JJp%A!G!64c$*B;5)t#lbK`=d5k<k
z-X|ZDkIARxOY#l*p8QCDA-|D7$aR<rM)(l2z;BQnzJjX5Gf+Cb0cFDnPyuZYKR+$u
z+owJJ`E-L1pI-3WGZ4OdM#4YOIQZn50zW*naCdS({Ov4;kDWE}rLzrwbM`<ZpMt-e
zGw^Y99zJbC@K|Gpml_*9(|F*GrUpFF)PdKTEW#pMqrEQp3P~i%*x!_a-Ag&xvDAn(
zg{P}B(hA<FI>6gjchVE`*B=r%95Of-QaBlMI0KS653+ca949BqY3xk<ntVsj<I9tm
z$Q5!8;$wh^q-c0Wa={Z)68s+3fv=-1csTOImr*hN7u^A$MIGU%=x+EX>H~j7L*RpG
z6#NcNfUlv4ao>Ip?z}$%KSIyIXV3=t2YL|}X&QX`d<s84-@tFrPc#UBJSOaevcm69
zEPU-$hku<k_|(ZH%(xfQajO(L;Ta_XUrkCSb@A2Uh9n<8_nN@}Rw+DhwIO%HkJnw~
z9(bw}UZIAO`{0M_0Wyg^gfFi=LLSA}SN_{lNRE&X$Vd3%-{<5j@-6v+{6u~wzmq>n
z2>ztZ@F8V`-zX0}MJ3Y|ng*{>neYPTlakvMKA+0q=cz4xJ9U9Sr=IZP)E|DEhQn9W
zSomj}44+Ih;D>1*d@n76za=5*t03#^A?;fs?>pc}>7Ql(1nzpBreDA((s%HMbfHQE
z(ChGaWQ2z!3%nY+;mIfo-ivC(V^IS_h4dJ)21le5lX0i<YvXz2CF3;{bY?^vu^4w4
zcN_OY?oUASKZER_h4f#5{9^@#%rNLa6EtolcKlgM3=#e~7ek{jRbDVP511RJr%2(a
z^RK=z50JNok4Sjb6232mXUpf{MQS@dMg0q2qF#rGs5jvqs>-+J2k`X-f0mjrPIx?m
zzawyl<|~IQUpZX(%7Kh?a7QvEor6beLEbqyB?D5=!7rJReGab4fd=5<9Ut@n2M0BR
zHsIi+rqBr-+!T=dyA%@C0_oc!M|U7>18Hi9@J`57M}(arSzQs{1^K!g;XRPDdl8mH
z*7_jq2Z<Yia1i8f2*P2Iz7YuTgA9&BI0lj^z9szt<Z%MRNs!715k3Ujd>G+$Na#$2
zk3df6Abb?k`WV8;A+t{)JOasmAK?d(-wzRf1S$R);U|#gPZ53&iT)DdSCH#(5Pl2k
z{vP2Eka6)X+@B!nzaab-@{aFYfSa#Cr*ZJ~HF6zcNGzbjWs>lhhEV!TLn!^FA(Z~o
z5K4b(2&KO?gwk6Y!W5cHYax`L(hy2dX$Uigr!<7pQyN0)DGj0YkcKcIJftBk6CTnK
zwh|uF5K0ee2&IQKgwjJALg^t5q4bc3u($A#hOoczkcLotNJA(+q#>*j9?}qwg{B&Z
zP<lv1C_SVhlpfL$&JZ5b5K0ee2&IQKgwjJALg^t5q4bc3aFy_khERG%Lnu9>A>1Ln
zp&^vs&@irP(C;UZmfp<}O7CU}zYyNd5K8Z62&HE;gcpQoGlbHI8P+u_e3&7WKFknG
zA7%)p4>N?)hZ#b*@L`5f`Y=N%eV8GvDSVhAls?Q5N*`tjr4KXMM#qQ|9=J~7PU=~9
z9=5T-R08a8aZMxd$ikvx;@ibnSP=fSB5@rS%M+m=xROs?|Ncc&IN;gJi#@n0BprKm
zvq>KI)HWu~u|HYwWwsZt#Rih0((~Uq>1lTwnFT+vn&;pDmZpK{SmA&76nxvBfzM#!
zh4&)9ynGeDc!lraNO=Eqz~i4+`Q;T}c^krqpU_TC;Ipq(c(|2*dGAtwdI!Pd-hJ@0
z_W(TWJ*0f}3a`UeetOp_FTF3o58glPHFzk7f4k46=U(NtSJQHO54(Ebx~x7igR^$P
zuijqRe<$c^2<a=}j(xBN50eO3gU7&GpMi_c!FGVgrsn{dL5kS}A5n1)C+uN)4E8X^
z)gr~U7If7AbbkJCN4X~MR)xp-KONtd@H@B#J_dIQ@6KxM#K`G965l*tY!7(25?9F#
zdyG~9Z@@EqhFwR?f!E>6kHJG7?o43s(R09?*bd-IT-yn}Q{r6`@0R!_iA9-9aZM@8
z6qFm7pxGkNUB?8?c6sh5mLskp@QjT?s(ip^JT+n1?cNmFhCTlV*ntny^{fEtYOE1(
z6l)G_$8!vEW-hQ1PsqiYw*gyN6JQ&juL}A?;3zzI74%}44rfIYmq;wuYR<|eE|s{Y
z#4RLlCGqV7WA-D_AK@AMCV$z;7uRCA_Nubz7;Fbz(=h2zQuvY-ek6qtN%)Tx-Vnug
V75=m<G8a<f$L=36aJ0DO`adrr^@RWc

diff --git a/tests/Avalonia.RenderTests/Assets/NotoSansArabic-Regular.ttf b/tests/Avalonia.RenderTests/Assets/NotoSansArabic-Regular.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..79359c460b13e94945a8700227dabdc790091c0e
GIT binary patch
literal 177004
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

literal 0
HcmV?d00001

diff --git a/tests/Avalonia.Skia.UnitTests/Media/CustomFontManagerImpl.cs b/tests/Avalonia.Skia.UnitTests/Media/CustomFontManagerImpl.cs
index 13cc14b03e..7d0cf05b0b 100644
--- a/tests/Avalonia.Skia.UnitTests/Media/CustomFontManagerImpl.cs
+++ b/tests/Avalonia.Skia.UnitTests/Media/CustomFontManagerImpl.cs
@@ -16,7 +16,7 @@ namespace Avalonia.Skia.UnitTests.Media
         private readonly Typeface _defaultTypeface =
             new Typeface("resm:Avalonia.Skia.UnitTests.Assets?assembly=Avalonia.Skia.UnitTests#Noto Mono");
         private readonly Typeface _arabicTypeface =
-           new Typeface("resm:Avalonia.Skia.UnitTests.Assets?assembly=Avalonia.Skia.UnitTests#Noto Kufi Arabic");
+           new Typeface("resm:Avalonia.Skia.UnitTests.Assets?assembly=Avalonia.Skia.UnitTests#Noto Sans Arabic");
         private readonly Typeface _italicTypeface =
             new Typeface("resm:Avalonia.Skia.UnitTests.Assets?assembly=Avalonia.Skia.UnitTests#Noto Sans", FontStyle.Italic);
         private readonly Typeface _emojiTypeface =
@@ -82,6 +82,12 @@ namespace Avalonia.Skia.UnitTests.Media
                         skTypeface = typefaceCollection.Get(typeface);
                         break;
                     }
+                case "Noto Sans Arabic":
+                    {
+                        var typefaceCollection = SKTypefaceCollectionCache.GetOrAddTypefaceCollection(_arabicTypeface.FontFamily);
+                        skTypeface = typefaceCollection.Get(typeface);
+                        break;
+                    }
                 case FontFamily.DefaultFontFamilyName:
                 case "Noto Mono":
                     {
diff --git a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs
index 43948e9229..c457a96299 100644
--- a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs
+++ b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs
@@ -1005,7 +1005,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
 
                         var distance = textLine.GetDistanceFromCharacterHit(new CharacterHit(cluster));
 
-                        Assert.Equal(currentX, distance, 5);
+                        Assert.Equal(currentX, distance);
 
                         currentX += glyphAdvance;
 

From 4f79ac8a1c1cdecc71e89e4d94d98082ec54c8ea Mon Sep 17 00:00:00 2001
From: Benedikt <b.stebner@outlook.de>
Date: Tue, 2 Aug 2022 13:25:57 +0200
Subject: [PATCH 210/240] Fix precession errors

---
 src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs      | 6 +++---
 .../Media/TextFormatting/TextLayoutTests.cs                 | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs b/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
index 6c6939d2a0..fa1ab6fd29 100644
--- a/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
@@ -357,7 +357,7 @@ namespace Avalonia.Media.TextFormatting
                     if (currentPosition + currentRun.TextSourceLength >= characterIndex && 
                         TryGetDistanceFromCharacterHit(currentRun, characterHit, currentPosition, remainingLength, flowDirection, out var distance, out _))
                     {
-                        return currentDistance + distance;
+                        return Math.Max(0, currentDistance + distance);
                     }
 
                     //No hit hit found so we add the full width
@@ -382,7 +382,7 @@ namespace Avalonia.Media.TextFormatting
                             distance = currentGlyphRun.Size.Width - distance;
                         }
 
-                        return currentDistance - distance;
+                        return Math.Max(0, currentDistance - distance);
                     }
 
                     //No hit hit found so we add the full width
@@ -392,7 +392,7 @@ namespace Avalonia.Media.TextFormatting
                 }
             }
 
-            return currentDistance;
+            return Math.Max(0, currentDistance);
         }
 
         private static bool TryGetDistanceFromCharacterHit(
diff --git a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs
index c457a96299..43948e9229 100644
--- a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs
+++ b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLayoutTests.cs
@@ -1005,7 +1005,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
 
                         var distance = textLine.GetDistanceFromCharacterHit(new CharacterHit(cluster));
 
-                        Assert.Equal(currentX, distance);
+                        Assert.Equal(currentX, distance, 5);
 
                         currentX += glyphAdvance;
 

From fe79cee6726a76e875a3184218106d7b3b6dc6de Mon Sep 17 00:00:00 2001
From: Takoooooo <tako0qq@gmail.com>
Date: Tue, 2 Aug 2022 16:11:08 +0300
Subject: [PATCH 211/240] Fix Tests.

---
 .../ListBoxTests_Single.cs                    | 133 +++--
 .../Primitives/SelectingItemsControlTests.cs  |  89 +--
 .../SelectingItemsControlTests_Multiple.cs    | 542 ++++++++++--------
 3 files changed, 422 insertions(+), 342 deletions(-)

diff --git a/tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs b/tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs
index 8f795104bf..bf516748cc 100644
--- a/tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs
+++ b/tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs
@@ -5,10 +5,12 @@ using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Templates;
 using Avalonia.Data;
 using Avalonia.Input;
+using Avalonia.Input.Platform;
 using Avalonia.LogicalTree;
 using Avalonia.Styling;
 using Avalonia.UnitTests;
 using Avalonia.VisualTree;
+using Moq;
 using Xunit;
 
 namespace Avalonia.Controls.UnitTests
@@ -60,104 +62,123 @@ namespace Avalonia.Controls.UnitTests
         [Fact]
         public void Clicking_Item_Should_Select_It()
         {
-            var target = new ListBox
+            using (UnitTestApplication.Start())
             {
-                Template = new FuncControlTemplate(CreateListBoxTemplate),
-                Items = new[] { "Foo", "Bar", "Baz " },
-            };
-
-            ApplyTemplate(target);
-            _mouse.Click(target.Presenter.Panel.Children[0]);
-
-            Assert.Equal(0, target.SelectedIndex);
+                var target = new ListBox
+                {
+                    Template = new FuncControlTemplate(CreateListBoxTemplate),
+                    Items = new[] { "Foo", "Bar", "Baz " },
+                };
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
+                ApplyTemplate(target);
+                _mouse.Click(target.Presenter.Panel.Children[0]);
+
+                Assert.Equal(0, target.SelectedIndex);
+            }
         }
 
         [Fact]
         public void Clicking_Selected_Item_Should_Not_Deselect_It()
         {
-            var target = new ListBox
+            using (UnitTestApplication.Start())
             {
-                Template = new FuncControlTemplate(CreateListBoxTemplate),
-                Items = new[] { "Foo", "Bar", "Baz " },
-            };
-
-            ApplyTemplate(target);
-            target.SelectedIndex = 0;
+                var target = new ListBox
+                {
+                    Template = new FuncControlTemplate(CreateListBoxTemplate),
+                    Items = new[] { "Foo", "Bar", "Baz " },
+                };
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
+                ApplyTemplate(target);
+                target.SelectedIndex = 0;
 
-            _mouse.Click(target.Presenter.Panel.Children[0]);
+                _mouse.Click(target.Presenter.Panel.Children[0]);
 
-            Assert.Equal(0, target.SelectedIndex);
+                Assert.Equal(0, target.SelectedIndex);
+            }
         }
 
         [Fact]
         public void Clicking_Item_Should_Select_It_When_SelectionMode_Toggle()
         {
-            var target = new ListBox
+            using (UnitTestApplication.Start())
             {
-                Template = new FuncControlTemplate(CreateListBoxTemplate),
-                Items = new[] { "Foo", "Bar", "Baz " },
-                SelectionMode = SelectionMode.Single | SelectionMode.Toggle,
-            };
-
-            ApplyTemplate(target);
+                var target = new ListBox
+                {
+                    Template = new FuncControlTemplate(CreateListBoxTemplate),
+                    Items = new[] { "Foo", "Bar", "Baz " },
+                    SelectionMode = SelectionMode.Single | SelectionMode.Toggle,
+                };
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
+                ApplyTemplate(target);
 
-            _mouse.Click(target.Presenter.Panel.Children[0]);
+                _mouse.Click(target.Presenter.Panel.Children[0]);
 
-            Assert.Equal(0, target.SelectedIndex);
+                Assert.Equal(0, target.SelectedIndex);
+            }
         }
 
         [Fact]
         public void Clicking_Selected_Item_Should_Deselect_It_When_SelectionMode_Toggle()
         {
-            var target = new ListBox
+            using (UnitTestApplication.Start())
             {
-                Template = new FuncControlTemplate(CreateListBoxTemplate),
-                Items = new[] { "Foo", "Bar", "Baz " },
-                SelectionMode = SelectionMode.Toggle,
-            };
+                var target = new ListBox
+                {
+                    Template = new FuncControlTemplate(CreateListBoxTemplate),
+                    Items = new[] { "Foo", "Bar", "Baz " },
+                    SelectionMode = SelectionMode.Toggle,
+                };
 
-            ApplyTemplate(target);
-            target.SelectedIndex = 0;
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
+                ApplyTemplate(target);
+                target.SelectedIndex = 0;
 
-            _mouse.Click(target.Presenter.Panel.Children[0]);
+                _mouse.Click(target.Presenter.Panel.Children[0]);
 
-            Assert.Equal(-1, target.SelectedIndex);
+                Assert.Equal(-1, target.SelectedIndex);
+            }
         }
 
         [Fact]
         public void Clicking_Selected_Item_Should_Not_Deselect_It_When_SelectionMode_ToggleAlwaysSelected()
         {
-            var target = new ListBox
+            using (UnitTestApplication.Start())
             {
-                Template = new FuncControlTemplate(CreateListBoxTemplate),
-                Items = new[] { "Foo", "Bar", "Baz " },
-                SelectionMode = SelectionMode.Toggle | SelectionMode.AlwaysSelected,
-            };
-
-            ApplyTemplate(target);
-            target.SelectedIndex = 0;
+                var target = new ListBox
+                {
+                    Template = new FuncControlTemplate(CreateListBoxTemplate),
+                    Items = new[] { "Foo", "Bar", "Baz " },
+                    SelectionMode = SelectionMode.Toggle | SelectionMode.AlwaysSelected,
+                };
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
+                ApplyTemplate(target);
+                target.SelectedIndex = 0;
 
-            _mouse.Click(target.Presenter.Panel.Children[0]);
+                _mouse.Click(target.Presenter.Panel.Children[0]);
 
-            Assert.Equal(0, target.SelectedIndex);
+                Assert.Equal(0, target.SelectedIndex);
+            }
         }
 
         [Fact]
         public void Clicking_Another_Item_Should_Select_It_When_SelectionMode_Toggle()
         {
-            var target = new ListBox
+            using (UnitTestApplication.Start())
             {
-                Template = new FuncControlTemplate(CreateListBoxTemplate),
-                Items = new[] { "Foo", "Bar", "Baz " },
-                SelectionMode = SelectionMode.Single | SelectionMode.Toggle,
-            };
-
-            ApplyTemplate(target);
-            target.SelectedIndex = 1;
+                var target = new ListBox
+                {
+                    Template = new FuncControlTemplate(CreateListBoxTemplate),
+                    Items = new[] { "Foo", "Bar", "Baz " },
+                    SelectionMode = SelectionMode.Single | SelectionMode.Toggle,
+                };
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
+                ApplyTemplate(target);
+                target.SelectedIndex = 1;
 
-            _mouse.Click(target.Presenter.Panel.Children[0]);
+                _mouse.Click(target.Presenter.Panel.Children[0]);
 
-            Assert.Equal(0, target.SelectedIndex);
+                Assert.Equal(0, target.SelectedIndex);
+            }
         }
 
         [Fact]
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs
index 4b6b6a1182..330cbfd7b9 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs
@@ -14,6 +14,7 @@ using Avalonia.Controls.Selection;
 using Avalonia.Controls.Templates;
 using Avalonia.Data;
 using Avalonia.Input;
+using Avalonia.Input.Platform;
 using Avalonia.Interactivity;
 using Avalonia.Markup.Data;
 using Avalonia.Platform;
@@ -1115,42 +1116,48 @@ namespace Avalonia.Controls.UnitTests.Primitives
         [Fact]
         public void Setting_SelectedItem_With_Pointer_Should_Set_TabOnceActiveElement()
         {
-            var target = new ListBox
+            using (UnitTestApplication.Start())
             {
-                Template = Template(),
-                Items = new[] { "Foo", "Bar", "Baz " },
-            };
-
-            Prepare(target);
-            _helper.Down((Interactive)target.Presenter.Panel.Children[1]);
+                var target = new ListBox
+                {
+                    Template = Template(),
+                    Items = new[] { "Foo", "Bar", "Baz " },
+                };
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
+                Prepare(target);
+                _helper.Down((Interactive)target.Presenter.Panel.Children[1]);
 
-            var panel = target.Presenter.Panel;
+                var panel = target.Presenter.Panel;
 
-            Assert.Equal(
-                KeyboardNavigation.GetTabOnceActiveElement((InputElement)panel),
-                panel.Children[1]);
+                Assert.Equal(
+                    KeyboardNavigation.GetTabOnceActiveElement((InputElement)panel),
+                    panel.Children[1]);
+            }
         }
 
         [Fact]
         public void Removing_SelectedItem_Should_Clear_TabOnceActiveElement()
         {
-            var items = new ObservableCollection<string>(new[] { "Foo", "Bar", "Baz " });
-
-            var target = new ListBox
+            using (UnitTestApplication.Start())
             {
-                Template = Template(),
-                Items = items,
-            };
+                var items = new ObservableCollection<string>(new[] { "Foo", "Bar", "Baz " });
 
-            Prepare(target);
+                var target = new ListBox
+                {
+                    Template = Template(),
+                    Items = items,
+                };
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
+                Prepare(target);
 
-            _helper.Down(target.Presenter.Panel.Children[1]);
+                _helper.Down(target.Presenter.Panel.Children[1]);
 
-            items.RemoveAt(1);
+                items.RemoveAt(1);
 
-            var panel = target.Presenter.Panel;
+                var panel = target.Presenter.Panel;
 
-            Assert.Null(KeyboardNavigation.GetTabOnceActiveElement((InputElement)panel));
+                Assert.Null(KeyboardNavigation.GetTabOnceActiveElement((InputElement)panel));
+            }
         }
 
         [Fact]
@@ -1230,31 +1237,37 @@ namespace Avalonia.Controls.UnitTests.Primitives
         [Fact]
         public void Should_Select_Correct_Item_When_Duplicate_Items_Are_Present()
         {
-            var target = new ListBox
+            using (UnitTestApplication.Start())
             {
-                Template = Template(),
-                Items = new[] { "Foo", "Bar", "Baz", "Foo", "Bar", "Baz" },
-            };
-
-            Prepare(target);
-            _helper.Down((Interactive)target.Presenter.Panel.Children[3]);
+                var target = new ListBox
+                {
+                    Template = Template(),
+                    Items = new[] { "Foo", "Bar", "Baz", "Foo", "Bar", "Baz" },
+                };
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
+                Prepare(target);
+                _helper.Down((Interactive)target.Presenter.Panel.Children[3]);
 
-            Assert.Equal(3, target.SelectedIndex);
+                Assert.Equal(3, target.SelectedIndex);
+            }
         }
 
         [Fact]
         public void Should_Apply_Selected_Pseudoclass_To_Correct_Item_When_Duplicate_Items_Are_Present()
         {
-            var target = new ListBox
+            using (UnitTestApplication.Start())
             {
-                Template = Template(),
-                Items = new[] { "Foo", "Bar", "Baz", "Foo", "Bar", "Baz" },
-            };
-
-            Prepare(target);
-            _helper.Down((Interactive)target.Presenter.Panel.Children[3]);
+                var target = new ListBox
+                {
+                    Template = Template(),
+                    Items = new[] { "Foo", "Bar", "Baz", "Foo", "Bar", "Baz" },
+                };
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
+                Prepare(target);
+                _helper.Down((Interactive)target.Presenter.Panel.Children[3]);
 
-            Assert.Equal(new[] { ":pressed", ":selected" }, target.Presenter.Panel.Children[3].Classes);
+                Assert.Equal(new[] { ":pressed", ":selected" }, target.Presenter.Panel.Children[3].Classes);
+            }
         }
 
         [Fact]
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs
index 6b26d76371..5d2f4e2a64 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs
@@ -10,8 +10,10 @@ using Avalonia.Controls.Selection;
 using Avalonia.Controls.Templates;
 using Avalonia.Data;
 using Avalonia.Input;
+using Avalonia.Input.Platform;
 using Avalonia.Interactivity;
 using Avalonia.UnitTests;
+using Moq;
 using Xunit;
 
 namespace Avalonia.Controls.UnitTests.Primitives
@@ -701,261 +703,290 @@ namespace Avalonia.Controls.UnitTests.Primitives
         [Fact]
         public void Shift_Selecting_From_No_Selection_Selects_From_Start()
         {
-            var target = new ListBox
+            using (UnitTestApplication.Start())
             {
-                Template = Template(),
-                Items = new[] { "Foo", "Bar", "Baz" },
-                SelectionMode = SelectionMode.Multiple,
-            };
-
-            target.ApplyTemplate();
-            target.Presenter.ApplyTemplate();
-            _helper.Click((Interactive)target.Presenter.Panel.Children[2], modifiers: KeyModifiers.Shift);
-
-            var panel = target.Presenter.Panel;
-
-            Assert.Equal(new[] { "Foo", "Bar", "Baz" }, target.SelectedItems);
-            Assert.Equal(new[] { 0, 1, 2 }, SelectedContainers(target));
+                var target = new ListBox
+                {
+                    Template = Template(),
+                    Items = new[] { "Foo", "Bar", "Baz" },
+                    SelectionMode = SelectionMode.Multiple,
+                };
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
+                target.ApplyTemplate();
+                target.Presenter.ApplyTemplate();
+                _helper.Click((Interactive)target.Presenter.Panel.Children[2], modifiers: KeyModifiers.Shift);
+
+                var panel = target.Presenter.Panel;
+
+                Assert.Equal(new[] { "Foo", "Bar", "Baz" }, target.SelectedItems);
+                Assert.Equal(new[] { 0, 1, 2 }, SelectedContainers(target));
+            }
         }
 
         [Fact]
         public void Ctrl_Selecting_Raises_SelectionChanged_Events()
         {
-            var target = new ListBox
+            using (UnitTestApplication.Start())
             {
-                Template = Template(),
-                Items = new[] { "Foo", "Bar", "Baz", "Qux" },
-                SelectionMode = SelectionMode.Multiple,
-            };
-
-            target.ApplyTemplate();
-            target.Presenter.ApplyTemplate();
+                var target = new ListBox
+                {
+                    Template = Template(),
+                    Items = new[] { "Foo", "Bar", "Baz", "Qux" },
+                    SelectionMode = SelectionMode.Multiple,
+                };
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
+                target.ApplyTemplate();
+                target.Presenter.ApplyTemplate();
 
-            SelectionChangedEventArgs receivedArgs = null;
+                SelectionChangedEventArgs receivedArgs = null;
 
-            target.SelectionChanged += (_, args) => receivedArgs = args;
+                target.SelectionChanged += (_, args) => receivedArgs = args;
 
-            void VerifyAdded(string selection)
-            {
-                Assert.NotNull(receivedArgs);
-                Assert.Equal(new[] { selection }, receivedArgs.AddedItems);
-                Assert.Empty(receivedArgs.RemovedItems);
-            }
+                void VerifyAdded(string selection)
+                {
+                    Assert.NotNull(receivedArgs);
+                    Assert.Equal(new[] { selection }, receivedArgs.AddedItems);
+                    Assert.Empty(receivedArgs.RemovedItems);
+                }
 
-            void VerifyRemoved(string selection)
-            {
-                Assert.NotNull(receivedArgs);
-                Assert.Equal(new[] { selection }, receivedArgs.RemovedItems);
-                Assert.Empty(receivedArgs.AddedItems);
-            }
+                void VerifyRemoved(string selection)
+                {
+                    Assert.NotNull(receivedArgs);
+                    Assert.Equal(new[] { selection }, receivedArgs.RemovedItems);
+                    Assert.Empty(receivedArgs.AddedItems);
+                }
 
-            _helper.Click((Interactive)target.Presenter.Panel.Children[1]);
+                _helper.Click((Interactive)target.Presenter.Panel.Children[1]);
 
-            VerifyAdded("Bar");
+                VerifyAdded("Bar");
 
-            receivedArgs = null;
-            _helper.Click((Interactive)target.Presenter.Panel.Children[2], modifiers: KeyModifiers.Control);
+                receivedArgs = null;
+                _helper.Click((Interactive)target.Presenter.Panel.Children[2], modifiers: KeyModifiers.Control);
 
-            VerifyAdded("Baz");
+                VerifyAdded("Baz");
 
-            receivedArgs = null;
-            _helper.Click((Interactive)target.Presenter.Panel.Children[3], modifiers: KeyModifiers.Control);
+                receivedArgs = null;
+                _helper.Click((Interactive)target.Presenter.Panel.Children[3], modifiers: KeyModifiers.Control);
 
-            VerifyAdded("Qux");
+                VerifyAdded("Qux");
 
-            receivedArgs = null;
-            _helper.Click((Interactive)target.Presenter.Panel.Children[1], modifiers: KeyModifiers.Control);
+                receivedArgs = null;
+                _helper.Click((Interactive)target.Presenter.Panel.Children[1], modifiers: KeyModifiers.Control);
 
-            VerifyRemoved("Bar");
+                VerifyRemoved("Bar");
+            }
         }
 
         [Fact]
         public void Ctrl_Selecting_SelectedItem_With_Multiple_Selection_Active_Sets_SelectedItem_To_Next_Selection()
         {
-            var target = new ListBox
+            using (UnitTestApplication.Start())
             {
-                Template = Template(),
-                Items = new[] { "Foo", "Bar", "Baz", "Qux" },
-                SelectionMode = SelectionMode.Multiple,
-            };
-
-            target.ApplyTemplate();
-            target.Presenter.ApplyTemplate();
-            _helper.Click((Interactive)target.Presenter.Panel.Children[1]);
-            _helper.Click((Interactive)target.Presenter.Panel.Children[2], modifiers: KeyModifiers.Control);
-            _helper.Click((Interactive)target.Presenter.Panel.Children[3], modifiers: KeyModifiers.Control);
-
-            Assert.Equal(1, target.SelectedIndex);
-            Assert.Equal("Bar", target.SelectedItem);
-            Assert.Equal(new[] { "Bar", "Baz", "Qux" }, target.SelectedItems);
-
-            _helper.Click((Interactive)target.Presenter.Panel.Children[1], modifiers: KeyModifiers.Control);
-
-            Assert.Equal(2, target.SelectedIndex);
-            Assert.Equal("Baz", target.SelectedItem);
-            Assert.Equal(new[] { "Baz", "Qux" }, target.SelectedItems);
+                var target = new ListBox
+                {
+                    Template = Template(),
+                    Items = new[] { "Foo", "Bar", "Baz", "Qux" },
+                    SelectionMode = SelectionMode.Multiple,
+                };
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
+                target.ApplyTemplate();
+                target.Presenter.ApplyTemplate();
+                _helper.Click((Interactive)target.Presenter.Panel.Children[1]);
+                _helper.Click((Interactive)target.Presenter.Panel.Children[2], modifiers: KeyModifiers.Control);
+                _helper.Click((Interactive)target.Presenter.Panel.Children[3], modifiers: KeyModifiers.Control);
+
+                Assert.Equal(1, target.SelectedIndex);
+                Assert.Equal("Bar", target.SelectedItem);
+                Assert.Equal(new[] { "Bar", "Baz", "Qux" }, target.SelectedItems);
+
+                _helper.Click((Interactive)target.Presenter.Panel.Children[1], modifiers: KeyModifiers.Control);
+
+                Assert.Equal(2, target.SelectedIndex);
+                Assert.Equal("Baz", target.SelectedItem);
+                Assert.Equal(new[] { "Baz", "Qux" }, target.SelectedItems);
+            }
         }
 
         [Fact]
         public void Ctrl_Selecting_Non_SelectedItem_With_Multiple_Selection_Active_Leaves_SelectedItem_The_Same()
         {
-            var target = new ListBox
+            using (UnitTestApplication.Start())
             {
-                Template = Template(),
-                Items = new[] { "Foo", "Bar", "Baz" },
-                SelectionMode = SelectionMode.Multiple,
-            };
+                var target = new ListBox
+                {
+                    Template = Template(),
+                    Items = new[] { "Foo", "Bar", "Baz" },
+                    SelectionMode = SelectionMode.Multiple,
+                };
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
 
-            target.ApplyTemplate();
-            target.Presenter.ApplyTemplate();
-            _helper.Click((Interactive)target.Presenter.Panel.Children[1]);
-            _helper.Click((Interactive)target.Presenter.Panel.Children[2], modifiers: KeyModifiers.Control);
+                target.ApplyTemplate();
+                target.Presenter.ApplyTemplate();
+                _helper.Click((Interactive)target.Presenter.Panel.Children[1]);
+                _helper.Click((Interactive)target.Presenter.Panel.Children[2], modifiers: KeyModifiers.Control);
 
-            Assert.Equal(1, target.SelectedIndex);
-            Assert.Equal("Bar", target.SelectedItem);
+                Assert.Equal(1, target.SelectedIndex);
+                Assert.Equal("Bar", target.SelectedItem);
 
-            _helper.Click((Interactive)target.Presenter.Panel.Children[2], modifiers: KeyModifiers.Control);
+                _helper.Click((Interactive)target.Presenter.Panel.Children[2], modifiers: KeyModifiers.Control);
 
-            Assert.Equal(1, target.SelectedIndex);
-            Assert.Equal("Bar", target.SelectedItem);
+                Assert.Equal(1, target.SelectedIndex);
+                Assert.Equal("Bar", target.SelectedItem);
+            }
         }
 
         [Fact]
         public void Should_Ctrl_Select_Correct_Item_When_Duplicate_Items_Are_Present()
         {
-            var target = new ListBox
+            using (UnitTestApplication.Start())
             {
-                Template = Template(),
-                Items = new[] { "Foo", "Bar", "Baz", "Foo", "Bar", "Baz" },
-                SelectionMode = SelectionMode.Multiple,
-            };
-
-            target.ApplyTemplate();
-            target.Presenter.ApplyTemplate();
-            _helper.Click((Interactive)target.Presenter.Panel.Children[3]);
-            _helper.Click((Interactive)target.Presenter.Panel.Children[4], modifiers: KeyModifiers.Control);
-
-            var panel = target.Presenter.Panel;
-
-            Assert.Equal(new[] { "Foo", "Bar" }, target.SelectedItems);
-            Assert.Equal(new[] { 3, 4 }, SelectedContainers(target));
+                var target = new ListBox
+                {
+                    Template = Template(),
+                    Items = new[] { "Foo", "Bar", "Baz", "Foo", "Bar", "Baz" },
+                    SelectionMode = SelectionMode.Multiple,
+                };
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
+                target.ApplyTemplate();
+                target.Presenter.ApplyTemplate();
+                _helper.Click((Interactive)target.Presenter.Panel.Children[3]);
+                _helper.Click((Interactive)target.Presenter.Panel.Children[4], modifiers: KeyModifiers.Control);
+
+                var panel = target.Presenter.Panel;
+
+                Assert.Equal(new[] { "Foo", "Bar" }, target.SelectedItems);
+                Assert.Equal(new[] { 3, 4 }, SelectedContainers(target));
+            }
         }
 
         [Fact]
         public void Should_Shift_Select_Correct_Item_When_Duplicates_Are_Present()
         {
-            var target = new ListBox
+            using (UnitTestApplication.Start())
             {
-                Template = Template(),
-                Items = new[] { "Foo", "Bar", "Baz", "Foo", "Bar", "Baz" },
-                SelectionMode = SelectionMode.Multiple,
-            };
-
-            target.ApplyTemplate();
-            target.Presenter.ApplyTemplate();
-            _helper.Click((Interactive)target.Presenter.Panel.Children[3]);
-            _helper.Click((Interactive)target.Presenter.Panel.Children[5], modifiers: KeyModifiers.Shift);
-
-            var panel = target.Presenter.Panel;
-
-            Assert.Equal(new[] { "Foo", "Bar", "Baz" }, target.SelectedItems);
-            Assert.Equal(new[] { 3, 4, 5 }, SelectedContainers(target));
+                var target = new ListBox
+                {
+                    Template = Template(),
+                    Items = new[] { "Foo", "Bar", "Baz", "Foo", "Bar", "Baz" },
+                    SelectionMode = SelectionMode.Multiple,
+                };
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
+                target.ApplyTemplate();
+                target.Presenter.ApplyTemplate();
+                _helper.Click((Interactive)target.Presenter.Panel.Children[3]);
+                _helper.Click((Interactive)target.Presenter.Panel.Children[5], modifiers: KeyModifiers.Shift);
+
+                var panel = target.Presenter.Panel;
+
+                Assert.Equal(new[] { "Foo", "Bar", "Baz" }, target.SelectedItems);
+                Assert.Equal(new[] { 3, 4, 5 }, SelectedContainers(target));
+            }
         }
 
         [Fact]
         public void Can_Shift_Select_All_Items_When_Duplicates_Are_Present()
         {
-            var target = new ListBox
+            using (UnitTestApplication.Start())
             {
-                Template = Template(),
-                Items = new[] { "Foo", "Bar", "Baz", "Foo", "Bar", "Baz" },
-                SelectionMode = SelectionMode.Multiple,
-            };
-
-            target.ApplyTemplate();
-            target.Presenter.ApplyTemplate();
-            _helper.Click((Interactive)target.Presenter.Panel.Children[0]);
-            _helper.Click((Interactive)target.Presenter.Panel.Children[5], modifiers: KeyModifiers.Shift);
-
-            var panel = target.Presenter.Panel;
-
-            Assert.Equal(new[] { "Foo", "Bar", "Baz", "Foo", "Bar", "Baz" }, target.SelectedItems);
-            Assert.Equal(new[] { 0, 1, 2, 3, 4, 5 }, SelectedContainers(target));
+                var target = new ListBox
+                {
+                    Template = Template(),
+                    Items = new[] { "Foo", "Bar", "Baz", "Foo", "Bar", "Baz" },
+                    SelectionMode = SelectionMode.Multiple,
+                };
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
+                target.ApplyTemplate();
+                target.Presenter.ApplyTemplate();
+                _helper.Click((Interactive)target.Presenter.Panel.Children[0]);
+                _helper.Click((Interactive)target.Presenter.Panel.Children[5], modifiers: KeyModifiers.Shift);
+
+                var panel = target.Presenter.Panel;
+
+                Assert.Equal(new[] { "Foo", "Bar", "Baz", "Foo", "Bar", "Baz" }, target.SelectedItems);
+                Assert.Equal(new[] { 0, 1, 2, 3, 4, 5 }, SelectedContainers(target));
+            }
         }
 
         [Fact]
         public void Shift_Selecting_Raises_SelectionChanged_Events()
         {
-            var target = new ListBox
+            using (UnitTestApplication.Start())
             {
-                Template = Template(),
-                Items = new[] { "Foo", "Bar", "Baz", "Qux" },
-                SelectionMode = SelectionMode.Multiple,
-            };
-
-            target.ApplyTemplate();
-            target.Presenter.ApplyTemplate();
+                var target = new ListBox
+                {
+                    Template = Template(),
+                    Items = new[] { "Foo", "Bar", "Baz", "Qux" },
+                    SelectionMode = SelectionMode.Multiple,
+                };
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
+                target.ApplyTemplate();
+                target.Presenter.ApplyTemplate();
 
-            SelectionChangedEventArgs receivedArgs = null;
+                SelectionChangedEventArgs receivedArgs = null;
 
-            target.SelectionChanged += (_, args) => receivedArgs = args;
+                target.SelectionChanged += (_, args) => receivedArgs = args;
 
-            void VerifyAdded(params string[] selection)
-            {
-                Assert.NotNull(receivedArgs);
-                Assert.Equal(selection, receivedArgs.AddedItems);
-                Assert.Empty(receivedArgs.RemovedItems);
-            }
+                void VerifyAdded(params string[] selection)
+                {
+                    Assert.NotNull(receivedArgs);
+                    Assert.Equal(selection, receivedArgs.AddedItems);
+                    Assert.Empty(receivedArgs.RemovedItems);
+                }
 
-            void VerifyRemoved(string selection)
-            {
-                Assert.NotNull(receivedArgs);
-                Assert.Equal(new[] { selection }, receivedArgs.RemovedItems);
-                Assert.Empty(receivedArgs.AddedItems);
-            }
+                void VerifyRemoved(string selection)
+                {
+                    Assert.NotNull(receivedArgs);
+                    Assert.Equal(new[] { selection }, receivedArgs.RemovedItems);
+                    Assert.Empty(receivedArgs.AddedItems);
+                }
 
-            _helper.Click((Interactive)target.Presenter.Panel.Children[1]);
+                _helper.Click((Interactive)target.Presenter.Panel.Children[1]);
 
-            VerifyAdded("Bar");
+                VerifyAdded("Bar");
 
-            receivedArgs = null;
-            _helper.Click((Interactive)target.Presenter.Panel.Children[3], modifiers: KeyModifiers.Shift);
+                receivedArgs = null;
+                _helper.Click((Interactive)target.Presenter.Panel.Children[3], modifiers: KeyModifiers.Shift);
 
-            VerifyAdded("Baz" ,"Qux");
+                VerifyAdded("Baz", "Qux");
 
-            receivedArgs = null;
-            _helper.Click((Interactive)target.Presenter.Panel.Children[2], modifiers: KeyModifiers.Shift);
+                receivedArgs = null;
+                _helper.Click((Interactive)target.Presenter.Panel.Children[2], modifiers: KeyModifiers.Shift);
 
-            VerifyRemoved("Qux");
+                VerifyRemoved("Qux");
+            }
         }
 
         [Fact]
         public void Duplicate_Items_Are_Added_To_SelectedItems_In_Order()
         {
-            var target = new ListBox
+            using (UnitTestApplication.Start())
             {
-                Template = Template(),
-                Items = new[] { "Foo", "Bar", "Baz", "Foo", "Bar", "Baz" },
-                SelectionMode = SelectionMode.Multiple,
-            };
+                var target = new ListBox
+                {
+                    Template = Template(),
+                    Items = new[] { "Foo", "Bar", "Baz", "Foo", "Bar", "Baz" },
+                    SelectionMode = SelectionMode.Multiple,
+                };
 
-            target.ApplyTemplate();
-            target.Presenter.ApplyTemplate();
-            _helper.Click((Interactive)target.Presenter.Panel.Children[0]);
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
+                target.ApplyTemplate();
+                target.Presenter.ApplyTemplate();
+                _helper.Click((Interactive)target.Presenter.Panel.Children[0]);
 
-            Assert.Equal(new[] { "Foo" }, target.SelectedItems);
+                Assert.Equal(new[] { "Foo" }, target.SelectedItems);
 
-            _helper.Click((Interactive)target.Presenter.Panel.Children[4], modifiers: KeyModifiers.Control);
+                _helper.Click((Interactive)target.Presenter.Panel.Children[4], modifiers: KeyModifiers.Control);
 
-            Assert.Equal(new[] { "Foo", "Bar" }, target.SelectedItems);
+                Assert.Equal(new[] { "Foo", "Bar" }, target.SelectedItems);
 
-            _helper.Click((Interactive)target.Presenter.Panel.Children[3], modifiers: KeyModifiers.Control);
+                _helper.Click((Interactive)target.Presenter.Panel.Children[3], modifiers: KeyModifiers.Control);
 
-            Assert.Equal(new[] { "Foo", "Bar", "Foo" }, target.SelectedItems);
+                Assert.Equal(new[] { "Foo", "Bar", "Foo" }, target.SelectedItems);
 
-            _helper.Click((Interactive)target.Presenter.Panel.Children[1], modifiers: KeyModifiers.Control);
+                _helper.Click((Interactive)target.Presenter.Panel.Children[1], modifiers: KeyModifiers.Control);
 
-            Assert.Equal(new[] { "Foo", "Bar", "Foo", "Bar" }, target.SelectedItems);
+                Assert.Equal(new[] { "Foo", "Bar", "Foo", "Bar" }, target.SelectedItems);
+            }
         }
 
         [Fact]
@@ -1158,70 +1189,79 @@ namespace Avalonia.Controls.UnitTests.Primitives
         [Fact]
         public void Left_Click_On_SelectedItem_Should_Clear_Existing_Selection()
         {
-            var target = new ListBox
+            using (UnitTestApplication.Start())
             {
-                Template = Template(),
-                Items = new[] { "Foo", "Bar", "Baz" },
-                ItemTemplate = new FuncDataTemplate<string>((x, _) => new TextBlock { Width = 20, Height = 10 }),
-                SelectionMode = SelectionMode.Multiple,
-            };
-
-            target.ApplyTemplate();
-            target.Presenter.ApplyTemplate();
-            target.SelectAll();
-
-            Assert.Equal(3, target.SelectedItems.Count);
-
-            _helper.Click((Interactive)target.Presenter.Panel.Children[0]);
-
-            Assert.Equal(1, target.SelectedItems.Count);
-            Assert.Equal(new[] { "Foo", }, target.SelectedItems);
-            Assert.Equal(new[] { 0 }, SelectedContainers(target));
+                var target = new ListBox
+                {
+                    Template = Template(),
+                    Items = new[] { "Foo", "Bar", "Baz" },
+                    ItemTemplate = new FuncDataTemplate<string>((x, _) => new TextBlock { Width = 20, Height = 10 }),
+                    SelectionMode = SelectionMode.Multiple,
+                };
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
+                target.ApplyTemplate();
+                target.Presenter.ApplyTemplate();
+                target.SelectAll();
+
+                Assert.Equal(3, target.SelectedItems.Count);
+
+                _helper.Click((Interactive)target.Presenter.Panel.Children[0]);
+
+                Assert.Equal(1, target.SelectedItems.Count);
+                Assert.Equal(new[] { "Foo", }, target.SelectedItems);
+                Assert.Equal(new[] { 0 }, SelectedContainers(target));
+            }
         }
 
         [Fact]
         public void Right_Click_On_SelectedItem_Should_Not_Clear_Existing_Selection()
         {
-            var target = new ListBox
+            using (UnitTestApplication.Start())
             {
-                Template = Template(),
-                Items = new[] { "Foo", "Bar", "Baz" },
-                ItemTemplate = new FuncDataTemplate<string>((x, _) => new TextBlock { Width = 20, Height = 10 }),
-                SelectionMode = SelectionMode.Multiple,
-            };
-
-            target.ApplyTemplate();
-            target.Presenter.ApplyTemplate();
-            target.SelectAll();
+                var target = new ListBox
+                {
+                    Template = Template(),
+                    Items = new[] { "Foo", "Bar", "Baz" },
+                    ItemTemplate = new FuncDataTemplate<string>((x, _) => new TextBlock { Width = 20, Height = 10 }),
+                    SelectionMode = SelectionMode.Multiple,
+                };
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
+                target.ApplyTemplate();
+                target.Presenter.ApplyTemplate();
+                target.SelectAll();
 
-            Assert.Equal(3, target.SelectedItems.Count);
+                Assert.Equal(3, target.SelectedItems.Count);
 
-            _helper.Click((Interactive)target.Presenter.Panel.Children[0], MouseButton.Right);
+                _helper.Click((Interactive)target.Presenter.Panel.Children[0], MouseButton.Right);
 
-            Assert.Equal(3, target.SelectedItems.Count);
+                Assert.Equal(3, target.SelectedItems.Count);
+            }
         }
 
         [Fact]
         public void Right_Click_On_UnselectedItem_Should_Clear_Existing_Selection()
         {
-            var target = new ListBox
+            using (UnitTestApplication.Start())
             {
-                Template = Template(),
-                Items = new[] { "Foo", "Bar", "Baz" },
-                ItemTemplate = new FuncDataTemplate<string>((x, _) => new TextBlock { Width = 20, Height = 10 }),
-                SelectionMode = SelectionMode.Multiple,
-            };
-
-            target.ApplyTemplate();
-            target.Presenter.ApplyTemplate();
-            _helper.Click((Interactive)target.Presenter.Panel.Children[0]);
-            _helper.Click((Interactive)target.Presenter.Panel.Children[1], modifiers: KeyModifiers.Shift);
-
-            Assert.Equal(2, target.SelectedItems.Count);
-
-            _helper.Click((Interactive)target.Presenter.Panel.Children[2], MouseButton.Right);
-
-            Assert.Equal(1, target.SelectedItems.Count);
+                var target = new ListBox
+                {
+                    Template = Template(),
+                    Items = new[] { "Foo", "Bar", "Baz" },
+                    ItemTemplate = new FuncDataTemplate<string>((x, _) => new TextBlock { Width = 20, Height = 10 }),
+                    SelectionMode = SelectionMode.Multiple,
+                };
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
+                target.ApplyTemplate();
+                target.Presenter.ApplyTemplate();
+                _helper.Click((Interactive)target.Presenter.Panel.Children[0]);
+                _helper.Click((Interactive)target.Presenter.Panel.Children[1], modifiers: KeyModifiers.Shift);
+
+                Assert.Equal(2, target.SelectedItems.Count);
+
+                _helper.Click((Interactive)target.Presenter.Panel.Children[2], MouseButton.Right);
+
+                Assert.Equal(1, target.SelectedItems.Count);
+            }
         }
 
         [Fact]
@@ -1253,41 +1293,47 @@ namespace Avalonia.Controls.UnitTests.Primitives
         [Fact]
         public void Shift_Right_Click_Should_Not_Select_Multiple()
         {
-            var target = new ListBox
+            using (UnitTestApplication.Start())
             {
-                Template = Template(),
-                Items = new[] { "Foo", "Bar", "Baz" },
-                ItemTemplate = new FuncDataTemplate<string>((x, _) => new TextBlock { Width = 20, Height = 10 }),
-                SelectionMode = SelectionMode.Multiple,
-            };
-
-            target.ApplyTemplate();
-            target.Presenter.ApplyTemplate();
-
-            _helper.Click((Interactive)target.Presenter.Panel.Children[0]);
-            _helper.Click((Interactive)target.Presenter.Panel.Children[2], MouseButton.Right, modifiers: KeyModifiers.Shift);
-
-            Assert.Equal(1, target.SelectedItems.Count);
+                var target = new ListBox
+                {
+                    Template = Template(),
+                    Items = new[] { "Foo", "Bar", "Baz" },
+                    ItemTemplate = new FuncDataTemplate<string>((x, _) => new TextBlock { Width = 20, Height = 10 }),
+                    SelectionMode = SelectionMode.Multiple,
+                };
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
+                target.ApplyTemplate();
+                target.Presenter.ApplyTemplate();
+
+                _helper.Click((Interactive)target.Presenter.Panel.Children[0]);
+                _helper.Click((Interactive)target.Presenter.Panel.Children[2], MouseButton.Right, modifiers: KeyModifiers.Shift);
+
+                Assert.Equal(1, target.SelectedItems.Count);
+            }
         }
 
         [Fact]
         public void Ctrl_Right_Click_Should_Not_Select_Multiple()
         {
-            var target = new ListBox
+            using (UnitTestApplication.Start())
             {
-                Template = Template(),
-                Items = new[] { "Foo", "Bar", "Baz" },
-                ItemTemplate = new FuncDataTemplate<string>((x, _) => new TextBlock { Width = 20, Height = 10 }),
-                SelectionMode = SelectionMode.Multiple,
-            };
-
-            target.ApplyTemplate();
-            target.Presenter.ApplyTemplate();
-
-            _helper.Click((Interactive)target.Presenter.Panel.Children[0]);
-            _helper.Click((Interactive)target.Presenter.Panel.Children[2], MouseButton.Right, modifiers: KeyModifiers.Control);
-
-            Assert.Equal(1, target.SelectedItems.Count);
+                var target = new ListBox
+                {
+                    Template = Template(),
+                    Items = new[] { "Foo", "Bar", "Baz" },
+                    ItemTemplate = new FuncDataTemplate<string>((x, _) => new TextBlock { Width = 20, Height = 10 }),
+                    SelectionMode = SelectionMode.Multiple,
+                };
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
+                target.ApplyTemplate();
+                target.Presenter.ApplyTemplate();
+
+                _helper.Click((Interactive)target.Presenter.Panel.Children[0]);
+                _helper.Click((Interactive)target.Presenter.Panel.Children[2], MouseButton.Right, modifiers: KeyModifiers.Control);
+
+                Assert.Equal(1, target.SelectedItems.Count);
+            }
         }
 
         [Fact]

From 1731f88822a6d0a4c2e5a58b69f866212e7ff7e4 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Tue, 2 Aug 2022 20:37:55 -0400
Subject: [PATCH 212/240] Rename Default to Simple

---
 Avalonia.sln                                  |  2 +-
 samples/BindingDemo/App.xaml                  |  2 +-
 samples/ControlCatalog/App.xaml.cs            |  2 +-
 samples/ControlCatalog/ControlCatalog.csproj  |  2 +-
 samples/ControlCatalog/MainView.xaml.cs       |  4 +-
 samples/PlatformSanityChecks/App.xaml         |  3 +-
 .../PlatformSanityChecks.csproj               |  2 +-
 samples/Previewer/App.xaml                    |  5 +-
 samples/Previewer/Previewer.csproj            |  2 +-
 samples/VirtualizationDemo/App.xaml           |  4 +-
 .../VirtualizationDemo.csproj                 |  2 +-
 .../interop/Direct3DInteropSample/App.paml    |  5 +-
 .../Direct3DInteropSample.csproj              |  2 +-
 src/Avalonia.Controls/ProgressBar.cs          |  4 -
 .../Avalonia.Diagnostics.csproj               |  2 +-
 .../Diagnostics/Views/MainWindow.xaml         |  2 +-
 .../Diagnostics/Views/MainWindow.xaml.cs      |  2 +-
 src/Avalonia.Themes.Default/DefaultTheme.xaml | 75 -------------------
 .../DefaultTheme.xaml.cs                      | 11 ---
 .../Accents/Base.xaml                         |  0
 .../Accents/BaseDark.xaml                     |  0
 .../Accents/BaseLight.xaml                    |  0
 .../ApiCompatBaseline.txt                     |  0
 .../Avalonia.Themes.Simple.csproj}            |  0
 .../Controls/AutoCompleteBox.xaml             |  0
 .../Controls/Button.xaml                      |  0
 .../Controls/ButtonSpinner.xaml               |  6 +-
 .../Controls/Calendar.xaml                    |  0
 .../Controls/CalendarButton.xaml              |  0
 .../Controls/CalendarDatePicker.xaml          |  0
 .../Controls/CalendarDayButton.xaml           |  0
 .../Controls/CalendarItem.xaml                |  0
 .../Controls/CaptionButtons.xaml              | 10 +--
 .../Controls/Carousel.xaml                    |  0
 .../Controls/CheckBox.xaml                    |  0
 .../Controls/ComboBox.xaml                    |  0
 .../Controls/ComboBoxItem.xaml                |  0
 .../Controls/ContentControl.xaml              |  0
 .../Controls/ContextMenu.xaml                 |  2 +-
 .../Controls/DataValidationErrors.xaml        |  0
 .../Controls/DatePicker.xaml                  | 22 +++---
 .../Controls/DateTimePickerShared.xaml        | 22 +++---
 .../Controls/DropDownButton.xaml              |  0
 .../Controls/EmbeddableControlRoot.xaml       |  0
 .../Controls/Expander.xaml                    | 34 ++++-----
 .../Controls/FlyoutPresenter.xaml             |  0
 .../Controls/FocusAdorner.xaml                |  0
 .../Controls/GridSplitter.xaml                |  0
 .../Controls/ItemsControl.xaml                |  0
 .../Controls/Label.xaml                       |  0
 .../Controls/ListBox.xaml                     |  0
 .../Controls/ListBoxItem.xaml                 |  0
 .../Controls/ManagedFileChooser.xaml          |  0
 .../Controls/Menu.xaml                        |  6 +-
 .../Controls/MenuFlyoutPresenter.xaml         |  2 +-
 .../Controls/MenuItem.xaml                    |  2 +-
 .../Controls/NativeMenuBar.xaml               | 10 +--
 .../Controls/NotificationCard.xaml            |  0
 .../Controls/NumericUpDown.xaml               |  0
 .../Controls/OverlayPopupHost.xaml            |  0
 .../Controls/PathIcon.xaml                    |  0
 .../Controls/PopupRoot.xaml                   |  0
 .../Controls/ProgressBar.xaml                 |  0
 .../Controls/RadioButton.xaml                 |  0
 .../Controls/RepeatButton.xaml                |  0
 .../Controls/RichTextBlock.xaml               |  0
 .../Controls/ScrollBar.xaml                   |  0
 .../Controls/ScrollViewer.xaml                |  2 +-
 .../Controls/Separator.xaml                   |  0
 .../Controls/SimpleControls.xaml              | 74 ++++++++++++++++++
 .../Controls/Slider.xaml                      |  0
 .../Controls/SplitButton.xaml                 |  8 +-
 .../Controls/SplitView.xaml                   |  0
 .../Controls/TabControl.xaml                  |  0
 .../Controls/TabItem.xaml                     |  0
 .../Controls/TabStrip.xaml                    |  0
 .../Controls/TabStripItem.xaml                |  0
 .../Controls/TextBox.xaml                     | 14 ++--
 .../Controls/TimePicker.xaml                  | 20 ++---
 .../Controls/TitleBar.xaml                    |  0
 .../Controls/ToggleButton.xaml                |  0
 .../Controls/ToggleSwitch.xaml                |  0
 .../Controls/ToolTip.xaml                     |  0
 .../Controls/TransitioningContentControl.xaml |  0
 .../Controls/TreeView.xaml                    |  0
 .../Controls/TreeViewItem.xaml                |  4 +-
 .../Controls/UserControl.xaml                 |  4 +-
 .../Controls/Window.xaml                      |  0
 .../Controls/WindowNotificationManager.xaml   |  0
 .../IBitmapToImageConverter.cs                |  2 +-
 .../InverseBooleanValueConverter.cs           |  2 +-
 .../Properties/AssemblyInfo.cs                |  3 +
 .../SimpleTheme.cs                            | 14 ++--
 .../SimpleThemeMode.cs                        |  2 +-
 .../Avalonia.Designer.HostApp.csproj          |  2 +-
 .../Utilities/UriExtensionsTests.cs           |  6 +-
 .../Avalonia.Benchmarks.csproj                |  2 +-
 .../Themes/ThemeBenchmark.cs                  |  6 +-
 .../Avalonia.DesignerSupport.TestApp/App.xaml |  6 +-
 .../Avalonia.DesignerSupport.TestApp.csproj   |  2 +-
 .../Avalonia.Direct2D1.RenderTests.csproj     |  2 +-
 .../Avalonia.LeakTests.csproj                 |  2 +-
 .../Avalonia.Markup.Xaml.UnitTests.csproj     |  2 +-
 .../Xaml/BasicTests.cs                        |  2 +-
 .../Avalonia.Skia.RenderTests.csproj          |  2 +-
 .../Avalonia.UnitTests.csproj                 |  2 +-
 tests/Avalonia.UnitTests/TestServices.cs      | 19 ++---
 .../Avalonia.UnitTests/UnitTestApplication.cs |  8 +-
 108 files changed, 220 insertions(+), 241 deletions(-)
 delete mode 100644 src/Avalonia.Themes.Default/DefaultTheme.xaml
 delete mode 100644 src/Avalonia.Themes.Default/DefaultTheme.xaml.cs
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Accents/Base.xaml (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Accents/BaseDark.xaml (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Accents/BaseLight.xaml (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/ApiCompatBaseline.txt (100%)
 rename src/{Avalonia.Themes.Default/Avalonia.Themes.Default.csproj => Avalonia.Themes.Simple/Avalonia.Themes.Simple.csproj} (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/AutoCompleteBox.xaml (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/Button.xaml (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/ButtonSpinner.xaml (94%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/Calendar.xaml (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/CalendarButton.xaml (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/CalendarDatePicker.xaml (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/CalendarDayButton.xaml (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/CalendarItem.xaml (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/CaptionButtons.xaml (93%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/Carousel.xaml (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/CheckBox.xaml (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/ComboBox.xaml (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/ComboBoxItem.xaml (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/ContentControl.xaml (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/ContextMenu.xaml (95%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/DataValidationErrors.xaml (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/DatePicker.xaml (94%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/DateTimePickerShared.xaml (87%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/DropDownButton.xaml (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/EmbeddableControlRoot.xaml (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/Expander.xaml (88%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/FlyoutPresenter.xaml (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/FocusAdorner.xaml (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/GridSplitter.xaml (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/ItemsControl.xaml (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/Label.xaml (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/ListBox.xaml (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/ListBoxItem.xaml (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/ManagedFileChooser.xaml (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/Menu.xaml (95%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/MenuFlyoutPresenter.xaml (96%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/MenuItem.xaml (98%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/NativeMenuBar.xaml (76%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/NotificationCard.xaml (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/NumericUpDown.xaml (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/OverlayPopupHost.xaml (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/PathIcon.xaml (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/PopupRoot.xaml (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/ProgressBar.xaml (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/RadioButton.xaml (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/RepeatButton.xaml (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/RichTextBlock.xaml (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/ScrollBar.xaml (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/ScrollViewer.xaml (99%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/Separator.xaml (100%)
 create mode 100644 src/Avalonia.Themes.Simple/Controls/SimpleControls.xaml
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/Slider.xaml (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/SplitButton.xaml (98%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/SplitView.xaml (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/TabControl.xaml (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/TabItem.xaml (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/TabStrip.xaml (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/TabStripItem.xaml (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/TextBox.xaml (96%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/TimePicker.xaml (94%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/TitleBar.xaml (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/ToggleButton.xaml (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/ToggleSwitch.xaml (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/ToolTip.xaml (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/TransitioningContentControl.xaml (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/TreeView.xaml (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/TreeViewItem.xaml (96%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/UserControl.xaml (90%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/Window.xaml (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/Controls/WindowNotificationManager.xaml (100%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/IBitmapToImageConverter.cs (95%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/InverseBooleanValueConverter.cs (94%)
 create mode 100644 src/Avalonia.Themes.Simple/Properties/AssemblyInfo.cs
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/SimpleTheme.cs (89%)
 rename src/{Avalonia.Themes.Default => Avalonia.Themes.Simple}/SimpleThemeMode.cs (67%)

diff --git a/Avalonia.sln b/Avalonia.sln
index 4999719676..35b6b2108a 100644
--- a/Avalonia.sln
+++ b/Avalonia.sln
@@ -13,7 +13,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Direct2D1", "src\W
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Controls", "src\Avalonia.Controls\Avalonia.Controls.csproj", "{D2221C82-4A25-4583-9B43-D791E3F6820C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Themes.Default", "src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj", "{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Themes.Simple", "src\Avalonia.Themes.Simple\Avalonia.Themes.Simple.csproj", "{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Diagnostics", "src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj", "{7062AE20-5DCC-4442-9645-8195BDECE63E}"
 EndProject
diff --git a/samples/BindingDemo/App.xaml b/samples/BindingDemo/App.xaml
index 3e312c8685..175e838616 100644
--- a/samples/BindingDemo/App.xaml
+++ b/samples/BindingDemo/App.xaml
@@ -4,6 +4,6 @@
     x:Class="BindingDemo.App">
     <Application.Styles>
         <FluentTheme />
-        <StyleInclude Source="avares://Avalonia.Themes.Default/Accents/BaseLight.xaml"/>
+        <StyleInclude Source="avares://Avalonia.Themes.Simple/Accents/BaseLight.xaml"/>
     </Application.Styles>
 </Application>
diff --git a/samples/ControlCatalog/App.xaml.cs b/samples/ControlCatalog/App.xaml.cs
index 7ebb87094a..eb8ecc3af0 100644
--- a/samples/ControlCatalog/App.xaml.cs
+++ b/samples/ControlCatalog/App.xaml.cs
@@ -5,7 +5,7 @@ using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
 using Avalonia.Markup.Xaml.Styling;
 using Avalonia.Styling;
-using Avalonia.Themes.Default;
+using Avalonia.Themes.Simple;
 using Avalonia.Themes.Fluent;
 using ControlCatalog.ViewModels;
 
diff --git a/samples/ControlCatalog/ControlCatalog.csproj b/samples/ControlCatalog/ControlCatalog.csproj
index 8358fb3cd4..2654574a3e 100644
--- a/samples/ControlCatalog/ControlCatalog.csproj
+++ b/samples/ControlCatalog/ControlCatalog.csproj
@@ -29,7 +29,7 @@
     <ProjectReference Include="..\..\packages\Avalonia\Avalonia.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Controls.ColorPicker\Avalonia.Controls.ColorPicker.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Controls.DataGrid\Avalonia.Controls.DataGrid.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Themes.Simple\Avalonia.Themes.Simple.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Themes.Fluent\Avalonia.Themes.Fluent.csproj" />
     <ProjectReference Include="..\MiniMvvm\MiniMvvm.csproj" />
     <ProjectReference Include="..\SampleControls\ControlSamples.csproj" />
diff --git a/samples/ControlCatalog/MainView.xaml.cs b/samples/ControlCatalog/MainView.xaml.cs
index 47d11738bc..d8d58edaf6 100644
--- a/samples/ControlCatalog/MainView.xaml.cs
+++ b/samples/ControlCatalog/MainView.xaml.cs
@@ -60,14 +60,14 @@ namespace ControlCatalog
                     }
                     else if (theme == CatalogTheme.DefaultLight)
                     {
-                        App.Default.Mode = Avalonia.Themes.Default.SimpleThemeMode.Light;
+                        App.Default.Mode = Avalonia.Themes.Simple.SimpleThemeMode.Light;
                         Application.Current.Styles[0] = App.DefaultLight;
                         Application.Current.Styles[1] = App.ColorPickerDefault;
                         Application.Current.Styles[2] = App.DataGridDefault;
                     }
                     else if (theme == CatalogTheme.DefaultDark)
                     {
-                        App.Default.Mode = Avalonia.Themes.Default.SimpleThemeMode.Dark;
+                        App.Default.Mode = Avalonia.Themes.Simple.SimpleThemeMode.Dark;
                         Application.Current.Styles[0] = App.DefaultDark;
                         Application.Current.Styles[1] = App.ColorPickerDefault;
                         Application.Current.Styles[2] = App.DataGridDefault;
diff --git a/samples/PlatformSanityChecks/App.xaml b/samples/PlatformSanityChecks/App.xaml
index 25bab6ae35..1b9d64fca6 100644
--- a/samples/PlatformSanityChecks/App.xaml
+++ b/samples/PlatformSanityChecks/App.xaml
@@ -1,6 +1,5 @@
 <Application xmlns="https://github.com/avaloniaui">
     <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"/>
+        <SimpleTheme Mode="Light" />
     </Application.Styles>
 </Application>
diff --git a/samples/PlatformSanityChecks/PlatformSanityChecks.csproj b/samples/PlatformSanityChecks/PlatformSanityChecks.csproj
index 4f7f06b529..5c743aabdb 100644
--- a/samples/PlatformSanityChecks/PlatformSanityChecks.csproj
+++ b/samples/PlatformSanityChecks/PlatformSanityChecks.csproj
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Avalonia.Desktop\Avalonia.Desktop.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Themes.Simple\Avalonia.Themes.Simple.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.X11\Avalonia.X11.csproj" />
   </ItemGroup>
 
diff --git a/samples/Previewer/App.xaml b/samples/Previewer/App.xaml
index 6bae1955af..1b9d64fca6 100644
--- a/samples/Previewer/App.xaml
+++ b/samples/Previewer/App.xaml
@@ -1,6 +1,5 @@
 <Application xmlns="https://github.com/avaloniaui">
     <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"/>
+        <SimpleTheme Mode="Light" />
     </Application.Styles>
-</Application>
\ No newline at end of file
+</Application>
diff --git a/samples/Previewer/Previewer.csproj b/samples/Previewer/Previewer.csproj
index 98560e9ab0..2cc84168dc 100644
--- a/samples/Previewer/Previewer.csproj
+++ b/samples/Previewer/Previewer.csproj
@@ -10,7 +10,7 @@
     <EmbeddedResource Include="**\*.xaml" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Themes.Simple\Avalonia.Themes.Simple.csproj" />
   </ItemGroup>
   
   <Import Project="..\..\build\SampleApp.props" />
diff --git a/samples/VirtualizationDemo/App.xaml b/samples/VirtualizationDemo/App.xaml
index 3ad1dce794..0b64d0c09b 100644
--- a/samples/VirtualizationDemo/App.xaml
+++ b/samples/VirtualizationDemo/App.xaml
@@ -3,7 +3,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:Class="VirtualizationDemo.App">
     <Application.Styles>
-        <StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml"/>
-        <StyleInclude Source="avares://Avalonia.Themes.Default/Accents/BaseLight.xaml"/>
+        <StyleInclude Source="avares://Avalonia.Themes.Simple/DefaultTheme.xaml"/>
+        <StyleInclude Source="avares://Avalonia.Themes.Simple/Accents/BaseLight.xaml"/>
     </Application.Styles>
 </Application>
\ No newline at end of file
diff --git a/samples/VirtualizationDemo/VirtualizationDemo.csproj b/samples/VirtualizationDemo/VirtualizationDemo.csproj
index bd6054327f..b27cfe77e8 100644
--- a/samples/VirtualizationDemo/VirtualizationDemo.csproj
+++ b/samples/VirtualizationDemo/VirtualizationDemo.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Themes.Simple\Avalonia.Themes.Simple.csproj" />
     <ProjectReference Include="..\..\src\Linux\Avalonia.LinuxFramebuffer\Avalonia.LinuxFramebuffer.csproj" />
     <ProjectReference Include="..\MiniMvvm\MiniMvvm.csproj" />
   </ItemGroup>
diff --git a/samples/interop/Direct3DInteropSample/App.paml b/samples/interop/Direct3DInteropSample/App.paml
index d9630eef58..e6d77dfaf4 100644
--- a/samples/interop/Direct3DInteropSample/App.paml
+++ b/samples/interop/Direct3DInteropSample/App.paml
@@ -1,6 +1,5 @@
 <Application xmlns="https://github.com/avaloniaui">
   <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"/>
+    <SimpleTheme Mode="Light" />
   </Application.Styles>
-</Application>
\ No newline at end of file
+</Application>
diff --git a/samples/interop/Direct3DInteropSample/Direct3DInteropSample.csproj b/samples/interop/Direct3DInteropSample/Direct3DInteropSample.csproj
index 81b94b4d09..f9ef4693d5 100644
--- a/samples/interop/Direct3DInteropSample/Direct3DInteropSample.csproj
+++ b/samples/interop/Direct3DInteropSample/Direct3DInteropSample.csproj
@@ -22,7 +22,7 @@
       </EmbeddedResource>
     </ItemGroup>
     <ItemGroup>
-        <ProjectReference Include="..\..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
+        <ProjectReference Include="..\..\..\src\Avalonia.Themes.Simple\Avalonia.Themes.Simple.csproj" />
         <ProjectReference Include="..\..\..\src\Windows\Avalonia.Direct2D1\Avalonia.Direct2D1.csproj" />
         <ProjectReference Include="..\..\..\src\Windows\Avalonia.Win32\Avalonia.Win32.csproj" />
         <ProjectReference Include="..\..\MiniMvvm\MiniMvvm.csproj" />
diff --git a/src/Avalonia.Controls/ProgressBar.cs b/src/Avalonia.Controls/ProgressBar.cs
index 56b9caf085..91114628ee 100644
--- a/src/Avalonia.Controls/ProgressBar.cs
+++ b/src/Avalonia.Controls/ProgressBar.cs
@@ -119,14 +119,12 @@ namespace Avalonia.Controls
                 nameof(Percentage),
                 o => o.Percentage);
 
-        [Obsolete("To be removed when Avalonia.Themes.Default is discontinued.")]
         public static readonly DirectProperty<ProgressBar, double> IndeterminateStartingOffsetProperty =
             AvaloniaProperty.RegisterDirect<ProgressBar, double>(
                 nameof(IndeterminateStartingOffset),
                 p => p.IndeterminateStartingOffset,
                 (p, o) => p.IndeterminateStartingOffset = o);
 
-        [Obsolete("To be removed when Avalonia.Themes.Default is discontinued.")]
         public static readonly DirectProperty<ProgressBar, double> IndeterminateEndingOffsetProperty =
             AvaloniaProperty.RegisterDirect<ProgressBar, double>(
                 nameof(IndeterminateEndingOffset),
@@ -139,14 +137,12 @@ namespace Avalonia.Controls
             private set { SetAndRaise(PercentageProperty, ref _percentage, value); }
         }
         
-        [Obsolete("To be removed when Avalonia.Themes.Default is discontinued.")]
         public double IndeterminateStartingOffset
         {
             get => _indeterminateStartingOffset;
             set => SetAndRaise(IndeterminateStartingOffsetProperty, ref _indeterminateStartingOffset, value);
         }
 
-        [Obsolete("To be removed when Avalonia.Themes.Default is discontinued.")]
         public double IndeterminateEndingOffset
         {
             get => _indeterminateEndingOffset;
diff --git a/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj b/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj
index adddf3f57b..d719135a7f 100644
--- a/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj
+++ b/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj
@@ -19,7 +19,7 @@
     <ProjectReference Include="..\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />
     <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
+    <ProjectReference Include="..\Avalonia.Themes.Simple\Avalonia.Themes.Simple.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.4.0" />
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml
index 004518598c..63073952ac 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml
@@ -2,7 +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"
+        xmlns:default="using:Avalonia.Themes.Simple"
         Title="Avalonia DevTools"
         x:Class="Avalonia.Diagnostics.Views.MainWindow"
         Theme="{StaticResource {x:Type Window}}">
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs b/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs
index 96dc929434..c81997f2cb 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs
@@ -11,7 +11,7 @@ using Avalonia.Input;
 using Avalonia.Input.Raw;
 using Avalonia.Markup.Xaml;
 using Avalonia.Styling;
-using Avalonia.Themes.Default;
+using Avalonia.Themes.Simple;
 using Avalonia.VisualTree;
 
 namespace Avalonia.Diagnostics.Views
diff --git a/src/Avalonia.Themes.Default/DefaultTheme.xaml b/src/Avalonia.Themes.Default/DefaultTheme.xaml
deleted file mode 100644
index 8f5bea557c..0000000000
--- a/src/Avalonia.Themes.Default/DefaultTheme.xaml
+++ /dev/null
@@ -1,75 +0,0 @@
-<Styles x:Class="Avalonia.Themes.Default.DefaultTheme"
-        xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Styles.Resources>
-    <ResourceDictionary>
-      <ResourceDictionary.MergedDictionaries>
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/Button.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/RadioButton.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/Expander.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/RepeatButton.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/ToggleSwitch.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/ButtonSpinner.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/ToggleButton.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/DropDownButton.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/PathIcon.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/CheckBox.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/ToolTip.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/Label.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/ComboBoxItem.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/ComboBox.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/Window.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/Carousel.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/CaptionButtons.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/TitleBar.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/TextBox.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/AutoCompleteBox.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/DataValidationErrors.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/ContentControl.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/FlyoutPresenter.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/MenuFlyoutPresenter.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/GridSplitter.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/ItemsControl.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/ListBoxItem.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/ListBox.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/ScrollBar.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/ScrollViewer.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/TabStrip.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/TabStripItem.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/TabControl.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/TabItem.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/PopupRoot.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/OverlayPopupHost.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/WindowNotificationManager.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/EmbeddableControlRoot.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/TransitioningContentControl.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/TreeView.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/TreeViewItem.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/ProgressBar.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/Separator.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/Menu.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/MenuItem.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/ContextMenu.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/CalendarButton.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/CalendarDayButton.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/CalendarItem.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/Calendar.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/CalendarDatePicker.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/Slider.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/NotificationCard.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/NativeMenuBar.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/NumericUpDown.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/DateTimePickerShared.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/DatePicker.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/TimePicker.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/SplitView.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/ManagedFileChooser.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/SplitButton.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Themes.Default/Controls/RichTextBlock.xaml" />
-      </ResourceDictionary.MergedDictionaries>
-    </ResourceDictionary>
-  </Styles.Resources>
-
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/FocusAdorner.xaml" />
-  <StyleInclude Source="avares://Avalonia.Themes.Default/Controls/UserControl.xaml" />
-</Styles>
diff --git a/src/Avalonia.Themes.Default/DefaultTheme.xaml.cs b/src/Avalonia.Themes.Default/DefaultTheme.xaml.cs
deleted file mode 100644
index 598b418977..0000000000
--- a/src/Avalonia.Themes.Default/DefaultTheme.xaml.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Avalonia.Styling;
-
-namespace Avalonia.Themes.Default
-{
-    /// <summary>
-    /// The default Avalonia theme.
-    /// </summary>
-    public class DefaultTheme : Styles
-    {
-    }
-}
diff --git a/src/Avalonia.Themes.Default/Accents/Base.xaml b/src/Avalonia.Themes.Simple/Accents/Base.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Accents/Base.xaml
rename to src/Avalonia.Themes.Simple/Accents/Base.xaml
diff --git a/src/Avalonia.Themes.Default/Accents/BaseDark.xaml b/src/Avalonia.Themes.Simple/Accents/BaseDark.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Accents/BaseDark.xaml
rename to src/Avalonia.Themes.Simple/Accents/BaseDark.xaml
diff --git a/src/Avalonia.Themes.Default/Accents/BaseLight.xaml b/src/Avalonia.Themes.Simple/Accents/BaseLight.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Accents/BaseLight.xaml
rename to src/Avalonia.Themes.Simple/Accents/BaseLight.xaml
diff --git a/src/Avalonia.Themes.Default/ApiCompatBaseline.txt b/src/Avalonia.Themes.Simple/ApiCompatBaseline.txt
similarity index 100%
rename from src/Avalonia.Themes.Default/ApiCompatBaseline.txt
rename to src/Avalonia.Themes.Simple/ApiCompatBaseline.txt
diff --git a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj b/src/Avalonia.Themes.Simple/Avalonia.Themes.Simple.csproj
similarity index 100%
rename from src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
rename to src/Avalonia.Themes.Simple/Avalonia.Themes.Simple.csproj
diff --git a/src/Avalonia.Themes.Default/Controls/AutoCompleteBox.xaml b/src/Avalonia.Themes.Simple/Controls/AutoCompleteBox.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Controls/AutoCompleteBox.xaml
rename to src/Avalonia.Themes.Simple/Controls/AutoCompleteBox.xaml
diff --git a/src/Avalonia.Themes.Default/Controls/Button.xaml b/src/Avalonia.Themes.Simple/Controls/Button.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Controls/Button.xaml
rename to src/Avalonia.Themes.Simple/Controls/Button.xaml
diff --git a/src/Avalonia.Themes.Default/Controls/ButtonSpinner.xaml b/src/Avalonia.Themes.Simple/Controls/ButtonSpinner.xaml
similarity index 94%
rename from src/Avalonia.Themes.Default/Controls/ButtonSpinner.xaml
rename to src/Avalonia.Themes.Simple/Controls/ButtonSpinner.xaml
index 4585fc8e56..9798e5290b 100644
--- a/src/Avalonia.Themes.Default/Controls/ButtonSpinner.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/ButtonSpinner.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     x:CompileBindings="True">
 
-  <ControlTheme x:Key="DefaultButtonSpinnerRepeatButton"
+  <ControlTheme x:Key="SimpleButtonSpinnerRepeatButton"
                 BasedOn="{StaticResource {x:Type RepeatButton}}"
                 TargetType="RepeatButton">
     <Setter Property="Background" Value="Transparent" />
@@ -38,7 +38,7 @@
                            IsVisible="{TemplateBinding ShowButtonSpinner}"
                            Rows="2">
                 <RepeatButton Name="PART_IncreaseButton"
-                              Theme="{StaticResource DefaultButtonSpinnerRepeatButton}">
+                              Theme="{StaticResource SimpleButtonSpinnerRepeatButton}">
                   <Path Width="8"
                         Height="4"
                         HorizontalAlignment="Center"
@@ -48,7 +48,7 @@
                         Stretch="Uniform" />
                 </RepeatButton>
                 <RepeatButton Name="PART_DecreaseButton"
-                              Theme="{StaticResource DefaultButtonSpinnerRepeatButton}">
+                              Theme="{StaticResource SimpleButtonSpinnerRepeatButton}">
                   <Path Width="8"
                         Height="4"
                         HorizontalAlignment="Center"
diff --git a/src/Avalonia.Themes.Default/Controls/Calendar.xaml b/src/Avalonia.Themes.Simple/Controls/Calendar.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Controls/Calendar.xaml
rename to src/Avalonia.Themes.Simple/Controls/Calendar.xaml
diff --git a/src/Avalonia.Themes.Default/Controls/CalendarButton.xaml b/src/Avalonia.Themes.Simple/Controls/CalendarButton.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Controls/CalendarButton.xaml
rename to src/Avalonia.Themes.Simple/Controls/CalendarButton.xaml
diff --git a/src/Avalonia.Themes.Default/Controls/CalendarDatePicker.xaml b/src/Avalonia.Themes.Simple/Controls/CalendarDatePicker.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Controls/CalendarDatePicker.xaml
rename to src/Avalonia.Themes.Simple/Controls/CalendarDatePicker.xaml
diff --git a/src/Avalonia.Themes.Default/Controls/CalendarDayButton.xaml b/src/Avalonia.Themes.Simple/Controls/CalendarDayButton.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Controls/CalendarDayButton.xaml
rename to src/Avalonia.Themes.Simple/Controls/CalendarDayButton.xaml
diff --git a/src/Avalonia.Themes.Default/Controls/CalendarItem.xaml b/src/Avalonia.Themes.Simple/Controls/CalendarItem.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Controls/CalendarItem.xaml
rename to src/Avalonia.Themes.Simple/Controls/CalendarItem.xaml
diff --git a/src/Avalonia.Themes.Default/Controls/CaptionButtons.xaml b/src/Avalonia.Themes.Simple/Controls/CaptionButtons.xaml
similarity index 93%
rename from src/Avalonia.Themes.Default/Controls/CaptionButtons.xaml
rename to src/Avalonia.Themes.Simple/Controls/CaptionButtons.xaml
index adc02b7c3c..379b92ea17 100644
--- a/src/Avalonia.Themes.Default/Controls/CaptionButtons.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/CaptionButtons.xaml
@@ -8,7 +8,7 @@
     </Border>
   </Design.PreviewWith>
 
-  <ControlTheme x:Key="DefaultCaptionButton"
+  <ControlTheme x:Key="SimpleCaptionButton"
                 TargetType="Button">
     <Setter Property="Background" Value="#ffe5e5e5" />
     <!--  Reusing BorderBrush to define pressed background color, as it's not used otherwise  -->
@@ -44,7 +44,7 @@
                     TextElement.FontSize="10">
           <Button x:Name="PART_FullScreenButton"
                   IsVisible="False"
-                  Theme="{StaticResource DefaultCaptionButton}">
+                  Theme="{StaticResource SimpleCaptionButton}">
             <Viewbox Width="11"
                      Margin="2">
               <Path Name="FullScreenButtonPath"
@@ -54,7 +54,7 @@
             </Viewbox>
           </Button>
           <Button x:Name="PART_MinimiseButton"
-                  Theme="{StaticResource DefaultCaptionButton}">
+                  Theme="{StaticResource SimpleCaptionButton}">
             <Viewbox Width="11"
                      Margin="2">
               <Path Data="M2048 1229v-205h-2048v205h2048z"
@@ -63,7 +63,7 @@
             </Viewbox>
           </Button>
           <Button x:Name="PART_RestoreButton"
-                  Theme="{StaticResource DefaultCaptionButton}">
+                  Theme="{StaticResource SimpleCaptionButton}">
             <Viewbox Width="11"
                      Margin="2">
               <Viewbox.RenderTransform>
@@ -78,7 +78,7 @@
           <Button x:Name="PART_CloseButton"
                   Background="#ffe81123"
                   BorderBrush="#fff1707a"
-                  Theme="{StaticResource DefaultCaptionButton}">
+                  Theme="{StaticResource SimpleCaptionButton}">
             <Viewbox Width="11"
                      Margin="2">
               <Path Data="M1169 1024l879 -879l-145 -145l-879 879l-879 -879l-145 145l879 879l-879 879l145 145l879 -879l879 879l145 -145z"
diff --git a/src/Avalonia.Themes.Default/Controls/Carousel.xaml b/src/Avalonia.Themes.Simple/Controls/Carousel.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Controls/Carousel.xaml
rename to src/Avalonia.Themes.Simple/Controls/Carousel.xaml
diff --git a/src/Avalonia.Themes.Default/Controls/CheckBox.xaml b/src/Avalonia.Themes.Simple/Controls/CheckBox.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Controls/CheckBox.xaml
rename to src/Avalonia.Themes.Simple/Controls/CheckBox.xaml
diff --git a/src/Avalonia.Themes.Default/Controls/ComboBox.xaml b/src/Avalonia.Themes.Simple/Controls/ComboBox.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Controls/ComboBox.xaml
rename to src/Avalonia.Themes.Simple/Controls/ComboBox.xaml
diff --git a/src/Avalonia.Themes.Default/Controls/ComboBoxItem.xaml b/src/Avalonia.Themes.Simple/Controls/ComboBoxItem.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Controls/ComboBoxItem.xaml
rename to src/Avalonia.Themes.Simple/Controls/ComboBoxItem.xaml
diff --git a/src/Avalonia.Themes.Default/Controls/ContentControl.xaml b/src/Avalonia.Themes.Simple/Controls/ContentControl.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Controls/ContentControl.xaml
rename to src/Avalonia.Themes.Simple/Controls/ContentControl.xaml
diff --git a/src/Avalonia.Themes.Default/Controls/ContextMenu.xaml b/src/Avalonia.Themes.Simple/Controls/ContextMenu.xaml
similarity index 95%
rename from src/Avalonia.Themes.Default/Controls/ContextMenu.xaml
rename to src/Avalonia.Themes.Simple/Controls/ContextMenu.xaml
index baad686bd9..e99f1c5ac0 100644
--- a/src/Avalonia.Themes.Default/Controls/ContextMenu.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/ContextMenu.xaml
@@ -15,7 +15,7 @@
                 BorderBrush="{TemplateBinding BorderBrush}"
                 BorderThickness="{TemplateBinding BorderThickness}"
                 CornerRadius="{TemplateBinding CornerRadius}">
-          <ScrollViewer Theme="{StaticResource DefaultMenuScrollViewer}">
+          <ScrollViewer Theme="{StaticResource SimpleMenuScrollViewer}">
             <ItemsPresenter Name="PART_ItemsPresenter"
                             ItemTemplate="{TemplateBinding ItemTemplate}"
                             Items="{TemplateBinding Items}"
diff --git a/src/Avalonia.Themes.Default/Controls/DataValidationErrors.xaml b/src/Avalonia.Themes.Simple/Controls/DataValidationErrors.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Controls/DataValidationErrors.xaml
rename to src/Avalonia.Themes.Simple/Controls/DataValidationErrors.xaml
diff --git a/src/Avalonia.Themes.Default/Controls/DatePicker.xaml b/src/Avalonia.Themes.Simple/Controls/DatePicker.xaml
similarity index 94%
rename from src/Avalonia.Themes.Default/Controls/DatePicker.xaml
rename to src/Avalonia.Themes.Simple/Controls/DatePicker.xaml
index 8198158d5e..a6da2ad9f8 100644
--- a/src/Avalonia.Themes.Default/Controls/DatePicker.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/DatePicker.xaml
@@ -42,7 +42,7 @@
   <Thickness x:Key="DatePickerHostMonthPadding">9,3,0,6</Thickness>
   <x:Double x:Key="DatePickerSpacerThemeWidth">1</x:Double>
 
-  <ControlTheme x:Key="DefaultDatePickerFlyoutButton"
+  <ControlTheme x:Key="SimpleDatePickerFlyoutButton"
                 TargetType="Button">
     <Setter Property="RenderTransform" Value="none" />
     <Setter Property="Template">
@@ -115,7 +115,7 @@
                     Foreground="{TemplateBinding Foreground}"
                     IsEnabled="{TemplateBinding IsEnabled}"
                     TemplatedControl.IsTemplateFocusTarget="True"
-                    Theme="{StaticResource DefaultDatePickerFlyoutButton}">
+                    Theme="{StaticResource SimpleDatePickerFlyoutButton}">
               <Grid Name="ButtonContentGrid"
                     ColumnDefinitions="78*,Auto,132*,Auto,78*">
                 <TextBlock Name="DayText"
@@ -200,7 +200,7 @@
             <Grid Name="PickerContainer">
               <Grid.Styles>
                 <Style Selector="DateTimePickerPanel > ListBoxItem">
-                  <Setter Property="Theme" Value="{StaticResource DefaultDateTimePickerItem}" />
+                  <Setter Property="Theme" Value="{StaticResource SimpleDateTimePickerItem}" />
                 </Style>
               </Grid.Styles>
               <!--  Column Definitions set in code, ignore here  -->
@@ -213,9 +213,9 @@
                                        ShouldLoop="True" />
                 </ScrollViewer>
                 <RepeatButton Name="MonthUpButton"
-                              Theme="{StaticResource DefaultDateTimePickerUpButton}" />
+                              Theme="{StaticResource SimpleDateTimePickerUpButton}" />
                 <RepeatButton Name="MonthDownButton"
-                              Theme="{StaticResource DefaultDateTimePickerDownButton}" />
+                              Theme="{StaticResource SimpleDateTimePickerDownButton}" />
               </Panel>
               <Panel Name="DayHost">
                 <ScrollViewer HorizontalScrollBarVisibility="Disabled"
@@ -226,9 +226,9 @@
                                        ShouldLoop="True" />
                 </ScrollViewer>
                 <RepeatButton Name="DayUpButton"
-                              Theme="{StaticResource DefaultDateTimePickerUpButton}" />
+                              Theme="{StaticResource SimpleDateTimePickerUpButton}" />
                 <RepeatButton Name="DayDownButton"
-                              Theme="{StaticResource DefaultDateTimePickerDownButton}" />
+                              Theme="{StaticResource SimpleDateTimePickerDownButton}" />
               </Panel>
               <Panel Name="YearHost">
                 <ScrollViewer HorizontalScrollBarVisibility="Disabled"
@@ -239,9 +239,9 @@
                                        ShouldLoop="False" />
                 </ScrollViewer>
                 <RepeatButton Name="YearUpButton"
-                              Theme="{StaticResource DefaultDateTimePickerUpButton}" />
+                              Theme="{StaticResource SimpleDateTimePickerUpButton}" />
                 <RepeatButton Name="YearDownButton"
-                              Theme="{StaticResource DefaultDateTimePickerDownButton}" />
+                              Theme="{StaticResource SimpleDateTimePickerDownButton}" />
               </Panel>
               <Rectangle Name="HighlightRect"
                          Grid.Column="0"
@@ -279,7 +279,7 @@
                       Height="{DynamicResource DatePickerFlyoutPresenterAcceptDismissHostGridHeight}"
                       HorizontalAlignment="Stretch"
                       VerticalAlignment="Stretch"
-                      Theme="{StaticResource DefaultDateTimePickerButton}">
+                      Theme="{StaticResource SimpleDateTimePickerButton}">
                 <Path Data="M0.5,8.5 5,13.5 15.5,3"
                       Stroke="{Binding $parent[Button].Foreground}"
                       StrokeLineCap="Round"
@@ -290,7 +290,7 @@
                       Height="{DynamicResource DatePickerFlyoutPresenterAcceptDismissHostGridHeight}"
                       HorizontalAlignment="Stretch"
                       VerticalAlignment="Stretch"
-                      Theme="{StaticResource DefaultDateTimePickerButton}">
+                      Theme="{StaticResource SimpleDateTimePickerButton}">
                 <Path Data="M2,2 14,14 M2,14 14 2"
                       Stroke="{Binding $parent[Button].Foreground}"
                       StrokeLineCap="Round"
diff --git a/src/Avalonia.Themes.Default/Controls/DateTimePickerShared.xaml b/src/Avalonia.Themes.Simple/Controls/DateTimePickerShared.xaml
similarity index 87%
rename from src/Avalonia.Themes.Default/Controls/DateTimePickerShared.xaml
rename to src/Avalonia.Themes.Simple/Controls/DateTimePickerShared.xaml
index 1e4b50ca40..5909a1abbf 100644
--- a/src/Avalonia.Themes.Default/Controls/DateTimePickerShared.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/DateTimePickerShared.xaml
@@ -13,17 +13,17 @@
     <Border Width="200"
             Padding="20">
       <StackPanel Spacing="20">
-        <ListBoxItem Theme="{DynamicResource DefaultDateTimePickerItem}">Standard Item</ListBoxItem>
-        <ListBoxItem Theme="{DynamicResource DefaultDateTimePickerItem}" Classes="MonthItem">Month Item</ListBoxItem>
-        <RepeatButton Theme="{DynamicResource DefaultDateTimePickerButton}">Button</RepeatButton>
-        <RepeatButton Theme="{DynamicResource DefaultDateTimePickerUpButton}" IsVisible="True"/>
-        <RepeatButton Theme="{DynamicResource DefaultDateTimePickerDownButton}" IsVisible="True"/>
+        <ListBoxItem Theme="{DynamicResource SimpleDateTimePickerItem}">Standard Item</ListBoxItem>
+        <ListBoxItem Theme="{DynamicResource SimpleDateTimePickerItem}" Classes="MonthItem">Month Item</ListBoxItem>
+        <RepeatButton Theme="{DynamicResource SimpleDateTimePickerButton}">Button</RepeatButton>
+        <RepeatButton Theme="{DynamicResource SimpleDateTimePickerUpButton}" IsVisible="True"/>
+        <RepeatButton Theme="{DynamicResource SimpleDateTimePickerDownButton}" IsVisible="True"/>
       </StackPanel>
     </Border>
   </Design.PreviewWith>
 
   <!--  Theme for the items displayed in the selectors  -->
-  <ControlTheme x:Key="DefaultDateTimePickerItem"
+  <ControlTheme x:Key="SimpleDateTimePickerItem"
                 BasedOn="{StaticResource {x:Type ListBoxItem}}"
                 TargetType="ListBoxItem">
     <Setter Property="Padding" Value="{DynamicResource DatePickerFlyoutPresenterItemPadding}" />
@@ -47,7 +47,7 @@
   </ControlTheme>
 
   <!--  This is used for both the accept/dismiss & repeatbuttons in the presenter  -->
-  <ControlTheme x:Key="DefaultDateTimePickerButton"
+  <ControlTheme x:Key="SimpleDateTimePickerButton"
                 TargetType="Button">
     <Setter Property="Background" Value="{DynamicResource ThemeControlTransparentBrush}" />
     <Setter Property="Height" Value="22" />
@@ -91,8 +91,8 @@
     </Style>
   </ControlTheme>
 
-  <ControlTheme x:Key="DefaultDateTimePickerUpButton"
-                BasedOn="{StaticResource DefaultDateTimePickerButton}"
+  <ControlTheme x:Key="SimpleDateTimePickerUpButton"
+                BasedOn="{StaticResource SimpleDateTimePickerButton}"
                 TargetType="RepeatButton">
     <Setter Property="VerticalAlignment" Value="Top" />
     <Setter Property="Height" Value="22" />
@@ -114,8 +114,8 @@
     </Setter>
   </ControlTheme>
 
-  <ControlTheme x:Key="DefaultDateTimePickerDownButton"
-                BasedOn="{StaticResource DefaultDateTimePickerButton}"
+  <ControlTheme x:Key="SimpleDateTimePickerDownButton"
+                BasedOn="{StaticResource SimpleDateTimePickerButton}"
                 TargetType="RepeatButton">
     <Setter Property="VerticalAlignment" Value="Bottom" />
     <Setter Property="Height" Value="22" />
diff --git a/src/Avalonia.Themes.Default/Controls/DropDownButton.xaml b/src/Avalonia.Themes.Simple/Controls/DropDownButton.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Controls/DropDownButton.xaml
rename to src/Avalonia.Themes.Simple/Controls/DropDownButton.xaml
diff --git a/src/Avalonia.Themes.Default/Controls/EmbeddableControlRoot.xaml b/src/Avalonia.Themes.Simple/Controls/EmbeddableControlRoot.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Controls/EmbeddableControlRoot.xaml
rename to src/Avalonia.Themes.Simple/Controls/EmbeddableControlRoot.xaml
diff --git a/src/Avalonia.Themes.Default/Controls/Expander.xaml b/src/Avalonia.Themes.Simple/Controls/Expander.xaml
similarity index 88%
rename from src/Avalonia.Themes.Default/Controls/Expander.xaml
rename to src/Avalonia.Themes.Simple/Controls/Expander.xaml
index bfa5fb3130..9920c9445a 100644
--- a/src/Avalonia.Themes.Default/Controls/Expander.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/Expander.xaml
@@ -44,7 +44,7 @@
     </Border>
   </Design.PreviewWith>
 
-  <ControlTheme x:Key="DefaultExpanderToggleButtonTheme"
+  <ControlTheme x:Key="SimpleExpanderToggleButtonTheme"
                 TargetType="ToggleButton">
     <Setter Property="HorizontalContentAlignment" Value="Stretch" />
     <Setter Property="Background" Value="Transparent" />
@@ -80,8 +80,8 @@
       <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderLowBrush}" />
     </Style>
   </ControlTheme>
-  <ControlTheme x:Key="DefaultExpanderToggleButtonUpTheme"
-                BasedOn="{StaticResource DefaultExpanderToggleButtonTheme}"
+  <ControlTheme x:Key="SimpleExpanderToggleButtonUpTheme"
+                BasedOn="{StaticResource SimpleExpanderToggleButtonTheme}"
                 TargetType="ToggleButton">
     <Style Selector="^ /template/ Path">
       <Setter Property="RenderTransform">
@@ -89,8 +89,8 @@
       </Setter>
     </Style>
   </ControlTheme>
-  <ControlTheme x:Key="DefaultExpanderToggleButtonDownTheme"
-                BasedOn="{StaticResource DefaultExpanderToggleButtonTheme}"
+  <ControlTheme x:Key="SimpleExpanderToggleButtonDownTheme"
+                BasedOn="{StaticResource SimpleExpanderToggleButtonTheme}"
                 TargetType="ToggleButton">
     <Style Selector="^ /template/ Path">
       <Setter Property="RenderTransform">
@@ -98,8 +98,8 @@
       </Setter>
     </Style>
   </ControlTheme>
-  <ControlTheme x:Key="DefaultExpanderToggleButtonLeftTheme"
-                BasedOn="{StaticResource DefaultExpanderToggleButtonTheme}"
+  <ControlTheme x:Key="SimpleExpanderToggleButtonLeftTheme"
+                BasedOn="{StaticResource SimpleExpanderToggleButtonTheme}"
                 TargetType="ToggleButton">
     <Style Selector="^ /template/ Path">
       <Setter Property="RenderTransform">
@@ -107,8 +107,8 @@
       </Setter>
     </Style>
   </ControlTheme>
-  <ControlTheme x:Key="DefaultExpanderToggleButtonRightTheme"
-                BasedOn="{StaticResource DefaultExpanderToggleButtonTheme}"
+  <ControlTheme x:Key="SimpleExpanderToggleButtonRightTheme"
+                BasedOn="{StaticResource SimpleExpanderToggleButtonTheme}"
                 TargetType="ToggleButton">
     <Style Selector="^ /template/ Path">
       <Setter Property="RenderTransform">
@@ -139,7 +139,7 @@
                             Content="{TemplateBinding Header}"
                             IsChecked="{TemplateBinding IsExpanded,
                                                         Mode=TwoWay}"
-                            Theme="{StaticResource DefaultExpanderToggleButtonRightTheme}" />
+                            Theme="{StaticResource SimpleExpanderToggleButtonRightTheme}" />
               <ContentPresenter Name="PART_ContentPresenter"
                                 Grid.Row="1"
                                 Padding="{TemplateBinding Padding}"
@@ -153,7 +153,7 @@
         </ControlTemplate>
       </Setter>
       <Style Selector="^:expanded /template/ ToggleButton#PART_toggle">
-        <Setter Property="Theme" Value="{StaticResource DefaultExpanderToggleButtonDownTheme}" />
+        <Setter Property="Theme" Value="{StaticResource SimpleExpanderToggleButtonDownTheme}" />
       </Style>
     </Style>
     <Style Selector="^[ExpandDirection=Up]">
@@ -171,7 +171,7 @@
                             Content="{TemplateBinding Header}"
                             IsChecked="{TemplateBinding IsExpanded,
                                                         Mode=TwoWay}"
-                            Theme="{StaticResource DefaultExpanderToggleButtonRightTheme}" />
+                            Theme="{StaticResource SimpleExpanderToggleButtonRightTheme}" />
               <ContentPresenter Name="PART_ContentPresenter"
                                 Grid.Row="0"
                                 Padding="{TemplateBinding Padding}"
@@ -185,7 +185,7 @@
         </ControlTemplate>
       </Setter>
       <Style Selector="^:expanded /template/ ToggleButton#PART_toggle">
-        <Setter Property="Theme" Value="{StaticResource DefaultExpanderToggleButtonUpTheme}" />
+        <Setter Property="Theme" Value="{StaticResource SimpleExpanderToggleButtonUpTheme}" />
       </Style>
     </Style>
     <Style Selector="^[ExpandDirection=Right]">
@@ -203,7 +203,7 @@
                             Content="{TemplateBinding Header}"
                             IsChecked="{TemplateBinding IsExpanded,
                                                         Mode=TwoWay}"
-                            Theme="{StaticResource DefaultExpanderToggleButtonLeftTheme}" />
+                            Theme="{StaticResource SimpleExpanderToggleButtonLeftTheme}" />
               <ContentPresenter Name="PART_ContentPresenter"
                                 Grid.Column="1"
                                 Padding="{TemplateBinding Padding}"
@@ -217,7 +217,7 @@
         </ControlTemplate>
       </Setter>
       <Style Selector="^:expanded /template/ ToggleButton#PART_toggle">
-        <Setter Property="Theme" Value="{StaticResource DefaultExpanderToggleButtonRightTheme}" />
+        <Setter Property="Theme" Value="{StaticResource SimpleExpanderToggleButtonRightTheme}" />
       </Style>
     </Style>
     <Style Selector="^[ExpandDirection=Left]">
@@ -235,7 +235,7 @@
                             Content="{TemplateBinding Header}"
                             IsChecked="{TemplateBinding IsExpanded,
                                                         Mode=TwoWay}"
-                            Theme="{StaticResource DefaultExpanderToggleButtonRightTheme}" />
+                            Theme="{StaticResource SimpleExpanderToggleButtonRightTheme}" />
               <ContentPresenter Name="PART_ContentPresenter"
                                 Grid.Column="0"
                                 Padding="{TemplateBinding Padding}"
@@ -249,7 +249,7 @@
         </ControlTemplate>
       </Setter>
       <Style Selector="^:expanded /template/ ToggleButton#PART_toggle">
-        <Setter Property="Theme" Value="{StaticResource DefaultExpanderToggleButtonLeftTheme}" />
+        <Setter Property="Theme" Value="{StaticResource SimpleExpanderToggleButtonLeftTheme}" />
       </Style>
     </Style>
   </ControlTheme>
diff --git a/src/Avalonia.Themes.Default/Controls/FlyoutPresenter.xaml b/src/Avalonia.Themes.Simple/Controls/FlyoutPresenter.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Controls/FlyoutPresenter.xaml
rename to src/Avalonia.Themes.Simple/Controls/FlyoutPresenter.xaml
diff --git a/src/Avalonia.Themes.Default/Controls/FocusAdorner.xaml b/src/Avalonia.Themes.Simple/Controls/FocusAdorner.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Controls/FocusAdorner.xaml
rename to src/Avalonia.Themes.Simple/Controls/FocusAdorner.xaml
diff --git a/src/Avalonia.Themes.Default/Controls/GridSplitter.xaml b/src/Avalonia.Themes.Simple/Controls/GridSplitter.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Controls/GridSplitter.xaml
rename to src/Avalonia.Themes.Simple/Controls/GridSplitter.xaml
diff --git a/src/Avalonia.Themes.Default/Controls/ItemsControl.xaml b/src/Avalonia.Themes.Simple/Controls/ItemsControl.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Controls/ItemsControl.xaml
rename to src/Avalonia.Themes.Simple/Controls/ItemsControl.xaml
diff --git a/src/Avalonia.Themes.Default/Controls/Label.xaml b/src/Avalonia.Themes.Simple/Controls/Label.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Controls/Label.xaml
rename to src/Avalonia.Themes.Simple/Controls/Label.xaml
diff --git a/src/Avalonia.Themes.Default/Controls/ListBox.xaml b/src/Avalonia.Themes.Simple/Controls/ListBox.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Controls/ListBox.xaml
rename to src/Avalonia.Themes.Simple/Controls/ListBox.xaml
diff --git a/src/Avalonia.Themes.Default/Controls/ListBoxItem.xaml b/src/Avalonia.Themes.Simple/Controls/ListBoxItem.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Controls/ListBoxItem.xaml
rename to src/Avalonia.Themes.Simple/Controls/ListBoxItem.xaml
diff --git a/src/Avalonia.Themes.Default/Controls/ManagedFileChooser.xaml b/src/Avalonia.Themes.Simple/Controls/ManagedFileChooser.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Controls/ManagedFileChooser.xaml
rename to src/Avalonia.Themes.Simple/Controls/ManagedFileChooser.xaml
diff --git a/src/Avalonia.Themes.Default/Controls/Menu.xaml b/src/Avalonia.Themes.Simple/Controls/Menu.xaml
similarity index 95%
rename from src/Avalonia.Themes.Default/Controls/Menu.xaml
rename to src/Avalonia.Themes.Simple/Controls/Menu.xaml
index c698343d83..95b259bfa6 100644
--- a/src/Avalonia.Themes.Default/Controls/Menu.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/Menu.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:sys="using:System">
 
-  <ControlTheme x:Key="DefaultTopLevelMenuItem"
+  <ControlTheme x:Key="SimpleTopLevelMenuItem"
                 TargetType="MenuItem">
     <Setter Property="Background" Value="Transparent" />
     <Setter Property="Padding" Value="6 0" />
@@ -32,7 +32,7 @@
               <Border Background="{DynamicResource ThemeBackgroundBrush}"
                       BorderBrush="{DynamicResource ThemeBorderMidBrush}"
                       BorderThickness="{TemplateBinding BorderThickness}">
-                <ScrollViewer Theme="{StaticResource DefaultMenuScrollViewer}">
+                <ScrollViewer Theme="{StaticResource SimpleMenuScrollViewer}">
                   <ItemsPresenter Name="PART_ItemsPresenter"
                                   Margin="2"
                                   Grid.IsSharedSizeScope="True"
@@ -63,7 +63,7 @@
 
   <ControlTheme x:Key="{x:Type Menu}"
                 TargetType="Menu">
-    <Setter Property="ItemContainerTheme" Value="{StaticResource DefaultTopLevelMenuItem}" />
+    <Setter Property="ItemContainerTheme" Value="{StaticResource SimpleTopLevelMenuItem}" />
     <Setter Property="Template">
       <ControlTemplate>
         <Border Padding="{TemplateBinding Padding}"
diff --git a/src/Avalonia.Themes.Default/Controls/MenuFlyoutPresenter.xaml b/src/Avalonia.Themes.Simple/Controls/MenuFlyoutPresenter.xaml
similarity index 96%
rename from src/Avalonia.Themes.Default/Controls/MenuFlyoutPresenter.xaml
rename to src/Avalonia.Themes.Simple/Controls/MenuFlyoutPresenter.xaml
index 78c3d767a3..d974c36d31 100644
--- a/src/Avalonia.Themes.Default/Controls/MenuFlyoutPresenter.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/MenuFlyoutPresenter.xaml
@@ -15,7 +15,7 @@
                 BorderThickness="{TemplateBinding BorderThickness}"
                 CornerRadius="{TemplateBinding CornerRadius}">
           <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
-                        Theme="{StaticResource DefaultMenuScrollViewer}"
+                        Theme="{StaticResource SimpleMenuScrollViewer}"
                         VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
             <ItemsPresenter Name="PART_ItemsPresenter"
                             Margin="{TemplateBinding Padding}"
diff --git a/src/Avalonia.Themes.Default/Controls/MenuItem.xaml b/src/Avalonia.Themes.Simple/Controls/MenuItem.xaml
similarity index 98%
rename from src/Avalonia.Themes.Default/Controls/MenuItem.xaml
rename to src/Avalonia.Themes.Simple/Controls/MenuItem.xaml
index b2d0f3535a..ec22ee413d 100644
--- a/src/Avalonia.Themes.Default/Controls/MenuItem.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/MenuItem.xaml
@@ -68,7 +68,7 @@
               <Border Background="{DynamicResource ThemeBackgroundBrush}"
                       BorderBrush="{DynamicResource ThemeBorderMidBrush}"
                       BorderThickness="{TemplateBinding BorderThickness}">
-                <ScrollViewer Theme="{StaticResource DefaultMenuScrollViewer}">
+                <ScrollViewer Theme="{StaticResource SimpleMenuScrollViewer}">
                   <ItemsPresenter Name="PART_ItemsPresenter"
                                   Margin="2"
                                   Grid.IsSharedSizeScope="True"
diff --git a/src/Avalonia.Themes.Default/Controls/NativeMenuBar.xaml b/src/Avalonia.Themes.Simple/Controls/NativeMenuBar.xaml
similarity index 76%
rename from src/Avalonia.Themes.Default/Controls/NativeMenuBar.xaml
rename to src/Avalonia.Themes.Simple/Controls/NativeMenuBar.xaml
index 3c74e2743a..8c51ec8609 100644
--- a/src/Avalonia.Themes.Default/Controls/NativeMenuBar.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/NativeMenuBar.xaml
@@ -1,14 +1,14 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:default="clr-namespace:Avalonia.Themes.Default">
-  <default:InverseBooleanValueConverter x:Key="AvaloniaThemesDefaultNativeMenuBarInverseBooleanValueConverter"
+                    xmlns:default="clr-namespace:Avalonia.Themes.Simple">
+  <default:InverseBooleanValueConverter x:Key="AvaloniaThemesSimpleNativeMenuBarInverseBooleanValueConverter"
                                         Default="True" />
-  <default:IBitmapToImageConverter x:Key="AvaloniaThemesDefaultNativeMenuBarIBitmapToImageConverter" />
+  <default:IBitmapToImageConverter x:Key="AvaloniaThemesSimpleNativeMenuBarIBitmapToImageConverter" />
   <ControlTheme x:Key="{x:Type NativeMenuBar}"
                 TargetType="NativeMenuBar">
     <Setter Property="Template">
       <ControlTemplate>
-        <Menu IsVisible="{Binding $parent[TopLevel].(NativeMenu.IsNativeMenuExported), Converter={StaticResource AvaloniaThemesDefaultNativeMenuBarInverseBooleanValueConverter}}"
+        <Menu IsVisible="{Binding $parent[TopLevel].(NativeMenu.IsNativeMenuExported), Converter={StaticResource AvaloniaThemesSimpleNativeMenuBarInverseBooleanValueConverter}}"
               Items="{Binding $parent[TopLevel].(NativeMenu.Menu).Items}">
           <Menu.Styles>
             <Style Selector="MenuItem">
@@ -20,7 +20,7 @@
               <Setter Property="CommandParameter" Value="{Binding CommandParameter}" />
               <Setter Property="(NativeMenuBar.EnableMenuItemClickForwarding)" Value="True" />
               <!--  NativeMenuItem is IBitmap and MenuItem is Image  -->
-              <Setter Property="Icon" Value="{Binding Icon, Converter={StaticResource AvaloniaThemesDefaultNativeMenuBarIBitmapToImageConverter}}" />
+              <Setter Property="Icon" Value="{Binding Icon, Converter={StaticResource AvaloniaThemesSimpleNativeMenuBarIBitmapToImageConverter}}" />
             </Style>
           </Menu.Styles>
         </Menu>
diff --git a/src/Avalonia.Themes.Default/Controls/NotificationCard.xaml b/src/Avalonia.Themes.Simple/Controls/NotificationCard.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Controls/NotificationCard.xaml
rename to src/Avalonia.Themes.Simple/Controls/NotificationCard.xaml
diff --git a/src/Avalonia.Themes.Default/Controls/NumericUpDown.xaml b/src/Avalonia.Themes.Simple/Controls/NumericUpDown.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Controls/NumericUpDown.xaml
rename to src/Avalonia.Themes.Simple/Controls/NumericUpDown.xaml
diff --git a/src/Avalonia.Themes.Default/Controls/OverlayPopupHost.xaml b/src/Avalonia.Themes.Simple/Controls/OverlayPopupHost.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Controls/OverlayPopupHost.xaml
rename to src/Avalonia.Themes.Simple/Controls/OverlayPopupHost.xaml
diff --git a/src/Avalonia.Themes.Default/Controls/PathIcon.xaml b/src/Avalonia.Themes.Simple/Controls/PathIcon.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Controls/PathIcon.xaml
rename to src/Avalonia.Themes.Simple/Controls/PathIcon.xaml
diff --git a/src/Avalonia.Themes.Default/Controls/PopupRoot.xaml b/src/Avalonia.Themes.Simple/Controls/PopupRoot.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Controls/PopupRoot.xaml
rename to src/Avalonia.Themes.Simple/Controls/PopupRoot.xaml
diff --git a/src/Avalonia.Themes.Default/Controls/ProgressBar.xaml b/src/Avalonia.Themes.Simple/Controls/ProgressBar.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Controls/ProgressBar.xaml
rename to src/Avalonia.Themes.Simple/Controls/ProgressBar.xaml
diff --git a/src/Avalonia.Themes.Default/Controls/RadioButton.xaml b/src/Avalonia.Themes.Simple/Controls/RadioButton.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Controls/RadioButton.xaml
rename to src/Avalonia.Themes.Simple/Controls/RadioButton.xaml
diff --git a/src/Avalonia.Themes.Default/Controls/RepeatButton.xaml b/src/Avalonia.Themes.Simple/Controls/RepeatButton.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Controls/RepeatButton.xaml
rename to src/Avalonia.Themes.Simple/Controls/RepeatButton.xaml
diff --git a/src/Avalonia.Themes.Default/Controls/RichTextBlock.xaml b/src/Avalonia.Themes.Simple/Controls/RichTextBlock.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Controls/RichTextBlock.xaml
rename to src/Avalonia.Themes.Simple/Controls/RichTextBlock.xaml
diff --git a/src/Avalonia.Themes.Default/Controls/ScrollBar.xaml b/src/Avalonia.Themes.Simple/Controls/ScrollBar.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Controls/ScrollBar.xaml
rename to src/Avalonia.Themes.Simple/Controls/ScrollBar.xaml
diff --git a/src/Avalonia.Themes.Default/Controls/ScrollViewer.xaml b/src/Avalonia.Themes.Simple/Controls/ScrollViewer.xaml
similarity index 99%
rename from src/Avalonia.Themes.Default/Controls/ScrollViewer.xaml
rename to src/Avalonia.Themes.Simple/Controls/ScrollViewer.xaml
index 83b3330fcf..e11fbb6f15 100644
--- a/src/Avalonia.Themes.Default/Controls/ScrollViewer.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/ScrollViewer.xaml
@@ -56,7 +56,7 @@
     </Setter>
   </ControlTheme>
 
-  <ControlTheme x:Key="DefaultMenuScrollViewer"
+  <ControlTheme x:Key="SimpleMenuScrollViewer"
                 TargetType="ScrollViewer">
     <Setter Property="Background" Value="Transparent" />
     <Setter Property="Template">
diff --git a/src/Avalonia.Themes.Default/Controls/Separator.xaml b/src/Avalonia.Themes.Simple/Controls/Separator.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Controls/Separator.xaml
rename to src/Avalonia.Themes.Simple/Controls/Separator.xaml
diff --git a/src/Avalonia.Themes.Simple/Controls/SimpleControls.xaml b/src/Avalonia.Themes.Simple/Controls/SimpleControls.xaml
new file mode 100644
index 0000000000..644c6ed416
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/SimpleControls.xaml
@@ -0,0 +1,74 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Styles.Resources>
+    <ResourceDictionary>
+      <ResourceDictionary.MergedDictionaries>
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/Button.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/RadioButton.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/Expander.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/RepeatButton.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/ToggleSwitch.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/ButtonSpinner.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/ToggleButton.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/DropDownButton.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/PathIcon.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/CheckBox.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/ToolTip.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/Label.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/ComboBoxItem.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/ComboBox.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/Window.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/Carousel.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/CaptionButtons.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/TitleBar.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/TextBox.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/AutoCompleteBox.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/DataValidationErrors.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/ContentControl.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/FlyoutPresenter.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/MenuFlyoutPresenter.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/GridSplitter.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/ItemsControl.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/ListBoxItem.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/ListBox.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/ScrollBar.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/ScrollViewer.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/TabStrip.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/TabStripItem.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/TabControl.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/TabItem.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/PopupRoot.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/OverlayPopupHost.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/WindowNotificationManager.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/EmbeddableControlRoot.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/TransitioningContentControl.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/TreeView.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/TreeViewItem.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/ProgressBar.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/Separator.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/Menu.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/MenuItem.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/ContextMenu.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/CalendarButton.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/CalendarDayButton.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/CalendarItem.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/Calendar.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/CalendarDatePicker.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/Slider.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/NotificationCard.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/NativeMenuBar.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/NumericUpDown.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/DateTimePickerShared.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/DatePicker.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/TimePicker.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/SplitView.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/ManagedFileChooser.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/SplitButton.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/RichTextBlock.xaml" />
+      </ResourceDictionary.MergedDictionaries>
+    </ResourceDictionary>
+  </Styles.Resources>
+
+  <StyleInclude Source="avares://Avalonia.Themes.Simple/Controls/FocusAdorner.xaml" />
+  <StyleInclude Source="avares://Avalonia.Themes.Simple/Controls/UserControl.xaml" />
+</Styles>
diff --git a/src/Avalonia.Themes.Default/Controls/Slider.xaml b/src/Avalonia.Themes.Simple/Controls/Slider.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Controls/Slider.xaml
rename to src/Avalonia.Themes.Simple/Controls/Slider.xaml
diff --git a/src/Avalonia.Themes.Default/Controls/SplitButton.xaml b/src/Avalonia.Themes.Simple/Controls/SplitButton.xaml
similarity index 98%
rename from src/Avalonia.Themes.Default/Controls/SplitButton.xaml
rename to src/Avalonia.Themes.Simple/Controls/SplitButton.xaml
index aa71d0e7c7..f0d22aac97 100644
--- a/src/Avalonia.Themes.Default/Controls/SplitButton.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/SplitButton.xaml
@@ -3,7 +3,7 @@
                     x:CompileBindings="True"
                     xmlns:converters="using:Avalonia.Controls.Converters">
 
-  <!-- This style is heavily based on the Default v1 style.
+  <!-- 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. -->
 
   <Design.PreviewWith>
@@ -58,7 +58,7 @@
   <SolidColorBrush x:Key="SplitButtonBorderBrushCheckedDisabled" Color="{DynamicResource ThemeControlMidColor}"
                    Opacity="{DynamicResource ThemeDisabledOpacity}" />
 
-  <ControlTheme x:Key="DefaultSplitButtonComponent" TargetType="Button">
+  <ControlTheme x:Key="SimpleSplitButtonComponent" TargetType="Button">
     <Setter Property="Template">
       <ControlTemplate>
         <ContentPresenter x:Name="PART_ContentPresenter"
@@ -156,7 +156,7 @@
 
           <Button x:Name="PART_PrimaryButton"
                   Grid.Column="0"
-                  Theme="{StaticResource DefaultSplitButtonComponent}"
+                  Theme="{StaticResource SimpleSplitButtonComponent}"
                   MinWidth="{DynamicResource SplitButtonPrimaryButtonSize}"
                   Foreground="{TemplateBinding Foreground}"
                   Background="{TemplateBinding Background}"
@@ -187,7 +187,7 @@
 
           <Button x:Name="PART_SecondaryButton"
                   Grid.Column="2"
-                  Theme="{StaticResource DefaultSplitButtonComponent}"
+                  Theme="{StaticResource SimpleSplitButtonComponent}"
                   MinWidth="{DynamicResource SplitButtonSecondaryButtonSize}"
                   BorderBrush="{TemplateBinding BorderBrush}"
                   Foreground="{TemplateBinding Foreground}"
diff --git a/src/Avalonia.Themes.Default/Controls/SplitView.xaml b/src/Avalonia.Themes.Simple/Controls/SplitView.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Controls/SplitView.xaml
rename to src/Avalonia.Themes.Simple/Controls/SplitView.xaml
diff --git a/src/Avalonia.Themes.Default/Controls/TabControl.xaml b/src/Avalonia.Themes.Simple/Controls/TabControl.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Controls/TabControl.xaml
rename to src/Avalonia.Themes.Simple/Controls/TabControl.xaml
diff --git a/src/Avalonia.Themes.Default/Controls/TabItem.xaml b/src/Avalonia.Themes.Simple/Controls/TabItem.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Controls/TabItem.xaml
rename to src/Avalonia.Themes.Simple/Controls/TabItem.xaml
diff --git a/src/Avalonia.Themes.Default/Controls/TabStrip.xaml b/src/Avalonia.Themes.Simple/Controls/TabStrip.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Controls/TabStrip.xaml
rename to src/Avalonia.Themes.Simple/Controls/TabStrip.xaml
diff --git a/src/Avalonia.Themes.Default/Controls/TabStripItem.xaml b/src/Avalonia.Themes.Simple/Controls/TabStripItem.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Controls/TabStripItem.xaml
rename to src/Avalonia.Themes.Simple/Controls/TabStripItem.xaml
diff --git a/src/Avalonia.Themes.Default/Controls/TextBox.xaml b/src/Avalonia.Themes.Simple/Controls/TextBox.xaml
similarity index 96%
rename from src/Avalonia.Themes.Default/Controls/TextBox.xaml
rename to src/Avalonia.Themes.Simple/Controls/TextBox.xaml
index 3cc8bc5421..5fa6412688 100644
--- a/src/Avalonia.Themes.Default/Controls/TextBox.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/TextBox.xaml
@@ -4,7 +4,7 @@
   <StreamGeometry x:Key="PasswordBoxRevealButtonData">m10.051 7.0032c2.215 0 4.0105 1.7901 4.0105 3.9984s-1.7956 3.9984-4.0105 3.9984c-2.215 0-4.0105-1.7901-4.0105-3.9984s1.7956-3.9984 4.0105-3.9984zm0 1.4994c-1.3844 0-2.5066 1.1188-2.5066 2.499s1.1222 2.499 2.5066 2.499 2.5066-1.1188 2.5066-2.499-1.1222-2.499-2.5066-2.499zm0-5.0026c4.6257 0 8.6188 3.1487 9.7267 7.5613 0.10085 0.40165-0.14399 0.80877-0.54686 0.90931-0.40288 0.10054-0.81122-0.14355-0.91208-0.54521-0.94136-3.7492-4.3361-6.4261-8.2678-6.4261-3.9334 0-7.3292 2.6792-8.2689 6.4306-0.10063 0.40171-0.50884 0.64603-0.91177 0.54571s-0.648-0.5073-0.54737-0.90901c1.106-4.4152 5.1003-7.5667 9.728-7.5667z</StreamGeometry>
   <StreamGeometry x:Key="PasswordBoxHideButtonData">m0.21967 0.21965c-0.26627 0.26627-0.29047 0.68293-0.07262 0.97654l0.07262 0.08412 4.0346 4.0346c-1.922 1.3495-3.3585 3.365-3.9554 5.7495-0.10058 0.4018 0.14362 0.8091 0.54543 0.9097 0.40182 0.1005 0.80909-0.1436 0.90968-0.5455 0.52947-2.1151 1.8371-3.8891 3.5802-5.0341l1.8096 1.8098c-0.70751 0.7215-1.1438 1.71-1.1438 2.8003 0 2.2092 1.7909 4 4 4 1.0904 0 2.0788-0.4363 2.8004-1.1438l5.9193 5.9195c0.2929 0.2929 0.7677 0.2929 1.0606 0 0.2663-0.2662 0.2905-0.6829 0.0726-0.9765l-0.0726-0.0841-6.1135-6.1142 0.0012-0.0015-1.2001-1.1979-2.8699-2.8693 2e-3 -8e-4 -2.8812-2.8782 0.0012-0.0018-1.1333-1.1305-4.3064-4.3058c-0.29289-0.29289-0.76777-0.29289-1.0607 0zm7.9844 9.0458 3.5351 3.5351c-0.45 0.4358-1.0633 0.704-1.7392 0.704-1.3807 0-2.5-1.1193-2.5-2.5 0-0.6759 0.26824-1.2892 0.7041-1.7391zm1.7959-5.7655c-1.0003 0-1.9709 0.14807-2.8889 0.425l1.237 1.2362c0.5358-0.10587 1.0883-0.16119 1.6519-0.16119 3.9231 0 7.3099 2.6803 8.2471 6.4332 0.1004 0.4018 0.5075 0.6462 0.9094 0.5459 0.4019-0.1004 0.6463-0.5075 0.5459-0.9094-1.103-4.417-5.0869-7.5697-9.7024-7.5697zm0.1947 3.5093 3.8013 3.8007c-0.1018-2.0569-1.7488-3.7024-3.8013-3.8007z</StreamGeometry>
 
-  <MenuFlyout x:Key="DefaultTextBoxContextFlyout" Placement="Bottom">
+  <MenuFlyout x:Key="SimpleTextBoxContextFlyout" Placement="Bottom">
     <MenuItem x:Name="TextBoxContextFlyoutCutItem" Header="Cut" Command="{Binding $parent[TextBox].Cut}"
               IsEnabled="{Binding $parent[TextBox].CanCut}" InputGesture="{x:Static TextBox.CutGesture}" />
     <MenuItem x:Name="TextBoxContextFlyoutCopyItem" Header="Copy" Command="{Binding $parent[TextBox].Copy}"
@@ -13,7 +13,7 @@
               IsEnabled="{Binding $parent[TextBox].CanPaste}" InputGesture="{x:Static TextBox.PasteGesture}" />
   </MenuFlyout>
 
-  <ContextMenu x:Key="DefaultTextBoxContextMenu" x:Name="TextBoxContextMenu">
+  <ContextMenu x:Key="SimpleTextBoxContextMenu" x:Name="TextBoxContextMenu">
     <MenuItem x:Name="TextBoxContextMenuCutItem" Header="Cut" Command="{Binding $parent[TextBox].Cut}"
               IsEnabled="{Binding $parent[TextBox].CanCut}" InputGesture="{x:Static TextBox.CutGesture}" />
     <MenuItem x:Name="TextBoxContextMenuCopyItem" Header="Copy" Command="{Binding $parent[TextBox].Copy}"
@@ -22,7 +22,7 @@
               IsEnabled="{Binding $parent[TextBox].CanPaste}" InputGesture="{x:Static TextBox.PasteGesture}" />
   </ContextMenu>
 
-  <ControlTheme x:Key="DefaultTextBoxClearButtonTheme"
+  <ControlTheme x:Key="SimpleTextBoxClearButtonTheme"
                 BasedOn="{StaticResource {x:Type Button}}"
                 TargetType="Button">
     <Setter Property="Cursor" Value="Arrow" />
@@ -46,7 +46,7 @@
     </Setter>
   </ControlTheme>
 
-  <ControlTheme x:Key="DefaultPasswordBoxRevealButtonTheme"
+  <ControlTheme x:Key="SimplePasswordBoxRevealButtonTheme"
                 BasedOn="{StaticResource {x:Type Button}}"
                 TargetType="ToggleButton">
     <Setter Property="Cursor" Value="Arrow" />
@@ -96,7 +96,7 @@
     <Setter Property="SelectionBrush" Value="{DynamicResource HighlightBrush}" />
     <Setter Property="SelectionForegroundBrush" Value="{DynamicResource HighlightForegroundBrush}" />
     <Setter Property="Padding" Value="4" />
-    <Setter Property="ContextFlyout" Value="{StaticResource DefaultTextBoxContextFlyout}" />
+    <Setter Property="ContextFlyout" Value="{StaticResource SimpleTextBoxContextFlyout}" />
     <Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
     <Setter Property="Template">
       <ControlTemplate>
@@ -192,7 +192,7 @@
         <Template>
           <Button Command="{Binding $parent[TextBox].Clear}"
                   Focusable="False"
-                  Theme="{StaticResource DefaultTextBoxClearButtonTheme}" />
+                  Theme="{StaticResource SimpleTextBoxClearButtonTheme}" />
         </Template>
       </Setter>
     </Style>
@@ -212,7 +212,7 @@
             <ToggleButton Background="Transparent"
                           Focusable="False"
                           IsChecked="{Binding $parent[TextBox].RevealPassword, Mode=TwoWay}"
-                          Theme="{StaticResource DefaultPasswordBoxRevealButtonTheme}" />
+                          Theme="{StaticResource SimplePasswordBoxRevealButtonTheme}" />
           </Panel>
         </Template>
       </Setter>
diff --git a/src/Avalonia.Themes.Default/Controls/TimePicker.xaml b/src/Avalonia.Themes.Simple/Controls/TimePicker.xaml
similarity index 94%
rename from src/Avalonia.Themes.Default/Controls/TimePicker.xaml
rename to src/Avalonia.Themes.Simple/Controls/TimePicker.xaml
index b0ffc97e68..c49b3aec4e 100644
--- a/src/Avalonia.Themes.Default/Controls/TimePicker.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/TimePicker.xaml
@@ -41,7 +41,7 @@
   <Thickness x:Key="TimePickerFlyoutPresenterItemPadding">0,3,0,6</Thickness>
   <Thickness x:Key="TimePickerHostPadding">0,3,0,6</Thickness>
 
-  <ControlTheme x:Key="DefaultTimePickerFlyoutButton"
+  <ControlTheme x:Key="SimpleTimePickerFlyoutButton"
                 TargetType="Button">
     <Setter Property="RenderTransform" Value="none" />
     <Setter Property="Template">
@@ -114,7 +114,7 @@
                     CornerRadius="{TemplateBinding CornerRadius}"
                     Foreground="{TemplateBinding Foreground}"
                     IsEnabled="{TemplateBinding IsEnabled}"
-                    Theme="{StaticResource DefaultTimePickerFlyoutButton}">
+                    Theme="{StaticResource SimpleTimePickerFlyoutButton}">
 
               <Grid Name="FlyoutButtonContentGrid">
                 <!--  Ignore col defs here, set in code  -->
@@ -226,9 +226,9 @@
                                        ShouldLoop="True" />
                 </ScrollViewer>
                 <RepeatButton Name="HourUpButton"
-                              Theme="{StaticResource DefaultDateTimePickerUpButton}" />
+                              Theme="{StaticResource SimpleDateTimePickerUpButton}" />
                 <RepeatButton Name="HourDownButton"
-                              Theme="{StaticResource DefaultDateTimePickerDownButton}" />
+                              Theme="{StaticResource SimpleDateTimePickerDownButton}" />
               </Panel>
 
               <Panel Name="MinuteHost"
@@ -241,9 +241,9 @@
                                        ShouldLoop="True" />
                 </ScrollViewer>
                 <RepeatButton Name="MinuteUpButton"
-                              Theme="{StaticResource DefaultDateTimePickerUpButton}" />
+                              Theme="{StaticResource SimpleDateTimePickerUpButton}" />
                 <RepeatButton Name="MinuteDownButton"
-                              Theme="{StaticResource DefaultDateTimePickerDownButton}" />
+                              Theme="{StaticResource SimpleDateTimePickerDownButton}" />
               </Panel>
 
               <Panel Name="PeriodHost"
@@ -256,9 +256,9 @@
                                        ShouldLoop="False" />
                 </ScrollViewer>
                 <RepeatButton Name="PeriodUpButton"
-                              Theme="{StaticResource DefaultDateTimePickerUpButton}" />
+                              Theme="{StaticResource SimpleDateTimePickerUpButton}" />
                 <RepeatButton Name="PeriodDownButton"
-                              Theme="{StaticResource DefaultDateTimePickerDownButton}" />
+                              Theme="{StaticResource SimpleDateTimePickerDownButton}" />
               </Panel>
 
               <Rectangle x:Name="HighlightRect"
@@ -296,7 +296,7 @@
                       Height="{DynamicResource TimePickerFlyoutPresenterAcceptDismissHostGridHeight}"
                       HorizontalAlignment="Stretch"
                       VerticalAlignment="Stretch"
-                      Theme="{StaticResource DefaultDateTimePickerButton}">
+                      Theme="{StaticResource SimpleDateTimePickerButton}">
                 <Path Data="M0.5,8.5 5,13.5 15.5,3"
                       Stroke="{Binding $parent[Button].Foreground}"
                       StrokeLineCap="Round"
@@ -308,7 +308,7 @@
                       HorizontalAlignment="Stretch"
                       VerticalAlignment="Stretch"
                       FontSize="16"
-                      Theme="{StaticResource DefaultDateTimePickerButton}">
+                      Theme="{StaticResource SimpleDateTimePickerButton}">
                 <Path Data="M2,2 14,14 M2,14 14 2"
                       Stroke="{Binding $parent[Button].Foreground}"
                       StrokeLineCap="Round"
diff --git a/src/Avalonia.Themes.Default/Controls/TitleBar.xaml b/src/Avalonia.Themes.Simple/Controls/TitleBar.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Controls/TitleBar.xaml
rename to src/Avalonia.Themes.Simple/Controls/TitleBar.xaml
diff --git a/src/Avalonia.Themes.Default/Controls/ToggleButton.xaml b/src/Avalonia.Themes.Simple/Controls/ToggleButton.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Controls/ToggleButton.xaml
rename to src/Avalonia.Themes.Simple/Controls/ToggleButton.xaml
diff --git a/src/Avalonia.Themes.Default/Controls/ToggleSwitch.xaml b/src/Avalonia.Themes.Simple/Controls/ToggleSwitch.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Controls/ToggleSwitch.xaml
rename to src/Avalonia.Themes.Simple/Controls/ToggleSwitch.xaml
diff --git a/src/Avalonia.Themes.Default/Controls/ToolTip.xaml b/src/Avalonia.Themes.Simple/Controls/ToolTip.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Controls/ToolTip.xaml
rename to src/Avalonia.Themes.Simple/Controls/ToolTip.xaml
diff --git a/src/Avalonia.Themes.Default/Controls/TransitioningContentControl.xaml b/src/Avalonia.Themes.Simple/Controls/TransitioningContentControl.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Controls/TransitioningContentControl.xaml
rename to src/Avalonia.Themes.Simple/Controls/TransitioningContentControl.xaml
diff --git a/src/Avalonia.Themes.Default/Controls/TreeView.xaml b/src/Avalonia.Themes.Simple/Controls/TreeView.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Controls/TreeView.xaml
rename to src/Avalonia.Themes.Simple/Controls/TreeView.xaml
diff --git a/src/Avalonia.Themes.Default/Controls/TreeViewItem.xaml b/src/Avalonia.Themes.Simple/Controls/TreeViewItem.xaml
similarity index 96%
rename from src/Avalonia.Themes.Default/Controls/TreeViewItem.xaml
rename to src/Avalonia.Themes.Simple/Controls/TreeViewItem.xaml
index 7baf0ef2a6..8b3452244c 100644
--- a/src/Avalonia.Themes.Default/Controls/TreeViewItem.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/TreeViewItem.xaml
@@ -5,7 +5,7 @@
                                         Indent="16"
                                         Left="True" />
 
-  <ControlTheme x:Key="DefaultTreeViewItemToggleButtonTheme"
+  <ControlTheme x:Key="SimpleTreeViewItemToggleButtonTheme"
                 TargetType="ToggleButton">
     <Setter Property="Template">
       <ControlTemplate>
@@ -52,7 +52,7 @@
                             Focusable="False"
                             IsChecked="{TemplateBinding IsExpanded,
                                                         Mode=TwoWay}"
-                            Theme="{StaticResource DefaultTreeViewItemToggleButtonTheme}" />
+                            Theme="{StaticResource SimpleTreeViewItemToggleButtonTheme}" />
               <ContentPresenter Name="PART_HeaderPresenter"
                                 Grid.Column="1"
                                 Padding="{TemplateBinding Padding}"
diff --git a/src/Avalonia.Themes.Default/Controls/UserControl.xaml b/src/Avalonia.Themes.Simple/Controls/UserControl.xaml
similarity index 90%
rename from src/Avalonia.Themes.Default/Controls/UserControl.xaml
rename to src/Avalonia.Themes.Simple/Controls/UserControl.xaml
index 56248f8c5f..3316b0298c 100644
--- a/src/Avalonia.Themes.Default/Controls/UserControl.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/UserControl.xaml
@@ -2,7 +2,7 @@
        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
        Selector=":is(UserControl)">
   <Style.Resources>
-    <ControlTheme x:Key="DefaultUserControl"
+    <ControlTheme x:Key="SimpleUserControl"
                   TargetType="UserControl">
       <Setter Property="Template">
         <ControlTemplate>
@@ -21,5 +21,5 @@
     </ControlTheme>
   </Style.Resources>
 
-  <Setter Property="Theme" Value="{StaticResource DefaultUserControl}" />
+  <Setter Property="Theme" Value="{StaticResource SimpleUserControl}" />
 </Style>
diff --git a/src/Avalonia.Themes.Default/Controls/Window.xaml b/src/Avalonia.Themes.Simple/Controls/Window.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Controls/Window.xaml
rename to src/Avalonia.Themes.Simple/Controls/Window.xaml
diff --git a/src/Avalonia.Themes.Default/Controls/WindowNotificationManager.xaml b/src/Avalonia.Themes.Simple/Controls/WindowNotificationManager.xaml
similarity index 100%
rename from src/Avalonia.Themes.Default/Controls/WindowNotificationManager.xaml
rename to src/Avalonia.Themes.Simple/Controls/WindowNotificationManager.xaml
diff --git a/src/Avalonia.Themes.Default/IBitmapToImageConverter.cs b/src/Avalonia.Themes.Simple/IBitmapToImageConverter.cs
similarity index 95%
rename from src/Avalonia.Themes.Default/IBitmapToImageConverter.cs
rename to src/Avalonia.Themes.Simple/IBitmapToImageConverter.cs
index 9b7fcecf45..fade026b51 100644
--- a/src/Avalonia.Themes.Default/IBitmapToImageConverter.cs
+++ b/src/Avalonia.Themes.Simple/IBitmapToImageConverter.cs
@@ -8,7 +8,7 @@ using Avalonia.Controls;
 using Avalonia.Data.Converters;
 using Avalonia.Media.Imaging;
 
-namespace Avalonia.Themes.Default
+namespace Avalonia.Themes.Simple
 {
     internal class IBitmapToImageConverter : IValueConverter
     {
diff --git a/src/Avalonia.Themes.Default/InverseBooleanValueConverter.cs b/src/Avalonia.Themes.Simple/InverseBooleanValueConverter.cs
similarity index 94%
rename from src/Avalonia.Themes.Default/InverseBooleanValueConverter.cs
rename to src/Avalonia.Themes.Simple/InverseBooleanValueConverter.cs
index 7befc81b8e..15cc5b4a80 100644
--- a/src/Avalonia.Themes.Default/InverseBooleanValueConverter.cs
+++ b/src/Avalonia.Themes.Simple/InverseBooleanValueConverter.cs
@@ -2,7 +2,7 @@ using System;
 using System.Globalization;
 using Avalonia.Data.Converters;
 
-namespace Avalonia.Themes.Default
+namespace Avalonia.Themes.Simple
 {
     class InverseBooleanValueConverter : IValueConverter
     {
diff --git a/src/Avalonia.Themes.Simple/Properties/AssemblyInfo.cs b/src/Avalonia.Themes.Simple/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..f00510816a
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Properties/AssemblyInfo.cs
@@ -0,0 +1,3 @@
+using Avalonia.Metadata;
+
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Themes.Simple")]
diff --git a/src/Avalonia.Themes.Default/SimpleTheme.cs b/src/Avalonia.Themes.Simple/SimpleTheme.cs
similarity index 89%
rename from src/Avalonia.Themes.Default/SimpleTheme.cs
rename to src/Avalonia.Themes.Simple/SimpleTheme.cs
index 98e35355c8..f225cb4c4d 100644
--- a/src/Avalonia.Themes.Default/SimpleTheme.cs
+++ b/src/Avalonia.Themes.Simple/SimpleTheme.cs
@@ -6,7 +6,7 @@ using Avalonia.Markup.Xaml.Styling;
 using Avalonia.Styling;
 #nullable enable
 
-namespace Avalonia.Themes.Default
+namespace Avalonia.Themes.Simple
 {
     public class SimpleTheme : AvaloniaObject, IStyle, IResourceProvider
     {
@@ -23,9 +23,9 @@ namespace Avalonia.Themes.Default
         /// 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)
+        public SimpleTheme(Uri? baseUri = null)
         {
-            _baseUri = baseUri;
+            _baseUri = baseUri ?? new Uri("avares://Avalonia.Themes.Simple/");
             InitStyles(_baseUri);
         }
 
@@ -138,18 +138,18 @@ namespace Avalonia.Themes.Default
             {
                 new StyleInclude(baseUri)
                 {
-                    Source = new Uri("avares://Avalonia.Themes.Default/DefaultTheme.xaml")
+                    Source = new Uri("avares://Avalonia.Themes.Simple/Controls/SimpleControls.xaml")
                 },
                 new StyleInclude(baseUri)
                 {
-                    Source = new Uri("avares://Avalonia.Themes.Default/Accents/Base.xaml")
+                    Source = new Uri("avares://Avalonia.Themes.Simple/Accents/Base.xaml")
                 }
             };
             _simpleLight = new Styles
             {
                 new StyleInclude(baseUri)
                 {
-                    Source = new Uri("avares://Avalonia.Themes.Default/Accents/BaseLight.xaml")
+                    Source = new Uri("avares://Avalonia.Themes.Simple/Accents/BaseLight.xaml")
                 }
             };
 
@@ -157,7 +157,7 @@ namespace Avalonia.Themes.Default
             {
                 new StyleInclude(baseUri)
                 {
-                    Source = new Uri("avares://Avalonia.Themes.Default/Accents/BaseDark.xaml")
+                    Source = new Uri("avares://Avalonia.Themes.Simple/Accents/BaseDark.xaml")
                 }
             };
         }
diff --git a/src/Avalonia.Themes.Default/SimpleThemeMode.cs b/src/Avalonia.Themes.Simple/SimpleThemeMode.cs
similarity index 67%
rename from src/Avalonia.Themes.Default/SimpleThemeMode.cs
rename to src/Avalonia.Themes.Simple/SimpleThemeMode.cs
index be33466327..683c751f10 100644
--- a/src/Avalonia.Themes.Default/SimpleThemeMode.cs
+++ b/src/Avalonia.Themes.Simple/SimpleThemeMode.cs
@@ -1,4 +1,4 @@
-namespace Avalonia.Themes.Default
+namespace Avalonia.Themes.Simple
 {
     public enum SimpleThemeMode
     {
diff --git a/src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj b/src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj
index 1cf68c1605..f509bb21ba 100644
--- a/src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj
+++ b/src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj
@@ -10,7 +10,7 @@
     <ProjectReference Include="..\..\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\..\Avalonia.Controls\Avalonia.Controls.csproj" />
     <ProjectReference Include="..\..\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
+    <ProjectReference Include="..\..\Avalonia.Themes.Simple\Avalonia.Themes.Simple.csproj" />
   </ItemGroup>
   <Import Project="..\..\..\src\Markup\Avalonia.Markup.Xaml.Loader\IncludeXamlIlSre.props" />
   <ItemGroup>
diff --git a/tests/Avalonia.Base.UnitTests/Utilities/UriExtensionsTests.cs b/tests/Avalonia.Base.UnitTests/Utilities/UriExtensionsTests.cs
index 5c3ac6adeb..4a879c8ced 100644
--- a/tests/Avalonia.Base.UnitTests/Utilities/UriExtensionsTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Utilities/UriExtensionsTests.cs
@@ -10,9 +10,9 @@ public class UriExtensionsTests
     public void Assembly_Name_From_Query_Parsed()
     {
         const string key = "assembly";
-        const string value = "Avalonia.Themes.Default";
+        const string value = "Avalonia.Themes.Simple";
 
-        var uri = new Uri($"resm:Avalonia.Themes.Default.Accents.BaseLight.xaml?{key}={value}");
+        var uri = new Uri($"resm:Avalonia.Themes.Simple.Accents.BaseLight.xaml?{key}={value}");
         var name = uri.GetAssemblyNameFromQuery();
 
         Assert.Equal(value, name);
@@ -21,7 +21,7 @@ public class UriExtensionsTests
     [Fact]
     public void Assembly_Name_From_Empty_Query_Not_Parsed()
     {
-        var uri = new Uri("resm:Avalonia.Themes.Default.Accents.BaseLight.xaml");
+        var uri = new Uri("resm:Avalonia.Themes.Simple.Accents.BaseLight.xaml");
         var name = uri.GetAssemblyNameFromQuery();
 
         Assert.Equal(string.Empty, name);
diff --git a/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj b/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj
index 5d17808e0c..3f4978f544 100644
--- a/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj
+++ b/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj
@@ -9,7 +9,7 @@
     <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Themes.Fluent\Avalonia.Themes.Fluent.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Themes.Simple\Avalonia.Themes.Simple.csproj" />
     <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
   </ItemGroup>
   <ItemGroup>
diff --git a/tests/Avalonia.Benchmarks/Themes/ThemeBenchmark.cs b/tests/Avalonia.Benchmarks/Themes/ThemeBenchmark.cs
index 9a5b49790d..c64931a6ef 100644
--- a/tests/Avalonia.Benchmarks/Themes/ThemeBenchmark.cs
+++ b/tests/Avalonia.Benchmarks/Themes/ThemeBenchmark.cs
@@ -37,8 +37,8 @@ namespace Avalonia.Benchmarks.Themes
         }
 
         [Benchmark]
-        [Arguments("avares://Avalonia.Themes.Default/Accents/BaseLight.xaml")]
-        [Arguments("avares://Avalonia.Themes.Default/Accents/BaseDark.xaml")]
+        [Arguments("avares://Avalonia.Themes.Simple/Accents/BaseLight.xaml")]
+        [Arguments("avares://Avalonia.Themes.Simple/Accents/BaseDark.xaml")]
         public bool InitDefaultTheme(string themeUri)
         {
             UnitTestApplication.Current.Styles[0] = new Styles
@@ -49,7 +49,7 @@ namespace Avalonia.Benchmarks.Themes
                 },
                 new StyleInclude(new Uri("resm:Styles?assembly=Avalonia.Benchmarks"))
                 {
-                    Source = new Uri("avares://Avalonia.Themes.Default/DefaultTheme.xaml")
+                    Source = new Uri("avares://Avalonia.Themes.Simple/DefaultTheme.xaml")
                 }
             };
             return ((IResourceHost)UnitTestApplication.Current).TryGetResource("ThemeAccentColor", out _);
diff --git a/tests/Avalonia.DesignerSupport.TestApp/App.xaml b/tests/Avalonia.DesignerSupport.TestApp/App.xaml
index 5a33ffff80..803cae09c8 100644
--- a/tests/Avalonia.DesignerSupport.TestApp/App.xaml
+++ b/tests/Avalonia.DesignerSupport.TestApp/App.xaml
@@ -3,8 +3,8 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Application.Styles>
-        <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" />
+        <StyleInclude Source="avares://Avalonia.Themes.Simple/DefaultTheme.xaml" />
+        <StyleInclude Source="avares://Avalonia.Themes.Simple/Accents/Base.xaml" />
+        <StyleInclude Source="avares://Avalonia.Themes.Simple/Accents/BaseLight.xaml" />
     </Application.Styles>
 </Application>
diff --git a/tests/Avalonia.DesignerSupport.TestApp/Avalonia.DesignerSupport.TestApp.csproj b/tests/Avalonia.DesignerSupport.TestApp/Avalonia.DesignerSupport.TestApp.csproj
index f66b2b0457..278b0e087e 100644
--- a/tests/Avalonia.DesignerSupport.TestApp/Avalonia.DesignerSupport.TestApp.csproj
+++ b/tests/Avalonia.DesignerSupport.TestApp/Avalonia.DesignerSupport.TestApp.csproj
@@ -21,7 +21,7 @@
     <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Themes.Simple\Avalonia.Themes.Simple.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Desktop\Avalonia.Desktop.csproj" />
   </ItemGroup>
   <Import Project="..\..\build\BuildTargets.targets" />
diff --git a/tests/Avalonia.Direct2D1.RenderTests/Avalonia.Direct2D1.RenderTests.csproj b/tests/Avalonia.Direct2D1.RenderTests/Avalonia.Direct2D1.RenderTests.csproj
index 52acc78db1..4a90da77e7 100644
--- a/tests/Avalonia.Direct2D1.RenderTests/Avalonia.Direct2D1.RenderTests.csproj
+++ b/tests/Avalonia.Direct2D1.RenderTests/Avalonia.Direct2D1.RenderTests.csproj
@@ -13,7 +13,7 @@
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Themes.Simple\Avalonia.Themes.Simple.csproj" />
     <ProjectReference Include="..\..\src\Windows\Avalonia.Direct2D1\Avalonia.Direct2D1.csproj" />
   </ItemGroup>
   <Import Project="..\..\build\Moq.props" />
diff --git a/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj b/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj
index a00b24bdd7..4572f7ae7c 100644
--- a/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj
+++ b/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj
@@ -15,7 +15,7 @@
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Themes.Simple\Avalonia.Themes.Simple.csproj" />
     <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
     <Compile Remove="testproject/**/*.cs" />
   </ItemGroup>
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj b/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj
index a0efa7bdeb..f562529cb8 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj
@@ -18,7 +18,7 @@
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Themes.Simple\Avalonia.Themes.Simple.csproj" />
     <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
   </ItemGroup>
   <ItemGroup>
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
index 29148e6f2e..af2435a52f 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
@@ -466,7 +466,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
                 var xaml = @"
 <Styles xmlns='https://github.com/avaloniaui'
         xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
-    <StyleInclude Source='avares://Avalonia.Themes.Default/Controls/UserControl.xaml'/>
+    <StyleInclude Source='avares://Avalonia.Themes.Simple/Controls/UserControl.xaml'/>
 </Styles>";
 
                 var styles = AvaloniaRuntimeXamlLoader.Parse<Styles>(xaml);
diff --git a/tests/Avalonia.Skia.RenderTests/Avalonia.Skia.RenderTests.csproj b/tests/Avalonia.Skia.RenderTests/Avalonia.Skia.RenderTests.csproj
index d3f2b44968..5e481f21c1 100644
--- a/tests/Avalonia.Skia.RenderTests/Avalonia.Skia.RenderTests.csproj
+++ b/tests/Avalonia.Skia.RenderTests/Avalonia.Skia.RenderTests.csproj
@@ -14,7 +14,7 @@
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Themes.Simple\Avalonia.Themes.Simple.csproj" />
     <ProjectReference Include="..\..\src\Skia\Avalonia.Skia\Avalonia.Skia.csproj" />
   </ItemGroup>
   <Import Project="..\..\build\Moq.props" />
diff --git a/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj b/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj
index 52ef23c966..cb6884cad8 100644
--- a/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj
+++ b/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj
@@ -18,7 +18,7 @@
     <ProjectReference Include="..\..\src\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Themes.Simple\Avalonia.Themes.Simple.csproj" />
   </ItemGroup>
   <Import Project="..\..\build\Moq.props" />
   <Import Project="..\..\build\Rx.props" />
diff --git a/tests/Avalonia.UnitTests/TestServices.cs b/tests/Avalonia.UnitTests/TestServices.cs
index c1be745aca..6a211d238e 100644
--- a/tests/Avalonia.UnitTests/TestServices.cs
+++ b/tests/Avalonia.UnitTests/TestServices.cs
@@ -6,7 +6,7 @@ using Avalonia.Markup.Xaml;
 using Avalonia.Media;
 using Avalonia.Platform;
 using Avalonia.Styling;
-using Avalonia.Themes.Default;
+using Avalonia.Themes.Simple;
 using Avalonia.Rendering;
 using System.Reactive.Concurrency;
 using System.Collections.Generic;
@@ -81,7 +81,7 @@ namespace Avalonia.UnitTests
             IScheduler scheduler = null,
             ICursorFactory standardCursorFactory = null,
             IStyler styler = null,
-            Func<Styles> theme = null,
+            Func<IStyle> theme = null,
             IPlatformThreadingInterface threadingInterface = null,
             IFontManagerImpl fontManagerImpl = null,
             ITextShaperImpl textShaperImpl = null,
@@ -122,7 +122,7 @@ namespace Avalonia.UnitTests
         public IScheduler Scheduler { get; }
         public ICursorFactory StandardCursorFactory { get; }
         public IStyler Styler { get; }
-        public Func<Styles> Theme { get; }
+        public Func<IStyle> Theme { get; }
         public IPlatformThreadingInterface ThreadingInterface { get; }
         public IWindowImpl WindowImpl { get; }
         public IWindowingPlatform WindowingPlatform { get; }
@@ -169,18 +169,9 @@ namespace Avalonia.UnitTests
                 windowImpl: windowImpl ?? WindowImpl);
         }
 
-        private static Styles CreateDefaultTheme()
+        private static IStyle CreateDefaultTheme()
         {
-            var result = new Styles
-            {
-                new DefaultTheme(),
-            };
-
-            var baseLight = (IStyle)AvaloniaXamlLoader.Load(
-                new Uri("avares://Avalonia.Themes.Default/Accents/BaseLight.xaml"));
-            result.Add(baseLight);
-
-            return result;
+            return new SimpleTheme { Mode = SimpleThemeMode.Light };
         }
 
         private static IPlatformRenderInterface CreateRenderInterfaceMock()
diff --git a/tests/Avalonia.UnitTests/UnitTestApplication.cs b/tests/Avalonia.UnitTests/UnitTestApplication.cs
index 63c2832b92..260771c9ab 100644
--- a/tests/Avalonia.UnitTests/UnitTestApplication.cs
+++ b/tests/Avalonia.UnitTests/UnitTestApplication.cs
@@ -71,12 +71,16 @@ namespace Avalonia.UnitTests
                 .Bind<IStyler>().ToConstant(Services.Styler)
                 .Bind<IWindowingPlatform>().ToConstant(Services.WindowingPlatform)
                 .Bind<PlatformHotkeyConfiguration>().ToSingleton<PlatformHotkeyConfiguration>();
-            var styles = Services.Theme?.Invoke();
+            var theme = Services.Theme?.Invoke();
 
-            if (styles != null)
+            if (theme is Styles styles)
             {
                 Styles.AddRange(styles);
             }
+            else if (theme is not null)
+            {
+                Styles.Add(theme);
+            }
         }
     }
 }

From 5ee439b5e400db88f1a620ebc60bc9222e96552e Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Tue, 2 Aug 2022 20:56:45 -0400
Subject: [PATCH 213/240] Rename remainings

---
 samples/ControlCatalog/App.xaml.cs            | 24 +++++++++----------
 samples/ControlCatalog/MainView.xaml          |  4 ++--
 samples/ControlCatalog/MainView.xaml.cs       | 20 ++++++++--------
 samples/ControlCatalog/Models/CatalogTheme.cs | 10 +++-----
 .../{Default => Simple}/ColorPreviewer.xaml   |  0
 .../{Default => Simple}/ColorSlider.xaml      |  0
 .../{Default => Simple}/ColorSpectrum.xaml    |  0
 .../Default.xaml => Simple/Simple.xaml}       |  6 ++---
 .../Themes/{Default.xaml => Simple.xaml}      |  4 ++--
 .../Diagnostics/Views/MainWindow.xaml         |  5 ++--
 10 files changed, 34 insertions(+), 39 deletions(-)
 rename src/Avalonia.Controls.ColorPicker/Themes/{Default => Simple}/ColorPreviewer.xaml (100%)
 rename src/Avalonia.Controls.ColorPicker/Themes/{Default => Simple}/ColorSlider.xaml (100%)
 rename src/Avalonia.Controls.ColorPicker/Themes/{Default => Simple}/ColorSpectrum.xaml (100%)
 rename src/Avalonia.Controls.ColorPicker/Themes/{Default/Default.xaml => Simple/Simple.xaml} (94%)
 rename src/Avalonia.Controls.DataGrid/Themes/{Default.xaml => Simple.xaml} (99%)

diff --git a/samples/ControlCatalog/App.xaml.cs b/samples/ControlCatalog/App.xaml.cs
index eb8ecc3af0..e936359fe4 100644
--- a/samples/ControlCatalog/App.xaml.cs
+++ b/samples/ControlCatalog/App.xaml.cs
@@ -23,9 +23,9 @@ namespace ControlCatalog
             Source = new Uri("avares://Avalonia.Controls.ColorPicker/Themes/Fluent/Fluent.xaml")
         };
 
-        public static readonly StyleInclude ColorPickerDefault = new StyleInclude(new Uri("avares://ControlCatalog/Styles"))
+        public static readonly StyleInclude ColorPickerSimple = new StyleInclude(new Uri("avares://ControlCatalog/Styles"))
         {
-            Source = new Uri("avares://Avalonia.Controls.ColorPicker/Themes/Default/Default.xaml")
+            Source = new Uri("avares://Avalonia.Controls.ColorPicker/Themes/Simple/Simple.xaml")
         };
 
         public static readonly StyleInclude DataGridFluent = new StyleInclude(new Uri("avares://ControlCatalog/Styles"))
@@ -33,16 +33,16 @@ namespace ControlCatalog
             Source = new Uri("avares://Avalonia.Controls.DataGrid/Themes/Fluent.xaml")
         };
 
-        public static readonly StyleInclude DataGridDefault = new StyleInclude(new Uri("avares://ControlCatalog/Styles"))
+        public static readonly StyleInclude DataGridSimple = new StyleInclude(new Uri("avares://ControlCatalog/Styles"))
         {
-            Source = new Uri("avares://Avalonia.Controls.DataGrid/Themes/Default.xaml")
+            Source = new Uri("avares://Avalonia.Controls.DataGrid/Themes/Simple.xaml")
         };
 
         public static FluentTheme Fluent = new FluentTheme(new Uri("avares://ControlCatalog/Styles"));
 
-        public static SimpleTheme Default = new SimpleTheme(new Uri("avares://ControlCatalog/Styles"));
+        public static SimpleTheme Simple = new SimpleTheme(new Uri("avares://ControlCatalog/Styles"));
 
-        public static Styles DefaultLight = new Styles
+        public static Styles SimpleLight = new Styles
         {
             new StyleInclude(new Uri("resm:Styles?assembly=ControlCatalog"))
             {
@@ -56,10 +56,10 @@ namespace ControlCatalog
             {
                 Source = new Uri("avares://Avalonia.Themes.Fluent/Accents/BaseLight.xaml")
             },
-            Default
+            Simple
         };
 
-        public static Styles DefaultDark = new Styles
+        public static Styles SimpleDark = new Styles
         {
             new StyleInclude(new Uri("resm:Styles?assembly=ControlCatalog"))
             {
@@ -73,14 +73,14 @@ namespace ControlCatalog
             {
                 Source = new Uri("avares://Avalonia.Themes.Fluent/Accents/BaseDark.xaml")
             },
-            Default
+            Simple
         };
 
         public override void Initialize()
         {
-            Styles.Insert(0, Fluent);
-            Styles.Insert(1, ColorPickerFluent);
-            Styles.Insert(2, DataGridFluent);
+            Styles.Insert(0, Simple);
+            Styles.Insert(1, ColorPickerSimple);
+            Styles.Insert(2, DataGridSimple);
             AvaloniaXamlLoader.Load(this);
         }
 
diff --git a/samples/ControlCatalog/MainView.xaml b/samples/ControlCatalog/MainView.xaml
index 7461e78c33..7f5a191519 100644
--- a/samples/ControlCatalog/MainView.xaml
+++ b/samples/ControlCatalog/MainView.xaml
@@ -187,8 +187,8 @@
               <ComboBox.Items>
                 <models:CatalogTheme>FluentLight</models:CatalogTheme>
                 <models:CatalogTheme>FluentDark</models:CatalogTheme>
-                <models:CatalogTheme>DefaultLight</models:CatalogTheme>
-                <models:CatalogTheme>DefaultDark</models:CatalogTheme>
+                <models:CatalogTheme>SimpleLight</models:CatalogTheme>
+                <models:CatalogTheme>SimpleDark</models:CatalogTheme>
               </ComboBox.Items>
             </ComboBox>
             <ComboBox x:Name="TransparencyLevels"
diff --git a/samples/ControlCatalog/MainView.xaml.cs b/samples/ControlCatalog/MainView.xaml.cs
index d8d58edaf6..58433f13ce 100644
--- a/samples/ControlCatalog/MainView.xaml.cs
+++ b/samples/ControlCatalog/MainView.xaml.cs
@@ -58,19 +58,19 @@ namespace ControlCatalog
                         Application.Current.Styles[1] = App.ColorPickerFluent;
                         Application.Current.Styles[2] = App.DataGridFluent;
                     }
-                    else if (theme == CatalogTheme.DefaultLight)
+                    else if (theme == CatalogTheme.SimpleLight)
                     {
-                        App.Default.Mode = Avalonia.Themes.Simple.SimpleThemeMode.Light;
-                        Application.Current.Styles[0] = App.DefaultLight;
-                        Application.Current.Styles[1] = App.ColorPickerDefault;
-                        Application.Current.Styles[2] = App.DataGridDefault;
+                        App.Simple.Mode = Avalonia.Themes.Simple.SimpleThemeMode.Light;
+                        Application.Current.Styles[0] = App.SimpleLight;
+                        Application.Current.Styles[1] = App.ColorPickerSimple;
+                        Application.Current.Styles[2] = App.DataGridSimple;
                     }
-                    else if (theme == CatalogTheme.DefaultDark)
+                    else if (theme == CatalogTheme.SimpleDark)
                     {
-                        App.Default.Mode = Avalonia.Themes.Simple.SimpleThemeMode.Dark;
-                        Application.Current.Styles[0] = App.DefaultDark;
-                        Application.Current.Styles[1] = App.ColorPickerDefault;
-                        Application.Current.Styles[2] = App.DataGridDefault;
+                        App.Simple.Mode = Avalonia.Themes.Simple.SimpleThemeMode.Dark;
+                        Application.Current.Styles[0] = App.SimpleDark;
+                        Application.Current.Styles[1] = App.ColorPickerSimple;
+                        Application.Current.Styles[2] = App.DataGridSimple;
                     }
                 }
             };
diff --git a/samples/ControlCatalog/Models/CatalogTheme.cs b/samples/ControlCatalog/Models/CatalogTheme.cs
index f7be8e0014..37224ed26e 100644
--- a/samples/ControlCatalog/Models/CatalogTheme.cs
+++ b/samples/ControlCatalog/Models/CatalogTheme.cs
@@ -1,14 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace ControlCatalog.Models
+namespace ControlCatalog.Models
 {
     public enum CatalogTheme
     {
         FluentLight,
         FluentDark,
-        DefaultLight,
-        DefaultDark
+        SimpleLight,
+        SimpleDark
     }
 }
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Default/ColorPreviewer.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorPreviewer.xaml
similarity index 100%
rename from src/Avalonia.Controls.ColorPicker/Themes/Default/ColorPreviewer.xaml
rename to src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorPreviewer.xaml
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Default/ColorSlider.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorSlider.xaml
similarity index 100%
rename from src/Avalonia.Controls.ColorPicker/Themes/Default/ColorSlider.xaml
rename to src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorSlider.xaml
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Default/ColorSpectrum.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorSpectrum.xaml
similarity index 100%
rename from src/Avalonia.Controls.ColorPicker/Themes/Default/ColorSpectrum.xaml
rename to src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorSpectrum.xaml
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Default/Default.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Simple/Simple.xaml
similarity index 94%
rename from src/Avalonia.Controls.ColorPicker/Themes/Default/Default.xaml
rename to src/Avalonia.Controls.ColorPicker/Themes/Simple/Simple.xaml
index b452e34394..697a94421d 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Default/Default.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Simple/Simple.xaml
@@ -36,9 +36,9 @@
       <ResourceDictionary.MergedDictionaries>
 
         <!-- Primitives -->
-        <ResourceInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Default/ColorPreviewer.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Default/ColorSlider.xaml" />
-        <ResourceInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Default/ColorSpectrum.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Simple/ColorPreviewer.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Simple/ColorSlider.xaml" />
+        <ResourceInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Simple/ColorSpectrum.xaml" />
 
         <!-- Controls -->
         <!-- Note the ColorPicker and ColorView are unsupported in the default theme -->
diff --git a/src/Avalonia.Controls.DataGrid/Themes/Default.xaml b/src/Avalonia.Controls.DataGrid/Themes/Simple.xaml
similarity index 99%
rename from src/Avalonia.Controls.DataGrid/Themes/Default.xaml
rename to src/Avalonia.Controls.DataGrid/Themes/Simple.xaml
index 83d9332613..6a748f399e 100644
--- a/src/Avalonia.Controls.DataGrid/Themes/Default.xaml
+++ b/src/Avalonia.Controls.DataGrid/Themes/Simple.xaml
@@ -223,7 +223,7 @@
       </Style>
     </ControlTheme>
 
-    <ControlTheme x:Key="DefaultDataGridRowGroupExpanderButtonTheme"
+    <ControlTheme x:Key="SimpleDataGridRowGroupExpanderButtonTheme"
                   TargetType="ToggleButton">
       <Setter Property="Template">
         <ControlTemplate>
@@ -270,7 +270,7 @@
                           BorderThickness="{TemplateBinding BorderThickness}"
                           CornerRadius="{TemplateBinding CornerRadius}"
                           Foreground="{TemplateBinding Foreground}"
-                          Theme="{StaticResource DefaultDataGridRowGroupExpanderButtonTheme}" />
+                          Theme="{StaticResource SimpleDataGridRowGroupExpanderButtonTheme}" />
 
             <StackPanel Grid.Row="1"
                         Grid.Column="3"
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml
index 63073952ac..1270dbaa62 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml
@@ -2,7 +2,6 @@
         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.Simple"
         Title="Avalonia DevTools"
         x:Class="Avalonia.Diagnostics.Views.MainWindow"
         Theme="{StaticResource {x:Type Window}}">
@@ -11,8 +10,8 @@
   </Window.DataTemplates>
   
   <Window.Styles>
-    <default:SimpleTheme Mode="Light"/>
-    <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Default.xaml"/>
+    <SimpleTheme Mode="Light"/>
+    <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Simple.xaml"/>
     <StyleInclude Source="avares://Avalonia.Diagnostics/Diagnostics/Controls/ThicknessEditor.axaml" />
     <StyleInclude Source="avares://Avalonia.Diagnostics/Diagnostics/Controls/FilterTextBox.axaml" />
   </Window.Styles>

From fcdb22983b873969f6aaff84c62a4959356b9bb1 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Tue, 2 Aug 2022 21:03:17 -0400
Subject: [PATCH 214/240] Revert debug changes

---
 samples/ControlCatalog/App.xaml.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/samples/ControlCatalog/App.xaml.cs b/samples/ControlCatalog/App.xaml.cs
index e936359fe4..750c1082a6 100644
--- a/samples/ControlCatalog/App.xaml.cs
+++ b/samples/ControlCatalog/App.xaml.cs
@@ -78,9 +78,9 @@ namespace ControlCatalog
 
         public override void Initialize()
         {
-            Styles.Insert(0, Simple);
-            Styles.Insert(1, ColorPickerSimple);
-            Styles.Insert(2, DataGridSimple);
+            Styles.Insert(0, Fluent);
+            Styles.Insert(1, ColorPickerFluent);
+            Styles.Insert(2, DataGridFluent);
             AvaloniaXamlLoader.Load(this);
         }
 

From a9910501ec5e67e06309847bfaf321bcf62fea93 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Tue, 2 Aug 2022 21:32:04 -0400
Subject: [PATCH 215/240] Fix tests

---
 samples/VirtualizationDemo/App.xaml           | 16 +++++-----
 .../Themes/ThemeBenchmark.cs                  | 29 ++++++++-----------
 .../Avalonia.DesignerSupport.TestApp/App.xaml | 15 ++++------
 3 files changed, 25 insertions(+), 35 deletions(-)

diff --git a/samples/VirtualizationDemo/App.xaml b/samples/VirtualizationDemo/App.xaml
index 0b64d0c09b..eb5f0e4dca 100644
--- a/samples/VirtualizationDemo/App.xaml
+++ b/samples/VirtualizationDemo/App.xaml
@@ -1,9 +1,7 @@
-<Application
-    xmlns="https://github.com/avaloniaui" 
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    x:Class="VirtualizationDemo.App">
-    <Application.Styles>
-        <StyleInclude Source="avares://Avalonia.Themes.Simple/DefaultTheme.xaml"/>
-        <StyleInclude Source="avares://Avalonia.Themes.Simple/Accents/BaseLight.xaml"/>
-    </Application.Styles>
-</Application>
\ No newline at end of file
+<Application xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="VirtualizationDemo.App">
+  <Application.Styles>
+    <SimpleTheme />
+  </Application.Styles>
+</Application>
diff --git a/tests/Avalonia.Benchmarks/Themes/ThemeBenchmark.cs b/tests/Avalonia.Benchmarks/Themes/ThemeBenchmark.cs
index c64931a6ef..aed8a38d08 100644
--- a/tests/Avalonia.Benchmarks/Themes/ThemeBenchmark.cs
+++ b/tests/Avalonia.Benchmarks/Themes/ThemeBenchmark.cs
@@ -4,6 +4,8 @@ using Avalonia.Controls;
 using Avalonia.Markup.Xaml.Styling;
 using Avalonia.Platform;
 using Avalonia.Styling;
+using Avalonia.Themes.Fluent;
+using Avalonia.Themes.Simple;
 using Avalonia.UnitTests;
 
 using BenchmarkDotNet.Attributes;
@@ -25,32 +27,25 @@ namespace Avalonia.Benchmarks.Themes
         }
 
         [Benchmark]
-        [Arguments("avares://Avalonia.Themes.Fluent/FluentDark.xaml")]
-        [Arguments("avares://Avalonia.Themes.Fluent/FluentLight.xaml")]
-        public bool InitFluentTheme(string themeUri)
+        [Arguments(FluentThemeMode.Dark)]
+        [Arguments(FluentThemeMode.Light)]
+        public bool InitFluentTheme(FluentThemeMode mode)
         {
-            UnitTestApplication.Current.Styles[0] = new StyleInclude(new Uri("resm:Styles?assembly=Avalonia.Benchmarks"))
+            UnitTestApplication.Current.Styles[0] = new FluentTheme(new Uri("resm:Styles?assembly=Avalonia.Benchmarks"))
             {
-                Source = new Uri(themeUri)
+                Mode = mode
             };
             return ((IResourceHost)UnitTestApplication.Current).TryGetResource("SystemAccentColor", out _);
         }
 
         [Benchmark]
-        [Arguments("avares://Avalonia.Themes.Simple/Accents/BaseLight.xaml")]
-        [Arguments("avares://Avalonia.Themes.Simple/Accents/BaseDark.xaml")]
-        public bool InitDefaultTheme(string themeUri)
+        [Arguments(SimpleThemeMode.Dark)]
+        [Arguments(SimpleThemeMode.Light)]
+        public bool InitDefaultTheme(SimpleThemeMode mode)
         {
-            UnitTestApplication.Current.Styles[0] = new Styles
+            UnitTestApplication.Current.Styles[0] = new SimpleTheme(new Uri("resm:Styles?assembly=Avalonia.Benchmarks"))
             {
-                new StyleInclude(new Uri("resm:Styles?assembly=Avalonia.Benchmarks"))
-                {
-                    Source = new Uri(themeUri)
-                },
-                new StyleInclude(new Uri("resm:Styles?assembly=Avalonia.Benchmarks"))
-                {
-                    Source = new Uri("avares://Avalonia.Themes.Simple/DefaultTheme.xaml")
-                }
+                Mode = mode
             };
             return ((IResourceHost)UnitTestApplication.Current).TryGetResource("ThemeAccentColor", out _);
         }
diff --git a/tests/Avalonia.DesignerSupport.TestApp/App.xaml b/tests/Avalonia.DesignerSupport.TestApp/App.xaml
index 803cae09c8..ad32431b37 100644
--- a/tests/Avalonia.DesignerSupport.TestApp/App.xaml
+++ b/tests/Avalonia.DesignerSupport.TestApp/App.xaml
@@ -1,10 +1,7 @@
-<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="avares://Avalonia.Themes.Simple/DefaultTheme.xaml" />
-        <StyleInclude Source="avares://Avalonia.Themes.Simple/Accents/Base.xaml" />
-        <StyleInclude Source="avares://Avalonia.Themes.Simple/Accents/BaseLight.xaml" />
-    </Application.Styles>
+<Application x:Class="Avalonia.DesignerSupport.TestApp.App"
+             xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Application.Styles>
+    <SimpleTheme />
+  </Application.Styles>
 </Application>

From e94eb0cbfd6bc32e588413c132fc7f54e641089c Mon Sep 17 00:00:00 2001
From: robloo <robloo@users.noreply.github.com>
Date: Tue, 2 Aug 2022 23:49:17 -0400
Subject: [PATCH 216/240] More simple theme renaming

---
 src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs        | 4 ++--
 src/Avalonia.Controls.ColorPicker/Themes/Simple/Simple.xaml | 2 +-
 src/Avalonia.ReactiveUI/TransitioningContentControl.cs      | 2 +-
 tests/Avalonia.Benchmarks/Themes/ThemeBenchmark.cs          | 2 +-
 tests/Avalonia.LeakTests/ControlTests.cs                    | 2 +-
 tests/Avalonia.UnitTests/TestServices.cs                    | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs b/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs
index 39a83c00c4..4b41ecf328 100644
--- a/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs
+++ b/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs
@@ -326,8 +326,8 @@ namespace Avalonia.Build.Tasks
                                         var op = i[c].Operand as MethodReference;
                                         
                                         // TODO: Throw an error
-                                        // This usually happens when same XAML resource was added twice for some weird reason
-                                        // We currently support it for dual-named default theme resource
+                                        // This usually happens when the same XAML resource was added twice for some weird reason
+                                        // We currently support it for dual-named simple theme resources
                                         if (op != null
                                             && op.Name == TrampolineName)
                                         {
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Simple/Simple.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Simple/Simple.xaml
index 697a94421d..1e507a91fe 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Simple/Simple.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Simple/Simple.xaml
@@ -41,7 +41,7 @@
         <ResourceInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Simple/ColorSpectrum.xaml" />
 
         <!-- Controls -->
-        <!-- Note the ColorPicker and ColorView are unsupported in the default theme -->
+        <!-- Note the ColorPicker and ColorView are currently unsupported in the simple theme -->
         <!-- These controls depend on fluent styles for TabControl, Button, TextBox, etc. -->
 
       </ResourceDictionary.MergedDictionaries>
diff --git a/src/Avalonia.ReactiveUI/TransitioningContentControl.cs b/src/Avalonia.ReactiveUI/TransitioningContentControl.cs
index d26e90b2da..2bbf87590e 100644
--- a/src/Avalonia.ReactiveUI/TransitioningContentControl.cs
+++ b/src/Avalonia.ReactiveUI/TransitioningContentControl.cs
@@ -57,7 +57,7 @@ namespace Avalonia.ReactiveUI
         
         /// <summary>
         /// TransitioningContentControl uses the default ContentControl 
-        /// template from Avalonia default theme.
+        /// template from Avalonia simple theme.
         /// </summary>
         Type IStyleable.StyleKey => typeof(ContentControl);
 
diff --git a/tests/Avalonia.Benchmarks/Themes/ThemeBenchmark.cs b/tests/Avalonia.Benchmarks/Themes/ThemeBenchmark.cs
index aed8a38d08..86ba4c6005 100644
--- a/tests/Avalonia.Benchmarks/Themes/ThemeBenchmark.cs
+++ b/tests/Avalonia.Benchmarks/Themes/ThemeBenchmark.cs
@@ -41,7 +41,7 @@ namespace Avalonia.Benchmarks.Themes
         [Benchmark]
         [Arguments(SimpleThemeMode.Dark)]
         [Arguments(SimpleThemeMode.Light)]
-        public bool InitDefaultTheme(SimpleThemeMode mode)
+        public bool InitSimpleTheme(SimpleThemeMode mode)
         {
             UnitTestApplication.Current.Styles[0] = new SimpleTheme(new Uri("resm:Styles?assembly=Avalonia.Benchmarks"))
             {
diff --git a/tests/Avalonia.LeakTests/ControlTests.cs b/tests/Avalonia.LeakTests/ControlTests.cs
index a7474dc92e..2a77bd55fc 100644
--- a/tests/Avalonia.LeakTests/ControlTests.cs
+++ b/tests/Avalonia.LeakTests/ControlTests.cs
@@ -313,7 +313,7 @@ namespace Avalonia.LeakTests
                 var border = textBox.GetTemplateChildren().FirstOrDefault(x => x.Name == "border");
 
                 // The TextBox should have subscriptions to its Classes collection from the
-                // default theme.
+                // simple theme.
                 Assert.NotEqual(0, textBox.Classes.ListenerCount);
 
                 // Clear the content and ensure the TextBox is removed.
diff --git a/tests/Avalonia.UnitTests/TestServices.cs b/tests/Avalonia.UnitTests/TestServices.cs
index 6a211d238e..49da2794c1 100644
--- a/tests/Avalonia.UnitTests/TestServices.cs
+++ b/tests/Avalonia.UnitTests/TestServices.cs
@@ -24,7 +24,7 @@ namespace Avalonia.UnitTests
             renderInterface: new MockPlatformRenderInterface(),
             standardCursorFactory: Mock.Of<ICursorFactory>(),
             styler: new Styler(),
-            theme: () => CreateDefaultTheme(),
+            theme: () => CreateSimpleTheme(),
             threadingInterface: Mock.Of<IPlatformThreadingInterface>(x => x.CurrentThreadIsLoopThread == true),
             fontManagerImpl: new MockFontManagerImpl(),
             textShaperImpl: new MockTextShaperImpl(),
@@ -169,7 +169,7 @@ namespace Avalonia.UnitTests
                 windowImpl: windowImpl ?? WindowImpl);
         }
 
-        private static IStyle CreateDefaultTheme()
+        private static IStyle CreateSimpleTheme()
         {
             return new SimpleTheme { Mode = SimpleThemeMode.Light };
         }

From 687b5f9ea0a8cdba122e7e983f379cfad713366c Mon Sep 17 00:00:00 2001
From: robloo <robloo@users.noreply.github.com>
Date: Wed, 3 Aug 2022 00:28:53 -0400
Subject: [PATCH 217/240] Fix comment for TransitioningContentControl which
 uses whatever default theme is loaded

Co-authored-by: Max Katz <maxkatz6@outlook.com>
---
 src/Avalonia.ReactiveUI/TransitioningContentControl.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.ReactiveUI/TransitioningContentControl.cs b/src/Avalonia.ReactiveUI/TransitioningContentControl.cs
index 2bbf87590e..d26e90b2da 100644
--- a/src/Avalonia.ReactiveUI/TransitioningContentControl.cs
+++ b/src/Avalonia.ReactiveUI/TransitioningContentControl.cs
@@ -57,7 +57,7 @@ namespace Avalonia.ReactiveUI
         
         /// <summary>
         /// TransitioningContentControl uses the default ContentControl 
-        /// template from Avalonia simple theme.
+        /// template from Avalonia default theme.
         /// </summary>
         Type IStyleable.StyleKey => typeof(ContentControl);
 

From ce966f72e3fcd5474db30f2a91ba7660c5f65896 Mon Sep 17 00:00:00 2001
From: robloo <robloo@users.noreply.github.com>
Date: Wed, 3 Aug 2022 00:29:37 -0400
Subject: [PATCH 218/240] Fix comment which is correct as "default theme"

Co-authored-by: Max Katz <maxkatz6@outlook.com>
---
 tests/Avalonia.LeakTests/ControlTests.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Avalonia.LeakTests/ControlTests.cs b/tests/Avalonia.LeakTests/ControlTests.cs
index 2a77bd55fc..a7474dc92e 100644
--- a/tests/Avalonia.LeakTests/ControlTests.cs
+++ b/tests/Avalonia.LeakTests/ControlTests.cs
@@ -313,7 +313,7 @@ namespace Avalonia.LeakTests
                 var border = textBox.GetTemplateChildren().FirstOrDefault(x => x.Name == "border");
 
                 // The TextBox should have subscriptions to its Classes collection from the
-                // simple theme.
+                // default theme.
                 Assert.NotEqual(0, textBox.Classes.ListenerCount);
 
                 // Clear the content and ensure the TextBox is removed.

From 7274083cd1343db196fb5d1d1e9a294c0b66cc5d Mon Sep 17 00:00:00 2001
From: robloo <robloo@users.noreply.github.com>
Date: Wed, 3 Aug 2022 00:30:39 -0400
Subject: [PATCH 219/240] Fix comment which is correct as "default theme"

Co-authored-by: Max Katz <maxkatz6@outlook.com>
---
 src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs b/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs
index 4b41ecf328..5915388822 100644
--- a/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs
+++ b/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs
@@ -327,7 +327,7 @@ namespace Avalonia.Build.Tasks
                                         
                                         // TODO: Throw an error
                                         // This usually happens when the same XAML resource was added twice for some weird reason
-                                        // We currently support it for dual-named simple theme resources
+                                        // We currently support it for dual-named default theme resources
                                         if (op != null
                                             && op.Name == TrampolineName)
                                         {

From 705e9065a3b677359a9db1fadd7665dec96bb050 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Wed, 3 Aug 2022 02:28:05 -0400
Subject: [PATCH 220/240] Add more tests for lazy resources

---
 .../Xaml/ResourceDictionaryTests.cs           | 84 +++++++++++++++++--
 1 file changed, 79 insertions(+), 5 deletions(-)

diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ResourceDictionaryTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ResourceDictionaryTests.cs
index 939c5319e4..74b6a1e15d 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ResourceDictionaryTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ResourceDictionaryTests.cs
@@ -74,13 +74,33 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
                 var xaml = @"
 <ResourceDictionary xmlns='https://github.com/avaloniaui'
                     xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
-  <Color x:Key='Red'>Red</Color>
+    <SolidColorBrush x:Key='Red' Color='Red' />
 </ResourceDictionary>";
                 var resources = (ResourceDictionary)AvaloniaRuntimeXamlLoader.Load(xaml);
 
                 Assert.True(resources.ContainsDeferredKey("Red"));
             }
         }
+        
+        [Fact]
+        public void Item_Added_To_ResourceDictionary_Is_UnDeferred_On_Read()
+        {
+            using (StyledWindow())
+            {
+                var xaml = @"
+<ResourceDictionary xmlns='https://github.com/avaloniaui'
+                    xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <SolidColorBrush x:Key='Red' Color='Red' />
+</ResourceDictionary>";
+                var resources = (ResourceDictionary)AvaloniaRuntimeXamlLoader.Load(xaml);
+
+                Assert.True(resources.ContainsDeferredKey("Red"));
+
+                Assert.IsType<SolidColorBrush>(resources["Red"]);
+                
+                Assert.False(resources.ContainsDeferredKey("Red"));
+            }
+        }
 
         [Fact]
         public void Item_Is_Added_To_Window_Resources_As_Deferred()
@@ -91,7 +111,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
 <Window xmlns='https://github.com/avaloniaui'
         xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
     <Window.Resources>
-        <Color x:Key='Red'>Red</Color>
+        <SolidColorBrush x:Key='Red' Color='Red' />
     </Window.Resources>
 </Window>";
                 var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
@@ -113,7 +133,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary>
-                    <Color x:Key='Red'>Red</Color>
+                    <SolidColorBrush x:Key='Red' Color='Red' />
                 </ResourceDictionary>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
@@ -135,7 +155,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
 <Style xmlns='https://github.com/avaloniaui'
         xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
     <Style.Resources>
-        <Color x:Key='Red'>Red</Color>
+        <SolidColorBrush x:Key='Red' Color='Red' />
     </Style.Resources>
 </Style>";
                 var style = (Style)AvaloniaRuntimeXamlLoader.Load(xaml);
@@ -154,7 +174,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
 <Styles xmlns='https://github.com/avaloniaui'
         xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
     <Styles.Resources>
-        <Color x:Key='Red'>Red</Color>
+        <SolidColorBrush x:Key='Red' Color='Red' />
     </Styles.Resources>
 </Styles>";
                 var style = (Styles)AvaloniaRuntimeXamlLoader.Load(xaml);
@@ -164,6 +184,60 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
             }
         }
 
+        [Fact]
+        public void Item_Can_Be_StaticReferenced_As_Deferred()
+        {
+            using (StyledWindow())
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Window.Resources>
+        <SolidColorBrush x:Key='Red' Color='Red' />
+    </Window.Resources>
+    <Button>
+        <Button.Resources>
+            <StaticResource x:Key='Red2' ResourceKey='Red' />
+        </Button.Resources>
+    </Button>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var windowResources = (ResourceDictionary)window.Resources;
+                var buttonResources = (ResourceDictionary)((Button)window.Content!).Resources;
+                
+                Assert.True(windowResources.ContainsDeferredKey("Red"));
+                Assert.True(buttonResources.ContainsDeferredKey("Red2"));
+            }
+        }
+        
+        [Fact]
+        public void Item_StaticReferenced_Is_UnDeferred_On_Read()
+        {
+            using (StyledWindow())
+            {
+                var xaml = @"
+<Window xmlns='https://github.com/avaloniaui'
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Window.Resources>
+        <SolidColorBrush x:Key='Red' Color='Red' />
+    </Window.Resources>
+    <Button>
+        <Button.Resources>
+            <StaticResource x:Key='Red2' ResourceKey='Red' />
+        </Button.Resources>
+    </Button>
+</Window>";
+                var window = (Window)AvaloniaRuntimeXamlLoader.Load(xaml);
+                var windowResources = (ResourceDictionary)window.Resources;
+                var buttonResources = (ResourceDictionary)((Button)window.Content!).Resources;
+                
+                Assert.IsType<SolidColorBrush>(buttonResources["Red2"]);
+                
+                Assert.False(windowResources.ContainsDeferredKey("Red"));
+                Assert.False(buttonResources.ContainsDeferredKey("Red2"));
+            }
+        }
+
         private IDisposable StyledWindow(params (string, string)[] assets)
         {
             var services = TestServices.StyledWindow.With(

From 3fd8763e807f195cee6c4313cf6e0ecf44e74aa5 Mon Sep 17 00:00:00 2001
From: Takoooooo <tako0qq@gmail.com>
Date: Wed, 3 Aug 2022 13:22:00 +0300
Subject: [PATCH 221/240] Use correct ToggleModifier in TreeView multiselection
 on MacOS.

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

diff --git a/src/Avalonia.Controls/TreeView.cs b/src/Avalonia.Controls/TreeView.cs
index b2a188a2ea..7359f3cade 100644
--- a/src/Avalonia.Controls/TreeView.cs
+++ b/src/Avalonia.Controls/TreeView.cs
@@ -529,7 +529,7 @@ namespace Avalonia.Controls
                         e.Source,
                         true,
                         e.KeyModifiers.HasAllFlags(KeyModifiers.Shift),
-                        e.KeyModifiers.HasAllFlags(KeyModifiers.Control),
+                        e.KeyModifiers.HasAllFlags(AvaloniaLocator.Current.GetRequiredService<PlatformHotkeyConfiguration>().CommandModifiers),
                         point.Properties.IsRightButtonPressed);
                 }
             }

From 3717aec4f5f4e9e5c88d5b03b22d067fdd67a568 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Wed, 3 Aug 2022 14:32:38 +0300
Subject: [PATCH 222/240] Use GetFeature + API lease approach for accessing
 SKCanvas

---
 samples/RenderDemo/Pages/CustomSkiaPage.cs    |  6 +-
 src/Avalonia.Base/Media/DrawingGroup.cs       |  2 +
 .../Platform/IDrawingContextImpl.cs           | 14 +++
 .../Drawing/CompositionDrawingContext.cs      |  2 +
 .../Composition/Server/DrawingContextProxy.cs |  3 +
 .../SceneGraph/DeferredDrawingContextImpl.cs  |  2 +
 .../HeadlessPlatformRenderInterface.cs        |  5 +
 src/Skia/Avalonia.Skia/DrawingContextImpl.cs  | 97 +++++++++++++++++--
 .../Helpers/DrawingContextHelper.cs           | 12 ++-
 .../Avalonia.Skia/ISkiaDrawingContextImpl.cs  | 15 ---
 .../ISkiaSharpApiLeaseFeature.cs              | 20 ++++
 .../Media/DrawingContextImpl.cs               |  1 +
 .../NullDrawingContextImpl.cs                 |  5 +-
 13 files changed, 152 insertions(+), 32 deletions(-)
 delete mode 100644 src/Skia/Avalonia.Skia/ISkiaDrawingContextImpl.cs
 create mode 100644 src/Skia/Avalonia.Skia/ISkiaSharpApiLeaseFeature.cs

diff --git a/samples/RenderDemo/Pages/CustomSkiaPage.cs b/samples/RenderDemo/Pages/CustomSkiaPage.cs
index 9c524a7932..bf27747154 100644
--- a/samples/RenderDemo/Pages/CustomSkiaPage.cs
+++ b/samples/RenderDemo/Pages/CustomSkiaPage.cs
@@ -40,14 +40,16 @@ namespace RenderDemo.Pages
             static Stopwatch St = Stopwatch.StartNew();
             public void Render(IDrawingContextImpl context)
             {
-                var canvas = (context as ISkiaDrawingContextImpl)?.SkCanvas;
-                if (canvas == null)
+                var leaseFeature = context.GetFeature<ISkiaSharpApiLeaseFeature>();
+                if (leaseFeature == null)
                     using (var c = new DrawingContext(context, false))
                     {
                         c.DrawText(_noSkia, new Point());
                     }
                 else
                 {
+                    using var lease = leaseFeature.Lease();
+                    var canvas = lease.SkCanvas;
                     canvas.Save();
                     // create the first shader
                     var colors = new SKColor[] {
diff --git a/src/Avalonia.Base/Media/DrawingGroup.cs b/src/Avalonia.Base/Media/DrawingGroup.cs
index 603bb1c1c1..e71f568207 100644
--- a/src/Avalonia.Base/Media/DrawingGroup.cs
+++ b/src/Avalonia.Base/Media/DrawingGroup.cs
@@ -228,6 +228,8 @@ namespace Avalonia.Media
                 throw new NotImplementedException();
             }
 
+            public object? GetFeature(Type t) => null;
+
             public void DrawBitmap(IRef<IBitmapImpl> source, double opacity, Rect sourceRect, Rect destRect, BitmapInterpolationMode bitmapInterpolationMode = BitmapInterpolationMode.Default)
             {
                 throw new NotImplementedException();
diff --git a/src/Avalonia.Base/Platform/IDrawingContextImpl.cs b/src/Avalonia.Base/Platform/IDrawingContextImpl.cs
index d84a509234..6aa5eeea3d 100644
--- a/src/Avalonia.Base/Platform/IDrawingContextImpl.cs
+++ b/src/Avalonia.Base/Platform/IDrawingContextImpl.cs
@@ -172,6 +172,20 @@ namespace Avalonia.Platform
         /// </summary>
         /// <param name="custom">Custom draw operation</param>
         void Custom(ICustomDrawOperation custom);
+
+        /// <summary>
+        /// Attempts to get an optional feature from the drawing context implementation
+        /// </summary>
+        object? GetFeature(Type t);
+    }
+
+    public static class DrawingContextImplExtensions
+    {
+        /// <summary>
+        /// Attempts to get an optional feature from the drawing context implementation
+        /// </summary>
+        public static T? GetFeature<T>(this IDrawingContextImpl context) where T : class =>
+            (T?)context.GetFeature(typeof(T));
     }
 
     public interface IDrawingContextLayerImpl : IRenderTargetBitmapImpl
diff --git a/src/Avalonia.Base/Rendering/Composition/Drawing/CompositionDrawingContext.cs b/src/Avalonia.Base/Rendering/Composition/Drawing/CompositionDrawingContext.cs
index 01216d19ed..30b57883fc 100644
--- a/src/Avalonia.Base/Rendering/Composition/Drawing/CompositionDrawingContext.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Drawing/CompositionDrawingContext.cs
@@ -156,6 +156,8 @@ internal class CompositionDrawingContext : IDrawingContextImpl, IDrawingContextW
             ++_drawOperationIndex;
     }
 
+    public object? GetFeature(Type t) => null;
+
     /// <inheritdoc/>
     public void DrawGlyphRun(IBrush foreground, GlyphRun glyphRun)
     {
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/DrawingContextProxy.cs b/src/Avalonia.Base/Rendering/Composition/Server/DrawingContextProxy.cs
index 7eb35a68ed..03859d241f 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/DrawingContextProxy.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/DrawingContextProxy.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Numerics;
 using Avalonia.Media;
 using Avalonia.Media.Imaging;
@@ -155,6 +156,8 @@ internal class CompositorDrawingContextProxy : IDrawingContextImpl, IDrawingCont
         _impl.Custom(custom);
     }
 
+    public object? GetFeature(Type t) => _impl.GetFeature(t);
+
     public class VisualBrushRenderer : IVisualBrushRenderer
     {
         public CompositionDrawList? VisualBrushDrawList { get; set; }
diff --git a/src/Avalonia.Base/Rendering/SceneGraph/DeferredDrawingContextImpl.cs b/src/Avalonia.Base/Rendering/SceneGraph/DeferredDrawingContextImpl.cs
index 07082e4ac3..d6766fa9b8 100644
--- a/src/Avalonia.Base/Rendering/SceneGraph/DeferredDrawingContextImpl.cs
+++ b/src/Avalonia.Base/Rendering/SceneGraph/DeferredDrawingContextImpl.cs
@@ -203,6 +203,8 @@ namespace Avalonia.Rendering.SceneGraph
                 ++_drawOperationindex;
         }
 
+        public object? GetFeature(Type t) => null;
+
         /// <inheritdoc/>
         public void DrawGlyphRun(IBrush foreground, GlyphRun glyphRun)
         {
diff --git a/src/Avalonia.Headless/HeadlessPlatformRenderInterface.cs b/src/Avalonia.Headless/HeadlessPlatformRenderInterface.cs
index 5576368240..cb23c6c336 100644
--- a/src/Avalonia.Headless/HeadlessPlatformRenderInterface.cs
+++ b/src/Avalonia.Headless/HeadlessPlatformRenderInterface.cs
@@ -416,6 +416,11 @@ namespace Avalonia.Headless
 
             }
 
+            public object GetFeature(Type t)
+            {
+                return null;
+            }
+
             public void DrawLine(IPen pen, Point p1, Point p2)
             {
             }
diff --git a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
index 8293769138..99ab60d1ac 100644
--- a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
+++ b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
@@ -10,6 +10,7 @@ using Avalonia.Rendering.SceneGraph;
 using Avalonia.Rendering.Utilities;
 using Avalonia.Utilities;
 using Avalonia.Media.Imaging;
+using JetBrains.Annotations;
 using SkiaSharp;
 
 namespace Avalonia.Skia
@@ -17,7 +18,7 @@ namespace Avalonia.Skia
     /// <summary>
     /// Skia based drawing context.
     /// </summary>
-    internal class DrawingContextImpl : IDrawingContextImpl, ISkiaDrawingContextImpl, IDrawingContextWithAcrylicLikeSupport
+    internal class DrawingContextImpl : IDrawingContextImpl, IDrawingContextWithAcrylicLikeSupport
     {
         private IDisposable[] _disposables;
         private readonly Vector _dpi;
@@ -38,7 +39,8 @@ namespace Avalonia.Skia
         private readonly SKPaint _fillPaint = new SKPaint();
         private readonly SKPaint _boxShadowPaint = new SKPaint();
         private static SKShader s_acrylicNoiseShader;
-        private readonly ISkiaGpuRenderSession _session; 
+        private readonly ISkiaGpuRenderSession _session;
+        private bool _leased = false;
 
         /// <summary>
         /// Context create info.
@@ -83,6 +85,47 @@ namespace Avalonia.Skia
             public ISkiaGpuRenderSession CurrentSession;
         }
 
+        class SkiaLeaseFeature : ISkiaSharpApiLeaseFeature
+        {
+            private readonly DrawingContextImpl _context;
+
+            public SkiaLeaseFeature(DrawingContextImpl context)
+            {
+                _context = context;
+            }
+
+            public ISkiaSharpApiLease Lease()
+            {
+                _context.CheckLease();
+                return new ApiLease(_context);
+            }
+
+            class ApiLease : ISkiaSharpApiLease
+            {
+                private DrawingContextImpl _context;
+                private readonly SKMatrix _revertTransform;
+
+                public ApiLease(DrawingContextImpl context)
+                {
+                    _revertTransform = context.Canvas.TotalMatrix;
+                    _context = context;
+                    _context._leased = true;
+                }
+
+                public SKCanvas SkCanvas => _context.Canvas;
+                public GRContext GrContext => _context.GrContext;
+                public SKSurface SkSurface => _context.Surface;
+                public double CurrentOpacity => _context._currentOpacity;
+                
+                public void Dispose()
+                {
+                    _context.Canvas.SetMatrix(_revertTransform);
+                    _context._leased = false;
+                    _context = null;
+                }
+            }
+        }
+        
         /// <summary>
         /// Create new drawing context.
         /// </summary>
@@ -123,20 +166,23 @@ namespace Avalonia.Skia
         public SKCanvas Canvas { get; }
         public SKSurface Surface { get; }
 
-        SKCanvas ISkiaDrawingContextImpl.SkCanvas => Canvas;
-        SKSurface ISkiaDrawingContextImpl.SkSurface => Surface;
-        GRContext ISkiaDrawingContextImpl.GrContext => _grContext;
-        double ISkiaDrawingContextImpl.CurrentOpacity => _currentOpacity;
-
+        private void CheckLease()
+        {
+            if (_leased)
+                throw new InvalidOperationException("The underlying graphics API is currently leased");
+        }
+        
         /// <inheritdoc />
         public void Clear(Color color)
         {
+            CheckLease();
             Canvas.Clear(color.ToSKColor());
         }
 
         /// <inheritdoc />
         public void DrawBitmap(IRef<IBitmapImpl> source, double opacity, Rect sourceRect, Rect destRect, BitmapInterpolationMode bitmapInterpolationMode)
         {
+            CheckLease();
             var drawableImage = (IDrawableBitmapImpl)source.Item;
             var s = sourceRect.ToSKRect();
             var d = destRect.ToSKRect();
@@ -157,6 +203,7 @@ namespace Avalonia.Skia
         /// <inheritdoc />
         public void DrawBitmap(IRef<IBitmapImpl> source, IBrush opacityMask, Rect opacityMaskRect, Rect destRect)
         {
+            CheckLease();
             PushOpacityMask(opacityMask, opacityMaskRect);
             DrawBitmap(source, 1, new Rect(0, 0, source.Item.PixelSize.Width, source.Item.PixelSize.Height), destRect, BitmapInterpolationMode.Default);
             PopOpacityMask();
@@ -165,6 +212,7 @@ namespace Avalonia.Skia
         /// <inheritdoc />
         public void DrawLine(IPen pen, Point p1, Point p2)
         {
+            CheckLease();
             using (var paint = CreatePaint(_strokePaint, pen, new Size(Math.Abs(p2.X - p1.X), Math.Abs(p2.Y - p1.Y))))
             {
                 if (paint.Paint is object)
@@ -177,6 +225,7 @@ namespace Avalonia.Skia
         /// <inheritdoc />
         public void DrawGeometry(IBrush brush, IPen pen, IGeometryImpl geometry)
         {
+            CheckLease();
             var impl = (GeometryImpl) geometry;
             var size = geometry.Bounds.Size;
 
@@ -260,6 +309,7 @@ namespace Avalonia.Skia
         {
             if (rect.Rect.Height <= 0 || rect.Rect.Width <= 0)
                 return;
+            CheckLease();
             
             var rc = rect.Rect.ToSKRect();
             var isRounded = rect.IsRounded;
@@ -296,6 +346,7 @@ namespace Avalonia.Skia
         {
             if (rect.Rect.Height <= 0 || rect.Rect.Width <= 0)
                 return;
+            CheckLease();
             // Arbitrary chosen values
             // On OSX Skia breaks OpenGL context when asked to draw, e. g. (0, 0, 623, 6666600) rect
             if (rect.Rect.Height > 8192 || rect.Rect.Width > 8192)
@@ -421,7 +472,8 @@ namespace Avalonia.Skia
         {
             if (rect.Height <= 0 || rect.Width <= 0)
                 return;
-
+            CheckLease();
+            
             var rc = rect.ToSKRect();
 
             if (brush != null)
@@ -447,6 +499,7 @@ namespace Avalonia.Skia
         /// <inheritdoc />
         public void DrawGlyphRun(IBrush foreground, GlyphRun glyphRun)
         {
+            CheckLease();
             using (var paintWrapper = CreatePaint(_fillPaint, foreground, glyphRun.Size))
             {
                 var glyphRunImpl = (GlyphRunImpl)glyphRun.GlyphRunImpl;
@@ -459,18 +512,21 @@ namespace Avalonia.Skia
         /// <inheritdoc />
         public IDrawingContextLayerImpl CreateLayer(Size size)
         {
+            CheckLease();
             return CreateRenderTarget(size, true);
         }
 
         /// <inheritdoc />
         public void PushClip(Rect clip)
         {
+            CheckLease();
             Canvas.Save();
             Canvas.ClipRect(clip.ToSKRect());
         }
 
         public void PushClip(RoundedRect clip)
         {
+            CheckLease();
             Canvas.Save();
             Canvas.ClipRoundRect(clip.ToSKRoundRect(), antialias:true);
         }
@@ -478,12 +534,14 @@ namespace Avalonia.Skia
         /// <inheritdoc />
         public void PopClip()
         {
+            CheckLease();
             Canvas.Restore();
         }
 
         /// <inheritdoc />
         public void PushOpacity(double opacity)
         {
+            CheckLease();
             _opacityStack.Push(_currentOpacity);
             _currentOpacity *= opacity;
         }
@@ -491,6 +549,7 @@ namespace Avalonia.Skia
         /// <inheritdoc />
         public void PopOpacity()
         {
+            CheckLease();
             _currentOpacity = _opacityStack.Pop();
         }
 
@@ -499,6 +558,7 @@ namespace Avalonia.Skia
         {
             if(_disposed)
                 return;
+            CheckLease();
             try
             {
                 if (_grContext != null)
@@ -523,6 +583,7 @@ namespace Avalonia.Skia
         /// <inheritdoc />
         public void PushGeometryClip(IGeometryImpl clip)
         {
+            CheckLease();
             Canvas.Save();
             Canvas.ClipPath(((GeometryImpl)clip).EffectivePath, SKClipOperation.Intersect, true);
         }
@@ -530,12 +591,14 @@ namespace Avalonia.Skia
         /// <inheritdoc />
         public void PopGeometryClip()
         {
+            CheckLease();
             Canvas.Restore();
         }
 
         /// <inheritdoc />
         public void PushBitmapBlendMode(BitmapBlendingMode blendingMode)
         {
+            CheckLease();
             _blendingModeStack.Push(_currentBlendingMode);
             _currentBlendingMode = blendingMode;
         }
@@ -543,14 +606,20 @@ namespace Avalonia.Skia
         /// <inheritdoc />
         public void PopBitmapBlendMode()
         {
+            CheckLease();
             _currentBlendingMode = _blendingModeStack.Pop();
         }
 
-        public void Custom(ICustomDrawOperation custom) => custom.Render(this);
+        public void Custom(ICustomDrawOperation custom)
+        {
+            CheckLease();
+            custom.Render(this);
+        }
 
         /// <inheritdoc />
         public void PushOpacityMask(IBrush mask, Rect bounds)
         {
+            CheckLease();
             // TODO: This should be disposed
             var paint = new SKPaint();
 
@@ -561,6 +630,7 @@ namespace Avalonia.Skia
         /// <inheritdoc />
         public void PopOpacityMask()
         {
+            CheckLease();
             using (var paint = new SKPaint { BlendMode = SKBlendMode.DstIn })
             {
                 Canvas.SaveLayer(paint);
@@ -580,6 +650,7 @@ namespace Avalonia.Skia
             get { return _currentTransform; }
             set
             {
+                CheckLease();
                 if (_currentTransform == value)
                     return;
 
@@ -596,6 +667,14 @@ namespace Avalonia.Skia
             }
         }
 
+        [CanBeNull]
+        public object GetFeature(Type t)
+        {
+            if (t == typeof(ISkiaSharpApiLeaseFeature))
+                return new SkiaLeaseFeature(this);
+            return null;
+        }
+
         /// <summary>
         /// Configure paint wrapper for using gradient brush.
         /// </summary>
diff --git a/src/Skia/Avalonia.Skia/Helpers/DrawingContextHelper.cs b/src/Skia/Avalonia.Skia/Helpers/DrawingContextHelper.cs
index d0b45b7c5d..a078c364a2 100644
--- a/src/Skia/Avalonia.Skia/Helpers/DrawingContextHelper.cs
+++ b/src/Skia/Avalonia.Skia/Helpers/DrawingContextHelper.cs
@@ -33,7 +33,7 @@ namespace Avalonia.Skia.Helpers
         /// Unsupported - Wraps a GPU Backed SkiaSurface in an Avalonia DrawingContext.
         /// </summary>
         [Obsolete]
-        public static ISkiaDrawingContextImpl WrapSkiaSurface(this SKSurface surface, GRContext grContext, Vector dpi, params IDisposable[] disposables)
+        public static IDrawingContextImpl WrapSkiaSurface(this SKSurface surface, GRContext grContext, Vector dpi, params IDisposable[] disposables)
         {
             var createInfo = new DrawingContextImpl.CreateInfo
             {
@@ -50,7 +50,7 @@ namespace Avalonia.Skia.Helpers
         /// Unsupported - Wraps a non-GPU Backed SkiaSurface in an Avalonia DrawingContext.
         /// </summary>
         [Obsolete]
-        public static ISkiaDrawingContextImpl WrapSkiaSurface(this SKSurface surface, Vector dpi, params IDisposable[] disposables)
+        public static IDrawingContextImpl WrapSkiaSurface(this SKSurface surface, Vector dpi, params IDisposable[] disposables)
         {
             var createInfo = new DrawingContextImpl.CreateInfo
             {
@@ -63,7 +63,7 @@ namespace Avalonia.Skia.Helpers
         }
 
         [Obsolete]
-        public static ISkiaDrawingContextImpl CreateDrawingContext(Size size, Vector dpi, GRContext grContext = null)
+        public static IDrawingContextImpl CreateDrawingContext(Size size, Vector dpi, GRContext grContext = null)
         {
             if (grContext is null)
             {
@@ -90,9 +90,11 @@ namespace Avalonia.Skia.Helpers
         }
         
         [Obsolete]
-        public static void DrawTo(this ISkiaDrawingContextImpl source, ISkiaDrawingContextImpl destination, SKPaint paint = null)
+        public static void DrawTo(this IDrawingContextImpl source, IDrawingContextImpl destination, SKPaint paint = null)
         {
-            destination.SkCanvas.DrawSurface(source.SkSurface, new SKPoint(0, 0), paint);
+            var src = (DrawingContextImpl)source;
+            var dst = (DrawingContextImpl)destination;
+            dst.Canvas.DrawSurface(src.Surface, new SKPoint(0, 0), paint);
         }
     }
 }
diff --git a/src/Skia/Avalonia.Skia/ISkiaDrawingContextImpl.cs b/src/Skia/Avalonia.Skia/ISkiaDrawingContextImpl.cs
deleted file mode 100644
index 1b60154d46..0000000000
--- a/src/Skia/Avalonia.Skia/ISkiaDrawingContextImpl.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Avalonia.Metadata;
-using Avalonia.Platform;
-using SkiaSharp;
-
-namespace Avalonia.Skia
-{
-    [Unstable]
-    public interface ISkiaDrawingContextImpl : IDrawingContextImpl
-    {
-        SKCanvas SkCanvas { get; }
-        GRContext GrContext { get; }
-        SKSurface SkSurface { get; }
-        double CurrentOpacity { get; }
-    }
-}
diff --git a/src/Skia/Avalonia.Skia/ISkiaSharpApiLeaseFeature.cs b/src/Skia/Avalonia.Skia/ISkiaSharpApiLeaseFeature.cs
new file mode 100644
index 0000000000..b3966c0324
--- /dev/null
+++ b/src/Skia/Avalonia.Skia/ISkiaSharpApiLeaseFeature.cs
@@ -0,0 +1,20 @@
+using System;
+using Avalonia.Metadata;
+using SkiaSharp;
+
+namespace Avalonia.Skia;
+
+[Unstable]
+public interface ISkiaSharpApiLeaseFeature
+{
+    public ISkiaSharpApiLease Lease();
+}
+
+[Unstable]
+public interface ISkiaSharpApiLease : IDisposable
+{
+    SKCanvas SkCanvas { get; }
+    GRContext GrContext { get; }
+    SKSurface SkSurface { get; }
+    double CurrentOpacity { get; }
+}
\ No newline at end of file
diff --git a/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
index a7f1d9c3e5..180ae491b3 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
@@ -614,5 +614,6 @@ namespace Avalonia.Direct2D1.Media
         }
         
         public void Custom(ICustomDrawOperation custom) => custom.Render(this);
+        public object GetFeature(Type t) => null;
     }
 }
diff --git a/tests/Avalonia.Benchmarks/NullDrawingContextImpl.cs b/tests/Avalonia.Benchmarks/NullDrawingContextImpl.cs
index 6fb2a5ac24..8436881122 100644
--- a/tests/Avalonia.Benchmarks/NullDrawingContextImpl.cs
+++ b/tests/Avalonia.Benchmarks/NullDrawingContextImpl.cs
@@ -1,4 +1,5 @@
-using Avalonia.Media;
+using System;
+using Avalonia.Media;
 using Avalonia.Platform;
 using Avalonia.Rendering.SceneGraph;
 using Avalonia.Utilities;
@@ -99,5 +100,7 @@ namespace Avalonia.Benchmarks
         public void Custom(ICustomDrawOperation custom)
         {
         }
+
+        public object GetFeature(Type t) => null;
     }
 }

From a30d73eb5ed9433cff2d212b21fb9eae93e7b54b Mon Sep 17 00:00:00 2001
From: Takoooooo <tako0qq@gmail.com>
Date: Wed, 3 Aug 2022 14:38:45 +0300
Subject: [PATCH 223/240] Fix tests.

---
 .../TreeViewTests.cs                          | 38 ++++++++++---------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs b/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs
index d784caf2db..9cf21423a3 100644
--- a/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs
@@ -18,6 +18,7 @@ using Avalonia.LogicalTree;
 using Avalonia.Styling;
 using Avalonia.UnitTests;
 using JetBrains.Annotations;
+using Moq;
 using Xunit;
 
 namespace Avalonia.Controls.UnitTests
@@ -885,28 +886,31 @@ namespace Avalonia.Controls.UnitTests
         [Fact]
         public void Right_Click_On_SelectedItem_Should_Not_Clear_Existing_Selection()
         {
-            var tree = CreateTestTreeData();
-            var target = new TreeView
+            using (UnitTestApplication.Start())
             {
-                Template = CreateTreeViewTemplate(),
-                Items = tree,
-                SelectionMode = SelectionMode.Multiple,
-            };
-
-            var visualRoot = new TestRoot();
-            visualRoot.Child = target;
+                var tree = CreateTestTreeData();
+                var target = new TreeView
+                {
+                    Template = CreateTreeViewTemplate(),
+                    Items = tree,
+                    SelectionMode = SelectionMode.Multiple,
+                };
+                AvaloniaLocator.CurrentMutable.Bind<PlatformHotkeyConfiguration>().ToConstant(new Mock<PlatformHotkeyConfiguration>().Object);
+                var visualRoot = new TestRoot();
+                visualRoot.Child = target;
 
-            CreateNodeDataTemplate(target);
-            ApplyTemplates(target);
-            target.ExpandSubTree((TreeViewItem)target.Presenter.Panel.Children[0]);
-            target.SelectAll();
+                CreateNodeDataTemplate(target);
+                ApplyTemplates(target);
+                target.ExpandSubTree((TreeViewItem)target.Presenter.Panel.Children[0]);
+                target.SelectAll();
 
-            AssertChildrenSelected(target, tree[0]);
-            Assert.Equal(5, target.SelectedItems.Count);
+                AssertChildrenSelected(target, tree[0]);
+                Assert.Equal(5, target.SelectedItems.Count);
 
-            _mouse.Click((Interactive)target.Presenter.Panel.Children[0], MouseButton.Right);
+                _mouse.Click((Interactive)target.Presenter.Panel.Children[0], MouseButton.Right);
 
-            Assert.Equal(5, target.SelectedItems.Count);
+                Assert.Equal(5, target.SelectedItems.Count);
+            }
         }
 
         [Fact]

From fffdcfcc2a8c49f16d9f1c363c774e56e20d685b Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Wed, 3 Aug 2022 14:05:55 +0200
Subject: [PATCH 224/240] Fix fluent ButtonSpinner theme.

The button was greying out its borders on pointer-over.
---
 .../Controls/ButtonSpinner.xaml               | 30 ++++++++++++++-----
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml b/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml
index 855dc5363e..aa55065f6d 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml
@@ -41,13 +41,31 @@
   <StreamGeometry x:Key="ButtonSpinnerIncreaseButtonIcon">M0,9 L10,0 20,9 19,10 10,2 1,10 z</StreamGeometry>
   <StreamGeometry x:Key="ButtonSpinnerDecreaseButtonIcon">M0,1 L10,10 20,1 19,0 10,8 1,0 z</StreamGeometry>
 
-  <ControlTheme x:Key="FluentButtonSpinnerRepeatButton" TargetType="RepeatButton" BasedOn="{StaticResource {x:Type RepeatButton}}">
-    <Setter Property="CornerRadius" Value="0"/>
+  <ControlTheme x:Key="FluentButtonSpinnerRepeatButton" TargetType="RepeatButton">
     <Setter Property="MinWidth" Value="34" />
-    <Setter Property="VerticalAlignment" Value="Stretch" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ContentPresenter x:Name="PART_ContentPresenter"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          Content="{TemplateBinding Content}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          Padding="{TemplateBinding Padding}"
+                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+      </ControlTemplate>
+    </Setter>
+    <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource RepeatButtonBackgroundPointerOver}" />
+    </Style>
+
+    <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource RepeatButtonBackgroundPressed}" />
+    </Style>
+
     <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
-      <Setter Property="BorderBrush" Value="{TemplateBinding BorderBrush}" />
-      <Setter Property="Foreground" Value="{DynamicResource RepeatButtonForegroundDisabled}"/>
+      <Setter Property="Foreground" Value="{DynamicResource RepeatButtonForegroundDisabled}" />
     </Style>
   </ControlTheme>
 
@@ -83,7 +101,6 @@
                               Background="{TemplateBinding Background}"
                               BorderBrush="{TemplateBinding BorderBrush}"
                               BorderThickness="{TemplateBinding BorderThickness, Converter={StaticResource ButtonSpinnerLeftThickness}}"
-                              CornerRadius="0"
                               VerticalAlignment="Stretch"
                               VerticalContentAlignment="Center"
                               Foreground="{TemplateBinding Foreground}"
@@ -99,7 +116,6 @@
                               Background="{TemplateBinding Background}"
                               BorderBrush="{TemplateBinding BorderBrush}"
                               BorderThickness="{TemplateBinding BorderThickness, Converter={StaticResource ButtonSpinnerLeftThickness}}"
-                              CornerRadius="0"
                               VerticalAlignment="Stretch"
                               VerticalContentAlignment="Center"
                               Foreground="{TemplateBinding Foreground}"

From ad518ac6787ab8265adcd1a4eddc70c390590ca6 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Wed, 3 Aug 2022 15:00:42 +0300
Subject: [PATCH 225/240] Add backpressure for sending batches to the render
 thread

---
 .../Rendering/Composition/CompositingRenderer.cs      |  2 +-
 src/Avalonia.Base/Rendering/Composition/Compositor.cs | 11 ++++++++++-
 .../Rendering/Composition/Server/ServerCompositor.cs  |  3 +--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/Avalonia.Base/Rendering/Composition/CompositingRenderer.cs b/src/Avalonia.Base/Rendering/Composition/CompositingRenderer.cs
index db773bc43c..9aa3c25425 100644
--- a/src/Avalonia.Base/Rendering/Composition/CompositingRenderer.cs
+++ b/src/Avalonia.Base/Rendering/Composition/CompositingRenderer.cs
@@ -71,7 +71,7 @@ public class CompositingRenderer : IRendererWithCompositor
         if(_queuedUpdate)
             return;
         _queuedUpdate = true;
-        Dispatcher.UIThread.Post(_update, DispatcherPriority.Composition);
+        _compositor.InvokeWhenReadyForNextCommit(_update);
     }
     
     /// <inheritdoc/>
diff --git a/src/Avalonia.Base/Rendering/Composition/Compositor.cs b/src/Avalonia.Base/Rendering/Composition/Compositor.cs
index 45212d0f36..f812acc016 100644
--- a/src/Avalonia.Base/Rendering/Composition/Compositor.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Compositor.cs
@@ -33,6 +33,7 @@ namespace Avalonia.Rendering.Composition
         internal IEasing DefaultEasing { get; }
         private List<Action>? _invokeOnNextCommit;
         private readonly Stack<List<Action>> _invokeListPool = new();
+        private Task? _lastBatchCompleted;
 
         /// <summary>
         /// Creates a new compositor on a specified render loop that would use a particular GPU
@@ -86,7 +87,7 @@ namespace Avalonia.Rendering.Composition
             if (_invokeOnNextCommit != null) 
                 ScheduleCommitCallbacks(batch.Completed);
             
-            return batch.Completed;
+            return _lastBatchCompleted = batch.Completed;
         }
 
         async void ScheduleCommitCallbacks(Task task)
@@ -139,5 +140,13 @@ namespace Avalonia.Rendering.Composition
             _invokeOnNextCommit ??= _invokeListPool.Count > 0 ? _invokeListPool.Pop() : new();
             _invokeOnNextCommit.Add(action);
         }
+
+        public void InvokeWhenReadyForNextCommit(Action action)
+        {
+            if (_lastBatchCompleted == null || _lastBatchCompleted.IsCompleted)
+                Dispatcher.UIThread.Post(action, DispatcherPriority.Composition);
+            else
+                _lastBatchCompleted.ContinueWith(_ => Dispatcher.UIThread.Post(action, DispatcherPriority.Composition));
+        }
     }
 }
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositor.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositor.cs
index 621bc84f4a..bfc2b2d626 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositor.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositor.cs
@@ -108,6 +108,7 @@ namespace Avalonia.Rendering.Composition.Server
         private void RenderCore()
         {
             ApplyPendingBatches();
+            CompletePendingBatches();
             
             foreach(var animation in _activeAnimations)
                 _animationsToUpdate.Add(animation);
@@ -119,8 +120,6 @@ namespace Avalonia.Rendering.Composition.Server
             
             foreach (var t in _activeTargets)
                 t.Render();
-            
-            CompletePendingBatches();
         }
 
         public void AddCompositionTarget(ServerCompositionTarget target)

From 0d472a100b6fc191d69675512028c4e770045081 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Wed, 3 Aug 2022 15:57:13 +0300
Subject: [PATCH 226/240] Use static callback for ContinueWith

---
 src/Avalonia.Base/Rendering/Composition/Compositor.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Base/Rendering/Composition/Compositor.cs b/src/Avalonia.Base/Rendering/Composition/Compositor.cs
index f812acc016..10360f7874 100644
--- a/src/Avalonia.Base/Rendering/Composition/Compositor.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Compositor.cs
@@ -146,7 +146,9 @@ namespace Avalonia.Rendering.Composition
             if (_lastBatchCompleted == null || _lastBatchCompleted.IsCompleted)
                 Dispatcher.UIThread.Post(action, DispatcherPriority.Composition);
             else
-                _lastBatchCompleted.ContinueWith(_ => Dispatcher.UIThread.Post(action, DispatcherPriority.Composition));
+                _lastBatchCompleted.ContinueWith(
+                    static (_, state) => Dispatcher.UIThread.Post((Action)state!, DispatcherPriority.Composition),
+                    action);
         }
     }
 }

From 3d327bc046ab6295fac0634b9da06fec92a8d493 Mon Sep 17 00:00:00 2001
From: Takoooooo <tako0qq@gmail.com>
Date: Wed, 3 Aug 2022 18:50:23 +0300
Subject: [PATCH 227/240] Fix and optimize StringFormatConverter.

StringFormatConverter should validate values and return AvaloniaProperty.UnsetValue in case of incorrect value or exception.
---
 .../Converters/StringFormatConverter.cs       | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/Avalonia.Controls/Converters/StringFormatConverter.cs b/src/Avalonia.Controls/Converters/StringFormatConverter.cs
index ae920dac7e..7075d3de99 100644
--- a/src/Avalonia.Controls/Converters/StringFormatConverter.cs
+++ b/src/Avalonia.Controls/Converters/StringFormatConverter.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
-using Avalonia.Data;
 using Avalonia.Data.Converters;
 
 namespace Avalonia.Controls.Converters;
@@ -15,13 +13,25 @@ public class StringFormatConverter : IMultiValueConverter
 {
     public object? Convert(IList<object?> values, Type targetType, object? parameter, CultureInfo culture)
     {
-        try
-        {
-            return string.Format((string)values[0]!, values.Skip(1).ToArray());
-        }
-        catch (Exception e)
+        if (values != null &&
+            values.Count == 5 &&
+            values[0] is string format &&
+            values[1] is double &&
+            values[2] is double &&
+            values[3] is double &&
+            values[4] is double)
+
         {
-            return new BindingNotification(e, BindingErrorType.Error);
+
+            try
+            {
+                return string.Format(format, values[1], values[2], values[3], values[4]);
+            }
+            catch
+            {
+                return AvaloniaProperty.UnsetValue;
+            }
         }
+        return AvaloniaProperty.UnsetValue;
     }
 }

From d4840a55bc1037970cc8cc2e2125fb0446741ebb Mon Sep 17 00:00:00 2001
From: Andrey Kunchev <donandren@gmail.com>
Date: Tue, 2 Aug 2022 18:31:57 +0300
Subject: [PATCH 228/240] add failing test for #8669

---
 .../ListBoxTests.cs                           | 49 +++++++++++++++++--
 1 file changed, 44 insertions(+), 5 deletions(-)

diff --git a/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs b/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs
index afa153a593..f6d96edb99 100644
--- a/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs
@@ -9,7 +9,6 @@ using Avalonia.Data;
 using Avalonia.Input;
 using Avalonia.LogicalTree;
 using Avalonia.Styling;
-using Avalonia.Threading;
 using Avalonia.UnitTests;
 using Avalonia.VisualTree;
 using Xunit;
@@ -19,7 +18,7 @@ namespace Avalonia.Controls.UnitTests
     public class ListBoxTests
     {
         private MouseTestHelper _mouse = new MouseTestHelper();
-        
+
         [Fact]
         public void Should_Use_ItemTemplate_To_Create_Item_Content()
         {
@@ -433,6 +432,47 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
+        [Fact]
+        public void ListBox_Should_Be_Valid_After_Remove_Of_Item_In_NonVisibleArea()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var items = new AvaloniaList<string>(Enumerable.Range(1, 30).Select(v => v.ToString()));
+
+                var wnd = new Window() { Width = 100, Height = 100, IsVisible = true };
+
+                var target = new ListBox()
+                {
+                    AutoScrollToSelectedItem = true,
+                    Height = 100,
+                    Width = 50,
+                    VirtualizationMode = ItemVirtualizationMode.Simple,
+                    ItemTemplate = new FuncDataTemplate<object>((c, _) => new Border() { Height = 10 }),
+                    Items = items,
+                };
+                wnd.Content = target;
+
+                var lm = wnd.LayoutManager;
+
+                lm.ExecuteInitialLayoutPass();
+
+                //select last / scroll to last item
+                target.SelectedItem = items.Last();
+
+                lm.ExecuteLayoutPass();
+
+                //remove the first item (in non realized area of the listbox)
+                items.Remove("1");
+                lm.ExecuteLayoutPass();
+
+                Assert.Equal("30", target.ItemContainerGenerator.ContainerFromIndex(items.Count - 1).DataContext);
+                Assert.Equal("29", target.ItemContainerGenerator.ContainerFromIndex(items.Count - 2).DataContext);
+                Assert.Equal("28", target.ItemContainerGenerator.ContainerFromIndex(items.Count - 3).DataContext);
+                Assert.Equal("27", target.ItemContainerGenerator.ContainerFromIndex(items.Count - 4).DataContext);
+                Assert.Equal("26", target.ItemContainerGenerator.ContainerFromIndex(items.Count - 5).DataContext);
+            }
+        }
+
         [Fact]
         public void Clicking_Item_Should_Raise_BringIntoView_For_Correct_Control()
         {
@@ -656,7 +696,6 @@ namespace Avalonia.Controls.UnitTests
             public string Value { get; }
         }
 
-
         [Fact]
         public void SelectedItem_Validation()
         {
@@ -670,11 +709,11 @@ namespace Avalonia.Controls.UnitTests
             };
 
             Prepare(target);
-            
+
             var exception = new System.InvalidCastException("failed validation");
             var textObservable = new BehaviorSubject<BindingNotification>(new BindingNotification(exception, BindingErrorType.DataValidationError));
             target.Bind(ComboBox.SelectedItemProperty, textObservable);
-                
+
             Assert.True(DataValidationErrors.GetHasErrors(target));
             Assert.True(DataValidationErrors.GetErrors(target).SequenceEqual(new[] { exception }));
         }

From d68efa1cd4f89142eb7cf159425ea6939d978e02 Mon Sep 17 00:00:00 2001
From: Andrey Kunchev <donandren@gmail.com>
Date: Thu, 4 Aug 2022 15:07:23 +0300
Subject: [PATCH 229/240] fix for #8669

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

diff --git a/src/Avalonia.Controls/Presenters/ItemVirtualizerSimple.cs b/src/Avalonia.Controls/Presenters/ItemVirtualizerSimple.cs
index 39a512a773..4db2ec6d50 100644
--- a/src/Avalonia.Controls/Presenters/ItemVirtualizerSimple.cs
+++ b/src/Avalonia.Controls/Presenters/ItemVirtualizerSimple.cs
@@ -187,7 +187,7 @@ namespace Avalonia.Controls.Presenters
                         break;
 
                     case NotifyCollectionChangedAction.Remove:
-                        if ((e.OldStartingIndex >= FirstIndex && e.OldStartingIndex < NextIndex) ||
+                        if (e.OldStartingIndex < NextIndex ||
                             panel.Children.Count > ItemCount)
                         {
                             RecycleContainersOnRemove();

From 6520722e5488350433e525232877e139ad57cf53 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Wed, 3 Aug 2022 03:20:37 -0400
Subject: [PATCH 230/240] Attempt to not deferr value types

---
 ...valoniaXamlIlDeferredResourceTransformer.cs | 10 ++++++++++
 .../Xaml/ResourceDictionaryTests.cs            | 18 ++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlDeferredResourceTransformer.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlDeferredResourceTransformer.cs
index 099878df08..662263e513 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlDeferredResourceTransformer.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlDeferredResourceTransformer.cs
@@ -15,6 +15,9 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
             if (!(node is XamlPropertyAssignmentNode pa) || pa.Values.Count != 2)
                 return node;
 
+            if (!ShouldBeDeferred(pa.Values[1]))
+                return node;
+
             var types = context.GetAvaloniaTypes();
 
             if (pa.Property.DeclaringType == types.ResourceDictionary && pa.Property.Name == "Content")
@@ -37,6 +40,13 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
             return node;
         }
 
+        private static bool ShouldBeDeferred(IXamlAstValueNode node)
+        {
+            // XAML compiler is currently strict about value types, allowing them to be created only through converters.
+            // At the moment it should be safe to not defer structs.
+            return !node.Type.GetClrType().IsValueType;
+        }
+        
         class AdderSetter : IXamlPropertySetter, IXamlEmitablePropertySetter<IXamlILEmitter>
         {
             private readonly IXamlMethod _getter;
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ResourceDictionaryTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ResourceDictionaryTests.cs
index 74b6a1e15d..19fb88b391 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ResourceDictionaryTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ResourceDictionaryTests.cs
@@ -3,6 +3,7 @@ using Avalonia.Controls;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Templates;
 using Avalonia.Media;
+using Avalonia.Media.Immutable;
 using Avalonia.Styling;
 using Avalonia.UnitTests;
 using Xunit;
@@ -237,6 +238,23 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
                 Assert.False(buttonResources.ContainsDeferredKey("Red2"));
             }
         }
+        
+        [Fact]
+        public void Value_Type_With_Parse_Should_Not_Be_Deferred()
+        {
+            using (StyledWindow())
+            {
+                var xaml = @"
+<ResourceDictionary xmlns='https://github.com/avaloniaui'
+                    xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Color x:Key='Red'>Red</Color>
+</ResourceDictionary>";
+                var resources = (ResourceDictionary)AvaloniaRuntimeXamlLoader.Load(xaml);
+
+                Assert.False(resources.ContainsDeferredKey("Red"));
+                Assert.IsType<Color>(resources["Red"]);
+            }
+        }
 
         private IDisposable StyledWindow(params (string, string)[] assets)
         {

From 41d31d8857dec976aa293d8070ea69296f84c2d1 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Wed, 3 Aug 2022 03:53:01 -0400
Subject: [PATCH 231/240] Add thickness test as well

---
 .../Xaml/ResourceDictionaryTests.cs           | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ResourceDictionaryTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ResourceDictionaryTests.cs
index 19fb88b391..5066341bbb 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ResourceDictionaryTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ResourceDictionaryTests.cs
@@ -240,7 +240,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         }
         
         [Fact]
-        public void Value_Type_With_Parse_Should_Not_Be_Deferred()
+        public void Value_Type_With_Parse_Converter_Should_Not_Be_Deferred()
         {
             using (StyledWindow())
             {
@@ -255,6 +255,23 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
                 Assert.IsType<Color>(resources["Red"]);
             }
         }
+        
+        [Fact]
+        public void Value_Type_With_Ctor_Converter_Should_Not_Be_Deferred()
+        {
+            using (StyledWindow())
+            {
+                var xaml = @"
+<ResourceDictionary xmlns='https://github.com/avaloniaui'
+                    xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
+    <Thickness x:Key='Margin'>1 1 1 1</Thickness>
+</ResourceDictionary>";
+                var resources = (ResourceDictionary)AvaloniaRuntimeXamlLoader.Load(xaml);
+
+                Assert.False(resources.ContainsDeferredKey("Margin"));
+                Assert.IsType<Thickness>(resources["Margin"]);
+            }
+        }
 
         private IDisposable StyledWindow(params (string, string)[] assets)
         {

From 0360af6780f476f195142fa2772fc9f008e9da47 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 4 Aug 2022 18:11:07 +0200
Subject: [PATCH 232/240] Added failing test for #8672.

---
 .../Data/TemplateBindingTests.cs              | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/tests/Avalonia.Markup.UnitTests/Data/TemplateBindingTests.cs b/tests/Avalonia.Markup.UnitTests/Data/TemplateBindingTests.cs
index d9ea3e374c..979dbec674 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/TemplateBindingTests.cs
+++ b/tests/Avalonia.Markup.UnitTests/Data/TemplateBindingTests.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using Avalonia.Controls;
@@ -217,6 +218,37 @@ namespace Avalonia.Markup.UnitTests.Data
             }
         }
 
+        [Fact]
+        public void Should_Not_Pass_UnsetValue_To_MultiBinding_During_ApplyTemplate()
+        {
+            var converter = new MultiConverter();
+            var source = new Button
+            {
+                Content = "foo",
+                Template = new FuncControlTemplate<Button>((parent, _) =>
+                    new ContentPresenter
+                    {
+                        [~ContentPresenter.ContentProperty] = new MultiBinding
+                        {
+                            Converter = converter,
+                            Bindings =
+                            {
+                                new TemplateBinding(ContentControl.ContentProperty),
+                            }
+                        }
+                    }),
+            };
+
+            source.ApplyTemplate();
+
+            var target = (ContentPresenter)source.GetVisualChildren().Single();
+
+            // #8672 was caused by TemplateBinding passing "unset" to the MultiBinding during
+            // ApplyTemplate as the TemplatedParent property doesn't get setup until after the
+            // binding is initiated.
+            Assert.Equal(new[] { "foo" }, converter.Values);
+        }
+
         private class PrefixConverter : IValueConverter
         {
             public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
@@ -247,5 +279,16 @@ namespace Avalonia.Markup.UnitTests.Data
                 return null;
             }
         }
+
+        private class MultiConverter : IMultiValueConverter
+        {
+            public List<object> Values { get; } = new();
+
+            public object Convert(IList<object> values, Type targetType, object parameter, CultureInfo culture)
+            {
+                Values.AddRange(values);
+                return values.FirstOrDefault();
+            }
+        }
     }
 }

From 835622c0174ae11813839b2fb7258215701d00da Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 4 Aug 2022 18:27:21 +0200
Subject: [PATCH 233/240] Tweak TemplateBinding initialization.

Don't produce an "unset" value from `TemplateBinding` until the binding has previously produced a value.

Fixes #8672.
---
 src/Markup/Avalonia.Markup/Data/TemplateBinding.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Markup/Avalonia.Markup/Data/TemplateBinding.cs b/src/Markup/Avalonia.Markup/Data/TemplateBinding.cs
index 265af3c5da..4a3538fff2 100644
--- a/src/Markup/Avalonia.Markup/Data/TemplateBinding.cs
+++ b/src/Markup/Avalonia.Markup/Data/TemplateBinding.cs
@@ -19,6 +19,7 @@ namespace Avalonia.Data
         private bool _isSetterValue;
         private IStyledElement _target = default!;
         private Type? _targetType;
+        private bool _hasProducedValue;
 
         public TemplateBinding()
         {
@@ -143,10 +144,12 @@ namespace Avalonia.Data
                 }
 
                 PublishNext(value);
+                _hasProducedValue = true;
             }
-            else
+            else if (_hasProducedValue)
             {
                 PublishNext(AvaloniaProperty.UnsetValue);
+                _hasProducedValue = false;
             }
         }
 

From 4497b8a7306e37916c30f5151285d45dcb2e9bf5 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 5 Aug 2022 12:50:01 +0200
Subject: [PATCH 234/240] Hackfix for #8678.

---
 .../StaticResourceExtension.cs                 | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs
index add97a660b..d462a2210e 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs
@@ -39,6 +39,8 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
                 targetType = setter.Property.PropertyType;
             }
 
+            var previousWasControlTheme = false;
+
             // Look upwards though the ambient context for IResourceNodes
             // which might be able to give us the resource.
             foreach (var parent in stack.Parents)
@@ -47,6 +49,21 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
                 {
                     return ColorToBrushConverter.Convert(value, targetType);
                 }
+
+                // HACK: Temporary fix for #8678. Hard-coded to only work for the DevTools main
+                // window as we don't want 3rd parties to start relying on this hack.
+                //
+                // We need to implement compile-time merging of resource dictionaries and this
+                // hack can be removed.
+                if (previousWasControlTheme &&
+                    parent is ResourceDictionary hack &&
+                    hack.Owner?.GetType().FullName == "Avalonia.Diagnostics.Views.MainWindow" &&
+                    hack.Owner.TryGetResource(ResourceKey, out value))
+                {
+                    return ColorToBrushConverter.Convert(value, targetType);
+                }
+
+                previousWasControlTheme = parent is ControlTheme;
             }
 
             if (provideTarget.TargetObject is IControl target &&
@@ -69,3 +86,4 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
         }
     }
 }
+

From a9cb1e2497a3104ecdd34318842821e67723aa68 Mon Sep 17 00:00:00 2001
From: Takoooooo <tako0qq@gmail.com>
Date: Fri, 5 Aug 2022 14:56:16 +0300
Subject: [PATCH 235/240] Address review.

---
 .../Converters/StringFormatConverter.cs             | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/Avalonia.Controls/Converters/StringFormatConverter.cs b/src/Avalonia.Controls/Converters/StringFormatConverter.cs
index 7075d3de99..82e75d9c34 100644
--- a/src/Avalonia.Controls/Converters/StringFormatConverter.cs
+++ b/src/Avalonia.Controls/Converters/StringFormatConverter.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+using System.Linq;
 using Avalonia.Data.Converters;
 
 namespace Avalonia.Controls.Converters;
@@ -13,19 +14,11 @@ public class StringFormatConverter : IMultiValueConverter
 {
     public object? Convert(IList<object?> values, Type targetType, object? parameter, CultureInfo culture)
     {
-        if (values != null &&
-            values.Count == 5 &&
-            values[0] is string format &&
-            values[1] is double &&
-            values[2] is double &&
-            values[3] is double &&
-            values[4] is double)
-
+        if (values[0] is string format)
         {
-
             try
             {
-                return string.Format(format, values[1], values[2], values[3], values[4]);
+                return string.Format(format, values.Skip(1).ToArray());
             }
             catch
             {

From 3af34590745c83e282331093858f25fef0e641af Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Sat, 6 Aug 2022 00:57:43 -0400
Subject: [PATCH 236/240] Stop transition if it was cancelled

---
 src/Avalonia.Controls/TransitioningContentControl.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls/TransitioningContentControl.cs b/src/Avalonia.Controls/TransitioningContentControl.cs
index 451e234653..70b21b7248 100644
--- a/src/Avalonia.Controls/TransitioningContentControl.cs
+++ b/src/Avalonia.Controls/TransitioningContentControl.cs
@@ -84,13 +84,19 @@ public class TransitioningContentControl : ContentControl
 
         _lastTransitionCts?.Cancel();
         _lastTransitionCts = new CancellationTokenSource();
+        var localToken = _lastTransitionCts.Token;
 
         if (PageTransition != null)
-            await PageTransition.Start(this, null, true, _lastTransitionCts.Token);
+            await PageTransition.Start(this, null, true, localToken);
+
+        if (localToken.IsCancellationRequested)
+        {
+            return;
+        }
 
         CurrentContent = content;
 
         if (PageTransition != null)
-            await PageTransition.Start(null, this, true, _lastTransitionCts.Token);
+            await PageTransition.Start(null, this, true, localToken);
     }
 }

From 2132ba2cc909884fb069b384f5ac30fce7cc63b5 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Sat, 6 Aug 2022 03:58:45 -0400
Subject: [PATCH 237/240] Delete legacy ReactiveUI.TransitioningContentControl

---
 .../TransitioningContentControl.cs            | 80 -------------------
 1 file changed, 80 deletions(-)
 delete mode 100644 src/Avalonia.ReactiveUI/TransitioningContentControl.cs

diff --git a/src/Avalonia.ReactiveUI/TransitioningContentControl.cs b/src/Avalonia.ReactiveUI/TransitioningContentControl.cs
deleted file mode 100644
index d26e90b2da..0000000000
--- a/src/Avalonia.ReactiveUI/TransitioningContentControl.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-using System;
-using System.Threading;
-
-using Avalonia.Animation;
-using Avalonia.Controls;
-using Avalonia.Styling;
-
-namespace Avalonia.ReactiveUI
-{
-    /// <summary>
-    /// A ContentControl that animates the transition when its content is changed.
-    /// </summary>
-    [Obsolete("Use TransitioningContentControl in Avalonia.Controls namespace")]
-    public class TransitioningContentControl : ContentControl, IStyleable
-    {
-        /// <summary>
-        /// <see cref="AvaloniaProperty"/> for the <see cref="PageTransition"/> property.
-        /// </summary>
-        public static readonly StyledProperty<IPageTransition?> PageTransitionProperty =
-            AvaloniaProperty.Register<TransitioningContentControl, IPageTransition?>(nameof(PageTransition),
-                new CrossFade(TimeSpan.FromSeconds(0.5)));
-
-        /// <summary>
-        /// <see cref="AvaloniaProperty"/> for the <see cref="DefaultContent"/> property.
-        /// </summary>
-        public static readonly StyledProperty<object?> DefaultContentProperty =
-            AvaloniaProperty.Register<TransitioningContentControl, object?>(nameof(DefaultContent));
-
-        private CancellationTokenSource? _lastTransitionCts;
-
-        /// <summary>
-        /// Gets or sets the animation played when content appears and disappears.
-        /// </summary>
-        public IPageTransition? PageTransition
-        {
-            get => GetValue(PageTransitionProperty);
-            set => SetValue(PageTransitionProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the content displayed whenever there is no page currently routed.
-        /// </summary>
-        public object? DefaultContent
-        {
-            get => GetValue(DefaultContentProperty);
-            set => SetValue(DefaultContentProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the content with animation.
-        /// </summary>
-        public new object? Content
-        {
-            get => base.Content;
-            set => UpdateContentWithTransition(value);
-        }
-        
-        /// <summary>
-        /// TransitioningContentControl uses the default ContentControl 
-        /// template from Avalonia default theme.
-        /// </summary>
-        Type IStyleable.StyleKey => typeof(ContentControl);
-
-        /// <summary>
-        /// Updates the content with transitions.
-        /// </summary>
-        /// <param name="content">New content to set.</param>
-        private async void UpdateContentWithTransition(object? content)
-        {
-            _lastTransitionCts?.Cancel();
-            _lastTransitionCts = new CancellationTokenSource();
-
-            if (PageTransition != null)
-                await PageTransition.Start(this, null, true, _lastTransitionCts.Token);
-            base.Content = content;
-            if (PageTransition != null)
-                await PageTransition.Start(null, this, true, _lastTransitionCts.Token);
-        }
-    }
-}

From a4c220cdcc6021f5a7d8b3cb805ff108e5eff31f Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Sat, 6 Aug 2022 04:45:22 -0400
Subject: [PATCH 238/240] Enable android composition renderer

---
 src/Android/Avalonia.Android/AndroidPlatform.cs   | 15 +++++++++++++--
 .../Platform/SkiaPlatform/TopLevelImpl.cs         |  9 ++++++---
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/Android/Avalonia.Android/AndroidPlatform.cs b/src/Android/Avalonia.Android/AndroidPlatform.cs
index 0c72c389dc..89444dea10 100644
--- a/src/Android/Avalonia.Android/AndroidPlatform.cs
+++ b/src/Android/Avalonia.Android/AndroidPlatform.cs
@@ -8,7 +8,8 @@ using Avalonia.Input.Platform;
 using Avalonia.OpenGL.Egl;
 using Avalonia.Platform;
 using Avalonia.Rendering;
-using Avalonia.Skia;
+using Avalonia.Rendering.Composition;
+using Avalonia.OpenGL;
 
 namespace Avalonia
 {
@@ -42,6 +43,8 @@ namespace Avalonia.Android
 
         public TimeSpan DoubleClickTime => TimeSpan.FromMilliseconds(500);
 
+        internal static Compositor Compositor { get; private set; }
+
         public static void Initialize(AndroidPlatformOptions options)
         {
             Options = options;
@@ -62,12 +65,20 @@ namespace Avalonia.Android
             {
                 EglPlatformOpenGlInterface.TryInitialize();
             }
+            
+            if (options.UseCompositor)
+            {
+                Compositor = new Compositor(
+                    AvaloniaLocator.Current.GetRequiredService<IRenderLoop>(),
+                    AvaloniaLocator.Current.GetService<IPlatformOpenGlInterface>());
+            }
         }
     }
 
     public sealed class AndroidPlatformOptions
     {
-        public bool UseDeferredRendering { get; set; } = true;
+        public bool UseDeferredRendering { get; set; } = false;
         public bool UseGpu { get; set; } = true;
+        public bool UseCompositor { get; set; } = true;
     }
 }
diff --git a/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs b/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
index fd97e293f9..3484ea2317 100644
--- a/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
+++ b/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
@@ -19,6 +19,7 @@ using Avalonia.OpenGL.Surfaces;
 using Avalonia.Platform;
 using Avalonia.Platform.Storage;
 using Avalonia.Rendering;
+using Avalonia.Rendering.Composition;
 
 namespace Avalonia.Android.Platform.SkiaPlatform
 {
@@ -84,9 +85,11 @@ namespace Avalonia.Android.Platform.SkiaPlatform
         public IEnumerable<object> Surfaces => new object[] { _gl, _framebuffer, Handle };
 
         public IRenderer CreateRenderer(IRenderRoot root) =>
-            AndroidPlatform.Options.UseDeferredRendering
-            ? new DeferredRenderer(root, AvaloniaLocator.Current.GetService<IRenderLoop>()) { RenderOnlyOnRenderThread = true }
-            : new ImmediateRenderer(root);
+            AndroidPlatform.Options.UseCompositor
+                ? new CompositingRenderer(root, AndroidPlatform.Compositor) { DrawFps = true }
+                : AndroidPlatform.Options.UseDeferredRendering
+                    ? new DeferredRenderer(root, AvaloniaLocator.Current.GetRequiredService<IRenderLoop>()) { RenderOnlyOnRenderThread = true }
+                    : new ImmediateRenderer(root);
 
         public virtual void Hide()
         {

From 748a25df0d8210c070c07dd9e0cd7a95ffa12e5f Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Sat, 6 Aug 2022 22:38:36 -0400
Subject: [PATCH 239/240] Restore missing DefaultContentProperty prop

---
 src/Avalonia.ReactiveUI/RoutedViewHost.cs    | 15 +++++++++++++++
 src/Avalonia.ReactiveUI/ViewModelViewHost.cs | 18 ++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/src/Avalonia.ReactiveUI/RoutedViewHost.cs b/src/Avalonia.ReactiveUI/RoutedViewHost.cs
index 9269dc70f8..775014d419 100644
--- a/src/Avalonia.ReactiveUI/RoutedViewHost.cs
+++ b/src/Avalonia.ReactiveUI/RoutedViewHost.cs
@@ -64,6 +64,12 @@ namespace Avalonia.ReactiveUI
         public static readonly StyledProperty<string?> ViewContractProperty =
             AvaloniaProperty.Register<RoutedViewHost, string?>(nameof(ViewContract));
 
+        /// <summary>
+        /// <see cref="AvaloniaProperty"/> for the <see cref="DefaultContent"/> property.
+        /// </summary>
+        public static readonly StyledProperty<object?> DefaultContentProperty =
+            ViewModelViewHost.DefaultContentProperty.AddOwner<RoutedViewHost>();
+
         /// <summary>
         /// Initializes a new instance of the <see cref="RoutedViewHost"/> class.
         /// </summary>
@@ -106,6 +112,15 @@ namespace Avalonia.ReactiveUI
             set => SetValue(ViewContractProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets the content displayed whenever there is no page currently routed.
+        /// </summary>
+        public object? DefaultContent
+        {
+            get => GetValue(DefaultContentProperty);
+            set => SetValue(DefaultContentProperty, value);
+        }
+
         /// <summary>
         /// Gets or sets the ReactiveUI view locator used by this router.
         /// </summary>
diff --git a/src/Avalonia.ReactiveUI/ViewModelViewHost.cs b/src/Avalonia.ReactiveUI/ViewModelViewHost.cs
index 16dee00ebc..869238b377 100644
--- a/src/Avalonia.ReactiveUI/ViewModelViewHost.cs
+++ b/src/Avalonia.ReactiveUI/ViewModelViewHost.cs
@@ -1,5 +1,8 @@
 using System;
 using System.Reactive.Disposables;
+
+using Avalonia.Controls;
+
 using ReactiveUI;
 using Splat;
 
@@ -24,6 +27,12 @@ namespace Avalonia.ReactiveUI
         public static readonly StyledProperty<string?> ViewContractProperty =
             AvaloniaProperty.Register<ViewModelViewHost, string?>(nameof(ViewContract));
 
+        /// <summary>
+        /// <see cref="AvaloniaProperty"/> for the <see cref="DefaultContent"/> property.
+        /// </summary>
+        public static readonly StyledProperty<object?> DefaultContentProperty =
+            AvaloniaProperty.Register<ViewModelViewHost, object?>(nameof(DefaultContent));
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ViewModelViewHost"/> class.
         /// </summary>
@@ -55,6 +64,15 @@ namespace Avalonia.ReactiveUI
             set => SetValue(ViewContractProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets the content displayed whenever there is no page currently routed.
+        /// </summary>
+        public object? DefaultContent
+        {
+            get => GetValue(DefaultContentProperty);
+            set => SetValue(DefaultContentProperty, value);
+        }
+
         /// <summary>
         /// Gets or sets the view locator.
         /// </summary>

From 8436e0f7624a050b7e256abcf7d7a1d8f5aae30d Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Sun, 7 Aug 2022 01:32:48 -0400
Subject: [PATCH 240/240] Remove test that doesn't make sense anymore

---
 .../TransitioningContentControlTest.cs                    | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/tests/Avalonia.ReactiveUI.UnitTests/TransitioningContentControlTest.cs b/tests/Avalonia.ReactiveUI.UnitTests/TransitioningContentControlTest.cs
index 6ca617d2d4..daa3830b7d 100644
--- a/tests/Avalonia.ReactiveUI.UnitTests/TransitioningContentControlTest.cs
+++ b/tests/Avalonia.ReactiveUI.UnitTests/TransitioningContentControlTest.cs
@@ -12,14 +12,6 @@ namespace Avalonia.ReactiveUI.UnitTests
 {
     public class TransitioningContentControlTest
     {
-        [Fact]
-        public void Transitioning_Control_Should_Derive_Template_From_Content_Control()
-        {
-            var target = new TransitioningContentControl();
-            var stylable = (IStyledElement)target;
-            Assert.Equal(typeof(ContentControl),stylable.StyleKey);
-        }
-
         [Fact]
         public void Transitioning_Control_Template_Should_Be_Instantiated() 
         {