diff --git a/Bitvault.Avalonia/App.axaml.cs b/Bitvault.Avalonia/App.axaml.cs
index af0df89..4b0a441 100644
--- a/Bitvault.Avalonia/App.axaml.cs
+++ b/Bitvault.Avalonia/App.axaml.cs
@@ -1,16 +1,16 @@
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
+using Bitvault.Data;
+using HotAvalonia;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Hosting;
+using System;
+using System.Collections.Generic;
 using Toolkit.Avalonia;
 using Toolkit.Foundation;
-using Microsoft.Extensions.DependencyInjection.Extensions;
-using HotAvalonia;
-using Bitvault.Data;
-using System.Collections.Generic;
-using System;
 
 namespace Bitvault.Avalonia;
 
@@ -39,7 +39,7 @@ public partial class App : Application
 
                 services.AddHandler<ContainerActivatedHandler>();
 
-                services.AddTransient<IContainerComponent> (provider => Component.Create<ContainerComponent>(provider, args =>
+                services.AddTransient<IContainerComponent>(provider => Component.Create<ContainerComponent>(provider, args =>
                 {
                     args.AddServices(services =>
                     {
@@ -62,12 +62,12 @@ public partial class App : Application
 
                         services.AddDbContextFactory<ContainerDbContext>((provider, args) =>
                         {
-                            if (provider.GetRequiredService<IValueStore<ContainerConnection>>() 
+                            if (provider.GetRequiredService<IValueStore<ContainerConnection>>()
                                 is IValueStore<ContainerConnection> connection)
                             {
                                 args.UseSqlite($"{connection.Value}");
                             }
-                        }); 
+                        });
 
                         services.AddHandler<QueryContainerHandler>();
                         services.AddHandler<CreateItemHandler>();
@@ -121,7 +121,7 @@ public partial class App : Application
                     });
                 })!);
 
-                services.AddTransient<IContainerFactory,  ContainerFactory>();
+                services.AddTransient<IContainerFactory, ContainerFactory>();
                 services.AddHandler<CreateContainerHandler>();
 
                 services.AddSingleton<IContainerHostCollection, ContainerHostCollection>();
diff --git a/Bitvault.Avalonia/ArchiveItemActionView.axaml.cs b/Bitvault.Avalonia/ArchiveItemActionView.axaml.cs
index 3eb2c1e..d7e0944 100644
--- a/Bitvault.Avalonia/ArchiveItemActionView.axaml.cs
+++ b/Bitvault.Avalonia/ArchiveItemActionView.axaml.cs
@@ -5,4 +5,4 @@ namespace Bitvault.Avalonia;
 public partial class ArchiveItemActionView : UserControl
 {
     public ArchiveItemActionView() => InitializeComponent();
-}
+}
\ No newline at end of file
diff --git a/Bitvault.Avalonia/Bitvault.Avalonia.csproj b/Bitvault.Avalonia/Bitvault.Avalonia.csproj
index b85da66..c3a5e8a 100644
--- a/Bitvault.Avalonia/Bitvault.Avalonia.csproj
+++ b/Bitvault.Avalonia/Bitvault.Avalonia.csproj
@@ -21,11 +21,11 @@
 		<PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.999-cibuild0048140-alpha" />
 		<PackageReference Include="Avalonia.Labs.Controls" Version="11.0.10.1" />
 		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
-		<PackageReference Include="FluentAvaloniaUI" Version="2.1.0-preview1" />
-		<PackageReference Include="System.Reactive" Version="6.0.1-preview.1" />
+		<PackageReference Include="FluentAvaloniaUI" Version="2.1.0-preview5" />
+		<PackageReference Include="System.Reactive" Version="6.0.1" />
 		<PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.1.0-beta2.1" />
-		<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0-preview.3.24172.9" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.0-preview.3.24172.4">
+		<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0-preview.4.24266.19" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.0-preview.4.24267.1">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
diff --git a/Bitvault.Avalonia/ConfirmItemActionView.axaml.cs b/Bitvault.Avalonia/ConfirmItemActionView.axaml.cs
index 113e0d1..c9b2ce4 100644
--- a/Bitvault.Avalonia/ConfirmItemActionView.axaml.cs
+++ b/Bitvault.Avalonia/ConfirmItemActionView.axaml.cs
@@ -5,4 +5,4 @@ namespace Bitvault.Avalonia;
 public partial class ConfirmItemActionView : UserControl
 {
     public ConfirmItemActionView() => InitializeComponent();
-}
+}
\ No newline at end of file
diff --git a/Bitvault.Avalonia/ContainerHeaderView.axaml.cs b/Bitvault.Avalonia/ContainerHeaderView.axaml.cs
index f66ffa0..b5af373 100644
--- a/Bitvault.Avalonia/ContainerHeaderView.axaml.cs
+++ b/Bitvault.Avalonia/ContainerHeaderView.axaml.cs
@@ -5,4 +5,4 @@ namespace Bitvault.Avalonia;
 public partial class ContainerHeaderView : UserControl
 {
     public ContainerHeaderView() => InitializeComponent();
-}
+}
\ No newline at end of file
diff --git a/Bitvault.Avalonia/ContainerView.axaml b/Bitvault.Avalonia/ContainerView.axaml
index 366beb9..e1e7dd8 100644
--- a/Bitvault.Avalonia/ContainerView.axaml
+++ b/Bitvault.Avalonia/ContainerView.axaml
@@ -29,7 +29,7 @@
             AutoScrollToSelectedItem="True"
             ItemTemplate="{ReflectionBinding Template}"
             ItemsSource="{Binding}"
-            SelectedItem="{Binding SelectedItem}"
+            SelectedItem="{Binding SelectedItem, Mode=TwoWay}"
             SelectionMode="Single">
             <ListBox.Styles>
                 <Style Selector="ListBoxItem">
@@ -52,7 +52,10 @@
             BorderThickness="1,1,0,0"
             CornerRadius="8 0 0 0">
             <Grid RowDefinitions="Auto, *">
-                <Border Grid.Row="0" Padding="4" Height="44">
+                <Border
+                    Grid.Row="0"
+                    Height="44"
+                    Padding="4">
                     <ContentControl>
                         <Interaction.Behaviors>
                             <AttachedBehaviour>
diff --git a/Bitvault.Avalonia/CreateItemActionView.axaml.cs b/Bitvault.Avalonia/CreateItemActionView.axaml.cs
index 69955e6..0e8ecd8 100644
--- a/Bitvault.Avalonia/CreateItemActionView.axaml.cs
+++ b/Bitvault.Avalonia/CreateItemActionView.axaml.cs
@@ -5,4 +5,4 @@ namespace Bitvault.Avalonia;
 public partial class CreateItemActionView : UserControl
 {
     public CreateItemActionView() => InitializeComponent();
-}
+}
\ No newline at end of file
diff --git a/Bitvault.Avalonia/DeleteItemActionView.axaml.cs b/Bitvault.Avalonia/DeleteItemActionView.axaml.cs
index 23ab526..d47c1b8 100644
--- a/Bitvault.Avalonia/DeleteItemActionView.axaml.cs
+++ b/Bitvault.Avalonia/DeleteItemActionView.axaml.cs
@@ -9,4 +9,4 @@ namespace Bitvault.Avalonia
             InitializeComponent();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Bitvault.Avalonia/DismissItemActionView.axaml.cs b/Bitvault.Avalonia/DismissItemActionView.axaml.cs
