diff --git a/native/Avalonia.Native/src/OSX/AvnWindow.mm b/native/Avalonia.Native/src/OSX/AvnWindow.mm
index d3b7b4ede6..23abf1d53f 100644
--- a/native/Avalonia.Native/src/OSX/AvnWindow.mm
+++ b/native/Avalonia.Native/src/OSX/AvnWindow.mm
@@ -223,6 +223,19 @@
     }
 }
 
+// From chromium:
+//
+// > The delegate or the window class should implement this method so that
+// > -[NSWindow isZoomed] can be then determined by whether or not the current
+// > window frame is equal to the zoomed frame.
+//
+// If we don't implement this, then isZoomed always returns true for a non-
+// resizable window ¯\_(ツ)_/¯
+- (NSRect)windowWillUseStandardFrame:(NSWindow*)window
+                        defaultFrame:(NSRect)newFrame {
+  return newFrame;
+}
+
 -(BOOL)canBecomeKeyWindow
 {
     if(_canBecomeKeyWindow)
@@ -261,10 +274,6 @@
 -(void) setEnabled:(bool)enable
 {
     _isEnabled = enable;
-    
-    [[self standardWindowButton:NSWindowCloseButton] setEnabled:enable];
-    [[self standardWindowButton:NSWindowMiniaturizeButton] setEnabled:enable];
-    [[self standardWindowButton:NSWindowZoomButton] setEnabled:enable];
 }
 
 -(void)becomeKeyWindow
diff --git a/native/Avalonia.Native/src/OSX/PopupImpl.mm b/native/Avalonia.Native/src/OSX/PopupImpl.mm
index 9820a9f052..972d03d08c 100644
--- a/native/Avalonia.Native/src/OSX/PopupImpl.mm
+++ b/native/Avalonia.Native/src/OSX/PopupImpl.mm
@@ -29,7 +29,7 @@ private:
         [Window setLevel:NSPopUpMenuWindowLevel];
     }
 protected:
-    virtual NSWindowStyleMask GetStyle() override
+    virtual NSWindowStyleMask CalculateStyleMask() override
     {
         return NSWindowStyleMaskBorderless;
     }
diff --git a/native/Avalonia.Native/src/OSX/WindowBaseImpl.h b/native/Avalonia.Native/src/OSX/WindowBaseImpl.h
index 4c2758f6c6..93decef136 100644
--- a/native/Avalonia.Native/src/OSX/WindowBaseImpl.h
+++ b/native/Avalonia.Native/src/OSX/WindowBaseImpl.h
@@ -105,9 +105,8 @@ BEGIN_INTERFACE_MAP()
     virtual void BringToFront ();
 
 protected:
-    virtual NSWindowStyleMask GetStyle();
-
-    void UpdateStyle();
+    virtual NSWindowStyleMask CalculateStyleMask() = 0;
+    virtual void UpdateStyle();
 
 private:
     void CreateNSWindow (bool isDialog);
diff --git a/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm b/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm
index 038e9a048c..59102e15a6 100644
--- a/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm
+++ b/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm
@@ -35,18 +35,14 @@ WindowBaseImpl::WindowBaseImpl(IAvnWindowBaseEvents *events, IAvnGlContext *gl,
     lastSize = NSSize { 100, 100 };
     lastMaxSize = NSSize { CGFLOAT_MAX, CGFLOAT_MAX};
     lastMinSize = NSSize { 0, 0 };
-
     lastMenu = nullptr;
     
     CreateNSWindow(usePanel);
     
     [Window setContentView:StandardContainer];
-    [Window setStyleMask:NSWindowStyleMaskBorderless];
     [Window setBackingType:NSBackingStoreBuffered];
-
     [Window setContentMinSize:lastMinSize];
     [Window setContentMaxSize:lastMaxSize];
-
     [Window setOpaque:false];
 }
 
@@ -564,12 +560,8 @@ bool WindowBaseImpl::IsModal() {
     return false;
 }
 
-NSWindowStyleMask WindowBaseImpl::GetStyle() {
-    return NSWindowStyleMaskBorderless;
-}
-
 void WindowBaseImpl::UpdateStyle() {
-    [Window setStyleMask:GetStyle()];
+    [Window setStyleMask:CalculateStyleMask()];
 }
 
 void WindowBaseImpl::CleanNSWindow() {
@@ -580,21 +572,12 @@ void WindowBaseImpl::CleanNSWindow() {
     }
 }
 
-void WindowBaseImpl::CreateNSWindow(bool isDialog) {
-    if (isDialog) {
-        if (![Window isKindOfClass:[AvnPanel class]]) {
-            CleanNSWindow();
-
-            Window = [[AvnPanel alloc] initWithParent:this contentRect:NSRect{0, 0, lastSize} styleMask:GetStyle()];
-            
-            [Window setHidesOnDeactivate:false];
-        }
+void WindowBaseImpl::CreateNSWindow(bool usePanel) {
+    if (usePanel) {
+        Window = [[AvnPanel alloc] initWithParent:this contentRect:NSRect{0, 0, lastSize} styleMask:NSWindowStyleMaskBorderless];
+        [Window setHidesOnDeactivate:false];
     } else {
-        if (![Window isKindOfClass:[AvnWindow class]]) {
-            CleanNSWindow();
-
-            Window = [[AvnWindow alloc] initWithParent:this contentRect:NSRect{0, 0, lastSize} styleMask:GetStyle()];
-        }
+        Window = [[AvnWindow alloc] initWithParent:this contentRect:NSRect{0, 0, lastSize} styleMask:NSWindowStyleMaskBorderless];
     }
 }
 
diff --git a/native/Avalonia.Native/src/OSX/WindowImpl.h b/native/Avalonia.Native/src/OSX/WindowImpl.h
index 3861aaf170..29bb659039 100644
--- a/native/Avalonia.Native/src/OSX/WindowImpl.h
+++ b/native/Avalonia.Native/src/OSX/WindowImpl.h
@@ -41,8 +41,6 @@ BEGIN_INTERFACE_MAP()
 
     WindowImpl(IAvnWindowEvents* events, IAvnGlContext* gl);
 
-    void HideOrShowTrafficLights ();
-
     virtual HRESULT Show (bool activate, bool isDialog) override;
 
     virtual HRESULT SetEnabled (bool enable) override;
@@ -100,9 +98,11 @@ BEGIN_INTERFACE_MAP()
     bool CanBecomeKeyWindow ();
 
 protected:
-    virtual NSWindowStyleMask GetStyle() override;
+    virtual NSWindowStyleMask CalculateStyleMask() override;
+    void UpdateStyle () override;
 
 private:
+    void ZOrderChildWindows();
     void OnInitialiseNSWindow();
     NSString *_lastTitle;
 };
diff --git a/native/Avalonia.Native/src/OSX/WindowImpl.mm b/native/Avalonia.Native/src/OSX/WindowImpl.mm
index ce82f7d83f..cf1ee6943d 100644
--- a/native/Avalonia.Native/src/OSX/WindowImpl.mm
+++ b/native/Avalonia.Native/src/OSX/WindowImpl.mm
@@ -30,19 +30,6 @@ WindowImpl::WindowImpl(IAvnWindowEvents *events, IAvnGlContext *gl) : WindowBase
     OnInitialiseNSWindow();
 }
 
-void WindowImpl::HideOrShowTrafficLights() {
-    if (Window == nil) {
-        return;
-    }
-
-    bool wantsChrome = (_extendClientHints & AvnSystemChrome) || (_extendClientHints & AvnPreferSystemChrome);
-    bool hasTrafficLights = _isClientAreaExtended ? wantsChrome : _decorations == SystemDecorationsFull;
-    
-    [[Window standardWindowButton:NSWindowCloseButton] setHidden:!hasTrafficLights];
-    [[Window standardWindowButton:NSWindowMiniaturizeButton] setHidden:!hasTrafficLights];
-    [[Window standardWindowButton:NSWindowZoomButton] setHidden:!hasTrafficLights];
-}
-
 void WindowImpl::OnInitialiseNSWindow(){
     [GetWindowProtocol() setCanBecomeKeyWindow:true];
     
@@ -67,8 +54,6 @@ HRESULT WindowImpl::Show(bool activate, bool isDialog) {
 
         WindowBaseImpl::Show(activate, isDialog);
         GetWindowState(&_actualWindowState);
-        HideOrShowTrafficLights();
-
         return SetWindowState(_lastWindowState);
     }
 }
@@ -134,14 +119,19 @@ void WindowImpl::BringToFront()
         }
         
         [Window invalidateShadow];
