From d9d612027abbbbeae6b615fe9a99847622a161b3 Mon Sep 17 00:00:00 2001
From: chinboy <chinware@163.com>
Date: Tue, 8 Jul 2025 20:55:53 +0800
Subject: [PATCH] refactor ResourceBindingsDisposable implementation

---
 Directory.Packages.props                      |   1 +
 build/Version.props                           |   2 +-
 scripts/PublishToLocalSources.ps1             |  60 ++++++---
 .../Column/DataGridRowExpander.cs             |   7 +-
 .../DataGrid.Privates.cs                      |   8 +-
 .../AddOnDecoratedBox/AddOnDecoratedBox.cs    |   6 +-
 src/AtomUI.Controls/Alert/Alert.cs            |   6 +-
 .../Badge/DotBadgeIndicator.cs                |   6 +-
 .../ButtonSpinner/ButtonSpinnerInnerBox.cs    |   6 +-
 src/AtomUI.Controls/Buttons/Button.cs         | 115 ++++++++++--------
 src/AtomUI.Controls/Buttons/DropdownButton.cs |  37 +++---
 src/AtomUI.Controls/Buttons/SplitButton.cs    |   6 +-
 .../Themes/Button/BaseButtonTheme.axaml       |  10 +-
 .../Utils/ButtonIconVisibleConverter.cs       |   9 +-
 .../Calendar/BaseCalendarDayButton.cs         |   6 +-
 src/AtomUI.Controls/Calendar/Calendar.cs      |   6 +-
 src/AtomUI.Controls/Calendar/CalendarItem.cs  |   6 +-
 .../CheckBox/CheckBoxIndicator.cs             |   6 +-
 src/AtomUI.Controls/Collapse/Collapse.cs      |   6 +-
 .../CalendarView/CalendarDayButton.cs         |   7 +-
 .../DatePicker/CalendarView/CalendarItem.cs   |   8 +-
 .../DatePicker/DatePickerPresenter.cs         |   6 +-
 src/AtomUI.Controls/Drawer/Drawer.cs          |   6 +-
 src/AtomUI.Controls/Expander/Expander.cs      |   6 +-
 src/AtomUI.Controls/Flyouts/FlyoutHost.cs     |   6 +-
 .../Flyouts/MenuFlyoutPresenter.cs            |   7 +-
 src/AtomUI.Controls/GroupBox/GroupBox.cs      |   6 +-
 src/AtomUI.Controls/Input/TextBox.cs          |   6 +-
 src/AtomUI.Controls/ListBox/ListBox.cs        |   7 +-
 src/AtomUI.Controls/Menu/Menu.cs              |   6 +-
 src/AtomUI.Controls/Menu/MenuSeparator.cs     |   6 +-
 src/AtomUI.Controls/NavMenu/NavMenu.cs        |   6 +-
 .../Notifications/NotificationProgressBar.cs  |   6 +-
 .../Pagination/AbstractPagination.cs          |   7 +-
 .../Pagination/PageSizeComboBoxItem.cs        |   6 +-
 .../Pagination/PaginationNav.cs               |  13 +-
 .../Pagination/PaginationNavItem.cs           |   6 +-
 .../Pagination/QuickJumperBar.cs              |   6 +-
 src/AtomUI.Controls/Popup/Popup.cs            |   6 +-
 .../RadioButton/RadioIndicator.cs             |   6 +-
 src/AtomUI.Controls/Slider/SliderTrack.cs     |   7 +-
 src/AtomUI.Controls/Switch/SwitchKnob.cs      |   6 +-
 .../Switch/Themes/ToggleSwitchTheme.axaml     |   2 +-
 src/AtomUI.Controls/Switch/ToggleSwitch.cs    |  10 +-
 .../TabControl/BaseTabControl.cs              |   6 +-
 .../TabControl/BaseTabScrollViewer.cs         |   6 +-
 src/AtomUI.Controls/TabControl/TabItem.cs     |   6 +-
 .../TabControl/TabStrip/BaseTabStrip.cs       |   6 +-
 .../TabControl/TabStrip/TabStripItem.cs       |   6 +-
 src/AtomUI.Controls/Tag/Tag.cs                |   6 +-
 src/AtomUI.Controls/Tag/Themes/TagTheme.axaml |  24 ++--
 src/AtomUI.Controls/TextBlock/TextBlock.cs    |   6 +-
 .../TimePicker/DateTimePickerPanel.cs         |   6 +-
 .../TimePicker/TimePickerPresenter.cs         |   6 +-
 .../TimePicker/TimeView/TimeView.cs           |  11 +-
 .../Timeline/TimelineIndicator.cs             |   7 +-
 .../TreeView/DragPreviewAdorner.cs            |   6 +-
 src/AtomUI.Controls/TreeView/TreeViewItem.cs  |   6 +-
 src/AtomUI.Controls/Window/Window.cs          |   1 +
 .../AtomUI.ReactiveUI.csproj                  |   5 +-
 src/AtomUI.Theme/AtomUI.Theme.csproj          |   3 +-
 src/AtomUI.Theme/IResourceBindingManager.cs   |   4 +-
 src/AtomUI.Theme/ThemeManager.cs              |   6 +-
 63 files changed, 425 insertions(+), 175 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index a0cb10b80..8572c4368 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -7,6 +7,7 @@
         <PackageVersion Include="Avalonia.Desktop" Version="$(AvaloniaVersion)"/>
         <PackageVersion Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)"/>
         <PackageVersion Include="Avalonia.Controls.ColorPicker" Version="$(AvaloniaVersion)"/>
+        <PackageVersion Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersion)"/>
         <PackageVersion Include="AtomUI.Controls.DataGrid" Version="$(AvaloniaVersion)"/>
         <PackageVersion Include="Avalonia.Win32" Version="$(AvaloniaVersion)"/>
         <PackageVersion Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)"/>
diff --git a/build/Version.props b/build/Version.props
index 10bfa0801..536e604b4 100644
--- a/build/Version.props
+++ b/build/Version.props
@@ -2,7 +2,7 @@
     <PropertyGroup>
         <NoWarn>$(NoWarn);CS7035</NoWarn>
         <AvaloniaVersion>11.3.2</AvaloniaVersion>
-        <AtomUIVersion>0.0.6-build.1</AtomUIVersion>
+        <AtomUIVersion>0.0.6-build.2</AtomUIVersion>
     </PropertyGroup>
     
     <PropertyGroup>
diff --git a/scripts/PublishToLocalSources.ps1 b/scripts/PublishToLocalSources.ps1
index 696c08875..5087352c8 100644
--- a/scripts/PublishToLocalSources.ps1
+++ b/scripts/PublishToLocalSources.ps1
@@ -4,26 +4,52 @@ param (
     [string]$preReleaseTag
 )
 
+function Push-NuGetPackages {
+    [CmdletBinding(SupportsShouldProcess = $true)]
+    param(
+        [string]$PackagePath = "../output/Nuget",
+        [Parameter(Mandatory = $true)]
+        [string]$Source
+    )
+
+    # 获取所有NuGet包
+    $packages = Get-ChildItem -Path $PackagePath -Filter *.nupkg -Recurse -File
+
+    if (-not $packages) {
+        Write-Warning "未找到任何.nupkg文件"
+        return
+    }
+
+    # 处理每个包
+    foreach ($pkg in $packages) {
+        if ($PSCmdlet.ShouldProcess($pkg.Name, "推送并删除")) {
+            try {
+                # 推送包
+                dotnet nuget push $pkg.FullName --source $Source
+
+                if ($LASTEXITCODE -eq 0) {
+                    # 删除成功推送的包
+                    Remove-Item $pkg.FullName -Force
+                    Write-Host "✓ 成功: $($pkg.Name)" -ForegroundColor Green
+                } else {
+                    Write-Warning "推送失败: $($pkg.Name) (退出码: $LASTEXITCODE)"
+                }
+            }
+            catch {
+                Write-Error "处理 $($pkg.Name) 时出错: $_"
+            }
+        }
+    }
+}
+
 dotnet build -v diag --configuration $buildType ../packages/AtomUI/AtomUI.csproj
-dotnet build -v diag --configuration $buildType ../src/AtomUI.Controls.DataGrid/AtomUI.Controls.DataGrid.csproj
 dotnet pack --no-build --configuration $buildType ../packages/AtomUI/AtomUI.csproj
 dotnet pack --no-build --configuration $buildType ../src/AtomUI.IconPkg.Generator/AtomUI.IconPkg.Generator.csproj
 dotnet pack --no-build --configuration $buildType ../src/AtomUI.Generator/AtomUI.Generator.csproj
+
+Push-NuGetPackages -Source $localSourcesDir -Confirm:$false
+
+dotnet build -v diag --configuration $buildType ../src/AtomUI.Controls.DataGrid/AtomUI.Controls.DataGrid.csproj
 dotnet pack --no-build --configuration $buildType ../src/AtomUI.Controls.DataGrid/AtomUI.Controls.DataGrid.csproj
 
