diff --git a/.github/workflows/build-gallery-windows.yml b/.github/workflows/build-gallery-windows.yml
new file mode 100644
index 000000000..821c2fd3a
--- /dev/null
+++ b/.github/workflows/build-gallery-windows.yml
@@ -0,0 +1,23 @@
+name: Build Gallery (Native)
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  build:
+    runs-on: windows-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Build Native
+        run: dotnet publish SukiUI.Demo/SukiUI.Demo.csproj -c Release -r win-x64 -o bin/
+
+      - name: Upload
+        uses: actions/upload-artifact@v4
+        with:
+          name: gallery-native
+          path: bin
diff --git a/SukiUI.Demo/App.axaml b/SukiUI.Demo/App.axaml
index 11485037b..ceca5e713 100644
--- a/SukiUI.Demo/App.axaml
+++ b/SukiUI.Demo/App.axaml
@@ -6,9 +6,6 @@
              xmlns:common="clr-namespace:SukiUI.Demo.Common"
              xmlns:suki="https://github.com/kikipoulet/SukiUI"
              RequestedThemeVariant="Default">
-    <Application.DataTemplates>
-        <common:ViewLocator />
-    </Application.DataTemplates>
     
     <TrayIcon.Icons>
         <TrayIcons>
diff --git a/SukiUI.Demo/App.axaml.cs b/SukiUI.Demo/App.axaml.cs
index 810a6a6ce..d0f257f6c 100644
--- a/SukiUI.Demo/App.axaml.cs
+++ b/SukiUI.Demo/App.axaml.cs
@@ -5,11 +5,19 @@
 using Avalonia.Markup.Xaml;
 using Microsoft.Extensions.DependencyInjection;
 using SukiUI.Demo.Common;
-using SukiUI.Demo.Features;
+using SukiUI.Demo.Features.ControlsLibrary;
+using SukiUI.Demo.Features.ControlsLibrary.Colors;
+using SukiUI.Demo.Features.ControlsLibrary.Dialogs;
+using SukiUI.Demo.Features.ControlsLibrary.StackPage;
+using SukiUI.Demo.Features.ControlsLibrary.TabControl;
+using SukiUI.Demo.Features.ControlsLibrary.Toasts;
+using SukiUI.Demo.Features.CustomTheme;
+using SukiUI.Demo.Features.Dashboard;
+using SukiUI.Demo.Features.Effects;
+using SukiUI.Demo.Features.Playground;
+using SukiUI.Demo.Features.Splash;
+using SukiUI.Demo.Features.Theming;
 using SukiUI.Demo.Services;
-using System;
-using System.Linq;
-using SukiUI.Controls;
 using SukiUI.Dialogs;
 using SukiUI.Toasts;
 
