diff --git a/SukiUI/Controls/Hosts/SukiToastHost.cs b/SukiUI/Controls/Hosts/SukiToastHost.cs
index 05ccf6b3d..5ca71607e 100644
--- a/SukiUI/Controls/Hosts/SukiToastHost.cs
+++ b/SukiUI/Controls/Hosts/SukiToastHost.cs
@@ -1,7 +1,4 @@
 using System;
-using System.Linq;
-using System.Reactive;
-using System.Reactive.Linq;
 using System.Threading.Tasks;
 using Avalonia;
 using Avalonia.Controls;
@@ -41,20 +38,22 @@ public ToastLocation Position
             set => SetValue(PositionProperty, value);
         }
 
-        private IDisposable? _subscriptions;
-        
         protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
             base.OnApplyTemplate(e);
-            _subscriptions = this.GetObservable(PositionProperty)
-                .Do(OnPositionChanged)
-                .Select(_ => Unit.Default).ObserveOn(new AvaloniaSynchronizationContext())
-                .Subscribe();
+            OnPositionChanged(Position);
+        }
+
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+            if (change.Property == PositionProperty && change.NewValue is ToastLocation loc) 
+                OnPositionChanged(loc);
         }
 
-        private void OnPositionChanged(ToastLocation obj)
+        private void OnPositionChanged(ToastLocation newLoc)
         {
-            HorizontalAlignment = Position switch
+            HorizontalAlignment = newLoc switch
             {
                 ToastLocation.BottomRight => HorizontalAlignment.Right,
                 ToastLocation.BottomLeft => HorizontalAlignment.Left,
@@ -62,7 +61,7 @@ private void OnPositionChanged(ToastLocation obj)
                 ToastLocation.TopLeft => HorizontalAlignment.Left,
                 _ => throw new ArgumentOutOfRangeException()
             };
-            VerticalAlignment = Position switch
+            VerticalAlignment = newLoc switch
             {
                 ToastLocation.BottomRight => VerticalAlignment.Bottom,
                 ToastLocation.BottomLeft => VerticalAlignment.Bottom,
@@ -71,12 +70,6 @@ private void OnPositionChanged(ToastLocation obj)
                 _ => throw new ArgumentOutOfRangeException()
             };
         }
-
-        protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
-        {
-            base.OnDetachedFromVisualTree(e);
-            _subscriptions?.Dispose();
-        }
         
         private static void OnManagerPropertyChanged(AvaloniaObject sender,
             AvaloniaPropertyChangedEventArgs propChanged)
diff --git a/SukiUI/Controls/PropertyGrid/PropertyGrid.axaml.cs b/SukiUI/Controls/PropertyGrid/PropertyGrid.axaml.cs
index f1dee40d9..30cf97184 100644
--- a/SukiUI/Controls/PropertyGrid/PropertyGrid.axaml.cs
+++ b/SukiUI/Controls/PropertyGrid/PropertyGrid.axaml.cs
@@ -2,17 +2,16 @@
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
-using System;
 using System.ComponentModel;
-using System.Reactive.Linq;
 