-# 探测包
-$packages = Get-ChildItem -Path ../output/Nuget -Filter *.nupkg -Recurse -File
-
-foreach ($pkg in $packages) {
-    try {
-        # 执行 NuGet 推送命令
-        dotnet nuget push $pkg.FullName --source $localSourcesDir
-
-        if ($LASTEXITCODE -ne 0) {
-            Write-Warning "推送失败: $($pkg.Name)"
-        }
-    }
-    catch {
-        Write-Error "推送 $($pkg.Name) 时发生异常: $_"
-    }
-}
\ No newline at end of file
+Push-NuGetPackages -Source $localSourcesDir -Confirm:$false
diff --git a/src/AtomUI.Controls.DataGrid/Column/DataGridRowExpander.cs b/src/AtomUI.Controls.DataGrid/Column/DataGridRowExpander.cs
index 12ed8a189..97e7dbaaf 100644
--- a/src/AtomUI.Controls.DataGrid/Column/DataGridRowExpander.cs
+++ b/src/AtomUI.Controls.DataGrid/Column/DataGridRowExpander.cs
@@ -44,7 +44,12 @@ internal class DataGridRowExpander : ToggleButton,
     }
 
     private CompositeDisposable? _resourceBindingsDisposable;
-    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable => _resourceBindingsDisposable;
+    
+    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable
+    {
+        get => _resourceBindingsDisposable;
+        set => _resourceBindingsDisposable = value;
+    }
 
     private Rectangle? _horizontalIndicator;
     private Rectangle? _verticalIndicator;
diff --git a/src/AtomUI.Controls.DataGrid/DataGrid.Privates.cs b/src/AtomUI.Controls.DataGrid/DataGrid.Privates.cs
index 1c5659416..79ac7ddf6 100644
--- a/src/AtomUI.Controls.DataGrid/DataGrid.Privates.cs
+++ b/src/AtomUI.Controls.DataGrid/DataGrid.Privates.cs
@@ -209,7 +209,13 @@ public partial class DataGrid
     Control IMotionAwareControl.PropertyBindTarget => this;
     Control IControlSharedTokenResourcesHost.HostControl => this;
     string IControlSharedTokenResourcesHost.TokenId => DataGridToken.ID;
-    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable => _resourceBindingsDisposable;
+    
+    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable 
+    {
+        get => _resourceBindingsDisposable;
+        set => _resourceBindingsDisposable = value;
+    }
+    
     private CompositeDisposable? _resourceBindingsDisposable;
 
     #endregion
diff --git a/src/AtomUI.Controls/AddOnDecoratedBox/AddOnDecoratedBox.cs b/src/AtomUI.Controls/AddOnDecoratedBox/AddOnDecoratedBox.cs
index ac1ee5e34..779381516 100644
--- a/src/AtomUI.Controls/AddOnDecoratedBox/AddOnDecoratedBox.cs
+++ b/src/AtomUI.Controls/AddOnDecoratedBox/AddOnDecoratedBox.cs
@@ -177,7 +177,11 @@ public class AddOnDecoratedBox : ContentControl,
     Control IControlSharedTokenResourcesHost.HostControl => this;
     string IControlSharedTokenResourcesHost.TokenId => AddOnDecoratedBoxToken.ID;
 
-    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable => _resourceBindingsDisposable;
+    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable 
+    {
+        get => _resourceBindingsDisposable;
+        set => _resourceBindingsDisposable = value;
+    }
 
     #endregion
 
diff --git a/src/AtomUI.Controls/Alert/Alert.cs b/src/AtomUI.Controls/Alert/Alert.cs
index af5d37e5a..84e917ff3 100644
--- a/src/AtomUI.Controls/Alert/Alert.cs
+++ b/src/AtomUI.Controls/Alert/Alert.cs
@@ -117,7 +117,11 @@ public class Alert : TemplatedControl,
 
     Control IControlSharedTokenResourcesHost.HostControl => this;
     string IControlSharedTokenResourcesHost.TokenId => AlertToken.ID;
-    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable => _resourceBindingsDisposable;
+    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable 
+    {
+        get => _resourceBindingsDisposable;
+        set => _resourceBindingsDisposable = value;
+    }
 
     #endregion
 
diff --git a/src/AtomUI.Controls/Badge/DotBadgeIndicator.cs b/src/AtomUI.Controls/Badge/DotBadgeIndicator.cs
index e4fef2df6..f88a5ce68 100644
--- a/src/AtomUI.Controls/Badge/DotBadgeIndicator.cs
+++ b/src/AtomUI.Controls/Badge/DotBadgeIndicator.cs
@@ -41,7 +41,11 @@ internal class DotBadgeIndicator : Control,
         set => SetValue(BadgeShadowSizeProperty, value);
     }
 
-    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable => _resourceBindingsDisposable;
+    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable
+    {
+        get => _resourceBindingsDisposable;
+        set => _resourceBindingsDisposable = value;
+    }
 
     private BoxShadows _boxShadows;
     private CompositeDisposable? _resourceBindingsDisposable;
diff --git a/src/AtomUI.Controls/ButtonSpinner/ButtonSpinnerInnerBox.cs b/src/AtomUI.Controls/ButtonSpinner/ButtonSpinnerInnerBox.cs
index a3a353a51..741fa4421 100644
--- a/src/AtomUI.Controls/ButtonSpinner/ButtonSpinnerInnerBox.cs
+++ b/src/AtomUI.Controls/ButtonSpinner/ButtonSpinnerInnerBox.cs
@@ -99,7 +99,11 @@ internal class ButtonSpinnerInnerBox : AddOnDecoratedInnerBox,
         set => SetAndRaise(SpinnerHandleWidthTokenProperty, ref _spinnerHandleWidthToken, value);
     }
     
-    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable => _resourceBindingsDisposable;
+    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable
+    {
+        get => _resourceBindingsDisposable;
+        set => _resourceBindingsDisposable = value;
+    }
 
     #endregion
     
diff --git a/src/AtomUI.Controls/Buttons/Button.cs b/src/AtomUI.Controls/Buttons/Button.cs
index e35e6cb7c..67c73c179 100644
--- a/src/AtomUI.Controls/Buttons/Button.cs
+++ b/src/AtomUI.Controls/Buttons/Button.cs
@@ -1,3 +1,4 @@
+using System.Diagnostics;
 using System.Reactive.Disposables;
 using AtomUI.Animations;
 using AtomUI.Controls.Themes;
@@ -40,7 +41,7 @@ public enum ButtonShape
 
 [PseudoClasses(
     ButtonPseudoClass.IconOnly,
-    ButtonPseudoClass.Loading, 
+    ButtonPseudoClass.Loading,
     ButtonPseudoClass.IsDanger,
     ButtonPseudoClass.DefaultType,
     ButtonPseudoClass.PrimaryType,
@@ -73,10 +74,10 @@ public class Button : AvaloniaButton,
     public static readonly StyledProperty<ButtonSizeType> SizeTypeProperty =
         SizeTypeAwareControlProperty.SizeTypeProperty.AddOwner<Button>();
 
-    public static readonly StyledProperty<Icon?> IconProperty = 
+    public static readonly StyledProperty<Icon?> IconProperty =
         AvaloniaProperty.Register<Button, Icon?>(nameof(Icon));
 
-    public static readonly StyledProperty<bool> IsMotionEnabledProperty = 
+    public static readonly StyledProperty<bool> IsMotionEnabledProperty =
         MotionAwareControlProperty.IsMotionEnabledProperty.AddOwner<Button>();
 
     public static readonly StyledProperty<bool> IsWaveSpiritEnabledProperty =
@@ -123,7 +124,7 @@ public class Button : AvaloniaButton,
         get => GetValue(IconProperty);
         set => SetValue(IconProperty, value);
     }
-    
+
     public bool IsMotionEnabled
     {
         get => GetValue(IsMotionEnabledProperty);
@@ -151,20 +152,20 @@ public class Button : AvaloniaButton,
     internal static readonly StyledProperty<BoxShadow> DangerShadowProperty =
         AvaloniaProperty.Register<Button, BoxShadow>(
             nameof(DangerShadow));
-    
-    internal static readonly StyledProperty<bool> IsIconVisibleProperty = 
+
+    internal static readonly StyledProperty<bool> IsIconVisibleProperty =
         AvaloniaProperty.Register<Button, bool>(nameof(IsIconVisible), true);
 
     internal static readonly StyledProperty<object?> RightExtraContentProperty =
         AvaloniaProperty.Register<Button, object?>(nameof(RightExtraContent));
-    
+
     internal static readonly StyledProperty<IDataTemplate?> RightExtraContentTemplateProperty =
         AvaloniaProperty.Register<ContentControl, IDataTemplate?>(nameof(RightExtraContentTemplate));
 
     internal static readonly StyledProperty<Thickness> EffectiveBorderThicknessProperty =
         AvaloniaProperty.Register<Button, Thickness>(
             nameof(EffectiveBorderThickness));
-    
+
     internal BoxShadow DefaultShadow
     {
         get => GetValue(DefaultShadowProperty);
@@ -182,7 +183,7 @@ public class Button : AvaloniaButton,
         get => GetValue(DangerShadowProperty);
         set => SetValue(DangerShadowProperty, value);
     }
-    
+
     internal bool IsIconVisible
     {
         get => GetValue(IsIconVisibleProperty);
@@ -200,22 +201,28 @@ public class Button : AvaloniaButton,
         get => GetValue(RightExtraContentTemplateProperty);
         set => SetValue(RightExtraContentTemplateProperty, value);
     }
-    
+
     public Thickness EffectiveBorderThickness
     {
         get => GetValue(EffectiveBorderThicknessProperty);
         set => SetValue(EffectiveBorderThicknessProperty, value);
     }
-    
+
     Control IMotionAwareControl.PropertyBindTarget => this;
     Control IControlSharedTokenResourcesHost.HostControl => this;
     string IControlSharedTokenResourcesHost.TokenId => ButtonToken.ID;
-    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable => _resourceBindingsDisposable;
+
+    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable
+    {
+        get => _resourceBindingsDisposable;
+        set => _resourceBindingsDisposable = value;
+    }
 
     #endregion
-    
+
     private CompositeDisposable? _resourceBindingsDisposable;
     private Border? _frame;
+    protected bool _themeConfigured;
 
     static Button()
     {
@@ -231,11 +238,12 @@ public class Button : AvaloniaButton,
     {
         this.RegisterResources();
         this.BindWaveSpiritProperties();
+        _resourceBindingsDisposable = new CompositeDisposable();
     }
 
     protected override Size MeasureOverride(Size availableSize)
     {
-        var size         = base.MeasureOverride(availableSize); 
+        var size         = base.MeasureOverride(availableSize);
         var targetWidth  = size.Width;
         var targetHeight = size.Height;
 
@@ -251,15 +259,8 @@ public class Button : AvaloniaButton,
             CornerRadius = new CornerRadius(targetHeight);
             targetWidth  = Math.Max(targetWidth, targetHeight + targetHeight / 2);
         }
-      
-        return new Size(targetWidth, targetHeight);
-    }
 
-    protected override void OnAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e)
-    {
-        _resourceBindingsDisposable = new CompositeDisposable();
-        SetupControlThemeBindings();
-        base.OnAttachedToLogicalTree(e);
+        return new Size(targetWidth, targetHeight);
     }
 
     private void SetupShadows()
@@ -312,12 +313,6 @@ public class Button : AvaloniaButton,
         }
     }
 