@@ -17,52 +25,76 @@ namespace SukiUI.Demo;
 
 public class App : Application
 {
-    private IServiceProvider? _provider;
-
     public override void Initialize()
     {
         AvaloniaXamlLoader.Load(this);
-        _provider = ConfigureServices();
     }
 
     public override void OnFrameworkInitializationCompleted()
     {
         if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
         {
-            var viewLocator = _provider?.GetRequiredService<IDataTemplate>();
-            var mainViewModel = _provider?.GetRequiredService<SukiUIDemoViewModel>();
-            var mainView = _provider?.GetRequiredService<SukiUIDemoView>();
-            mainView.DataContext = mainViewModel;
-            desktop.MainWindow = mainView;
+            var services = new ServiceCollection();
+
+            services.AddSingleton(desktop);
+
+            var views = ConfigureViews(services);
+            var provider = ConfigureServices(services);
+
+            DataTemplates.Add(new ViewLocator(views));
+
+            desktop.MainWindow = views.CreateView<SukiUIDemoViewModel>(provider) as Window;
         }
 
         base.OnFrameworkInitializationCompleted();
     }
 
-    private static ServiceProvider ConfigureServices()
+    private static SukiViews ConfigureViews(ServiceCollection services)
     {
-        var viewLocator = Current?.DataTemplates.First(x => x is ViewLocator);
-        var services = new ServiceCollection();
+        return new SukiViews()
 
-        // Views
-        services.AddSingleton<SukiUIDemoView>();
-        
-        // Services
-        if (viewLocator is not null)
-            services.AddSingleton(viewLocator);
-        services.AddSingleton<PageNavigationService>();
+            // Add main view
+            .AddView<SukiUIDemoView, SukiUIDemoViewModel>(services)
+
+            // Add pages
+            .AddView<SplashView, SplashViewModel>(services)
+            .AddView<ThemingView, ThemingViewModel>(services)
+            .AddView<PlaygroundView, PlaygroundViewModel>(services)
+            .AddView<EffectsView, EffectsViewModel>(services)
+            .AddView<DashboardView, DashboardViewModel>(services)
+            .AddView<ButtonsView, ButtonsViewModel>(services)
+            .AddView<CardsView, CardsViewModel>(services)
+            .AddView<CollectionsView, CollectionsViewModel>(services)
+            .AddView<ContextMenusView, ContextMenusViewModel>(services)
+            .AddView<DockView, DockViewModel>(services)
+            .AddView<ExpanderView, ExpanderViewModel>(services)
+            .AddView<IconsView, IconsViewModel>(services)
+            .AddView<InfoBarView, InfoBarViewModel>(services)
+            .AddView<MiscView, MiscViewModel>(services)
+            .AddView<ProgressView, ProgressViewModel>(services)
+            .AddView<PropertyGridView, PropertyGridViewModel>(services)
+            .AddView<TextView, TextViewModel>(services)
+            .AddView<TogglesView, TogglesViewModel>(services)
+            .AddView<ToastsView, ToastsViewModel>(services)
+            .AddView<TabControlView, TabControlViewModel>(services)
+            .AddView<StackPageView, StackPageViewModel>(services)
+            .AddView<DialogsView, DialogsViewModel>(services)
+            .AddView<ColorsView, ColorsViewModel>(services)
+
+            // Add additional views
+            .AddView<DialogView, DialogViewModel>(services)
+            .AddView<VmDialogView, VmDialogViewModel>(services)
+            .AddView<RecursiveView, RecursiveViewModel>(services)
+            .AddView<CustomThemeDialogView, CustomThemeDialogViewModel>(services);
+    }
+
+    private static ServiceProvider ConfigureServices(ServiceCollection services)
+    {
         services.AddSingleton<ClipboardService>();
+        services.AddSingleton<PageNavigationService>();
         services.AddSingleton<ISukiToastManager, SukiToastManager>();
         services.AddSingleton<ISukiDialogManager, SukiDialogManager>();
 
-        // ViewModels
-        services.AddSingleton<SukiUIDemoViewModel>();
-        var types = AppDomain.CurrentDomain.GetAssemblies()
-            .SelectMany(s => s.GetTypes())
-            .Where(p => !p.IsAbstract && typeof(DemoPageBase).IsAssignableFrom(p));
-        foreach (var type in types)
-            services.AddSingleton(typeof(DemoPageBase), type);
-
         return services.BuildServiceProvider();
     }
 }
\ No newline at end of file
diff --git a/SukiUI.Demo/Common/SukiViews.cs b/SukiUI.Demo/Common/SukiViews.cs
new file mode 100644
index 000000000..b56bbaf8d
--- /dev/null
+++ b/SukiUI.Demo/Common/SukiViews.cs
@@ -0,0 +1,81 @@
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Microsoft.Extensions.DependencyInjection;
+using SukiUI.Demo.Features;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+
+namespace SukiUI.Demo.Common;
+
+public class SukiViews
+{
+    private readonly Dictionary<Type, Type> _vmToViewMap = [];
+
+    public SukiViews AddView<
+        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TView,
+        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TViewModel>(ServiceCollection services)
+        where TView : ContentControl
+        where TViewModel : ObservableObject
+    {
+        var viewType = typeof(TView);
+        var viewModelType = typeof(TViewModel);
+
+        _vmToViewMap.Add(viewModelType, viewType);
+
+        if (viewModelType.IsAssignableTo(typeof(DemoPageBase)))
+        {
+            services.AddSingleton(typeof(DemoPageBase), viewModelType);
+        }
+        else
+        {
+            services.AddSingleton(viewModelType);
+        }
+
+        return this;
+    }
+
+    public bool TryCreateView(IServiceProvider provider, Type viewModelType, [NotNullWhen(true)] out Control? view)
+    {
+        var viewModel = provider.GetRequiredService(viewModelType);
+
+        return TryCreateView(viewModel, out view);
+    }
+
+    public bool TryCreateView(object? viewModel, [NotNullWhen(true)] out Control? view)
+    {
+        view = null;
+
+        if (viewModel == null)
+        {
+            return false;
+        }
+
+        var viewModelType = viewModel.GetType();
+
+        if (_vmToViewMap.TryGetValue(viewModelType, out var viewType))
+        {
+            view = Activator.CreateInstance(viewType) as Control;
+
+            if (view != null)
+            {
+                view.DataContext = viewModel;
+            }
+        }
+
+        return view != null;
+    }
+
+    public Control CreateView<TViewModel>(IServiceProvider provider) where TViewModel : ObservableObject
+    {
+        var viewModelType = typeof(TViewModel);
+
+        if (TryCreateView(provider, viewModelType, out var view))
+        {
+            return view;
+        }
+
+        throw new InvalidOperationException();
+    }
+}
\ No newline at end of file
diff --git a/SukiUI.Demo/Common/ViewLocator.cs b/SukiUI.Demo/Common/ViewLocator.cs
index 4f12def8b..47adb52d7 100644
--- a/SukiUI.Demo/Common/ViewLocator.cs
+++ b/SukiUI.Demo/Common/ViewLocator.cs
@@ -1,39 +1,37 @@
 using Avalonia.Controls;
 using Avalonia.Controls.Templates;
