diff --git a/SukiUI/ColorTheme/NotificationColor.cs b/SukiUI/ColorTheme/NotificationColor.cs
index 4c9b9161..af4355dc 100644
--- a/SukiUI/ColorTheme/NotificationColor.cs
+++ b/SukiUI/ColorTheme/NotificationColor.cs
@@ -4,8 +4,8 @@ namespace SukiUI.ColorTheme;
 
 public static class NotificationColor
 {
-    public static readonly SolidColorBrush InfoIconForeground = new(Color.FromRgb(47, 84, 235));
-    public static readonly SolidColorBrush SuccessIconForeground = new(Color.FromRgb(56, 158, 13));
-    public static readonly SolidColorBrush WarningIconForeground = new(Color.FromRgb(240, 140, 22));
-    public static readonly SolidColorBrush ErrorIconForeground = new(Color.FromRgb(236, 63, 48));
+    public static readonly SolidColorBrush InfoIconForeground = new(Color.FromRgb(47,84,235));
+    public static readonly SolidColorBrush SuccessIconForeground = new(Color.FromRgb(56,158,13));
+    public static readonly SolidColorBrush WarningIconForeground = new(Color.FromRgb(240,140,22));
+    public static readonly SolidColorBrush ErrorIconForeground = new(Color.FromRgb(236,63,48));
 }
\ No newline at end of file
diff --git a/SukiUI/Content/Icons.cs b/SukiUI/Content/Icons.cs
index 5e3f8a62..c6cd6889 100644
--- a/SukiUI/Content/Icons.cs
+++ b/SukiUI/Content/Icons.cs
@@ -8,9 +8,12 @@ namespace SukiUI.Content;
 /// </summary>
 public static class Icons
 {
-    // Material Icons
-    public static readonly StreamGeometry WindowMinimize = Parse("M20,14H4V10H20");
+    public static readonly StreamGeometry Search = Parse("M11.5,2.75 C16.3324916,2.75 20.25,6.66750844 20.25,11.5 C20.25,13.6461673 19.4773285,15.6118676 18.1949905,17.1340957 L25.0303301,23.9696699 C25.3232233,24.2625631 25.3232233,24.7374369 25.0303301,25.0303301 C24.7640635,25.2965966 24.3473998,25.3208027 24.0537883,25.1029482 L23.9696699,25.0303301 L17.1340957,18.1949905 C15.6118676,19.4773285 13.6461673,20.25 11.5,20.25 C6.66750844,20.25 2.75,16.3324916 2.75,11.5 C2.75,6.66750844 6.66750844,2.75 11.5,2.75 Z M11.5,4.25 C7.49593556,4.25 4.25,7.49593556 4.25,11.5 C4.25,15.5040644 7.49593556,18.75 11.5,18.75 C15.5040644,18.75 18.75,15.5040644 18.75,11.5 C18.75,7.49593556 15.5040644,4.25 11.5,4.25 Z"); 
 
+    
+    // Material Icons
+    public static readonly StreamGeometry WindowMinimize = Parse("M20,14H4V10H20"); 
+    
     // Material Icons
     public static readonly StreamGeometry FileOpen = Parse("M17.0606622,9 C17.8933043,9 18.7000032,9.27703406 19.3552116,9.78392956 L19.5300545,9.92783739 L22.116207,12.1907209 C22.306094,12.356872 22.5408581,12.4608817 22.7890575,12.4909364 L22.9393378,12.5 L40.25,12.5 C42.2542592,12.5 43.8912737,14.0723611 43.994802,16.0508414 L44,16.25 L44,35.25 C44,37.2542592 42.4276389,38.8912737 40.4491586,38.994802 L40.25,39 L7.75,39 C5.74574083,39 4.10872626,37.4276389 4.00519801,35.4491586 L4,35.25 L4,12.75 C4,10.7457408 5.57236105,9.10872626 7.55084143,9.00519801 L7.75,9 L17.0606622,9 Z M22.8474156,14.9988741 L20.7205012,17.6147223 C20.0558881,18.4327077 19.0802671,18.9305178 18.0350306,18.993257 L17.8100737,19 L6.5,18.999 L6.5,35.25 C6.5,35.8972087 6.99187466,36.4295339 7.62219476,36.4935464 L7.75,36.5 L40.25,36.5 C40.8972087,36.5 41.4295339,36.0081253 41.4935464,35.3778052 L41.5,35.25 L41.5,16.25 C41.5,15.6027913 41.0081253,15.0704661 40.3778052,15.0064536 L40.25,15 L22.8474156,14.9988741 Z M17.0606622,11.5 L7.75,11.5 C7.10279131,11.5 6.5704661,11.9918747 6.50645361,12.6221948 L6.5,12.75 L6.5,16.499 L17.8100737,16.5 C18.1394331,16.5 18.4534488,16.3701335 18.6858203,16.1419575 L18.7802162,16.0382408 L20.415,14.025 L17.883793,11.8092791 C17.693906,11.643128 17.4591419,11.5391183 17.2109425,11.5090636 L17.0606622,11.5 Z");
 
diff --git a/SukiUI/Controls/BusyArea.axaml b/SukiUI/Controls/BusyArea.axaml
index c94bb4a7..98aec979 100644
--- a/SukiUI/Controls/BusyArea.axaml
+++ b/SukiUI/Controls/BusyArea.axaml
@@ -19,7 +19,7 @@
                                    LastChildFill="True">
                             <TextBlock Margin="10"
                                        DockPanel.Dock="Bottom"
-                                       FontWeight="DemiBold"
+                                       FontWeight="{DynamicResource DefaultDemiBold}"
                                        IsVisible="{TemplateBinding BusyText,
                                                                    Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
                                        Text="{TemplateBinding BusyText}" />
diff --git a/SukiUI/Controls/CircleProgressBar.axaml.cs b/SukiUI/Controls/CircleProgressBar.axaml.cs
index 35169da5..8b50b410 100644
--- a/SukiUI/Controls/CircleProgressBar.axaml.cs
+++ b/SukiUI/Controls/CircleProgressBar.axaml.cs
@@ -1,5 +1,6 @@
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Data;
 using Avalonia.Markup.Xaml;
 
 namespace SukiUI.Controls
@@ -24,7 +25,7 @@ public double Value
             set
             {
                 _value = (int)(value * 3.6);
-                SetValue(ValueProperty, _value);
+                SetValue(ValueProperty,_value);
             }
         }
 
@@ -32,9 +33,9 @@ public double Value
         /// Defines the <see cref="Value"/> property.
         /// </summary>
         public static readonly StyledProperty<double> ValueProperty =
-            AvaloniaProperty.Register<CircleProgressBar, double>(nameof(Value), defaultValue: 50, coerce: (o, d) => d * 3.6);
-
-
+            AvaloniaProperty.Register<CircleProgressBar, double>(nameof(Value), defaultValue: 50, coerce: (o, d) =>  d * 3.6);
+        
+        
         public static readonly StyledProperty<int> HeightProperty =
         AvaloniaProperty.Register<CircleProgressBar, int>(nameof(Height), defaultValue: 150);
 
@@ -61,7 +62,7 @@ public int StrokeWidth
             get { return GetValue(StrokeWidthProperty); }
             set { SetValue(StrokeWidthProperty, value); }
         }
-
+        
         public static readonly StyledProperty<bool> IsIndeterminateProperty =
             AvaloniaProperty.Register<CircleProgressBar, bool>(nameof(IsIndeterminate), false);
 
diff --git a/SukiUI/Controls/CodeView.axaml.cs b/SukiUI/Controls/CodeView.axaml.cs
index 23c6ee5c..d9386916 100644
--- a/SukiUI/Controls/CodeView.axaml.cs
+++ b/SukiUI/Controls/CodeView.axaml.cs
@@ -9,6 +9,7 @@
 using SukiUI.Content;
 using SukiUI.Extensions;
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace SukiUI.Controls;
diff --git a/SukiUI/Controls/ContentExpandControl.axaml.cs b/SukiUI/Controls/ContentExpandControl.axaml.cs
index 8a01f045..064c75e4 100644
--- a/SukiUI/Controls/ContentExpandControl.axaml.cs
+++ b/SukiUI/Controls/ContentExpandControl.axaml.cs
@@ -1,7 +1,7 @@
+using System;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Layout;
-using System;
 
 namespace SukiUI.Controls
 {
@@ -15,16 +15,16 @@ public double Multiplier
             get => GetValue(MultiplierProperty);
             set => SetValue(MultiplierProperty, value);
         }
-
+        
         public static readonly StyledProperty<Orientation> OrientationProperty =
             AvaloniaProperty.Register<ContentExpandControl, Orientation>(nameof(Orientation));
-
+        
         public Orientation Orientation
         {
             get => GetValue(OrientationProperty);
             set => SetValue(OrientationProperty, value);
         }
-
+        
         static ContentExpandControl()
         {
             AffectsArrange<ContentExpandControl>(MultiplierProperty, OrientationProperty);
diff --git a/SukiUI/Controls/GlassMorphism/GlassCard.axaml.cs b/SukiUI/Controls/GlassMorphism/GlassCard.axaml.cs
index 4d055053..ac324bae 100644
--- a/SukiUI/Controls/GlassMorphism/GlassCard.axaml.cs
+++ b/SukiUI/Controls/GlassMorphism/GlassCard.axaml.cs
@@ -1,11 +1,16 @@
-using Avalonia;
+using System;
+using System.ComponentModel;
+using System.Windows.Input;
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
 using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.LogicalTree;
 using Avalonia.Rendering.Composition;
+using Avalonia.Rendering.Composition.Animations;
 using SukiUI.Helpers;
-using System.ComponentModel;
-using System.Windows.Input;
 
 namespace SukiUI.Controls;
 
@@ -28,8 +33,8 @@ public class GlassCard : ContentControl
         get => GetValue(BorderThicknessProperty);
         set => SetValue(BorderThicknessProperty, value);
     }
-
-
+    
+ 
     public static readonly StyledProperty<bool> IsAnimatedProperty =
         AvaloniaProperty.Register<GlassCard, bool>(nameof(IsAnimated), true);
 
@@ -38,7 +43,7 @@ public bool IsAnimated
         get => GetValue(IsAnimatedProperty);
         set => SetValue(IsAnimatedProperty, value);
     }
-
+    
     public static readonly StyledProperty<bool> IsOpaqueProperty =
         AvaloniaProperty.Register<GlassCard, bool>(nameof(IsOpaque), false);
 
@@ -109,7 +114,7 @@ protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         }
 
     }
-
+    
 
 
 
@@ -122,7 +127,7 @@ protected override void OnPointerPressed(PointerPressedEventArgs e)
     {
         base.OnPointerPressed(e);
         PseudoClasses.Set(":pointerdown", true);
-        if (IsInteractive && Command is not null && Command.CanExecute(CommandParameter))
+        if(IsInteractive && Command is not null && Command.CanExecute(CommandParameter))
             Command.Execute(CommandParameter);
     }
 
diff --git a/SukiUI/Controls/InfoBadge.axaml b/SukiUI/Controls/InfoBadge.axaml
index 407bb416..ecddd1fe 100644
--- a/SukiUI/Controls/InfoBadge.axaml
+++ b/SukiUI/Controls/InfoBadge.axaml
@@ -8,10 +8,10 @@
                     Height="400"
                     Margin="0,20,0,0"
                     Spacing="20">
-            <controls:InfoBadge Appearance="Info" Header="Info"
+            <controls:InfoBadge Appearance="Info"
                                 CornerPosition="TopRight"
-                                >
-            
+                                Header="Info">
+
                 <Button Content="Log In" />
             </controls:InfoBadge>
             <controls:InfoBadge Appearance="Warning"
@@ -72,14 +72,17 @@
                             CornerRadius="{TemplateBinding CornerRadius}"
                             IsVisible="{Binding !!Header, RelativeSource={RelativeSource TemplatedParent}}"
                             UseLayoutRounding="False">
-                        <ContentPresenter Name="PART_HeaderPresenter" Margin="2"  
-                                          HorizontalAlignment="Center" FontWeight="DemiBold"
-                                          VerticalAlignment="Center" Foreground="White" 
+                        <ContentPresenter Name="PART_HeaderPresenter"
+                                          Margin="2"
+                                          HorizontalAlignment="Center"
+                                          VerticalAlignment="Center"
                                           Focusable="False"
+                                          FontWeight="{DynamicResource DefaultDemiBold}"
+                                          Foreground="White"
                                           IsTabStop="False">
                             <ContentPresenter.Styles>
                                 <Style Selector="TextBlock">
-                                    <Setter Property="FontSize" Value="13"></Setter>
+                                    <Setter Property="FontSize" Value="13" />
                                 </Style>
                             </ContentPresenter.Styles>
                             <ContentPresenter.Content>
diff --git a/SukiUI/Controls/InfoBadge.axaml.cs b/SukiUI/Controls/InfoBadge.axaml.cs
index da4b1817..9d4f5121 100644
--- a/SukiUI/Controls/InfoBadge.axaml.cs
+++ b/SukiUI/Controls/InfoBadge.axaml.cs
@@ -8,10 +8,10 @@
 
 namespace SukiUI.Controls;
 
-public class InfoBadge : HeaderedContentControl
+public class InfoBadge: HeaderedContentControl
 {
     private Border? _badgeContainer;
-
+    
     public static readonly StyledProperty<NotificationType> AppearanceProperty =
         AvaloniaProperty.Register<InfoBadge, NotificationType>(nameof(Appearance), NotificationType.Info);
 
@@ -28,7 +28,7 @@ public NotificationType Appearance
                 NotificationType.Error => NotificationColor.ErrorIconForeground,
                 _ => NotificationColor.InfoIconForeground
             };
-
+            
             SetValue(AppearanceProperty, value);
         }
     }
@@ -40,14 +40,13 @@ public CornerPosition CornerPosition
         get => GetValue(CornerPositionProperty);
         set => SetValue(CornerPositionProperty, value);
     }
-
+    
     public static readonly StyledProperty<bool> IsDotProperty = AvaloniaProperty.Register<InfoBadge, bool>(
         nameof(IsDot), false);
     public bool IsDot
     {
         get => GetValue(IsDotProperty);
-        set
-        {
+        set {
             UpdateBadgePosition();
             SetValue(IsDotProperty, value);
         }
@@ -97,7 +96,7 @@ private void UpdateBadgePosition()
         {
             horizontalOffset = 1;
         }
-
+        
         if (_badgeContainer is not null && Presenter?.Child is not null)
         {
             _badgeContainer.RenderTransform = new TransformGroup
diff --git a/SukiUI/Controls/InfoBar.axaml.cs b/SukiUI/Controls/InfoBar.axaml.cs
index 0d2413d9..0afedcae 100644
--- a/SukiUI/Controls/InfoBar.axaml.cs
+++ b/SukiUI/Controls/InfoBar.axaml.cs
@@ -1,6 +1,8 @@
-using Avalonia;
+using System.Windows.Input;
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
+using Avalonia.Interactivity;
 using Avalonia.Media;
 using SukiUI.ColorTheme;
 using SukiUI.Content;
@@ -26,7 +28,7 @@ public NotificationType Severity
                 NotificationType.Error => Icons.AlertOutline,
                 _ => Icons.InformationOutline
             };
-
+            
             IconForeground = value switch
             {
                 NotificationType.Info => NotificationColor.InfoIconForeground,
@@ -35,11 +37,11 @@ public NotificationType Severity
                 NotificationType.Error => NotificationColor.ErrorIconForeground,
                 _ => NotificationColor.InfoIconForeground
             };
-
+            
             SetValue(SeverityProperty, value);
         }
     }
-
+    
     public static readonly StyledProperty<object?> IconProperty =
         AvaloniaProperty.Register<InfoBar, object?>(nameof(Icon), Icons.InformationOutline);
 
@@ -48,16 +50,16 @@ public object? Icon
         get => GetValue(IconProperty);
         private set => SetValue(IconProperty, value);
     }
-
+    
     public static readonly StyledProperty<IBrush?> IconForegroundProperty =
         AvaloniaProperty.Register<InfoBar, IBrush?>(nameof(IconForeground), NotificationColor.InfoIconForeground);
-
+    
     public IBrush? IconForeground
     {
         get => GetValue(IconForegroundProperty);
         private set => SetValue(IconForegroundProperty, value);
     }
-
+    
     public static readonly StyledProperty<bool> IsOpenProperty =
         AvaloniaProperty.Register<InfoBar, bool>(nameof(IsOpen), true);
 
@@ -66,7 +68,7 @@ public bool IsOpen
         get => GetValue(IsOpenProperty);
         set => SetValue(IsOpenProperty, value);
     }
-
+    
     public static readonly StyledProperty<bool> IsClosableProperty =
         AvaloniaProperty.Register<InfoBar, bool>(nameof(IsClosable), true);
 
@@ -75,8 +77,8 @@ public bool IsClosable
         get => GetValue(IsClosableProperty);
         set => SetValue(IsClosableProperty, value);
     }
-
-
+    
+       
     public static readonly StyledProperty<bool> IsOpaqueProperty =
         AvaloniaProperty.Register<InfoBar, bool>(nameof(IsOpaque), false);
 
@@ -85,7 +87,7 @@ public bool IsOpaque
         get => GetValue(IsOpaqueProperty);
         set => SetValue(IsOpaqueProperty, value);
     }
-
+    
     public static readonly StyledProperty<string> TitleProperty =
         AvaloniaProperty.Register<InfoBar, string>(nameof(Title), string.Empty);
 
@@ -108,7 +110,7 @@ protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
     {
         base.OnApplyTemplate(e);
 
-        e.NameScope.Get<Button>("PART_CloseButton").Click += (_, _) => { IsOpen = false; };
+        e.NameScope.Get<Button>("PART_CloseButton").Click += (_, _) => { IsOpen = false;};
     }
 
     protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
diff --git a/SukiUI/Controls/Loading.axaml.cs b/SukiUI/Controls/Loading.axaml.cs
index a5559c65..35ce8e12 100644
--- a/SukiUI/Controls/Loading.axaml.cs
+++ b/SukiUI/Controls/Loading.axaml.cs
@@ -1,6 +1,7 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
+using Avalonia.Markup.Xaml.MarkupExtensions;
 using Avalonia.Media;
 
 namespace SukiUI.Controls
@@ -16,8 +17,8 @@ private void InitializeComponent()
         {
             AvaloniaXamlLoader.Load(this);
         }
-
-
+        
+        
         public static readonly StyledProperty<IBrush> ForegroundProperty =
             AvaloniaProperty.Register<Loading, IBrush>(nameof(Foreground), defaultValue: Brushes.Aqua);
 
@@ -26,6 +27,6 @@ public IBrush Foreground
             get => GetValue(ForegroundProperty);
             set => SetValue(ForegroundProperty, value);
         }
-
+        
     }
 }
\ No newline at end of file
diff --git a/SukiUI/Controls/MessageBox.axaml b/SukiUI/Controls/MessageBox.axaml
index 725f6c9c..74dfdd19 100644
--- a/SukiUI/Controls/MessageBox.axaml
+++ b/SukiUI/Controls/MessageBox.axaml
@@ -1,72 +1,105 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl x:Class="SukiUI.Controls.MessageBox"
+             xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:content="clr-namespace:SukiUI.Content"
+             xmlns:controls="clr-namespace:SukiUI.Controls"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:controls="clr-namespace:SukiUI.Controls"
-             xmlns:content="clr-namespace:SukiUI.Content"
-             mc:Ignorable="d" d:DesignWidth="480"  Width="480" 
-             x:Class="SukiUI.Controls.MessageBox">
+             Width="480"
+             d:DesignWidth="480"
+             mc:Ignorable="d">
     <UserControl.Styles>
         <Style Selector="controls|MessageBox">
             <Setter Property="Template">
                 <ControlTemplate>
-    <Panel>
-        <Border Background="{DynamicResource SukiCardBackground}" BorderBrush="{DynamicResource SukiBorderBrush}" BorderThickness="1" CornerRadius="25" Margin="0,90,0,0">
-            <Border CornerRadius="25" ClipToBounds="True">
-            <Panel>
-                <Panel IsVisible="{DynamicResource IsDark}">
-                    
-                        <Panel.Background>
-                            <LinearGradientBrush StartPoint="0%,0%" EndPoint="100%,100%">
-                                <GradientStop Color="{DynamicResource SukiAccentColor3}" Offset="0"></GradientStop>
-                                <GradientStop Color="{DynamicResource SukiPrimaryColor15}" Offset="1"></GradientStop>
+                    <Panel>
+                        <Border Margin="0,90,0,0"
+                                Background="{DynamicResource SukiCardBackground}"
+                                BorderBrush="{DynamicResource SukiBorderBrush}"
+                                BorderThickness="1"
+                                CornerRadius="25">
+                            <Border ClipToBounds="True" CornerRadius="25">
+                                <Panel>
+                                    <Panel IsVisible="{DynamicResource IsDark}">
 
-                            </LinearGradientBrush>
-                        </Panel.Background>
-                   
-                </Panel>
-                        
-                <Panel IsVisible="{DynamicResource IsLight}">
-                        <Panel.Background>
-                            <LinearGradientBrush StartPoint="0%,0%" EndPoint="100%,100%">
-                                <GradientStop Color="{DynamicResource SukiAccentColor5}" Offset="0"></GradientStop>
-                                <GradientStop Color="{DynamicResource SukiPrimaryColor7}" Offset="1"></GradientStop>
+                                        <Panel.Background>
+                                            <LinearGradientBrush StartPoint="0%,0%" EndPoint="100%,100%">
+                                                <GradientStop Offset="0" Color="{DynamicResource SukiAccentColor3}" />
+                                                <GradientStop Offset="1" Color="{DynamicResource SukiPrimaryColor15}" />
 
-                            </LinearGradientBrush>
-                        </Panel.Background>
-                </Panel>
-                <StackPanel>
-                    <TextBlock Margin="0,60,0,0" Text="{TemplateBinding Title}" FontWeight="DemiBold" FontSize="26" HorizontalAlignment="Center" Foreground="{DynamicResource SukiText}"></TextBlock>
-                    <ContentPresenter Margin="30,20,30,30" Content="{TemplateBinding Content}" FontWeight="DemiBold" TextWrapping="Wrap" Foreground="{DynamicResource SukiLowText}"></ContentPresenter>
-                    <StackPanel IsVisible="{TemplateBinding ShowActionButton}" Orientation="Horizontal" Spacing="15" Margin="0,0,30,30" HorizontalAlignment="Right">
-                      
-                        <Button Name="ButtonAction" Classes="Flat" Content="{TemplateBinding ActionButtonContent}"></Button>
-                    </StackPanel>
-                </StackPanel>
-            </Panel>
-            </Border>
-        </Border>
-        
-        <Border CornerRadius="50" Margin="0,50,0,0" Height="60" Width="70" HorizontalAlignment="Center" VerticalAlignment="Top" BoxShadow="{DynamicResource SukiBigPopupShadow}"></Border>
-        <Border  
-                 Margin="0,20,0,0" Background="#fafafa" Width="100" Height="100" CornerRadius="50" VerticalAlignment="Top" HorizontalAlignment="Center">
-            <Border CornerRadius="50" ClipToBounds="True">
-                <Panel>
-                    <Panel Opacity="1"  Background="{TemplateBinding Foreground}">
-                        
-                    </Panel>
-                    
-                    <PathIcon Width="28" Margin="0,0,0,0"
-                              Height="28" HorizontalAlignment="Center" VerticalAlignment="Center"
-                              Data="{TemplateBinding Icon}"
-                              Foreground="White" />
+                                            </LinearGradientBrush>
+                                        </Panel.Background>
+
+                                    </Panel>
 