-    protected override void OnDetachedFromLogicalTree(LogicalTreeAttachmentEventArgs e)
-    {
-        base.OnDetachedFromLogicalTree(e);
-        this.DisposeTokenBindings();
-    }
-
     protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs e)
     {
         base.OnPropertyChanged(e);
@@ -372,10 +367,10 @@ public class Button : AvaloniaButton,
         }
 
         if (this.IsAttachedToVisualTree())
-        { 
+        {
             if (e.Property == IsDangerProperty ||
-              e.Property == IsGhostProperty ||
-              e.Property == ButtonTypeProperty)
+                e.Property == IsGhostProperty ||
+                e.Property == ButtonTypeProperty)
             {
                 SetupShadows();
             }
@@ -395,27 +390,26 @@ public class Button : AvaloniaButton,
         }
     }
 
-    protected virtual void SetupControlThemeBindings()
+    protected virtual void SetupControlThemeBindings(bool force = false)
     {
-        if (ButtonType == ButtonType.Default)
+        if (!_themeConfigured || force)
         {
-            this.AddResourceBindingDisposable(
-                TokenResourceBinder.CreateTokenBinding(this, ThemeProperty, DefaultButtonTheme.ID));
-        }
-        else if (ButtonType == ButtonType.Primary)
-        {
-            this.AddResourceBindingDisposable(
-                TokenResourceBinder.CreateTokenBinding(this, ThemeProperty, PrimaryButtonTheme.ID));
-        }
-        else if (ButtonType == ButtonType.Text)
-        {
-            this.AddResourceBindingDisposable(
-                TokenResourceBinder.CreateTokenBinding(this, ThemeProperty, TextButtonTheme.ID));
-        }
-        else if (ButtonType == ButtonType.Link)
-        {
-            this.AddResourceBindingDisposable(
-                TokenResourceBinder.CreateTokenBinding(this, ThemeProperty, LinkButtonTheme.ID));
+            if (ButtonType == ButtonType.Default)
+            {
+                TokenResourceBinder.CreateTokenBinding(this, ThemeProperty, DefaultButtonTheme.ID);
+            }
+            else if (ButtonType == ButtonType.Primary)
+            {
+                TokenResourceBinder.CreateTokenBinding(this, ThemeProperty, PrimaryButtonTheme.ID);
+            }
+            else if (ButtonType == ButtonType.Text)
+            {
+                TokenResourceBinder.CreateTokenBinding(this, ThemeProperty, TextButtonTheme.ID);
+            }
+            else if (ButtonType == ButtonType.Link)
+            {
+                TokenResourceBinder.CreateTokenBinding(this, ThemeProperty, LinkButtonTheme.ID);
+            }
         }
     }
 
@@ -428,7 +422,7 @@ public class Button : AvaloniaButton,
                 _frame.Transitions = new Transitions();
                 _frame.Transitions.Add(TransitionUtils.CreateTransition<SolidColorBrushTransition>(BackgroundProperty));
             }
-            
+
             if (Transitions is null)
             {
                 var transitions = new Transitions();
@@ -438,7 +432,8 @@ public class Button : AvaloniaButton,
                     {
                         transitions.Add(
                             TransitionUtils.CreateTransition<SolidColorBrushTransition>(BorderBrushProperty));
-                        transitions.Add(TransitionUtils.CreateTransition<SolidColorBrushTransition>(ForegroundProperty));
+                        transitions.Add(
+                            TransitionUtils.CreateTransition<SolidColorBrushTransition>(ForegroundProperty));
                     }
                 }
                 else if (ButtonType == ButtonType.Default)
@@ -474,9 +469,16 @@ public class Button : AvaloniaButton,
         ConfigureTransitions();
     }
 