+// ReSharper disable once CheckNamespace
 namespace SukiUI.Controls
 {
     public partial class PropertyGrid : UserControl
     {
         static PropertyGrid()
         {
-            ItemProperty.Changed.Subscribe(OnItemChanged);
+            ItemProperty.Changed.AddClassHandler<PropertyGrid>((_, args) => OnItemChanged(args));
         }
 
         public PropertyGrid()
@@ -40,8 +39,8 @@ public InstanceViewModel? Instance
             get { return GetValue(InstanceProperty); }
             set { SetValue(InstanceProperty, value); }
         }
-
-        private static void OnItemChanged(AvaloniaPropertyChangedEventArgs e)
+        
+        private static void OnItemChanged( AvaloniaPropertyChangedEventArgs e)
         {
             if (e.Sender is PropertyGrid propertyGrid)
             {
diff --git a/SukiUI/Controls/SettingsLayout.axaml.cs b/SukiUI/Controls/SettingsLayout.axaml.cs
index b7b982c34..03e762914 100644
--- a/SukiUI/Controls/SettingsLayout.axaml.cs
+++ b/SukiUI/Controls/SettingsLayout.axaml.cs
@@ -8,14 +8,12 @@
 using Avalonia.LogicalTree;
 using Avalonia.Markup.Xaml;
 using Avalonia.Styling;
-using DynamicData;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Avalonia.Layout;
 
 namespace SukiUI.Controls;
 
@@ -32,11 +30,6 @@ public SettingsLayout()
         InitializeComponent();
     }
 
-    protected override void OnAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e)
-    {
-        base.OnAttachedToLogicalTree(e);
-    }
-
     protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
     {
         base.OnApplyTemplate(e);
@@ -55,11 +48,10 @@ private void InitializeComponent()
     private ObservableCollection<SettingsLayoutItem> _items;
 
     public static readonly DirectProperty<SettingsLayout, ObservableCollection<SettingsLayoutItem>> StepsProperty =
-        AvaloniaProperty.RegisterDirect<SettingsLayout, ObservableCollection<SettingsLayoutItem>>(nameof(Items), l => l.Items,
-            (numpicker, v) =>
-            {
-                numpicker.Items = v;
-            }, defaultBindingMode: BindingMode.TwoWay, enableDataValidation: true);
+        AvaloniaProperty.RegisterDirect<SettingsLayout, ObservableCollection<SettingsLayoutItem>>(nameof(Items),
+            l => l.Items,
+            (numpicker, v) => { numpicker.Items = v; }, defaultBindingMode: BindingMode.TwoWay,
+            enableDataValidation: true);
 
     public ObservableCollection<SettingsLayoutItem> Items
     {
@@ -110,7 +102,7 @@ private void UpdateItems()
             var summaryButton = new RadioButton()
             {
                 Content = new TextBlock() { Text = settingsLayoutItem.Header, FontSize = 17 },
-                Classes = { new string[] { "MenuChip" } }
+                Classes = {  "MenuChip" }
             };
             summaryButton.Click += async (sender, args) =>
             {
@@ -119,7 +111,7 @@ private void UpdateItems()
                 var x = border.TranslatePoint(new Point(), stackItems);
 
                 if (x.HasValue)
-                    await AnimateScroll(x.Value.Y);  // myScroll.Offset = new Vector(0, x.Value.Y);
+                    await AnimateScroll(x.Value.Y); // myScroll.Offset = new Vector(0, x.Value.Y);
             };
             radios.Add(summaryButton);
             stackSummary.Children.Add(summaryButton);
@@ -139,35 +131,28 @@ private void UpdateItems()
         };
     }
 
-    private  Mutex mut = new Mutex();
+    private Mutex mut = new Mutex();
 
     private double LastDesiredSize = -1;
-    
+
     private async void DockPanel_SizeChanged(object sender, SizeChangedEventArgs e)
     {
-        
         var stack = this.GetTemplateChildren().First(n => n.Name == "StackSummary");
         var desiredSize = e.NewSize.Width > 1100 ? 400 : 0;
-        
-        if(LastDesiredSize == desiredSize)
+
+        if (LastDesiredSize == desiredSize)
             return;
 
         LastDesiredSize = desiredSize;
 
-        if (stack.Width != desiredSize && (stack.Width == 0 || stack.Width == 400)) 
+        if (stack.Width != desiredSize && (stack.Width == 0 || stack.Width == 400))
             stack.Animate<double>(WidthProperty, stack.Width, desiredSize, TimeSpan.FromMilliseconds(800));
-        
-       
     }
 
     private bool isAnimatingWidth = false;
     private bool isAnimatingMargin = false;
     private bool isAnimatingScroll = false;
 
-
-
-   
-
     private async Task AnimateScroll(double desiredScroll)
     {
         isAnimatingScroll = true;
@@ -189,7 +174,14 @@ private async Task AnimateScroll(double desiredScroll)
                 },
                 new KeyFrame()
                 {
-                    Setters = { new Setter { Property = ScrollViewer.OffsetProperty, Value = new Vector(myscroll.Offset.X, desiredScroll -30) } },
+                    Setters =
+                    {
+                        new Setter
+                        {
+                            Property = ScrollViewer.OffsetProperty,
+                            Value = new Vector(myscroll.Offset.X, desiredScroll - 30)
+                        }
+                    },
                     KeyTime = TimeSpan.FromMilliseconds(800)
                 }
             }
@@ -203,6 +195,4 @@ private async Task AnimateScroll(double desiredScroll)
 
         await Task.WhenAll(animationTask, abortTask);
     }
-
-   
 }
\ No newline at end of file
diff --git a/SukiUI/Controls/Stepper.axaml.cs b/SukiUI/Controls/Stepper.axaml.cs
index 836919c10..8b6471156 100644
--- a/SukiUI/Controls/Stepper.axaml.cs
+++ b/SukiUI/Controls/Stepper.axaml.cs
@@ -3,8 +3,6 @@
 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;