-                </Panel>
-            </Border>
-        </Border>
-    </Panel>
+                                    <Panel IsVisible="{DynamicResource IsLight}">
+                                        <Panel.Background>
+                                            <LinearGradientBrush StartPoint="0%,0%" EndPoint="100%,100%">
+                                                <GradientStop Offset="0" Color="{DynamicResource SukiAccentColor5}" />
+                                                <GradientStop Offset="1" Color="{DynamicResource SukiPrimaryColor7}" />
+
+                                            </LinearGradientBrush>
+                                        </Panel.Background>
+                                    </Panel>
+                                    <StackPanel>
+                                        <TextBlock Margin="0,60,0,0"
+                                                   HorizontalAlignment="Center"
+                                                   FontSize="26"
+                                                   FontWeight="{DynamicResource DefaultDemiBold}"
+                                                   Foreground="{DynamicResource SukiText}"
+                                                   Text="{TemplateBinding Title}" />
+                                        <ContentPresenter Margin="30,20,30,30"
+                                                          Content="{TemplateBinding Content}"
+                                                          FontWeight="{DynamicResource DefaultDemiBold}"
+                                                          Foreground="{DynamicResource SukiLowText}"
+                                                          TextWrapping="Wrap" />
+                                        <StackPanel Margin="0,0,30,30"
+                                                    HorizontalAlignment="Right"
+                                                    IsVisible="{TemplateBinding ShowActionButton}"
+                                                    Orientation="Horizontal"
+                                                    Spacing="15">
+
+                                            <Button Name="ButtonAction"
+                                                    Classes="Flat"
+                                                    Content="{TemplateBinding ActionButtonContent}" />
+                                        </StackPanel>
+                                    </StackPanel>
+                                </Panel>
+                            </Border>
+                        </Border>
+
+                        <Border Width="70"
+                                Height="60"
+                                Margin="0,50,0,0"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Top"
+                                BoxShadow="{DynamicResource SukiBigPopupShadow}"
+                                CornerRadius="50" />
+                        <Border Width="100"
+                                Height="100"
+                                Margin="0,20,0,0"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Top"
+                                Background="#fafafa"
+                                CornerRadius="50">
+                            <Border ClipToBounds="True" CornerRadius="50">
+                                <Panel>
+                                    <Panel Background="{TemplateBinding Foreground}" Opacity="1" />
+
+                                    <PathIcon Width="28"
+                                              Height="28"
+                                              Margin="0,0,0,0"
+                                              HorizontalAlignment="Center"
+                                              VerticalAlignment="Center"
+                                              Data="{TemplateBinding Icon}"
+                                              Foreground="White" />
+
+                                </Panel>
+                            </Border>
+                        </Border>
+                    </Panel>
                 </ControlTemplate>
             </Setter>
-            </Style>
-        </UserControl.Styles>
+        </Style>
+    </UserControl.Styles>
 </UserControl>
diff --git a/SukiUI/Controls/MessageBox.axaml.cs b/SukiUI/Controls/MessageBox.axaml.cs
index ff477355..5e61140b 100644
--- a/SukiUI/Controls/MessageBox.axaml.cs
+++ b/SukiUI/Controls/MessageBox.axaml.cs
@@ -1,7 +1,8 @@
+using System;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
-using System;
+using Avalonia.Markup.Xaml;
 
 namespace SukiUI.Controls
 {
@@ -11,16 +12,16 @@ public MessageBox()
         {
             InitializeComponent();
         }
-
+        
         protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
             base.OnApplyTemplate(e);
 
             e.NameScope.Get<Button>("ButtonAction").Click += ((sender, args) => _onActionCallback?.Invoke());
         }
-
+        
         public Action? _onActionCallback;
-
+        
         public static readonly StyledProperty<object?> IconProperty =
             AvaloniaProperty.Register<MessageBox, object?>(nameof(Icon));
 
@@ -29,7 +30,7 @@ public object? Icon
             get => GetValue(IconProperty);
             set => SetValue(IconProperty, value);
         }
-
+    
         public static readonly StyledProperty<string> TitleProperty =
             AvaloniaProperty.Register<MessageBox, string>(nameof(Title));
 
@@ -38,7 +39,7 @@ public string Title
             get => GetValue(TitleProperty);
             set => SetValue(TitleProperty, value);
         }
-
+    
         public static readonly StyledProperty<bool> ShowActionButtonProperty =
             AvaloniaProperty.Register<MessageBox, bool>(nameof(ShowActionButton));
 
@@ -47,7 +48,7 @@ public bool ShowActionButton
             get => GetValue(ShowActionButtonProperty);
             set => SetValue(ShowActionButtonProperty, value);
         }
-
+    
         public static readonly StyledProperty<string> ActionButtonContentProperty =
             AvaloniaProperty.Register<MessageBox, string>(nameof(ActionButtonContent));
 
diff --git a/SukiUI/Controls/PropertyGrid/PropertyGridWindow.axaml.cs b/SukiUI/Controls/PropertyGrid/PropertyGridWindow.axaml.cs
index b688f861..e2f61f8b 100644
--- a/SukiUI/Controls/PropertyGrid/PropertyGridWindow.axaml.cs
+++ b/SukiUI/Controls/PropertyGrid/PropertyGridWindow.axaml.cs
@@ -1,3 +1,5 @@
+using Avalonia.Controls;
+
 namespace SukiUI.Controls
 {
     public partial class PropertyGridWindow : SukiWindow
diff --git a/SukiUI/Controls/SettingsLayout.axaml b/SukiUI/Controls/SettingsLayout.axaml
index e5c4ecbe..b2d94eca 100644
--- a/SukiUI/Controls/SettingsLayout.axaml
+++ b/SukiUI/Controls/SettingsLayout.axaml
@@ -53,7 +53,7 @@
         </Style>
 
         <Style Selector="RadioButton.MenuChip:checked">
-            <Setter Property="TextBlock.FontWeight" Value="DemiBold" />
+            <Setter Property="TextBlock.FontWeight" Value="{DynamicResource DefaultDemiBold}" />
 
             <Setter Property="BorderThickness" Value="0,0,0,0" />
             <Setter Property="BorderBrush" Value="{DynamicResource SukiPrimaryColor}" />
@@ -72,7 +72,7 @@
 
 
         <Style Selector="RadioButton.MenuChip:checked  TextBlock">
-            <Setter Property="FontWeight" Value="DemiBold" />
+            <Setter Property="FontWeight" Value="{DynamicResource DefaultDemiBold}" />
             <Setter Property="Foreground" Value="{DynamicResource SukiPrimaryColor}" />
         </Style>
 
@@ -102,7 +102,7 @@
 
             </Setter>
 
-            <Setter Property="TextBlock.FontWeight" Value="DemiBold" />
+            <Setter Property="TextBlock.FontWeight" Value="{DynamicResource DefaultDemiBold}" />
             <Setter Property="TextBlock.Foreground" Value="{DynamicResource SukiPrimaryColor}" />
             <Setter Property="Background" Value="{DynamicResource SukiPrimaryColor10}" />
             <Setter Property="BorderBrush" Value="{DynamicResource SukiPrimaryColor}" />
@@ -128,8 +128,10 @@
                                     Margin="0,25,0,0"
                                     HorizontalAlignment="Left"
                                     DockPanel.Dock="Left" />
-                        <ScrollViewer Classes="Stack" Name="MyScroll">
-                            <StackPanel theme:StackPanelExtensions.AnimatedScroll="True" Name="StackItems" Margin="-10,0" />
+                        <ScrollViewer Name="MyScroll" Classes="Stack">
+                            <StackPanel Name="StackItems"
+                                        Margin="-10,0"
+                                        theme:StackPanelExtensions.AnimatedScroll="True" />
                         </ScrollViewer>
                     </DockPanel>
                 </ControlTemplate>
diff --git a/SukiUI/Controls/SettingsLayout.axaml.cs b/SukiUI/Controls/SettingsLayout.axaml.cs
index 52cf01f0..08261ae0 100644
--- a/SukiUI/Controls/SettingsLayout.axaml.cs
+++ b/SukiUI/Controls/SettingsLayout.axaml.cs
@@ -139,8 +139,8 @@ private void UpdateItems()
 
     private async void DockPanel_SizeChanged(object sender, SizeChangedEventArgs e)
     {
-        //if (isAnimatingWidth)
-        return;
+        if (isAnimatingWidth)
+            return;
 
         var currentwidth = this.GetTemplateChildren().First(n => n.Name == "StackSummary").Width;
         var desiredSize = e.NewSize.Width > 1000 ? 400 : 0;
diff --git a/SukiUI/Controls/Stepper.axaml.cs b/SukiUI/Controls/Stepper.axaml.cs
index 80de2749..c277e0cb 100644
--- a/SukiUI/Controls/Stepper.axaml.cs
+++ b/SukiUI/Controls/Stepper.axaml.cs
@@ -1,3 +1,10 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Linq;
+using System.Reactive;
+using System.Reactive.Linq;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
@@ -7,40 +14,33 @@
 using Avalonia.Media;
 using Avalonia.Threading;
 using SukiUI.Content;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Linq;
-using System.Reactive;
-using System.Reactive.Linq;
 
 namespace SukiUI.Controls
 {
     public class Stepper : TemplatedControl
     {
         public static readonly StyledProperty<bool> AlternativeStyleProperty =
-            AvaloniaProperty.Register<Stepper, bool>(nameof(AlternativeStyle), defaultValue: false);
-
-        public bool AlternativeStyle
-        {
-            get { return GetValue(AlternativeStyleProperty); }
-            set { SetValue(AlternativeStyleProperty, value); }
-        }
+            AvaloniaProperty.Register<Stepper, bool>(nameof(AlternativeStyle));
 
 
         public static readonly StyledProperty<int> IndexProperty =
             AvaloniaProperty.Register<Stepper, int>(nameof(Index));
 
+        public static readonly StyledProperty<IEnumerable?> StepsProperty =
+            AvaloniaProperty.Register<Stepper, IEnumerable?>(nameof(Steps));
+
+        public bool AlternativeStyle
+        {
+            get => GetValue(AlternativeStyleProperty);
+            set => SetValue(AlternativeStyleProperty, value);
+        }
+
         public int Index
         {
             get => GetValue(IndexProperty);
             set => SetValue(IndexProperty, value);
         }
 
-        public static readonly StyledProperty<IEnumerable?> StepsProperty =
-            AvaloniaProperty.Register<Stepper, IEnumerable?>(nameof(Steps));
-
         public IEnumerable? Steps
         {
             get => GetValue(StepsProperty);
@@ -53,7 +53,11 @@ public IEnumerable? Steps
         protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
             base.OnApplyTemplate(e);
-            if (e.NameScope.Get<Grid>("PART_GridStepper") is not { } grid) return;
+            if (e.NameScope.Get<Grid>("PART_GridStepper") is not { } grid)
+            {
+                return;
+            }
+
             _grid = grid;
         }
 
@@ -72,36 +76,56 @@ protected override void OnLoaded(RoutedEventArgs e)
 
         private void StepsChangedHandler(IEnumerable? newSteps)
         {
-            if (newSteps is null) return;
-            if (newSteps is not IEnumerable<object> stepsEnumerable) return;
+            if (newSteps is null)
+            {
+                return;
+            }
+
+            if (newSteps is not IEnumerable<object> stepsEnumerable)
+            {
+                return;
+            }
+
             var steps = stepsEnumerable.ToArray();
 
             if (AlternativeStyle)
+            {
                 UpdateAlternate(steps);
+            }
             else
+            {
                 Update(steps);
+            }
 
             if (newSteps is INotifyCollectionChanged notify)
+            {
                 notify.CollectionChanged += (_, _) => Update(steps);
+            }
         }
 
         #region StepperBaseStyle
 
         private void Update(object[] steps)
         {
-            if (_grid is null) return;
+            if (_grid is null)
+            {
+                return;
+            }
+
             _grid.Children.Clear();
 
             SetColumnDefinitions(_grid, steps);
 
             for (var i = 0; i < steps.Length; i++)
+            {
                 AddStep(steps[i], i, _grid, steps.Length);
+            }
         }
 
         private void SetColumnDefinitions(Grid grid, object[] steps)
         {
             var columns = new ColumnDefinitions();
-            for (int i = 0; i < steps.Length; i++)
+            for (var i = 0; i < steps.Length; i++)
             {
                 columns.Add(new ColumnDefinition());
             }
@@ -111,21 +135,23 @@ private void SetColumnDefinitions(Grid grid, object[] steps)
 
         private void AddStep(object step, int index, Grid grid, int stepCount)
         {
-            var griditem = new Grid()
+            var griditem = new Grid
             {
-                ColumnDefinitions = new ColumnDefinitions()
+                ColumnDefinitions = new ColumnDefinitions
                     { new(GridLength.Auto), new(GridLength.Star), new(GridLength.Auto) }
             };
 
-            var icon = new PathIcon()
-            { Height = 10, Width = 10, Data = Icons.ChevronRight, Margin = new Thickness(0, 0, 20, 0) };
+            var icon = new PathIcon
+                { Height = 10, Width = 10, Data = Icons.ChevronRight, Margin = new Thickness(0, 0, 20, 0) };
             if (index == stepCount - 1)
+            {
                 icon.IsVisible = false;
+            }
 
             Grid.SetColumn(icon, 2);
             griditem.Children.Add(icon);
 
-            var circle = new Border()
+            var circle = new Border
             {
                 Margin = new Thickness(0, 0, 0, 2),
                 Height = 24,
@@ -140,14 +166,13 @@ private void AddStep(object step, int index, Grid grid, int stepCount)
                 circle[!BackgroundProperty] = new DynamicResourceExtension("SukiPrimaryColor");
 
                 circle.BorderThickness = new Thickness(0);
-                circle.Child = new TextBlock()
+                circle.Child = new TextBlock
                 {
                     VerticalAlignment = VerticalAlignment.Center,
                     HorizontalAlignment = HorizontalAlignment.Center,
                     Text = (index + 1).ToString(),
                     FontSize = 13,
-                    Foreground = Brushes.White,
-                    TextWrapping = TextWrapping.Wrap
+                    Foreground = Brushes.White, TextWrapping = TextWrapping.Wrap
                 };
             }
             else
@@ -155,14 +180,13 @@ private void AddStep(object step, int index, Grid grid, int stepCount)
                 circle[!BackgroundProperty] = new DynamicResourceExtension("SukiControlBorderBrush");
 
                 circle.BorderThickness = new Thickness(0);
-                circle.Child = new TextBlock()
+                circle.Child = new TextBlock
                 {
                     VerticalAlignment = VerticalAlignment.Center,
                     HorizontalAlignment = HorizontalAlignment.Center,
                     Text = (index + 1).ToString(),
                     FontSize = 13,
-                    Foreground = Brushes.White,
-                    TextWrapping = TextWrapping.Wrap
+                    Foreground = Brushes.White, TextWrapping = TextWrapping.Wrap
                 };
             }
 
@@ -170,16 +194,19 @@ private void AddStep(object step, int index, Grid grid, int stepCount)
             griditem.Children.Add(circle);
             Control content = step switch
             {
-                string s => new TextBlock()
+                string s => new TextBlock
                 {
-                    FontWeight = index <= Index ? FontWeight.DemiBold : FontWeight.Normal,
+                    FontWeight = index <= Index
+                        ? TryGetResource("DefaultDemiBold", ActualThemeVariant, out var fontWeight)
+                            ? (FontWeight)fontWeight!
+                            : FontWeight.Bold
+                        : FontWeight.Normal,
                     Margin = new Thickness(10, 0, 0, 0),
                     Text = s,
                     VerticalAlignment = VerticalAlignment.Center,
-                    HorizontalAlignment = HorizontalAlignment.Left,
-                    TextWrapping = TextWrapping.Wrap
+                    HorizontalAlignment = HorizontalAlignment.Left, TextWrapping = TextWrapping.Wrap
                 },
-                _ => new ContentControl() { Content = step }
+                _ => new ContentControl { Content = step }
             };
 
             Grid.SetColumn(content, 1);
@@ -202,7 +229,11 @@ protected override void OnUnloaded(RoutedEventArgs e)
 
         public void UpdateAlternate(object[] steps)
         {
-            if (_grid is null) return;
+            if (_grid is null)
+            {
+                return;
+            }
+
             _grid.Children.Clear();
 
             SetColumnDefinitionsAlternate(_grid);
@@ -217,18 +248,20 @@ private void SetColumnDefinitionsAlternate(Grid grid)
         {
             var columns = new ColumnDefinitions();
             foreach (var s in Steps)
+            {
                 columns.Add(new ColumnDefinition());
+            }
+
             grid.ColumnDefinitions = columns;
         }
 
         private void AddStepAlternate(object step, int index, Grid grid, object[] steps)
         {
-            var gridItem = new Grid() { ColumnDefinitions = new ColumnDefinitions() { new(), new() } };
+            var gridItem = new Grid { ColumnDefinitions = new ColumnDefinitions { new(), new() } };
 
             var line = new Border
             {
-                CornerRadius = new CornerRadius(3),
-                Margin = new Thickness(-5, 0, 23, 0),
+                CornerRadius = new CornerRadius(3), Margin = new Thickness(-5, 0, 23, 0),
                 Height = 2,
                 HorizontalAlignment = HorizontalAlignment.Stretch,
                 VerticalAlignment = VerticalAlignment.Center,
@@ -236,21 +269,26 @@ private void AddStepAlternate(object step, int index, Grid grid, object[] steps)
             };
             var line1 = new Border
             {
-                CornerRadius = new CornerRadius(3),
-                Margin = new Thickness(23, 0, -5, 0),
-                Height = 2,
-                HorizontalAlignment = HorizontalAlignment.Stretch,
+                CornerRadius = new CornerRadius(3), Margin = new Thickness(23, 0, -5, 0),
+                Height = 2, HorizontalAlignment = HorizontalAlignment.Stretch,
                 VerticalAlignment = VerticalAlignment.Center,
                 [!BackgroundProperty] = new DynamicResourceExtension("SukiControlBorderBrush")
             };
 
             if (index == 0)
+            {
                 line.IsVisible = false;
+            }
+
             if (index == steps.Length - 1)
+            {
                 line1.IsVisible = false;
+            }
 
             if (index == Index)
+            {
                 line[!BackgroundProperty] = new DynamicResourceExtension("SukiPrimaryColor");
+            }
 
             if (index < Index)
             {
@@ -266,7 +304,7 @@ private void AddStepAlternate(object step, int index, Grid grid, object[] steps)
 
             var gridBorder = new Grid();
 
-            var circle = new Border()
+            var circle = new Border
             {
                 Margin = new Thickness(0, 0, 0, 2),
                 Height = 30,
@@ -280,7 +318,7 @@ private void AddStepAlternate(object step, int index, Grid grid, object[] steps)
             {
                 circle[!BackgroundProperty] = new DynamicResourceExtension("SukiPrimaryColor");
                 circle.BorderThickness = new Thickness(0);
-                circle.Child = new TextBlock()
+                circle.Child = new TextBlock
                 {
                     VerticalAlignment = VerticalAlignment.Center,
                     HorizontalAlignment = HorizontalAlignment.Center,
@@ -317,13 +355,11 @@ private void AddStepAlternate(object step, int index, Grid grid, object[] steps)
 
             gridBorder.Children.Add(circle);
 
-            gridBorder.Children.Add(new TextBlock()
+            gridBorder.Children.Add(new TextBlock
             {
                 FontWeight = index == Index ? FontWeight.Medium : FontWeight.Normal,
-                Text = step.ToString(),
-                VerticalAlignment = VerticalAlignment.Center,
-                HorizontalAlignment = HorizontalAlignment.Center,
-                Margin = new Thickness(0, 55, 0, 0)
+                Text = step.ToString(), VerticalAlignment = VerticalAlignment.Center,
+                HorizontalAlignment = HorizontalAlignment.Center, Margin = new Thickness(0, 55, 0, 0)
             });
 
             Grid.SetColumn(gridItem, index);
diff --git a/SukiUI/Controls/SukiBackground.cs b/SukiUI/Controls/SukiBackground.cs
index f378a0f3..3ba27670 100644
--- a/SukiUI/Controls/SukiBackground.cs
+++ b/SukiUI/Controls/SukiBackground.cs
@@ -1,13 +1,14 @@
+using System;
+using System.Reactive;
+using System.Reactive.Linq;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.Media;
 using Avalonia.Threading;
 using SukiUI.Enums;
+using SukiUI.Utilities;
 using SukiUI.Utilities.Effects;
-using System;
-using System.Reactive;
-using System.Reactive.Linq;
 
 namespace SukiUI.Controls
 {
@@ -54,7 +55,7 @@ public string? ShaderCode
 
         public static readonly StyledProperty<bool> AnimationEnabledProperty =
             AvaloniaProperty.Register<SukiWindow, bool>(nameof(AnimationEnabled), defaultValue: false);
-
+        
         /// <summary>
         /// Enables/disables animations - DEFAULT: False
         /// </summary>
@@ -66,7 +67,7 @@ public bool AnimationEnabled
 
         public static readonly StyledProperty<bool> TransitionsEnabledProperty =
             AvaloniaProperty.Register<SukiBackground, bool>(nameof(TransitionsEnabled), defaultValue: false);
-
+        
         /// <summary>
         /// Enables/disables transition animations when switching backgrounds - DEFAULT: False
         /// </summary>
@@ -78,7 +79,7 @@ public bool TransitionsEnabled
 
         public static readonly StyledProperty<double> TransitionTimeProperty =
             AvaloniaProperty.Register<SukiBackground, double>(nameof(TransitionTime), defaultValue: 1.0);
-
+        
         /// <summary>
         /// The amount of time in seconds the background transition will take - DEFAULT: 1.0
         /// </summary>
@@ -87,7 +88,7 @@ public double TransitionTime
             get => GetValue(TransitionTimeProperty);
             set => SetValue(TransitionTimeProperty, value);
         }
-
+        
         private readonly EffectBackgroundDraw _draw;
         private readonly IDisposable _observables;
 
diff --git a/SukiUI/Controls/SukiHost.axaml b/SukiUI/Controls/SukiHost.axaml
index ce9f298e..b4e3472f 100644
--- a/SukiUI/Controls/SukiHost.axaml
+++ b/SukiUI/Controls/SukiHost.axaml
@@ -26,7 +26,8 @@
                             VerticalAlignment="Stretch"
                             Background="{DynamicResource SukiDialogBackground}"
                             IsHitTestVisible="False"
-                            Opacity="0">
+                            IsVisible="False"
+                            Opacity="0.4">
                         
                     </Border>
 
@@ -37,7 +38,7 @@
                             Classes.opened="False"
                             CornerRadius="15"
                             IsHitTestVisible="False"
-                            Opacity="0">
+                            IsVisible="False">
                         <Border.Transitions>
                             <Transitions>
                                 <ThicknessTransition Property="Margin" Duration="0:0:0.25">
@@ -92,7 +93,7 @@
                         <Style Selector="suki|SukiHost[IsDialogOpen=True]">
 
                             <Style Selector="^ Border#PART_DialogBackground">
-                                <Setter Property="Opacity" Value="0.4" />
+                                <Setter Property="IsVisible" Value="True" />
                                 <Setter Property="IsHitTestVisible" Value="True" />
                             </Style>
 
@@ -114,7 +115,7 @@
 
                             <Style Selector="^ Border#borderDialog">
                                 <Setter Property="Margin" Value="0,25,0,0" />
-                                <Setter Property="Opacity" Value="1" />
+                                <Setter Property="IsVisible" Value="True" />
                                 <Setter Property="IsHitTestVisible" Value="True" />
                                 <Setter Property="RenderTransform" Value="scale(1)" />
                             </Style>
@@ -124,7 +125,7 @@
                         <Style Selector="suki|SukiHost[IsDialogOpen=False]">
 
                             <Style Selector="^ Border#PART_DialogBackground">
-                                <Setter Property="Opacity" Value="0" />
+                                <Setter Property="IsVisible" Value="False" />
                                 <Setter Property="IsHitTestVisible" Value="False" />
                             </Style>
 
@@ -144,7 +145,7 @@
                             </Style>
 
                             <Style Selector="^ Border#borderDialog">
-                                <Setter Property="Opacity" Value="0" />
+                                <Setter Property="IsVisible" Value="False" />
                                 <Setter Property="IsHitTestVisible" Value="False" />
                                 <Setter Property="RenderTransform" Value="scale(0.7)" />
                                 <Setter Property="Margin" Value="0,125,0,0" />
@@ -159,4 +160,4 @@
     <ControlTheme x:Key="{x:Type suki:SukiHost}"
                   BasedOn="{StaticResource SukiHostTheme}"
                   TargetType="suki:SukiHost" />
-</ResourceDictionary>
\ No newline at end of file
+</ResourceDictionary>
diff --git a/SukiUI/Controls/SukiHost.axaml.cs b/SukiUI/Controls/SukiHost.axaml.cs
index efaf41b3..9eb87e68 100644
--- a/SukiUI/Controls/SukiHost.axaml.cs
+++ b/SukiUI/Controls/SukiHost.axaml.cs
@@ -4,11 +4,7 @@
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
 using Avalonia.Layout;
-using Avalonia.LogicalTree;
-using Avalonia.Media;
-using Avalonia.Rendering.Composition;
 using Avalonia.Threading;
-using SukiUI.Content;
 using SukiUI.Enums;
 using SukiUI.Helpers;
 using SukiUI.Models;
@@ -16,6 +12,13 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Avalonia.Interactivity;
+using Avalonia.LogicalTree;
+using Avalonia.Media;
+using Avalonia.Rendering.Composition;
+using Avalonia.Rendering.Composition.Animations;
+using Avalonia.VisualTree;
+using SukiUI.Content;
 
 namespace SukiUI.Controls;
 
@@ -24,8 +27,8 @@ namespace SukiUI.Controls;
 /// </summary>
 public class SukiHost : ContentControl
 {
-
-
+    
+  
 
     protected override Type StyleKeyOverride => typeof(SukiHost);
 
@@ -111,17 +114,17 @@ protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
             toastLoc == ToastLocation.BottomLeft
                 ? HorizontalAlignment.Left
                 : HorizontalAlignment.Right;
-
+        
         var b = e.NameScope.Get<Border>("PART_DialogBackground");
         b.Loaded += (sender, args) =>
         {
             var v = ElementComposition.GetElementVisual(b);
             CompositionAnimationHelper.MakeOpacityAnimated(v, 400);
-        };
-
-
+        }; 
+        
+     
     }
-
+    
 
     // TODO: Dialog API desperately needs to support a result or on-close callback.
     // TODO: Toasts and dialogs should be dragged out into their own discrete service and provided by a higher level service locator.
@@ -191,15 +194,12 @@ public static async Task ShowDialogAsync(object? content, bool showCardBehind =
 
     public static void ShowMessageBox(MessageBoxModel model, bool allowbackgroundclose = true)
     {
-
-
-        SukiHost.ShowDialog(new MessageBox()
-        {
+        
+        
+        SukiHost.ShowDialog(new MessageBox(){
             _onActionCallback = model.ActionButton,
-            Title = model.Title,
-            Content = model.Content,
-            ShowActionButton = model.ActionButtonContent != null,
-            ActionButtonContent = model.ActionButtonContent,
+            Title = model.Title, Content = model.Content, ShowActionButton = model.ActionButtonContent != null, 
+            ActionButtonContent = model.ActionButtonContent, 
             Icon = model.Type switch
             {
                 NotificationType.Info => Icons.InformationOutline,
@@ -208,16 +208,14 @@ public static void ShowMessageBox(MessageBoxModel model, bool allowbackgroundclo
                 NotificationType.Error => Icons.AlertOutline,
                 _ => Icons.InformationOutline
             }
-            ,
-            Foreground = model.Type switch
+            , Foreground = model.Type switch
             {
-                NotificationType.Info => SukiHost.GetGradient(Color.FromRgb(47, 84, 235)),
-                NotificationType.Success => SukiHost.GetGradient(Color.FromRgb(82, 196, 26)),
-                NotificationType.Warning => SukiHost.GetGradient(Color.FromRgb(240, 140, 22)),
-                NotificationType.Error => SukiHost.GetGradient(Color.FromRgb(245, 34, 45)),
-                _ => SukiHost.GetGradient(Color.FromRgb(89, 126, 255))
-            }
-        }, false, allowbackgroundclose);
+                NotificationType.Info => SukiHost.GetGradient(Color.FromRgb(47,84,235)),
+                NotificationType.Success => SukiHost.GetGradient(Color.FromRgb(82,196,26)),
+                NotificationType.Warning => SukiHost.GetGradient(Color.FromRgb(240,140,22)),
+                NotificationType.Error => SukiHost.GetGradient(Color.FromRgb(245,34,45)),
+                _ => SukiHost.GetGradient(Color.FromRgb(89,126,255))
+            }}, false, allowbackgroundclose);
 
     }
 
@@ -234,7 +232,7 @@ private static LinearGradientBrush GetGradient(Color c1)
             }
         };
     }
-
+    
     /// <summary>
     /// Attempts to close a dialog if one is shown in a specific window.
     /// </summary>
@@ -243,14 +241,14 @@ public static void CloseDialog(Window window)
         if (!Instances.TryGetValue(window, out var host))
             throw new InvalidOperationException("No SukiHost present in this window");
         host.IsDialogOpen = false;
-
+       
     }
 
     /// <summary>
     /// Attempts to close a dialog if one is shown in the earliest of any opened windows.
     /// </summary>
     public static void CloseDialog() => CloseDialog(_mainWindow);
-
+    
     /// <summary>
     /// Used to close the open dialog when the background is clicked, if this is allowed.
     /// </summary>
@@ -259,7 +257,7 @@ private static void BackgroundRequestClose(SukiHost host)
         if (!host.AllowBackgroundClose) return;
         host.IsDialogOpen = false;
     }
-
+    
     /// <summary>
     /// Shows a toast in the SukiHost - The default location is in the bottom right.
     /// This can be changed with an attached property in SukiWindow.
@@ -285,16 +283,15 @@ public static async Task ShowToast(Window window, ToastModel model)
                 toast.Animate(MarginProperty, new Thickness(0, 10, 0, -10), new Thickness(),
                     TimeSpan.FromMilliseconds(500));
             });
-        }
-        catch { }
+        }catch{}
     }
-
+    
     /// <summary>
     /// <inheritdoc cref="ShowToast(Window, SukiToastModel)"/>
     /// This method will show the toast in the earliest opened window.
     /// </summary>
     /// <param name="model">A pre-constructed <see cref="SukiToastModel"/>.</param>
-    public static Task ShowToast(ToastModel model) =>
+    public static Task ShowToast(ToastModel model) => 
         ShowToast(_mainWindow, model);
 
     /// <summary>
diff --git a/SukiUI/Controls/SukiSideMenu.axaml b/SukiUI/Controls/SukiSideMenu.axaml
index 30b7fc43..91bfcb0c 100644
--- a/SukiUI/Controls/SukiSideMenu.axaml
+++ b/SukiUI/Controls/SukiSideMenu.axaml
@@ -3,6 +3,9 @@
                     xmlns:content="clr-namespace:SukiUI.Content"
                     xmlns:suki="clr-namespace:SukiUI.Controls"
                     xmlns:theme="clr-namespace:SukiUI.Theme">
+    <Design.PreviewWith>
+        <suki:SukiSideMenu></suki:SukiSideMenu>
+    </Design.PreviewWith>
     <ControlTheme x:Key="SukiSideMenuStyle" TargetType="suki:SukiSideMenu">
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
         <Setter Property="Template">
@@ -26,7 +29,7 @@
                                             Cursor="Hand"
                                             DockPanel.Dock="Top">
                                         <Panel>
-                                            <!--<PathIcon Name="PART_ExpandIcon"
+                                            <PathIcon Name="PART_ExpandIcon"
                                                       Width="12"
                                                       Height="12"
                                                       Data="{x:Static content:Icons.ChevronLeft}"
@@ -36,7 +39,7 @@
                                                         <TransformOperationsTransition Property="RenderTransform" Duration="{StaticResource MediumAnimationDuration}" />
                                                     </Transitions>
                                                 </PathIcon.Transitions>
-                                            </PathIcon>-->
+                                            </PathIcon>
                                         </Panel>
                                     </Button>
                                     <Grid MinHeight="{TemplateBinding HeaderMinHeight}"
@@ -48,19 +51,44 @@
                                                     Content="{TemplateBinding FooterContent}"
                                                     DockPanel.Dock="Bottom"
                                                     IsVisible="{TemplateBinding IsMenuExpanded}" />
-                                    <Grid Name="PART_Spacer"
+                                    <Grid Name="PART_Spacer" 
                                           Height="15"
                                           DockPanel.Dock="Top" />
-                                    <ScrollViewer Name="PART_ScrollViewer"
-                                                  AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}"
-                                                  Background="{TemplateBinding Background}"
-                                                  BringIntoViewOnFocusChange="{TemplateBinding (ScrollViewer.BringIntoViewOnFocusChange)}"
-                                                  Classes="Stack"
-                                                  HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
-                                                  HorizontalSnapPointsType="{TemplateBinding (ScrollViewer.HorizontalSnapPointsType)}"
-                                                  IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
-                                                  VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}"
-                                                  VerticalSnapPointsType="{TemplateBinding (ScrollViewer.VerticalSnapPointsType)}">
+                                    <DockPanel>
+                                        <StackPanel IsVisible="{TemplateBinding IsSearchEnabled}" DockPanel.Dock="Top">
+                                            <StackPanel.Styles>
+                                                <Style Selector="suki|GlassCard:pointerover">
+                                                    <Setter Property="Width" Value="190"></Setter>
+                                                    <Setter Property="CornerRadius" Value="12" />
+                                                </Style>
+                                            </StackPanel.Styles>
+                                            <suki:GlassCard HorizontalAlignment="Right" IsAnimated="False" Width="42" Margin="15,10,15,15" CornerRadius="22" Height="42">
+                                                <suki:GlassCard.Transitions>
+                                                    <Transitions>
+                                                        <CornerRadiusTransition Property="CornerRadius" Duration="0:0:0.35"></CornerRadiusTransition>
+                                                        <DoubleTransition Property="Width" Duration="0:0:0.35"></DoubleTransition>
+                                                    </Transitions>
+                                                </suki:GlassCard.Transitions>
+                                                <DockPanel Margin="-3,-1,0,0">
+                                                <PathIcon Width="13" DockPanel.Dock="Left" VerticalAlignment="Center" Foreground="{DynamicResource SukiLowText}"
+                                                          Height="13"
+                                                          Data="{x:Static content:Icons.Search}" />
+                                                <TextBox Text="{Binding Search, Mode=TwoWay}" x:DataType="suki:SukiSideMenuService" DataContext="{x:Static suki:SukiSideMenuService.Instance}" BorderThickness="0" Watermark="Search"></TextBox>
+                                            </DockPanel>
+                                        </suki:GlassCard>
+                                            
+                                          <!--  <Border Height="1" Margin="20,0,20,15" Background="{DynamicResource SukiBorderBrush}"/> -->
+                                            </StackPanel>
+                                        <ScrollViewer Name="PART_ScrollViewer"
+                                                      AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}"
+                                                      Background="{TemplateBinding Background}"
+                                                      BringIntoViewOnFocusChange="{TemplateBinding (ScrollViewer.BringIntoViewOnFocusChange)}"
+                                                      Classes="Stack"
+                                                      HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
+                                                      HorizontalSnapPointsType="{TemplateBinding (ScrollViewer.HorizontalSnapPointsType)}"
+                                                      IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
+                                                      VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}"
+                                                      VerticalSnapPointsType="{TemplateBinding (ScrollViewer.VerticalSnapPointsType)}">
                                         <StackPanel theme:StackPanelExtensions.AnimatedScroll="True">
                                             <ItemsPresenter Name="PART_ItemsPresenter"
                                                             Margin="{TemplateBinding Padding}"