+    protected override void OnAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e)
+    {
+        base.OnAttachedToLogicalTree(e);
+        SetupControlThemeBindings();
+    }
+
     protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
     {
         base.OnAttachedToVisualTree(e);
+        _resourceBindingsDisposable = new CompositeDisposable();
         this.AddResourceBindingDisposable(TokenResourceBinder.CreateTokenBinding(this, BorderThicknessProperty,
             SharedTokenKey.BorderThickness,
             BindingPriority.Template,
@@ -486,6 +488,12 @@ public class Button : AvaloniaButton,
         UpdatePseudoClasses();
     }
 
+    protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
+    {
+        base.OnDetachedFromVisualTree(e);
+        this.DisposeTokenBindings();
+    }
+
     private void SetupEffectiveBorderThickness()
     {
         if (ButtonType == ButtonType.Default)
@@ -511,7 +519,8 @@ public class Button : AvaloniaButton,
 
     public Rect WaveGeometry()
     {
-        return new Rect(0, 0, Bounds.Width, Bounds.Height);
+        Debug.Assert(_frame != null);
+        return _frame.Bounds;
     }
 
     public CornerRadius WaveBorderRadius()
diff --git a/src/AtomUI.Controls/Buttons/DropdownButton.cs b/src/AtomUI.Controls/Buttons/DropdownButton.cs
index b306d469e..317f80e8d 100644
--- a/src/AtomUI.Controls/Buttons/DropdownButton.cs
+++ b/src/AtomUI.Controls/Buttons/DropdownButton.cs
@@ -147,27 +147,26 @@ public class DropdownButton : Button
         _flyoutStateHelper.ClickHideFlyoutPredicate = ClickHideFlyoutPredicate;
     }
     
-    protected override void SetupControlThemeBindings()
+    protected override void SetupControlThemeBindings(bool force = false)
     {
-        if (ButtonType == ButtonType.Default)
+        if (!_themeConfigured || force)
         {
-            this.AddResourceBindingDisposable(
-                TokenResourceBinder.CreateTokenBinding(this, ThemeProperty, DefaultDropdownButtonTheme.ID));
-        }
-        else if (ButtonType == ButtonType.Primary)
-        {
-            this.AddResourceBindingDisposable(
-                TokenResourceBinder.CreateTokenBinding(this, ThemeProperty, PrimaryDropdownButtonTheme.ID));
-        }
-        else if (ButtonType == ButtonType.Text)
-        {
-            this.AddResourceBindingDisposable(
-                TokenResourceBinder.CreateTokenBinding(this, ThemeProperty, TextDropdownButtonTheme.ID));
-        }
-        else if (ButtonType == ButtonType.Link)
-        {
-            this.AddResourceBindingDisposable(
-                TokenResourceBinder.CreateTokenBinding(this, ThemeProperty, LinkDropdownButtonTheme.ID));
+            if (ButtonType == ButtonType.Default)
+            {
+                TokenResourceBinder.CreateTokenBinding(this, ThemeProperty, DefaultDropdownButtonTheme.ID);
+            }
+            else if (ButtonType == ButtonType.Primary)
+            {
+                TokenResourceBinder.CreateTokenBinding(this, ThemeProperty, PrimaryDropdownButtonTheme.ID);
+            }
+            else if (ButtonType == ButtonType.Text)
+            {
+                TokenResourceBinder.CreateTokenBinding(this, ThemeProperty, TextDropdownButtonTheme.ID);
+            }
+            else if (ButtonType == ButtonType.Link)
+            {
+                TokenResourceBinder.CreateTokenBinding(this, ThemeProperty, LinkDropdownButtonTheme.ID);
+            }
         }
     }
 
diff --git a/src/AtomUI.Controls/Buttons/SplitButton.cs b/src/AtomUI.Controls/Buttons/SplitButton.cs
index c2cc59d29..ca84441b0 100644
--- a/src/AtomUI.Controls/Buttons/SplitButton.cs
+++ b/src/AtomUI.Controls/Buttons/SplitButton.cs
@@ -265,7 +265,11 @@ public class SplitButton : ContentControl,
     Control IMotionAwareControl.PropertyBindTarget => this;
     Control IControlSharedTokenResourcesHost.HostControl => this;
     string IControlSharedTokenResourcesHost.TokenId => ButtonToken.ID;
-    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable => _resourceBindingsDisposable;
+    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable  
+    {
+        get => _resourceBindingsDisposable;
+        set => _resourceBindingsDisposable = value;
+    }
     
     #endregion
 
diff --git a/src/AtomUI.Controls/Buttons/Themes/Button/BaseButtonTheme.axaml b/src/AtomUI.Controls/Buttons/Themes/Button/BaseButtonTheme.axaml
index bf0b40d53..d345c0145 100644
--- a/src/AtomUI.Controls/Buttons/Themes/Button/BaseButtonTheme.axaml
+++ b/src/AtomUI.Controls/Buttons/Themes/Button/BaseButtonTheme.axaml
@@ -29,6 +29,7 @@
                                     Converter="{x:Static atom:BaseButtonTheme.ButtonIconVisibleConverter}">
                                     <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Icon" />
                                     <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="IsIconVisible" />
+                                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="IsLoading" />
                                 </MultiBinding>
                             </atom:IconPresenter.IsVisible>
                         </atom:IconPresenter>
@@ -43,12 +44,15 @@
     </Setter>
 
     <Style Selector="^:is(atom|Button)">
-        <Setter Property="HorizontalAlignment" Value="Left" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="Cursor" Value="Hand" />
         <Setter Property="DefaultShadow" Value="{DynamicResource {x:Static atom:ButtonTokenKey.DefaultShadow}}" />
         <Setter Property="PrimaryShadow" Value="{DynamicResource {x:Static atom:ButtonTokenKey.PrimaryShadow}}" />
         <Setter Property="DangerShadow" Value="{DynamicResource {x:Static atom:ButtonTokenKey.DangerShadow}}" />
+        <Setter Property="HorizontalAlignment" Value="Left"/>
+        
+        <Style Selector="^/template/ Border#PART_Frame">
+            <Setter Property="Cursor" Value="Hand" />
+            <Setter Property="VerticalAlignment" Value="Top"/>
+        </Style>
 
         <!-- BuildSizeStyle 开始 -->
         <Style Selector="^[SizeType=Large]">
diff --git a/src/AtomUI.Controls/Buttons/Utils/ButtonIconVisibleConverter.cs b/src/AtomUI.Controls/Buttons/Utils/ButtonIconVisibleConverter.cs
index 15986cf1b..0f9a0f550 100644
--- a/src/AtomUI.Controls/Buttons/Utils/ButtonIconVisibleConverter.cs
+++ b/src/AtomUI.Controls/Buttons/Utils/ButtonIconVisibleConverter.cs
@@ -8,12 +8,13 @@ public class ButtonIconVisibleConverter : IMultiValueConverter
 {
     public object? Convert(IList<object?> values, Type targetType, object? parameter, CultureInfo culture)
     {
-        if (values.Count != 2)
+        if (values.Count != 3)
         {
             return false;
         }
-        var icon = values[0] as Icon;
-        var iconVisible      = values[1] as bool?;
-        return icon != null && iconVisible == true;
+        var icon        = values[0] as Icon;
+        var iconVisible = values[1] as bool?;
+        var isLoading = values[2] as bool?;
+        return icon != null && iconVisible == true && isLoading != true;
     }
 }
\ No newline at end of file
diff --git a/src/AtomUI.Controls/Calendar/BaseCalendarDayButton.cs b/src/AtomUI.Controls/Calendar/BaseCalendarDayButton.cs
index 66b12f432..215d5aee3 100644
--- a/src/AtomUI.Controls/Calendar/BaseCalendarDayButton.cs
+++ b/src/AtomUI.Controls/Calendar/BaseCalendarDayButton.cs
@@ -40,7 +40,11 @@ internal class BaseCalendarDayButton : AvaloniaButton,
         set => SetValue(IsMotionEnabledProperty, value);
     }
     
-    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable => _resourceBindingsDisposable;
+    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable
+    {
+        get => _resourceBindingsDisposable;
+        set => _resourceBindingsDisposable = value;
+    }
     private CompositeDisposable? _resourceBindingsDisposable;
 
     /// <summary>
diff --git a/src/AtomUI.Controls/Calendar/Calendar.cs b/src/AtomUI.Controls/Calendar/Calendar.cs
index 106d35009..14557b015 100644
--- a/src/AtomUI.Controls/Calendar/Calendar.cs
+++ b/src/AtomUI.Controls/Calendar/Calendar.cs
@@ -593,7 +593,11 @@ public class Calendar : TemplatedControl,
     Control IMotionAwareControl.PropertyBindTarget => this;
     Control IControlSharedTokenResourcesHost.HostControl => this;
     string IControlSharedTokenResourcesHost.TokenId => CalendarToken.ID;
-    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable => _resourceBindingsDisposable;
+    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable 
+    {
+        get => _resourceBindingsDisposable;
+        set => _resourceBindingsDisposable = value;
+    }
 
     #endregion
     
diff --git a/src/AtomUI.Controls/Calendar/CalendarItem.cs b/src/AtomUI.Controls/Calendar/CalendarItem.cs
index 86f92b3ba..b9946aa65 100644
--- a/src/AtomUI.Controls/Calendar/CalendarItem.cs
+++ b/src/AtomUI.Controls/Calendar/CalendarItem.cs
@@ -241,7 +241,11 @@ internal class CalendarItem : TemplatedControl,
         }
     }
 
-    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable => _resourceBindingsDisposable;
+    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable
+    {
+        get => _resourceBindingsDisposable;
+        set => _resourceBindingsDisposable = value;
+    }
     #endregion
     
     private CompositeDisposable? _resourceBindingsDisposable;
diff --git a/src/AtomUI.Controls/CheckBox/CheckBoxIndicator.cs b/src/AtomUI.Controls/CheckBox/CheckBoxIndicator.cs
index eb483e04f..f5b927dc6 100644
--- a/src/AtomUI.Controls/CheckBox/CheckBoxIndicator.cs
+++ b/src/AtomUI.Controls/CheckBox/CheckBoxIndicator.cs
@@ -134,7 +134,11 @@ internal class CheckBoxIndicator : Control,
         set => SetValue(IsWaveSpiritEnabledProperty, value);
     }
     
-    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable => _resourceBindingsDisposable;
+    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable
+    {
+        get => _resourceBindingsDisposable;
+        set => _resourceBindingsDisposable = value;
+    }
 
     #endregion
 
diff --git a/src/AtomUI.Controls/Collapse/Collapse.cs b/src/AtomUI.Controls/Collapse/Collapse.cs
index 1b09bb833..12194043a 100644
--- a/src/AtomUI.Controls/Collapse/Collapse.cs
+++ b/src/AtomUI.Controls/Collapse/Collapse.cs
@@ -127,7 +127,11 @@ public class Collapse : SelectingItemsControl,
     Control IMotionAwareControl.PropertyBindTarget => this;
     Control IControlSharedTokenResourcesHost.HostControl => this;
     string IControlSharedTokenResourcesHost.TokenId => CollapseToken.ID;
-    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable => _resourceBindingsDisposable;
+    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable
+    {
+        get => _resourceBindingsDisposable;
+        set => _resourceBindingsDisposable = value;
+    }
 
     #endregion
     
diff --git a/src/AtomUI.Controls/DatePicker/CalendarView/CalendarDayButton.cs b/src/AtomUI.Controls/DatePicker/CalendarView/CalendarDayButton.cs
index 76856a76b..2024e93e1 100644
--- a/src/AtomUI.Controls/DatePicker/CalendarView/CalendarDayButton.cs
+++ b/src/AtomUI.Controls/DatePicker/CalendarView/CalendarDayButton.cs
@@ -40,7 +40,12 @@ internal sealed class CalendarDayButton : AvaloniaButton,
         set => SetValue(IsMotionEnabledProperty, value);
     }
     
-    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable => _resourceBindingsDisposable;
+    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable 
+    {
+        get => _resourceBindingsDisposable;
+        set => _resourceBindingsDisposable = value;
+    }
+    
     private CompositeDisposable? _resourceBindingsDisposable;
     
     /// <summary>
diff --git a/src/AtomUI.Controls/DatePicker/CalendarView/CalendarItem.cs b/src/AtomUI.Controls/DatePicker/CalendarView/CalendarItem.cs
index 05d2753c5..1f5cc7197 100644
--- a/src/AtomUI.Controls/DatePicker/CalendarView/CalendarItem.cs
+++ b/src/AtomUI.Controls/DatePicker/CalendarView/CalendarItem.cs
@@ -205,8 +205,12 @@ internal class CalendarItem : TemplatedControl,
             }
         }
     }
-    
-    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable => _resourceBindingsDisposable;
+
+    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable
+    {
+        get => _resourceBindingsDisposable;
+        set => _resourceBindingsDisposable = value;
+    }
 
     #endregion
 
