diff --git a/SukiUI.Demo/Features/ControlsLibrary/MiscView.axaml b/SukiUI.Demo/Features/ControlsLibrary/MiscView.axaml
index 5249476fb..ed7d19890 100644
--- a/SukiUI.Demo/Features/ControlsLibrary/MiscView.axaml
+++ b/SukiUI.Demo/Features/ControlsLibrary/MiscView.axaml
@@ -1,11 +1,11 @@
 <UserControl x:Class="SukiUI.Demo.Features.ControlsLibrary.MiscView"
              xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:suki="https://github.com/kikipoulet/SukiUI"
              xmlns:controlsLibrary="clr-namespace:SukiUI.Demo.Features.ControlsLibrary"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:showMeTheXaml="clr-namespace:ShowMeTheXaml;assembly=ShowMeTheXaml.Avalonia"
+             xmlns:suki="https://github.com/kikipoulet/SukiUI"
              d:DesignHeight="450"
              d:DesignWidth="800"
              x:DataType="controlsLibrary:MiscViewModel"
@@ -50,7 +50,7 @@
                 </suki:GlassCard>
                 <suki:GlassCard>
                     <suki:GroupBox Header="Time Picker">
-                      <!--  <TimePicker /> -->
+                        <!--  <TimePicker /> -->
                     </suki:GroupBox>
                 </suki:GlassCard>
                 <suki:GlassCard>
@@ -91,26 +91,26 @@
 
                 <suki:GlassCard>
                     <suki:GroupBox Header="File Picker">
-                        <StackPanel Spacing="8">
-                            <Button Margin="5"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Classes="Primary"
-                                    Command="{Binding OpenFileCommand}"
-                                    Content="Open File" />
-                            <Button Margin="5"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Classes="Primary"
-                                    Command="{Binding SaveFileCommand}"
-                                    Content="Save File" />
-                            <Button Margin="5"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Classes="Primary"
-                                    Command="{Binding OpenFolderCommand}"
-                                    Content="Open Folder" />
-                        </StackPanel>
+                        <!-- <StackPanel Spacing="8"> -->
+                        <!--  <Button Margin="5"  -->
+                        <!--  HorizontalAlignment="Center"  -->
+                        <!--  VerticalAlignment="Center"  -->
+                        <!--  Classes="Primary"  -->
+                        <!--  Command="{Binding OpenFileCommand}"  -->
+                        <!--  Content="Open File" />  -->
+                        <!--  <Button Margin="5"  -->
+                        <!--  HorizontalAlignment="Center"  -->
+                        <!--  VerticalAlignment="Center"  -->
+                        <!--  Classes="Primary"  -->
+                        <!--  Command="{Binding SaveFileCommand}"  -->
+                        <!--  Content="Save File" />  -->
+                        <!--  <Button Margin="5"  -->
+                        <!--  HorizontalAlignment="Center"  -->
+                        <!--  VerticalAlignment="Center"  -->
+                        <!--  Classes="Primary"  -->
+                        <!--  Command="{Binding OpenFolderCommand}"  -->
+                        <!--  Content="Open Folder" />  -->
+                        <!-- </StackPanel> -->
                     </suki:GroupBox>
                 </suki:GlassCard>
             </WrapPanel>
diff --git a/SukiUI.Demo/Features/Playground/PlaygroundView.axaml b/SukiUI.Demo/Features/Playground/PlaygroundView.axaml
index 43f1e7d66..0b5d76674 100644
--- a/SukiUI.Demo/Features/Playground/PlaygroundView.axaml
+++ b/SukiUI.Demo/Features/Playground/PlaygroundView.axaml
@@ -3,11 +3,11 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
              xmlns:avaloniaEdit="https://github.com/avaloniaui/avaloniaedit"
-             xmlns:suki="https://github.com/kikipoulet/SukiUI"
              xmlns:converters="clr-namespace:SukiUI.Demo.Converters"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:playground="clr-namespace:SukiUI.Demo.Features.Playground"
+             xmlns:suki="https://github.com/kikipoulet/SukiUI"
              d:DesignHeight="450"
              d:DesignWidth="800"
              x:DataType="playground:PlaygroundViewModel"