index 2386de9..576ff14 100644
--- a/Bitvault.Avalonia/DismissItemActionView.axaml.cs
+++ b/Bitvault.Avalonia/DismissItemActionView.axaml.cs
@@ -5,4 +5,4 @@ namespace Bitvault.Avalonia;
 public partial class DismissItemActionView : UserControl
 {
     public DismissItemActionView() => InitializeComponent();
-}
+}
\ No newline at end of file
diff --git a/Bitvault.Avalonia/EditItemActionView.axaml.cs b/Bitvault.Avalonia/EditItemActionView.axaml.cs
index 04d34a6..2e5bfe7 100644
--- a/Bitvault.Avalonia/EditItemActionView.axaml.cs
+++ b/Bitvault.Avalonia/EditItemActionView.axaml.cs
@@ -5,4 +5,4 @@ namespace Bitvault.Avalonia;
 public partial class EditItemActionView : UserControl
 {
     public EditItemActionView() => InitializeComponent();
-}
+}
\ No newline at end of file
diff --git a/Bitvault.Avalonia/FavouriteItemActionView.axaml.cs b/Bitvault.Avalonia/FavouriteItemActionView.axaml.cs
index f6adc4a..476d46e 100644
--- a/Bitvault.Avalonia/FavouriteItemActionView.axaml.cs
+++ b/Bitvault.Avalonia/FavouriteItemActionView.axaml.cs
@@ -5,4 +5,4 @@ namespace Bitvault.Avalonia;
 public partial class FavouriteItemActionView : UserControl
 {
     public FavouriteItemActionView() => InitializeComponent();
-}
+}
\ No newline at end of file
diff --git a/Bitvault.Avalonia/ItemCommandHeaderView.axaml.cs b/Bitvault.Avalonia/ItemCommandHeaderView.axaml.cs
index 9657d45..d8d5dc9 100644
--- a/Bitvault.Avalonia/ItemCommandHeaderView.axaml.cs
+++ b/Bitvault.Avalonia/ItemCommandHeaderView.axaml.cs
@@ -5,4 +5,4 @@ namespace Bitvault.Avalonia;
 public partial class ItemCommandHeaderView : UserControl
 {
     public ItemCommandHeaderView() => InitializeComponent();
-}
+}
\ No newline at end of file
diff --git a/Bitvault.Avalonia/ItemHeaderView.axaml.cs b/Bitvault.Avalonia/ItemHeaderView.axaml.cs
index fd6fc2e..9092122 100644
--- a/Bitvault.Avalonia/ItemHeaderView.axaml.cs
+++ b/Bitvault.Avalonia/ItemHeaderView.axaml.cs
@@ -5,4 +5,4 @@ namespace Bitvault.Avalonia;
 public partial class ItemHeaderView : UserControl
 {
     public ItemHeaderView() => InitializeComponent();
-}
+}
\ No newline at end of file
diff --git a/Bitvault.Avalonia/ItemNavigationView.axaml b/Bitvault.Avalonia/ItemNavigationView.axaml
index 448c349..4621ab3 100644
--- a/Bitvault.Avalonia/ItemNavigationView.axaml
+++ b/Bitvault.Avalonia/ItemNavigationView.axaml
@@ -4,7 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:vm="using:Bitvault"
     x:DataType="vm:ItemNavigationViewModel"
-    IsSelected="{Binding Selected}">
+    IsSelected="{Binding Selected, Mode=TwoWay}">
     <ListBoxItem.Resources>
         <SolidColorBrush x:Key="StarredIconForegroundBrush" Color="#FFEDB120" />
     </ListBoxItem.Resources>
diff --git a/Bitvault.Avalonia/ItemNavigationView.axaml.cs b/Bitvault.Avalonia/ItemNavigationView.axaml.cs
index c953ba1..8079503 100644
--- a/Bitvault.Avalonia/ItemNavigationView.axaml.cs
+++ b/Bitvault.Avalonia/ItemNavigationView.axaml.cs
@@ -5,4 +5,4 @@ namespace Bitvault.Avalonia;
 public partial class ItemNavigationView : ListBoxItem
 {
     public ItemNavigationView() => InitializeComponent();
-}
+}
\ No newline at end of file
diff --git a/Bitvault.Avalonia/ItemView.axaml.cs b/Bitvault.Avalonia/ItemView.axaml.cs
index f549c57..e761565 100644
--- a/Bitvault.Avalonia/ItemView.axaml.cs
+++ b/Bitvault.Avalonia/ItemView.axaml.cs
@@ -5,4 +5,4 @@ namespace Bitvault.Avalonia;
 public partial class ItemView : UserControl
 {
     public ItemView() => InitializeComponent();
-}
+}
\ No newline at end of file
diff --git a/Bitvault.Avalonia/SearchContainerActionView.axaml.cs b/Bitvault.Avalonia/SearchContainerActionView.axaml.cs
index 38fb854..42751d7 100644
--- a/Bitvault.Avalonia/SearchContainerActionView.axaml.cs
+++ b/Bitvault.Avalonia/SearchContainerActionView.axaml.cs
@@ -5,4 +5,4 @@ namespace Bitvault.Avalonia;
 public partial class SearchContainerActionView : UserControl
 {
     public SearchContainerActionView() => InitializeComponent();
-}
+}
\ No newline at end of file
diff --git a/Bitvault.Avalonia/UnarchiveItemActionView.axaml.cs b/Bitvault.Avalonia/UnarchiveItemActionView.axaml.cs
index 3ef9e1d..a6f82c1 100644
--- a/Bitvault.Avalonia/UnarchiveItemActionView.axaml.cs
+++ b/Bitvault.Avalonia/UnarchiveItemActionView.axaml.cs
@@ -5,4 +5,4 @@ namespace Bitvault.Avalonia;
 public partial class UnarchiveItemActionView : UserControl
 {
     public UnarchiveItemActionView() => InitializeComponent();
-}
+}
\ No newline at end of file
diff --git a/Bitvault.Data/Bitvault.Data.csproj b/Bitvault.Data/Bitvault.Data.csproj
index a9ea45d..2172c7b 100644
--- a/Bitvault.Data/Bitvault.Data.csproj
+++ b/Bitvault.Data/Bitvault.Data.csproj
@@ -5,13 +5,13 @@
 		<Nullable>enable</Nullable>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.0-preview.3.24172.4" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.0-preview.3.24172.4">
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.0-preview.4.24267.1" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.0-preview.4.24267.1">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="9.0.0-preview.3.24172.4" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.0-preview.3.24172.4">
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="9.0.0-preview.4.24267.1" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.0-preview.4.24267.1">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
diff --git a/Bitvault.Data/ContainerDbContext.cs b/Bitvault.Data/ContainerDbContext.cs
index b3e48aa..1ac3fe4 100644
--- a/Bitvault.Data/ContainerDbContext.cs
+++ b/Bitvault.Data/ContainerDbContext.cs
@@ -2,7 +2,7 @@
 
 namespace Bitvault.Data;
 
-public class ContainerDbContext(DbContextOptions<ContainerDbContext> options) : 
+public class ContainerDbContext(DbContextOptions<ContainerDbContext> options) :
     DbContext(options)
 {
     public DbSet<BlobEntry> Blobs { get; set; }
@@ -21,4 +21,4 @@ public class ContainerDbContext(DbContextOptions<ContainerDbContext> options) :
             .HasMany(x => x.Blobs)
             .WithOne();
     }
-}
+}
\ No newline at end of file
diff --git a/Bitvault.Data/TagEntry.cs b/Bitvault.Data/TagEntry.cs
index 3974b6f..d069c03 100644
--- a/Bitvault.Data/TagEntry.cs
+++ b/Bitvault.Data/TagEntry.cs
@@ -10,4 +10,4 @@ public class TagEntry
     public int Id { get; set; }
 
     public string? Name { get; set; }