diff --git a/src/AtomUI.Controls/DatePicker/DatePickerPresenter.cs b/src/AtomUI.Controls/DatePicker/DatePickerPresenter.cs
index 4c0bf3130..1678d9366 100644
--- a/src/AtomUI.Controls/DatePicker/DatePickerPresenter.cs
+++ b/src/AtomUI.Controls/DatePicker/DatePickerPresenter.cs
@@ -110,7 +110,11 @@ internal class DatePickerPresenter : PickerPresenterBase,
         set => SetValue(TempSelectedTimeProperty, value);
     }
 
-    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable => _resourceBindingsDisposable;
+    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable
+    {
+        get => _resourceBindingsDisposable;
+        set => _resourceBindingsDisposable = value;
+    }
 
     #endregion
 
diff --git a/src/AtomUI.Controls/Drawer/Drawer.cs b/src/AtomUI.Controls/Drawer/Drawer.cs
index c8d56221d..885e62a0b 100644
--- a/src/AtomUI.Controls/Drawer/Drawer.cs
+++ b/src/AtomUI.Controls/Drawer/Drawer.cs
@@ -193,7 +193,11 @@ public class Drawer : Control,
     Control IMotionAwareControl.PropertyBindTarget => this;
     Control IControlSharedTokenResourcesHost.HostControl => this;
     string IControlSharedTokenResourcesHost.TokenId => DrawerToken.ID;
-    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable => _resourceBindingsDisposable;
+    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable
+    {
+        get => _resourceBindingsDisposable;
+        set => _resourceBindingsDisposable = value;
+    }
 
     #endregion
 
diff --git a/src/AtomUI.Controls/Expander/Expander.cs b/src/AtomUI.Controls/Expander/Expander.cs
index 5083b8917..b9a3c9c0a 100644
--- a/src/AtomUI.Controls/Expander/Expander.cs
+++ b/src/AtomUI.Controls/Expander/Expander.cs
@@ -181,7 +181,11 @@ public class Expander : AvaloniaExpander,
     Control IMotionAwareControl.PropertyBindTarget => this;
     Control IControlSharedTokenResourcesHost.HostControl => this;
     string IControlSharedTokenResourcesHost.TokenId => ExpanderToken.ID;
-    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable => _resourceBindingsDisposable;
+    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable
+    {
+        get => _resourceBindingsDisposable;
+        set => _resourceBindingsDisposable = value;
+    }
     
     #endregion
     
diff --git a/src/AtomUI.Controls/Flyouts/FlyoutHost.cs b/src/AtomUI.Controls/Flyouts/FlyoutHost.cs
index 48ed9412e..b35ceb7af 100644
--- a/src/AtomUI.Controls/Flyouts/FlyoutHost.cs
+++ b/src/AtomUI.Controls/Flyouts/FlyoutHost.cs
@@ -188,7 +188,11 @@ public class FlyoutHost : Control,
     #region 内部属性定义
 
     Control IMotionAwareControl.PropertyBindTarget => this;
-    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable => _resourceBindingsDisposable;
+    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable
+    {
+        get => _resourceBindingsDisposable;
+        set => _resourceBindingsDisposable = value;
+    }
 
     #endregion
 
diff --git a/src/AtomUI.Controls/Flyouts/MenuFlyoutPresenter.cs b/src/AtomUI.Controls/Flyouts/MenuFlyoutPresenter.cs
index b9cd46848..22617b196 100644
--- a/src/AtomUI.Controls/Flyouts/MenuFlyoutPresenter.cs
+++ b/src/AtomUI.Controls/Flyouts/MenuFlyoutPresenter.cs
@@ -72,7 +72,12 @@ public class MenuFlyoutPresenter : MenuBase,
     Control IMotionAwareControl.PropertyBindTarget => this;
     Control IControlSharedTokenResourcesHost.HostControl => this;
     string IControlSharedTokenResourcesHost.TokenId => MenuToken.ID;
-    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable => _resourceBindingsDisposable;
+
+    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable
+    {
+        get => _resourceBindingsDisposable;
+        set => _resourceBindingsDisposable = value;
+    }
 
     #endregion
 
diff --git a/src/AtomUI.Controls/GroupBox/GroupBox.cs b/src/AtomUI.Controls/GroupBox/GroupBox.cs
index 31383d660..223c97eb9 100644
--- a/src/AtomUI.Controls/GroupBox/GroupBox.cs
+++ b/src/AtomUI.Controls/GroupBox/GroupBox.cs
@@ -97,7 +97,11 @@ public class GroupBox : ContentControl,
 
     Control IControlSharedTokenResourcesHost.HostControl => this;
     string IControlSharedTokenResourcesHost.TokenId => GroupBoxToken.ID;
-    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable => _resourceBindingsDisposable;
+    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable 
+    {
+        get => _resourceBindingsDisposable;
+        set => _resourceBindingsDisposable = value;
+    }
     
     #endregion
 
diff --git a/src/AtomUI.Controls/Input/TextBox.cs b/src/AtomUI.Controls/Input/TextBox.cs
index 8a7215466..d0b8520cc 100644
--- a/src/AtomUI.Controls/Input/TextBox.cs
+++ b/src/AtomUI.Controls/Input/TextBox.cs
@@ -94,7 +94,11 @@ public class TextBox : AvaloniaTextBox,
 
     Control IControlSharedTokenResourcesHost.HostControl => this;
     string IControlSharedTokenResourcesHost.TokenId => LineEditToken.ID;
-    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable => _resourceBindingsDisposable;
+    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable
+    {
+        get => _resourceBindingsDisposable;
+        set => _resourceBindingsDisposable = value;
+    }
 
     #endregion
 
diff --git a/src/AtomUI.Controls/ListBox/ListBox.cs b/src/AtomUI.Controls/ListBox/ListBox.cs
index e97ec3a84..cb3e7291f 100644
--- a/src/AtomUI.Controls/ListBox/ListBox.cs
+++ b/src/AtomUI.Controls/ListBox/ListBox.cs
@@ -53,7 +53,12 @@ public class ListBox : AvaloniaListBox,
     Control IMotionAwareControl.PropertyBindTarget => this;
     Control IControlSharedTokenResourcesHost.HostControl => this;
     string IControlSharedTokenResourcesHost.TokenId => ListBoxToken.ID;
-    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable => _resourceBindingsDisposable;
+
+    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable
+    {
+        get => _resourceBindingsDisposable;
+        set => _resourceBindingsDisposable = value;
+    }
     
     #endregion
     
diff --git a/src/AtomUI.Controls/Menu/Menu.cs b/src/AtomUI.Controls/Menu/Menu.cs
index 68256f474..5eadfa50c 100644
--- a/src/AtomUI.Controls/Menu/Menu.cs
+++ b/src/AtomUI.Controls/Menu/Menu.cs
@@ -44,7 +44,11 @@ public class Menu : AvaloniaMenu,
     Control IMotionAwareControl.PropertyBindTarget => this;
     Control IControlSharedTokenResourcesHost.HostControl => this;
     string IControlSharedTokenResourcesHost.TokenId => MenuToken.ID;
-    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable => _resourceBindingsDisposable;
+    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable
+    {
+        get => _resourceBindingsDisposable;
+        set => _resourceBindingsDisposable = value;
+    }
 
     #endregion
 
diff --git a/src/AtomUI.Controls/Menu/MenuSeparator.cs b/src/AtomUI.Controls/Menu/MenuSeparator.cs
index 3cc12e537..fbff848f2 100644
--- a/src/AtomUI.Controls/Menu/MenuSeparator.cs
+++ b/src/AtomUI.Controls/Menu/MenuSeparator.cs
@@ -32,7 +32,11 @@ public class MenuSeparator : AvaloniaSeparator,
     
     Control IControlSharedTokenResourcesHost.HostControl => this;
     string IControlSharedTokenResourcesHost.TokenId => MenuToken.ID;
-    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable => _resourceBindingsDisposable;
+    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable
+    {
+        get => _resourceBindingsDisposable;
+        set => _resourceBindingsDisposable = value;
+    }
     
     #endregion
     
diff --git a/src/AtomUI.Controls/NavMenu/NavMenu.cs b/src/AtomUI.Controls/NavMenu/NavMenu.cs
index ffdbae0f3..e922146d9 100644
--- a/src/AtomUI.Controls/NavMenu/NavMenu.cs
+++ b/src/AtomUI.Controls/NavMenu/NavMenu.cs
@@ -127,7 +127,11 @@ public class NavMenu : NavMenuBase,
     private CompositeDisposable? _resourceBindingsDisposable;
     private ItemsPresenter? _menuItemsPresenter;
 