+        ZOrderChildWindows();
+    }
+}
+
+void WindowImpl::ZOrderChildWindows()
+{
+    for(auto iterator = _children.begin(); iterator != _children.end(); iterator++)
+    {
+        auto window = (*iterator)->Window;
         
-        for(auto iterator = _children.begin(); iterator != _children.end(); iterator++)
-        {
-            auto window = (*iterator)->Window;
-            
-            // #9565: Only bring window to front if it's on the currently active space
-            if ([window isOnActiveSpace])
-                (*iterator)->BringToFront();
+        // #9565: Only bring window to front if it's on the currently active space
+        if ([window isOnActiveSpace]) {
+            (*iterator)->BringToFront();
         }
     }
 }
@@ -161,13 +151,15 @@ bool WindowImpl::CanBecomeKeyWindow()
 
 void WindowImpl::StartStateTransition() {
     _transitioningWindowState = true;
+    UpdateStyle();
 }
 
 void WindowImpl::EndStateTransition() {
     _transitioningWindowState = false;
-    
+    UpdateStyle();
+
     // Ensure correct order of child windows after fullscreen transition.
-    BringToFront();
+    ZOrderChildWindows();
 }
 
 SystemDecorations WindowImpl::Decorations() {
@@ -225,16 +217,12 @@ bool WindowImpl::IsZoomed() {
 }
 
 void WindowImpl::DoZoom() {
-    switch (_decorations) {
-        case SystemDecorationsNone:
-        case SystemDecorationsBorderOnly:
-            [Window setFrame:[Window screen].visibleFrame display:true];
-            break;
-
-
-        case SystemDecorationsFull:
-            [Window performZoom:Window];
-            break;
+    if (_decorations == SystemDecorationsNone ||
+        _decorations == SystemDecorationsBorderOnly ||
+        _canResize == false) {
+        [Window setFrame:[Window screen].visibleFrame display:true];
+    } else {
+        [Window performZoom:Window];
     }
 }
 
@@ -261,8 +249,6 @@ HRESULT WindowImpl::SetDecorations(SystemDecorations value) {
 
         UpdateStyle();
 
-        HideOrShowTrafficLights();
-
         switch (_decorations) {
             case SystemDecorationsNone:
                 [Window setHasShadow:NO];
@@ -419,9 +405,6 @@ HRESULT WindowImpl::SetExtendClientArea(bool enable) {
             }
 
             [GetWindowProtocol() setIsExtended:enable];
-
-            HideOrShowTrafficLights();
-
             UpdateStyle();
         }
 
@@ -577,14 +560,16 @@ bool WindowImpl::IsOwned() {
     return _parent != nullptr;
 }
 
-NSWindowStyleMask WindowImpl::GetStyle() {
-    unsigned long s = NSWindowStyleMaskBorderless;
+NSWindowStyleMask WindowImpl::CalculateStyleMask() {
+    // Use the current style mask and only clear the flags we're going to be modifying.
+    unsigned long s = [Window styleMask] &
+        ~(NSWindowStyleMaskFullSizeContentView |
+          NSWindowStyleMaskTitled |
+          NSWindowStyleMaskClosable |
+          NSWindowStyleMaskResizable |
+          NSWindowStyleMaskMiniaturizable |
+          NSWindowStyleMaskTexturedBackground);
     
-    if(_actualWindowState == FullScreen)
-    {
-        s |= NSWindowStyleMaskFullScreen;
-    }
-
     switch (_decorations) {
         case SystemDecorationsNone:
             s = s | NSWindowStyleMaskFullSizeContentView;
@@ -597,7 +582,7 @@ NSWindowStyleMask WindowImpl::GetStyle() {
         case SystemDecorationsFull:
             s = s | NSWindowStyleMaskTitled | NSWindowStyleMaskClosable;
 
-            if (_canResize && _isEnabled) {
+            if ((_canResize && _isEnabled) || _transitioningWindowState) {
                 s = s | NSWindowStyleMaskResizable;
             }
             break;
@@ -612,3 +597,25 @@ NSWindowStyleMask WindowImpl::GetStyle() {
     }
     return s;
 }
+
+void WindowImpl::UpdateStyle() {
+    WindowBaseImpl::UpdateStyle();
+    
+    if (Window == nil) {
+        return;
+    }
+
+    bool wantsChrome = (_extendClientHints & AvnSystemChrome) || (_extendClientHints & AvnPreferSystemChrome);
+    bool hasTrafficLights = _isClientAreaExtended ? wantsChrome : _decorations == SystemDecorationsFull;
+    
+    NSButton* closeButton = [Window standardWindowButton:NSWindowCloseButton];
+    NSButton* miniaturizeButton = [Window standardWindowButton:NSWindowMiniaturizeButton];
+    NSButton* zoomButton = [Window standardWindowButton:NSWindowZoomButton];
+
+    [closeButton setHidden:!hasTrafficLights];
+    [closeButton setEnabled:_isEnabled];
+    [miniaturizeButton setHidden:!hasTrafficLights];
+    [miniaturizeButton setEnabled:_isEnabled];
+    [zoomButton setHidden:!hasTrafficLights];
+    [zoomButton setEnabled:_isEnabled && _canResize];
+}
diff --git a/samples/IntegrationTestApp/MainWindow.axaml b/samples/IntegrationTestApp/MainWindow.axaml
index 4e5a8463df..a6f463fdcb 100644
--- a/samples/IntegrationTestApp/MainWindow.axaml
+++ b/samples/IntegrationTestApp/MainWindow.axaml
@@ -140,6 +140,7 @@
               <ComboBoxItem Name="ShowWindowStateMaximized">Maximized</ComboBoxItem>
               <ComboBoxItem Name="ShowWindowStateFullScreen">FullScreen</ComboBoxItem>
             </ComboBox>
+            <CheckBox Name="ShowWindowCanResize" IsChecked="True">Can Resize</CheckBox>
             <Button Name="ShowWindow">Show Window</Button>
             <Button Name="SendToBack">Send to Back</Button>
             <Button Name="EnterFullscreen">Enter Fullscreen</Button>
diff --git a/samples/IntegrationTestApp/MainWindow.axaml.cs b/samples/IntegrationTestApp/MainWindow.axaml.cs
index 3cd5350cce..087f25666b 100644
--- a/samples/IntegrationTestApp/MainWindow.axaml.cs
+++ b/samples/IntegrationTestApp/MainWindow.axaml.cs
@@ -66,11 +66,13 @@ namespace IntegrationTestApp
             var locationComboBox = this.GetControl<ComboBox>("ShowWindowLocation");
             var stateComboBox = this.GetControl<ComboBox>("ShowWindowState");
             var size = !string.IsNullOrWhiteSpace(sizeTextBox.Text) ? Size.Parse(sizeTextBox.Text) : (Size?)null;
+            var canResizeCheckBox = this.GetControl<CheckBox>("ShowWindowCanResize");
             var owner = (Window)this.GetVisualRoot()!;
 
             var window = new ShowWindowTest
             {
                 WindowStartupLocation = (WindowStartupLocation)locationComboBox.SelectedIndex,
+                CanResize = canResizeCheckBox.IsChecked.Value,
             };
 
             if (Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime lifetime)
diff --git a/samples/MobileSandbox/MainView.xaml b/samples/MobileSandbox/MainView.xaml
index 1eab13aa75..5d35ec3fec 100644
--- a/samples/MobileSandbox/MainView.xaml
+++ b/samples/MobileSandbox/MainView.xaml
@@ -5,8 +5,8 @@
              x:DataType="mobileSandbox:MainView">
   <StackPanel Margin="100 50" Spacing="50">
     <TextBlock Text="Login" Foreground="White" />
-    <TextBox Watermark="Text" />
-    <TextBox Watermark="Username" TextInputOptions.ContentType="Email" AcceptsReturn="True" TextInputOptions.ReturnKeyType="Search" />
+    <TextBox TextInputOptions.Multiline="True" AcceptsReturn="True" Watermark="Text" Height="200" TextWrapping="Wrap"/>
+    <TextBox Watermark="Username" TextInputOptions.ContentType="Email" TextInputOptions.ReturnKeyType="Done" />
     <TextBox Watermark="Password" PasswordChar="*" TextInputOptions.ContentType="Password" />
     <TextBox Watermark="Pin" PasswordChar="*" TextInputOptions.ContentType="Digits" />
     <Button Content="Login" Command="{Binding ButtonCommand}" />
diff --git a/src/Android/Avalonia.Android/AndroidInputMethod.cs b/src/Android/Avalonia.Android/AndroidInputMethod.cs
index c885a7768c..27dcfe8645 100644
--- a/src/Android/Avalonia.Android/AndroidInputMethod.cs
+++ b/src/Android/Avalonia.Android/AndroidInputMethod.cs
@@ -5,8 +5,10 @@ using Android.Text;
 using Android.Views;
 using Android.Views.InputMethods;
 using Avalonia.Android.Platform.SkiaPlatform;
+using Avalonia.Controls.Presenters;
 using Avalonia.Input;
 using Avalonia.Input.TextInput;
+using Avalonia.Reactive;
 
 namespace Avalonia.Android
 {
@@ -32,7 +34,7 @@ namespace Avalonia.Android
        ActionPrevious = 0x00000007,
     }
 
-    class AndroidInputMethod<TView> : ITextInputMethodImpl, IAndroidInputMethod
+    internal class AndroidInputMethod<TView> : ITextInputMethodImpl, IAndroidInputMethod
         where TView : View, IInitEditorInfo
     {
         private readonly TView _host;
@@ -68,23 +70,10 @@ namespace Avalonia.Android
 
         public void SetClient(ITextInputMethodClient client)
         {
-            if (_client != null)
-            {
-                _client.SurroundingTextChanged -= SurroundingTextChanged;
-            }
-
-            if(_inputConnection != null)
-            {
-                _inputConnection.ComposingText = null;
-                _inputConnection.ComposingRegion = default;
-            }
-
             _client = client;
 
             if (IsActive)
             {
-                _client.SurroundingTextChanged += SurroundingTextChanged;
-
                 _host.RequestFocus();
 
                 _imm.RestartInput(View);              
@@ -101,24 +90,6 @@ namespace Avalonia.Android
             }
         }
 
-        private void SurroundingTextChanged(object sender, EventArgs e)
-        {
-            if (IsActive && _inputConnection != null)
-            {
-                var surroundingText = Client.SurroundingText;
-
-                _inputConnection.SurroundingText = surroundingText;
-
-                _imm.UpdateSelection(_host, surroundingText.AnchorOffset, surroundingText.CursorOffset, surroundingText.AnchorOffset, surroundingText.CursorOffset);
-
-                if (_inputConnection.ComposingText != null && !_inputConnection.IsCommiting && surroundingText.AnchorOffset == surroundingText.CursorOffset)
-                {
-                    _inputConnection.CommitText(_inputConnection.ComposingText, 0);
-                    _inputConnection.SetSelection(surroundingText.AnchorOffset, surroundingText.CursorOffset);
-                }
-            }
-        }
-
         public void SetCursorRect(Rect rect)
         {
             
@@ -157,17 +128,20 @@ namespace Avalonia.Android
                     TextInputReturnKeyType.Search => (ImeFlags)CustomImeFlags.ActionSearch,
                     TextInputReturnKeyType.Next => (ImeFlags)CustomImeFlags.ActionNext,
                     TextInputReturnKeyType.Previous => (ImeFlags)CustomImeFlags.ActionPrevious,
-                    _ => (ImeFlags)CustomImeFlags.ActionDone
+                    TextInputReturnKeyType.Done => (ImeFlags)CustomImeFlags.ActionDone,
+                    _ => options.Multiline ? ImeFlags.NoEnterAction : (ImeFlags)CustomImeFlags.ActionDone
                 };
 
                 outAttrs.ImeOptions |= ImeFlags.NoFullscreen | ImeFlags.NoExtractUi;
 
+                _client.TextEditable = _inputConnection.InputEditable;
+
                 return _inputConnection;
             });
         }
     }
 
-    public readonly record struct ComposingRegion
+    internal readonly record struct ComposingRegion
     {
         private readonly int _start = -1;
         private readonly int _end = -1;
diff --git a/src/Android/Avalonia.Android/Avalonia.Android.csproj b/src/Android/Avalonia.Android/Avalonia.Android.csproj
index 66557418dd..2533016e9f 100644
--- a/src/Android/Avalonia.Android/Avalonia.Android.csproj
+++ b/src/Android/Avalonia.Android/Avalonia.Android.csproj
@@ -5,6 +5,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <MSBuildEnableWorkloadResolver>true</MSBuildEnableWorkloadResolver>
     <DebugType>portable</DebugType>
+    <AndroidResgenNamespace>Avalonia.Android.Internal</AndroidResgenNamespace>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\packages\Avalonia\Avalonia.csproj" />
diff --git a/src/Android/Avalonia.Android/InputEditable.cs b/src/Android/Avalonia.Android/InputEditable.cs
new file mode 100644
index 0000000000..c5b68d2652
--- /dev/null
+++ b/src/Android/Avalonia.Android/InputEditable.cs
@@ -0,0 +1,127 @@
+using System;
+using Android.Runtime;
+using Android.Text;
+using Android.Views;
+using Android.Views.InputMethods;
+using Avalonia.Android.Platform.SkiaPlatform;
+using Avalonia.Controls.Presenters;
+using Avalonia.Input;
+using Avalonia.Input.Raw;
+using Avalonia.Input.TextInput;
+using Java.Lang;
+using static System.Net.Mime.MediaTypeNames;
+
+namespace Avalonia.Android
+{
+    internal class InputEditable : SpannableStringBuilder, ITextEditable
+    {
+        private readonly TopLevelImpl _topLevel;
+        private readonly IAndroidInputMethod _inputMethod;
+        private readonly AvaloniaInputConnection _avaloniaInputConnection;
+        private int _currentBatchLevel;
+        private string _previousText;
+        private int _previousSelectionStart;
+        private int _previousSelectionEnd;
+
+        public event EventHandler TextChanged;
+        public event EventHandler SelectionChanged;
+        public event EventHandler CompositionChanged;
+
+        public InputEditable(TopLevelImpl topLevel, IAndroidInputMethod inputMethod, AvaloniaInputConnection avaloniaInputConnection)
+        {
+            _topLevel = topLevel;
+            _inputMethod = inputMethod;
+            _avaloniaInputConnection = avaloniaInputConnection;
+        }
+
+        public InputEditable(ICharSequence text) : base(text)
+        {
+        }
+
+        public InputEditable(string text) : base(text)
+        {
+        }
+
+        public InputEditable(ICharSequence text, int start, int end) : base(text, start, end)
+        {
+        }
+
+        public InputEditable(string text, int start, int end) : base(text, start, end)
+        {
+        }
+
+        protected InputEditable(IntPtr javaReference, JniHandleOwnership transfer) : base(javaReference, transfer)
+        {
+        }
+
+        public int SelectionStart
+        {
+            get => Selection.GetSelectionStart(this); set
+            {
+                var end = SelectionEnd < 0 ? 0 : SelectionEnd;
+                _avaloniaInputConnection.SetSelection(value, end);
+                _inputMethod.IMM.UpdateSelection(_topLevel.View, value, end, value, end);
+            }
+        }
+        public int SelectionEnd
+        {
+            get => Selection.GetSelectionEnd(this); set
+            {
+                var start = SelectionStart < 0 ? 0 : SelectionStart;
+                _avaloniaInputConnection.SetSelection(start, value);
+                _inputMethod.IMM.UpdateSelection(_topLevel.View, start, value, start, value);
+            }
+        }
+
+        public string? Text
+        {
+            get => ToString(); set
+            {
+                if (Text != value)
+                {
+                    Clear();
+                    Insert(0, value ?? "");
+                }
+            }
+        }
+
+        public int CompositionStart => BaseInputConnection.GetComposingSpanStart(this);
+
+        public int CompositionEnd => BaseInputConnection.GetComposingSpanEnd(this);
+
+        public void BeginBatchEdit()
+        {
+            _currentBatchLevel++;
+
+            if (_currentBatchLevel == 1)
+            {
+                _previousText = ToString();
+                _previousSelectionStart =  SelectionStart;
+                _previousSelectionEnd = SelectionEnd;
+            }
+        }
+
+        public void EndBatchEdit()
+        {
+            if (_currentBatchLevel == 1)
+            {
+                if(_previousText != Text)
+                {
+                    TextChanged?.Invoke(this, EventArgs.Empty);
+                }
+
+                if (_previousSelectionStart != SelectionStart || _previousSelectionEnd != SelectionEnd)
+                {
+                    SelectionChanged?.Invoke(this, EventArgs.Empty);
+                }
+            }
+
+            _currentBatchLevel--;
+        }
+
+        public void RaiseCompositionChanged()
+        {
+            CompositionChanged?.Invoke(this, EventArgs.Empty);
+        }
+    }
+}
diff --git a/src/Android/Avalonia.Android/Platform/Input/AndroidKeyboardDevice.cs b/src/Android/Avalonia.Android/Platform/Input/AndroidKeyboardDevice.cs
index 726ccdbbdd..ab84801e57 100644
--- a/src/Android/Avalonia.Android/Platform/Input/AndroidKeyboardDevice.cs
+++ b/src/Android/Avalonia.Android/Platform/Input/AndroidKeyboardDevice.cs
@@ -5,7 +5,7 @@ using Avalonia.Input;
 
 namespace Avalonia.Android.Platform.Input
 {
-    public class AndroidKeyboardDevice : KeyboardDevice, IKeyboardDevice {
+    internal class AndroidKeyboardDevice : KeyboardDevice, IKeyboardDevice {
     private static readonly Dictionary<Keycode, Key> KeyDic = new Dictionary<Keycode, Key>
      {
          //   { Keycode.Cancel?, Key.Cancel },
diff --git a/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs b/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs
index f205458f0e..47297a4f76 100644
--- a/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs
+++ b/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs
@@ -10,7 +10,7 @@ using Avalonia.Platform;
 
 namespace Avalonia.Android
 {
-    public abstract class InvalidationAwareSurfaceView : SurfaceView, ISurfaceHolderCallback, IPlatformNativeSurfaceHandle
+    internal abstract class InvalidationAwareSurfaceView : SurfaceView, ISurfaceHolderCallback, IPlatformNativeSurfaceHandle
     {
         bool _invalidateQueued;
         readonly object _lock = new object();
diff --git a/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs b/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
index 693a26f3bd..e511ed9a8b 100644
--- a/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
+++ b/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
@@ -28,6 +28,7 @@ using Math = System.Math;
 using AndroidRect = Android.Graphics.Rect;
 using Window = Android.Views.Window;
 using Android.Graphics.Drawables;
+using Java.Util;
 
 namespace Avalonia.Android.Platform.SkiaPlatform
 {
@@ -410,159 +411,73 @@ namespace Avalonia.Android.Platform.SkiaPlatform
     {
         private readonly TopLevelImpl _topLevel;
         private readonly IAndroidInputMethod _inputMethod;
+        private readonly InputEditable _editable;
 
         public AvaloniaInputConnection(TopLevelImpl topLevel, IAndroidInputMethod inputMethod) : base(inputMethod.View, true)
         {
             _topLevel = topLevel;
             _inputMethod = inputMethod;
+            _editable = new InputEditable(_topLevel, _inputMethod, this);
         }
 
-        public TextInputMethodSurroundingText SurroundingText { get; set; }
+        public override IEditable Editable => _editable;
 
-        public string ComposingText { get; internal set; }
-
-        public ComposingRegion? ComposingRegion { get; internal set; }
-
-        public bool IsComposing => !string.IsNullOrEmpty(ComposingText);
-        public bool IsCommiting { get; private set; }
+        internal InputEditable InputEditable => _editable;
 
         public override bool SetComposingRegion(int start, int end)
         {
-            //System.Diagnostics.Debug.WriteLine($"Composing Region: [{start}|{end}] {SurroundingText.Text?.Substring(start, end - start)}");
+            var ret = base.SetComposingRegion(start, end);
 
-            ComposingRegion = new ComposingRegion(start, end);
+            InputEditable.RaiseCompositionChanged();
 
-            return base.SetComposingRegion(start, end);
+            return ret;
         }
 
         public override bool SetComposingText(ICharSequence text, int newCursorPosition)
         {
             var composingText = text.ToString();
 
-            ComposingText = composingText;
-
-            _inputMethod.Client?.SetPreeditText(ComposingText);
-
-            return base.SetComposingText(text, newCursorPosition);
-        }
-
-        public override bool FinishComposingText()
-        {
-            if (!string.IsNullOrEmpty(ComposingText))
+            if (string.IsNullOrEmpty(composingText))
             {
-                CommitText(ComposingText, ComposingText.Length);
+                return CommitText(text, newCursorPosition);
             }
             else
             {
-                ComposingRegion = new ComposingRegion(SurroundingText.CursorOffset, SurroundingText.CursorOffset);
-            }
-
-            return base.FinishComposingText();
-        }
-
-        public override ICharSequence GetTextBeforeCursorFormatted(int length, [GeneratedEnum] GetTextFlags flags)
-        {
-            if (!string.IsNullOrEmpty(SurroundingText.Text) && length > 0)
-            {
-                var start = System.Math.Max(SurroundingText.CursorOffset - length, 0);
+                var ret = base.SetComposingText(text, newCursorPosition);
 
-                var end = System.Math.Min(start + length - 1, SurroundingText.CursorOffset);
+                InputEditable.RaiseCompositionChanged();
 
-                var text = SurroundingText.Text.Substring(start, end - start);
-
-                //System.Diagnostics.Debug.WriteLine($"Text Before: {text}");
-
-                return new Java.Lang.String(text);
+                return ret;
             }
-
-            return null;
         }
 
-        public override ICharSequence GetTextAfterCursorFormatted(int length, [GeneratedEnum] GetTextFlags flags)
+        public override bool BeginBatchEdit()
         {
-            if (!string.IsNullOrEmpty(SurroundingText.Text))
-            {
-                var start = SurroundingText.CursorOffset;
-
-                var end = System.Math.Min(start + length, SurroundingText.Text.Length);
-
-                var text = SurroundingText.Text.Substring(start, end - start);
+            _editable.BeginBatchEdit();
 
-                //System.Diagnostics.Debug.WriteLine($"Text After: {text}");
-
-                return new Java.Lang.String(text);
-            }
-
-            return null;
+            return base.BeginBatchEdit();
         }
 
-        public override bool CommitText(ICharSequence text, int newCursorPosition)
+        public override bool EndBatchEdit()
         {
-            IsCommiting = true;
-            var committedText = text.ToString();
-
-            _inputMethod.Client.SetPreeditText(null);
+            var ret = base.EndBatchEdit();
+            _editable.EndBatchEdit();
 
-            int? start, end;
-
-            if(SurroundingText.CursorOffset != SurroundingText.AnchorOffset)
-            {
-                start = Math.Min(SurroundingText.CursorOffset, SurroundingText.AnchorOffset);
-                end = Math.Max(SurroundingText.CursorOffset, SurroundingText.AnchorOffset);
-            }
-            else if (ComposingRegion != null)
-            {
-                start = ComposingRegion?.Start;
-                end = ComposingRegion?.End;
-
-                ComposingRegion = null;
-            }
-            else
-            {
-                start = end = _inputMethod.Client.SurroundingText.CursorOffset;
-            }
-
-            _inputMethod.Client.SelectInSurroundingText((int)start, (int)end);
-
-            var time = DateTime.Now.TimeOfDay;
-
-            var rawTextEvent = new RawTextInputEventArgs(KeyboardDevice.Instance, (ulong)time.Ticks, _topLevel.InputRoot, committedText);
-
-            _topLevel.Input(rawTextEvent);
-
-            ComposingText = null;
-
-            ComposingRegion = new ComposingRegion(newCursorPosition, newCursorPosition);
-
-            return base.CommitText(text, newCursorPosition);
+            return ret;
         }
 
-        public override bool DeleteSurroundingText(int beforeLength, int afterLength)
+        public override bool FinishComposingText()
         {
-            var surroundingText = _inputMethod.Client.SurroundingText;
-
-            var selectionStart = surroundingText.CursorOffset;
-
-            _inputMethod.Client.SelectInSurroundingText(selectionStart - beforeLength, selectionStart + afterLength);
-
-            _inputMethod.View.DispatchKeyEvent(new KeyEvent(KeyEventActions.Down, Keycode.ForwardDel));
-
-            surroundingText = _inputMethod.Client.SurroundingText;
-
-            selectionStart = surroundingText.CursorOffset;
-
-            ComposingRegion = new ComposingRegion(selectionStart, selectionStart);
-
-            return base.DeleteSurroundingText(beforeLength, afterLength);
+            var ret = base.FinishComposingText();
+            InputEditable.RaiseCompositionChanged();
+            return ret;
         }
 
-        public override bool SetSelection(int start, int end)
+        public override bool CommitText(ICharSequence text, int newCursorPosition)
         {
-            _inputMethod.Client.SelectInSurroundingText(start, end);
-
-            ComposingRegion = new ComposingRegion(start, end);
-
-            return base.SetSelection(start, end);
+            var ret = base.CommitText(text, newCursorPosition);
+            InputEditable.RaiseCompositionChanged();
+            return ret;
         }
 
         public override bool PerformEditorAction([GeneratedEnum] ImeAction actionCode)
diff --git a/src/Android/Avalonia.Android/PlatformIconLoader.cs b/src/Android/Avalonia.Android/PlatformIconLoader.cs
index 88677a9375..f557685dd2 100644
--- a/src/Android/Avalonia.Android/PlatformIconLoader.cs
+++ b/src/Android/Avalonia.Android/PlatformIconLoader.cs
@@ -3,7 +3,7 @@ using Avalonia.Platform;
 
 namespace Avalonia.Android
 {
-    class PlatformIconLoader : IPlatformIconLoader
+    internal class PlatformIconLoader : IPlatformIconLoader
     {
         public IWindowIconImpl LoadIcon(IBitmapImpl bitmap)
         {
@@ -29,7 +29,7 @@ namespace Avalonia.Android
     }
 
     // Stores the icon created as a stream to support saving even though an icon is never shown
-    public class FakeIcon : IWindowIconImpl
+    internal class FakeIcon : IWindowIconImpl
     {
         private Stream stream = new MemoryStream();
 
diff --git a/src/Android/Avalonia.Android/Stubs.cs b/src/Android/Avalonia.Android/Stubs.cs
index f36c01dbc8..05638cdf88 100644
--- a/src/Android/Avalonia.Android/Stubs.cs
+++ b/src/Android/Avalonia.Android/Stubs.cs
@@ -4,7 +4,7 @@ using Avalonia.Platform;
 
 namespace Avalonia.Android
 {
-    class WindowingPlatformStub : IWindowingPlatform
+    internal class WindowingPlatformStub : IWindowingPlatform
     {
         public IWindowImpl CreateWindow() => throw new NotSupportedException();
 
@@ -13,7 +13,7 @@ namespace Avalonia.Android
         public ITrayIconImpl CreateTrayIcon() => null;
     }
 
-    class PlatformIconLoaderStub : IPlatformIconLoader
+    internal class PlatformIconLoaderStub : IPlatformIconLoader
     {
         public IWindowIconImpl LoadIcon(IBitmapImpl bitmap)
         {
@@ -38,7 +38,7 @@ namespace Avalonia.Android
         }
     }
 
-    public class IconStub : IWindowIconImpl
+    internal class IconStub : IWindowIconImpl
     {
         private readonly MemoryStream _ms;
 
diff --git a/src/Avalonia.Base/AvaloniaObject.cs b/src/Avalonia.Base/AvaloniaObject.cs
index 74dc55355b..2c9efc7767 100644
--- a/src/Avalonia.Base/AvaloniaObject.cs
+++ b/src/Avalonia.Base/AvaloniaObject.cs
@@ -118,7 +118,7 @@ namespace Avalonia
         {
             _ = property ?? throw new ArgumentNullException(nameof(property));
             VerifyAccess();
-            _values.ClearLocalValue(property);
+            _values.ClearValue(property);
         }
 
         /// <summary>
@@ -152,7 +152,7 @@ namespace Avalonia
             property = property ?? throw new ArgumentNullException(nameof(property));
             VerifyAccess();
 
-            _values.ClearLocalValue(property);
+            _values.ClearValue(property);
         }
 
         /// <summary>
@@ -329,7 +329,7 @@ namespace Avalonia
             if (value is UnsetValueType)
             {
                 if (priority == BindingPriority.LocalValue)
-                    _values.ClearLocalValue(property);
+                    _values.ClearValue(property);
             }
             else if (value is not DoNothingType)
             {
@@ -355,6 +355,57 @@ namespace Avalonia
             SetDirectValueUnchecked(property, value);
         }
 
+        /// <summary>
+        /// Sets the value of a dependency property without changing its value source.
+        /// </summary>
+        /// <param name="property">The property.</param>
+        /// <param name="value">The value.</param>
+        /// <remarks>
+        /// This method is used by a component that programmatically sets the value of one of its
+        /// own properties without disabling an application's declared use of the property. The
+        /// method changes the effective value of the property, but existing data bindings and
+        /// styles will continue to work.
+        /// 
+        /// The new value will have the property's current <see cref="BindingPriority"/>, even if
+        /// that priority is <see cref="BindingPriority.Unset"/> or 
+        /// <see cref="BindingPriority.Inherited"/>.
+        /// </remarks>
+        public void SetCurrentValue(AvaloniaProperty property, object? value) => 
+            property.RouteSetCurrentValue(this, value);
+
+        /// <summary>
+        /// Sets the value of a dependency property without changing its value source.
+        /// </summary>
+        /// <typeparam name="T">The type of the property.</typeparam>
+        /// <param name="property">The property.</param>
+        /// <param name="value">The value.</param>
+        /// <remarks>
+        /// This method is used by a component that programmatically sets the value of one of its
+        /// own properties without disabling an application's declared use of the property. The
+        /// method changes the effective value of the property, but existing data bindings and
+        /// styles will continue to work.
+        /// 
+        /// The new value will have the property's current <see cref="BindingPriority"/>, even if
+        /// that priority is <see cref="BindingPriority.Unset"/> or 
+        /// <see cref="BindingPriority.Inherited"/>.
+        /// </remarks>
+        public void SetCurrentValue<T>(StyledProperty<T> property, T value)
+        {
+            _ = property ?? throw new ArgumentNullException(nameof(property));
+            VerifyAccess();
+
+            LogPropertySet(property, value, BindingPriority.LocalValue);
+
+            if (value is UnsetValueType)
+            {
+                _values.ClearValue(property);
+            }
+            else if (value is not DoNothingType)
+            {
+                _values.SetCurrentValue(property, value);
+            }
+        }
+
         /// <summary>
         /// Binds a <see cref="AvaloniaProperty"/> to an observable.
         /// </summary>
@@ -547,7 +598,8 @@ namespace Avalonia
                     property,
                     GetValue(property),
                     BindingPriority.LocalValue,
-                    null);
+                    null,
+                    false);
             }
 
             return _values.GetDiagnostic(property);
diff --git a/src/Avalonia.Base/AvaloniaProperty.cs b/src/Avalonia.Base/AvaloniaProperty.cs
index 5db4d81f03..45ab293a89 100644
--- a/src/Avalonia.Base/AvaloniaProperty.cs
+++ b/src/Avalonia.Base/AvaloniaProperty.cs
@@ -225,13 +225,8 @@ namespace Avalonia
         /// <param name="defaultValue">The default value of the property.</param>
         /// <param name="inherits">Whether the property inherits its value.</param>
         /// <param name="defaultBindingMode">The default binding mode for the property.</param>
-         /// <param name="validate">A value validation callback.</param>
+        /// <param name="validate">A value validation callback.</param>
         /// <param name="coerce">A value coercion callback.</param>
-        /// <param name="notifying">
-        /// A method that gets called before and after the property starts being notified on an
-        /// object; the bool argument will be true before and false afterwards. This callback is
-        /// intended to support IsDataContextChanging.
-        /// </param>
         /// <returns>A <see cref="StyledProperty{TValue}"/></returns>
         public static StyledProperty<TValue> Register<TOwner, TValue>(
             string name,
@@ -239,8 +234,40 @@ namespace Avalonia
             bool inherits = false,
             BindingMode defaultBindingMode = BindingMode.OneWay,
             Func<TValue, bool>? validate = null,
-            Func<AvaloniaObject, TValue, TValue>? coerce = null,
-            Action<AvaloniaObject, bool>? notifying = null)
+            Func<AvaloniaObject, TValue, TValue>? coerce = null)
+                where TOwner : AvaloniaObject
+        {
+            _ = name ?? throw new ArgumentNullException(nameof(name));
+
+            var metadata = new StyledPropertyMetadata<TValue>(
+                defaultValue,
+                defaultBindingMode: defaultBindingMode,
+                coerce: coerce);
+
+            var result = new StyledProperty<TValue>(
+                name,
+                typeof(TOwner),
+                metadata,
+                inherits,
+                validate);
+            AvaloniaPropertyRegistry.Instance.Register(typeof(TOwner), result);
+            return result;
+        }
+        
+        /// <inheritdoc cref="Register{TOwner, TValue}" />
+        /// <param name="notifying">
+        /// A method that gets called before and after the property starts being notified on an
+        /// object; the bool argument will be true before and false afterwards. This callback is
+        /// intended to support IsDataContextChanging.
+        /// </param>
+        internal static StyledProperty<TValue> Register<TOwner, TValue>(
+            string name,
+            TValue defaultValue,
+            bool inherits,
+            BindingMode defaultBindingMode,
+            Func<TValue, bool>? validate,
+            Func<AvaloniaObject, TValue, TValue>? coerce,
+            Action<AvaloniaObject, bool>? notifying)
                 where TOwner : AvaloniaObject
         {
             _ = name ?? throw new ArgumentNullException(nameof(name));
@@ -496,6 +523,13 @@ namespace Avalonia
             object? value,
             BindingPriority priority);
 
+        /// <summary>
+        /// Routes an untyped SetCurrentValue call to a typed call.
+        /// </summary>
+        /// <param name="o">The object instance.</param>
+        /// <param name="value">The value.</param>
+        internal abstract void RouteSetCurrentValue(AvaloniaObject o, object? value);
+
         /// <summary>
         /// Routes an untyped Bind call to a typed call.
         /// </summary>
diff --git a/src/Avalonia.Base/Diagnostics/AvaloniaPropertyValue.cs b/src/Avalonia.Base/Diagnostics/AvaloniaPropertyValue.cs
index 4189fd5234..0b3e62f1cc 100644
--- a/src/Avalonia.Base/Diagnostics/AvaloniaPropertyValue.cs
+++ b/src/Avalonia.Base/Diagnostics/AvaloniaPropertyValue.cs
@@ -3,28 +3,23 @@ using Avalonia.Data;
 namespace Avalonia.Diagnostics
 {
     /// <summary>
-    /// Holds diagnostic-related information about the value of a <see cref="AvaloniaProperty"/>
-    /// on a <see cref="AvaloniaObject"/>.
+    /// Holds diagnostic-related information about the value of an <see cref="AvaloniaProperty"/>
+    /// on an <see cref="AvaloniaObject"/>.
     /// </summary>
     public class AvaloniaPropertyValue
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AvaloniaPropertyValue"/> class.
-        /// </summary>
-        /// <param name="property">The property.</param>
-        /// <param name="value">The current property value.</param>
-        /// <param name="priority">The priority of the current value.</param>
-        /// <param name="diagnostic">A diagnostic string.</param>
-        public AvaloniaPropertyValue(
+        internal AvaloniaPropertyValue(
             AvaloniaProperty property,
             object? value,
             BindingPriority priority,
-            string? diagnostic)
+            string? diagnostic,
+            bool isOverriddenCurrentValue)
         {
             Property = property;
             Value = value;
             Priority = priority;
             Diagnostic = diagnostic;
+            IsOverriddenCurrentValue = isOverriddenCurrentValue;
         }
 
         /// <summary>
@@ -46,5 +41,11 @@ namespace Avalonia.Diagnostics
         /// Gets a diagnostic string.
         /// </summary>
         public string? Diagnostic { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether the <see cref="Value"/> was overridden by a call to 
+        /// <see cref="AvaloniaObject.SetCurrentValue{T}"/>.
+        /// </summary>
+        public bool IsOverriddenCurrentValue { get; }
     }
 }
diff --git a/src/Avalonia.Base/DirectPropertyBase.cs b/src/Avalonia.Base/DirectPropertyBase.cs
index 9ee1eee0fa..94dfaaab01 100644
--- a/src/Avalonia.Base/DirectPropertyBase.cs
+++ b/src/Avalonia.Base/DirectPropertyBase.cs
@@ -152,6 +152,11 @@ namespace Avalonia
             return null;
         }
 
+        internal override void RouteSetCurrentValue(AvaloniaObject o, object? value)
+        {
+            RouteSetValue(o, value, BindingPriority.LocalValue);
+        }
+
         /// <summary>
         /// Routes an untyped Bind call to a typed call.
         /// </summary>
diff --git a/src/Avalonia.Base/Input/TextInput/ITextEditable.cs b/src/Avalonia.Base/Input/TextInput/ITextEditable.cs
new file mode 100644
index 0000000000..f9f5ec8d40
--- /dev/null
+++ b/src/Avalonia.Base/Input/TextInput/ITextEditable.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Avalonia.Metadata;
+
+namespace Avalonia.Input.TextInput
+{
+    [NotClientImplementable]
+    public interface ITextEditable
+    {
+        event EventHandler TextChanged;
+        event EventHandler SelectionChanged;
+        event EventHandler CompositionChanged;
+        int SelectionStart { get; set; }
+        int SelectionEnd { get; set; }
+        int CompositionStart { get; }
+        int CompositionEnd { get; }
+        
+        string? Text { get; set; }
+    }
+}
diff --git a/src/Avalonia.Base/Input/TextInput/ITextInputMethodClient.cs b/src/Avalonia.Base/Input/TextInput/ITextInputMethodClient.cs
index 531cf3c704..2cdcd33626 100644
--- a/src/Avalonia.Base/Input/TextInput/ITextInputMethodClient.cs
+++ b/src/Avalonia.Base/Input/TextInput/ITextInputMethodClient.cs
@@ -1,4 +1,5 @@
 using System;
+using Avalonia.Media.TextFormatting;
 using Avalonia.VisualTree;
 
 namespace Avalonia.Input.TextInput
@@ -30,6 +31,11 @@ namespace Avalonia.Input.TextInput
         /// </summary>
         void SetPreeditText(string? text);
 
+        /// <summary>
+        /// Sets the current composing region. This doesn't remove the composing text from the commited text.
+        /// </summary>
+        void SetComposingRegion(TextRange? region);
+
         /// <summary>
         /// Indicates if text input client is capable of providing the text around the cursor
         /// </summary>
@@ -43,6 +49,11 @@ namespace Avalonia.Input.TextInput
         /// </summary>
         event EventHandler? SurroundingTextChanged;
 
+        /// <summary>
+        /// Gets or sets a platform editable. Text and selection changes made in the editable are forwarded to the IM client.
+        /// </summary>
+        ITextEditable? TextEditable { get; set; }
+
         void SelectInSurroundingText(int start, int end);
     }
 
diff --git a/src/Avalonia.Base/PropertyStore/EffectiveValue.cs b/src/Avalonia.Base/PropertyStore/EffectiveValue.cs
index 04d3c805c2..78f0ad46b7 100644
--- a/src/Avalonia.Base/PropertyStore/EffectiveValue.cs
+++ b/src/Avalonia.Base/PropertyStore/EffectiveValue.cs
@@ -29,6 +29,12 @@ namespace Avalonia.PropertyStore
         /// </summary>
         public BindingPriority BasePriority { get; protected set; }
 
+        /// <summary>
+        /// Gets a value indicating whether the <see cref="Value"/> was overridden by a call to 
+        /// <see cref="AvaloniaObject.SetCurrentValue{T}"/>.
+        /// </summary>
+        public bool IsOverridenCurrentValue { get; set; }
+
         /// <summary>
         /// Begins a reevaluation pass on the effective value.
         /// </summary>
diff --git a/src/Avalonia.Base/PropertyStore/EffectiveValue`1.cs b/src/Avalonia.Base/PropertyStore/EffectiveValue`1.cs
index 3e20dcce56..c469034f9b 100644
--- a/src/Avalonia.Base/PropertyStore/EffectiveValue`1.cs
+++ b/src/Avalonia.Base/PropertyStore/EffectiveValue`1.cs
@@ -19,13 +19,16 @@ namespace Avalonia.PropertyStore
         private T? _baseValue;
         private UncommonFields? _uncommon;
 
-        public EffectiveValue(AvaloniaObject owner, StyledProperty<T> property)
+        public EffectiveValue(
+            AvaloniaObject owner,
+            StyledProperty<T> property,
+            EffectiveValue<T>? inherited)
         {
             Priority = BindingPriority.Unset;
             BasePriority = BindingPriority.Unset;
             _metadata = property.GetMetadata(owner.GetType());
 
-            var value = _metadata.DefaultValue;
+            var value = inherited is null ? _metadata.DefaultValue : inherited.Value;
 
             if (property.HasCoercion && _metadata.CoerceValue is { } coerce)
             {
@@ -57,7 +60,7 @@ namespace Avalonia.PropertyStore
             Debug.Assert(priority != BindingPriority.LocalValue);
             UpdateValueEntry(value, priority);
 
-            SetAndRaiseCore(owner,  (StyledProperty<T>)value.Property, GetValue(value), priority);
+            SetAndRaiseCore(owner,  (StyledProperty<T>)value.Property, GetValue(value), priority, false);
         }
 
         public void SetLocalValueAndRaise(
@@ -65,7 +68,16 @@ namespace Avalonia.PropertyStore
             StyledProperty<T> property,
             T value)
         {
-            SetAndRaiseCore(owner, property, value, BindingPriority.LocalValue);
+            SetAndRaiseCore(owner, property, value, BindingPriority.LocalValue, false);
+        }
+
+        public void SetCurrentValueAndRaise(
+            ValueStore owner,
+            StyledProperty<T> property,
+            T value)
+        {
+            IsOverridenCurrentValue = true;
+            SetAndRaiseCore(owner, property, value, Priority, true);
         }
 
         public bool TryGetBaseValue([MaybeNullWhen(false)] out T value)
@@ -98,7 +110,7 @@ namespace Avalonia.PropertyStore
             Debug.Assert(Priority != BindingPriority.Animation);
             Debug.Assert(BasePriority != BindingPriority.Unset);
             UpdateValueEntry(null, BindingPriority.Animation);
-            SetAndRaiseCore(owner, (StyledProperty<T>)property, _baseValue!, BasePriority);
+            SetAndRaiseCore(owner, (StyledProperty<T>)property, _baseValue!, BasePriority, false);
         }
 
         public override void CoerceValue(ValueStore owner, AvaloniaProperty property)
@@ -158,15 +170,16 @@ namespace Avalonia.PropertyStore
             ValueStore owner,
             StyledProperty<T> property,
             T value,
-            BindingPriority priority)
+            BindingPriority priority,
+            bool isOverriddenCurrentValue)
         {
-            Debug.Assert(priority < BindingPriority.Inherited);
-
             var oldValue = Value;
             var valueChanged = false;
             var baseValueChanged = false;
             var v = value;
 
+            IsOverridenCurrentValue = isOverriddenCurrentValue;
+
             if (_uncommon?._coerce is { } coerce)
                 v = coerce(owner.Owner, value);
 
@@ -209,7 +222,6 @@ namespace Avalonia.PropertyStore
             T baseValue,
             BindingPriority basePriority)
         {
-            Debug.Assert(priority < BindingPriority.Inherited);
             Debug.Assert(basePriority > BindingPriority.Animation);
             Debug.Assert(priority <= basePriority);
 
@@ -225,7 +237,7 @@ namespace Avalonia.PropertyStore
                 bv = coerce(owner.Owner, baseValue);
             }
 
-            if (priority != BindingPriority.Unset && !EqualityComparer<T>.Default.Equals(Value, v))
+            if (!EqualityComparer<T>.Default.Equals(Value, v))
             {
                 Value = v;
                 valueChanged = true;
@@ -233,9 +245,7 @@ namespace Avalonia.PropertyStore
                     _uncommon._uncoercedValue = value;
             }
 
-            if (priority != BindingPriority.Unset &&
-                (BasePriority == BindingPriority.Unset ||
-                 !EqualityComparer<T>.Default.Equals(_baseValue, bv)))
+            if (!EqualityComparer<T>.Default.Equals(_baseValue, bv))
             {
                 _baseValue = v;
                 baseValueChanged = true;
diff --git a/src/Avalonia.Base/PropertyStore/ValueStore.cs b/src/Avalonia.Base/PropertyStore/ValueStore.cs
index a758360545..ec6ed392c1 100644
--- a/src/Avalonia.Base/PropertyStore/ValueStore.cs
+++ b/src/Avalonia.Base/PropertyStore/ValueStore.cs
@@ -7,7 +7,6 @@ using Avalonia.Data;
 using Avalonia.Diagnostics;
 using Avalonia.Styling;
 using Avalonia.Utilities;
-using static Avalonia.Rendering.Composition.Animations.PropertySetSnapshot;
 
 namespace Avalonia.PropertyStore
 {
@@ -156,11 +155,12 @@ namespace Avalonia.PropertyStore
             return observer;
         }
 
-        public void ClearLocalValue(AvaloniaProperty property)
+        public void ClearValue(AvaloniaProperty property)
         {
             if (TryGetEffectiveValue(property, out var effective) &&
-                effective.Priority == BindingPriority.LocalValue)
+                (effective.Priority == BindingPriority.LocalValue || effective.IsOverridenCurrentValue))
             {
+                effective.IsOverridenCurrentValue = false;
                 ReevaluateEffectiveValue(property, effective, ignoreLocalValue: true);
             }
         }
@@ -184,7 +184,7 @@ namespace Avalonia.PropertyStore
                 }
                 else
                 {
-                    var effectiveValue = new EffectiveValue<T>(Owner, property);
+                    var effectiveValue = CreateEffectiveValue(property);
                     AddEffectiveValue(property, effectiveValue);
                     effectiveValue.SetAndRaise(this, result, priority);
                 }
@@ -200,7 +200,7 @@ namespace Avalonia.PropertyStore
                 }
                 else
                 {
-                    var effectiveValue = new EffectiveValue<T>(Owner, property);
+                    var effectiveValue = CreateEffectiveValue(property);
                     AddEffectiveValue(property, effectiveValue);
                     effectiveValue.SetLocalValueAndRaise(this, property, value);
                 }
@@ -209,6 +209,20 @@ namespace Avalonia.PropertyStore
             }
         }
 
+        public void SetCurrentValue<T>(StyledProperty<T> property, T value)
+        {
+            if (TryGetEffectiveValue(property, out var v))
+            {
+                ((EffectiveValue<T>)v).SetCurrentValueAndRaise(this, property, value);
+            }
+            else
+            {
+                var effectiveValue = CreateEffectiveValue(property);
+                AddEffectiveValue(property, effectiveValue);
+                effectiveValue.SetCurrentValueAndRaise(this, property, value);
+            }
+        }
+
         public object? GetValue(AvaloniaProperty property)
         {
             if (_effectiveValues.TryGetValue(property, out var v))
@@ -235,12 +249,7 @@ namespace Avalonia.PropertyStore
             return false;
         }
 
-        public bool IsSet(AvaloniaProperty property)
-        {
-            if (_effectiveValues.TryGetValue(property, out var v))
-                return v.Priority < BindingPriority.Inherited;
-            return false;
-        }
+        public bool IsSet(AvaloniaProperty property) => _effectiveValues.TryGetValue(property, out _);
 
         public void CoerceValue(AvaloniaProperty property)
         {
@@ -278,6 +287,16 @@ namespace Avalonia.PropertyStore
             return false;
         }
 
+        public EffectiveValue<T> CreateEffectiveValue<T>(StyledProperty<T> property)
+        {
+            EffectiveValue<T>? inherited = null;
+
+            if (property.Inherits && TryGetInheritedValue(property, out var v))
+                inherited = (EffectiveValue<T>)v;
+
+            return new EffectiveValue<T>(Owner, property, inherited);
+        }
+
         public void SetInheritanceParent(AvaloniaObject? newParent)
         {
             var values = AvaloniaPropertyDictionaryPool<OldNewValue>.Get();
@@ -490,7 +509,7 @@ namespace Avalonia.PropertyStore
                 if (existing == observer)
                 {
                     _localValueBindings?.Remove(property.Id);
-                    ClearLocalValue(property);
+                    ClearValue(property);
                 }
             }
         }
@@ -616,11 +635,13 @@ namespace Avalonia.PropertyStore
         {
             object? value;
             BindingPriority priority;
+            bool overridden = false;
 
             if (_effectiveValues.TryGetValue(property, out var v))
             {
                 value = v.Value;
                 priority = v.Priority;
+                overridden = v.IsOverridenCurrentValue;
             }
             else if (property.Inherits && TryGetInheritedValue(property, out v))
             {
@@ -637,7 +658,8 @@ namespace Avalonia.PropertyStore
                 property,
                 value,
                 priority,
-                null);
+                null,
+                overridden);
         }
 
         private int InsertFrame(ValueFrame frame)
@@ -787,7 +809,7 @@ namespace Avalonia.PropertyStore
                     // - The value is a non-animation value and its priority is higher than the current
                     //   effective value's base priority
                     var isRelevantPriority = current is null ||
-                        priority < current.Priority ||
+                        (priority < current.Priority && priority < current.BasePriority) ||
                         (priority > BindingPriority.Animation && priority < current.BasePriority);
 
                     if (foundEntry && isRelevantPriority && entry!.HasValue)
diff --git a/src/Avalonia.Base/StyledElement.cs b/src/Avalonia.Base/StyledElement.cs
index 5bf022cd51..2cdb973174 100644
--- a/src/Avalonia.Base/StyledElement.cs
+++ b/src/Avalonia.Base/StyledElement.cs
@@ -41,7 +41,11 @@ namespace Avalonia
         public static readonly StyledProperty<object?> DataContextProperty =
             AvaloniaProperty.Register<StyledElement, object?>(
                 nameof(DataContext),
+                defaultValue: null,
                 inherits: true,
+                defaultBindingMode: BindingMode.OneWay,
+                validate: null,
+                coerce: null,
                 notifying: DataContextNotifying);
 
         /// <summary>
diff --git a/src/Avalonia.Base/StyledProperty.cs b/src/Avalonia.Base/StyledProperty.cs
index 79d1b9202d..8695918c18 100644
--- a/src/Avalonia.Base/StyledProperty.cs
+++ b/src/Avalonia.Base/StyledProperty.cs
@@ -171,7 +171,7 @@ namespace Avalonia
 
         internal override EffectiveValue CreateEffectiveValue(AvaloniaObject o)
         {
-            return new EffectiveValue<TValue>(o, this);
+            return o.GetValueStore().CreateEffectiveValue(this);
         }
 
         /// <inheritdoc/>
@@ -194,24 +194,48 @@ namespace Avalonia
         }
 
         /// <inheritdoc/>
-        [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = TrimmingMessages.ImplicitTypeConvertionSupressWarningMessage)]
         internal override IDisposable? RouteSetValue(
             AvaloniaObject target,
             object? value,
             BindingPriority priority)
+        {
+            if (ShouldSetValue(target, value, out var converted))
+                return target.SetValue<TValue>(this, converted, priority);
+            return null;
+        }
+
+        internal override void RouteSetCurrentValue(AvaloniaObject target, object? value)
+        {
+            if (ShouldSetValue(target, value, out var converted))
+                target.SetCurrentValue<TValue>(this, converted);
+        }
+
+        internal override IDisposable RouteBind(
+            AvaloniaObject target,
+            IObservable<object?> source,
+            BindingPriority priority)
+        {
+            return target.Bind<TValue>(this, source, priority);
+        }
+
+        [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = TrimmingMessages.ImplicitTypeConvertionSupressWarningMessage)]
+        private bool ShouldSetValue(AvaloniaObject target, object? value, [NotNullWhen(true)] out TValue? converted)
         {
             if (value == BindingOperations.DoNothing)
             {
-                return null;
+                converted = default;
+                return false; 
             }
-            else if (value == UnsetValue)
+            if (value == UnsetValue)
             {
                 target.ClearValue(this);
-                return null;
+                converted = default;
+                return false;
             }
-            else if (TypeUtilities.TryConvertImplicit(PropertyType, value, out var converted))
+            else if (TypeUtilities.TryConvertImplicit(PropertyType, value, out var v))
             {
-                return target.SetValue<TValue>(this, (TValue)converted!, priority);
+                converted = (TValue)v!;
+                return true;
             }
             else
             {
@@ -220,14 +244,6 @@ namespace Avalonia
             }
         }
 
-        internal override IDisposable RouteBind(
-            AvaloniaObject target,
-            IObservable<object?> source,
-            BindingPriority priority)
-        {
-            return target.Bind<TValue>(this, source, priority);
-        }
-
         private object? GetDefaultBoxedValue(Type type)
         {
             _ = type ?? throw new ArgumentNullException(nameof(type));
diff --git a/src/Avalonia.Controls/ItemsControl.cs b/src/Avalonia.Controls/ItemsControl.cs
index 2f02a48d55..ce12d5f2bf 100644
--- a/src/Avalonia.Controls/ItemsControl.cs
+++ b/src/Avalonia.Controls/ItemsControl.cs
@@ -559,7 +559,12 @@ namespace Avalonia.Controls
             return new ItemContainerGenerator(this);
         }
 
-        internal void AddLogicalChild(Control c) => LogicalChildren.Add(c);
+        internal void AddLogicalChild(Control c)
+        {
+            if (!LogicalChildren.Contains(c))
+                LogicalChildren.Add(c);
+        }
+
         internal void RemoveLogicalChild(Control c) => LogicalChildren.Remove(c);
 
         /// <summary>
diff --git a/src/Avalonia.Controls/Presenters/TextPresenter.cs b/src/Avalonia.Controls/Presenters/TextPresenter.cs
index 3481b1ecf3..bb6b03d59a 100644
--- a/src/Avalonia.Controls/Presenters/TextPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/TextPresenter.cs
@@ -63,6 +63,15 @@ namespace Avalonia.Controls.Presenters
                 o => o.PreeditText,
                  (o, v) => o.PreeditText = v);
 