-}
+}
\ No newline at end of file
diff --git a/Bitvault/AggerateContainerViewModelHandler.cs b/Bitvault/AggerateContainerViewModelHandler.cs
index 2ab0095..7456bd1 100644
--- a/Bitvault/AggerateContainerViewModelHandler.cs
+++ b/Bitvault/AggerateContainerViewModelHandler.cs
@@ -9,7 +9,7 @@ public class AggerateContainerViewModelHandler(IMediator mediator,
     IPublisher publisher) :
     INotificationHandler<AggerateEventArgs<ItemNavigationViewModel, ContainerViewModelConfiguration>>
 {
-    public async Task Handle(AggerateEventArgs<ItemNavigationViewModel, 
+    public async Task Handle(AggerateEventArgs<ItemNavigationViewModel,
         ContainerViewModelConfiguration> args)
     {
         if (args.Options is ContainerViewModelConfiguration configuration)
@@ -18,10 +18,10 @@ public class AggerateContainerViewModelHandler(IMediator mediator,
             bool selected = true;
 
             if (await mediator.Handle<RequestEventArgs<QueryContainerConfiguration>,
-                IReadOnlyCollection<(Guid Id, string Name, bool Favourite, bool Archived)>>(Request.As(new QueryContainerConfiguration 
-                { 
+                IReadOnlyCollection<(Guid Id, string Name, bool Favourite, bool Archived)>>(Request.As(new QueryContainerConfiguration
+                {
                     Filter = configuration.Filter,
-                    Query = configuration.Query 
+                    Query = configuration.Query
                 })) is IReadOnlyCollection<(Guid Id, string Name, bool Favourite, bool Archived)> results)
             {
                 foreach ((Guid Id, string Name, bool Favourite, bool Archived) in results)
@@ -44,4 +44,4 @@ public class AggerateContainerViewModelHandler(IMediator mediator,
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Bitvault/AggerateItemViewModelHandler.cs b/Bitvault/AggerateItemViewModelHandler.cs
index c48afb7..b55c7ab 100644
--- a/Bitvault/AggerateItemViewModelHandler.cs
+++ b/Bitvault/AggerateItemViewModelHandler.cs
@@ -16,4 +16,4 @@ public class AggerateItemViewModelHandler(IMediator mediator,
 
         return Task.CompletedTask;
     }
-}
+}
\ No newline at end of file
diff --git a/Bitvault/AggerateMainViewModelHandler.cs b/Bitvault/AggerateMainViewModelHandler.cs
index b99a7a3..6d44d61 100644
--- a/Bitvault/AggerateMainViewModelHandler.cs
+++ b/Bitvault/AggerateMainViewModelHandler.cs
@@ -9,7 +9,7 @@ public class AggerateMainViewModelHandler(IPublisher publisher,
 {
     public Task Handle(AggerateEventArgs<IMainNavigationViewModel> args)
     {
-        foreach (IComponentHost container in containers.OrderBy(x => x.GetConfiguration<ContainerConfiguration>() 
+        foreach (IComponentHost container in containers.OrderBy(x => x.GetConfiguration<ContainerConfiguration>()
             is ContainerConfiguration configuration ? configuration.Name : null))
         {
             if (container.Services.GetRequiredService<ContainerConfiguration>() is ContainerConfiguration configuration)
diff --git a/Bitvault/AllNavigationViewModel.cs b/Bitvault/AllNavigationViewModel.cs
index bc3a1f7..7894d56 100644
--- a/Bitvault/AllNavigationViewModel.cs
+++ b/Bitvault/AllNavigationViewModel.cs
@@ -8,4 +8,4 @@ public partial class AllNavigationViewModel(IServiceProvider provider,
     IPublisher publisher,
     ISubscription subscriber,
     IDisposer disposer,
-    string filter) : FilterContainerNavigationViewModel(provider, factory, mediator, publisher, subscriber, disposer, filter);
+    string filter) : FilterContainerNavigationViewModel(provider, factory, mediator, publisher, subscriber, disposer, filter);
\ No newline at end of file
diff --git a/Bitvault/ArchiveEventArgs.cs b/Bitvault/ArchiveEventArgs.cs
index ec670e7..6eedc60 100644
--- a/Bitvault/ArchiveEventArgs.cs
+++ b/Bitvault/ArchiveEventArgs.cs
@@ -1,3 +1,3 @@
 namespace Bitvault;
 
-public record ArchiveEventArgs<TValue>(TValue Value);
+public record ArchiveEventArgs<TValue>(TValue Value);
\ No newline at end of file
diff --git a/Bitvault/ArchiveItemHandler.cs b/Bitvault/ArchiveItemHandler.cs
index 0f285fc..e11684d 100644
--- a/Bitvault/ArchiveItemHandler.cs
+++ b/Bitvault/ArchiveItemHandler.cs
@@ -28,7 +28,6 @@ public class ArchiveItemHandler(IValueStore<Item> valueStore,
         }
         catch
         {
-
         }
     }
 }
\ No newline at end of file
diff --git a/Bitvault/Bitvault.csproj b/Bitvault/Bitvault.csproj
index f380683..50bcc57 100644
--- a/Bitvault/Bitvault.csproj
+++ b/Bitvault/Bitvault.csproj
@@ -7,7 +7,7 @@
 	<ItemGroup>
 		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
 		<PackageReference Include="LinqKit.Microsoft.EntityFrameworkCore" Version="8.1.5" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.0-preview.3.24172.4" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.0-preview.4.24267.1" />
 	</ItemGroup>
 	<ItemGroup>
 	  <ProjectReference Include="..\Bitvault.Data\Bitvault.Data.csproj" />
diff --git a/Bitvault/Closed.cs b/Bitvault/Closed.cs
index 8f7b240..c78db8f 100644
--- a/Bitvault/Closed.cs
+++ b/Bitvault/Closed.cs
@@ -7,4 +7,4 @@ public record Closed
     public static ChangedEventArgs<TValue> As<TValue>(TValue value) => new(value);
 
     public static ChangedEventArgs<TValue> As<TValue>() where TValue : new() => new(new TValue());
-}
+}
\ No newline at end of file
diff --git a/Bitvault/ClosedEventArgs.cs b/Bitvault/ClosedEventArgs.cs
index de4ca18..a1c587d 100644
--- a/Bitvault/ClosedEventArgs.cs
+++ b/Bitvault/ClosedEventArgs.cs
@@ -1,3 +1,3 @@
 namespace Bitvault;
 
-public record ClosedEventArgs<TValue>(TValue? Value = default);
+public record ClosedEventArgs<TValue>(TValue? Value = default);
\ No newline at end of file
diff --git a/Bitvault/CommandCollection.cs b/Bitvault/CommandCollection.cs
index 23ad771..a7363df 100644
--- a/Bitvault/CommandCollection.cs
+++ b/Bitvault/CommandCollection.cs
@@ -7,6 +7,5 @@ public class CommandCollection :
 {
     public CommandCollection(IList<IDisposable> list) : base(list)
     {
-
     }
-}
+}
\ No newline at end of file
diff --git a/Bitvault/ConfirmItemActionViewModel.cs b/Bitvault/ConfirmItemActionViewModel.cs
index 73e4e9a..ffe6447 100644
--- a/Bitvault/ConfirmItemActionViewModel.cs
+++ b/Bitvault/ConfirmItemActionViewModel.cs
@@ -10,7 +10,6 @@ public partial class ConfirmItemActionViewModel(IServiceProvider provider,
     ISubscription subscriber,
     IDisposer disposer) : Observable(provider, factory, mediator, publisher, subscriber, disposer)
 {
-
     [RelayCommand]
     public void Invoke() => Publisher.Publish(Confirm.As<Item>());
-}
+}
\ No newline at end of file
diff --git a/Bitvault/ConfirmItemHandler.cs b/Bitvault/ConfirmItemHandler.cs
index 6c395b2..6c69549 100644
--- a/Bitvault/ConfirmItemHandler.cs
+++ b/Bitvault/ConfirmItemHandler.cs
@@ -25,8 +25,8 @@ public class ConfirmItemHandler(IValueStore<Item> valueStore,
                 publisher.Publish(Modified.As(item, newItem));
 
                 valueStore.Set(newItem);
-                
-                await mediator.Handle<EditEventArgs<(Guid, ItemConfiguration)>, bool>(new EditEventArgs<(Guid, 
+
+                await mediator.Handle<EditEventArgs<(Guid, ItemConfiguration)>, bool>(new EditEventArgs<(Guid,
                     ItemConfiguration)>((item.Id, new ItemConfiguration { Name = name })));
             }
             else
@@ -34,7 +34,7 @@ public class ConfirmItemHandler(IValueStore<Item> valueStore,
                 Guid id = Guid.NewGuid();
                 string? name = configuration.Name;
 
-                bool Success = await mediator.Handle<CreateEventArgs<(Guid, 
+                bool Success = await mediator.Handle<CreateEventArgs<(Guid,
                     ItemConfiguration)>, bool>(new CreateEventArgs<(Guid, ItemConfiguration)>((id, new ItemConfiguration { Name = name })));
 
                 if (Success)
@@ -44,4 +44,4 @@ public class ConfirmItemHandler(IValueStore<Item> valueStore,
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Bitvault/ContainerActivatedHandler.cs b/Bitvault/ContainerActivatedHandler.cs
index dd86e07..8d5f7be 100644
--- a/Bitvault/ContainerActivatedHandler.cs
+++ b/Bitvault/ContainerActivatedHandler.cs
@@ -4,7 +4,7 @@ using Toolkit.Foundation;
 namespace Bitvault;
 
 public class ContainerActivatedHandler(IContainerHostCollection containers,
-    IPublisher publisher) : 
+    IPublisher publisher) :
     INotificationHandler<ActivatedEventArgs<IComponentHost>>
 {
     public Task Handle(ActivatedEventArgs<IComponentHost> args)
@@ -12,7 +12,7 @@ public class ContainerActivatedHandler(IContainerHostCollection containers,
         if (args.Value is IComponentHost container)
         {
             List<IComponentHost> sortedContainers = [.. containers, container];
-            sortedContainers = [.. sortedContainers.OrderBy(x => x.GetConfiguration< ContainerConfiguration>() is ContainerConfiguration configuration ? configuration.Name : null)];
+            sortedContainers = [.. sortedContainers.OrderBy(x => x.GetConfiguration<ContainerConfiguration>() is ContainerConfiguration configuration ? configuration.Name : null)];
 
             int index = sortedContainers.IndexOf(container);
 
diff --git a/Bitvault/ContainerConfiguration.cs b/Bitvault/ContainerConfiguration.cs
index 64b919b..1e909f0 100644
--- a/Bitvault/ContainerConfiguration.cs
+++ b/Bitvault/ContainerConfiguration.cs
@@ -8,4 +8,4 @@ public record ContainerConfiguration :
     public string? Name { get; set; }
 
     public string? Key { get; set; }
-}
+}
\ No newline at end of file
diff --git a/Bitvault/ContainerConnection.cs b/Bitvault/ContainerConnection.cs
index d5bb2f5..fc263c9 100644
--- a/Bitvault/ContainerConnection.cs
+++ b/Bitvault/ContainerConnection.cs
@@ -5,4 +5,4 @@ public class ContainerConnection(string connection)
     private readonly string connection = connection;
 
     public override string ToString() => connection;
-}
+}
\ No newline at end of file
diff --git a/Bitvault/ContainerFactory.cs b/Bitvault/ContainerFactory.cs
index 05e1df1..eb367c6 100644
--- a/Bitvault/ContainerFactory.cs
+++ b/Bitvault/ContainerFactory.cs
@@ -2,12 +2,12 @@
 
 namespace Bitvault;
 
-public class ContainerFactory(IComponentFactory componentFactory) : 
+public class ContainerFactory(IComponentFactory componentFactory) :
     IContainerFactory
 {
     public IComponentHost? Create(string name)
     {
-        if (componentFactory.Create<IContainerComponent, ContainerConfiguration>($"Vault:{name}", 
+        if (componentFactory.Create<IContainerComponent, ContainerConfiguration>($"Vault:{name}",
             new ContainerConfiguration { Name = name }) is IComponentHost host)
         {
             return host;
@@ -15,4 +15,4 @@ public class ContainerFactory(IComponentFactory componentFactory) :
 
         return default;
     }
-}
+}
\ No newline at end of file
diff --git a/Bitvault/ContainerHeaderViewModel.cs b/Bitvault/ContainerHeaderViewModel.cs
index ca79eaa..b47c738 100644
--- a/Bitvault/ContainerHeaderViewModel.cs
+++ b/Bitvault/ContainerHeaderViewModel.cs
@@ -2,10 +2,10 @@
 
 namespace Bitvault;
 
-public partial class ContainerHeaderViewModel : 
+public partial class ContainerHeaderViewModel :
     ObservableCollection
 {
-    public ContainerHeaderViewModel(IServiceProvider provider, 
+    public ContainerHeaderViewModel(IServiceProvider provider,
         IServiceFactory factory,
         IMediator mediator,
         IPublisher publisher,
@@ -20,4 +20,4 @@ public partial class ContainerHeaderViewModel :
     }
 
     public IContentTemplate Template { get; set; }
-}
+}
\ No newline at end of file
diff --git a/Bitvault/ContainerInitializer.cs b/Bitvault/ContainerInitializer.cs
index 46080f7..6e8a2df 100644
--- a/Bitvault/ContainerInitializer.cs
+++ b/Bitvault/ContainerInitializer.cs
@@ -3,15 +3,15 @@
 namespace Bitvault;
 
 public class ContainerInitializer(IEnumerable<IConfigurationDescriptor<ContainerConfiguration>> configurations,
-    IComponentFactory componentFactory, 
+    IComponentFactory componentFactory,
     IContainerHostCollection vaults) : IInitializer
 {
     public async Task Initialize()
     {
         foreach (IConfigurationDescriptor<ContainerConfiguration> configuration in configurations)
-        {       
+        {
             if (componentFactory.Create<IContainerComponent,
-                ContainerConfiguration>(configuration.Section, configuration.Value) 
+                ContainerConfiguration>(configuration.Section, configuration.Value)
                 is IComponentHost host)
             {
                 vaults.Add(host);
@@ -19,4 +19,4 @@ public class ContainerInitializer(IEnumerable<IConfigurationDescriptor<Container
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Bitvault/ContainerStorageFactory.cs b/Bitvault/ContainerStorageFactory.cs
index c797b2d..8bd4636 100644
--- a/Bitvault/ContainerStorageFactory.cs
+++ b/Bitvault/ContainerStorageFactory.cs
@@ -11,7 +11,7 @@ public class ContainerStorageFactory(IValueStore<ContainerConnection> connection
     IServiceProvider provider) :
     IContainerStorageFactory
 {
-    public async Task<bool> Create(string name, 
+    public async Task<bool> Create(string name,
         SecurityKey key)
     {
         connection.Set(new ContainerConnection($"Data Source={Path.Combine(environment.ContentRootPath, name)}" +
@@ -28,7 +28,6 @@ public class ContainerStorageFactory(IValueStore<ContainerConnection> connection
                 await context.Database.CloseConnectionAsync().ConfigureAwait(false);
 
                 context.Database.SetConnectionString(null);
-
             }).ConfigureAwait(false);
         }
         catch
@@ -38,4 +37,4 @@ public class ContainerStorageFactory(IValueStore<ContainerConnection> connection
 
         return true;
     }
-}
+}
\ No newline at end of file
diff --git a/Bitvault/ContainerToken.cs b/Bitvault/ContainerToken.cs
index d3c6253..8f59863 100644
--- a/Bitvault/ContainerToken.cs
+++ b/Bitvault/ContainerToken.cs
@@ -15,11 +15,9 @@ public record ContainerToken
 
     public ContainerToken()
     {
-
     }
 
-
     public string Name { get; } = "";
 
     public string? Password { get; } = "";
-}
+}
\ No newline at end of file
diff --git a/Bitvault/ContainerViewModel.cs b/Bitvault/ContainerViewModel.cs
index cdf54d4..9bc1d80 100644
--- a/Bitvault/ContainerViewModel.cs
+++ b/Bitvault/ContainerViewModel.cs
@@ -3,7 +3,6 @@ using Toolkit.Foundation;
 
 namespace Bitvault;
 
-
 [Aggerate(nameof(ContainerViewModel))]
 public partial class ContainerViewModel(IServiceProvider provider,
     IServiceFactory factory,
@@ -44,6 +43,7 @@ public partial class ContainerViewModel(IServiceProvider provider,
 
         return Task.CompletedTask;
     }
+
     public Task Handle(NotifyEventArgs<Search> args)
     {
         if (args.Value is Search search)
diff --git a/Bitvault/ContainerViewModelConfiguration.cs b/Bitvault/ContainerViewModelConfiguration.cs
index 198daf8..1517043 100644
--- a/Bitvault/ContainerViewModelConfiguration.cs
+++ b/Bitvault/ContainerViewModelConfiguration.cs
@@ -5,4 +5,4 @@ public record ContainerViewModelConfiguration
     public string? Filter { get; set; } = "All";
 
     public string? Query { get; set; }
-}
+}
\ No newline at end of file
diff --git a/Bitvault/CreateContainerHandler.cs b/Bitvault/CreateContainerHandler.cs
index 980a765..ac2d08a 100644
--- a/Bitvault/CreateContainerHandler.cs
+++ b/Bitvault/CreateContainerHandler.cs
@@ -9,7 +9,7 @@ public class CreateContainerHandler(IContainerFactory componentFactory,
     IPublisher publisher) :
     IHandler<CreateEventArgs<ContainerToken>, bool>
 {
-    public async Task<bool> Handle(CreateEventArgs<ContainerToken> args, 
+    public async Task<bool> Handle(CreateEventArgs<ContainerToken> args,
         CancellationToken cancellationToken)
     {
         if (args.Value is ContainerToken container && container.Name is { Length: > 0 } name &&
diff --git a/Bitvault/CreateContainerViewModel.cs b/Bitvault/CreateContainerViewModel.cs
index b59f2cc..8105cf9 100644
--- a/Bitvault/CreateContainerViewModel.cs
+++ b/Bitvault/CreateContainerViewModel.cs
@@ -21,6 +21,6 @@ public partial class CreateContainerViewModel(IServiceProvider provider,
     [ObservableProperty]
     private string password;
 
-    public async Task<bool> Confirm() => 
+    public async Task<bool> Confirm() =>
         await Mediator.Handle<CreateEventArgs<ContainerToken>, bool>(Create.As(new ContainerToken(Name, Password)));
 }
\ No newline at end of file
diff --git a/Bitvault/CreateItemHandler.cs b/Bitvault/CreateItemHandler.cs
index c26f79d..ee1ca45 100644
--- a/Bitvault/CreateItemHandler.cs
+++ b/Bitvault/CreateItemHandler.cs
@@ -5,7 +5,7 @@ using Toolkit.Foundation;
 
 namespace Bitvault;
 
-public class CreateItemHandler(IDbContextFactory<ContainerDbContext> dbContextFactory) : 
+public class CreateItemHandler(IDbContextFactory<ContainerDbContext> dbContextFactory) :
     IHandler<CreateEventArgs<(Guid, ItemConfiguration)>, bool>
 {
     public async Task<bool> Handle(CreateEventArgs<(Guid, ItemConfiguration)> args,
@@ -24,7 +24,6 @@ public class CreateItemHandler(IDbContextFactory<ContainerDbContext> dbContextFa
                 {
                     result = await context.AddAsync(new ItemEntry { Id = id, Name = name }, cancellationToken);
                     await context.SaveChangesAsync(cancellationToken);
-
                 }, cancellationToken);
 
                 if (result is not null)
@@ -34,10 +33,9 @@ public class CreateItemHandler(IDbContextFactory<ContainerDbContext> dbContextFa
             }
             catch
             {
-
             }
         }
 
         return false;
     }
-}
+}
\ No newline at end of file
diff --git a/Bitvault/CreatedItemHandler.cs b/Bitvault/CreatedItemHandler.cs
index e02a352..cef3647 100644
--- a/Bitvault/CreatedItemHandler.cs
+++ b/Bitvault/CreatedItemHandler.cs
@@ -1,11 +1,10 @@
-using FluentAvalonia.Core;
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 using Toolkit.Foundation;
 
 namespace Bitvault;
 
 public class CreatedItemHandler(IServiceProvider serviceProvider,
-    ICache< Item> cache,
+    ICache<Item> cache,
     IPublisher publisher) :
     INotificationHandler<CreatedEventArgs<Item>>
 {
@@ -17,7 +16,7 @@ public class CreatedItemHandler(IServiceProvider serviceProvider,
             IServiceFactory serviceFactory = serviceScope.ServiceProvider.GetRequiredService<IServiceFactory>();
             IValueStore<Item> valueStore = serviceScope.ServiceProvider.GetRequiredService<IValueStore<Item>>();
 
-            if (serviceFactory.Create<ItemNavigationViewModel>(item.Id, item.Name, "Description", true) 
+            if (serviceFactory.Create<ItemNavigationViewModel>(item.Id, item.Name, "Description", true)
                 is ItemNavigationViewModel viewModel)
             {
                 cache.Add(item);
@@ -31,4 +30,4 @@ public class CreatedItemHandler(IServiceProvider serviceProvider,
 
         return Task.CompletedTask;
     }
-}
+}
\ No newline at end of file
diff --git a/Bitvault/DeleteItemActionViewModel.cs b/Bitvault/DeleteItemActionViewModel.cs
index 0154903..eb300c3 100644
--- a/Bitvault/DeleteItemActionViewModel.cs
+++ b/Bitvault/DeleteItemActionViewModel.cs
@@ -12,4 +12,4 @@ public partial class DeleteItemActionViewModel(IServiceProvider provider,
 {
     [RelayCommand]
     public void Invoke() => Publisher.Publish(Delete.As<Item>());
-}
+}
\ No newline at end of file
diff --git a/Bitvault/EditItemHander.cs b/Bitvault/EditItemHander.cs
index 7f39e24..fcb2896 100644
--- a/Bitvault/EditItemHander.cs
+++ b/Bitvault/EditItemHander.cs
@@ -27,8 +27,7 @@ public class EditItemHander(IDbContextFactory<ContainerDbContext> dbContextFacto
                     {
                         result.Name = name;
                         await context.SaveChangesAsync(cancellationToken);
-                    }    
-
+                    }
                 }, cancellationToken);
 
                 if (result is not null)
@@ -38,10 +37,9 @@ public class EditItemHander(IDbContextFactory<ContainerDbContext> dbContextFacto
             }
             catch
             {
-
             }
         }
 
         return false;
     }
-}
+}
\ No newline at end of file
diff --git a/Bitvault/Favourite.cs b/Bitvault/Favourite.cs
index d673916..758093c 100644
--- a/Bitvault/Favourite.cs
+++ b/Bitvault/Favourite.cs
@@ -7,4 +7,4 @@ public record Favourite
 
     public static FavouriteEventArgs<TValue> As<TValue>() where TValue : new() =>
         new(new TValue());
-}
+}
\ No newline at end of file
diff --git a/Bitvault/FavouriteEventArgs.cs b/Bitvault/FavouriteEventArgs.cs
index 3541b01..c6de83a 100644
--- a/Bitvault/FavouriteEventArgs.cs
+++ b/Bitvault/FavouriteEventArgs.cs
@@ -1,3 +1,3 @@
 namespace Bitvault;
 
-public record FavouriteEventArgs<TValue>(TValue Value);
+public record FavouriteEventArgs<TValue>(TValue Value);
\ No newline at end of file
diff --git a/Bitvault/FavouriteItemActionViewModel.cs b/Bitvault/FavouriteItemActionViewModel.cs
index 78e14b0..7ffe03d 100644
--- a/Bitvault/FavouriteItemActionViewModel.cs
+++ b/Bitvault/FavouriteItemActionViewModel.cs
@@ -26,5 +26,4 @@ public partial class FavouriteItemActionViewModel(IServiceProvider provider,
             Publisher.Publish(Unfavourite.As<Item>());
         }
     }
-}
-
+}
\ No newline at end of file
diff --git a/Bitvault/FavouriteItemHandler.cs b/Bitvault/FavouriteItemHandler.cs
index 2720f48..fdfb45b 100644
--- a/Bitvault/FavouriteItemHandler.cs
+++ b/Bitvault/FavouriteItemHandler.cs
@@ -28,7 +28,6 @@ public class FavouriteItemHandler(IValueStore<Item> valueStore,
         }
         catch
         {
-
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Bitvault/Filter.cs b/Bitvault/Filter.cs
index c8f5ede..8055ac5 100644
--- a/Bitvault/Filter.cs
+++ b/Bitvault/Filter.cs
@@ -1,3 +1,3 @@
 namespace Bitvault;
 
-public record Filter(string? Value);
+public record Filter(string? Value);
\ No newline at end of file
diff --git a/Bitvault/FilterContainerNavigationViewModel.cs b/Bitvault/FilterContainerNavigationViewModel.cs
index 8e59220..fa7f733 100644
--- a/Bitvault/FilterContainerNavigationViewModel.cs
+++ b/Bitvault/FilterContainerNavigationViewModel.cs
@@ -36,6 +36,6 @@ public partial class FilterContainerNavigationViewModel : Observable,
         Task.FromResult(Activated = true);
 
     [RelayCommand]
-    public void Invoke() => Publisher.Publish(Notify.As(new Filter(Filter)), 
+    public void Invoke() => Publisher.Publish(Notify.As(new Filter(Filter)),
         nameof(ContainerViewModel));
 }
\ No newline at end of file
diff --git a/Bitvault/FooterViewModel.cs b/Bitvault/FooterViewModel.cs
index 2a0e854..c503c8c 100644
--- a/Bitvault/FooterViewModel.cs
+++ b/Bitvault/FooterViewModel.cs
@@ -14,4 +14,4 @@ public partial class FooterViewModel :
     {
         Add<ManageNavigationViewModel>();
     }
-}
+}
\ No newline at end of file
diff --git a/Bitvault/Form.cs b/Bitvault/Form.cs
index 160fd76..0dfdf00 100644
--- a/Bitvault/Form.cs
+++ b/Bitvault/Form.cs
@@ -2,5 +2,5 @@
 
 public record Form
 {
-    public ICollection<FormEntry>? Entries { get; set;}
+    public ICollection<FormEntry>? Entries { get; set; }
 }
\ No newline at end of file
diff --git a/Bitvault/FormFieldType.cs b/Bitvault/FormFieldType.cs
index d6f6801..f94abe5 100644
--- a/Bitvault/FormFieldType.cs
+++ b/Bitvault/FormFieldType.cs
@@ -13,4 +13,4 @@ public enum FormFieldType
     Text,
     Time,
     Url
-}
+}
\ No newline at end of file
diff --git a/Bitvault/IContainerNavigationViewModel.cs b/Bitvault/IContainerNavigationViewModel.cs
index 2523ab2..668cea3 100644
--- a/Bitvault/IContainerNavigationViewModel.cs
+++ b/Bitvault/IContainerNavigationViewModel.cs
@@ -2,6 +2,6 @@
 
 namespace Bitvault;
 
-public interface IContainerNavigationViewModel : 
-    ISelectable, 
+public interface IContainerNavigationViewModel :
+    ISelectable,
     IDisposable;
\ No newline at end of file
diff --git a/Bitvault/IItemEntryViewModel.cs b/Bitvault/IItemEntryViewModel.cs
index 0db12c8..8fde9c1 100644
--- a/Bitvault/IItemEntryViewModel.cs
+++ b/Bitvault/IItemEntryViewModel.cs
@@ -1,7 +1,6 @@
 namespace Bitvault;
 
-public interface IItemEntryViewModel : 
+public interface IItemEntryViewModel :
     IDisposable
 {
-
-}
+}
\ No newline at end of file
diff --git a/Bitvault/IMainNavigationViewModel.cs b/Bitvault/IMainNavigationViewModel.cs
index 895ac5f..0fbbc4a 100644
--- a/Bitvault/IMainNavigationViewModel.cs
+++ b/Bitvault/IMainNavigationViewModel.cs
@@ -1,3 +1,3 @@
 namespace Bitvault;
 
-public interface IMainNavigationViewModel : IDisposable;
+public interface IMainNavigationViewModel : IDisposable;
\ No newline at end of file
diff --git a/Bitvault/ISecurityKeyFactory.cs b/Bitvault/ISecurityKeyFactory.cs
index 1fc2455..dec7765 100644
--- a/Bitvault/ISecurityKeyFactory.cs
+++ b/Bitvault/ISecurityKeyFactory.cs
@@ -5,4 +5,4 @@ public interface ISecurityKeyFactory
     SecurityKey? Create(byte[] phrase,
         byte[]? encryptedKey = null,
         byte[]? salt = null);
-}
+}
\ No newline at end of file
diff --git a/Bitvault/IconViewModel.cs b/Bitvault/IconViewModel.cs
index 2280bf3..6b6a8d1 100644
--- a/Bitvault/IconViewModel.cs
+++ b/Bitvault/IconViewModel.cs
@@ -11,6 +11,5 @@ public partial class IconViewModel : Observable
         ISubscription subscriber,
         IDisposer disposer) : base(provider, factory, mediator, publisher, subscriber, disposer)
     {
-
     }
-}
+}
\ No newline at end of file
diff --git a/Bitvault/Item.cs b/Bitvault/Item.cs
index 82ecc11..46225e6 100644
--- a/Bitvault/Item.cs
+++ b/Bitvault/Item.cs
@@ -5,5 +5,4 @@ public record Item
     public Guid Id { get; init; }
 
     public string? Name { get; init; } = "";