-    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable => _resourceBindingsDisposable;
+    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable
+    {
+        get => _resourceBindingsDisposable;
+        set => _resourceBindingsDisposable = value;
+    }
 
     public NavMenu()
     {
diff --git a/src/AtomUI.Controls/Notifications/NotificationProgressBar.cs b/src/AtomUI.Controls/Notifications/NotificationProgressBar.cs
index 2e9b8a08d..02c6a5c9a 100644
--- a/src/AtomUI.Controls/Notifications/NotificationProgressBar.cs
+++ b/src/AtomUI.Controls/Notifications/NotificationProgressBar.cs
@@ -54,7 +54,11 @@ internal class NotificationProgressBar : Control,
 
     #region 内部属性定义
 
-    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable => _resourceBindingsDisposable;
+    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable
+    {
+        get => _resourceBindingsDisposable;
+        set => _resourceBindingsDisposable = value;
+    }
 
     #endregion
 
diff --git a/src/AtomUI.Controls/Pagination/AbstractPagination.cs b/src/AtomUI.Controls/Pagination/AbstractPagination.cs
index b88ecb1f8..e812f2444 100644
--- a/src/AtomUI.Controls/Pagination/AbstractPagination.cs
+++ b/src/AtomUI.Controls/Pagination/AbstractPagination.cs
@@ -99,7 +99,12 @@ public abstract class AbstractPagination : TemplatedControl,
     
     #region 内部属性定义
     Control IMotionAwareControl.PropertyBindTarget => this;
-    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable => _resourceBindingsDisposable;
+
+    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable
+    {
+        get => _resourceBindingsDisposable;
+        set => _resourceBindingsDisposable = value;
+    }
     private CompositeDisposable? _resourceBindingsDisposable;
     #endregion
     
diff --git a/src/AtomUI.Controls/Pagination/PageSizeComboBoxItem.cs b/src/AtomUI.Controls/Pagination/PageSizeComboBoxItem.cs
index 769a4392e..a2656f7ef 100644
--- a/src/AtomUI.Controls/Pagination/PageSizeComboBoxItem.cs
+++ b/src/AtomUI.Controls/Pagination/PageSizeComboBoxItem.cs
@@ -11,7 +11,11 @@ internal class PageSizeComboBoxItem : ComboBoxItem,
     public int PageSize { get; set; }
     
     private CompositeDisposable? _resourceBindingsDisposable;
-    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable => _resourceBindingsDisposable;
+    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable
+    {
+        get => _resourceBindingsDisposable;
+        set => _resourceBindingsDisposable = value;
+    }
 
     protected override void OnAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e)
     {
diff --git a/src/AtomUI.Controls/Pagination/PaginationNav.cs b/src/AtomUI.Controls/Pagination/PaginationNav.cs
index ed727f17d..f3dae84b5 100644
--- a/src/AtomUI.Controls/Pagination/PaginationNav.cs
+++ b/src/AtomUI.Controls/Pagination/PaginationNav.cs
@@ -44,7 +44,11 @@ internal class PaginationNav : SelectingItemsControl,
 
     #region 内部属性
 
-    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable => _resourceBindingsDisposable;
+    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable 
+    {
+        get => _resourceBindingsDisposable;
+        set => _resourceBindingsDisposable = value;
+    }
 
     #endregion
      
@@ -141,7 +145,12 @@ internal class PaginationNav : SelectingItemsControl,
 internal class NavItemsPresenter : ItemsPresenter,
                                    IResourceBindingManager
 {
-    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable => _resourceBindingsDisposable;
+    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable 
+    {
+        get => _resourceBindingsDisposable;
+        set => _resourceBindingsDisposable = value;
+    }
+    
     private CompositeDisposable? _resourceBindingsDisposable;
     
     internal static readonly DirectProperty<NavItemsPresenter, bool> IsEnabledSpacingProperty =
diff --git a/src/AtomUI.Controls/Pagination/PaginationNavItem.cs b/src/AtomUI.Controls/Pagination/PaginationNavItem.cs
index 033795aa1..3d80f5389 100644
--- a/src/AtomUI.Controls/Pagination/PaginationNavItem.cs
+++ b/src/AtomUI.Controls/Pagination/PaginationNavItem.cs
@@ -87,7 +87,11 @@ internal class PaginationNavItem : ContentControl,
         private set => SetAndRaise(IsPressedProperty, ref _isPressed, value);
     }
 
-    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable => _resourceBindingsDisposable;
+    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable 
+    {
+        get => _resourceBindingsDisposable;
+        set => _resourceBindingsDisposable = value;
+    }
     
     private CompositeDisposable? _resourceBindingsDisposable;
 
diff --git a/src/AtomUI.Controls/Pagination/QuickJumperBar.cs b/src/AtomUI.Controls/Pagination/QuickJumperBar.cs
index fdb5c90e6..ae98506f5 100644
--- a/src/AtomUI.Controls/Pagination/QuickJumperBar.cs
+++ b/src/AtomUI.Controls/Pagination/QuickJumperBar.cs
@@ -57,7 +57,11 @@ internal class QuickJumperBar : TemplatedControl,
         set => SetValue(SizeTypeProperty, value);
     }
     
-    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable => _resourceBindingsDisposable;
+    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable
+    {
+        get => _resourceBindingsDisposable;
+        set => _resourceBindingsDisposable = value;
+    }
     private CompositeDisposable? _resourceBindingsDisposable;
     
     private LineEdit? _lineEdit;
diff --git a/src/AtomUI.Controls/Popup/Popup.cs b/src/AtomUI.Controls/Popup/Popup.cs
index d6e5f9e9a..6ca4a54cc 100644
--- a/src/AtomUI.Controls/Popup/Popup.cs
+++ b/src/AtomUI.Controls/Popup/Popup.cs
@@ -121,7 +121,11 @@ public class Popup : AvaloniaPopup,
 
     Control IMotionAwareControl.PropertyBindTarget => this;
 
-    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable => _resourceBindingsDisposable;
+    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable
+    {
+        get => _resourceBindingsDisposable;
+        set => _resourceBindingsDisposable = value;
+    }
 
     #endregion
 
diff --git a/src/AtomUI.Controls/RadioButton/RadioIndicator.cs b/src/AtomUI.Controls/RadioButton/RadioIndicator.cs
index 84d91b61d..d1e6061f8 100644
--- a/src/AtomUI.Controls/RadioButton/RadioIndicator.cs
+++ b/src/AtomUI.Controls/RadioButton/RadioIndicator.cs
@@ -135,7 +135,11 @@ internal class RadioIndicator : Control,
         set => SetValue(IsWaveAnimationEnabledProperty, value);
     }
 
-    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable => _resourceBindingsDisposable;
+    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable 
+    {
+        get => _resourceBindingsDisposable;
+        set => _resourceBindingsDisposable = value;
+    }
 
     #endregion
 
diff --git a/src/AtomUI.Controls/Slider/SliderTrack.cs b/src/AtomUI.Controls/Slider/SliderTrack.cs
index 2ca457cda..54e73c58f 100644
--- a/src/AtomUI.Controls/Slider/SliderTrack.cs
+++ b/src/AtomUI.Controls/Slider/SliderTrack.cs
@@ -288,8 +288,11 @@ public class SliderTrack : Control,
         set => SetValue(IsMotionEnabledProperty, value);
     }
 
-    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable => _resourceBindingsDisposable;
-
+    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable
+    {
+        get => _resourceBindingsDisposable;
+        set => _resourceBindingsDisposable = value;
+    }
     #endregion
 
     #region 事件定义
diff --git a/src/AtomUI.Controls/Switch/SwitchKnob.cs b/src/AtomUI.Controls/Switch/SwitchKnob.cs
index ef5749315..d5226279a 100644
--- a/src/AtomUI.Controls/Switch/SwitchKnob.cs
+++ b/src/AtomUI.Controls/Switch/SwitchKnob.cs
@@ -118,7 +118,11 @@ internal class SwitchKnob : Control,
         set => SetAndRaise(LoadingBgOpacityTokenProperty, ref _loadingBgOpacity, value);
     }
     
-    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable => _resourceBindingsDisposable;
+    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable 
+    {
+        get => _resourceBindingsDisposable;
+        set => _resourceBindingsDisposable = value;
+    }
     
     #endregion
     
diff --git a/src/AtomUI.Controls/Switch/Themes/ToggleSwitchTheme.axaml b/src/AtomUI.Controls/Switch/Themes/ToggleSwitchTheme.axaml
index 0b0fd22d6..08dc64522 100644
--- a/src/AtomUI.Controls/Switch/Themes/ToggleSwitchTheme.axaml
+++ b/src/AtomUI.Controls/Switch/Themes/ToggleSwitchTheme.axaml
@@ -14,7 +14,7 @@
         </Setter>
         
         <Setter Property="Foreground" Value="{DynamicResource {x:Static atom:SharedTokenKey.ColorTextLightSolid}}"/>
-        <Setter Property="HorizontalAlignment" Value="Left"/>
+   
         <Setter Property="TrackPadding" Value="{DynamicResource {x:Static atom:ToggleSwitchTokenKey.TrackPadding}}"/>
         
         <Style Selector="^[IsLoading=True], ^:disabled">
