diff --git a/Bitvault.Avalonia.Desktop/Bitvault.Avalonia.Desktop.csproj b/Bitvault.Avalonia.Desktop/Bitvault.Avalonia.Desktop.csproj
index 89e119b..28cf11a 100644
--- a/Bitvault.Avalonia.Desktop/Bitvault.Avalonia.Desktop.csproj
+++ b/Bitvault.Avalonia.Desktop/Bitvault.Avalonia.Desktop.csproj
@@ -9,7 +9,7 @@
 		<RuntimeIdentifier>win-x64</RuntimeIdentifier>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Avalonia.Desktop" Version="11.1.0-beta2" />
+		<PackageReference Include="Avalonia.Desktop" Version="11.2.999-cibuild0048140-alpha" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\Bitvault.Avalonia\Bitvault.Avalonia.csproj" />
diff --git a/Bitvault.Avalonia/Bitvault - Backup.Avalonia.csproj b/Bitvault.Avalonia/Bitvault - Backup.Avalonia.csproj
new file mode 100644
index 0000000..c884d9b
--- /dev/null
+++ b/Bitvault.Avalonia/Bitvault - Backup.Avalonia.csproj	
@@ -0,0 +1,56 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<TargetFramework>net8.0</TargetFramework>
+		<Nullable>enable</Nullable>
+		<LangVersion>latest</LangVersion>
+		<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
+	</PropertyGroup>
+	<ItemGroup>
+		<AvaloniaResource Include="Assets\**" />
+	</ItemGroup>
+	<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
+		<DefineConstants>$(DefineConstants);ENABLE_XAML_HOT_RELOAD</DefineConstants>
+	</PropertyGroup>
+	<ItemGroup>
+		<PackageReference Condition="$(DefineConstants.Contains(ENABLE_XAML_HOT_RELOAD))" Include="Avalonia.Markup.Xaml.Loader" Version="11.2.999-cibuild0048140-alpha" />
+		<PackageReference Condition="$(DefineConstants.Contains(ENABLE_XAML_HOT_RELOAD))" Include="HotAvalonia" Version="1.1.1" />
+		<PackageReference Include="HotAvalonia.Extensions" Version="1.1.1" PrivateAssets="All" />
+		<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="Avalonia.Xaml.Behaviors" Version="11.2.999-cibuild0048140-alpha.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">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+		<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
+		<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.2.999-cibuild0048140-alpha" />
+	</ItemGroup>
+	<ItemGroup>
+	  <ProjectReference Include="..\Bitvault\Bitvault.csproj" />
+	  <ProjectReference Include="..\Toolkit\Toolkit.Avalonia\Toolkit.Avalonia.csproj" />
+	  <ProjectReference Include="..\Toolkit\Toolkit.Foundation\Toolkit.Foundation.csproj" />
+	  <ProjectReference Include="..\Toolkit\Toolkit.UI.Avalonia\Toolkit.UI.Avalonia.csproj" />
+	  <ProjectReference Include="..\Toolkit\Toolkit.UI.Controls.Avalonia\Toolkit.UI.Controls.Avalonia.csproj" />
+	</ItemGroup>
+	<ItemGroup>
+	  <Compile Update="AddVaultContentActionView.axaml.cs">
+	    <DependentUpon>AddVaultContentActionView.axaml</DependentUpon>
+	  </Compile>
+	  <Compile Update="OpenView.axaml.cs">
+	    <DependentUpon>OpenView.axaml</DependentUpon>
+	  </Compile>
+	  <Compile Update="ManageNavigationView.axaml.cs">
+	    <DependentUpon>ManageNavigationView.axaml</DependentUpon>
+	  </Compile>
+	  <Compile Update="VaultHeaderView.axaml.cs">
+	    <DependentUpon>VaultHeaderView.axaml</DependentUpon>
+	  </Compile>
+	  <Compile Update="VaultNavigationView.axaml.cs">
+	    <DependentUpon>VaultNavigationView.axaml</DependentUpon>
+	  </Compile>
+	</ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Bitvault.Avalonia/Bitvault.Avalonia.csproj b/Bitvault.Avalonia/Bitvault.Avalonia.csproj
index dace963..b045c68 100644
--- a/Bitvault.Avalonia/Bitvault.Avalonia.csproj
+++ b/Bitvault.Avalonia/Bitvault.Avalonia.csproj
@@ -12,13 +12,10 @@
 		<DefineConstants>$(DefineConstants);ENABLE_XAML_HOT_RELOAD</DefineConstants>
 	</PropertyGroup>
 	<ItemGroup>