-using System;
+using CommunityToolkit.Mvvm.ComponentModel;
 using System.Collections.Generic;
-using System.ComponentModel;
 
 namespace SukiUI.Demo.Common;
 
-public class ViewLocator : IDataTemplate
+public class ViewLocator(SukiViews views) : IDataTemplate
 {
-    private readonly Dictionary<object, Control> _controlCache = new();
+    private readonly Dictionary<object, Control> _controlCache = [];
 
-    public Control Build(object? data)
+    public Control Build(object? param)
     {
-        if(data is null) 
-            return new TextBlock { Text = "Data is null." };
-        
-        var fullName = data.GetType().FullName;
-        
-        if (string.IsNullOrWhiteSpace(fullName)) 
-            return new TextBlock { Text = "Type has no name, or name is empty." };
-        
-        var name = fullName.Replace("ViewModel", "View");
-        var type = Type.GetType(name);
-        if (type is null)
-            return new TextBlock { Text = $"No View For {name}." };
-
-        if (!_controlCache.TryGetValue(data, out var res))
+        if (param is null)
         {
-            res ??= (Control)Activator.CreateInstance(type)!;
-            _controlCache[data] = res;
+            return CreateText("Data is null.");
         }
 
-        res.DataContext = data;
-        return res;
+        if (_controlCache.TryGetValue(param, out var control))
+        {
+            return control;
+        }
+
+        if (views.TryCreateView(param, out var view))
+        {
+            _controlCache.Add(param, view);
+
+            return view;
+        }
+
+        return CreateText($"No View For {param.GetType().Name}.");
     }
 
-    public bool Match(object? data) => data is INotifyPropertyChanged;
+    public bool Match(object? data) => data is ObservableObject;
+
+    private static TextBlock CreateText(string text) => new TextBlock { Text = text };
 }
\ No newline at end of file
diff --git a/SukiUI.Demo/Converters/StringToControlConverter.cs b/SukiUI.Demo/Converters/StringToControlConverter.cs
index 4fc93179a..256b5f523 100644
--- a/SukiUI.Demo/Converters/StringToControlConverter.cs
+++ b/SukiUI.Demo/Converters/StringToControlConverter.cs
@@ -17,7 +17,15 @@ public sealed class StringToControlConverter : IValueConverter
         if (string.IsNullOrWhiteSpace(xamlCode)) return null;
 
         var previewCode = XamlData.InsertIntoGridControl(xamlCode);
-        return AvaloniaRuntimeXamlLoader.Parse<Grid>(previewCode);
+
+        try
+        {
+            return AvaloniaRuntimeXamlLoader.Parse<Grid>(previewCode);
+        }
+        catch
+        {
+            return null;
+        }
     }
 
     public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