@@ -68,6 +96,7 @@
                                                             ItemsPanel="{TemplateBinding ItemsPanel}" />
                                         </StackPanel>
                                     </ScrollViewer>
+                                        </DockPanel>
                                 </DockPanel>
                             </Grid>
                         </Border>
diff --git a/SukiUI/Controls/SukiSideMenu.axaml.cs b/SukiUI/Controls/SukiSideMenu.axaml.cs
index 956e2c3e..af0be225 100644
--- a/SukiUI/Controls/SukiSideMenu.axaml.cs
+++ b/SukiUI/Controls/SukiSideMenu.axaml.cs
@@ -1,20 +1,29 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
-using Avalonia.Interactivity;
-using Avalonia.Layout;
 using Avalonia.Threading;
-using SukiUI.Enums;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reactive;
 using System.Reactive.Linq;
+using Avalonia.Interactivity;
+using Avalonia.Layout;
+using SukiUI.Enums;
 
 namespace SukiUI.Controls;
 
 public class SukiSideMenu : SelectingItemsControl
 {
+    public static readonly StyledProperty<bool> IsSearchEnabledProperty =
+        AvaloniaProperty.Register<SukiSideMenu, bool>(nameof(IsSearchEnabled), defaultValue: false);
+
+    public bool IsSearchEnabled
+    {
+        get => GetValue(IsSearchEnabledProperty);
+        set => SetValue(IsSearchEnabledProperty, value);
+    }
+    
     public static readonly StyledProperty<bool> IsToggleButtonVisibleProperty =
         AvaloniaProperty.Register<SukiSideMenu, bool>(nameof(IsToggleButtonVisible), defaultValue: true);
 
@@ -23,7 +32,7 @@ public bool IsToggleButtonVisible
         get => GetValue(IsToggleButtonVisibleProperty);
         set => SetValue(IsToggleButtonVisibleProperty, value);
     }
-
+    
     public static readonly StyledProperty<bool> IsMenuExpandedProperty =
         AvaloniaProperty.Register<SukiSideMenu, bool>(nameof(IsMenuExpanded), defaultValue: true);
 
@@ -32,7 +41,7 @@ public bool IsMenuExpanded
         get => GetValue(IsMenuExpandedProperty);
         set => SetValue(IsMenuExpandedProperty, value);
     }
-
+    
     public static readonly StyledProperty<int> OpenPaneLengthProperty =
         AvaloniaProperty.Register<SukiSideMenu, int>(nameof(OpenPaneLength), defaultValue: 220);
 
@@ -45,7 +54,7 @@ public int OpenPaneLength
             _ => throw new ArgumentOutOfRangeException($"OpenPaneLength must be greater than or equal to 200, but was {value}")
         });
     }
-
+    
     public static readonly StyledProperty<HorizontalAlignment> TogglePaneButtonPositionProperty =
         AvaloniaProperty.Register<SukiSideMenu, HorizontalAlignment>(nameof(TogglePaneButtonPosition), defaultValue: HorizontalAlignment.Right);
 
@@ -105,7 +114,7 @@ public object? FooterContent
 
     private IDisposable? _subscriptionDisposable;
     private IDisposable? _contentDisposable;
-
+    
     public SukiSideMenu()
     {
         SelectionMode = SelectionMode.Single | SelectionMode.AlwaysSelected;
@@ -115,16 +124,16 @@ public SukiSideMenu()
     private void MenuExpandedClicked()
     {
         IsMenuExpanded = !IsMenuExpanded;
-
-        if (_sideMenuItems.Any())
+        
+        if(_sideMenuItems.Any())
             foreach (var item in _sideMenuItems)
                 item.IsTopMenuExpanded = IsMenuExpanded;
-
-        else if (Items.FirstOrDefault() is SukiSideMenuItem)
+        
+        else if(Items.FirstOrDefault() is SukiSideMenuItem)
             foreach (SukiSideMenuItem? item in Items)
                 item!.IsTopMenuExpanded = IsMenuExpanded;
     }
-
+    
     protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
     {
         base.OnApplyTemplate(e);
@@ -136,16 +145,16 @@ protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
 
         e.NameScope.Get<Button>("PART_SidebarToggleButton").Click += (_, _) =>
             MenuExpandedClicked();
-
+      
 
         if (e.NameScope.Get<Grid>("PART_Spacer") is { } spacer)
         {
             spacer.IsVisible = IsSpacerVisible;
             var menuObservable = this.GetObservable(IsMenuExpandedProperty)
                 .Select(_ => Unit.Default);
-
+           
             _subscriptionDisposable = menuObservable
-
+               
                 .ObserveOn(new AvaloniaSynchronizationContext())
                 .Subscribe(_ => spacer.IsVisible = IsSpacerVisible);
         }
diff --git a/SukiUI/Controls/SukiSideMenuItem.axaml b/SukiUI/Controls/SukiSideMenuItem.axaml
index fa4e355c..04c7d342 100644
--- a/SukiUI/Controls/SukiSideMenuItem.axaml
+++ b/SukiUI/Controls/SukiSideMenuItem.axaml
@@ -25,14 +25,21 @@
     <ControlTheme x:Key="SukiSideMenuItemStyle" TargetType="suki:SukiSideMenuItem">
         <Setter Property="Template">
             <ControlTemplate>
-                <Border Name="PART_Border"
-                        MinWidth="85"
-                        Margin="15,2"
-                        Padding="30,15,15,15"
-                        Background="{DynamicResource SukiPrimaryColor0}"
-                        CornerRadius="{DynamicResource MediumCornerRadius}">
+                <Panel>
+                <Border 
+                         MaxHeight="{Binding #PSearch.MaxHeight}"
+                         Name="PART_Border"
+                         MinWidth="85"
+                         Margin="15,2"
+                         Padding="30,15,15,15"
+                         Background="{DynamicResource SukiPrimaryColor0}"
+                         CornerRadius="{DynamicResource MediumCornerRadius}">
+                   
                     <Border.Transitions>
                         <Transitions>
+                            <DoubleTransition Property="MaxHeight" Duration="0:0:1">
+                                <DoubleTransition.Easing>CubicEaseInOut</DoubleTransition.Easing>
+                            </DoubleTransition>
                             <BrushTransition Property="Background" Duration="0:0:0.35" />
                             <ThicknessTransition Property="Padding" Duration="0:0:0.35">
                                 <ThicknessTransition.Easing>CubicEaseInOut</ThicknessTransition.Easing>
@@ -70,8 +77,22 @@
 
                     </Panel>
                 </Border>
+                    <Panel Name="PSearch" x:DataType="suki:SukiSideMenuService" DataContext="{x:Static suki:SukiSideMenuService.Instance}">
+                        <Border.MaxHeight>
+                            <MultiBinding Converter="{x:Static suki:SideMenuSearchToVisibilityConverter.Instance}">
+                                <Binding Path="Search"  ></Binding>
+                                <TemplateBinding Property="Header"></TemplateBinding>
+                            </MultiBinding>
+                        </Border.MaxHeight>
+                    </Panel>
+                    
+                </Panel>
             </ControlTemplate>
         </Setter>
+        <Style Selector="^.Compact /template/ Border#PART_Border">
+            <Setter Property="Padding" Value="30,10,15,10" />
+            <Setter Property="CornerRadius" Value="12" />
+        </Style>
         <Style Selector="^:pointerover">
             <Style Selector="^ /template/ Border#PART_Border">
                 <Setter Property="Background" Value="{DynamicResource SukiPrimaryColor5}" />
@@ -90,6 +111,9 @@
                 <Style Selector="^[IsTopMenuExpanded=True] /template/ Border#PART_Border">
                     <Setter Property="Padding" Value="-10,15,15,15" />
                 </Style>
+                <Style Selector="^.Compact[IsTopMenuExpanded=True] /template/ Border#PART_Border">
+                    <Setter Property="Padding" Value="-10,10,15,10" />
+                </Style>
                 <Style Selector="^[IsTopMenuExpanded=True] /template/ ContentControl#PART_Icon">
                     <Setter Property="Opacity" Value="0" />
                 </Style>
diff --git a/SukiUI/Controls/SukiSideMenuItem.axaml.cs b/SukiUI/Controls/SukiSideMenuItem.axaml.cs
index e92ab0f6..71ab4aa6 100644
--- a/SukiUI/Controls/SukiSideMenuItem.axaml.cs
+++ b/SukiUI/Controls/SukiSideMenuItem.axaml.cs
@@ -1,7 +1,11 @@
+using System;
+using System.Globalization;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
+using Avalonia.Data;
+using Avalonia.Data.Converters;
 using Avalonia.Input;
 
 namespace SukiUI.Controls;
@@ -68,7 +72,7 @@ protected override void OnPointerPressed(PointerPressedEventArgs e)
             }
         }
     }
-
+    
     public static readonly StyledProperty<bool> IsContentMovableProperty =
         AvaloniaProperty.Register<SukiSideMenuItem, bool>(nameof(IsContentMovable), defaultValue: true);
 
@@ -77,7 +81,7 @@ public bool IsContentMovable
         get => GetValue(IsContentMovableProperty);
         set => SetValue(IsContentMovableProperty, value);
     }
-
+    
     public static readonly StyledProperty<bool> IsTopMenuExpandedProperty =
         AvaloniaProperty.Register<SukiSideMenuItem, bool>(nameof(IsTopMenuExpanded), defaultValue: true);
 
diff --git a/SukiUI/Controls/SukiSideMenuSearchService.cs b/SukiUI/Controls/SukiSideMenuSearchService.cs
new file mode 100644
index 00000000..f4581b64
--- /dev/null
+++ b/SukiUI/Controls/SukiSideMenuSearchService.cs
@@ -0,0 +1,72 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Globalization;
+using Avalonia.Data;
+using Avalonia.Data.Converters;
+using ReactiveUI;
+
+
+
+
+namespace SukiUI.Controls
+{
+    // sirdoombox will kill me because of this
+    internal class SukiSideMenuService : INotifyPropertyChanged
+    {
+        
+        private static SukiSideMenuService _instance;
+
+        public static SukiSideMenuService Instance 
+        {
+            get
+            {
+                if (_instance == null)
+                    _instance = new SukiSideMenuService();
+
+                return _instance;
+            }
+        }
+        
+        string search ="";
+        public string Search
+        {
+            get => search;
+            set
+            {
+                if (value != search)
+                {
+                    search = value;
+                    PropertyChanged?.Invoke(this, new PropertyChangedEventArgs("Search"));
+                }
+            }
+        }
+
+        public event PropertyChangedEventHandler? PropertyChanged;
+        
+    }
+    
+    public class SideMenuSearchToVisibilityConverter : IMultiValueConverter
+    {
+        public static readonly SideMenuSearchToVisibilityConverter Instance = new();
+
+        public object? Convert(IList<object?> values, Type targetType, object? parameter, CultureInfo culture)
+        {
+        
+            string search = (string)values[0];
+            string header = (string)values[1];
+           
+            if(header.ToLower().Contains(search.ToLower()))
+                return 200d;
+
+            return 0d;
+        
+        }
+
+        public object ConvertBack(object? value, Type targetType, 
+            object? parameter, CultureInfo culture)
+        {
+            throw new NotSupportedException();
+        }
+    }
+}
\ No newline at end of file
diff --git a/SukiUI/Controls/SukiToast.axaml b/SukiUI/Controls/SukiToast.axaml
index b40a23a7..b804fdaf 100644
--- a/SukiUI/Controls/SukiToast.axaml
+++ b/SukiUI/Controls/SukiToast.axaml
@@ -2,82 +2,99 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:content="clr-namespace:SukiUI.Content"
                     xmlns:suki="clr-namespace:SukiUI.Controls">
-   <Design.PreviewWith>
-       <suki:SukiToast Title="titre" Content="message"></suki:SukiToast>
-   </Design.PreviewWith>
+    <Design.PreviewWith>
+        <suki:SukiToast Title="titre" Content="message" />
+    </Design.PreviewWith>
     <ControlTheme x:Key="SukiToastTheme" TargetType="suki:SukiToast">
         <Setter Property="Template">
             <ControlTemplate>
                 <Panel>
-                 
+
                     <Border Name="PART_ToastCard"
-                            Width="300" 
+                            Width="300"
                             Margin="40,5,30,10"
-                            Padding="0" BorderThickness="1" BorderBrush="{DynamicResource SukiBorderBrush}"
-                            BoxShadow="{DynamicResource SukiPopupShadow}"
+                            Padding="0"
                             Background="{DynamicResource SukiCardBackground}"
+                            BorderBrush="{DynamicResource SukiBorderBrush}"
+                            BorderThickness="1"
+                            BoxShadow="{DynamicResource SukiPopupShadow}"
                             CornerRadius="15">