@@ -48,7 +46,6 @@ public IEnumerable? Steps
         }
 
         private Grid? _grid;
-        private IDisposable? _subscriptionDisposables;
 
         protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
@@ -59,19 +56,14 @@ protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
             }
 
             _grid = grid;
+            StepsChangedHandler(Steps);
         }
 
-        protected override void OnLoaded(RoutedEventArgs e)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
-            var indexObs = this.GetObservable(IndexProperty)
-                .Do(_ => StepsChangedHandler(Steps))
-                .Select(_ => Unit.Default);
-            _subscriptionDisposables = this.GetObservable(StepsProperty)
-                .Do(_ => StepsChangedHandler(Steps))
-                .Select(_ => Unit.Default)
-                .Merge(indexObs)
-                .ObserveOn(new AvaloniaSynchronizationContext())
-                .Subscribe();
+            base.OnPropertyChanged(change);
+            if (change.Property == IndexProperty || change.Property == StepsProperty) 
+                StepsChangedHandler(Steps);
         }
 
         private void StepsChangedHandler(IEnumerable? newSteps)
@@ -217,12 +209,6 @@ private void AddStep(object step, int index, Grid grid, int stepCount)
             grid.Children.Add(griditem);
         }
 
-        protected override void OnUnloaded(RoutedEventArgs e)
-        {
-            base.OnUnloaded(e);
-            _subscriptionDisposables?.Dispose();
-        }
-
         #endregion
 
         #region StepperAlternateStyle
diff --git a/SukiUI/Controls/SukiBackground.cs b/SukiUI/Controls/SukiBackground.cs
index 107d4f0a3..e8bdaa681 100644
--- a/SukiUI/Controls/SukiBackground.cs
+++ b/SukiUI/Controls/SukiBackground.cs
@@ -1,13 +1,10 @@
 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;
 
 namespace SukiUI.Controls
@@ -98,39 +95,36 @@ public bool ForceSoftwareRendering
         }
         
         private readonly EffectBackgroundDraw _draw;
-        private readonly IDisposable _observables;
 
         public SukiBackground()
         {
             IsHitTestVisible = false;
             _draw = new EffectBackgroundDraw(new Rect(0, 0, Bounds.Width, Bounds.Height));
-            var forceSwRenderingObs = this.GetObservable(ForceSoftwareRenderingProperty)
-                .Do(enabled => _draw.ForceSoftwareRendering = enabled)
-                .Select(_ => Unit.Default);
-            var transEnabledObs = this.GetObservable(TransitionsEnabledProperty)
-                .Do(enabled => _draw.TransitionsEnabled = enabled)
-                .Select(_ => Unit.Default)
-                .Merge(forceSwRenderingObs);
-            var transTime = this.GetObservable(TransitionTimeProperty)
-                .Do(time => _draw.TransitionTime = time)
-                .Select(_ => Unit.Default)
-                .Merge(transEnabledObs);
-            var animObs = this.GetObservable(AnimationEnabledProperty)
-                .Do(enabled => _draw.AnimationEnabled = enabled)
-                .Select(_ => Unit.Default)
-                .Merge(transTime);
-            var bgStyleObs = this.GetObservable(StyleProperty)
-                .Select(_ => Unit.Default)
-                .Merge(animObs);
-            var bgShaderFileObs = this.GetObservable(ShaderFileProperty)
-                .Select(_ => Unit.Default)
-                .Merge(bgStyleObs);
-            var bgShaderCodeObs = this.GetObservable(ShaderCodeProperty)
-                .Select(_ => Unit.Default)
-                .Merge(bgShaderFileObs)
-                .Do(_ => HandleBackgroundStyleChanges())
-                .ObserveOn(new AvaloniaSynchronizationContext());
-            _observables = bgShaderCodeObs.Subscribe();
+        }
+
+        protected override void OnLoaded(RoutedEventArgs e)
+        {
+            base.OnLoaded(e);
+            _draw.ForceSoftwareRendering = ForceSoftwareRendering;
+            _draw.TransitionsEnabled = TransitionsEnabled;
+            _draw.TransitionTime = TransitionTime;
+            _draw.AnimationEnabled = AnimationEnabled;
+            HandleBackgroundStyleChanges();
+        }
+
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+            if (change.Property == ForceSoftwareRenderingProperty && change.NewValue is bool forceSoftwareRendering)
+                _draw.ForceSoftwareRendering = forceSoftwareRendering;
+            else if(change.Property == TransitionsEnabledProperty && change.NewValue is bool transitionEnabled)
+                _draw.TransitionsEnabled = transitionEnabled;
+            else if(change.Property == TransitionTimeProperty && change.NewValue is double transitionTime)
+                _draw.TransitionTime = transitionTime;
+            else if(change.Property == AnimationEnabledProperty && change.NewValue is bool animationEnabled)
+                _draw.AnimationEnabled = animationEnabled;
+            else if(change.Property == StyleProperty || change.Property == ShaderFileProperty || change.Property == ShaderCodeProperty)
+                HandleBackgroundStyleChanges();
         }
 
         public override void Render(DrawingContext context)