diff --git a/SukiUI.Demo/Features/ControlsLibrary/IconViewItem.cs b/SukiUI.Demo/Features/ControlsLibrary/IconViewItem.cs
new file mode 100644
index 000000000..e441815ca
--- /dev/null
+++ b/SukiUI.Demo/Features/ControlsLibrary/IconViewItem.cs
@@ -0,0 +1,26 @@
+using Avalonia.Media;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using SukiUI.Demo.Services;
+using SukiUI.Toasts;
+
+namespace SukiUI.Demo.Features.ControlsLibrary;
+
+public partial class IconItemViewModel(ClipboardService clipboard, ISukiToastManager toastManager) : ObservableObject
+{
+    public required string Name { get; init; }
+
+    public required Geometry Geometry { get; init; }
+
+    [RelayCommand]
+    public void OnClick()
+    {
+        clipboard.CopyToClipboard($"<PathIcon Data=\"{{x:Static content:Icons.{Name}}}\" />");
+
+        toastManager
+            .CreateSimpleInfoToast()
+            .WithTitle("Copied To Clipboard")
+            .WithContent($"Copied the XAML for {Name} to your clipboard.")
+            .Queue();
+    }
+}
\ No newline at end of file
diff --git a/SukiUI.Demo/Features/ControlsLibrary/IconsView.axaml b/SukiUI.Demo/Features/ControlsLibrary/IconsView.axaml
index 366ff4092..206b691e1 100644
--- a/SukiUI.Demo/Features/ControlsLibrary/IconsView.axaml
+++ b/SukiUI.Demo/Features/ControlsLibrary/IconsView.axaml
@@ -38,18 +38,17 @@
             </suki:GroupBox>
         </suki:GlassCard>
         <ScrollViewer Grid.Row="1">
-            <ItemsControl suki:ItemsControlExtensions.AnimatedScroll="True" ItemsSource="{Binding AllIcons}">
+            <ItemsControl suki:ItemsControlExtensions.AnimatedScroll="True" ItemsSource="{Binding Icons}">
                 <ItemsControl.ItemTemplate>
-                    <DataTemplate x:CompileBindings="False">
+                    <DataTemplate x:DataType="controlsLibrary:IconItemViewModel">
                         <suki:GlassCard Margin="15,15,15,15"
                                         IsInteractive="True"
-                                        Command="{Binding $parent[controlsLibrary:IconsView].((controlsLibrary:IconsViewModel)DataContext).IconClickedCommand}"
-                                        CommandParameter="{Binding Key}">
-                            <suki:GroupBox Header="{Binding Key}">
+                                        Command="{Binding ClickCommand}">
+                            <suki:GroupBox Header="{Binding Name}">
                                 <PathIcon Width="25"
                                           Height="25"
                                           Margin="0,8,0,0"
-                                          Data="{Binding Value}" />
+                                          Data="{Binding Geometry}" />
                             </suki:GroupBox>
                         </suki:GlassCard>
                     </DataTemplate>
diff --git a/SukiUI.Demo/Features/ControlsLibrary/IconsViewModel.cs b/SukiUI.Demo/Features/ControlsLibrary/IconsViewModel.cs
index 3d4ff3d26..f30b8a2c6 100644
--- a/SukiUI.Demo/Features/ControlsLibrary/IconsViewModel.cs
+++ b/SukiUI.Demo/Features/ControlsLibrary/IconsViewModel.cs
@@ -1,40 +1,39 @@
 using Avalonia.Media;
 using Material.Icons;
 using SukiUI.Content;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using CommunityToolkit.Mvvm.Input;
 using SukiUI.Demo.Services;
 using SukiUI.Toasts;
+using System.Collections.Generic;
+using System.Reflection;
 
 namespace SukiUI.Demo.Features.ControlsLibrary;
 
 public partial class IconsViewModel : DemoPageBase
 {
-    public Dictionary<string, StreamGeometry> AllIcons { get; }
+    public IEnumerable<IconItemViewModel> Icons { get; }
 
-    private readonly ClipboardService _clipboardService;
-    private readonly ISukiToastManager _toastManager;
-    
     public IconsViewModel(ClipboardService clipboardService, ISukiToastManager toastManager) : base("Icons", MaterialIconKind.AlphaICircleOutline, int.MaxValue)
     {
-        _clipboardService = clipboardService;
-        _toastManager = toastManager;
-        AllIcons = typeof(Icons)
-            .GetFields(BindingFlags.Public | BindingFlags.Static)
-            .Where(x => x.FieldType == typeof(StreamGeometry))
-            .OrderBy(x => x.Name)
-            .ToDictionary(x => x.Name, y => (StreamGeometry)y.GetValue(null)!);
-    }
+        var fields = typeof(Icons).GetFields(BindingFlags.Public | BindingFlags.Static);
 
-    [RelayCommand]
-    private void OnIconClicked(string iconName)
-    {
-        _clipboardService.CopyToClipboard($"<PathIcon Data=\"{{x:Static content:Icons.{iconName}}}\" />");
-        _toastManager.CreateSimpleInfoToast()
-            .WithTitle("Copied To Clipboard")
-            .WithContent($"Copied the XAML for {iconName} to your clipboard.")
-            .Queue();
+        var icons = new List<IconItemViewModel>(fields.Length);
+
+        foreach (var field in fields)
+        {
+            if (field.GetValue(null) is not Geometry geometry)
+            {
+                continue;
+            }
+
+            var icon = new IconItemViewModel(clipboardService, toastManager)
+            {
+                Name = field.Name,
+                Geometry = geometry
+            };
+
+            icons.Add(icon);
+        }
+
+        Icons = icons;
     }
 }