-                    <Border CornerRadius="15" ClipToBounds="True">
-                    <Panel>
-                        <Panel IsVisible="{DynamicResource IsDark}">
-                            <Panel Margin="0">
-                                <Panel.Background>
-                                    <LinearGradientBrush StartPoint="0%,0%" EndPoint="100%,100%">
-                                        <GradientStop Color="{DynamicResource SukiAccentColor5}" Offset="0"></GradientStop>
-                                        <GradientStop Color="{DynamicResource SukiPrimaryColor10}" Offset="1"></GradientStop>
+                        <Border ClipToBounds="True" CornerRadius="15">
+                            <Panel>
+                                <Panel IsVisible="{DynamicResource IsDark}">
+                                    <Panel Margin="0">
+                                        <Panel.Background>
+                                            <LinearGradientBrush StartPoint="0%,0%" EndPoint="100%,100%">
+                                                <GradientStop Offset="0" Color="{DynamicResource SukiAccentColor5}" />
+                                                <GradientStop Offset="1" Color="{DynamicResource SukiPrimaryColor10}" />
 
-                                    </LinearGradientBrush>
-                                </Panel.Background>
-                            </Panel>
-                        </Panel>
-                        
-                        <Panel IsVisible="{DynamicResource IsLight}">
-                            <Panel Margin="0">
-                                <Panel.Background>
-                                    <LinearGradientBrush StartPoint="0%,0%" EndPoint="100%,100%">
-                                        <GradientStop Color="{DynamicResource SukiAccentColor3}" Offset="0"></GradientStop>
-                                        <GradientStop Color="{DynamicResource SukiPrimaryColor3}" Offset="1"></GradientStop>
+                                            </LinearGradientBrush>
+                                        </Panel.Background>
+                                    </Panel>
+                                </Panel>
 
-                                    </LinearGradientBrush>
-                                </Panel.Background>
-                            </Panel>
-                            
-                        </Panel>
+                                <Panel IsVisible="{DynamicResource IsLight}">
+                                    <Panel Margin="0">
+                                        <Panel.Background>
+                                            <LinearGradientBrush StartPoint="0%,0%" EndPoint="100%,100%">
+                                                <GradientStop Offset="0" Color="{DynamicResource SukiAccentColor3}" />
+                                                <GradientStop Offset="1" Color="{DynamicResource SukiPrimaryColor3}" />
+
+                                            </LinearGradientBrush>
+                                        </Panel.Background>
+                                    </Panel>
+
+                                </Panel>
 
-                      
-                        <Panel Margin="20, 22">
-                        
-                        <DockPanel Margin="0,-7" LastChildFill="True">
-                        <StackPanel DockPanel.Dock="Top" Orientation="Horizontal">
-                               <ContentPresenter Margin="12,0,0,0"
-                                       FontSize="15"
-                                       FontWeight="DemiBold"
-                                       Foreground="{DynamicResource SukiText}"
-                                       Content="{TemplateBinding Title}" />
-                        </StackPanel>
-                            <Button Name="ButtonAction" FontSize="14" Padding="14,6" DockPanel.Dock="Bottom" IsVisible="{TemplateBinding ShowActionButton}" HorizontalAlignment="Right" Margin="0,14,0,0" Content="{TemplateBinding ActionButtonContent}">
-                            </Button>
-                        <ContentPresenter Margin="12,10,0,0"
-                                          Content="{TemplateBinding Content}"
-                                          Foreground="{DynamicResource SukiText}"
-                                          TextWrapping="Wrap" />
-                        
-                    </DockPanel>
-                    </Panel>
-                    </Panel>
+
+                                <Panel Margin="20,22">
+
+                                    <DockPanel Margin="0,-7" LastChildFill="True">
+                                        <StackPanel DockPanel.Dock="Top" Orientation="Horizontal">
+                                            <ContentPresenter Margin="12,0,0,0"
+                                                              Content="{TemplateBinding Title}"
+                                                              FontSize="15"
+                                                              FontWeight="{DynamicResource DefaultDemiBold}"
+                                                              Foreground="{DynamicResource SukiText}" />
+                                        </StackPanel>
+                                        <Button Name="ButtonAction"
+                                                Margin="0,14,0,0"
+                                                Padding="14,6"
+                                                HorizontalAlignment="Right"
+                                                Content="{TemplateBinding ActionButtonContent}"
+                                                DockPanel.Dock="Bottom"
+                                                FontSize="14"
+                                                IsVisible="{TemplateBinding ShowActionButton}" />
+                                        <ContentPresenter Margin="12,10,0,0"
+                                                          Content="{TemplateBinding Content}"
+                                                          Foreground="{DynamicResource SukiText}"
+                                                          TextWrapping="Wrap" />
+
+                                    </DockPanel>
+                                </Panel>
+                            </Panel>
+                        </Border>
                     </Border>
-                </Border>
-                    <Border  BoxShadow="{DynamicResource SukiSmallPopupShadow}"
-                             Margin="22,0,0,0" Background="{DynamicResource SukiCardBackground}" Width="35" Height="35" CornerRadius="35" VerticalAlignment="Center" HorizontalAlignment="Left">
-                        <Border CornerRadius="35" ClipToBounds="True">
-                        <Panel>
-                            <Panel  Opacity="1" Background="{TemplateBinding Foreground}"></Panel>
-                           <PathIcon Width="15" Margin="0,0,0,0"
-                                      Height="15" HorizontalAlignment="Center" VerticalAlignment="Center"
-                                      Data="{TemplateBinding Icon}"
-                                      Foreground="White" />
+                    <Border Width="35"
+                            Height="35"
+                            Margin="22,0,0,0"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            Background="{DynamicResource SukiCardBackground}"
+                            BoxShadow="{DynamicResource SukiSmallPopupShadow}"
+                            CornerRadius="35">
+                        <Border ClipToBounds="True" CornerRadius="35">
+                            <Panel>
+                                <Panel Background="{TemplateBinding Foreground}" Opacity="1" />
+                                <PathIcon Width="15"
+                                          Height="15"
+                                          Margin="0,0,0,0"
+                                          HorizontalAlignment="Center"
+                                          VerticalAlignment="Center"
+                                          Data="{TemplateBinding Icon}"
+                                          Foreground="White" />
 
-                        </Panel>
+                            </Panel>
                         </Border>
                     </Border>
                 </Panel>
diff --git a/SukiUI/Controls/SukiToast.axaml.cs b/SukiUI/Controls/SukiToast.axaml.cs
index 78819afa..5de8e5bf 100644
--- a/SukiUI/Controls/SukiToast.axaml.cs
+++ b/SukiUI/Controls/SukiToast.axaml.cs
@@ -2,20 +2,21 @@
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
 using Avalonia.Input;
+using SukiUI.Models;
+using System;
+using System.Timers;
 using Avalonia.Interactivity;
+using Avalonia.Media;
 using SukiUI.ColorTheme;
 using SukiUI.Content;
 using SukiUI.Enums;
-using SukiUI.Models;
-using System;
-using System.Timers;
 
 namespace SukiUI.Controls;
 
 public class SukiToast : ContentControl
 {
     protected override Type StyleKeyOverride => typeof(SukiToast);
-
+    
     internal SukiHost Host { get; private set; }
 
     private readonly Timer _timer = new();
@@ -33,7 +34,7 @@ private async void TimerOnElapsed(object sender, ElapsedEventArgs e)
         _timer.Stop();
         await SukiHost.ClearToast(this);
     }
-
+    
     public static readonly StyledProperty<object?> IconProperty =
         AvaloniaProperty.Register<SukiToast, object?>(nameof(Icon));
 
@@ -42,7 +43,7 @@ public object? Icon
         get => GetValue(IconProperty);
         set => SetValue(IconProperty, value);
     }
-
+    
     public static readonly StyledProperty<string> TitleProperty =
         AvaloniaProperty.Register<SukiToast, string>(nameof(Title));
 
@@ -51,7 +52,7 @@ public string Title
         get => GetValue(TitleProperty);
         set => SetValue(TitleProperty, value);
     }
-
+    
     public static readonly StyledProperty<bool> ShowActionButtonProperty =
         AvaloniaProperty.Register<SukiToast, bool>(nameof(ShowActionButton));
 
@@ -60,7 +61,7 @@ public bool ShowActionButton
         get => GetValue(ShowActionButtonProperty);
         set => SetValue(ShowActionButtonProperty, value);
     }
-
+    
     public static readonly StyledProperty<string> ActionButtonContentProperty =
         AvaloniaProperty.Register<SukiToast, string>(nameof(ActionButtonContent));
 
@@ -89,10 +90,10 @@ private async void ToastCardClickedHandler(object o, PointerPressedEventArgs poi
         _onClickedCallback = null;
         await SukiHost.ClearToast(this);
     }
-
+    
     // Icon Foreground Brushes
     // Note: it would be better to place them into a resource dictionary, but findResource performs slightly slower
-
+    
 
     public void Initialize(ToastModel model, SukiHost host)
     {
@@ -128,7 +129,7 @@ public void Initialize(ToastModel model, SukiHost host)
             _ => NotificationColor.InfoIconForeground
         };
         _onClickedCallback = model.OnClicked;
-
+       
         _timer.Interval = model.Lifetime?.TotalMilliseconds ?? TimeSpan.FromSeconds(6).TotalMilliseconds;
         _timer.Start();
         DockPanel.SetDock(this, Dock.Bottom);
diff --git a/SukiUI/Controls/SukiTransitioningContentControl.axaml.cs b/SukiUI/Controls/SukiTransitioningContentControl.axaml.cs
index 56383ebf..e0d10ba3 100644
--- a/SukiUI/Controls/SukiTransitioningContentControl.axaml.cs
+++ b/SukiUI/Controls/SukiTransitioningContentControl.axaml.cs
@@ -1,14 +1,16 @@
+using System;
+using System.Reactive.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using Avalonia;
 using Avalonia.Animation;
 using Avalonia.Controls;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
+using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Styling;
 using Avalonia.Threading;
-using System;
-using System.Reactive.Linq;
-using System.Threading;
 
 namespace SukiUI.Controls
 {
@@ -52,7 +54,7 @@ public object? Content
 
         private static readonly Animation FadeIn;
         private static readonly Animation FadeOut;
-
+        
         private ContentPresenter To => _isFirstBufferActive ? _secondBuffer : _firstBuffer;
         private ContentPresenter From => _isFirstBufferActive ? _firstBuffer : _secondBuffer;
 
@@ -149,11 +151,14 @@ protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         public void PushContent(object? content)
         {
             if (content is null) return;
-
+            
             _animCancellationToken.Cancel();
             _animCancellationToken.Dispose();
             _animCancellationToken = new CancellationTokenSource();
 
+            FirstBuffer = null;
+            SecondBuffer = null;
+            
             if (_isFirstBufferActive) SecondBuffer = content;
             else FirstBuffer = content;
             try
diff --git a/SukiUI/Controls/SukiWindow.axaml b/SukiUI/Controls/SukiWindow.axaml
index 9ae12882..4bd9993b 100644
--- a/SukiUI/Controls/SukiWindow.axaml
+++ b/SukiUI/Controls/SukiWindow.axaml
@@ -28,8 +28,10 @@
                                                  Style="{TemplateBinding BackgroundStyle}"
                                                  TransitionTime="{TemplateBinding BackgroundTransitionTime}"
                                                  TransitionsEnabled="{TemplateBinding BackgroundTransitionsEnabled}" />
-                            <Panel Background="White" Opacity="0.1" IsVisible="{DynamicResource IsLight}" />
-                           
+                            <Panel Background="White"
+                                   IsVisible="{DynamicResource IsLight}"
+                                   Opacity="0.1" />
+
                             <DockPanel LastChildFill="True">
                                 <Panel DockPanel.Dock="Top">
                                     <Panel.Styles>
@@ -78,7 +80,7 @@
                                                         <ItemsControl ItemsSource="{TemplateBinding RightWindowTitleBarControls}">
                                                             <ItemsControl.ItemsPanel>
                                                                 <ItemsPanelTemplate>
-                                                                    <StackPanel Orientation="Horizontal" FlowDirection="RightToLeft"/>
+                                                                    <StackPanel FlowDirection="RightToLeft" Orientation="Horizontal" />
                                                                 </ItemsPanelTemplate>
                                                             </ItemsControl.ItemsPanel>
                                                         </ItemsControl>
@@ -116,7 +118,7 @@
                 </Border>
             </ControlTemplate>
         </Setter>
-        
+
         <Style Selector="^[WindowState=Maximized] /template/ PathIcon#MaximizeIcon">
             <Setter Property="Data" Value="{x:Static icons:Icons.WindowRestore}" />
         </Style>
diff --git a/SukiUI/Controls/SukiWindow.axaml.cs b/SukiUI/Controls/SukiWindow.axaml.cs
index 5d1b0c71..1ed0d5af 100644
--- a/SukiUI/Controls/SukiWindow.axaml.cs
+++ b/SukiUI/Controls/SukiWindow.axaml.cs
@@ -1,41 +1,23 @@
 using Avalonia;
-using Avalonia.Collections;
 using Avalonia.Controls;
-using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Controls.Primitives;
 using Avalonia.Input;
-using Avalonia.Interactivity;
 using Avalonia.Media;
 using Avalonia.Threading;
-using SukiUI.Enums;
 using System;
 using System.Reactive;
 using System.Reactive.Linq;
 using System.Runtime.InteropServices;
+using Avalonia.Collections;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Interactivity;
+using SukiUI.Enums;
+using SukiUI.Utilities;
 
 namespace SukiUI.Controls;
 
 public class SukiWindow : Window
 {
-    public SukiWindow()
-    {
-        MenuItems = new AvaloniaList<MenuItem>();
-        SetSystemDecorationsBasedOnPlatform();
-    }
-
-    private void SetSystemDecorationsBasedOnPlatform()
-    {
-        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-        {
-            this.SystemDecorations = SystemDecorations.Full;
-        }
-        else
-        {
-            this.SystemDecorations = SystemDecorations.BorderOnly;
-        }
-    }
-
-
     protected override Type StyleKeyOverride => typeof(SukiWindow);
 
     public static readonly StyledProperty<double> TitleFontSizeProperty =
@@ -48,8 +30,7 @@ public double TitleFontSize
     }
 
     public static readonly StyledProperty<FontWeight> TitleFontWeightProperty =
-        AvaloniaProperty.Register<SukiWindow, FontWeight>(nameof(TitleFontWeight),
-            defaultValue: FontWeight.Bold);
+        AvaloniaProperty.Register<SukiWindow, FontWeight>(nameof(TitleFontWeight), defaultValue: FontWeight.Bold);
 
     public FontWeight TitleFontWeight
     {
@@ -101,8 +82,7 @@ public AvaloniaList<MenuItem>? MenuItems
         get => GetValue(MenuItemsProperty);
         set => SetValue(MenuItemsProperty, value);
     }
-
-
+    
     public static readonly StyledProperty<bool> CanMinimizeProperty =
         AvaloniaProperty.Register<SukiWindow, bool>(nameof(CanMinimize), defaultValue: true);
 
@@ -121,7 +101,7 @@ public bool CanMove
         set => SetValue(CanMoveProperty, value);
     }
 
-    // BACKGROUND PROPERTIES
+    // Background properties
     public static readonly StyledProperty<bool> BackgroundAnimationEnabledProperty =
         AvaloniaProperty.Register<SukiWindow, bool>(nameof(BackgroundAnimationEnabled), defaultValue: false);
 
@@ -134,8 +114,7 @@ public bool BackgroundAnimationEnabled
     public static readonly StyledProperty<SukiBackgroundStyle> BackgroundStyleProperty =
         AvaloniaProperty.Register<SukiWindow, SukiBackgroundStyle>(nameof(BackgroundStyle),
             defaultValue: SukiBackgroundStyle.Bubble);
-
-
+    
     /// <inheritdoc cref="SukiBackground.Style"/>
     public SukiBackgroundStyle BackgroundStyle
     {
@@ -155,18 +134,17 @@ public string? BackgroundShaderFile
 
     public static readonly StyledProperty<string?> BackgroundShaderCodeProperty =
         AvaloniaProperty.Register<SukiWindow, string?>(nameof(BackgroundShaderCode));
-
-
+    
     /// <inheritdoc cref="SukiBackground.ShaderCode"/>
     public string? BackgroundShaderCode
     {
         get => GetValue(BackgroundShaderCodeProperty);
         set => SetValue(BackgroundShaderCodeProperty, value);
     }
-
+    
     public static readonly StyledProperty<bool> BackgroundTransitionsEnabledProperty =
         AvaloniaProperty.Register<SukiBackground, bool>(nameof(BackgroundTransitionsEnabled), defaultValue: false);
-
+    
     /// <inheritdoc cref="SukiBackground.TransitionsEnabled"/>
     public bool BackgroundTransitionsEnabled
     {
@@ -176,7 +154,7 @@ public bool BackgroundTransitionsEnabled
 
     public static readonly StyledProperty<double> BackgroundTransitionTimeProperty =
         AvaloniaProperty.Register<SukiBackground, double>(nameof(BackgroundTransitionTime), defaultValue: 1.0);
-
+    
     /// <inheritdoc cref="SukiBackground.TransitionTime"/>
     public double BackgroundTransitionTime
     {
@@ -184,10 +162,13 @@ public double BackgroundTransitionTime
         set => SetValue(BackgroundTransitionTimeProperty, value);
     }
 
-    public static readonly StyledProperty<Avalonia.Controls.Controls> RightWindowTitleBarControlsProperty = AvaloniaProperty.Register<SukiWindow, Avalonia.Controls.Controls>(nameof(RightWindowTitleBarControls), defaultValue: new Avalonia.Controls.Controls());
+    public static readonly StyledProperty<Avalonia.Controls.Controls> RightWindowTitleBarControlsProperty = 
+        AvaloniaProperty.Register<SukiWindow, Avalonia.Controls.Controls>(nameof(RightWindowTitleBarControls), 
+            defaultValue: new Avalonia.Controls.Controls());
 
     /// <summary>
-    /// Controls that are displayed on the right side of the title bar, to the left of the normal window control buttons. (Displays provided controls right-to-left)
+    /// Controls that are displayed on the right side of the title bar,
+    /// to the left of the normal window control buttons. (Displays provided controls right-to-left)
     /// </summary>
     public Avalonia.Controls.Controls RightWindowTitleBarControls
     {
@@ -195,23 +176,41 @@ public Avalonia.Controls.Controls RightWindowTitleBarControls
         set => SetValue(RightWindowTitleBarControlsProperty, value);
     }
 
+    public SukiWindow()
+    {
+        MenuItems = new AvaloniaList<MenuItem>();
+        RightWindowTitleBarControls = new Avalonia.Controls.Controls();
+        SetSystemDecorationsBasedOnPlatform();
+    }
+
+    private void SetSystemDecorationsBasedOnPlatform()
+    {
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+        {
+            this.SystemDecorations = SystemDecorations.Full;
+        }
+        else
+        {
+            this.SystemDecorations = SystemDecorations.BorderOnly;
+        }
+    }
+
     private IDisposable? _subscriptionDisposables;
-    private SukiBackground? _background;
 
     protected override void OnLoaded(RoutedEventArgs e)
     {
         base.OnLoaded(e);
+        
         if (Application.Current?.ApplicationLifetime is not IClassicDesktopStyleApplicationLifetime desktop)
             return;
-        if (desktop.MainWindow is SukiWindow s && s != this)
+        if (desktop.MainWindow is SukiWindow window && window != this)
         {
-            if (Icon == null) Icon = s.Icon;
+            Icon ??= window.Icon;
             // This would be nice to do, but obviously LogoContent is a control and you can't attach it twice.
             // if (LogoContent is null) LogoContent = s.LogoContent;
         }
     }
-
-
+    
     protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
     {
         base.OnApplyTemplate(e);
@@ -226,10 +225,12 @@ protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
             if (e.NameScope.Get<Button>("PART_MaximizeButton") is { } maximize)
             {
                 maximize.Click += OnMaximizeButtonClicked;
-                bool pointerOnMaxButton = false;
+                var pointerOnMaxButton = false;
                 var setter = typeof(Button).GetProperty("IsPointerOver");
 
-                var proc = (IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam, ref bool handled) =>
+                // Windows Snap Layout
+                var proc = 
+                    (IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam, ref bool handled) =>
                 {
                     switch (msg)
                     {
@@ -244,17 +245,17 @@ protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
                             var point = new PixelPoint(
                                 (short)(ToInt32(lParam) & 0xffff),
                                 (short)(ToInt32(lParam) >> 16));
-                            var buttonLeftTop = maximize.PointToScreen(new(0, 0));
-                            var x = (buttonLeftTop.X - point.X) / RenderScaling;
-                            var y = (point.Y - buttonLeftTop.Y) / RenderScaling;
+                            var buttonLeftTop = maximize.PointToScreen(new Point(0, 0));
+                            var x               = (buttonLeftTop.X - point.X)         / RenderScaling;
+                            var y               = (point.Y         - buttonLeftTop.Y) / RenderScaling;
                             if (new Rect(0, 0,
                                     maximize.DesiredSize.Width,
                                     maximize.DesiredSize.Height)
                                 .Contains(new Point(x, y)))
                             {
                                 setter?.SetValue(maximize, true);
-                                pointerOnMaxButton = true;
-                                handled = true;
+                                pointerOnMaxButton   = true;
+                                handled              = true;
                                 return (IntPtr)9;
                             }
 
@@ -264,22 +265,16 @@ protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
                     }
 
                     return IntPtr.Zero;
-
-                    static int ToInt32(IntPtr ptr) => IntPtr.Size == 4 ? ptr.ToInt32() : (int)(ptr.ToInt64() & 0xffffffff);
+                    
+                    static int ToInt32(IntPtr ptr) => IntPtr.Size == 4 
+                                                    ? ptr.ToInt32() : (int)(ptr.ToInt64() & 0xffffffff);
                 };
-
-
-
+                
                 Win32Properties.AddWndProcHookCallback(this, new Win32Properties.CustomWndProcHookCallback(proc));
-            }
+            } 
 
             if (e.NameScope.Get<Button>("PART_MinimizeButton") is { } minimize)
-                minimize.Click += (_, _) =>
-                {
-
-                    WindowState = WindowState.Minimized;
-
-                };
+                minimize.Click += (_, _) => WindowState = WindowState.Minimized;
 
             if (e.NameScope.Get<Button>("PART_CloseButton") is { } close)
                 close.Click += (_, _) => Close();
@@ -292,6 +287,7 @@ protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         }
         catch
         {
+            // ignored
         }
     }
 
@@ -299,8 +295,8 @@ private void OnMaximizeButtonClicked(object? sender, RoutedEventArgs args)
     {
         if (!CanResize) return;
         WindowState = WindowState == WindowState.Maximized
-            ? WindowState.Normal
-            : WindowState.Maximized;
+                    ? WindowState.Normal
+                    : WindowState.Maximized;
     }
 
     private void OnWindowStateChanged(WindowState state)
@@ -320,5 +316,4 @@ protected override void OnUnloaded(RoutedEventArgs e)
         base.OnUnloaded(e);
         _subscriptionDisposables?.Dispose();
     }
-
 }
\ No newline at end of file
diff --git a/SukiUI/Controls/WaveProgress.axaml b/SukiUI/Controls/WaveProgress.axaml
index 34a0a8e0..4ed76f76 100644
--- a/SukiUI/Controls/WaveProgress.axaml
+++ b/SukiUI/Controls/WaveProgress.axaml
@@ -1,5 +1,4 @@
-
-<UserControl x:Class="SukiUI.Controls.WaveProgress"
+<UserControl x:Class="SukiUI.Controls.WaveProgress"
              xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -24,9 +23,9 @@
                             ClipToBounds="False"
                             CornerRadius="100">
                         <Border.Resources>
-                            <waveProgress:WaveProgressValueConverter x:Key="WValueConvert" />
-                            <waveProgress:WaveProgressValueTextConverter x:Key="WValueTextConvert" />
-                            <waveProgress:WaveProgressValueColorConverter x:Key="WValueColorConvert" />
+                            <waveProgress:WaveProgressValueConverter x:Key="WValueConverter" />
+                            <waveProgress:WaveProgressValueTextConverter x:Key="WValueTextConverter" />
+                            <waveProgress:WaveProgressValueColorConverter x:Key="WValueColorConverter" />
                             <waveProgress:WaveProgressGradientOffsetConverter x:Key="WGradientConverter" />
                         </Border.Resources>
 