@@ -149,10 +143,5 @@ private void HandleBackgroundStyleChanges()
             else
                 _draw.Effect = SukiEffect.FromEmbeddedResource(Style.ToString());
         }
-
-        protected override void OnUnloaded(RoutedEventArgs e)
-        {
-            _observables.Dispose();
-        }
     }
 }
\ No newline at end of file
diff --git a/SukiUI/Controls/SukiSideMenu.axaml.cs b/SukiUI/Controls/SukiSideMenu.axaml.cs
index af0be225b..a90d085e8 100644
--- a/SukiUI/Controls/SukiSideMenu.axaml.cs
+++ b/SukiUI/Controls/SukiSideMenu.axaml.cs
@@ -1,12 +1,9 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
-using Avalonia.Threading;
 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;
@@ -112,15 +109,15 @@ public object? FooterContent
 
     private bool IsSpacerVisible => !IsMenuExpanded;
 
-    private IDisposable? _subscriptionDisposable;
-    private IDisposable? _contentDisposable;
+
+    private SukiTransitioningContentControl? _contentControl;
+    private Grid? _spacer;
     
     public SukiSideMenu()
     {
         SelectionMode = SelectionMode.Single | SelectionMode.AlwaysSelected;
     }
 
-
     private void MenuExpandedClicked()
     {
         IsMenuExpanded = !IsMenuExpanded;
@@ -143,49 +140,43 @@ protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
             SelectedItem = Items.First();
         }
 
-        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);
-        }
+        e.NameScope.Get<Button>("PART_SidebarToggleButton").Click += (_, _) => MenuExpandedClicked();
+        _contentControl = e.NameScope.Get<SukiTransitioningContentControl>("PART_TransitioningContentControl");
+        _spacer = e.NameScope.Get<Grid>("PART_Spacer");
+        if(_spacer != null) _spacer.IsVisible = IsSpacerVisible;
+    }
 
-        if (e.NameScope.Get<SukiTransitioningContentControl>("PART_TransitioningContentControl") is { } contentControl)
-        {
-            _contentDisposable = this.GetObservable(SelectedItemProperty)
-                .ObserveOn(new AvaloniaSynchronizationContext())
-                .Do(obj =>
-                {
-                    contentControl.Content = obj switch
-                    {
-                        SukiSideMenuItem { PageContent: { } sukiMenuPageContent } => sukiMenuPageContent,
-                        _ => obj
-                    };
-                })
-                .Subscribe();
-        }
+    protected override void OnLoaded(RoutedEventArgs e)
+    {
+        base.OnLoaded(e);
+        SetContentControlContent(SelectedItem);
+    }
 
+    protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+    {
+        base.OnPropertyChanged(change);
+        if (change.Property == SelectedItemProperty && _contentControl != null) 
+            SetContentControlContent(change.NewValue);
+        if (change.Property == IsMenuExpandedProperty && _spacer != null) 
+            _spacer.IsVisible = IsSpacerVisible;
     }
 
-    public bool UpdateSelectionFromPointerEvent(Control source)
+    private void SetContentControlContent(object? newContent)
     {
-        return UpdateSelectionFromEventSource(source);
+        if (_contentControl == null) return;
+        _contentControl.Content = newContent switch
+        {
+            SukiSideMenuItem { PageContent: { } sukiMenuPageContent } => sukiMenuPageContent,
+            _ => newContent
+        };
     }
 