@@ -32,6 +32,7 @@
                                     VerticalAlignment="Top"
                                     Classes="Basic"
                                     Click="ClosePane"
+                                    Command="{Binding TogglePaneDelayCommand}"
                                     DockPanel.Dock="Top"
                                     IsHitTestVisible="True"
                                     Opacity="1">
@@ -170,6 +171,7 @@
                                 VerticalAlignment="Top"
                                 Classes="Basic"
                                 Click="OpenPane"
+                                Command="{Binding TogglePaneDelayCommand}"
                                 IsHitTestVisible="True"
                                 Opacity="1">
                             <StackPanel>
diff --git a/SukiUI.Demo/Features/Playground/PlaygroundViewModel.cs b/SukiUI.Demo/Features/Playground/PlaygroundViewModel.cs
index 937104829..dd41f9da4 100644
--- a/SukiUI.Demo/Features/Playground/PlaygroundViewModel.cs
+++ b/SukiUI.Demo/Features/Playground/PlaygroundViewModel.cs
@@ -1,14 +1,21 @@
 using System;
 using System.Collections.ObjectModel;
+using System.Threading.Tasks;
 using Avalonia.Controls.Notifications;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
 using Material.Icons;
 using SukiUI.Demo.Utilities;
 using SukiUI.Toasts;
 
 namespace SukiUI.Demo.Features.Playground;
 