@@ -39,7 +38,7 @@
                             <Panel>
                                 <Canvas Width="200" Height="200">
                                     <Path Canvas.Top="{TemplateBinding Value,
-                                                                       Converter={StaticResource WValueConvert}}"
+                                                                       Converter={StaticResource WValueConverter}}"
                                           Classes="WaveAnimatedFast"
                                           Data="M 0,50 H 700 V 350 H 0 M 0,50 C 25,55 75,45 100,50 S 175,55 200,50 S 275,45 300,50 S 375,55 400,50 S 475,45 500,50 S 575,55 600,50 S 675,45 700,50"
                                           Fill="{TemplateBinding Value,
@@ -57,7 +56,7 @@
                                         </Path.Transitions>
                                     </Path>
                                     <Path Canvas.Top="{TemplateBinding Value,
-                                                                       Converter={StaticResource WValueConvert}}"
+                                                                       Converter={StaticResource WValueConverter}}"
                                           Classes="WaveAnimated"
                                           Data="M 0,50 H 700 V 350 H 0 M 0,50 C 25,55 75,45 100,50 S 175,55 200,50 S 275,45 300,50 S 375,55 400,50 S 475,45 500,50 S 575,55 600,50 S 675,45 700,50"
                                           Fill="{TemplateBinding Value,
@@ -68,7 +67,6 @@
                                             <Transitions>
                                                 <DoubleTransition Property="Canvas.Top" Duration="0:0:2.5">
                                                     <DoubleTransition.Easing>
-
                                                         <CircularEaseOut />
                                                     </DoubleTransition.Easing>
                                                 </DoubleTransition>
@@ -82,9 +80,9 @@
                                            VerticalAlignment="Center"
                                            Classes="h2"
                                            Foreground="{TemplateBinding Value,
-                                                                        Converter={StaticResource WValueColorConvert}}"
+                                                                        Converter={StaticResource WValueColorConverter}}"
                                            Text="{TemplateBinding Value,
-                                                                  Converter={StaticResource WValueTextConvert}}">
+                                                                  Converter={StaticResource WValueTextConverter}}">
                                     <TextBlock.Transitions>
                                         <Transitions>
                                             <DoubleTransition Property="Opacity" Duration="0:0:0.3" />
diff --git a/SukiUI/Controls/WaveProgress.axaml.cs b/SukiUI/Controls/WaveProgress.axaml.cs
index 30018738..e9eec54d 100644
--- a/SukiUI/Controls/WaveProgress.axaml.cs
+++ b/SukiUI/Controls/WaveProgress.axaml.cs
@@ -9,6 +9,7 @@ public partial class WaveProgress : UserControl
     public WaveProgress()
     {
         InitializeComponent();
+        
         var theme = SukiTheme.GetInstance();
         theme.OnBaseThemeChanged += _ =>
         {
@@ -27,33 +28,24 @@ private void InitializeComponent()
         AvaloniaXamlLoader.Load(this);
     }
 
-    private double _value = 50;
+    public static readonly StyledProperty<double> ValueProperty =
+        AvaloniaProperty.Register<WaveProgress, double>(nameof(Value), defaultValue: 50);
 
     public double Value
     {
-        get => _value;
+        get => GetValue(ValueProperty);
         set
         {
-            if (value is < 0 or > 100)
-                return;
-
-            SetValue(ValueProperty, value);
+            if (value is >= 0 and <= 100)
+                SetValue(ValueProperty, value);
         }
     }
-
-    public static readonly StyledProperty<double> ValueProperty =
-        AvaloniaProperty.Register<CircleProgressBar, double>(nameof(Value), defaultValue: 50);
-
-
-
+    
     public static readonly StyledProperty<bool> IsTextVisibleProperty = AvaloniaProperty.Register<WaveProgress, bool>(nameof(IsTextVisible), defaultValue: true);
 
     public bool IsTextVisible
     {
-        get { return GetValue(IsTextVisibleProperty); }
-        set
-        {
-            SetValue(IsTextVisibleProperty, value);
-        }
+        get => GetValue(IsTextVisibleProperty);
+        set => SetValue(IsTextVisibleProperty, value);
     }
 }
\ No newline at end of file
diff --git a/SukiUI/Converters/InfoBadgeOverflowConverter.cs b/SukiUI/Converters/InfoBadgeOverflowConverter.cs
index 93ef5550..6a6aa5eb 100644
--- a/SukiUI/Converters/InfoBadgeOverflowConverter.cs
+++ b/SukiUI/Converters/InfoBadgeOverflowConverter.cs
@@ -1,11 +1,11 @@
-using Avalonia.Data.Converters;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
+using Avalonia.Data.Converters;
 
 namespace SukiUI.Converters;
 
-public class InfoBadgeOverflowConverter : IMultiValueConverter
+public class InfoBadgeOverflowConverter: IMultiValueConverter
 {
     public object? Convert(IList<object?> values, Type targetType, object? parameter, CultureInfo culture)
     {
@@ -19,7 +19,7 @@ public class InfoBadgeOverflowConverter : IMultiValueConverter
         {
             return overflowValue + overflowSuffix;
         }
-
+        
         return values[0];
     }
 }
\ No newline at end of file
diff --git a/SukiUI/Converters/SideMenuScrollerToOpacityMask.cs b/SukiUI/Converters/SideMenuScrollerToOpacityMask.cs
index 015fac4e..889cd97d 100644
--- a/SukiUI/Converters/SideMenuScrollerToOpacityMask.cs
+++ b/SukiUI/Converters/SideMenuScrollerToOpacityMask.cs
@@ -1,18 +1,18 @@
-using Avalonia;
-using Avalonia.Data.Converters;
-using Avalonia.Media;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+using Avalonia;
+using Avalonia.Data.Converters;
+using Avalonia.Media;
 
 namespace SukiUI.Converters
 {
     public class SideMenuScrollerToOpacityMask : IMultiValueConverter
     {
         private readonly Func<double, double, IBrush?> _func;
-
-        public static SideMenuScrollerToOpacityMask Top { get; } = new((x, y) => x > y ? TopBrush : Brushes.White);
-        public static SideMenuScrollerToOpacityMask Bottom { get; } = new((x, y) => x < y ? BottomBrush : Brushes.White);
+        
+        public static SideMenuScrollerToOpacityMask Top { get; } = new((x,y) => x > y ? TopBrush : Brushes.White);
+        public static SideMenuScrollerToOpacityMask Bottom { get; } = new((x,y) => x < y ? BottomBrush : Brushes.White);
 
         private static readonly LinearGradientBrush BottomBrush = new()
         {
@@ -24,7 +24,7 @@ public class SideMenuScrollerToOpacityMask : IMultiValueConverter
                 new(Colors.Transparent,1 )
             }
         };
-
+        
         private static readonly LinearGradientBrush TopBrush = new()
         {
             StartPoint = new RelativePoint(0.5, 1, RelativeUnit.Relative),
@@ -35,12 +35,12 @@ public class SideMenuScrollerToOpacityMask : IMultiValueConverter
                 new(Colors.Transparent,1 )
             }
         };
-
+        
         public SideMenuScrollerToOpacityMask(Func<double, double, IBrush?> func)
         {
             _func = func;
         }
-
+        
         public object? Convert(IList<object?> values, Type targetType, object? parameter, CultureInfo culture)
         {
             if (values.Count != 2) return null;
diff --git a/SukiUI/Converters/SideMenuScrollerToVisibilityBool.cs b/SukiUI/Converters/SideMenuScrollerToVisibilityBool.cs
index 020184af..4c3f4e6c 100644
--- a/SukiUI/Converters/SideMenuScrollerToVisibilityBool.cs
+++ b/SukiUI/Converters/SideMenuScrollerToVisibilityBool.cs
@@ -1,28 +1,28 @@
-using Avalonia.Data.Converters;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+using Avalonia.Data.Converters;
 
 namespace SukiUI.Converters
 {
     public class SideMenuScrollerToVisibilityBool : IMultiValueConverter
     {
-        public static SideMenuScrollerToVisibilityBool Up { get; } = new((x, y) => x > y);
+        public static SideMenuScrollerToVisibilityBool Up { get; } = new((x,y) => x > y);
 
         public static SideMenuScrollerToVisibilityBool Down { get; } = new((x, y) => x < y);
 
         private readonly Func<double, double, bool> _converter;
-
+        
         public SideMenuScrollerToVisibilityBool(Func<double, double, bool> converter)
         {
             _converter = converter;
         }
-
+        
         public object? Convert(IList<object?> values, Type targetType, object? parameter, CultureInfo culture)
         {
             if (values[0] is not double firstVal) return null;
             if (values[1] is not double secondVal) return null;
-            return _converter(firstVal, secondVal);
+            return _converter(firstVal,secondVal);
         }
     }
 }
\ No newline at end of file
diff --git a/SukiUI/Converters/WaveProgress/WaveProgressGradientOffsetConverter.cs b/SukiUI/Converters/WaveProgress/WaveProgressGradientOffsetConverter.cs
index d529fe04..2ce0c3a1 100644
--- a/SukiUI/Converters/WaveProgress/WaveProgressGradientOffsetConverter.cs
+++ b/SukiUI/Converters/WaveProgress/WaveProgressGradientOffsetConverter.cs
@@ -1,10 +1,10 @@
-using Avalonia;
+using System;
+using System.Globalization;
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Data.Converters;
 using Avalonia.Media;
 using Avalonia.Styling;
-using System;
-using System.Globalization;
 
 namespace SukiUI.Converters.WaveProgress;
 
@@ -16,7 +16,7 @@ public object Convert(object? value, Type targetType, object? parameter, Culture
     {
         if (value is not double v)
             return Brushes.Blue;
-
+            
         var primaryColor = (Color)(Application.Current!.FindResource("SukiPrimaryColor") ?? Colors.DodgerBlue);
         var accentColor = (Color)(Application.Current!.FindResource("SukiAccentColor") ?? Colors.Transparent);
 
diff --git a/SukiUI/Converters/WaveProgress/WaveProgressValueColorConverter.cs b/SukiUI/Converters/WaveProgress/WaveProgressValueColorConverter.cs
index f222d7af..b5adfc4a 100644
--- a/SukiUI/Converters/WaveProgress/WaveProgressValueColorConverter.cs
+++ b/SukiUI/Converters/WaveProgress/WaveProgressValueColorConverter.cs
@@ -1,9 +1,9 @@
-using Avalonia;
+using System;
+using System.Globalization;
+using Avalonia;
 using Avalonia.Data.Converters;
 using Avalonia.Media;
 using Avalonia.Styling;
-using System;
-using System.Globalization;
 
 namespace SukiUI.Converters.WaveProgress;
 
diff --git a/SukiUI/Converters/WaveProgress/WaveProgressValueConverter.cs b/SukiUI/Converters/WaveProgress/WaveProgressValueConverter.cs
index c3641a79..e04955b8 100644
--- a/SukiUI/Converters/WaveProgress/WaveProgressValueConverter.cs
+++ b/SukiUI/Converters/WaveProgress/WaveProgressValueConverter.cs
@@ -1,6 +1,6 @@
-using Avalonia.Data.Converters;
-using System;
+using System;
 using System.Globalization;
+using Avalonia.Data.Converters;
 
 namespace SukiUI.Converters.WaveProgress;
 
diff --git a/SukiUI/Converters/WaveProgress/WaveProgressValueTextConverter.cs b/SukiUI/Converters/WaveProgress/WaveProgressValueTextConverter.cs
index 16075cb9..a02aadf3 100644
--- a/SukiUI/Converters/WaveProgress/WaveProgressValueTextConverter.cs
+++ b/SukiUI/Converters/WaveProgress/WaveProgressValueTextConverter.cs
@@ -1,6 +1,6 @@
-using Avalonia.Data.Converters;
-using System;
+using System;
 using System.Globalization;
+using Avalonia.Data.Converters;
 
 namespace SukiUI.Converters.WaveProgress;
 
diff --git a/SukiUI/Enums/SukiBackgroundStyle.cs b/SukiUI/Enums/SukiBackgroundStyle.cs
index 990b7674..c0dc7f28 100644
--- a/SukiUI/Enums/SukiBackgroundStyle.cs
+++ b/SukiUI/Enums/SukiBackgroundStyle.cs
@@ -6,6 +6,6 @@ public enum SukiBackgroundStyle
         Flat,
         Bubble,
         BubbleStrong,
-
+       
     }
 }
\ No newline at end of file
diff --git a/SukiUI/Helpers/AnimationExtensions.cs b/SukiUI/Helpers/AnimationExtensions.cs
index bcf10b63..02268bf6 100644
--- a/SukiUI/Helpers/AnimationExtensions.cs
+++ b/SukiUI/Helpers/AnimationExtensions.cs
@@ -1,14 +1,14 @@
-using Avalonia;
+using System;
+using Avalonia;
 using Avalonia.Controls;
-using System;
 
 namespace SukiUI.Helpers
 {
     public static class AnimationExtensions
     {
 
-        public static readonly AttachedProperty<double> FadeInProperty = AvaloniaProperty.RegisterAttached<Control, double>("FadeIn", typeof(Control), defaultValue: 0);
-
+        public static readonly AttachedProperty<double> FadeInProperty = AvaloniaProperty.RegisterAttached<Control, double>("FadeIn", typeof(Control), defaultValue: 0);    
+ 
 
         public static double GetFadeIn(Control wrap)
         {
@@ -22,12 +22,12 @@ public static void SetFadeIn(Control interactElem, double value)
                 interactElem.Opacity = 0;
                 interactElem.AttachedToVisualTree += (sender, args) =>
                 {
-                    interactElem.Animate<double>(Control.OpacityProperty, 0, 1, TimeSpan.FromMilliseconds(value));
+                    interactElem.Animate<double>(Control.OpacityProperty, 0,1, TimeSpan.FromMilliseconds(value));
                 };
             }
             interactElem.SetValue(FadeInProperty, value);
         }
-
-
+    
+  
     }
 }
\ No newline at end of file
diff --git a/SukiUI/Helpers/CompositionAnimationHelper.cs b/SukiUI/Helpers/CompositionAnimationHelper.cs
index 8d669ed3..58e99385 100644
--- a/SukiUI/Helpers/CompositionAnimationHelper.cs
+++ b/SukiUI/Helpers/CompositionAnimationHelper.cs
@@ -1,6 +1,6 @@
+using System;
 using Avalonia.Rendering.Composition;
 using Avalonia.Rendering.Composition.Animations;