+    public bool UpdateSelectionFromPointerEvent(Control source) => UpdateSelectionFromEventSource(source);
+
     protected override Control CreateContainerForItemOverride(object? item, int index, object? recycleKey)
     {
-        SukiSideMenuItem menuItem =
-            (ItemTemplate != null && ItemTemplate.Match(item) &&
-             ItemTemplate.Build(item) is SukiSideMenuItem sukiMenuItem)
+        var menuItem = (ItemTemplate != null && ItemTemplate.Match(item) &&
+                        ItemTemplate.Build(item) is SukiSideMenuItem sukiMenuItem)
                 ? sukiMenuItem
                 : new SukiSideMenuItem();
         menuItem.IsContentMovable = IsSelectedItemContentMovable;
@@ -193,17 +184,10 @@ protected override Control CreateContainerForItemOverride(object? item, int inde
         return menuItem;
     }
 
-    private List<SukiSideMenuItem> _sideMenuItems = new();
+    private readonly List<SukiSideMenuItem> _sideMenuItems = new();
 
     protected override bool NeedsContainerOverride(object? item, int index, out object? recycleKey)
     {
         return NeedsContainer<SukiSideMenuItem>(item, out recycleKey);
     }
-
-    protected override void OnUnloaded(RoutedEventArgs e)
-    {
-        base.OnUnloaded(e);
-        _contentDisposable?.Dispose();
-        _subscriptionDisposable?.Dispose();
-    }
 }
diff --git a/SukiUI/Controls/SukiSideMenuSearchService.cs b/SukiUI/Controls/SukiSideMenuSearchService.cs
index f4581b640..254cdabfc 100644
--- a/SukiUI/Controls/SukiSideMenuSearchService.cs
+++ b/SukiUI/Controls/SukiSideMenuSearchService.cs
@@ -2,16 +2,12 @@
 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
+    // this is quite disgusting but if it works it works... -Doom
     internal class SukiSideMenuService : INotifyPropertyChanged
     {
         
diff --git a/SukiUI/Controls/SukiTransitioningContentControl.axaml.cs b/SukiUI/Controls/SukiTransitioningContentControl.axaml.cs
index e0d10ba39..7715c6f78 100644
--- a/SukiUI/Controls/SukiTransitioningContentControl.axaml.cs
+++ b/SukiUI/Controls/SukiTransitioningContentControl.axaml.cs
@@ -1,13 +1,10 @@
 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;
@@ -50,8 +47,6 @@ public object? Content
         private ContentPresenter _firstBuffer = null!;
         private ContentPresenter _secondBuffer = null!;
 
-        private IDisposable? _disposable;
-
         private static readonly Animation FadeIn;
         private static readonly Animation FadeOut;
         
@@ -129,14 +124,11 @@ static SukiTransitioningContentControl()
 
         private CancellationTokenSource _animCancellationToken = new();
 
-        private IDisposable? _contentDisposable;
-
-        protected override void OnLoaded(RoutedEventArgs e)
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
-            base.OnLoaded(e);
-            _contentDisposable = this.GetObservable(ContentProperty)
-                .ObserveOn(new AvaloniaSynchronizationContext())
-                .Subscribe(PushContent);
+            base.OnPropertyChanged(change);
+            if(change.Property == ContentProperty)
+                PushContent(change.NewValue);
         }
 
         protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
@@ -179,8 +171,6 @@ public void PushContent(object? content)
         protected override void OnUnloaded(RoutedEventArgs e)
         {
             base.OnUnloaded(e);
-            _disposable?.Dispose();
-            _contentDisposable?.Dispose();
             _animCancellationToken.Dispose();
         }
     }
diff --git a/SukiUI/Controls/SukiWindow.axaml.cs b/SukiUI/Controls/SukiWindow.axaml.cs
index 8ce32a87e..25f73e912 100644
--- a/SukiUI/Controls/SukiWindow.axaml.cs
+++ b/SukiUI/Controls/SukiWindow.axaml.cs
@@ -3,16 +3,11 @@
 using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using Avalonia.Media;
-using Avalonia.Threading;
 using System;
-using System.Reactive;
-using System.Reactive.Linq;
-using System.Reflection;
 using Avalonia.Collections;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Interactivity;
 using SukiUI.Enums;
-using SukiUI.Utilities;
 
 namespace SukiUI.Controls;
 
@@ -91,7 +86,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);
 