\ No newline at end of file
diff --git a/SukiUI.Demo/Features/Dashboard/DashboardView.axaml b/SukiUI.Demo/Features/Dashboard/DashboardView.axaml
index 68aa6a269..7c36b1858 100644
--- a/SukiUI.Demo/Features/Dashboard/DashboardView.axaml
+++ b/SukiUI.Demo/Features/Dashboard/DashboardView.axaml
@@ -320,9 +320,15 @@
                             <Grid>
                                 <DataGrid Margin="15,0,15,10"
                                           VerticalAlignment="Top"
-                                          AutoGenerateColumns="True"
                                           IsReadOnly="True"
-                                          ItemsSource="{Binding Invoices}" />
+                                          ItemsSource="{Binding Invoices}" >
+                                    <DataGrid.Columns>
+                                        <DataGridTextColumn Binding="{Binding Id}" Header="Id" />
+                                        <DataGridTextColumn Binding="{Binding BillingName}" Header="BillingName"/>
+                                        <DataGridTextColumn Binding="{Binding AmountPaid}" Header="AmountPaid" />
+                                        <DataGridCheckBoxColumn Binding="{Binding Paid}" Header="Paid" />
+                                    </DataGrid.Columns>
+                                </DataGrid>
                             </Grid>
                         </TabItem>
                         <TabItem>
diff --git a/SukiUI.Demo/Features/Playground/PlaygroundView.axaml.cs b/SukiUI.Demo/Features/Playground/PlaygroundView.axaml.cs
index 91f29dcee..873cb54a4 100644
--- a/SukiUI.Demo/Features/Playground/PlaygroundView.axaml.cs
+++ b/SukiUI.Demo/Features/Playground/PlaygroundView.axaml.cs
@@ -31,10 +31,6 @@ public partial class PlaygroundView : UserControl
     private TextEditor? _textEditor;
 
     private GlassCard? _glassPlayground;
-
-    private Button? _renderButton;
-
-    private Button? _clearButton;
     
     private PlaygroundViewModel PlaygroundDataContext => (PlaygroundViewModel)DataContext!;
 
@@ -60,11 +56,6 @@ protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         _textEditor.TextArea.IndentationStrategy = new CSharpIndentationStrategy(_textEditor.Options);
         _textEditor.TextArea.RightClickMovesCaret = true;
 
-        _renderButton = this.FindControl<Button>("RenderButton")!;
-        _renderButton.Click += OnRenderClicked;
-        _clearButton = this.FindControl<Button>("ClearButton")!;
-        //  _clearButton.Click += OnClearClicked;
-
         OnBaseThemeChanged(Application.Current!.ActualThemeVariant);
         SukiTheme.GetInstance().OnBaseThemeChanged += OnBaseThemeChanged;
     }
@@ -96,6 +87,10 @@ private void OnRenderClicked(object? sender, RoutedEventArgs e)
         {
             PlaygroundDataContext.DisplayError( $"Exception occurred during loading xaml code for control: \n {ex.Message}");
         }
+        catch (Exception ex)
+        {
+            PlaygroundDataContext.DisplayError( $"Exception occurred during creating control: {ex.Message}");
+        }
     }
 
     private void OnBaseThemeChanged(ThemeVariant currentTheme)