-using System;
 
 namespace SukiUI.Helpers
 {
@@ -10,7 +10,7 @@ public static void MakeScrollable(CompositionVisual compositionVisual, double mi
         {
             if (compositionVisual == null)
                 return;
-
+        
             Compositor compositor = compositionVisual.Compositor;
 
             var animationGroup = compositor.CreateAnimationGroup();
@@ -25,123 +25,123 @@ public static void MakeScrollable(CompositionVisual compositionVisual, double mi
             implicitAnimationCollection["Offset"] = animationGroup;
             compositionVisual.ImplicitAnimations = implicitAnimationCollection;
         }
+        
+            public static void MakeOpacityAnimated(CompositionVisual compositionVisual, double millis = 700)
+    {
+        if (compositionVisual == null)
+            return;
+
+        Compositor compositor = compositionVisual.Compositor;
+
+        var animationGroup = compositor.CreateAnimationGroup();
+      
+        
+        ScalarKeyFrameAnimation opacityAnimation = compositor.CreateScalarKeyFrameAnimation();
+        opacityAnimation.Target = "Opacity";
+        opacityAnimation.InsertExpressionKeyFrame(1.0f, "this.FinalValue");
+        opacityAnimation.Duration = TimeSpan.FromMilliseconds(millis);
+        
+    
+       
+        Vector3KeyFrameAnimation offsetAnimation = compositor.CreateVector3KeyFrameAnimation();
+        offsetAnimation.Target = "Offset";
+        offsetAnimation.InsertExpressionKeyFrame(1.0f, "this.FinalValue");
+        offsetAnimation.Duration = TimeSpan.FromMilliseconds(millis);
+        
+
+        animationGroup.Add(offsetAnimation);
+        animationGroup.Add(opacityAnimation);
+      
+        
+        ImplicitAnimationCollection implicitAnimationCollection = compositor.CreateImplicitAnimationCollection();
+        implicitAnimationCollection["Opacity"] = animationGroup;
+        implicitAnimationCollection["Offset"] = animationGroup;
+
+        
+        compositionVisual.ImplicitAnimations = implicitAnimationCollection;
 
-        public static void MakeOpacityAnimated(CompositionVisual compositionVisual, double millis = 700)
-        {
-            if (compositionVisual == null)
-                return;
-
-            Compositor compositor = compositionVisual.Compositor;
-
-            var animationGroup = compositor.CreateAnimationGroup();
-
-
-            ScalarKeyFrameAnimation opacityAnimation = compositor.CreateScalarKeyFrameAnimation();
-            opacityAnimation.Target = "Opacity";
-            opacityAnimation.InsertExpressionKeyFrame(1.0f, "this.FinalValue");
-            opacityAnimation.Duration = TimeSpan.FromMilliseconds(millis);
-
-
-
-            Vector3KeyFrameAnimation offsetAnimation = compositor.CreateVector3KeyFrameAnimation();
-            offsetAnimation.Target = "Offset";
-            offsetAnimation.InsertExpressionKeyFrame(1.0f, "this.FinalValue");
-            offsetAnimation.Duration = TimeSpan.FromMilliseconds(millis);
-
-
-            animationGroup.Add(offsetAnimation);
-            animationGroup.Add(opacityAnimation);
-
-
-            ImplicitAnimationCollection implicitAnimationCollection = compositor.CreateImplicitAnimationCollection();
-            implicitAnimationCollection["Opacity"] = animationGroup;
-            implicitAnimationCollection["Offset"] = animationGroup;
-
-
-            compositionVisual.ImplicitAnimations = implicitAnimationCollection;
-
-        }
-
-        public static void MakeSizeAnimated(CompositionVisual compositionVisual, double millis = 450)
-        {
-            if (compositionVisual == null)
-                return;
-
-            Compositor compositor = compositionVisual.Compositor;
-
-            var animationGroup = compositor.CreateAnimationGroup();
-
-            Vector2KeyFrameAnimation sizeAnimation = compositor.CreateVector2KeyFrameAnimation();
-            sizeAnimation.Target = "Size";
-            sizeAnimation.InsertExpressionKeyFrame(1.0f, "this.FinalValue");
-            sizeAnimation.Duration = TimeSpan.FromMilliseconds(millis);
-
-
-
-            Vector3KeyFrameAnimation offsetAnimation = compositor.CreateVector3KeyFrameAnimation();
-            offsetAnimation.Target = "Offset";
-            offsetAnimation.InsertExpressionKeyFrame(1.0f, "this.FinalValue");
-            offsetAnimation.Duration = TimeSpan.FromMilliseconds(millis);
-
-
-
-            animationGroup.Add(sizeAnimation);
-
-            animationGroup.Add(offsetAnimation);
-
-            ImplicitAnimationCollection implicitAnimationCollection = compositor.CreateImplicitAnimationCollection();
-            implicitAnimationCollection["Size"] = animationGroup;
-            implicitAnimationCollection["Offset"] = animationGroup;
-
-
-            compositionVisual.ImplicitAnimations = implicitAnimationCollection;
-
-        }
-
-
-        public static void MakeSizeOpacityAnimated(CompositionVisual compositionVisual, double millis = 450)
-        {
-            if (compositionVisual == null)
-                return;
-
-            Compositor compositor = compositionVisual.Compositor;
-
-            var animationGroup = compositor.CreateAnimationGroup();
-
-            Vector2KeyFrameAnimation sizeAnimation = compositor.CreateVector2KeyFrameAnimation();
-            sizeAnimation.Target = "Size";
-            sizeAnimation.InsertExpressionKeyFrame(1.0f, "this.FinalValue");
-            sizeAnimation.Duration = TimeSpan.FromMilliseconds(millis);
-
-
-
-            Vector3KeyFrameAnimation offsetAnimation = compositor.CreateVector3KeyFrameAnimation();
-            offsetAnimation.Target = "Offset";
-            offsetAnimation.InsertExpressionKeyFrame(1.0f, "this.FinalValue");
-            offsetAnimation.Duration = TimeSpan.FromMilliseconds(millis);
-
-
-            ScalarKeyFrameAnimation opacityAnimation = compositor.CreateScalarKeyFrameAnimation();
-            opacityAnimation.Target = "Opacity";
-            opacityAnimation.InsertExpressionKeyFrame(1.0f, "this.FinalValue");
-            opacityAnimation.Duration = TimeSpan.FromMilliseconds(millis);
-
-
-
-            animationGroup.Add(sizeAnimation);
-            animationGroup.Add(opacityAnimation);
-
-            animationGroup.Add(offsetAnimation);
-
-            ImplicitAnimationCollection implicitAnimationCollection = compositor.CreateImplicitAnimationCollection();
-            implicitAnimationCollection["Size"] = animationGroup;
-            implicitAnimationCollection["Opacity"] = animationGroup;
-            implicitAnimationCollection["Offset"] = animationGroup;
+    }
 
+    public static void MakeSizeAnimated(CompositionVisual compositionVisual, double millis =450)
+    {
+        if (compositionVisual == null)
+            return;
+
+        Compositor compositor = compositionVisual.Compositor;
+
+        var animationGroup = compositor.CreateAnimationGroup();
+        
+        Vector2KeyFrameAnimation sizeAnimation = compositor.CreateVector2KeyFrameAnimation();
+        sizeAnimation.Target = "Size";
+        sizeAnimation.InsertExpressionKeyFrame(1.0f, "this.FinalValue");
+        sizeAnimation.Duration = TimeSpan.FromMilliseconds(millis);
+        
+      
+        
+        Vector3KeyFrameAnimation offsetAnimation = compositor.CreateVector3KeyFrameAnimation();
+        offsetAnimation.Target = "Offset";
+        offsetAnimation.InsertExpressionKeyFrame(1.0f, "this.FinalValue");
+        offsetAnimation.Duration = TimeSpan.FromMilliseconds(millis);
+        
+        
+        
+        animationGroup.Add(sizeAnimation);
+
+        animationGroup.Add(offsetAnimation);
+        
+        ImplicitAnimationCollection implicitAnimationCollection = compositor.CreateImplicitAnimationCollection();
+        implicitAnimationCollection["Size"] = animationGroup;
+        implicitAnimationCollection["Offset"] = animationGroup;
+
+        
+        compositionVisual.ImplicitAnimations = implicitAnimationCollection;
 
-            compositionVisual.ImplicitAnimations = implicitAnimationCollection;
+    }
+    
+    
+    public static void MakeSizeOpacityAnimated(CompositionVisual compositionVisual, double millis =450)
+    {
+        if (compositionVisual == null)
+            return;
+
+        Compositor compositor = compositionVisual.Compositor;
+
+        var animationGroup = compositor.CreateAnimationGroup();
+        
+        Vector2KeyFrameAnimation sizeAnimation = compositor.CreateVector2KeyFrameAnimation();
+        sizeAnimation.Target = "Size";
+        sizeAnimation.InsertExpressionKeyFrame(1.0f, "this.FinalValue");
+        sizeAnimation.Duration = TimeSpan.FromMilliseconds(millis);
+        
+      
+        
+        Vector3KeyFrameAnimation offsetAnimation = compositor.CreateVector3KeyFrameAnimation();
+        offsetAnimation.Target = "Offset";
+        offsetAnimation.InsertExpressionKeyFrame(1.0f, "this.FinalValue");
+        offsetAnimation.Duration = TimeSpan.FromMilliseconds(millis);
+        
+        
+        ScalarKeyFrameAnimation opacityAnimation = compositor.CreateScalarKeyFrameAnimation();
+        opacityAnimation.Target = "Opacity";
+        opacityAnimation.InsertExpressionKeyFrame(1.0f, "this.FinalValue");
+        opacityAnimation.Duration = TimeSpan.FromMilliseconds(millis);
+
+        
+        
+        animationGroup.Add(sizeAnimation);
+        animationGroup.Add(opacityAnimation);
+
+        animationGroup.Add(offsetAnimation);
+        
+        ImplicitAnimationCollection implicitAnimationCollection = compositor.CreateImplicitAnimationCollection();
+        implicitAnimationCollection["Size"] = animationGroup;
+        implicitAnimationCollection["Opacity"] = animationGroup;
+        implicitAnimationCollection["Offset"] = animationGroup;
+
+        
+        compositionVisual.ImplicitAnimations = implicitAnimationCollection;
 
-        }
+    }
 
     }
 }
\ No newline at end of file
diff --git a/SukiUI/Helpers/FastNoiseLite.cs b/SukiUI/Helpers/FastNoiseLite.cs
index 739d0234..eab95ddc 100644
--- a/SukiUI/Helpers/FastNoiseLite.cs
+++ b/SukiUI/Helpers/FastNoiseLite.cs
@@ -61,65 +61,65 @@ public class FastNoiseLite
     private const short INLINE = 256; // MethodImplOptions.AggressiveInlining;
     private const short OPTIMISE = 512; // MethodImplOptions.AggressiveOptimization;
 
-    public enum NoiseType
-    {
+    public enum NoiseType 
+    { 
         OpenSimplex2,
         OpenSimplex2S,
         Cellular,
         Perlin,
         ValueCubic,
-        Value
+        Value 
     };
 
-    public enum RotationType3D
+    public enum RotationType3D 
     {
-        None,
-        ImproveXYPlanes,
-        ImproveXZPlanes
+        None, 
+        ImproveXYPlanes, 
+        ImproveXZPlanes 
     };
-
-    public enum FractalType
-    {
-        None,
-        FBm,
-        Ridged,
-        PingPong,
-        DomainWarpProgressive,
-        DomainWarpIndependent
+    
+    public enum FractalType 
+    {
+        None, 
+        FBm, 
+        Ridged, 
+        PingPong, 
+        DomainWarpProgressive, 
+        DomainWarpIndependent 
     };
 
-    public enum CellularDistanceFunction
+    public enum CellularDistanceFunction 
     {
-        Euclidean,
-        EuclideanSq,
-        Manhattan,
-        Hybrid
+        Euclidean, 
+        EuclideanSq, 
+        Manhattan, 
+        Hybrid 
     };
-
-    public enum CellularReturnType
-    {
-        CellValue,
-        Distance,
-        Distance2,
-        Distance2Add,
-        Distance2Sub,
-        Distance2Mul,
-        Distance2Div
+    
+    public enum CellularReturnType 
+    {
+        CellValue, 
+        Distance, 
+        Distance2, 
+        Distance2Add, 
+        Distance2Sub, 
+        Distance2Mul, 
+        Distance2Div 
     };
 
-    public enum DomainWarpType
-    {
-        OpenSimplex2,
-        OpenSimplex2Reduced,
-        BasicGrid
+    public enum DomainWarpType 
+    { 
+        OpenSimplex2, 
+        OpenSimplex2Reduced, 
+        BasicGrid 
     };
 
-    private enum TransformType3D
+    private enum TransformType3D 
     {
-        None,
-        ImproveXYPlanes,
-        ImproveXZPlanes,
-        DefaultOpenSimplex2
+        None, 
+        ImproveXYPlanes, 
+        ImproveXZPlanes, 
+        DefaultOpenSimplex2 
     };
 
     private int mSeed = 1337;
@@ -775,7 +775,7 @@ private void TransformNoiseCoordinate(ref FNLfloat x, ref FNLfloat y)
                     const FNLfloat SQRT3 = (FNLfloat)1.7320508075688772935274463415059;
                     const FNLfloat F2 = 0.5f * (SQRT3 - 1);
                     FNLfloat t = (x + y) * F2;
-                    x += t;
+                    x += t; 
                     y += t;
                 }
                 break;
@@ -862,13 +862,13 @@ private void TransformDomainWarpCoordinate(ref FNLfloat x, ref FNLfloat y)
         {
             case DomainWarpType.OpenSimplex2:
             case DomainWarpType.OpenSimplex2Reduced:
-                {
-                    const FNLfloat SQRT3 = (FNLfloat)1.7320508075688772935274463415059;
-                    const FNLfloat F2 = 0.5f * (SQRT3 - 1);
-                    FNLfloat t = (x + y) * F2;
-                    x += t; y += t;
-                }
-                break;
+            {
+                const FNLfloat SQRT3 = (FNLfloat)1.7320508075688772935274463415059;
+                const FNLfloat F2 = 0.5f * (SQRT3 - 1);
+                FNLfloat t = (x + y) * F2;
+                x += t; y += t;
+            }
+            break;
             default:
                 break;
         }
@@ -1185,8 +1185,7 @@ private float SingleOpenSimplex2(int seed, FNLfloat x, FNLfloat y, FNLfloat z)
             if (ax0 >= ay0 && ax0 >= az0)
             {
                 float b = a + ax0 + ax0;
-                if (b > 1)
-                {
+                if (b > 1) {
                     b -= 1;
                     value += (b * b) * (b * b) * GradCoord(seed, i - xNSign * PrimeX, j, k, x0 + xNSign, y0, z0);
                 }
diff --git a/SukiUI/Models/MessageBoxModel.cs b/SukiUI/Models/MessageBoxModel.cs
index 5e87a623..4b8da7ec 100644
--- a/SukiUI/Models/MessageBoxModel.cs
+++ b/SukiUI/Models/MessageBoxModel.cs
@@ -1,15 +1,15 @@
-using SukiUI.Enums;
 using System;
+using SukiUI.Enums;
 
 namespace SukiUI.Models
 {
-    public readonly record struct MessageBoxModel(string Title, object Content, NotificationType Type = NotificationType.Info, string? ActionButtonContent = null, Action? ActionButton = null)
+    public readonly record struct MessageBoxModel(string Title, object Content, NotificationType Type = NotificationType.Info, string? ActionButtonContent = null,Action? ActionButton= null)
     {
         public string Title { get; } = Title;
         public object Content { get; } = Content;
         public NotificationType Type { get; } = Type;
-
-
+        
+  
 
         public string? ActionButtonContent { get; } = ActionButtonContent;
         public Action? OnActionButtonClicked { get; } = ActionButton;
diff --git a/SukiUI/Models/SukiColorTheme.cs b/SukiUI/Models/SukiColorTheme.cs
index 3a29c8c1..a03011fe 100644
--- a/SukiUI/Models/SukiColorTheme.cs
+++ b/SukiUI/Models/SukiColorTheme.cs
@@ -1,6 +1,6 @@
+using System;
 using Avalonia.Media;
 using SukiUI.Enums;
-using System;
 
 namespace SukiUI.Models;
 
@@ -11,7 +11,7 @@ public record SukiColorTheme
     public Color Primary { get; }
 
     public IBrush PrimaryBrush => new SolidColorBrush(Primary);
-
+    
     public Color PrimaryDark { get; }
 
     public IBrush PrimaryDarkBrush => new SolidColorBrush(PrimaryDark);
@@ -19,7 +19,7 @@ public record SukiColorTheme
     public Color Accent { get; }
 
     public IBrush AccentBrush => new SolidColorBrush(Accent);
-
+    
     public Color AccentDark { get; }
 
     public IBrush AccentDarkBrush => new SolidColorBrush(AccentDark);
diff --git a/SukiUI/Models/ToastModel.cs b/SukiUI/Models/ToastModel.cs
index 84832b05..1e3d20a2 100644
--- a/SukiUI/Models/ToastModel.cs
+++ b/SukiUI/Models/ToastModel.cs
@@ -1,14 +1,14 @@
-using SukiUI.Enums;
 using System;
+using SukiUI.Enums;
 
 namespace SukiUI.Models;
 
-public readonly record struct ToastModel(string Title, object Content, NotificationType Type = NotificationType.Info, TimeSpan? Lifetime = null, Action? OnClicked = null, string? ActionButtonContent = null, Action? ActionButton = null)
+public readonly record struct ToastModel(string Title, object Content, NotificationType Type = NotificationType.Info, TimeSpan? Lifetime = null, Action? OnClicked = null, string? ActionButtonContent = null,Action? ActionButton= null)
 {
     public string Title { get; } = Title;
     public object Content { get; } = Content;
     public NotificationType Type { get; } = Type;
-    public TimeSpan? Lifetime { get; } = Lifetime;
+    public TimeSpan? Lifetime { get; } = Lifetime ;
     public Action? OnClicked { get; } = OnClicked;
 
     public string? ActionButtonContent { get; } = ActionButtonContent;
diff --git a/SukiUI/Properties/AssemblyInfo.cs b/SukiUI/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..24caaa99
--- /dev/null
+++ b/SukiUI/Properties/AssemblyInfo.cs
@@ -0,0 +1,9 @@
+using Avalonia.Metadata;
+
+[assembly: XmlnsDefinition("https://github.com/kikipoulet/SukiUI", "SukiUI")]
+[assembly: XmlnsDefinition("https://github.com/kikipoulet/SukiUI", "SukiUI.Controls")]
+[assembly: XmlnsDefinition("https://github.com/kikipoulet/SukiUI", "SukiUI.Converters")]
+[assembly: XmlnsDefinition("https://github.com/kikipoulet/SukiUI", "SukiUI.Theme")]
+[assembly: XmlnsDefinition("https://github.com/kikipoulet/SukiUI", "SukiUI.Models")]
+[assembly: XmlnsDefinition("https://github.com/kikipoulet/SukiUI", "SukiUI.Content")]
+[assembly: XmlnsPrefix("https://github.com/kikipoulet/SukiUI", "suki")]
diff --git a/SukiUI/SukiUI.csproj b/SukiUI/SukiUI.csproj
index 96215deb..7f6f9b77 100644
--- a/SukiUI/SukiUI.csproj
+++ b/SukiUI/SukiUI.csproj
@@ -21,7 +21,7 @@
 		<LangVersion>10</LangVersion>
 		<UserSecretsId>712f85e4-12d3-41b0-a417-5714a113666f</UserSecretsId>
 		<Description>https://github.com/kikipoulet/SukiUI</Description>
-		<PackageVersion>6.0.0</PackageVersion>
+		<PackageVersion>6.0.0-beta7</PackageVersion>
 		<Nullable>enable</Nullable>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<PackageIcon>OIG.N5o-removebg-preview.png</PackageIcon>
diff --git a/SukiUI/Theme/Button.axaml b/SukiUI/Theme/Button.axaml
index d8f5b9fb..f138d38f 100644
--- a/SukiUI/Theme/Button.axaml
+++ b/SukiUI/Theme/Button.axaml
@@ -38,7 +38,7 @@
                                           Content="{TemplateBinding Content}"
                                           FontFamily="{TemplateBinding FontFamily}"
                                           FontSize="{TemplateBinding FontSize}"
-                                          FontWeight="DemiBold"
+                                          FontWeight="{DynamicResource DefaultDemiBold}"
                                           RecognizesAccessKey="True" />
                     </StackPanel>
                 </Border>
@@ -54,7 +54,7 @@
         <!--  Nested Selectors For Basic Button  -->
         <Style Selector="^ /template/ TextBlock">
             <Setter Property="FontSize" Value="15" />
-            <Setter Property="FontWeight" Value="DemiBold" />
+            <Setter Property="FontWeight" Value="{DynamicResource DefaultDemiBold}" />
             <Setter Property="Transitions">
                 <Transitions>
                     <BrushTransition Property="Foreground" Duration="0:0:0.3" />
@@ -495,7 +495,7 @@
             <Setter Property="Padding" Value="0" />
             <Setter Property="Transitions">
                 <Transitions>
-                    <BrushTransition Property="Background" Duration="0.01"/>
+                    <BrushTransition Property="Background" Duration="0.01" />
                 </Transitions>
             </Setter>
             <Style Selector="^:pointerover">
@@ -508,38 +508,6 @@
                 </Style>
             </Style>
         </Style>
-
-        <Style Selector="^.Hyperlink">
-            <Setter Property="Foreground" Value="{DynamicResource SukiPrimaryColor}" />
-            <Setter Property="Padding" Value="0" />
-            <Setter Property="Cursor" Value="Hand" />
-            <Setter Property="VerticalAlignment" Value="Bottom" />
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="Background" Value="Transparent" />
-            <Setter Property="Template">
-                <ControlTemplate>
-                    <ContentPresenter Content="{TemplateBinding Content}">
-                        <ContentPresenter.Styles>
-                            <Style Selector="TextBlock">
-                                <Setter Property="FontWeight" Value="Bold" />
-                                <Setter Property="FontSize" Value="{TemplateBinding FontSize}" />
-                                <Setter Property="Transitions">
-                                    <Setter.Value>
-                                    <Transitions>
-                                        <BrushTransition Property="Foreground" Duration="{DynamicResource ShortAnimationDuration}" />
-                                    </Transitions>
-                                    </Setter.Value>
-                                </Setter>
-                                <Style Selector="^:pointerover">
-                                    <Setter Property="Foreground" Value="{DynamicResource SukiPrimaryColor}" />
-                                </Style>
-                            </Style>
-                        </ContentPresenter.Styles>
-                    </ContentPresenter>
-                </ControlTemplate>
-            </Setter>
-        </Style>
-
         <Style Selector="^.Large">
             <Setter Property="FontSize" Value="18" />
             <Setter Property="Padding" Value="30,12" />
diff --git a/SukiUI/Theme/Calendar/CalendarItem.axaml b/SukiUI/Theme/Calendar/CalendarItem.axaml
index c77aa7d9..dda6bbe2 100644
--- a/SukiUI/Theme/Calendar/CalendarItem.axaml
+++ b/SukiUI/Theme/Calendar/CalendarItem.axaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:content="clr-namespace:SukiUI.Content">
-    
+
     <ControlTheme x:Key="SukiCalendarItemStyle" TargetType="CalendarItem">
         <Setter Property="HorizontalAlignment" Value="Stretch" />
         <Setter Property="VerticalAlignment" Value="Stretch" />
@@ -29,7 +29,8 @@
                               ColumnDefinitions="Auto, *, Auto, Auto">
                             <Button Name="PART_HeaderButton"
                                     Grid.Column="0"
-                                    Classes="Basic" FontWeight="DemiBold"
+                                    Classes="Basic"
+                                    FontWeight="{DynamicResource DefaultDemiBold}"
                                     IsEnabled="False" />
 
                             <Button Name="PART_PreviousButton"
@@ -72,7 +73,7 @@
 
         <Style Selector="^ /template/ Button.HeaderButton">
             <Setter Property="Height" Value="24" />
-            <Setter Property="TextElement.FontWeight" Value="DemiBold"></Setter>
+            <Setter Property="TextElement.FontWeight" Value="{DynamicResource DefaultDemiBold}" />
             <Setter Property="Padding" Value="8, 0" />
             <Setter Property="HorizontalContentAlignment" Value="Left" />
         </Style>
diff --git a/SukiUI/Theme/DataGridStyle.axaml b/SukiUI/Theme/DataGridStyle.axaml
index b2b0734b..b9b00d08 100644
--- a/SukiUI/Theme/DataGridStyle.axaml
+++ b/SukiUI/Theme/DataGridStyle.axaml
@@ -20,18 +20,15 @@
     </Design.PreviewWith>
     <Style Selector="DataGridCell">
         <Setter Property="Background" Value="Transparent" />
-        <Setter Property="HorizontalContentAlignment" Value="Left" />
-        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="VerticalContentAlignment" Value="Stretch" />
         <Setter Property="FontSize" Value="25" />
         <Setter Property="Template">
             <ControlTemplate>
                 <Grid Background="{TemplateBinding Background}" ColumnDefinitions="*,Auto">
                     <ContentPresenter Margin="{TemplateBinding Padding}"
-                                      HorizontalAlignment="Center"
+                                      HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                       VerticalAlignment="Center"
-                                      HorizontalContentAlignment="Center"
-                                      VerticalContentAlignment="Center"
                                       Content="{TemplateBinding Content}"
                                       ContentTemplate="{TemplateBinding ContentTemplate}"
                                       TextBlock.Foreground="{TemplateBinding Foreground}" />
@@ -62,7 +59,7 @@
 
     <Style Selector="DataGridColumnHeader">
         <Setter Property="HorizontalContentAlignment" Value="Left" />
-        <Setter Property="FontWeight" Value="DemiBold" />
+        <Setter Property="FontWeight" Value="{DynamicResource DefaultDemiBold}" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="SeparatorBrush" Value="{DynamicResource ThemeControlLowColor}" />
         <Setter Property="Padding" Value="12" />
diff --git a/SukiUI/Theme/DatePicker.axaml b/SukiUI/Theme/DatePicker.axaml
index 6553b117..33a93147 100644
--- a/SukiUI/Theme/DatePicker.axaml
+++ b/SukiUI/Theme/DatePicker.axaml
@@ -262,7 +262,7 @@
                                               Foreground="{DynamicResource SukiPrimaryColor}" />
                                     <TextBlock Margin="10,0,0,0"
                                                FontSize="16"
-                                               FontWeight="DemiBold"
+                                               FontWeight="{DynamicResource DefaultDemiBold}"
                                                Foreground="{DynamicResource SukiPrimaryColor}"
                                                Text="Apply" />
                                 </StackPanel>
diff --git a/SukiUI/Theme/DropDownButton.axaml b/SukiUI/Theme/DropDownButton.axaml
index 576cc68d..97a4c6de 100644
--- a/SukiUI/Theme/DropDownButton.axaml
+++ b/SukiUI/Theme/DropDownButton.axaml
@@ -10,7 +10,7 @@
         <Setter Property="FontSize" Value="15" />
         <Setter Property="Padding" Value="20,8" />
         <Setter Property="FontFamily" Value="{DynamicResource DefaultFontFamily}" />
-        <Setter Property="FontWeight" Value="DemiBold" />
+        <Setter Property="FontWeight" Value="{DynamicResource DefaultDemiBold}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate>
diff --git a/SukiUI/Theme/Expander.axaml b/SukiUI/Theme/Expander.axaml
index c7c626db..db5d5042 100644
--- a/SukiUI/Theme/Expander.axaml
+++ b/SukiUI/Theme/Expander.axaml
@@ -24,14 +24,14 @@
 
                             <LayoutTransformControl Name="PART_ToggleTransform">
                                 <DockPanel>
-                                  
+
                                     <Border Name="PART_BottomBorder"
                                             Height="2"
                                             HorizontalAlignment="Stretch"
                                             Background="{DynamicResource SukiBorderBrush}"
                                             DockPanel.Dock="Bottom" />
-                                    
-                                    <ToggleButton Name="PART_ToggleButton" 
+
+                                    <ToggleButton Name="PART_ToggleButton"
                                                   HorizontalAlignment="Stretch"
                                                   VerticalAlignment="Center"
                                                   HorizontalContentAlignment="Stretch"
@@ -47,7 +47,7 @@
                                                               HorizontalAlignment="Left"
                                                               VerticalAlignment="Center"
                                                               Content="{TemplateBinding Header}"
-                                                              FontWeight="DemiBold" />
+                                                              FontWeight="{DynamicResource DefaultDemiBold}" />
                                             <PathIcon Name="PART_Icon"
                                                       Grid.Column="2"
                                                       Width="10"
diff --git a/SukiUI/Theme/FlyoutPresenter.axaml b/SukiUI/Theme/FlyoutPresenter.axaml
index 6b353606..f631a6d9 100644
--- a/SukiUI/Theme/FlyoutPresenter.axaml
+++ b/SukiUI/Theme/FlyoutPresenter.axaml
@@ -13,7 +13,7 @@
         <Setter Property="FlowDirection" Value="{TemplateBinding FlowDirection}"/>
         <Setter Property="Template">
             <ControlTemplate>
-                <Border Name="LayoutRoot"
+                <Border Name="LayoutRoot" 
                         Background="Transparent"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="0"
diff --git a/SukiUI/Theme/HyperlinkButton.axaml b/SukiUI/Theme/HyperlinkButton.axaml
new file mode 100644
index 00000000..87f64f25
--- /dev/null
+++ b/SukiUI/Theme/HyperlinkButton.axaml
@@ -0,0 +1,77 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ControlTheme x:Key="SukiHyperlinkButtonStyle" TargetType="HyperlinkButton">
+        <Setter Property="Cursor" Value="Hand" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BackgroundSizing" Value="OuterBorderEdge" />
+        <Setter Property="Foreground" Value="{DynamicResource SukiPrimaryColor}" />
+        <Setter Property="BorderBrush" Value="Transparent" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="CornerRadius" Value="0" />
+        <Setter Property="Padding" Value="0" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="RenderTransform" Value="none" />
+        <Setter Property="TextBlock.TextDecorations" Value="Underline" />
+        <Setter Property="Transitions">
+            <Transitions>
+                <TransformOperationsTransition Property="RenderTransform" Duration="0:0:.075" />
+            </Transitions>
+        </Setter>
+        <Setter Property="Template">
+            <ControlTemplate>
+                <ContentPresenter x:Name="PART_ContentPresenter"
+                                  Background="{TemplateBinding Background}"
+                                  BackgroundSizing="{TemplateBinding BackgroundSizing}"
+                                  BorderBrush="{TemplateBinding BorderBrush}"
+                                  BorderThickness="{TemplateBinding BorderThickness}"
+                                  CornerRadius="{TemplateBinding CornerRadius}"
+                                  Content="{TemplateBinding Content}"
+                                  ContentTemplate="{TemplateBinding ContentTemplate}"
+                                  Padding="{TemplateBinding Padding}"
+                                  RecognizesAccessKey="True"
+                                  HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                  VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+            </ControlTemplate>
+        </Setter>
+        
+        <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+            <Setter Property="Transitions">
+                <Transitions>
+                    <BrushTransition Property="Foreground" Duration="{StaticResource ShortAnimationDuration}"/>
+                </Transitions>
+            </Setter>
+        </Style>
+        
+        <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+            <Setter Property="Foreground" Value="{DynamicResource SukiPrimaryDarkColor}" />
+        </Style>
+
+        <Style Selector="^:pressed">
+            <Setter Property="RenderTransform" Value="scale(0.95)" />
+        </Style>
+
+        <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+            <Setter Property="Foreground" Value="{DynamicResource SukiPrimaryColor75}" />
+        </Style>
+
+        <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
+            <Setter Property="Foreground" Value="{DynamicResource SukiDisabledText}" />
+        </Style>
+
+        <Style Selector="^:visited">
+            <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource SukiAccentColor}" />
+            </Style>
+            <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource SukiAccentDarkColor}" />
+            </Style>
+            <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource SukiAccentColor75}" />
+            </Style>
+        </Style>
+    </ControlTheme>
+    <ControlTheme x:Key="{x:Type HyperlinkButton}"
+                  BasedOn="{StaticResource SukiHyperlinkButtonStyle}"
+                  TargetType="HyperlinkButton" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/SukiUI/Theme/Index.axaml b/SukiUI/Theme/Index.axaml
index ef0b3cd1..4d46f65b 100644
--- a/SukiUI/Theme/Index.axaml
+++ b/SukiUI/Theme/Index.axaml
@@ -47,6 +47,7 @@
             <Easing x:Key="MenuEasing">CircularEaseOut</Easing>
 
             <FontFamily x:Key="DefaultFontFamily">avares://SukiUI/CustomFont#MiSans</FontFamily>
+            <FontWeight x:Key="DefaultDemiBold">DemiBold</FontWeight>
 
             <ResourceDictionary.MergedDictionaries>
                 <ResourceInclude Source="avares://sukiUI/Theme/TextBlock.xaml" />
@@ -54,6 +55,7 @@
                 <ResourceInclude Source="avares://SukiUI/Theme/DatePicker.axaml" />
                 <ResourceInclude Source="avares://sukiUI/Theme/ToolTipStyle.axaml" />
                 <ResourceInclude Source="avares://sukiUI/Theme/Button.axaml" />
+                <ResourceInclude Source="avares://sukiUI/Theme/HyperlinkButton.axaml" />
                 <ResourceInclude Source="avares://sukiUI/Theme/PathIcon.axaml" />
                 <ResourceInclude Source="avares://sukiUI/Theme/Expander.axaml" />
                 <ResourceInclude Source="avares://sukiUI/Theme/CalendarDatePickerStyle.axaml" />
diff --git a/SukiUI/Theme/Index.axaml.cs b/SukiUI/Theme/Index.axaml.cs
index ec00ff81..e1de8513 100644
--- a/SukiUI/Theme/Index.axaml.cs
+++ b/SukiUI/Theme/Index.axaml.cs
@@ -5,6 +5,7 @@
 using Avalonia.Media;
 using Avalonia.Styling;
 using DynamicData;
+using SukiUI.Controls;
 using SukiUI.Enums;
 using SukiUI.Extensions;
 using SukiUI.Models;
@@ -202,7 +203,7 @@ static SukiTheme()
             new DefaultSukiColorTheme(SukiColor.Red, Color.Parse("#D03A2F"), Color.Parse("#2FC5D0")),
             new DefaultSukiColorTheme(SukiColor.Green, Color.Parse("#537834"), Color.Parse("#B24DB0")),
             new DefaultSukiColorTheme(SukiColor.Blue, Color.Parse("#0A59F7"), Color.Parse("#F7A80A")),
-
+ 
         };
         DefaultColorThemes = defaultThemes.ToDictionary(x => x.ThemeColor, y => (SukiColorTheme)y);
     }
diff --git a/SukiUI/Theme/ManagedFileChooser.axaml b/SukiUI/Theme/ManagedFileChooser.axaml
index 46cb46f3..9c8f3d3d 100644
--- a/SukiUI/Theme/ManagedFileChooser.axaml
+++ b/SukiUI/Theme/ManagedFileChooser.axaml
@@ -77,7 +77,7 @@
                                        Source="/Content/Images/icons8-file-explorer-new-48.png" />
                                 <TextBlock Margin="12,0,0,0"
                                            FontSize="25"
-                                           FontWeight="DemiBold"
+                                           FontWeight="{DynamicResource DefaultDemiBold}"
                                            Text="{Binding Title}">
                                     <TextBlock.Foreground>
                                         <LinearGradientBrush StartPoint="0%,0%" EndPoint="100%,100%">
@@ -151,7 +151,7 @@
                                                 </Image>
                                                 <TextBlock Margin="7,0,0,0"
                                                            FontSize="17"
-                                                           FontWeight="DemiBold"
+                                                           FontWeight="{DynamicResource DefaultDemiBold}"
                                                            Text="{Binding DisplayName}" />
                                             </StackPanel>
                                         </DataTemplate>
diff --git a/SukiUI/Theme/ManagedFileChooserConverters.cs b/SukiUI/Theme/ManagedFileChooserConverters.cs
index c665ce0a..765405f7 100644
--- a/SukiUI/Theme/ManagedFileChooserConverters.cs
+++ b/SukiUI/Theme/ManagedFileChooserConverters.cs
@@ -1,19 +1,19 @@
-using Avalonia;
+using System;
+using System.Globalization;
+using System.Linq;
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
 using Avalonia.Data.Converters;
 using Avalonia.Layout;
 using Avalonia.Markup.Xaml.MarkupExtensions;
 using Avalonia.Media;
 using SukiUI.Content;
-using System;
-using System.Globalization;
-using System.Linq;
 
 namespace SukiUI.Theme
 {
     public class TextToPathConverter : IValueConverter
     {
-
         public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
         {
             var pathes = (value as string).Split('\\');
@@ -22,34 +22,37 @@ public class TextToPathConverter : IValueConverter
                 pathes = pathes.Skip(1).ToArray();
             }
 
-            var stackPanel = new StackPanel() { VerticalAlignment = VerticalAlignment.Center, Orientation = Orientation.Horizontal, Margin = new Thickness(5) };
+            var stackPanel = new StackPanel
+            {
+                VerticalAlignment = VerticalAlignment.Center, Orientation = Orientation.Horizontal,
+                Margin = new Thickness(5)
+            };
 
             for (var i = 0; i < pathes.Length; i++)
             {
-                var t = new TextBlock()
+                var t = new TextBlock
                 {
                     Text = pathes[i],
-                    FontWeight = FontWeight.DemiBold,
-                    FontSize = 14,
-                    VerticalAlignment = VerticalAlignment.Center
-
+                    FontWeight =
+                        Application.Current!.TryGetResource("DefaultDemiBold", Application.Current!.ActualThemeVariant,
+                            out var fontWeight)
+                            ? (FontWeight)fontWeight!
+                            : FontWeight.DemiBold,
+                    FontSize = 14, VerticalAlignment = VerticalAlignment.Center,
+                    [!TextBlock.ForegroundProperty] = i == pathes.Length - 1
+                        ? new DynamicResourceExtension("SukiText")
+                        : new DynamicResourceExtension("SukiLowText")
                 };
 
-                t[!TextBlock.ForegroundProperty] = i == pathes.Length - 1 ? new DynamicResourceExtension("SukiText") : new DynamicResourceExtension("SukiLowText");
-
                 stackPanel.Children.Add(t);
 
-                var p = new PathIcon()
+                var p = new PathIcon
                 {
-                    Height = 6,
-                    Margin = new Thickness(12, 4, 12, 2),
-                    Width = 5,
-                    Data = Icons.ChevronRight,
-                    IsVisible = i != pathes.Length - 1,
-                    VerticalAlignment = VerticalAlignment.Center
+                    Height = 6, Margin = new Thickness(12, 4, 12, 2), Width = 5, Data = Icons.ChevronRight,
+                    IsVisible = i != pathes.Length - 1, VerticalAlignment = VerticalAlignment.Center
                 };
 
-                p[!PathIcon.ForegroundProperty] = new DynamicResourceExtension("SukiLowText");
+                p[!TemplatedControl.ForegroundProperty] = new DynamicResourceExtension("SukiLowText");
 
                 stackPanel.Children.Add(p);
             }
@@ -65,7 +68,6 @@ public object ConvertBack(object? value, Type targetType, object? parameter, Cul
 
     public class WindowManagedConverter : IValueConverter
     {
-
         public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
         {
             var w = value as Window;
@@ -73,7 +75,6 @@ public class WindowManagedConverter : IValueConverter
             //    w.ExtendClientAreaToDecorationsHint = true;
 
 
-
             return "";
         }
 
diff --git a/SukiUI/Theme/Menu.axaml b/SukiUI/Theme/Menu.axaml
index 94470aa8..3c1ec2bd 100644
--- a/SukiUI/Theme/Menu.axaml
+++ b/SukiUI/Theme/Menu.axaml
@@ -3,12 +3,13 @@
                     xmlns:controls="clr-namespace:SukiUI.Controls"
                     xmlns:system="clr-namespace:System;assembly=netstandard">
     <ControlTheme x:Key="SukiTopLevelMenuItem" TargetType="MenuItem">
-        <Setter Property="FontWeight" Value="DemiBold" />
+        <Setter Property="FontWeight" Value="{DynamicResource DefaultDemiBold}" />
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Padding" Value="10 0" />
         <Setter Property="Template">
             <ControlTemplate>
-                <Border Name="root" Margin="5,5"
+                <Border Name="root"
+                        Margin="5,5"
                         Background="{TemplateBinding Background}"
                         BorderBrush="{DynamicResource SukiLightBorderBrush}"
                         BorderThickness="0"
@@ -21,7 +22,7 @@
                                           Content="{TemplateBinding Header}">
                             <ContentPresenter.DataTemplates>
                                 <DataTemplate DataType="system:String">
-                                    <TextBlock FontWeight="DemiBold" Text="{CompiledBinding}" />
+                                    <TextBlock FontWeight="{DynamicResource DefaultDemiBold}" Text="{CompiledBinding}" />
                                 </DataTemplate>
                             </ContentPresenter.DataTemplates>
                         </ContentPresenter>
@@ -47,12 +48,12 @@
                                             ClipToBounds="True"
                                             CornerRadius="6">
                                         <Panel Background="{DynamicResource PopupGradientBrush}">
-                                        <ScrollViewer>
-                                            <ItemsPresenter Name="PART_ItemsPresenter"
-                                                            Grid.IsSharedSizeScope="True"
-                                                            ItemsPanel="{TemplateBinding ItemsPanel}" />
-                                        </ScrollViewer>
-                                            </Panel>
+                                            <ScrollViewer>
+                                                <ItemsPresenter Name="PART_ItemsPresenter"
+                                                                Grid.IsSharedSizeScope="True"
+                                                                ItemsPanel="{TemplateBinding ItemsPanel}" />
+                                            </ScrollViewer>
+                                        </Panel>
                                     </Border>
                                 </Grid>
                             </LayoutTransformControl>
@@ -91,11 +92,12 @@
         <Setter Property="Template">
             <ControlTemplate>
                 <LayoutTransformControl Name="PART_LayoutTransform" RenderTransformOrigin="50%, 0%">
-                    <controls:GlassCard Height="45" IsAnimated="False"
+                    <controls:GlassCard Height="45"
                                         Padding="{TemplateBinding Padding}"
                                         BorderBrush="{DynamicResource SukiBorderBrush}"
                                         BorderThickness="0"
-                                        CornerRadius="{TemplateBinding CornerRadius}">
+                                        CornerRadius="{TemplateBinding CornerRadius}"
+                                        IsAnimated="False">
                         <ItemsPresenter Name="PART_ItemsPresenter"
                                         ItemsPanel="{TemplateBinding ItemsPanel}"
                                         KeyboardNavigation.TabNavigation="Continue" />
@@ -136,7 +138,7 @@
                         <Setter Property="ScaleTransform.ScaleY" Value="0.9" />
                         <Setter Property="ScaleTransform.ScaleX" Value="0.9" />
                         <Setter Property="Opacity" Value="0" />
-                        <Setter Property="IsVisible" Value="False"></Setter>
+                        <Setter Property="IsVisible" Value="False" />
                     </KeyFrame>
                 </Animation>
             </Style.Animations>
diff --git a/SukiUI/Theme/MenuItem.axaml b/SukiUI/Theme/MenuItem.axaml
index 7fc980cc..9d7e6625 100644
--- a/SukiUI/Theme/MenuItem.axaml
+++ b/SukiUI/Theme/MenuItem.axaml
@@ -48,7 +48,7 @@
                                               Content="{TemplateBinding Header}">
                                 <ContentPresenter.DataTemplates>
                                     <DataTemplate DataType="system:String">
-                                        <TextBlock FontWeight="DemiBold" Text="{Binding}" />
+                                        <TextBlock FontWeight="{DynamicResource DefaultDemiBold}" Text="{Binding}" />
                                     </DataTemplate>
                                 </ContentPresenter.DataTemplates>
                             </ContentPresenter>
@@ -83,9 +83,9 @@
                                             ClipToBounds="True"
                                             CornerRadius="5">
                                         <Panel Background="{DynamicResource PopupGradientBrush}">
-                                        <ScrollViewer>
-                                            <ItemsPresenter Name="PART_ItemsPresenter" ItemsPanel="{TemplateBinding ItemsPanel}" />
-                                        </ScrollViewer>
+                                            <ScrollViewer>
+                                                <ItemsPresenter Name="PART_ItemsPresenter" ItemsPanel="{TemplateBinding ItemsPanel}" />
+                                            </ScrollViewer>
                                         </Panel>
                                     </Border>
                                 </Panel>
diff --git a/SukiUI/Theme/NotificationCardStyle.axaml b/SukiUI/Theme/NotificationCardStyle.axaml
index 6b511816..e7e63ca0 100644
--- a/SukiUI/Theme/NotificationCardStyle.axaml
+++ b/SukiUI/Theme/NotificationCardStyle.axaml
@@ -32,20 +32,20 @@
                                 ClipToBounds="True"
                                 CornerRadius="10">
                             <Panel>
-                                
+
                                 <DockPanel>
-                                <PathIcon Margin="11,11,5,5"
-                                          VerticalAlignment="Top"
-                                          Data="{x:Static content:Icons.CircleInformation}"
-                                          DockPanel.Dock="Left"
-                                          Foreground="{DynamicResource SukiPrimaryColor}" />
-                                <Panel x:Name="PART_HeaderBar"
-                                       Height="4"
-                                       Margin="0,-3,0,0"
-                                       Classes="TextBold"
-                                       DockPanel.Dock="Top" />
-                                <ContentControl Name="PART_Content" Content="{TemplateBinding Content}" />
-                            </DockPanel>
+                                    <PathIcon Margin="11,11,5,5"
+                                              VerticalAlignment="Top"
+                                              Data="{x:Static content:Icons.CircleInformation}"
+                                              DockPanel.Dock="Left"
+                                              Foreground="{DynamicResource SukiPrimaryColor}" />
+                                    <Panel x:Name="PART_HeaderBar"
+                                           Height="4"
+                                           Margin="0,-3,0,0"
+                                           Classes="TextBold"
+                                           DockPanel.Dock="Top" />
+                                    <ContentControl Name="PART_Content" Content="{TemplateBinding Content}" />
+                                </DockPanel>
                             </Panel>
                         </Border>
                     </Border>
@@ -55,7 +55,7 @@
     </Style>
 
     <Style Selector="Panel.TextBold /template/ TextBlock">
-        <Setter Property="FontWeight" Value="DemiBold" />
+        <Setter Property="FontWeight" Value="{DynamicResource DefaultDemiBold}" />
     </Style>
 
     <Style Selector="NotificationCard/template/ ContentControl#PART_Content">
diff --git a/SukiUI/Theme/NotificationStyle.axaml b/SukiUI/Theme/NotificationStyle.axaml
index 8fbba6a9..0425baa4 100644
--- a/SukiUI/Theme/NotificationStyle.axaml
+++ b/SukiUI/Theme/NotificationStyle.axaml
@@ -18,7 +18,7 @@
                                         Spacing="8"
                                         TextBlock.Foreground="{DynamicResource SukiText}">
                                 <TextBlock FontSize="18"
-                                           FontWeight="DemiBold"
+                                           FontWeight="{DynamicResource DefaultDemiBold}"
                                            Text="{Binding Title}" />
                                 <TextBlock MaxHeight="80"
                                            Margin="0,0,12,0"
diff --git a/SukiUI/Theme/NumericUpDownExtensions.cs b/SukiUI/Theme/NumericUpDownExtensions.cs
index e16659be..7c83e1da 100644
--- a/SukiUI/Theme/NumericUpDownExtensions.cs
+++ b/SukiUI/Theme/NumericUpDownExtensions.cs
@@ -5,19 +5,19 @@ namespace SukiUI.Theme
 {
     public class NumericUpDownExtensions
     {
+        
+        
+            public static readonly AttachedProperty<string> UnitProperty =
+                AvaloniaProperty.RegisterAttached<NumericUpDown, string>("Unit", typeof(NumericUpDown), defaultValue: "");
 
+            public static string GetUnit(NumericUpDown textBox)
+            {
+                return textBox.GetValue(UnitProperty);
+            }
 
-        public static readonly AttachedProperty<string> UnitProperty =
-            AvaloniaProperty.RegisterAttached<NumericUpDown, string>("Unit", typeof(NumericUpDown), defaultValue: "");
-
-        public static string GetUnit(NumericUpDown textBox)
-        {
-            return textBox.GetValue(UnitProperty);
-        }
-
-        public static void SetUnit(NumericUpDown textBox, string value)
-        {
-            textBox.SetValue(UnitProperty, value);
-        }
+            public static void SetUnit(NumericUpDown textBox, string value)
+            {
+                textBox.SetValue(UnitProperty, value);
+            }
     }
 }
\ No newline at end of file
diff --git a/SukiUI/Theme/ProgressBarStyles.xaml b/SukiUI/Theme/ProgressBarStyles.xaml
index f44be78c..dbdfe063 100644
--- a/SukiUI/Theme/ProgressBarStyles.xaml
+++ b/SukiUI/Theme/ProgressBarStyles.xaml
@@ -24,7 +24,7 @@
                                HorizontalAlignment="Right"
                                VerticalAlignment="Center"
                                DockPanel.Dock="Right"
-                               FontWeight="DemiBold"
+                               FontWeight="{DynamicResource DefaultDemiBold}"
                                Foreground="{DynamicResource SukiText}"
                                Text="{Binding Value, RelativeSource={RelativeSource TemplatedParent}, StringFormat={}{0:0}%}"
                                TextAlignment="Right" />
@@ -182,14 +182,17 @@
                        IterationCount="Infinite"
                        Duration="0:0:2">
                 <KeyFrame Cue="0%">
-                    <Setter Property="TranslateTransform.X" Value="{Binding IndeterminateStartingOffset, RelativeSource={RelativeSource TemplatedParent}}" />
+                    <Setter Property="TranslateTransform.X"
+                            Value="{Binding IndeterminateStartingOffset, RelativeSource={RelativeSource TemplatedParent}}" />
                 </KeyFrame>
                 <KeyFrame Cue="100%">
-                    <Setter Property="TranslateTransform.X" Value="{Binding IndeterminateEndingOffset, RelativeSource={RelativeSource TemplatedParent}}" />
+                    <Setter Property="TranslateTransform.X"
+                            Value="{Binding IndeterminateEndingOffset, RelativeSource={RelativeSource TemplatedParent}}" />
                 </KeyFrame>
             </Animation>
         </Style.Animations>
-        <Setter Property="Width" Value="{Binding TemplateProperties.ContainerWidth, RelativeSource={RelativeSource TemplatedParent}}" />
+        <Setter Property="Width"
+                Value="{Binding TemplateProperties.ContainerWidth, RelativeSource={RelativeSource TemplatedParent}}" />
     </Style>
 
     <Style Selector="ProgressBar:vertical:indeterminate /template/ Border#PART_IndeterminateIndicator">
@@ -198,14 +201,17 @@
                        IterationCount="Infinite"
                        Duration="0:0:2">
                 <KeyFrame Cue="0%">
-                    <Setter Property="TranslateTransform.Y" Value="{Binding IndeterminateStartingOffset, RelativeSource={RelativeSource TemplatedParent}}" />
+                    <Setter Property="TranslateTransform.Y"
+                            Value="{Binding IndeterminateStartingOffset, RelativeSource={RelativeSource TemplatedParent}}" />
                 </KeyFrame>
                 <KeyFrame Cue="100%">
-                    <Setter Property="TranslateTransform.Y" Value="{Binding IndeterminateEndingOffset, RelativeSource={RelativeSource TemplatedParent}}" />
+                    <Setter Property="TranslateTransform.Y"
+                            Value="{Binding IndeterminateEndingOffset, RelativeSource={RelativeSource TemplatedParent}}" />
                 </KeyFrame>
             </Animation>
         </Style.Animations>
-        <Setter Property="Height" Value="{Binding TemplateProperties.ContainerWidth, RelativeSource={RelativeSource TemplatedParent}}" />
+        <Setter Property="Height"
+                Value="{Binding TemplateProperties.ContainerWidth, RelativeSource={RelativeSource TemplatedParent}}" />
     </Style>
 
     <Style Selector="ProgressBar.Accent">
@@ -213,7 +219,7 @@
     </Style>
 
     <Style Selector="ProgressBar.Light">
-        <Setter Property="Foreground" Value="{DynamicResource SukiPrimaryColor75}"></Setter>
+        <Setter Property="Foreground" Value="{DynamicResource SukiPrimaryColor75}" />
     </Style>
 
 </Styles>
\ No newline at end of file
diff --git a/SukiUI/Theme/RadioButtonStyles.xaml b/SukiUI/Theme/RadioButtonStyles.xaml
index 815b822e..2d899b16 100644
--- a/SukiUI/Theme/RadioButtonStyles.xaml
+++ b/SukiUI/Theme/RadioButtonStyles.xaml
@@ -264,7 +264,7 @@
 
 
     <Style Selector="RadioButton.MenuItem:checked">
-        <Setter Property="TextBlock.FontWeight" Value="DemiBold" />
+        <Setter Property="TextBlock.FontWeight" Value="{DynamicResource DefaultDemiBold}" />
         <Setter Property="BorderThickness" Value="0,0,0,0" />
         <Setter Property="BorderBrush" Value="{DynamicResource SukiPrimaryColor}" />
         <Setter Property="Margin" Value="-30,5,5,5" />
@@ -277,7 +277,7 @@
     </Style>
 
     <Style Selector="RadioButton.MenuItem:checked  TextBlock">
-        <Setter Property="FontWeight" Value="DemiBold" />
+        <Setter Property="FontWeight" Value="{DynamicResource DefaultDemiBold}" />
         <Setter Property="Foreground" Value="{DynamicResource SukiPrimaryColor}" />
     </Style>
 
@@ -290,7 +290,7 @@
 
         </Setter>
 
-        <Setter Property="TextBlock.FontWeight" Value="DemiBold" />
+        <Setter Property="TextBlock.FontWeight" Value="{DynamicResource DefaultDemiBold}" />
         <Setter Property="TextBlock.Foreground" Value="{DynamicResource SukiPrimaryColor}" />
         <Setter Property="Background" Value="{DynamicResource SukiPrimaryColor10}" />
         <Setter Property="BorderBrush" Value="{DynamicResource SukiPrimaryColor}" />
diff --git a/SukiUI/Theme/ScrollableExtensions.cs b/SukiUI/Theme/ScrollableExtensions.cs
index 6e968ffe..03b4fed2 100644
--- a/SukiUI/Theme/ScrollableExtensions.cs
+++ b/SukiUI/Theme/ScrollableExtensions.cs
@@ -1,9 +1,11 @@
-using Avalonia;
+using System;
+using System.Numerics;
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Primitives;
 using Avalonia.Rendering.Composition;
 using Avalonia.Rendering.Composition.Animations;
-using System;
 
 namespace SukiUI.Theme
 {
@@ -14,7 +16,7 @@ public static void MakeScrollable(CompositionVisual compositionVisual)
         {
             if (compositionVisual == null)
                 return;
-
+        
             Compositor compositor = compositionVisual.Compositor;
 
             var animationGroup = compositor.CreateAnimationGroup();
@@ -29,13 +31,13 @@ public static void MakeScrollable(CompositionVisual compositionVisual)
             implicitAnimationCollection["Offset"] = animationGroup;
             compositionVisual.ImplicitAnimations = implicitAnimationCollection;
         }
-
-
+        
+       
     }
-
-
-
-
+    
+  
+  
+    
     public static class StackPanelExtensions
     {
         public static readonly AttachedProperty<bool> AnimatedScrollProperty =
@@ -45,10 +47,10 @@ static StackPanelExtensions()
         {
             AnimatedScrollProperty.Changed.AddClassHandler<StackPanel>(HandleAnimatedScrollChanged);
         }
-
+        
         private static void HandleAnimatedScrollChanged(StackPanel interactElem, AvaloniaPropertyChangedEventArgs args)
         {
-            if (GetAnimatedScroll(interactElem))
+            if(GetAnimatedScroll(interactElem))
                 interactElem.AttachedToVisualTree += (sender, args) => Scrollable.MakeScrollable(ElementComposition.GetElementVisual(interactElem));
         }
 
@@ -65,7 +67,7 @@ public static void SetAnimatedScroll(StackPanel wrap, bool value)
         }
 
     }
-
+    
     public static class WrapPanelExtensions
     {
         public static readonly AttachedProperty<bool> AnimatedScrollProperty =
@@ -75,10 +77,10 @@ static WrapPanelExtensions()
         {
             AnimatedScrollProperty.Changed.AddClassHandler<WrapPanel>(HandleAnimatedScrollChanged);
         }
-
+        
         private static void HandleAnimatedScrollChanged(WrapPanel interactElem, AvaloniaPropertyChangedEventArgs args)
         {
-            if (GetAnimatedScroll(interactElem))
+            if(GetAnimatedScroll(interactElem))
                 interactElem.AttachedToVisualTree += (sender, args) => Scrollable.MakeScrollable(ElementComposition.GetElementVisual(interactElem));
         }
 
@@ -95,7 +97,7 @@ public static void SetAnimatedScroll(WrapPanel wrap, bool value)
         }
 
     }
-
+    
     public static class ItemsPresenterExtensions
     {
         public static readonly AttachedProperty<bool> AnimatedScrollProperty =
@@ -105,10 +107,10 @@ static ItemsPresenterExtensions()
         {
             AnimatedScrollProperty.Changed.AddClassHandler<ItemsPresenter>(HandleAnimatedScrollChanged);
         }
-
+        
         private static void HandleAnimatedScrollChanged(ItemsPresenter interactElem, AvaloniaPropertyChangedEventArgs args)
         {
-            if (GetAnimatedScroll(interactElem))
+            if(GetAnimatedScroll(interactElem))
                 interactElem.AttachedToVisualTree += (sender, args) => Scrollable.MakeScrollable(ElementComposition.GetElementVisual(interactElem));
         }
 
@@ -126,7 +128,7 @@ public static void SetAnimatedScroll(ItemsPresenter wrap, bool value)
 
     }
 
-
+    
     public static class ItemsControlExtensions
     {
         public static readonly AttachedProperty<bool> AnimatedScrollProperty =
@@ -136,10 +138,10 @@ static ItemsControlExtensions()
         {
             AnimatedScrollProperty.Changed.AddClassHandler<ItemsControl>(HandleAnimatedScrollChanged);
         }
-
+        
         private static void HandleAnimatedScrollChanged(ItemsControl interactElem, AvaloniaPropertyChangedEventArgs args)
         {
-            if (GetAnimatedScroll(interactElem))
+            if(GetAnimatedScroll(interactElem))
                 interactElem.AttachedToVisualTree += (sender, args) => Scrollable.MakeScrollable(ElementComposition.GetElementVisual(interactElem));
         }
 
@@ -157,6 +159,6 @@ public static void SetAnimatedScroll(ItemsControl wrap, bool value)
 
     }
 
-
-
+  
+  
 }
\ No newline at end of file
diff --git a/SukiUI/Theme/TextBoxStyles.xaml b/SukiUI/Theme/TextBoxStyles.xaml
index 63bd1226..f87ae2db 100644
--- a/SukiUI/Theme/TextBoxStyles.xaml
+++ b/SukiUI/Theme/TextBoxStyles.xaml
@@ -32,13 +32,13 @@
                         <StackPanel>
                             <TextBlock Margin="6,0,0,3"
                                        FontSize="13"
-                                       FontWeight="DemiBold"
+                                       FontWeight="{DynamicResource DefaultDemiBold}"
                                        Text="Username" />
                             <TextBox />
 
                             <TextBlock Margin="6,18,0,3"
                                        FontSize="13"
-                                       FontWeight="DemiBold"
+                                       FontWeight="{DynamicResource DefaultDemiBold}"
                                        Text="Password" />
                             <TextBox Margin="0,0,0,20" />
                         </StackPanel>
@@ -53,7 +53,7 @@
                             <PathIcon Data="{x:Static content:Icons.Login}" Foreground="White" />
                             <TextBlock Margin="10,0,0,0"
                                        FontSize="13"
-                                       FontWeight="DemiBold"
+                                       FontWeight="{DynamicResource DefaultDemiBold}"
                                        Foreground="White"
                                        Text="Sign In" />
                         </StackPanel>
@@ -69,18 +69,21 @@
         <StreamGeometry x:Key="PasswordBoxRevealButtonData">m10.051 7.0032c2.215 0 4.0105 1.7901 4.0105 3.9984s-1.7956 3.9984-4.0105 3.9984c-2.215 0-4.0105-1.7901-4.0105-3.9984s1.7956-3.9984 4.0105-3.9984zm0 1.4994c-1.3844 0-2.5066 1.1188-2.5066 2.499s1.1222 2.499 2.5066 2.499 2.5066-1.1188 2.5066-2.499-1.1222-2.499-2.5066-2.499zm0-5.0026c4.6257 0 8.6188 3.1487 9.7267 7.5613 0.10085 0.40165-0.14399 0.80877-0.54686 0.90931-0.40288 0.10054-0.81122-0.14355-0.91208-0.54521-0.94136-3.7492-4.3361-6.4261-8.2678-6.4261-3.9334 0-7.3292 2.6792-8.2689 6.4306-0.10063 0.40171-0.50884 0.64603-0.91177 0.54571s-0.648-0.5073-0.54737-0.90901c1.106-4.4152 5.1003-7.5667 9.728-7.5667z</StreamGeometry>
         <StreamGeometry x:Key="PasswordBoxHideButtonData">m0.21967 0.21965c-0.26627 0.26627-0.29047 0.68293-0.07262 0.97654l0.07262 0.08412 4.0346 4.0346c-1.922 1.3495-3.3585 3.365-3.9554 5.7495-0.10058 0.4018 0.14362 0.8091 0.54543 0.9097 0.40182 0.1005 0.80909-0.1436 0.90968-0.5455 0.52947-2.1151 1.8371-3.8891 3.5802-5.0341l1.8096 1.8098c-0.70751 0.7215-1.1438 1.71-1.1438 2.8003 0 2.2092 1.7909 4 4 4 1.0904 0 2.0788-0.4363 2.8004-1.1438l5.9193 5.9195c0.2929 0.2929 0.7677 0.2929 1.0606 0 0.2663-0.2662 0.2905-0.6829 0.0726-0.9765l-0.0726-0.0841-6.1135-6.1142 0.0012-0.0015-1.2001-1.1979-2.8699-2.8693 2e-3 -8e-4 -2.8812-2.8782 0.0012-0.0018-1.1333-1.1305-4.3064-4.3058c-0.29289-0.29289-0.76777-0.29289-1.0607 0zm7.9844 9.0458 3.5351 3.5351c-0.45 0.4358-1.0633 0.704-1.7392 0.704-1.3807 0-2.5-1.1193-2.5-2.5 0-0.6759 0.26824-1.2892 0.7041-1.7391zm1.7959-5.7655c-1.0003 0-1.9709 0.14807-2.8889 0.425l1.237 1.2362c0.5358-0.10587 1.0883-0.16119 1.6519-0.16119 3.9231 0 7.3099 2.6803 8.2471 6.4332 0.1004 0.4018 0.5075 0.6462 0.9094 0.5459 0.4019-0.1004 0.6463-0.5075 0.5459-0.9094-1.103-4.417-5.0869-7.5697-9.7024-7.5697zm0.1947 3.5093 3.8013 3.8007c-0.1018-2.0569-1.7488-3.7024-3.8013-3.8007z</StreamGeometry>
 
-        <MenuFlyout   x:Key="DefaultTextBoxContextFlyout" Placement="Bottom">
-            <MenuItem Margin="10,0,0,0" x:Name="TextBoxContextFlyoutCutItem" 
+        <MenuFlyout x:Key="DefaultTextBoxContextFlyout" Placement="Bottom">
+            <MenuItem x:Name="TextBoxContextFlyoutCutItem"
+                      Margin="10,0,0,0"
                       Command="{Binding $parent[TextBox].Cut}"
                       Header="Cut"
                       InputGesture="{x:Static TextBox.CutGesture}"
                       IsEnabled="{Binding $parent[TextBox].CanCut}" />
-            <MenuItem Margin="10,0,0,0" x:Name="TextBoxContextFlyoutCopyItem"
+            <MenuItem x:Name="TextBoxContextFlyoutCopyItem"
+                      Margin="10,0,0,0"
                       Command="{Binding $parent[TextBox].Copy}"
                       Header="Copy"
                       InputGesture="{x:Static TextBox.CopyGesture}"
                       IsEnabled="{Binding $parent[TextBox].CanCopy}" />
-            <MenuItem Margin="10,0,0,0" x:Name="TextBoxContextFlyoutPasteItem"
+            <MenuItem x:Name="TextBoxContextFlyoutPasteItem"
+                      Margin="10,0,0,0"
                       Command="{Binding $parent[TextBox].Paste}"
                       Header="Paste"
                       InputGesture="{x:Static TextBox.PasteGesture}"
@@ -88,17 +91,20 @@
         </MenuFlyout>
 
         <ContextMenu x:Key="DefaultTextBoxContextMenu" x:Name="TextBoxContextMenu">
-            <MenuItem Margin="10,0,0,0" x:Name="TextBoxContextMenuCutItem"
+            <MenuItem x:Name="TextBoxContextMenuCutItem"
+                      Margin="10,0,0,0"
                       Command="{Binding $parent[TextBox].Cut}"
-                      Header="Cut" 
+                      Header="Cut"
                       InputGesture="{x:Static TextBox.CutGesture}"
                       IsEnabled="{Binding $parent[TextBox].CanCut}" />
-            <MenuItem Margin="10,0,0,0" x:Name="TextBoxContextMenuCopyItem"
+            <MenuItem x:Name="TextBoxContextMenuCopyItem"
+                      Margin="10,0,0,0"
                       Command="{Binding $parent[TextBox].Copy}"
                       Header="Copy"
                       InputGesture="{x:Static TextBox.CopyGesture}"
                       IsEnabled="{Binding $parent[TextBox].CanCopy}" />
-            <MenuItem Margin="10,0,0,0" x:Name="TextBoxContextMenuPasteItem"
+            <MenuItem x:Name="TextBoxContextMenuPasteItem"
+                      Margin="10,0,0,0"
                       Command="{Binding $parent[TextBox].Paste}"
                       Header="Paste"
                       InputGesture="{x:Static TextBox.PasteGesture}"
@@ -155,7 +161,6 @@
                             </Border>
 
 
-
                             <DockPanel Margin="{TemplateBinding Padding}"
                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
@@ -166,7 +171,8 @@
                                            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}" />
@@ -177,11 +183,8 @@
                                 <DataValidationErrors>
 
                                     <Grid ColumnDefinitions="Auto,*,Auto">
-                                        <ContentPresenter Grid.Column="0"
-                                                          Grid.ColumnSpan="1"
-                                                          Content="{TemplateBinding InnerLeftContent}" />
+                                        <ContentPresenter Grid.Column="0" Content="{TemplateBinding InnerLeftContent}" />
                                         <ScrollViewer Grid.Column="1"
-                                                      Grid.ColumnSpan="1"
                                                       HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
                                                       VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
                                             <Panel Margin="0,0,0,0">
@@ -207,9 +210,7 @@
                                                                TextWrapping="{TemplateBinding TextWrapping}" />
                                             </Panel>
                                         </ScrollViewer>
-                                        <ContentPresenter Grid.Column="2"
-                                                          Grid.ColumnSpan="1"
-                                                          Content="{TemplateBinding InnerRightContent}" />
+                                        <ContentPresenter Grid.Column="2" Content="{TemplateBinding InnerRightContent}" />
                                     </Grid>
                                 </DataValidationErrors>
                             </DockPanel>
@@ -267,7 +268,6 @@
                             </Border>
 
 
-
                             <DockPanel Margin="{TemplateBinding Padding}"
                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
@@ -278,7 +278,8 @@
                                            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}" />
@@ -289,11 +290,8 @@
                                 <DataValidationErrors>
 
                                     <Grid ColumnDefinitions="Auto,*,Auto">
-                                        <ContentPresenter Grid.Column="0"
-                                                          Grid.ColumnSpan="1"
-                                                          Content="{TemplateBinding InnerLeftContent}" />
+                                        <ContentPresenter Grid.Column="0" Content="{TemplateBinding InnerLeftContent}" />
                                         <ScrollViewer Grid.Column="1"
-                                                      Grid.ColumnSpan="1"
                                                       HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
                                                       VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
                                             <Panel>
@@ -322,9 +320,7 @@
 
                                             </Panel>
                                         </ScrollViewer>
-                                        <ContentPresenter Grid.Column="2"
-                                                          Grid.ColumnSpan="1"
-                                                          Content="{TemplateBinding InnerRightContent}" />
+                                        <ContentPresenter Grid.Column="2" Content="{TemplateBinding InnerRightContent}" />
                                     </Grid>
 
                                 </DataValidationErrors>
@@ -373,7 +369,7 @@
                         <Border Name="borderbottom"
                                 Margin="1,-1,1,-1"
                                 BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
                                 ClipToBounds="True"
                                 CornerRadius="1">
                             <Border.Transitions>
@@ -383,8 +379,6 @@
                             </Border.Transitions>
 
 
-
-
                             <DockPanel Margin="{TemplateBinding Padding}"
                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
@@ -394,7 +388,8 @@
                                            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}" />
@@ -416,9 +411,10 @@
                                                       VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
                                             <Panel>
                                                 <TextBlock Name="watermark"
+                                                           FontSize="{TemplateBinding FontSize}"
                                                            IsVisible="{TemplateBinding Text,
                                                                                        Converter={x:Static StringConverters.IsNullOrEmpty}}"
-                                                           Opacity="0.5" FontSize="{TemplateBinding FontSize}"
+                                                           Opacity="0.5"
                                                            Text="{TemplateBinding Watermark}"
                                                            TextAlignment="{TemplateBinding TextAlignment}"
                                                            TextWrapping="{TemplateBinding TextWrapping}" />
@@ -426,7 +422,6 @@
                                                                Margin="0,0,0,0"
                                                                CaretBrush="{DynamicResource SukiLowText}"
                                                                CaretIndex="{TemplateBinding CaretIndex}"
-                                                               TextBlock.FontSize="{TemplateBinding FontSize}"
                                                                PasswordChar="{TemplateBinding PasswordChar}"
                                                                RevealPassword="{TemplateBinding RevealPassword}"
                                                                SelectionBrush="{TemplateBinding SelectionBrush}"
@@ -436,6 +431,7 @@
                                                                Text="{TemplateBinding Text,
                                                                                       Mode=TwoWay}"
                                                                TextAlignment="{TemplateBinding TextAlignment}"