@@ -123,7 +118,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
     {
@@ -143,17 +138,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
     {
@@ -163,7 +158,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
     {
@@ -171,12 +166,13 @@ public double BackgroundTransitionTime
         set => SetValue(BackgroundTransitionTimeProperty, value);
     }
 
-    public static readonly StyledProperty<Avalonia.Controls.Controls> RightWindowTitleBarControlsProperty = 
-        AvaloniaProperty.Register<SukiWindow, Avalonia.Controls.Controls>(nameof(RightWindowTitleBarControls), 
+    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<bool> BackgroundForceSoftwareRenderingProperty = AvaloniaProperty.Register<SukiWindow, bool>(nameof(BackgroundForceSoftwareRendering));
-    
+    public static readonly StyledProperty<bool> BackgroundForceSoftwareRenderingProperty =
+        AvaloniaProperty.Register<SukiWindow, bool>(nameof(BackgroundForceSoftwareRendering));
+
     /// <summary>
     /// Forces the background of the window to utilise software rendering.
     /// This prevents use of any advanced effects or animations and provides only a flat background colour that changes with the theme.
@@ -197,8 +193,8 @@ public Avalonia.Controls.Controls RightWindowTitleBarControls
         set => SetValue(RightWindowTitleBarControlsProperty, value);
     }
 
-    public static readonly StyledProperty<Avalonia.Controls.Controls> HostsProperty = 
-        AvaloniaProperty.Register<SukiWindow, Avalonia.Controls.Controls>(nameof(Hosts), 
+    public static readonly StyledProperty<Avalonia.Controls.Controls> HostsProperty =
+        AvaloniaProperty.Register<SukiWindow, Avalonia.Controls.Controls>(nameof(Hosts),
             defaultValue: new Avalonia.Controls.Controls());
 
     /// <summary>
@@ -218,12 +214,10 @@ public SukiWindow()
         Hosts = new Avalonia.Controls.Controls();
     }
 
-    private IDisposable? _subscriptionDisposables;
-
     protected override void OnLoaded(RoutedEventArgs e)
     {
         base.OnLoaded(e);
-        
+
         if (Application.Current?.ApplicationLifetime is not IClassicDesktopStyleApplicationLifetime desktop)
             return;
         if (desktop.MainWindow is SukiWindow window && window != this)
@@ -233,68 +227,26 @@ protected override void OnLoaded(RoutedEventArgs e)
             // if (LogoContent is null) LogoContent = s.LogoContent;
         }
     }
-    
+
+    protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+    {
+        base.OnPropertyChanged(change);
+        if (change.Property == WindowStateProperty && change.NewValue is WindowState windowState) 
+            OnWindowStateChanged(windowState);
+    }
+
     protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
     {
         base.OnApplyTemplate(e);
-
-        _subscriptionDisposables = this.GetObservable(WindowStateProperty)
-            .Do(OnWindowStateChanged)
-            .Select(_ => Unit.Default).ObserveOn(new AvaloniaSynchronizationContext())
-            .Subscribe();
+        OnWindowStateChanged(WindowState);
         try
         {
             // Create handlers for buttons
             if (e.NameScope.Get<Button>("PART_MaximizeButton") is { } maximize)
             {
                 maximize.Click += OnMaximizeButtonClicked;
-                var pointerOnMaxButton = false;
-                var setter = typeof(Button).GetProperty("IsPointerOver");
-
-                // Windows Snap Layout
-                var proc = 
-                    (IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam, ref bool handled) =>
-                {
-                    switch (msg)
-                    {
-                        case 533:
-                            if (!pointerOnMaxButton) break;
-                            if (!CanResize) break;
-                            WindowState = WindowState == WindowState.Maximized
-                                ? WindowState.Normal
-                                : WindowState.Maximized;
-                            break;
-                        case 0x0084:
-                            var point = new PixelPoint(
-                                (short)(ToInt32(lParam) & 0xffff),
-                                (short)(ToInt32(lParam) >> 16));
-                            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;
-                                return (IntPtr)9;
-                            }
-
-                            pointerOnMaxButton = false;
-                            setter?.SetValue(maximize, false);
-                            break;
-                    }
-
-                    return IntPtr.Zero;
-                    
-                    static int ToInt32(IntPtr ptr) => IntPtr.Size == 4 
-                                                    ? ptr.ToInt32() : (int)(ptr.ToInt64() & 0xffffffff);
-                };
-                
-                Win32Properties.AddWndProcHookCallback(this, new Win32Properties.CustomWndProcHookCallback(proc));
-            } 
+                EnableWindowsSnapLayout(maximize);
+            }
 
             if (e.NameScope.Get<Button>("PART_MinimizeButton") is { } minimize)
                 minimize.Click += (_, _) => WindowState = WindowState.Minimized;
@@ -318,18 +270,65 @@ private void OnMaximizeButtonClicked(object? sender, RoutedEventArgs args)
     {
         if (!CanResize) return;
         WindowState = WindowState == WindowState.Maximized
-                    ? WindowState.Normal
-                    : WindowState.Maximized;
+            ? WindowState.Normal
+            : WindowState.Maximized;
+    }
+
+    private void EnableWindowsSnapLayout(Button maximize)
+    {
+        var pointerOnMaxButton = false;
+        var setter = typeof(Button).GetProperty("IsPointerOver");
+        var proc = (IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam, ref bool handled) =>
+        {
+            switch (msg)
+            {
+                case 533:
+                    if (!pointerOnMaxButton) break;
+                    if (!CanResize) break;
+                    WindowState = WindowState == WindowState.Maximized
+                        ? WindowState.Normal
+                        : WindowState.Maximized;
+                    break;
+                case 0x0084:
+                    var point = new PixelPoint(
+                        (short)(ToInt32(lParam) & 0xffff),
+                        (short)(ToInt32(lParam) >> 16));
+                    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;
+                        return (IntPtr)9;
+                    }
+
+                    pointerOnMaxButton = false;
+                    setter?.SetValue(maximize, false);
+                    break;
+            }
+
+            return IntPtr.Zero;
+
+            static int ToInt32(IntPtr ptr) => IntPtr.Size == 4
+                ? ptr.ToInt32()
+                : (int)(ptr.ToInt64() & 0xffffffff);
+        };
+
+        Win32Properties.AddWndProcHookCallback(this, new Win32Properties.CustomWndProcHookCallback(proc));
     }
 
     private void OnWindowStateChanged(WindowState state)
     {
         if (state == WindowState.FullScreen)
             CanResize = CanMove = false;
-        
         if (state == WindowState.Maximized)
             Margin = new Thickness(7);
-        else 
+        else
             Margin = new Thickness(0);
     }
 