-}
-
+}
\ No newline at end of file
diff --git a/Bitvault/ItemCommandHeaderViewModel.cs b/Bitvault/ItemCommandHeaderViewModel.cs
index 559be6e..3f2ab47 100644
--- a/Bitvault/ItemCommandHeaderViewModel.cs
+++ b/Bitvault/ItemCommandHeaderViewModel.cs
@@ -8,7 +8,7 @@ public partial class ItemCommandHeaderViewModel(IServiceProvider provider,
     IPublisher publisher,
     ISubscription subscriber,
     IDisposer disposer,
-    IContentTemplate template) : 
+    IContentTemplate template) :
     ObservableCollection(provider, factory, mediator, publisher, subscriber, disposer),
     INotificationHandler<NotifyEventArgs<CommandCollection>>
 {
diff --git a/Bitvault/ItemConfiguration.cs b/Bitvault/ItemConfiguration.cs
index 76cc84c..d84a596 100644
--- a/Bitvault/ItemConfiguration.cs
+++ b/Bitvault/ItemConfiguration.cs
@@ -3,4 +3,4 @@
 public record ItemConfiguration
 {
     public string? Name { get; set; } = "";
-}
+}
\ No newline at end of file
diff --git a/Bitvault/ItemHeaderConfiguration.cs b/Bitvault/ItemHeaderConfiguration.cs
index 9a22399..87903b6 100644
--- a/Bitvault/ItemHeaderConfiguration.cs
+++ b/Bitvault/ItemHeaderConfiguration.cs
@@ -3,4 +3,4 @@
 public record ItemHeaderConfiguration
 {
     public string? Name { get; init; } = "";
-}
+}
\ No newline at end of file
diff --git a/Bitvault/ItemHeaderViewModel.cs b/Bitvault/ItemHeaderViewModel.cs
index 639ac35..455efaa 100644
--- a/Bitvault/ItemHeaderViewModel.cs
+++ b/Bitvault/ItemHeaderViewModel.cs
@@ -1,5 +1,4 @@
 using CommunityToolkit.Mvvm.ComponentModel;