+        /// <summary>
+        /// Defines the <see cref="CompositionRegion"/> property.
+        /// </summary>
+        public static readonly DirectProperty<TextPresenter, TextRange?> CompositionRegionProperty =
+            AvaloniaProperty.RegisterDirect<TextPresenter, TextRange?>(
+                nameof(CompositionRegion),
+                o => o.CompositionRegion,
+                 (o, v) => o.CompositionRegion = v);
+
         /// <summary>
         /// Defines the <see cref="TextAlignment"/> property.
         /// </summary>
@@ -106,6 +115,7 @@ namespace Avalonia.Controls.Presenters
         private Rect _caretBounds;
         private Point _navigationPosition;
         private string? _preeditText;
+        private TextRange? _compositionRegion;
 
         static TextPresenter()
         {
@@ -146,6 +156,12 @@ namespace Avalonia.Controls.Presenters
             set => SetAndRaise(PreeditTextProperty, ref _preeditText, value);
         }
 
+        public TextRange? CompositionRegion
+        {
+            get => _compositionRegion;
+            set => SetAndRaise(CompositionRegionProperty, ref _compositionRegion, value);
+        }
+
         /// <summary>
         /// Gets or sets the font family.
         /// </summary>
@@ -548,7 +564,20 @@ namespace Avalonia.Controls.Presenters
 
             var foreground = Foreground;
 