diff --git a/src/AtomUI.Controls/Switch/ToggleSwitch.cs b/src/AtomUI.Controls/Switch/ToggleSwitch.cs
index 1b24c3046..98115e236 100644
--- a/src/AtomUI.Controls/Switch/ToggleSwitch.cs
+++ b/src/AtomUI.Controls/Switch/ToggleSwitch.cs
@@ -369,7 +369,7 @@ public class ToggleSwitch : ToggleButton,
 
     private void AdjustOffsetOnReleased()
     {
-        CalculateElementsOffset(Bounds.Size);
+        CalculateElementsOffset(DesiredSize);
 
         if (_switchKnob is not null)
         {
@@ -415,7 +415,7 @@ public class ToggleSwitch : ToggleButton,
         {
             if (e.Property == IsCheckedProperty && IsMotionEnabled)
             {
-                CalculateElementsOffset(Bounds.Size);
+                CalculateElementsOffset(DesiredSize);
                 WaveSpiritAdorner.ShowWaveAdorner(this, WaveType.PillWave);
             }
         }
@@ -499,7 +499,7 @@ public class ToggleSwitch : ToggleButton,
     public sealed override void Render(DrawingContext context)
     {
         using var state = context.PushOpacity(SwitchOpacity);
-        context.DrawPilledRect(GrooveBackground, null, new Rect(0, 0, Bounds.Width, Bounds.Height));
+        context.DrawPilledRect(GrooveBackground, null, new Rect(0, 0, DesiredSize.Width, DesiredSize.Height));
     }
 
     public bool HitTest(Point point)
@@ -582,12 +582,12 @@ public class ToggleSwitch : ToggleButton,
 
     private Rect GrooveRect()
     {
-        return new Rect(new Point(0, 0), Bounds.Size);
+        return new Rect(new Point(0, 0), DesiredSize);
     }
 
     private Rect HandleRect()
     {
-        return HandleRect(IsChecked.HasValue && IsChecked.Value, Bounds.Size);
+        return HandleRect(IsChecked.HasValue && IsChecked.Value, DesiredSize);
     }
 
     private Rect HandleRect(bool isChecked, Size controlSize)
diff --git a/src/AtomUI.Controls/TabControl/BaseTabControl.cs b/src/AtomUI.Controls/TabControl/BaseTabControl.cs
index 77b9d1bf0..5041479a0 100644
--- a/src/AtomUI.Controls/TabControl/BaseTabControl.cs
+++ b/src/AtomUI.Controls/TabControl/BaseTabControl.cs
@@ -95,7 +95,11 @@ public class BaseTabControl : AvaloniaTabControl,
     private Point _tabStripBorderStartPoint;
     private Point _tabStripBorderEndPoint;
     private CompositeDisposable? _resourceBindingsDisposable;
-    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable => _resourceBindingsDisposable;
+    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable
+    {
+        get => _resourceBindingsDisposable;
+        set => _resourceBindingsDisposable = value;
+    }
 
     static BaseTabControl()
     {
diff --git a/src/AtomUI.Controls/TabControl/BaseTabScrollViewer.cs b/src/AtomUI.Controls/TabControl/BaseTabScrollViewer.cs
index 672c6abbf..ada663967 100644
--- a/src/AtomUI.Controls/TabControl/BaseTabScrollViewer.cs
+++ b/src/AtomUI.Controls/TabControl/BaseTabScrollViewer.cs
@@ -77,7 +77,11 @@ internal abstract class BaseTabScrollViewer : ScrollViewer,
         set => SetValue(IsMotionEnabledProperty, value);
     }
     
-    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable => _resourceBindingsDisposable;
+    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable
+    {
+        get => _resourceBindingsDisposable;
+        set => _resourceBindingsDisposable = value;
+    }
 
     #endregion
 
diff --git a/src/AtomUI.Controls/TabControl/TabItem.cs b/src/AtomUI.Controls/TabControl/TabItem.cs
index b9da825fa..652212479 100644
--- a/src/AtomUI.Controls/TabControl/TabItem.cs
+++ b/src/AtomUI.Controls/TabControl/TabItem.cs
@@ -86,7 +86,11 @@ public class TabItem : AvaloniaTabItem,
         set => SetValue(IsMotionEnabledProperty, value);
     }
 
-    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable => _resourceBindingsDisposable;
+    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable
+    {
+        get => _resourceBindingsDisposable;
+        set => _resourceBindingsDisposable = value;
+    }
 
     #endregion
 
diff --git a/src/AtomUI.Controls/TabControl/TabStrip/BaseTabStrip.cs b/src/AtomUI.Controls/TabControl/TabStrip/BaseTabStrip.cs
index 399530168..dcd09e0c0 100644
--- a/src/AtomUI.Controls/TabControl/TabStrip/BaseTabStrip.cs
+++ b/src/AtomUI.Controls/TabControl/TabStrip/BaseTabStrip.cs
@@ -69,7 +69,11 @@ public abstract class BaseTabStrip : AvaloniaTabStrip,
     Control IMotionAwareControl.PropertyBindTarget => this;
     Control IControlSharedTokenResourcesHost.HostControl => this;
     string IControlSharedTokenResourcesHost.TokenId => TabControlToken.ID;
-    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable => _resourceBindingsDisposable;
+    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable
+    {
+        get => _resourceBindingsDisposable;
+        set => _resourceBindingsDisposable = value;
+    }
     
     #endregion
 
diff --git a/src/AtomUI.Controls/TabControl/TabStrip/TabStripItem.cs b/src/AtomUI.Controls/TabControl/TabStrip/TabStripItem.cs
index 80b2adc37..b263d72cd 100644
--- a/src/AtomUI.Controls/TabControl/TabStrip/TabStripItem.cs
+++ b/src/AtomUI.Controls/TabControl/TabStrip/TabStripItem.cs
@@ -102,7 +102,11 @@ public class TabStripItem : AvaloniaTabStripItem,
         set => SetValue(IsMotionEnabledProperty, value);
     }
     
-    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable => _resourceBindingsDisposable;
+    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable
+    {
+        get => _resourceBindingsDisposable;
+        set => _resourceBindingsDisposable = value;
+    }
     
     #endregion
     
diff --git a/src/AtomUI.Controls/Tag/Tag.cs b/src/AtomUI.Controls/Tag/Tag.cs
index 5c1cb1601..611ce64f3 100644
--- a/src/AtomUI.Controls/Tag/Tag.cs
+++ b/src/AtomUI.Controls/Tag/Tag.cs
@@ -158,7 +158,11 @@ public class Tag : TemplatedControl,
 
     Control IControlSharedTokenResourcesHost.HostControl => this;
     string IControlSharedTokenResourcesHost.TokenId => TagToken.ID;
-    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable => _resourceBindingsDisposable;
+    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable
+    {
+        get => _resourceBindingsDisposable;
+        set => _resourceBindingsDisposable = value;
+    }
 
     #endregion
 
diff --git a/src/AtomUI.Controls/Tag/Themes/TagTheme.axaml b/src/AtomUI.Controls/Tag/Themes/TagTheme.axaml
index 4cb02afb7..e0a45e137 100644
--- a/src/AtomUI.Controls/Tag/Themes/TagTheme.axaml
+++ b/src/AtomUI.Controls/Tag/Themes/TagTheme.axaml
@@ -5,12 +5,14 @@
     <ControlTheme x:Key="{x:Type atom:Tag}" TargetType="atom:Tag">
         <Setter Property="Template">
             <ControlTemplate>
-                <Panel>
-                    <Border Name="{x:Static atom:TagThemeConstants.FramePart}"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            CornerRadius="{TemplateBinding CornerRadius}"
-                            BorderThickness="{TemplateBinding BorderThickness}" />
+                <Border Name="{x:Static atom:TagThemeConstants.FramePart}"
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        CornerRadius="{TemplateBinding CornerRadius}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Top"
+                        >
                     <Grid Name="{x:Static atom:TagThemeConstants.ElementsLayoutPart}"
                           ColumnDefinitions="Auto, *, Auto"
                           Margin="{TemplateBinding Padding}">
@@ -18,16 +20,16 @@
                                             Grid.Column="0"
                                             Icon="{TemplateBinding Icon}" />
                         <atom:TextBlock Name="{x:Static atom:TagThemeConstants.TagTextLabelPart}"
-                                   Grid.Column="1"
-                                   VerticalAlignment="Center"
-                                   Text="{TemplateBinding TagText}"
-                                   Padding="{TemplateBinding TagTextPaddingInline}" />
+                                        Grid.Column="1"
+                                        VerticalAlignment="Center"
+                                        Text="{TemplateBinding TagText}"
+                                        Padding="{TemplateBinding TagTextPaddingInline}" />
                         <atom:IconButton Name="{x:Static atom:TagThemeConstants.CloseButtonPart}"
                                          Grid.Column="2"
                                          IsVisible="{TemplateBinding IsClosable}"
                                          Icon="{TemplateBinding CloseIcon}" />
                     </Grid>
-                </Panel>
+                </Border>
             </ControlTemplate>
         </Setter>
         <!-- basic 样式开始 -->
diff --git a/src/AtomUI.Controls/TextBlock/TextBlock.cs b/src/AtomUI.Controls/TextBlock/TextBlock.cs
index 2d92a6727..3913fbc0d 100644
--- a/src/AtomUI.Controls/TextBlock/TextBlock.cs
+++ b/src/AtomUI.Controls/TextBlock/TextBlock.cs
@@ -15,7 +15,11 @@ public class TextBlock : AvaloniaTextBlock, IResourceBindingManager
 {
     #region 内部属性定义
 
-    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable => _resourceBindingsDisposable;
+    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable
+    {
+        get => _resourceBindingsDisposable;
+        set => _resourceBindingsDisposable = value;
+    }
     
     #endregion
     
diff --git a/src/AtomUI.Controls/TimePicker/DateTimePickerPanel.cs b/src/AtomUI.Controls/TimePicker/DateTimePickerPanel.cs
index 3653b2699..583c2a8ad 100644
--- a/src/AtomUI.Controls/TimePicker/DateTimePickerPanel.cs
+++ b/src/AtomUI.Controls/TimePicker/DateTimePickerPanel.cs
@@ -116,7 +116,11 @@ internal class DateTimePickerPanel : Panel,
         set => SetValue(IsMotionEnabledProperty, value);
     }
 