-using System.Xml.Linq;
 using Toolkit.Foundation;
 
 namespace Bitvault;
@@ -30,7 +29,7 @@ public partial class ItemHeaderViewModel : Observable<string, string>,
         Track(nameof(Value), () => Value, newValue => Value = newValue);
     }
 
-    public Task<bool> Handle(ValidationEventArgs<Item> args, 
+    public Task<bool> Handle(ValidationEventArgs<Item> args,
         CancellationToken cancellationToken)
     {
         return Task.FromResult(true);
@@ -39,7 +38,7 @@ public partial class ItemHeaderViewModel : Observable<string, string>,
     public Task<ItemHeaderConfiguration> Handle(ConfirmEventArgs<Item> args,
         CancellationToken cancellationToken) => Task.FromResult(new ItemHeaderConfiguration { Name = Value });
 
-    public Task Handle(EditEventArgs<Item> args) => 
+    public Task Handle(EditEventArgs<Item> args) =>
         Task.FromResult(Immutable = false);
 
     public Task Handle(CancelEventArgs<Item> args)
@@ -57,4 +56,4 @@ public partial class ItemHeaderViewModel : Observable<string, string>,
 
         return Task.CompletedTask;
     }
-}
+}
\ No newline at end of file
diff --git a/Bitvault/ItemNavigationViewModel.cs b/Bitvault/ItemNavigationViewModel.cs
index cb5bc61..ccf6f30 100644
--- a/Bitvault/ItemNavigationViewModel.cs
+++ b/Bitvault/ItemNavigationViewModel.cs
@@ -49,17 +49,18 @@ public partial class ItemNavigationViewModel(IServiceProvider provider,
 
     public IContentTemplate Template { get; set; } = template;
 
-    public Task Handle(ArchiveEventArgs<Item> args) => 
+    public Task Handle(ArchiveEventArgs<Item> args) =>
         Task.Run(Dispose);
 
-    public Task Handle(UnarchiveEventArgs<Item> args) => 
+    public Task Handle(UnarchiveEventArgs<Item> args) =>
         Task.Run(Dispose);
 
-    public Task Handle(FavouriteEventArgs<Item> args) => 
+    public Task Handle(FavouriteEventArgs<Item> args) =>
         Task.FromResult(Favourite = true);
 
     public Task Handle(UnfavouriteEventArgs<Item> args) =>
         Task.FromResult(Favourite = false);
+
     public Task Handle(NotifyEventArgs<ItemHeaderConfiguration> args)
     {
         if (args.Value is ItemHeaderConfiguration configuration)
diff --git a/Bitvault/ItemViewModel.cs b/Bitvault/ItemViewModel.cs
index 7f38488..4288991 100644
--- a/Bitvault/ItemViewModel.cs
+++ b/Bitvault/ItemViewModel.cs
@@ -3,7 +3,7 @@ using Toolkit.Foundation;
 
 namespace Bitvault;
 
-public partial class ItemViewModel : 
+public partial class ItemViewModel :
     ObservableCollection<IItemEntryViewModel>,
     INotificationHandler<EditEventArgs<Item>>,
     INotificationHandler<ConfirmEventArgs<Item>>,
@@ -25,10 +25,10 @@ public partial class ItemViewModel :
     private string name;
 
     public ItemViewModel(IServiceProvider provider,
-        IServiceFactory factory, 
+        IServiceFactory factory,
         IMediator mediator,
-        IPublisher publisher, 
-        ISubscription subscriber, 
+        IPublisher publisher,
+        ISubscription subscriber,
         IDisposer disposer,
         IContentTemplate template,
         NamedComponent named,
@@ -37,7 +37,7 @@ public partial class ItemViewModel :
         bool favourite = false,
         bool archived = false) : base(provider, factory, mediator, publisher, subscriber, disposer)
     {
-        Named = $"{named}"; 
+        Named = $"{named}";
         Template = template;
         Immutable = immutable;
         Favourite = favourite;
@@ -112,4 +112,4 @@ public partial class ItemViewModel :
 
         return base.OnActivated();
     }
-}
+}
\ No newline at end of file
diff --git a/Bitvault/ModifiedItemHandler.cs b/Bitvault/ModifiedItemHandler.cs
index af0924e..d5e1b6a 100644
--- a/Bitvault/ModifiedItemHandler.cs
+++ b/Bitvault/ModifiedItemHandler.cs
@@ -34,4 +34,4 @@ public class ModifiedItemHandler(IServiceProvider serviceProvider,
 
         return Task.CompletedTask;
     }