-            if (!string.IsNullOrEmpty(_preeditText))
+            if(_compositionRegion != null)
+            {
+                var preeditHighlight = new ValueSpan<TextRunProperties>(_compositionRegion?.Start ?? 0, _compositionRegion?.Length ?? 0,
+                        new GenericTextRunProperties(typeface, FontSize,
+                        foregroundBrush: foreground,
+                        textDecorations: TextDecorations.Underline));
+
+                textStyleOverrides = new[]
+                {
+                    preeditHighlight
+                };
+
+            }
+            else if (!string.IsNullOrEmpty(_preeditText))
             {
                 var preeditHighlight = new ValueSpan<TextRunProperties>(_caretIndex, _preeditText.Length,
                         new GenericTextRunProperties(typeface, FontSize,
@@ -911,6 +940,7 @@ namespace Avalonia.Controls.Presenters
                         break;
                     }
 
+                case nameof(CompositionRegion):
                 case nameof(Foreground):
                 case nameof(FontSize):
                 case nameof(FontStyle):
@@ -931,7 +961,6 @@ namespace Avalonia.Controls.Presenters
 
                 case nameof(PasswordChar):
                 case nameof(RevealPassword):
-
                 case nameof(FlowDirection):
                     {
                         InvalidateTextLayout();
diff --git a/src/Avalonia.Controls/TextBoxTextInputMethodClient.cs b/src/Avalonia.Controls/TextBoxTextInputMethodClient.cs
index 10c2f36f43..3a28836a99 100644
--- a/src/Avalonia.Controls/TextBoxTextInputMethodClient.cs
+++ b/src/Avalonia.Controls/TextBoxTextInputMethodClient.cs
@@ -5,6 +5,7 @@ using Avalonia.Media.TextFormatting;
 using Avalonia.Threading;
 using Avalonia.Utilities;
 using Avalonia.VisualTree;
+using static System.Net.Mime.MediaTypeNames;
 
 namespace Avalonia.Controls
 {
@@ -12,6 +13,7 @@ namespace Avalonia.Controls
     {
         private TextBox? _parent;
         private TextPresenter? _presenter;
+        private ITextEditable? _textEditable;
 
         public Visual TextViewVisual => _presenter!;
 
@@ -45,7 +47,7 @@ namespace Avalonia.Controls
         {
             get
             {
-                if(_presenter is null || _parent is null)
+                if (_presenter is null || _parent is null)
                 {
                     return default;
                 }
@@ -71,13 +73,70 @@ namespace Avalonia.Controls
             }
         }
 
+        public ITextEditable? TextEditable
+        {
+            get => _textEditable; set
+            {
+                if(_textEditable != null)
+                {
+                    _textEditable.TextChanged -= TextEditable_TextChanged;
+                    _textEditable.SelectionChanged -= TextEditable_SelectionChanged;
+                    _textEditable.CompositionChanged -= TextEditable_CompositionChanged;
+                }
+
+                _textEditable = value;
+
+                if(_textEditable != null)
+                {
+                    _textEditable.TextChanged += TextEditable_TextChanged;
+                    _textEditable.SelectionChanged += TextEditable_SelectionChanged;
+                    _textEditable.CompositionChanged += TextEditable_CompositionChanged;
+
+                    if (_presenter != null)
+                    {
+                        _textEditable.Text = _presenter.Text;
+                        _textEditable.SelectionStart = _presenter.SelectionStart;
+                        _textEditable.SelectionEnd = _presenter.SelectionEnd;
+                    }
+                }
+            }
+        }
+
+        private void TextEditable_CompositionChanged(object? sender, EventArgs e)
+        {
+            if (_presenter != null && _textEditable != null)
+            {
+                _presenter.CompositionRegion = new TextRange(_textEditable.CompositionStart, _textEditable.CompositionEnd);
+            }
+        }
+
+        private void TextEditable_SelectionChanged(object? sender, EventArgs e)
+        {
+            if(_parent != null && _textEditable != null)
+            {
+                _parent.SelectionStart = _textEditable.SelectionStart;
+                _parent.SelectionEnd = _textEditable.SelectionEnd;
+            }
+        }
+
+        private void TextEditable_TextChanged(object? sender, EventArgs e)
+        {
+            if (_parent != null)
+            {
+                if (_parent.Text != _textEditable?.Text)
+                {
+                    _parent.Text = _textEditable?.Text;
+                }
+            }
+        }
+
         private static string GetTextLineText(TextLine textLine)
         {
             var builder = StringBuilderCache.Acquire(textLine.Length);
 
             foreach (var run in textLine.TextRuns)
             {
-                if(run.Length > 0)
+                if (run.Length > 0)
                 {
 #if NET6_0_OR_GREATER
                     builder.Append(run.Text.Span);
@@ -110,9 +169,18 @@ namespace Avalonia.Controls
             _presenter.PreeditText = text;
         }
 
+        public void SetComposingRegion(TextRange? region)
+        {
+            if (_presenter == null)
+            {
+                return;
+            }
+            _presenter.CompositionRegion = region;
+        }
+
         public void SelectInSurroundingText(int start, int end)
         {
-            if(_parent is null ||_presenter is null)
+            if (_parent is null || _presenter is null)
             {
                 return;
             }
@@ -125,21 +193,21 @@ namespace Avalonia.Controls
 
             var selectionStart = lineStart + start;
             var selectionEnd = lineStart + end;
-             
+
             _parent.SelectionStart = selectionStart;
             _parent.SelectionEnd = selectionEnd;
-        }    
-        
+        }
+
         public void SetPresenter(TextPresenter? presenter, TextBox? parent)
         {
-            if(_parent != null)
+            if (_parent != null)
             {
                 _parent.PropertyChanged -= OnParentPropertyChanged;
             }
 
             _parent = parent;
 
-            if(_parent != null)
+            if (_parent != null)
             {
                 _parent.PropertyChanged += OnParentPropertyChanged;
             }
@@ -148,16 +216,18 @@ namespace Avalonia.Controls
             {
                 _presenter.PreeditText = null;
 
-                _presenter.CaretBoundsChanged -= OnCaretBoundsChanged;             
+                _presenter.CompositionRegion = null;
+
+                _presenter.CaretBoundsChanged -= OnCaretBoundsChanged;
             }
-           
+
             _presenter = presenter;
-            
+
             if (_presenter != null)
             {
                 _presenter.CaretBoundsChanged += OnCaretBoundsChanged;
             }
-           
+
             TextViewVisualChanged?.Invoke(this, EventArgs.Empty);
 
             OnCaretBoundsChanged(this, EventArgs.Empty);
@@ -165,12 +235,33 @@ namespace Avalonia.Controls
 
         private void OnParentPropertyChanged(object? sender, AvaloniaPropertyChangedEventArgs e)
         {
-            if(e.Property == TextBox.SelectionStartProperty || e.Property == TextBox.SelectionEndProperty)
+            if (e.Property == TextBox.SelectionStartProperty || e.Property == TextBox.SelectionEndProperty)
             {
                 if (SupportsSurroundingText)
                 {
                     SurroundingTextChanged?.Invoke(this, e);
                 }
+                if (_textEditable != null)
+                {
+                    var value = (int)(e.NewValue ?? 0);
+                    if (e.Property == TextBox.SelectionStartProperty)
+                    {
+                        _textEditable.SelectionStart = value;
+                    }
+
+                    if (e.Property == TextBox.SelectionEndProperty)
+                    {
+                        _textEditable.SelectionEnd = value;
+                    }
+                }
+            }
+
+            if(e.Property == TextBox.TextProperty)
+            {
+                if(_textEditable != null)
+                {
+                    _textEditable.Text = (string?)e.NewValue;
+                }
             }
         }
 
diff --git a/src/Avalonia.FreeDesktop/DBusHelper.cs b/src/Avalonia.FreeDesktop/DBusHelper.cs
index ef99838208..fac77521dc 100644
--- a/src/Avalonia.FreeDesktop/DBusHelper.cs
+++ b/src/Avalonia.FreeDesktop/DBusHelper.cs
@@ -6,7 +6,7 @@ using Tmds.DBus;
 
 namespace Avalonia.FreeDesktop
 {
-    public static class DBusHelper
+    internal static class DBusHelper
     {
         /// <summary>
         /// This class uses synchronous execution at DBus connection establishment stage
diff --git a/src/Avalonia.FreeDesktop/DBusIme/X11DBusImeHelper.cs b/src/Avalonia.FreeDesktop/DBusIme/X11DBusImeHelper.cs
index 86978c8b60..d8874b6fae 100644
--- a/src/Avalonia.FreeDesktop/DBusIme/X11DBusImeHelper.cs
+++ b/src/Avalonia.FreeDesktop/DBusIme/X11DBusImeHelper.cs
@@ -6,7 +6,7 @@ using Tmds.DBus;
 
 namespace Avalonia.FreeDesktop.DBusIme
 {
-    public class X11DBusImeHelper
+    internal class X11DBusImeHelper
     {
         private static readonly Dictionary<string, Func<Connection, IX11InputMethodFactory>> KnownMethods =
             new Dictionary<string, Func<Connection, IX11InputMethodFactory>>
diff --git a/src/Avalonia.FreeDesktop/DBusMenuExporter.cs b/src/Avalonia.FreeDesktop/DBusMenuExporter.cs
index 0e6bee5f24..cfbafc53e5 100644
--- a/src/Avalonia.FreeDesktop/DBusMenuExporter.cs
+++ b/src/Avalonia.FreeDesktop/DBusMenuExporter.cs
@@ -15,7 +15,7 @@ using Tmds.DBus;
 
 namespace Avalonia.FreeDesktop
 {
-    public class DBusMenuExporter
+    internal class DBusMenuExporter
     {
         public static ITopLevelNativeMenuExporter? TryCreateTopLevelNativeMenu(IntPtr xid)
         {
diff --git a/src/Avalonia.FreeDesktop/IX11InputMethod.cs b/src/Avalonia.FreeDesktop/IX11InputMethod.cs
index 9fa9c1809e..7274b58876 100644
--- a/src/Avalonia.FreeDesktop/IX11InputMethod.cs
+++ b/src/Avalonia.FreeDesktop/IX11InputMethod.cs
@@ -6,13 +6,13 @@ using Avalonia.Input.TextInput;
 
 namespace Avalonia.FreeDesktop
 {
-    public interface IX11InputMethodFactory
+    internal interface IX11InputMethodFactory
     {
         (ITextInputMethodImpl method, IX11InputMethodControl control) CreateClient(IntPtr xid);
     }
 
 #pragma warning disable CA1815 // Override equals and operator equals on value types
-    public struct X11InputMethodForwardedKey
+    internal struct X11InputMethodForwardedKey
 #pragma warning restore CA1815 // Override equals and operator equals on value types
     {
         public int KeyVal { get; set; }
@@ -20,7 +20,7 @@ namespace Avalonia.FreeDesktop
         public RawKeyEventType Type { get; set; }
     }
     
-    public interface IX11InputMethodControl : IDisposable
+    internal interface IX11InputMethodControl : IDisposable
     {
         void SetWindowActive(bool active);
         bool IsEnabled { get; }
diff --git a/src/Avalonia.FreeDesktop/LinuxMountedVolumeInfoProvider.cs b/src/Avalonia.FreeDesktop/LinuxMountedVolumeInfoProvider.cs
index 4624a9c340..4aa6bed329 100644
--- a/src/Avalonia.FreeDesktop/LinuxMountedVolumeInfoProvider.cs
+++ b/src/Avalonia.FreeDesktop/LinuxMountedVolumeInfoProvider.cs
@@ -5,7 +5,7 @@ using Avalonia.Controls.Platform;
 
 namespace Avalonia.FreeDesktop
 {
-    public class LinuxMountedVolumeInfoProvider : IMountedVolumeInfoProvider
+    internal class LinuxMountedVolumeInfoProvider : IMountedVolumeInfoProvider
     {
         public IDisposable Listen(ObservableCollection<MountedVolumeInfo> mountedDrives)
         {
diff --git a/src/Avalonia.Headless/AvaloniaHeadlessPlatform.cs b/src/Avalonia.Headless/AvaloniaHeadlessPlatform.cs
index 9834969898..b0b1d731d2 100644
--- a/src/Avalonia.Headless/AvaloniaHeadlessPlatform.cs
+++ b/src/Avalonia.Headless/AvaloniaHeadlessPlatform.cs
@@ -68,8 +68,6 @@ namespace Avalonia.Headless
                 .Bind<IKeyboardDevice>().ToConstant(new KeyboardDevice())
                 .Bind<IRenderLoop>().ToConstant(new RenderLoop())
                 .Bind<IRenderTimer>().ToConstant(new RenderTimer(60))
-                .Bind<IFontManagerImpl>().ToSingleton<HeadlessFontManagerStub>()
-                .Bind<ITextShaperImpl>().ToSingleton<HeadlessTextShaperStub>()
                 .Bind<IWindowingPlatform>().ToConstant(new HeadlessWindowingPlatform())
                 .Bind<PlatformHotkeyConfiguration>().ToSingleton<PlatformHotkeyConfiguration>();
             Compositor = new Compositor(AvaloniaLocator.Current.GetRequiredService<IRenderLoop>(), null);
diff --git a/src/Avalonia.Native/CallbackBase.cs b/src/Avalonia.Native/CallbackBase.cs
index 2d875dbc0e..9f59c97f9b 100644
--- a/src/Avalonia.Native/CallbackBase.cs
+++ b/src/Avalonia.Native/CallbackBase.cs
@@ -6,7 +6,7 @@ using MicroCom.Runtime;
 
 namespace Avalonia.Native
 {
-    public abstract class NativeCallbackBase : CallbackBase, IMicroComExceptionCallback
+    internal abstract class NativeCallbackBase : CallbackBase, IMicroComExceptionCallback
     {
         public void RaiseException(Exception e)
         {
diff --git a/src/Avalonia.Native/MacOSMountedVolumeInfoProvider.cs b/src/Avalonia.Native/MacOSMountedVolumeInfoProvider.cs
index e79c7a40d3..1170a6fd9b 100644
--- a/src/Avalonia.Native/MacOSMountedVolumeInfoProvider.cs
+++ b/src/Avalonia.Native/MacOSMountedVolumeInfoProvider.cs
@@ -64,7 +64,7 @@ namespace Avalonia.Native
         }
     }
 
-    public class MacOSMountedVolumeInfoProvider : IMountedVolumeInfoProvider
+    internal class MacOSMountedVolumeInfoProvider : IMountedVolumeInfoProvider
     {
         public IDisposable Listen(ObservableCollection<MountedVolumeInfo> mountedDrives)
         {
diff --git a/src/Avalonia.Native/MenuActionCallback.cs b/src/Avalonia.Native/MenuActionCallback.cs
index 3acbb9c19c..e9446e2da1 100644
--- a/src/Avalonia.Native/MenuActionCallback.cs
+++ b/src/Avalonia.Native/MenuActionCallback.cs
@@ -3,7 +3,7 @@ using Avalonia.Native.Interop;
 
 namespace Avalonia.Native
 {
-    public class MenuActionCallback : NativeCallbackBase, IAvnActionCallback
+    internal class MenuActionCallback : NativeCallbackBase, IAvnActionCallback
     {
         private Action _action;
 
diff --git a/src/Avalonia.Native/PredicateCallback.cs b/src/Avalonia.Native/PredicateCallback.cs
index dbb65791f0..1ff71063af 100644
--- a/src/Avalonia.Native/PredicateCallback.cs
+++ b/src/Avalonia.Native/PredicateCallback.cs
@@ -3,7 +3,7 @@ using Avalonia.Native.Interop;
 
 namespace Avalonia.Native
 {
-    public class PredicateCallback : NativeCallbackBase, IAvnPredicateCallback
+    internal class PredicateCallback : NativeCallbackBase, IAvnPredicateCallback
     {
         private Func<bool> _predicate;
 
diff --git a/src/Avalonia.Native/ScreenImpl.cs b/src/Avalonia.Native/ScreenImpl.cs
index 53bd12cde1..c64d1378e8 100644
--- a/src/Avalonia.Native/ScreenImpl.cs
+++ b/src/Avalonia.Native/ScreenImpl.cs
@@ -5,7 +5,7 @@ using Avalonia.Platform;
 
 namespace Avalonia.Native
 {
-    class ScreenImpl : IScreenImpl, IDisposable
+    internal class ScreenImpl : IScreenImpl, IDisposable
     {
         private IAvnScreens _native;
 
diff --git a/src/Avalonia.X11/Glx/Glx.cs b/src/Avalonia.X11/Glx/Glx.cs
index 1a26d7d5f5..fceea3718c 100644
--- a/src/Avalonia.X11/Glx/Glx.cs
+++ b/src/Avalonia.X11/Glx/Glx.cs
@@ -10,7 +10,7 @@ using Avalonia.SourceGenerator;
 
 namespace Avalonia.X11.Glx
 {
-    unsafe partial class GlxInterface
+    internal unsafe partial class GlxInterface
     {
         private const string libGL = "libGL.so.1";
         [GetProcAddress("glXMakeContextCurrent")]
diff --git a/src/Avalonia.X11/Glx/GlxConsts.cs b/src/Avalonia.X11/Glx/GlxConsts.cs
index 9d153a6ade..0d1383420d 100644
--- a/src/Avalonia.X11/Glx/GlxConsts.cs
+++ b/src/Avalonia.X11/Glx/GlxConsts.cs
@@ -4,7 +4,7 @@
 #pragma warning disable 414
 namespace Avalonia.X11.Glx
 {
-    class GlxConsts
+    internal class GlxConsts
     {
         public const int GLX_USE_GL = 1;
         public const int GLX_BUFFER_SIZE = 2;
diff --git a/src/Avalonia.X11/Glx/GlxContext.cs b/src/Avalonia.X11/Glx/GlxContext.cs
index 572e4a6077..b1cb330b00 100644
--- a/src/Avalonia.X11/Glx/GlxContext.cs
+++ b/src/Avalonia.X11/Glx/GlxContext.cs
@@ -7,7 +7,7 @@ using Avalonia.Reactive;
 
 namespace Avalonia.X11.Glx
 {
-    class GlxContext : IGlContext
+    internal class GlxContext : IGlContext
     {
         public  IntPtr Handle { get; }
         public GlxInterface Glx { get; }
@@ -46,8 +46,8 @@ namespace Avalonia.X11.Glx
         public GlInterface GlInterface { get; }
         public int SampleCount { get; }
         public int StencilSize { get; }
-        
-        class RestoreContext : IDisposable
+
+        private class RestoreContext : IDisposable
         {
             private GlxInterface _glx;
             private IntPtr _defaultDisplay;
diff --git a/src/Avalonia.X11/Glx/GlxDisplay.cs b/src/Avalonia.X11/Glx/GlxDisplay.cs
index 9b8a8f0b5b..7749749eaa 100644
--- a/src/Avalonia.X11/Glx/GlxDisplay.cs
+++ b/src/Avalonia.X11/Glx/GlxDisplay.cs
@@ -6,7 +6,7 @@ using static Avalonia.X11.Glx.GlxConsts;
 
 namespace Avalonia.X11.Glx
 {
-    unsafe class GlxDisplay
+    internal unsafe class GlxDisplay
     {
         private readonly X11Info _x11;
         private readonly GlVersion[] _probeProfiles;
@@ -106,7 +106,7 @@ namespace Avalonia.X11.Glx
             }
         }
 
-        IntPtr CreatePBuffer()
+        private IntPtr CreatePBuffer()
         {
             return Glx.CreatePbuffer(_x11.Display, _fbconfig, new[] { GLX_PBUFFER_WIDTH, 1, GLX_PBUFFER_HEIGHT, 1, 0 });
         }
@@ -116,8 +116,8 @@ namespace Avalonia.X11.Glx
         
         public GlxContext CreateContext(IGlContext share) => CreateContext(CreatePBuffer(), share,
             share.SampleCount, share.StencilSize, true);
-        
-        GlxContext CreateContext(IntPtr defaultXid, IGlContext share,
+
+        private GlxContext CreateContext(IntPtr defaultXid, IGlContext share,
             int sampleCount, int stencilSize, bool ownsPBuffer)
         {
             var sharelist = ((GlxContext)share)?.Handle ?? IntPtr.Zero;
diff --git a/src/Avalonia.X11/Glx/GlxGlPlatformSurface.cs b/src/Avalonia.X11/Glx/GlxGlPlatformSurface.cs
index ebb1e18723..17c5909a39 100644
--- a/src/Avalonia.X11/Glx/GlxGlPlatformSurface.cs
+++ b/src/Avalonia.X11/Glx/GlxGlPlatformSurface.cs
@@ -6,7 +6,7 @@ using static Avalonia.OpenGL.GlConsts;
 
 namespace Avalonia.X11.Glx
 {
-    class GlxGlPlatformSurface: IGlPlatformSurface
+    internal class GlxGlPlatformSurface: IGlPlatformSurface
     {
 
         private readonly EglGlPlatformSurface.IEglWindowGlPlatformSurfaceInfo _info;
@@ -21,7 +21,7 @@ namespace Avalonia.X11.Glx
             return new RenderTarget((GlxContext)context, _info);
         }
 
-        class RenderTarget : IGlPlatformSurfaceRenderTarget
+        private class RenderTarget : IGlPlatformSurfaceRenderTarget
         {
             private readonly GlxContext _context;
             private readonly EglGlPlatformSurface.IEglWindowGlPlatformSurfaceInfo _info;
@@ -46,8 +46,8 @@ namespace Avalonia.X11.Glx
                     
                 return new Session(_context, _info, oldContext);
             }
-            
-            class Session : IGlPlatformSurfaceRenderingSession
+
+            private class Session : IGlPlatformSurfaceRenderingSession
             {
                 private readonly GlxContext _context;
                 private readonly EglGlPlatformSurface.IEglWindowGlPlatformSurfaceInfo _info;
diff --git a/src/Avalonia.X11/Glx/GlxPlatformFeature.cs b/src/Avalonia.X11/Glx/GlxPlatformFeature.cs
index bc50fa61aa..06766e0963 100644
--- a/src/Avalonia.X11/Glx/GlxPlatformFeature.cs
+++ b/src/Avalonia.X11/Glx/GlxPlatformFeature.cs
@@ -6,7 +6,7 @@ using Avalonia.Platform;
 
 namespace Avalonia.X11.Glx
 {
-    class GlxPlatformGraphics : IPlatformGraphics
+    internal class GlxPlatformGraphics : IPlatformGraphics
     {
         public GlxDisplay Display { get; private set; }
         public bool CanCreateContexts => true;
diff --git a/src/Avalonia.X11/Keysyms.cs b/src/Avalonia.X11/Keysyms.cs
index 651a06f574..970cf5ad4d 100644
--- a/src/Avalonia.X11/Keysyms.cs
+++ b/src/Avalonia.X11/Keysyms.cs
@@ -3,7 +3,7 @@
 // ReSharper disable CommentTypo
 namespace Avalonia.X11
 {
-    enum X11Key
+    internal enum X11Key
     {
         VoidSymbol = 0xffffff /* Void symbol */,
         BackSpace = 0xff08 /* Back space, back char */,
diff --git a/src/Avalonia.X11/NativeDialogs/Gtk.cs b/src/Avalonia.X11/NativeDialogs/Gtk.cs
index 4e56ae73cf..3f225dc6bc 100644
--- a/src/Avalonia.X11/NativeDialogs/Gtk.cs
+++ b/src/Avalonia.X11/NativeDialogs/Gtk.cs
@@ -7,8 +7,7 @@ using Avalonia.Platform.Interop;
 // ReSharper disable IdentifierTypo
 namespace Avalonia.X11.NativeDialogs
 {
-
-    static unsafe class Glib
+    internal static unsafe class Glib
     {
         private const string GlibName = "libglib-2.0.so.0";
         private const string GObjectName = "libgobject-2.0.so.0";
@@ -36,7 +35,7 @@ namespace Avalonia.X11.NativeDialogs
             IntPtr destroy);
 
 
-        class ConnectedSignal : IDisposable
+        private class ConnectedSignal : IDisposable
         {
             private readonly IntPtr _instance;
             private GCHandle _handle;
@@ -75,7 +74,7 @@ namespace Avalonia.X11.NativeDialogs
         }
 
 
-        static bool TimeoutHandler(IntPtr data)
+        private static bool TimeoutHandler(IntPtr data)
         {
             var handle = GCHandle.FromIntPtr(data);
             var cb = (Func<bool>)handle.Target;
@@ -95,7 +94,7 @@ namespace Avalonia.X11.NativeDialogs
             s_pinnedHandler = TimeoutHandler;
         }
 
-        static void AddTimeout(int priority, uint interval, Func<bool> callback)
+        private static void AddTimeout(int priority, uint interval, Func<bool> callback)
         {
             var handle = GCHandle.Alloc(callback);
             g_timeout_add_full(priority, interval, s_pinnedHandler, GCHandle.ToIntPtr(handle), IntPtr.Zero);
@@ -123,13 +122,13 @@ namespace Avalonia.X11.NativeDialogs
     }
 
     [StructLayout(LayoutKind.Sequential)]
-    unsafe struct GSList
+    internal unsafe struct GSList
     {
         public readonly IntPtr Data;
         public readonly GSList* Next;
     }
 
-    enum GtkFileChooserAction
+    internal enum GtkFileChooserAction
     {
         Open,
         Save,
@@ -137,7 +136,7 @@ namespace Avalonia.X11.NativeDialogs
     }
 
     // ReSharper disable UnusedMember.Global
-    enum GtkResponseType
+    internal enum GtkResponseType
     {
         Help = -11,
         Apply = -10,
@@ -153,14 +152,14 @@ namespace Avalonia.X11.NativeDialogs
     }
     // ReSharper restore UnusedMember.Global
 
-    static unsafe class Gtk
+    internal static unsafe class Gtk
     {
         private static IntPtr s_display;
         private const string GdkName = "libgdk-3.so.0";
         private const string GtkName = "libgtk-3.so.0";
 
         [DllImport(GtkName)]
-        static extern void gtk_main_iteration();
+        private static extern void gtk_main_iteration();
 
 
         [DllImport(GtkName)]
@@ -231,10 +230,10 @@ namespace Avalonia.X11.NativeDialogs
         public static extern void gtk_widget_hide(IntPtr gtkWidget);
 
         [DllImport(GtkName)]
-        static extern bool gtk_init_check(int argc, IntPtr argv);
+        private static extern bool gtk_init_check(int argc, IntPtr argv);
 
         [DllImport(GdkName)]
-        static extern IntPtr gdk_x11_window_foreign_new_for_display(IntPtr display, IntPtr xid);
+        private static extern IntPtr gdk_x11_window_foreign_new_for_display(IntPtr display, IntPtr xid);
         
         [DllImport(GdkName)]
         public static extern IntPtr gdk_x11_window_get_xid(IntPtr window);
@@ -244,13 +243,13 @@ namespace Avalonia.X11.NativeDialogs
         public static extern IntPtr gtk_container_add(IntPtr container, IntPtr widget);
 
         [DllImport(GdkName)]
-        static extern IntPtr gdk_set_allowed_backends(Utf8Buffer backends);
+        private static extern IntPtr gdk_set_allowed_backends(Utf8Buffer backends);
 
         [DllImport(GdkName)]
-        static extern IntPtr gdk_display_get_default();
+        private static extern IntPtr gdk_display_get_default();
 
         [DllImport(GtkName)]
-        static extern IntPtr gtk_application_new(Utf8Buffer appId, int flags);
+        private static extern IntPtr gtk_application_new(Utf8Buffer appId, int flags);
 
         [DllImport(GdkName)]
         public static extern void gdk_window_set_transient_for(IntPtr window, IntPtr parent);
diff --git a/src/Avalonia.X11/TransparencyHelper.cs b/src/Avalonia.X11/TransparencyHelper.cs
index 2140b61b6f..5ca2d1d337 100644
--- a/src/Avalonia.X11/TransparencyHelper.cs
+++ b/src/Avalonia.X11/TransparencyHelper.cs
@@ -3,7 +3,7 @@ using Avalonia.Controls;
 
 namespace Avalonia.X11
 {
-    class TransparencyHelper :  IDisposable, X11Globals.IGlobalsSubscriber
+    internal class TransparencyHelper :  IDisposable, X11Globals.IGlobalsSubscriber
     {
         private readonly X11Info _x11;
         private readonly IntPtr _window;
diff --git a/src/Avalonia.X11/X11Clipboard.cs b/src/Avalonia.X11/X11Clipboard.cs
index 2aa7797067..04d1aae194 100644
--- a/src/Avalonia.X11/X11Clipboard.cs
+++ b/src/Avalonia.X11/X11Clipboard.cs
@@ -9,7 +9,7 @@ using Avalonia.Input.Platform;
 using static Avalonia.X11.XLib;
 namespace Avalonia.X11
 {
-    class X11Clipboard : IClipboard
+    internal class X11Clipboard : IClipboard
     {
         private readonly X11Info _x11;
         private IDataObject _storedDataObject;
@@ -33,12 +33,12 @@ namespace Avalonia.X11
             }.Where(a => a != IntPtr.Zero).ToArray();
         }
 
-        bool IsStringAtom(IntPtr atom)
+        private bool IsStringAtom(IntPtr atom)
         {
             return _textAtoms.Contains(atom);
         }
-        
-        Encoding GetStringEncoding(IntPtr atom)
+
+        private Encoding GetStringEncoding(IntPtr atom)
         {
             return (atom == _x11.Atoms.XA_STRING
                     || atom == _x11.Atoms.OEMTEXT)
@@ -213,7 +213,7 @@ namespace Avalonia.X11
             }
         }
 
-        Task<IntPtr[]> SendFormatRequest()
+        private Task<IntPtr[]> SendFormatRequest()
         {
             if (_requestedFormatsTcs == null || _requestedFormatsTcs.Task.IsCompleted)
                 _requestedFormatsTcs = new TaskCompletionSource<IntPtr[]>();
@@ -222,7 +222,7 @@ namespace Avalonia.X11
             return _requestedFormatsTcs.Task;
         }
 
-        Task<object> SendDataRequest(IntPtr format)
+        private Task<object> SendDataRequest(IntPtr format)
         {
             if (_requestedDataTcs == null || _requestedFormatsTcs.Task.IsCompleted)
                 _requestedDataTcs = new TaskCompletionSource<object>();
@@ -230,7 +230,7 @@ namespace Avalonia.X11
             return _requestedDataTcs.Task;
         }
 
-        bool HasOwner => XGetSelectionOwner(_x11.Display, _x11.Atoms.CLIPBOARD) != IntPtr.Zero;
+        private bool HasOwner => XGetSelectionOwner(_x11.Display, _x11.Atoms.CLIPBOARD) != IntPtr.Zero;
         
         public async Task<string> GetTextAsync()
         {
@@ -252,7 +252,7 @@ namespace Avalonia.X11
             return (string)await SendDataRequest(target);
         }
 
-        void StoreAtomsInClipboardManager(IntPtr[] atoms)
+        private void StoreAtomsInClipboardManager(IntPtr[] atoms)
         {
             if (_x11.Atoms.CLIPBOARD_MANAGER != IntPtr.Zero && _x11.Atoms.SAVE_TARGETS != IntPtr.Zero)
             {
diff --git a/src/Avalonia.X11/X11CursorFactory.cs b/src/Avalonia.X11/X11CursorFactory.cs
index 16de10e163..56fd2f14ef 100644
--- a/src/Avalonia.X11/X11CursorFactory.cs
+++ b/src/Avalonia.X11/X11CursorFactory.cs
@@ -12,7 +12,7 @@ using Avalonia.Utilities;
 
 namespace Avalonia.X11
 {
-    partial class X11CursorFactory : ICursorFactory
+    internal partial class X11CursorFactory : ICursorFactory
     {
         private static readonly byte[] NullCursorData = new byte[] { 0 };
 
@@ -142,7 +142,7 @@ namespace Avalonia.X11
         }
     }
 
-    class CursorImpl : ICursorImpl
+    internal class CursorImpl : ICursorImpl
     {
         public CursorImpl() { }
         public CursorImpl(IntPtr handle) => Handle = handle;
diff --git a/src/Avalonia.X11/X11Enums.cs b/src/Avalonia.X11/X11Enums.cs
index d97e1c42bb..9d671ae6d2 100644
--- a/src/Avalonia.X11/X11Enums.cs
+++ b/src/Avalonia.X11/X11Enums.cs
@@ -3,7 +3,7 @@ using System;
 namespace Avalonia.X11
 {
 
-    public enum Status
+    internal enum Status
     {
         Success = 0, /* everything's okay */
         BadRequest = 1, /* bad request code */
@@ -38,7 +38,7 @@ namespace Avalonia.X11
     }
 
     [Flags]
-    public enum XEventMask : int
+    internal enum XEventMask : int
     {
         NoEventMask = 0,
         KeyPressMask = (1 << 0),
@@ -69,7 +69,7 @@ namespace Avalonia.X11
     }
 
     [Flags]
-    public enum XModifierMask
+    internal enum XModifierMask
     {
         ShiftMask = (1 << 0),
         LockMask = (1 << 1),
@@ -89,7 +89,7 @@ namespace Avalonia.X11
     }
     
     [Flags]
-    public enum XCreateWindowFlags
+    internal enum XCreateWindowFlags
     {
         CWBackPixmap = (1 << 0),
         CWBackPixel = (1 << 1),
diff --git a/src/Avalonia.X11/X11Exception.cs b/src/Avalonia.X11/X11Exception.cs
index 2ac5a31d9b..231ece497b 100644
--- a/src/Avalonia.X11/X11Exception.cs
+++ b/src/Avalonia.X11/X11Exception.cs
@@ -2,7 +2,7 @@ using System;
 
 namespace Avalonia.X11
 {
-    public class X11Exception : Exception
+    internal class X11Exception : Exception
     {
         public X11Exception(string message) : base(message)
         {
diff --git a/src/Avalonia.X11/X11Framebuffer.cs b/src/Avalonia.X11/X11Framebuffer.cs
index a9fedff8b5..90e4b18571 100644
--- a/src/Avalonia.X11/X11Framebuffer.cs
+++ b/src/Avalonia.X11/X11Framebuffer.cs
@@ -5,7 +5,7 @@ using SkiaSharp;
 using static Avalonia.X11.XLib;
 namespace Avalonia.X11
 {
-    class X11Framebuffer : ILockedFramebuffer
+    internal class X11Framebuffer : ILockedFramebuffer
     {
         private readonly IntPtr _display;
         private readonly IntPtr _xid;
diff --git a/src/Avalonia.X11/X11FramebufferSurface.cs b/src/Avalonia.X11/X11FramebufferSurface.cs
index 07c88b51a8..05885d1a25 100644
--- a/src/Avalonia.X11/X11FramebufferSurface.cs
+++ b/src/Avalonia.X11/X11FramebufferSurface.cs
@@ -4,7 +4,7 @@ using Avalonia.Platform;
 using static Avalonia.X11.XLib;
 namespace Avalonia.X11
 {
-    public class X11FramebufferSurface : IFramebufferPlatformSurface
+    internal class X11FramebufferSurface : IFramebufferPlatformSurface
     {
         private readonly IntPtr _display;
         private readonly IntPtr _xid;
diff --git a/src/Avalonia.X11/X11Globals.cs b/src/Avalonia.X11/X11Globals.cs
index 39834a44b3..1ae0544724 100644
--- a/src/Avalonia.X11/X11Globals.cs
+++ b/src/Avalonia.X11/X11Globals.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using static Avalonia.X11.XLib;
 namespace Avalonia.X11
 {
-    unsafe class X11Globals
+    internal unsafe class X11Globals
     {
         private readonly AvaloniaX11Platform _plat;
         private readonly int _screenNumber;
@@ -75,7 +75,7 @@ namespace Avalonia.X11
             }
         }
 
-        IntPtr GetSupportingWmCheck(IntPtr window)
+        private IntPtr GetSupportingWmCheck(IntPtr window)
         {
             XGetWindowProperty(_x11.Display, _rootWindow, _x11.Atoms._NET_SUPPORTING_WM_CHECK,
                 IntPtr.Zero, new IntPtr(IntPtr.Size), false,
@@ -95,7 +95,7 @@ namespace Avalonia.X11
             }
         }
 
-        void UpdateCompositingAtomOwner()
+        private void UpdateCompositingAtomOwner()
         {
             // This procedure is described in https://tronche.com/gui/x/icccm/sec-2.html#s-2.8
             
@@ -128,10 +128,10 @@ namespace Avalonia.X11
             if(ev.type == XEventName.DestroyNotify)
                 UpdateCompositingAtomOwner();
         }
-        
-        void UpdateWmName() => WmName = GetWmName();
 
-        string GetWmName()
+        private void UpdateWmName() => WmName = GetWmName();
+
+        private string GetWmName()
         {
             var wm = GetSupportingWmCheck(_rootWindow);
             if (wm == IntPtr.Zero || wm != GetSupportingWmCheck(wm))
diff --git a/src/Avalonia.X11/X11IconLoader.cs b/src/Avalonia.X11/X11IconLoader.cs
index bf59d72c0f..51db815b31 100644
--- a/src/Avalonia.X11/X11IconLoader.cs
+++ b/src/Avalonia.X11/X11IconLoader.cs
@@ -7,9 +7,9 @@ using Avalonia.Platform;
 
 namespace Avalonia.X11
 {
-    class X11IconLoader : IPlatformIconLoader
+    internal class X11IconLoader : IPlatformIconLoader
     {
-        static IWindowIconImpl LoadIcon(Bitmap bitmap)
+        private static IWindowIconImpl LoadIcon(Bitmap bitmap)
         {
             var rv = new X11IconData(bitmap);
             bitmap.Dispose();
@@ -28,8 +28,8 @@ namespace Avalonia.X11
             return LoadIcon(ms);
         }
     }
-    
-    unsafe class X11IconData : IWindowIconImpl, IFramebufferPlatformSurface
+
+    internal unsafe class X11IconData : IWindowIconImpl, IFramebufferPlatformSurface
     {
         private int _width;
         private int _height;
diff --git a/src/Avalonia.X11/X11Info.cs b/src/Avalonia.X11/X11Info.cs
index 72f3bf3137..17cd6b12c6 100644
--- a/src/Avalonia.X11/X11Info.cs
+++ b/src/Avalonia.X11/X11Info.cs
@@ -6,7 +6,7 @@ using static Avalonia.X11.XLib;
 // ReSharper disable UnusedAutoPropertyAccessor.Local
 namespace Avalonia.X11
 {
-    unsafe class X11Info
+    internal unsafe class X11Info
     {
         public IntPtr Display { get; }
         public IntPtr DeferredDisplay { get; }
diff --git a/src/Avalonia.X11/X11KeyTransform.cs b/src/Avalonia.X11/X11KeyTransform.cs
index 59f1da564c..6732a0f448 100644
--- a/src/Avalonia.X11/X11KeyTransform.cs
+++ b/src/Avalonia.X11/X11KeyTransform.cs
@@ -4,7 +4,7 @@ using Avalonia.Input;
 
 namespace Avalonia.X11
 {
-    static class X11KeyTransform
+    internal static class X11KeyTransform
     {
         private static readonly Dictionary<X11Key, Key> KeyDic = new Dictionary<X11Key, Key>
         {
diff --git a/src/Avalonia.X11/X11NativeControlHost.cs b/src/Avalonia.X11/X11NativeControlHost.cs
index 6c4eb81c84..e8710580eb 100644
--- a/src/Avalonia.X11/X11NativeControlHost.cs
+++ b/src/Avalonia.X11/X11NativeControlHost.cs
@@ -6,7 +6,7 @@ using static Avalonia.X11.XLib;
 namespace Avalonia.X11
 {
     // TODO: Actually implement XEmbed instead of simply using XReparentWindow
-    class X11NativeControlHost : INativeControlHostImpl
+    internal class X11NativeControlHost : INativeControlHostImpl
     {
         private readonly AvaloniaX11Platform _platform;
         public X11Window Window { get; }
@@ -57,7 +57,7 @@ namespace Avalonia.X11
 
         public bool IsCompatibleWith(IPlatformHandle handle) => handle.HandleDescriptor == "XID";
 
-        class DumbWindow : INativeControlHostDestroyableControlHandle
+        private class DumbWindow : INativeControlHostDestroyableControlHandle
         {
             private readonly IntPtr _display;
 
@@ -96,8 +96,8 @@ namespace Avalonia.X11
                 }
             }
         }
-        
-        class Attachment : INativeControlHostControlTopLevelAttachment
+
+        private class Attachment : INativeControlHostControlTopLevelAttachment
         {
             private readonly IntPtr _display;
             private readonly IntPtr _orphanedWindow;
@@ -129,7 +129,7 @@ namespace Avalonia.X11
                 _attachedTo = null;
             }
 
-            void CheckDisposed()
+            private void CheckDisposed()
             {
                 if (_child == null)
                     throw new ObjectDisposedException("X11 INativeControlHostControlTopLevelAttachment");
diff --git a/src/Avalonia.X11/X11Platform.cs b/src/Avalonia.X11/X11Platform.cs
index c5ae327c2f..170c6ce6b3 100644
--- a/src/Avalonia.X11/X11Platform.cs
+++ b/src/Avalonia.X11/X11Platform.cs
@@ -20,7 +20,7 @@ using static Avalonia.X11.XLib;
 
 namespace Avalonia.X11
 {
-    class AvaloniaX11Platform : IWindowingPlatform
+    internal class AvaloniaX11Platform : IWindowingPlatform
     {
         private Lazy<KeyboardDevice> _keyboardDevice = new Lazy<KeyboardDevice>(() => new KeyboardDevice());
         public KeyboardDevice KeyboardDevice => _keyboardDevice.Value;
@@ -35,7 +35,7 @@ namespace Avalonia.X11
         public IntPtr OrphanedWindow { get; private set; }
         public X11Globals Globals { get; private set; }
         [DllImport("libc")]
-        static extern void setlocale(int type, string s);
+        private static extern void setlocale(int type, string s);
         public void Initialize(X11PlatformOptions options)
         {
             Options = options;
@@ -138,7 +138,7 @@ namespace Avalonia.X11
             throw new NotSupportedException();
         }
 
-        static bool EnableIme(X11PlatformOptions options)
+        private static bool EnableIme(X11PlatformOptions options)
         {
             // Disable if explicitly asked by user
             var avaloniaImModule = Environment.GetEnvironmentVariable("AVALONIA_IM_MODULE");
@@ -160,7 +160,7 @@ namespace Avalonia.X11
             return isCjkLocale;
         }
 
-        static bool ShouldUseXim()
+        private static bool ShouldUseXim()
         {
             // Check if we are forbidden from using IME
             if (Environment.GetEnvironmentVariable("AVALONIA_IM_MODULE") == "none"
diff --git a/src/Avalonia.X11/X11PlatformThreading.cs b/src/Avalonia.X11/X11PlatformThreading.cs
index d724cd2aed..1946642de3 100644
--- a/src/Avalonia.X11/X11PlatformThreading.cs
+++ b/src/Avalonia.X11/X11PlatformThreading.cs
@@ -9,7 +9,7 @@ using static Avalonia.X11.XLib;
 
 namespace Avalonia.X11
 {
-    unsafe class X11PlatformThreading : IPlatformThreadingInterface
+    internal unsafe class X11PlatformThreading : IPlatformThreadingInterface
     {
         private readonly AvaloniaX11Platform _platform;
         private readonly IntPtr _display;
@@ -19,7 +19,7 @@ namespace Avalonia.X11
         private Thread _mainThread;
 
         [StructLayout(LayoutKind.Explicit)]
-        struct epoll_data
+        private struct epoll_data
         {
             [FieldOffset(0)]
             public IntPtr ptr;
@@ -36,30 +36,30 @@ namespace Avalonia.X11
         private const int O_NONBLOCK = 2048;
         
         [StructLayout(LayoutKind.Sequential)]
-        struct epoll_event
+        private struct epoll_event
         {
             public uint events;
             public epoll_data data;
         }
         
         [DllImport("libc")]
-        extern static int epoll_create1(int size);
+        private extern static int epoll_create1(int size);
 
         [DllImport("libc")]
-        extern static int epoll_ctl(int epfd, int op, int fd, ref epoll_event __event);
+        private extern static int epoll_ctl(int epfd, int op, int fd, ref epoll_event __event);
 
         [DllImport("libc")]
-        extern static int epoll_wait(int epfd, epoll_event* events, int maxevents, int timeout);
+        private extern static int epoll_wait(int epfd, epoll_event* events, int maxevents, int timeout);
 
         [DllImport("libc")]
-        extern static int pipe2(int* fds, int flags);
+        private extern static int pipe2(int* fds, int flags);
         [DllImport("libc")]
-        extern static IntPtr write(int fd, void* buf, IntPtr count);
+        private extern static IntPtr write(int fd, void* buf, IntPtr count);
         
         [DllImport("libc")]
-        extern static IntPtr read(int fd, void* buf, IntPtr count);
-        
-        enum EventCodes
+        private extern static IntPtr read(int fd, void* buf, IntPtr count);
+
+        private enum EventCodes
         {
             X11 = 1,
             Signal =2
@@ -72,7 +72,7 @@ namespace Avalonia.X11
         private int _epoll;
         private Stopwatch _clock = Stopwatch.StartNew();
 
-        class X11Timer : IDisposable
+        private class X11Timer : IDisposable
         {
             private readonly X11PlatformThreading _parent;
 
@@ -104,7 +104,7 @@ namespace Avalonia.X11
             }
         }
 
-        List<X11Timer> _timers = new List<X11Timer>();
+        private List<X11Timer> _timers = new List<X11Timer>();
         
         public X11PlatformThreading(AvaloniaX11Platform platform)
         {
@@ -139,12 +139,12 @@ namespace Avalonia.X11
                 throw new X11Exception("Unable to attach signal pipe to epoll");
         }
 
-        int TimerComparer(X11Timer t1, X11Timer t2)
+        private int TimerComparer(X11Timer t1, X11Timer t2)
         {
             return t2.Priority - t1.Priority;
         }
 
-        void CheckSignaled()
+        private void CheckSignaled()
         {
             int buf = 0;
             while (read(_sigread, &buf, new IntPtr(4)).ToInt64() > 0)
@@ -164,7 +164,7 @@ namespace Avalonia.X11
             Signaled?.Invoke(prio);
         }
 
-        unsafe void HandleX11(CancellationToken cancellationToken)
+        private unsafe void HandleX11(CancellationToken cancellationToken)
         {
             while (XPending(_display) != 0)
             {
diff --git a/src/Avalonia.X11/X11Screens.cs b/src/Avalonia.X11/X11Screens.cs
index 87899b11ed..6c7283952d 100644
--- a/src/Avalonia.X11/X11Screens.cs
+++ b/src/Avalonia.X11/X11Screens.cs
@@ -8,7 +8,7 @@ using static Avalonia.X11.XLib;
 
 namespace Avalonia.X11
 {
-    class X11Screens : IScreenImpl
+    internal class X11Screens : IScreenImpl
     {
         private IX11Screens _impl;
 
@@ -17,7 +17,7 @@ namespace Avalonia.X11
             _impl = impl;
         }
 
-        static unsafe X11Screen[] UpdateWorkArea(X11Info info, X11Screen[] screens)
+        private static unsafe X11Screen[] UpdateWorkArea(X11Info info, X11Screen[] screens)
         {
             var rect = default(PixelRect);
             foreach (var s in screens)
@@ -58,14 +58,14 @@ namespace Avalonia.X11
             XFree(prop);
             return screens;
         }
-        
-        class Randr15ScreensImpl : IX11Screens
+
+        private class Randr15ScreensImpl : IX11Screens
         {
             private readonly X11ScreensUserSettings _settings;
             private X11Screen[] _cache;
             private X11Info _x11;
             private IntPtr _window;
-            const int EDIDStructureLength = 32; // Length of a EDID-Block-Length(128 bytes), XRRGetOutputProperty multiplies offset and length by 4
+            private const int EDIDStructureLength = 32; // Length of a EDID-Block-Length(128 bytes), XRRGetOutputProperty multiplies offset and length by 4
             
             public Randr15ScreensImpl(AvaloniaX11Platform platform, X11ScreensUserSettings settings)
             {
@@ -160,7 +160,7 @@ namespace Avalonia.X11
             }
         }
 
-        class FallbackScreensImpl : IX11Screens
+        private class FallbackScreensImpl : IX11Screens
         {
             public FallbackScreensImpl(X11Info info, X11ScreensUserSettings settings)
             {
@@ -220,17 +220,17 @@ namespace Avalonia.X11
             _impl.Screens.Select(s => new Screen(s.Scaling, s.Bounds, s.WorkingArea, s.IsPrimary)).ToArray();
     }
 
-    interface IX11Screens
+    internal interface IX11Screens
     {
         X11Screen[] Screens { get; }
     }
 
-    class X11ScreensUserSettings
+    internal class X11ScreensUserSettings
     {
         public double GlobalScaleFactor { get; set; } = 1;
         public Dictionary<string, double> NamedScaleFactors { get; set; }
 
-        static double? TryParse(string s)
+        private static double? TryParse(string s)
         {
             if (s == null)
                 return null;
@@ -276,7 +276,7 @@ namespace Avalonia.X11
         }
     }
 
-    class X11Screen
+    internal class X11Screen
     {
         private const int FullHDWidth = 1920;
         private const int FullHDHeight = 1080;
diff --git a/src/Avalonia.X11/X11Structs.cs b/src/Avalonia.X11/X11Structs.cs
index 26515762b4..18f860a1a8 100644
--- a/src/Avalonia.X11/X11Structs.cs
+++ b/src/Avalonia.X11/X11Structs.cs
@@ -1751,8 +1751,7 @@ namespace Avalonia.X11 {
 	{
 		public IntPtr client_data;
 		public XIMProc callback;
-		[NonSerialized]
-		GCHandle gch;
+		[NonSerialized] private GCHandle gch;
 
 		public XIMCallback (IntPtr clientData, XIMProc proc)
 		{
@@ -1769,7 +1768,7 @@ namespace Avalonia.X11 {
     
     [StructLayout(LayoutKind.Sequential)]
 #pragma warning disable CA1815 // Override equals and operator equals on value types
-    public unsafe struct XImage
+    internal unsafe struct XImage
 #pragma warning restore CA1815 // Override equals and operator equals on value types
     {
         public int width, height; /* size of image */
@@ -1896,8 +1895,8 @@ namespace Avalonia.X11 {
 		public const string XNSpotLocation = "spotLocation";
 		public const string XNFontSet = "fontSet";
 	}
-	
-    unsafe struct XRRMonitorInfo {
+
+    internal unsafe struct XRRMonitorInfo {
         public IntPtr Name;
         public int Primary;
         public int Automatic;
diff --git a/src/Avalonia.X11/X11Window.Ime.cs b/src/Avalonia.X11/X11Window.Ime.cs
index e6066c7964..26ead5e6b8 100644
--- a/src/Avalonia.X11/X11Window.Ime.cs
+++ b/src/Avalonia.X11/X11Window.Ime.cs
@@ -11,7 +11,7 @@ using static Avalonia.X11.XLib;
 
 namespace Avalonia.X11
 {
-    partial class X11Window
+    internal partial class X11Window
     {
         private ITextInputMethodImpl _ime;
         private IX11InputMethodControl _imeControl;
@@ -20,7 +20,7 @@ namespace Avalonia.X11
         private Queue<(RawKeyEventArgs args, XEvent xev, int keyval, int keycode)> _imeQueue =
             new Queue<(RawKeyEventArgs args, XEvent xev, int keyVal, int keyCode)>();
 
-        unsafe void CreateIC()
+        private unsafe void CreateIC()
         {
             if (_x11.HasXim)
             {
@@ -65,8 +65,8 @@ namespace Avalonia.X11
                     new IntPtr((int)(XIMProperties.XIMPreeditNothing | XIMProperties.XIMStatusNothing)),
                     XNames.XNClientWindow, _handle, XNames.XNFocusWindow, _handle, IntPtr.Zero);
         }
-        
-        void InitializeIme()
+
+        private void InitializeIme()
         {
             var ime =  AvaloniaLocator.Current.GetService<IX11InputMethodFactory>()?.CreateClient(_handle);
             if (ime == null && _x11.HasXim)
@@ -89,9 +89,9 @@ namespace Avalonia.X11
             }
         }
 
-        void UpdateImePosition() => _imeControl?.UpdateWindowInfo(Position, RenderScaling);
+        private void UpdateImePosition() => _imeControl?.UpdateWindowInfo(Position, RenderScaling);
 
-        void HandleKeyEvent(ref XEvent ev)
+        private void HandleKeyEvent(ref XEvent ev)
         {
             var index = ev.KeyEvent.state.HasAllFlags(XModifierMask.ShiftMask);
 
@@ -117,7 +117,7 @@ namespace Avalonia.X11
             ScheduleKeyInput(args, ref ev, (int)key, ev.KeyEvent.keycode);
         }
 
-        void TriggerClassicTextInputEvent(ref XEvent ev)
+        private void TriggerClassicTextInputEvent(ref XEvent ev)
         {
             var text = TranslateEventToString(ref ev);
             if (text != null)
@@ -128,8 +128,8 @@ namespace Avalonia.X11
 
         private const int ImeBufferSize = 64 * 1024;
         [ThreadStatic] private static IntPtr ImeBuffer;
-        
-        unsafe string TranslateEventToString(ref XEvent ev)
+
+        private unsafe string TranslateEventToString(ref XEvent ev)
         {
             if (ImeBuffer == IntPtr.Zero)
                 ImeBuffer = Marshal.AllocHGlobal(ImeBufferSize);
@@ -158,9 +158,9 @@ namespace Avalonia.X11
 
             return text;
         }
-        
-        
-        void ScheduleKeyInput(RawKeyEventArgs args, ref XEvent xev, int keyval, int keycode)
+
+
+        private void ScheduleKeyInput(RawKeyEventArgs args, ref XEvent xev, int keyval, int keycode)
         {
             _x11.LastActivityTimestamp = xev.ButtonEvent.time;
             
@@ -170,8 +170,8 @@ namespace Avalonia.X11
             
             ScheduleInput(args);
         }
-        
-        bool FilterIme(RawKeyEventArgs args, XEvent xev, int keyval, int keycode)
+
+        private bool FilterIme(RawKeyEventArgs args, XEvent xev, int keyval, int keycode)
         {
             if (_ime == null)
                 return false;
@@ -182,7 +182,7 @@ namespace Avalonia.X11
             return true;
         }
 
-        async void ProcessNextImeEvent()
+        private async void ProcessNextImeEvent()
         {
             if(_processingIme)
                 return;
@@ -203,7 +203,7 @@ namespace Avalonia.X11
         }
 
         // This class is used to attach the text value of the key to an asynchronously dispatched KeyDown event
-        class RawKeyEventArgsWithText : RawKeyEventArgs
+        private class RawKeyEventArgsWithText : RawKeyEventArgs
         {
             public RawKeyEventArgsWithText(IKeyboardDevice device, ulong timestamp, IInputRoot root,
                 RawKeyEventType type, Key key, RawInputModifiers modifiers, string text) :
diff --git a/src/Avalonia.X11/X11Window.Xim.cs b/src/Avalonia.X11/X11Window.Xim.cs
index 8446d35cc6..cc5ecad09f 100644
--- a/src/Avalonia.X11/X11Window.Xim.cs
+++ b/src/Avalonia.X11/X11Window.Xim.cs
@@ -8,9 +8,9 @@ using Avalonia.Threading;
 using static Avalonia.X11.XLib;
 namespace Avalonia.X11
 {
-    partial class X11Window
+    internal partial class X11Window
     {
-        class XimInputMethod : ITextInputMethodImpl, IX11InputMethodControl
+        private class XimInputMethod : ITextInputMethodImpl, IX11InputMethodControl
         {
             private readonly X11Window _parent;
             private bool _windowActive, _imeActive;
diff --git a/src/Avalonia.X11/X11Window.cs b/src/Avalonia.X11/X11Window.cs
index c78ef2350e..9f09212814 100644
--- a/src/Avalonia.X11/X11Window.cs
+++ b/src/Avalonia.X11/X11Window.cs
@@ -27,7 +27,7 @@ using static Avalonia.X11.XLib;
 // ReSharper disable StringLiteralTypo
 namespace Avalonia.X11
 {
-    unsafe partial class X11Window : IWindowImpl, IPopupImpl, IXI2Client
+    internal unsafe partial class X11Window : IWindowImpl, IPopupImpl, IXI2Client
     {
         private readonly AvaloniaX11Platform _platform;
         private readonly bool _popup;
@@ -59,7 +59,7 @@ namespace Avalonia.X11
         private bool _useRenderWindow = false;
         private bool _usePositioningFlags = false;
 
-        enum XSyncState
+        private enum XSyncState
         {
             None,
             WaitConfigure,
@@ -219,7 +219,7 @@ namespace Avalonia.X11
             });
         }
 
-        class SurfaceInfo  : EglGlPlatformSurface.IEglWindowGlPlatformSurfaceInfo
+        private class SurfaceInfo  : EglGlPlatformSurface.IEglWindowGlPlatformSurfaceInfo
         {
             private readonly X11Window _window;
             private readonly IntPtr _display;
@@ -249,7 +249,7 @@ namespace Avalonia.X11
             public double Scaling => _window.RenderScaling;
         }
 
-        void UpdateMotifHints()
+        private void UpdateMotifHints()
         {
             var functions = MotifFunctions.Move | MotifFunctions.Close | MotifFunctions.Resize |
                             MotifFunctions.Minimize | MotifFunctions.Maximize;
@@ -278,7 +278,7 @@ namespace Avalonia.X11
                 PropertyMode.Replace, ref hints, 5);
         }
 
-        void UpdateSizeHints(PixelSize? preResize)
+        private void UpdateSizeHints(PixelSize? preResize)
         {
             var min = _minMaxSize.minSize;
             var max = _minMaxSize.maxSize;
@@ -386,7 +386,7 @@ namespace Avalonia.X11
         public IRenderer CreateRenderer(IRenderRoot root) =>
             new CompositingRenderer(root, _platform.Compositor, () => Surfaces);
 
-        void OnEvent(ref XEvent ev)
+        private void OnEvent(ref XEvent ev)
         {
             if (ev.type == XEventName.MapNotify)
             {
@@ -668,7 +668,7 @@ namespace Avalonia.X11
 
         }
 
-        static RawInputModifiers TranslateModifiers(XModifierMask state)
+        private static RawInputModifiers TranslateModifiers(XModifierMask state)
         {
             var rv = default(RawInputModifiers);
             if (state.HasAllFlags(XModifierMask.Button1Mask))
@@ -704,13 +704,13 @@ namespace Avalonia.X11
         
         private double _scaling = 1;
 
-        void ScheduleInput(RawInputEventArgs args, ref XEvent xev)
+        private void ScheduleInput(RawInputEventArgs args, ref XEvent xev)
         {
             _x11.LastActivityTimestamp = xev.ButtonEvent.time;
             ScheduleInput(args);
         }
 
-        void DispatchInput(RawInputEventArgs args)
+        private void DispatchInput(RawInputEventArgs args)
         {
             Input?.Invoke(args);
             if (!args.Handled && args is RawKeyEventArgsWithText text && !string.IsNullOrEmpty(text.Text))
@@ -746,8 +746,8 @@ namespace Avalonia.X11
             
             _rawEventGrouper.HandleEvent(args);
         }
-        
-        void MouseEvent(RawPointerEventType type, ref XEvent ev, XModifierMask mods)
+
+        private void MouseEvent(RawPointerEventType type, ref XEvent ev, XModifierMask mods)
         {
             var mev = new RawPointerEventArgs(
                 _mouse, (ulong)ev.ButtonEvent.time.ToInt64(), _inputRoot,
@@ -755,7 +755,7 @@ namespace Avalonia.X11
             ScheduleInput(mev, ref ev);
         }
 
-        void EnqueuePaint()
+        private void EnqueuePaint()
         {
             if (!_triggeredExpose)
             {
@@ -767,8 +767,8 @@ namespace Avalonia.X11
                 }, DispatcherPriority.Render);
             }
         }
-        
-        void DoPaint()
+
+        private void DoPaint()
         {
             Paint?.Invoke(new Rect());
             if (_xSyncCounter != IntPtr.Zero && _xSyncState == XSyncState.WaitPaint)
@@ -819,8 +819,8 @@ namespace Avalonia.X11
 
             return null;
         }
-        
-        void Cleanup()
+
+        private void Cleanup()
         {
             if (_rawEventGrouper != null)
             {
@@ -871,7 +871,7 @@ namespace Avalonia.X11
             }
         }
 
-        bool ActivateTransientChildIfNeeded()
+        private bool ActivateTransientChildIfNeeded()
         {
             if (_disabled)
             {
@@ -923,9 +923,9 @@ namespace Avalonia.X11
             Resize(size, true, PlatformResizeReason.Layout);
         }
 
-        PixelSize ToPixelSize(Size size) => new PixelSize((int)(size.Width * RenderScaling), (int)(size.Height * RenderScaling));
-        
-        void Resize(Size clientSize, bool force, PlatformResizeReason reason)
+        private PixelSize ToPixelSize(Size size) => new PixelSize((int)(size.Width * RenderScaling), (int)(size.Height * RenderScaling));
+
+        private void Resize(Size clientSize, bool force, PlatformResizeReason reason)
         {
             if (!force && clientSize == ClientSize)
                 return;
@@ -1020,7 +1020,7 @@ namespace Avalonia.X11
             .OrderByDescending(x => x.Width + x.Height).FirstOrDefault();
 
 
-        void SendNetWMMessage(IntPtr message_type, IntPtr l0,
+        private void SendNetWMMessage(IntPtr message_type, IntPtr l0,
             IntPtr? l1 = null, IntPtr? l2 = null, IntPtr? l3 = null, IntPtr? l4 = null)
         {
             var xev = new XEvent
@@ -1044,7 +1044,7 @@ namespace Avalonia.X11
 
         }
 
-        void BeginMoveResize(NetWmMoveResize side, PointerPressedEventArgs e)
+        private void BeginMoveResize(NetWmMoveResize side, PointerPressedEventArgs e)
         {
             var pos = GetCursorPos(_x11);
             XUngrabPointer(_x11.Display, new IntPtr(0));
@@ -1184,7 +1184,7 @@ namespace Avalonia.X11
             ChangeWMAtoms(!value, _x11.Atoms._NET_WM_STATE_SKIP_TASKBAR);
         }
 
-        void ChangeWMAtoms(bool enable, params IntPtr[] atoms)
+        private void ChangeWMAtoms(bool enable, params IntPtr[] atoms)
         {
             if (atoms.Length != 1 && atoms.Length != 2)
                 throw new ArgumentException();
diff --git a/src/Avalonia.X11/XError.cs b/src/Avalonia.X11/XError.cs
index 2cc8f63c96..fbe9c34686 100644
--- a/src/Avalonia.X11/XError.cs
+++ b/src/Avalonia.X11/XError.cs
@@ -2,11 +2,12 @@ using System;
 
 namespace Avalonia.X11
 {
-    static class XError
+    internal static class XError
     {
         private static readonly XErrorHandler s_errorHandlerDelegate = Handler;
         public static XErrorEvent LastError;
-        static int Handler(IntPtr display, ref XErrorEvent error)
+
+        private static int Handler(IntPtr display, ref XErrorEvent error)
         {
             LastError = error;
             return 0;
diff --git a/src/Avalonia.X11/XI2Manager.cs b/src/Avalonia.X11/XI2Manager.cs
index 7bf1df41b6..f66616f2aa 100644
--- a/src/Avalonia.X11/XI2Manager.cs
+++ b/src/Avalonia.X11/XI2Manager.cs
@@ -7,7 +7,7 @@ using static Avalonia.X11.XLib;
 
 namespace Avalonia.X11
 {
-    unsafe class XI2Manager
+    internal unsafe class XI2Manager
     {
         private static readonly XiEventType[] DefaultEventTypes = new XiEventType[]
         {
@@ -30,7 +30,7 @@ namespace Avalonia.X11
         private bool _multitouch;
         private Dictionary<IntPtr, IXI2Client> _clients = new Dictionary<IntPtr, IXI2Client>();
 
-        class DeviceInfo
+        private class DeviceInfo
         {
             public int Id { get; }
             public XIValuatorClassInfo[] Valuators { get; private set; }
@@ -67,7 +67,7 @@ namespace Avalonia.X11
             }
         }
 
-        class PointerDeviceInfo : DeviceInfo
+        private class PointerDeviceInfo : DeviceInfo
         {
             public PointerDeviceInfo(XIDeviceInfo info) : base(info)
             {
@@ -197,7 +197,7 @@ namespace Avalonia.X11
             }
         }
 
-        void OnEnterLeaveEvent(IXI2Client client, ref XIEnterLeaveEvent ev)
+        private void OnEnterLeaveEvent(IXI2Client client, ref XIEnterLeaveEvent ev)
         {
             if (ev.evtype == XiEventType.XI_Leave)
             {
@@ -215,7 +215,7 @@ namespace Avalonia.X11
             }
         }
 
-        void OnDeviceEvent(IXI2Client client, ParsedDeviceEvent ev)
+        private void OnDeviceEvent(IXI2Client client, ParsedDeviceEvent ev)
         {
             if (ev.Type == XiEventType.XI_TouchBegin 
                 || ev.Type == XiEventType.XI_TouchUpdate 
@@ -304,7 +304,7 @@ namespace Avalonia.X11
         }
     }
 
-    unsafe class ParsedDeviceEvent
+    internal unsafe class ParsedDeviceEvent
     {
         public XiEventType Type { get; }
         public RawInputModifiers Modifiers { get; }
@@ -367,8 +367,8 @@ namespace Avalonia.X11
             Emulated = ev->flags.HasAllFlags(XiDeviceEventFlags.XIPointerEmulated);
         }
     }
-    
-    interface IXI2Client
+
+    internal interface IXI2Client
     {
         IInputRoot InputRoot { get; }
         void ScheduleXI2Input(RawInputEventArgs args);
diff --git a/src/Avalonia.X11/XIStructs.cs b/src/Avalonia.X11/XIStructs.cs
index f4581a99ba..9a1ed01764 100644
--- a/src/Avalonia.X11/XIStructs.cs
+++ b/src/Avalonia.X11/XIStructs.cs
@@ -10,7 +10,7 @@ using Atom = System.IntPtr;
 namespace Avalonia.X11
 {
     [StructLayout(LayoutKind.Sequential)]
-    struct XIAddMasterInfo
+    internal struct XIAddMasterInfo
     {
         public int Type;
         public IntPtr Name;
@@ -19,7 +19,7 @@ namespace Avalonia.X11
     }
 
     [StructLayout(LayoutKind.Sequential)]
-    struct XIRemoveMasterInfo
+    internal struct XIRemoveMasterInfo
     {
         public int Type;
         public int Deviceid;
@@ -29,7 +29,7 @@ namespace Avalonia.X11
     };
 
     [StructLayout(LayoutKind.Sequential)]
-    struct XIAttachSlaveInfo
+    internal struct XIAttachSlaveInfo
     {
         public int Type;
         public int Deviceid;
@@ -37,14 +37,14 @@ namespace Avalonia.X11
     };
 
     [StructLayout(LayoutKind.Sequential)]
-    struct XIDetachSlaveInfo
+    internal struct XIDetachSlaveInfo
     {
         public int Type;
         public int Deviceid;
     };
 
     [StructLayout(LayoutKind.Explicit)]
-    struct XIAnyHierarchyChangeInfo
+    internal struct XIAnyHierarchyChangeInfo
     {
         [FieldOffset(0)] 
         public int type; /* must be first element */
@@ -59,7 +59,7 @@ namespace Avalonia.X11
     };
 
     [StructLayout(LayoutKind.Sequential)]
-    struct XIModifierState
+    internal struct XIModifierState
     {
         public int Base;
         public int Latched;
@@ -68,14 +68,14 @@ namespace Avalonia.X11
     };
 
     [StructLayout(LayoutKind.Sequential)]
-    unsafe struct XIButtonState
+    internal unsafe struct XIButtonState
     {
         public int MaskLen;
         public byte* Mask;
     };
 
     [StructLayout(LayoutKind.Sequential)]
-    unsafe struct XIValuatorState
+    internal unsafe struct XIValuatorState
     {
         public int MaskLen;
         public byte* Mask;
@@ -83,7 +83,7 @@ namespace Avalonia.X11
     };
 
     [StructLayout(LayoutKind.Sequential)]
-    unsafe struct XIEventMask
+    internal unsafe struct XIEventMask
     {
         public int Deviceid;
         public int MaskLen;
@@ -91,14 +91,14 @@ namespace Avalonia.X11
     };
 
     [StructLayout(LayoutKind.Sequential)]
-    struct XIAnyClassInfo
+    internal struct XIAnyClassInfo
     {
         public XiDeviceClass Type;
         public int Sourceid;
     };
 
     [StructLayout(LayoutKind.Sequential)]
-    unsafe struct XIButtonClassInfo
+    internal unsafe struct XIButtonClassInfo
     {
         public int Type;
         public int Sourceid;
@@ -108,7 +108,7 @@ namespace Avalonia.X11
     };
 
     [StructLayout(LayoutKind.Sequential)]
-    unsafe struct XIKeyClassInfo
+    internal unsafe struct XIKeyClassInfo
     {
         public int Type;
         public int Sourceid;
@@ -117,7 +117,7 @@ namespace Avalonia.X11
     };
 
     [StructLayout(LayoutKind.Sequential)]
-    struct XIValuatorClassInfo
+    internal struct XIValuatorClassInfo
     {
         public int Type;
         public int Sourceid;
@@ -132,7 +132,7 @@ namespace Avalonia.X11
 
 /* new in XI 2.1 */
     [StructLayout(LayoutKind.Sequential)]
-    struct XIScrollClassInfo
+    internal struct XIScrollClassInfo
     {
         public int Type;
         public int Sourceid;
@@ -142,14 +142,14 @@ namespace Avalonia.X11
         public int Flags;
     };
 
-    enum XiScrollType
+    internal enum XiScrollType
     {
         Vertical = 1,
         Horizontal = 2
     }
     
     [StructLayout(LayoutKind.Sequential)]
-    struct XITouchClassInfo
+    internal struct XITouchClassInfo
     {
         public int Type;
         public int Sourceid;
@@ -158,7 +158,7 @@ namespace Avalonia.X11
     };
 
     [StructLayout(LayoutKind.Sequential)]
-    unsafe struct XIDeviceInfo
+    internal unsafe struct XIDeviceInfo
     {
         public int Deviceid;
         public IntPtr Name;
@@ -169,7 +169,7 @@ namespace Avalonia.X11
         public XIAnyClassInfo** Classes;
     }
 
-    enum XiDeviceType
+    internal enum XiDeviceType
     {
         XIMasterPointer = 1,
         XIMasterKeyboard = 2,
@@ -178,13 +178,13 @@ namespace Avalonia.X11
         XIFloatingSlave = 5
     }
 
-    enum XiPredefinedDeviceId : int
+    internal enum XiPredefinedDeviceId : int
     {
         XIAllDevices = 0,
         XIAllMasterDevices = 1
     }
 
-    enum XiDeviceClass
+    internal enum XiDeviceClass
     {
         XIKeyClass = 0,
         XIButtonClass = 1,
@@ -194,7 +194,7 @@ namespace Avalonia.X11
     }
 
     [StructLayout(LayoutKind.Sequential)]
-    unsafe struct XIDeviceChangedEvent
+    internal unsafe struct XIDeviceChangedEvent
     {
         public int Type; /* GenericEvent */
         public UIntPtr Serial; /* # of last request processed by server */
@@ -211,7 +211,7 @@ namespace Avalonia.X11
     }
 
     [StructLayout(LayoutKind.Sequential)]
-    struct XIDeviceEvent
+    internal struct XIDeviceEvent
     {
         public XEventName type; /* GenericEvent */
         public UIntPtr serial; /* # of last request processed by server */
@@ -238,7 +238,7 @@ namespace Avalonia.X11
     }
     
     [StructLayout(LayoutKind.Sequential)]
-    unsafe struct XIEnterLeaveEvent
+    internal unsafe struct XIEnterLeaveEvent
     {
         public XEventName type; /* GenericEvent */
         public UIntPtr serial; /* # of last request processed by server */
@@ -266,14 +266,14 @@ namespace Avalonia.X11
     }
 
     [Flags]
-    public enum XiDeviceEventFlags : int
+    internal enum XiDeviceEventFlags : int
     {
         None = 0,
         XIPointerEmulated = (1 << 16)
     }
 
     [StructLayout(LayoutKind.Sequential)]
-    unsafe struct XIEvent
+    internal unsafe struct XIEvent
     {
         public int type; /* GenericEvent */
         public UIntPtr serial; /* # of last request processed by server */
@@ -284,7 +284,7 @@ namespace Avalonia.X11
         public IntPtr time;
     }
 
-    enum XiEventType
+    internal enum XiEventType
     {
         XI_DeviceChanged = 1,
         XI_KeyPress = 2,
@@ -315,7 +315,7 @@ namespace Avalonia.X11
         XI_LASTEVENT = XI_BarrierLeave,
     }
 
-    enum XiEnterLeaveDetail
+    internal enum XiEnterLeaveDetail
     {
         XINotifyAncestor = 0,
         XINotifyVirtual = 1,
diff --git a/src/Avalonia.X11/XLib.cs b/src/Avalonia.X11/XLib.cs
index 753d5f530c..7a43cd378b 100644
--- a/src/Avalonia.X11/XLib.cs
+++ b/src/Avalonia.X11/XLib.cs
@@ -16,11 +16,11 @@ namespace Avalonia.X11
 {
     internal unsafe static class XLib
     {
-        const string libX11 = "libX11.so.6";
-        const string libX11Randr = "libXrandr.so.2";
-        const string libX11Ext = "libXext.so.6";
-        const string libXInput = "libXi.so.6";
-        const string libXCursor = "libXcursor.so.1";
+        private const string libX11 = "libX11.so.6";
+        private const string libX11Randr = "libXrandr.so.2";
+        private const string libX11Ext = "libXext.so.6";
+        private const string libXInput = "libXi.so.6";
+        private const string libXCursor = "libXcursor.so.1";
 
         [DllImport(libX11)]
         public static extern IntPtr XOpenDisplay(IntPtr display);
diff --git a/src/Browser/Avalonia.Browser/AvaloniaView.cs b/src/Browser/Avalonia.Browser/AvaloniaView.cs
index 294216ee03..3f4aa0d0ba 100644
--- a/src/Browser/Avalonia.Browser/AvaloniaView.cs
+++ b/src/Browser/Avalonia.Browser/AvaloniaView.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Reflection;
 using System.Runtime.InteropServices.JavaScript;
 using Avalonia.Browser.Interop;
@@ -15,6 +16,7 @@ using Avalonia.Platform;
 using Avalonia.Rendering.Composition;
 using Avalonia.Threading;
 using SkiaSharp;
+using static System.Runtime.CompilerServices.RuntimeHelpers;
 
 namespace Avalonia.Browser
 {
@@ -94,6 +96,7 @@ namespace Avalonia.Browser
 
             InputHelper.SubscribeTextEvents(
                 _inputElement,
+                OnBeforeInput,
                 OnTextInput,
                 OnCompositionStart,
                 OnCompositionUpdate,
@@ -316,6 +319,30 @@ namespace Avalonia.Browser
             return _topLevelImpl.RawTextEvent(data);
         }
 
+        private bool OnBeforeInput(JSObject arg, int start, int end)
+        {
+            var type = arg.GetPropertyAsString("inputType");
+            if (type != "deleteByComposition")
+            {
+                if (type == "deleteContentBackward")
+                {
+                    start = _inputElement.GetPropertyAsInt32("selectionStart");
+                    end = _inputElement.GetPropertyAsInt32("selectionEnd");
+                }
+                else
+                {
+                    start = -1;
+                    end = -1;
+                }
+            }
+
+            if(start != -1 && end != -1 && _client != null)
+            {
+                _client.SelectInSurroundingText(start, end);
+            }
+            return false;
+        }
+
         private bool OnCompositionStart (JSObject args)
         {
             if (_client == null)
diff --git a/src/Browser/Avalonia.Browser/Interop/InputHelper.cs b/src/Browser/Avalonia.Browser/Interop/InputHelper.cs
index 7a010dc782..a816e39da8 100644
--- a/src/Browser/Avalonia.Browser/Interop/InputHelper.cs
+++ b/src/Browser/Avalonia.Browser/Interop/InputHelper.cs
@@ -18,6 +18,8 @@ internal static partial class InputHelper
     [JSImport("InputHelper.subscribeTextEvents", AvaloniaModule.MainModuleName)]
     public static partial void SubscribeTextEvents(
         JSObject htmlElement,
+        [JSMarshalAs<JSType.Function<JSType.Object, JSType.Number, JSType.Number, JSType.Boolean>>]
+        Func<JSObject, int, int, bool> onBeforeInput,
         [JSMarshalAs<JSType.Function<JSType.String, JSType.String, JSType.Boolean>>]
         Func<string, string?, bool> onInput,
         [JSMarshalAs<JSType.Function<JSType.Object, JSType.Boolean>>]
diff --git a/src/Browser/Avalonia.Browser/Skia/BrowserSkiaGpu.cs b/src/Browser/Avalonia.Browser/Skia/BrowserSkiaGpu.cs
index 4d3d8dcd97..3c04935f0d 100644
--- a/src/Browser/Avalonia.Browser/Skia/BrowserSkiaGpu.cs
+++ b/src/Browser/Avalonia.Browser/Skia/BrowserSkiaGpu.cs
@@ -6,7 +6,7 @@ using Avalonia.Reactive;
 
 namespace Avalonia.Browser.Skia
 {
-    public class BrowserSkiaGpu : ISkiaGpu
+    internal class BrowserSkiaGpu : ISkiaGpu
     {
         public ISkiaGpuRenderTarget? TryCreateRenderTarget(IEnumerable<object> surfaces)
         {
diff --git a/src/Browser/Avalonia.Browser/webapp/modules/avalonia/input.ts b/src/Browser/Avalonia.Browser/webapp/modules/avalonia/input.ts
index 83e8ee7f1c..0f0e5eb512 100644
--- a/src/Browser/Avalonia.Browser/webapp/modules/avalonia/input.ts
+++ b/src/Browser/Avalonia.Browser/webapp/modules/avalonia/input.ts
@@ -47,6 +47,7 @@ export class InputHelper {
 
     public static subscribeTextEvents(
         element: HTMLInputElement,
+        beforeInputCallback: (args: InputEvent, start: number, end: number) => boolean,
         inputCallback: (type: string, data: string | null) => boolean,
         compositionStartCallback: (args: CompositionEvent) => boolean,
         compositionUpdateCallback: (args: CompositionEvent) => boolean,
@@ -68,6 +69,25 @@ export class InputHelper {
         };
         element.addEventListener("compositionstart", compositionStartHandler);
 
+        const beforeInputHandler = (args: InputEvent) => {
+            const ranges = args.getTargetRanges();
+            let start = -1;
+            let end = -1;
+            if (ranges.length > 0) {
+                start = ranges[0].startOffset;
+                end = ranges[0].endOffset;
+            }
+
+            if (args.inputType === "insertCompositionText") {
+                start = 2;
+                end = start + 2;
+            }
+            if (beforeInputCallback(args, start, end)) {
+                args.preventDefault();
+            }
+        };
+        element.addEventListener("beforeinput", beforeInputHandler);
+
         const compositionUpdateHandler = (args: CompositionEvent) => {
             if (compositionUpdateCallback(args)) {
                 args.preventDefault();
diff --git a/src/Shared/RawEventGrouping.cs b/src/Shared/RawEventGrouping.cs
index 966744888c..c4772db820 100644
--- a/src/Shared/RawEventGrouping.cs
+++ b/src/Shared/RawEventGrouping.cs
@@ -17,8 +17,8 @@ internal class RawEventGrouper : IDisposable
     private readonly Action<RawInputEventArgs> _eventCallback;
     private readonly Queue<RawInputEventArgs> _inputQueue = new();
     private readonly Action _dispatchFromQueue;
-    readonly Dictionary<long, RawPointerEventArgs> _lastTouchPoints = new();
-    RawInputEventArgs? _lastEvent;
+    private readonly Dictionary<long, RawPointerEventArgs> _lastTouchPoints = new();
+    private RawInputEventArgs? _lastEvent;
 
     public RawEventGrouper(Action<RawInputEventArgs> eventCallback)
     {
diff --git a/src/Skia/Avalonia.Skia/GlyphRunImpl.cs b/src/Skia/Avalonia.Skia/GlyphRunImpl.cs
index cc669f9aaa..cfd6fc12f8 100644
--- a/src/Skia/Avalonia.Skia/GlyphRunImpl.cs
+++ b/src/Skia/Avalonia.Skia/GlyphRunImpl.cs
@@ -1,15 +1,12 @@
 using System;
 using System.Collections.Generic;
-using Avalonia.Metadata;
 using Avalonia.Platform;
 using SkiaSharp;
 #nullable enable
 
 namespace Avalonia.Skia
 {
-    /// <inheritdoc />
-    [Unstable]
-    public class GlyphRunImpl : IGlyphRunImpl
+    internal class GlyphRunImpl : IGlyphRunImpl
     {
         public GlyphRunImpl(SKTextBlob textBlob, Size size, Point baselineOrigin)
         {
diff --git a/src/Skia/Avalonia.Skia/GlyphTypefaceImpl.cs b/src/Skia/Avalonia.Skia/GlyphTypefaceImpl.cs
index 71bdc1bd6b..a8dd289a13 100644
--- a/src/Skia/Avalonia.Skia/GlyphTypefaceImpl.cs
+++ b/src/Skia/Avalonia.Skia/GlyphTypefaceImpl.cs
@@ -1,14 +1,12 @@
 using System;
 using System.Runtime.InteropServices;
 using Avalonia.Media;
-using Avalonia.Metadata;
 using HarfBuzzSharp;
 using SkiaSharp;
 
 namespace Avalonia.Skia
 {
-    [Unstable]
-    public class GlyphTypefaceImpl : IGlyphTypeface
+    internal class GlyphTypefaceImpl : IGlyphTypeface
     {
         private bool _isDisposed;
 
diff --git a/src/Skia/Avalonia.Skia/SKTypefaceCollection.cs b/src/Skia/Avalonia.Skia/SKTypefaceCollection.cs
index 1f3f20730f..73f58e66bc 100644
--- a/src/Skia/Avalonia.Skia/SKTypefaceCollection.cs
+++ b/src/Skia/Avalonia.Skia/SKTypefaceCollection.cs
@@ -4,7 +4,7 @@ using SkiaSharp;
 
 namespace Avalonia.Skia
 {
-    public class SKTypefaceCollection
+    internal class SKTypefaceCollection
     {
         private readonly ConcurrentDictionary<Typeface, SKTypeface> _typefaces =
             new ConcurrentDictionary<Typeface, SKTypeface>();
diff --git a/src/Skia/Avalonia.Skia/SKTypefaceCollectionCache.cs b/src/Skia/Avalonia.Skia/SKTypefaceCollectionCache.cs
index f7a86c11ff..b49efd59cd 100644
--- a/src/Skia/Avalonia.Skia/SKTypefaceCollectionCache.cs
+++ b/src/Skia/Avalonia.Skia/SKTypefaceCollectionCache.cs
@@ -7,7 +7,7 @@ using SkiaSharp;
 
 namespace Avalonia.Skia
 {
-    public static class SKTypefaceCollectionCache
+    internal static class SKTypefaceCollectionCache
     {
         private static readonly ConcurrentDictionary<FontFamily, SKTypefaceCollection> s_cachedCollections;
 
diff --git a/src/Skia/Avalonia.Skia/readme.md b/src/Skia/Avalonia.Skia/readme.md
deleted file mode 100644
index 7ed92c5453..0000000000
--- a/src/Skia/Avalonia.Skia/readme.md
+++ /dev/null
@@ -1,22 +0,0 @@
-DrawingContextImpl
-- Alpha support missing as SkiaSharp does not expose this
-- Gradient Shader caching?
-- Pen Dash styles
-
-Formatted Text Rendering 
-- Minor polish
-
-Linux
-- Need gpu platform implementation
-
-macOS
-- Need gpu platform implementation
-
-Android
-- Not tested at all yet
-
-iOS
-- Not tested at all yet
-
-General
-- Get Skia Unit Tests passing (most of the issues are related to antialiasing)
\ No newline at end of file
diff --git a/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj b/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj
index 32bcdba758..3c2d7b3322 100644
--- a/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj
+++ b/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj
@@ -5,11 +5,6 @@
     <PackageId>Avalonia.Direct2D1</PackageId>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="..\Avalonia.Win32\Interop\UnmanagedMethods.cs">
-      <Link>UnmanagedMethods.cs</Link>
-    </Compile>
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\packages\Avalonia\Avalonia.csproj" />
     <ProjectReference Include="..\Avalonia.Win32\Avalonia.Win32.csproj" />
@@ -22,6 +17,7 @@
   <ItemGroup Label="InternalsVisibleTo">
     <InternalsVisibleTo Include="Avalonia.Direct2D1.RenderTests, PublicKey=$(AvaloniaPublicKey)" />
     <InternalsVisibleTo Include="Avalonia.Direct2D1.UnitTests, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.Win32.Interop, PublicKey=$(AvaloniaPublicKey)"/>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs b/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs
index 99c01dd111..57379d1878 100644
--- a/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs
+++ b/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs
@@ -27,7 +27,7 @@ namespace Avalonia
 
 namespace Avalonia.Direct2D1
 {
-    public class Direct2D1Platform : IPlatformRenderInterface
+    internal class Direct2D1Platform : IPlatformRenderInterface
     {
         private static readonly Direct2D1Platform s_instance = new Direct2D1Platform();
 
diff --git a/src/Windows/Avalonia.Direct2D1/Disposable.cs b/src/Windows/Avalonia.Direct2D1/Disposable.cs
deleted file mode 100644
index 63dfeb2e0b..0000000000
--- a/src/Windows/Avalonia.Direct2D1/Disposable.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-
-namespace Avalonia.Direct2D1
-{
-    public class Disposable<T> : IDisposable where T : IDisposable
-    {
-        private readonly IDisposable _extra;
-
-        public Disposable(T inner)
-        {
-            Inner = inner;
-        }
-
-        public Disposable(T inner, IDisposable extra)
-        {
-            Inner = inner;
-            _extra = extra;
-        }
-
-        public T Inner { get; }
-
-        public static implicit operator T(Disposable<T> i)
-        {
-            return i.Inner;
-        }
-
-        public void Dispose()
-        {
-            Inner.Dispose();
-            _extra?.Dispose();
-        }
-    }
-}
diff --git a/src/Windows/Avalonia.Direct2D1/ILayerFactory.cs b/src/Windows/Avalonia.Direct2D1/ILayerFactory.cs
index a15bc0056a..504f4981f7 100644
--- a/src/Windows/Avalonia.Direct2D1/ILayerFactory.cs
+++ b/src/Windows/Avalonia.Direct2D1/ILayerFactory.cs
@@ -2,7 +2,7 @@
 
 namespace Avalonia.Direct2D1
 {
-    public interface ILayerFactory
+    internal interface ILayerFactory
     {
         IDrawingContextLayerImpl CreateLayer(Size size);
     }
diff --git a/src/Windows/Avalonia.Direct2D1/Media/BrushImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/BrushImpl.cs
index 602ea9b568..9fac86e0d2 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/BrushImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/BrushImpl.cs
@@ -1,10 +1,8 @@
 using System;
-using Avalonia.Metadata;
 
 namespace Avalonia.Direct2D1.Media
 {
-    [Unstable]
-    public abstract class BrushImpl : IDisposable
+    internal abstract class BrushImpl : IDisposable
     {
         public SharpDX.Direct2D1.Brush PlatformBrush { get; set; }
 
diff --git a/src/Windows/Avalonia.Direct2D1/Media/DWriteResourceFontFileEnumerator.cs b/src/Windows/Avalonia.Direct2D1/Media/DWriteResourceFontFileEnumerator.cs
index c144e12aea..42cc969b66 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/DWriteResourceFontFileEnumerator.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/DWriteResourceFontFileEnumerator.cs
@@ -6,7 +6,7 @@ namespace Avalonia.Direct2D1.Media
     /// <summary>
     /// Resource FontFileEnumerator.
     /// </summary>
-    public class DWriteResourceFontFileEnumerator : CallbackBase, FontFileEnumerator
+    internal class DWriteResourceFontFileEnumerator : CallbackBase, FontFileEnumerator
     {
         private readonly Factory _factory;
         private readonly FontFileLoader _loader;
@@ -64,4 +64,4 @@ namespace Avalonia.Direct2D1.Media
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Windows/Avalonia.Direct2D1/Media/DWriteResourceFontFileStream.cs b/src/Windows/Avalonia.Direct2D1/Media/DWriteResourceFontFileStream.cs
index 1802ef4d21..bd2e9ab8c3 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/DWriteResourceFontFileStream.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/DWriteResourceFontFileStream.cs
@@ -7,7 +7,7 @@ namespace Avalonia.Direct2D1.Media
     /// <summary>
     /// This FontFileStream implementation is reading data from a <see cref="DataStream"/>.
     /// </summary>
-    public class DWriteResourceFontFileStream : CallbackBase, FontFileStream
+    internal class DWriteResourceFontFileStream : CallbackBase, FontFileStream
     {
         private readonly DataStream _stream;
 
diff --git a/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
index d5d6cd8c29..3506abc63b 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
@@ -11,15 +11,13 @@ using SharpDX;
 using SharpDX.Direct2D1;
 using SharpDX.Mathematics.Interop;
 using BitmapInterpolationMode = Avalonia.Media.Imaging.BitmapInterpolationMode;
-using Avalonia.Metadata;
 
 namespace Avalonia.Direct2D1.Media
 {
     /// <summary>
     /// Draws using Direct2D1.
     /// </summary>
-    [Unstable]
-    public class DrawingContextImpl : IDrawingContextImpl
+    internal class DrawingContextImpl : IDrawingContextImpl
     {
         private readonly IVisualBrushRenderer _visualBrushRenderer;
         private readonly ILayerFactory _layerFactory;
diff --git a/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs
index c84c14daac..9a93d1afd3 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs
@@ -1,5 +1,4 @@
 using Avalonia.Logging;
-using Avalonia.Metadata;
 using Avalonia.Platform;
 using SharpDX.Direct2D1;
 
@@ -8,8 +7,7 @@ namespace Avalonia.Direct2D1.Media
     /// <summary>
     /// The platform-specific interface for <see cref="Avalonia.Media.Geometry"/>.
     /// </summary>
-    [Unstable]
-    public abstract class GeometryImpl : IGeometryImpl
+    internal abstract class GeometryImpl : IGeometryImpl
     {
         private const float ContourApproximation = 0.0001f;
 
diff --git a/src/Windows/Avalonia.Direct2D1/Media/GlyphTypefaceImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/GlyphTypefaceImpl.cs
index 705c715455..e4988322e7 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/GlyphTypefaceImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/GlyphTypefaceImpl.cs
@@ -1,6 +1,5 @@
 using System;
 using Avalonia.Media;
-using Avalonia.Metadata;
 using HarfBuzzSharp;
 using SharpDX.DirectWrite;
 using FontMetrics = Avalonia.Media.FontMetrics;
@@ -9,8 +8,7 @@ using GlyphMetrics = Avalonia.Media.GlyphMetrics;
 
 namespace Avalonia.Direct2D1.Media
 {
-    [Unstable]
-    public class GlyphTypefaceImpl : IGlyphTypeface
+    internal class GlyphTypefaceImpl : IGlyphTypeface
     {
         private bool _isDisposed;
 
diff --git a/src/Windows/Avalonia.Direct2D1/Media/ImageBrushImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/ImageBrushImpl.cs
index 17dc359ed7..829b887d9d 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/ImageBrushImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/ImageBrushImpl.cs
@@ -1,13 +1,11 @@
 using Avalonia.Media;
-using Avalonia.Metadata;
 using Avalonia.Rendering.Utilities;
 using Avalonia.Utilities;
 using SharpDX.Direct2D1;
 
 namespace Avalonia.Direct2D1.Media
 {
-    [Unstable]
-    public sealed class ImageBrushImpl : BrushImpl
+    internal sealed class ImageBrushImpl : BrushImpl
     {
         private readonly OptionalDispose<Bitmap> _bitmap;
 
diff --git a/src/Windows/Avalonia.Direct2D1/Media/Imaging/BitmapImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/Imaging/BitmapImpl.cs
index 059105c112..740efe833f 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/Imaging/BitmapImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/Imaging/BitmapImpl.cs
@@ -1,13 +1,11 @@
 using System;
 using System.IO;
-using Avalonia.Metadata;
 using Avalonia.Platform;
 using D2DBitmap = SharpDX.Direct2D1.Bitmap;
 
 namespace Avalonia.Direct2D1.Media
 {
-    [Unstable]
-    public abstract class BitmapImpl : IBitmapImpl, IDisposable
+    internal abstract class BitmapImpl : IBitmapImpl, IDisposable
     {
         public abstract Vector Dpi { get; }
         public abstract PixelSize PixelSize { get; }
diff --git a/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DBitmapImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DBitmapImpl.cs
index a321b225a0..940d4673b5 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DBitmapImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DBitmapImpl.cs
@@ -1,6 +1,5 @@
 using System;
 using System.IO;
-using Avalonia.Metadata;
 using SharpDX.WIC;
 using Bitmap = SharpDX.Direct2D1.Bitmap;
 
@@ -9,8 +8,7 @@ namespace Avalonia.Direct2D1.Media
     /// <summary>
     /// A Direct2D Bitmap implementation that uses a GPU memory bitmap as its image.
     /// </summary>
-    [Unstable]
-    public class D2DBitmapImpl : BitmapImpl
+    internal class D2DBitmapImpl : BitmapImpl
     {
         private readonly Bitmap _direct2DBitmap;
 
diff --git a/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DRenderTargetBitmapImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DRenderTargetBitmapImpl.cs
index 84f11acdd7..2dbc1d67d1 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DRenderTargetBitmapImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DRenderTargetBitmapImpl.cs
@@ -1,6 +1,5 @@
 using System;
 using System.IO;
-using Avalonia.Metadata;
 using Avalonia.Platform;
 using Avalonia.Rendering;
 using Avalonia.Utilities;
@@ -10,8 +9,7 @@ using D2DBitmap = SharpDX.Direct2D1.Bitmap;
 
 namespace Avalonia.Direct2D1.Media.Imaging
 {
-    [Unstable]
-    public class D2DRenderTargetBitmapImpl : D2DBitmapImpl, IDrawingContextLayerImpl, ILayerFactory
+    internal class D2DRenderTargetBitmapImpl : D2DBitmapImpl, IDrawingContextLayerImpl, ILayerFactory
     {
         private readonly BitmapRenderTarget _renderTarget;
 
diff --git a/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicBitmapImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicBitmapImpl.cs
index 72a48aca0c..533a29f68c 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicBitmapImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicBitmapImpl.cs
@@ -6,7 +6,6 @@ using SharpDX.WIC;
 using APixelFormat = Avalonia.Platform.PixelFormat;
 using AlphaFormat = Avalonia.Platform.AlphaFormat;
 using D2DBitmap = SharpDX.Direct2D1.Bitmap;
-using Avalonia.Metadata;
 using Avalonia.Platform;
 using PixelFormat = SharpDX.WIC.PixelFormat;
 
@@ -15,8 +14,7 @@ namespace Avalonia.Direct2D1.Media
     /// <summary>
     /// A WIC implementation of a <see cref="Avalonia.Media.Imaging.Bitmap"/>.
     /// </summary>
-    [Unstable]
-    public class WicBitmapImpl : BitmapImpl, IReadableBitmapImpl
+    internal class WicBitmapImpl : BitmapImpl, IReadableBitmapImpl
     {
         private readonly BitmapDecoder _decoder;
 
diff --git a/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicRenderTargetBitmapImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicRenderTargetBitmapImpl.cs
index 9f0d48dbc7..d6b1e618e5 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicRenderTargetBitmapImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicRenderTargetBitmapImpl.cs
@@ -1,13 +1,11 @@
 using System;
-using Avalonia.Metadata;
 using Avalonia.Platform;
 using Avalonia.Rendering;
 using SharpDX.Direct2D1;
 
 namespace Avalonia.Direct2D1.Media
 {
-    [Unstable]
-    public class WicRenderTargetBitmapImpl : WicBitmapImpl, IDrawingContextLayerImpl
+    internal class WicRenderTargetBitmapImpl : WicBitmapImpl, IDrawingContextLayerImpl
     {
         private readonly WicRenderTarget _renderTarget;
 
diff --git a/src/Windows/Avalonia.Direct2D1/Media/Imaging/WriteableWicBitmapImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WriteableWicBitmapImpl.cs
index 5f4c033cf7..0bdf901613 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/Imaging/WriteableWicBitmapImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WriteableWicBitmapImpl.cs
@@ -6,7 +6,7 @@ using PixelFormat = Avalonia.Platform.PixelFormat;
 
 namespace Avalonia.Direct2D1.Media.Imaging
 {
-    class WriteableWicBitmapImpl : WicBitmapImpl, IWriteableBitmapImpl
+    internal class WriteableWicBitmapImpl : WicBitmapImpl, IWriteableBitmapImpl
     {
         public WriteableWicBitmapImpl(Stream stream, int decodeSize, bool horizontal,
             Avalonia.Media.Imaging.BitmapInterpolationMode interpolationMode)
diff --git a/src/Windows/Avalonia.Direct2D1/Media/LinearGradientBrushImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/LinearGradientBrushImpl.cs
index 5dfe683f59..5de988c30e 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/LinearGradientBrushImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/LinearGradientBrushImpl.cs
@@ -1,11 +1,9 @@
 using System.Linq;
 using Avalonia.Media;
-using Avalonia.Metadata;
 
 namespace Avalonia.Direct2D1.Media
 {
-    [Unstable]
-    public class LinearGradientBrushImpl : BrushImpl
+    internal class LinearGradientBrushImpl : BrushImpl
     {
         public LinearGradientBrushImpl(
             ILinearGradientBrush brush,
diff --git a/src/Windows/Avalonia.Direct2D1/Media/RadialGradientBrushImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/RadialGradientBrushImpl.cs
index 0069e47001..bbb34651c5 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/RadialGradientBrushImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/RadialGradientBrushImpl.cs
@@ -1,11 +1,9 @@
 using System.Linq;
 using Avalonia.Media;
-using Avalonia.Metadata;
 
 namespace Avalonia.Direct2D1.Media
 {
-    [Unstable]
-    public class RadialGradientBrushImpl : BrushImpl
+    internal class RadialGradientBrushImpl : BrushImpl
     {
         public RadialGradientBrushImpl(
             IRadialGradientBrush brush,
diff --git a/src/Windows/Avalonia.Direct2D1/Media/SolidColorBrushImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/SolidColorBrushImpl.cs
index b85494e2c1..bf974798a2 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/SolidColorBrushImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/SolidColorBrushImpl.cs
@@ -1,10 +1,8 @@
 using Avalonia.Media;
-using Avalonia.Metadata;
 
 namespace Avalonia.Direct2D1.Media
 {
-    [Unstable]
-    public class SolidColorBrushImpl : BrushImpl
+    internal class SolidColorBrushImpl : BrushImpl
     {
         public SolidColorBrushImpl(ISolidColorBrush brush, SharpDX.Direct2D1.RenderTarget target)
         {
diff --git a/src/Windows/Avalonia.Direct2D1/Media/StreamGeometryContextImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/StreamGeometryContextImpl.cs
index ec8f82556d..5ffe331ca2 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/StreamGeometryContextImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/StreamGeometryContextImpl.cs
@@ -9,8 +9,7 @@ using SweepDirection = SharpDX.Direct2D1.SweepDirection;
 
 namespace Avalonia.Direct2D1.Media
 {
-    [Unstable]
-    public class StreamGeometryContextImpl : IStreamGeometryContextImpl
+    internal class StreamGeometryContextImpl : IStreamGeometryContextImpl
     {
         private readonly GeometrySink _sink;
 
diff --git a/src/Windows/Avalonia.Direct2D1/Media/StreamGeometryImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/StreamGeometryImpl.cs
index e1677c0ed1..684460916e 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/StreamGeometryImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/StreamGeometryImpl.cs
@@ -1,4 +1,3 @@
-using Avalonia.Metadata;
 using Avalonia.Platform;
 using SharpDX.Direct2D1;
 
@@ -7,8 +6,7 @@ namespace Avalonia.Direct2D1.Media
     /// <summary>
     /// A Direct2D implementation of a <see cref="Avalonia.Media.StreamGeometry"/>.
     /// </summary>
-    [Unstable]
-    public class StreamGeometryImpl : GeometryImpl, IStreamGeometryImpl
+    internal class StreamGeometryImpl : GeometryImpl, IStreamGeometryImpl
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StreamGeometryImpl"/> class.
diff --git a/src/Windows/Avalonia.Direct2D1/Media/TransformedGeometryImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/TransformedGeometryImpl.cs
index 3ecdb49e46..64aaea6f0a 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/TransformedGeometryImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/TransformedGeometryImpl.cs
@@ -1,11 +1,9 @@
-using Avalonia.Metadata;
 using Avalonia.Platform;
 using SharpDX.Direct2D1;
 
 namespace Avalonia.Direct2D1.Media
 {
-    [Unstable]
-    public class TransformedGeometryImpl : GeometryImpl, ITransformedGeometryImpl
+    internal class TransformedGeometryImpl : GeometryImpl, ITransformedGeometryImpl
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StreamGeometryImpl"/> class.
diff --git a/src/Windows/Avalonia.Direct2D1/OptionalDispose.cs b/src/Windows/Avalonia.Direct2D1/OptionalDispose.cs
index 1cdf7661df..d526da2b5d 100644
--- a/src/Windows/Avalonia.Direct2D1/OptionalDispose.cs
+++ b/src/Windows/Avalonia.Direct2D1/OptionalDispose.cs
@@ -2,7 +2,7 @@
 
 namespace Avalonia.Direct2D1
 {
-    public readonly record struct OptionalDispose<T> : IDisposable where T : IDisposable
+    internal readonly record struct OptionalDispose<T> : IDisposable where T : IDisposable
     {
         private readonly bool _dispose;
 
diff --git a/src/Windows/Avalonia.Direct2D1/PrimitiveExtensions.cs b/src/Windows/Avalonia.Direct2D1/PrimitiveExtensions.cs
index 669e139d8f..d042d56160 100644
--- a/src/Windows/Avalonia.Direct2D1/PrimitiveExtensions.cs
+++ b/src/Windows/Avalonia.Direct2D1/PrimitiveExtensions.cs
@@ -8,7 +8,7 @@ using DWrite = SharpDX.DirectWrite;
 
 namespace Avalonia.Direct2D1
 {
-    public static class PrimitiveExtensions
+    internal static class PrimitiveExtensions
     {
         /// <summary>
         /// The value for which all absolute numbers smaller than are considered equal to zero.
diff --git a/src/Windows/Avalonia.Direct2D1/RenderTarget.cs b/src/Windows/Avalonia.Direct2D1/RenderTarget.cs
index 1a749c1a7f..8d5062336c 100644
--- a/src/Windows/Avalonia.Direct2D1/RenderTarget.cs
+++ b/src/Windows/Avalonia.Direct2D1/RenderTarget.cs
@@ -5,7 +5,7 @@ using Avalonia.Rendering;
 
 namespace Avalonia.Direct2D1
 {
-    public class RenderTarget : IRenderTarget, ILayerFactory
+    internal class RenderTarget : IRenderTarget, ILayerFactory
     {
         /// <summary>
         /// The render target.
diff --git a/src/Windows/Avalonia.Direct2D1/SwapChainRenderTarget.cs b/src/Windows/Avalonia.Direct2D1/SwapChainRenderTarget.cs
index 4935e3db48..531c4119af 100644
--- a/src/Windows/Avalonia.Direct2D1/SwapChainRenderTarget.cs
+++ b/src/Windows/Avalonia.Direct2D1/SwapChainRenderTarget.cs
@@ -8,7 +8,7 @@ using SharpDX.DXGI;
 
 namespace Avalonia.Direct2D1
 {   
-    public abstract class SwapChainRenderTarget : IRenderTarget, ILayerFactory
+    internal abstract class SwapChainRenderTarget : IRenderTarget, ILayerFactory
     {
         private Size2 _savedSize;
         private Size2F _savedDpi;
diff --git a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
index 754e883c2f..92ebbd57b8 100644
--- a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
+++ b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
@@ -29,5 +29,6 @@
   </PropertyGroup>
   <ItemGroup>
     <InternalsVisibleTo Include="Avalonia.Win32.Interop, PublicKey=$(AvaloniaPublicKey)"/>
+    <InternalsVisibleTo Include="Avalonia.Direct2D1, PublicKey=$(AvaloniaPublicKey)"/>
   </ItemGroup>
 </Project>
diff --git a/src/Windows/Avalonia.Win32/DirectX/DirectXStructs.cs b/src/Windows/Avalonia.Win32/DirectX/DirectXStructs.cs
index e59eb98c6c..af8168d564 100644
--- a/src/Windows/Avalonia.Win32/DirectX/DirectXStructs.cs
+++ b/src/Windows/Avalonia.Win32/DirectX/DirectXStructs.cs
@@ -5,7 +5,7 @@ using static Avalonia.Win32.Interop.UnmanagedMethods;
 
 namespace Avalonia.Win32.DirectX
 {
-    public unsafe struct HANDLE
+    internal unsafe struct HANDLE
     {
         public readonly void* Value;
 
diff --git a/src/Windows/Avalonia.Win32/DirectX/DxgiConnection.cs b/src/Windows/Avalonia.Win32/DirectX/DxgiConnection.cs
index 26696ef903..07fb3169cb 100644
--- a/src/Windows/Avalonia.Win32/DirectX/DxgiConnection.cs
+++ b/src/Windows/Avalonia.Win32/DirectX/DxgiConnection.cs
@@ -9,7 +9,7 @@ using MicroCom.Runtime;
 
 namespace Avalonia.Win32.DirectX
 {
-    public unsafe class DxgiConnection : IRenderTimer
+    internal unsafe class DxgiConnection : IRenderTimer
     {
         public const uint ENUM_CURRENT_SETTINGS = unchecked((uint)(-1));
 
diff --git a/src/Windows/Avalonia.Win32/DirectX/DxgiRenderTarget.cs b/src/Windows/Avalonia.Win32/DirectX/DxgiRenderTarget.cs
index 065386b401..513aba4f20 100644
--- a/src/Windows/Avalonia.Win32/DirectX/DxgiRenderTarget.cs
+++ b/src/Windows/Avalonia.Win32/DirectX/DxgiRenderTarget.cs
@@ -7,7 +7,7 @@ using static Avalonia.Win32.Interop.UnmanagedMethods;
 
 namespace Avalonia.Win32.DirectX
 {
-    public unsafe class DxgiRenderTarget : EglPlatformSurfaceRenderTargetBase
+    internal unsafe class DxgiRenderTarget : EglPlatformSurfaceRenderTargetBase
     {
         // DXGI_FORMAT_B8G8R8A8_UNORM is target texture format as per ANGLE documentation 
 
diff --git a/src/Windows/Avalonia.Win32/DirectX/DxgiSwapchainWindow.cs b/src/Windows/Avalonia.Win32/DirectX/DxgiSwapchainWindow.cs
index 88226c5c89..a4c6598473 100644
--- a/src/Windows/Avalonia.Win32/DirectX/DxgiSwapchainWindow.cs
+++ b/src/Windows/Avalonia.Win32/DirectX/DxgiSwapchainWindow.cs
@@ -9,7 +9,7 @@ using Avalonia.OpenGL.Surfaces;
 
 namespace Avalonia.Win32.DirectX
 {
-    public class DxgiSwapchainWindow : EglGlPlatformSurfaceBase
+    internal class DxgiSwapchainWindow : EglGlPlatformSurfaceBase
     {
         private DxgiConnection _connection;
         private EglGlPlatformSurface.IEglWindowGlPlatformSurfaceInfo _window;
diff --git a/src/Windows/Avalonia.Win32/PlatformConstants.cs b/src/Windows/Avalonia.Win32/PlatformConstants.cs
index 9dd4780637..48dd9f45da 100644
--- a/src/Windows/Avalonia.Win32/PlatformConstants.cs
+++ b/src/Windows/Avalonia.Win32/PlatformConstants.cs
@@ -7,7 +7,7 @@ namespace Avalonia.Win32
         public const string WindowHandleType = "HWND";
         public const string CursorHandleType = "HCURSOR";
 
-        public static readonly Version Windows8 = new Version(6, 2);
-        public static readonly Version Windows7 = new Version(6, 1);
+        internal static readonly Version Windows8 = new Version(6, 2);
+        internal static readonly Version Windows7 = new Version(6, 1);
     }
 }
diff --git a/src/Windows/Avalonia.Win32/ScreenImpl.cs b/src/Windows/Avalonia.Win32/ScreenImpl.cs
index 69431c7ff6..6154dff307 100644
--- a/src/Windows/Avalonia.Win32/ScreenImpl.cs
+++ b/src/Windows/Avalonia.Win32/ScreenImpl.cs
@@ -7,8 +7,7 @@ using static Avalonia.Win32.Interop.UnmanagedMethods;
 
 namespace Avalonia.Win32
 {
-    [Unstable]
-    public class ScreenImpl : IScreenImpl
+    internal class ScreenImpl : IScreenImpl
     {
         private Screen[]? _allScreens;
 
diff --git a/src/Windows/Avalonia.Win32/TrayIconImpl.cs b/src/Windows/Avalonia.Win32/TrayIconImpl.cs
index 8a10c6d2e1..c19439c09e 100644
--- a/src/Windows/Avalonia.Win32/TrayIconImpl.cs
+++ b/src/Windows/Avalonia.Win32/TrayIconImpl.cs
@@ -13,8 +13,7 @@ using static Avalonia.Win32.Interop.UnmanagedMethods;
 
 namespace Avalonia.Win32
 {
-    [Unstable]
-    public class TrayIconImpl : ITrayIconImpl
+    internal class TrayIconImpl : ITrayIconImpl
     {
         private static readonly IntPtr s_emptyIcon = new System.Drawing.Bitmap(32, 32).GetHicon();
         private readonly int _uniqueId;
diff --git a/src/Windows/Avalonia.Win32/Win32Platform.cs b/src/Windows/Avalonia.Win32/Win32Platform.cs
index 4b327ed02a..7a9f2bb814 100644
--- a/src/Windows/Avalonia.Win32/Win32Platform.cs
+++ b/src/Windows/Avalonia.Win32/Win32Platform.cs
@@ -107,7 +107,7 @@ namespace Avalonia
 
 namespace Avalonia.Win32
 {
-    public class Win32Platform : IPlatformThreadingInterface, IWindowingPlatform, IPlatformIconLoader, IPlatformLifetimeEventsImpl
+    internal class Win32Platform : IPlatformThreadingInterface, IWindowingPlatform, IPlatformIconLoader, IPlatformLifetimeEventsImpl
     {
         private static readonly Win32Platform s_instance = new();
         private static Thread? s_uiThread;
diff --git a/src/Windows/Avalonia.Win32/WinRT/IBlurHost.cs b/src/Windows/Avalonia.Win32/WinRT/IBlurHost.cs
index 526be6e0f0..a3918d9ae6 100644
--- a/src/Windows/Avalonia.Win32/WinRT/IBlurHost.cs
+++ b/src/Windows/Avalonia.Win32/WinRT/IBlurHost.cs
@@ -1,6 +1,6 @@
 namespace Avalonia.Win32.WinRT
 {
-    public enum BlurEffect
+    internal enum BlurEffect
     {
         None,
         Acrylic,
diff --git a/src/Windows/Avalonia.Win32/WinRT/WinRTColor.cs b/src/Windows/Avalonia.Win32/WinRT/WinRTColor.cs
index 90b2022054..67769b7533 100644
--- a/src/Windows/Avalonia.Win32/WinRT/WinRTColor.cs
+++ b/src/Windows/Avalonia.Win32/WinRT/WinRTColor.cs
@@ -4,7 +4,7 @@ using Avalonia.Media;
 namespace Avalonia.Win32.WinRT
 {
     [StructLayout(LayoutKind.Sequential, Pack = 1)]
-    public record struct WinRTColor
+    internal record struct WinRTColor
     {
         public byte A;
         public byte R;
diff --git a/src/Windows/Avalonia.Win32/WinScreen.cs b/src/Windows/Avalonia.Win32/WinScreen.cs
index 69d334cbcc..10e0b3b8b1 100644
--- a/src/Windows/Avalonia.Win32/WinScreen.cs
+++ b/src/Windows/Avalonia.Win32/WinScreen.cs
@@ -3,7 +3,7 @@ using Avalonia.Platform;
 
 namespace Avalonia.Win32
 {
-    public class WinScreen : Screen
+    internal class WinScreen : Screen
     {
         private readonly IntPtr _hMonitor;
 
diff --git a/src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs b/src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs
index ed80f88b53..e8d2d8f0c5 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs
@@ -15,7 +15,7 @@ using static Avalonia.Win32.Interop.UnmanagedMethods;
 
 namespace Avalonia.Win32
 {
-    public partial class WindowImpl
+    internal partial class WindowImpl
     {
         [SuppressMessage("Microsoft.StyleCop.CSharp.NamingRules", "SA1305:FieldNamesMustNotUseHungarianNotation",
             Justification = "Using Win32 naming for consistency.")]
@@ -793,6 +793,7 @@ namespace Avalonia.Win32
 
                     if (info.pointerType == PointerInputType.PT_TOUCH)
                     {
+                        s_historyTouchInfos ??= new POINTER_TOUCH_INFO[MaxPointerHistorySize];
                         if (GetPointerTouchInfoHistory(info.pointerId, ref historyCount, s_historyTouchInfos))
                         {
                             for (int i = historyCount - 1; i >= 1; i--)
@@ -804,6 +805,7 @@ namespace Avalonia.Win32
                     }
                     else if (info.pointerType == PointerInputType.PT_PEN)
                     {
+                        s_historyPenInfos ??= new POINTER_PEN_INFO[MaxPointerHistorySize];
                         if (GetPointerPenInfoHistory(info.pointerId, ref historyCount, s_historyPenInfos))
                         {
                             for (int i = historyCount - 1; i >= 1; i--)
@@ -815,6 +817,7 @@ namespace Avalonia.Win32
                     }
                     else
                     {
+                        s_historyInfos ??= new POINTER_INFO[MaxPointerHistorySize];
                         // Currently Windows does not return history info for mouse input, but we handle it just for case.
                         if (GetPointerInfoHistory(info.pointerId, ref historyCount, s_historyInfos))
                         {
@@ -837,6 +840,8 @@ namespace Avalonia.Win32
             // To understand some of this code, please check MS docs:
             // https://learn.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-getmousemovepointsex#remarks
 
+            s_mouseHistoryInfos ??= new MOUSEMOVEPOINT[64];
+
             fixed (MOUSEMOVEPOINT* movePoints = s_mouseHistoryInfos)
             {
                 var movePointCopy = movePoint;
diff --git a/src/Windows/Avalonia.Win32/WindowImpl.CustomCaptionProc.cs b/src/Windows/Avalonia.Win32/WindowImpl.CustomCaptionProc.cs
index 20ab738a2a..4a4565a443 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.CustomCaptionProc.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.CustomCaptionProc.cs
@@ -5,7 +5,7 @@ using static Avalonia.Win32.Interop.UnmanagedMethods;
 
 namespace Avalonia.Win32
 {
-    public partial class WindowImpl
+    internal partial class WindowImpl
     {
         // Hit test the frame for resizing and moving.
         private HitTestValues HitTestNCA(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
diff --git a/src/Windows/Avalonia.Win32/WindowImpl.WndProc.cs b/src/Windows/Avalonia.Win32/WindowImpl.WndProc.cs
index 49197a83e8..e92272c079 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.WndProc.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.WndProc.cs
@@ -6,7 +6,7 @@ using Avalonia.Controls.Platform;
 
 namespace Avalonia.Win32
 {
-    public partial class WindowImpl
+    internal partial class WindowImpl
     {
         protected virtual unsafe IntPtr WndProc(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam)
         {
diff --git a/src/Windows/Avalonia.Win32/WindowImpl.cs b/src/Windows/Avalonia.Win32/WindowImpl.cs
index 812c72fd3c..419cb57e87 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.cs
@@ -30,8 +30,7 @@ namespace Avalonia.Win32
     /// <summary>
     /// Window implementation for Win32 platform.
     /// </summary>
-    [Unstable]
-    public partial class WindowImpl : IWindowImpl, EglGlPlatformSurface.IEglWindowGlPlatformSurfaceInfo
+    internal partial class WindowImpl : IWindowImpl, EglGlPlatformSurface.IEglWindowGlPlatformSurfaceInfo
     {
         private static readonly List<WindowImpl> s_instances = new();
 
@@ -101,10 +100,10 @@ namespace Avalonia.Win32
 
         private const int MaxPointerHistorySize = 512;
         private static readonly PooledList<RawPointerPoint> s_intermediatePointsPooledList = new();
-        private static readonly POINTER_TOUCH_INFO[] s_historyTouchInfos = new POINTER_TOUCH_INFO[MaxPointerHistorySize];
-        private static readonly POINTER_PEN_INFO[] s_historyPenInfos = new POINTER_PEN_INFO[MaxPointerHistorySize];
-        private static readonly POINTER_INFO[] s_historyInfos = new POINTER_INFO[MaxPointerHistorySize];
-        private static readonly MOUSEMOVEPOINT[] s_mouseHistoryInfos = new MOUSEMOVEPOINT[64];
+        private static POINTER_TOUCH_INFO[]? s_historyTouchInfos;
+        private static POINTER_PEN_INFO[]? s_historyPenInfos;
+        private static POINTER_INFO[]? s_historyInfos;
+        private static MOUSEMOVEPOINT[]? s_mouseHistoryInfos;
 
         public WindowImpl()
         {
@@ -1183,8 +1182,21 @@ namespace Avalonia.Win32
                     var y = monitorInfo.rcWork.top;
                     var cx = Math.Abs(monitorInfo.rcWork.right - x);
                     var cy = Math.Abs(monitorInfo.rcWork.bottom - y);
+                    var style = (WindowStyles)GetWindowLong(_hwnd, (int)WindowLongParam.GWL_STYLE);
 
-                    SetWindowPos(_hwnd, WindowPosZOrder.HWND_NOTOPMOST, x, y, cx, cy, SetWindowPosFlags.SWP_SHOWWINDOW);
+                    if (!style.HasFlag(WindowStyles.WS_SIZEFRAME))
+                    {
+                        // When calling SetWindowPos on a maximized window it automatically adjusts
+                        // for "hidden" borders which are placed offscreen, EVEN IF THE WINDOW HAS
+                        // NO BORDERS, meaning that the window is placed wrong when we have CanResize
+                        // == false. Account for this here.
+                        var borderThickness = BorderThickness;
+                        x -= (int)borderThickness.Left;
+                        cx += (int)borderThickness.Left + (int)borderThickness.Right;
+                        cy += (int)borderThickness.Bottom;
+                    }
+
+                    SetWindowPos(_hwnd, WindowPosZOrder.HWND_NOTOPMOST, x, y, cx, cy, SetWindowPosFlags.SWP_SHOWWINDOW | SetWindowPosFlags.SWP_FRAMECHANGED);
                 }
             }
         }
diff --git a/src/Windows/Avalonia.Win32/WindowsMountedVolumeInfoProvider.cs b/src/Windows/Avalonia.Win32/WindowsMountedVolumeInfoProvider.cs
index 4f4e0b9293..0731097804 100644
--- a/src/Windows/Avalonia.Win32/WindowsMountedVolumeInfoProvider.cs
+++ b/src/Windows/Avalonia.Win32/WindowsMountedVolumeInfoProvider.cs
@@ -4,7 +4,7 @@ using Avalonia.Controls.Platform;
 
 namespace Avalonia.Win32
 {
-    public class WindowsMountedVolumeInfoProvider : IMountedVolumeInfoProvider
+    internal class WindowsMountedVolumeInfoProvider : IMountedVolumeInfoProvider
     {
         public IDisposable Listen(ObservableCollection<MountedVolumeInfo> mountedDrives)
         {
diff --git a/src/iOS/Avalonia.iOS/ClipboardImpl.cs b/src/iOS/Avalonia.iOS/ClipboardImpl.cs
index b9f74d69c6..150f3424e3 100644
--- a/src/iOS/Avalonia.iOS/ClipboardImpl.cs
+++ b/src/iOS/Avalonia.iOS/ClipboardImpl.cs
@@ -6,7 +6,7 @@ using UIKit;
 
 namespace Avalonia.iOS
 {
-    public class ClipboardImpl : IClipboard
+    internal class ClipboardImpl : IClipboard
     {
         public Task<string> GetTextAsync()
         {
@@ -16,19 +16,19 @@ namespace Avalonia.iOS
         public Task SetTextAsync(string text)
         {
             UIPasteboard.General.String = text;
-            return Task.FromResult(0);
+            return Task.CompletedTask;
         }
 
         public Task ClearAsync()
         {
             UIPasteboard.General.String = "";
-            return Task.FromResult(0);
+            return Task.CompletedTask;
         }
 
-        public Task SetDataObjectAsync(IDataObject data) => throw new PlatformNotSupportedException();
+        public Task SetDataObjectAsync(IDataObject data) => Task.CompletedTask;
 
-        public Task<string[]> GetFormatsAsync() => throw new PlatformNotSupportedException();
+        public Task<string[]> GetFormatsAsync() => Task.FromResult(Array.Empty<string>());
 
-        public Task<object> GetDataAsync(string format) => throw new PlatformNotSupportedException();
+        public Task<object> GetDataAsync(string format) => Task.FromResult<object>(null);
     }
-}
\ No newline at end of file
+}
diff --git a/src/iOS/Avalonia.iOS/LayerFbo.cs b/src/iOS/Avalonia.iOS/LayerFbo.cs
index 9a93cdfb22..c19fb2ee8d 100644
--- a/src/iOS/Avalonia.iOS/LayerFbo.cs
+++ b/src/iOS/Avalonia.iOS/LayerFbo.cs
@@ -5,7 +5,7 @@ using OpenGLES;
 
 namespace Avalonia.iOS
 {
-    public class LayerFbo
+    internal class LayerFbo
     {
         private readonly EAGLContext _context;
         private readonly GlInterface _gl;
diff --git a/src/iOS/Avalonia.iOS/Stubs.cs b/src/iOS/Avalonia.iOS/Stubs.cs
index 9c46aa78cc..6ac89fcab2 100644
--- a/src/iOS/Avalonia.iOS/Stubs.cs
+++ b/src/iOS/Avalonia.iOS/Stubs.cs
@@ -5,7 +5,7 @@ using Avalonia.Platform;
 
 namespace Avalonia.iOS
 {
-    class CursorFactoryStub : ICursorFactory
+    internal class CursorFactoryStub : ICursorFactory
     {
         public ICursorImpl CreateCursor(IBitmapImpl cursor, PixelPoint hotSpot) => new CursorImplStub();
         ICursorImpl ICursorFactory.GetCursor(StandardCursorType cursorType) => new CursorImplStub();
@@ -16,7 +16,7 @@ namespace Avalonia.iOS
         }
     }
 
-    class WindowingPlatformStub : IWindowingPlatform
+    internal class WindowingPlatformStub : IWindowingPlatform
     {
         public IWindowImpl CreateWindow() => throw new NotSupportedException();
 
@@ -25,7 +25,7 @@ namespace Avalonia.iOS
         public ITrayIconImpl CreateTrayIcon() => null;
     }
     
-    class PlatformIconLoaderStub : IPlatformIconLoader
+    internal class PlatformIconLoaderStub : IPlatformIconLoader
     {
         public IWindowIconImpl LoadIcon(IBitmapImpl bitmap)
         {
@@ -50,7 +50,7 @@ namespace Avalonia.iOS
         }
     }
 
-    public class IconStub : IWindowIconImpl
+    internal class IconStub : IWindowIconImpl
     {
         private readonly MemoryStream _ms;
 
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs
index baaed5104d..b6036bba8f 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs
@@ -167,6 +167,22 @@ namespace Avalonia.Base.UnitTests
             Assert.Equal("foo", target.GetValue(property));
         }
 
+        [Fact]
+        public void Completing_Animation_Binding_Reverts_To_Set_LocalValue_With_Style_Value()
+        {
+            var target = new Class1();
+            var source = new Subject<BindingValue<string>>();
+            var property = Class1.FooProperty;
+
+            target.SetValue(property, "style", BindingPriority.Style);
+            target.SetValue(property, "foo");
+            target.Bind(property, source, BindingPriority.Animation);
+            source.OnNext("bar");
+            source.OnCompleted();
+
+            Assert.Equal("foo", target.GetValue(property));
+        }
+
         [Fact]
         public void Completing_LocalValue_Binding_Raises_PropertyChanged()
         {
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_SetCurrentValue.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_SetCurrentValue.cs
new file mode 100644
index 0000000000..8ad36a583e
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_SetCurrentValue.cs
@@ -0,0 +1,308 @@
+using System;
+using Avalonia.Data;
+using Avalonia.Diagnostics;
+using Xunit;
+using Observable = Avalonia.Reactive.Observable;
+
+namespace Avalonia.Base.UnitTests
+{
+    public class AvaloniaObjectTests_SetCurrentValue
+    {
+        [Fact]
+        public void SetCurrentValue_Sets_Unset_Value()
+        {
+            var target = new Class1();
+
+            target.SetCurrentValue(Class1.FooProperty, "newvalue");
+
+            Assert.Equal("newvalue", target.GetValue(Class1.FooProperty));
+            Assert.True(target.IsSet(Class1.FooProperty));
+            Assert.Equal(BindingPriority.Unset, GetPriority(target, Class1.FooProperty));
+            Assert.True(IsOverridden(target, Class1.FooProperty));
+        }
+
+        [Fact]
+        public void SetCurrentValue_Sets_Unset_Value_Untyped()
+        {
+            var target = new Class1();
+
+            target.SetCurrentValue((AvaloniaProperty)Class1.FooProperty, "newvalue");
+
+            Assert.Equal("newvalue", target.GetValue(Class1.FooProperty));
+            Assert.True(target.IsSet(Class1.FooProperty));
+            Assert.Equal(BindingPriority.Unset, GetPriority(target, Class1.FooProperty));
+            Assert.True(IsOverridden(target, Class1.FooProperty));
+        }
+
+        [Theory]
+        [InlineData(BindingPriority.LocalValue)]
+        [InlineData(BindingPriority.Style)]
+        [InlineData(BindingPriority.Animation)]
+        public void SetCurrentValue_Overrides_Existing_Value(BindingPriority priority)
+        {
+            var target = new Class1();
+
+            target.SetValue(Class1.FooProperty, "oldvalue", priority);
+            target.SetCurrentValue(Class1.FooProperty, "newvalue");
+
+            Assert.Equal("newvalue", target.GetValue(Class1.FooProperty));
+            Assert.True(target.IsSet(Class1.FooProperty));
+            Assert.Equal(priority, GetPriority(target, Class1.FooProperty));
+            Assert.True(IsOverridden(target, Class1.FooProperty));
+        }
+
+        [Fact]
+        public void SetCurrentValue_Overrides_Inherited_Value()
+        {
+            var parent = new Class1();
+            var target = new Class1 { InheritanceParent = parent };
+
+            parent.SetValue(Class1.InheritedProperty, "inheritedvalue");
+            target.SetCurrentValue(Class1.InheritedProperty, "newvalue");
+
+            Assert.Equal("newvalue", target.GetValue(Class1.InheritedProperty));
+            Assert.True(target.IsSet(Class1.InheritedProperty));
+            Assert.Equal(BindingPriority.Unset, GetPriority(target, Class1.InheritedProperty));
+            Assert.True(IsOverridden(target, Class1.InheritedProperty));
+        }
+
+        [Fact]
+        public void SetCurrentValue_Is_Inherited()
+        {
+            var parent = new Class1();
+            var target = new Class1 { InheritanceParent = parent };
+
+            parent.SetCurrentValue(Class1.InheritedProperty, "newvalue");
+
+            Assert.Equal("newvalue", target.GetValue(Class1.InheritedProperty));
+            Assert.False(target.IsSet(Class1.FooProperty));
+            Assert.Equal(BindingPriority.Inherited, GetPriority(target, Class1.InheritedProperty));
+            Assert.False(IsOverridden(target, Class1.InheritedProperty));
+        }
+
+        [Fact]
+        public void ClearValue_Clears_CurrentValue_With_Unset_Priority()
+        {
+            var target = new Class1();
+
+            target.SetCurrentValue(Class1.FooProperty, "newvalue");
+            target.ClearValue(Class1.FooProperty);
+
+            Assert.Equal("foodefault", target.Foo);
+            Assert.False(target.IsSet(Class1.FooProperty));
+            Assert.False(IsOverridden(target, Class1.FooProperty));
+        }
+
+        [Fact]
+        public void ClearValue_Clears_CurrentValue_With_Inherited_Priority()
+        {
+            var parent = new Class1();
+            var target = new Class1 { InheritanceParent = parent };
+
+            parent.SetValue(Class1.InheritedProperty, "inheritedvalue");
+            target.SetCurrentValue(Class1.InheritedProperty, "newvalue");
+            target.ClearValue(Class1.InheritedProperty);
+
+            Assert.Equal("inheritedvalue", target.Inherited);
+            Assert.False(target.IsSet(Class1.FooProperty));
+            Assert.False(IsOverridden(target, Class1.FooProperty));
+        }
+
+        [Fact]
+        public void ClearValue_Clears_CurrentValue_With_LocalValue_Priority()
+        {
+            var target = new Class1();
+
+            target.SetValue(Class1.FooProperty, "localvalue");
+            target.SetCurrentValue(Class1.FooProperty, "newvalue");
+            target.ClearValue(Class1.FooProperty);
+
+            Assert.Equal("foodefault", target.Foo);
+            Assert.False(target.IsSet(Class1.FooProperty));
+            Assert.False(IsOverridden(target, Class1.FooProperty));
+        }
+
+        [Fact]
+        public void ClearValue_Clears_CurrentValue_With_Style_Priority()
+        {
+            var target = new Class1();
+
+            target.SetValue(Class1.FooProperty, "stylevalue", BindingPriority.Style);
+            target.SetCurrentValue(Class1.FooProperty, "newvalue");
+            target.ClearValue(Class1.FooProperty);
+
+            Assert.Equal("stylevalue", target.Foo);
+            Assert.True(target.IsSet(Class1.FooProperty));
+            Assert.False(IsOverridden(target, Class1.FooProperty));
+        }
+
+        [Fact]
+        public void SetCurrentValue_Can_Be_Coerced()
+        {
+            var target = new Class1();
+
+            target.SetCurrentValue(Class1.CoercedProperty, 60);
+            Assert.Equal(60, target.GetValue(Class1.CoercedProperty));
+
+            target.CoerceMax = 50;
+            target.CoerceValue(Class1.CoercedProperty);
+            Assert.Equal(50, target.GetValue(Class1.CoercedProperty));
+
+            target.CoerceMax = 100;
+            target.CoerceValue(Class1.CoercedProperty);
+            Assert.Equal(60, target.GetValue(Class1.CoercedProperty));
+        }
+
+        [Fact]
+        public void SetCurrentValue_Unset_Clears_CurrentValue()
+        {
+            var target = new Class1();
+
+            target.SetCurrentValue(Class1.FooProperty, "newvalue");
+            target.SetCurrentValue(Class1.FooProperty, AvaloniaProperty.UnsetValue);
+
+            Assert.Equal("foodefault", target.Foo);
+            Assert.False(target.IsSet(Class1.FooProperty));
+            Assert.False(IsOverridden(target, Class1.FooProperty));
+        }
+
+        [Theory]
+        [InlineData(BindingPriority.LocalValue)]
+        [InlineData(BindingPriority.Style)]
+        [InlineData(BindingPriority.Animation)]
+        public void SetValue_Overrides_CurrentValue_With_Unset_Priority(BindingPriority priority)
+        {
+            var target = new Class1();
+
+            target.SetCurrentValue(Class1.FooProperty, "current");
+            target.SetValue(Class1.FooProperty, "setvalue", priority);
+
+            Assert.Equal("setvalue", target.Foo);
+            Assert.True(target.IsSet(Class1.FooProperty));
+            Assert.Equal(priority, GetPriority(target, Class1.FooProperty));
+            Assert.False(IsOverridden(target, Class1.FooProperty));
+        }
+
+        [Fact]
+        public void Animation_Value_Overrides_CurrentValue_With_LocalValue_Priority()
+        {
+            var target = new Class1();
+
+            target.SetValue(Class1.FooProperty, "localvalue");
+            target.SetCurrentValue(Class1.FooProperty, "current");
+            target.SetValue(Class1.FooProperty, "setvalue", BindingPriority.Animation);
+
+            Assert.Equal("setvalue", target.Foo);
+            Assert.True(target.IsSet(Class1.FooProperty));
+            Assert.Equal(BindingPriority.Animation, GetPriority(target, Class1.FooProperty));
+            Assert.False(IsOverridden(target, Class1.FooProperty));
+        }
+
+        [Fact]
+        public void StyleTrigger_Value_Overrides_CurrentValue_With_Style_Priority()
+        {
+            var target = new Class1();
+
+            target.SetValue(Class1.FooProperty, "style", BindingPriority.Style);
+            target.SetCurrentValue(Class1.FooProperty, "current");
+            target.SetValue(Class1.FooProperty, "setvalue", BindingPriority.StyleTrigger);
+
+            Assert.Equal("setvalue", target.Foo);
+            Assert.True(target.IsSet(Class1.FooProperty));
+            Assert.Equal(BindingPriority.StyleTrigger, GetPriority(target, Class1.FooProperty));
+            Assert.False(IsOverridden(target, Class1.FooProperty));
+        }
+
+        [Theory]
+        [InlineData(BindingPriority.LocalValue)]
+        [InlineData(BindingPriority.Style)]
+        [InlineData(BindingPriority.Animation)]
+        public void Binding_Overrides_CurrentValue_With_Unset_Priority(BindingPriority priority)
+        {
+            var target = new Class1();
+
+            target.SetCurrentValue(Class1.FooProperty, "current");
+            
+            var s = target.Bind(Class1.FooProperty, Observable.SingleValue("binding"), priority);
+
+            Assert.Equal("binding", target.Foo);
+            Assert.True(target.IsSet(Class1.FooProperty));
+            Assert.Equal(priority, GetPriority(target, Class1.FooProperty));
+            Assert.False(IsOverridden(target, Class1.FooProperty));
+
+            s.Dispose();
+
+            Assert.Equal("foodefault", target.Foo);
+        }
+
+        [Fact]
+        public void Animation_Binding_Overrides_CurrentValue_With_LocalValue_Priority()
+        {
+            var target = new Class1();
+
+            target.SetValue(Class1.FooProperty, "localvalue");
+            target.SetCurrentValue(Class1.FooProperty, "current");
+
+            var s = target.Bind(Class1.FooProperty, Observable.SingleValue("binding"), BindingPriority.Animation);
+
+            Assert.Equal("binding", target.Foo);
+            Assert.True(target.IsSet(Class1.FooProperty));
+            Assert.Equal(BindingPriority.Animation, GetPriority(target, Class1.FooProperty));
+            Assert.False(IsOverridden(target, Class1.FooProperty));
+
+            s.Dispose();
+
+            Assert.Equal("current", target.Foo);
+        }
+
+        [Fact]
+        public void StyleTrigger_Binding_Overrides_CurrentValue_With_Style_Priority()
+        {
+            var target = new Class1();
+
+            target.SetValue(Class1.FooProperty, "style", BindingPriority.Style);
+            target.SetCurrentValue(Class1.FooProperty, "current");
+            
+            var s = target.Bind(Class1.FooProperty, Observable.SingleValue("binding"), BindingPriority.StyleTrigger);
+
+            Assert.Equal("binding", target.Foo);
+            Assert.True(target.IsSet(Class1.FooProperty));
+            Assert.Equal(BindingPriority.StyleTrigger, GetPriority(target, Class1.FooProperty));
+            Assert.False(IsOverridden(target, Class1.FooProperty));
+
+            s.Dispose();
+
+            Assert.Equal("style", target.Foo);
+        }
+
+        private BindingPriority GetPriority(AvaloniaObject target, AvaloniaProperty property)
+        {
+            return target.GetDiagnostic(property).Priority;
+        }
+
+        private bool IsOverridden(AvaloniaObject target, AvaloniaProperty property)
+        {
+            return target.GetDiagnostic(property).IsOverriddenCurrentValue;
+        }
+
+        private class Class1 : AvaloniaObject
+        {
+            public static readonly StyledProperty<string> FooProperty =
+                AvaloniaProperty.Register<Class1, string>(nameof(Foo), "foodefault");
+            public static readonly StyledProperty<string> InheritedProperty =
+                AvaloniaProperty.Register<Class1, string>(nameof(Inherited), "inheriteddefault", inherits: true);
+            public static readonly StyledProperty<double> CoercedProperty =
+                AvaloniaProperty.Register<Class1, double>(nameof(Coerced), coerce: Coerce);
+
+            public string Foo => GetValue(FooProperty);
+            public string Inherited => GetValue(InheritedProperty);
+            public double Coerced => GetValue(CoercedProperty);
+            public double CoerceMax { get; set; } = 100;
+
+            private static double Coerce(AvaloniaObject sender, double value)
+            {
+                return Math.Min(value, ((Class1)sender).CoerceMax);
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaPropertyTests.cs b/tests/Avalonia.Base.UnitTests/AvaloniaPropertyTests.cs
index 5733159a23..7e932373c2 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaPropertyTests.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaPropertyTests.cs
@@ -179,6 +179,11 @@ namespace Avalonia.Base.UnitTests
                 throw new NotImplementedException();
             }
 
+            internal override void RouteSetCurrentValue(AvaloniaObject o, object value)
+            {
+                throw new NotImplementedException();
+            }
+
             internal override EffectiveValue CreateEffectiveValue(AvaloniaObject o)
             {
                 throw new NotImplementedException();
@@ -188,7 +193,12 @@ namespace Avalonia.Base.UnitTests
         private class Class1 : AvaloniaObject
         {
             public static readonly StyledProperty<string> FooProperty =
-                AvaloniaProperty.Register<Class1, string>("Foo", "default", notifying: FooNotifying);
+                AvaloniaProperty.Register<Class1, string>("Foo", "default",
+                    inherits: true,
+                    defaultBindingMode: BindingMode.OneWay,
+                    validate: null,
+                    coerce: null,
+                    notifying: FooNotifying);
 
             public int NotifyCount { get; private set; }
 
diff --git a/tests/Avalonia.Base.UnitTests/PropertyStore/ValueStoreTests_Inheritance.cs b/tests/Avalonia.Base.UnitTests/PropertyStore/ValueStoreTests_Inheritance.cs
index ed122e4ddc..91b0f9cdee 100644
--- a/tests/Avalonia.Base.UnitTests/PropertyStore/ValueStoreTests_Inheritance.cs
+++ b/tests/Avalonia.Base.UnitTests/PropertyStore/ValueStoreTests_Inheritance.cs
@@ -97,6 +97,27 @@ namespace Avalonia.Base.UnitTests.PropertyStore
             Assert.Same(parentStore, grandchild.GetValueStore().InheritanceAncestor);
         }
 
+        [Fact]
+        public void Child_Notifies_About_Setting_Back_To_Default_Value()
+        {
+            var parent = new Class1();
+            var child = new Class1();
+
+            parent.Foo = "changed";
+            child.Parent = parent;
+
+            bool raised = false;
+            child.PropertyChanged += (_, args) =>
+            {
+                raised = args.Property == Class1.FooProperty && args.GetNewValue<string>() == "foodefault";
+            };
+
+            Assert.Equal("changed", child.Foo); // inherited from parent.
+
+            child.Foo = "foodefault"; // reset back to default.
+            Assert.True(raised); // expect event to be raised, as actual value was changed.
+        }
+
         [Fact]
         public void Adding_Child_Sets_InheritanceAncestor()
         {
diff --git a/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs b/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs
index 28e88d1e71..f074972cef 100644
--- a/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs
@@ -147,6 +147,25 @@ namespace Avalonia.Controls.UnitTests
             Assert.Equal(new[] { child }, target.GetLogicalChildren());
         }
 
+        [Fact]
+        public void Control_Item_Should_Be_Logical_Child_After_Layout()
+        {
+            var target = new ItemsControl
+            {
+                Template = GetTemplate(),
+            };
+            var root = new TestRoot(target);
+            var child = new Control();
+
+            target.Template = GetTemplate();
+            target.Items = new[] { child };
+            root.LayoutManager.ExecuteInitialLayoutPass();
+
+            Assert.Equal(target, child.Parent);
+            Assert.Equal(target, child.GetLogicalParent());
+            Assert.Equal(new[] { child }, target.GetLogicalChildren());
+        }
+
         [Fact]
         public void Added_Container_Should_Have_LogicalParent_Set_To_ItemsControl()
         {
diff --git a/tests/Avalonia.IntegrationTests.Appium/WindowTests.cs b/tests/Avalonia.IntegrationTests.Appium/WindowTests.cs
index 7bb991aae6..ec24caa18c 100644
--- a/tests/Avalonia.IntegrationTests.Appium/WindowTests.cs
+++ b/tests/Avalonia.IntegrationTests.Appium/WindowTests.cs
@@ -30,9 +30,9 @@ namespace Avalonia.IntegrationTests.Appium
 
         [Theory]
         [MemberData(nameof(StartupLocationData))]
-        public void StartupLocation(Size? size, ShowWindowMode mode, WindowStartupLocation location)
+        public void StartupLocation(Size? size, ShowWindowMode mode, WindowStartupLocation location, bool canResize)
         {
-            using var window = OpenWindow(size, mode, location);
+            using var window = OpenWindow(size, mode, location, canResize: canResize);
             var info = GetWindowInfo();
 
             if (size.HasValue)
@@ -63,9 +63,9 @@ namespace Avalonia.IntegrationTests.Appium
 
         [Theory]
         [MemberData(nameof(WindowStateData))]
-        public void WindowState(Size? size, ShowWindowMode mode, WindowState state)
+        public void WindowState(Size? size, ShowWindowMode mode, WindowState state, bool canResize)
         {
-            using var window = OpenWindow(size, mode, state: state);
+            using var window = OpenWindow(size, mode, state: state, canResize: canResize);
 
             try
             {
@@ -230,10 +230,10 @@ namespace Avalonia.IntegrationTests.Appium
             Assert.Equal(new Rgba32(255, 0, 0), centerColor);
         }
 
-        public static TheoryData<Size?, ShowWindowMode, WindowStartupLocation> StartupLocationData()
+        public static TheoryData<Size?, ShowWindowMode, WindowStartupLocation, bool> StartupLocationData()
         {
             var sizes = new Size?[] { null, new Size(400, 300) };
-            var data = new TheoryData<Size?, ShowWindowMode, WindowStartupLocation>();
+            var data = new TheoryData<Size?, ShowWindowMode, WindowStartupLocation, bool>();
 
             foreach (var size in sizes)
             {
@@ -243,7 +243,8 @@ namespace Avalonia.IntegrationTests.Appium
                     {
                         if (!(location == WindowStartupLocation.CenterOwner && mode == ShowWindowMode.NonOwned))
                         {
-                            data.Add(size, mode, location);
+                            data.Add(size, mode, location, true);
+                            data.Add(size, mode, location, false);
                         }
                     }
                 }
@@ -252,10 +253,10 @@ namespace Avalonia.IntegrationTests.Appium
             return data;
         }
 
-        public static TheoryData<Size?, ShowWindowMode, WindowState> WindowStateData()
+        public static TheoryData<Size?, ShowWindowMode, WindowState, bool> WindowStateData()
         {
             var sizes = new Size?[] { null, new Size(400, 300) };
-            var data = new TheoryData<Size?, ShowWindowMode, WindowState>();
+            var data = new TheoryData<Size?, ShowWindowMode, WindowState, bool>();
 
             foreach (var size in sizes)
             {
@@ -273,7 +274,8 @@ namespace Avalonia.IntegrationTests.Appium
                             mode != ShowWindowMode.NonOwned)
                             continue;
 
-                        data.Add(size, mode, state);
+                        data.Add(size, mode, state, true);
+                        data.Add(size, mode, state, false);
                     }
                 }
             }
@@ -311,25 +313,39 @@ namespace Avalonia.IntegrationTests.Appium
             Size? size,
             ShowWindowMode mode,
             WindowStartupLocation location = WindowStartupLocation.Manual,
-            WindowState state = Controls.WindowState.Normal)
+            WindowState state = Controls.WindowState.Normal,
+            bool canResize = true)
         {
             var sizeTextBox = _session.FindElementByAccessibilityId("ShowWindowSize");
             var modeComboBox = _session.FindElementByAccessibilityId("ShowWindowMode");
             var locationComboBox = _session.FindElementByAccessibilityId("ShowWindowLocation");
             var stateComboBox = _session.FindElementByAccessibilityId("ShowWindowState");
+            var canResizeCheckBox = _session.FindElementByAccessibilityId("ShowWindowCanResize");
             var showButton = _session.FindElementByAccessibilityId("ShowWindow");
-
+            
             if (size.HasValue)
                 sizeTextBox.SendKeys($"{size.Value.Width}, {size.Value.Height}");
 
-            modeComboBox.Click();
-            _session.FindElementByName(mode.ToString()).SendClick();
+            if (modeComboBox.GetComboBoxValue() != mode.ToString())
+            {
+                modeComboBox.Click();
+                _session.FindElementByName(mode.ToString()).SendClick();
+            }
+
+            if (locationComboBox.GetComboBoxValue() != location.ToString())
+            {
+                locationComboBox.Click();
+                _session.FindElementByName(location.ToString()).SendClick();
+            }
 
-            locationComboBox.Click();
-            _session.FindElementByName(location.ToString()).SendClick();
+            if (stateComboBox.GetComboBoxValue() != state.ToString())
+            {
+                stateComboBox.Click();
+                _session.FindElementByAccessibilityId($"ShowWindowState{state}").SendClick();
+            }
 
-            stateComboBox.Click();
-            _session.FindElementByAccessibilityId($"ShowWindowState{state}").SendClick();
+            if (canResizeCheckBox.GetIsChecked() != canResize)
+                canResizeCheckBox.Click();
 
             return showButton.OpenWindowWithClick();
         }
diff --git a/tests/Avalonia.IntegrationTests.Appium/WindowTests_MacOS.cs b/tests/Avalonia.IntegrationTests.Appium/WindowTests_MacOS.cs
index d9817ecdd1..0839cbf183 100644
--- a/tests/Avalonia.IntegrationTests.Appium/WindowTests_MacOS.cs
+++ b/tests/Avalonia.IntegrationTests.Appium/WindowTests_MacOS.cs
@@ -323,21 +323,49 @@ namespace Avalonia.IntegrationTests.Appium
             secondaryWindow.GetChromeButtons().close.Click();
         }
 
-        private IDisposable OpenWindow(PixelSize? size, ShowWindowMode mode, WindowStartupLocation location)
+        [PlatformTheory(TestPlatforms.MacOS)]
+        [InlineData(ShowWindowMode.NonOwned)]
+        [InlineData(ShowWindowMode.Owned)]
+        [InlineData(ShowWindowMode.Modal)]
+        public void Window_Has_Disabled_Zoom_Button_When_CanResize_Is_False(ShowWindowMode mode)
+        {
+            using (OpenWindow(null, mode, WindowStartupLocation.Manual, canResize: false))
+            {
+                var secondaryWindow = GetWindow("SecondaryWindow");
+                var (_, _, zoomButton) = secondaryWindow.GetChromeButtons();
+                Assert.False(zoomButton.Enabled);
+            }
+        }
+        
+        private IDisposable OpenWindow(
+            PixelSize? size,
+            ShowWindowMode mode,
+            WindowStartupLocation location,
+            bool canResize = true)
         {
             var sizeTextBox = _session.FindElementByAccessibilityId("ShowWindowSize");
             var modeComboBox = _session.FindElementByAccessibilityId("ShowWindowMode");
             var locationComboBox = _session.FindElementByAccessibilityId("ShowWindowLocation");
+            var canResizeCheckBox = _session.FindElementByAccessibilityId("ShowWindowCanResize");
             var showButton = _session.FindElementByAccessibilityId("ShowWindow");
 
             if (size.HasValue)
                 sizeTextBox.SendKeys($"{size.Value.Width}, {size.Value.Height}");
 
-            modeComboBox.Click();
-            _session.FindElementByName(mode.ToString()).SendClick();
+            if (modeComboBox.GetComboBoxValue() != mode.ToString())
+            {
+                modeComboBox.Click();
+                _session.FindElementByName(mode.ToString()).SendClick();
+            }
 
-            locationComboBox.Click();
-            _session.FindElementByName(location.ToString()).SendClick();
+            if (locationComboBox.GetComboBoxValue() != location.ToString())
+            {
+                locationComboBox.Click();
+                _session.FindElementByName(location.ToString()).SendClick();
+            }
+            
+            if (canResizeCheckBox.GetIsChecked() != canResize)
+                canResizeCheckBox.Click();
 
             return showButton.OpenWindowWithClick();
         }