-internal class PlaygroundViewModel(ISukiToastManager toastManager) : DemoPageBase("Playground", MaterialIconKind.Pencil, -150)
+internal partial class PlaygroundViewModel(ISukiToastManager toastManager) : DemoPageBase("Playground", MaterialIconKind.Pencil, -150)
 {
+    // Delay the toggle pane to handle System.InvalidOperationException: The observable can only be subscribed once.
+    [RelayCommand]
+    private async Task TogglePaneDelay() => await Task.Delay(500);
+    
     public ObservableCollection<string> ButtonsElements { get; init; } =
     [
         XamlData.Buttons["ButtonFlat"],
diff --git a/SukiUI.Demo/Features/Theming/ThemingView.axaml b/SukiUI.Demo/Features/Theming/ThemingView.axaml
index 1ba487558..55bf2c1ba 100644
--- a/SukiUI.Demo/Features/Theming/ThemingView.axaml
+++ b/SukiUI.Demo/Features/Theming/ThemingView.axaml
@@ -3,8 +3,8 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:suki="https://github.com/kikipoulet/SukiUI"
              xmlns:objectModel="clr-namespace:System.Collections.ObjectModel;assembly=System.ObjectModel"
+             xmlns:suki="https://github.com/kikipoulet/SukiUI"
              xmlns:theming="clr-namespace:SukiUI.Demo.Features.Theming"
              d:DesignHeight="450"
              d:DesignWidth="800"
@@ -30,7 +30,7 @@
                                                 Background="#fafafa"
                                                 CornerRadius="{DynamicResource MediumCornerRadius}">
                                             <Grid>
-                                                <TextBlock Margin="42"
+                                                <TextBlock Margin="58,42,42,42"
                                                            HorizontalAlignment="Center"
                                                            VerticalAlignment="Bottom"
                                                            FontWeight="DemiBold"
@@ -49,7 +49,7 @@
                                                 Background="#222222"
                                                 CornerRadius="{DynamicResource MediumCornerRadius}">
                                             <Grid>
-                                                <TextBlock Margin="42"
+                                                <TextBlock Margin="58,42,42,42"
                                                            HorizontalAlignment="Center"
                                                            VerticalAlignment="Bottom"
                                                            FontWeight="DemiBold"
@@ -94,86 +94,84 @@
                         <suki:SettingsLayoutItem Header="Background">
                             <suki:SettingsLayoutItem.Content>
                                 <StackPanel>
-                                <suki:GlassCard Padding="25" Margin="0,25,0,0">
-                                    <StackPanel Spacing="40">
-                                        <DockPanel>
-                                            <ToggleSwitch VerticalAlignment="Top"
-                                                          Classes="Switch"
-                                                          DockPanel.Dock="Right"
-                                                          IsChecked="{Binding BackgroundAnimations}" />
-                                            <StackPanel HorizontalAlignment="Left">
-                                                <TextBlock FontSize="16"
-                                                           FontWeight="DemiBold"
-                                                           Text="Animated Background" />
-                                                <TextBlock Margin="0,12,70,0"
-                                                           Foreground="{DynamicResource SukiLowText}"
-                                                           Text="Enable/disable the animations for the background, which are driven by the currently active effect."
-                                                           TextWrapping="Wrap" />
-                                            </StackPanel>
-                                        </DockPanel>
-                                        <DockPanel>
-                                            <ToggleSwitch VerticalAlignment="Top"
-                                                          
-                                                          DockPanel.Dock="Right"
-                                                          IsChecked="{Binding BackgroundTransitions}" />
-                                            <StackPanel HorizontalAlignment="Left">
-                                                <TextBlock FontSize="16"
-                                                           FontWeight="DemiBold"
-                                                           Text="Background Transitions" />
-                                                <TextBlock Margin="0,12,70,0"
-                                                           Foreground="{DynamicResource SukiLowText}"
-                                                           Text="Enable/disable the transitions for the background, these will fade between the active effects when changed."
-                                                           TextWrapping="Wrap" />
-                                            </StackPanel>
-                                        </DockPanel>
-                                        
-                                    </StackPanel>
-                                </suki:GlassCard>
-                                <suki:GlassCard Padding="25"  Margin="0,45,0,0">
-                                    <StackPanel Spacing="40">
-                                        <DockPanel>
-                                            <ComboBox DockPanel.Dock="Right"
-                                                      ItemsSource="{Binding AvailableBackgroundStyles}"
-                                                      SelectedItem="{Binding BackgroundStyle}" />
-                                            <StackPanel HorizontalAlignment="Left">
-                                                <TextBlock FontSize="16"
-                                                           FontWeight="DemiBold"
-                                                           Text="Background Style" />
-                                                <TextBlock Margin="0,12,70,0"
-                                                           Foreground="{DynamicResource SukiLowText}"
-                                                           Text="Select from the included background styles."
-                                                           TextWrapping="Wrap" />
-                                            </StackPanel>
-                                        </DockPanel>
-                                        <DockPanel>
-                                            <StackPanel HorizontalAlignment="Left" DockPanel.Dock="Top">
-                                                <TextBlock FontSize="16"
-                                                           FontWeight="DemiBold"
-                                                           Text="Custom Shaders" />
-                                                <TextBlock Margin="0,12,70,0"
-                                                           Foreground="{DynamicResource SukiLowText}"
-                                                           Text="Click any of the buttons below to enable a background shader. Click it again to disable it. These are likely to put quite a load on your GPU and are purely to demonstrate and test the capabilities of the background renderer."
-                                                           TextWrapping="Wrap" />
-                                            </StackPanel>
-                                            <ItemsControl Margin="0,15,0,0" ItemsSource="{Binding CustomShaders}">
-                                                <ItemsControl.ItemTemplate>
-                                                    <DataTemplate>
-                                                        <Button Margin="10"
-                                                              
-                                                                Command="{Binding $parent[theming:ThemingView].((theming:ThemingViewModel)DataContext).TryCustomShaderCommand}"
-                                                                CommandParameter="{Binding}"
-                                                                Content="{Binding}" />
-                                                    </DataTemplate>
-                                                </ItemsControl.ItemTemplate>
-                                                <ItemsControl.ItemsPanel>
-                                                    <ItemsPanelTemplate>
-                                                        <UniformGrid Rows="1" />
-                                                    </ItemsPanelTemplate>
-                                                </ItemsControl.ItemsPanel>
-                                            </ItemsControl>
-                                        </DockPanel>
-                                    </StackPanel>
-                                </suki:GlassCard>
+                                    <suki:GlassCard Margin="0,25,0,0" Padding="25">
+                                        <StackPanel Spacing="40">
+                                            <DockPanel>
+                                                <ToggleSwitch VerticalAlignment="Top"
+                                                              Classes="Switch"
+                                                              DockPanel.Dock="Right"
+                                                              IsChecked="{Binding BackgroundAnimations}" />
+                                                <StackPanel HorizontalAlignment="Left">
+                                                    <TextBlock FontSize="16"
+                                                               FontWeight="DemiBold"
+                                                               Text="Animated Background" />
+                                                    <TextBlock Margin="0,12,70,0"
+                                                               Foreground="{DynamicResource SukiLowText}"
+                                                               Text="Enable/disable the animations for the background, which are driven by the currently active effect."
+                                                               TextWrapping="Wrap" />
+                                                </StackPanel>
+                                            </DockPanel>
+                                            <DockPanel>
+                                                <ToggleSwitch VerticalAlignment="Top"
+                                                              DockPanel.Dock="Right"
+                                                              IsChecked="{Binding BackgroundTransitions}" />
+                                                <StackPanel HorizontalAlignment="Left">
+                                                    <TextBlock FontSize="16"
+                                                               FontWeight="DemiBold"
+                                                               Text="Background Transitions" />
+                                                    <TextBlock Margin="0,12,70,0"
+                                                               Foreground="{DynamicResource SukiLowText}"
+                                                               Text="Enable/disable the transitions for the background, these will fade between the active effects when changed."
+                                                               TextWrapping="Wrap" />
+                                                </StackPanel>
+                                            </DockPanel>
+
+                                        </StackPanel>
+                                    </suki:GlassCard>
+                                    <suki:GlassCard Margin="0,45,0,0" Padding="25">
+                                        <StackPanel Spacing="40">
+                                            <DockPanel>
+                                                <ComboBox DockPanel.Dock="Right"
+                                                          ItemsSource="{Binding AvailableBackgroundStyles}"
+                                                          SelectedItem="{Binding BackgroundStyle}" />
+                                                <StackPanel HorizontalAlignment="Left">
+                                                    <TextBlock FontSize="16"
+                                                               FontWeight="DemiBold"
+                                                               Text="Background Style" />
+                                                    <TextBlock Margin="0,12,70,0"
+                                                               Foreground="{DynamicResource SukiLowText}"
+                                                               Text="Select from the included background styles."
+                                                               TextWrapping="Wrap" />
+                                                </StackPanel>
+                                            </DockPanel>
+                                            <DockPanel>
+                                                <StackPanel HorizontalAlignment="Left" DockPanel.Dock="Top">
+                                                    <TextBlock FontSize="16"
+                                                               FontWeight="DemiBold"
+                                                               Text="Custom Shaders" />
+                                                    <TextBlock Margin="0,12,70,0"
+                                                               Foreground="{DynamicResource SukiLowText}"
+                                                               Text="Click any of the buttons below to enable a background shader. Click it again to disable it. These are likely to put quite a load on your GPU and are purely to demonstrate and test the capabilities of the background renderer."
+                                                               TextWrapping="Wrap" />
+                                                </StackPanel>
+                                                <ItemsControl Margin="0,15,0,0" ItemsSource="{Binding CustomShaders}">
+                                                    <ItemsControl.ItemTemplate>
+                                                        <DataTemplate>
+                                                            <Button Margin="10"
+                                                                    Command="{Binding $parent[theming:ThemingView].((theming:ThemingViewModel)DataContext).TryCustomShaderCommand}"
+                                                                    CommandParameter="{Binding}"
+                                                                    Content="{Binding}" />
+                                                        </DataTemplate>
+                                                    </ItemsControl.ItemTemplate>
+                                                    <ItemsControl.ItemsPanel>
+                                                        <ItemsPanelTemplate>
+                                                            <UniformGrid Rows="1" />
+                                                        </ItemsPanelTemplate>
+                                                    </ItemsControl.ItemsPanel>
+                                                </ItemsControl>
+                                            </DockPanel>
+                                        </StackPanel>
+                                    </suki:GlassCard>
                                 </StackPanel>
                             </suki:SettingsLayoutItem.Content>
                         </suki:SettingsLayoutItem>
diff --git a/SukiUI/Theme/Expander.axaml b/SukiUI/Theme/Expander.axaml
index db5d50420..e4e6ca89b 100644
--- a/SukiUI/Theme/Expander.axaml
+++ b/SukiUI/Theme/Expander.axaml
@@ -2,6 +2,14 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:content="clr-namespace:SukiUI.Content"
                     xmlns:controls="clr-namespace:SukiUI.Controls">
+    <Design.PreviewWith>
+        <Border Padding="20">
+            <Expander Header="Expander" IsExpanded="True">
+                <TextBlock Text="Content" />
+            </Expander>
+        </Border>
+    </Design.PreviewWith>
+
     <ControlTheme x:Key="SukiExpanderStyle" TargetType="Expander">
         <Setter Property="TextBlock.TextAlignment" Value="Start" />
         <Setter Property="ClipToBounds" Value="False" />
@@ -24,12 +32,13 @@
 
                             <LayoutTransformControl Name="PART_ToggleTransform">
                                 <DockPanel>
-
                                     <Border Name="PART_BottomBorder"
                                             Height="2"
                                             HorizontalAlignment="Stretch"
                                             Background="{DynamicResource SukiBorderBrush}"
-                                            DockPanel.Dock="Bottom" />
+                                            CornerRadius="10"
+                                            DockPanel.Dock="Bottom"
+                                            Opacity="0.8" />
 
                                     <ToggleButton Name="PART_ToggleButton"
                                                   HorizontalAlignment="Stretch"
diff --git a/SukiUI/Theme/TextBoxStyles.xaml b/SukiUI/Theme/TextBoxStyles.xaml
index 47df060b6..3a4bd54cc 100644
--- a/SukiUI/Theme/TextBoxStyles.xaml
+++ b/SukiUI/Theme/TextBoxStyles.xaml
@@ -176,8 +176,7 @@
                                            Text="{TemplateBinding Watermark}">
                                     <TextBlock.IsVisible>
                                         <MultiBinding Converter="{x:Static BoolConverters.And}">
-                                            <Binding Path="UseFloatingWatermark"
-                                                     RelativeSource="{RelativeSource TemplatedParent}" />
+                                            <Binding Path="UseFloatingWatermark" RelativeSource="{RelativeSource TemplatedParent}" />
                                             <Binding Converter="{x:Static StringConverters.IsNotNullOrEmpty}"
                                                      Path="Text"
                                                      RelativeSource="{RelativeSource TemplatedParent}" />
@@ -280,8 +279,7 @@
                                            Text="{TemplateBinding Watermark}">
                                     <TextBlock.IsVisible>
                                         <MultiBinding Converter="{x:Static BoolConverters.And}">
-                                            <Binding Path="UseFloatingWatermark"
-                                                     RelativeSource="{RelativeSource TemplatedParent}" />
+                                            <Binding Path="UseFloatingWatermark" RelativeSource="{RelativeSource TemplatedParent}" />
                                             <Binding Converter="{x:Static StringConverters.IsNotNullOrEmpty}"
                                                      Path="Text"
                                                      RelativeSource="{RelativeSource TemplatedParent}" />
@@ -394,8 +392,7 @@
                                            Text="{TemplateBinding Watermark}">
                                     <TextBlock.IsVisible>
                                         <MultiBinding Converter="{x:Static BoolConverters.And}">
-                                            <Binding Path="UseFloatingWatermark"
-                                                     RelativeSource="{RelativeSource TemplatedParent}" />
+                                            <Binding Path="UseFloatingWatermark" RelativeSource="{RelativeSource TemplatedParent}" />
                                             <Binding Converter="{x:Static StringConverters.IsNotNullOrEmpty}"
                                                      Path="Text"
                                                      RelativeSource="{RelativeSource TemplatedParent}" />
@@ -407,8 +404,8 @@
 
                                     <Grid ColumnDefinitions="Auto,*,Auto">
                                         <Panel>
-                                            <TextBlock Margin="0,1,3,0"
-                                                       FontSize="13"
+                                            <TextBlock Margin="3,1,3,0"
+                                                       FontSize="14"
                                                        Foreground="{DynamicResource SukiLowText}"
                                                        Text="{TemplateBinding theme:TextBoxExtensions.Prefix}" />
                                         </Panel>
@@ -595,8 +592,7 @@
         </Setter>
     </Style>
 
-    <Style
-        Selector="ToggleButton.passwordBoxRevealButton:not(ToggleButton:checked) /template/ Path#PART_GlyphElement_Hide">
+    <Style Selector="ToggleButton.passwordBoxRevealButton:not(ToggleButton:checked) /template/ Path#PART_GlyphElement_Hide">
         <Setter Property="IsVisible" Value="False" />
     </Style>