@@ -338,10 +337,4 @@ private void OnTitleBarPointerPressed(object? sender, PointerPressedEventArgs e)
         base.OnPointerPressed(e);
         BeginMoveDrag(e);
     }
-
-    protected override void OnUnloaded(RoutedEventArgs e)
-    {
-        base.OnUnloaded(e);
-        _subscriptionDisposables?.Dispose();
-    }
 }
\ No newline at end of file
diff --git a/SukiUI/SukiUI.csproj b/SukiUI/SukiUI.csproj
index de768c923..580617e19 100644
--- a/SukiUI/SukiUI.csproj
+++ b/SukiUI/SukiUI.csproj
@@ -33,7 +33,6 @@
 		<PackageReference Include="SkiaSharp" Version="2.88.8" />
 		<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.2.0-beta1" />
 		<PackageReference Include="Avalonia.Themes.Simple" Version="11.2.0-beta1" />
-		<PackageReference Include="ReactiveUI" Version="20.1.1" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/SukiUI/Theme/Index.axaml.cs b/SukiUI/Theme/Index.axaml.cs
index e1de85131..f727cc0c4 100644
--- a/SukiUI/Theme/Index.axaml.cs
+++ b/SukiUI/Theme/Index.axaml.cs
@@ -4,8 +4,6 @@
 using Avalonia.Markup.Xaml;
 using Avalonia.Media;
 using Avalonia.Styling;
-using DynamicData;
-using SukiUI.Controls;
 using SukiUI.Enums;
 using SukiUI.Extensions;
 using SukiUI.Models;