+                                                               TextBlock.FontSize="{TemplateBinding FontSize}"
                                                                TextBlock.Foreground="{TemplateBinding Foreground}"
                                                                TextWrapping="{TemplateBinding TextWrapping}" />
                                             </Panel>
@@ -590,7 +586,8 @@
         </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>
 
@@ -603,5 +600,4 @@
     </Style>
 
 
-
 </Styles>
\ No newline at end of file
diff --git a/SukiUI/Theme/TimePickerStyle.axaml b/SukiUI/Theme/TimePickerStyle.axaml
index 8df3a640..6c67c0e6 100644
--- a/SukiUI/Theme/TimePickerStyle.axaml
+++ b/SukiUI/Theme/TimePickerStyle.axaml
@@ -320,7 +320,7 @@
                                               Foreground="{DynamicResource SukiPrimaryColor}" />
                                     <TextBlock Margin="10,0,0,0"
                                                FontSize="15"
-                                               FontWeight="DemiBold"
+                                               FontWeight="{DynamicResource DefaultDemiBold}"
                                                Foreground="{DynamicResource SukiPrimaryColor}"
                                                Text="Apply" />
                                 </StackPanel>
diff --git a/SukiUI/Theme/ToggleButtonStyles.xaml b/SukiUI/Theme/ToggleButtonStyles.xaml
index b251f68c..abd76974 100644
--- a/SukiUI/Theme/ToggleButtonStyles.xaml
+++ b/SukiUI/Theme/ToggleButtonStyles.xaml
@@ -16,7 +16,7 @@
         <Setter Property="BorderBrush" Value="{DynamicResource SukiControlBorderBrush}" />
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Padding" Value="18,10,18,8" />
-        <Setter Property="FontWeight" Value="DemiBold" />
+        <Setter Property="FontWeight" Value="{DynamicResource DefaultDemiBold}" />
         <Setter Property="FontSize" Value="14" />
         <Setter Property="Foreground" Value="{DynamicResource SukiText}" />
         <Setter Property="Transitions">