-}
+}
\ No newline at end of file
diff --git a/Bitvault/NoteViewModel.cs b/Bitvault/NoteViewModel.cs
index 26e6a32..39f26a3 100644
--- a/Bitvault/NoteViewModel.cs
+++ b/Bitvault/NoteViewModel.cs
@@ -11,6 +11,5 @@ public partial class NoteViewModel : Observable
         ISubscription subscriber,
         IDisposer disposer) : base(provider, factory, mediator, publisher, subscriber, disposer)
     {
-
     }
-}
+}
\ No newline at end of file
diff --git a/Bitvault/OpenContainerHandler.cs b/Bitvault/OpenContainerHandler.cs
index 9a97714..cbd9c19 100644
--- a/Bitvault/OpenContainerHandler.cs
+++ b/Bitvault/OpenContainerHandler.cs
@@ -18,7 +18,7 @@ public class OpenContainerHandler(ContainerConfiguration configuration,
                 byte[]? salt = Convert.FromBase64String(keyPart[0]);
                 byte[]? encryptedKey = Convert.FromBase64String(keyPart[1]);
 
-                if ( keyVaultFactory.Create(Encoding.UTF8.GetBytes(password), encryptedKey, salt) is SecurityKey key)
+                if (keyVaultFactory.Create(Encoding.UTF8.GetBytes(password), encryptedKey, salt) is SecurityKey key)
                 {
                     if (await vaultStorage.Create(name, key))
                     {
diff --git a/Bitvault/Opened.cs b/Bitvault/Opened.cs
index e0bd0f3..094cb79 100644
--- a/Bitvault/Opened.cs
+++ b/Bitvault/Opened.cs
@@ -5,4 +5,4 @@ public record Opened
     public static OpenedEventArgs<TValue> As<TValue>(TValue value) => new(value);
 
     public static OpenedEventArgs<TValue> As<TValue>() where TValue : new() => new(new TValue());
-}
+}
\ No newline at end of file
diff --git a/Bitvault/OpenedEventArgs.cs b/Bitvault/OpenedEventArgs.cs
index 3db4720..eda6a5b 100644
--- a/Bitvault/OpenedEventArgs.cs
+++ b/Bitvault/OpenedEventArgs.cs
@@ -1,3 +1,3 @@
 namespace Bitvault;
 
-public record OpenedEventArgs<TValue>(TValue? Value = default);
+public record OpenedEventArgs<TValue>(TValue? Value = default);
\ No newline at end of file
diff --git a/Bitvault/PasswordViewModel.cs b/Bitvault/PasswordViewModel.cs
index d9c48d7..f54c75e 100644
--- a/Bitvault/PasswordViewModel.cs
+++ b/Bitvault/PasswordViewModel.cs
@@ -11,6 +11,5 @@ public partial class PasswordViewModel : Observable
         ISubscription subscriber,
         IDisposer disposer) : base(provider, factory, mediator, publisher, subscriber, disposer)
     {
-
     }