diff --git a/SukiUI.Demo/Services/ClipboardService.cs b/SukiUI.Demo/Services/ClipboardService.cs
index f5d9113de..fda7cf675 100644
--- a/SukiUI.Demo/Services/ClipboardService.cs
+++ b/SukiUI.Demo/Services/ClipboardService.cs
@@ -1,7 +1,9 @@
+using Avalonia.Controls.ApplicationLifetimes;
+
 namespace SukiUI.Demo.Services
 {
-    public class ClipboardService(SukiUIDemoView mainWindow)
+    public class ClipboardService(IClassicDesktopStyleApplicationLifetime liftime)
     {
-        public void CopyToClipboard(string text) => mainWindow.Clipboard?.SetTextAsync(text);
+        public void CopyToClipboard(string text) => liftime.MainWindow?.Clipboard?.SetTextAsync(text);
     }
 }
\ No newline at end of file
diff --git a/SukiUI.Demo/SukiUI.Demo.csproj b/SukiUI.Demo/SukiUI.Demo.csproj
index bdc8f1428..0f5261048 100644
--- a/SukiUI.Demo/SukiUI.Demo.csproj
+++ b/SukiUI.Demo/SukiUI.Demo.csproj
@@ -8,6 +8,11 @@
 		<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
 	</PropertyGroup>
 
+	<PropertyGroup Condition="'$(Configuration)' != 'Debug'">
+		<PublishAot>true</PublishAot>
+		<InvariantGlobalization>true</InvariantGlobalization>
+	</PropertyGroup>
+
 	<ItemGroup>
 		<PackageReference Include="Avalonia" Version="11.2.1" />
 		<PackageReference Include="Avalonia.AvaloniaEdit" Version="11.1.0" />
diff --git a/SukiUI.Demo/SukiUIDemoView.axaml.cs b/SukiUI.Demo/SukiUIDemoView.axaml.cs
index f8631871c..ff299e123 100644
--- a/SukiUI.Demo/SukiUIDemoView.axaml.cs
+++ b/SukiUI.Demo/SukiUIDemoView.axaml.cs
@@ -4,6 +4,7 @@
 using SukiUI.Controls;
 using SukiUI.Enums;
 using SukiUI.Models;
+using System.Runtime.CompilerServices;
 
 namespace SukiUI.Demo;
 
@@ -12,6 +13,11 @@ public partial class SukiUIDemoView : SukiWindow
     public SukiUIDemoView()
     {
         InitializeComponent();
+
+        if (RuntimeFeature.IsDynamicCodeCompiled == false)
+        {
+            Title += " (native)";
+        }
     }
 
     private void ThemeMenuItem_OnClick(object? sender, RoutedEventArgs e)
diff --git a/SukiUI/Controls/SukiSideMenu.axaml b/SukiUI/Controls/SukiSideMenu.axaml
index b8d033cd7..4981cacde 100644
--- a/SukiUI/Controls/SukiSideMenu.axaml
+++ b/SukiUI/Controls/SukiSideMenu.axaml
@@ -75,7 +75,7 @@
                                                 <PathIcon Width="13" DockPanel.Dock="Left" VerticalAlignment="Center" Foreground="{DynamicResource SukiLowText}"
                                                           Height="13"
                                                           Data="{x:Static content:Icons.Search}" />
-                                                <TextBox theme:TextBoxExtensions.AddDeleteButton="True" Classes="NoShadow" Text="{Binding Search, Mode=TwoWay}" x:DataType="suki:SukiSideMenuService" DataContext="{x:Static suki:SukiSideMenuService.Instance}" BorderThickness="0" Watermark="Search"></TextBox>
+                                                <TextBox theme:TextBoxExtensions.AddDeleteButton="True" Classes="NoShadow" Text="{TemplateBinding SearchText, Mode=TwoWay}" BorderThickness="0" Watermark="Search"/>
                                             </DockPanel>
                                         </suki:GlassCard>
                                             
diff --git a/SukiUI/Controls/SukiSideMenu.axaml.cs b/SukiUI/Controls/SukiSideMenu.axaml.cs
index 8bb10044d..203dd0529 100644
--- a/SukiUI/Controls/SukiSideMenu.axaml.cs
+++ b/SukiUI/Controls/SukiSideMenu.axaml.cs
@@ -7,11 +7,15 @@
 using Avalonia.Interactivity;
 using Avalonia.Layout;
 using SukiUI.Enums;