@@ -188,9 +188,7 @@
                                     CornerRadius="{DynamicResource MediumCornerRadius}">
                                 <Border />
                                 <Border.Transitions>
-                                    <Transitions >
-                                     
-                                    </Transitions>
+                                    <Transitions />
                                 </Border.Transitions>
                             </Border>
 
@@ -201,11 +199,9 @@
             </ControlTemplate>
         </Setter>
     </Style>
-    
-   
 
 
-   <Style Selector="ToggleButton.Switch:unchecked /template/ Border#SwitchKnob">
+    <Style Selector="ToggleButton.Switch:unchecked /template/ Border#SwitchKnob">
         <Style.Animations>
             <Animation FillMode="Both" Duration="0:0:0.4">
                 <Animation.Easing>
@@ -255,8 +251,8 @@
                     <Setter Property="Canvas.Left" Value="11" />
 
                 </KeyFrame>
-                
-                
+
+
                 <KeyFrame Cue="80%">
                     <Setter Property="Width" Value="18" />
                 </KeyFrame>
@@ -277,7 +273,7 @@
     </Style>
 
 
-  <!--  <Style Selector="ToggleButton.Switch:pressed[IsChecked=False] /template/ Border#SwitchKnob">
+    <!--  <Style Selector="ToggleButton.Switch:pressed[IsChecked=False] /template/ Border#SwitchKnob">
         <Style.Animations>
             <Animation FillMode="Forward" Duration="0:0:0.15">
                 <KeyFrame Cue="0%">
@@ -309,8 +305,7 @@
             </Animation>
         </Style.Animations>
         <Setter Property="Width" Value="20" />
-    </Style>
--->
+    </Style>    -->
 
     <Style Selector="ToggleButton.Switch:checked /template/ Border#SwitchBackground">
         <Setter Property="Background" Value="{DynamicResource SukiPrimaryColor}" />
@@ -324,11 +319,11 @@
         <Setter Property="Background" Value="Transparent" />
         <Style Selector="^:checked">
             <Setter Property="Background" Value="Transparent" />
-            <Setter Property="Foreground" Value="{DynamicResource SukiText}"></Setter>
+            <Setter Property="Foreground" Value="{DynamicResource SukiText}" />
         </Style>
         <Style Selector="^:pointerover">
             <Setter Property="Background" Value="Transparent" />
-            <Setter Property="Foreground" Value="{DynamicResource SukiText}"></Setter>
+            <Setter Property="Foreground" Value="{DynamicResource SukiText}" />
         </Style>
         <Style Selector="^:checked">
             <Setter Property="Background" Value="Transparent" />
diff --git a/SukiUI/Utilities/Effects/EffectBackgroundDraw.cs b/SukiUI/Utilities/Effects/EffectBackgroundDraw.cs
index d1fa22b9..58d0ec95 100644
--- a/SukiUI/Utilities/Effects/EffectBackgroundDraw.cs
+++ b/SukiUI/Utilities/Effects/EffectBackgroundDraw.cs
@@ -1,7 +1,7 @@
-using Avalonia;
-using SkiaSharp;
 using System;
 using System.Diagnostics;
+using Avalonia;
+using SkiaSharp;
 
 namespace SukiUI.Utilities.Effects
 {
@@ -44,7 +44,7 @@ protected override void Render(SKCanvas canvas, SKRect rect)
             }
             if (_oldEffect is not null)
             {
-
+                
                 using var paint = new SKPaint();
                 // TODO: Investigate how to blend the shaders better - currently the only problem with this system.
                 // Blend modes effect the transition quite heavily, only these 3 seem to work in any reasonable way.
diff --git a/SukiUI/Utilities/Effects/EffectDrawBase.cs b/SukiUI/Utilities/Effects/EffectDrawBase.cs
index 8767ef10..7c61d3be 100644
--- a/SukiUI/Utilities/Effects/EffectDrawBase.cs
+++ b/SukiUI/Utilities/Effects/EffectDrawBase.cs
@@ -1,3 +1,5 @@
+using System;
+using System.Diagnostics;
 using Avalonia;
 using Avalonia.Media;
 using Avalonia.Platform;
@@ -5,8 +7,6 @@
 using Avalonia.Skia;
 using Avalonia.Styling;
 using SkiaSharp;
-using System;
-using System.Diagnostics;
 
 namespace SukiUI.Utilities.Effects
 {
@@ -41,11 +41,11 @@ public bool AnimationEnabled
         }
 
         protected float AnimationSpeedScale { get; set; } = 0.1f;
-
+        
         protected ThemeVariant ActiveVariant { get; private set; }
-
+        
         protected float AnimationSeconds => (float)_animationTick.Elapsed.TotalSeconds;
-
+        
         private readonly Stopwatch _animationTick = Stopwatch.StartNew();
 
         protected EffectDrawBase(Rect bounds)
@@ -66,24 +66,24 @@ public void Render(ImmediateDrawingContext context)
 
         protected abstract void Render(SKCanvas canvas, SKRect rect);
 
-        protected SKShader? EffectWithUniforms(float alpha = 1f) =>
+        protected SKShader? EffectWithUniforms(float alpha = 1f) => 
             EffectWithUniforms(Effect, alpha);
 
-        protected SKShader? EffectWithUniforms(SukiEffect? effect, float alpha = 1f) =>
+        protected SKShader? EffectWithUniforms(SukiEffect? effect, float alpha = 1f) => 
             effect?.ToShaderWithUniforms(AnimationSeconds, ActiveVariant, Bounds, AnimationSpeedScale, alpha);
 
         protected virtual void EffectChanged(SukiEffect? oldValue, SukiEffect? newValue)
         {
             // no-op
         }
-
+        
         public virtual void Dispose()
         {
             // no-op
         }
-
+        
         public virtual bool Equals(ICustomDrawOperation other) => false;
-
+        
         public virtual bool HitTest(Point p) => false;
     }
 }
\ No newline at end of file
diff --git a/SukiUI/Utilities/Effects/SukiEffect.cs b/SukiUI/Utilities/Effects/SukiEffect.cs
index 3f537bf5..3aef94ae 100644
--- a/SukiUI/Utilities/Effects/SukiEffect.cs
+++ b/SukiUI/Utilities/Effects/SukiEffect.cs
@@ -1,14 +1,14 @@
-using Avalonia;
-using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Media;
-using Avalonia.Styling;
-using SkiaSharp;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Text;
+using Avalonia;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Media;
+using Avalonia.Styling;
+using SkiaSharp;
 
 namespace SukiUI.Utilities.Effects
 {
@@ -153,7 +153,7 @@ internal SKShader ToShaderWithUniforms(float timeSeconds, ThemeVariant activeVar
             (float r, float g, float b) ToFloat(Color col) =>
                 (col.R / 255f, col.G / 255f, col.B / 255f);
         }
-
+        
         /// <summary>
         /// Returns the pure shader string without uniforms.
         /// </summary>
diff --git a/UotanToolbox/MainView.axaml b/UotanToolbox/MainView.axaml
index a7f1f1ee..aca91335 100644
--- a/UotanToolbox/MainView.axaml
+++ b/UotanToolbox/MainView.axaml
@@ -64,7 +64,7 @@
 								    Foreground="{DynamicResource SukiLowText}"
 									Text="{x:Static assets:Resources.Main_Status}"/>
 						<StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
-							<Button Classes="Hyperlink"
+							<Button Classes="Toolbox"
 									Foreground="White"
 									FontSize="13"
 									Content="{Binding Status, Mode=TwoWay}"/>
@@ -77,7 +77,7 @@
 								    Foreground="{DynamicResource SukiLowText}"
 									Text="{x:Static assets:Resources.Main_Code}"/>
 						<StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
-							<Button Classes="Hyperlink"
+							<Button Classes="Toolbox"
 									Foreground="White"
 									FontSize="13"
 									Content="{Binding CodeName, Mode=TwoWay}"/>
@@ -90,7 +90,7 @@
 								    Foreground="{DynamicResource SukiLowText}"
 									Text="{x:Static assets:Resources.Main_BLStatus}"/>
 						<StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
-							<Button Classes="Hyperlink"
+							<Button Classes="Toolbox"
 									Foreground="White"
 									FontSize="13"
 									Content="{Binding BLStatus, Mode=TwoWay}"/>
@@ -103,7 +103,7 @@
 								    Foreground="{DynamicResource SukiLowText}"
 									Text="{x:Static assets:Resources.Main_VABStatus}"/>
 						<StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
-							<Button Classes="Hyperlink"
+							<Button Classes="Toolbox"
 									Foreground="White"
 									FontSize="13"
 									Content="{Binding VABStatus, Mode=TwoWay}"/>