@@ -97,7 +95,13 @@ public void ChangeColorTheme(SukiColorTheme sukiColorTheme) =>
     /// </summary>
     public void SwitchColorTheme()
     {
-        var index = ColorThemes.IndexOf(ActiveColorTheme);
+        var index = -1;
+        for (var i = 0; i < ColorThemes.Count; i++)
+        {
+            if (ColorThemes[i] != ActiveColorTheme) continue;
+            index = i;
+            break;
+        }
         if (index == -1) return;
         var newIndex = (index + 1) % ColorThemes.Count;
         var newColorTheme = ColorThemes[newIndex];
@@ -203,7 +207,6 @@ 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/docs/docs/documentation/getting-started/launch.md b/docs/docs/documentation/getting-started/launch.md
index de7102411..94d06b160 100644
--- a/docs/docs/documentation/getting-started/launch.md
+++ b/docs/docs/documentation/getting-started/launch.md
@@ -15,6 +15,10 @@ Include SukiUI styles in your `App.axaml`
 </Application>
 ```
 
+::: warning
+If a default `ThemeColor` is not set and you do not set the theme by any other means, your window and many controls will be completely transparent.
+:::
+
 ## Use SukiWindow as MainWindow
 
 Change MainWindow from Window class to SukiWindow class.
diff --git a/docs/docs/documentation/hosts/dialog.md b/docs/docs/documentation/hosts/dialog.md
index 6af71834a..5a1beb8ca 100644
--- a/docs/docs/documentation/hosts/dialog.md
+++ b/docs/docs/documentation/hosts/dialog.md
@@ -2,4 +2,114 @@
 
 SukiUI provides a [host](./hosts) which can display dialogs easily at any level of your application. As standard we recommend simply using it in `SukiWindow.Hosts` as this provides the best experience, however dialogs can be localised within whatever context you require.
 
-The host is designed in such a way as to be MVVM friendly and as long as you have access to the `ISukiDialogManager` instance used for a given `SukiDialogHost` you can display dialogs in it.
\ No newline at end of file
+The host is designed in such a way as to be MVVM friendly and as long as you have access to the `ISukiDialogManager` instance used for a given `SukiDialogHost` you can display dialogs in it.
+
+Here is a simple example setup using MVVM:
+
+### View
+```xml
+<!-- XMLNS definitions omitted for brevity -->
+<suki:SukiWindow>
+	<suki:SukiWindow.Hosts>
+		<suki:SukiDialogHost Manager="{Binding DialogManager}"/>
+	</suki:SukiWindow.Hosts>
+<suki:SukiWindow>
+```
+
+### ViewModel
+```cs
+public class ExampleViewModel
+{
+	public ISukiDialogManager DialogManager { get; } = new SukiDialogManager();
+}
+```
+---
+
+If you do not wish to use MVVM, or would rather a simpler solution that "just works", then you can choose to implement it like this:
+
+### AXAML
+```xml
+<!-- XMLNS definitions omitted for brevity -->
+<suki:SukiWindow>
+	<suki:SukiWindow.Hosts>
+		<suki:SukiDialogHost Name="DialogHost"/>
+	</suki:SukiWindow.Hosts>
+<suki:SukiWindow>
+```
+### Code-Behind
+```cs
+public class MainWindow : SukiWindow
+{
+	public static ISukiDialogManager DialogManager = new SukiDialogManager();
+
+	public MainWindow()
+	{
+		InitializeComponent();
+		DialogHost.Manager = DialogManager;
+	}
+}
+```
+
+### Usage
+
+```cs
+MainWindow.DialogManager.CreateDialog()
+	.TryShow();
+```
+
+## Displaying Dialogs
+
+In order to construct and therefore display dialogs, a fluent style builder is provided that makes constructing dialogs simple. To begin constructing a dialog, it's recommended to call the extension method `.CreateDialog()` on the `ISukiDialogManager` instance you want it to be displayed in.
+
+From here method calls can be chained to construct the dialog as desired, most of these are self explanatory and have associated XMLDocs for convenience.
+
+Finally to display a dialog the `.TryShow()` method can be called to attempt to show the dialog if none is currently shown.
+
+Here is a simple example, expanding on the `ViewModel` above:
+
+```cs
+public void DisplayDialog()
+{
+	DialogManager.CreateDialog()
+		.WithTitle("Example Dialog")
+		.WithContent("The content of an example dialog can be seen here.")
+		.TryShow();
+}
+```
+
+## Dismissing Dialogs
+
+By default, dialogs have no mechanism to be dismissed. In order to add dismissal mechanisms to a dialog it's necessary to use the `.Dismiss()` method, at which point you can provide a method by which the dialogs can be dismissed. Currently the only standalone dismissal is `.ByClickingBackground()` which will dismiss the dialog when the user clicks outside of it.
+
+Here is an example of an empty dialog which will be dismissed when the background is clicked.
+
+```cs
+public void DisplayDialog()
+{
+	DialogManager.CreateDialog()
+            .Dismiss().ByClickingBackground()
+            .TryShow();
+}
+```
+
+The other method of dismissing dialogs involves the use of action buttons, discussed in the next section.
+
+## Interactions
+
+Dialogs can be interacted with simply by including a call to `.WithActionButton()`, this can be supplied with some content for the button, an on-clicked callback and optionally the `dismissOnClick` parameter can be set to `true` if you want the dialog to close immediately on clicking that specific button. Any number of `.WithActionButton()` calls can be included in the chain to add any number of buttons.
+
+Here is an example of a dialog with two buttons, one of which will dismiss the dialog.
+
+```cs
+public void DisplayDialog()
+{
+    dialogManager.CreateDialog()
+        .WithActionButton("Don't Close", _ => { })
+        .WithActionButton("Close ", _ => { }, true) // last parameter optional
+        .TryShow();
+}
+```
+
+## MessageBox Style
+
+It is possible to use the `.OfType()` method to cause the dialog to use an included MessageBox style, the styles included are: Information, Success, Warning and Error. 
\ No newline at end of file