+using Avalonia.Controls.Templates;
 
 namespace SukiUI.Controls;
 
 public class SukiSideMenu : SelectingItemsControl
 {
+    public static readonly StyledProperty<string?> SearchTextProperty =
+        AvaloniaProperty.Register<SukiSideMenu, string?>(nameof(SearchText));
+
     public static readonly StyledProperty<bool> IsSearchEnabledProperty =
         AvaloniaProperty.Register<SukiSideMenu, bool>(nameof(IsSearchEnabled), defaultValue: false);
 
@@ -24,6 +28,12 @@ public bool SidebarToggleEnabled
         set => SetValue(SidebarToggleEnabledProperty, value);
     }
 
+    public string? SearchText
+    {
+        get => GetValue(SearchTextProperty);
+        set => SetValue(SearchTextProperty, value);
+    }
+
     public bool IsSearchEnabled
     {
         get => GetValue(IsSearchEnabledProperty);
@@ -164,12 +174,37 @@ protected override void OnLoaded(RoutedEventArgs e)
     protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
     {
         base.OnPropertyChanged(change);
+
+        if (change.Property == SearchTextProperty)
+        {
+            FilterItems(change.GetNewValue<string>());
+        }
+
         if (change.Property == SelectedItemProperty && _contentControl != null) 
             SetContentControlContent(change.NewValue);
         if (change.Property == IsMenuExpandedProperty && _spacer != null) 
             _spacer.IsVisible = IsSpacerVisible;
     }
 
+    private void FilterItems(string search)
+    {
+        search = search.ToLower();
+
+        foreach (var item in _sideMenuItems)
+        {
+            var header = item.Header?.ToLower() ?? "";
+
+            if (header.Contains(search))
+            {
+                item.Show();
+            }
+            else
+            {
+                item.Hide();
+            }
+        }
+    }
+
     private void SetContentControlContent(object? newContent)
     {
         if (_contentControl == null) return;
diff --git a/SukiUI/Controls/SukiSideMenuItem.axaml b/SukiUI/Controls/SukiSideMenuItem.axaml
index 04c7d3421..fc1fd1de9 100644
--- a/SukiUI/Controls/SukiSideMenuItem.axaml
+++ b/SukiUI/Controls/SukiSideMenuItem.axaml
@@ -26,9 +26,7 @@
         <Setter Property="Template">
             <ControlTemplate>
                 <Panel>
-                <Border 
-                         MaxHeight="{Binding #PSearch.MaxHeight}"
-                         Name="PART_Border"
+                <Border Name="PART_Border"
                          MinWidth="85"
                          Margin="15,2"
                          Padding="30,15,15,15"
@@ -77,15 +75,6 @@
 
                     </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>
diff --git a/SukiUI/Controls/SukiSideMenuItem.axaml.cs b/SukiUI/Controls/SukiSideMenuItem.axaml.cs
index 71ab4aa65..29d579a6d 100644
--- a/SukiUI/Controls/SukiSideMenuItem.axaml.cs
+++ b/SukiUI/Controls/SukiSideMenuItem.axaml.cs
@@ -1,11 +1,7 @@
-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;
@@ -15,6 +11,8 @@ public class SukiSideMenuItem : ListBoxItem
     public static readonly StyledProperty<object?> IconProperty =
         AvaloniaProperty.Register<SukiSideMenuItem, object?>(nameof(Icon));
 
+    private Border? _border;
+
     public object? Icon
     {
         get => GetValue(IconProperty);
@@ -39,9 +37,32 @@ public object PageContent
         set => SetValue(PageContentProperty, value);
     }
 
+    public void Show()
+    {
+        if (_border == null)
+        {
+            return;
+        }
+
+        _border.MaxHeight = 200.0;
+    }
+
+    public void Hide()
+    {
+        if (_border == null)
+        {
+            return;
+        }
+
+        _border.MaxHeight = 0.0;
+    }
+
     protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
     {
         base.OnApplyTemplate(e);
+
+        _border = e.NameScope.Get<Border>("PART_Border");
+
         if (e.NameScope.Get<ContentPresenter>("PART_AltDisplay") is { } contentControl)
         {
             if (Header is not null || Icon is not null)
diff --git a/SukiUI/Controls/SukiSideMenuSearchService.cs b/SukiUI/Controls/SukiSideMenuSearchService.cs
deleted file mode 100644
index 254cdabfc..000000000
--- a/SukiUI/Controls/SukiSideMenuSearchService.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Globalization;
-using Avalonia.Data.Converters;
-
-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
-    {
-        
-        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