-}
+}
\ No newline at end of file
diff --git a/Bitvault/QueryContainerHandler.cs b/Bitvault/QueryContainerHandler.cs
index 705d28b..c0ea178 100644
--- a/Bitvault/QueryContainerHandler.cs
+++ b/Bitvault/QueryContainerHandler.cs
@@ -8,14 +8,14 @@ namespace Bitvault;
 public class QueryContainerHandler(IDbContextFactory<ContainerDbContext> dbContextFactory) :
     IHandler<RequestEventArgs<QueryContainerConfiguration>, IReadOnlyCollection<(Guid Id, string? Name, bool Favourite, bool Archived)>>
 {
-    public async Task<IReadOnlyCollection<(Guid Id, string? Name, bool Favourite, bool Archived)>> Handle(RequestEventArgs<QueryContainerConfiguration> args, 
+    public async Task<IReadOnlyCollection<(Guid Id, string? Name, bool Favourite, bool Archived)>> Handle(RequestEventArgs<QueryContainerConfiguration> args,
         CancellationToken cancellationToken)
     {
         List<(Guid Id, string? Name, bool Favourite, bool Archived)> items = [];
 
-        if (args.Value is  QueryContainerConfiguration queryConfiguration)
+        if (args.Value is QueryContainerConfiguration queryConfiguration)
         {
-            ExpressionStarter<ItemEntry> predicate = 
+            ExpressionStarter<ItemEntry> predicate =
                 PredicateBuilder.New<ItemEntry>(true);
 
             if (queryConfiguration.Filter == "All")
@@ -33,7 +33,7 @@ public class QueryContainerHandler(IDbContextFactory<ContainerDbContext> dbConte
                 predicate = predicate.And(x => x.State == 2);
             }
 
-            if (queryConfiguration.Query is { Length: > 0} query)
+            if (queryConfiguration.Query is { Length: > 0 } query)
             {
                 predicate = predicate.And(x => EF.Functions.Like(x.Name, $"%{query}%"));
             }
@@ -60,4 +60,4 @@ public class QueryContainerHandler(IDbContextFactory<ContainerDbContext> dbConte
 
         return items;
     }
-}
+}
\ No newline at end of file
diff --git a/Bitvault/QueryItemConfiguration.cs b/Bitvault/QueryItemConfiguration.cs
index a27eb73..98628ee 100644
--- a/Bitvault/QueryItemConfiguration.cs
+++ b/Bitvault/QueryItemConfiguration.cs
@@ -3,4 +3,4 @@
 public record QueryItemConfiguration
 {
     public int Id { get; set; }
-}
+}
\ No newline at end of file
diff --git a/Bitvault/SearchContainerActionViewModel.cs b/Bitvault/SearchContainerActionViewModel.cs
index 7e7b62f..b093cf0 100644
--- a/Bitvault/SearchContainerActionViewModel.cs
+++ b/Bitvault/SearchContainerActionViewModel.cs
@@ -18,5 +18,4 @@ public partial class SearchContainerActionViewModel(IServiceProvider provider,
     [RelayCommand]
     public void Invoke() => Publisher.Publish(Notify.As(new Search(Value)),
         nameof(ContainerViewModel));
-}
-
+}
\ No newline at end of file
diff --git a/Bitvault/SecurityKeyFactory.cs b/Bitvault/SecurityKeyFactory.cs
index 91cd386..d8aa31a 100644
--- a/Bitvault/SecurityKeyFactory.cs
+++ b/Bitvault/SecurityKeyFactory.cs
@@ -5,7 +5,7 @@ namespace Bitvault;
 public class SecurityKeyFactory(IKeyGenerator generator,
     IKeyDeriver deriver,
     IEncryptor encryptor,
-    IDecryptor decryptor) : 
+    IDecryptor decryptor) :
     ISecurityKeyFactory
 {
     public SecurityKey? Create(byte[] phrase,
@@ -30,5 +30,4 @@ public class SecurityKeyFactory(IKeyGenerator generator,
 
         return new SecurityKey(salt, encryptedKey, decryptedKey);
     }
-}
-
+}
\ No newline at end of file
diff --git a/Bitvault/TextViewModel.cs b/Bitvault/TextViewModel.cs
index 3dffae8..23d42b1 100644
--- a/Bitvault/TextViewModel.cs
+++ b/Bitvault/TextViewModel.cs
@@ -11,6 +11,5 @@ public partial class TextViewModel : Observable
         ISubscription subscriber,
         IDisposer disposer) : base(provider, factory, mediator, publisher, subscriber, disposer)
     {
-
     }