-	  <Compile Remove="VaultContentNavigationView.axaml.cs" />
-	</ItemGroup>
-	<ItemGroup>
-		<PackageReference Condition="$(DefineConstants.Contains(ENABLE_XAML_HOT_RELOAD))" Include="Avalonia.Markup.Xaml.Loader" Version="11.1.0-beta2" />
+		<PackageReference Condition="$(DefineConstants.Contains(ENABLE_XAML_HOT_RELOAD))" Include="Avalonia.Markup.Xaml.Loader" Version="11.2.999-cibuild0048140-alpha" />
 		<PackageReference Condition="$(DefineConstants.Contains(ENABLE_XAML_HOT_RELOAD))" Include="HotAvalonia" Version="1.1.1" />
 		<PackageReference Include="HotAvalonia.Extensions" Version="1.1.1" PrivateAssets="All" />
-		<PackageReference Include="Avalonia.Fonts.Inter" Version="11.1.0-beta2" />
+		<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" />
@@ -30,7 +27,7 @@
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
 		<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-		<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.1.0-beta2" />
+		<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.2.999-cibuild0048140-alpha" />
 	</ItemGroup>
 	<ItemGroup>
 	  <ProjectReference Include="..\Bitvault\Bitvault.csproj" />
diff --git a/Bitvault.Avalonia/VaultContentNavigationView.axaml b/Bitvault.Avalonia/VaultContentNavigationView.axaml
new file mode 100644
index 0000000..8afcfc2
--- /dev/null
+++ b/Bitvault.Avalonia/VaultContentNavigationView.axaml
@@ -0,0 +1,15 @@
+<ListBoxItem
+    x:Class="Bitvault.Avalonia.VaultContentNavigationView"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:vm="using:Bitvault"
+    x:Name="Name"
+    x:CompileBindings="False"
+    x:DataType="vm:VaultContentNavigationViewModel"
+    Content="{Binding Name}">
+    <Interaction.Behaviors>
+        <DataTriggerBehavior Binding="{Binding Selected}" Value="True">
+            <NavigateAction Context="Content" Route="AddVaultContent" />
+        </DataTriggerBehavior>
+    </Interaction.Behaviors>
+</ListBoxItem>
diff --git a/Bitvault.Avalonia/VaultContentNavigationView.axaml.cs b/Bitvault.Avalonia/VaultContentNavigationView.axaml.cs
index 0566a9f..6077ca5 100644
--- a/Bitvault.Avalonia/VaultContentNavigationView.axaml.cs
+++ b/Bitvault.Avalonia/VaultContentNavigationView.axaml.cs
@@ -1,8 +1,18 @@
 using Avalonia.Controls;
 
-namespace Bitvault.Avalonia;
-
-public partial class VaultContentNavigationView : ListBoxItem
+namespace Bitvault.Avalonia
 {
-    public VaultContentNavigationView() => InitializeComponent();
+    public partial class VaultContentNavigationView : ListBoxItem
+    {
+        public VaultContentNavigationView()
+        {
+            InitializeComponent();
+            Tapped += VaultContentNavigationView_Tapped;
+        }
+
+        private void VaultContentNavigationView_Tapped(object? sender, global::Avalonia.Input.TappedEventArgs e)
+        {
+
+        }
+    }
 }
diff --git a/Bitvault.Avalonia/VaultView.axaml b/Bitvault.Avalonia/VaultView.axaml
index 663eb54..413ef10 100644
--- a/Bitvault.Avalonia/VaultView.axaml
+++ b/Bitvault.Avalonia/VaultView.axaml
@@ -28,7 +28,13 @@
             Grid.Column="0"
             Margin="2,-1,0,0"
             ItemTemplate="{ReflectionBinding Template}"
-            ItemsSource="{Binding}" />
+            ItemsSource="{Binding}">
+            <ListBox.Styles>
+                <Style Selector="ListBoxItem">
+                    <Setter Property="IsSelected" Value="{ReflectionBinding Selected}" />
+                </Style>
+            </ListBox.Styles>
+        </ListBox>
         <Frame
             x:Name="Content"
             Grid.Row="1"
diff --git a/Bitvault/VaultContentNavigationViewModel.cs b/Bitvault/VaultContentNavigationViewModel.cs
index 8ead72d..196255c 100644
--- a/Bitvault/VaultContentNavigationViewModel.cs
+++ b/Bitvault/VaultContentNavigationViewModel.cs
@@ -24,9 +24,4 @@ public partial class VaultContentNavigationViewModel(IServiceProvider provider,
     private string? description = description;
 
     public IContentTemplate Template { get; set; } = template;
-
-    partial void OnSelectedChanged(bool value)
-    {
-        throw new NotImplementedException();
-    }
 }
\ No newline at end of file
diff --git a/Toolkit b/Toolkit
index 40845bb..ff8e97f 160000
--- a/Toolkit
+++ b/Toolkit
@@ -1 +1 @@
-Subproject commit 40845bb5b3246d87f367a5237a9f5dd44cc8abba
+Subproject commit ff8e97f03055701ca91b59918dca156a57baaefc