diff --git a/src/AtomUI.Controls/Expander/Expander.cs b/src/AtomUI.Controls/Expander/Expander.cs
index add49ee38..278a3439d 100644
--- a/src/AtomUI.Controls/Expander/Expander.cs
+++ b/src/AtomUI.Controls/Expander/Expander.cs
@@ -278,6 +278,14 @@ public class Expander : AvaloniaExpander,
             }
         }
 
+        if (this.IsAttachedToVisualTree())
+        {
+            if (change.Property == IsBorderlessProperty)
+            {
+                SetupEffectiveBorderThickness();
+            }
+        }
+
         if (change.Property == ExpandIconProperty)
         {
             if (change.OldValue is Icon oldIcon)
@@ -290,16 +298,7 @@ public class Expander : AvaloniaExpander,
                 newIcon.SetTemplatedParent(this);
             }
         }
-
-        if (this.IsAttachedToVisualTree())
-        {
-            if (change.Property == IsBorderlessProperty)
-            {
-                SetupEffectiveBorderThickness();
-            }
-        }
-
-        if (change.Property == IsExpandedProperty)
+        else if (change.Property == IsExpandedProperty)
         {
             HandleExpandedChanged();
         }
@@ -310,6 +309,18 @@ public class Expander : AvaloniaExpander,
         {
             SetupExpanderBorderThickness();
         }
+        else if (change.Property == AddOnContentProperty)
+        {
+            if (change.OldValue is Control oldControl)
+            {
+                oldControl.SetTemplatedParent(null);
+            }
+
+            if (change.NewValue is Control newControl)
+            {
+                newControl.SetTemplatedParent(this);
+            }
+        }
     }
 
     private void SetupDefaultIcon()
diff --git a/src/AtomUI.Controls/TabControl/TabStrip/BaseTabStripItemTheme.cs b/src/AtomUI.Controls/TabControl/TabStrip/BaseTabStripItemTheme.cs
index b39a6a884..516b77ce3 100644
--- a/src/AtomUI.Controls/TabControl/TabStrip/BaseTabStripItemTheme.cs
+++ b/src/AtomUI.Controls/TabControl/TabStrip/BaseTabStripItemTheme.cs
@@ -1,6 +1,5 @@
 using AtomUI.IconPkg;
 using AtomUI.Theme;
-using AtomUI.Theme.Data;
 using AtomUI.Theme.Styling;
 using Avalonia;
 using Avalonia.Controls;
diff --git a/src/AtomUI.Controls/TabControl/TabStrip/CardTabStrip.cs b/src/AtomUI.Controls/TabControl/TabStrip/CardTabStrip.cs
index 7604099f0..ad9e03963 100644
--- a/src/AtomUI.Controls/TabControl/TabStrip/CardTabStrip.cs
+++ b/src/AtomUI.Controls/TabControl/TabStrip/CardTabStrip.cs
@@ -3,7 +3,6 @@ using AtomUI.Data;
 using AtomUI.Theme;
 using AtomUI.Theme.Data;
 using AtomUI.Theme.Styling;
-using AtomUI.Utils;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Presenters;
diff --git a/src/AtomUI.Controls/TabControl/TabStrip/CardTabStripTheme.cs b/src/AtomUI.Controls/TabControl/TabStrip/CardTabStripTheme.cs
index 3c20914e2..4fdcd6bb1 100644
--- a/src/AtomUI.Controls/TabControl/TabStrip/CardTabStripTheme.cs
+++ b/src/AtomUI.Controls/TabControl/TabStrip/CardTabStripTheme.cs
@@ -1,7 +1,4 @@
-using AtomUI.IconPkg;
-using AtomUI.IconPkg.AntDesign;
-using AtomUI.Theme;
-using AtomUI.Theme.Data;
+using AtomUI.IconPkg.AntDesign;
 using AtomUI.Theme.Styling;
 using Avalonia;
 using Avalonia.Controls;
diff --git a/src/AtomUI.Controls/TabControl/TabStrip/TabStripTheme.cs b/src/AtomUI.Controls/TabControl/TabStrip/TabStripTheme.cs
index 6e18ea3c8..e3b992248 100644
--- a/src/AtomUI.Controls/TabControl/TabStrip/TabStripTheme.cs
+++ b/src/AtomUI.Controls/TabControl/TabStrip/TabStripTheme.cs
@@ -1,7 +1,4 @@
-using AtomUI.Theme;
-using AtomUI.Theme.Data;
-using AtomUI.Theme.Styling;
-using AtomUI.Utils;
+using AtomUI.Theme.Styling;
 using Avalonia.Controls;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Templates;