-}
+}
\ No newline at end of file
diff --git a/Bitvault/Unarchive.cs b/Bitvault/Unarchive.cs
index 63f451b..c826994 100644
--- a/Bitvault/Unarchive.cs
+++ b/Bitvault/Unarchive.cs
@@ -7,4 +7,4 @@ public record Unarchive
 
     public static UnarchiveEventArgs<TValue> As<TValue>() where TValue : new() =>
         new(new TValue());
-}
+}
\ No newline at end of file
diff --git a/Bitvault/UnarchiveEventArgs.cs b/Bitvault/UnarchiveEventArgs.cs
index 8b15903..f28cf1b 100644
--- a/Bitvault/UnarchiveEventArgs.cs
+++ b/Bitvault/UnarchiveEventArgs.cs
@@ -1,3 +1,3 @@
 namespace Bitvault;
 
-public record UnarchiveEventArgs<TValue>(TValue Value);
+public record UnarchiveEventArgs<TValue>(TValue Value);
\ No newline at end of file
diff --git a/Bitvault/UnarchiveItemActionViewModel.cs b/Bitvault/UnarchiveItemActionViewModel.cs
index fe54dba..d091a17 100644
--- a/Bitvault/UnarchiveItemActionViewModel.cs
+++ b/Bitvault/UnarchiveItemActionViewModel.cs
@@ -13,5 +13,4 @@ public partial class UnarchiveItemActionViewModel(IServiceProvider provider,
 {
     [RelayCommand]
     public void Invoke() => Publisher.Publish(Unarchive.As<Item>());
-}
-
+}
\ No newline at end of file
diff --git a/Bitvault/UnarchiveItemHandler.cs b/Bitvault/UnarchiveItemHandler.cs
index 603e315..b46a2b8 100644
--- a/Bitvault/UnarchiveItemHandler.cs
+++ b/Bitvault/UnarchiveItemHandler.cs
@@ -28,7 +28,6 @@ public class UnarchiveItemHandler(IValueStore<Item> valueStore,
         }
         catch
         {
-
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Bitvault/Unfavourite.cs b/Bitvault/Unfavourite.cs
index ec6a5fb..48e1712 100644
--- a/Bitvault/Unfavourite.cs
+++ b/Bitvault/Unfavourite.cs
@@ -7,4 +7,4 @@ public record Unfavourite
 
     public static UnfavouriteEventArgs<TValue> As<TValue>() where TValue : new() =>
         new(new TValue());
-}
+}
\ No newline at end of file
diff --git a/Bitvault/UnfavouriteEventArgs.cs b/Bitvault/UnfavouriteEventArgs.cs
index 18a5535..44259a9 100644
--- a/Bitvault/UnfavouriteEventArgs.cs
+++ b/Bitvault/UnfavouriteEventArgs.cs
@@ -1,3 +1,3 @@
 namespace Bitvault;
 
-public record UnfavouriteEventArgs<TValue>(TValue Value);
+public record UnfavouriteEventArgs<TValue>(TValue Value);
\ No newline at end of file
diff --git a/Bitvault/UnfavouriteItemActionViewModel.cs b/Bitvault/UnfavouriteItemActionViewModel.cs
index fa94d91..872b316 100644
--- a/Bitvault/UnfavouriteItemActionViewModel.cs
+++ b/Bitvault/UnfavouriteItemActionViewModel.cs
@@ -13,5 +13,4 @@ public partial class UnfavouriteItemActionViewModel(IServiceProvider provider,
 {
     [RelayCommand]
     public void Invoke() => Publisher.Publish(Unfavourite.As<Item>());
-}
-
+}
\ No newline at end of file
diff --git a/Bitvault/UnfavouriteItemHandler.cs b/Bitvault/UnfavouriteItemHandler.cs
index c307d7d..c1d5c14 100644
--- a/Bitvault/UnfavouriteItemHandler.cs
+++ b/Bitvault/UnfavouriteItemHandler.cs
@@ -28,7 +28,6 @@ public class UnfavouriteItemHandler(IValueStore<Item> valueStore,
         }
         catch
         {
-
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Toolkit b/Toolkit
index 246dab4..40a150f 160000
--- a/Toolkit
+++ b/Toolkit
@@ -1 +1 @@
-Subproject commit 246dab4297b5d9dca8bd0dc4457177f4998b9008
+Subproject commit 40a150fe80bdf1e12a2a4481c6643e0245934174