-    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable => _resourceBindingsDisposable;
+    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable
+    {
+        get => _resourceBindingsDisposable;
+        set => _resourceBindingsDisposable = value;
+    }
     #endregion
 
     #region 内部事件定义
diff --git a/src/AtomUI.Controls/TimePicker/TimePickerPresenter.cs b/src/AtomUI.Controls/TimePicker/TimePickerPresenter.cs
index 3aec44318..e90079ab0 100644
--- a/src/AtomUI.Controls/TimePicker/TimePickerPresenter.cs
+++ b/src/AtomUI.Controls/TimePicker/TimePickerPresenter.cs
@@ -108,7 +108,11 @@ internal class TimePickerPresenter : PickerPresenterBase,
         set => SetValue(IsMotionEnabledProperty, value);
     }
 
-    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable => _resourceBindingsDisposable;
+    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable
+    {
+        get => _resourceBindingsDisposable;
+        set => _resourceBindingsDisposable = value;
+    }
     
     #endregion
 
diff --git a/src/AtomUI.Controls/TimePicker/TimeView/TimeView.cs b/src/AtomUI.Controls/TimePicker/TimeView/TimeView.cs
index 6aa0419ce..0736c09ae 100644
--- a/src/AtomUI.Controls/TimePicker/TimeView/TimeView.cs
+++ b/src/AtomUI.Controls/TimePicker/TimeView/TimeView.cs
@@ -146,7 +146,11 @@ internal class TimeView : TemplatedControl,
         set => SetValue(IsMotionEnabledProperty, value);
     }
 
-    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable => _resourceBindingsDisposable;
+    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable
+    {
+        get => _resourceBindingsDisposable;
+        set => _resourceBindingsDisposable = value;
+    }
 
     #endregion
 
@@ -232,11 +236,12 @@ internal class TimeView : TemplatedControl,
         var inputManager = AvaloniaLocator.Current.GetService<IInputManager>()!;
         _pointerPositionDisposable = inputManager.Process.Subscribe(DetectPointerPosition);
         SyncTimeValueToPanel(SelectedTime ?? TimeSpan.Zero);
-        this.AddResourceBindingDisposable(TokenResourceBinder.CreateTokenBinding(this, SpacerWidthProperty, SharedTokenKey.LineWidth,
+        this.AddResourceBindingDisposable(TokenResourceBinder.CreateTokenBinding(this, SpacerWidthProperty,
+            SharedTokenKey.LineWidth,
             BindingPriority.Template,
             new RenderScaleAwareDoubleConfigure(this)));
     }
-    
+
     protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
     {
         base.OnDetachedFromVisualTree(e);
diff --git a/src/AtomUI.Controls/Timeline/TimelineIndicator.cs b/src/AtomUI.Controls/Timeline/TimelineIndicator.cs
index 3b9b5cb63..031f450a6 100644
--- a/src/AtomUI.Controls/Timeline/TimelineIndicator.cs
+++ b/src/AtomUI.Controls/Timeline/TimelineIndicator.cs
@@ -168,8 +168,11 @@ internal class TimelineIndicator : Control,
         set => SetAndRaise(NextIsPendingProperty, ref _nextIsPending, value);
     }
 
-    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable => _resourceBindingsDisposable;
-
+    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable 
+    {
+        get => _resourceBindingsDisposable;
+        set => _resourceBindingsDisposable = value;
+    }
     #endregion
 
     private CompositeDisposable? _resourceBindingsDisposable;
diff --git a/src/AtomUI.Controls/TreeView/DragPreviewAdorner.cs b/src/AtomUI.Controls/TreeView/DragPreviewAdorner.cs
index 989d3651c..8bdd000a8 100644
--- a/src/AtomUI.Controls/TreeView/DragPreviewAdorner.cs
+++ b/src/AtomUI.Controls/TreeView/DragPreviewAdorner.cs
@@ -59,7 +59,11 @@ internal class DragPreview : Decorator,
     }
 
     private readonly VisualBrush _visualBrush;
-    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable => _resourceBindingsDisposable;
+    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable
+    {
+        get => _resourceBindingsDisposable;
+        set => _resourceBindingsDisposable = value;
+    }
     private CompositeDisposable? _resourceBindingsDisposable;
 
     public DragPreview(Border previewControl)
diff --git a/src/AtomUI.Controls/TreeView/TreeViewItem.cs b/src/AtomUI.Controls/TreeView/TreeViewItem.cs
index 696a20847..cbb3c1a1e 100644
--- a/src/AtomUI.Controls/TreeView/TreeViewItem.cs
+++ b/src/AtomUI.Controls/TreeView/TreeViewItem.cs
@@ -326,7 +326,11 @@ public class TreeViewItem : AvaloniaTreeItem,
 
     internal TreeView? OwnerTreeView { get; set; }
 
-    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable => _resourceBindingsDisposable;
+    CompositeDisposable? IResourceBindingManager.ResourceBindingsDisposable 
+    {
+        get => _resourceBindingsDisposable;
+        set => _resourceBindingsDisposable = value;
+    }
     private bool _tempAnimationDisabled = false;
     private ITreeViewInteractionHandler? TreeViewInteractionHandler => this.FindLogicalAncestorOfType<TreeView>()?.InteractionHandler;
     
diff --git a/src/AtomUI.Controls/Window/Window.cs b/src/AtomUI.Controls/Window/Window.cs
index ede8b3a5a..c6b0adfd2 100644
--- a/src/AtomUI.Controls/Window/Window.cs
+++ b/src/AtomUI.Controls/Window/Window.cs
@@ -4,4 +4,5 @@ using AvaloniaWindow = Avalonia.Controls.Window;
 
 public class Window : AvaloniaWindow
 {
+    protected override Type StyleKeyOverride { get; } = typeof(Window);
 }
\ No newline at end of file
diff --git a/src/AtomUI.ReactiveUI/AtomUI.ReactiveUI.csproj b/src/AtomUI.ReactiveUI/AtomUI.ReactiveUI.csproj
index 7fdc26d74..09b9c4f14 100644
--- a/src/AtomUI.ReactiveUI/AtomUI.ReactiveUI.csproj
+++ b/src/AtomUI.ReactiveUI/AtomUI.ReactiveUI.csproj
@@ -6,7 +6,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <ProjectReference Include="../AtomUI.Controls/AtomUI.Controls.csproj" />
+        <ProjectReference Include="../AtomUI.Controls/AtomUI.Controls.csproj"/>
+        <PackageReference Include="Avalonia.ReactiveUI"/>
     </ItemGroup>
-    
+
 </Project>
diff --git a/src/AtomUI.Theme/AtomUI.Theme.csproj b/src/AtomUI.Theme/AtomUI.Theme.csproj
index 74d9f95d9..12de968dd 100644
--- a/src/AtomUI.Theme/AtomUI.Theme.csproj
+++ b/src/AtomUI.Theme/AtomUI.Theme.csproj
@@ -30,6 +30,7 @@
 
     <ItemGroup>
         <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics"/>
+        <PackageReference Include="Avalonia.Fonts.Inter"/>
     </ItemGroup>
-    
+
 </Project>
diff --git a/src/AtomUI.Theme/IResourceBindingManager.cs b/src/AtomUI.Theme/IResourceBindingManager.cs
index 233f345ce..bd81902f4 100644
--- a/src/AtomUI.Theme/IResourceBindingManager.cs
+++ b/src/AtomUI.Theme/IResourceBindingManager.cs
@@ -9,7 +9,7 @@ namespace AtomUI.Theme;
 
 public interface IResourceBindingManager
 {
-    CompositeDisposable? ResourceBindingsDisposable { get; }
+    CompositeDisposable? ResourceBindingsDisposable { get; set; }
 }
 
 public static class StyledElementTokenBindingsExtensions
@@ -65,7 +65,7 @@ public static class StyledElementTokenBindingsExtensions
         var consumer = control as IResourceBindingManager;
         Debug.Assert(consumer != null, $"{control.GetType()} is not IResourceBindingManager");
         consumer.ResourceBindingsDisposable?.Dispose();
-        consumer.ResourceBindingsDisposable?.Clear();
+        consumer.ResourceBindingsDisposable = null;
     }
 }
 
diff --git a/src/AtomUI.Theme/ThemeManager.cs b/src/AtomUI.Theme/ThemeManager.cs
index 97fd6ca43..9ed05d9ce 100644
--- a/src/AtomUI.Theme/ThemeManager.cs
+++ b/src/AtomUI.Theme/ThemeManager.cs
@@ -4,7 +4,6 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Platform;
 using Avalonia.Styling;
-using DynamicData;
 
 namespace AtomUI.Theme;
 
@@ -286,7 +285,10 @@ public class ThemeManager : Styles, IThemeManager
     {
         foreach (var provider in _controlThemesProviders)
         {
-            Resources.MergedDictionaries.AddRange(provider.ControlThemes);
+            foreach (var resourceProvider in provider.ControlThemes)
+            {
+                Resources.MergedDictionaries.Add(resourceProvider);
+            }
         }
         _controlThemesProviders.Clear();
         BuildLanguageResources();