diff --git a/.run/SecureFolderFS.run.xml b/.run/SecureFolderFS.run.xml
index 4dd955762..68ac246c4 100644
--- a/.run/SecureFolderFS.run.xml
+++ b/.run/SecureFolderFS.run.xml
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="SecureFolderFS (Desktop)" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
     <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/src/Platforms/SecureFolderFS.Uno/SecureFolderFS.Uno.csproj" />
-    <option name="LAUNCH_PROFILE_TFM" value="net8.0-desktop" />
+    <option name="LAUNCH_PROFILE_TFM" value="net9.0-desktop" />
     <option name="LAUNCH_PROFILE_NAME" value="SecureFolderFS (Desktop)" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -16,7 +16,7 @@
   </configuration>
   <configuration default="false" name="SecureFolderFS (WinAppSDK Unpackaged)" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
     <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/src/Platforms/SecureFolderFS.Uno/SecureFolderFS.Uno.csproj" />
-    <option name="LAUNCH_PROFILE_TFM" value="net8.0-windows10.0.19041.0" />
+    <option name="LAUNCH_PROFILE_TFM" value="net9.0-windows10.0.19041.0" />
     <option name="LAUNCH_PROFILE_NAME" value="SecureFolderFS (WinAppSDK Unpackaged)" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
diff --git a/global.json b/global.json
index 9c6830bea..f42869719 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,5 @@
 {
-  // To update the version of Uno please update the version of the Uno.Sdk here. See https://aka.platform.uno/upgrade-uno-packages for more information.
   "msbuild-sdks": {
-    "Uno.Sdk": "5.3.112"
+    "Uno.Sdk": "5.4.10"
   }
-}
\ No newline at end of file
+}
diff --git a/lib/Tmds.Fuse b/lib/Tmds.Fuse
index 326da425f..73663e78b 160000
--- a/lib/Tmds.Fuse
+++ b/lib/Tmds.Fuse
@@ -1 +1 @@
-Subproject commit 326da425f34b8d2522879adc42144665e1bf7b45
+Subproject commit 73663e78ba98e20850ecad10489028f2afedd60f
diff --git a/lib/nwebdav b/lib/nwebdav
index f22a616f4..17fcebe4d 160000
--- a/lib/nwebdav
+++ b/lib/nwebdav
@@ -1 +1 @@
-Subproject commit f22a616f4308fda23045e8c29ed1fd05e4d227e0
+Subproject commit 17fcebe4d06338f94122400c2c9cfdbb5ea8c77e
diff --git a/src/Platforms/Directory.Build.props b/src/Platforms/Directory.Build.props
index 45c1a7505..63cdfc438 100644
--- a/src/Platforms/Directory.Build.props
+++ b/src/Platforms/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <DotNetVersion>net8.0</DotNetVersion>
+    <DotNetVersion>net9.0</DotNetVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
@@ -62,7 +62,7 @@
     <When Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">
       <PropertyGroup>
         <IsMacCatalyst>true</IsMacCatalyst>
-        <SupportedOSPlatformVersion>14.0</SupportedOSPlatformVersion>
+        <SupportedOSPlatformVersion>15.0</SupportedOSPlatformVersion>
       </PropertyGroup>
     </When>
     <When Condition="$(TargetFramework.Contains('windows10'))">
diff --git a/src/Platforms/Directory.Packages.props b/src/Platforms/Directory.Packages.props
index b41f0b9b5..6cbaa6ad1 100644
--- a/src/Platforms/Directory.Packages.props
+++ b/src/Platforms/Directory.Packages.props
@@ -1,27 +1,27 @@
 <Project ToolsVersion="15.0">
   <ItemGroup>
-    <PackageVersion Include="AathifMahir.Maui.MauiIcons.Cupertino" Version="3.0.0" />
-    <PackageVersion Include="AathifMahir.Maui.MauiIcons.Material" Version="3.0.0" />
-    <PackageVersion Include="CommunityToolkit.Maui" Version="9.0.2" />
+    <PackageVersion Include="AathifMahir.Maui.MauiIcons.Cupertino" Version="4.0.0" />
+    <PackageVersion Include="AathifMahir.Maui.MauiIcons.Material" Version="4.0.0" />
+    <PackageVersion Include="CommunityToolkit.Maui" Version="9.1.1" />
+    <PackageVersion Include="CommunityToolkit.Maui.MediaElement" Version="4.1.2" />
     <PackageVersion Include="CommunityToolkit.WinUI.UI.Animations" Version="7.1.2" />
     <PackageVersion Include="CommunityToolkit.WinUI.UI.Controls.Markdown" Version="7.1.2" />
-    <PackageVersion Include="IconPacks.Material" Version="1.0.8765.1-build" />
-    <PackageVersion Include="LiveChartsCore.SkiaSharpView.Uno.WinUI" Version="2.0.0-rc3.3" />
-    <PackageVersion Include="Material.Components.Maui" Version="0.2.1-preview" />
+    <PackageVersion Include="ContextMenuContainer" Version="1.2.3" />
+    <PackageVersion Include="H.NotifyIcon.Uno.WinUI" Version="2.1.4" />
+    <PackageVersion Include="IconPacks.Material" Version="1.0.8940.2-build" />
+    <PackageVersion Include="LiveChartsCore.SkiaSharpView.Uno.WinUI" Version="2.0.0-rc4.5" />
+    <PackageVersion Include="Material.Components.Maui" Version="0.2.2-preview" />
     <PackageVersion Include="Microsoft.AppCenter.Analytics" Version="5.0.3" />
     <PackageVersion Include="Microsoft.AppCenter.Crashes" Version="5.0.3" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Maui.Controls" Version="8.0.70" />
-    <PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.70" />
-    <PackageVersion Include="Microsoft.Maui.Core" Version="8.0.70" />
-    <PackageVersion Include="Microsoft.Maui.Essentials" Version="8.0.70" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Maui.Controls" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Maui.Core" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Maui.Essentials" Version="9.0.10" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.NET.ILLink.Analyzers" Version="7.0.100-1.23401.1" />
     <PackageVersion Include="Microsoft.Windows.Compatibility" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.4.231008000" />
     <PackageVersion Include="Octokit" Version="13.0.1" />
+    <PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.9-preview.2.2" />
     <PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
     <PackageVersion Include="The49.Maui.BottomSheet" Version="8.0.3" />
     <PackageVersion Include="Uno.CommunityToolkit.WinUI" Version="7.1.200" />
@@ -33,14 +33,8 @@
     <PackageVersion Include="Uno.Resizetizer" Version="1.6.0" />
     <PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.3.90" />
     <PackageVersion Include="Uno.UniversalImageLoader" Version="1.9.37" />
-    <PackageVersion Include="Uno.Wasm.Bootstrap" Version="8.0.20" />
-    <PackageVersion Include="Uno.Wasm.Bootstrap.DevServer" Version="8.0.20" />
-    <PackageVersion Include="Uno.Wasm.Bootstrap.Server" Version="8.0.20" />
     <PackageVersion Include="Uno.WinUI" Version="5.3.90" />
     <PackageVersion Include="Uno.WinUI.Lottie" Version="5.3.90" />
-    <PackageVersion Include="Uno.WinUI.DevServer" Version="5.3.90" />
-    <PackageVersion Include="Uno.WinUI.Skia.Gtk" Version="5.3.90" />
-    <PackageVersion Include="Uno.WinUI.WebAssembly" Version="5.3.90" />
-    <PackageVersion Include="Vanara.PInvoke.ComCtl32" Version="4.0.2" />
+    <PackageVersion Include="Vanara.PInvoke.ComCtl32" Version="4.0.4" />
   </ItemGroup>
 </Project>
diff --git a/src/Platforms/SecureFolderFS.Maui/App.xaml.cs b/src/Platforms/SecureFolderFS.Maui/App.xaml.cs
index 69e9c619a..4fa5aaaa5 100644
--- a/src/Platforms/SecureFolderFS.Maui/App.xaml.cs
+++ b/src/Platforms/SecureFolderFS.Maui/App.xaml.cs
@@ -33,6 +33,8 @@ public App()
 
         protected override Window CreateWindow(IActivationState? activationState)
         {
+            APES.UI.XF.ContextMenuContainer.Init();
+            
             var appShell = Task.Run(GetAppShellAsync).ConfigureAwait(false).GetAwaiter().GetResult();
             return new Window(appShell);
         }
diff --git a/src/Platforms/SecureFolderFS.Maui/AppModels/ImageStream.cs b/src/Platforms/SecureFolderFS.Maui/AppModels/ImageStream.cs
new file mode 100644
index 000000000..d80b3989a
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Maui/AppModels/ImageStream.cs
@@ -0,0 +1,25 @@
+using IImage = SecureFolderFS.Shared.ComponentModel.IImage;
+
+namespace SecureFolderFS.Maui.AppModels
+{
+    /// <inheritdoc cref="IImage"/>
+    internal sealed class ImageStream : IImage
+    {
+        private readonly Stream _stream;
+        
+        public StreamImageSource Source { get; }
+
+        public ImageStream(Stream stream)
+        {
+            _stream = stream;
+            Source = new();
+            Source.Stream = (cancellationToken) => Task.FromResult(stream);
+        }
+
+        /// <inheritdoc/>
+        public void Dispose()
+        {
+            _stream.Dispose();
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Maui/AppModels/VideoStreamServer.cs b/src/Platforms/SecureFolderFS.Maui/AppModels/VideoStreamServer.cs
new file mode 100644
index 000000000..794d66bdc
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Maui/AppModels/VideoStreamServer.cs
@@ -0,0 +1,87 @@
+using System.Net;
+using System.Net.Sockets;
+using SecureFolderFS.Shared.ComponentModel;
+
+namespace SecureFolderFS.Maui.AppModels
+{
+    internal sealed class VideoStreamServer : IAsyncInitialize, IDisposable
+    {
+        private readonly HttpListener _httpListener;
+        private readonly Stream _videoStream;
+        private readonly string _mimeType;
+        private readonly int _port;
+        private bool _disposed;
+
+        public string BaseAddress => $"http://localhost:{_port}/video";
+
+        public VideoStreamServer(Stream videoStream, string mimeType)
+        {
+            _videoStream = videoStream;
+            _mimeType = mimeType;
+
+            // Automatically find a free port
+            _port = GetAvailablePort();
+
+            // Initialize the HttpListener with the free port
+            _httpListener = new HttpListener();
+            _httpListener.Prefixes.Add($"http://localhost:{_port}/");
+        }
+
+        /// <inheritdoc/>
+        public Task InitAsync(CancellationToken cancellationToken = default)
+        {
+            _httpListener.Start();
+            _ = BeginListeningAsync();
+            
+            return Task.CompletedTask;
+
+            async Task BeginListeningAsync()
+            {
+                while (!_disposed && _httpListener.IsListening && await _httpListener.GetContextAsync() is var context)
+                {
+                    try
+                    {
+                        if (context.Request.RawUrl != "/video")
+                        {
+                            context.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                            context.Response.Close();   
+                            continue;
+                        }
+                    
+                        context.Response.StatusCode = (int)HttpStatusCode.OK;
+                        context.Response.ContentType = _mimeType;
+                        context.Response.ContentLength64 = _videoStream.Length;
+                        context.Response.Headers["Accept-Ranges"] = "bytes";
+
+                        await _videoStream.CopyToAsync(context.Response.OutputStream, 64 * 1024, cancellationToken);
+                        _videoStream.Position = 0L;
+                        break;
+                    }
+                    catch (Exception)
+                    {
+                        break;
+                    }
+                }
+            }
+        }
+
+        /// <inheritdoc/>
+        public void Dispose()
+        {
+            _disposed = true;
+            _videoStream.Dispose();
+            _httpListener.Abort();
+        }
+        
+        private static int GetAvailablePort()
+        {
+            using var listener = new TcpListener(IPAddress.Loopback, 0);
+            listener.Start();
+
+            var port = ((IPEndPoint)listener.LocalEndpoint).Port;
+            listener.Stop();
+
+            return port;
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Maui/AppShell.xaml.cs b/src/Platforms/SecureFolderFS.Maui/AppShell.xaml.cs
index da2815896..76aa8d21c 100644
--- a/src/Platforms/SecureFolderFS.Maui/AppShell.xaml.cs
+++ b/src/Platforms/SecureFolderFS.Maui/AppShell.xaml.cs
@@ -14,6 +14,7 @@ public AppShell()
             // Register routes
             Routing.RegisterRoute("LoginPage", typeof(LoginPage));
             Routing.RegisterRoute("OverviewPage", typeof(OverviewPage));
+            Routing.RegisterRoute("BrowserPage", typeof(BrowserPage));
         }
     }
 }
diff --git a/src/Platforms/SecureFolderFS.Maui/Extensions/IocExtensions.cs b/src/Platforms/SecureFolderFS.Maui/Extensions/IocExtensions.cs
index 68c69482c..e156409ce 100644
--- a/src/Platforms/SecureFolderFS.Maui/Extensions/IocExtensions.cs
+++ b/src/Platforms/SecureFolderFS.Maui/Extensions/IocExtensions.cs
@@ -13,6 +13,7 @@ public static IServiceCollection WithMauiServices(this IServiceCollection servic
         {
             return serviceCollection
                     .AddSingleton<ISettingsService, SettingsService>(_ => new(new MauiAppSettings(settingsFolder), new UserSettings(settingsFolder)))
+                    .AddSingleton<IMediaService, MauiMediaService>()
                     .AddSingleton<IOverlayService, MauiOverlayService>()
                     .AddTransient<INavigationService, MauiNavigationService>()
                     .AddSingleton<IClipboardService, MauiClipboardService>()
diff --git a/src/Platforms/SecureFolderFS.Maui/Localization/ResourceString.cs b/src/Platforms/SecureFolderFS.Maui/Localization/ResourceString.cs
index e0d69c5e8..b96c46b33 100644
--- a/src/Platforms/SecureFolderFS.Maui/Localization/ResourceString.cs
+++ b/src/Platforms/SecureFolderFS.Maui/Localization/ResourceString.cs
@@ -12,16 +12,16 @@ internal sealed class ResourceString : IMarkupExtension
         /// <summary>
         /// Gets or sets the name identifier that is associated with a resource.
         /// </summary>
-        public string? Name { get; set; }
+        public string? Rid { get; set; }
 
         /// <inheritdoc/>
         public object ProvideValue(IServiceProvider serviceProvider)
         {
             LocalizationService ??= DI.OptionalService<ILocalizationService>();
             if (LocalizationService is null)
-                return $"{{{Name}}}";
+                return $"{{{Rid}}}";
 
-            return LocalizationService.TryGetString(Name ?? string.Empty) ?? $"{{{Name}}}";
+            return LocalizationService.TryGetString(Rid ?? string.Empty) ?? $"{{{Rid}}}";
         }
     }
 }
diff --git a/src/Platforms/SecureFolderFS.Maui/MauiProgram.cs b/src/Platforms/SecureFolderFS.Maui/MauiProgram.cs
index f7d719fff..93b27c8a9 100644
--- a/src/Platforms/SecureFolderFS.Maui/MauiProgram.cs
+++ b/src/Platforms/SecureFolderFS.Maui/MauiProgram.cs
@@ -1,3 +1,4 @@
+using APES.UI.XF;
 using CommunityToolkit.Maui;
 using Microsoft.Extensions.Logging;
 using The49.Maui.BottomSheet;
@@ -25,12 +26,14 @@ public static MauiApp CreateMauiApp()
                 })
 
                 // Plugins
-                .UseMauiCommunityToolkit()      // https://github.com/CommunityToolkit/Maui
-                .UseBottomSheet()               // https://github.com/the49ltd/The49.Maui.BottomSheet
+                .UseMauiCommunityToolkitMediaElement()  // https://github.com/CommunityToolkit/Maui
+                .UseMauiCommunityToolkit()              // https://github.com/CommunityToolkit/Maui
+                .UseBottomSheet()                       // https://github.com/the49ltd/The49.Maui.BottomSheet
+                .ConfigureContextMenuContainer()        // https://github.com/anpin/ContextMenuContainer
 
 #if ANDROID
-                .UseMaterialMauiIcons()         // https://github.com/AathifMahir/MauiIcons
-                .UseMaterialComponents()        // https://github.com/mdc-maui/mdc-maui
+                .UseMaterialMauiIcons()                 // https://github.com/AathifMahir/MauiIcons
+                .UseMaterialComponents()                // https://github.com/mdc-maui/mdc-maui
 #elif IOS
                 .UseCupertinoMauiIcons()
 #endif
@@ -42,11 +45,8 @@ public static MauiApp CreateMauiApp()
                     handlers.AddHandler<ContentPageExtended, Handlers.ContentPageExHandler>();
 #endif
                 })
-                ;
-
-#if DEBUG
-            builder.Logging.AddDebug();
-#endif
+                
+                ; // Finish initialization
 
             return builder.Build();
         }
diff --git a/src/Platforms/SecureFolderFS.Maui/Platforms/Android/AndroidManifest.xml b/src/Platforms/SecureFolderFS.Maui/Platforms/Android/AndroidManifest.xml
index b31496818..19750b79f 100644
--- a/src/Platforms/SecureFolderFS.Maui/Platforms/Android/AndroidManifest.xml
+++ b/src/Platforms/SecureFolderFS.Maui/Platforms/Android/AndroidManifest.xml
@@ -1,7 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-	<application android:allowBackup="true" android:icon="@mipmap/appicon" android:supportsRtl="true"></application>
+	<application android:usesCleartextTraffic="true" android:allowBackup="true" android:icon="@mipmap/appicon" android:supportsRtl="true">
+    <service android:name="communityToolkit.maui.media.services" android:exported="false" android:enabled="true" android:foregroundServiceType="mediaPlayback">
+      <intent-filter>
+        <action android:name="android.intent.action.MEDIA_BUTTON" />
+      </intent-filter>
+      <intent-filter>
+        <action android:name="androidx.media3.session.MediaSessionService"/>
+      </intent-filter>
+    </service>
+  </application>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 	<uses-permission android:name="android.permission.INTERNET" />
+  <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+  <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+  <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
+  <uses-permission android:name="android.permission.MEDIA_CONTENT_CONTROL" />
 	<uses-sdk />
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/src/Platforms/SecureFolderFS.Maui/Platforms/Android/AppModels/AndroidFileSystemDescriptor.cs b/src/Platforms/SecureFolderFS.Maui/Platforms/Android/AppModels/AndroidFileSystemDescriptor.cs
deleted file mode 100644
index 4b7af571c..000000000
--- a/src/Platforms/SecureFolderFS.Maui/Platforms/Android/AppModels/AndroidFileSystemDescriptor.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using SecureFolderFS.Core.FileSystem.Enums;
-using SecureFolderFS.Core.MobileFS.Platforms.Android;
-using SecureFolderFS.Sdk.Models;
-using SecureFolderFS.Sdk.Results;
-using SecureFolderFS.Shared.ComponentModel;
-
-namespace SecureFolderFS.Maui.Platforms.Android.AppModels
-{
-    /// <inheritdoc cref="IFileSystemInfoModel"/>
-    internal sealed class AndroidFileSystemDescriptor : IFileSystemInfoModel
-    {
-        /// <inheritdoc/>
-        public string Name { get; } = Core.MobileFS.Constants.ANDROID_FILE_SYSTEM_NAME;
-
-        /// <inheritdoc/>
-        public string Id { get; } = Core.Constants.FileSystemId.FS_ANDROID;
-
-        /// <inheritdoc/>
-        public async Task<IResult> GetStatusAsync(CancellationToken cancellationToken = default)
-        {
-            var result = AndroidFileSystemMountable.IsSupported();
-            if (result == FileSystemAvailabilityType.Available)
-                return new FileSystemResult(OperatingSystem.IsAndroid(), true);
-
-            var message = result switch
-            {
-                // TODO: Handle more cases
-                _ => "DocumentsProvider is not available.",
-            };
-
-            await Task.CompletedTask;
-            return new FileSystemResult(OperatingSystem.IsAndroid(), new NotSupportedException(message));
-        }
-    }
-}
diff --git a/src/Platforms/SecureFolderFS.Maui/Platforms/Android/Helpers/AndroidLifecycleHelper.cs b/src/Platforms/SecureFolderFS.Maui/Platforms/Android/Helpers/AndroidLifecycleHelper.cs
index 3372ddf7a..6d111f2fa 100644
--- a/src/Platforms/SecureFolderFS.Maui/Platforms/Android/Helpers/AndroidLifecycleHelper.cs
+++ b/src/Platforms/SecureFolderFS.Maui/Platforms/Android/Helpers/AndroidLifecycleHelper.cs
@@ -17,15 +17,14 @@ internal sealed class AndroidLifecycleHelper : BaseLifecycleHelper
         protected override string AppDirectory { get; } = Microsoft.Maui.Storage.FileSystem.Current.AppDataDirectory;
 
         /// <inheritdoc/>
-        public override async Task InitAsync(CancellationToken cancellationToken = default)
+        public override Task InitAsync(CancellationToken cancellationToken = default)
         {
-            // Request permissions
-            //await RequestPermissionsAsync<Permissions.StorageWrite>();
-
             // Initialize settings
             var settingsFolderPath = Path.Combine(AppDirectory, SecureFolderFS.UI.Constants.FileNames.SETTINGS_FOLDER_NAME);
             var settingsFolder = new SystemFolder(Directory.CreateDirectory(settingsFolderPath));
             ConfigureServices(settingsFolder);
+
+            return Task.CompletedTask;
         }
 
         /// <inheritdoc/>
@@ -40,8 +39,9 @@ protected override IServiceCollection ConfigureServices(IModifiableFolder settin
             return base.ConfigureServices(settingsFolder)
                     //.AddSingleton<IPrinterService, WindowsPrinterService>()
                     .AddSingleton<IApplicationService, AndroidApplicationService>()
-                    .AddSingleton<IVaultService, AndroidVaultService>()
-                    .AddSingleton<IVaultManagerService, AndroidVaultManagerService>()
+                    .AddSingleton<ISystemService, AndroidSystemService>()
+                    .AddSingleton<IVaultCredentialsService, AndroidVaultCredentialsService>()
+                    .AddSingleton<IVaultFileSystemService, AndroidVaultFileSystemService>()
                     .AddSingleton<IStorageService, AndroidStorageService>()
                     .AddSingleton<IFileExplorerService, AndroidFileExplorerService>()
                     .AddSingleton<ITelemetryService, DebugTelemetryService>()
diff --git a/src/Platforms/SecureFolderFS.Maui/Platforms/Android/MainActivity.cs b/src/Platforms/SecureFolderFS.Maui/Platforms/Android/MainActivity.cs
index c97244369..f55b81860 100644
--- a/src/Platforms/SecureFolderFS.Maui/Platforms/Android/MainActivity.cs
+++ b/src/Platforms/SecureFolderFS.Maui/Platforms/Android/MainActivity.cs
@@ -4,7 +4,13 @@
 
 namespace SecureFolderFS.Maui
 {
-    [Activity(Theme = "@style/Maui.SplashTheme", Exported = true, MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode | ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize | ConfigChanges.Density)]
+    [Activity(
+        Theme = "@style/Maui.SplashTheme",
+        Exported = true,
+        MainLauncher = true,
+        ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode | ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize | ConfigChanges.Density,
+        ResizeableActivity = true,
+        LaunchMode = LaunchMode.SingleTask)]
     public class MainActivity : MauiAppCompatActivity
     {
         public static MainActivity? Instance { get; private set; }
diff --git a/src/Platforms/SecureFolderFS.Maui/Platforms/Android/ServiceImplementation/AndroidFileExplorerService.cs b/src/Platforms/SecureFolderFS.Maui/Platforms/Android/ServiceImplementation/AndroidFileExplorerService.cs
index ca4c77e88..00506ff75 100644
--- a/src/Platforms/SecureFolderFS.Maui/Platforms/Android/ServiceImplementation/AndroidFileExplorerService.cs
+++ b/src/Platforms/SecureFolderFS.Maui/Platforms/Android/ServiceImplementation/AndroidFileExplorerService.cs
@@ -32,7 +32,7 @@ public async Task<bool> SaveFileAsync(string suggestedName, Stream dataStream, I
         }
 
         /// <inheritdoc/>
-        public async Task<IFile?> PickFileAsync(IEnumerable<string>? filter, CancellationToken cancellationToken = default)
+        public async Task<IFile?> PickFileAsync(IEnumerable<string>? filter, bool persist = true, CancellationToken cancellationToken = default)
         {
             var intent = new Intent(Intent.ActionOpenDocument)
                 .AddCategory(Intent.CategoryOpenable)
@@ -47,13 +47,14 @@ public async Task<bool> SaveFileAsync(string suggestedName, Stream dataStream, I
                 return null;
 
             var file = new AndroidFile(result, MainActivity.Instance);
-            await file.AddBookmarkAsync(cancellationToken);
+            if (persist)
+                await file.AddBookmarkAsync(cancellationToken);
 
             return file;
         }
 
         /// <inheritdoc/>
-        public async Task<IFolder?> PickFolderAsync(CancellationToken cancellationToken = default)
+        public async Task<IFolder?> PickFolderAsync(bool persist = true, CancellationToken cancellationToken = default)
         {
             var initialPath = AndroidPathExtensions.GetExternalDirectory();
             if (AOSEnvironment.ExternalStorageDirectory is not null)
@@ -63,8 +64,11 @@ public async Task<bool> SaveFileAsync(string suggestedName, Stream dataStream, I
             var intent = new Intent(Intent.ActionOpenDocumentTree);
 
             intent.PutExtra(DocumentsContract.ExtraInitialUri, initialFolderUri);
-            intent.AddFlags(ActivityFlags.GrantReadUriPermission);
-            intent.AddFlags(ActivityFlags.GrantWriteUriPermission);
+            if (persist)
+            {
+                intent.AddFlags(ActivityFlags.GrantReadUriPermission);
+                intent.AddFlags(ActivityFlags.GrantWriteUriPermission);
+            }
 
             // RequestCodeFolderPicker 0x000007D0
             var result = await StartActivityAsync(intent, 0x000007D0);
@@ -72,7 +76,8 @@ public async Task<bool> SaveFileAsync(string suggestedName, Stream dataStream, I
                 return null;
 
             var folder = new AndroidFolder(result, MainActivity.Instance);
-            await folder.AddBookmarkAsync(cancellationToken);
+            if (persist)
+                await folder.AddBookmarkAsync(cancellationToken);
 
             return folder;
         }
diff --git a/src/Platforms/SecureFolderFS.Maui/Platforms/Android/ServiceImplementation/AndroidSystemService.cs b/src/Platforms/SecureFolderFS.Maui/Platforms/Android/ServiceImplementation/AndroidSystemService.cs
new file mode 100644
index 000000000..0b71db01b
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Maui/Platforms/Android/ServiceImplementation/AndroidSystemService.cs
@@ -0,0 +1,13 @@
+using SecureFolderFS.Sdk.Services;
+
+namespace SecureFolderFS.Maui.Platforms.Android.ServiceImplementation
+{
+    /// <inheritdoc cref="ISystemService"/>
+    internal sealed class AndroidSystemService : ISystemService
+    {
+        // TODO: Use BroadcastReceiver - ActionScreenOff, ActionUserPresent
+        
+        /// <inheritdoc/>
+        public event EventHandler? DesktopLocked;
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Maui/Platforms/Android/ServiceImplementation/AndroidVaultService.cs b/src/Platforms/SecureFolderFS.Maui/Platforms/Android/ServiceImplementation/AndroidVaultCredentialsService.cs
similarity index 82%
rename from src/Platforms/SecureFolderFS.Maui/Platforms/Android/ServiceImplementation/AndroidVaultService.cs
rename to src/Platforms/SecureFolderFS.Maui/Platforms/Android/ServiceImplementation/AndroidVaultCredentialsService.cs
index 227fc2aa8..89360c239 100644
--- a/src/Platforms/SecureFolderFS.Maui/Platforms/Android/ServiceImplementation/AndroidVaultService.cs
+++ b/src/Platforms/SecureFolderFS.Maui/Platforms/Android/ServiceImplementation/AndroidVaultCredentialsService.cs
@@ -1,25 +1,18 @@
 using System.Runtime.CompilerServices;
 using OwlCore.Storage;
+using SecureFolderFS.Core.Cryptography;
 using SecureFolderFS.Core.VaultAccess;
-using SecureFolderFS.Maui.Platforms.Android.AppModels;
-using SecureFolderFS.Sdk.AppModels;
-using SecureFolderFS.Sdk.Models;
 using SecureFolderFS.Sdk.Services;
 using SecureFolderFS.Sdk.ViewModels.Controls.Authentication;
+using SecureFolderFS.Shared.Models;
 using SecureFolderFS.UI.ServiceImplementation;
-using SecureFolderFS.UI.ViewModels;
+using SecureFolderFS.UI.ViewModels.Authentication;
 
 namespace SecureFolderFS.Maui.Platforms.Android.ServiceImplementation
 {
     /// <inheritdoc cref="IVaultService"/>
-    internal sealed class AndroidVaultService : BaseVaultService
+    internal sealed class AndroidVaultCredentialsService : BaseVaultCredentialsService
     {
-        /// <inheritdoc/>
-        public override IEnumerable<IFileSystemInfoModel> GetFileSystems()
-        {
-            yield return new AndroidFileSystemDescriptor();
-        }
-
         /// <inheritdoc/>
         public override IEnumerable<string> GetContentCiphers()
         {
@@ -28,7 +21,7 @@ public override IEnumerable<string> GetContentCiphers()
             // - https://github.com/ektrah/nsec/issues/81
             // - https://nsec.rocks/docs/install#supported-platforms
 
-            yield return Core.Cryptography.Constants.CipherId.AES_GCM;
+            yield return Constants.CipherId.AES_GCM;
         }
 
         /// <inheritdoc/>
diff --git a/src/Platforms/SecureFolderFS.Maui/Platforms/Android/ServiceImplementation/AndroidVaultFileSystemService.cs b/src/Platforms/SecureFolderFS.Maui/Platforms/Android/ServiceImplementation/AndroidVaultFileSystemService.cs
new file mode 100644
index 000000000..4374275fa
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Maui/Platforms/Android/ServiceImplementation/AndroidVaultFileSystemService.cs
@@ -0,0 +1,19 @@
+using System.Runtime.CompilerServices;
+using SecureFolderFS.Core.MobileFS.Platforms.Android;
+using SecureFolderFS.Sdk.Services;
+using SecureFolderFS.UI.ServiceImplementation;
+using IFileSystem = SecureFolderFS.Storage.VirtualFileSystem.IFileSystem;
+
+namespace SecureFolderFS.Maui.Platforms.Android.ServiceImplementation
+{
+    /// <inheritdoc cref="IVaultFileSystemService"/>
+    internal sealed class AndroidVaultFileSystemService : BaseVaultFileSystemService
+    {
+        /// <inheritdoc/>
+        public override async IAsyncEnumerable<IFileSystem> GetFileSystemsAsync([EnumeratorCancellation] CancellationToken cancellationToken)
+        {
+            await Task.CompletedTask;
+            yield return new AndroidFileSystem();
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Maui/Platforms/Android/ServiceImplementation/AndroidVaultManagerService.cs b/src/Platforms/SecureFolderFS.Maui/Platforms/Android/ServiceImplementation/AndroidVaultManagerService.cs
deleted file mode 100644
index 27ec84ace..000000000
--- a/src/Platforms/SecureFolderFS.Maui/Platforms/Android/ServiceImplementation/AndroidVaultManagerService.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using SecureFolderFS.Core.FileSystem.AppModels;
-using SecureFolderFS.Core.MobileFS.Platforms.Android;
-using SecureFolderFS.Core.Routines.Operational;
-using SecureFolderFS.Sdk.AppModels;
-using SecureFolderFS.Sdk.Models;
-using SecureFolderFS.Sdk.Services;
-using SecureFolderFS.Storage.Extensions;
-using SecureFolderFS.Storage.VirtualFileSystem;
-using SecureFolderFS.UI.Helpers;
-using SecureFolderFS.UI.ServiceImplementation;
-
-namespace SecureFolderFS.Maui.Platforms.Android.ServiceImplementation
-{
-    /// <inheritdoc cref="IVaultManagerService"/>
-    internal sealed class AndroidVaultManagerService : BaseVaultManagerService
-    {
-        /// <inheritdoc/>
-        public override async Task<IVFSRoot> CreateFileSystemAsync(IVaultModel vaultModel, IDisposable unlockContract, CancellationToken cancellationToken)
-        {
-            try
-            {
-                var contentFolder = await vaultModel.Folder.GetFolderByNameAsync(Core.Constants.Vault.Names.VAULT_CONTENT_FOLDERNAME, cancellationToken);
-                var routines = await VaultRoutines.CreateRoutinesAsync(vaultModel.Folder, StreamSerializer.Instance, cancellationToken);
-                var statisticsModel = new ConsolidatedStatisticsModel();
-                var storageRoutine = routines.BuildStorage();
-                var options = new FileSystemOptions()
-                {
-                    VolumeName = vaultModel.VaultName, // TODO: Format name to exclude illegal characters
-                    FileSystemId = await VaultHelpers.GetBestFileSystemAsync(cancellationToken),
-                    HealthStatistics = statisticsModel,
-                    FileSystemStatistics = statisticsModel
-                };
-
-                storageRoutine.SetUnlockContract(unlockContract);
-                var specifics = storageRoutine.GetSpecifics(contentFolder, options);
-                var mountable = options.FileSystemId switch
-                {
-                    Core.Constants.FileSystemId.FS_ANDROID => AndroidFileSystemMountable.CreateMountable(specifics),
-                    _ => throw new ArgumentOutOfRangeException(nameof(options.FileSystemId))
-                };
-
-                return await mountable.MountAsync(options.FileSystemId switch
-                {
-                    Core.Constants.FileSystemId.FS_ANDROID => new AndroidMountOptions(),
-                    _ => throw new ArgumentOutOfRangeException(nameof(options.FileSystemId))
-                }, cancellationToken);
-            }
-            catch (Exception ex)
-            {
-                // Make sure to dispose the unlock contract when failed
-                unlockContract.Dispose();
-
-                _ = ex;
-                throw;
-            }
-        }
-    }
-}
diff --git a/src/Platforms/SecureFolderFS.Maui/Platforms/Android/Storage/AndroidFile.cs b/src/Platforms/SecureFolderFS.Maui/Platforms/Android/Storage/AndroidFile.cs
index 29e4e7b8a..2d06088bf 100644
--- a/src/Platforms/SecureFolderFS.Maui/Platforms/Android/Storage/AndroidFile.cs
+++ b/src/Platforms/SecureFolderFS.Maui/Platforms/Android/Storage/AndroidFile.cs
@@ -1,8 +1,12 @@
 using Android.App;
 using Android.Content;
 using Android.Provider;
+using Android.Runtime;
 using AndroidX.DocumentFile.Provider;
 using OwlCore.Storage;
+using SecureFolderFS.Core.MobileFS.Platforms.Android.Streams;
+using SecureFolderFS.Maui.Platforms.Android.Storage.StorageProperties;
+using SecureFolderFS.Storage.StorageProperties;
 using AndroidUri = Android.Net.Uri;
 
 namespace SecureFolderFS.Maui.Platforms.Android.Storage
@@ -11,12 +15,16 @@ namespace SecureFolderFS.Maui.Platforms.Android.Storage
     internal sealed class AndroidFile : AndroidStorable, IChildFile
     {
         /// <inheritdoc/>
-        protected override DocumentFile? Document { get; }
+        public override string Name { get; }
+
+        /// <inheritdoc/>
+        public override DocumentFile? Document { get; }
 
         public AndroidFile(AndroidUri uri, Activity activity, AndroidFolder? parent = null, AndroidUri? permissionRoot = null, string? bookmarkId = null)
             : base(uri, activity, parent, permissionRoot, bookmarkId)
         {
             Document = DocumentFile.FromSingleUri(activity, uri);
+            Name = Document?.Name ?? base.Name;
         }
 
         /// <inheritdoc/>
@@ -32,15 +40,36 @@ public Task<Stream> OpenStreamAsync(FileAccess accessMode, CancellationToken can
                 return Task.FromResult(stream);
             }
 
-            stream = accessMode == FileAccess.Read
-                ? activity.ContentResolver?.OpenInputStream(Inner)
-                : activity.ContentResolver?.OpenOutputStream(Inner);
+            if (accessMode == FileAccess.Read)
+            {
+                stream = activity.ContentResolver?.OpenInputStream(Inner);
+            }
+            else
+            {
+                var inputStream = (activity.ContentResolver?.OpenInputStream(Inner) as InputStreamInvoker)?.BaseInputStream;
+                var outputStream = (activity.ContentResolver?.OpenOutputStream(Inner) as OutputStreamInvoker)?.BaseOutputStream;
+                if (inputStream is null || outputStream is null)
+                    return Task.FromException<Stream>(new UnauthorizedAccessException($"Could not open a stream to: '{Id}'."));
 
+                var combinedInputStream = new InputOutputStream(inputStream, outputStream, GetFileSize(activity.ContentResolver, Inner));
+                stream = combinedInputStream;
+            }
+            
             if (stream is null)
                 return Task.FromException<Stream>(new UnauthorizedAccessException($"Could not open a stream to: '{Id}'."));
 
             return Task.FromResult(stream);
         }
+        
+        /// <inheritdoc/>
+        public override Task<IBasicProperties> GetPropertiesAsync()
+        {
+            if (Document is null)
+                return Task.FromException<IBasicProperties>(new ArgumentNullException(nameof(Document)));
+
+            properties ??= new AndroidFileProperties(Document);
+            return Task.FromResult(properties);
+        }
 
         private static bool IsVirtualFile(Context context, AndroidUri uri)
         {
@@ -76,5 +105,32 @@ private static bool IsVirtualFile(Context context, AndroidUri uri)
 
             return null;
         }
+        
+        private static long GetFileSize(ContentResolver? contentResolver, AndroidUri uri)
+        {
+            if (contentResolver is null)
+                return 0L;
+            
+            try
+            {
+                // Try to get file size using content resolver
+                using var cursor = contentResolver.Query(uri, null, null, null, null);
+                if (cursor != null && cursor.MoveToFirst())
+                {
+                    int sizeIndex = cursor.GetColumnIndex(IOpenableColumns.Size);
+                    if (sizeIndex != -1)
+                    {
+                        return cursor.GetLong(sizeIndex);
+                    }
+                }
+            }
+            catch
+            {
+                // Fallback method if content resolver fails
+            }
+
+            // If size can't be determined, return -1
+            return -1;
+        }
     }
 }
diff --git a/src/Platforms/SecureFolderFS.Maui/Platforms/Android/Storage/AndroidFolder.cs b/src/Platforms/SecureFolderFS.Maui/Platforms/Android/Storage/AndroidFolder.cs
index c515fe766..eb88cd176 100644
--- a/src/Platforms/SecureFolderFS.Maui/Platforms/Android/Storage/AndroidFolder.cs
+++ b/src/Platforms/SecureFolderFS.Maui/Platforms/Android/Storage/AndroidFolder.cs
@@ -2,22 +2,65 @@
 using Android.Provider;
 using Android.Webkit;
 using AndroidX.DocumentFile.Provider;
+using AndroidX.Navigation;
 using OwlCore.Storage;
+using SecureFolderFS.Maui.Platforms.Android.Storage.StorageProperties;
+using SecureFolderFS.Storage.Renamable;
+using SecureFolderFS.Storage.StorageProperties;
 using Activity = Android.App.Activity;
 using AndroidUri = Android.Net.Uri;
 
 namespace SecureFolderFS.Maui.Platforms.Android.Storage
 {
     /// <inheritdoc cref="IChildFolder"/>
-    internal sealed class AndroidFolder : AndroidStorable, IModifiableFolder, IChildFolder, IGetFirstByName // TODO: Implement: IGetFirstByName, IGetItem
+    internal sealed class AndroidFolder : AndroidStorable, IModifiableFolder, IChildFolder, IGetFirstByName, IRenamableFolder // TODO: Implement: IGetFirstByName, IGetItem
     {
+        private static Exception RenameException { get; } = new IOException("Could not rename the item.");
+        
         /// <inheritdoc/>
-        protected override DocumentFile? Document { get; }
+        public override string Name { get; }
+        
+        /// <inheritdoc/>
+        public override DocumentFile? Document { get; }
 
         public AndroidFolder(AndroidUri uri, Activity activity, AndroidFolder? parent = null, AndroidUri? permissionRoot = null, string? bookmarkId = null)
             : base(uri, activity, parent, permissionRoot, bookmarkId)
         {
             Document = DocumentFile.FromTreeUri(activity, uri);
+            Name = Document?.Name ?? base.Name;
+        }
+
+        /// <inheritdoc/>
+        public Task<IStorableChild> RenameAsync(IStorableChild storable, string newName, CancellationToken cancellationToken = default)
+        {
+            switch (storable)
+            {
+                case AndroidFolder folder:
+                {
+                    if (activity.ContentResolver is null)
+                        return Task.FromException<IStorableChild>(RenameException);
+
+                    var uri = DocumentsContract.RenameDocument(activity.ContentResolver, folder.Inner, newName);
+                    if (uri is null)
+                        return Task.FromException<IStorableChild>(RenameException);
+
+                    return Task.FromResult<IStorableChild>(new AndroidFolder(uri, activity, parent, permissionRoot));
+                }
+
+                case AndroidFile file:
+                {
+                    if (activity.ContentResolver is null)
+                        return Task.FromException<IStorableChild>(RenameException);
+
+                    var uri = DocumentsContract.RenameDocument(activity.ContentResolver, file.Inner, newName);
+                    if (uri is null)
+                        return Task.FromException<IStorableChild>(RenameException);
+
+                    return Task.FromResult<IStorableChild>(new AndroidFile(uri, activity, parent, permissionRoot));
+                }
+
+                default: return Task.FromException<IStorableChild>(new ArgumentOutOfRangeException(nameof(storable)));
+            }
         }
 
         /// <inheritdoc/>
@@ -139,9 +182,19 @@ public async Task<IStorableChild> GetFirstByNameAsync(string name, CancellationT
                 .ConfigureAwait(false);
 
             if (target is null)
-                throw new DirectoryNotFoundException($"No storage item with the name '{name}' could be found.");
+                throw new FileNotFoundException($"No storage item with the name '{name}' could be found.");
 
             return target;
         }
+        
+        /// <inheritdoc/>
+        public override Task<IBasicProperties> GetPropertiesAsync()
+        {
+            if (Document is null)
+                return Task.FromException<IBasicProperties>(new ArgumentNullException(nameof(Document)));
+
+            properties ??= new AndroidFileProperties(Document);
+            return Task.FromResult(properties);
+        }
     }
 }
diff --git a/src/Platforms/SecureFolderFS.Maui/Platforms/Android/Storage/AndroidStorable.cs b/src/Platforms/SecureFolderFS.Maui/Platforms/Android/Storage/AndroidStorable.cs
index b30ff8722..3e37cad66 100644
--- a/src/Platforms/SecureFolderFS.Maui/Platforms/Android/Storage/AndroidStorable.cs
+++ b/src/Platforms/SecureFolderFS.Maui/Platforms/Android/Storage/AndroidStorable.cs
@@ -1,21 +1,23 @@
+using System.Diagnostics;
 using Android.Content;
-using Android.Provider;
 using AndroidX.DocumentFile.Provider;
-using CommunityToolkit.Maui.Core.Extensions;
 using OwlCore.Storage;
 using SecureFolderFS.Shared.ComponentModel;
 using SecureFolderFS.Storage;
+using SecureFolderFS.Storage.StorageProperties;
+using SecureFolderFS.UI;
 using Activity = Android.App.Activity;
 using AndroidUri = Android.Net.Uri;
 
 namespace SecureFolderFS.Maui.Platforms.Android.Storage
 {
     /// <inheritdoc cref="IStorableChild"/>
-    internal abstract class AndroidStorable : IStorableChild, IBookmark, IWrapper<AndroidUri>
+    internal abstract class AndroidStorable : IStorableChild, IStorableProperties, IBookmark, IWrapper<AndroidUri>
     {
         protected readonly Activity activity;
         protected readonly AndroidFolder? parent;
         protected readonly AndroidUri permissionRoot;
+        protected IBasicProperties? properties;
 
         /// <inheritdoc/>
         public AndroidUri Inner { get; }
@@ -32,7 +34,7 @@ internal abstract class AndroidStorable : IStorableChild, IBookmark, IWrapper<An
         /// <summary>
         /// Gets the <see cref="DocumentFile"/> associated with the storage type identified by <see cref="AndroidUri"/>.
         /// </summary>
-        protected abstract DocumentFile? Document { get; }
+        public abstract DocumentFile? Document { get; }
 
         protected AndroidStorable(AndroidUri uri, Activity activity, AndroidFolder? parent = null, AndroidUri? permissionRoot = null, string? bookmarkId = null)
         {
@@ -60,7 +62,7 @@ public Task AddBookmarkAsync(CancellationToken cancellationToken = default)
                 activity.ContentResolver?.TakePersistableUriPermission(Inner,
                     ActivityFlags.GrantWriteUriPermission | ActivityFlags.GrantReadUriPermission);
 
-                BookmarkId = $"{UI.Constants.STORABLE_BOOKMARK_RID}{Id}";
+                BookmarkId = $"{Constants.STORABLE_BOOKMARK_RID}{Id}";
             }
             catch (Exception ex)
             {
@@ -87,6 +89,9 @@ public Task RemoveBookmarkAsync(CancellationToken cancellationToken = default)
 
             return Task.CompletedTask;
         }
+        
+        /// <inheritdoc/>
+        public abstract Task<IBasicProperties> GetPropertiesAsync();
 
         protected static string? GetColumnValue(Context context, AndroidUri contentUri, string column, string? selection = null, string[]? selectionArgs = null)
         {
@@ -104,7 +109,7 @@ public Task RemoveBookmarkAsync(CancellationToken cancellationToken = default)
             catch (Exception ex)
             {
                 _ = ex;
-                System.Diagnostics.Debugger.Break();
+                Debugger.Break();
             }
 
             return null;
diff --git a/src/Platforms/SecureFolderFS.Maui/Platforms/Android/Storage/StorageProperties/AndroidFileProperties.cs b/src/Platforms/SecureFolderFS.Maui/Platforms/Android/Storage/StorageProperties/AndroidFileProperties.cs
new file mode 100644
index 000000000..4f145d407
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Maui/Platforms/Android/Storage/StorageProperties/AndroidFileProperties.cs
@@ -0,0 +1,32 @@
+using System.Runtime.CompilerServices;
+using AndroidX.DocumentFile.Provider;
+using OwlCore.Storage;
+using SecureFolderFS.Storage.StorageProperties;
+
+namespace SecureFolderFS.Maui.Platforms.Android.Storage.StorageProperties
+{
+    /// <inheritdoc cref="IBasicProperties"/>
+    internal sealed class AndroidFileProperties : ISizeProperties, IBasicProperties
+    {
+        private readonly DocumentFile _document;
+
+        public AndroidFileProperties(DocumentFile document)
+        {
+            _document = document;
+        }
+
+        /// <inheritdoc/>
+        public Task<IStorageProperty<long>?> GetSizeAsync(CancellationToken cancellationToken = default)
+        {
+            var sizeProperty = new GenericProperty<long>(_document.Length());
+            return Task.FromResult<IStorageProperty<long>>(sizeProperty);
+        }
+
+        /// <inheritdoc/>
+        public async IAsyncEnumerable<IStorageProperty<object>> GetPropertiesAsync([EnumeratorCancellation] CancellationToken cancellationToken = default)
+        {
+            yield return await GetSizeAsync(cancellationToken) as IStorageProperty<object>;
+        }
+    }
+}
+
diff --git a/src/Platforms/SecureFolderFS.Maui/Platforms/Android/Storage/StorageProperties/AndroidFolderProperties.cs b/src/Platforms/SecureFolderFS.Maui/Platforms/Android/Storage/StorageProperties/AndroidFolderProperties.cs
new file mode 100644
index 000000000..329c1069f
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Maui/Platforms/Android/Storage/StorageProperties/AndroidFolderProperties.cs
@@ -0,0 +1,32 @@
+using System.Runtime.CompilerServices;
+using AndroidX.DocumentFile.Provider;
+using OwlCore.Storage;
+using SecureFolderFS.Storage.StorageProperties;
+
+namespace SecureFolderFS.Maui.Platforms.Android.Storage.StorageProperties
+{
+    /// <inheritdoc cref="IBasicProperties"/>
+    internal sealed class AndroidFolderProperties : ISizeProperties, IBasicProperties
+    {
+        private readonly DocumentFile _document;
+
+        public AndroidFolderProperties(DocumentFile document)
+        {
+            _document = document;
+        }
+
+        /// <inheritdoc/>
+        public Task<IStorageProperty<long>?> GetSizeAsync(CancellationToken cancellationToken = default)
+        {
+            var sizeProperty = new GenericProperty<long>(_document.Length());
+            return Task.FromResult<IStorageProperty<long>>(sizeProperty);
+        }
+
+        /// <inheritdoc/>
+        public async IAsyncEnumerable<IStorageProperty<object>> GetPropertiesAsync([EnumeratorCancellation] CancellationToken cancellationToken = default)
+        {
+            yield return await GetSizeAsync(cancellationToken) as IStorageProperty<object>;
+        }
+    }
+}
+
diff --git a/src/Platforms/SecureFolderFS.Maui/Platforms/iOS/AppModels/IOSFileSystemDescriptor.cs b/src/Platforms/SecureFolderFS.Maui/Platforms/iOS/AppModels/IOSFileSystemDescriptor.cs
deleted file mode 100644
index 0a63ff72e..000000000
--- a/src/Platforms/SecureFolderFS.Maui/Platforms/iOS/AppModels/IOSFileSystemDescriptor.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using SecureFolderFS.Core.FileSystem.Enums;
-using SecureFolderFS.Core.MobileFS;
-using SecureFolderFS.Core.MobileFS.Platforms.iOS;
-using SecureFolderFS.Sdk.Models;
-using SecureFolderFS.Sdk.Results;
-using SecureFolderFS.Shared.ComponentModel;
-
-namespace SecureFolderFS.Maui.AppModels
-{
-    /// <inheritdoc cref="IFileSystemInfoModel"/>
-    internal sealed class IOSFileSystemDescriptor : IFileSystemInfoModel
-    {
-        /// <inheritdoc/>
-        public string Name { get; } = Constants.ANDROID_FILE_SYSTEM_NAME;
-
-        /// <inheritdoc/>
-        public string Id { get; } = Core.Constants.FileSystemId.FS_ANDROID;
-
-        /// <inheritdoc/>
-        public async Task<IResult> GetStatusAsync(CancellationToken cancellationToken = default)
-        {
-            var result = IOSFileSystemMountable.IsSupported();
-            if (result == FileSystemAvailabilityType.Available)
-                return new FileSystemResult(OperatingSystem.IsAndroid(), true);
-
-            await Task.CompletedTask;
-            return new FileSystemResult(OperatingSystem.IsAndroid(), new NotSupportedException("DocumentsProvider is not available."));
-        }
-    }
-}
diff --git a/src/Platforms/SecureFolderFS.Maui/Platforms/iOS/Entitlements.plist b/src/Platforms/SecureFolderFS.Maui/Platforms/iOS/Entitlements.plist
index 4f0f214ce..00dd79dc0 100644
--- a/src/Platforms/SecureFolderFS.Maui/Platforms/iOS/Entitlements.plist
+++ b/src/Platforms/SecureFolderFS.Maui/Platforms/iOS/Entitlements.plist
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-    <dict>
-    </dict>
-</plist>
\ No newline at end of file
+	<dict>
+	</dict>
+</plist>
diff --git a/src/Platforms/SecureFolderFS.Maui/Platforms/iOS/Helpers/IOSLifecycleHelper.cs b/src/Platforms/SecureFolderFS.Maui/Platforms/iOS/Helpers/IOSLifecycleHelper.cs
index fadf315f0..b5306b392 100644
--- a/src/Platforms/SecureFolderFS.Maui/Platforms/iOS/Helpers/IOSLifecycleHelper.cs
+++ b/src/Platforms/SecureFolderFS.Maui/Platforms/iOS/Helpers/IOSLifecycleHelper.cs
@@ -37,8 +37,9 @@ protected override IServiceCollection ConfigureServices(IModifiableFolder settin
             return base.ConfigureServices(settingsFolder)
                     //.AddSingleton<IPrinterService, WindowsPrinterService>()
                     .AddSingleton<IApplicationService, IOSApplicationService>()
-                    .AddSingleton<IVaultService, IOSVaultService>()
-                    .AddSingleton<IVaultManagerService, IOSVaultManagerService>()
+                    .AddSingleton<ISystemService, IOSSystemService>()
+                    .AddSingleton<IVaultCredentialsService, IOSVaultCredentialsService>()
+                    .AddSingleton<IVaultFileSystemService, IOSVaultFileSystemService>()
                     .AddSingleton<IStorageService, IOSStorageService>()
                     .AddSingleton<IFileExplorerService, IOSFileExplorerService>()
                     .AddSingleton<ITelemetryService, DebugTelemetryService>()
diff --git a/src/Platforms/SecureFolderFS.Maui/Platforms/iOS/ServiceImplementation/IOSSystemService.cs b/src/Platforms/SecureFolderFS.Maui/Platforms/iOS/ServiceImplementation/IOSSystemService.cs
new file mode 100644
index 000000000..aa18d08d3
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Maui/Platforms/iOS/ServiceImplementation/IOSSystemService.cs
@@ -0,0 +1,11 @@
+using SecureFolderFS.Sdk.Services;
+
+namespace SecureFolderFS.Maui.Platforms.iOS.ServiceImplementation
+{
+    /// <inheritdoc cref="ISystemService"/>
+    internal sealed class IOSSystemService : ISystemService
+    {
+        /// <inheritdoc/>
+        public event EventHandler? DesktopLocked;
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Maui/Platforms/iOS/ServiceImplementation/IOSVaultService.cs b/src/Platforms/SecureFolderFS.Maui/Platforms/iOS/ServiceImplementation/IOSVaultCredentialsService.cs
similarity index 84%
rename from src/Platforms/SecureFolderFS.Maui/Platforms/iOS/ServiceImplementation/IOSVaultService.cs
rename to src/Platforms/SecureFolderFS.Maui/Platforms/iOS/ServiceImplementation/IOSVaultCredentialsService.cs
index 97e0cd81f..cd0347886 100644
--- a/src/Platforms/SecureFolderFS.Maui/Platforms/iOS/ServiceImplementation/IOSVaultService.cs
+++ b/src/Platforms/SecureFolderFS.Maui/Platforms/iOS/ServiceImplementation/IOSVaultCredentialsService.cs
@@ -1,9 +1,7 @@
 using System.Runtime.CompilerServices;
 using OwlCore.Storage;
 using SecureFolderFS.Core.VaultAccess;
-using SecureFolderFS.Maui.AppModels;
 using SecureFolderFS.Sdk.AppModels;
-using SecureFolderFS.Sdk.Models;
 using SecureFolderFS.Sdk.Services;
 using SecureFolderFS.Sdk.ViewModels.Controls.Authentication;
 using SecureFolderFS.UI.ServiceImplementation;
@@ -11,15 +9,9 @@
 
 namespace SecureFolderFS.Maui.Platforms.iOS.ServiceImplementation
 {
-    /// <inheritdoc cref="IVaultService"/>
-    internal sealed class IOSVaultService : BaseVaultService
+    /// <inheritdoc cref="IVaultCredentialsService"/>
+    internal sealed class IOSVaultCredentialsService : BaseVaultCredentialsService
     {
-        /// <inheritdoc/>
-        public override IEnumerable<IFileSystemInfoModel> GetFileSystems()
-        {
-            yield return new IOSFileSystemDescriptor();
-        }
-
         /// <inheritdoc/>
         public override async IAsyncEnumerable<AuthenticationViewModel> GetLoginAsync(IFolder vaultFolder, [EnumeratorCancellation] CancellationToken cancellationToken = default)
         {
diff --git a/src/Platforms/SecureFolderFS.Maui/Platforms/iOS/ServiceImplementation/IOSVaultFileSystemService.cs b/src/Platforms/SecureFolderFS.Maui/Platforms/iOS/ServiceImplementation/IOSVaultFileSystemService.cs
new file mode 100644
index 000000000..a9eaf65fd
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Maui/Platforms/iOS/ServiceImplementation/IOSVaultFileSystemService.cs
@@ -0,0 +1,19 @@
+using System.Runtime.CompilerServices;
+using SecureFolderFS.Core.MobileFS.Platforms.iOS;
+using SecureFolderFS.Sdk.Services;
+using SecureFolderFS.UI.ServiceImplementation;
+using IFileSystem = SecureFolderFS.Storage.VirtualFileSystem.IFileSystem;
+
+namespace SecureFolderFS.Maui.Platforms.iOS.ServiceImplementation
+{
+    /// <inheritdoc cref="IVaultFileSystemService"/>
+    internal sealed class IOSVaultFileSystemService : BaseVaultFileSystemService
+    {
+        /// <inheritdoc/>
+        public override async IAsyncEnumerable<IFileSystem> GetFileSystemsAsync([EnumeratorCancellation] CancellationToken cancellationToken)
+        {
+            await Task.CompletedTask;
+            yield return new IOSFileSystem();
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Maui/Platforms/iOS/ServiceImplementation/IOSVaultManagerService.cs b/src/Platforms/SecureFolderFS.Maui/Platforms/iOS/ServiceImplementation/IOSVaultManagerService.cs
deleted file mode 100644
index f8ad68e18..000000000
--- a/src/Platforms/SecureFolderFS.Maui/Platforms/iOS/ServiceImplementation/IOSVaultManagerService.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using OwlCore.Storage.System.IO;
-using SecureFolderFS.Core.FileSystem;
-using SecureFolderFS.Core.FileSystem.AppModels;
-using SecureFolderFS.Sdk.Models;
-using SecureFolderFS.Sdk.Services;
-using SecureFolderFS.Storage.VirtualFileSystem;
-using SecureFolderFS.UI.ServiceImplementation;
-
-namespace SecureFolderFS.Maui.Platforms.iOS.ServiceImplementation
-{
-    /// <inheritdoc cref="IVaultManagerService"/>
-    internal sealed class IOSVaultManagerService : BaseVaultManagerService
-    {
-        /// <inheritdoc/>
-        public override Task<IVFSRoot> CreateFileSystemAsync(IVaultModel vaultModel, IDisposable unlockContract, CancellationToken cancellationToken)
-        {
-            // TODO: Add implementation for ios FS
-
-            var statisticsModel = new ConsolidatedStatisticsModel();
-            var root = new SystemFolder(FileSystem.Current.AppDataDirectory);
-            
-            return Task.FromResult<IVFSRoot>(new LocalVFSRoot(unlockContract, root, new()
-            {
-                VolumeName = vaultModel.VaultName,
-                FileSystemId = string.Empty,
-                FileSystemStatistics = statisticsModel,
-                HealthStatistics = statisticsModel
-            }));
-        }
-    }
-}
diff --git a/src/Platforms/SecureFolderFS.Maui/Popups/CredentialsPopup.xaml b/src/Platforms/SecureFolderFS.Maui/Popups/CredentialsPopup.xaml
index bca113e5d..90fd3bc2f 100644
--- a/src/Platforms/SecureFolderFS.Maui/Popups/CredentialsPopup.xaml
+++ b/src/Platforms/SecureFolderFS.Maui/Popups/CredentialsPopup.xaml
@@ -2,10 +2,126 @@
     x:Class="SecureFolderFS.Maui.Popups.CredentialsPopup"
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:l="using:SecureFolderFS.Maui.Localization"
+    xmlns:mdc="clr-namespace:Material.Components.Maui;assembly=Material.Components.Maui"
+    xmlns:ts="clr-namespace:SecureFolderFS.Maui.TemplateSelectors"
     xmlns:tv="clr-namespace:CommunityToolkit.Maui.Views;assembly=CommunityToolkit.Maui"
+    xmlns:uc="clr-namespace:SecureFolderFS.Maui.UserControls"
+    xmlns:vc="clr-namespace:SecureFolderFS.Maui.ValueConverters"
+    xmlns:vm="clr-namespace:SecureFolderFS.Sdk.ViewModels.Controls;assembly=SecureFolderFS.Sdk"
+    xmlns:vm2="clr-namespace:SecureFolderFS.Sdk.ViewModels.Controls.Authentication;assembly=SecureFolderFS.Sdk"
+    xmlns:vm3="clr-namespace:SecureFolderFS.Sdk.ViewModels.Views.Credentials;assembly=SecureFolderFS.Sdk"
     x:Name="ThisPopup"
     BindingContext="{x:Reference ThisPopup}">
 
+    <tv:Popup.Resources>
+        <vc:BoolInvertConverter x:Key="BoolInvertConverter" />
+
+        <!--  Alternative Stage: Resetting credentials with Recovery Key  -->
+        <DataTemplate x:Key="ResetTemplate" x:DataType="vm3:CredentialsResetViewModel">
+            <VerticalStackLayout Spacing="24">
+                <Picker
+                    HorizontalOptions="Center"
+                    HorizontalTextAlignment="Center"
+                    ItemDisplayBinding="{Binding Title, Mode=OneWay, x:DataType={x:Type vm2:AuthenticationViewModel}}"
+                    ItemsSource="{Binding AuthenticationOptions}"
+                    SelectedItem="{Binding RegisterViewModel.CurrentViewModel, Mode=TwoWay}"
+                    WidthRequest="200" />
+
+                <uc:RegisterControl CurrentViewModel="{Binding RegisterViewModel.CurrentViewModel, Mode=OneWay}" HorizontalOptions="Fill" />
+
+                <OnPlatform x:TypeArguments="View">
+                    <On Platform="iOS">
+                        <Button
+                            Clicked="ResetViewButton_Click"
+                            HorizontalOptions="Fill"
+                            IsEnabled="{Binding ViewModel.PrimaryButtonEnabled, Mode=OneWay, Source={x:Reference ThisPopup}}"
+                            Text="{Binding ViewModel.PrimaryButtonText, Mode=OneWay, Source={x:Reference ThisPopup}}" />
+                    </On>
+                    <On Platform="Android">
+                        <mdc:Button
+                            Clicked="ResetViewButton_Click"
+                            HorizontalOptions="Fill"
+                            IsEnabled="{Binding ViewModel.CanContinue, Mode=OneWay, Source={x:Reference ThisPopup}}"
+                            Text="{Binding ViewModel.PrimaryButtonText, Mode=OneWay, Source={x:Reference ThisPopup}}" />
+                    </On>
+                </OnPlatform>
+            </VerticalStackLayout>
+        </DataTemplate>
+
+        <!--  1st Stage: Login  -->
+        <DataTemplate x:Key="LoginTemplate" x:DataType="vm:LoginViewModel">
+            <VerticalStackLayout Spacing="8">
+                <uc:LoginControl CurrentViewModel="{Binding CurrentViewModel, Mode=OneWay}" ProvideContinuationButton="True" />
+                <OnPlatform x:TypeArguments="View">
+                    <On Platform="iOS">
+                        <Button Command="{Binding RecoverAccessCommand}" Text="{l:ResourceString Rid=RecoverAccess}" />
+                    </On>
+                    <On Platform="Android">
+                        <mdc:Button
+                            Command="{Binding RecoverAccessCommand}"
+                            Style="{DynamicResource TextButtonStyle}"
+                            Text="{l:ResourceString Rid=RecoverAccess}" />
+                    </On>
+                </OnPlatform>
+            </VerticalStackLayout>
+        </DataTemplate>
+
+        <!--  2nd Stage: Option selection  -->
+        <DataTemplate x:Key="SelectionTemplate" x:DataType="vm3:CredentialsSelectionViewModel">
+            <VerticalStackLayout>
+                <TableView Loaded="TableRoot_Loaded">
+                    <TableRoot>
+                        <!--  Modify existing section added in code-behind  -->
+                        <TableSection Title="{l:ResourceString Rid=AllOptions}" />
+                        <!--  All options populated in code-behind  -->
+                    </TableRoot>
+                </TableView>
+            </VerticalStackLayout>
+        </DataTemplate>
+
+        <!--  3rd Stage: Confirmation  -->
+        <DataTemplate x:Key="ConfirmationTemplate" x:DataType="vm3:CredentialsConfirmationViewModel">
+            <VerticalStackLayout Spacing="16">
+                <Grid>
+                    <!--  Confirmation Panel  -->
+                    <VerticalStackLayout IsVisible="{Binding IsRemoving, Mode=OneWay, Converter={StaticResource BoolInvertConverter}}" Spacing="16">
+                        <uc:RegisterControl CurrentViewModel="{Binding RegisterViewModel.CurrentViewModel, Mode=OneWay}" />
+                        <Label Text="{l:ResourceString Rid=RecoveryKeyTip}" />
+                    </VerticalStackLayout>
+
+                    <!--  Removal Panel  -->
+                    <VerticalStackLayout IsVisible="{Binding IsRemoving, Mode=OneWay}" Spacing="16">
+                        <Label Text="{l:ResourceString Rid=RemoveAuthenticationQuestion}" />
+                        <VerticalStackLayout Spacing="8">
+                            <Label
+                                FontAttributes="Bold"
+                                FontSize="24"
+                                Text="{Binding ConfiguredViewModel.Title, Mode=OneWay}" />
+                            <Label Text="{Binding ConfiguredViewModel.Description, Mode=OneWay}" />
+                        </VerticalStackLayout>
+                    </VerticalStackLayout>
+                </Grid>
+                <OnPlatform x:TypeArguments="View">
+                    <On Platform="iOS">
+                        <Button
+                            Clicked="ConfirmationViewButton_Click"
+                            HorizontalOptions="Fill"
+                            IsEnabled="{Binding ViewModel.PrimaryButtonEnabled, Mode=OneWay, Source={x:Reference ThisPopup}}"
+                            Text="{Binding ViewModel.PrimaryButtonText, Mode=OneWay, Source={x:Reference ThisPopup}}" />
+                    </On>
+                    <On Platform="Android">
+                        <mdc:Button
+                            Clicked="ConfirmationViewButton_Click"
+                            HorizontalOptions="Fill"
+                            IsEnabled="{Binding ViewModel.CanContinue, Mode=OneWay, Source={x:Reference ThisPopup}}"
+                            Text="{Binding ViewModel.PrimaryButtonText, Mode=OneWay, Source={x:Reference ThisPopup}}" />
+                    </On>
+                </OnPlatform>
+            </VerticalStackLayout>
+        </DataTemplate>
+    </tv:Popup.Resources>
+
     <Grid Padding="16" RowSpacing="24">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
@@ -18,13 +134,17 @@
             FontSize="24"
             Text="{Binding ViewModel.Title, Mode=OneWay}" />
 
-        <!--<uc:ContentPresentation
-      Grid.Row="1"
-      VerticalOptions="Center"
-      ViewContent="{Binding ViewModel.CurrentViewModel, Mode=OneWay}">
-      <uc:ContentPresentation.TemplateSelector>
-        <ts:RecoveryPreviewTemplateSelector LoginTemplate="{StaticResource LoginTemplate}" RecoveryTemplate="{StaticResource RecoveryTemplate}" />
-      </uc:ContentPresentation.TemplateSelector>
-    </uc:ContentPresentation>-->
+        <uc:ContentPresentation
+            Grid.Row="1"
+            Presentation="{Binding ViewModel.SelectedViewModel, Mode=OneWay}"
+            VerticalOptions="Center">
+            <uc:ContentPresentation.TemplateSelector>
+                <ts:CredentialsTemplateSelector
+                    ConfirmationTemplate="{StaticResource ConfirmationTemplate}"
+                    LoginTemplate="{StaticResource LoginTemplate}"
+                    ResetTemplate="{StaticResource ResetTemplate}"
+                    SelectionTemplate="{StaticResource SelectionTemplate}" />
+            </uc:ContentPresentation.TemplateSelector>
+        </uc:ContentPresentation>
     </Grid>
 </tv:Popup>
diff --git a/src/Platforms/SecureFolderFS.Maui/Popups/CredentialsPopup.xaml.cs b/src/Platforms/SecureFolderFS.Maui/Popups/CredentialsPopup.xaml.cs
index 6a9ee16b2..66d056b5b 100644
--- a/src/Platforms/SecureFolderFS.Maui/Popups/CredentialsPopup.xaml.cs
+++ b/src/Platforms/SecureFolderFS.Maui/Popups/CredentialsPopup.xaml.cs
@@ -1,9 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using CommunityToolkit.Maui.Views;
+using SecureFolderFS.Sdk.Extensions;
+using SecureFolderFS.Sdk.ViewModels.Views.Credentials;
 using SecureFolderFS.Sdk.ViewModels.Views.Overlays;
 using SecureFolderFS.Shared.ComponentModel;
 using SecureFolderFS.UI.Utils;
@@ -36,7 +33,92 @@ public void SetView(IViewable viewable)
         /// <inheritdoc/>
         public Task HideAsync()
         {
-            return Task.CompletedTask;
+            return CloseAsync();
+        }
+        
+        private void TableRoot_Loaded(object? sender, EventArgs e)
+        {
+            if (ViewModel?.SelectionViewModel is not { } selectionViewModel || sender is not TableView tableView)
+                return;
+            
+            // Init "Modify existing" section
+            if (selectionViewModel.ConfiguredViewModel is not null)
+            {
+                var modifyExistingSection = new TableSection()
+                {
+                    Title = "ModifyExisting".ToLocalized()
+                };
+                
+                // Modify existing
+                modifyExistingSection.Add(new TextCell()
+                {
+                    Text = selectionViewModel.ConfiguredViewModel.Title,
+                    Detail = "ChangeCurrentAuthentication".ToLocalized(),
+                    Command = selectionViewModel.ItemSelectedCommand
+                });
+                
+                // Remove credentials
+                if (selectionViewModel.CanRemoveCredentials)
+                    modifyExistingSection.Add(new TextCell()
+                    {
+                        Text = "RemoveAuthentication".ToLocalized(),
+                        Detail = "RemoveAuthenticationDescription".ToLocalized(),
+                        Command = selectionViewModel.RemoveCredentialsCommand
+                    });
+                
+                tableView.Root.Add(modifyExistingSection);
+            }
+            
+            // Init "All options" section
+            var allOptionsSection = tableView.Root.Last();
+            
+            // Add items to the options section
+            // Note: We could hook up CollectionChanged event and listen for item
+            //      changes, however, it'd be inefficient and unnecessary
+            foreach (var item in selectionViewModel.AuthenticationOptions)
+            {
+                allOptionsSection.Add(new TextCell()
+                {
+                    Text = item.Title,
+                    Detail = item.Description,
+                    Command = selectionViewModel.ItemSelectedCommand,
+                    CommandParameter = item
+                });
+            }
+        }
+
+        private async void ResetViewButton_Click(object? sender, EventArgs e)
+        {
+            if (ViewModel?.SelectedViewModel is not CredentialsResetViewModel credentialsResetViewModel)
+                return;
+            
+            try
+            {
+                await credentialsResetViewModel.ConfirmAsync(default);
+                await HideAsync();
+            }
+            catch (Exception ex)
+            {
+                // TODO: Report to user
+                _ = ex;
+            }    
+        }
+        
+        private async void ConfirmationViewButton_Click(object? sender, EventArgs e)
+        {
+            if (ViewModel?.SelectedViewModel is not CredentialsConfirmationViewModel credentialsConfirmation)
+                return;
+
+            try
+            {
+                await credentialsConfirmation.ConfirmAsync(default);
+                await HideAsync();
+            }
+            catch (Exception ex)
+            {
+                // TODO: Report to user
+                _ = ex;
+            }
         }
         
         public CredentialsOverlayViewModel? ViewModel
diff --git a/src/Platforms/SecureFolderFS.Maui/Popups/PreviewRecoveryPopup.xaml b/src/Platforms/SecureFolderFS.Maui/Popups/PreviewRecoveryPopup.xaml
index 6280d164b..d0f908ba2 100644
--- a/src/Platforms/SecureFolderFS.Maui/Popups/PreviewRecoveryPopup.xaml
+++ b/src/Platforms/SecureFolderFS.Maui/Popups/PreviewRecoveryPopup.xaml
@@ -19,7 +19,7 @@
         </DataTemplate>
         <DataTemplate x:Key="RecoveryTemplate" x:DataType="vm:RecoveryPreviewControlViewModel">
             <Grid Padding="{OnPlatform Android='12,0'}">
-                <uc:RecoveryPreviewControl ExportCommand="{Binding ExportCommand, Mode=OneWay}" MasterKey="{Binding MasterKey, Mode=OneWay}" />
+                <uc:RecoveryPreviewControl ExportCommand="{Binding ExportCommand, Mode=OneWay}" RecoveryKey="{Binding RecoveryKey, Mode=OneWay}" />
             </Grid>
         </DataTemplate>
     </tv:Popup.Resources>
@@ -44,8 +44,8 @@
         <uc:ContentPresentation
             Grid.Row="1"
             HorizontalOptions="Fill"
-            VerticalOptions="Center"
-            ViewContent="{Binding ViewModel.CurrentViewModel, Mode=OneWay}">
+            Presentation="{Binding ViewModel.CurrentViewModel, Mode=OneWay}"
+            VerticalOptions="Center">
             <uc:ContentPresentation.TemplateSelector>
                 <ts:RecoveryPreviewTemplateSelector LoginTemplate="{StaticResource LoginTemplate}" RecoveryTemplate="{StaticResource RecoveryTemplate}" />
             </uc:ContentPresentation.TemplateSelector>
diff --git a/src/Platforms/SecureFolderFS.Maui/Popups/PreviewRecoveryPopup.xaml.cs b/src/Platforms/SecureFolderFS.Maui/Popups/PreviewRecoveryPopup.xaml.cs
index 6c3c3f04a..f3230a16d 100644
--- a/src/Platforms/SecureFolderFS.Maui/Popups/PreviewRecoveryPopup.xaml.cs
+++ b/src/Platforms/SecureFolderFS.Maui/Popups/PreviewRecoveryPopup.xaml.cs
@@ -36,7 +36,7 @@ public void SetView(IViewable viewable)
         /// <inheritdoc/>
         public Task HideAsync()
         {
-            return Task.CompletedTask;
+            return CloseAsync();
         }
         
         private void ViewModel_PropertyChanged(object? sender, PropertyChangedEventArgs e)
diff --git a/src/Platforms/SecureFolderFS.Maui/Prompts/NewItemPrompt.cs b/src/Platforms/SecureFolderFS.Maui/Prompts/NewItemPrompt.cs
new file mode 100644
index 000000000..ee286872a
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Maui/Prompts/NewItemPrompt.cs
@@ -0,0 +1,44 @@
+using SecureFolderFS.Sdk.Extensions;
+using SecureFolderFS.Sdk.ViewModels.Views.Overlays;
+using SecureFolderFS.Shared.ComponentModel;
+using SecureFolderFS.Shared.Models;
+using SecureFolderFS.UI.Utils;
+
+namespace SecureFolderFS.Maui.Prompts
+{
+    internal sealed class NewItemPrompt : IOverlayControl
+    {
+        public NewItemOverlayViewModel? ViewModel { get; private set; }
+        
+        /// <inheritdoc/>
+        public async Task<IResult> ShowAsync()
+        {
+            if (ViewModel is null)
+                return Result.Failure(null);
+            
+            var page = Shell.Current.CurrentPage;
+            ViewModel.ItemName = await page.DisplayPromptAsync(
+                ViewModel.Title,
+                ViewModel.Message,
+                "Confirm".ToLocalized(),
+                "Cancel".ToLocalized());
+            
+            if (string.IsNullOrWhiteSpace(ViewModel.ItemName))
+                return Result.Failure(null);
+
+            return Result.Success;
+        }
+
+        /// <inheritdoc/>
+        public void SetView(IViewable viewable)
+        {
+            ViewModel = (NewItemOverlayViewModel)viewable;
+        }
+
+        /// <inheritdoc/>
+        public Task HideAsync()
+        {
+            return Task.CompletedTask;
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Maui/Prompts/RecoveryPrompt.cs b/src/Platforms/SecureFolderFS.Maui/Prompts/RecoveryPrompt.cs
index f402ac81e..b5dbd1b83 100644
--- a/src/Platforms/SecureFolderFS.Maui/Prompts/RecoveryPrompt.cs
+++ b/src/Platforms/SecureFolderFS.Maui/Prompts/RecoveryPrompt.cs
@@ -18,7 +18,11 @@ public async Task<IResult> ShowAsync()
                 return Result.Failure(null);
             
             var page = Shell.Current.CurrentPage;
-            ViewModel.MasterKey = await page.DisplayPromptAsync("RecoverAccess".ToLocalized(), "EnterRecoveryKey".ToLocalized());
+            ViewModel.RecoveryKey = await page.DisplayPromptAsync(
+                ViewModel.Title,
+                ViewModel.Message,
+                "Confirm".ToLocalized(),
+                "Cancel".ToLocalized());
             
             var result = await ViewModel.RecoverAsync(default);
             if (!result)
diff --git a/src/Platforms/SecureFolderFS.Maui/Prompts/RenamePrompt.cs b/src/Platforms/SecureFolderFS.Maui/Prompts/RenamePrompt.cs
new file mode 100644
index 000000000..b8a7acab9
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Maui/Prompts/RenamePrompt.cs
@@ -0,0 +1,44 @@
+using SecureFolderFS.Sdk.Extensions;
+using SecureFolderFS.Sdk.ViewModels.Views.Overlays;
+using SecureFolderFS.Shared.ComponentModel;
+using SecureFolderFS.Shared.Models;
+using SecureFolderFS.UI.Utils;
+
+namespace SecureFolderFS.Maui.Prompts
+{
+    public sealed class RenamePrompt : IOverlayControl
+    {
+        public RenameOverlayViewModel? ViewModel { get; private set; }
+        
+        /// <inheritdoc/>
+        public async Task<IResult> ShowAsync()
+        {
+            if (ViewModel is null)
+                return Result.Failure(null);
+            
+            var page = Shell.Current.CurrentPage;
+            ViewModel.NewName = await page.DisplayPromptAsync(
+                ViewModel.Title,
+                ViewModel.Message,
+                "Confirm".ToLocalized(),
+                "Cancel".ToLocalized());
+            
+            if (string.IsNullOrWhiteSpace(ViewModel.NewName))
+                return Result.Failure(null);
+
+            return Result.Success;
+        }
+
+        /// <inheritdoc/>
+        public void SetView(IViewable viewable)
+        {
+            ViewModel = (RenameOverlayViewModel)viewable;
+        }
+
+        /// <inheritdoc/>
+        public Task HideAsync()
+        {
+            return Task.CompletedTask;
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Maui/Resources/Images/error_shield.svg b/src/Platforms/SecureFolderFS.Maui/Resources/Images/error_shield.svg
new file mode 100644
index 000000000..53f67c703
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Maui/Resources/Images/error_shield.svg
@@ -0,0 +1,10 @@
+<svg preserveAspectRatio="xMinYMin" width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="17" y="18" width="26" height="22" fill="white"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 31.125 5.375 C 37.480469 10.140625 43.96875 12.5 50.625 12.5 C 51.660156 12.5 52.5 13.339844 52.5 14.375 L 52.5 27.5 C 52.5 40.003906 45.105469 49.191406 30.6875 54.871094 C 30.246094 55.042969 29.753906 55.042969 29.3125 54.871094 C 14.894531 49.191406 7.5 40 7.5 27.5 L 7.5 14.375 C 7.5 13.339844 8.339844 12.5 9.375 12.5 C 16.03125 12.5 22.519531 10.140625 28.875 5.375 C 29.542969 4.875 30.457031 4.875 31.125 5.375 Z M 23.199219 20.554688 C 22.5 19.890625 21.414062 19.867188 20.683594 20.496094 C 19.957031 21.125 19.820312 22.203125 20.375 22.992188 L 20.554688 23.203125 L 27.363281 30.011719 L 20.554688 36.824219 C 20.066406 37.292969 19.867188 37.988281 20.039062 38.644531 C 20.210938 39.304688 20.722656 39.816406 21.378906 39.988281 C 22.035156 40.15625 22.734375 39.960938 23.203125 39.46875 L 30.011719 32.660156 L 36.824219 39.46875 C 37.476562 40.125 38.515625 40.203125 39.261719 39.652344 L 39.46875 39.46875 C 40.125 38.8125 40.203125 37.777344 39.652344 37.03125 L 39.46875 36.824219 L 32.660156 30.011719 L 39.46875 23.203125 C 40.203125 22.472656 40.203125 21.285156 39.46875 20.550781 C 38.738281 19.820312 37.550781 19.820312 36.820312 20.550781 L 30.011719 27.363281 L 23.203125 20.554688 Z M 23.199219 20.554688 "/>
+<defs>
+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="53" y1="55" x2="8" y2="5" gradientTransform="matrix(2.5,0,0,2.5,0,0)">
+<stop offset="0" style="stop-color:rgb(100%,33.72549%,24.705882%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(100%,0%,0%);stop-opacity:1;"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/src/Platforms/SecureFolderFS.Maui/Resources/Images/green_shield.svg b/src/Platforms/SecureFolderFS.Maui/Resources/Images/success_shield.svg
similarity index 100%
rename from src/Platforms/SecureFolderFS.Maui/Resources/Images/green_shield.svg
rename to src/Platforms/SecureFolderFS.Maui/Resources/Images/success_shield.svg
diff --git a/src/Platforms/SecureFolderFS.Maui/Resources/Images/warning_shield.svg b/src/Platforms/SecureFolderFS.Maui/Resources/Images/warning_shield.svg
new file mode 100644
index 000000000..87ac9c527
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Maui/Resources/Images/warning_shield.svg
@@ -0,0 +1,10 @@
+<svg preserveAspectRatio="xMinYMin" width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="17" y="14" width="26" height="32" fill="white"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 31.125 5.375 C 37.480469 10.140625 43.96875 12.5 50.625 12.5 C 51.660156 12.5 52.5 13.339844 52.5 14.375 L 52.5 27.5 C 52.5 40.003906 45.105469 49.191406 30.6875 54.871094 C 30.246094 55.042969 29.753906 55.042969 29.3125 54.871094 C 14.894531 49.191406 7.5 40 7.5 27.5 L 7.5 14.375 C 7.5 13.339844 8.339844 12.5 9.375 12.5 C 16.03125 12.5 22.519531 10.140625 28.875 5.375 C 29.542969 4.875 30.457031 4.875 31.125 5.375 Z M 30 40 C 28.964844 40 28.125 40.839844 28.125 41.875 C 28.125 42.910156 28.964844 43.75 30 43.75 C 31.035156 43.75 31.875 42.910156 31.875 41.875 C 31.875 40.839844 31.035156 40 30 40 Z M 30 17.453125 C 29.0625 17.453125 28.269531 18.148438 28.140625 19.074219 L 28.125 19.328125 L 28.125 35.578125 L 28.140625 35.835938 C 28.269531 36.761719 29.0625 37.453125 30 37.453125 C 30.9375 37.453125 31.730469 36.761719 31.859375 35.835938 L 31.875 35.578125 L 31.875 19.328125 L 31.859375 19.074219 C 31.730469 18.148438 30.9375 17.453125 30 17.453125 Z M 30 17.453125 "/>
+<defs>
+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="53" y1="55" x2="8" y2="5" gradientTransform="matrix(2.5,0,0,2.5,0,0)">
+<stop offset="0" style="stop-color:rgb(100%,76.470588%,0%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(100%,40%,0%);stop-opacity:1;"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/src/Platforms/SecureFolderFS.Maui/Resources/Styles/Styles.xaml b/src/Platforms/SecureFolderFS.Maui/Resources/Styles/Styles.xaml
index 1cd984c94..d1ff6a7be 100644
--- a/src/Platforms/SecureFolderFS.Maui/Resources/Styles/Styles.xaml
+++ b/src/Platforms/SecureFolderFS.Maui/Resources/Styles/Styles.xaml
@@ -1,6 +1,4 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/dotnet/2021/maui" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
-
-
     <Style ApplyToDerivedTypes="True" TargetType="Page">
         <Setter Property="Padding" Value="0" />
         <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource OffBlack}}" />
@@ -13,10 +11,6 @@
         <Setter Property="Shell.DisabledColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray950}}" />
         <Setter Property="Shell.UnselectedColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray200}}" />
         <Setter Property="Shell.NavBarHasShadow" Value="False" />
-        <Setter Property="Shell.TabBarBackgroundColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Black}}" />
-        <Setter Property="Shell.TabBarForegroundColor" Value="{AppThemeBinding Light={StaticResource Magenta}, Dark={StaticResource White}}" />
-        <Setter Property="Shell.TabBarTitleColor" Value="{AppThemeBinding Light={StaticResource Magenta}, Dark={StaticResource White}}" />
-        <Setter Property="Shell.TabBarUnselectedColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource Gray200}}" />
     </Style>
 
     <Style TargetType="NavigationPage">
diff --git a/src/Platforms/SecureFolderFS.Maui/SecureFolderFS.Maui.csproj b/src/Platforms/SecureFolderFS.Maui/SecureFolderFS.Maui.csproj
index 744662399..fa8a5d4b5 100644
--- a/src/Platforms/SecureFolderFS.Maui/SecureFolderFS.Maui.csproj
+++ b/src/Platforms/SecureFolderFS.Maui/SecureFolderFS.Maui.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
-    <!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
-    <!-- <TargetFrameworks>$(TargetFrameworks);net8.0-tizen</TargetFrameworks> -->
+<!--    <TargetFrameworks>net9.0-android;net9.0-ios</TargetFrameworks>-->
+    <TargetFramework>net9.0-android</TargetFramework>
+<!--    <TargetFramework>net9.0-ios</TargetFramework>-->
 
     <!-- Note for MacCatalyst:
     The default runtime is maccatalyst-x64, except in Release config, in which case the default is maccatalyst-x64;maccatalyst-arm64.
@@ -24,21 +24,24 @@
     <ApplicationTitle>SecureFolderFS</ApplicationTitle>
 
     <!-- App Identifier -->
-    <ApplicationId>com.securefolderfs.securefolderfs</ApplicationId>
+    <ApplicationId>org.securefolderfs.securefolderfs</ApplicationId>
 
     <!-- Versions -->
     <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
     <ApplicationVersion>1</ApplicationVersion>
 
-    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
-    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
-    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">12.2</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">26.0</SupportedOSPlatformVersion>
     <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
     <TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
     <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
     <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
 
+  <PropertyGroup Condition="$(TargetFramework.Contains('-ios')) and '$(Configuration)' == 'Debug'">
+    <RuntimeIdentifier>iossimulator-arm64</RuntimeIdentifier>
+  </PropertyGroup>
+
   <ItemGroup>
     <!-- App Icon -->
     <MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#FFFFFF" />
@@ -65,11 +68,12 @@
     <PackageReference Include="AathifMahir.Maui.MauiIcons.Cupertino" />
     <PackageReference Include="AathifMahir.Maui.MauiIcons.Material" />
     <PackageReference Include="CommunityToolkit.Maui" />
+    <PackageReference Include="CommunityToolkit.Maui.MediaElement" />
+    <PackageReference Include="ContextMenuContainer" />
     <PackageReference Include="IconPacks.Material" />
     <PackageReference Include="Material.Components.Maui" />
     <PackageReference Include="Microsoft.Maui.Controls" />
     <PackageReference Include="Microsoft.Maui.Controls.Compatibility" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" />
     <PackageReference Include="Microsoft.Maui.Core" />
     <PackageReference Include="Microsoft.Maui.Essentials" />
     <PackageReference Include="The49.Maui.BottomSheet" />
diff --git a/src/Platforms/SecureFolderFS.Maui/ServiceImplementation/MauiMediaService.cs b/src/Platforms/SecureFolderFS.Maui/ServiceImplementation/MauiMediaService.cs
new file mode 100644
index 000000000..b03ad4655
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Maui/ServiceImplementation/MauiMediaService.cs
@@ -0,0 +1,28 @@
+using OwlCore.Storage;
+using SecureFolderFS.Maui.AppModels;
+using SecureFolderFS.Sdk.Helpers;
+using SecureFolderFS.Sdk.Services;
+using IImage = SecureFolderFS.Shared.ComponentModel.IImage;
+
+namespace SecureFolderFS.Maui.ServiceImplementation
+{
+    /// <inheritdoc cref="IMediaService"/>
+    internal sealed class MauiMediaService : IMediaService
+    {
+        /// <inheritdoc/>
+        public async Task<IImage> ReadImageFileAsync(IFile file, CancellationToken cancellationToken)
+        {
+            var stream = await file.OpenReadAsync(cancellationToken);
+            return new ImageStream(stream);
+        }
+
+        /// <inheritdoc/>
+        public async Task<IDisposable> StreamVideoAsync(IFile file, CancellationToken cancellationToken)
+        {
+            var classification = FileTypeHelper.GetClassification(file);
+            var stream = await file.OpenReadAsync(cancellationToken);
+            
+            return new VideoStreamServer(stream, classification.MimeType);
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Maui/ServiceImplementation/MauiNavigationService.cs b/src/Platforms/SecureFolderFS.Maui/ServiceImplementation/MauiNavigationService.cs
index fc92c46df..337468d2e 100644
--- a/src/Platforms/SecureFolderFS.Maui/ServiceImplementation/MauiNavigationService.cs
+++ b/src/Platforms/SecureFolderFS.Maui/ServiceImplementation/MauiNavigationService.cs
@@ -8,14 +8,54 @@ namespace SecureFolderFS.Maui.ServiceImplementation
     /// <inheritdoc cref="INavigationService"/>
     internal sealed class MauiNavigationService : BaseNavigationService
     {
+        public int IndexInNavigation { get; private set; }
+        
         /// <inheritdoc/>
         protected override async Task<bool> BeginNavigationAsync(IViewDesignation? target, NavigationType navigationType)
         {
-            if (NavigationControl is null)
+            if (Navigator is null)
                 return false;
 
-            _ = navigationType;
-            return await NavigationControl.NavigateAsync<IViewDesignation, string>(target);
+            switch (navigationType)
+            {
+                case NavigationType.Backward:
+                {
+                    if (!await Navigator.GoBackAsync())
+                        return false;
+                        
+                    IndexInNavigation--;
+                    CurrentView = Views[IndexInNavigation];
+                    
+                    return true;
+                }
+                
+                case NavigationType.Forward:
+                {
+                    if (!await Navigator.GoForwardAsync())
+                        return false;
+                        
+                    IndexInNavigation++;
+                    CurrentView = Views[IndexInNavigation];
+                    
+                    return true;
+                }
+
+                default:
+                case NavigationType.Chained:
+                {
+                    if (!await Navigator.NavigateAsync(target))
+                        return false;
+
+                    IndexInNavigation++;
+                    if (IndexInNavigation >= 0 && IndexInNavigation < Views.Count)
+                    {
+                        // Remove all elements after the specified index
+                        Views.RemoveRange(IndexInNavigation + 1, Views.Count - (IndexInNavigation + 1));
+                    }
+
+                    return true;
+                }
+            }
         }
 
         internal void SetCurrentViewInternal(IViewDesignation? viewDesignation)
diff --git a/src/Platforms/SecureFolderFS.Maui/ServiceImplementation/MauiOverlayService.cs b/src/Platforms/SecureFolderFS.Maui/ServiceImplementation/MauiOverlayService.cs
index 7e8f72376..f6f883f45 100644
--- a/src/Platforms/SecureFolderFS.Maui/ServiceImplementation/MauiOverlayService.cs
+++ b/src/Platforms/SecureFolderFS.Maui/ServiceImplementation/MauiOverlayService.cs
@@ -1,6 +1,7 @@
 using SecureFolderFS.Maui.Popups;
 using SecureFolderFS.Maui.Prompts;
 using SecureFolderFS.Maui.Views;
+using SecureFolderFS.Maui.Views.Modals;
 using SecureFolderFS.Maui.Views.Modals.Settings;
 using SecureFolderFS.Maui.Views.Modals.Wizard;
 using SecureFolderFS.Sdk.Services;
@@ -24,6 +25,9 @@ protected override IOverlayControl GetOverlay(IViewable viewable)
             {
                 WizardOverlayViewModel => new MainWizardPage(navigation),
                 SettingsOverlayViewModel => new SettingsPage(navigation),
+                PreviewerOverlayViewModel => new FilePreviewModalPage(navigation),
+                RenameOverlayViewModel => new RenamePrompt(),
+                NewItemOverlayViewModel => new NewItemPrompt(),
                 RecoveryOverlayViewModel => new RecoveryPrompt(),
                 CredentialsOverlayViewModel => new CredentialsPopup(),
                 PreviewRecoveryOverlayViewModel => new PreviewRecoveryPopup(),
diff --git a/src/Platforms/SecureFolderFS.Maui/TemplateSelectors/CredentialsTemplateSelector.cs b/src/Platforms/SecureFolderFS.Maui/TemplateSelectors/CredentialsTemplateSelector.cs
new file mode 100644
index 000000000..dde72c501
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Maui/TemplateSelectors/CredentialsTemplateSelector.cs
@@ -0,0 +1,29 @@
+using SecureFolderFS.Sdk.ViewModels.Controls;
+using SecureFolderFS.Sdk.ViewModels.Views.Credentials;
+
+namespace SecureFolderFS.Maui.TemplateSelectors
+{
+    internal sealed class CredentialsTemplateSelector : DataTemplateSelector
+    {
+        public DataTemplate? ResetTemplate { get; set; }
+
+        public DataTemplate? LoginTemplate { get; set; }
+
+        public DataTemplate? SelectionTemplate { get; set; }
+
+        public DataTemplate? ConfirmationTemplate { get; set; }
+
+        /// <inheritdoc/>
+        protected override DataTemplate? OnSelectTemplate(object item, BindableObject container)
+        {
+            return item switch
+            {
+                LoginViewModel => LoginTemplate,
+                CredentialsResetViewModel => ResetTemplate,
+                CredentialsSelectionViewModel => SelectionTemplate,
+                CredentialsConfirmationViewModel => ConfirmationTemplate,
+                _ => null
+            };
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Maui/TemplateSelectors/LoginTemplateSelector.cs b/src/Platforms/SecureFolderFS.Maui/TemplateSelectors/LoginTemplateSelector.cs
index 243fa490d..e8fe2519a 100644
--- a/src/Platforms/SecureFolderFS.Maui/TemplateSelectors/LoginTemplateSelector.cs
+++ b/src/Platforms/SecureFolderFS.Maui/TemplateSelectors/LoginTemplateSelector.cs
@@ -1,5 +1,5 @@
 using SecureFolderFS.Sdk.ViewModels.Controls.Authentication;
-using SecureFolderFS.UI.ViewModels;
+using SecureFolderFS.UI.ViewModels.Authentication;
 
 namespace SecureFolderFS.Maui.TemplateSelectors
 {
diff --git a/src/Platforms/SecureFolderFS.Maui/TemplateSelectors/PreviewerTemplateSelector.cs b/src/Platforms/SecureFolderFS.Maui/TemplateSelectors/PreviewerTemplateSelector.cs
new file mode 100644
index 000000000..46713fee1
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Maui/TemplateSelectors/PreviewerTemplateSelector.cs
@@ -0,0 +1,25 @@
+using SecureFolderFS.Sdk.ViewModels.Controls.Previewers;
+
+namespace SecureFolderFS.Maui.TemplateSelectors
+{
+    internal sealed class PreviewerTemplateSelector : DataTemplateSelector
+    {
+        public DataTemplate? ImageTemplate { get; set; }
+        
+        public DataTemplate? VideoTemplate { get; set; }
+        
+        public DataTemplate? TextTemplate { get; set; }
+        
+        /// <inheritdoc/>
+        protected override DataTemplate? OnSelectTemplate(object item, BindableObject container)
+        {
+            return item switch
+            {
+                ImagePreviewerViewModel => ImageTemplate,
+                VideoPreviewerViewModel => VideoTemplate,
+                TextPreviewerViewModel => TextTemplate,
+                _ => null
+            };
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Maui/TemplateSelectors/RegistrationTemplateSelector.cs b/src/Platforms/SecureFolderFS.Maui/TemplateSelectors/RegistrationTemplateSelector.cs
index 2cf3e6a62..da8dff9d8 100644
--- a/src/Platforms/SecureFolderFS.Maui/TemplateSelectors/RegistrationTemplateSelector.cs
+++ b/src/Platforms/SecureFolderFS.Maui/TemplateSelectors/RegistrationTemplateSelector.cs
@@ -1,4 +1,4 @@
-using SecureFolderFS.UI.ViewModels;
+using SecureFolderFS.UI.ViewModels.Authentication;
 
 namespace SecureFolderFS.Maui.TemplateSelectors
 {
diff --git a/src/Platforms/SecureFolderFS.Maui/TemplateSelectors/VaultDashboardTemplateSelector.cs b/src/Platforms/SecureFolderFS.Maui/TemplateSelectors/VaultDashboardTemplateSelector.cs
deleted file mode 100644
index c96e05c61..000000000
--- a/src/Platforms/SecureFolderFS.Maui/TemplateSelectors/VaultDashboardTemplateSelector.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using SecureFolderFS.Sdk.ViewModels.Views.Vault;
-
-namespace SecureFolderFS.Maui.TemplateSelectors
-{
-    internal sealed class VaultDashboardTemplateSelector : DataTemplateSelector
-    {
-        public DataTemplate? OverviewTemplate { get; set; }
-
-        public DataTemplate? PropertiesTemplate { get; set; }
-
-        /// <inheritdoc/>
-        protected override DataTemplate OnSelectTemplate(object item, BindableObject container)
-        {
-            return item switch
-            {
-                VaultOverviewViewModel => OverviewTemplate,
-                VaultPropertiesViewModel => PropertiesTemplate,
-            } ?? throw new ArgumentException("Invalid view model type specified.", nameof(item));
-        }
-    }
-}
diff --git a/src/Platforms/SecureFolderFS.Maui/TemplateSelectors/WidgetsTemplateSelector.cs b/src/Platforms/SecureFolderFS.Maui/TemplateSelectors/WidgetsTemplateSelector.cs
index 531010709..08131a538 100644
--- a/src/Platforms/SecureFolderFS.Maui/TemplateSelectors/WidgetsTemplateSelector.cs
+++ b/src/Platforms/SecureFolderFS.Maui/TemplateSelectors/WidgetsTemplateSelector.cs
@@ -1,4 +1,5 @@
-using SecureFolderFS.Sdk.ViewModels.Controls.Widgets.Categories;
+using SecureFolderFS.Sdk.ViewModels.Controls.Widgets.Data;
+using SecureFolderFS.Sdk.ViewModels.Controls.Widgets.Health;
 
 namespace SecureFolderFS.Maui.TemplateSelectors
 {
diff --git a/src/Platforms/SecureFolderFS.Maui/UserControls/ActivityButton.xaml b/src/Platforms/SecureFolderFS.Maui/UserControls/ActivityButton.xaml
new file mode 100644
index 000000000..50d3715d5
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Maui/UserControls/ActivityButton.xaml
@@ -0,0 +1,25 @@
+<ContentView
+    x:Class="SecureFolderFS.Maui.UserControls.ActivityButton"
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:local="clr-namespace:SecureFolderFS.Maui.UserControls"
+    xmlns:mdc="clr-namespace:Material.Components.Maui;assembly=Material.Components.Maui"
+    x:Name="ThisControl">
+
+    <Grid x:DataType="local:ActivityButton" BindingContext="{x:Reference Name=ThisControl}">
+        <OnPlatform x:TypeArguments="View">
+            <On Platform="iOS">
+                <Grid>
+                    <Button x:Name="IOSButton" Command="{Binding Command, Mode=OneWay}" />
+                    <ActivityIndicator IsRunning="{Binding IsProgressing, Mode=OneWay}" />
+                </Grid>
+            </On>
+            <On Platform="Android">
+                <Grid>
+                    <mdc:Button x:Name="AndroidButton" Command="{Binding Command, Mode=OneWay}" />
+                    <ActivityIndicator IsRunning="{Binding IsProgressing, Mode=OneWay}" WidthRequest="20" />
+                </Grid>
+            </On>
+        </OnPlatform>
+    </Grid>
+</ContentView>
diff --git a/src/Platforms/SecureFolderFS.Maui/UserControls/ActivityButton.xaml.cs b/src/Platforms/SecureFolderFS.Maui/UserControls/ActivityButton.xaml.cs
new file mode 100644
index 000000000..bfbf308f8
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Maui/UserControls/ActivityButton.xaml.cs
@@ -0,0 +1,65 @@
+using System.Windows.Input;
+
+namespace SecureFolderFS.Maui.UserControls
+{
+    public partial class ActivityButton : ContentView
+    {
+        public ActivityButton()
+        {
+            InitializeComponent();
+        }
+        
+        public ICommand? Command
+        {
+            get => (ICommand?)GetValue(CommandProperty);
+            set => SetValue(CommandProperty, value);
+        }
+        public static readonly BindableProperty CommandProperty =
+            BindableProperty.Create(nameof(Command), typeof(ICommand), typeof(ActivityButton), null);
+
+        public string? Text
+        {
+            get => (string?)GetValue(TextProperty);
+            set => SetValue(TextProperty, value);
+        }
+        public static readonly BindableProperty TextProperty =
+            BindableProperty.Create(nameof(Text), typeof(string), typeof(ActivityButton), null,
+                propertyChanged: (bindable, oldValue, newValue) =>
+                {
+                    if (bindable is not ActivityButton activityButton)
+                        return;
+
+                    if (activityButton.IsProgressing)
+                        return;
+
+#if ANDROID
+                    activityButton.AndroidButton.Text = activityButton.Text;
+#elif IOS
+                    activityButton.IOSButton.Text = activityButton.Text;
+#endif
+                });
+
+        public bool IsProgressing
+        {
+            get => (bool)GetValue(IsProgressingProperty);
+            set => SetValue(IsProgressingProperty, value);
+        }
+        public static readonly BindableProperty IsProgressingProperty =
+            BindableProperty.Create(nameof(IsProgressing), typeof(bool), typeof(ActivityButton), false,
+                propertyChanged: (bindable, oldValue, newValue) =>
+                {
+                    if (bindable is not ActivityButton activityButton)
+                        return;
+
+#if ANDROID
+                    activityButton.AndroidButton.Text = activityButton.IsProgressing
+                        ? string.Empty
+                        : activityButton.Text;
+#elif IOS
+                    activityButton.IOSButton.Text = activityButton.IsProgressing
+                        ? string.Empty
+                        : activityButton.Text;
+#endif
+                });
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Maui/UserControls/BreadcrumbBar.xaml b/src/Platforms/SecureFolderFS.Maui/UserControls/BreadcrumbBar.xaml
new file mode 100644
index 000000000..65aa9f8ca
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Maui/UserControls/BreadcrumbBar.xaml
@@ -0,0 +1,46 @@
+<ContentView
+    x:Class="SecureFolderFS.Maui.UserControls.BreadcrumbBar"
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:local="clr-namespace:SecureFolderFS.Maui.UserControls"
+    xmlns:vc="clr-namespace:SecureFolderFS.Maui.ValueConverters"
+    xmlns:vm="clr-namespace:SecureFolderFS.Sdk.ViewModels.Controls;assembly=SecureFolderFS.Sdk"
+    x:Name="ThisControl">
+
+    <ContentView.Resources>
+        <vc:BoolInvertConverter x:Key="BoolInvertConverter" />
+        <vc:BreadcrumbConverter x:Key="BreadcrumbConverter" />
+    </ContentView.Resources>
+
+    <CollectionView
+        x:DataType="local:BreadcrumbBar"
+        BindingContext="{x:Reference ThisControl}"
+        ItemsSource="{Binding ItemsSource, Mode=OneWay}"
+        SelectionMode="None"
+        VerticalOptions="Center">
+        <CollectionView.ItemTemplate>
+            <DataTemplate x:DataType="vm:BreadcrumbItemViewModel">
+                <HorizontalStackLayout>
+                    <Label
+                        FontAttributes="{Binding IsLeading, Converter={StaticResource BreadcrumbConverter}, ConverterParameter='FontAttributes'}"
+                        FontSize="15"
+                        Text="{Binding Title, Mode=OneWay}"
+                        VerticalOptions="Center" />
+                    <Label
+                        Margin="12,0"
+                        FontSize="15"
+                        IsVisible="{Binding IsLeading, Mode=OneWay, Converter={StaticResource BoolInvertConverter}}"
+                        Text="&gt;"
+                        VerticalOptions="Center" />
+
+                    <HorizontalStackLayout.GestureRecognizers>
+                        <TapGestureRecognizer Command="{Binding Command, Mode=OneWay}" CommandParameter="{Binding}" />
+                    </HorizontalStackLayout.GestureRecognizers>
+                </HorizontalStackLayout>
+            </DataTemplate>
+        </CollectionView.ItemTemplate>
+        <CollectionView.ItemsLayout>
+            <LinearItemsLayout Orientation="Horizontal" />
+        </CollectionView.ItemsLayout>
+    </CollectionView>
+</ContentView>
diff --git a/src/Platforms/SecureFolderFS.Maui/UserControls/BreadcrumbBar.xaml.cs b/src/Platforms/SecureFolderFS.Maui/UserControls/BreadcrumbBar.xaml.cs
new file mode 100644
index 000000000..353c03899
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Maui/UserControls/BreadcrumbBar.xaml.cs
@@ -0,0 +1,20 @@
+using SecureFolderFS.Sdk.ViewModels.Controls;
+
+namespace SecureFolderFS.Maui.UserControls
+{
+    public partial class BreadcrumbBar : ContentView
+    {
+        public BreadcrumbBar()
+        {
+            InitializeComponent();
+        }
+        
+        public IList<BreadcrumbItemViewModel>? ItemsSource
+        {
+            get => (IList<BreadcrumbItemViewModel>?)GetValue(ItemsSourceProperty);
+            set => SetValue(ItemsSourceProperty, value);
+        }
+        public static readonly BindableProperty ItemsSourceProperty =
+            BindableProperty.Create(nameof(ItemsSource), typeof(IList<BreadcrumbItemViewModel>), typeof(BreadcrumbBar), defaultValue: null);
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Maui/UserControls/BrowserControl.xaml b/src/Platforms/SecureFolderFS.Maui/UserControls/BrowserControl.xaml
new file mode 100644
index 000000000..d5ac33680
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Maui/UserControls/BrowserControl.xaml
@@ -0,0 +1,62 @@
+<ContentView
+    x:Class="SecureFolderFS.Maui.UserControls.BrowserControl"
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:apesui="clr-namespace:APES.UI.XF;assembly=APES.UI.XF"
+    xmlns:local="clr-namespace:SecureFolderFS.Maui.UserControls"
+    xmlns:vc="clr-namespace:SecureFolderFS.Maui.ValueConverters"
+    xmlns:vm="clr-namespace:SecureFolderFS.Sdk.ViewModels.Views.Browser;assembly=SecureFolderFS.Sdk"
+    x:Name="RootControl">
+
+    <ContentView.Resources>
+        <vc:FileIconConverter x:Key="FileIconConverter" />
+        <vc:BoolSelectionModeConverter x:Key="BoolSelectionModeConverter" />
+    </ContentView.Resources>
+
+    <Grid x:DataType="local:BrowserControl" BindingContext="{x:Reference RootControl}">
+        <RefreshView Refreshing="RefreshView_Refreshing">
+            <CollectionView ItemsSource="{Binding ItemsSource, Mode=OneWay}" SelectionMode="{Binding IsSelecting, Mode=OneWay, Converter={StaticResource BoolSelectionModeConverter}}">
+                <CollectionView.ItemTemplate>
+                    <DataTemplate x:DataType="vm:BrowserItemViewModel">
+                        <apesui:ContextMenuContainer x:Name="ItemContainer">
+                            <apesui:ContextMenuContainer.MenuItems>
+                                <apesui:ContextMenuItem Command="{Binding RenameCommand}" Text="Rename" />
+                                <apesui:ContextMenuItem Command="{Binding ExportCommand}" Text="Export" />
+                                <apesui:ContextMenuItem Command="{Binding MoveCommand}" Text="Move" />
+                                <apesui:ContextMenuItem Command="{Binding CopyCommand}" Text="Copy" />
+                                <apesui:ContextMenuItem
+                                    Command="{Binding DeleteCommand}"
+                                    IsDestructive="True"
+                                    Text="Delete" />
+                            </apesui:ContextMenuContainer.MenuItems>
+                            <apesui:ContextMenuContainer.Content>
+                                <Grid
+                                    x:Name="SourceGrid"
+                                    Padding="13,4"
+                                    ColumnSpacing="13">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition />
+                                    </Grid.ColumnDefinitions>
+
+                                    <HorizontalStackLayout Grid.Column="0" Spacing="8">
+                                        <CheckBox IsChecked="{Binding IsSelected, Mode=TwoWay}" IsVisible="{Binding ParentFolder.BrowserViewModel.IsSelecting, Mode=OneWay}" />
+                                        <ContentView Content="{Binding Thumbnail, Converter={StaticResource FileIconConverter}, ConverterParameter={x:Reference SourceGrid}}" VerticalOptions="Center" />
+                                    </HorizontalStackLayout>
+                                    <Label
+                                        Grid.Column="1"
+                                        FontSize="15"
+                                        Text="{Binding Title, Mode=OneWay}"
+                                        VerticalOptions="Center" />
+                                </Grid>
+                            </apesui:ContextMenuContainer.Content>
+                            <apesui:ContextMenuContainer.GestureRecognizers>
+                                <TapGestureRecognizer CommandParameter="{x:Reference ItemContainer}" Tapped="TapGestureRecognizer_Tapped" />
+                            </apesui:ContextMenuContainer.GestureRecognizers>
+                        </apesui:ContextMenuContainer>
+                    </DataTemplate>
+                </CollectionView.ItemTemplate>
+            </CollectionView>
+        </RefreshView>
+    </Grid>
+</ContentView>
diff --git a/src/Platforms/SecureFolderFS.Maui/UserControls/BrowserControl.xaml.cs b/src/Platforms/SecureFolderFS.Maui/UserControls/BrowserControl.xaml.cs
new file mode 100644
index 000000000..ccf21bb1d
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Maui/UserControls/BrowserControl.xaml.cs
@@ -0,0 +1,59 @@
+using System.Windows.Input;
+using AndroidX.Lifecycle;
+using SecureFolderFS.Sdk.ViewModels.Views.Browser;
+
+namespace SecureFolderFS.Maui.UserControls
+{
+    public partial class BrowserControl : ContentView
+    {
+        public BrowserControl()
+        {
+            InitializeComponent();
+        }
+        
+        private void RefreshView_Refreshing(object? sender, EventArgs e)
+        {
+            if (sender is not RefreshView refreshView)
+                return;
+
+            RefreshCommand?.Execute(null);
+            refreshView.IsRefreshing = false;
+        }
+        
+        private void TapGestureRecognizer_Tapped(object? sender, TappedEventArgs e)
+        {
+            if (e.Parameter is not View { BindingContext: BrowserItemViewModel itemViewModel })
+                return;
+
+            if (IsSelecting)
+                itemViewModel.IsSelected = !itemViewModel.IsSelected;
+            else
+                itemViewModel.OpenCommand.Execute(null);
+        }
+        
+        public bool IsSelecting
+        {
+            get => (bool)GetValue(IsSelectingProperty);
+            set => SetValue(IsSelectingProperty, value);
+        }
+        public static readonly BindableProperty IsSelectingProperty =
+            BindableProperty.Create(nameof(IsSelecting), typeof(bool), typeof(BrowserControl), defaultValue: false);
+        
+        public ICommand? RefreshCommand
+        {
+            get => (ICommand?)GetValue(RefreshCommandProperty);
+            set => SetValue(RefreshCommandProperty, value);
+        }
+        public static readonly BindableProperty RefreshCommandProperty =
+            BindableProperty.Create(nameof(RefreshCommand), typeof(ICommand), typeof(BrowserControl), defaultValue: null);
+        
+        public IList<BrowserItemViewModel>? ItemsSource
+        {
+            get => (IList<BrowserItemViewModel>?)GetValue(ItemsSourceProperty);
+            set => SetValue(ItemsSourceProperty, value);
+        }
+        public static readonly BindableProperty ItemsSourceProperty =
+            BindableProperty.Create(nameof(ItemsSource), typeof(IList<BrowserItemViewModel>), typeof(BrowserControl), defaultValue: null);
+    }
+}
+
diff --git a/src/Platforms/SecureFolderFS.Maui/UserControls/ContentPresentation.xaml.cs b/src/Platforms/SecureFolderFS.Maui/UserControls/ContentPresentation.xaml.cs
index 8130ec9df..c170b1834 100644
--- a/src/Platforms/SecureFolderFS.Maui/UserControls/ContentPresentation.xaml.cs
+++ b/src/Platforms/SecureFolderFS.Maui/UserControls/ContentPresentation.xaml.cs
@@ -7,13 +7,13 @@ public ContentPresentation()
             InitializeComponent();
         }
 
-        public object? ViewContent
+        public object? Presentation
         {
-            get => (object?)GetValue(ViewContentProperty);
-            set => SetValue(ViewContentProperty, value);
+            get => (object?)GetValue(PresentationProperty);
+            set => SetValue(PresentationProperty, value);
         }
-        public static readonly BindableProperty ViewContentProperty =
-            BindableProperty.Create(nameof(ViewContent), typeof(object), typeof(ContentPresentation), null, propertyChanged:
+        public static readonly BindableProperty PresentationProperty =
+            BindableProperty.Create(nameof(Presentation), typeof(object), typeof(ContentPresentation), null, propertyChanged:
                 (bindable, _, newValue) => ApplyTemplate(bindable, newValue));
 
         public DataTemplateSelector? TemplateSelector
@@ -23,7 +23,7 @@ public DataTemplateSelector? TemplateSelector
         }
         public static readonly BindableProperty TemplateSelectorProperty =
             BindableProperty.Create(nameof(TemplateSelector), typeof(DataTemplateSelector), typeof(ContentPresentation), null, propertyChanged:
-                (bindable, _, _) => ApplyTemplate(bindable, (bindable as ContentPresentation)?.ViewContent));
+                (bindable, _, _) => ApplyTemplate(bindable, (bindable as ContentPresentation)?.Presentation));
 
         private static void ApplyTemplate(BindableObject bindable, object? newValue)
         {
diff --git a/src/Platforms/SecureFolderFS.Maui/UserControls/LoginControl.xaml b/src/Platforms/SecureFolderFS.Maui/UserControls/LoginControl.xaml
index 0cda1f409..47a169775 100644
--- a/src/Platforms/SecureFolderFS.Maui/UserControls/LoginControl.xaml
+++ b/src/Platforms/SecureFolderFS.Maui/UserControls/LoginControl.xaml
@@ -9,7 +9,7 @@
     xmlns:mi_cupertino="clr-namespace:MauiIcons.Cupertino;assembly=MauiIcons.Cupertino"
     xmlns:mi_material="clr-namespace:MauiIcons.Material;assembly=MauiIcons.Material"
     xmlns:ts="using:SecureFolderFS.Maui.TemplateSelectors"
-    xmlns:vm="clr-namespace:SecureFolderFS.UI.ViewModels;assembly=SecureFolderFS.UI"
+    xmlns:vm="clr-namespace:SecureFolderFS.UI.ViewModels.Authentication;assembly=SecureFolderFS.UI"
     xmlns:vm2="clr-namespace:SecureFolderFS.Sdk.ViewModels.Controls.Authentication;assembly=SecureFolderFS.Sdk"
     x:Name="ThisLoginControl">
 
@@ -27,13 +27,13 @@
                             <mdc:Button
                                 Command="{Binding ProvideCredentialsCommand}"
                                 IsVisible="{Binding ProvideContinuationButton, Mode=OneWay, Source={x:Reference Name=ThisLoginControl}}"
-                                Text="{l:ResourceString Name=Continue}" />
+                                Text="{l:ResourceString Rid=Continue}" />
                         </On>
                         <On Platform="iOS">
                             <Button
                                 Command="{Binding ProvideCredentialsCommand}"
                                 IsVisible="{Binding ProvideContinuationButton, Mode=OneWay, Source={x:Reference Name=ThisLoginControl}}"
-                                Text="{l:ResourceString Name=Continue}" />
+                                Text="{l:ResourceString Rid=Continue}" />
                         </On>
                     </OnPlatform>
                 </VerticalStackLayout>
@@ -88,20 +88,20 @@
                     <Label
                         FontSize="17"
                         HorizontalOptions="Center"
-                        Text="Vault could not be loaded" />
+                        Text="{l:ResourceString Rid=VaultLoadError}" />
                     <Label
                         FontSize="12"
                         HorizontalOptions="Center"
                         HorizontalTextAlignment="Center"
                         Opacity="0.6"
-                        Text="{Binding ErrorMessage, Mode=OneWay}" />
+                        Text="{Binding Message, Mode=OneWay}" />
                 </VerticalStackLayout>
             </ContentView>
         </DataTemplate>
     </ContentView.Resources>
 
     <Grid x:Name="RootGrid" x:DataType="local:LoginControl">
-        <local:ContentPresentation ViewContent="{Binding CurrentViewModel, Mode=OneWay}">
+        <local:ContentPresentation Presentation="{Binding CurrentViewModel, Mode=OneWay}">
             <local:ContentPresentation.TemplateSelector>
                 <ts:LoginTemplateSelector
                     ErrorTemplate="{StaticResource ErrorTemplate}"
diff --git a/src/Platforms/SecureFolderFS.Maui/UserControls/Navigation/BrowserNavigationControl.cs b/src/Platforms/SecureFolderFS.Maui/UserControls/Navigation/BrowserNavigationControl.cs
new file mode 100644
index 000000000..efa6193f9
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Maui/UserControls/Navigation/BrowserNavigationControl.cs
@@ -0,0 +1,27 @@
+using SecureFolderFS.Shared.ComponentModel;
+using SecureFolderFS.UI.Utils;
+
+namespace SecureFolderFS.Maui.UserControls.Navigation
+{
+    /// <inheritdoc cref="INavigator"/>
+    internal sealed class BrowserNavigationControl : ContentPresentation, INavigator
+    {
+        /// <inheritdoc/>
+        public Task<bool> NavigateAsync(IViewDesignation? view)
+        {
+            throw new NotImplementedException();
+        }
+
+        /// <inheritdoc/>
+        public Task<bool> GoBackAsync()
+        {
+            throw new NotImplementedException();
+        }
+
+        /// <inheritdoc/>
+        public Task<bool> GoForwardAsync()
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Maui/UserControls/Navigation/ContentNavigationControl.xaml.cs b/src/Platforms/SecureFolderFS.Maui/UserControls/Navigation/ContentNavigationControl.xaml.cs
index 4e7cbd8b5..c3923a044 100644
--- a/src/Platforms/SecureFolderFS.Maui/UserControls/Navigation/ContentNavigationControl.xaml.cs
+++ b/src/Platforms/SecureFolderFS.Maui/UserControls/Navigation/ContentNavigationControl.xaml.cs
@@ -1,26 +1,23 @@
 using SecureFolderFS.Shared.ComponentModel;
-using SecureFolderFS.UI.Utils;
 
 namespace SecureFolderFS.Maui.UserControls.Navigation
 {
-    public abstract partial class ContentNavigationControl : ContentView, INavigationControl
+    public abstract partial class ContentNavigationControl : ContentView, INavigator, IDisposable
     {
         public ContentNavigationControl()
         {
             InitializeComponent();
             RootGrid.BindingContext = this;
         }
-
+        
         /// <inheritdoc/>
-        public async Task<bool> NavigateAsync<TTarget, TTransition>(TTarget? target, TTransition? transition = default)
-            where TTarget : IViewDesignation
-            where TTransition : class
+        public async Task<bool> NavigateAsync(IViewDesignation? view)
         {
             // Get the transition finalizer which will be used to end the transition
-            var transitionFinalizer = await ApplyTransitionAsync(target, transition);
+            var transitionFinalizer = await ApplyTransitionAsync(view);
 
             // Navigate by setting the content
-            Presentation.ViewContent = target;
+            Presentation.Presentation = view;
 
             // End the transition
             if (transitionFinalizer is not null)
@@ -29,12 +26,24 @@ public async Task<bool> NavigateAsync<TTarget, TTransition>(TTarget? target, TTr
             return true;
         }
 
-        protected abstract Task<IAsyncDisposable?> ApplyTransitionAsync<TTarget, TTransition>(TTarget? target, TTransition? transition = default) where TTransition : class;
+        /// <inheritdoc/>
+        public Task<bool> GoBackAsync()
+        {
+            return Task.FromResult(false);
+        }
+
+        /// <inheritdoc/>
+        public Task<bool> GoForwardAsync()
+        {
+            return Task.FromResult(false);
+        }
+        
+        protected abstract Task<IAsyncDisposable?> ApplyTransitionAsync<TTarget>(TTarget? target);
 
         /// <inheritdoc/>
         public void Dispose()
         {
-            (Presentation.ViewContent as IDisposable)?.Dispose();
+            (Presentation.Presentation as IDisposable)?.Dispose();
         }
 
         public DataTemplateSelector? TemplateSelector
diff --git a/src/Platforms/SecureFolderFS.Maui/UserControls/Navigation/ShellNavigationControl.cs b/src/Platforms/SecureFolderFS.Maui/UserControls/Navigation/ShellNavigationControl.cs
index b8d82ff48..98484d5f0 100644
--- a/src/Platforms/SecureFolderFS.Maui/UserControls/Navigation/ShellNavigationControl.cs
+++ b/src/Platforms/SecureFolderFS.Maui/UserControls/Navigation/ShellNavigationControl.cs
@@ -1,28 +1,54 @@
 using SecureFolderFS.Maui.Extensions;
 using SecureFolderFS.Maui.Views.Vault;
+using SecureFolderFS.Sdk.ViewModels.Views.Browser;
 using SecureFolderFS.Sdk.ViewModels.Views.Vault;
 using SecureFolderFS.Shared.ComponentModel;
-using SecureFolderFS.UI.Utils;
 
 namespace SecureFolderFS.Maui.UserControls.Navigation
 {
-    /// <inheritdoc cref="INavigationControl"/>
-    internal sealed class ShellNavigationControl : INavigationControl
+    /// <inheritdoc cref="INavigator"/>
+    internal sealed class ShellNavigationControl : INavigator
     {
         public static ShellNavigationControl Instance { get; } = new();
-
+        
         /// <inheritdoc/>
-        public async Task<bool> NavigateAsync<TTarget, TTransition>(TTarget? target, TTransition? transition = default)
-            where TTransition : class
-            where TTarget : IViewDesignation
+        public async Task<bool> NavigateAsync(IViewDesignation? view)
         {
-            var url = target switch
+            var url = view switch
             {
                 VaultLoginViewModel => "LoginPage",
                 VaultDashboardViewModel => "OverviewPage",
-                _ => throw new ArgumentOutOfRangeException(nameof(target))
+                BrowserViewModel => "BrowserPage",
+                _ => throw new ArgumentOutOfRangeException(nameof(view))
             };
 
+            url = ParseUrl(view, url);
+            await Shell.Current.GoToAsync(url, view.ToViewModelParameter());
+            
+            return true;
+        }
+
+        /// <inheritdoc/>
+        public async Task<bool> GoBackAsync()
+        {
+            await Shell.Current.GoBackAsync();
+            return true;
+        }
+
+        /// <inheritdoc/>
+        public Task<bool> GoForwardAsync()
+        {
+            return Task.FromResult(false);
+        }
+
+        private static string ParseUrl<TTarget>(TTarget? target, string url)
+        {
+            // Implementation detail: since we are navigating (and forgetting!) to OverviewPage from LoginPage (when logging-in)
+            // or to LoginPage from OverviewPage (when logging-out), the navigation stack no longer contains a reference to
+            // the login/dashboard view model, and so we need to synchronize the Shell navigation and modify the url in such a way
+            // that the aforementioned pages are popped from Shell in specific instances. This approach does not corrupt
+            // the navigation chain, but merely aligns it with our stack.
+            
             // Logging in, remove LoginPage when going back
             if (target is VaultDashboardViewModel && Shell.Current.CurrentPage is LoginPage)
                 url = $"../{url}";
@@ -31,13 +57,7 @@ public async Task<bool> NavigateAsync<TTarget, TTransition>(TTarget? target, TTr
             if (target is VaultLoginViewModel && Shell.Current.CurrentPage is OverviewPage)
                 url = $"../{url}";
 
-            await Shell.Current.GoToAsync(url, target.ToViewModelParameter());
-            return true;
-        }
-
-        /// <inheritdoc/>
-        public void Dispose()
-        {
+            return url;
         }
     }
 }
diff --git a/src/Platforms/SecureFolderFS.Maui/UserControls/Navigation/VaultDashboardNavigationControl.cs b/src/Platforms/SecureFolderFS.Maui/UserControls/Navigation/VaultDashboardNavigationControl.cs
deleted file mode 100644
index e9015e0ff..000000000
--- a/src/Platforms/SecureFolderFS.Maui/UserControls/Navigation/VaultDashboardNavigationControl.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace SecureFolderFS.Maui.UserControls.Navigation
-{
-    internal sealed class VaultDashboardNavigationControl : ContentNavigationControl
-    {
-        /// <inheritdoc/>
-        protected override Task<IAsyncDisposable?> ApplyTransitionAsync<TTarget, TTransition>(TTarget? target, TTransition? transition = default)
-            where TTarget : default
-            where TTransition : class
-        {
-            return Task.FromResult<IAsyncDisposable?>(null);
-        }
-    }
-}
diff --git a/src/Platforms/SecureFolderFS.Maui/UserControls/PanPinchContainer.cs b/src/Platforms/SecureFolderFS.Maui/UserControls/PanPinchContainer.cs
new file mode 100644
index 000000000..fc9bf717c
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Maui/UserControls/PanPinchContainer.cs
@@ -0,0 +1,239 @@
+// Some parts of the following code were used from MauiPanPinchContainer on the MIT License basis.
+// See the associated license file for more information.
+
+namespace SecureFolderFS.Maui.UserControls
+{
+    /// <summary>
+    /// <para><see href="https://learn.microsoft.com/en-us/dotnet/maui/fundamentals/gestures/pan"/></para>
+    /// <para><see href="https://learn.microsoft.com/en-us/dotnet/maui/fundamentals/gestures/pinch"/></para>
+    /// </summary>
+    public class PanPinchContainer : ContentView
+    {
+        private readonly TapGestureRecognizer _doubleTapGestureRecognizer;
+        private readonly PinchGestureRecognizer _pinchGestureRecognizer;
+        private readonly PanGestureRecognizer _panGestureRecognizer;
+        private bool _isPanEnabled = true;
+        private double _currentScale = 1;
+        private double _startScale = 1;
+        private double _panX;
+        private double _panY;
+
+        public PanPinchContainer()
+        {
+            _panGestureRecognizer = new PanGestureRecognizer();
+            _pinchGestureRecognizer = new PinchGestureRecognizer();
+            _doubleTapGestureRecognizer = new TapGestureRecognizer() { NumberOfTapsRequired = 2 };
+
+            _panGestureRecognizer.PanUpdated += OnPanUpdatedAsync;
+            _pinchGestureRecognizer.PinchUpdated += OnPinchUpdatedAsync;
+            _doubleTapGestureRecognizer.Tapped += DoubleTappedAsync;
+            
+            GestureRecognizers.Add(_panGestureRecognizer);
+            GestureRecognizers.Add(_pinchGestureRecognizer);
+            GestureRecognizers.Add(_doubleTapGestureRecognizer);
+        }
+
+        protected override void OnChildAdded(Element child)
+        {
+            base.OnChildAdded(child);
+            if (child is not View view)
+                return;
+
+            view.HorizontalOptions = LayoutOptions.Center;
+            view.VerticalOptions = LayoutOptions.Center;
+        }
+
+        private async Task ClampTranslationAsync(double transX, double transY, bool animate = false)
+        {
+            Content.AnchorX = 0;
+            Content.AnchorY = 0;
+
+            var contentWidth = Content.Width * _currentScale;
+            var contentHeight = Content.Height * _currentScale;
+
+            if (contentWidth <= Width)
+            {
+                transX = -(contentWidth - Content.Width) / 2;
+            }
+            else
+            {
+                var minBoundX = ((Width - Content.Width) / 2) + contentWidth - Width;
+                var maxBoundX = (Width - Content.Width) / 2;
+                transX = Math.Clamp(transX, -minBoundX, -maxBoundX);
+            }
+
+            if (contentHeight <= Height)
+                transY = -(contentHeight - Content.Height) / 2;
+            else
+            {
+                var minBoundY = ((Height - Content.Height) / 2) + contentHeight - Height;
+                var maxBoundY = (Height - Content.Height) / 2;
+                transY = Math.Clamp(transY, -minBoundY, -maxBoundY);
+            }
+
+            if (animate)
+                await TranslateToAsync(transX, transY);
+            else
+            {
+                Content.TranslationX = transX;
+                Content.TranslationY = transY;
+            }
+        }
+
+        private async Task ClampTranslationFromScaleOriginAsync(double originX, double originY, bool animate = false)
+        {
+            // The ScaleOrigin is in relative coordinates to the wrapped user interface element,
+            // so get the X pixel coordinate.
+            double renderedX = Content.X + _panX;
+            double deltaX = renderedX / Width;
+            double deltaWidth = Width / (Content.Width * _startScale);
+            originX = (originX - deltaX) * deltaWidth;
+
+            // The ScaleOrigin is in relative coordinates to the wrapped user interface element,
+            // so get the Y pixel coordinate.
+            double renderedY = Content.Y + _panY;
+            double deltaY = renderedY / Height;
+            double deltaHeight = Height / (Content.Height * _startScale);
+            originY = (originY - deltaY) * deltaHeight;
+
+            // Calculate the transformed element pixel coordinates.
+            double targetX = _panX - (originX * Content.Width * (_currentScale - _startScale));
+            double targetY = _panY - (originY * Content.Height * (_currentScale - _startScale));
+
+            // Apply translation based on the change in origin.
+            if (_currentScale > 1)
+            {
+                targetX = Math.Clamp(targetX, -Content.Width * (_currentScale - 1), 0);
+                targetY = Math.Clamp(targetY, -Content.Height * (_currentScale - 1), 0);
+            }
+            else
+            {
+                targetX = (Width - (Content.Width * _currentScale)) / 2;
+                targetY = Content.Height * (1 - _currentScale) / 2;
+            }
+
+            await ClampTranslationAsync(targetX, targetY, animate);
+        }
+
+        private async void DoubleTappedAsync(object? sender, TappedEventArgs e)
+        {
+            _startScale = Content.Scale;
+            _currentScale = _startScale;
+            _panX = Content.TranslationX;
+            _panY = Content.TranslationY;
+            _currentScale = _currentScale < 2 ? 2 : 1;
+
+            var point = e.GetPosition(sender as View);
+            var translateTask = Task.CompletedTask;
+            if (point is not null)
+                translateTask = ClampTranslationFromScaleOriginAsync(point.Value.X / Width, point.Value.Y / Height, true);
+
+            var scaleTask = ScaleToAsync(_currentScale);
+            await Task.WhenAll(translateTask, scaleTask);
+            _panX = Content.TranslationX;
+            _panY = Content.TranslationY;
+        }
+
+        private async void OnPanUpdatedAsync(object? sender, PanUpdatedEventArgs e)
+        {
+            if (!_isPanEnabled)
+                return;
+
+            if (Content.Scale <= 1)
+                return;
+
+            if (e.StatusType == GestureStatus.Started)
+            {
+                _panX = Content.TranslationX;
+                _panY = Content.TranslationY;
+
+                Content.AnchorX = 0;
+                Content.AnchorY = 0;
+            }
+            else if (e.StatusType == GestureStatus.Running)
+            {
+                // Translate and pan.
+                await ClampTranslationAsync(_panX + e.TotalX, _panY + e.TotalY);
+            }
+            else if (e.StatusType == GestureStatus.Completed)
+            {
+                // Store the translation applied during the pan
+                _panX = Content.TranslationX;
+                _panY = Content.TranslationY;
+            }
+            else if (e.StatusType == GestureStatus.Canceled)
+            {
+                Content.TranslationX = _panX;
+                Content.TranslationY = _panX;
+            }
+        }
+
+        private async void OnPinchUpdatedAsync(object? sender, PinchGestureUpdatedEventArgs e)
+        {
+            if (e.Status == GestureStatus.Started)
+            {
+                _isPanEnabled = false;
+
+                _panX = Content.TranslationX;
+                _panY = Content.TranslationY;
+
+                // Store the current scale factor applied to the wrapped user interface element,
+                // and zero the components for the center point of the translate transform.
+                _startScale = Content.Scale;
+
+                Content.AnchorX = 0;
+                Content.AnchorY = 0;
+            }
+
+            if (e.Status == GestureStatus.Running)
+            {
+                // Calculate the scale factor to be applied.
+                _currentScale += (e.Scale - 1) * _startScale;
+                _currentScale = Math.Clamp(_currentScale, 0.5, 10);
+
+                await ClampTranslationFromScaleOriginAsync(e.ScaleOrigin.X, e.ScaleOrigin.Y);
+
+                // Apply scale factor
+                Content.Scale = _currentScale;
+            }
+
+            if (e.Status == GestureStatus.Completed)
+            {
+                if (_currentScale < 1)
+                {
+                    var translateTask = TranslateToAsync(0, 0);
+                    var scaleTask = ScaleToAsync(1);
+
+                    await Task.WhenAll(translateTask, scaleTask);
+                }
+
+                // Store the translation delta's of the wrapped user interface element.
+                _panX = Content.TranslationX;
+                _panY = Content.TranslationY;
+
+                _isPanEnabled = true;
+            }
+            else if (e.Status == GestureStatus.Canceled)
+            {
+                Content.TranslationX = _panX;
+                Content.TranslationY = _panY;
+                Content.Scale = _startScale;
+
+                _isPanEnabled = true;
+            }
+        }
+
+        private async Task ScaleToAsync(double scale)
+        {
+            await Content.ScaleTo(scale, 250, Easing.Linear);
+            _currentScale = scale;
+        }
+
+        private async Task TranslateToAsync(double x, double y)
+        {
+            await Content.TranslateTo(x, y, 250, Easing.Linear);
+            _panX = x;
+            _panY = y;
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Maui/UserControls/PasswordControl.xaml b/src/Platforms/SecureFolderFS.Maui/UserControls/PasswordControl.xaml
index 3e4548a7d..8ca9eec14 100644
--- a/src/Platforms/SecureFolderFS.Maui/UserControls/PasswordControl.xaml
+++ b/src/Platforms/SecureFolderFS.Maui/UserControls/PasswordControl.xaml
@@ -15,17 +15,17 @@
                 <mdc:TextField
                     HorizontalOptions="Fill"
                     InputType="Password"
-                    LabelText="{Binding Placeholder, Mode=OneWay, FallbackValue={l:ResourceString Name=Password}}"
-                    SupportingText="{Binding Title, Mode=OneWay, FallbackValue={l:ResourceString Name=EnterPassword}}"
+                    LabelText="{Binding Placeholder, Mode=OneWay, FallbackValue={l:ResourceString Rid=Password}}"
+                    SupportingText="{Binding Title, Mode=OneWay, FallbackValue={l:ResourceString Rid=EnterPassword}}"
                     Text="{Binding UnsecurePassword, Mode=TwoWay}"
                     WidthRequest="320" />
             </On>
             <On Platform="iOS">
                 <VerticalStackLayout Spacing="2">
-                    <Label Opacity="0.6" Text="{Binding Title, Mode=OneWay, FallbackValue={l:ResourceString Name=EnterPassword}}" />
+                    <Label Opacity="0.6" Text="{Binding Title, Mode=OneWay, FallbackValue={l:ResourceString Rid=EnterPassword}}" />
                     <Entry
                         IsPassword="True"
-                        Placeholder="{Binding Placeholder, Mode=OneWay, FallbackValue={l:ResourceString Name=Password}}"
+                        Placeholder="{Binding Placeholder, Mode=OneWay, FallbackValue={l:ResourceString Rid=Password}}"
                         Text="{Binding UnsecurePassword, Mode=TwoWay}" />
                 </VerticalStackLayout>
             </On>
diff --git a/src/Platforms/SecureFolderFS.Maui/UserControls/RecoveryPreviewControl.xaml b/src/Platforms/SecureFolderFS.Maui/UserControls/RecoveryPreviewControl.xaml
index ac286dd3f..e2df23bc7 100644
--- a/src/Platforms/SecureFolderFS.Maui/UserControls/RecoveryPreviewControl.xaml
+++ b/src/Platforms/SecureFolderFS.Maui/UserControls/RecoveryPreviewControl.xaml
@@ -13,7 +13,7 @@
         <OnPlatform x:TypeArguments="View">
             <On Platform="Android">
                 <VerticalStackLayout BindingContext="{x:Reference ThisRecoveryControl}" Spacing="32">
-                    <Label FontSize="16" Text="{l:ResourceString Name=MasterKeyDescription}" />
+                    <Label FontSize="16" Text="{l:ResourceString Rid=MasterKeyDescription}" />
 
                     <VerticalStackLayout Spacing="8">
                         <mdc:Card Style="{DynamicResource FilledCardStyle}">
@@ -22,7 +22,7 @@
                                 <Label
                                     FontFamily="Courier New"
                                     LineBreakMode="CharacterWrap"
-                                    Text="{Binding MasterKey, Mode=OneWay, Source={x:Reference ThisRecoveryControl}}" />
+                                    Text="{Binding RecoveryKey, Mode=OneWay, Source={x:Reference ThisRecoveryControl}}" />
                             </VerticalStackLayout>
                         </mdc:Card>
                         <mdc:Button
@@ -36,7 +36,7 @@
             </On>
             <On Platform="iOS">
                 <VerticalStackLayout BindingContext="{x:Reference ThisRecoveryControl}" Spacing="32">
-                    <Label FontSize="16" Text="{l:ResourceString Name=MasterKeyDescription}" />
+                    <Label FontSize="16" Text="{l:ResourceString Rid=MasterKeyDescription}" />
 
                     <VerticalStackLayout Spacing="4">
                         <Label Opacity="0.6" Text="Recovery key" />
@@ -47,7 +47,7 @@
                             <Label
                                 FontFamily="Courier New"
                                 LineBreakMode="CharacterWrap"
-                                Text="{Binding MasterKey, Mode=OneWay}" />
+                                Text="{Binding RecoveryKey, Mode=OneWay}" />
                         </Border>
                         <Button
                             Command="{Binding ExportCommand, Mode=OneWay}"
diff --git a/src/Platforms/SecureFolderFS.Maui/UserControls/RecoveryPreviewControl.xaml.cs b/src/Platforms/SecureFolderFS.Maui/UserControls/RecoveryPreviewControl.xaml.cs
index cda1890f3..66c3545c6 100644
--- a/src/Platforms/SecureFolderFS.Maui/UserControls/RecoveryPreviewControl.xaml.cs
+++ b/src/Platforms/SecureFolderFS.Maui/UserControls/RecoveryPreviewControl.xaml.cs
@@ -10,13 +10,13 @@ public RecoveryPreviewControl()
             RootGrid.BindingContext = this;
         }
         
-        public string? MasterKey
+        public string? RecoveryKey
         {
-            get => (string?)GetValue(MasterKeyProperty);
-            set => SetValue(MasterKeyProperty, value);
+            get => (string?)GetValue(RecoveryKeyProperty);
+            set => SetValue(RecoveryKeyProperty, value);
         }
-        public static readonly BindableProperty MasterKeyProperty =
-            BindableProperty.Create(nameof(MasterKey), typeof(string), typeof(RecoveryPreviewControl), null);
+        public static readonly BindableProperty RecoveryKeyProperty =
+            BindableProperty.Create(nameof(RecoveryKey), typeof(string), typeof(RecoveryPreviewControl), null);
         
         public ICommand? ExportCommand
         {
diff --git a/src/Platforms/SecureFolderFS.Maui/UserControls/RegisterControl.xaml b/src/Platforms/SecureFolderFS.Maui/UserControls/RegisterControl.xaml
index c78106eb8..ed0b27e7b 100644
--- a/src/Platforms/SecureFolderFS.Maui/UserControls/RegisterControl.xaml
+++ b/src/Platforms/SecureFolderFS.Maui/UserControls/RegisterControl.xaml
@@ -10,15 +10,15 @@
     xmlns:mi_material="clr-namespace:MauiIcons.Material;assembly=MauiIcons.Material"
     xmlns:ts="clr-namespace:SecureFolderFS.Maui.TemplateSelectors"
     xmlns:uc="clr-namespace:SecureFolderFS.Maui.UserControls"
-    xmlns:vm="clr-namespace:SecureFolderFS.UI.ViewModels;assembly=SecureFolderFS.UI">
+    xmlns:vm="clr-namespace:SecureFolderFS.UI.ViewModels.Authentication;assembly=SecureFolderFS.UI">
 
     <ContentView.Resources>
         <!--  Password Template  -->
         <DataTemplate x:Key="PasswordTemplate" x:DataType="vm:PasswordCreationViewModel">
             <ContentView>
                 <VerticalStackLayout Spacing="16">
-                    <local:PasswordControl Title="{l:ResourceString Name=NewPassword}" UnsecurePassword="{Binding PrimaryPassword, Mode=TwoWay}" />
-                    <local:PasswordControl Title="{l:ResourceString Name=RepeatPassword}" UnsecurePassword="{Binding SecondaryPassword, Mode=TwoWay}" />
+                    <local:PasswordControl Title="{l:ResourceString Rid=NewPassword}" UnsecurePassword="{Binding PrimaryPassword, Mode=TwoWay}" />
+                    <local:PasswordControl Title="{l:ResourceString Rid=RepeatPassword}" UnsecurePassword="{Binding SecondaryPassword, Mode=TwoWay}" />
                 </VerticalStackLayout>
             </ContentView>
         </DataTemplate>
@@ -43,7 +43,7 @@
                     <Label
                         HorizontalOptions="Center"
                         Opacity="0.6"
-                        Text="{l:ResourceString Name=SetupKeyFile}" />
+                        Text="{l:ResourceString Rid=SetupKeyFile}" />
 
                     <!--  Authenticate  -->
                     <OnPlatform x:TypeArguments="View">
@@ -51,13 +51,13 @@
                             <mdc:Button
                                 Command="{Binding ProvideCredentialsCommand}"
                                 HorizontalOptions="Center"
-                                Text="{l:ResourceString Name=Setup}" />
+                                Text="{l:ResourceString Rid=Setup}" />
                         </On>
                         <On Platform="iOS">
                             <Button
                                 Command="{Binding ProvideCredentialsCommand}"
                                 HorizontalOptions="Center"
-                                Text="{l:ResourceString Name=Setup}" />
+                                Text="{l:ResourceString Rid=Setup}" />
                         </On>
                     </OnPlatform>
                 </VerticalStackLayout>
@@ -66,7 +66,7 @@
     </ContentView.Resources>
 
     <Grid x:Name="RootGrid" x:DataType="local:RegisterControl">
-        <uc:ContentPresentation ViewContent="{Binding CurrentViewModel, Mode=OneWay}">
+        <uc:ContentPresentation Presentation="{Binding CurrentViewModel, Mode=OneWay}">
             <uc:ContentPresentation.TemplateSelector>
                 <ts:RegistrationTemplateSelector KeyFileTemplate="{StaticResource KeyFileTemplate}" PasswordTemplate="{StaticResource PasswordTemplate}" />
             </uc:ContentPresentation.TemplateSelector>
diff --git a/src/Platforms/SecureFolderFS.Maui/UserControls/TransferControl.xaml b/src/Platforms/SecureFolderFS.Maui/UserControls/TransferControl.xaml
new file mode 100644
index 000000000..279c747b9
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Maui/UserControls/TransferControl.xaml
@@ -0,0 +1,47 @@
+<ContentView
+    x:Class="SecureFolderFS.Maui.UserControls.TransferControl"
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:l="clr-namespace:SecureFolderFS.Maui.Localization"
+    xmlns:local="clr-namespace:SecureFolderFS.Maui.UserControls"
+    xmlns:mdc="clr-namespace:Material.Components.Maui;assembly=Material.Components.Maui"
+    xmlns:mdci="clr-namespace:IconPacks.IconKind;assembly=IconPacks.Material"
+    xmlns:uc="clr-namespace:SecureFolderFS.Maui.UserControls"
+    x:Name="RootControl">
+
+    <Grid
+        Padding="16"
+        x:DataType="local:TransferControl"
+        Background="{StaticResource SecondaryBrush}"
+        BackgroundColor="Gray"
+        BindingContext="{x:Reference RootControl}">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition />
+            <ColumnDefinition Width="Auto" />
+        </Grid.ColumnDefinitions>
+
+        <Label
+            Grid.Column="0"
+            FontSize="18"
+            Text="{Binding Title, Mode=OneWay}"
+            VerticalOptions="Center" />
+
+        <OnPlatform x:TypeArguments="View">
+            <On Platform="Android">
+                <HorizontalStackLayout Grid.Column="1" Spacing="8">
+                    <mdc:IconButton
+                        Command="{Binding CancelCommand, Mode=OneWay}"
+                        IconData="{x:Static mdci:Material.Close}"
+                        Style="{DynamicResource OutlinedIconButtonStyle}" />
+                    <uc:ActivityButton Command="{Binding PrimaryCommand, Mode=OneWay}" Text="{Binding PrimaryButtonText, Mode=OneWay}" />
+                </HorizontalStackLayout>
+            </On>
+            <On Platform="iOS">
+                <HorizontalStackLayout Grid.Column="1" Spacing="8">
+                    <Button Command="{Binding CancelCommand, Mode=OneWay}" Text="{l:ResourceString Rid=Cancel}" />
+                    <uc:ActivityButton Command="{Binding PrimaryCommand, Mode=OneWay}" Text="{Binding PrimaryButtonText, Mode=OneWay}" />
+                </HorizontalStackLayout>
+            </On>
+        </OnPlatform>
+    </Grid>
+</ContentView>
diff --git a/src/Platforms/SecureFolderFS.Maui/UserControls/TransferControl.xaml.cs b/src/Platforms/SecureFolderFS.Maui/UserControls/TransferControl.xaml.cs
new file mode 100644
index 000000000..d75556c24
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Maui/UserControls/TransferControl.xaml.cs
@@ -0,0 +1,44 @@
+using System.Windows.Input;
+
+namespace SecureFolderFS.Maui.UserControls
+{
+    public partial class TransferControl : ContentView
+    {
+        public TransferControl()
+        {
+            InitializeComponent();
+        }
+        
+        public string? Title
+        {
+            get => (string?)GetValue(TitleProperty);
+            set => SetValue(TitleProperty, value);
+        }
+        public static readonly BindableProperty TitleProperty =
+            BindableProperty.Create(nameof(Title), typeof(string), typeof(TransferControl), defaultValue: null);
+        
+        public string? PrimaryButtonText
+        {
+            get => (string?)GetValue(PrimaryButtonTextProperty);
+            set => SetValue(PrimaryButtonTextProperty, value);
+        }
+        public static readonly BindableProperty PrimaryButtonTextProperty =
+            BindableProperty.Create(nameof(PrimaryButtonText), typeof(string), typeof(TransferControl), defaultValue: null);
+        
+        public ICommand? CancelCommand
+        {
+            get => (ICommand?)GetValue(CancelCommandProperty);
+            set => SetValue(CancelCommandProperty, value);
+        }
+        public static readonly BindableProperty CancelCommandProperty =
+            BindableProperty.Create(nameof(CancelCommand), typeof(ICommand), typeof(TransferControl), defaultValue: null);
+        
+        public ICommand? PrimaryCommand
+        {
+            get => (ICommand?)GetValue(PrimaryCommandProperty);
+            set => SetValue(PrimaryCommandProperty, value);
+        }
+        public static readonly BindableProperty PrimaryCommandProperty =
+            BindableProperty.Create(nameof(PrimaryCommand), typeof(ICommand), typeof(TransferControl), defaultValue: null);
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Maui/UserControls/Widgets/AggregatedDataWidget.xaml b/src/Platforms/SecureFolderFS.Maui/UserControls/Widgets/AggregatedDataWidget.xaml
new file mode 100644
index 000000000..fd409c59f
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Maui/UserControls/Widgets/AggregatedDataWidget.xaml
@@ -0,0 +1,33 @@
+<ContentView
+    x:Class="SecureFolderFS.Maui.UserControls.Widgets.AggregatedDataWidget"
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:l="clr-namespace:SecureFolderFS.Maui.Localization"
+    xmlns:local="clr-namespace:SecureFolderFS.Maui.UserControls.Widgets"
+    x:Name="RootControl">
+
+    <Grid
+        x:DataType="local:AggregatedDataWidget"
+        BindingContext="{x:Reference RootControl}"
+        ColumnSpacing="24">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition />
+            <ColumnDefinition />
+        </Grid.ColumnDefinitions>
+
+        <VerticalStackLayout Grid.Column="0">
+            <Label Opacity="0.6" Text="{l:ResourceString Rid=TotalRead}" />
+            <Label
+                FontAttributes="Bold"
+                FontSize="22"
+                Text="{Binding TotalRead, Mode=OneWay}" />
+        </VerticalStackLayout>
+        <VerticalStackLayout Grid.Column="1">
+            <Label Opacity="0.6" Text="{l:ResourceString Rid=TotalWrite}" />
+            <Label
+                FontAttributes="Bold"
+                FontSize="22"
+                Text="{Binding TotalWrite, Mode=OneWay}" />
+        </VerticalStackLayout>
+    </Grid>
+</ContentView>
diff --git a/src/Platforms/SecureFolderFS.Maui/UserControls/Widgets/AggregatedDataWidget.xaml.cs b/src/Platforms/SecureFolderFS.Maui/UserControls/Widgets/AggregatedDataWidget.xaml.cs
new file mode 100644
index 000000000..6875070d0
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Maui/UserControls/Widgets/AggregatedDataWidget.xaml.cs
@@ -0,0 +1,27 @@
+namespace SecureFolderFS.Maui.UserControls.Widgets
+{
+    public partial class AggregatedDataWidget : ContentView
+    {
+        public AggregatedDataWidget()
+        {
+            InitializeComponent();
+        }
+        
+        public string? TotalRead
+        {
+            get => (string?)GetValue(TotalReadProperty);
+            set => SetValue(TotalReadProperty, value);
+        }
+        public static readonly BindableProperty TotalReadProperty =
+            BindableProperty.Create(nameof(TotalRead), typeof(string), typeof(AggregatedDataWidget), null);
+        
+        public string? TotalWrite
+        {
+            get => (string?)GetValue(TotalWriteProperty);
+            set => SetValue(TotalWriteProperty, value);
+        }
+        public static readonly BindableProperty TotalWriteProperty =
+            BindableProperty.Create(nameof(TotalWrite), typeof(string), typeof(AggregatedDataWidget), null);
+    }
+}
+
diff --git a/src/Platforms/SecureFolderFS.Maui/UserControls/Widgets/HealthWidget.xaml b/src/Platforms/SecureFolderFS.Maui/UserControls/Widgets/HealthWidget.xaml
new file mode 100644
index 000000000..57a84e090
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Maui/UserControls/Widgets/HealthWidget.xaml
@@ -0,0 +1,23 @@
+<ContentView
+    x:Class="SecureFolderFS.Maui.UserControls.Widgets.HealthWidget"
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:l="clr-namespace:SecureFolderFS.Maui.Localization"
+    xmlns:local="clr-namespace:SecureFolderFS.Maui.UserControls.Widgets"
+    x:Name="RootControl">
+
+    <HorizontalStackLayout
+        x:DataType="local:HealthWidget"
+        BindingContext="{x:Reference RootControl}"
+        Spacing="4">
+        <Image
+            Margin="-4,0,0,0"
+            HeightRequest="48"
+            Source="success_shield.png" />
+        <Label
+            FontAttributes="Bold"
+            FontSize="18"
+            Text="{l:ResourceString Rid=HealthNoProblems}"
+            VerticalOptions="Center" />
+    </HorizontalStackLayout>
+</ContentView>
diff --git a/src/Platforms/SecureFolderFS.Maui/UserControls/Widgets/HealthWidget.xaml.cs b/src/Platforms/SecureFolderFS.Maui/UserControls/Widgets/HealthWidget.xaml.cs
new file mode 100644
index 000000000..41154dfbb
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Maui/UserControls/Widgets/HealthWidget.xaml.cs
@@ -0,0 +1,11 @@
+namespace SecureFolderFS.Maui.UserControls.Widgets
+{
+    public partial class HealthWidget : ContentView
+    {
+        public HealthWidget()
+        {
+            InitializeComponent();
+        }
+    }
+}
+
diff --git a/src/Platforms/SecureFolderFS.Maui/ValueConverters/BoolInvertConverter.cs b/src/Platforms/SecureFolderFS.Maui/ValueConverters/BoolInvertConverter.cs
index 8a1f71302..f85ba7d22 100644
--- a/src/Platforms/SecureFolderFS.Maui/ValueConverters/BoolInvertConverter.cs
+++ b/src/Platforms/SecureFolderFS.Maui/ValueConverters/BoolInvertConverter.cs
@@ -4,7 +4,7 @@
 namespace SecureFolderFS.Maui.ValueConverters
 {
     /// <inheritdoc cref="BaseBoolInvertConverter"/>
-    public sealed class BoolInvertConverter : BaseBoolInvertConverter, IValueConverter
+    internal sealed class BoolInvertConverter : BaseBoolInvertConverter, IValueConverter
     {
         /// <inheritdoc/>
         public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
diff --git a/src/Platforms/SecureFolderFS.Maui/ValueConverters/BoolSelectionModeConverter.cs b/src/Platforms/SecureFolderFS.Maui/ValueConverters/BoolSelectionModeConverter.cs
new file mode 100644
index 000000000..256cf3a2a
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Maui/ValueConverters/BoolSelectionModeConverter.cs
@@ -0,0 +1,22 @@
+using System.Globalization;
+
+namespace SecureFolderFS.Maui.ValueConverters
+{
+    internal sealed class BoolSelectionModeConverter : IValueConverter
+    {
+        /// <inheritdoc/>
+        public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+        {
+            if (value is not bool bValue)
+                return SelectionMode.None;
+
+            return bValue ? SelectionMode.Multiple : SelectionMode.None;
+        }
+
+        /// <inheritdoc/>
+        public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Maui/ValueConverters/BoolToStringConverter.cs b/src/Platforms/SecureFolderFS.Maui/ValueConverters/BoolToStringConverter.cs
new file mode 100644
index 000000000..218224598
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Maui/ValueConverters/BoolToStringConverter.cs
@@ -0,0 +1,19 @@
+using System.Globalization;
+using SecureFolderFS.UI.ValueConverters;
+
+namespace SecureFolderFS.Maui.ValueConverters
+{
+    /// <inheritdoc cref="BaseBoolToStringConverter"/>
+    internal sealed class BoolToStringConverter : BaseBoolToStringConverter, IValueConverter
+    {
+        public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+        {
+            return TryConvert(value, targetType, parameter);
+        }
+
+        public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+        {
+            return TryConvertBack(value, targetType, parameter);
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Maui/ValueConverters/BreadcrumbConverter.cs b/src/Platforms/SecureFolderFS.Maui/ValueConverters/BreadcrumbConverter.cs
new file mode 100644
index 000000000..354acd121
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Maui/ValueConverters/BreadcrumbConverter.cs
@@ -0,0 +1,31 @@
+using System.Globalization;
+
+namespace SecureFolderFS.Maui.ValueConverters
+{
+    internal sealed class BreadcrumbConverter : IValueConverter
+    {
+        /// <inheritdoc/>
+        public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+        {
+            if (parameter is not string strParam)
+                return null;
+
+            switch (strParam.ToLower())
+            {
+                case "fontattributes":
+                    if (value is not bool bValue)
+                        return FontAttributes.None;
+                    
+                    return bValue ? FontAttributes.Bold : FontAttributes.None;
+            }
+
+            return null;
+        }
+
+        /// <inheritdoc/>
+        public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Maui/ValueConverters/DateTimeToStringConverter.cs b/src/Platforms/SecureFolderFS.Maui/ValueConverters/DateTimeToStringConverter.cs
index af8946816..f2ba3ab16 100644
--- a/src/Platforms/SecureFolderFS.Maui/ValueConverters/DateTimeToStringConverter.cs
+++ b/src/Platforms/SecureFolderFS.Maui/ValueConverters/DateTimeToStringConverter.cs
@@ -4,18 +4,18 @@
 namespace SecureFolderFS.Maui.ValueConverters
 {
     /// <inheritdoc cref="BaseDateTimeToStringConverter"/>
-    public sealed class DateTimeToStringConverter : BaseDateTimeToStringConverter, IValueConverter
+    internal sealed class DateTimeToStringConverter : BaseDateTimeToStringConverter, IValueConverter
     {
         /// <inheritdoc/>
         public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
         {
-            return base.TryConvert(value, targetType, parameter);
+            return TryConvert(value, targetType, parameter);
         }
 
         /// <inheritdoc/>
         public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
         {
-            return base.TryConvertBack(value, targetType, parameter);
+            return TryConvertBack(value, targetType, parameter);
         }
     }
 }
diff --git a/src/Platforms/SecureFolderFS.Maui/ValueConverters/FileIconConverter.cs b/src/Platforms/SecureFolderFS.Maui/ValueConverters/FileIconConverter.cs
new file mode 100644
index 000000000..6dd7bb104
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Maui/ValueConverters/FileIconConverter.cs
@@ -0,0 +1,40 @@
+using System.Globalization;
+using MauiIcons.Core;
+using MauiIcons.Material;
+using SecureFolderFS.Sdk.ViewModels.Views.Browser;
+using IImage = SecureFolderFS.Shared.ComponentModel.IImage;
+
+namespace SecureFolderFS.Maui.ValueConverters
+{
+    internal sealed class FileIconConverter : IValueConverter
+    {
+        /// <inheritdoc/>
+        public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+        {
+            if (parameter is not View { BindingContext: BrowserItemViewModel itemViewModel })
+                return null;
+
+            return value switch
+            {
+                IImage image => ToImage(image),
+                _ => itemViewModel switch
+                {
+                    FolderViewModel => new MauiIcon() { Icon = MaterialIcons.Folder },
+                    _ => new MauiIcon() { Icon = MaterialIcons.Description }
+                }
+            };
+            
+            static object? ToImage(IImage image)
+            {
+                // TODO: Implement IImage
+                return null;
+            }
+        }
+
+        /// <inheritdoc/>
+        public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Maui/ValueConverters/FolderItemsCountToStringConverter.cs b/src/Platforms/SecureFolderFS.Maui/ValueConverters/FolderItemsCountToStringConverter.cs
new file mode 100644
index 000000000..8585b48e1
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Maui/ValueConverters/FolderItemsCountToStringConverter.cs
@@ -0,0 +1,23 @@
+using System.Globalization;
+
+namespace SecureFolderFS.Maui.ValueConverters
+{
+    internal sealed class FolderItemsCountToStringConverter : IValueConverter
+    {
+        /// <inheritdoc/>
+        public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+        {
+            if (value is not int intValue)
+                return null;
+            
+            // TODO: Localize text (use different strings for singular and plural forms)
+            return $"{intValue} elements"; 
+        }
+
+        /// <inheritdoc/>
+        public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Maui/ValueConverters/ImageToSourceConverter.cs b/src/Platforms/SecureFolderFS.Maui/ValueConverters/ImageToSourceConverter.cs
new file mode 100644
index 000000000..d872db455
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Maui/ValueConverters/ImageToSourceConverter.cs
@@ -0,0 +1,24 @@
+using System.Globalization;
+using SecureFolderFS.Maui.AppModels;
+
+namespace SecureFolderFS.Maui.ValueConverters
+{
+    internal sealed class ImageToSourceConverter : IValueConverter
+    {
+        /// <inheritdoc/>
+        public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+        {
+            return value switch
+            {
+                ImageStream imageStream => imageStream.Source,
+                _ => null
+            };
+        }
+
+        /// <inheritdoc/>
+        public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Maui/ValueConverters/LoginViewModelBoolConverter.cs b/src/Platforms/SecureFolderFS.Maui/ValueConverters/LoginViewModelBoolConverter.cs
index 410f455da..945f67a0d 100644
--- a/src/Platforms/SecureFolderFS.Maui/ValueConverters/LoginViewModelBoolConverter.cs
+++ b/src/Platforms/SecureFolderFS.Maui/ValueConverters/LoginViewModelBoolConverter.cs
@@ -3,8 +3,8 @@
 
 namespace SecureFolderFS.Maui.ValueConverters
 {
-    /// <inheritdoc cref="BaseLoginViewModelBoolConverter"/>
-    internal sealed class LoginViewModelBoolConverter : BaseLoginViewModelBoolConverter, IValueConverter
+    /// <inheritdoc cref="BaseLoginViewModelConverter"/>
+    internal sealed class LoginViewModelBoolConverter : BaseLoginViewModelConverter, IValueConverter
     {
         /// <inheritdoc/>
         public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
diff --git a/src/Platforms/SecureFolderFS.Maui/ValueConverters/MediaToSourceConverter.cs b/src/Platforms/SecureFolderFS.Maui/ValueConverters/MediaToSourceConverter.cs
new file mode 100644
index 000000000..31a58ac95
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Maui/ValueConverters/MediaToSourceConverter.cs
@@ -0,0 +1,25 @@
+using System.Globalization;
+using CommunityToolkit.Maui.Views;
+using SecureFolderFS.Maui.AppModels;
+
+namespace SecureFolderFS.Maui.ValueConverters
+{
+    internal sealed class MediaToSourceConverter : IValueConverter
+    {
+        /// <inheritdoc/>
+        public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+        {
+            return value switch
+            {
+                VideoStreamServer videoServer => MediaSource.FromUri(videoServer.BaseAddress),
+                _ => null
+            };
+        }
+
+        /// <inheritdoc/>
+        public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Maui/ValueConverters/TransferTypeToOperationStringConverter.cs b/src/Platforms/SecureFolderFS.Maui/ValueConverters/TransferTypeToOperationStringConverter.cs
new file mode 100644
index 000000000..cad08a07c
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Maui/ValueConverters/TransferTypeToOperationStringConverter.cs
@@ -0,0 +1,29 @@
+using System.Globalization;
+using SecureFolderFS.Sdk.Enums;
+
+namespace SecureFolderFS.Maui.ValueConverters
+{
+    internal sealed class TransferTypeToOperationStringConverter : IValueConverter
+    {
+        /// <inheritdoc/>
+        public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+        {
+            if (value is not TransferType transferType)
+                return "Transfer";
+
+            return transferType switch
+            {
+                TransferType.Copy => "Copy",
+                TransferType.Move => "Move",
+                TransferType.Recycle => "Recycle",
+                _ => "Transfer"
+            };
+        }
+
+        /// <inheritdoc/>
+        public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Maui/Views/MainPage.xaml b/src/Platforms/SecureFolderFS.Maui/Views/MainPage.xaml
index 8dc9c3cae..a312765c1 100644
--- a/src/Platforms/SecureFolderFS.Maui/Views/MainPage.xaml
+++ b/src/Platforms/SecureFolderFS.Maui/Views/MainPage.xaml
@@ -12,7 +12,7 @@
     xmlns:mi_material="clr-namespace:MauiIcons.Material;assembly=MauiIcons.Material"
     xmlns:vc="clr-namespace:SecureFolderFS.Maui.ValueConverters"
     xmlns:vm="clr-namespace:SecureFolderFS.Sdk.ViewModels.Controls.VaultList;assembly=SecureFolderFS.Sdk"
-    Title="{l:ResourceString Name=MyVaults}"
+    Title="{l:ResourceString Rid=MyVaults}"
     ios:Page.LargeTitleDisplay="Always"
     x:DataType="local:MainPage"
     Loaded="MainPage_Loaded">
@@ -23,66 +23,75 @@
         <vc:BoolInvertConverter x:Key="BoolInvertConverter" />
     </ContentPage.Resources>
 
-    <VerticalStackLayout>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
+
         <SearchBar
+            Grid.Row="0"
             HeightRequest="24"
             IsVisible="True"
             Placeholder="Search" />
-        <Grid>
-            <ListView
-                ItemTapped="ListView_ItemTapped"
-                ItemsSource="{Binding ViewModel.VaultListViewModel.Items, Mode=OneWay}"
-                RowHeight="64"
-                SelectionMode="None">
-                <ListView.ItemTemplate>
-                    <DataTemplate x:DataType="vm:VaultListItemViewModel">
-                        <ViewCell>
-                            <ViewCell.ContextActions>
-                                <MenuFlyoutItem Command="{Binding RemoveVaultCommand}" Text="Remove" />
-                            </ViewCell.ContextActions>
 
-                            <HorizontalStackLayout
-                                Padding="8,2"
-                                Spacing="8"
-                                VerticalOptions="Center">
-                                <Grid VerticalOptions="Center">
-                                    <mi:MauiIcon Icon="{mi_material:Material Lock}" OnPlatforms="Android" />
-                                    <mi:MauiIcon Icon="{mi_cupertino:Cupertino Lock}" OnPlatforms="iOS" />
-                                </Grid>
+        <ListView
+            Grid.Row="1"
+            ItemTapped="ListView_ItemTapped"
+            ItemsSource="{Binding ViewModel.VaultListViewModel.Items, Mode=OneWay}"
+            RowHeight="64"
+            SelectionMode="None">
+            <ListView.ItemTemplate>
+                <DataTemplate x:DataType="vm:VaultListItemViewModel">
+                    <ViewCell>
+                        <ViewCell.ContextActions>
+                            <MenuFlyoutItem Command="{Binding RemoveVaultCommand}" Text="Remove" />
+                        </ViewCell.ContextActions>
+
+                        <HorizontalStackLayout
+                            Padding="8,2"
+                            Spacing="8"
+                            VerticalOptions="Center">
+                            <Grid VerticalOptions="Center">
+                                <mi:MauiIcon Icon="{mi_material:Material Lock}" OnPlatforms="Android" />
+                                <mi:MauiIcon Icon="{mi_cupertino:Cupertino Lock}" OnPlatforms="iOS" />
+                            </Grid>
 
-                                <VerticalStackLayout VerticalOptions="Center">
-                                    <Label
-                                        FontAttributes="Bold"
-                                        FontSize="16"
-                                        Text="{Binding VaultModel.VaultName, Mode=OneWay}"
-                                        VerticalOptions="Center" />
-                                    <Label IsVisible="{Binding LastAccessDate, Mode=OneWay, Converter={StaticResource NullToBoolConverter}}" Text="{Binding LastAccessDate, Mode=OneWay, Converter={StaticResource DateTimeToStringConverter}}" />
-                                </VerticalStackLayout>
-                            </HorizontalStackLayout>
-                        </ViewCell>
-                    </DataTemplate>
-                </ListView.ItemTemplate>
-            </ListView>
+                            <VerticalStackLayout VerticalOptions="Center">
+                                <Label
+                                    FontAttributes="Bold"
+                                    FontSize="16"
+                                    Text="{Binding VaultViewModel.VaultName, Mode=OneWay}"
+                                    VerticalOptions="Center" />
+                                <Label IsVisible="{Binding VaultViewModel.LastAccessDate, Mode=OneWay, Converter={StaticResource NullToBoolConverter}}" Text="{Binding VaultViewModel.LastAccessDate, Mode=OneWay, Converter={StaticResource DateTimeToStringConverter}}" />
+                            </VerticalStackLayout>
+                        </HorizontalStackLayout>
+                    </ViewCell>
+                </DataTemplate>
+            </ListView.ItemTemplate>
+        </ListView>
 
-            <VerticalStackLayout
-                Margin="0,0,0,64"
-                Padding="12,0"
-                IsVisible="{Binding ViewModel.VaultListViewModel.HasVaults, Mode=OneWay, Converter={StaticResource BoolInvertConverter}}"
-                Spacing="16"
-                VerticalOptions="Center">
-                <Image Source="app_icon.png" WidthRequest="64" />
-                <Label
-                    FontAttributes="Bold"
-                    FontSize="24"
-                    HorizontalOptions="Center"
-                    Text="{l:ResourceString Name=Welcome}" />
-                <Label
-                    FontSize="16"
-                    HorizontalOptions="Center"
-                    HorizontalTextAlignment="Center"
-                    Text="{l:ResourceString Name=NoVaultsMessage}" />
-            </VerticalStackLayout>
+        <VerticalStackLayout
+            Grid.Row="1"
+            Margin="0,0,0,64"
+            Padding="12,0"
+            IsVisible="{Binding ViewModel.VaultListViewModel.HasVaults, Mode=OneWay, Converter={StaticResource BoolInvertConverter}}"
+            Spacing="16"
+            VerticalOptions="Center">
+            <Image Source="app_icon.png" WidthRequest="64" />
+            <Label
+                FontAttributes="Bold"
+                FontSize="24"
+                HorizontalOptions="Center"
+                Text="{l:ResourceString Rid=Welcome}" />
+            <Label
+                FontSize="16"
+                HorizontalOptions="Center"
+                HorizontalTextAlignment="Center"
+                Text="{l:ResourceString Rid=NoVaultsMessage}" />
+        </VerticalStackLayout>
 
+        <Grid Grid.Row="0" Grid.RowSpan="2">
             <OnPlatform x:TypeArguments="View">
                 <On Platform="Android">
                     <mdc:FAB
@@ -94,5 +103,5 @@
                 </On>
             </OnPlatform>
         </Grid>
-    </VerticalStackLayout>
+    </Grid>
 </local:ContentPageExtended>
diff --git a/src/Platforms/SecureFolderFS.Maui/Views/MainPage.xaml.cs b/src/Platforms/SecureFolderFS.Maui/Views/MainPage.xaml.cs
index 3d8b1ccfd..4a05f5b1e 100644
--- a/src/Platforms/SecureFolderFS.Maui/Views/MainPage.xaml.cs
+++ b/src/Platforms/SecureFolderFS.Maui/Views/MainPage.xaml.cs
@@ -1,7 +1,7 @@
-using SecureFolderFS.Maui.AppModels;
+using MauiIcons.Core;
 using SecureFolderFS.Maui.ServiceImplementation;
 using SecureFolderFS.Maui.UserControls.Navigation;
-using SecureFolderFS.Sdk.Extensions;
+using SecureFolderFS.Sdk.Contexts;
 using SecureFolderFS.Sdk.ViewModels.Controls.VaultList;
 using SecureFolderFS.Sdk.ViewModels.Views.Host;
 using SecureFolderFS.Sdk.ViewModels.Views.Vault;
@@ -21,7 +21,7 @@ public MainPage()
             Instance = this;
             BindingContext = this;
             _ = ViewModel.InitAsync();
-            _ = new MauiIcons.Core.MauiIcon(); // Workaround for XFC0000
+            _ = new MauiIcon(); // Workaround for XFC0000
 
             InitializeComponent();
         }
@@ -32,10 +32,10 @@ private async void ListView_ItemTapped(object? sender, ItemTappedEventArgs e)
             if (e.Item is not VaultListItemViewModel itemViewModel)
                 return;
 
-            var target = ViewModel.NavigationService.Views.FirstOrDefault(x => (x as BaseVaultViewModel)?.VaultModel.Equals(itemViewModel.VaultModel) ?? false);
+            var target = ViewModel.NavigationService.Views.FirstOrDefault(x => (x as IVaultViewContext)?.VaultViewModel.VaultModel.Equals(itemViewModel.VaultViewModel.VaultModel) ?? false);
             if (target is null)
             {
-                var vaultLoginViewModel = new VaultLoginViewModel(itemViewModel.VaultModel, ViewModel.NavigationService);
+                var vaultLoginViewModel = new VaultLoginViewModel(itemViewModel.VaultViewModel, ViewModel.NavigationService);
                 _ = vaultLoginViewModel.InitAsync();
                 target = vaultLoginViewModel;
             }
diff --git a/src/Platforms/SecureFolderFS.Maui/Views/Modals/BaseModalPage.xaml b/src/Platforms/SecureFolderFS.Maui/Views/Modals/BaseModalPage.xaml
index 1bf334e8b..23d35e2ca 100644
--- a/src/Platforms/SecureFolderFS.Maui/Views/Modals/BaseModalPage.xaml
+++ b/src/Platforms/SecureFolderFS.Maui/Views/Modals/BaseModalPage.xaml
@@ -64,7 +64,12 @@
 
     <OnPlatform x:TypeArguments="View">
         <On Platform="Android">
-            <Border BackgroundColor="White" BindingContext="{x:Reference Root}">
+            <Border
+                x:Name="ModalBorder"
+                BackgroundColor="White"
+                BindingContext="{x:Reference Root}"
+                Stroke="Transparent"
+                StrokeThickness="0">
                 <Border.StrokeShape>
                     <RoundRectangle CornerRadius="24,24,0,0" />
                 </Border.StrokeShape>
@@ -81,6 +86,7 @@
                         Padding="16"
                         FontAttributes="Bold"
                         FontSize="22"
+                        IsVisible="{Binding Title, Mode=OneWay, Converter={StaticResource NullToBoolConverter}}"
                         Text="{Binding Title, Mode=OneWay}" />
 
                     <ContentView
@@ -91,10 +97,12 @@
 
                     <!--  Buttons  -->
                     <Grid
+                        x:Name="ButtonsGrid"
                         Grid.Row="2"
                         Padding="8"
                         ColumnSpacing="8"
-                        HorizontalOptions="Fill">
+                        HorizontalOptions="Fill"
+                        IsVisible="False">
 
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition />
diff --git a/src/Platforms/SecureFolderFS.Maui/Views/Modals/BaseModalPage.xaml.cs b/src/Platforms/SecureFolderFS.Maui/Views/Modals/BaseModalPage.xaml.cs
index 9c0b28888..8d210f545 100644
--- a/src/Platforms/SecureFolderFS.Maui/Views/Modals/BaseModalPage.xaml.cs
+++ b/src/Platforms/SecureFolderFS.Maui/Views/Modals/BaseModalPage.xaml.cs
@@ -1,4 +1,5 @@
 using System.Windows.Input;
+using Microsoft.Maui.Controls.Shapes;
 
 namespace SecureFolderFS.Maui.Views.Modals
 {
@@ -18,6 +19,38 @@ private void SheetPrimaryButton_SizeChanged(object? sender, EventArgs e)
 #endif
         }
 
+        private static void UpdateButtonsVisibility(BindableObject bindable)
+        {
+#if ANDROID
+            if (bindable is not BaseModalPage modalPage)
+                return;
+
+            var closeVisible = !string.IsNullOrEmpty(modalPage.CloseText);
+            var primaryVisible = !string.IsNullOrEmpty(modalPage.PrimaryText);
+            
+            modalPage.ButtonsGrid.IsVisible = primaryVisible || closeVisible;
+#else
+            _ = bindable;
+#endif
+        }
+        
+        public bool IsImmersive
+        {
+            get => (bool)GetValue(IsImmersiveProperty);
+            set => SetValue(IsImmersiveProperty, value);
+        }
+        public static readonly BindableProperty IsImmersiveProperty =
+            BindableProperty.Create(nameof(IsImmersive), typeof(bool), typeof(BaseModalPage), false, propertyChanged:
+                (bindable, _, newValue) =>
+                {
+                    if (bindable is not BaseModalPage modalPage)
+                        return;
+
+                    modalPage.ModalBorder.StrokeShape = !(bool)newValue
+                        ? new RoundRectangle() { CornerRadius = new(24, 24, 0, 0) }
+                        : new Rectangle();
+                });
+
         public View? ModalContent
         {
             get => (View?)GetValue(ModalContentProperty);
@@ -48,7 +81,8 @@ public string? PrimaryText
             set => SetValue(PrimaryTextProperty, value);
         }
         public static readonly BindableProperty PrimaryTextProperty =
-            BindableProperty.Create(nameof(PrimaryText), typeof(string), typeof(BaseModalPage), null);
+            BindableProperty.Create(nameof(PrimaryText), typeof(string), typeof(BaseModalPage), null, propertyChanged:
+                (bindable, _, _) => UpdateButtonsVisibility(bindable));
 
         public string? CloseText
         {
@@ -56,7 +90,8 @@ public string? CloseText
             set => SetValue(CloseTextProperty, value);
         }
         public static readonly BindableProperty CloseTextProperty =
-            BindableProperty.Create(nameof(CloseText), typeof(string), typeof(BaseModalPage), null);
+            BindableProperty.Create(nameof(CloseText), typeof(string), typeof(BaseModalPage), null, propertyChanged:
+                (bindable, _, _) => UpdateButtonsVisibility(bindable));
 
         public bool PrimaryEnabled
         {
diff --git a/src/Platforms/SecureFolderFS.Maui/Views/Modals/FilePreviewModalPage.xaml b/src/Platforms/SecureFolderFS.Maui/Views/Modals/FilePreviewModalPage.xaml
new file mode 100644
index 000000000..fe88b4db9
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Maui/Views/Modals/FilePreviewModalPage.xaml
@@ -0,0 +1,51 @@
+<local:BaseModalPage
+    x:Class="SecureFolderFS.Maui.Views.Modals.FilePreviewModalPage"
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:local="clr-namespace:SecureFolderFS.Maui.Views.Modals"
+    xmlns:mt="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
+    xmlns:ts="clr-namespace:SecureFolderFS.Maui.TemplateSelectors"
+    xmlns:uc="clr-namespace:SecureFolderFS.Maui.UserControls"
+    xmlns:vc="clr-namespace:SecureFolderFS.Maui.ValueConverters"
+    xmlns:vm="clr-namespace:SecureFolderFS.Sdk.ViewModels.Controls.Previewers;assembly=SecureFolderFS.Sdk"
+    Title="{Binding ViewModel.PreviewerViewModel.Title, Mode=OneWay}"
+    x:DataType="local:FilePreviewModalPage"
+    IsImmersive="True">
+
+    <local:BaseModalPage.Resources>
+        <vc:ImageToSourceConverter x:Key="ImageToSourceConverter" />
+        <vc:MediaToSourceConverter x:Key="MediaToSourceConverter" />
+
+        <DataTemplate x:Key="VideoTemplate" x:DataType="vm:VideoPreviewerViewModel">
+            <mt:MediaElement
+                ShouldAutoPlay="True"
+                ShouldLoopPlayback="True"
+                Source="{Binding Source, Mode=OneWay, Converter={StaticResource MediaToSourceConverter}}" />
+        </DataTemplate>
+        <DataTemplate x:Key="ImageTemplate" x:DataType="vm:ImagePreviewerViewModel">
+            <uc:PanPinchContainer>
+                <Image Source="{Binding Source, Mode=OneWay, Converter={StaticResource ImageToSourceConverter}}" />
+            </uc:PanPinchContainer>
+        </DataTemplate>
+        <DataTemplate x:Key="TextTemplate" x:DataType="vm:TextPreviewerViewModel">
+            <ScrollView
+                Padding="8"
+                HorizontalScrollBarVisibility="Always"
+                Orientation="Both"
+                VerticalScrollBarVisibility="Always">
+                <Label Text="{Binding Source, Mode=OneWay}" />
+            </ScrollView>
+        </DataTemplate>
+    </local:BaseModalPage.Resources>
+
+    <local:BaseModalPage.ModalContent>
+        <uc:ContentPresentation x:Name="Presentation" Presentation="{Binding ViewModel.PreviewerViewModel, Mode=OneWay}">
+            <uc:ContentPresentation.TemplateSelector>
+                <ts:PreviewerTemplateSelector
+                    ImageTemplate="{StaticResource ImageTemplate}"
+                    TextTemplate="{StaticResource TextTemplate}"
+                    VideoTemplate="{StaticResource VideoTemplate}" />
+            </uc:ContentPresentation.TemplateSelector>
+        </uc:ContentPresentation>
+    </local:BaseModalPage.ModalContent>
+</local:BaseModalPage>
diff --git a/src/Platforms/SecureFolderFS.Maui/Views/Modals/FilePreviewModalPage.xaml.cs b/src/Platforms/SecureFolderFS.Maui/Views/Modals/FilePreviewModalPage.xaml.cs
new file mode 100644
index 000000000..4f8bdf0e1
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Maui/Views/Modals/FilePreviewModalPage.xaml.cs
@@ -0,0 +1,86 @@
+using CommunityToolkit.Maui.Views;
+using SecureFolderFS.Maui.Extensions;
+using SecureFolderFS.Sdk.ViewModels.Views.Overlays;
+using SecureFolderFS.Shared.ComponentModel;
+using SecureFolderFS.Shared.Models;
+using SecureFolderFS.UI.Utils;
+#if IOS
+using Microsoft.Maui.Controls.PlatformConfiguration;
+using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
+using NavigationPage = Microsoft.Maui.Controls.NavigationPage;
+#endif
+
+namespace SecureFolderFS.Maui.Views.Modals
+{
+    public partial class FilePreviewModalPage : BaseModalPage, IOverlayControl
+    {
+        private readonly INavigation _sourceNavigation;
+        private readonly TaskCompletionSource<IResult> _modalTcs;
+        
+        public FilePreviewModalPage(INavigation sourceNavigation)
+        {
+            _sourceNavigation = sourceNavigation;
+            _modalTcs = new();
+            BindingContext = this;
+            
+            InitializeComponent();
+        }
+        
+        /// <inheritdoc/>
+        public async Task<IResult> ShowAsync()
+        {
+            // Using Shell to display modals is broken - each new page shown after a 'modal' page will be incorrectly displayed as another modal.
+            // NavigationPage approach does not have this issue
+#if ANDROID
+            await _sourceNavigation.PushModalAsync(new NavigationPage(this)
+            {
+                BackgroundColor = Color.FromArgb("#80000000")
+            });
+#elif IOS
+            var navigationPage = new NavigationPage(this);
+            NavigationPage.SetIconColor(navigationPage, Color.FromArgb("#007bff"));
+            navigationPage.On<iOS>().SetModalPresentationStyle(UIModalPresentationStyle.PageSheet);
+            await _sourceNavigation.PushModalAsync(navigationPage);
+#endif
+
+            return await _modalTcs.Task;
+        }
+
+        /// <inheritdoc/>
+        public void SetView(IViewable viewable)
+        {
+            ViewModel = viewable as PreviewerOverlayViewModel;
+            OnPropertyChanged(nameof(ViewModel));
+        }
+        
+        /// <inheritdoc/>
+        public async Task HideAsync()
+        {
+            await Shell.Current.GoBackAsync(Navigation.NavigationStack.Count);
+        }
+
+        /// <inheritdoc/>
+        protected override void OnDisappearing()
+        {
+            if ((Presentation.Content as ContentView)?.Content is not MediaElement mediaElement)
+                return;
+
+            mediaElement.Stop();
+            mediaElement.Handler?.DisconnectHandler();
+            mediaElement.Dispose();
+            mediaElement.Source = null;
+            
+            _modalTcs.TrySetResult(Result.Success);
+            base.OnDisappearing();
+        }
+
+        public PreviewerOverlayViewModel? ViewModel
+        {
+            get => (PreviewerOverlayViewModel?)GetValue(ViewModelProperty);
+            set => SetValue(ViewModelProperty, value);
+        }
+        public static readonly BindableProperty ViewModelProperty =
+            BindableProperty.Create(nameof(ViewModel), typeof(PreviewerOverlayViewModel), typeof(FilePreviewModalPage), null);
+    }
+}
+
diff --git a/src/Platforms/SecureFolderFS.Maui/Views/Modals/Settings/SettingsPage.xaml b/src/Platforms/SecureFolderFS.Maui/Views/Modals/Settings/SettingsPage.xaml
index 0b6dbd721..4de3bf2fb 100644
--- a/src/Platforms/SecureFolderFS.Maui/Views/Modals/Settings/SettingsPage.xaml
+++ b/src/Platforms/SecureFolderFS.Maui/Views/Modals/Settings/SettingsPage.xaml
@@ -6,15 +6,16 @@
     xmlns:local="clr-namespace:SecureFolderFS.Maui.Views.Modals.Settings"
     xmlns:md="clr-namespace:SecureFolderFS.Maui.Views.Modals"
     xmlns:uc="clr-namespace:SecureFolderFS.Maui.UserControls"
+    xmlns:vm="clr-namespace:SecureFolderFS.Sdk.ViewModels.Controls;assembly=SecureFolderFS.Sdk"
     x:Name="ThisPage"
-    Title="{l:ResourceString Name=Settings}"
+    Title="{l:ResourceString Rid=Settings}"
     x:DataType="local:SettingsPage">
 
     <VerticalStackLayout>
         <TableView>
             <TableRoot>
-                <TableSection Title="{l:ResourceString Name=SettingsGeneral}">
-                    <uc:SplitCell LeftText="{l:ResourceString Name=Language}">
+                <TableSection Title="{l:ResourceString Rid=SettingsGeneral}">
+                    <uc:SplitCell LeftText="{l:ResourceString Rid=Language}">
                         <uc:SplitCell.RightSide>
                             <Border>
                                 <Border.Stroke>
@@ -23,25 +24,25 @@
 
                                 <Picker
                                     BindingContext="{x:Reference ThisPage}"
-                                    ItemDisplayBinding="{Binding DisplayName, Mode=OneWay}"
+                                    ItemDisplayBinding="{Binding Title, Mode=OneWay, x:DataType={x:Type vm:LanguageViewModel}}"
                                     ItemsSource="{Binding GeneralViewModel.Languages, Mode=OneWay}"
                                     SelectedItem="{Binding GeneralViewModel.SelectedLanguage, Mode=TwoWay}"
                                     WidthRequest="96" />
                             </Border>
                         </uc:SplitCell.RightSide>
                     </uc:SplitCell>
-                    <SwitchCell On="{Binding PrivacyViewModel.AutoLockVaults, Mode=TwoWay}" Text="{l:ResourceString Name=AutoLock}" />
-                    <SwitchCell On="{Binding PrivacyViewModel.IsTelemetryEnabled, Mode=TwoWay}" Text="{l:ResourceString Name=Telemetry}" />
+                    <SwitchCell On="{Binding PrivacyViewModel.LockOnSystemLock, Mode=TwoWay}" Text="{l:ResourceString Rid=AutoLock}" />
+                    <SwitchCell On="{Binding PrivacyViewModel.IsTelemetryEnabled, Mode=TwoWay}" Text="{l:ResourceString Rid=Telemetry}" />
                 </TableSection>
 
-                <TableSection Title="{l:ResourceString Name=SettingsAbout}">
+                <TableSection Title="{l:ResourceString Rid=SettingsAbout}">
                     <uc:SplitCell
                         Command="{Binding AboutViewModel.CopyAppVersionCommand}"
-                        LeftText="{l:ResourceString Name=Version}"
+                        LeftText="{l:ResourceString Rid=Version}"
                         RightText="{Binding AboutViewModel.AppVersion, Mode=OneWay}" />
                     <uc:SplitCell
                         Command="{Binding AboutViewModel.CopySystemVersionCommand}"
-                        LeftText="{l:ResourceString Name=SystemVersion}"
+                        LeftText="{l:ResourceString Rid=SystemVersion}"
                         RightText="{Binding AboutViewModel.SystemVersion, Mode=OneWay}" />
                 </TableSection>
             </TableRoot>
diff --git a/src/Platforms/SecureFolderFS.Maui/Views/Modals/Wizard/CredentialsWizardPage.xaml b/src/Platforms/SecureFolderFS.Maui/Views/Modals/Wizard/CredentialsWizardPage.xaml
index 459628dfd..875c060e3 100644
--- a/src/Platforms/SecureFolderFS.Maui/Views/Modals/Wizard/CredentialsWizardPage.xaml
+++ b/src/Platforms/SecureFolderFS.Maui/Views/Modals/Wizard/CredentialsWizardPage.xaml
@@ -5,6 +5,7 @@
     xmlns:local="clr-namespace:SecureFolderFS.Maui.Views.Modals.Wizard"
     xmlns:md="clr-namespace:SecureFolderFS.Maui.Views.Modals"
     xmlns:uc="clr-namespace:SecureFolderFS.Maui.UserControls"
+    xmlns:vm="clr-namespace:SecureFolderFS.Sdk.ViewModels.Controls.Authentication;assembly=SecureFolderFS.Sdk"
     x:Name="ThisPage"
     Title="{Binding ViewModel.Title, Mode=OneWay}"
     x:DataType="local:CredentialsWizardPage"
@@ -23,12 +24,12 @@
                         <Picker
                             HorizontalOptions="Center"
                             HorizontalTextAlignment="Center"
-                            ItemDisplayBinding="{Binding DisplayName, Mode=OneWay}"
+                            ItemDisplayBinding="{Binding Title, Mode=OneWay, x:DataType={x:Type vm:AuthenticationViewModel}}"
                             ItemsSource="{Binding ViewModel.AuthenticationOptions}"
                             SelectedItem="{Binding ViewModel.RegisterViewModel.CurrentViewModel, Mode=TwoWay}"
                             WidthRequest="200" />
 
-                        <uc:RegisterControl CurrentViewModel="{Binding ViewModel.RegisterViewModel.CurrentViewModel, Mode=OneWay}" HorizontalOptions="FillAndExpand" />
+                        <uc:RegisterControl CurrentViewModel="{Binding ViewModel.RegisterViewModel.CurrentViewModel, Mode=OneWay}" HorizontalOptions="Fill" />
                     </VerticalStackLayout>
                 </On>
                 <On Platform="iOS">
@@ -36,11 +37,11 @@
                         <Picker
                             HorizontalOptions="Center"
                             HorizontalTextAlignment="Center"
-                            ItemDisplayBinding="{Binding DisplayName, Mode=OneWay}"
+                            ItemDisplayBinding="{Binding Title, Mode=OneWay, x:DataType={x:Type vm:AuthenticationViewModel}}"
                             ItemsSource="{Binding ViewModel.AuthenticationOptions}"
                             SelectedItem="{Binding ViewModel.RegisterViewModel.CurrentViewModel, Mode=TwoWay}"
                             WidthRequest="200" />
-                        <uc:RegisterControl CurrentViewModel="{Binding ViewModel.RegisterViewModel.CurrentViewModel, Mode=OneWay}" HorizontalOptions="FillAndExpand" />
+                        <uc:RegisterControl CurrentViewModel="{Binding ViewModel.RegisterViewModel.CurrentViewModel, Mode=OneWay}" HorizontalOptions="Fill" />
                     </VerticalStackLayout>
                 </On>
             </OnPlatform>
diff --git a/src/Platforms/SecureFolderFS.Maui/Views/Modals/Wizard/MainWizardPage.xaml b/src/Platforms/SecureFolderFS.Maui/Views/Modals/Wizard/MainWizardPage.xaml
index 9ffd2c094..c0407135b 100644
--- a/src/Platforms/SecureFolderFS.Maui/Views/Modals/Wizard/MainWizardPage.xaml
+++ b/src/Platforms/SecureFolderFS.Maui/Views/Modals/Wizard/MainWizardPage.xaml
@@ -22,14 +22,14 @@
             <OnPlatform x:TypeArguments="View">
                 <On Platform="Android">
                     <HorizontalStackLayout HorizontalOptions="Center" Spacing="4">
-                        <mdc:Button Clicked="Existing_Clicked" Text="{l:ResourceString Name=AddExisting}" />
-                        <mdc:Button Clicked="New_Clicked" Text="{l:ResourceString Name=CreateNew}" />
+                        <mdc:Button Clicked="Existing_Clicked" Text="{l:ResourceString Rid=AddExisting}" />
+                        <mdc:Button Clicked="New_Clicked" Text="{l:ResourceString Rid=CreateNew}" />
                     </HorizontalStackLayout>
                 </On>
                 <On Platform="iOS">
                     <HorizontalStackLayout HorizontalOptions="Center" Spacing="4">
-                        <Button Clicked="Existing_Clicked" Text="{l:ResourceString Name=AddExisting}" />
-                        <Button Clicked="New_Clicked" Text="{l:ResourceString Name=CreateNew}" />
+                        <Button Clicked="Existing_Clicked" Text="{l:ResourceString Rid=AddExisting}" />
+                        <Button Clicked="New_Clicked" Text="{l:ResourceString Rid=CreateNew}" />
                     </HorizontalStackLayout>
                 </On>
             </OnPlatform>
diff --git a/src/Platforms/SecureFolderFS.Maui/Views/Modals/Wizard/MainWizardPage.xaml.cs b/src/Platforms/SecureFolderFS.Maui/Views/Modals/Wizard/MainWizardPage.xaml.cs
index 4fbb83c99..394eed6bf 100644
--- a/src/Platforms/SecureFolderFS.Maui/Views/Modals/Wizard/MainWizardPage.xaml.cs
+++ b/src/Platforms/SecureFolderFS.Maui/Views/Modals/Wizard/MainWizardPage.xaml.cs
@@ -7,11 +7,11 @@
 using SecureFolderFS.Shared.ComponentModel;
 using SecureFolderFS.Shared.Models;
 using SecureFolderFS.UI.Utils;
-using NavigationPage = Microsoft.Maui.Controls.NavigationPage;
 
 #if IOS
 using Microsoft.Maui.Controls.PlatformConfiguration;
 using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
+using NavigationPage = Microsoft.Maui.Controls.NavigationPage;
 #endif
 
 namespace SecureFolderFS.Maui.Views.Modals.Wizard
@@ -57,8 +57,8 @@ await _sourceNavigation.PushModalAsync(new NavigationPage(this)
         /// <inheritdoc/>
         public void SetView(IViewable viewable)
         {
-            ViewModel = new();
             OverlayViewModel = (WizardOverlayViewModel)viewable;
+            ViewModel = new(OverlayViewModel.VaultCollectionModel);
             OverlayViewModel.NavigationRequested += ViewModel_NavigationRequested;
             OverlayViewModel.CurrentViewModel = ViewModel;
             Shell.Current.Navigated += Shell_Navigated;
@@ -66,21 +66,7 @@ public void SetView(IViewable viewable)
             OnPropertyChanged(nameof(ViewModel));
             OnPropertyChanged(nameof(OverlayViewModel));
         }
-
-        private void Shell_Navigated(object? sender, ShellNavigatedEventArgs e)
-        {
-            if (e.Current.Location.OriginalString.Contains("NavigationPage"))
-                return;
-                
-            Shell.Current.Navigated -= Shell_Navigated;
-            if (OverlayViewModel is not null)
-                OverlayViewModel.NavigationRequested -= ViewModel_NavigationRequested;
-            
-            _modalTcs.TrySetResult(OverlayViewModel?.CurrentViewModel is SummaryWizardViewModel
-                ? Result.Success
-                : Result.Failure(null));
-        }
-
+        
         /// <inheritdoc/>
         public async Task HideAsync()
         {
@@ -96,6 +82,20 @@ protected override void OnAppearing()
             base.OnAppearing();
         }
 
+        private void Shell_Navigated(object? sender, ShellNavigatedEventArgs e)
+        {
+            if (e.Current.Location.OriginalString.Contains("NavigationPage"))
+                return;
+                
+            Shell.Current.Navigated -= Shell_Navigated;
+            if (OverlayViewModel is not null)
+                OverlayViewModel.NavigationRequested -= ViewModel_NavigationRequested;
+            
+            _modalTcs.TrySetResult(OverlayViewModel?.CurrentViewModel is SummaryWizardViewModel
+                ? Result.Success
+                : Result.Failure(null));
+        }
+
         private async void ViewModel_NavigationRequested(object? sender, Shared.EventArguments.NavigationRequestedEventArgs e)
         {
             if (OverlayViewModel is null)
@@ -110,7 +110,7 @@ private async void ViewModel_NavigationRequested(object? sender, Shared.EventArg
             BaseWizardViewModel? nextViewModel = e.Origin switch
             {
                 // Main -> Location
-                MainWizardViewModel viewModel => new LocationWizardViewModel(viewModel.CreationType),
+                MainWizardViewModel viewModel => new LocationWizardViewModel(OverlayViewModel.VaultCollectionModel, viewModel.CreationType),
 
                 // Location -> Credentials
                 LocationWizardViewModel { CreationType: NewVaultCreationType.CreateNew, SelectedFolder: IModifiableFolder modifiableFolder } => new CredentialsWizardViewModel(modifiableFolder),
diff --git a/src/Platforms/SecureFolderFS.Maui/Views/Modals/Wizard/RecoveryWizardPage.xaml b/src/Platforms/SecureFolderFS.Maui/Views/Modals/Wizard/RecoveryWizardPage.xaml
index 88e992011..956627a4c 100644
--- a/src/Platforms/SecureFolderFS.Maui/Views/Modals/Wizard/RecoveryWizardPage.xaml
+++ b/src/Platforms/SecureFolderFS.Maui/Views/Modals/Wizard/RecoveryWizardPage.xaml
@@ -16,6 +16,6 @@
     PrimaryText="{Binding OverlayViewModel.PrimaryButtonText, Mode=OneWay}">
 
     <md:BaseModalPage.ModalContent>
-        <uc:RecoveryPreviewControl ExportCommand="{Binding ViewModel.RecoveryViewModel.ExportCommand, Mode=OneWay}" MasterKey="{Binding ViewModel.RecoveryViewModel.MasterKey, Mode=OneWay}" />
+        <uc:RecoveryPreviewControl ExportCommand="{Binding ViewModel.RecoveryViewModel.ExportCommand, Mode=OneWay}" RecoveryKey="{Binding ViewModel.RecoveryViewModel.RecoveryKey, Mode=OneWay}" />
     </md:BaseModalPage.ModalContent>
 </md:BaseModalPage>
diff --git a/src/Platforms/SecureFolderFS.Maui/Views/Modals/Wizard/SummaryWizardPage.xaml b/src/Platforms/SecureFolderFS.Maui/Views/Modals/Wizard/SummaryWizardPage.xaml
index 3b97f5b15..8664fad79 100644
--- a/src/Platforms/SecureFolderFS.Maui/Views/Modals/Wizard/SummaryWizardPage.xaml
+++ b/src/Platforms/SecureFolderFS.Maui/Views/Modals/Wizard/SummaryWizardPage.xaml
@@ -9,9 +9,9 @@
     xmlns:mi_material="clr-namespace:MauiIcons.Material;assembly=MauiIcons.Material"
     Title="{Binding ViewModel.Title, Mode=OneWay}"
     x:DataType="local:SummaryWizardPage"
-    PrimaryCommand="{Binding OverlayViewModel.ContinuationCommand, Mode=OneWay}"
-    PrimaryEnabled="{Binding ViewModel.CanContinue, Mode=OneWay}"
-    PrimaryText="{Binding OverlayViewModel.PrimaryButtonText, Mode=OneWay}">
+    CloseCommand="{Binding OverlayViewModel.ContinuationCommand, Mode=OneWay}"
+    CloseEnabled="{Binding ViewModel.CanContinue, Mode=OneWay}"
+    CloseText="{Binding OverlayViewModel.PrimaryButtonText, Mode=OneWay}">
 
     <md:BaseModalPage.ModalContent>
         <VerticalStackLayout
diff --git a/src/Platforms/SecureFolderFS.Maui/Views/Vault/BrowserPage.xaml b/src/Platforms/SecureFolderFS.Maui/Views/Vault/BrowserPage.xaml
new file mode 100644
index 000000000..204016c1b
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Maui/Views/Vault/BrowserPage.xaml
@@ -0,0 +1,86 @@
+<ContentPage
+    x:Class="SecureFolderFS.Maui.Views.Vault.BrowserPage"
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:local="clr-namespace:SecureFolderFS.Maui.Views.Vault"
+    xmlns:uc="clr-namespace:SecureFolderFS.Maui.UserControls"
+    xmlns:vc="clr-namespace:SecureFolderFS.Maui.ValueConverters"
+    x:Name="ThisPage"
+    x:DataType="local:BrowserPage">
+
+    <ContentPage.Resources>
+        <vc:BoolToStringConverter x:Key="BoolToStringConverter" />
+        <vc:FolderItemsCountToStringConverter x:Key="FolderItemsCountToStringConverter" />
+        <vc:TransferTypeToOperationStringConverter x:Key="TransferTypeToOperationStringConverter" />
+    </ContentPage.Resources>
+
+    <ContentPage.ToolbarItems>
+        <ToolbarItem
+            Command="{Binding ViewModel.ToggleSelectionCommand, Mode=OneWay}"
+            Order="Secondary"
+            Text="{Binding ViewModel.IsSelecting, Mode=OneWay, Converter={StaticResource BoolToStringConverter}, ConverterParameter='false:STANDARD|Select:true:LOCALIZE|Cancel'}" />
+        <ToolbarItem
+            Command="{Binding ViewModel.NewItemCommand}"
+            CommandParameter="File"
+            Order="Secondary"
+            Text="Create new file" />
+        <ToolbarItem
+            Command="{Binding ViewModel.NewItemCommand}"
+            CommandParameter="Folder"
+            Order="Secondary"
+            Text="Create new folder" />
+        <ToolbarItem
+            Command="{Binding ViewModel.ImportItemCommand}"
+            CommandParameter="File"
+            Order="Secondary"
+            Text="Import file" />
+        <ToolbarItem
+            Command="{Binding ViewModel.ImportItemCommand}"
+            CommandParameter="Folder"
+            Order="Secondary"
+            Text="Import folder" />
+    </ContentPage.ToolbarItems>
+
+    <Shell.TitleView>
+        <VerticalStackLayout VerticalOptions="Center">
+            <Label
+                FontAttributes="Bold"
+                FontSize="20"
+                Text="{Binding ViewModel.Title, Mode=OneWay}" />
+            <Label
+                FontSize="14"
+                Opacity="0.6"
+                Text="{Binding ViewModel.CurrentFolder.Items.Count, Mode=OneWay, Converter={StaticResource FolderItemsCountToStringConverter}}" />
+        </VerticalStackLayout>
+    </Shell.TitleView>
+
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
+
+        <uc:BreadcrumbBar
+            Grid.Row="0"
+            Margin="56,0,0,0"
+            HeightRequest="32"
+            ItemsSource="{Binding ViewModel.Breadcrumbs, Mode=OneWay}" />
+
+        <uc:BrowserControl
+            x:Name="Browser"
+            Grid.Row="1"
+            IsSelecting="{Binding ViewModel.IsSelecting, Mode=OneWay}"
+            ItemsSource="{Binding ViewModel.CurrentFolder.Items, Mode=OneWay}"
+            RefreshCommand="{Binding ViewModel.RefreshCommand, Mode=OneWay}" />
+
+        <uc:TransferControl
+            Title="{Binding ViewModel.TransferViewModel.Title, Mode=OneWay}"
+            Grid.Row="0"
+            Grid.RowSpan="2"
+            CancelCommand="{Binding ViewModel.TransferViewModel.CancelCommand, Mode=OneWay}"
+            IsVisible="{Binding ViewModel.TransferViewModel.IsVisible, Mode=OneWay}"
+            PrimaryButtonText="{Binding ViewModel.TransferViewModel.TransferType, Mode=OneWay, Converter={StaticResource TransferTypeToOperationStringConverter}}"
+            PrimaryCommand="{Binding ViewModel.TransferViewModel.ConfirmCommand, Mode=OneWay}"
+            VerticalOptions="End" />
+    </Grid>
+</ContentPage>
diff --git a/src/Platforms/SecureFolderFS.Maui/Views/Vault/BrowserPage.xaml.cs b/src/Platforms/SecureFolderFS.Maui/Views/Vault/BrowserPage.xaml.cs
new file mode 100644
index 000000000..e6881ef4e
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Maui/Views/Vault/BrowserPage.xaml.cs
@@ -0,0 +1,141 @@
+using SecureFolderFS.Maui.Extensions;
+using SecureFolderFS.Maui.ServiceImplementation;
+using SecureFolderFS.Sdk.ViewModels.Views.Browser;
+using SecureFolderFS.Shared.ComponentModel;
+using SecureFolderFS.UI.Helpers;
+
+namespace SecureFolderFS.Maui.Views.Vault
+{
+    public partial class BrowserPage : ContentPage, IQueryAttributable, INavigator
+    {
+        public BrowserPage()
+        {
+            InitializeComponent();
+            BindingContext = this;
+        }
+
+        /// <inheritdoc/>
+        public void ApplyQueryAttributes(IDictionary<string, object> query)
+        {
+            ViewModel = query.ToViewModel<BrowserViewModel>();
+            if (ViewModel?.CurrentFolder is not null && ViewModel.Navigator is MauiNavigationService navigationService)
+            {
+                navigationService.SetupNavigation(this);
+                navigationService.Views.Add(ViewModel.CurrentFolder);
+                navigationService.SetCurrentViewInternal(ViewModel.CurrentFolder);
+            }
+            
+            OnPropertyChanged(nameof(ViewModel));
+        }
+        
+        /// <inheritdoc/>
+        public async Task<bool> NavigateAsync(IViewDesignation? view)
+        {
+            if (view is not FolderViewModel folderViewModel)
+                return false;
+            
+            // Make last item non-leading
+            if (ViewModel?.Breadcrumbs?.LastOrDefault() is { } lastNavigationItem)
+                lastNavigationItem.IsLeading = false;
+            
+            // Add navigated-to folder to Breadcrumb
+            ViewModel?.Breadcrumbs?.Add(new(folderViewModel.Title, ViewModel.NavigateBreadcrumbCommand));
+            
+#if ANDROID
+            // On Android: Navigate by changing current folder (i.e. ViewModel source)
+            if (ViewModel is not null)
+            {
+                // Animate navigation
+                await AnimateViewChangeAsync(folderViewModel);
+                return true;
+            }
+#elif IOS
+            // On iOS: Navigate whole page using shell
+            // TODO: Set folder source in BrowserViewModel (to reuse the BrowserViewModel) and navigate the whole page instead of only the source
+#endif
+            return false;
+        }
+
+        /// <inheritdoc/>
+        public async Task<bool> GoBackAsync()
+        {
+            if (ViewModel?.Navigator is not MauiNavigationService navigationService)
+                return false;
+
+            var index = navigationService.IndexInNavigation;
+            if (navigationService.Views[Math.Max(--index, 0)] is not FolderViewModel folderViewModel)
+                return false;
+            
+            // Animate navigation
+            await AnimateViewChangeAsync(folderViewModel);
+
+            // Remove last navigated-to breadcrumb
+            var last = ViewModel?.Breadcrumbs?.LastOrDefault();
+            if (last is not null)
+                ViewModel?.Breadcrumbs?.Remove(last);
+
+            // Make last navigated-to breadcrumb leading
+            last = ViewModel?.Breadcrumbs?.LastOrDefault();
+            if (last is not null)
+                last.IsLeading = true;
+            
+            return true;
+        }
+
+        /// <inheritdoc/>
+        public async Task<bool> GoForwardAsync()
+        {
+            if (ViewModel?.Navigator is not MauiNavigationService navigationService)
+                return false;
+
+            var index = navigationService.IndexInNavigation;
+            if (navigationService.Views[Math.Min(++index, Math.Max(navigationService.Views.Count, 0))] is not FolderViewModel folderViewModel)
+                return false;
+            
+            // Animate navigation
+            await AnimateViewChangeAsync(folderViewModel);
+            
+            // Make last navigated-to breadcrumb non-leading
+            var last = ViewModel?.Breadcrumbs?.LastOrDefault();
+            if (last is not null)
+                last.IsLeading = false;
+            
+            // Add new breadcrumb
+            ViewModel?.Breadcrumbs?.Add(new(folderViewModel.Title, ViewModel.NavigateBreadcrumbCommand));
+
+            return true;
+        }
+
+        /// <inheritdoc/>
+        protected override bool OnBackButtonPressed()
+        {
+            if (ViewModel?.CurrentFolder is null)
+                return base.OnBackButtonPressed();
+
+            if (ViewModel.BaseFolder.Id == ViewModel.CurrentFolder.Folder.Id)
+                return base.OnBackButtonPressed();
+            
+            _ = ViewModel.Navigator.GoBackAsync();
+            return true;
+        }
+
+        private async Task AnimateViewChangeAsync(FolderViewModel? folder)
+        {
+            if (ViewModel is null)
+                return;
+
+            await Browser.FadeTo(0.0d, 125u);
+            ViewModel.CurrentFolder = folder;
+            await Browser.FadeTo(1.0d, 125u);
+        }
+        
+        public BrowserViewModel? ViewModel
+        {
+            get => (BrowserViewModel?)GetValue(ViewModelProperty);
+            set => SetValue(ViewModelProperty, value);
+        }
+        public static readonly BindableProperty ViewModelProperty =
+            BindableProperty.Create(nameof(ViewModel), typeof(BrowserViewModel), typeof(BrowserPage), null);
+    }
+}
+
diff --git a/src/Platforms/SecureFolderFS.Maui/Views/Vault/LoginPage.xaml b/src/Platforms/SecureFolderFS.Maui/Views/Vault/LoginPage.xaml
index ecdcbb3a8..58e057d51 100644
--- a/src/Platforms/SecureFolderFS.Maui/Views/Vault/LoginPage.xaml
+++ b/src/Platforms/SecureFolderFS.Maui/Views/Vault/LoginPage.xaml
@@ -41,7 +41,7 @@
                 FontSize="20"
                 HorizontalOptions="Center"
                 HorizontalTextAlignment="Center"
-                Text="{l:ResourceString Name=VaultLocked}"
+                Text="{l:ResourceString Rid=VaultLocked}"
                 VerticalOptions="Center" />
         </VerticalStackLayout>
 
@@ -51,15 +51,16 @@
             <OnPlatform x:TypeArguments="View">
                 <On Platform="iOS">
                     <Button
-                        Command="{Binding ViewModel.BeginRecoveryCommand}"
+                        Command="{Binding ViewModel.LoginViewModel.RecoverAccessCommand}"
                         IsVisible="{Binding ViewModel.LoginViewModel.CurrentViewModel, Mode=OneWay, Converter={StaticResource LoginViewModelBoolConverter}, ConverterParameter='MigrationViewModel,ErrorViewModel|invert'}"
-                        Text="{l:ResourceString Name=RecoverAccess}" />
+                        Text="{l:ResourceString Rid=RecoverAccess}" />
                 </On>
                 <On Platform="Android">
                     <mdc:Button
-                        Command="{Binding ViewModel.BeginRecoveryCommand}"
+                        Command="{Binding ViewModel.LoginViewModel.RecoverAccessCommand}"
                         IsVisible="{Binding ViewModel.LoginViewModel.CurrentViewModel, Mode=OneWay, Converter={StaticResource LoginViewModelBoolConverter}, ConverterParameter='MigrationViewModel,ErrorViewModel|invert'}"
-                        Text="{l:ResourceString Name=RecoverAccess}" />
+                        Style="{DynamicResource TextButtonStyle}"
+                        Text="{l:ResourceString Rid=RecoverAccess}" />
                 </On>
             </OnPlatform>
         </VerticalStackLayout>
diff --git a/src/Platforms/SecureFolderFS.Maui/Views/Vault/LoginPage.xaml.cs b/src/Platforms/SecureFolderFS.Maui/Views/Vault/LoginPage.xaml.cs
index bc8456a49..7b21be098 100644
--- a/src/Platforms/SecureFolderFS.Maui/Views/Vault/LoginPage.xaml.cs
+++ b/src/Platforms/SecureFolderFS.Maui/Views/Vault/LoginPage.xaml.cs
@@ -4,6 +4,8 @@
 using SecureFolderFS.Sdk.EventArguments;
 using SecureFolderFS.Sdk.Extensions;
 using SecureFolderFS.Sdk.Services;
+using SecureFolderFS.Sdk.ViewModels.Controls.Transfer;
+using SecureFolderFS.Sdk.ViewModels.Views.Browser;
 using SecureFolderFS.Sdk.ViewModels.Views.Vault;
 using SecureFolderFS.Shared;
 using SecureFolderFS.Shared.EventArguments;
@@ -20,6 +22,7 @@ public LoginPage()
             InitializeComponent();
         }
 
+        /// <inheritdoc/>
         public void ApplyQueryAttributes(IDictionary<string, object> query)
         {
             ViewModel = query.ToViewModel<VaultLoginViewModel>();
@@ -53,6 +56,16 @@ private async void ViewModel_NavigationRequested(object? sender, NavigationReque
             // Initialize DashboardViewModel and use the same navigation for dashboard
             var dashboardNavigation = DI.Service<INavigationService>();
             var dashboardViewModel = new VaultDashboardViewModel(args.UnlockedVaultViewModel, ViewModel.VaultNavigation, dashboardNavigation);
+
+            var rootFolder = args.UnlockedVaultViewModel.StorageRoot.Inner;
+            var navigator = DI.Service<INavigationService>();
+            var browserViewModel = new BrowserViewModel(navigator, rootFolder, args.UnlockedVaultViewModel.VaultViewModel);
+            var transferViewModel = new TransferViewModel(browserViewModel);
+            var folderViewModel = new FolderViewModel(rootFolder, browserViewModel, null);
+            _ = folderViewModel.ListContentsAsync();
+            
+            browserViewModel.TransferViewModel = transferViewModel;
+            browserViewModel.CurrentFolder = folderViewModel;
             
             // Since both overview and properties are on the same page,
             // initialize and navigate the views to keep them in cache
@@ -60,9 +73,15 @@ private async void ViewModel_NavigationRequested(object? sender, NavigationReque
             var propertiesViewModel = new VaultPropertiesViewModel(args.UnlockedVaultViewModel);
             var overviewViewModel = new VaultOverviewViewModel(
                 args.UnlockedVaultViewModel,
-                new(ViewModel.VaultNavigation, ViewModel.VaultNavigation, args.UnlockedVaultViewModel, propertiesViewModel),
-                new(args.UnlockedVaultViewModel,
-                    new WidgetsCollectionModel(args.UnlockedVaultViewModel.VaultModel.Folder)));
+                new(ViewModel.VaultNavigation,
+                    ViewModel.VaultNavigation,
+                    args.UnlockedVaultViewModel,
+                    browserViewModel,
+                    propertiesViewModel),
+                    new(
+                        args.UnlockedVaultViewModel,
+                        ViewModel.VaultNavigation,
+                        new WidgetsCollectionModel(args.UnlockedVaultViewModel.VaultViewModel.VaultModel.Folder)));
             
             // Set Title to 'fake' navigation
             dashboardViewModel.Title = overviewViewModel.Title;
diff --git a/src/Platforms/SecureFolderFS.Maui/Views/Vault/OverviewPage.xaml b/src/Platforms/SecureFolderFS.Maui/Views/Vault/OverviewPage.xaml
index 690520332..e4fb7ebbc 100644
--- a/src/Platforms/SecureFolderFS.Maui/Views/Vault/OverviewPage.xaml
+++ b/src/Platforms/SecureFolderFS.Maui/Views/Vault/OverviewPage.xaml
@@ -7,49 +7,21 @@
     xmlns:mdc="clr-namespace:Material.Components.Maui;assembly=Material.Components.Maui"
     xmlns:ts="clr-namespace:SecureFolderFS.Maui.TemplateSelectors"
     xmlns:uc="clr-namespace:SecureFolderFS.Maui.UserControls"
-    xmlns:vm="clr-namespace:SecureFolderFS.Sdk.ViewModels.Controls.Widgets.Categories;assembly=SecureFolderFS.Sdk"
+    xmlns:ucw="clr-namespace:SecureFolderFS.Maui.UserControls.Widgets"
+    xmlns:vm="clr-namespace:SecureFolderFS.Sdk.ViewModels.Controls.Widgets.Health;assembly=SecureFolderFS.Sdk"
+    xmlns:vm2="clr-namespace:SecureFolderFS.Sdk.ViewModels.Controls.Widgets.Data;assembly=SecureFolderFS.Sdk"
     Title="{Binding ViewModel.Title, Mode=OneWay}"
     x:DataType="local:OverviewPage">
 
     <ContentPage.Resources>
+        <!--  Health Widget  -->
         <DataTemplate x:Key="HealthWidgetTemplate" x:DataType="vm:HealthWidgetViewModel">
-            <!--  Health Widget  -->
-            <HorizontalStackLayout Spacing="4">
-                <Image
-                    Margin="-4,0,0,0"
-                    HeightRequest="48"
-                    Source="green_shield.png" />
-                <Label
-                    FontAttributes="Bold"
-                    FontSize="18"
-                    Text="{l:ResourceString Name=HealthNoProblems}"
-                    VerticalOptions="Center" />
-            </HorizontalStackLayout>
+            <ucw:HealthWidget />
         </DataTemplate>
 
-        <!--  Data statistics widget  -->
-        <DataTemplate x:Key="AggregatedDataWidgetTemplate" x:DataType="vm:AggregatedDataWidgetViewModel">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition />
-                    <ColumnDefinition />
-                </Grid.ColumnDefinitions>
-
-                <VerticalStackLayout Grid.Column="0">
-                    <Label Opacity="0.6" Text="{l:ResourceString Name=TotalRead}" />
-                    <Label
-                        FontAttributes="Bold"
-                        FontSize="22"
-                        Text="0Mb" />
-                </VerticalStackLayout>
-                <VerticalStackLayout Grid.Column="1">
-                    <Label Opacity="0.6" Text="{l:ResourceString Name=TotalWrite}" />
-                    <Label
-                        FontAttributes="Bold"
-                        FontSize="22"
-                        Text="0Mb" />
-                </VerticalStackLayout>
-            </Grid>
+        <!--  Aggregated Data Statistics Widget  -->
+        <DataTemplate x:Key="AggregatedDataWidgetTemplate" x:DataType="vm2:AggregatedDataWidgetViewModel">
+            <ucw:AggregatedDataWidget TotalRead="{Binding TotalRead, Mode=OneWay}" TotalWrite="{Binding TotalWrite, Mode=OneWay}" />
         </DataTemplate>
     </ContentPage.Resources>
 
@@ -78,14 +50,14 @@
                         Command="{Binding OverviewViewModel.VaultControlsViewModel.RevealFolderCommand}"
                         HeightRequest="48"
                         Style="{DynamicResource FilledTonalButtonStyle}"
-                        Text="{l:ResourceString Name=ViewInFiles}"
+                        Text="{l:ResourceString Rid=ViewInFiles}"
                         WidthRequest="180" />
                     <mdc:Button
                         Grid.Column="1"
                         Command="{Binding OverviewViewModel.VaultControlsViewModel.LockVaultCommand}"
                         HeightRequest="48"
                         Style="{DynamicResource FilledTonalButtonStyle}"
-                        Text="{l:ResourceString Name=LockVault}"
+                        Text="{l:ResourceString Rid=LockVault}"
                         WidthRequest="180" />
                 </Grid>
             </On>
@@ -96,39 +68,44 @@
             <TableRoot>
                 <OnPlatform x:TypeArguments="TableSection">
                     <On Platform="iOS">
-                        <TableSection Title="{l:ResourceString Name=QuickActions}">
-                            <TextCell Command="{Binding OverviewViewModel.VaultControlsViewModel.RevealFolderCommand}" Text="{l:ResourceString Name=ViewInFiles}" />
-                            <TextCell Command="{Binding OverviewViewModel.VaultControlsViewModel.LockVaultCommand}" Text="{l:ResourceString Name=LockVault}" />
+                        <TableSection Title="{l:ResourceString Rid=QuickActions}">
+                            <TextCell Command="{Binding OverviewViewModel.VaultControlsViewModel.RevealFolderCommand}" Text="{l:ResourceString Rid=ViewInFiles}" />
+                            <TextCell Command="{Binding OverviewViewModel.VaultControlsViewModel.LockVaultCommand}" Text="{l:ResourceString Rid=LockVault}" />
                         </TableSection>
                     </On>
                     <On Platform="Android">
-                        <TableSection />
+                        <TableSection Title="{l:ResourceString Rid=QuickActions}">
+                            <TextCell
+                                Command="{Binding OverviewViewModel.VaultControlsViewModel.BrowseCommand}"
+                                Detail="View contents of your vault"
+                                Text="Open file browser" />
+                        </TableSection>
                     </On>
                 </OnPlatform>
-                <TableSection Title="{l:ResourceString Name=VaultProperties}">
+                <TableSection Title="{l:ResourceString Rid=VaultProperties}">
                     <uc:SplitCell
                         IsEnabled="False"
-                        LeftText="{l:ResourceString Name=Security}"
+                        LeftText="{l:ResourceString Rid=Security}"
                         RightText="{Binding PropertiesViewModel.SecurityText, Mode=OneWay}" />
                     <uc:SplitCell
                         IsEnabled="False"
-                        LeftText="{l:ResourceString Name=DataEncryption}"
+                        LeftText="{l:ResourceString Rid=DataEncryption}"
                         RightText="{Binding PropertiesViewModel.ContentCipherText, Mode=OneWay}" />
                     <uc:SplitCell
                         IsEnabled="False"
-                        LeftText="{l:ResourceString Name=FileNameEncryption}"
+                        LeftText="{l:ResourceString Rid=FileNameEncryption}"
                         RightText="{Binding PropertiesViewModel.FileNameCipherText, Mode=OneWay}" />
                 </TableSection>
-                <TableSection Title="{l:ResourceString Name=Authentication}">
+                <TableSection Title="{l:ResourceString Rid=Authentication}">
                     <TextCell
                         Command="{Binding PropertiesViewModel.ChangeFirstAuthenticationCommand}"
-                        Detail="{l:ResourceString Name=ChangeCredentialsDescription}"
-                        Text="{l:ResourceString Name=ChangeCredentials}" />
+                        Detail="{l:ResourceString Rid=ChangeCredentialsDescription}"
+                        Text="{l:ResourceString Rid=ChangeCredentials}" />
                     <TextCell
                         Command="{Binding PropertiesViewModel.ChangeSecondAuthenticationCommand}"
-                        Detail="{l:ResourceString Name=TwoFactorDescription}"
-                        Text="{l:ResourceString Name=TwoFactor}" />
-                    <TextCell Command="{Binding PropertiesViewModel.ViewRecoveryCommand}" Text="{l:ResourceString Name=RecoveryCodes}" />
+                        Detail="{l:ResourceString Rid=TwoFactorDescription}"
+                        Text="{l:ResourceString Rid=TwoFactor}" />
+                    <TextCell Command="{Binding PropertiesViewModel.ViewRecoveryCommand}" Text="{l:ResourceString Rid=RecoveryCodes}" />
                 </TableSection>
             </TableRoot>
         </TableView>
diff --git a/src/Platforms/SecureFolderFS.Maui/Views/Vault/OverviewPage.xaml.cs b/src/Platforms/SecureFolderFS.Maui/Views/Vault/OverviewPage.xaml.cs
index 7ecbbf693..f0c575f06 100644
--- a/src/Platforms/SecureFolderFS.Maui/Views/Vault/OverviewPage.xaml.cs
+++ b/src/Platforms/SecureFolderFS.Maui/Views/Vault/OverviewPage.xaml.cs
@@ -13,6 +13,7 @@ public OverviewPage()
             InitializeComponent();
         }
 
+        /// <inheritdoc/>
         public void ApplyQueryAttributes(IDictionary<string, object> query)
         {
             ViewModel = query.ToViewModel<VaultDashboardViewModel>();
diff --git a/src/Platforms/SecureFolderFS.UI/Assets/AppAssets/Shields/error_shield.png b/src/Platforms/SecureFolderFS.UI/Assets/AppAssets/Shields/error_shield.png
new file mode 100644
index 000000000..30ff11f58
Binary files /dev/null and b/src/Platforms/SecureFolderFS.UI/Assets/AppAssets/Shields/error_shield.png differ
diff --git a/src/Platforms/SecureFolderFS.UI/Assets/AppAssets/Shields/error_shield.svg b/src/Platforms/SecureFolderFS.UI/Assets/AppAssets/Shields/error_shield.svg
new file mode 100644
index 000000000..53f67c703
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.UI/Assets/AppAssets/Shields/error_shield.svg
@@ -0,0 +1,10 @@
+<svg preserveAspectRatio="xMinYMin" width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="17" y="18" width="26" height="22" fill="white"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 31.125 5.375 C 37.480469 10.140625 43.96875 12.5 50.625 12.5 C 51.660156 12.5 52.5 13.339844 52.5 14.375 L 52.5 27.5 C 52.5 40.003906 45.105469 49.191406 30.6875 54.871094 C 30.246094 55.042969 29.753906 55.042969 29.3125 54.871094 C 14.894531 49.191406 7.5 40 7.5 27.5 L 7.5 14.375 C 7.5 13.339844 8.339844 12.5 9.375 12.5 C 16.03125 12.5 22.519531 10.140625 28.875 5.375 C 29.542969 4.875 30.457031 4.875 31.125 5.375 Z M 23.199219 20.554688 C 22.5 19.890625 21.414062 19.867188 20.683594 20.496094 C 19.957031 21.125 19.820312 22.203125 20.375 22.992188 L 20.554688 23.203125 L 27.363281 30.011719 L 20.554688 36.824219 C 20.066406 37.292969 19.867188 37.988281 20.039062 38.644531 C 20.210938 39.304688 20.722656 39.816406 21.378906 39.988281 C 22.035156 40.15625 22.734375 39.960938 23.203125 39.46875 L 30.011719 32.660156 L 36.824219 39.46875 C 37.476562 40.125 38.515625 40.203125 39.261719 39.652344 L 39.46875 39.46875 C 40.125 38.8125 40.203125 37.777344 39.652344 37.03125 L 39.46875 36.824219 L 32.660156 30.011719 L 39.46875 23.203125 C 40.203125 22.472656 40.203125 21.285156 39.46875 20.550781 C 38.738281 19.820312 37.550781 19.820312 36.820312 20.550781 L 30.011719 27.363281 L 23.203125 20.554688 Z M 23.199219 20.554688 "/>
+<defs>
+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="53" y1="55" x2="8" y2="5" gradientTransform="matrix(2.5,0,0,2.5,0,0)">
+<stop offset="0" style="stop-color:rgb(100%,33.72549%,24.705882%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(100%,0%,0%);stop-opacity:1;"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/src/Platforms/SecureFolderFS.UI/Assets/AppAssets/GreenShield.png b/src/Platforms/SecureFolderFS.UI/Assets/AppAssets/Shields/success_shield.png
similarity index 100%
rename from src/Platforms/SecureFolderFS.UI/Assets/AppAssets/GreenShield.png
rename to src/Platforms/SecureFolderFS.UI/Assets/AppAssets/Shields/success_shield.png
diff --git a/src/Platforms/SecureFolderFS.UI/Assets/AppAssets/GreenShield.svg b/src/Platforms/SecureFolderFS.UI/Assets/AppAssets/Shields/success_shield.svg
similarity index 100%
rename from src/Platforms/SecureFolderFS.UI/Assets/AppAssets/GreenShield.svg
rename to src/Platforms/SecureFolderFS.UI/Assets/AppAssets/Shields/success_shield.svg
diff --git a/src/Platforms/SecureFolderFS.UI/Assets/AppAssets/Shields/warning_shield.png b/src/Platforms/SecureFolderFS.UI/Assets/AppAssets/Shields/warning_shield.png
new file mode 100644
index 000000000..8b31a3062
Binary files /dev/null and b/src/Platforms/SecureFolderFS.UI/Assets/AppAssets/Shields/warning_shield.png differ
diff --git a/src/Platforms/SecureFolderFS.UI/Assets/AppAssets/Shields/warning_shield.svg b/src/Platforms/SecureFolderFS.UI/Assets/AppAssets/Shields/warning_shield.svg
new file mode 100644
index 000000000..87ac9c527
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.UI/Assets/AppAssets/Shields/warning_shield.svg
@@ -0,0 +1,10 @@
+<svg preserveAspectRatio="xMinYMin" width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="17" y="14" width="26" height="32" fill="white"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 31.125 5.375 C 37.480469 10.140625 43.96875 12.5 50.625 12.5 C 51.660156 12.5 52.5 13.339844 52.5 14.375 L 52.5 27.5 C 52.5 40.003906 45.105469 49.191406 30.6875 54.871094 C 30.246094 55.042969 29.753906 55.042969 29.3125 54.871094 C 14.894531 49.191406 7.5 40 7.5 27.5 L 7.5 14.375 C 7.5 13.339844 8.339844 12.5 9.375 12.5 C 16.03125 12.5 22.519531 10.140625 28.875 5.375 C 29.542969 4.875 30.457031 4.875 31.125 5.375 Z M 30 40 C 28.964844 40 28.125 40.839844 28.125 41.875 C 28.125 42.910156 28.964844 43.75 30 43.75 C 31.035156 43.75 31.875 42.910156 31.875 41.875 C 31.875 40.839844 31.035156 40 30 40 Z M 30 17.453125 C 29.0625 17.453125 28.269531 18.148438 28.140625 19.074219 L 28.125 19.328125 L 28.125 35.578125 L 28.140625 35.835938 C 28.269531 36.761719 29.0625 37.453125 30 37.453125 C 30.9375 37.453125 31.730469 36.761719 31.859375 35.835938 L 31.875 35.578125 L 31.875 19.328125 L 31.859375 19.074219 C 31.730469 18.148438 30.9375 17.453125 30 17.453125 Z M 30 17.453125 "/>
+<defs>
+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="53" y1="55" x2="8" y2="5" gradientTransform="matrix(2.5,0,0,2.5,0,0)">
+<stop offset="0" style="stop-color:rgb(100%,76.470588%,0%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(100%,40%,0%);stop-opacity:1;"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/src/Platforms/SecureFolderFS.UI/Assets/AppAssets/AppIcon.ico b/src/Platforms/SecureFolderFS.UI/Assets/AppAssets/app_icon.ico
similarity index 100%
rename from src/Platforms/SecureFolderFS.UI/Assets/AppAssets/AppIcon.ico
rename to src/Platforms/SecureFolderFS.UI/Assets/AppAssets/app_icon.ico
diff --git a/src/Platforms/SecureFolderFS.UI/Assets/AppAssets/AppIcon.png b/src/Platforms/SecureFolderFS.UI/Assets/AppAssets/app_icon.png
similarity index 100%
rename from src/Platforms/SecureFolderFS.UI/Assets/AppAssets/AppIcon.png
rename to src/Platforms/SecureFolderFS.UI/Assets/AppAssets/app_icon.png
diff --git a/src/Platforms/SecureFolderFS.UI/Assets/AppAssets/app_icon.svg b/src/Platforms/SecureFolderFS.UI/Assets/AppAssets/app_icon.svg
new file mode 100644
index 000000000..796cc7f6f
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.UI/Assets/AppAssets/app_icon.svg
@@ -0,0 +1,179 @@
+<svg width="1091" height="1088" viewBox="0 0 1091 1088" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_211_11423)">
+<g clip-path="url(#clip0_211_11423)">
+<g filter="url(#filter1_d_211_11423)">
+<path d="M4.00063 185.625C4.00069 120.386 56.8871 67.5 122.126 67.5H331.032C374.073 67.5 414.533 88.0227 439.959 122.75L475.879 171.812C482.236 180.494 492.351 185.625 503.111 185.625H965.875C1031.11 185.625 1084 238.511 1084 303.75V894.375C1084 959.614 1031.11 1012.5 965.875 1012.5H122.125C56.8863 1012.5 3.99994 959.614 4 894.375L4.00063 185.625Z" fill="url(#paint0_linear_211_11423)"/>
+</g>
+<mask id="mask0_211_11423" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="4" y="67" width="1080" height="946">
+<path d="M4.00063 185.625C4.00069 120.386 56.8871 67.5 122.126 67.5H331.032C374.073 67.5 414.533 88.0227 439.959 122.75L475.879 171.812C482.236 180.494 492.351 185.625 503.111 185.625H965.875C1031.11 185.625 1084 238.511 1084 303.75V894.375C1084 959.614 1031.11 1012.5 965.875 1012.5H122.125C56.8863 1012.5 3.99994 959.614 4 894.375L4.00063 185.625Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_211_11423)">
+<g style="mix-blend-mode:color-burn" filter="url(#filter2_d_211_11423)">
+<g style="mix-blend-mode:color-burn">
+<path d="M4 438.75C4 373.511 56.8864 320.625 122.125 320.625H421.387C430.339 320.625 438.923 317.069 445.252 310.74L451.394 304.598C473.547 282.445 503.592 270 534.921 270H965.875C1031.11 270 1084 322.886 1084 388.125V894.375C1084 950.294 1038.67 995.625 982.75 995.625H105.25C49.3312 995.625 4 950.294 4 894.375V438.75Z" fill="white"/>
+</g>
+</g>
+<g filter="url(#filter3_d_211_11423)">
+<path d="M4 438.75C4 373.511 56.8864 320.625 122.125 320.625H421.387C430.339 320.625 438.923 317.069 445.252 310.74L451.394 304.598C473.547 282.445 503.592 270 534.921 270H965.875C1031.11 270 1084 322.886 1084 388.125V894.375C1084 950.294 1038.67 995.625 982.75 995.625H105.25C49.3312 995.625 4 950.294 4 894.375V438.75Z" fill="url(#paint1_linear_211_11423)"/>
+</g>
+<g filter="url(#filter4_d_211_11423)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M122.125 320.625C56.8864 320.625 4 373.511 4 438.75C4 382.831 49.3312 337.5 105.25 337.5H422.835C436.262 337.5 449.138 332.166 458.632 322.672L464.774 316.53C483.762 297.542 509.516 286.875 536.369 286.875H982.75C1038.67 286.875 1084 332.206 1084 388.125C1084 322.886 1031.11 270 965.875 270H534.921C503.592 270 473.547 282.445 451.394 304.598L445.252 310.74C438.923 317.069 430.339 320.625 421.387 320.625H122.125Z" fill="url(#paint2_linear_211_11423)" shape-rendering="crispEdges"/>
+</g>
+</g>
+</g>
+<path d="M727.97 632.5V636H731.47H767.161H770.661V632.5V559C770.661 544.123 773.368 530.228 778.757 517.279C784.173 504.268 791.556 492.967 800.902 483.345C810.247 473.722 821.211 466.131 833.822 460.565C846.369 455.029 859.827 452.25 874.235 452.25C888.642 452.25 902.101 455.029 914.648 460.565C927.259 466.131 938.223 473.722 947.568 483.345C956.914 492.967 964.297 504.268 969.712 517.279C975.102 530.228 977.809 544.123 977.809 559V632.5V636H981.309H1017H1020.5V632.5V559C1020.5 538.275 1016.7 518.772 1009.08 500.524C1001.48 482.146 991.021 466.168 977.685 452.628C964.535 438.897 949.008 428.114 931.134 420.281C913.383 412.421 894.404 408.5 874.235 408.5C854.063 408.5 834.994 412.422 817.063 420.279L817.05 420.284C799.357 428.12 783.835 438.904 770.506 452.628C757.354 466.169 746.986 482.147 739.391 500.522C731.77 518.77 727.97 538.274 727.97 559V632.5Z" fill="url(#paint3_linear_211_11423)" stroke="url(#paint4_linear_211_11423)" stroke-width="7"/>
+<g filter="url(#filter5_d_211_11423)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1048.54 676.941C1048.54 671.542 1047.61 666.455 1045.76 661.679C1043.9 656.696 1041.3 652.439 1037.95 648.909C1034.79 645.172 1030.98 642.265 1026.52 640.188C1022.24 638.112 1017.69 637.074 1012.86 637.074H727.372C722.353 637.074 717.707 638.112 713.432 640.188C709.157 642.265 705.347 645.172 702.001 648.909C698.842 652.439 696.332 656.592 694.474 661.368C692.615 666.144 691.686 671.335 691.686 676.941V916.147C691.686 921.753 692.615 927.048 694.474 932.032C696.332 936.808 698.842 940.96 702.001 944.49C705.161 948.02 708.878 950.823 713.153 952.9C717.614 954.976 722.353 956.015 727.372 956.015H1012.86C1017.88 956.015 1022.52 954.976 1026.8 952.9C1031.07 950.823 1034.79 948.02 1037.95 944.49C1041.3 940.753 1043.9 936.496 1045.76 931.72C1047.61 926.944 1048.54 921.753 1048.54 916.147V676.941ZM903.013 812.117C904.871 807.342 905.801 802.15 905.801 796.544C905.801 791.145 904.871 786.058 903.013 781.282C901.154 776.299 898.552 772.042 895.206 768.512C892.047 764.775 888.236 761.867 883.776 759.791C879.501 757.715 874.947 756.676 870.115 756.676C865.096 756.676 860.45 757.715 856.175 759.791C851.9 761.867 848.09 764.775 844.744 768.512C841.585 772.042 839.076 776.195 837.217 780.971C835.358 785.747 834.429 790.938 834.429 796.544C834.429 802.15 835.358 807.445 837.217 812.429C839.076 817.205 841.585 821.357 844.744 824.887C847.904 828.417 851.621 831.221 855.896 833.297C860.357 835.373 865.096 836.412 870.115 836.412C875.133 836.412 879.78 835.373 884.055 833.297C888.329 831.221 892.047 828.417 895.206 824.887C898.552 821.15 901.154 816.893 903.013 812.117Z" fill="url(#paint5_linear_211_11423)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M988.791 995.882H937.337C1048.32 995.882 1095.4 956.015 1084.46 850.296V900.239C1084.46 953.512 1040.18 995.844 988.791 995.882Z" fill="url(#paint6_linear_211_11423)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M903.013 812.117C904.871 807.342 905.801 802.15 905.801 796.544C905.801 791.145 904.871 786.058 903.013 781.282C901.154 776.299 898.552 772.042 895.206 768.512C892.047 764.775 888.236 761.867 883.776 759.791C879.501 757.715 874.947 756.676 870.115 756.676C865.096 756.676 860.45 757.715 856.175 759.791C851.9 761.867 848.09 764.775 844.744 768.512C841.585 772.042 839.076 776.195 837.217 780.971C835.358 785.747 834.429 790.938 834.429 796.544C834.429 802.15 835.358 807.445 837.217 812.429C839.076 817.205 841.585 821.357 844.744 824.887C847.904 828.417 851.621 831.221 855.896 833.297C860.357 835.373 865.096 836.412 870.115 836.412C875.133 836.412 879.78 835.373 884.055 833.297C888.329 831.221 892.047 828.417 895.206 824.887C898.552 821.15 901.154 816.893 903.013 812.117Z" fill="url(#paint7_linear_211_11423)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M699.492 989.653C708.228 993.806 717.521 995.882 727.372 995.882H937.337C1048.32 995.882 1095.4 956.015 1084.46 850.296V676.684C1084.46 665.679 1082.37 655.658 1078.65 646.106C1074.94 636.347 1069.83 627.833 1063.32 620.566C1056.81 613.298 1049.19 607.588 1040.46 603.435C1031.91 599.282 1022.71 597.206 1012.86 597.206H977.172H763.057H727.372C717.521 597.206 708.228 599.282 699.492 603.435C690.942 607.588 683.415 613.298 676.91 620.566C670.404 627.833 665.293 636.347 661.576 646.106C657.859 655.658 656 665.936 656 676.941V916.147C656 927.152 657.859 937.534 661.576 947.294C665.293 956.845 670.404 965.255 676.91 972.522C683.415 979.79 690.942 985.5 699.492 989.653ZM1045.76 661.679C1047.61 666.455 1048.54 671.542 1048.54 676.941V916.147C1048.54 921.753 1047.61 926.944 1045.76 931.72C1043.9 936.496 1041.3 940.753 1037.95 944.49C1034.79 948.02 1031.07 950.823 1026.8 952.9C1022.52 954.976 1017.88 956.015 1012.86 956.015H727.372C722.353 956.015 717.614 954.976 713.153 952.9C708.878 950.823 705.161 948.02 702.001 944.49C698.842 940.96 696.332 936.808 694.474 932.032C692.615 927.048 691.686 921.753 691.686 916.147V676.941C691.686 671.335 692.615 666.144 694.474 661.368C696.332 656.592 698.842 652.439 702.001 648.909C705.347 645.172 709.157 642.265 713.432 640.188C717.707 638.112 722.353 637.074 727.372 637.074H1012.86C1017.69 637.074 1022.24 638.112 1026.52 640.188C1030.98 642.265 1034.79 645.172 1037.95 648.909C1041.3 652.439 1043.9 656.696 1045.76 661.679Z" fill="url(#paint8_linear_211_11423)"/>
+</g>
+<g filter="url(#filter6_d_211_11423)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1048.54 676.941C1048.54 671.542 1047.61 666.455 1045.76 661.679C1043.9 656.696 1041.3 652.439 1037.95 648.909C1034.79 645.172 1030.98 642.265 1026.52 640.188C1022.24 638.112 1017.69 637.074 1012.86 637.074H727.372C722.353 637.074 717.707 638.112 713.432 640.188C709.157 642.265 705.347 645.172 702.001 648.909C698.842 652.439 696.332 656.592 694.474 661.368C692.615 666.144 691.686 671.335 691.686 676.941V916.147C691.686 921.753 692.615 927.048 694.474 932.032C696.332 936.808 698.842 940.96 702.001 944.49C705.161 948.02 708.878 950.823 713.153 952.9C717.614 954.976 722.353 956.015 727.372 956.015H1012.86C1017.88 956.015 1022.52 954.976 1026.8 952.9C1031.07 950.823 1034.79 948.02 1037.95 944.49C1041.3 940.753 1043.9 936.496 1045.76 931.72C1047.61 926.944 1048.54 921.753 1048.54 916.147V676.941ZM903.013 812.117C904.871 807.342 905.801 802.15 905.801 796.544C905.801 791.145 904.871 786.058 903.013 781.282C901.154 776.299 898.552 772.042 895.206 768.512C892.047 764.775 888.236 761.867 883.776 759.791C879.501 757.715 874.947 756.676 870.115 756.676C865.096 756.676 860.45 757.715 856.175 759.791C851.9 761.867 848.09 764.775 844.744 768.512C841.585 772.042 839.076 776.195 837.217 780.971C835.358 785.747 834.429 790.938 834.429 796.544C834.429 802.15 835.358 807.445 837.217 812.429C839.076 817.205 841.585 821.357 844.744 824.887C847.904 828.417 851.621 831.221 855.896 833.297C860.357 835.373 865.096 836.412 870.115 836.412C875.133 836.412 879.78 835.373 884.055 833.297C888.329 831.221 892.047 828.417 895.206 824.887C898.552 821.15 901.154 816.893 903.013 812.117Z" fill="url(#paint9_linear_211_11423)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M988.791 995.882H937.337C1048.32 995.882 1095.4 956.015 1084.46 850.296V900.239C1084.46 953.512 1040.18 995.844 988.791 995.882Z" fill="url(#paint10_linear_211_11423)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M903.013 812.117C904.871 807.342 905.801 802.15 905.801 796.544C905.801 791.145 904.871 786.058 903.013 781.282C901.154 776.299 898.552 772.042 895.206 768.512C892.047 764.775 888.236 761.867 883.776 759.791C879.501 757.715 874.947 756.676 870.115 756.676C865.096 756.676 860.45 757.715 856.175 759.791C851.9 761.867 848.09 764.775 844.744 768.512C841.585 772.042 839.076 776.195 837.217 780.971C835.358 785.747 834.429 790.938 834.429 796.544C834.429 802.15 835.358 807.445 837.217 812.429C839.076 817.205 841.585 821.357 844.744 824.887C847.904 828.417 851.621 831.221 855.896 833.297C860.357 835.373 865.096 836.412 870.115 836.412C875.133 836.412 879.78 835.373 884.055 833.297C888.329 831.221 892.047 828.417 895.206 824.887C898.552 821.15 901.154 816.893 903.013 812.117Z" fill="url(#paint11_linear_211_11423)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M699.492 989.653C708.228 993.806 717.521 995.882 727.372 995.882H937.337C1048.32 995.882 1095.4 956.015 1084.46 850.296V676.684C1084.46 665.679 1082.37 655.658 1078.65 646.106C1074.94 636.347 1069.83 627.833 1063.32 620.566C1056.81 613.298 1049.19 607.588 1040.46 603.435C1031.91 599.282 1022.71 597.206 1012.86 597.206H977.172H763.057H727.372C717.521 597.206 708.228 599.282 699.492 603.435C690.942 607.588 683.415 613.298 676.91 620.566C670.404 627.833 665.293 636.347 661.576 646.106C657.859 655.658 656 665.936 656 676.941V916.147C656 927.152 657.859 937.534 661.576 947.294C665.293 956.845 670.404 965.255 676.91 972.522C683.415 979.79 690.942 985.5 699.492 989.653ZM1045.76 661.679C1047.61 666.455 1048.54 671.542 1048.54 676.941V916.147C1048.54 921.753 1047.61 926.944 1045.76 931.72C1043.9 936.496 1041.3 940.753 1037.95 944.49C1034.79 948.02 1031.07 950.823 1026.8 952.9C1022.52 954.976 1017.88 956.015 1012.86 956.015H727.372C722.353 956.015 717.614 954.976 713.153 952.9C708.878 950.823 705.161 948.02 702.001 944.49C698.842 940.96 696.332 936.808 694.474 932.032C692.615 927.048 691.686 921.753 691.686 916.147V676.941C691.686 671.335 692.615 666.144 694.474 661.368C696.332 656.592 698.842 652.439 702.001 648.909C705.347 645.172 709.157 642.265 713.432 640.188C717.707 638.112 722.353 637.074 727.372 637.074H1012.86C1017.69 637.074 1022.24 638.112 1026.52 640.188C1030.98 642.265 1034.79 645.172 1037.95 648.909C1041.3 652.439 1043.9 656.696 1045.76 661.679Z" fill="url(#paint12_linear_211_11423)"/>
+</g>
+<g filter="url(#filter7_i_211_11423)">
+<rect x="822" y="711" width="83" height="179" rx="35" fill="#006AB5"/>
+</g>
+</g>
+<defs>
+<filter id="filter0_d_211_11423" x="0" y="0" width="1090" height="1088" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="4"/>
+<feGaussianBlur stdDeviation="2"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_211_11423"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_211_11423" result="shape"/>
+</filter>
+<filter id="filter1_d_211_11423" x="0" y="67.5" width="1088" height="953" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="4"/>
+<feGaussianBlur stdDeviation="2"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_211_11423"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_211_11423" result="shape"/>
+</filter>
+<filter id="filter2_d_211_11423" x="-63.5" y="168.75" width="1215" height="860.625" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="-33.75"/>
+<feGaussianBlur stdDeviation="33.75"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_211_11423"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_211_11423" result="shape"/>
+</filter>
+<filter id="filter3_d_211_11423" x="0" y="270" width="1088" height="733.625" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="4"/>
+<feGaussianBlur stdDeviation="2"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_211_11423"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_211_11423" result="shape"/>
+</filter>
+<filter id="filter4_d_211_11423" x="0" y="270" width="1088" height="176.75" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="4"/>
+<feGaussianBlur stdDeviation="2"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_211_11423"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_211_11423" result="shape"/>
+</filter>
+<filter id="filter5_d_211_11423" x="651" y="590.206" width="440" height="408.677" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="-2"/>
+<feGaussianBlur stdDeviation="2.5"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.15 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_211_11423"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_211_11423" result="shape"/>
+</filter>
+<filter id="filter6_d_211_11423" x="651" y="590.206" width="440" height="408.677" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="-2"/>
+<feGaussianBlur stdDeviation="2.5"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.15 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_211_11423"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_211_11423" result="shape"/>
+</filter>
+<filter id="filter7_i_211_11423" x="822" y="711" width="83" height="187" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="8"/>
+<feGaussianBlur stdDeviation="6"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.15 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_211_11423"/>
+</filter>
+<linearGradient id="paint0_linear_211_11423" x1="3.99991" y1="-3.58017e-05" x2="1284.11" y2="728.257" gradientUnits="userSpaceOnUse">
+<stop offset="0.25" stop-color="#C1C1C1"/>
+<stop offset="0.934027" stop-color="#818181"/>
+</linearGradient>
+<linearGradient id="paint1_linear_211_11423" x1="-40" y1="63" x2="1040" y2="1020.5" gradientUnits="userSpaceOnUse">
+<stop offset="0.187317" stop-color="#D0D0CF"/>
+<stop offset="1" stop-color="#878787"/>
+</linearGradient>
+<linearGradient id="paint2_linear_211_11423" x1="4" y1="270" x2="1084" y2="270" gradientUnits="userSpaceOnUse">
+<stop offset="0.105802" stop-color="#DFDFDF"/>
+<stop offset="1" stop-color="#D6D6D6" stop-opacity="0.2"/>
+</linearGradient>
+<linearGradient id="paint3_linear_211_11423" x1="874.235" y1="412" x2="878.965" y2="672.69" gradientUnits="userSpaceOnUse">
+<stop stop-color="#3FACFF"/>
+<stop offset="1" stop-color="#0078D3"/>
+<stop offset="1" stop-color="#004579"/>
+</linearGradient>
+<linearGradient id="paint4_linear_211_11423" x1="867.543" y1="397.07" x2="866.804" y2="963.25" gradientUnits="userSpaceOnUse">
+<stop stop-color="#77BDF2"/>
+<stop offset="1" stop-color="#00477D"/>
+<stop offset="1" stop-color="#00477D"/>
+</linearGradient>
+<linearGradient id="paint5_linear_211_11423" x1="871" y1="358" x2="871" y2="996" gradientUnits="userSpaceOnUse">
+<stop stop-color="#4CC2FF"/>
+<stop offset="1" stop-color="#0078D4"/>
+</linearGradient>
+<linearGradient id="paint6_linear_211_11423" x1="870.115" y1="358" x2="870.115" y2="995.882" gradientUnits="userSpaceOnUse">
+<stop stop-color="#83D5FF"/>
+<stop offset="1" stop-color="#0078D4"/>
+</linearGradient>
+<linearGradient id="paint7_linear_211_11423" x1="870.115" y1="358" x2="870.115" y2="995.882" gradientUnits="userSpaceOnUse">
+<stop stop-color="#83D5FF"/>
+<stop offset="1" stop-color="#0078D4"/>
+</linearGradient>
+<linearGradient id="paint8_linear_211_11423" x1="870.115" y1="358" x2="870.115" y2="995.882" gradientUnits="userSpaceOnUse">
+<stop stop-color="#83D5FF"/>
+<stop offset="1" stop-color="#0078D4"/>
+</linearGradient>
+<linearGradient id="paint9_linear_211_11423" x1="871" y1="358" x2="871" y2="996" gradientUnits="userSpaceOnUse">
+<stop stop-color="#4CC2FF"/>
+<stop offset="1" stop-color="#0078D4"/>
+</linearGradient>
+<linearGradient id="paint10_linear_211_11423" x1="870.115" y1="358" x2="870.115" y2="995.882" gradientUnits="userSpaceOnUse">
+<stop stop-color="#83D5FF"/>
+<stop offset="1" stop-color="#0078D4"/>
+</linearGradient>
+<linearGradient id="paint11_linear_211_11423" x1="870.115" y1="358" x2="870.115" y2="995.882" gradientUnits="userSpaceOnUse">
+<stop stop-color="#83D5FF"/>
+<stop offset="1" stop-color="#0078D4"/>
+</linearGradient>
+<linearGradient id="paint12_linear_211_11423" x1="870.115" y1="358" x2="870.115" y2="995.882" gradientUnits="userSpaceOnUse">
+<stop stop-color="#83D5FF"/>
+<stop offset="1" stop-color="#0078D4"/>
+</linearGradient>
+<clipPath id="clip0_211_11423">
+<rect width="1080" height="1080" fill="white" transform="translate(4)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/Platforms/SecureFolderFS.UI/Assets/AppAssets/AppTitle.png b/src/Platforms/SecureFolderFS.UI/Assets/AppAssets/app_title.png
similarity index 100%
rename from src/Platforms/SecureFolderFS.UI/Assets/AppAssets/AppTitle.png
rename to src/Platforms/SecureFolderFS.UI/Assets/AppAssets/app_title.png
diff --git a/src/Platforms/SecureFolderFS.UI/Assets/AppAssets/AppTitle.svg b/src/Platforms/SecureFolderFS.UI/Assets/AppAssets/app_title.svg
similarity index 100%
rename from src/Platforms/SecureFolderFS.UI/Assets/AppAssets/AppTitle.svg
rename to src/Platforms/SecureFolderFS.UI/Assets/AppAssets/app_title.svg
diff --git a/src/Platforms/SecureFolderFS.UI/Assets/AppAssets/Vault_dark.svg b/src/Platforms/SecureFolderFS.UI/Assets/AppAssets/vault_dark.svg
similarity index 100%
rename from src/Platforms/SecureFolderFS.UI/Assets/AppAssets/Vault_dark.svg
rename to src/Platforms/SecureFolderFS.UI/Assets/AppAssets/vault_dark.svg
diff --git a/src/Platforms/SecureFolderFS.UI/Assets/AppAssets/Vault_light.svg b/src/Platforms/SecureFolderFS.UI/Assets/AppAssets/vault_light.svg
similarity index 100%
rename from src/Platforms/SecureFolderFS.UI/Assets/AppAssets/Vault_light.svg
rename to src/Platforms/SecureFolderFS.UI/Assets/AppAssets/vault_light.svg
diff --git a/src/Platforms/SecureFolderFS.UI/Assets/Licenses/FluentAvaloniaFluentIcons LICENSE b/src/Platforms/SecureFolderFS.UI/Assets/Licenses/FluentAvaloniaFluentIcons LICENSE
deleted file mode 100644
index d8e22faeb..000000000
--- a/src/Platforms/SecureFolderFS.UI/Assets/Licenses/FluentAvaloniaFluentIcons LICENSE	
+++ /dev/null
@@ -1,27 +0,0 @@
-FluentAvalonia.FluentIcons
-https://github.com/taj-ny/FluentAvalonia.FluentIcons/blob/main/LICENSE
-MIT
-https://github.com/taj-ny/FluentAvalonia.FluentIcons
-
-MIT License
-
-Copyright (c) 2020 Microsoft Corporation
-Copyright (c) 2023 taj_ny
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/src/Platforms/SecureFolderFS.UI/Assets/Licenses/FluentAvalonia LICENSE b/src/Platforms/SecureFolderFS.UI/Assets/Licenses/MauiPanPinchContainer LICENSE
similarity index 83%
rename from src/Platforms/SecureFolderFS.UI/Assets/Licenses/FluentAvalonia LICENSE
rename to src/Platforms/SecureFolderFS.UI/Assets/Licenses/MauiPanPinchContainer LICENSE
index 79e9d52df..8d38ae8ee 100644
--- a/src/Platforms/SecureFolderFS.UI/Assets/Licenses/FluentAvalonia LICENSE	
+++ b/src/Platforms/SecureFolderFS.UI/Assets/Licenses/MauiPanPinchContainer LICENSE	
@@ -1,11 +1,11 @@
-FluentAvalonia
-https://github.com/amwx/FluentAvalonia/blob/master/LICENSE
+MauiPanPinchContainer
+https://github.com/CodingOctocat/MauiPanPinchContainer/blob/master/LICENSE
 MIT
-https://github.com/amwx/FluentAvalonia
+https://github.com/CodingOctocat/MauiPanPinchContainer?tab=MIT-1-ov-file
 
 MIT License
 
-Copyright (c) 2020 amwx
+Copyright (c) 2024 CodingNinja
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/src/Platforms/SecureFolderFS.UI/Constants.cs b/src/Platforms/SecureFolderFS.UI/Constants.cs
index 0ad0b4959..20584d6f6 100644
--- a/src/Platforms/SecureFolderFS.UI/Constants.cs
+++ b/src/Platforms/SecureFolderFS.UI/Constants.cs
@@ -3,6 +3,7 @@ namespace SecureFolderFS.UI
     public static class Constants
     {
         public const string MAIN_WINDOW_ID = "SecureFolderFS_mainwindow";
+        public const string DATA_CONTAINER_ID = "SecureFolderFS_datacontainer";
         public const string STORABLE_BOOKMARK_RID = "bookmark:";
 
         public static class GitHub
@@ -19,7 +20,7 @@ public static class FileNames
             public const string APPLICATION_SETTINGS_FILENAME = "application_settings.json";
             public const string SAVED_VAULTS_FILENAME = "saved_vaults.json";
             public const string USER_SETTINGS_FILENAME = "user_settings.json";
-            public const string ICON_ASSET_PATH = "Assets/AppAssets/AppIcon.ico";
+            public const string ICON_ASSET_PATH = "Assets/AppAssets/app_icon.ico";
         }
 
         public static class AppThemes
diff --git a/src/Platforms/SecureFolderFS.UI/Helpers/BaseLifecycleHelper.cs b/src/Platforms/SecureFolderFS.UI/Helpers/BaseLifecycleHelper.cs
index 56e5151b0..d6fadde8b 100644
--- a/src/Platforms/SecureFolderFS.UI/Helpers/BaseLifecycleHelper.cs
+++ b/src/Platforms/SecureFolderFS.UI/Helpers/BaseLifecycleHelper.cs
@@ -21,7 +21,7 @@ public abstract class BaseLifecycleHelper : IAsyncInitialize
         /// <inheritdoc/>
         public virtual Task InitAsync(CancellationToken cancellationToken = default)
         {
-            var settingsFolderPath = Path.Combine(Directory.GetCurrentDirectory(), SecureFolderFS.UI.Constants.FileNames.SETTINGS_FOLDER_NAME);
+            var settingsFolderPath = Path.Combine(Directory.GetCurrentDirectory(), Constants.FileNames.SETTINGS_FOLDER_NAME);
             var settingsFolder = new SystemFolder(Directory.CreateDirectory(settingsFolderPath));
             ConfigureServices(settingsFolder);
 
@@ -47,9 +47,11 @@ protected virtual IServiceCollection ConfigureServices(IModifiableFolder setting
         {
             return ServiceCollection
 
-                    // Singleton services
-                    .AddSingleton<IVaultPersistenceService, VaultPersistenceService>(_ => new(settingsFolder))
+                // Singleton services
+                    .AddSingleton<IVaultService, VaultService>()
+                    .AddSingleton<IVaultManagerService, VaultManagerService>()
                     .AddSingleton<IChangelogService, GitHubChangelogService>()
+                    .AddSingleton<IVaultPersistenceService, VaultPersistenceService>(_ => new(settingsFolder))
 
                 ; // Finish service initialization
         }
diff --git a/src/Platforms/SecureFolderFS.UI/Helpers/NavigationHelpers.cs b/src/Platforms/SecureFolderFS.UI/Helpers/NavigationHelpers.cs
index 4c90a19a8..653f48bb3 100644
--- a/src/Platforms/SecureFolderFS.UI/Helpers/NavigationHelpers.cs
+++ b/src/Platforms/SecureFolderFS.UI/Helpers/NavigationHelpers.cs
@@ -1,4 +1,5 @@
 using SecureFolderFS.Sdk.Services;
+using SecureFolderFS.Shared.ComponentModel;
 using SecureFolderFS.UI.ServiceImplementation;
 using SecureFolderFS.UI.Utils;
 
@@ -9,10 +10,10 @@ public static class NavigationHelpers
         public static void ResetNavigation(this INavigationService navigationService)
         {
             if (navigationService is INavigationControlContract navigationControlContract)
-                navigationControlContract.NavigationControl = null;
+                navigationControlContract.Navigator = null;
         }
 
-        public static bool SetupNavigation(this INavigationService navigationService, INavigationControl navigationControl, bool overrideNavigation = false)
+        public static bool SetupNavigation(this INavigationService navigationService, INavigator navigator, bool overrideNavigation = false)
         {
             if (navigationService is not BaseNavigationService baseNavigationService)
                 return false;
@@ -20,7 +21,7 @@ public static bool SetupNavigation(this INavigationService navigationService, IN
             if (!overrideNavigation && baseNavigationService.IsInitialized)
                 return true;
 
-            baseNavigationService.NavigationControl = navigationControl;
+            baseNavigationService.Navigator = navigator;
             return baseNavigationService.IsInitialized;
         }
     }
diff --git a/src/Platforms/SecureFolderFS.UI/Helpers/VaultHelpers.cs b/src/Platforms/SecureFolderFS.UI/Helpers/VaultHelpers.cs
index 9267e0530..7fafb044b 100644
--- a/src/Platforms/SecureFolderFS.UI/Helpers/VaultHelpers.cs
+++ b/src/Platforms/SecureFolderFS.UI/Helpers/VaultHelpers.cs
@@ -1,11 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using SecureFolderFS.Core.Cryptography.SecureStore;
-using SecureFolderFS.Sdk.Services;
-using SecureFolderFS.Shared;
 using SecureFolderFS.Shared.ComponentModel;
 using SecureFolderFS.Shared.Models;
 using static SecureFolderFS.Core.Constants.Vault;
@@ -14,38 +10,13 @@ namespace SecureFolderFS.UI.Helpers
 {
     public static class VaultHelpers
     {
-        public static async Task<string> GetBestFileSystemAsync(CancellationToken cancellationToken)
-        {
-            var vaultService = DI.Service<IVaultService>();
-            var settingsService = DI.Service<ISettingsService>();
-
-            string? lastBestId = null;
-            foreach (var item in vaultService.GetFileSystems())
-            {
-                if (item.Id == settingsService.UserSettings.PreferredFileSystemId)
-                {
-                    if ((await item.GetStatusAsync(cancellationToken)).Successful)
-                        return item.Id;
-                }
-                else
-                {
-                    if (lastBestId is null && (await item.GetStatusAsync(cancellationToken)).Successful)
-                        lastBestId = item.Id;
-                }
-            }
-
-            if (lastBestId is null)
-                throw new NotSupportedException("No supported adapters found.");
-
-            return lastBestId;
-        }
-
         public static IDictionary<string, object?> ParseOptions(VaultOptions vaultOptions)
         {
             return new Dictionary<string, object?>()
             {
                 { Associations.ASSOC_CONTENT_CIPHER_ID, vaultOptions.ContentCipherId },
                 { Associations.ASSOC_FILENAME_CIPHER_ID, vaultOptions.FileNameCipherId },
+                { Associations.ASSOC_FILENAME_ENCODING_ID, vaultOptions.NameEncodingId },
                 { Associations.ASSOC_AUTHENTICATION, string.Join(Authentication.SEPARATOR, vaultOptions.AuthenticationMethod) },
                 { Associations.ASSOC_VERSION, vaultOptions.Version },
                 { Associations.ASSOC_VAULT_ID, vaultOptions.VaultId }
diff --git a/src/Platforms/SecureFolderFS.UI/SecureFolderFS.UI.csproj b/src/Platforms/SecureFolderFS.UI/SecureFolderFS.UI.csproj
index 5192031db..d22075853 100644
--- a/src/Platforms/SecureFolderFS.UI/SecureFolderFS.UI.csproj
+++ b/src/Platforms/SecureFolderFS.UI/SecureFolderFS.UI.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <ImplicitUsings>disable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <Platforms>AnyCPU;ARM64;x64;x86</Platforms>
@@ -9,12 +9,16 @@
 
     <ItemGroup>
         <EmbeddedResource Include="Assets\*" />
-        <None Remove="Assets\AppAssets\AppIcon.ico" />
-        <None Remove="Assets\AppAssets\AppIcon.png" />
-        <None Remove="Assets\AppAssets\AppTitle.png" />
-        <None Remove="Assets\AppAssets\AppTitle.svg" />
-        <None Remove="Assets\AppAssets\GreenShield.svg" />
-        <None Remove="Assets\AppAssets\GreenShield.png" />
+        <None Remove="Assets\AppAssets\app_icon.ico" />
+        <None Remove="Assets\AppAssets\app_icon.png" />
+        <None Remove="Assets\AppAssets\app_title.png" />
+        <None Remove="Assets\AppAssets\app_title.svg" />
+        <None Remove="Assets\AppAssets\Shields\error_shield.svg" />
+        <None Remove="Assets\AppAssets\Shields\error_shield.png" />
+        <None Remove="Assets\AppAssets\Shields\success_shield.png" />
+        <None Remove="Assets\AppAssets\Shields\success_shield.svg" />
+        <None Remove="Assets\AppAssets\Shields\warning_shield.png" />
+        <None Remove="Assets\AppAssets\Shields\warning_shield.svg" />
         <None Remove="Assets\AppAssets\Media\ExplanationVideoDark.mov" />
         <None Remove="Assets\Licenses\FluentAvalonia LICENSE" />
         <None Remove="Assets\Licenses\MicrosoftExtensionsDependencyInjection LICENSE" />
@@ -22,36 +26,39 @@
         <None Remove="Assets\Licenses\Roslyn Analyzers LICENSE" />
         <None Remove="Assets\Licenses\Roslyn LICENSE" />
         <None Remove="Assets\Licenses\WinUI3Utilities LICENSE" />
-        <EmbeddedResource Include="Assets\AppAssets\AppIcon.ico">
+        <EmbeddedResource Include="Assets\AppAssets\app_icon.ico">
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </EmbeddedResource>
-        <EmbeddedResource Include="Assets\AppAssets\AppIcon.png">
+        <EmbeddedResource Include="Assets\AppAssets\app_icon.png">
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </EmbeddedResource>
-        <EmbeddedResource Include="Assets\AppAssets\AppTitle.png">
+        <EmbeddedResource Include="Assets\AppAssets\app_title.png">
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </EmbeddedResource>
-        <EmbeddedResource Include="Assets\AppAssets\AppTitle.svg">
+        <EmbeddedResource Include="Assets\AppAssets\app_title.svg">
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </EmbeddedResource>
-        <None Remove="Assets\AppAssets\Vault_dark.svg" />
+        <None Remove="Assets\AppAssets\vault_dark.svg" />
         <EmbeddedResource Include="Assets\AppAssets\Media\ExplanationVideoDark.mov">
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </EmbeddedResource>
-        <EmbeddedResource Include="Assets\AppAssets\Vault_dark.svg">
+        <EmbeddedResource Include="Assets\AppAssets\vault_dark.svg">
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </EmbeddedResource>
-        <None Remove="Assets\AppAssets\Vault_light.svg" />
-        <EmbeddedResource Include="Assets\AppAssets\Vault_light.svg">
+        <None Remove="Assets\AppAssets\vault_light.svg" />
+        <EmbeddedResource Include="Assets\AppAssets\vault_light.svg">
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </EmbeddedResource>
-        <EmbeddedResource Include="Assets\AppAssets\GreenShield.svg">
+        <EmbeddedResource Include="Assets\AppAssets\Shields\error_shield.svg">
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </EmbeddedResource>
-        <None Remove="Assets\Licenses\Tmds.Fuse LICENSE" />
-        <EmbeddedResource Include="Assets\Licenses\FluentAvalonia LICENSE">
+        <EmbeddedResource Include="Assets\AppAssets\Shields\success_shield.svg">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </EmbeddedResource>
+        <EmbeddedResource Include="Assets\AppAssets\Shields\warning_shield.svg">
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </EmbeddedResource>
+        <None Remove="Assets\Licenses\Tmds.Fuse LICENSE" />
         <EmbeddedResource Include="Assets\Licenses\MicrosoftExtensionsDependencyInjection LICENSE">
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </EmbeddedResource>
@@ -144,10 +151,17 @@
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </EmbeddedResource>
         <None Remove="Assets\Licenses\FluentAvaloniaFluentIcons LICENSE" />
-        <EmbeddedResource Include="Assets\Licenses\FluentAvaloniaFluentIcons LICENSE">
+        <EmbeddedResource Include="Assets\AppAssets\Shields\error_shield.png">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </EmbeddedResource>
+        <EmbeddedResource Include="Assets\AppAssets\Shields\success_shield.png">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </EmbeddedResource>
+        <EmbeddedResource Include="Assets\AppAssets\Shields\warning_shield.png">
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </EmbeddedResource>
-        <EmbeddedResource Include="Assets\AppAssets\GreenShield.png">
+        <None Remove="Assets\AppAssets\app_icon.svg" />
+        <EmbeddedResource Include="Assets\AppAssets\app_icon.svg">
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </EmbeddedResource>
     </ItemGroup>
diff --git a/src/Platforms/SecureFolderFS.UI/ServiceImplementation/BaseNavigationService.cs b/src/Platforms/SecureFolderFS.UI/ServiceImplementation/BaseNavigationService.cs
index 03d05191f..124efa1c1 100644
--- a/src/Platforms/SecureFolderFS.UI/ServiceImplementation/BaseNavigationService.cs
+++ b/src/Platforms/SecureFolderFS.UI/ServiceImplementation/BaseNavigationService.cs
@@ -16,10 +16,10 @@ public abstract class BaseNavigationService : INavigationService, INavigationCon
         public IViewDesignation? CurrentView { get; protected set; }
 
         /// <inheritdoc/>
-        public ICollection<IViewDesignation> Views { get; protected set; }
+        public List<IViewDesignation> Views { get; protected set; }
 
         /// <inheritdoc/>
-        public INavigationControl? NavigationControl { get; set; }
+        public INavigator? Navigator { get; set; }
 
         /// <inheritdoc/>
         public event EventHandler<IViewDesignation?>? NavigationChanged;
@@ -27,7 +27,7 @@ public abstract class BaseNavigationService : INavigationService, INavigationCon
         /// <summary>
         /// Gets the value that determines whether this service is initialized and can handle navigation.
         /// </summary>
-        public virtual bool IsInitialized => NavigationControl is not null;
+        public virtual bool IsInitialized => Navigator is not null;
 
         protected BaseNavigationService()
         {
@@ -35,7 +35,7 @@ protected BaseNavigationService()
         }
 
         /// <inheritdoc/>
-        public virtual async Task<bool> NavigateAsync(IViewDesignation view)
+        public virtual async Task<bool> NavigateAsync(IViewDesignation? view)
         {
             if (!IsInitialized)
                 return false;
@@ -44,19 +44,19 @@ public virtual async Task<bool> NavigateAsync(IViewDesignation view)
             CurrentView?.OnDisappearing();
 
             // Notify the new target that it's been navigated to
-            view.OnAppearing();
+            view?.OnAppearing();
             
             // Update current target
             CurrentView = view;
-
-            // Add new target
-            if (!Views.Contains(view))
-                Views.Add(view);
             
             // Start actual navigation
             var navigationResult = await BeginNavigationAsync(view, NavigationType.Chained);
             if (!navigationResult)
                 return false;
+            
+            // Add new target
+            if (view is not null && !Views.Contains(view))
+                Views.Add(view);
 
             // Notify that navigation has occurred
             NavigationChanged?.Invoke(this, view);
@@ -98,7 +98,7 @@ public virtual async Task<bool> GoForwardAsync()
                 // Notify that navigation has occurred
                 NavigationChanged?.Invoke(this, CurrentView);
             }
-
+            
             return navigationResult;
         }
 
@@ -120,7 +120,7 @@ public virtual async Task<bool> GoForwardAsync()
         public virtual void Dispose()
         {
             CurrentView = null;
-            NavigationControl?.Dispose();
+            (Navigator as IDisposable)?.Dispose();
 
             Views.DisposeElements();
             Views.Clear();
diff --git a/src/Platforms/SecureFolderFS.UI/ServiceImplementation/BaseVaultCredentialsService.cs b/src/Platforms/SecureFolderFS.UI/ServiceImplementation/BaseVaultCredentialsService.cs
new file mode 100644
index 000000000..cf1eaec28
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.UI/ServiceImplementation/BaseVaultCredentialsService.cs
@@ -0,0 +1,31 @@
+using System.Collections.Generic;
+using System.Threading;
+using OwlCore.Storage;
+using SecureFolderFS.Sdk.Services;
+using SecureFolderFS.Sdk.ViewModels.Controls.Authentication;
+
+namespace SecureFolderFS.UI.ServiceImplementation
+{
+    /// <inheritdoc cref="IVaultCredentialsService"/>
+    public abstract class BaseVaultCredentialsService : IVaultCredentialsService
+    {
+        /// <inheritdoc/>
+        public virtual IEnumerable<string> GetContentCiphers()
+        {
+            yield return Core.Cryptography.Constants.CipherId.XCHACHA20_POLY1305;
+            yield return Core.Cryptography.Constants.CipherId.AES_GCM;
+        }
+
+        /// <inheritdoc/>
+        public virtual IEnumerable<string> GetFileNameCiphers()
+        {
+            yield return Core.Cryptography.Constants.CipherId.AES_SIV;
+            yield return Core.Cryptography.Constants.CipherId.NONE;
+        }
+
+        /// <inheritdoc/>
+        public abstract IAsyncEnumerable<AuthenticationViewModel> GetLoginAsync(IFolder vaultFolder, CancellationToken cancellationToken = default);
+
+        public abstract IAsyncEnumerable<AuthenticationViewModel> GetCreationAsync(IFolder vaultFolder, string vaultId, CancellationToken cancellationToken = default);
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.UI/ServiceImplementation/BaseVaultFileSystemService.cs b/src/Platforms/SecureFolderFS.UI/ServiceImplementation/BaseVaultFileSystemService.cs
new file mode 100644
index 000000000..c069df846
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.UI/ServiceImplementation/BaseVaultFileSystemService.cs
@@ -0,0 +1,115 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Threading;
+using System.Threading.Tasks;
+using OwlCore.Storage;
+using SecureFolderFS.Core.FileSystem;
+using SecureFolderFS.Core.FileSystem.Helpers.Health;
+using SecureFolderFS.Sdk.Helpers;
+using SecureFolderFS.Sdk.Services;
+using SecureFolderFS.Sdk.ViewModels.Controls.Widgets.Health;
+using SecureFolderFS.Shared.ComponentModel;
+using SecureFolderFS.Shared.Extensions;
+using SecureFolderFS.Shared.Models;
+using SecureFolderFS.Storage.VirtualFileSystem;
+using SecureFolderFS.UI.ViewModels.Health;
+
+namespace SecureFolderFS.UI.ServiceImplementation
+{
+    /// <inheritdoc cref="IVaultFileSystemService"/>
+    public abstract class BaseVaultFileSystemService : IVaultFileSystemService
+    {
+        /// <inheritdoc/>
+        public Task<IFileSystem> GetLocalFileSystemAsync(CancellationToken cancellationToken)
+        {
+            return Task.FromResult<IFileSystem>(new LocalFileSystem());
+        }
+
+        /// <inheritdoc/>
+        public async Task<HealthIssueViewModel?> GetIssueViewModelAsync(IResult result, IStorableChild storable, CancellationToken cancellation)
+        {
+            await Task.CompletedTask;
+            if (result.Successful || result.Exception is null)
+                return null;
+
+            return result.Exception switch
+            {
+                AggregateException aggregate => aggregate.InnerException switch
+                {
+                    EndOfStreamException => new HealthDirectoryIssueViewModel(storable, result, "Invalid directory ID") { ErrorMessage = "Regenerate invalid directory ID", Icon = "\uE8B7" }.WithInitAsync(),
+                    FileNotFoundException => new HealthDirectoryIssueViewModel(storable, result, "Missing directory ID") { ErrorMessage = "Regenerate missing directory ID", Icon = "\uE8B7" }.WithInitAsync(),
+                    { } ex => GetDefault(ex),
+                    _ => GetDefault(aggregate)
+                },
+                FormatException => new HealthNameIssueViewModel(storable, result, "Invalid item name") { ErrorMessage = "Choose a new name", Icon = "\uE8AC" },
+                CryptographicException => new HealthFileDataIssueViewModel(storable, result, "Corrupted file contents") { ErrorMessage = "Overwrite affected file regions", Icon = "\uE74C" },
+                { } ex => GetDefault(ex)
+            };
+
+            HealthIssueViewModel GetDefault(Exception ex)
+            {
+                return new HealthIssueViewModel(storable, result, ex.GetType().ToString()) { Icon = "\uE783" };
+            }
+        }
+
+        /// <inheritdoc/>
+        public async Task ResolveIssuesAsync(IEnumerable<HealthIssueViewModel> issues, IDisposable contractOrRoot, IVaultFileSystemService.IssueDelegate? issueDelegate, CancellationToken cancellationToken = default)
+        {
+            // Sort in the following order:
+            /*
+                1. Corrupted file contents (HealthFileDataIssueViewModel)
+                2. Corrupted folder/file names (HealthNameIssueViewModel) and corrupted Directory ID (HealthDirectoryIssueViewModel) starting with items with most parents
+            */
+            var sortedIssues = issues
+                .OrderByDescending(issue => issue is HealthFileDataIssueViewModel)
+                .ThenBy(issue => issue is HealthNameIssueViewModel or HealthDirectoryIssueViewModel)
+                .ThenByDescending(issue =>
+                {
+                    // Get the amount of items
+                    var pathComponents = issue.Inner.Id.Split(Path.DirectorySeparatorChar).Length;
+
+                    // We actually prioritize Directory ID issues first, since the children
+                    // of the affected directory also need to be renamed in one sweep
+                    return issue is HealthDirectoryIssueViewModel ? ++pathComponents : pathComponents;
+                })
+                .ToArray();
+
+            if (contractOrRoot is IWrapper<FileSystemSpecifics> specificsWrapper)
+            {
+                foreach (var item in sortedIssues)
+                {
+                    var result = item switch
+                    {
+                        // Name issue
+                        HealthNameIssueViewModel nameIssue => await HealthHelpers.RepairNameAsync(
+                            nameIssue.Inner,
+                            specificsWrapper.Inner,
+                            FormattingHelpers.SanitizeItemName(nameIssue.ItemName ?? string.Empty, nameIssue.OriginalName),
+                            cancellationToken),
+
+                        // TODO: Implement repair for HealthFileDataIssueViewModel
+                        HealthFileDataIssueViewModel dataIssue => Result.Failure(null),
+
+                        // Directory ID issue
+                        HealthDirectoryIssueViewModel directoryIssue => await HealthHelpers.RepairDirectoryAsync(
+                            directoryIssue.Folder ?? throw new ArgumentNullException(nameof(HealthDirectoryIssueViewModel.Folder)),
+                            specificsWrapper.Inner.Security,
+                            cancellationToken),
+
+                        // Default
+                        _ => null
+                    };
+
+                    if (result is not null)
+                        issueDelegate?.Invoke(item, result);
+                }
+            }
+        }
+
+        /// <inheritdoc/>
+        public abstract IAsyncEnumerable<IFileSystem> GetFileSystemsAsync(CancellationToken cancellationToken);
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.UI/ServiceImplementation/BaseVaultService.cs b/src/Platforms/SecureFolderFS.UI/ServiceImplementation/BaseVaultService.cs
deleted file mode 100644
index 1e8fd23de..000000000
--- a/src/Platforms/SecureFolderFS.UI/ServiceImplementation/BaseVaultService.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using OwlCore.Storage;
-using SecureFolderFS.Core.Validators;
-using SecureFolderFS.Core.VaultAccess;
-using SecureFolderFS.Sdk.AppModels;
-using SecureFolderFS.Sdk.Models;
-using SecureFolderFS.Sdk.Services;
-using SecureFolderFS.Sdk.ViewModels.Controls.Authentication;
-using SecureFolderFS.Shared.ComponentModel;
-using SecureFolderFS.Shared.Models;
-
-namespace SecureFolderFS.UI.ServiceImplementation
-{
-    /// <inheritdoc cref="IVaultService"/>
-    public abstract class BaseVaultService : IVaultService
-    {
-        /// <inheritdoc/>
-        public int LatestVaultVersion { get; } = Core.Constants.Vault.Versions.LATEST_VERSION;
-
-        /// <inheritdoc/>
-        public IAsyncValidator<IFolder> VaultValidator { get; } = new VaultValidator(StreamSerializer.Instance);
-
-        /// <inheritdoc/>
-        public virtual bool IsNameReserved(string? name)
-        {
-            return name is not null && (
-                   name.Equals(Core.Constants.Vault.Names.VAULT_KEYSTORE_FILENAME, StringComparison.OrdinalIgnoreCase) ||
-                   name.Equals(Core.Constants.Vault.Names.VAULT_CONFIGURATION_FILENAME, StringComparison.OrdinalIgnoreCase) ||
-                   name.Equals(Core.Constants.Vault.Names.VAULT_CONTENT_FOLDERNAME, StringComparison.OrdinalIgnoreCase));
-        }
-
-        /// <inheritdoc/>
-        public virtual IEnumerable<string> GetContentCiphers()
-        {
-            yield return Core.Cryptography.Constants.CipherId.XCHACHA20_POLY1305;
-            yield return Core.Cryptography.Constants.CipherId.AES_GCM;
-        }
-
-        /// <inheritdoc/>
-        public virtual IEnumerable<string> GetFileNameCiphers()
-        {
-            yield return Core.Cryptography.Constants.CipherId.AES_SIV;
-            yield return Core.Cryptography.Constants.CipherId.NONE;
-        }
-
-        /// <inheritdoc/>
-        public virtual async Task<VaultOptions> GetVaultOptionsAsync(IFolder vaultFolder, CancellationToken cancellationToken = default)
-        {
-            var vaultReader = new VaultReader(vaultFolder, StreamSerializer.Instance);
-            var config = await vaultReader.ReadConfigurationAsync(cancellationToken);
-
-            return new()
-            {
-                AuthenticationMethod = config.AuthenticationMethod.Split(Core.Constants.Vault.Authentication.SEPARATOR),
-                ContentCipherId = config.ContentCipherId,
-                FileNameCipherId = config.FileNameCipherId,
-                VaultId = config.Uid,
-                Version = config.Version
-            };
-        }
-
-        /// <inheritdoc/>
-        public abstract IEnumerable<IFileSystemInfoModel> GetFileSystems();
-
-        /// <inheritdoc/>
-        public abstract IAsyncEnumerable<AuthenticationViewModel> GetLoginAsync(IFolder vaultFolder, CancellationToken cancellationToken = default);
-
-        /// <inheritdoc/>
-        public abstract IAsyncEnumerable<AuthenticationViewModel> GetCreationAsync(IFolder vaultFolder, string vaultId, CancellationToken cancellationToken = default);
-    }
-}
diff --git a/src/Platforms/SecureFolderFS.UI/ServiceImplementation/Settings/UserSettings.cs b/src/Platforms/SecureFolderFS.UI/ServiceImplementation/Settings/UserSettings.cs
index ee8472d03..64ff6e4ba 100644
--- a/src/Platforms/SecureFolderFS.UI/ServiceImplementation/Settings/UserSettings.cs
+++ b/src/Platforms/SecureFolderFS.UI/ServiceImplementation/Settings/UserSettings.cs
@@ -39,6 +39,13 @@ public virtual bool StartOnSystemStartup
             set => SetSetting(value);
         }
 
+        /// <inheritdoc/>
+        public virtual bool ReduceToBackground
+        {
+            get => GetSetting(static () => true);
+            set => SetSetting(value);
+        }
+
         /// <inheritdoc/>
         public virtual bool ContinueOnLastVault
         {
@@ -58,16 +65,23 @@ public virtual bool OpenFolderOnUnlock
         #region Privacy
 
         /// <inheritdoc/>
-        public virtual bool AutoLockVaults
+        public virtual bool IsTelemetryEnabled
+        {
+            get => GetSetting(() => true);
+            set => SetSetting(value);
+        }
+
+        /// <inheritdoc/>
+        public virtual bool LockOnSystemLock
         {
             get => GetSetting(() => false);
             set => SetSetting(value);
         }
 
         /// <inheritdoc/>
-        public virtual bool IsTelemetryEnabled
+        public virtual bool DisableRecentAccess
         {
-            get => GetSetting(() => true);
+            get => GetSetting(() => false);
             set => SetSetting(value);
         }
 
@@ -77,12 +91,13 @@ protected virtual void UserSettings_PropertyChanged(object? sender, PropertyChan
         {
             var eventName = e.PropertyName switch
             {
-                nameof(AutoLockVaults) => $"{nameof(AutoLockVaults)}: {AutoLockVaults}",
+                nameof(LockOnSystemLock) => $"{nameof(LockOnSystemLock)}: {LockOnSystemLock}",
                 nameof(IsTelemetryEnabled) => $"{nameof(IsTelemetryEnabled)}: {IsTelemetryEnabled}",
                 nameof(PreferredFileSystemId) => $"{nameof(PreferredFileSystemId)}: {PreferredFileSystemId}",
                 nameof(StartOnSystemStartup) => $"{nameof(StartOnSystemStartup)}: {StartOnSystemStartup}",
                 nameof(ContinueOnLastVault) => $"{nameof(ContinueOnLastVault)}: {ContinueOnLastVault}",
                 nameof(OpenFolderOnUnlock) => $"{nameof(OpenFolderOnUnlock)}: {OpenFolderOnUnlock}",
+                nameof(ReduceToBackground) => $"{nameof(ReduceToBackground)}: {ReduceToBackground}",
                 _ => null
             };
 
diff --git a/src/Platforms/SecureFolderFS.UI/ServiceImplementation/BaseVaultManagerService.cs b/src/Platforms/SecureFolderFS.UI/ServiceImplementation/VaultManagerService.cs
similarity index 50%
rename from src/Platforms/SecureFolderFS.UI/ServiceImplementation/BaseVaultManagerService.cs
rename to src/Platforms/SecureFolderFS.UI/ServiceImplementation/VaultManagerService.cs
index 6b9cb023f..1bfa1213c 100644
--- a/src/Platforms/SecureFolderFS.UI/ServiceImplementation/BaseVaultManagerService.cs
+++ b/src/Platforms/SecureFolderFS.UI/ServiceImplementation/VaultManagerService.cs
@@ -1,32 +1,24 @@
 using System;
-using System.IO;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using OwlCore.Storage;
 using SecureFolderFS.Core.Cryptography.SecureStore;
-using SecureFolderFS.Core.FileSystem;
-using SecureFolderFS.Core.FileSystem.AppModels;
-using SecureFolderFS.Core.FileSystem.Storage;
-using SecureFolderFS.Core.Migration;
 using SecureFolderFS.Core.Routines.Operational;
-using SecureFolderFS.Core.VaultAccess;
 using SecureFolderFS.Sdk.AppModels;
-using SecureFolderFS.Sdk.Models;
 using SecureFolderFS.Sdk.Services;
 using SecureFolderFS.Shared.ComponentModel;
 using SecureFolderFS.Shared.Models;
 using SecureFolderFS.Storage.Extensions;
-using SecureFolderFS.Storage.VirtualFileSystem;
 using SecureFolderFS.UI.Helpers;
 
 namespace SecureFolderFS.UI.ServiceImplementation
 {
     /// <inheritdoc cref="IVaultManagerService"/>
-    public abstract class BaseVaultManagerService : IVaultManagerService
+    public class VaultManagerService : IVaultManagerService
     {
         /// <inheritdoc/>
-        public async Task<IDisposable> CreateAsync(IFolder vaultFolder, IKey passkey, VaultOptions vaultOptions,
+        public virtual async Task<IDisposable> CreateAsync(IFolder vaultFolder, IKey passkey, VaultOptions vaultOptions,
             CancellationToken cancellationToken = default)
         {
             using var creationRoutine = (await VaultRoutines.CreateRoutinesAsync(vaultFolder, StreamSerializer.Instance, cancellationToken)).CreateVault();
@@ -47,7 +39,7 @@ public async Task<IDisposable> CreateAsync(IFolder vaultFolder, IKey passkey, Va
         }
 
         /// <inheritdoc/>
-        public async Task<IDisposable> UnlockAsync(IFolder vaultFolder, IKey passkey, CancellationToken cancellationToken = default)
+        public virtual async Task<IDisposable> UnlockAsync(IFolder vaultFolder, IKey passkey, CancellationToken cancellationToken = default)
         {
             var routines = await VaultRoutines.CreateRoutinesAsync(vaultFolder, StreamSerializer.Instance, cancellationToken);
             using var unlockRoutine = routines.UnlockVault();
@@ -59,17 +51,17 @@ public async Task<IDisposable> UnlockAsync(IFolder vaultFolder, IKey passkey, Ca
         }
 
         /// <inheritdoc/>
-        public async Task<IDisposable> RecoverAsync(IFolder vaultFolder, string encodedRecoveryKey, CancellationToken cancellationToken = default)
+        public virtual async Task<IDisposable> RecoverAsync(IFolder vaultFolder, string encodedRecoveryKey, CancellationToken cancellationToken = default)
         {
             var routines = await VaultRoutines.CreateRoutinesAsync(vaultFolder, StreamSerializer.Instance, cancellationToken);
             var recoveryRoutine = routines.RecoverVault();
             var keySplit = encodedRecoveryKey.Split(Core.Constants.KEY_TEXT_SEPARATOR);
-            var recoveryKey = new SecureKey(Core.Cryptography.Constants.KeyChains.ENCKEY_LENGTH + Core.Cryptography.Constants.KeyChains.MACKEY_LENGTH);
+            var recoveryKey = new SecureKey(Core.Cryptography.Constants.KeyTraits.ENCKEY_LENGTH + Core.Cryptography.Constants.KeyTraits.MACKEY_LENGTH);
 
-            if (!Convert.TryFromBase64String(keySplit[0], recoveryKey.Key.AsSpan(0, Core.Cryptography.Constants.KeyChains.ENCKEY_LENGTH), out _))
+            if (!Convert.TryFromBase64String(keySplit[0], recoveryKey.Key.AsSpan(0, Core.Cryptography.Constants.KeyTraits.ENCKEY_LENGTH), out _))
                 throw new FormatException("The recovery key (1) was not in correct format.");
 
-            if (!Convert.TryFromBase64String(keySplit[1], recoveryKey.Key.AsSpan(Core.Cryptography.Constants.KeyChains.ENCKEY_LENGTH), out _))
+            if (!Convert.TryFromBase64String(keySplit[1], recoveryKey.Key.AsSpan(Core.Cryptography.Constants.KeyTraits.ENCKEY_LENGTH), out _))
                 throw new FormatException("The recovery key (2) was not in correct format.");
 
             await recoveryRoutine.InitAsync(cancellationToken);
@@ -78,54 +70,7 @@ public async Task<IDisposable> RecoverAsync(IFolder vaultFolder, string encodedR
         }
 
         /// <inheritdoc/>
-        public virtual async Task<IVFSRoot> CreateLocalStorageAsync(IVaultModel vaultModel, IDisposable unlockContract, CancellationToken cancellationToken)
-        {
-            try
-            {
-                var contentFolder = await vaultModel.Folder.GetFolderByNameAsync(Core.Constants.Vault.Names.VAULT_CONTENT_FOLDERNAME, cancellationToken);
-                var routines = await VaultRoutines.CreateRoutinesAsync(vaultModel.Folder, StreamSerializer.Instance, cancellationToken);
-                var statisticsModel = new ConsolidatedStatisticsModel();
-                var storageRoutine = routines.BuildStorage();
-                var options = new FileSystemOptions()
-                {
-                    VolumeName = vaultModel.VaultName, // TODO: Format name to exclude illegal characters
-                    FileSystemId = string.Empty,
-                    HealthStatistics = statisticsModel,
-                    FileSystemStatistics = statisticsModel
-                };
-
-                storageRoutine.SetUnlockContract(unlockContract);
-                var specifics = storageRoutine.GetSpecifics(contentFolder, options);
-                var cryptoFolder = new CryptoFolder(Path.DirectorySeparatorChar.ToString(), contentFolder, specifics);
-
-                return new LocalVFSRoot(specifics, cryptoFolder, options);
-            }
-            catch (Exception ex)
-            {
-                // Make sure to dispose the unlock contract when failed
-                unlockContract.Dispose();
-
-                _ = ex;
-                throw;
-            }
-        }
-
-        /// <inheritdoc/>
-        public virtual async Task<IVaultMigratorModel> GetMigratorAsync(IFolder vaultFolder, CancellationToken cancellationToken = default)
-        {
-            var vaultReader = new VaultReader(vaultFolder, StreamSerializer.Instance);
-            var configVersion = await vaultReader.ReadVersionAsync(cancellationToken);
-
-            return configVersion.Version switch
-            {
-                Core.Constants.Vault.Versions.V1 => Migrators.GetMigratorV1_V2(vaultFolder, StreamSerializer.Instance),
-                _ => throw new ArgumentOutOfRangeException(nameof(configVersion.Version))
-            };
-        }
-
-        /// <inheritdoc/>
-        public virtual async Task ChangeAuthenticationAsync(IFolder vaultFolder, IDisposable unlockContract, IKey newPasskey,
-            VaultOptions vaultOptions, CancellationToken cancellationToken = default)
+        public virtual async Task ModifyAuthenticationAsync(IFolder vaultFolder, IDisposable unlockContract, IKey newPasskey, VaultOptions vaultOptions, CancellationToken cancellationToken = default)
         {
             using var credentialsRoutine = (await VaultRoutines.CreateRoutinesAsync(vaultFolder, StreamSerializer.Instance, cancellationToken)).ModifyCredentials();
             using var newPasskeySecret = VaultHelpers.ParsePasskeySecret(newPasskey);
@@ -135,11 +80,8 @@ public virtual async Task ChangeAuthenticationAsync(IFolder vaultFolder, IDispos
             credentialsRoutine.SetUnlockContract(unlockContract);
             credentialsRoutine.SetOptions(options);
             credentialsRoutine.SetCredentials(newPasskeySecret);
-            
+
             _ = await credentialsRoutine.FinalizeAsync(cancellationToken);
         }
-
-        /// <inheritdoc/>
-        public abstract Task<IVFSRoot> CreateFileSystemAsync(IVaultModel vaultModel, IDisposable unlockContract, CancellationToken cancellationToken);
     }
 }
diff --git a/src/Platforms/SecureFolderFS.UI/ServiceImplementation/VaultPersistence/VaultWidgets.cs b/src/Platforms/SecureFolderFS.UI/ServiceImplementation/VaultPersistence/VaultWidgets.cs
index 6ad459477..2482cb5da 100644
--- a/src/Platforms/SecureFolderFS.UI/ServiceImplementation/VaultPersistence/VaultWidgets.cs
+++ b/src/Platforms/SecureFolderFS.UI/ServiceImplementation/VaultPersistence/VaultWidgets.cs
@@ -6,6 +6,7 @@
 using SecureFolderFS.Sdk.Models;
 using SecureFolderFS.Sdk.Services.VaultPersistence;
 using SecureFolderFS.Shared.Helpers;
+using SecureFolderFS.Shared.Models;
 
 namespace SecureFolderFS.UI.ServiceImplementation.VaultPersistence
 {
diff --git a/src/Platforms/SecureFolderFS.UI/ServiceImplementation/VaultService.cs b/src/Platforms/SecureFolderFS.UI/ServiceImplementation/VaultService.cs
new file mode 100644
index 000000000..6d2707224
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.UI/ServiceImplementation/VaultService.cs
@@ -0,0 +1,78 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using OwlCore.Storage;
+using SecureFolderFS.Core.FileSystem.Helpers.Paths;
+using SecureFolderFS.Core.Migration;
+using SecureFolderFS.Core.Validators;
+using SecureFolderFS.Core.VaultAccess;
+using SecureFolderFS.Sdk.AppModels;
+using SecureFolderFS.Sdk.Services;
+using SecureFolderFS.Shared.ComponentModel;
+using SecureFolderFS.Shared.Models;
+
+namespace SecureFolderFS.UI.ServiceImplementation
+{
+    /// <inheritdoc cref="IVaultService"/>
+    public class VaultService : IVaultService
+    {
+        /// <inheritdoc/>
+        public int LatestVaultVersion { get; } = Core.Constants.Vault.Versions.LATEST_VERSION;
+
+        /// <inheritdoc/>
+        public string ContentFolderName { get; } = Core.Constants.Vault.Names.VAULT_CONTENT_FOLDERNAME;
+
+        /// <inheritdoc/>
+        public IAsyncValidator<IFolder> VaultValidator { get; } = new VaultValidator(StreamSerializer.Instance);
+
+        /// <inheritdoc/>
+        public virtual bool IsNameReserved(string? name)
+        {
+            return name is not null && (
+                    PathHelpers.IsCoreName(name) ||
+                    name.Equals(Core.Constants.Vault.Names.VAULT_KEYSTORE_FILENAME, StringComparison.OrdinalIgnoreCase) ||
+                    name.Equals(Core.Constants.Vault.Names.VAULT_CONFIGURATION_FILENAME, StringComparison.OrdinalIgnoreCase) ||
+                    name.Equals(Core.Constants.Vault.Names.VAULT_CONTENT_FOLDERNAME, StringComparison.OrdinalIgnoreCase));
+        }
+
+        /// <inheritdoc/>
+        public virtual IEnumerable<string> GetEncodingOptions()
+        {
+            // TODO: (v3) Swap default order when Base4K (Vault V3) is implemented
+            yield return Core.Cryptography.Constants.CipherId.ENCODING_BASE64URL;
+            yield return Core.Cryptography.Constants.CipherId.ENCODING_BASE4K;
+        }
+
+        /// <inheritdoc/>
+        public virtual async Task<VaultOptions> GetVaultOptionsAsync(IFolder vaultFolder, CancellationToken cancellationToken = default)
+        {
+            var vaultReader = new VaultReader(vaultFolder, StreamSerializer.Instance);
+            var config = await vaultReader.ReadConfigurationAsync(cancellationToken);
+
+            return new()
+            {
+                AuthenticationMethod = config.AuthenticationMethod.Split(Core.Constants.Vault.Authentication.SEPARATOR),
+                ContentCipherId = config.ContentCipherId,
+                FileNameCipherId = config.FileNameCipherId,
+                NameEncodingId = config.FileNameEncodingId,
+                VaultId = config.Uid,
+                Version = config.Version
+            };
+        }
+
+        /// <inheritdoc/>
+        public virtual async Task<IVaultMigratorModel> GetMigratorAsync(IFolder vaultFolder, CancellationToken cancellationToken = default)
+        {
+            var vaultReader = new VaultReader(vaultFolder, StreamSerializer.Instance);
+            var configVersion = await vaultReader.ReadVersionAsync(cancellationToken);
+
+            return configVersion.Version switch
+            {
+                Core.Constants.Vault.Versions.V1 => Migrators.GetMigratorV1_V2(vaultFolder, StreamSerializer.Instance),
+                Core.Constants.Vault.Versions.V2 => Migrators.GetMigratorV2_V3(vaultFolder, StreamSerializer.Instance),
+                _ => throw new ArgumentOutOfRangeException(nameof(configVersion.Version))
+            };
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.UI/Strings/en-US/Resources.resx b/src/Platforms/SecureFolderFS.UI/Strings/en-US/Resources.resx
index 4dd7236f5..ee4ee0c1f 100644
--- a/src/Platforms/SecureFolderFS.UI/Strings/en-US/Resources.resx
+++ b/src/Platforms/SecureFolderFS.UI/Strings/en-US/Resources.resx
@@ -393,7 +393,7 @@
     <value>Privacy</value>
   </data>
   <data name="ShowEncryptedVault" xml:space="preserve">
-    <value>Show encrypted vault in File Explorer</value>
+    <value>Show in File Explorer</value>
   </data>
   <data name="Social" xml:space="preserve">
     <value>Social</value>
@@ -644,4 +644,28 @@
   <data name="LearnMore" xml:space="preserve">
     <value>Learn more</value>
   </data>
-</root>
+  <data name="VaultAlreadyExists" xml:space="preserve">
+    <value>The selected vault already exists</value>
+  </data>
+  <data name="UnlockAsReadOnly" xml:space="preserve">
+    <value>Unlock as read-only</value>
+  </data>
+  <data name="VaultReadOnlyMode" xml:space="preserve">
+    <value>The vault is in read-only mode</value>
+  </data>
+  <data name="HealthReport" xml:space="preserve">
+    <value>Health report</value>
+    <comment>Title for health report view</comment>
+  </data>
+  <data name="Rename" xml:space="preserve">
+    <value>Rename</value>
+  </data>
+  <data name="MoveUp" xml:space="preserve">
+    <value>Move up</value>
+    <comment>Change order of vaults</comment>
+  </data>
+  <data name="MoveDown" xml:space="preserve">
+    <value>Move down</value>
+    <comment>Change order of vaults</comment>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/Platforms/SecureFolderFS.UI/UserControls/InfoBars/DokanyInfoBar.cs b/src/Platforms/SecureFolderFS.UI/UserControls/InfoBars/DokanyInfoBar.cs
deleted file mode 100644
index 3b67735c2..000000000
--- a/src/Platforms/SecureFolderFS.UI/UserControls/InfoBars/DokanyInfoBar.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using SecureFolderFS.Sdk.ViewModels.Controls;
-
-namespace SecureFolderFS.UI.UserControls.InfoBars
-{
-    public sealed class DokanyInfoBar : InfoBarViewModel
-    {
-    }
-}
diff --git a/src/Platforms/SecureFolderFS.UI/UserControls/InfoBars/FuseInfoBar.cs b/src/Platforms/SecureFolderFS.UI/UserControls/InfoBars/FuseInfoBar.cs
deleted file mode 100644
index 9ccaf432e..000000000
--- a/src/Platforms/SecureFolderFS.UI/UserControls/InfoBars/FuseInfoBar.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using SecureFolderFS.Sdk.ViewModels.Controls;
-
-namespace SecureFolderFS.UI.UserControls.InfoBars
-{
-    public sealed class FuseInfoBar : InfoBarViewModel
-    {
-    }
-}
\ No newline at end of file
diff --git a/src/Platforms/SecureFolderFS.UI/UserControls/InfoBars/WebDavInfoBar.cs b/src/Platforms/SecureFolderFS.UI/UserControls/InfoBars/WebDavInfoBar.cs
deleted file mode 100644
index da4eabe3c..000000000
--- a/src/Platforms/SecureFolderFS.UI/UserControls/InfoBars/WebDavInfoBar.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using SecureFolderFS.Sdk.ViewModels.Controls;
-
-namespace SecureFolderFS.UI.UserControls.InfoBars
-{
-    public sealed class WebDavInfoBar : InfoBarViewModel
-    {
-        public WebDavInfoBar()
-        {
-            Message = "WebDav is experimental. You may encounter bugs and stability issues. We recommend backing up your data before using WebDav.";
-        }
-    }
-}
diff --git a/src/Platforms/SecureFolderFS.UI/Utils/INavigationControl.cs b/src/Platforms/SecureFolderFS.UI/Utils/INavigationControl.cs
deleted file mode 100644
index 58f22f7bb..000000000
--- a/src/Platforms/SecureFolderFS.UI/Utils/INavigationControl.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using SecureFolderFS.Shared.ComponentModel;
-
-namespace SecureFolderFS.UI.Utils
-{
-    // TODO: Needs docs
-    public interface INavigationControl : IDisposable
-    {
-        Task<bool> NavigateAsync<TTarget, TTransition>(TTarget? target, TTransition? transition = default)
-            where TTransition : class
-            where TTarget : IViewDesignation;
-    }
-}
diff --git a/src/Platforms/SecureFolderFS.UI/Utils/INavigationControlContract.cs b/src/Platforms/SecureFolderFS.UI/Utils/INavigationControlContract.cs
index 6c6281dca..df1a2ef09 100644
--- a/src/Platforms/SecureFolderFS.UI/Utils/INavigationControlContract.cs
+++ b/src/Platforms/SecureFolderFS.UI/Utils/INavigationControlContract.cs
@@ -1,4 +1,5 @@
 using SecureFolderFS.Sdk.Services;
+using SecureFolderFS.Shared.ComponentModel;
 
 namespace SecureFolderFS.UI.Utils
 {
@@ -8,6 +9,6 @@ public interface INavigationControlContract
         /// <summary>
         /// Sets the control used for navigation.
         /// </summary>
-        public INavigationControl? NavigationControl { set; }
+        public INavigator? Navigator { get; set; }
     }
 }
diff --git a/src/Platforms/SecureFolderFS.UI/ValueConverters/BaseConverter.cs b/src/Platforms/SecureFolderFS.UI/ValueConverters/BaseConverter.cs
index 8177d7fb6..a1a4c76ab 100644
--- a/src/Platforms/SecureFolderFS.UI/ValueConverters/BaseConverter.cs
+++ b/src/Platforms/SecureFolderFS.UI/ValueConverters/BaseConverter.cs
@@ -1,12 +1,28 @@
-using System;
+using System;
 
 namespace SecureFolderFS.UI.ValueConverters
 {
-    // TODO: Needs docs
+    /// <summary>
+    /// Provides a base class for value converters.
+    /// </summary>
     public abstract class BaseConverter
     {
+        /// <summary>
+        /// Attempts to convert a value to the specified target type.
+        /// </summary>
+        /// <param name="value">The value to convert.</param>
+        /// <param name="targetType">The type to convert the value to.</param>
+        /// <param name="parameter">An optional parameter to use during the conversion.</param>
+        /// <returns>The converted value, or null if the conversion failed.</returns>
         protected abstract object? TryConvert(object? value, Type targetType, object? parameter);
 
+        /// <summary>
+        /// Attempts to convert a value back to the specified target type.
+        /// </summary>
+        /// <param name="value">The value to convert back.</param>
+        /// <param name="targetType">The type to convert the value back to.</param>
+        /// <param name="parameter">An optional parameter to use during the conversion.</param>
+        /// <returns>The converted value, or null if the conversion failed.</returns>
         protected abstract object? TryConvertBack(object? value, Type targetType, object? parameter);
     }
 }
diff --git a/src/Platforms/SecureFolderFS.UI/ValueConverters/BaseCountToStringConverter.cs b/src/Platforms/SecureFolderFS.UI/ValueConverters/BaseCountToStringConverter.cs
new file mode 100644
index 000000000..d05c279c3
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.UI/ValueConverters/BaseCountToStringConverter.cs
@@ -0,0 +1,33 @@
+using System;
+using SecureFolderFS.Sdk.Extensions;
+
+namespace SecureFolderFS.UI.ValueConverters
+{
+    public abstract class BaseCountToStringConverter : BaseConverter
+    {
+        /// <inheritdoc/>
+        protected override object? TryConvert(object? value, Type targetType, object? parameter)
+        {
+            if (value is not int numValue)
+                return string.Empty;
+
+            if (parameter is not string formatString)
+                return numValue.ToString();
+
+            // Example:
+            // LOCALIZE|StringRes
+            // STANDARD|Some string {0}
+
+            var split = formatString.Split('|', 2);
+            var result = split[0] == "LOCALIZE" ? split[1].ToLocalized() : split[1];
+
+            return string.Format(result, numValue);
+        }
+
+        /// <inheritdoc/>
+        protected override object? TryConvertBack(object? value, Type targetType, object? parameter)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.UI/ValueConverters/BaseDateTimeToStringConverter.cs b/src/Platforms/SecureFolderFS.UI/ValueConverters/BaseDateTimeToStringConverter.cs
index 8c6f375aa..88dd983c8 100644
--- a/src/Platforms/SecureFolderFS.UI/ValueConverters/BaseDateTimeToStringConverter.cs
+++ b/src/Platforms/SecureFolderFS.UI/ValueConverters/BaseDateTimeToStringConverter.cs
@@ -14,15 +14,8 @@ public abstract class BaseDateTimeToStringConverter : BaseConverter
             if (value is not DateTime dateTime)
                 return string.Empty;
             
-            var cultureInfo = DI.Service<ILocalizationService>().CurrentCulture;
-            var dateString = dateTime switch
-            {
-                _ when dateTime.Year == 1 => "Unspecified",
-                _ when dateTime.Date == DateTime.Today => SafetyHelpers.NoThrowResult(() => string.Format("DateToday".ToLocalized(), dateTime.ToString("t", cultureInfo))),
-                _ => null
-            };
-
-            dateString ??= $"{dateTime.ToString("d", cultureInfo)}, {dateTime.ToString("t", cultureInfo)}";
+            var localizationService = DI.Service<ILocalizationService>();
+            var dateString = localizationService.LocalizeDate(dateTime);
             if (parameter is string formatString)
             {
                 var split = formatString.Split('|');
diff --git a/src/Platforms/SecureFolderFS.UI/ValueConverters/BaseGenericEnumConverter.cs b/src/Platforms/SecureFolderFS.UI/ValueConverters/BaseGenericEnumConverter.cs
index c626e2554..432081698 100644
--- a/src/Platforms/SecureFolderFS.UI/ValueConverters/BaseGenericEnumConverter.cs
+++ b/src/Platforms/SecureFolderFS.UI/ValueConverters/BaseGenericEnumConverter.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -30,7 +30,7 @@ private object ConvertInternal(object? value, Type targetType, object? parameter
                 if (enumConversionValues.TryGetValue(enumValue, out var convertedValue))
                     enumValue = convertedValue;
 
-                // else.. use value from the cast above
+                // else... use value from the cast above
             }
 
             try
diff --git a/src/Platforms/SecureFolderFS.UI/ValueConverters/BaseLoginViewModelBoolConverter.cs b/src/Platforms/SecureFolderFS.UI/ValueConverters/BaseLoginViewModelConverter.cs
similarity index 92%
rename from src/Platforms/SecureFolderFS.UI/ValueConverters/BaseLoginViewModelBoolConverter.cs
rename to src/Platforms/SecureFolderFS.UI/ValueConverters/BaseLoginViewModelConverter.cs
index 104bcbaf3..37dc86342 100644
--- a/src/Platforms/SecureFolderFS.UI/ValueConverters/BaseLoginViewModelBoolConverter.cs
+++ b/src/Platforms/SecureFolderFS.UI/ValueConverters/BaseLoginViewModelConverter.cs
@@ -2,7 +2,7 @@
 
 namespace SecureFolderFS.UI.ValueConverters
 {
-    public abstract class BaseLoginViewModelBoolConverter : BaseConverter
+    public abstract class BaseLoginViewModelConverter : BaseConverter
     {
         /// <inheritdoc/>
         protected override object? TryConvert(object? value, Type targetType, object? parameter)
diff --git a/src/Platforms/SecureFolderFS.UI/ValueConverters/BaseSeverityHealthIconConverter.cs b/src/Platforms/SecureFolderFS.UI/ValueConverters/BaseSeverityHealthIconConverter.cs
new file mode 100644
index 000000000..10c2b1fe0
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.UI/ValueConverters/BaseSeverityHealthIconConverter.cs
@@ -0,0 +1,34 @@
+using System;
+using SecureFolderFS.Sdk.Enums;
+
+namespace SecureFolderFS.UI.ValueConverters
+{
+    public abstract class BaseSeverityHealthIconConverter : BaseConverter
+    {
+        protected abstract object? SuccessIcon { get; }
+
+        protected abstract object? WarningIcon { get; }
+
+        protected abstract object? CriticalIcon { get; }
+
+        /// <inheritdoc/>
+        protected override object? TryConvert(object? value, Type targetType, object? parameter)
+        {
+            if (value is not SeverityType severity)
+                return null;
+
+            return severity switch
+            {
+                SeverityType.Warning => WarningIcon,
+                SeverityType.Critical => CriticalIcon,
+                _ => SuccessIcon
+            };
+        }
+
+        /// <inheritdoc/>
+        protected override object? TryConvertBack(object? value, Type targetType, object? parameter)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.UI/ViewModels/KeyFileCreationViewModel.cs b/src/Platforms/SecureFolderFS.UI/ViewModels/Authentication/KeyFileCreationViewModel.cs
similarity index 94%
rename from src/Platforms/SecureFolderFS.UI/ViewModels/KeyFileCreationViewModel.cs
rename to src/Platforms/SecureFolderFS.UI/ViewModels/Authentication/KeyFileCreationViewModel.cs
index b492ec341..551ba425b 100644
--- a/src/Platforms/SecureFolderFS.UI/ViewModels/KeyFileCreationViewModel.cs
+++ b/src/Platforms/SecureFolderFS.UI/ViewModels/Authentication/KeyFileCreationViewModel.cs
@@ -4,7 +4,7 @@
 using System.Threading.Tasks;
 using SecureFolderFS.Sdk.EventArguments;
 
-namespace SecureFolderFS.UI.ViewModels
+namespace SecureFolderFS.UI.ViewModels.Authentication
 {
     /// <inheritdoc cref="KeyFileViewModel"/>
     [Bindable(true)]
diff --git a/src/Platforms/SecureFolderFS.UI/ViewModels/KeyFileLoginViewModel.cs b/src/Platforms/SecureFolderFS.UI/ViewModels/Authentication/KeyFileLoginViewModel.cs
similarity index 92%
rename from src/Platforms/SecureFolderFS.UI/ViewModels/KeyFileLoginViewModel.cs
rename to src/Platforms/SecureFolderFS.UI/ViewModels/Authentication/KeyFileLoginViewModel.cs
index b8db2d94d..a830b673f 100644
--- a/src/Platforms/SecureFolderFS.UI/ViewModels/KeyFileLoginViewModel.cs
+++ b/src/Platforms/SecureFolderFS.UI/ViewModels/Authentication/KeyFileLoginViewModel.cs
@@ -4,11 +4,11 @@
 using System.Threading.Tasks;
 using OwlCore.Storage;
 using SecureFolderFS.Core.VaultAccess;
-using SecureFolderFS.Sdk.AppModels;
 using SecureFolderFS.Sdk.EventArguments;
 using SecureFolderFS.Shared.Extensions;
+using SecureFolderFS.Shared.Models;
 
-namespace SecureFolderFS.UI.ViewModels
+namespace SecureFolderFS.UI.ViewModels.Authentication
 {
     /// <inheritdoc cref="KeyFileViewModel"/>
     [Bindable(true)]
diff --git a/src/Platforms/SecureFolderFS.UI/ViewModels/KeyFileViewModel.cs b/src/Platforms/SecureFolderFS.UI/ViewModels/Authentication/KeyFileViewModel.cs
similarity index 96%
rename from src/Platforms/SecureFolderFS.UI/ViewModels/KeyFileViewModel.cs
rename to src/Platforms/SecureFolderFS.UI/ViewModels/Authentication/KeyFileViewModel.cs
index 7788d7e11..8c4a22c12 100644
--- a/src/Platforms/SecureFolderFS.UI/ViewModels/KeyFileViewModel.cs
+++ b/src/Platforms/SecureFolderFS.UI/ViewModels/Authentication/KeyFileViewModel.cs
@@ -15,7 +15,7 @@
 using SecureFolderFS.Shared;
 using SecureFolderFS.Shared.ComponentModel;
 
-namespace SecureFolderFS.UI.ViewModels
+namespace SecureFolderFS.UI.ViewModels.Authentication
 {
     /// <inheritdoc cref="AuthenticationViewModel"/>
     [Bindable(true)]
@@ -34,7 +34,7 @@ public abstract class KeyFileViewModel : AuthenticationViewModel
         protected KeyFileViewModel()
             : base(Core.Constants.Vault.Authentication.AUTH_KEYFILE)
         {
-            DisplayName = "KeyFile".ToLocalized();
+            Title = "KeyFile".ToLocalized();
             Icon = "\uE8D7";
         }
 
@@ -84,7 +84,7 @@ public override async Task<IKey> SignAsync(string id, byte[]? data, Cancellation
             // The 'data' parameter is not needed in this type of authentication
             _ = data;
 
-            var keyFile = await FileExplorerService.PickFileAsync([ ".key", "*" ], cancellationToken);
+            var keyFile = await FileExplorerService.PickFileAsync([ ".key", "*" ], false, cancellationToken);
             if (keyFile is null)
                 throw new OperationCanceledException("The user did not pick a file.");
 
diff --git a/src/Platforms/SecureFolderFS.UI/ViewModels/PasswordCreationViewModel.cs b/src/Platforms/SecureFolderFS.UI/ViewModels/Authentication/PasswordCreationViewModel.cs
similarity index 94%
rename from src/Platforms/SecureFolderFS.UI/ViewModels/PasswordCreationViewModel.cs
rename to src/Platforms/SecureFolderFS.UI/ViewModels/Authentication/PasswordCreationViewModel.cs
index fae4a34d6..8751a33bb 100644
--- a/src/Platforms/SecureFolderFS.UI/ViewModels/PasswordCreationViewModel.cs
+++ b/src/Platforms/SecureFolderFS.UI/ViewModels/Authentication/PasswordCreationViewModel.cs
@@ -5,7 +5,7 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using SecureFolderFS.Sdk.EventArguments;
 
-namespace SecureFolderFS.UI.ViewModels
+namespace SecureFolderFS.UI.ViewModels.Authentication
 {
     /// <inheritdoc cref="PasswordViewModel"/>
     [Bindable(true)]
@@ -47,7 +47,7 @@ protected override Task ProvideCredentialsAsync(CancellationToken cancellationTo
         /// <inheritdoc/>
         public override void Dispose()
         {
-            SecondaryPassword = null;
+            _SecondaryPassword = null;
             base.Dispose();
         }
     }
diff --git a/src/Platforms/SecureFolderFS.UI/ViewModels/PasswordLoginViewModel.cs b/src/Platforms/SecureFolderFS.UI/ViewModels/Authentication/PasswordLoginViewModel.cs
similarity index 95%
rename from src/Platforms/SecureFolderFS.UI/ViewModels/PasswordLoginViewModel.cs
rename to src/Platforms/SecureFolderFS.UI/ViewModels/Authentication/PasswordLoginViewModel.cs
index b554a1aeb..49033611c 100644
--- a/src/Platforms/SecureFolderFS.UI/ViewModels/PasswordLoginViewModel.cs
+++ b/src/Platforms/SecureFolderFS.UI/ViewModels/Authentication/PasswordLoginViewModel.cs
@@ -6,7 +6,7 @@
 using SecureFolderFS.Sdk.EventArguments;
 using SecureFolderFS.Shared.ComponentModel;
 
-namespace SecureFolderFS.UI.ViewModels
+namespace SecureFolderFS.UI.ViewModels.Authentication
 {
     /// <inheritdoc cref="PasswordLoginViewModel"/>
     [Bindable(true)]
diff --git a/src/Platforms/SecureFolderFS.UI/ViewModels/PasswordViewModel.cs b/src/Platforms/SecureFolderFS.UI/ViewModels/Authentication/PasswordViewModel.cs
similarity index 95%
rename from src/Platforms/SecureFolderFS.UI/ViewModels/PasswordViewModel.cs
rename to src/Platforms/SecureFolderFS.UI/ViewModels/Authentication/PasswordViewModel.cs
index 854f78694..384c147d3 100644
--- a/src/Platforms/SecureFolderFS.UI/ViewModels/PasswordViewModel.cs
+++ b/src/Platforms/SecureFolderFS.UI/ViewModels/Authentication/PasswordViewModel.cs
@@ -9,7 +9,7 @@
 using SecureFolderFS.Shared.ComponentModel;
 using SecureFolderFS.Shared.Models;
 
-namespace SecureFolderFS.UI.ViewModels
+namespace SecureFolderFS.UI.ViewModels.Authentication
 {
     /// <inheritdoc cref="AuthenticationViewModel"/>
     [Bindable(true)]
@@ -26,7 +26,7 @@ public abstract partial class PasswordViewModel : AuthenticationViewModel, IWrap
         protected PasswordViewModel()
             : base(Core.Constants.Vault.Authentication.AUTH_PASSWORD)
         {
-            DisplayName = "Password".ToLocalized();
+            Title = "Password".ToLocalized();
             Icon = "\uE8AC";
         }
 
@@ -75,7 +75,7 @@ protected virtual void OnPasswordChanged(string? value)
         /// <inheritdoc/>
         public override void Dispose()
         {
-            PrimaryPassword = null;
+            _PrimaryPassword = null;
         }
     }
 }
diff --git a/src/Platforms/SecureFolderFS.UI/ViewModels/Health/HealthDirectoryIssueViewModel.cs b/src/Platforms/SecureFolderFS.UI/ViewModels/Health/HealthDirectoryIssueViewModel.cs
new file mode 100644
index 000000000..2a63adc10
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.UI/ViewModels/Health/HealthDirectoryIssueViewModel.cs
@@ -0,0 +1,44 @@
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Threading;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.ComponentModel;
+using OwlCore.Storage;
+using SecureFolderFS.Sdk.Enums;
+using SecureFolderFS.Sdk.ViewModels.Controls.Widgets.Health;
+using SecureFolderFS.Shared.ComponentModel;
+
+namespace SecureFolderFS.UI.ViewModels.Health
+{
+    /// <inheritdoc cref="HealthIssueViewModel"/>
+    [Bindable(true)]
+    public sealed partial class HealthDirectoryIssueViewModel : HealthIssueViewModel, IAsyncInitialize
+    {
+        [ObservableProperty] private ObservableCollection<HealthIssueViewModel> _Issues;
+
+        public IFolder? Folder => Inner as IFolder;
+
+        public HealthDirectoryIssueViewModel(IStorableChild storable, IResult result, string? title = null)
+            : base(storable, result, title)
+        {
+            Severity = SeverityType.Warning;
+            Issues = new();
+        }
+
+        /// <inheritdoc/>
+        public async Task InitAsync(CancellationToken cancellationToken = default)
+        {
+            if (Folder is null)
+                return;
+
+            Issues.Clear();
+            await foreach (var item in Folder.GetItemsAsync(StorableType.All, cancellationToken))
+            {
+                Issues.Add(new HealthNameIssueViewModel(item, Shared.Models.Result.Failure(null), "Invalid name")
+                {
+                    ErrorMessage = "Generate a new name"
+                });
+            }
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.UI/ViewModels/Health/HealthFileDataIssueViewModel.cs b/src/Platforms/SecureFolderFS.UI/ViewModels/Health/HealthFileDataIssueViewModel.cs
new file mode 100644
index 000000000..b66700e46
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.UI/ViewModels/Health/HealthFileDataIssueViewModel.cs
@@ -0,0 +1,21 @@
+using System.ComponentModel;
+using OwlCore.Storage;
+using SecureFolderFS.Sdk.Enums;
+using SecureFolderFS.Sdk.ViewModels.Controls.Widgets.Health;
+using SecureFolderFS.Shared.ComponentModel;
+
+namespace SecureFolderFS.UI.ViewModels.Health
+{
+    /// <inheritdoc cref="HealthIssueViewModel"/>
+    [Bindable(true)]
+    public sealed partial class HealthFileDataIssueViewModel : HealthIssueViewModel
+    {
+        public IFile? File => Inner as IFile;
+
+        public HealthFileDataIssueViewModel(IStorableChild storable, IResult? result, string? title = null)
+            : base(storable, result, title)
+        {
+            Severity = SeverityType.Critical;
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.UI/ViewModels/Health/HealthNameIssueViewModel.cs b/src/Platforms/SecureFolderFS.UI/ViewModels/Health/HealthNameIssueViewModel.cs
new file mode 100644
index 000000000..a2d73b530
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.UI/ViewModels/Health/HealthNameIssueViewModel.cs
@@ -0,0 +1,36 @@
+using System.ComponentModel;
+using CommunityToolkit.Mvvm.ComponentModel;
+using OwlCore.Storage;
+using SecureFolderFS.Sdk.Enums;
+using SecureFolderFS.Sdk.ViewModels.Controls.Widgets.Health;
+using SecureFolderFS.Shared.ComponentModel;
+
+namespace SecureFolderFS.UI.ViewModels.Health
+{
+    /// <inheritdoc cref="HealthIssueViewModel"/>
+    [Bindable(true)]
+    public sealed partial class HealthNameIssueViewModel : HealthIssueViewModel
+    {
+        [ObservableProperty] private bool _IsEditing;
+        [ObservableProperty] private string? _ItemName;
+
+        public string OriginalName { get; }
+
+        public HealthNameIssueViewModel(IStorableChild storable, IResult result, string? title = null)
+            : base(storable, result, title)
+        {
+            OriginalName = storable.Name;
+            ItemName = storable.Name;
+            Severity = SeverityType.Warning;
+        }
+
+        partial void OnIsEditingChanged(bool value)
+        {
+            if (!value && string.IsNullOrWhiteSpace(ItemName))
+                ItemName = OriginalName;
+
+            var wasNameChanged = !OriginalName.Equals(ItemName);
+            ErrorMessage = wasNameChanged ? "A custom name will be applied" : "Generate a new name";
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Uno/App.xaml.cs b/src/Platforms/SecureFolderFS.Uno/App.xaml.cs
index 3c05fb6e8..d5e3b4fd0 100644
--- a/src/Platforms/SecureFolderFS.Uno/App.xaml.cs
+++ b/src/Platforms/SecureFolderFS.Uno/App.xaml.cs
@@ -14,6 +14,8 @@
 using SecureFolderFS.Uno.UserControls.InterfaceRoot;
 using Uno.UI;
 using Windows.ApplicationModel;
+using H.NotifyIcon;
+using SecureFolderFS.Shared.Helpers;
 
 namespace SecureFolderFS.Uno
 {
@@ -21,6 +23,8 @@ public partial class App : Application
     {
         public static App? Instance { get; private set; }
 
+        public bool UseForceClose { get; set; }
+
         public IServiceProvider? ServiceProvider { get; private set; }
 
         public Window? MainWindow { get; private set; }
@@ -92,30 +96,33 @@ protected override async void OnLaunched(LaunchActivatedEventArgs args)
 
         private static void EnsureEarlyWindow(Window window)
         {
+            // Set window content
             window.Content = new MainWindowRootControl();
 
+            // Attach event for window closing
+            window.Closed += Window_Closed;
+
 #if WINDOWS
+            var appWindow = window.AppWindow;
+
 #if !UNPACKAGED
             // Set icon
-            window.AppWindow.SetIcon(Path.Combine(Package.Current.InstalledLocation.Path, UI.Constants.FileNames.ICON_ASSET_PATH));
+            appWindow.SetIcon(Path.Combine(Package.Current.InstalledLocation.Path, UI.Constants.FileNames.ICON_ASSET_PATH));
 #endif
             // Set backdrop
             window.SystemBackdrop = new MicaBackdrop();
 
             // Set title
-            window.AppWindow.Title = "SecureFolderFS";
-
-            // Attach event for window closing
-            window.AppWindow.Closing += AppWindow_Closing;
+            appWindow.Title = nameof(SecureFolderFS);
 
             if (Microsoft.UI.Windowing.AppWindowTitleBar.IsCustomizationSupported())
             {
                 // Extend title bar
-                window.AppWindow.TitleBar.ExtendsContentIntoTitleBar = true;
+                appWindow.TitleBar.ExtendsContentIntoTitleBar = true;
 
                 // Set window buttons background to transparent
-                window.AppWindow.TitleBar.ButtonBackgroundColor = Colors.Transparent;
-                window.AppWindow.TitleBar.ButtonInactiveBackgroundColor = Colors.Transparent;
+                appWindow.TitleBar.ButtonBackgroundColor = Colors.Transparent;
+                appWindow.TitleBar.ButtonInactiveBackgroundColor = Colors.Transparent;
             }
             else if (window.Content is MainWindowRootControl rootControl)
             {
@@ -130,27 +137,42 @@ private static void EnsureEarlyWindow(Window window)
             boundsManager.MinWidth = 662;
             boundsManager.MinHeight = 572;
 
+            // Load saved window state
+            if (!boundsManager.LoadWindowState(UI.Constants.MAIN_WINDOW_ID))
+                window.AppWindow.MoveAndResize(new(100, 100, 1050, 680));
+
 #else
-            _ = window;
+            window.Title = nameof(SecureFolderFS);
+            global::Uno.Resizetizer.WindowExtensions.SetWindowIcon(window);
 #endif
         }
 
-#if WINDOWS
-        private static async void AppWindow_Closing(Microsoft.UI.Windowing.AppWindow sender, Microsoft.UI.Windowing.AppWindowClosingEventArgs args)
+        private static async void Window_Closed(object sender, WindowEventArgs args)
         {
-            try
-            {
-                FileSystemManager.Instance.FileSystems.DisposeElements();
-            }
-            catch (Exception ex)
+#if WINDOWS
+            if (App.Instance?.MainWindow is { } mainWindow)
             {
-                _ = ex;
+                var boundsManager = Platforms.Windows.Helpers.WindowsBoundsManager.AddOrGet(mainWindow);
+                boundsManager.SaveWindowState(UI.Constants.MAIN_WINDOW_ID);
             }
+#endif
 
             var settingsService = DI.Service<ISettingsService>();
-            await settingsService.TrySaveAsync();
+            var shouldForceClose = (!App.Instance?.UseForceClose) ?? false;
+            shouldForceClose = shouldForceClose && settingsService.UserSettings.ReduceToBackground;
+
+            if (shouldForceClose)
+            {
+                args.Handled = true;
+                App.Instance?.MainWindow?.Hide(enableEfficiencyMode: false);
+            }
+            else
+            {
+                await SafetyHelpers.NoThrowAsync(async () => await settingsService.TrySaveAsync());
+                SafetyHelpers.NoThrow(static () => FileSystemManager.Instance.FileSystems.DisposeElements());
+                App.Current.Exit();
+            }
         }
-#endif
 
         #endregion
 
@@ -172,9 +194,9 @@ public static void InitializeLogging()
             var factory = LoggerFactory.Create(builder =>
             {
 #if __WASM__
-            builder.AddProvider(new global::Uno.Extensions.Logging.WebAssembly.WebAssemblyConsoleLoggerProvider());
+                builder.AddProvider(new global::Uno.Extensions.Logging.WebAssembly.WebAssemblyConsoleLoggerProvider());
 #elif __IOS__ || __MACCATALYST__
-            builder.AddProvider(new global::Uno.Extensions.Logging.OSLogLoggerProvider());
+                builder.AddProvider(new global::Uno.Extensions.Logging.OSLogLoggerProvider());
 #else
                 builder.AddConsole();
 #endif
diff --git a/src/Platforms/SecureFolderFS.Uno/AppModels/ImageBitmap.cs b/src/Platforms/SecureFolderFS.Uno/AppModels/ImageBitmap.cs
new file mode 100644
index 000000000..0e3c7ce0a
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Uno/AppModels/ImageBitmap.cs
@@ -0,0 +1,20 @@
+using Microsoft.UI.Xaml.Media.Imaging;
+using SecureFolderFS.Shared.ComponentModel;
+using Windows.Graphics.Imaging;
+
+namespace SecureFolderFS.Uno.AppModels
+{
+    /// <inheritdoc cref="IImage"/>
+    public sealed class ImageBitmap(BitmapImage source, SoftwareBitmap? softwareBitmap) : IImage
+    {
+        public BitmapImage Source { get; } = source;
+
+        public SoftwareBitmap? SoftwareBitmap { get; } = softwareBitmap;
+
+        /// <inheritdoc/>
+        public void Dispose()
+        {
+            SoftwareBitmap?.Dispose();
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Uno/AppModels/WebDavDescriptor.cs b/src/Platforms/SecureFolderFS.Uno/AppModels/WebDavDescriptor.cs
deleted file mode 100644
index 0e65d53b8..000000000
--- a/src/Platforms/SecureFolderFS.Uno/AppModels/WebDavDescriptor.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-#if HAS_UNO_SKIA || MACCATALYST || WINDOWS
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using SecureFolderFS.Core.FileSystem.Enums;
-using SecureFolderFS.Core.WebDav;
-using SecureFolderFS.Sdk.Models;
-using SecureFolderFS.Sdk.Results;
-using SecureFolderFS.Shared.ComponentModel;
-
-namespace SecureFolderFS.Uno.AppModels
-{
-    /// <inheritdoc cref="IFileSystemInfoModel"/>
-    public sealed class WebDavDescriptor : IFileSystemInfoModel
-    {
-        /// <inheritdoc/>
-        public string Name { get; } = Core.WebDav.Constants.FILE_SYSTEM_NAME;
-
-        /// <inheritdoc/>
-        public string Id { get; } = Core.Constants.FileSystemId.FS_WEBDAV;
-
-        /// <inheritdoc/>
-        public Task<IResult> GetStatusAsync(CancellationToken cancellationToken = default)
-        {
-            var result = WebDavMountable.IsSupported();
-            if (result == FileSystemAvailabilityType.Available)
-                return Task.FromResult<IResult>(new FileSystemResult(true, true)); // Always available (canSupport)
-
-            return Task.FromResult<IResult>(new FileSystemResult(true, new NotSupportedException($"WebDav file system is not supported: {result}.")));
-        }
-    }
-}
-#endif
diff --git a/src/Platforms/SecureFolderFS.Uno/Assets/Icons/app_icon.ico b/src/Platforms/SecureFolderFS.Uno/Assets/Icons/app_icon.ico
new file mode 100644
index 000000000..d23fa3d23
Binary files /dev/null and b/src/Platforms/SecureFolderFS.Uno/Assets/Icons/app_icon.ico differ
diff --git a/src/Platforms/SecureFolderFS.Uno/Assets/Icons/icon.svg b/src/Platforms/SecureFolderFS.Uno/Assets/Icons/icon.svg
new file mode 100644
index 000000000..a15af53aa
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Uno/Assets/Icons/icon.svg
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="456"
+   height="456"
+   viewBox="0 0 456 456"
+   version="1.1"
+   id="svg453"
+   sodipodi:docname="icon.svg"
+   inkscape:version="1.2 (dc2aedaf03, 2022-05-15)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs457" />
+  <sodipodi:namedview
+     id="namedview455"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="1.8574561"
+     inkscape:cx="228.26919"
+     inkscape:cy="228.26919"
+     inkscape:window-width="1920"
+     inkscape:window-height="1027"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg453" />
+  <rect
+     x="0"
+     y="0"
+     width="456"
+     height="456"
+     fill="#FFFFFF"
+     id="rect451" />
+</svg>
diff --git a/src/Platforms/SecureFolderFS.Uno/Assets/Icons/icon_foreground.svg b/src/Platforms/SecureFolderFS.Uno/Assets/Icons/icon_foreground.svg
new file mode 100644
index 000000000..796cc7f6f
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Uno/Assets/Icons/icon_foreground.svg
@@ -0,0 +1,179 @@
+<svg width="1091" height="1088" viewBox="0 0 1091 1088" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_211_11423)">
+<g clip-path="url(#clip0_211_11423)">
+<g filter="url(#filter1_d_211_11423)">
+<path d="M4.00063 185.625C4.00069 120.386 56.8871 67.5 122.126 67.5H331.032C374.073 67.5 414.533 88.0227 439.959 122.75L475.879 171.812C482.236 180.494 492.351 185.625 503.111 185.625H965.875C1031.11 185.625 1084 238.511 1084 303.75V894.375C1084 959.614 1031.11 1012.5 965.875 1012.5H122.125C56.8863 1012.5 3.99994 959.614 4 894.375L4.00063 185.625Z" fill="url(#paint0_linear_211_11423)"/>
+</g>
+<mask id="mask0_211_11423" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="4" y="67" width="1080" height="946">
+<path d="M4.00063 185.625C4.00069 120.386 56.8871 67.5 122.126 67.5H331.032C374.073 67.5 414.533 88.0227 439.959 122.75L475.879 171.812C482.236 180.494 492.351 185.625 503.111 185.625H965.875C1031.11 185.625 1084 238.511 1084 303.75V894.375C1084 959.614 1031.11 1012.5 965.875 1012.5H122.125C56.8863 1012.5 3.99994 959.614 4 894.375L4.00063 185.625Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_211_11423)">
+<g style="mix-blend-mode:color-burn" filter="url(#filter2_d_211_11423)">
+<g style="mix-blend-mode:color-burn">
+<path d="M4 438.75C4 373.511 56.8864 320.625 122.125 320.625H421.387C430.339 320.625 438.923 317.069 445.252 310.74L451.394 304.598C473.547 282.445 503.592 270 534.921 270H965.875C1031.11 270 1084 322.886 1084 388.125V894.375C1084 950.294 1038.67 995.625 982.75 995.625H105.25C49.3312 995.625 4 950.294 4 894.375V438.75Z" fill="white"/>
+</g>
+</g>
+<g filter="url(#filter3_d_211_11423)">
+<path d="M4 438.75C4 373.511 56.8864 320.625 122.125 320.625H421.387C430.339 320.625 438.923 317.069 445.252 310.74L451.394 304.598C473.547 282.445 503.592 270 534.921 270H965.875C1031.11 270 1084 322.886 1084 388.125V894.375C1084 950.294 1038.67 995.625 982.75 995.625H105.25C49.3312 995.625 4 950.294 4 894.375V438.75Z" fill="url(#paint1_linear_211_11423)"/>
+</g>
+<g filter="url(#filter4_d_211_11423)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M122.125 320.625C56.8864 320.625 4 373.511 4 438.75C4 382.831 49.3312 337.5 105.25 337.5H422.835C436.262 337.5 449.138 332.166 458.632 322.672L464.774 316.53C483.762 297.542 509.516 286.875 536.369 286.875H982.75C1038.67 286.875 1084 332.206 1084 388.125C1084 322.886 1031.11 270 965.875 270H534.921C503.592 270 473.547 282.445 451.394 304.598L445.252 310.74C438.923 317.069 430.339 320.625 421.387 320.625H122.125Z" fill="url(#paint2_linear_211_11423)" shape-rendering="crispEdges"/>
+</g>
+</g>
+</g>
+<path d="M727.97 632.5V636H731.47H767.161H770.661V632.5V559C770.661 544.123 773.368 530.228 778.757 517.279C784.173 504.268 791.556 492.967 800.902 483.345C810.247 473.722 821.211 466.131 833.822 460.565C846.369 455.029 859.827 452.25 874.235 452.25C888.642 452.25 902.101 455.029 914.648 460.565C927.259 466.131 938.223 473.722 947.568 483.345C956.914 492.967 964.297 504.268 969.712 517.279C975.102 530.228 977.809 544.123 977.809 559V632.5V636H981.309H1017H1020.5V632.5V559C1020.5 538.275 1016.7 518.772 1009.08 500.524C1001.48 482.146 991.021 466.168 977.685 452.628C964.535 438.897 949.008 428.114 931.134 420.281C913.383 412.421 894.404 408.5 874.235 408.5C854.063 408.5 834.994 412.422 817.063 420.279L817.05 420.284C799.357 428.12 783.835 438.904 770.506 452.628C757.354 466.169 746.986 482.147 739.391 500.522C731.77 518.77 727.97 538.274 727.97 559V632.5Z" fill="url(#paint3_linear_211_11423)" stroke="url(#paint4_linear_211_11423)" stroke-width="7"/>
+<g filter="url(#filter5_d_211_11423)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1048.54 676.941C1048.54 671.542 1047.61 666.455 1045.76 661.679C1043.9 656.696 1041.3 652.439 1037.95 648.909C1034.79 645.172 1030.98 642.265 1026.52 640.188C1022.24 638.112 1017.69 637.074 1012.86 637.074H727.372C722.353 637.074 717.707 638.112 713.432 640.188C709.157 642.265 705.347 645.172 702.001 648.909C698.842 652.439 696.332 656.592 694.474 661.368C692.615 666.144 691.686 671.335 691.686 676.941V916.147C691.686 921.753 692.615 927.048 694.474 932.032C696.332 936.808 698.842 940.96 702.001 944.49C705.161 948.02 708.878 950.823 713.153 952.9C717.614 954.976 722.353 956.015 727.372 956.015H1012.86C1017.88 956.015 1022.52 954.976 1026.8 952.9C1031.07 950.823 1034.79 948.02 1037.95 944.49C1041.3 940.753 1043.9 936.496 1045.76 931.72C1047.61 926.944 1048.54 921.753 1048.54 916.147V676.941ZM903.013 812.117C904.871 807.342 905.801 802.15 905.801 796.544C905.801 791.145 904.871 786.058 903.013 781.282C901.154 776.299 898.552 772.042 895.206 768.512C892.047 764.775 888.236 761.867 883.776 759.791C879.501 757.715 874.947 756.676 870.115 756.676C865.096 756.676 860.45 757.715 856.175 759.791C851.9 761.867 848.09 764.775 844.744 768.512C841.585 772.042 839.076 776.195 837.217 780.971C835.358 785.747 834.429 790.938 834.429 796.544C834.429 802.15 835.358 807.445 837.217 812.429C839.076 817.205 841.585 821.357 844.744 824.887C847.904 828.417 851.621 831.221 855.896 833.297C860.357 835.373 865.096 836.412 870.115 836.412C875.133 836.412 879.78 835.373 884.055 833.297C888.329 831.221 892.047 828.417 895.206 824.887C898.552 821.15 901.154 816.893 903.013 812.117Z" fill="url(#paint5_linear_211_11423)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M988.791 995.882H937.337C1048.32 995.882 1095.4 956.015 1084.46 850.296V900.239C1084.46 953.512 1040.18 995.844 988.791 995.882Z" fill="url(#paint6_linear_211_11423)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M903.013 812.117C904.871 807.342 905.801 802.15 905.801 796.544C905.801 791.145 904.871 786.058 903.013 781.282C901.154 776.299 898.552 772.042 895.206 768.512C892.047 764.775 888.236 761.867 883.776 759.791C879.501 757.715 874.947 756.676 870.115 756.676C865.096 756.676 860.45 757.715 856.175 759.791C851.9 761.867 848.09 764.775 844.744 768.512C841.585 772.042 839.076 776.195 837.217 780.971C835.358 785.747 834.429 790.938 834.429 796.544C834.429 802.15 835.358 807.445 837.217 812.429C839.076 817.205 841.585 821.357 844.744 824.887C847.904 828.417 851.621 831.221 855.896 833.297C860.357 835.373 865.096 836.412 870.115 836.412C875.133 836.412 879.78 835.373 884.055 833.297C888.329 831.221 892.047 828.417 895.206 824.887C898.552 821.15 901.154 816.893 903.013 812.117Z" fill="url(#paint7_linear_211_11423)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M699.492 989.653C708.228 993.806 717.521 995.882 727.372 995.882H937.337C1048.32 995.882 1095.4 956.015 1084.46 850.296V676.684C1084.46 665.679 1082.37 655.658 1078.65 646.106C1074.94 636.347 1069.83 627.833 1063.32 620.566C1056.81 613.298 1049.19 607.588 1040.46 603.435C1031.91 599.282 1022.71 597.206 1012.86 597.206H977.172H763.057H727.372C717.521 597.206 708.228 599.282 699.492 603.435C690.942 607.588 683.415 613.298 676.91 620.566C670.404 627.833 665.293 636.347 661.576 646.106C657.859 655.658 656 665.936 656 676.941V916.147C656 927.152 657.859 937.534 661.576 947.294C665.293 956.845 670.404 965.255 676.91 972.522C683.415 979.79 690.942 985.5 699.492 989.653ZM1045.76 661.679C1047.61 666.455 1048.54 671.542 1048.54 676.941V916.147C1048.54 921.753 1047.61 926.944 1045.76 931.72C1043.9 936.496 1041.3 940.753 1037.95 944.49C1034.79 948.02 1031.07 950.823 1026.8 952.9C1022.52 954.976 1017.88 956.015 1012.86 956.015H727.372C722.353 956.015 717.614 954.976 713.153 952.9C708.878 950.823 705.161 948.02 702.001 944.49C698.842 940.96 696.332 936.808 694.474 932.032C692.615 927.048 691.686 921.753 691.686 916.147V676.941C691.686 671.335 692.615 666.144 694.474 661.368C696.332 656.592 698.842 652.439 702.001 648.909C705.347 645.172 709.157 642.265 713.432 640.188C717.707 638.112 722.353 637.074 727.372 637.074H1012.86C1017.69 637.074 1022.24 638.112 1026.52 640.188C1030.98 642.265 1034.79 645.172 1037.95 648.909C1041.3 652.439 1043.9 656.696 1045.76 661.679Z" fill="url(#paint8_linear_211_11423)"/>
+</g>
+<g filter="url(#filter6_d_211_11423)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1048.54 676.941C1048.54 671.542 1047.61 666.455 1045.76 661.679C1043.9 656.696 1041.3 652.439 1037.95 648.909C1034.79 645.172 1030.98 642.265 1026.52 640.188C1022.24 638.112 1017.69 637.074 1012.86 637.074H727.372C722.353 637.074 717.707 638.112 713.432 640.188C709.157 642.265 705.347 645.172 702.001 648.909C698.842 652.439 696.332 656.592 694.474 661.368C692.615 666.144 691.686 671.335 691.686 676.941V916.147C691.686 921.753 692.615 927.048 694.474 932.032C696.332 936.808 698.842 940.96 702.001 944.49C705.161 948.02 708.878 950.823 713.153 952.9C717.614 954.976 722.353 956.015 727.372 956.015H1012.86C1017.88 956.015 1022.52 954.976 1026.8 952.9C1031.07 950.823 1034.79 948.02 1037.95 944.49C1041.3 940.753 1043.9 936.496 1045.76 931.72C1047.61 926.944 1048.54 921.753 1048.54 916.147V676.941ZM903.013 812.117C904.871 807.342 905.801 802.15 905.801 796.544C905.801 791.145 904.871 786.058 903.013 781.282C901.154 776.299 898.552 772.042 895.206 768.512C892.047 764.775 888.236 761.867 883.776 759.791C879.501 757.715 874.947 756.676 870.115 756.676C865.096 756.676 860.45 757.715 856.175 759.791C851.9 761.867 848.09 764.775 844.744 768.512C841.585 772.042 839.076 776.195 837.217 780.971C835.358 785.747 834.429 790.938 834.429 796.544C834.429 802.15 835.358 807.445 837.217 812.429C839.076 817.205 841.585 821.357 844.744 824.887C847.904 828.417 851.621 831.221 855.896 833.297C860.357 835.373 865.096 836.412 870.115 836.412C875.133 836.412 879.78 835.373 884.055 833.297C888.329 831.221 892.047 828.417 895.206 824.887C898.552 821.15 901.154 816.893 903.013 812.117Z" fill="url(#paint9_linear_211_11423)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M988.791 995.882H937.337C1048.32 995.882 1095.4 956.015 1084.46 850.296V900.239C1084.46 953.512 1040.18 995.844 988.791 995.882Z" fill="url(#paint10_linear_211_11423)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M903.013 812.117C904.871 807.342 905.801 802.15 905.801 796.544C905.801 791.145 904.871 786.058 903.013 781.282C901.154 776.299 898.552 772.042 895.206 768.512C892.047 764.775 888.236 761.867 883.776 759.791C879.501 757.715 874.947 756.676 870.115 756.676C865.096 756.676 860.45 757.715 856.175 759.791C851.9 761.867 848.09 764.775 844.744 768.512C841.585 772.042 839.076 776.195 837.217 780.971C835.358 785.747 834.429 790.938 834.429 796.544C834.429 802.15 835.358 807.445 837.217 812.429C839.076 817.205 841.585 821.357 844.744 824.887C847.904 828.417 851.621 831.221 855.896 833.297C860.357 835.373 865.096 836.412 870.115 836.412C875.133 836.412 879.78 835.373 884.055 833.297C888.329 831.221 892.047 828.417 895.206 824.887C898.552 821.15 901.154 816.893 903.013 812.117Z" fill="url(#paint11_linear_211_11423)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M699.492 989.653C708.228 993.806 717.521 995.882 727.372 995.882H937.337C1048.32 995.882 1095.4 956.015 1084.46 850.296V676.684C1084.46 665.679 1082.37 655.658 1078.65 646.106C1074.94 636.347 1069.83 627.833 1063.32 620.566C1056.81 613.298 1049.19 607.588 1040.46 603.435C1031.91 599.282 1022.71 597.206 1012.86 597.206H977.172H763.057H727.372C717.521 597.206 708.228 599.282 699.492 603.435C690.942 607.588 683.415 613.298 676.91 620.566C670.404 627.833 665.293 636.347 661.576 646.106C657.859 655.658 656 665.936 656 676.941V916.147C656 927.152 657.859 937.534 661.576 947.294C665.293 956.845 670.404 965.255 676.91 972.522C683.415 979.79 690.942 985.5 699.492 989.653ZM1045.76 661.679C1047.61 666.455 1048.54 671.542 1048.54 676.941V916.147C1048.54 921.753 1047.61 926.944 1045.76 931.72C1043.9 936.496 1041.3 940.753 1037.95 944.49C1034.79 948.02 1031.07 950.823 1026.8 952.9C1022.52 954.976 1017.88 956.015 1012.86 956.015H727.372C722.353 956.015 717.614 954.976 713.153 952.9C708.878 950.823 705.161 948.02 702.001 944.49C698.842 940.96 696.332 936.808 694.474 932.032C692.615 927.048 691.686 921.753 691.686 916.147V676.941C691.686 671.335 692.615 666.144 694.474 661.368C696.332 656.592 698.842 652.439 702.001 648.909C705.347 645.172 709.157 642.265 713.432 640.188C717.707 638.112 722.353 637.074 727.372 637.074H1012.86C1017.69 637.074 1022.24 638.112 1026.52 640.188C1030.98 642.265 1034.79 645.172 1037.95 648.909C1041.3 652.439 1043.9 656.696 1045.76 661.679Z" fill="url(#paint12_linear_211_11423)"/>
+</g>
+<g filter="url(#filter7_i_211_11423)">
+<rect x="822" y="711" width="83" height="179" rx="35" fill="#006AB5"/>
+</g>
+</g>
+<defs>
+<filter id="filter0_d_211_11423" x="0" y="0" width="1090" height="1088" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="4"/>
+<feGaussianBlur stdDeviation="2"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_211_11423"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_211_11423" result="shape"/>
+</filter>
+<filter id="filter1_d_211_11423" x="0" y="67.5" width="1088" height="953" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="4"/>
+<feGaussianBlur stdDeviation="2"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_211_11423"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_211_11423" result="shape"/>
+</filter>
+<filter id="filter2_d_211_11423" x="-63.5" y="168.75" width="1215" height="860.625" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="-33.75"/>
+<feGaussianBlur stdDeviation="33.75"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_211_11423"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_211_11423" result="shape"/>
+</filter>
+<filter id="filter3_d_211_11423" x="0" y="270" width="1088" height="733.625" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="4"/>
+<feGaussianBlur stdDeviation="2"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_211_11423"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_211_11423" result="shape"/>
+</filter>
+<filter id="filter4_d_211_11423" x="0" y="270" width="1088" height="176.75" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="4"/>
+<feGaussianBlur stdDeviation="2"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_211_11423"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_211_11423" result="shape"/>
+</filter>
+<filter id="filter5_d_211_11423" x="651" y="590.206" width="440" height="408.677" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="-2"/>
+<feGaussianBlur stdDeviation="2.5"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.15 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_211_11423"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_211_11423" result="shape"/>
+</filter>
+<filter id="filter6_d_211_11423" x="651" y="590.206" width="440" height="408.677" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="-2"/>
+<feGaussianBlur stdDeviation="2.5"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.15 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_211_11423"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_211_11423" result="shape"/>
+</filter>
+<filter id="filter7_i_211_11423" x="822" y="711" width="83" height="187" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="8"/>
+<feGaussianBlur stdDeviation="6"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.15 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_211_11423"/>
+</filter>
+<linearGradient id="paint0_linear_211_11423" x1="3.99991" y1="-3.58017e-05" x2="1284.11" y2="728.257" gradientUnits="userSpaceOnUse">
+<stop offset="0.25" stop-color="#C1C1C1"/>
+<stop offset="0.934027" stop-color="#818181"/>
+</linearGradient>
+<linearGradient id="paint1_linear_211_11423" x1="-40" y1="63" x2="1040" y2="1020.5" gradientUnits="userSpaceOnUse">
+<stop offset="0.187317" stop-color="#D0D0CF"/>
+<stop offset="1" stop-color="#878787"/>
+</linearGradient>
+<linearGradient id="paint2_linear_211_11423" x1="4" y1="270" x2="1084" y2="270" gradientUnits="userSpaceOnUse">
+<stop offset="0.105802" stop-color="#DFDFDF"/>
+<stop offset="1" stop-color="#D6D6D6" stop-opacity="0.2"/>
+</linearGradient>
+<linearGradient id="paint3_linear_211_11423" x1="874.235" y1="412" x2="878.965" y2="672.69" gradientUnits="userSpaceOnUse">
+<stop stop-color="#3FACFF"/>
+<stop offset="1" stop-color="#0078D3"/>
+<stop offset="1" stop-color="#004579"/>
+</linearGradient>
+<linearGradient id="paint4_linear_211_11423" x1="867.543" y1="397.07" x2="866.804" y2="963.25" gradientUnits="userSpaceOnUse">
+<stop stop-color="#77BDF2"/>
+<stop offset="1" stop-color="#00477D"/>
+<stop offset="1" stop-color="#00477D"/>
+</linearGradient>
+<linearGradient id="paint5_linear_211_11423" x1="871" y1="358" x2="871" y2="996" gradientUnits="userSpaceOnUse">
+<stop stop-color="#4CC2FF"/>
+<stop offset="1" stop-color="#0078D4"/>
+</linearGradient>
+<linearGradient id="paint6_linear_211_11423" x1="870.115" y1="358" x2="870.115" y2="995.882" gradientUnits="userSpaceOnUse">
+<stop stop-color="#83D5FF"/>
+<stop offset="1" stop-color="#0078D4"/>
+</linearGradient>
+<linearGradient id="paint7_linear_211_11423" x1="870.115" y1="358" x2="870.115" y2="995.882" gradientUnits="userSpaceOnUse">
+<stop stop-color="#83D5FF"/>
+<stop offset="1" stop-color="#0078D4"/>
+</linearGradient>
+<linearGradient id="paint8_linear_211_11423" x1="870.115" y1="358" x2="870.115" y2="995.882" gradientUnits="userSpaceOnUse">
+<stop stop-color="#83D5FF"/>
+<stop offset="1" stop-color="#0078D4"/>
+</linearGradient>
+<linearGradient id="paint9_linear_211_11423" x1="871" y1="358" x2="871" y2="996" gradientUnits="userSpaceOnUse">
+<stop stop-color="#4CC2FF"/>
+<stop offset="1" stop-color="#0078D4"/>
+</linearGradient>
+<linearGradient id="paint10_linear_211_11423" x1="870.115" y1="358" x2="870.115" y2="995.882" gradientUnits="userSpaceOnUse">
+<stop stop-color="#83D5FF"/>
+<stop offset="1" stop-color="#0078D4"/>
+</linearGradient>
+<linearGradient id="paint11_linear_211_11423" x1="870.115" y1="358" x2="870.115" y2="995.882" gradientUnits="userSpaceOnUse">
+<stop stop-color="#83D5FF"/>
+<stop offset="1" stop-color="#0078D4"/>
+</linearGradient>
+<linearGradient id="paint12_linear_211_11423" x1="870.115" y1="358" x2="870.115" y2="995.882" gradientUnits="userSpaceOnUse">
+<stop stop-color="#83D5FF"/>
+<stop offset="1" stop-color="#0078D4"/>
+</linearGradient>
+<clipPath id="clip0_211_11423">
+<rect width="1080" height="1080" fill="white" transform="translate(4)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/Platforms/SecureFolderFS.Uno/Assets/Splash/icon_foreground.svg b/src/Platforms/SecureFolderFS.Uno/Assets/Splash/icon_foreground.svg
new file mode 100644
index 000000000..796cc7f6f
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Uno/Assets/Splash/icon_foreground.svg
@@ -0,0 +1,179 @@
+<svg width="1091" height="1088" viewBox="0 0 1091 1088" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_211_11423)">
+<g clip-path="url(#clip0_211_11423)">
+<g filter="url(#filter1_d_211_11423)">
+<path d="M4.00063 185.625C4.00069 120.386 56.8871 67.5 122.126 67.5H331.032C374.073 67.5 414.533 88.0227 439.959 122.75L475.879 171.812C482.236 180.494 492.351 185.625 503.111 185.625H965.875C1031.11 185.625 1084 238.511 1084 303.75V894.375C1084 959.614 1031.11 1012.5 965.875 1012.5H122.125C56.8863 1012.5 3.99994 959.614 4 894.375L4.00063 185.625Z" fill="url(#paint0_linear_211_11423)"/>
+</g>
+<mask id="mask0_211_11423" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="4" y="67" width="1080" height="946">
+<path d="M4.00063 185.625C4.00069 120.386 56.8871 67.5 122.126 67.5H331.032C374.073 67.5 414.533 88.0227 439.959 122.75L475.879 171.812C482.236 180.494 492.351 185.625 503.111 185.625H965.875C1031.11 185.625 1084 238.511 1084 303.75V894.375C1084 959.614 1031.11 1012.5 965.875 1012.5H122.125C56.8863 1012.5 3.99994 959.614 4 894.375L4.00063 185.625Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_211_11423)">
+<g style="mix-blend-mode:color-burn" filter="url(#filter2_d_211_11423)">
+<g style="mix-blend-mode:color-burn">
+<path d="M4 438.75C4 373.511 56.8864 320.625 122.125 320.625H421.387C430.339 320.625 438.923 317.069 445.252 310.74L451.394 304.598C473.547 282.445 503.592 270 534.921 270H965.875C1031.11 270 1084 322.886 1084 388.125V894.375C1084 950.294 1038.67 995.625 982.75 995.625H105.25C49.3312 995.625 4 950.294 4 894.375V438.75Z" fill="white"/>
+</g>
+</g>
+<g filter="url(#filter3_d_211_11423)">
+<path d="M4 438.75C4 373.511 56.8864 320.625 122.125 320.625H421.387C430.339 320.625 438.923 317.069 445.252 310.74L451.394 304.598C473.547 282.445 503.592 270 534.921 270H965.875C1031.11 270 1084 322.886 1084 388.125V894.375C1084 950.294 1038.67 995.625 982.75 995.625H105.25C49.3312 995.625 4 950.294 4 894.375V438.75Z" fill="url(#paint1_linear_211_11423)"/>
+</g>
+<g filter="url(#filter4_d_211_11423)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M122.125 320.625C56.8864 320.625 4 373.511 4 438.75C4 382.831 49.3312 337.5 105.25 337.5H422.835C436.262 337.5 449.138 332.166 458.632 322.672L464.774 316.53C483.762 297.542 509.516 286.875 536.369 286.875H982.75C1038.67 286.875 1084 332.206 1084 388.125C1084 322.886 1031.11 270 965.875 270H534.921C503.592 270 473.547 282.445 451.394 304.598L445.252 310.74C438.923 317.069 430.339 320.625 421.387 320.625H122.125Z" fill="url(#paint2_linear_211_11423)" shape-rendering="crispEdges"/>
+</g>
+</g>
+</g>
+<path d="M727.97 632.5V636H731.47H767.161H770.661V632.5V559C770.661 544.123 773.368 530.228 778.757 517.279C784.173 504.268 791.556 492.967 800.902 483.345C810.247 473.722 821.211 466.131 833.822 460.565C846.369 455.029 859.827 452.25 874.235 452.25C888.642 452.25 902.101 455.029 914.648 460.565C927.259 466.131 938.223 473.722 947.568 483.345C956.914 492.967 964.297 504.268 969.712 517.279C975.102 530.228 977.809 544.123 977.809 559V632.5V636H981.309H1017H1020.5V632.5V559C1020.5 538.275 1016.7 518.772 1009.08 500.524C1001.48 482.146 991.021 466.168 977.685 452.628C964.535 438.897 949.008 428.114 931.134 420.281C913.383 412.421 894.404 408.5 874.235 408.5C854.063 408.5 834.994 412.422 817.063 420.279L817.05 420.284C799.357 428.12 783.835 438.904 770.506 452.628C757.354 466.169 746.986 482.147 739.391 500.522C731.77 518.77 727.97 538.274 727.97 559V632.5Z" fill="url(#paint3_linear_211_11423)" stroke="url(#paint4_linear_211_11423)" stroke-width="7"/>
+<g filter="url(#filter5_d_211_11423)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1048.54 676.941C1048.54 671.542 1047.61 666.455 1045.76 661.679C1043.9 656.696 1041.3 652.439 1037.95 648.909C1034.79 645.172 1030.98 642.265 1026.52 640.188C1022.24 638.112 1017.69 637.074 1012.86 637.074H727.372C722.353 637.074 717.707 638.112 713.432 640.188C709.157 642.265 705.347 645.172 702.001 648.909C698.842 652.439 696.332 656.592 694.474 661.368C692.615 666.144 691.686 671.335 691.686 676.941V916.147C691.686 921.753 692.615 927.048 694.474 932.032C696.332 936.808 698.842 940.96 702.001 944.49C705.161 948.02 708.878 950.823 713.153 952.9C717.614 954.976 722.353 956.015 727.372 956.015H1012.86C1017.88 956.015 1022.52 954.976 1026.8 952.9C1031.07 950.823 1034.79 948.02 1037.95 944.49C1041.3 940.753 1043.9 936.496 1045.76 931.72C1047.61 926.944 1048.54 921.753 1048.54 916.147V676.941ZM903.013 812.117C904.871 807.342 905.801 802.15 905.801 796.544C905.801 791.145 904.871 786.058 903.013 781.282C901.154 776.299 898.552 772.042 895.206 768.512C892.047 764.775 888.236 761.867 883.776 759.791C879.501 757.715 874.947 756.676 870.115 756.676C865.096 756.676 860.45 757.715 856.175 759.791C851.9 761.867 848.09 764.775 844.744 768.512C841.585 772.042 839.076 776.195 837.217 780.971C835.358 785.747 834.429 790.938 834.429 796.544C834.429 802.15 835.358 807.445 837.217 812.429C839.076 817.205 841.585 821.357 844.744 824.887C847.904 828.417 851.621 831.221 855.896 833.297C860.357 835.373 865.096 836.412 870.115 836.412C875.133 836.412 879.78 835.373 884.055 833.297C888.329 831.221 892.047 828.417 895.206 824.887C898.552 821.15 901.154 816.893 903.013 812.117Z" fill="url(#paint5_linear_211_11423)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M988.791 995.882H937.337C1048.32 995.882 1095.4 956.015 1084.46 850.296V900.239C1084.46 953.512 1040.18 995.844 988.791 995.882Z" fill="url(#paint6_linear_211_11423)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M903.013 812.117C904.871 807.342 905.801 802.15 905.801 796.544C905.801 791.145 904.871 786.058 903.013 781.282C901.154 776.299 898.552 772.042 895.206 768.512C892.047 764.775 888.236 761.867 883.776 759.791C879.501 757.715 874.947 756.676 870.115 756.676C865.096 756.676 860.45 757.715 856.175 759.791C851.9 761.867 848.09 764.775 844.744 768.512C841.585 772.042 839.076 776.195 837.217 780.971C835.358 785.747 834.429 790.938 834.429 796.544C834.429 802.15 835.358 807.445 837.217 812.429C839.076 817.205 841.585 821.357 844.744 824.887C847.904 828.417 851.621 831.221 855.896 833.297C860.357 835.373 865.096 836.412 870.115 836.412C875.133 836.412 879.78 835.373 884.055 833.297C888.329 831.221 892.047 828.417 895.206 824.887C898.552 821.15 901.154 816.893 903.013 812.117Z" fill="url(#paint7_linear_211_11423)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M699.492 989.653C708.228 993.806 717.521 995.882 727.372 995.882H937.337C1048.32 995.882 1095.4 956.015 1084.46 850.296V676.684C1084.46 665.679 1082.37 655.658 1078.65 646.106C1074.94 636.347 1069.83 627.833 1063.32 620.566C1056.81 613.298 1049.19 607.588 1040.46 603.435C1031.91 599.282 1022.71 597.206 1012.86 597.206H977.172H763.057H727.372C717.521 597.206 708.228 599.282 699.492 603.435C690.942 607.588 683.415 613.298 676.91 620.566C670.404 627.833 665.293 636.347 661.576 646.106C657.859 655.658 656 665.936 656 676.941V916.147C656 927.152 657.859 937.534 661.576 947.294C665.293 956.845 670.404 965.255 676.91 972.522C683.415 979.79 690.942 985.5 699.492 989.653ZM1045.76 661.679C1047.61 666.455 1048.54 671.542 1048.54 676.941V916.147C1048.54 921.753 1047.61 926.944 1045.76 931.72C1043.9 936.496 1041.3 940.753 1037.95 944.49C1034.79 948.02 1031.07 950.823 1026.8 952.9C1022.52 954.976 1017.88 956.015 1012.86 956.015H727.372C722.353 956.015 717.614 954.976 713.153 952.9C708.878 950.823 705.161 948.02 702.001 944.49C698.842 940.96 696.332 936.808 694.474 932.032C692.615 927.048 691.686 921.753 691.686 916.147V676.941C691.686 671.335 692.615 666.144 694.474 661.368C696.332 656.592 698.842 652.439 702.001 648.909C705.347 645.172 709.157 642.265 713.432 640.188C717.707 638.112 722.353 637.074 727.372 637.074H1012.86C1017.69 637.074 1022.24 638.112 1026.52 640.188C1030.98 642.265 1034.79 645.172 1037.95 648.909C1041.3 652.439 1043.9 656.696 1045.76 661.679Z" fill="url(#paint8_linear_211_11423)"/>
+</g>
+<g filter="url(#filter6_d_211_11423)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1048.54 676.941C1048.54 671.542 1047.61 666.455 1045.76 661.679C1043.9 656.696 1041.3 652.439 1037.95 648.909C1034.79 645.172 1030.98 642.265 1026.52 640.188C1022.24 638.112 1017.69 637.074 1012.86 637.074H727.372C722.353 637.074 717.707 638.112 713.432 640.188C709.157 642.265 705.347 645.172 702.001 648.909C698.842 652.439 696.332 656.592 694.474 661.368C692.615 666.144 691.686 671.335 691.686 676.941V916.147C691.686 921.753 692.615 927.048 694.474 932.032C696.332 936.808 698.842 940.96 702.001 944.49C705.161 948.02 708.878 950.823 713.153 952.9C717.614 954.976 722.353 956.015 727.372 956.015H1012.86C1017.88 956.015 1022.52 954.976 1026.8 952.9C1031.07 950.823 1034.79 948.02 1037.95 944.49C1041.3 940.753 1043.9 936.496 1045.76 931.72C1047.61 926.944 1048.54 921.753 1048.54 916.147V676.941ZM903.013 812.117C904.871 807.342 905.801 802.15 905.801 796.544C905.801 791.145 904.871 786.058 903.013 781.282C901.154 776.299 898.552 772.042 895.206 768.512C892.047 764.775 888.236 761.867 883.776 759.791C879.501 757.715 874.947 756.676 870.115 756.676C865.096 756.676 860.45 757.715 856.175 759.791C851.9 761.867 848.09 764.775 844.744 768.512C841.585 772.042 839.076 776.195 837.217 780.971C835.358 785.747 834.429 790.938 834.429 796.544C834.429 802.15 835.358 807.445 837.217 812.429C839.076 817.205 841.585 821.357 844.744 824.887C847.904 828.417 851.621 831.221 855.896 833.297C860.357 835.373 865.096 836.412 870.115 836.412C875.133 836.412 879.78 835.373 884.055 833.297C888.329 831.221 892.047 828.417 895.206 824.887C898.552 821.15 901.154 816.893 903.013 812.117Z" fill="url(#paint9_linear_211_11423)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M988.791 995.882H937.337C1048.32 995.882 1095.4 956.015 1084.46 850.296V900.239C1084.46 953.512 1040.18 995.844 988.791 995.882Z" fill="url(#paint10_linear_211_11423)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M903.013 812.117C904.871 807.342 905.801 802.15 905.801 796.544C905.801 791.145 904.871 786.058 903.013 781.282C901.154 776.299 898.552 772.042 895.206 768.512C892.047 764.775 888.236 761.867 883.776 759.791C879.501 757.715 874.947 756.676 870.115 756.676C865.096 756.676 860.45 757.715 856.175 759.791C851.9 761.867 848.09 764.775 844.744 768.512C841.585 772.042 839.076 776.195 837.217 780.971C835.358 785.747 834.429 790.938 834.429 796.544C834.429 802.15 835.358 807.445 837.217 812.429C839.076 817.205 841.585 821.357 844.744 824.887C847.904 828.417 851.621 831.221 855.896 833.297C860.357 835.373 865.096 836.412 870.115 836.412C875.133 836.412 879.78 835.373 884.055 833.297C888.329 831.221 892.047 828.417 895.206 824.887C898.552 821.15 901.154 816.893 903.013 812.117Z" fill="url(#paint11_linear_211_11423)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M699.492 989.653C708.228 993.806 717.521 995.882 727.372 995.882H937.337C1048.32 995.882 1095.4 956.015 1084.46 850.296V676.684C1084.46 665.679 1082.37 655.658 1078.65 646.106C1074.94 636.347 1069.83 627.833 1063.32 620.566C1056.81 613.298 1049.19 607.588 1040.46 603.435C1031.91 599.282 1022.71 597.206 1012.86 597.206H977.172H763.057H727.372C717.521 597.206 708.228 599.282 699.492 603.435C690.942 607.588 683.415 613.298 676.91 620.566C670.404 627.833 665.293 636.347 661.576 646.106C657.859 655.658 656 665.936 656 676.941V916.147C656 927.152 657.859 937.534 661.576 947.294C665.293 956.845 670.404 965.255 676.91 972.522C683.415 979.79 690.942 985.5 699.492 989.653ZM1045.76 661.679C1047.61 666.455 1048.54 671.542 1048.54 676.941V916.147C1048.54 921.753 1047.61 926.944 1045.76 931.72C1043.9 936.496 1041.3 940.753 1037.95 944.49C1034.79 948.02 1031.07 950.823 1026.8 952.9C1022.52 954.976 1017.88 956.015 1012.86 956.015H727.372C722.353 956.015 717.614 954.976 713.153 952.9C708.878 950.823 705.161 948.02 702.001 944.49C698.842 940.96 696.332 936.808 694.474 932.032C692.615 927.048 691.686 921.753 691.686 916.147V676.941C691.686 671.335 692.615 666.144 694.474 661.368C696.332 656.592 698.842 652.439 702.001 648.909C705.347 645.172 709.157 642.265 713.432 640.188C717.707 638.112 722.353 637.074 727.372 637.074H1012.86C1017.69 637.074 1022.24 638.112 1026.52 640.188C1030.98 642.265 1034.79 645.172 1037.95 648.909C1041.3 652.439 1043.9 656.696 1045.76 661.679Z" fill="url(#paint12_linear_211_11423)"/>
+</g>
+<g filter="url(#filter7_i_211_11423)">
+<rect x="822" y="711" width="83" height="179" rx="35" fill="#006AB5"/>
+</g>
+</g>
+<defs>
+<filter id="filter0_d_211_11423" x="0" y="0" width="1090" height="1088" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="4"/>
+<feGaussianBlur stdDeviation="2"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_211_11423"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_211_11423" result="shape"/>
+</filter>
+<filter id="filter1_d_211_11423" x="0" y="67.5" width="1088" height="953" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="4"/>
+<feGaussianBlur stdDeviation="2"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_211_11423"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_211_11423" result="shape"/>
+</filter>
+<filter id="filter2_d_211_11423" x="-63.5" y="168.75" width="1215" height="860.625" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="-33.75"/>
+<feGaussianBlur stdDeviation="33.75"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_211_11423"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_211_11423" result="shape"/>
+</filter>
+<filter id="filter3_d_211_11423" x="0" y="270" width="1088" height="733.625" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="4"/>
+<feGaussianBlur stdDeviation="2"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_211_11423"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_211_11423" result="shape"/>
+</filter>
+<filter id="filter4_d_211_11423" x="0" y="270" width="1088" height="176.75" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="4"/>
+<feGaussianBlur stdDeviation="2"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_211_11423"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_211_11423" result="shape"/>
+</filter>
+<filter id="filter5_d_211_11423" x="651" y="590.206" width="440" height="408.677" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="-2"/>
+<feGaussianBlur stdDeviation="2.5"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.15 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_211_11423"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_211_11423" result="shape"/>
+</filter>
+<filter id="filter6_d_211_11423" x="651" y="590.206" width="440" height="408.677" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="-2"/>
+<feGaussianBlur stdDeviation="2.5"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.15 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_211_11423"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_211_11423" result="shape"/>
+</filter>
+<filter id="filter7_i_211_11423" x="822" y="711" width="83" height="187" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="8"/>
+<feGaussianBlur stdDeviation="6"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.15 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_211_11423"/>
+</filter>
+<linearGradient id="paint0_linear_211_11423" x1="3.99991" y1="-3.58017e-05" x2="1284.11" y2="728.257" gradientUnits="userSpaceOnUse">
+<stop offset="0.25" stop-color="#C1C1C1"/>
+<stop offset="0.934027" stop-color="#818181"/>
+</linearGradient>
+<linearGradient id="paint1_linear_211_11423" x1="-40" y1="63" x2="1040" y2="1020.5" gradientUnits="userSpaceOnUse">
+<stop offset="0.187317" stop-color="#D0D0CF"/>
+<stop offset="1" stop-color="#878787"/>
+</linearGradient>
+<linearGradient id="paint2_linear_211_11423" x1="4" y1="270" x2="1084" y2="270" gradientUnits="userSpaceOnUse">
+<stop offset="0.105802" stop-color="#DFDFDF"/>
+<stop offset="1" stop-color="#D6D6D6" stop-opacity="0.2"/>
+</linearGradient>
+<linearGradient id="paint3_linear_211_11423" x1="874.235" y1="412" x2="878.965" y2="672.69" gradientUnits="userSpaceOnUse">
+<stop stop-color="#3FACFF"/>
+<stop offset="1" stop-color="#0078D3"/>
+<stop offset="1" stop-color="#004579"/>
+</linearGradient>
+<linearGradient id="paint4_linear_211_11423" x1="867.543" y1="397.07" x2="866.804" y2="963.25" gradientUnits="userSpaceOnUse">
+<stop stop-color="#77BDF2"/>
+<stop offset="1" stop-color="#00477D"/>
+<stop offset="1" stop-color="#00477D"/>
+</linearGradient>
+<linearGradient id="paint5_linear_211_11423" x1="871" y1="358" x2="871" y2="996" gradientUnits="userSpaceOnUse">
+<stop stop-color="#4CC2FF"/>
+<stop offset="1" stop-color="#0078D4"/>
+</linearGradient>
+<linearGradient id="paint6_linear_211_11423" x1="870.115" y1="358" x2="870.115" y2="995.882" gradientUnits="userSpaceOnUse">
+<stop stop-color="#83D5FF"/>
+<stop offset="1" stop-color="#0078D4"/>
+</linearGradient>
+<linearGradient id="paint7_linear_211_11423" x1="870.115" y1="358" x2="870.115" y2="995.882" gradientUnits="userSpaceOnUse">
+<stop stop-color="#83D5FF"/>
+<stop offset="1" stop-color="#0078D4"/>
+</linearGradient>
+<linearGradient id="paint8_linear_211_11423" x1="870.115" y1="358" x2="870.115" y2="995.882" gradientUnits="userSpaceOnUse">
+<stop stop-color="#83D5FF"/>
+<stop offset="1" stop-color="#0078D4"/>
+</linearGradient>
+<linearGradient id="paint9_linear_211_11423" x1="871" y1="358" x2="871" y2="996" gradientUnits="userSpaceOnUse">
+<stop stop-color="#4CC2FF"/>
+<stop offset="1" stop-color="#0078D4"/>
+</linearGradient>
+<linearGradient id="paint10_linear_211_11423" x1="870.115" y1="358" x2="870.115" y2="995.882" gradientUnits="userSpaceOnUse">
+<stop stop-color="#83D5FF"/>
+<stop offset="1" stop-color="#0078D4"/>
+</linearGradient>
+<linearGradient id="paint11_linear_211_11423" x1="870.115" y1="358" x2="870.115" y2="995.882" gradientUnits="userSpaceOnUse">
+<stop stop-color="#83D5FF"/>
+<stop offset="1" stop-color="#0078D4"/>
+</linearGradient>
+<linearGradient id="paint12_linear_211_11423" x1="870.115" y1="358" x2="870.115" y2="995.882" gradientUnits="userSpaceOnUse">
+<stop stop-color="#83D5FF"/>
+<stop offset="1" stop-color="#0078D4"/>
+</linearGradient>
+<clipPath id="clip0_211_11423">
+<rect width="1080" height="1080" fill="white" transform="translate(4)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/Platforms/SecureFolderFS.Uno/Assets/Splash/splash_screen.svg b/src/Platforms/SecureFolderFS.Uno/Assets/Splash/splash_screen.svg
deleted file mode 100644
index 8ffc41ae3..000000000
--- a/src/Platforms/SecureFolderFS.Uno/Assets/Splash/splash_screen.svg
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="450"
-   height="450"
-   viewBox="0 0 50.369617 49.826836"
-   version="1.1"
-   id="svg151"
-   sodipodi:docname="icon_foreground.svg"
-   inkscape:version="1.2 (dc2aedaf03, 2022-05-15)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview153"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     showgrid="false"
-     inkscape:zoom="1.250876"
-     inkscape:cx="218.64677"
-     inkscape:cy="175.87674"
-     inkscape:window-width="1920"
-     inkscape:window-height="1027"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g149" />
-  <defs
-     id="defs105">
-    <path
-       id="aj28a0fd1a"
-       d="M 1.738,0.156 3.927,2.323 2.347,3.919 0.101,1.81 Z" />
-    <path
-       id="fdje57jgic"
-       d="M 2.201,0.066 3.855,1.703 1.69,3.894 0.093,2.311 Z" />
-    <path
-       id="6bg72xwlze"
-       d="M 2.398,0.044 3.994,1.624 1.886,3.869 0.232,2.232 Z" />
-    <path
-       id="eaqjnja8wg"
-       d="M 1.736,0.023 3.981,2.132 2.344,3.786 0.156,1.619 Z" />
-  </defs>
-  <g
-     fill="none"
-     fill-rule="evenodd"
-     id="g149"
-     transform="translate(-2.9304427e-4,-1.6465461e-4)">
-    <g
-       id="g147">
-      <g
-         id="g145">
-        <path
-           fill="#7a67f8"
-           d="M 34.758,38.865 H 34.746 C 31.892,38.86 29.342,36.882 26.152,33.692 l -6.93,-6.873 2.166,-2.188 6.937,6.88 c 3.075,3.074 4.876,4.272 6.427,4.275 h 0.005 c 1.567,0 3.467,-1.262 6.558,-4.353 l 3.541,-3.587 c 1.784,-1.784 2.57,-3.34 2.408,-4.762 -0.13,-1.156 -0.894,-2.397 -2.401,-3.904 L 44.83,19.146 C 43.202,17.414 41.211,15.483 39.131,14.414 38.745,12.437 37.48,10.881 37.3,10.596 c 3.803,0.559 7.197,3.703 9.758,6.424 2.788,2.794 5.803,7.176 -0.018,12.996 l -3.54,3.588 c -3.251,3.25 -5.844,5.261 -8.742,5.261"
-           id="path107" />
-        <path
-           fill="#f85977"
-           d="m 25.399,28.608 6.492,-6.562 c 3.076,-3.076 4.274,-4.877 4.276,-6.428 0.004,-1.567 -1.257,-3.469 -4.352,-6.563 L 28.228,5.515 C 24.58,1.867 22.369,2.699 19.561,5.507 L 19.528,5.54 c -1.54,1.448 -3.237,3.182 -4.346,5.01 -1.031,0.073 -2.361,0.424 -3.997,1.518 0.906,-3.397 3.737,-6.422 6.216,-8.755 2.794,-2.789 7.177,-5.804 12.997,0.017 l 3.588,3.54 c 3.255,3.256 5.266,5.851 5.26,8.754 -0.005,2.854 -1.982,5.404 -5.172,8.594 l -6.489,6.559 z"
-           id="path109" />
-        <path
-           fill="#159bff"
-           d="M 12.522,38.707 C 8.939,37.946 5.746,34.972 3.308,32.382 2.035,31.106 0.321,29.13 0.042,26.663 c -0.274,-2.414 0.8,-4.795 3.283,-7.278 l 3.542,-3.588 c 3.25,-3.25 5.843,-5.261 8.74,-5.261 h 0.013 c 2.854,0.005 5.404,1.983 8.593,5.172 l 7.046,6.976 -2.165,2.19 -7.053,-6.983 c -3.076,-3.076 -4.876,-4.273 -6.427,-4.276 h -0.006 c -1.566,0 -3.466,1.261 -6.557,4.352 L 5.51,21.555 c -1.784,1.784 -2.57,3.34 -2.409,4.762 0.131,1.156 0.894,2.396 2.402,3.904 l 0.033,0.034 c 1.55,1.649 3.43,3.479 5.401,4.573 0.168,1.739 1.2,3.297 1.585,3.88"
-           id="path111" />
-        <path
-           fill="#67e5ad"
-           d="m 26.32,49.827 c -1.925,0 -4.114,-0.886 -6.557,-3.33 l -3.588,-3.54 C 9.167,35.949 9.151,32.546 16.086,25.61 l 6.802,-6.872 2.193,2.162 -6.812,6.882 c -3.076,3.076 -4.273,4.877 -4.276,6.427 -0.003,1.568 1.258,3.47 4.352,6.563 l 3.588,3.541 c 3.646,3.647 5.858,2.816 8.666,0.008 l 0.034,-0.033 c 1.654,-1.555 3.5,-3.46 4.593,-5.437 1.661,-0.14 2.9,-0.841 3.835,-1.438 -0.8,3.537 -3.738,6.69 -6.302,9.102 -1.62,1.618 -3.777,3.312 -6.439,3.312"
-           id="path113" />
-        <g
-           transform="translate(21.154,18.577)"
-           id="g120">
-          <mask
-             id="8jptpqrneb"
-             fill="#ffffff">
-            <use
-               xlink:href="#aj28a0fd1a"
-               id="use115" />
-          </mask>
-          <path
-             d="M 0.101,1.81 1.738,0.156 3.927,2.323 2.347,3.919 Z"
-             mask="url(#8jptpqrneb)"
-             id="path118" />
-        </g>
-        <g
-           transform="translate(27.404,20.981)"
-           id="g127">
-          <mask
-             id="b2iljpfwbd"
-             fill="#ffffff">
-            <use
-               xlink:href="#fdje57jgic"
-               id="use122" />
-          </mask>
-          <path
-             d="M 2.201,0.066 3.855,1.703 1.69,3.894 0.093,2.311 Z"
-             mask="url(#b2iljpfwbd)"
-             id="path125" />
-        </g>
-        <g
-           transform="translate(18.99,24.587)"
-           id="g134">
-          <mask
-             id="gj70tyfpnf"
-             fill="#ffffff">
-            <use
-               xlink:href="#6bg72xwlze"
-               id="use129" />
-          </mask>
-          <path
-             d="M 1.886,3.869 0.232,2.232 2.398,0.044 3.994,1.624 Z"
-             mask="url(#gj70tyfpnf)"
-             id="path132" />
-        </g>
-        <g
-           transform="translate(25.24,26.99)"
-           id="g141">
-          <mask
-             id="z7vhvduckh"
-             fill="#ffffff">
-            <use
-               xlink:href="#eaqjnja8wg"
-               id="use136" />
-          </mask>
-          <path
-             d="M 3.981,2.132 2.344,3.786 0.156,1.619 1.736,0.023 Z"
-             mask="url(#z7vhvduckh)"
-             id="path139" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/src/Platforms/SecureFolderFS.Uno/Dialogs/AgreementDialog.xaml b/src/Platforms/SecureFolderFS.Uno/Dialogs/AgreementDialog.xaml
index 423f309fd..cf91d2efb 100644
--- a/src/Platforms/SecureFolderFS.Uno/Dialogs/AgreementDialog.xaml
+++ b/src/Platforms/SecureFolderFS.Uno/Dialogs/AgreementDialog.xaml
@@ -10,7 +10,7 @@
     Closing="AgreementDialog_Closing"
     DefaultButton="Primary"
     PrimaryButtonClick="AgreementDialog_PrimaryButtonClick"
-    PrimaryButtonText="{l:ResourceString Name=Continue}"
+    PrimaryButtonText="{l:ResourceString Rid=Continue}"
     RequestedTheme="{x:Bind h:UnoThemeHelper.Instance.CurrentElementTheme, Mode=OneWay}"
     Style="{ThemeResource DefaultContentDialogStyle}"
     mc:Ignorable="d">
diff --git a/src/Platforms/SecureFolderFS.Uno/Dialogs/ChangelogDialog.xaml b/src/Platforms/SecureFolderFS.Uno/Dialogs/ChangelogDialog.xaml
index f48fe5c12..439baee4c 100644
--- a/src/Platforms/SecureFolderFS.Uno/Dialogs/ChangelogDialog.xaml
+++ b/src/Platforms/SecureFolderFS.Uno/Dialogs/ChangelogDialog.xaml
@@ -9,15 +9,16 @@
     xmlns:not_win="http://uno.ui/skia"
     xmlns:tuc="using:CommunityToolkit.WinUI.UI.Controls"
     xmlns:vc="using:SecureFolderFS.Uno.ValueConverters"
-    Title="{l:ResourceString Name=WhatsNew}"
+    Title="{l:ResourceString Rid=WhatsNew}"
     DefaultButton="Primary"
-    PrimaryButtonText="{l:ResourceString Name=ChangelogCloseButton}"
+    PrimaryButtonText="{l:ResourceString Rid=ChangelogCloseButton}"
     RequestedTheme="{x:Bind h:UnoThemeHelper.Instance.CurrentElementTheme, Mode=OneWay}"
     Style="{ThemeResource DefaultContentDialogStyle}"
     mc:Ignorable="d not_win">
 
     <ContentDialog.Resources>
         <vc:NullToBoolConverter x:Key="NullToBoolConverter" />
+        <vc:NullToVisibilityConverter x:Key="NullToVisibilityConverter" />
     </ContentDialog.Resources>
 
     <Grid>
@@ -27,7 +28,7 @@
         </Grid.RowDefinitions>
 
         <Grid
-            x:Name="ChangelogPanel"
+            x:Name="RootGrid"
             Grid.Row="0"
             x:Load="{x:Bind ViewModel.ErrorText, Mode=OneWay, Converter={StaticResource NullToBoolConverter}, ConverterParameter='invert'}"
             RowSpacing="8">
@@ -57,10 +58,10 @@
 
             <HyperlinkButton
                 Grid.Row="1"
-                AutomationProperties.Name="{l:ResourceString Name=ViewOnGitHub}"
+                AutomationProperties.Name="{l:ResourceString Rid=ViewOnGitHub}"
                 NavigateUri="https://github.com/securefolderfs-community/SecureFolderFS/releases">
                 <StackPanel Orientation="Horizontal" Spacing="6">
-                    <TextBlock Text="{l:ResourceString Name=ViewOnGitHub}" />
+                    <TextBlock Text="{l:ResourceString Rid=ViewOnGitHub}" />
                     <FontIcon
                         Margin="0,0,0,-2"
                         FontSize="14"
@@ -74,7 +75,7 @@
             Grid.Row="0"
             HorizontalAlignment="Center"
             x:Load="{x:Bind ViewModel.ErrorText, Mode=OneWay, Converter={StaticResource NullToBoolConverter}}">
-            <TextBlock HorizontalAlignment="Center" Text="{l:ResourceString Name=ChangelogError}" />
+            <TextBlock HorizontalAlignment="Center" Text="{l:ResourceString Rid=ChangelogError}" />
             <TextBlock
                 HorizontalAlignment="Center"
                 FontSize="12"
@@ -88,10 +89,10 @@
                 HorizontalAlignment="Center"
                 Orientation="Horizontal"
                 Spacing="8">
-                <HyperlinkButton Command="{x:Bind ViewModel.RetryCommand, Mode=OneWay}" Content="{l:ResourceString Name=Retry}" />
-                <HyperlinkButton AutomationProperties.Name="{l:ResourceString Name=ViewOnGitHub}" NavigateUri="https://github.com/securefolderfs-community/SecureFolderFS/releases">
+                <HyperlinkButton Command="{x:Bind ViewModel.RetryCommand, Mode=OneWay}" Content="{l:ResourceString Rid=Retry}" />
+                <HyperlinkButton AutomationProperties.Name="{l:ResourceString Rid=ViewOnGitHub}" NavigateUri="https://github.com/securefolderfs-community/SecureFolderFS/releases">
                     <StackPanel Orientation="Horizontal" Spacing="6">
-                        <TextBlock Text="{l:ResourceString Name=ViewOnGitHub}" />
+                        <TextBlock Text="{l:ResourceString Rid=ViewOnGitHub}" />
                         <FontIcon
                             Margin="0,0,0,-2"
                             FontSize="14"
diff --git a/src/Platforms/SecureFolderFS.Uno/Dialogs/CredentialsDialog.xaml b/src/Platforms/SecureFolderFS.Uno/Dialogs/CredentialsDialog.xaml
index bd94f7f75..9b991940c 100644
--- a/src/Platforms/SecureFolderFS.Uno/Dialogs/CredentialsDialog.xaml
+++ b/src/Platforms/SecureFolderFS.Uno/Dialogs/CredentialsDialog.xaml
@@ -15,7 +15,7 @@
     xmlns:vm3="using:SecureFolderFS.Sdk.ViewModels.Views.Credentials"
     HorizontalAlignment="Stretch"
     HorizontalContentAlignment="Stretch"
-    CloseButtonText="{l:ResourceString Name=Close}"
+    CloseButtonText="{l:ResourceString Rid=Close}"
     Closed="CredentialsDialog_Closed"
     Closing="ContentDialog_Closing"
     DefaultButton="Primary"
@@ -33,7 +33,7 @@
         <!--  Alternative Stage: Resetting credentials with Recovery Key  -->
         <DataTemplate x:Key="ResetTemplate" x:DataType="vm3:CredentialsResetViewModel">
             <ucab:ActionBlockControl
-                Title="{l:ResourceString Name=LockType}"
+                Title="{l:ResourceString Rid=LockType}"
                 Grid.Row="0"
                 MinWidth="450"
                 BlockMode="Expandable"
@@ -45,7 +45,7 @@
                     <ComboBox ItemsSource="{x:Bind AuthenticationOptions, Mode=OneWay}" SelectedItem="{x:Bind RegisterViewModel.CurrentViewModel, Mode=TwoWay}">
                         <ComboBox.ItemTemplate>
                             <DataTemplate x:DataType="vm2:AuthenticationViewModel">
-                                <TextBlock Text="{x:Bind DisplayName, Mode=OneWay}" />
+                                <TextBlock Text="{x:Bind Title, Mode=OneWay}" />
                             </DataTemplate>
                         </ComboBox.ItemTemplate>
                     </ComboBox>
@@ -68,11 +68,11 @@
                     Padding="4,2"
                     HorizontalAlignment="Center"
                     Click="ResetCredentialsLink_Click"
-                    Content="{l:ResourceString Name=ResetCredentials}">
+                    Content="{l:ResourceString Rid=ResetCredentials}">
                     <FlyoutBase.AttachedFlyout>
                         <Flyout>
                             <StackPanel Width="400" Spacing="8">
-                                <TextBlock Text="{l:ResourceString Name=EnterRecoveryKey}" />
+                                <TextBlock Text="{l:ResourceString Rid=EnterRecoveryKey}" />
                                 <TextBox
                                     x:Name="RecoveryKeyText"
                                     AcceptsReturn="True"
@@ -82,7 +82,7 @@
                                     HorizontalAlignment="Right"
                                     Command="{x:Bind RecoverAccessCommand, Mode=OneWay}"
                                     CommandParameter="{Binding Path=Text, ElementName=RecoveryKeyText, Mode=OneWay}"
-                                    Content="{l:ResourceString Name=RecoverAccess}" />
+                                    Content="{l:ResourceString Rid=RecoverAccess}" />
                             </StackPanel>
                         </Flyout>
                     </FlyoutBase.AttachedFlyout>
@@ -97,30 +97,30 @@
                     x:Name="ExistingOptions"
                     x:Load="{x:Bind ConfiguredViewModel, Mode=OneWay, Converter={StaticResource NullToBoolConverter}}"
                     Spacing="4">
-                    <TextBlock Style="{StaticResource SettingsSectionHeaderStyle}" Text="{l:ResourceString Name=ModifyExisting}" />
+                    <TextBlock Style="{StaticResource SettingsSectionHeaderStyle}" Text="{l:ResourceString Rid=ModifyExisting}" />
                     <ucab:ActionBlockControl
-                        Title="{x:Bind ConfiguredViewModel.DisplayName, Mode=OneWay}"
+                        Title="{x:Bind ConfiguredViewModel.Title, Mode=OneWay}"
                         BlockMode="Clickable"
                         ClickCommand="{x:Bind ItemSelectedCommand, Mode=OneWay}"
-                        Description="{l:ResourceString Name=ChangeCurrentAuthentication}">
+                        Description="{l:ResourceString Rid=ChangeCurrentAuthentication}">
                         <ucab:ActionBlockControl.Icon>
                             <FontIcon Glyph="{x:Bind ConfiguredViewModel.Icon, Mode=OneWay}" />
                         </ucab:ActionBlockControl.Icon>
                     </ucab:ActionBlockControl>
                     <ucab:ActionBlockControl
                         x:Name="RemoveAuthentication"
-                        Title="{l:ResourceString Name=RemoveAuthentication}"
+                        Title="{l:ResourceString Rid=RemoveAuthentication}"
                         x:Load="{x:Bind CanRemoveCredentials, Mode=OneWay}"
                         BlockMode="Clickable"
                         ClickCommand="{x:Bind RemoveCredentialsCommand, Mode=OneWay}"
-                        Description="{l:ResourceString Name=RemoveAuthenticationDescription}">
+                        Description="{l:ResourceString Rid=RemoveAuthenticationDescription}">
                         <ucab:ActionBlockControl.Icon>
                             <FontIcon Glyph="&#xE738;" />
                         </ucab:ActionBlockControl.Icon>
                     </ucab:ActionBlockControl>
                 </StackPanel>
                 <StackPanel Spacing="4">
-                    <TextBlock Style="{StaticResource SettingsSectionHeaderStyle}" Text="{l:ResourceString Name=AllOptions}" />
+                    <TextBlock Style="{StaticResource SettingsSectionHeaderStyle}" Text="{l:ResourceString Rid=AllOptions}" />
                     <ListView
                         Margin="0"
                         Padding="0"
@@ -130,7 +130,7 @@
                         <ListView.ItemTemplate>
                             <DataTemplate x:DataType="vm2:AuthenticationViewModel">
                                 <ucab:ActionBlockControl
-                                    Title="{x:Bind DisplayName, Mode=OneWay}"
+                                    Title="{x:Bind Title, Mode=OneWay}"
                                     Margin="0,0,0,4"
                                     BlockMode="Clickable"
                                     Click="ActionBlockControl_Click"
@@ -150,6 +150,8 @@
         <!--  3rd Stage: Confirmation  -->
         <DataTemplate x:Key="ConfirmationTemplate" x:DataType="vm3:CredentialsConfirmationViewModel">
             <Grid Width="500" Padding="8,0,8,0">
+
+                <!--  Confirmation Panel  -->
                 <StackPanel
                     x:Name="CredentialsSetupPanel"
                     x:Load="{x:Bind IsRemoving, Mode=OneWay, Converter={StaticResource BoolInvertConverter}}"
@@ -166,15 +168,17 @@
                             IsEnabled="False" />
                         <HyperlinkButton
                             Padding="4,2"
-                            Content="{l:ResourceString Name=LearnMore}"
+                            Content="{l:ResourceString Rid=LearnMore}"
                             IsEnabled="False" />
                     </StackPanel>
                     <InfoBar
                         IsClosable="False"
                         IsOpen="True"
-                        Message="{l:ResourceString Name=RecoveryKeyTip}"
+                        Message="{l:ResourceString Rid=RecoveryKeyTip}"
                         Severity="Informational" />
                 </StackPanel>
+
+                <!--  Removal Panel  -->
                 <StackPanel
                     x:Name="CredentialsRemovalPanel"
                     x:Load="{x:Bind IsRemoving, Mode=OneWay}"
@@ -182,16 +186,16 @@
                     <InfoBar
                         IsClosable="False"
                         IsOpen="True"
-                        Message="{l:ResourceString Name=RemoveAuthenticationQuestion}" />
+                        Message="{l:ResourceString Rid=RemoveAuthenticationQuestion}" />
                     <ucab:ActionBlockControl
-                        Title="{x:Bind ConfiguredViewModel.DisplayName, Mode=OneWay}"
+                        Title="{x:Bind ConfiguredViewModel.Title, Mode=OneWay}"
                         BlockMode="Default"
                         Description="{x:Bind ConfiguredViewModel.Description, Mode=OneWay}">
                         <ucab:ActionBlockControl.Icon>
                             <FontIcon Glyph="{x:Bind ConfiguredViewModel.Icon, Mode=OneWay}" />
                         </ucab:ActionBlockControl.Icon>
                     </ucab:ActionBlockControl>
-                    <TextBlock Opacity="0.8" Text="{l:ResourceString Name=RemoveAuthenticationTip}" />
+                    <TextBlock Opacity="0.8" Text="{l:ResourceString Rid=RemoveAuthenticationTip}" />
                 </StackPanel>
             </Grid>
         </DataTemplate>
diff --git a/src/Platforms/SecureFolderFS.Uno/Dialogs/CredentialsDialog.xaml.cs b/src/Platforms/SecureFolderFS.Uno/Dialogs/CredentialsDialog.xaml.cs
index 4ac09e5c8..a00883ea9 100644
--- a/src/Platforms/SecureFolderFS.Uno/Dialogs/CredentialsDialog.xaml.cs
+++ b/src/Platforms/SecureFolderFS.Uno/Dialogs/CredentialsDialog.xaml.cs
@@ -77,11 +77,7 @@ private async void ContentDialog_PrimaryButtonClick(ContentDialog sender, Conten
             {
                 try
                 {
-                    if (credentialsConfirmation.IsRemoving)
-                        await credentialsConfirmation.RemoveAsync(default);
-                    else
-                        await credentialsConfirmation.ConfirmAsync(default);
-                        
+                    await credentialsConfirmation.ConfirmAsync(default);
                     await HideAsync();
                 }
                 catch (Exception ex)
diff --git a/src/Platforms/SecureFolderFS.Uno/Dialogs/LicensesDialog.xaml b/src/Platforms/SecureFolderFS.Uno/Dialogs/LicensesDialog.xaml
index 25c826ff1..aed95d016 100644
--- a/src/Platforms/SecureFolderFS.Uno/Dialogs/LicensesDialog.xaml
+++ b/src/Platforms/SecureFolderFS.Uno/Dialogs/LicensesDialog.xaml
@@ -36,7 +36,7 @@
                 VerticalAlignment="Center"
                 FontSize="16"
                 FontWeight="SemiBold"
-                Text="{l:ResourceString Name=Licenses}" />
+                Text="{l:ResourceString Rid=Licenses}" />
 
             <Button
                 Width="34"
@@ -45,7 +45,7 @@
                 Padding="0"
                 HorizontalAlignment="Right"
                 VerticalAlignment="Top"
-                AutomationProperties.Name="{l:ResourceString Name=Close}"
+                AutomationProperties.Name="{l:ResourceString Rid=Close}"
                 Background="Transparent"
                 BorderThickness="0"
                 Click="CloseButton_Click"
@@ -62,11 +62,11 @@
                             <ucab:ActionBlockControl.ActionElement>
                                 <StackPanel Orientation="Horizontal" Spacing="8">
                                     <HyperlinkButton
-                                        Content="{l:ResourceString Name=Website}"
+                                        Content="{l:ResourceString Rid=Website}"
                                         NavigateUri="{x:Bind ProjectWebsiteUri}"
                                         Visibility="{x:Bind ProjectWebsiteUri, Converter={StaticResource NullToVisibilityConverter}}" />
                                     <HyperlinkButton
-                                        Content="{l:ResourceString Name=License}"
+                                        Content="{l:ResourceString Rid=License}"
                                         NavigateUri="{x:Bind LicenseUris, Converter={StaticResource OnlyFirstElementOrNullConverter}}"
                                         Visibility="{Binding NavigateUri, RelativeSource={RelativeSource Mode=Self}, Converter={StaticResource NullToVisibilityConverter}}" />
                                 </StackPanel>
diff --git a/src/Platforms/SecureFolderFS.Uno/Dialogs/MigrationDialog.xaml b/src/Platforms/SecureFolderFS.Uno/Dialogs/MigrationDialog.xaml
index 71307a074..a2d08d6e7 100644
--- a/src/Platforms/SecureFolderFS.Uno/Dialogs/MigrationDialog.xaml
+++ b/src/Platforms/SecureFolderFS.Uno/Dialogs/MigrationDialog.xaml
@@ -7,7 +7,8 @@
     xmlns:l="using:SecureFolderFS.Uno.Localization"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ts="using:SecureFolderFS.Uno.TemplateSelectors"
-    xmlns:uc="using:SecureFolderFS.Uno.UserControls.Migration"
+    xmlns:uc="using:SecureFolderFS.Uno.UserControls"
+    xmlns:uc2="using:SecureFolderFS.Uno.UserControls.Migration"
     xmlns:vc="using:SecureFolderFS.Uno.ValueConverters"
     xmlns:vm="using:SecureFolderFS.Sdk.ViewModels.Controls.Authentication"
     x:Name="ThisDialog"
@@ -18,7 +19,7 @@
     PrimaryButtonClick="MigrationDialog_PrimaryButtonClick"
     PrimaryButtonText="{x:Bind ViewModel.PrimaryButtonText, Mode=OneWay}"
     RequestedTheme="{x:Bind h:UnoThemeHelper.Instance.CurrentElementTheme, Mode=OneWay}"
-    SecondaryButtonText="{l:ResourceString Name=Close}"
+    SecondaryButtonText="{l:ResourceString Rid=Close}"
     Style="{ThemeResource DefaultContentDialogStyle}"
     mc:Ignorable="d">
 
@@ -26,7 +27,7 @@
         <vc:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
         <vc:ProgressIsDeterminateConverter x:Key="ProgressIsDeterminateConverter" />
         <DataTemplate x:Key="MigratorV1_V2" x:DataType="vm:MigrationViewModel">
-            <uc:MigratorV1_V2
+            <uc2:MigratorV1_V2
                 MigrateCommand="{Binding ViewModel.AuthenticateMigrationCommand, Mode=OneWay, ElementName=ThisDialog}"
                 ProvideContinuationButton="False"
                 VaultFolder="{x:Bind VaultFolder, Mode=OneWay}"
@@ -73,48 +74,19 @@
                 <Button
                     HorizontalAlignment="Center"
                     Command="{x:Bind ViewModel.MigrateCommand, Mode=OneWay}"
-                    Content="{l:ResourceString Name=Migrate}"
+                    Content="{l:ResourceString Rid=Migrate}"
                     Style="{ThemeResource AccentButtonStyle}" />
             </StackPanel>
         </StackPanel>
 
         <StackPanel x:Name="CompletedView" Visibility="Collapsed">
             <InfoBar
-                Title="{l:ResourceString Name=VaultMigrated}"
+                Title="{l:ResourceString Rid=VaultMigrated}"
                 IsClosable="False"
                 IsOpen="True"
                 Severity="Success" />
         </StackPanel>
-        <StackPanel
-            x:Name="ErrorView"
-            Spacing="4"
-            Visibility="Collapsed">
-            <InfoBar
-                Title="{l:ResourceString Name=Error}"
-                IsClosable="False"
-                IsOpen="True"
-                Message="{l:ResourceString Name=ErrorOccurred}"
-                Severity="Error" />
-            <Expander IsExpanded="True">
-                <Expander.Header>
-                    <TextBlock Text="{l:ResourceString Name=ErrorDetails}" />
-                </Expander.Header>
-                <ScrollViewer
-                    Height="200"
-                    MaxWidth="600"
-                    Padding="4"
-                    HorizontalScrollBarVisibility="Auto"
-                    VerticalScrollBarVisibility="Auto">
-                    <TextBlock
-                        x:Name="ErrorMessage"
-                        HorizontalAlignment="Center"
-                        FontSize="12"
-                        HorizontalTextAlignment="Center"
-                        IsTextSelectionEnabled="True"
-                        Opacity="0.8"
-                        TextWrapping="Wrap" />
-                </ScrollViewer>
-            </Expander>
-        </StackPanel>
+
+        <uc:ErrorControl x:Name="ErrorView" Visibility="Collapsed" />
     </Grid>
 </ContentDialog>
diff --git a/src/Platforms/SecureFolderFS.Uno/Dialogs/MigrationDialog.xaml.cs b/src/Platforms/SecureFolderFS.Uno/Dialogs/MigrationDialog.xaml.cs
index 358ac31f1..629b59c9e 100644
--- a/src/Platforms/SecureFolderFS.Uno/Dialogs/MigrationDialog.xaml.cs
+++ b/src/Platforms/SecureFolderFS.Uno/Dialogs/MigrationDialog.xaml.cs
@@ -70,7 +70,7 @@ private void ViewModel_StateChanged(object? sender, EventArgs e)
                 {
                     MigrationView.Visibility = Visibility.Collapsed;
                     ErrorView.Visibility = Visibility.Visible;
-                    ErrorMessage.Text = args.Result.GetMessage();
+                    ErrorView.ExceptionMessage = args.Result.GetMessage();
                 }
             }
         }
diff --git a/src/Platforms/SecureFolderFS.Uno/Dialogs/PaymentDialog.xaml b/src/Platforms/SecureFolderFS.Uno/Dialogs/PaymentDialog.xaml
index 7aa63c760..58145b152 100644
--- a/src/Platforms/SecureFolderFS.Uno/Dialogs/PaymentDialog.xaml
+++ b/src/Platforms/SecureFolderFS.Uno/Dialogs/PaymentDialog.xaml
@@ -6,7 +6,7 @@
     xmlns:h="using:SecureFolderFS.Uno.Helpers"
     xmlns:l="using:SecureFolderFS.Uno.Localization"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    CloseButtonText="{l:ResourceString Name=Cancel}"
+    CloseButtonText="{l:ResourceString Rid=Cancel}"
     DefaultButton="Primary"
     IsPrimaryButtonEnabled="{x:Bind ViewModel.PrimaryButtonEnabled, Mode=OneWay}"
     PrimaryButtonText="{x:Bind ViewModel.PrimaryButtonText, Mode=OneWay}"
@@ -27,7 +27,7 @@
             <Image
                 Height="42"
                 VerticalAlignment="Center"
-                Source="ms-appx://SecureFolderFS.UI/Assets/AppAssets/AppIcon.png" />
+                Source="ms-appx://SecureFolderFS.UI/Assets/AppAssets/app_icon.png" />
             <TextBlock
                 VerticalAlignment="Center"
                 FontSize="22"
diff --git a/src/Platforms/SecureFolderFS.Uno/Dialogs/PreviewRecoveryDialog.xaml b/src/Platforms/SecureFolderFS.Uno/Dialogs/PreviewRecoveryDialog.xaml
index cc6e80a1b..07bf801b9 100644
--- a/src/Platforms/SecureFolderFS.Uno/Dialogs/PreviewRecoveryDialog.xaml
+++ b/src/Platforms/SecureFolderFS.Uno/Dialogs/PreviewRecoveryDialog.xaml
@@ -12,7 +12,7 @@
     Title="{x:Bind ViewModel.Title, Mode=OneWay}"
     HorizontalAlignment="Stretch"
     HorizontalContentAlignment="Stretch"
-    CloseButtonText="{l:ResourceString Name=Close}"
+    CloseButtonText="{l:ResourceString Rid=Close}"
     Closing="ContentDialog_Closing"
     DefaultButton="Primary"
     PrimaryButtonClick="ContentDialog_PrimaryButtonClick"
diff --git a/src/Platforms/SecureFolderFS.Uno/Dialogs/RecoveryDialog.xaml b/src/Platforms/SecureFolderFS.Uno/Dialogs/RecoveryDialog.xaml
index c662b143c..9099b5bf4 100644
--- a/src/Platforms/SecureFolderFS.Uno/Dialogs/RecoveryDialog.xaml
+++ b/src/Platforms/SecureFolderFS.Uno/Dialogs/RecoveryDialog.xaml
@@ -6,14 +6,14 @@
     xmlns:h="using:SecureFolderFS.Uno.Helpers"
     xmlns:l="using:SecureFolderFS.Uno.Localization"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    Title="{l:ResourceString Name=RecoverAccess}"
+    Title="{l:ResourceString Rid=RecoverAccess}"
     Width="600"
     HorizontalAlignment="Stretch"
     HorizontalContentAlignment="Stretch"
-    CloseButtonText="{l:ResourceString Name=Cancel}"
+    CloseButtonText="{l:ResourceString Rid=Cancel}"
     DefaultButton="Primary"
     PrimaryButtonClick="RecoveryDialog_PrimaryButtonClick"
-    PrimaryButtonText="{l:ResourceString Name=Recover}"
+    PrimaryButtonText="{l:ResourceString Rid=Recover}"
     RequestedTheme="{x:Bind h:UnoThemeHelper.Instance.CurrentElementTheme, Mode=OneWay}"
     Style="{ThemeResource DefaultContentDialogStyle}"
     mc:Ignorable="d">
@@ -24,7 +24,7 @@
     </ContentDialog.Resources>
 
     <StackPanel Spacing="8">
-        <TextBlock Text="{l:ResourceString Name=EnterRecoveryKey}" />
+        <TextBlock Text="{l:ResourceString Rid=EnterRecoveryKey}" />
         <TextBox
             AcceptsReturn="True"
             FontFamily="Consolas"
@@ -37,7 +37,7 @@
                     Margin="0,0,0,-4"
                     FontSize="16"
                     Glyph="&#xE77F;" />
-                <TextBlock Text="{l:ResourceString Name=Paste}" />
+                <TextBlock Text="{l:ResourceString Rid=Paste}" />
             </StackPanel>
         </Button>
     </StackPanel>
diff --git a/src/Platforms/SecureFolderFS.Uno/Dialogs/SettingsDialog.xaml b/src/Platforms/SecureFolderFS.Uno/Dialogs/SettingsDialog.xaml
index 3af30da6a..3ba01e842 100644
--- a/src/Platforms/SecureFolderFS.Uno/Dialogs/SettingsDialog.xaml
+++ b/src/Platforms/SecureFolderFS.Uno/Dialogs/SettingsDialog.xaml
@@ -31,8 +31,8 @@
 
                 <!--  General  -->
                 <NavigationViewItem
-                    AutomationProperties.Name="{l:ResourceString Name=SettingsGeneral}"
-                    Content="{l:ResourceString Name=SettingsGeneral}"
+                    AutomationProperties.Name="{l:ResourceString Rid=SettingsGeneral}"
+                    Content="{l:ResourceString Rid=SettingsGeneral}"
                     IsSelected="True"
                     Tag="0">
                     <NavigationViewItem.Icon>
@@ -42,8 +42,8 @@
 
                 <!--  Preferences  -->
                 <NavigationViewItem
-                    AutomationProperties.Name="{l:ResourceString Name=SettingsPreferences}"
-                    Content="{l:ResourceString Name=SettingsPreferences}"
+                    AutomationProperties.Name="{l:ResourceString Rid=SettingsPreferences}"
+                    Content="{l:ResourceString Rid=SettingsPreferences}"
                     Tag="1">
                     <NavigationViewItem.Icon>
                         <FontIcon Glyph="&#xE90F;" />
@@ -52,8 +52,8 @@
 
                 <!--  Privacy  -->
                 <NavigationViewItem
-                    AutomationProperties.Name="{l:ResourceString Name=SettingsPrivacy}"
-                    Content="{l:ResourceString Name=SettingsPrivacy}"
+                    AutomationProperties.Name="{l:ResourceString Rid=SettingsPrivacy}"
+                    Content="{l:ResourceString Rid=SettingsPrivacy}"
                     Tag="2">
                     <NavigationViewItem.Icon>
                         <FontIcon Glyph="&#xEA18;" />
@@ -63,8 +63,8 @@
                 <!--  About  -->
                 <NavigationViewItem
                     Margin="0,0,45,0"
-                    AutomationProperties.Name="{l:ResourceString Name=SettingsAbout}"
-                    Content="{l:ResourceString Name=SettingsAbout}"
+                    AutomationProperties.Name="{l:ResourceString Rid=SettingsAbout}"
+                    Content="{l:ResourceString Rid=SettingsAbout}"
                     Tag="3">
                     <NavigationViewItem.Icon>
                         <FontIcon Glyph="&#xE946;" />
@@ -85,7 +85,7 @@
             Padding="0"
             HorizontalAlignment="Right"
             VerticalAlignment="Top"
-            AutomationProperties.Name="{l:ResourceString Name=Close}"
+            AutomationProperties.Name="{l:ResourceString Rid=Close}"
             Background="Transparent"
             BorderThickness="0"
             Click="CloseButton_Click"
diff --git a/src/Platforms/SecureFolderFS.Uno/Dialogs/VaultWizardDialog.xaml.cs b/src/Platforms/SecureFolderFS.Uno/Dialogs/VaultWizardDialog.xaml.cs
index b87d463d8..f2a554fcc 100644
--- a/src/Platforms/SecureFolderFS.Uno/Dialogs/VaultWizardDialog.xaml.cs
+++ b/src/Platforms/SecureFolderFS.Uno/Dialogs/VaultWizardDialog.xaml.cs
@@ -60,7 +60,7 @@ private async Task NavigateAsync(BaseWizardViewModel viewModel)
 
             _previousViewModel = ViewModel.CurrentViewModel;
             ViewModel.CurrentViewModel = viewModel;
-            _ = Navigation.NavigateAsync(viewModel, (NavigationTransitionInfo?)null);
+            _ = Navigation.NavigateAsync(viewModel);
 
             var shouldShowBack = ViewModel.CurrentViewModel is CredentialsWizardViewModel && Navigation.ContentFrame.CanGoBack;
             await BackTitle.AnimateBackAsync(shouldShowBack);
@@ -88,7 +88,7 @@ private async void VaultWizardDialog_Loaded(object sender, RoutedEventArgs e)
                 return;
 
             ViewModel.NavigationRequested += ViewModel_NavigationRequested;
-            await NavigateAsync(new MainWizardViewModel());
+            await NavigateAsync(new MainWizardViewModel(ViewModel.VaultCollectionModel));
         }
 
         private async void ViewModel_NavigationRequested(object? sender, NavigationRequestedEventArgs e)
diff --git a/src/Platforms/SecureFolderFS.Uno/Extensions/UnoIocExtensions.cs b/src/Platforms/SecureFolderFS.Uno/Extensions/UnoIocExtensions.cs
index 4018c0826..69d28d0ac 100644
--- a/src/Platforms/SecureFolderFS.Uno/Extensions/UnoIocExtensions.cs
+++ b/src/Platforms/SecureFolderFS.Uno/Extensions/UnoIocExtensions.cs
@@ -13,6 +13,7 @@ public static IServiceCollection WithUnoServices(this IServiceCollection service
         {
             return serviceCollection
                 .AddSingleton<ISettingsService, SettingsService>(_ => new(new AppSettings(settingsFolder), new UserSettings(settingsFolder)))
+                .AddSingleton<IMediaService, UnoMediaService>()
                 .AddSingleton<IOverlayService, UnoDialogService>()
                 .AddSingleton<IStorageService, UnoStorageService>()
                 .AddSingleton<IClipboardService, UnoClipboardService>()
diff --git a/src/Platforms/SecureFolderFS.Uno/Extensions/VisualTreeHelperExtensions.cs b/src/Platforms/SecureFolderFS.Uno/Extensions/VisualTreeHelperExtensions.cs
new file mode 100644
index 000000000..1c5aaf60a
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Uno/Extensions/VisualTreeHelperExtensions.cs
@@ -0,0 +1,32 @@
+using System;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Media;
+
+namespace SecureFolderFS.Uno.Extensions
+{
+    public static class VisualTreeHelperExtensions
+    {
+        public static T? GetParent<T>(this DependencyObject obj)
+        {
+            return (T?)GetParent(obj, typeof(T));
+        }
+
+        public static object? GetParent(DependencyObject? obj, Type type)
+        {
+            while (true)
+            {
+                if (obj is null)
+                    return null;
+
+                var parent = VisualTreeHelper.GetParent(obj);
+                if (parent is null)
+                    return null;
+
+                if (type.IsInstanceOfType(parent))
+                    return parent;
+
+                obj = parent;
+            }
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Uno/Helpers/DriveMappingHelpers.cs b/src/Platforms/SecureFolderFS.Uno/Helpers/DriveMappingHelpers.cs
new file mode 100644
index 000000000..ca5b1503d
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Uno/Helpers/DriveMappingHelpers.cs
@@ -0,0 +1,136 @@
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using SecureFolderFS.Uno.PInvoke;
+
+namespace SecureFolderFS.Uno.Helpers
+{
+    public static class DriveMappingHelpers
+    {
+        public static string GetRemotePath(
+            string protocol,
+            string domain,
+            int port,
+            string name)
+        {
+            var sep = Path.DirectorySeparatorChar;
+            if (OperatingSystem.IsWindows())
+            {
+                return $"{sep}{sep}{domain}@{port}{sep}{name}{sep}";
+            }
+            else if (OperatingSystem.IsMacCatalyst())
+            {
+                return $"{protocol}:{sep}{sep}{domain}:{port}{sep}{name}";
+            }
+            else if (OperatingSystem.IsLinux())
+            {
+                return $"{protocol}:{sep}{sep}{domain}:{port}{sep}{name}";
+            }
+
+            throw new PlatformNotSupportedException();
+        }
+
+        public static async Task<string?> GetMountPathForRemotePathAsync(string remotePath)
+        {
+            if (OperatingSystem.IsWindows())
+            {
+                remotePath = remotePath.TrimEnd('\\');
+
+                var bufferSize = remotePath.Length + 1; // Null-terminated
+                var driveRemotePathBuilder = new StringBuilder(bufferSize);
+
+                foreach (var drive in DriveInfo.GetDrives().Select(item => $"{item.Name[0]}:"))
+                {
+                    if (UnsafeNative.WNetGetConnection(drive, driveRemotePathBuilder, ref bufferSize) == 0 && driveRemotePathBuilder.ToString() == remotePath)
+                        return drive;
+
+                    driveRemotePathBuilder.Clear();
+                }
+            }
+            else if (OperatingSystem.IsMacCatalyst())
+            {
+                var process = new Process()
+                {
+                    StartInfo = new ProcessStartInfo()
+                    {
+                        FileName = "mount",
+                        Arguments = "-t webdav",
+                        RedirectStandardOutput = true,
+                        RedirectStandardError = true,
+                        UseShellExecute = false,
+                        CreateNoWindow = true
+                    }
+                };
+
+                process.Start();
+                var output = await process.StandardOutput.ReadToEndAsync();
+                await process.WaitForExitAsync();
+
+                var lines = output.Split('\n');
+                foreach (var line in lines)
+                {
+                    if (line.Contains(remotePath))
+                    {
+                        var parts = line.Split(' ');
+                        if (parts.Length > 2)
+                            return parts[2]; // Assuming the mount path is the third part
+                    }
+                }
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Attempts to map a network drive. Doesn't throw on failure.
+        /// </summary>
+        public static async Task MapNetworkDriveAsync(
+            string mountPath,
+            string remotePath,
+            CancellationToken cancellationToken = default)
+        {
+            if (OperatingSystem.IsWindows())
+            {
+                var netResource = new NETRESOURCE()
+                {
+                    dwType = UnsafeNative.RESOURCETYPE_DISK,
+                    lpLocalName = mountPath,
+                    lpRemoteName = remotePath,
+                };
+
+                // WNetAddConnection2 doesn't return until it has either successfully established a connection or timed out,
+                // so it has to be run in another thread to prevent blocking the server from responding.
+                _ = Task.Run(() =>
+                {
+                    var error = UnsafeNative.WNetAddConnection2(netResource, null!, null!, UnsafeNative.CONNECT_TEMPORARY);
+                    _ = error;
+                }, cancellationToken);
+            }
+            else if (OperatingSystem.IsMacCatalyst())
+            {
+                var args = $"mount_webdav {remotePath} {mountPath}";
+                var process = new Process()
+                {
+                    StartInfo = new ProcessStartInfo()
+                    {
+                        FileName = "/bin/bash",
+                        Arguments = $"-c \"{args}\"",
+                        RedirectStandardOutput = true,
+                        RedirectStandardError = true,
+                        UseShellExecute = false,
+                        CreateNoWindow = true
+                    }
+                };
+
+                process.Start();
+                await process.WaitForExitAsync(cancellationToken);
+                var error = await process.StandardError.ReadToEndAsync(cancellationToken);
+                _ = error;
+            }
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Uno/Helpers/ImagingHelpers.cs b/src/Platforms/SecureFolderFS.Uno/Helpers/ImagingHelpers.cs
new file mode 100644
index 000000000..6888b45fe
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Uno/Helpers/ImagingHelpers.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.UI.Xaml.Media.Imaging;
+using SecureFolderFS.Shared.ComponentModel;
+using SecureFolderFS.Uno.AppModels;
+using Windows.Graphics.Imaging;
+using Windows.Storage.Streams;
+
+namespace SecureFolderFS.Uno.Helpers
+{
+    internal static class ImagingHelpers
+    {
+        public static async Task<IImage> GetBitmapFromStreamAsync(IRandomAccessStream winrtStream, string mimeType, CancellationToken cancellationToken)
+        {
+            using var winrtMemStream = new InMemoryRandomAccessStream();
+
+            var decoderGuid = MimeHelpers.MimeToBitmapDecoder(mimeType);
+            var encoderGuid = MimeHelpers.MimeToBitmapEncoder(mimeType);
+
+            var decoder = await BitmapDecoder.CreateAsync(decoderGuid, winrtStream);
+            var encoder = await BitmapEncoder.CreateAsync(encoderGuid, winrtMemStream);
+
+            var softwareBitmap = await decoder.GetSoftwareBitmapAsync().AsTask(cancellationToken);
+            encoder.SetSoftwareBitmap(softwareBitmap);
+
+            await encoder.FlushAsync().AsTask(cancellationToken);
+
+            var bitmap = new BitmapImage();
+            await bitmap.SetSourceAsync(winrtMemStream).AsTask(cancellationToken);
+
+            return new ImageBitmap(bitmap, softwareBitmap);
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Uno/Helpers/MimeHelpers.cs b/src/Platforms/SecureFolderFS.Uno/Helpers/MimeHelpers.cs
new file mode 100644
index 000000000..60d669ed5
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Uno/Helpers/MimeHelpers.cs
@@ -0,0 +1,42 @@
+using System;
+using Windows.Graphics.Imaging;
+
+namespace SecureFolderFS.Uno.Helpers
+{
+    internal static class MimeHelpers
+    {
+        public static Guid MimeToBitmapDecoder(string mimeType)
+        {
+            return mimeType switch
+            {
+                "image/bmp" => BitmapDecoder.BmpDecoderId,
+                "image/gif" => BitmapDecoder.GifDecoderId,
+                "image/heic" => BitmapDecoder.HeifDecoderId,
+                "image/vnd.microsoft.icon" => BitmapDecoder.IcoDecoderId,
+                "image/jpeg" => BitmapDecoder.JpegDecoderId,
+                "image/png" => BitmapDecoder.PngDecoderId,
+                "image/tiff" => BitmapDecoder.TiffDecoderId,
+                "image/webp" => BitmapDecoder.WebpDecoderId,
+
+                _ => BitmapDecoder.PngDecoderId
+            };
+        }
+
+        public static Guid MimeToBitmapEncoder(string mimeType)
+        {
+            return mimeType switch
+            {
+                "image/bmp" => BitmapEncoder.BmpEncoderId,
+                "image/gif" => BitmapEncoder.GifEncoderId,
+                "image/heic" => BitmapEncoder.HeifEncoderId,
+                "image/vnd.microsoft.icon" => BitmapEncoder.PngEncoderId,
+                "image/jpeg" => BitmapEncoder.JpegEncoderId,
+                "image/png" => BitmapEncoder.PngEncoderId,
+                "image/tiff" => BitmapEncoder.TiffEncoderId,
+                "image/webp" => BitmapEncoder.PngEncoderId,
+
+                _ => BitmapEncoder.PngEncoderId
+            };
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Uno/Localization/ResourceString.cs b/src/Platforms/SecureFolderFS.Uno/Localization/ResourceString.cs
index 5a59c51d8..b82e512fc 100644
--- a/src/Platforms/SecureFolderFS.Uno/Localization/ResourceString.cs
+++ b/src/Platforms/SecureFolderFS.Uno/Localization/ResourceString.cs
@@ -1,7 +1,6 @@
-using CommunityToolkit.Mvvm.DependencyInjection;
+using System.ComponentModel;
 using Microsoft.UI.Xaml.Markup;
 using SecureFolderFS.Sdk.Services;
-using System.ComponentModel;
 using SecureFolderFS.Shared;
 
 namespace SecureFolderFS.Uno.Localization
@@ -15,16 +14,16 @@ internal sealed class ResourceString : MarkupExtension
         /// <summary>
         /// Gets or sets the name identifier that is associated with a resource.
         /// </summary>
-        public string? Name { get; set; }
+        public string? Rid { get; set; }
 
         /// <inheritdoc/>
         protected override object ProvideValue()
         {
             LocalizationService ??= DI.OptionalService<ILocalizationService>();
             if (LocalizationService is null)
-                return $"{{{Name}}}";
+                return $"{{{Rid}}}";
 
-            return LocalizationService.TryGetString(Name ?? string.Empty) ?? $"{{{Name}}}";
+            return LocalizationService.TryGetString(Rid ?? string.Empty) ?? $"{{{Rid}}}";
         }
     }
 }
diff --git a/src/Platforms/SecureFolderFS.Uno/PInvoke/UnsafeNative.Imports.cs b/src/Platforms/SecureFolderFS.Uno/PInvoke/UnsafeNative.Imports.cs
new file mode 100644
index 000000000..c70f07322
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Uno/PInvoke/UnsafeNative.Imports.cs
@@ -0,0 +1,51 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Text;
+
+namespace SecureFolderFS.Uno.PInvoke
+{
+    internal static partial class UnsafeNative
+    {
+        public const int CONNECT_TEMPORARY = 4;
+        public const int RESOURCETYPE_DISK = 1;
+
+        [DllImport("Mpr.dll")]
+        public static extern int WNetAddConnection2(
+            [In] NETRESOURCE lpNetResource,
+            [In] string lpPassword,
+            [In] string lpUserName,
+            [In] uint dwFlags);
+
+        [DllImport("Mpr.dll")]
+        public static extern int WNetCancelConnection2(
+            [In] string lpName,
+            [In] uint dwFlags,
+            [In] bool fForce);
+
+        [DllImport("Mpr.dll")]
+        public static extern int WNetGetConnection(
+            [In] string lpLocalName,
+            [Out] StringBuilder lpRemoteName,
+            [In, Out] ref int lpnLength);
+
+        [DllImport("user32.dll")]
+        public static extern int SendMessageA(
+            [In] IntPtr hWnd,
+            [In] uint wMsg,
+            [In] IntPtr wParam,
+            [In] IntPtr lParam);
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    internal class NETRESOURCE
+    {
+        public uint dwScope;
+        public uint dwType;
+        public uint dwDisplayType;
+        public uint dwUsage;
+        public string lpLocalName = null!;
+        public string lpRemoteName = null!;
+        public string lpComment = null!;
+        public string lpProvider = null!;
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Uno/PInvoke/UnsafeNative.Wrappers.cs b/src/Platforms/SecureFolderFS.Uno/PInvoke/UnsafeNative.Wrappers.cs
new file mode 100644
index 000000000..d0facf504
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Uno/PInvoke/UnsafeNative.Wrappers.cs
@@ -0,0 +1,46 @@
+#if WINDOWS
+using System;
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
+using Vanara.PInvoke;
+using static Vanara.PInvoke.User32;
+
+namespace SecureFolderFS.Uno.PInvoke
+{
+    internal static partial class UnsafeNative
+    {
+        public static List<MONITORINFOEX> GetMonitorInfos()
+        {
+            var count = GetSystemMetrics(SystemMetric.SM_CMONITORS);
+
+            var infos = new List<MONITORINFOEX>(count);
+            var gcHandle = GCHandle.Alloc(infos);
+            var pGcHandle = GCHandle.ToIntPtr(gcHandle);
+
+            var success = EnumDisplayMonitors(default, null, MonitorEnumProc, pGcHandle);
+            gcHandle.Free();
+            if (!success)
+                Marshal.ThrowExceptionForHR(Marshal.GetLastWin32Error());
+
+            return infos;
+        }
+
+        private static bool MonitorEnumProc(IntPtr hMonitor, IntPtr hdcMonitor, PRECT lprcMonitor, IntPtr dwData)
+        {
+            var handle = GCHandle.FromIntPtr(dwData);
+            if (!lprcMonitor.IsEmpty && handle is { IsAllocated: true, Target: List<MONITORINFOEX> list })
+            {
+                var monitorInfo = new MONITORINFOEX()
+                {
+                    cbSize = (uint)Marshal.SizeOf<MONITORINFOEX>()
+                };
+
+                GetMonitorInfo(hMonitor, ref monitorInfo);
+                list.Add(monitorInfo);
+            }
+
+            return true;
+        }
+    }
+}
+#endif
diff --git a/src/Platforms/SecureFolderFS.Uno/Package.appxmanifest b/src/Platforms/SecureFolderFS.Uno/Package.appxmanifest
index af7239488..f6c316300 100644
--- a/src/Platforms/SecureFolderFS.Uno/Package.appxmanifest
+++ b/src/Platforms/SecureFolderFS.Uno/Package.appxmanifest
@@ -9,7 +9,7 @@
   <Identity
     Name="636fdcec-de3d-40c0-b25d-22edc942a779"
     Publisher="CN=d2dyno"
-    Version="0.6.2.0" />
+    Version="0.7.0.0" />
 
   <Properties>
     <DisplayName>SecureFolderFS</DisplayName>
diff --git a/src/Platforms/SecureFolderFS.Uno/Platforms/Desktop/AppModels/SkiaFuseDescriptor.cs b/src/Platforms/SecureFolderFS.Uno/Platforms/Desktop/AppModels/SkiaFuseDescriptor.cs
deleted file mode 100644
index 042bb8e88..000000000
--- a/src/Platforms/SecureFolderFS.Uno/Platforms/Desktop/AppModels/SkiaFuseDescriptor.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using SecureFolderFS.Core.FileSystem.Enums;
-using SecureFolderFS.Core.FUSE;
-using SecureFolderFS.Sdk.Models;
-using SecureFolderFS.Sdk.Results;
-using SecureFolderFS.Shared.ComponentModel;
-
-namespace SecureFolderFS.Uno.Platforms.Desktop.AppModels
-{
-    /// <inheritdoc cref="IFileSystemInfoModel"/>
-    internal sealed class SkiaFuseDescriptor : IFileSystemInfoModel
-    {
-        /// <inheritdoc/>
-        public string Name { get; } = Core.FUSE.Constants.FILE_SYSTEM_NAME;
-
-        /// <inheritdoc/>
-        public string Id { get; } = Core.Constants.FileSystemId.FS_FUSE;
-
-        /// <inheritdoc/>
-        public Task<IResult> GetStatusAsync(CancellationToken cancellationToken = default)
-        {
-            var result = FuseMountable.IsSupported();
-            if (result != FileSystemAvailabilityType.Available)
-            {
-                // TODO: Use localization strings
-                var message = result switch
-                {
-                    FileSystemAvailabilityType.ModuleUnavailable or
-                    FileSystemAvailabilityType.CoreUnavailable => "libfuse3 has not been detected. Please install libfuse3 to continue using SecureFolderFS.",
-                    _ => "SecureFolderFS cannot work with the installed libfuse version. Please install libfuse3."
-                };
-
-                return Task.FromResult<IResult>(new FileSystemResult(OperatingSystem.IsLinux(), new NotSupportedException(message)));
-            }
-
-            return Task.FromResult<IResult>(new FileSystemResult(OperatingSystem.IsLinux(), true));
-        }
-    }
-}
diff --git a/src/Platforms/SecureFolderFS.Uno/Platforms/Desktop/Helpers/SkiaLifecycleHelper.cs b/src/Platforms/SecureFolderFS.Uno/Platforms/Desktop/Helpers/SkiaLifecycleHelper.cs
index a77bd0621..1d852130b 100644
--- a/src/Platforms/SecureFolderFS.Uno/Platforms/Desktop/Helpers/SkiaLifecycleHelper.cs
+++ b/src/Platforms/SecureFolderFS.Uno/Platforms/Desktop/Helpers/SkiaLifecycleHelper.cs
@@ -49,6 +49,7 @@ protected override IServiceCollection ConfigureServices(IModifiableFolder settin
         {
             return base.ConfigureServices(settingsFolder)
                 //.AddSingleton<IPrinterService, WindowsPrinterService>()
+                .AddSingleton<ISystemService, SkiaSystemService>()
                 .AddSingleton<IVaultService, SkiaVaultService>()
                 .AddSingleton<IApplicationService, SkiaApplicationService>()
                 .AddSingleton<IVaultManagerService, SkiaVaultManagerService>()
diff --git a/src/Platforms/SecureFolderFS.Uno/Platforms/Desktop/ServiceImplementation/SkiaSystemService.cs b/src/Platforms/SecureFolderFS.Uno/Platforms/Desktop/ServiceImplementation/SkiaSystemService.cs
new file mode 100644
index 000000000..df69d0141
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Uno/Platforms/Desktop/ServiceImplementation/SkiaSystemService.cs
@@ -0,0 +1,18 @@
+using System;
+using SecureFolderFS.Sdk.Services;
+
+namespace SecureFolderFS.Uno.Platforms.Desktop.ServiceImplementation
+{
+    /// <inheritdoc cref="ISystemService"/>
+    internal sealed class SkiaSystemService : ISystemService
+    {
+        private EventHandler? _desktopLocked;
+
+        /// <inheritdoc/>
+        public event EventHandler? DesktopLocked // TODO: Implement on linux
+        {
+            add => _desktopLocked += value;
+            remove => _desktopLocked -= value;
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Uno/Platforms/Desktop/ServiceImplementation/SkiaVaultService.cs b/src/Platforms/SecureFolderFS.Uno/Platforms/Desktop/ServiceImplementation/SkiaVaultCredentialsService.cs
similarity index 78%
rename from src/Platforms/SecureFolderFS.Uno/Platforms/Desktop/ServiceImplementation/SkiaVaultService.cs
rename to src/Platforms/SecureFolderFS.Uno/Platforms/Desktop/ServiceImplementation/SkiaVaultCredentialsService.cs
index ce91ea4ef..989f363f5 100644
--- a/src/Platforms/SecureFolderFS.Uno/Platforms/Desktop/ServiceImplementation/SkiaVaultService.cs
+++ b/src/Platforms/SecureFolderFS.Uno/Platforms/Desktop/ServiceImplementation/SkiaVaultCredentialsService.cs
@@ -6,26 +6,14 @@
 using OwlCore.Storage;
 using SecureFolderFS.Core.VaultAccess;
 using SecureFolderFS.Sdk.AppModels;
-using SecureFolderFS.Sdk.Models;
-using SecureFolderFS.Sdk.Services;
 using SecureFolderFS.Sdk.ViewModels.Controls.Authentication;
 using SecureFolderFS.UI.ServiceImplementation;
-using SecureFolderFS.UI.ViewModels;
-using SecureFolderFS.Uno.AppModels;
-using SecureFolderFS.Uno.Platforms.Desktop.AppModels;
+using SecureFolderFS.UI.ViewModels.Authentication;
 
 namespace SecureFolderFS.Uno.Platforms.Desktop.ServiceImplementation
 {
-    /// <inheritdoc cref="IVaultService"/>
-    internal sealed class SkiaVaultService : BaseVaultService
+    internal sealed class SkiaVaultCredentialsService : BaseVaultCredentialsService
     {
-        /// <inheritdoc/>
-        public override IEnumerable<IFileSystemInfoModel> GetFileSystems()
-        {
-            yield return new SkiaFuseDescriptor();
-            yield return new WebDavDescriptor();
-        }
-
         /// <inheritdoc/>
         public override async IAsyncEnumerable<AuthenticationViewModel> GetLoginAsync(IFolder vaultFolder, [EnumeratorCancellation] CancellationToken cancellationToken = default)
         {
diff --git a/src/Platforms/SecureFolderFS.Uno/Platforms/Desktop/ServiceImplementation/SkiaVaultFileSystemService.cs b/src/Platforms/SecureFolderFS.Uno/Platforms/Desktop/ServiceImplementation/SkiaVaultFileSystemService.cs
new file mode 100644
index 000000000..ffa8c478c
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Uno/Platforms/Desktop/ServiceImplementation/SkiaVaultFileSystemService.cs
@@ -0,0 +1,25 @@
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+using SecureFolderFS.Core.FileSystem.AppModels;
+using SecureFolderFS.Core.WebDav.AppModels;
+using SecureFolderFS.Sdk.Models;
+using SecureFolderFS.Sdk.Services;
+using SecureFolderFS.Storage.VirtualFileSystem;
+using SecureFolderFS.UI.ServiceImplementation;
+
+namespace SecureFolderFS.Uno.Platforms.Desktop.ServiceImplementation
+{
+    /// <inheritdoc cref="IVaultFileSystemService"/>
+    internal sealed class SkiaVaultFileSystemService : BaseVaultFileSystemService
+    {
+        /// <inheritdoc/>
+        public override async IAsyncEnumerable<IFileSystem> GetFileSystemsAsync([EnumeratorCancellation] CancellationToken cancellationToken)
+        {
+            await Task.CompletedTask;
+            yield return new SkiaWebDavFileSystem();
+            yield return new FuseFileSystem();
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Uno/Platforms/Desktop/ServiceImplementation/SkiaVaultManagerService.cs b/src/Platforms/SecureFolderFS.Uno/Platforms/Desktop/ServiceImplementation/SkiaVaultManagerService.cs
deleted file mode 100644
index 26a3aa459..000000000
--- a/src/Platforms/SecureFolderFS.Uno/Platforms/Desktop/ServiceImplementation/SkiaVaultManagerService.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using SecureFolderFS.Core.FileSystem.AppModels;
-using SecureFolderFS.Core.FUSE;
-using SecureFolderFS.Core.FUSE.AppModels;
-using SecureFolderFS.Core.Routines.Operational;
-using SecureFolderFS.Core.WebDav;
-using SecureFolderFS.Core.WebDav.AppModels;
-using SecureFolderFS.Sdk.AppModels;
-using SecureFolderFS.Sdk.Models;
-using SecureFolderFS.Sdk.Services;
-using SecureFolderFS.Storage.Extensions;
-using SecureFolderFS.Storage.VirtualFileSystem;
-using SecureFolderFS.UI.Helpers;
-using SecureFolderFS.UI.ServiceImplementation;
-
-namespace SecureFolderFS.Uno.Platforms.Desktop.ServiceImplementation
-{
-    /// <inheritdoc cref="IVaultManagerService"/>
-    internal sealed class SkiaVaultManagerService : BaseVaultManagerService
-    {
-        /// <inheritdoc/>
-        public override async Task<IVFSRoot> CreateFileSystemAsync(IVaultModel vaultModel, IDisposable unlockContract, CancellationToken cancellationToken)
-        {
-            try
-            {
-                var contentFolder = await vaultModel.Folder.GetFolderByNameAsync(Core.Constants.Vault.Names.VAULT_CONTENT_FOLDERNAME, cancellationToken);
-                var routines = await VaultRoutines.CreateRoutinesAsync(vaultModel.Folder, StreamSerializer.Instance, cancellationToken);
-                var statisticsModel = new ConsolidatedStatisticsModel();
-                var storageRoutine = routines.BuildStorage();
-                var options = new FileSystemOptions()
-                {
-                    VolumeName = vaultModel.VaultName, // TODO: Format name to exclude illegal characters
-                    FileSystemId = await VaultHelpers.GetBestFileSystemAsync(cancellationToken),
-                    HealthStatistics = statisticsModel,
-                    FileSystemStatistics = statisticsModel
-                };
-
-                storageRoutine.SetUnlockContract(unlockContract);
-                var pathConverter = storageRoutine.CreateStorageComponents(contentFolder, options);
-                var specifics = storageRoutine.GetSpecifics(contentFolder, options);
-
-                var mountable = options.FileSystemId switch
-                {
-                    Core.Constants.FileSystemId.FS_FUSE => FuseMountable.CreateMountable(specifics),
-                    Core.Constants.FileSystemId.FS_WEBDAV => WebDavMountable.CreateMountable(specifics, pathConverter),
-                    _ => throw new ArgumentOutOfRangeException(nameof(options.FileSystemId))
-                };
-
-                return await mountable.MountAsync(options.FileSystemId switch
-                {
-                    Core.Constants.FileSystemId.FS_FUSE => new FuseMountOptions(),
-                    Core.Constants.FileSystemId.FS_WEBDAV => new WebDavMountOptions() { Domain = "localhost", PreferredPort = 4949 },
-                    _ => throw new ArgumentOutOfRangeException(nameof(options.FileSystemId))
-
-                }, cancellationToken);
-            }
-            catch (Exception ex)
-            {
-                // Make sure to dispose the unlock contract when failed
-                unlockContract.Dispose();
-
-                _ = ex;
-                throw;
-            }
-        }
-    }
-}
diff --git a/src/Platforms/SecureFolderFS.Uno/Platforms/Desktop/SkiaWebDavFileSystem.Linux.cs b/src/Platforms/SecureFolderFS.Uno/Platforms/Desktop/SkiaWebDavFileSystem.Linux.cs
new file mode 100644
index 000000000..17235c83b
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Uno/Platforms/Desktop/SkiaWebDavFileSystem.Linux.cs
@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Threading;
+using SecureFolderFS.Storage.VirtualFileSystem;
+using System.Threading.Tasks;
+using OwlCore.Storage.Memory;
+using SecureFolderFS.Core.WebDav;
+using SecureFolderFS.Uno.Helpers;
+using NWebDav.Server.Dispatching;
+
+namespace SecureFolderFS.Uno.Platforms.Desktop
+{
+    /// <inheritdoc cref="IFileSystem"/>
+    internal sealed partial class SkiaWebDavFileSystem
+    {
+#if HAS_UNO_SKIA && !__MACCATALYST__
+        /// <inheritdoc/>
+        protected override async Task<IVFSRoot> MountAsync(
+            FileSystemSpecifics specifics,
+            HttpListener listener,
+            WebDavOptions options,
+            IRequestDispatcher requestDispatcher,
+            CancellationToken cancellationToken)
+        {
+            var remotePath = DriveMappingHelpers.GetRemotePath(options.Protocol, options.Domain, options.Port, options.VolumeName);
+            var mountPath = await DriveMappingHelpers.GetMountPathForRemotePathAsync(remotePath);
+
+            var webDavWrapper = new WebDavWrapper(listener, requestDispatcher, mountPath);
+            webDavWrapper.StartFileSystem();
+
+            // TODO: Currently using MemoryFolder because the check in SystemFolder might sometimes fail
+            return new WebDavRootFolder(webDavWrapper, new MemoryFolder(remotePath, options.VolumeName), specifics);
+        }
+#endif
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Uno/Platforms/Desktop/SkiaWebDavFileSystem.cs b/src/Platforms/SecureFolderFS.Uno/Platforms/Desktop/SkiaWebDavFileSystem.cs
new file mode 100644
index 000000000..c94464857
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Uno/Platforms/Desktop/SkiaWebDavFileSystem.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Net;
+using System.Threading;
+using System.Threading.Tasks;
+using NWebDav.Server.Dispatching;
+using SecureFolderFS.Core.WebDav;
+using SecureFolderFS.Storage.VirtualFileSystem;
+
+namespace SecureFolderFS.Uno.Platforms.Desktop
+{
+    /// <inheritdoc cref="IFileSystem"/>
+    internal sealed partial class SkiaWebDavFileSystem : WebDavFileSystem
+    {
+#if WINDOWS
+        /// <inheritdoc/>
+        protected override Task<IVFSRoot> MountAsync(
+            FileSystemSpecifics specifics,
+            HttpListener listener,
+            WebDavOptions options,
+            IRequestDispatcher requestDispatcher,
+            CancellationToken cancellationToken)
+        {
+            throw new PlatformNotSupportedException();
+        }
+#endif
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Uno/Platforms/MacCatalyst/AppModels/MacOsFuseDescriptor.cs b/src/Platforms/SecureFolderFS.Uno/Platforms/MacCatalyst/AppModels/MacOsFuseDescriptor.cs
deleted file mode 100644
index e99052f91..000000000
--- a/src/Platforms/SecureFolderFS.Uno/Platforms/MacCatalyst/AppModels/MacOsFuseDescriptor.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using SecureFolderFS.Core.FileSystem.Enums;
-using SecureFolderFS.Core.FUSE;
-using SecureFolderFS.Sdk.Models;
-using SecureFolderFS.Sdk.Results;
-using SecureFolderFS.Shared.ComponentModel;
-
-namespace SecureFolderFS.Uno.Platforms.MacCatalyst.AppModels
-{
-    /// <inheritdoc cref="IFileSystemInfoModel"/>
-    internal sealed class MacOsFuseDescriptor : IFileSystemInfoModel
-    {
-        /// <inheritdoc/>
-        public string Name { get; } = Core.FUSE.Constants.FILE_SYSTEM_NAME;
-
-        /// <inheritdoc/>
-        public string Id { get; } = Core.Constants.FileSystemId.FS_FUSE;
-
-        /// <inheritdoc/>
-        public Task<IResult> GetStatusAsync(CancellationToken cancellationToken = default)
-        {
-            var result = FuseMountable.IsSupported();
-            if (result != FileSystemAvailabilityType.Available)
-            {
-                // TODO: Use localization strings
-                var message = result switch
-                {
-                    FileSystemAvailabilityType.ModuleUnavailable or
-                    FileSystemAvailabilityType.CoreUnavailable => "libfuse3 has not been detected. Please install libfuse3 to continue using SecureFolderFS.",
-                    _ => "SecureFolderFS cannot work with the installed libfuse version. Please install libfuse3."
-                };
-
-                return Task.FromResult<IResult>(new FileSystemResult(OperatingSystem.IsMacCatalyst(), new NotSupportedException(message)));
-            }
-
-            return Task.FromResult<IResult>(new FileSystemResult(OperatingSystem.IsMacCatalyst(), true));
-        }
-    }
-}
diff --git a/src/Platforms/SecureFolderFS.Uno/Platforms/MacCatalyst/Helpers/MacOsLifecycleHelper.cs b/src/Platforms/SecureFolderFS.Uno/Platforms/MacCatalyst/Helpers/MacOsLifecycleHelper.cs
index 45b6b1250..1e39c6cba 100644
--- a/src/Platforms/SecureFolderFS.Uno/Platforms/MacCatalyst/Helpers/MacOsLifecycleHelper.cs
+++ b/src/Platforms/SecureFolderFS.Uno/Platforms/MacCatalyst/Helpers/MacOsLifecycleHelper.cs
@@ -50,9 +50,10 @@ protected override IServiceCollection ConfigureServices(IModifiableFolder settin
         {
             return base.ConfigureServices(settingsFolder)
                 //.AddSingleton<IPrinterService, WindowsPrinterService>()
-                .AddSingleton<IVaultService, MacOsVaultService>()
+                .AddSingleton<ISystemService, MacOsSystemService>()
                 .AddSingleton<IApplicationService, MacOsApplicationService>()
-                .AddSingleton<IVaultManagerService, MacOsVaultManagerService>()
+                .AddSingleton<IVaultFileSystemService, MacOsVaultFileSystemService>()
+                .AddSingleton<IVaultCredentialsService, MacOsVaultCredentialsService>()
                 .AddSingleton<ITelemetryService, DebugTelemetryService>()
                 .AddSingleton<IIapService, DebugIapService>()
                 .AddSingleton<IUpdateService, DebugUpdateService>()
diff --git a/src/Platforms/SecureFolderFS.Uno/Platforms/MacCatalyst/Info.plist b/src/Platforms/SecureFolderFS.Uno/Platforms/MacCatalyst/Info.plist
index 1bb02ddcd..8759149bf 100644
--- a/src/Platforms/SecureFolderFS.Uno/Platforms/MacCatalyst/Info.plist
+++ b/src/Platforms/SecureFolderFS.Uno/Platforms/MacCatalyst/Info.plist
@@ -15,7 +15,9 @@
 			<string>UIInterfaceOrientationLandscapeRight</string>
 		</array>
 		<key>XSAppIconAssets</key>
-		<string>Assets.xcassets/icon.appiconset</string>
+		<string>Assets.xcassets/iconapp.appiconset</string>
+		<key>CFBundleDisplayName</key>
+		<string>SecureFolderFS</string>
 
 		<!--
 		Adjust this to your application's encryption usage.
diff --git a/src/Platforms/SecureFolderFS.Uno/Platforms/MacCatalyst/MacOsWebDavFileSystem.cs b/src/Platforms/SecureFolderFS.Uno/Platforms/MacCatalyst/MacOsWebDavFileSystem.cs
new file mode 100644
index 000000000..b5c08a692
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Uno/Platforms/MacCatalyst/MacOsWebDavFileSystem.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Net;
+using System.Threading;
+using System.Threading.Tasks;
+using NWebDav.Server.Dispatching;
+using SecureFolderFS.Core.FileSystem;
+using SecureFolderFS.Core.WebDav;
+using SecureFolderFS.Core.WebDav.AppModels;
+using SecureFolderFS.Storage.VirtualFileSystem;
+#if __MACCATALYST__
+using System.Diagnostics;
+using OwlCore.Storage.Memory;
+using SecureFolderFS.Uno.Helpers;
+#endif
+
+namespace SecureFolderFS.Uno.Platforms.MacCatalyst
+{
+    /// <inheritdoc cref="IFileSystem"/>
+    internal sealed partial class MacOsWebDavFileSystem : WebDavFileSystem
+    {
+        protected override async Task<IVFSRoot> MountAsync(
+            FileSystemSpecifics specifics,
+            HttpListener listener,
+            WebDavOptions options,
+            IRequestDispatcher requestDispatcher,
+            CancellationToken cancellationToken)
+        {
+#if __MACCATALYST__
+            var remotePath = DriveMappingHelpers.GetRemotePath(options.Protocol, options.Domain, options.Port, options.VolumeName);
+            var remoteUri = new Uri(remotePath);
+
+            // Mount WebDAV volume via AppleScript
+            Process.Start("/usr/bin/osascript", ["-e", $"mount volume \"{remoteUri.AbsoluteUri}\""]);
+            var mountPoint = $"/Volumes/{options.VolumeName}";
+            
+            // Create wrapper
+            var webDavWrapper = new WebDavWrapper(listener, requestDispatcher, mountPoint);
+            webDavWrapper.StartFileSystem();
+
+            Debug.WriteLine($"Mounted {remoteUri} on {mountPoint}.");
+            await Task.CompletedTask;
+            return new WebDavRootFolder(webDavWrapper, new MemoryFolder(mountPoint, options.VolumeName), specifics);
+#else
+            throw new PlatformNotSupportedException();
+#endif
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Uno/Platforms/MacCatalyst/ServiceImplementation/MacOsSystemService.cs b/src/Platforms/SecureFolderFS.Uno/Platforms/MacCatalyst/ServiceImplementation/MacOsSystemService.cs
new file mode 100644
index 000000000..9cb9bf42a
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Uno/Platforms/MacCatalyst/ServiceImplementation/MacOsSystemService.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Runtime.InteropServices;
+using Foundation;
+using SecureFolderFS.Sdk.Services;
+
+namespace SecureFolderFS.Uno.Platforms.MacCatalyst.ServiceImplementation
+{
+    /// <inheritdoc cref="ISystemService"/>
+    internal sealed class MacOsSystemService : ISystemService
+    {
+        private EventHandler? _desktopLocked;
+
+        /// <inheritdoc/>
+        public event EventHandler? DesktopLocked
+        {
+            add
+            {
+                _desktopLocked += value;
+                NSNotificationCenter.DefaultCenter.AddObserver((NSString)"com.apple.screenIsLocked",
+                    NSKeyValueObservingOptions.New, _ =>
+                    {
+                        _desktopLocked?.Invoke(this, EventArgs.Empty);
+                    });
+            }
+            remove
+            {
+                _desktopLocked -= value;
+                NSNotificationCenter.DefaultCenter.RemoveObserver((NSString)"com.apple.screenIsLocked");
+            }
+        }
+
+        [DllImport("/System/Library/Frameworks/CoreServices.framework/CoreServices")]
+        private static extern IntPtr CGSessionCopyCurrentDictionary();
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Uno/Platforms/MacCatalyst/ServiceImplementation/MacOsVaultService.cs b/src/Platforms/SecureFolderFS.Uno/Platforms/MacCatalyst/ServiceImplementation/MacOsVaultCredentialsService.cs
similarity index 82%
rename from src/Platforms/SecureFolderFS.Uno/Platforms/MacCatalyst/ServiceImplementation/MacOsVaultService.cs
rename to src/Platforms/SecureFolderFS.Uno/Platforms/MacCatalyst/ServiceImplementation/MacOsVaultCredentialsService.cs
index bb9707512..895ff294c 100644
--- a/src/Platforms/SecureFolderFS.Uno/Platforms/MacCatalyst/ServiceImplementation/MacOsVaultService.cs
+++ b/src/Platforms/SecureFolderFS.Uno/Platforms/MacCatalyst/ServiceImplementation/MacOsVaultCredentialsService.cs
@@ -4,26 +4,24 @@
 using System.Threading;
 using System.Threading.Tasks;
 using OwlCore.Storage;
+using SecureFolderFS.Core.Cryptography;
 using SecureFolderFS.Core.VaultAccess;
-using SecureFolderFS.Sdk.AppModels;
-using SecureFolderFS.Sdk.Models;
 using SecureFolderFS.Sdk.Services;
 using SecureFolderFS.Sdk.ViewModels.Controls.Authentication;
+using SecureFolderFS.Shared.Models;
 using SecureFolderFS.UI.ServiceImplementation;
-using SecureFolderFS.UI.ViewModels;
-using SecureFolderFS.Uno.AppModels;
-using SecureFolderFS.Uno.Platforms.MacCatalyst.AppModels;
+using SecureFolderFS.UI.ViewModels.Authentication;
 
 namespace SecureFolderFS.Uno.Platforms.MacCatalyst.ServiceImplementation
 {
     /// <inheritdoc cref="IVaultService"/>
-    internal sealed class MacOsVaultService : BaseVaultService
+    internal sealed class MacOsVaultCredentialsService : BaseVaultCredentialsService
     {
         /// <inheritdoc/>
-        public override IEnumerable<IFileSystemInfoModel> GetFileSystems()
+        public override IEnumerable<string> GetContentCiphers()
         {
-            yield return new MacOsFuseDescriptor();
-            yield return new WebDavDescriptor();
+            yield return Constants.CipherId.AES_GCM;
+            yield return Constants.CipherId.XCHACHA20_POLY1305;
         }
 
         /// <inheritdoc/>
diff --git a/src/Platforms/SecureFolderFS.Uno/Platforms/MacCatalyst/ServiceImplementation/MacOsVaultFileSystemService.cs b/src/Platforms/SecureFolderFS.Uno/Platforms/MacCatalyst/ServiceImplementation/MacOsVaultFileSystemService.cs
new file mode 100644
index 000000000..1e5d5dee2
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Uno/Platforms/MacCatalyst/ServiceImplementation/MacOsVaultFileSystemService.cs
@@ -0,0 +1,23 @@
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+using SecureFolderFS.Core.FUSE;
+using SecureFolderFS.Sdk.Services;
+using SecureFolderFS.Storage.VirtualFileSystem;
+using SecureFolderFS.UI.ServiceImplementation;
+
+namespace SecureFolderFS.Uno.Platforms.MacCatalyst.ServiceImplementation
+{
+    /// <inheritdoc cref="IVaultManagerService"/>
+    internal sealed class MacOsVaultFileSystemService : BaseVaultFileSystemService
+    {
+        /// <inheritdoc/>
+        public override async IAsyncEnumerable<IFileSystem> GetFileSystemsAsync([EnumeratorCancellation] CancellationToken cancellationToken)
+        {
+            await Task.CompletedTask;
+            yield return new FuseFileSystem();
+            yield return new MacOsWebDavFileSystem();
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Uno/Platforms/MacCatalyst/ServiceImplementation/MacOsVaultManagerService.cs b/src/Platforms/SecureFolderFS.Uno/Platforms/MacCatalyst/ServiceImplementation/MacOsVaultManagerService.cs
deleted file mode 100644
index 41bbd8ce2..000000000
--- a/src/Platforms/SecureFolderFS.Uno/Platforms/MacCatalyst/ServiceImplementation/MacOsVaultManagerService.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using SecureFolderFS.Core.FileSystem.AppModels;
-using SecureFolderFS.Core.FUSE;
-using SecureFolderFS.Core.FUSE.AppModels;
-using SecureFolderFS.Core.Routines.Operational;
-using SecureFolderFS.Core.WebDav;
-using SecureFolderFS.Core.WebDav.AppModels;
-using SecureFolderFS.Sdk.AppModels;
-using SecureFolderFS.Sdk.Models;
-using SecureFolderFS.Sdk.Services;
-using SecureFolderFS.Storage.Extensions;
-using SecureFolderFS.Storage.VirtualFileSystem;
-using SecureFolderFS.UI.Helpers;
-using SecureFolderFS.UI.ServiceImplementation;
-
-namespace SecureFolderFS.Uno.Platforms.MacCatalyst.ServiceImplementation
-{
-    /// <inheritdoc cref="IVaultManagerService"/>
-    internal sealed class MacOsVaultManagerService : BaseVaultManagerService
-    {
-        /// <inheritdoc/>
-        public override async Task<IVFSRoot> CreateFileSystemAsync(IVaultModel vaultModel, IDisposable unlockContract, CancellationToken cancellationToken)
-        {
-            try
-            {
-                var contentFolder = await vaultModel.Folder.GetFolderByNameAsync(Core.Constants.Vault.Names.VAULT_CONTENT_FOLDERNAME, cancellationToken);
-                var routines = await VaultRoutines.CreateRoutinesAsync(vaultModel.Folder, StreamSerializer.Instance, cancellationToken);
-                var statisticsModel = new ConsolidatedStatisticsModel();
-                var storageRoutine = routines.BuildStorage();
-                var options = new FileSystemOptions()
-                {
-                    VolumeName = vaultModel.VaultName, // TODO: Format name to exclude illegal characters
-                    FileSystemId = await VaultHelpers.GetBestFileSystemAsync(cancellationToken),
-                    HealthStatistics = statisticsModel,
-                    FileSystemStatistics = statisticsModel
-                };
-
-                storageRoutine.SetUnlockContract(unlockContract);
-                var pathConverter = storageRoutine.CreateStorageComponents(contentFolder, options);
-                var specifics = storageRoutine.GetSpecifics(contentFolder, options);
-
-                var mountable = options.FileSystemId switch
-                {
-                    Core.Constants.FileSystemId.FS_FUSE => FuseMountable.CreateMountable(specifics),
-                    Core.Constants.FileSystemId.FS_WEBDAV => WebDavMountable.CreateMountable(specifics, pathConverter),
-                    _ => throw new ArgumentOutOfRangeException(nameof(options.FileSystemId))
-                };
-
-                return await mountable.MountAsync(options.FileSystemId switch
-                {
-                    Core.Constants.FileSystemId.FS_FUSE => new FuseMountOptions(),
-                    Core.Constants.FileSystemId.FS_WEBDAV => new WebDavMountOptions() { Domain = "localhost", PreferredPort = 4949 },
-                    _ => throw new ArgumentOutOfRangeException(nameof(options.FileSystemId))
-
-                }, cancellationToken);
-            }
-            catch (Exception ex)
-            {
-                // Make sure to dispose the unlock contract when failed
-                unlockContract.Dispose();
-
-                _ = ex;
-                throw;
-            }
-        }
-    }
-}
diff --git a/src/Platforms/SecureFolderFS.Uno/Platforms/Windows/AppModels/WindowsDokanyDescriptor.cs b/src/Platforms/SecureFolderFS.Uno/Platforms/Windows/AppModels/WindowsDokanyDescriptor.cs
deleted file mode 100644
index 440f3b6bc..000000000
--- a/src/Platforms/SecureFolderFS.Uno/Platforms/Windows/AppModels/WindowsDokanyDescriptor.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using SecureFolderFS.Core.Dokany;
-using SecureFolderFS.Core.FileSystem.Enums;
-using SecureFolderFS.Sdk.Models;
-using SecureFolderFS.Sdk.Results;
-using SecureFolderFS.Shared.ComponentModel;
-
-namespace SecureFolderFS.Uno.Platforms.Windows.AppModels
-{
-    /// <inheritdoc cref="IFileSystemInfoModel"/>
-    internal sealed class WindowsDokanyDescriptor : IFileSystemInfoModel
-    {
-        /// <inheritdoc/>
-        public string Name { get; } = Core.Dokany.Constants.FILE_SYSTEM_NAME;
-
-        /// <inheritdoc/>
-        public string Id { get; } = Core.Constants.FileSystemId.FS_DOKAN;
-
-        /// <inheritdoc/>
-        public async Task<IResult> GetStatusAsync(CancellationToken cancellationToken = default)
-        {
-            var result = DokanyMountable.IsSupported();
-            if (result == FileSystemAvailabilityType.Available)
-                return new FileSystemResult(OperatingSystem.IsWindows(), true);
-
-            // TODO: Use localization strings
-            var message = result switch
-            {
-                FileSystemAvailabilityType.ModuleUnavailable or FileSystemAvailabilityType.CoreUnavailable => "Dokany has not been detected. Please install Dokany to continue using SecureFolderFS.",
-                FileSystemAvailabilityType.VersionTooLow => "The installed version of Dokany is outdated. Please update Dokany to the match requested version.",
-                FileSystemAvailabilityType.VersionTooHigh => "The installed version of Dokany is not compatible with SecureFolderFS version. Please install requested version of Dokany.",
-                _ => "SecureFolderFS cannot work with installed Dokany version. Please install requested version of Dokany."
-            };
-
-            await Task.CompletedTask;
-            return new FileSystemResult(OperatingSystem.IsWindows(), new NotSupportedException(message));
-        }
-    }
-}
diff --git a/src/Platforms/SecureFolderFS.Uno/Platforms/Windows/Helpers/WindowsBoundsManager.cs b/src/Platforms/SecureFolderFS.Uno/Platforms/Windows/Helpers/WindowsBoundsManager.cs
index ce9cbf2cd..b738f120b 100644
--- a/src/Platforms/SecureFolderFS.Uno/Platforms/Windows/Helpers/WindowsBoundsManager.cs
+++ b/src/Platforms/SecureFolderFS.Uno/Platforms/Windows/Helpers/WindowsBoundsManager.cs
@@ -1,7 +1,16 @@
+// Some parts of the following code were used from WinUIEx on the MIT License basis.
+// See the associated license file for more information.
+
 using System;
 using System.Collections.Generic;
+using System.IO;
+using System.Runtime.InteropServices;
 using Microsoft.UI.Xaml;
+using SecureFolderFS.Uno.PInvoke;
+using SecureFolderFS.Uno.Platforms.Windows.Extensions;
 using Vanara.PInvoke;
+using Windows.Storage;
+using static Vanara.PInvoke.User32;
 
 namespace SecureFolderFS.Uno.Platforms.Windows.Helpers
 {
@@ -11,6 +20,7 @@ internal sealed class WindowsBoundsManager : IDisposable
         private readonly Win32NativeWindowMessageReceiver _messageReceiver;
         private readonly Window _window;
         private readonly IntPtr _hWnd;
+        private bool _isRestoringWindowState;
 
         public int MinWidth { get; set; }
 
@@ -24,19 +34,146 @@ private WindowsBoundsManager(Window window)
             _messageReceiver.MessageReceived += MessageReceiver_MessageReceived;
         }
 
+        public bool LoadWindowState(string windowId)
+        {
+#if UNPACKAGED
+            // Unpackaged scenario is currently unsupported
+            return false;
+#endif
+            var dataContainer = GetDataContainer(false);
+            if (dataContainer is null)
+                return false;
+
+            var dataKey = $"WindowState_{windowId}";
+            byte[]? windowStateBuffer = null;
+
+            if (dataContainer.TryGetValue(dataKey, out var rawObj) && rawObj is string base64)
+                windowStateBuffer = Convert.FromBase64String(base64);
+
+            if (windowStateBuffer is null)
+                return false;
+
+            var monitors = UnsafeNative.GetMonitorInfos();
+            using var memoryStream = new MemoryStream(windowStateBuffer);
+            using var binaryReader = new BinaryReader(memoryStream);
+
+            // Read monitors count
+            var monitorCount = binaryReader.ReadInt32();
+            if (monitorCount != monitors.Count)
+                return false; // Amount of monitors changed
+
+            foreach (var item in monitors)
+            {
+                // Skip monitor name (important, do not remove)
+                _ = binaryReader.ReadString();
+
+                var left = binaryReader.ReadInt32();
+                var top = binaryReader.ReadInt32();
+                var right = binaryReader.ReadInt32();
+                var bottom = binaryReader.ReadInt32();
+
+                if (item.rcMonitor.Left != left ||
+                    item.rcMonitor.Top != top ||
+                    item.rcMonitor.Right != right ||
+                    item.rcMonitor.Bottom != bottom)
+                    return false; // Monitor layout changed
+            }
+
+            var sizeWindowPlacement = Marshal.SizeOf<WINDOWPLACEMENT>();
+            var windowPlacementBuffer = binaryReader.ReadBytes(sizeWindowPlacement);
+            var pWindowPlacementBuffer = Marshal.AllocHGlobal(sizeWindowPlacement);
+
+            Marshal.Copy(windowPlacementBuffer, 0, pWindowPlacementBuffer, sizeWindowPlacement);
+            var windowPlacement = Marshal.PtrToStructure<WINDOWPLACEMENT>(pWindowPlacementBuffer);
+            Marshal.FreeHGlobal(pWindowPlacementBuffer);
+
+            if (windowPlacement is { showCmd: ShowWindowCommand.SW_SHOWMINIMIZED, flags: WindowPlacementFlags.WPF_RESTORETOMAXIMIZED })
+                windowPlacement.showCmd = ShowWindowCommand.SW_MAXIMIZE;
+            else if (windowPlacement.showCmd != ShowWindowCommand.SW_MAXIMIZE)
+                windowPlacement.showCmd = ShowWindowCommand.SW_NORMAL;
+
+            _isRestoringWindowState = true;
+            _ = SetWindowPlacement(_window.GetWindowHandle(), ref windowPlacement);
+            _isRestoringWindowState = false;
+
+            return true;
+        }
+
+        public void SaveWindowState(string windowId)
+        {
+            var dataContainer = GetDataContainer(true);
+            if (dataContainer is null)
+                return;
+
+            using var memoryStream = new MemoryStream();
+            using var binaryWriter = new BinaryWriter(memoryStream);
+            var monitors = UnsafeNative.GetMonitorInfos();
+
+            binaryWriter.Write(monitors.Count);
+            foreach (var item in monitors)
+            {
+                binaryWriter.Write(item.szDevice);
+                binaryWriter.Write(item.rcMonitor.Left);
+                binaryWriter.Write(item.rcMonitor.Top);
+                binaryWriter.Write(item.rcMonitor.Right);
+                binaryWriter.Write(item.rcMonitor.Bottom);
+            }
+
+            var windowPlacement = new WINDOWPLACEMENT();
+            _ = GetWindowPlacement(_window.GetWindowHandle(), ref windowPlacement);
+
+            var sizeWindowPlacement = Marshal.SizeOf<WINDOWPLACEMENT>();
+            var pWindowPlacementBuffer = Marshal.AllocHGlobal(sizeWindowPlacement);
+            Marshal.StructureToPtr(windowPlacement, pWindowPlacementBuffer, false);
+            
+            var windowPlacementBuffer = new byte[sizeWindowPlacement];
+            Marshal.Copy(pWindowPlacementBuffer, windowPlacementBuffer, 0, sizeWindowPlacement);
+            Marshal.FreeHGlobal(pWindowPlacementBuffer);
+
+            binaryWriter.Write(windowPlacementBuffer);
+            binaryWriter.Flush();
+            dataContainer[$"WindowState_{windowId}"] = Convert.ToBase64String(memoryStream.ToArray());
+        }
+
+        private IDictionary<string, object>? GetDataContainer(bool createIfMissing)
+        {
+            try
+            {
+                if (ApplicationData.Current.LocalSettings.Containers.TryGetValue(UI.Constants.DATA_CONTAINER_ID, out var container))
+                    return container.Values;
+                else if (createIfMissing)
+                    return ApplicationData.Current.LocalSettings.CreateContainer(UI.Constants.DATA_CONTAINER_ID, ApplicationDataCreateDisposition.Always).Values;
+            }
+            catch (Exception) { }
+
+            return null;
+        }
+
         private void MessageReceiver_MessageReceived(object? sender, WindowMessageEventArgs e)
         {
-            switch ((User32.WindowMessage)e.NativeMessage.uMsg)
+            switch ((WindowMessage)e.NativeMessage.uMsg)
             {
-                case User32.WindowMessage.WM_GETMINMAXINFO:
+                case WindowMessage.WM_GETMINMAXINFO:
                 unsafe
                 {
-                    var rect2 = (User32.MINMAXINFO*)e.NativeMessage.lparam;
-                    var currentDpi = User32.GetDpiForWindow(_hWnd);
+                    if (_isRestoringWindowState)
+                        break;
+
+                    var rect2 = (MINMAXINFO*)e.NativeMessage.lparam;
+                    var currentDpi = GetDpiForWindow(_hWnd);
 
                     // Restrict min-size
                     rect2->minTrackSize.cx = (int)Math.Max(MinWidth * (currentDpi / 96f), rect2->minTrackSize.cx);
                     rect2->minTrackSize.cy = (int)Math.Max(MinHeight * (currentDpi / 96f), rect2->minTrackSize.cy);
+
+                    break;
+                }
+
+                case WindowMessage.WM_DPICHANGED:
+                {
+                    if (_isRestoringWindowState)
+                        e.Handled = true;
+
                     break;
                 }
             }
diff --git a/src/Platforms/SecureFolderFS.Uno/Platforms/Windows/Helpers/WindowsLifecycleHelper.cs b/src/Platforms/SecureFolderFS.Uno/Platforms/Windows/Helpers/WindowsLifecycleHelper.cs
index a7a61b88a..cf2348598 100644
--- a/src/Platforms/SecureFolderFS.Uno/Platforms/Windows/Helpers/WindowsLifecycleHelper.cs
+++ b/src/Platforms/SecureFolderFS.Uno/Platforms/Windows/Helpers/WindowsLifecycleHelper.cs
@@ -26,7 +26,7 @@ internal sealed class WindowsLifecycleHelper : BaseLifecycleHelper
     {
         /// <inheritdoc/>
         protected override string AppDirectory { get; } =
-#if UNPACKAGED
+#if WINAPPSDK_PACKAGED
             Directory.GetCurrentDirectory();
 #else
             ApplicationData.Current.LocalFolder.Path;
@@ -69,10 +69,11 @@ public override void LogExceptionToFile(Exception? ex)
         protected override IServiceCollection ConfigureServices(IModifiableFolder settingsFolder)
         {
             return base.ConfigureServices(settingsFolder)
+                .AddSingleton<ISystemService, WindowsSystemService>()
                 .AddSingleton<IPrinterService, WindowsPrinterService>()
-                .AddSingleton<IVaultService, WindowsVaultService>()
-                .AddSingleton<IVaultManagerService, WindowsVaultManagerService>()
                 .AddSingleton<IApplicationService, WindowsApplicationService>()
+                .AddSingleton<IVaultFileSystemService, WindowsVaultFileSystemService>()
+                .AddSingleton<IVaultCredentialsService, WindowsVaultCredentialsService>()
 
                 // ITelemetryService
 #if DEBUG
diff --git a/src/Platforms/SecureFolderFS.Uno/Platforms/Windows/ServiceImplementation/WindowsApplicationService.cs b/src/Platforms/SecureFolderFS.Uno/Platforms/Windows/ServiceImplementation/WindowsApplicationService.cs
index 4c3e7c587..ae4c932ab 100644
--- a/src/Platforms/SecureFolderFS.Uno/Platforms/Windows/ServiceImplementation/WindowsApplicationService.cs
+++ b/src/Platforms/SecureFolderFS.Uno/Platforms/Windows/ServiceImplementation/WindowsApplicationService.cs
@@ -2,7 +2,6 @@
 using System.Threading.Tasks;
 using SecureFolderFS.Sdk.Services;
 using SecureFolderFS.UI.ServiceImplementation;
-using Windows.ApplicationModel;
 using Windows.System;
 
 namespace SecureFolderFS.Uno.Platforms.Windows.ServiceImplementation
@@ -21,16 +20,19 @@ public override Version AppVersion
         {
             get
             {
-                var packageVersion = Package.Current.Id.Version;
+#if UNPACKAGED
+                return base.AppVersion;
+#else
+                var packageVersion = global::Windows.ApplicationModel.Package.Current.Id.Version;
                 return new Version(packageVersion.Major, packageVersion.Minor, packageVersion.Build, packageVersion.Revision);
+#endif
             }
         }
 
         /// <inheritdoc/>
         public override string GetSystemVersion()
         {
-            var osInfo = Environment.OSVersion;
-            return $"Windows {osInfo.VersionString}";
+            return Environment.OSVersion.VersionString;
         }
 
         /// <inheritdoc/>
diff --git a/src/Platforms/SecureFolderFS.Uno/Platforms/Windows/ServiceImplementation/WindowsSystemService.cs b/src/Platforms/SecureFolderFS.Uno/Platforms/Windows/ServiceImplementation/WindowsSystemService.cs
new file mode 100644
index 000000000..ac87a0925
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Uno/Platforms/Windows/ServiceImplementation/WindowsSystemService.cs
@@ -0,0 +1,43 @@
+using System;
+using Microsoft.Win32;
+using SecureFolderFS.Sdk.Services;
+
+namespace SecureFolderFS.Uno.Platforms.Windows.ServiceImplementation
+{
+    /// <inheritdoc cref="ISystemService"/>
+    internal sealed class WindowsSystemService : ISystemService
+    {
+        private EventHandler? _desktopLocked;
+
+        /// <inheritdoc/>
+        public event EventHandler? DesktopLocked
+        {
+            add
+            {
+                if (_desktopLocked is null)
+                    SystemEvents.SessionSwitch += SystemEvents_SessionSwitch;
+
+                _desktopLocked += value;
+            }
+            remove
+            {
+                _desktopLocked -= value;
+                if (_desktopLocked is null)
+                    SystemEvents.SessionSwitch -= SystemEvents_SessionSwitch;
+            }
+        }
+
+        private void SystemEvents_SessionSwitch(object sender, SessionSwitchEventArgs e)
+        {
+            switch (e.Reason)
+            {
+                case SessionSwitchReason.SessionLock:
+                case SessionSwitchReason.SessionLogoff:
+                    _desktopLocked?.Invoke(sender, e);
+                    break;
+
+                default: return;
+            }
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Uno/Platforms/Windows/ServiceImplementation/WindowsVaultService.cs b/src/Platforms/SecureFolderFS.Uno/Platforms/Windows/ServiceImplementation/WindowsVaultCredentialsService.cs
similarity index 84%
rename from src/Platforms/SecureFolderFS.Uno/Platforms/Windows/ServiceImplementation/WindowsVaultService.cs
rename to src/Platforms/SecureFolderFS.Uno/Platforms/Windows/ServiceImplementation/WindowsVaultCredentialsService.cs
index 2acef3c70..b3a6e3f62 100644
--- a/src/Platforms/SecureFolderFS.Uno/Platforms/Windows/ServiceImplementation/WindowsVaultService.cs
+++ b/src/Platforms/SecureFolderFS.Uno/Platforms/Windows/ServiceImplementation/WindowsVaultCredentialsService.cs
@@ -4,29 +4,19 @@
 using System.Threading;
 using OwlCore.Storage;
 using SecureFolderFS.Core.VaultAccess;
-using SecureFolderFS.Sdk.AppModels;
-using SecureFolderFS.Sdk.Models;
 using SecureFolderFS.Sdk.Services;
 using SecureFolderFS.Sdk.ViewModels.Controls.Authentication;
+using SecureFolderFS.Shared.Models;
 using SecureFolderFS.UI.ServiceImplementation;
-using SecureFolderFS.UI.ViewModels;
-using SecureFolderFS.Uno.AppModels;
-using SecureFolderFS.Uno.Platforms.Windows.AppModels;
+using SecureFolderFS.UI.ViewModels.Authentication;
 using SecureFolderFS.Uno.ViewModels;
 using Windows.Security.Credentials;
 
 namespace SecureFolderFS.Uno.Platforms.Windows.ServiceImplementation
 {
     /// <inheritdoc cref="IVaultService"/>
-    internal sealed class WindowsVaultService : BaseVaultService
+    internal sealed class WindowsVaultCredentialsService : BaseVaultCredentialsService
     {
-        /// <inheritdoc/>
-        public override IEnumerable<IFileSystemInfoModel> GetFileSystems()
-        {
-            yield return new WindowsDokanyDescriptor();
-            yield return new WebDavDescriptor();
-        }
-
         /// <inheritdoc/>
         public override async IAsyncEnumerable<AuthenticationViewModel> GetLoginAsync(IFolder vaultFolder, [EnumeratorCancellation] CancellationToken cancellationToken = default)
         {
diff --git a/src/Platforms/SecureFolderFS.Uno/Platforms/Windows/ServiceImplementation/WindowsVaultFileSystemService.cs b/src/Platforms/SecureFolderFS.Uno/Platforms/Windows/ServiceImplementation/WindowsVaultFileSystemService.cs
new file mode 100644
index 000000000..686ea7b4f
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Uno/Platforms/Windows/ServiceImplementation/WindowsVaultFileSystemService.cs
@@ -0,0 +1,23 @@
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+using SecureFolderFS.Core.Dokany;
+using SecureFolderFS.Sdk.Services;
+using SecureFolderFS.Storage.VirtualFileSystem;
+using SecureFolderFS.UI.ServiceImplementation;
+
+namespace SecureFolderFS.Uno.Platforms.Windows.ServiceImplementation
+{
+    /// <inheritdoc cref="IVaultManagerService"/>
+    public sealed class WindowsVaultFileSystemService : BaseVaultFileSystemService
+    {
+        /// <inheritdoc/>
+        public override async IAsyncEnumerable<IFileSystem> GetFileSystemsAsync([EnumeratorCancellation] CancellationToken cancellationToken)
+        {
+            await Task.CompletedTask;
+            yield return new WindowsWebDavFileSystem();
+            yield return new DokanyFileSystem();
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Uno/Platforms/Windows/ServiceImplementation/WindowsVaultManagerService.cs b/src/Platforms/SecureFolderFS.Uno/Platforms/Windows/ServiceImplementation/WindowsVaultManagerService.cs
deleted file mode 100644
index 372dbdada..000000000
--- a/src/Platforms/SecureFolderFS.Uno/Platforms/Windows/ServiceImplementation/WindowsVaultManagerService.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using SecureFolderFS.Core.Dokany;
-using SecureFolderFS.Core.FileSystem.AppModels;
-using SecureFolderFS.Core.Routines.Operational;
-using SecureFolderFS.Core.WebDav;
-using SecureFolderFS.Core.WebDav.AppModels;
-using SecureFolderFS.Sdk.AppModels;
-using SecureFolderFS.Sdk.Models;
-using SecureFolderFS.Sdk.Services;
-using SecureFolderFS.Storage.Extensions;
-using SecureFolderFS.Storage.VirtualFileSystem;
-using SecureFolderFS.UI.Helpers;
-using SecureFolderFS.UI.ServiceImplementation;
-
-namespace SecureFolderFS.Uno.Platforms.Windows.ServiceImplementation
-{
-    /// <inheritdoc cref="IVaultManagerService"/>
-    public sealed class WindowsVaultManagerService : BaseVaultManagerService
-    {
-        /// <inheritdoc/>
-        public override async Task<IVFSRoot> CreateFileSystemAsync(IVaultModel vaultModel, IDisposable unlockContract, CancellationToken cancellationToken)
-        {
-            try
-            {
-                var contentFolder = await vaultModel.Folder.GetFolderByNameAsync(Core.Constants.Vault.Names.VAULT_CONTENT_FOLDERNAME, cancellationToken);
-                var routines = await VaultRoutines.CreateRoutinesAsync(vaultModel.Folder, StreamSerializer.Instance, cancellationToken);
-                var statisticsModel = new ConsolidatedStatisticsModel();
-                var storageRoutine = routines.BuildStorage();
-                var options = new FileSystemOptions()
-                {
-                    VolumeName = vaultModel.VaultName, // TODO: Format name to exclude illegal characters
-                    FileSystemId = await VaultHelpers.GetBestFileSystemAsync(cancellationToken),
-                    HealthStatistics = statisticsModel,
-                    FileSystemStatistics = statisticsModel
-                };
-
-                storageRoutine.SetUnlockContract(unlockContract);
-                var pathConverter = storageRoutine.CreateStorageComponents(contentFolder, options);
-                var specifics = storageRoutine.GetSpecifics(contentFolder, options);
-
-                var mountable = options.FileSystemId switch
-                {
-                    Core.Constants.FileSystemId.FS_DOKAN => DokanyMountable.CreateMountable(specifics),
-                    Core.Constants.FileSystemId.FS_WEBDAV => WebDavMountable.CreateMountable(specifics, pathConverter),
-                    _ => throw new ArgumentOutOfRangeException(nameof(options.FileSystemId))
-                };
-
-                return await mountable.MountAsync(options.FileSystemId switch
-                {
-                    Core.Constants.FileSystemId.FS_DOKAN => new DokanyMountOptions(),
-                    Core.Constants.FileSystemId.FS_WEBDAV => new WebDavMountOptions() { Domain = "localhost", PreferredPort = 4949 },
-                    _ => throw new ArgumentOutOfRangeException(nameof(options.FileSystemId))
-
-                }, cancellationToken);
-            }
-            catch (Exception ex)
-            {
-                // Make sure to dispose the unlock contract when failed
-                unlockContract.Dispose();
-
-                _ = ex;
-                throw;
-            }
-        }
-    }
-}
diff --git a/src/Platforms/SecureFolderFS.Uno/Platforms/Windows/WindowsWebDavFileSystem.cs b/src/Platforms/SecureFolderFS.Uno/Platforms/Windows/WindowsWebDavFileSystem.cs
new file mode 100644
index 000000000..a3b80b984
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Uno/Platforms/Windows/WindowsWebDavFileSystem.cs
@@ -0,0 +1,45 @@
+using System.IO;
+using System.Net;
+using System.Threading;
+using System.Threading.Tasks;
+using NWebDav.Server.Dispatching;
+using OwlCore.Storage.Memory;
+using SecureFolderFS.Core.FileSystem;
+using SecureFolderFS.Core.FileSystem.Helpers.Paths;
+using SecureFolderFS.Core.WebDav;
+using SecureFolderFS.Core.WebDav.AppModels;
+using SecureFolderFS.Storage.VirtualFileSystem;
+using SecureFolderFS.Uno.Helpers;
+
+namespace SecureFolderFS.Uno.Platforms.Windows
+{
+    /// <inheritdoc cref="IFileSystem"/>
+    public sealed class WindowsWebDavFileSystem : WebDavFileSystem
+    {
+        /// <inheritdoc/>
+        protected override async Task<IVFSRoot> MountAsync(
+            FileSystemSpecifics specifics,
+            HttpListener listener,
+            WebDavOptions options,
+            IRequestDispatcher requestDispatcher,
+            CancellationToken cancellationToken)
+        {
+            var remotePath = DriveMappingHelpers.GetRemotePath(options.Protocol, options.Domain, options.Port, options.VolumeName);
+            var mountPath = await DriveMappingHelpers.GetMountPathForRemotePathAsync(remotePath);
+            if (mountPath is null)
+            {
+                mountPath = PathHelpers.GetFreeMountPath(options.VolumeName);
+                if (mountPath is null)
+                    throw new IOException("No free mount points found.");
+
+                await DriveMappingHelpers.MapNetworkDriveAsync(mountPath, remotePath, cancellationToken);
+            }
+
+            var webDavWrapper = new WebDavWrapper(listener, requestDispatcher, mountPath);
+            webDavWrapper.StartFileSystem();
+
+            // TODO: Currently using MemoryFolder because the check in SystemFolder might sometimes fail
+            return new WindowsWebDavVFSRoot(webDavWrapper, new MemoryFolder(remotePath, options.VolumeName), specifics);
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Uno/Platforms/Windows/WindowsWebDavVFSRoot.cs b/src/Platforms/SecureFolderFS.Uno/Platforms/Windows/WindowsWebDavVFSRoot.cs
new file mode 100644
index 000000000..6ebe5379a
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Uno/Platforms/Windows/WindowsWebDavVFSRoot.cs
@@ -0,0 +1,113 @@
+using System.Threading.Tasks;
+using OwlCore.Storage;
+using SecureFolderFS.Core.FileSystem;
+using SecureFolderFS.Core.WebDav;
+using SecureFolderFS.Storage.VirtualFileSystem;
+
+#if WINDOWS
+using System;
+using System.Diagnostics;
+using System.IO;
+using SecureFolderFS.Uno.PInvoke;
+#endif
+
+namespace SecureFolderFS.Uno.Platforms.Windows
+{
+    /// <inheritdoc cref="IVFSRoot"/>
+    internal sealed class WindowsWebDavVFSRoot : VFSRoot
+    {
+        private const uint WM_CLOSE = 0x0010;
+
+        private readonly WebDavWrapper _webDavWrapper;
+        private bool _disposed;
+
+        /// <inheritdoc/>
+        public override string FileSystemName { get; } = Core.WebDav.Constants.FileSystem.FS_NAME;
+
+        public WindowsWebDavVFSRoot(WebDavWrapper webDavWrapper, IFolder storageRoot, FileSystemSpecifics specifics)
+            : base(storageRoot, specifics)
+        {
+            _webDavWrapper = webDavWrapper;
+        }
+
+        /// <inheritdoc/>
+        public override async ValueTask DisposeAsync()
+        {
+            if (_disposed)
+                return;
+
+            _disposed = await _webDavWrapper.CloseFileSystemAsync();
+            if (_disposed)
+            {
+                await base.DisposeAsync();
+                FileSystemManager.Instance.FileSystems.Remove(this);
+                await CloseExplorerShellAsync(storageRoot.Id);
+            }
+        }
+
+        private static async Task CloseExplorerShellAsync(string path)
+        {
+#if WINDOWS
+            try
+            {
+                var shellWindows = new SHDocVw.ShellWindows();
+                foreach (SHDocVw.InternetExplorer ie in shellWindows)
+                {
+                    var formattedName = Path.GetFileNameWithoutExtension(ie.FullName);
+                    if (!formattedName.Equals("explorer", StringComparison.OrdinalIgnoreCase))
+                        continue;
+
+                    var url = ie.LocationURL.Replace('/', Path.DirectorySeparatorChar);
+                    var formattedUrl = Uri.UnescapeDataString(url);
+                    if (!formattedUrl.Contains(path))
+                        continue;
+
+                    var windowClosed = false;
+                    try
+                    {
+                        // Attach closing event
+                        ie.WindowClosing += Window_Closing;
+
+                        // Try to quit first
+                        ie.Quit();
+
+                        // Wait a short delay
+                        await Task.Delay(100);
+
+                        if (!windowClosed)
+                        {
+                            // Retry with WM_CLOSE
+                            var hWnd = new IntPtr(ie.HWND);
+                            _ = UnsafeNative.SendMessageA(hWnd, WM_CLOSE, IntPtr.Zero, IntPtr.Zero);
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        // May sometimes throw when trying to access invalid window handle
+                        _ = ex;
+                    }
+                    finally
+                    {
+                        // Detach to avoid leaking memory
+                        ie.WindowClosing -= Window_Closing;
+                    }
+                    continue;
+
+                    void Window_Closing(bool isChildWindow, ref bool cancel)
+                    {
+                        windowClosed = true;
+                    }
+                }
+            }
+            catch (Exception)
+            {
+                // Something went terribly wrong
+                Debugger.Break();
+            }
+#else
+            _ = path;
+            await Task.CompletedTask;
+#endif
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Uno/Properties/launchSettings.json b/src/Platforms/SecureFolderFS.Uno/Properties/launchSettings.json
index 753f3a101..7cda04ed2 100644
--- a/src/Platforms/SecureFolderFS.Uno/Properties/launchSettings.json
+++ b/src/Platforms/SecureFolderFS.Uno/Properties/launchSettings.json
@@ -23,7 +23,7 @@
     },
     "SecureFolderFS (Desktop WSL2)": {
       "commandName": "WSL2",
-      "commandLineArgs": "{ProjectDir}/bin/Debug/net8.0-desktop/SecureFolderFS.Uno.dll",
+      "commandLineArgs": "{ProjectDir}/bin/Debug/net9.0-desktop/SecureFolderFS.Uno.dll",
       "distributionName": "",
       "compatibleTargetFramework": "desktop",
       "environmentVariables": {
diff --git a/src/Platforms/SecureFolderFS.Uno/ResourceDictionaries/ImageResources.xaml b/src/Platforms/SecureFolderFS.Uno/ResourceDictionaries/ImageResources.xaml
index 1647efddc..2fe2ebc69 100644
--- a/src/Platforms/SecureFolderFS.Uno/ResourceDictionaries/ImageResources.xaml
+++ b/src/Platforms/SecureFolderFS.Uno/ResourceDictionaries/ImageResources.xaml
@@ -3,12 +3,12 @@
     <ResourceDictionary.ThemeDictionaries>
         <ResourceDictionary x:Key="Light">
             <Style x:Key="AddNewVaultBanner" TargetType="Image">
-                <Setter Property="Source" Value="ms-appx://SecureFolderFS.UI/Assets/AppAssets/Vault_light.svg" />
+                <Setter Property="Source" Value="ms-appx://SecureFolderFS.UI/Assets/AppAssets/vault_light.svg" />
             </Style>
         </ResourceDictionary>
         <ResourceDictionary x:Key="Dark">
             <Style x:Key="AddNewVaultBanner" TargetType="Image">
-                <Setter Property="Source" Value="ms-appx://SecureFolderFS.UI/Assets/AppAssets/Vault_dark.svg" />
+                <Setter Property="Source" Value="ms-appx://SecureFolderFS.UI/Assets/AppAssets/vault_dark.svg" />
             </Style>
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
diff --git a/src/Platforms/SecureFolderFS.Uno/SecureFolderFS.Uno.csproj b/src/Platforms/SecureFolderFS.Uno/SecureFolderFS.Uno.csproj
index 6bd4cf69e..fdc4556ec 100644
--- a/src/Platforms/SecureFolderFS.Uno/SecureFolderFS.Uno.csproj
+++ b/src/Platforms/SecureFolderFS.Uno/SecureFolderFS.Uno.csproj
@@ -1,39 +1,41 @@
 <Project Sdk="Uno.Sdk">
   <PropertyGroup>
-    <TargetFrameworks Condition=" !$([MSBuild]::IsOSPlatform('linux')) ">$(TargetFrameworks);net8.0-maccatalyst</TargetFrameworks>
-    <TargetFrameworks Condition=" $([MSBuild]::IsOSPlatform('windows')) ">$(TargetFrameworks);net8.0-windows10.0.19041</TargetFrameworks>
-    <TargetFrameworks Condition=" $([MSBuild]::IsOSPlatform('linux')) ">$(TargetFrameworks);net8.0-desktop</TargetFrameworks>
+    <TargetFrameworks Condition=" $([MSBuild]::IsOSPlatform('macOS')) ">$(TargetFrameworks);net9.0-maccatalyst</TargetFrameworks>
+    <TargetFrameworks Condition=" $([MSBuild]::IsOSPlatform('windows')) ">$(TargetFrameworks);net9.0-windows10.0.19041</TargetFrameworks>
+    <TargetFrameworks Condition=" $([MSBuild]::IsOSPlatform('linux')) ">$(TargetFrameworks);net9.0-desktop</TargetFrameworks>
 
-    <!-- To build SecureFolderFS (Desktop) on Windows, comment net8.0-windows[...] -->
+    <!-- To build SecureFolderFS (Desktop) on Windows, comment net9.0-windows[...] -->
 
     <!-- Uncomment if you want to explicity set a TargetFramework -->
-    <!--<TargetFramework>net8.0-desktop</TargetFramework>-->
-    <!--<TargetFramework>net8.0-maccatalyst</TargetFramework>-->
-    <!--<TargetFramework>net8.0-windows10.0.19041</TargetFramework>-->
+    <!--<TargetFramework>net9.0-desktop</TargetFramework>-->
+    <!--<TargetFramework>net9.0-maccatalyst</TargetFramework>-->
+    <!--<TargetFramework>net9.0-windows10.0.19041</TargetFramework>-->
   </PropertyGroup>
 
-  <PropertyGroup>    
+  <PropertyGroup>
     <!-- Build Properties -->
     <OutputType>Exe</OutputType>
     <UnoSingleProject>true</UnoSingleProject>
     <ImplicitUsings>disable</ImplicitUsings>
     <RootNamespace>SecureFolderFS.Uno</RootNamespace>
+    <AccelerateBuildsInVisualStudio>True</AccelerateBuildsInVisualStudio>
 
     <!-- Application Properties -->
     <ApplicationTitle>SecureFolderFS</ApplicationTitle>
-    <AssemblyVersion>0.6.2.0</AssemblyVersion>
-    <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
+    <AssemblyVersion>0.7.0.0</AssemblyVersion>
+    <ApplicationDisplayVersion>0.7.0.0</ApplicationDisplayVersion>
     <ApplicationVersion>1</ApplicationVersion>
-    <ApplicationId>com.securefolderfs.SecureFolderFS</ApplicationId>
+    <ApplicationId>org.securefolderfs.SecureFolderFS</ApplicationId>
   </PropertyGroup>
 
   <!-- Package References -->
   <ItemGroup>
+    <PackageReference Include="H.NotifyIcon.Uno.WinUI" />
     <PackageReference Include="LiveChartsCore.SkiaSharpView.Uno.WinUI" />
     <PackageReference Include="Microsoft.AppCenter.Analytics" />
     <PackageReference Include="Microsoft.AppCenter.Crashes" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" />
+    <PackageReference Include="SkiaSharp.Views.Uno.WinUI" />
     <PackageReference Include="System.Configuration.ConfigurationManager" />
   </ItemGroup>
 
@@ -48,7 +50,7 @@
   <Choose>
 
     <!-- Mac Catalyst -->
-    <When Condition="'$(TargetFramework)'=='net8.0-maccatalyst'">
+    <When Condition="'$(TargetFramework)'=='net9.0-maccatalyst'">
       <ItemGroup>
         <PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Animations" />
         <PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls.Markdown" />
@@ -66,7 +68,7 @@
     </When>
 
     <!-- Skia Desktop -->
-    <When Condition="'$(TargetFramework)'=='net8.0-desktop'">
+    <When Condition="'$(TargetFramework)'=='net9.0-desktop'">
       <PropertyGroup>
         <DefineConstants>HAS_UNO_SKIA</DefineConstants>
       </PropertyGroup>
@@ -83,7 +85,7 @@
     </When>
 
     <!-- Windows -->
-    <When Condition="'$(TargetFramework)'=='net8.0-windows10.0.19041'">
+    <When Condition="'$(TargetFramework)'=='net9.0-windows10.0.19041'">
       <ItemGroup>
         <PackageReference Include="CommunityToolkit.WinUI.UI.Animations" />
         <PackageReference Include="CommunityToolkit.WinUI.UI.Controls.Markdown" />
@@ -95,6 +97,19 @@
         <ProjectReference Include="..\..\SecureFolderFS.Core.WebDav\SecureFolderFS.Core.WebDav.csproj" />
       </ItemGroup>
 
+      <!-- File Explorer Shell -->
+      <ItemGroup>
+        <COMReference Include="SHDocVw">
+          <WrapperTool>tlbimp</WrapperTool>
+          <VersionMinor>1</VersionMinor>
+          <VersionMajor>1</VersionMajor>
+          <Guid>eab22ac0-30c1-11cf-a7eb-0000c05bae0b</Guid>
+          <Lcid>0</Lcid>
+          <Isolated>false</Isolated>
+          <EmbedInteropTypes>true</EmbedInteropTypes>
+        </COMReference>
+      </ItemGroup>
+
       <PropertyGroup>
         <!-- Publishing -->
         <UseWinUI>True</UseWinUI>
@@ -107,7 +122,7 @@
 
         <!-- Packaging -->
         <AppxBundle>Never</AppxBundle>
-        <!--<AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>-->  
+        <!--<AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>-->
         <AppxBundlePlatforms>x86|x64|arm64</AppxBundlePlatforms>
         <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
         <AppxSymbolPackageEnabled>True</AppxSymbolPackageEnabled>
@@ -121,7 +136,7 @@
         <WinAppSdkBuildToolsVersion Condition="$(TargetFramework.Contains('windows10'))">10.0.22621.3233</WinAppSdkBuildToolsVersion>
         <UnoExtensionsVersion Condition="$(TargetFramework.Contains('windows10'))">4.2.2</UnoExtensionsVersion>
         <!-- Remove when the .NET SDK 8.0.403 or later has been released -->
-        <WindowsSdkPackageVersion>10.0.19041.34</WindowsSdkPackageVersion>
+        <WindowsSdkPackageVersion>10.0.19041.38</WindowsSdkPackageVersion>
 
         <!-- Languages -->
         <AppxDefaultResourceQualifiers>Language=en-US;pl-PL;de-DE;es-ES;da-DK;uk-UA;pt-PT;ms-MY;id-ID;hi-IN</AppxDefaultResourceQualifiers>
@@ -194,6 +209,7 @@
     <None Remove="Assets\AppIcon\WideTile.scale-150.png" />
     <None Remove="Assets\AppIcon\WideTile.scale-200.png" />
     <None Remove="Assets\AppIcon\WideTile.scale-400.png" />
+    <None Remove="Assets\Icons\app_icon.ico" />
   </ItemGroup>
 
   <ItemGroup>
@@ -215,10 +231,14 @@
     <None Remove="UserControls\ActionBlocks\ActionBlockControl.xaml" />
     <None Remove="UserControls\BackButtonTitleControl.xaml" />
     <None Remove="UserControls\BannerControl.xaml" />
+    <None Remove="UserControls\DebugControls\DebugDashboardRepresentationControl.xaml" />
+    <None Remove="UserControls\DebugControls\DebugLoginRepresentationControl.xaml" />
+    <None Remove="UserControls\ErrorControl.xaml" />
     <None Remove="UserControls\GraphControl.xaml" />
     <None Remove="UserControls\InstallationControl.xaml" />
     <None Remove="UserControls\InterfaceHost\MainAppHostControl.xaml" />
     <None Remove="UserControls\InterfaceHost\NoVaultsAppHostControl.xaml" />
+    <None Remove="UserControls\InterfaceRoot\DebugWindowRootControl.xaml" />
     <None Remove="UserControls\InterfaceRoot\MainWindowRootControl.xaml" />
     <None Remove="UserControls\Introduction\AgreementScreen.xaml" />
     <None Remove="UserControls\Introduction\EndScreen.xaml" />
@@ -236,6 +256,8 @@
     <None Remove="UserControls\VaultFolderSelectionControl.xaml" />
     <None Remove="UserControls\Widgets\GraphsWidget.xaml" />
     <None Remove="UserControls\Widgets\HealthWidget.xaml" />
+    <None Remove="Views\DebugViews\DebugAppControlPage.xaml" />
+    <None Remove="Views\DebugViews\DebugFileSystemLogPage.xaml" />
     <None Remove="Views\PrintPages\RecoveryKeyPrintPage.xaml" />
     <None Remove="Views\Settings\AboutSettingsPage.xaml" />
     <None Remove="Views\Settings\GeneralSettingsPage.xaml" />
@@ -246,6 +268,7 @@
     <None Remove="Views\VaultWizard\RecoveryWizardPage.xaml" />
     <None Remove="Views\VaultWizard\SummaryWizardPage.xaml" />
     <None Remove="Views\Vault\VaultDashboardPage.xaml" />
+    <None Remove="Views\Vault\VaultHealthPage.xaml" />
     <None Remove="Views\Vault\VaultLoginPage.xaml" />
     <None Remove="Views\Vault\VaultOverviewPage.xaml" />
     <None Remove="Views\Vault\VaultPropertiesPage.xaml" />
@@ -442,10 +465,14 @@
     <UpToDateCheckInput Remove="UserControls\ActionBlocks\ActionBlockControl.xaml" />
     <UpToDateCheckInput Remove="UserControls\BackButtonTitleControl.xaml" />
     <UpToDateCheckInput Remove="UserControls\BannerControl.xaml" />
+    <UpToDateCheckInput Remove="UserControls\DebugControls\DebugDashboardRepresentationControl.xaml" />
+    <UpToDateCheckInput Remove="UserControls\DebugControls\DebugLoginRepresentationControl.xaml" />
+    <UpToDateCheckInput Remove="UserControls\ErrorControl.xaml" />
     <UpToDateCheckInput Remove="UserControls\GraphControl.xaml" />
     <UpToDateCheckInput Remove="UserControls\InstallationControl.xaml" />
     <UpToDateCheckInput Remove="UserControls\InterfaceHost\MainAppHostControl.xaml" />
     <UpToDateCheckInput Remove="UserControls\InterfaceHost\NoVaultsAppHostControl.xaml" />
+    <UpToDateCheckInput Remove="UserControls\InterfaceRoot\DebugWindowRootControl.xaml" />
     <UpToDateCheckInput Remove="UserControls\InterfaceRoot\MainWindowRootControl.xaml" />
     <UpToDateCheckInput Remove="UserControls\Introduction\AgreementScreen.xaml" />
     <UpToDateCheckInput Remove="UserControls\Introduction\EndScreen.xaml" />
@@ -463,6 +490,8 @@
     <UpToDateCheckInput Remove="UserControls\VaultFolderSelectionControl.xaml" />
     <UpToDateCheckInput Remove="UserControls\Widgets\GraphsWidget.xaml" />
     <UpToDateCheckInput Remove="UserControls\Widgets\HealthWidget.xaml" />
+    <UpToDateCheckInput Remove="Views\DebugViews\DebugAppControlPage.xaml" />
+    <UpToDateCheckInput Remove="Views\DebugViews\DebugFileSystemLogPage.xaml" />
     <UpToDateCheckInput Remove="Views\PrintPages\RecoveryKeyPrintPage.xaml" />
     <UpToDateCheckInput Remove="Views\Settings\AboutSettingsPage.xaml" />
     <UpToDateCheckInput Remove="Views\Settings\GeneralSettingsPage.xaml" />
@@ -477,4 +506,10 @@
     <UpToDateCheckInput Remove="Views\Vault\VaultOverviewPage.xaml" />
     <UpToDateCheckInput Remove="Views\Vault\VaultPropertiesPage.xaml" />
   </ItemGroup>
+
+  <ItemGroup>
+    <Page Update="Views\Vault\VaultHealthPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
 </Project>
diff --git a/src/Platforms/SecureFolderFS.Uno/ServiceImplementation/UnoFileExplorerService.cs b/src/Platforms/SecureFolderFS.Uno/ServiceImplementation/UnoFileExplorerService.cs
index 20989de37..5aba92599 100644
--- a/src/Platforms/SecureFolderFS.Uno/ServiceImplementation/UnoFileExplorerService.cs
+++ b/src/Platforms/SecureFolderFS.Uno/ServiceImplementation/UnoFileExplorerService.cs
@@ -5,8 +5,8 @@
 using System.Threading;
 using System.Threading.Tasks;
 using OwlCore.Storage;
-using OwlCore.Storage.System.IO;
 using SecureFolderFS.Sdk.Services;
+using SecureFolderFS.Storage.SystemStorageEx;
 using Windows.Storage;
 using Windows.Storage.Pickers;
 
@@ -25,17 +25,7 @@ public Task TryOpenInFileExplorerAsync(IFolder folder, CancellationToken cancell
             }
         
 #if __MACOS__ || __MACCATALYST__
-            using var process = new Process();
-            process.StartInfo = new ProcessStartInfo()
-            {
-                FileName = "open",
-                Arguments = $"\"{folder.Id}/\"",
-                RedirectStandardOutput = false,
-                UseShellExecute = false,
-                CreateNoWindow = true,
-            };
-            process.Start();
-            
+            Process.Start("sh", ["-c", $"open {folder.Id}"]);
             return Task.CompletedTask;
 #elif WINDOWS
             return global::Windows.System.Launcher.LaunchFolderPathAsync(folder.Id).AsTask(cancellationToken);
@@ -71,7 +61,7 @@ public async Task<bool> SaveFileAsync(string suggestedName, Stream dataStream, I
         }
 
         /// <inheritdoc/>
-        public async Task<IFile?> PickFileAsync(IEnumerable<string>? filter, CancellationToken cancellationToken = default)
+        public async Task<IFile?> PickFileAsync(IEnumerable<string>? filter, bool persist = true, CancellationToken cancellationToken = default)
         {
             var filePicker = new FileOpenPicker();
             WinRT_InitializeObject(filePicker);
@@ -89,11 +79,11 @@ public async Task<bool> SaveFileAsync(string suggestedName, Stream dataStream, I
                 return null;
 
             //return new WindowsStorageFile(file);
-            return new SystemFile(file.Path);
+            return new SystemFileEx(file.Path);
         }
 
         /// <inheritdoc/>
-        public async Task<IFolder?> PickFolderAsync(CancellationToken cancellationToken = default)
+        public async Task<IFolder?> PickFolderAsync(bool persist = true, CancellationToken cancellationToken = default)
         {
             var folderPicker = new FolderPicker();
             WinRT_InitializeObject(folderPicker);
@@ -104,7 +94,7 @@ public async Task<bool> SaveFileAsync(string suggestedName, Stream dataStream, I
                 return null;
 
             //return new WindowsStorageFolder(folder);
-            return new SystemFolder(folder.Path);
+            return new SystemFolderEx(folder.Path);
         }
 
         private static void WinRT_InitializeObject(object obj)
diff --git a/src/Platforms/SecureFolderFS.Uno/ServiceImplementation/UnoMediaService.cs b/src/Platforms/SecureFolderFS.Uno/ServiceImplementation/UnoMediaService.cs
new file mode 100644
index 000000000..373a43bb9
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Uno/ServiceImplementation/UnoMediaService.cs
@@ -0,0 +1,37 @@
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.UI.Xaml.Media.Imaging;
+using OwlCore.Storage;
+using SecureFolderFS.Sdk.Services;
+using SecureFolderFS.Shared.ComponentModel;
+using SecureFolderFS.Uno.AppModels;
+
+namespace SecureFolderFS.Uno.ServiceImplementation
+{
+    /// <inheritdoc cref="IMediaService"/>
+    internal sealed class UnoMediaService : IMediaService
+    {
+        /// <inheritdoc/>
+        public async Task<IImage> ReadImageFileAsync(IFile file, CancellationToken cancellationToken)
+        {
+            await using var stream = await file.OpenStreamAsync(FileAccess.Read, cancellationToken);
+            using var winrtStream = stream.AsRandomAccessStream();
+
+            var bitmapImage = new BitmapImage();
+            await bitmapImage.SetSourceAsync(winrtStream).AsTask(cancellationToken);
+
+            return new ImageBitmap(bitmapImage, null);
+
+            //var mimeType = MimeTypeMap.GetMimeType(file.Id);
+            //return await ImagingHelpers.GetBitmapFromStreamAsync(winrtStream, mimeType, cancellationToken);
+        }
+
+        /// <inheritdoc/>
+        public Task<IDisposable> StreamVideoAsync(IFile file, CancellationToken cancellationToken)
+        {
+            return Task.FromException<IDisposable>(new NotSupportedException());
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Uno/ServiceImplementation/UnoNavigationService.cs b/src/Platforms/SecureFolderFS.Uno/ServiceImplementation/UnoNavigationService.cs
index e39579ac9..caf87e8b0 100644
--- a/src/Platforms/SecureFolderFS.Uno/ServiceImplementation/UnoNavigationService.cs
+++ b/src/Platforms/SecureFolderFS.Uno/ServiceImplementation/UnoNavigationService.cs
@@ -6,33 +6,30 @@
 using SecureFolderFS.Shared.ComponentModel;
 using SecureFolderFS.Shared.Extensions;
 using SecureFolderFS.UI.ServiceImplementation;
-using SecureFolderFS.UI.Utils;
 using SecureFolderFS.Uno.UserControls.Navigation;
 
 namespace SecureFolderFS.Uno.ServiceImplementation
 {
     /// <inheritdoc cref="INavigationService"/>
-    public sealed class UnoNavigationService : BaseNavigationService, INavigationControlContract
+    public sealed class UnoNavigationService : BaseNavigationService
     {
         /// <inheritdoc/>
         protected override async Task<bool> BeginNavigationAsync(IViewDesignation? view, NavigationType navigationType)
         {
-            if (NavigationControl is null)
+            if (Navigator is null)
                 return false;
 
             switch (navigationType)
             {
                 case NavigationType.Backward:
                 {
-                    if (NavigationControl is not FrameNavigationControl frameNavigation)
+                    if (Navigator is not FrameNavigationControl frameNavigation)
                         return false;
-
-                    if (!frameNavigation.ContentFrame.CanGoBack) 
-                        return false;
-
+                    
                     // Navigate back
-                    frameNavigation.ContentFrame.GoBack();
-
+                    if (!await Navigator.GoBackAsync())
+                        return false;
+                    
                     var contentType = frameNavigation.Content?.GetType();
                     if (contentType is null)
                         return false;
@@ -47,14 +44,12 @@ protected override async Task<bool> BeginNavigationAsync(IViewDesignation? view,
 
                 case NavigationType.Forward:
                 {
-                    if (NavigationControl is not FrameNavigationControl frameNavigation)
-                        return false;
-
-                    if (!frameNavigation.ContentFrame.CanGoForward)
+                    if (Navigator is not FrameNavigationControl frameNavigation)
                         return false;
 
                     // Navigate forward
-                    frameNavigation.ContentFrame.GoForward();
+                    if (!await Navigator.GoForwardAsync())
+                        return false;
 
                     var contentType = frameNavigation.ContentFrame.Content?.GetType();
                     if (contentType is null)
@@ -74,7 +69,7 @@ protected override async Task<bool> BeginNavigationAsync(IViewDesignation? view,
                     if (view is null)
                         return false;
 
-                    return await NavigationControl.NavigateAsync(view, (NavigationTransitionInfo?)null);
+                    return await Navigator.NavigateAsync(view);
                 }
             }
         }
diff --git a/src/Platforms/SecureFolderFS.Uno/ServiceImplementation/UnoStorageService.cs b/src/Platforms/SecureFolderFS.Uno/ServiceImplementation/UnoStorageService.cs
index fe3a466cc..1777ad4db 100644
--- a/src/Platforms/SecureFolderFS.Uno/ServiceImplementation/UnoStorageService.cs
+++ b/src/Platforms/SecureFolderFS.Uno/ServiceImplementation/UnoStorageService.cs
@@ -5,6 +5,7 @@
 using OwlCore.Storage;
 using OwlCore.Storage.System.IO;
 using SecureFolderFS.Sdk.Services;
+using SecureFolderFS.Storage.SystemStorageEx;
 using Windows.Storage;
 
 namespace SecureFolderFS.Uno.ServiceImplementation
@@ -25,8 +26,8 @@ public async Task<TStorable> GetPersistedAsync<TStorable>(string id, Cancellatio
             await Task.CompletedTask;
             return (TStorable)(IStorable)(true switch
             {
-                _ when typeof(TStorable).IsAssignableFrom(typeof(IFile)) => new SystemFile(id),
-                _ when typeof(TStorable).IsAssignableFrom(typeof(IFolder)) => new SystemFolder(id),
+                _ when typeof(TStorable).IsAssignableFrom(typeof(IFile)) => new SystemFileEx(id),
+                _ when typeof(TStorable).IsAssignableFrom(typeof(IFolder)) => new SystemFolderEx(id),
                 _ => GetUnknown(id)
             });
 
@@ -34,11 +35,11 @@ static IStorable GetUnknown(string path)
             {
                 // Check for file
                 if (Path.GetFileName(path) is { } str && str != string.Empty && File.Exists(path))
-                    return new SystemFile(path);
+                    return new SystemFileEx(path);
 
                 // Check for folder
                 if (Directory.Exists(path))
-                    return new SystemFolder(path);
+                    return new SystemFolderEx(path);
 
                 throw new ArgumentException("The path is not a file nor a folder.", nameof(id));
             }
diff --git a/src/Platforms/SecureFolderFS.Uno/ServiceImplementation/UnoThreadingService.cs b/src/Platforms/SecureFolderFS.Uno/ServiceImplementation/UnoThreadingService.cs
index 60b2b0052..3e76ee485 100644
--- a/src/Platforms/SecureFolderFS.Uno/ServiceImplementation/UnoThreadingService.cs
+++ b/src/Platforms/SecureFolderFS.Uno/ServiceImplementation/UnoThreadingService.cs
@@ -1,7 +1,9 @@
 using System;
+using System.Threading;
 using Microsoft.UI.Dispatching;
 using SecureFolderFS.Sdk.Services;
 using SecureFolderFS.Shared.ComponentModel;
+using SecureFolderFS.Uno.UserControls.InterfaceRoot;
 
 namespace SecureFolderFS.Uno.ServiceImplementation
 {
@@ -10,6 +12,12 @@ internal sealed class UnoThreadingService : IThreadingService
     {
         private readonly DispatcherQueue _dispatcherQueue = DispatcherQueue.GetForCurrentThread();
 
+        /// <inheritdoc/>
+        public SynchronizationContext? GetContext()
+        {
+            return (App.Instance?.MainWindow?.Content as MainWindowRootControl)?.Context;
+        }
+
         /// <inheritdoc/>
         public IAwaitable ChangeThreadAsync()
         {
diff --git a/src/Platforms/SecureFolderFS.Uno/TemplateSelectors/FileSystemInfoBarTemplateSelector.cs b/src/Platforms/SecureFolderFS.Uno/TemplateSelectors/FileSystemInfoBarTemplateSelector.cs
deleted file mode 100644
index 93a8e8ad5..000000000
--- a/src/Platforms/SecureFolderFS.Uno/TemplateSelectors/FileSystemInfoBarTemplateSelector.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using Microsoft.UI.Xaml;
-using SecureFolderFS.Sdk.ViewModels.Controls;
-using SecureFolderFS.UI.UserControls.InfoBars;
-
-namespace SecureFolderFS.Uno.TemplateSelectors
-{
-    internal sealed class FileSystemInfoBarTemplateSelector : BaseTemplateSelector<InfoBarViewModel>
-    {
-        public DataTemplate? DokanyUnavailableInfoBarTemplate { get; set; }
-
-        public DataTemplate? WebDavExperimentalInfoBarTemplate { get; set; }
-
-        protected override DataTemplate? SelectTemplateCore(InfoBarViewModel? item, DependencyObject container)
-        {
-            return item switch
-            {
-                DokanyInfoBar => DokanyUnavailableInfoBarTemplate,
-                WebDavInfoBar => WebDavExperimentalInfoBarTemplate,
-                _ => base.SelectTemplateCore(item, container)
-            };
-        }
-    }
-}
diff --git a/src/Platforms/SecureFolderFS.Uno/TemplateSelectors/HealthIssueTemplateSelector.cs b/src/Platforms/SecureFolderFS.Uno/TemplateSelectors/HealthIssueTemplateSelector.cs
new file mode 100644
index 000000000..9aa40f86f
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Uno/TemplateSelectors/HealthIssueTemplateSelector.cs
@@ -0,0 +1,30 @@
+using Microsoft.UI.Xaml;
+using SecureFolderFS.Sdk.ViewModels.Controls.Widgets.Health;
+using SecureFolderFS.UI.ViewModels.Health;
+
+namespace SecureFolderFS.Uno.TemplateSelectors
+{
+    internal sealed class HealthIssueTemplateSelector : BaseTemplateSelector<HealthIssueViewModel>
+    {
+        public DataTemplate? IssueTemplate { get; set; }
+
+        public DataTemplate? NameIssueTemplate { get; set; }
+
+        public DataTemplate? FileDataIssueTemplate { get; set; }
+
+        public DataTemplate? DirectoryIssueTemplate { get; set; }
+
+        /// <inheritdoc/>
+        protected override DataTemplate? SelectTemplateCore(HealthIssueViewModel? item, DependencyObject container)
+        {
+            return item switch
+            {
+                HealthNameIssueViewModel => NameIssueTemplate,
+                HealthFileDataIssueViewModel => FileDataIssueTemplate,
+                HealthDirectoryIssueViewModel => DirectoryIssueTemplate,
+                { } => IssueTemplate,
+                _ => base.SelectTemplateCore(item, container)
+            };
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Uno/TemplateSelectors/LoginTemplateSelector.cs b/src/Platforms/SecureFolderFS.Uno/TemplateSelectors/LoginTemplateSelector.cs
index 10c46c1e7..ba8b22cdc 100644
--- a/src/Platforms/SecureFolderFS.Uno/TemplateSelectors/LoginTemplateSelector.cs
+++ b/src/Platforms/SecureFolderFS.Uno/TemplateSelectors/LoginTemplateSelector.cs
@@ -1,7 +1,7 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using Microsoft.UI.Xaml;
 using SecureFolderFS.Sdk.ViewModels.Controls.Authentication;
-using SecureFolderFS.UI.ViewModels;
+using SecureFolderFS.UI.ViewModels.Authentication;
 using SecureFolderFS.Uno.ViewModels;
 
 namespace SecureFolderFS.Uno.TemplateSelectors
diff --git a/src/Platforms/SecureFolderFS.Uno/TemplateSelectors/MigrationTemplateSelector.cs b/src/Platforms/SecureFolderFS.Uno/TemplateSelectors/MigrationTemplateSelector.cs
index a382b2639..28df463c5 100644
--- a/src/Platforms/SecureFolderFS.Uno/TemplateSelectors/MigrationTemplateSelector.cs
+++ b/src/Platforms/SecureFolderFS.Uno/TemplateSelectors/MigrationTemplateSelector.cs
@@ -13,7 +13,7 @@ internal sealed class MigrationTemplateSelector : BaseTemplateSelector<Migration
             return item?.FormatVersion switch
             {
                 Core.Constants.Vault.Versions.V1 => MigratorV1_V2,
-                _ => base.SelectTemplateCore(item)
+                _ => base.SelectTemplateCore(item, container)
             };
         }
     }
diff --git a/src/Platforms/SecureFolderFS.Uno/TemplateSelectors/RegistrationTemplateSelector.cs b/src/Platforms/SecureFolderFS.Uno/TemplateSelectors/RegistrationTemplateSelector.cs
index 711ada20c..f352f54c6 100644
--- a/src/Platforms/SecureFolderFS.Uno/TemplateSelectors/RegistrationTemplateSelector.cs
+++ b/src/Platforms/SecureFolderFS.Uno/TemplateSelectors/RegistrationTemplateSelector.cs
@@ -1,6 +1,6 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using Microsoft.UI.Xaml;
-using SecureFolderFS.UI.ViewModels;
+using SecureFolderFS.UI.ViewModels.Authentication;
 using SecureFolderFS.Uno.ViewModels;
 
 namespace SecureFolderFS.Uno.TemplateSelectors
diff --git a/src/Platforms/SecureFolderFS.Uno/TemplateSelectors/WidgetsTemplateSelector.cs b/src/Platforms/SecureFolderFS.Uno/TemplateSelectors/WidgetsTemplateSelector.cs
index d7229f67a..0cc2a9ee2 100644
--- a/src/Platforms/SecureFolderFS.Uno/TemplateSelectors/WidgetsTemplateSelector.cs
+++ b/src/Platforms/SecureFolderFS.Uno/TemplateSelectors/WidgetsTemplateSelector.cs
@@ -1,6 +1,7 @@
 using Microsoft.UI.Xaml;
 using SecureFolderFS.Sdk.ViewModels.Controls.Widgets;
-using SecureFolderFS.Sdk.ViewModels.Controls.Widgets.Categories;
+using SecureFolderFS.Sdk.ViewModels.Controls.Widgets.Data;
+using SecureFolderFS.Sdk.ViewModels.Controls.Widgets.Health;
 
 namespace SecureFolderFS.Uno.TemplateSelectors
 {
@@ -18,7 +19,7 @@ internal sealed class WidgetsTemplateSelector : BaseTemplateSelector<BaseWidgetV
             {
                 HealthWidgetViewModel => HealthWidgetTemplate,
                 GraphsWidgetViewModel => GraphsWidgetTemplate,
-                // TODO: AggregatedDataWidgetTemplate
+                AggregatedDataWidgetViewModel => AggregatedDataWidgetTemplate,
                 _ => base.SelectTemplateCore(item, container)
             };
         }
diff --git a/src/Platforms/SecureFolderFS.Uno/UserControls/ActionBlocks/ActionBlockControl.xaml b/src/Platforms/SecureFolderFS.Uno/UserControls/ActionBlocks/ActionBlockControl.xaml
index 02a2f0a28..6e271a697 100644
--- a/src/Platforms/SecureFolderFS.Uno/UserControls/ActionBlocks/ActionBlockControl.xaml
+++ b/src/Platforms/SecureFolderFS.Uno/UserControls/ActionBlocks/ActionBlockControl.xaml
@@ -21,13 +21,14 @@
                 Background="{ThemeResource ExpanderHeaderBackground}"
                 BorderBrush="{ThemeResource ExpanderHeaderBorderBrush}"
                 BorderThickness="{ThemeResource ExpanderHeaderBorderThickness}"
-                CornerRadius="{ThemeResource ControlCornerRadius}">
+                CornerRadius="{ThemeResource ControlCornerRadius}"
+                DataContext="{Binding ElementName=ActionBlock}"
+                ToolTipService.ToolTip="{Binding ToolTip, Mode=OneWay}">
                 <local:ActionBlockContentControl
                     Title="{Binding Title, Mode=OneWay}"
                     ActionElement="{Binding ActionElement, Mode=OneWay}"
                     AdditionalActionElement="{Binding AdditionalActionElement, Mode=OneWay}"
                     CustomDescription="{Binding CustomDescription, Mode=OneWay}"
-                    DataContext="{Binding ElementName=ActionBlock}"
                     Description="{Binding Description, Mode=OneWay}"
                     Icon="{Binding Icon, Mode=OneWay}" />
             </Grid>
@@ -48,7 +49,8 @@
                 Click="Button_Click"
                 Command="{Binding ClickCommand, Mode=OneWay}"
                 CornerRadius="{ThemeResource ControlCornerRadius}"
-                DataContext="{Binding ElementName=ActionBlock}">
+                DataContext="{Binding ElementName=ActionBlock}"
+                ToolTipService.ToolTip="{Binding ToolTip, Mode=OneWay}">
                 <local:ActionBlockContentControl
                     Title="{Binding Title, Mode=OneWay}"
                     ActionElement="{Binding ActionElement, Mode=OneWay}"
@@ -69,11 +71,12 @@
                 VerticalContentAlignment="Center"
                 DataContext="{Binding ElementName=ActionBlock}"
                 Expanding="Expander_Expanding"
-                IsExpanded="{Binding IsExpanded, Mode=TwoWay}">
+                IsExpanded="{Binding IsExpanded, Mode=TwoWay}"
+                ToolTipService.ToolTip="{Binding ToolTip, Mode=OneWay}">
                 <Expander.Header>
                     <local:ActionBlockContentControl
                         Title="{Binding Title, Mode=OneWay}"
-                        Height="72"
+                        Height="70"
                         ActionElement="{Binding ActionElement, Mode=OneWay}"
                         AdditionalActionElement="{Binding AdditionalActionElement, Mode=OneWay}"
                         CustomDescription="{Binding CustomDescription, Mode=OneWay}"
diff --git a/src/Platforms/SecureFolderFS.Uno/UserControls/ActionBlocks/ActionBlockControl.xaml.cs b/src/Platforms/SecureFolderFS.Uno/UserControls/ActionBlocks/ActionBlockControl.xaml.cs
index 64cc2bd4c..c0bb9923f 100644
--- a/src/Platforms/SecureFolderFS.Uno/UserControls/ActionBlocks/ActionBlockControl.xaml.cs
+++ b/src/Platforms/SecureFolderFS.Uno/UserControls/ActionBlocks/ActionBlockControl.xaml.cs
@@ -91,6 +91,14 @@ public string? Description
         public static readonly DependencyProperty DescriptionProperty =
             DependencyProperty.Register(nameof(Description), typeof(string), typeof(ActionBlockControl), new PropertyMetadata(defaultValue: null));
 
+        public string? ToolTip
+        {
+            get => (string?)GetValue(ToolTipProperty);
+            set => SetValue(ToolTipProperty, value);
+        }
+        public static readonly DependencyProperty ToolTipProperty =
+            DependencyProperty.Register(nameof(ToolTip), typeof(string), typeof(ActionBlockControl), new PropertyMetadata(defaultValue: null));
+
         public FrameworkElement CustomDescription
         {
             get => (FrameworkElement)GetValue(CustomDescriptionProperty);
diff --git a/src/Platforms/SecureFolderFS.Uno/UserControls/BackButtonTitleControl.xaml b/src/Platforms/SecureFolderFS.Uno/UserControls/BackButtonTitleControl.xaml
index 24500e8ec..86fe25360 100644
--- a/src/Platforms/SecureFolderFS.Uno/UserControls/BackButtonTitleControl.xaml
+++ b/src/Platforms/SecureFolderFS.Uno/UserControls/BackButtonTitleControl.xaml
@@ -6,7 +6,9 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:l="using:SecureFolderFS.Uno.Localization"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d">
+    xmlns:not_win="http://uno.ui/skia"
+    xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    mc:Ignorable="d not_win">
 
     <UserControl.Resources>
         <Storyboard x:Key="HideBackButtonStoryboard" x:Name="HideBackButtonStoryboard">
@@ -54,19 +56,22 @@
             Height="32"
             Margin="0,0,16,0"
             Padding="8"
-            AutomationProperties.Name="{l:ResourceString Name=Back}"
+            AutomationProperties.Name="{l:ResourceString Rid=Back}"
             Background="Transparent"
             BorderThickness="0"
             Click="GoBack_Click"
             Visibility="Collapsed">
-            <AnimatedIcon>
-                <AnimatedIcon.Source>
-                    <animvis:AnimatedBackVisualSource />
-                </AnimatedIcon.Source>
-                <AnimatedIcon.FallbackIconSource>
-                    <SymbolIconSource Symbol="Back" />
-                </AnimatedIcon.FallbackIconSource>
-            </AnimatedIcon>
+            <Grid>
+                <win:AnimatedIcon>
+                    <AnimatedIcon.Source>
+                        <animvis:AnimatedBackVisualSource />
+                    </AnimatedIcon.Source>
+                    <AnimatedIcon.FallbackIconSource>
+                        <SymbolIconSource Symbol="Back" />
+                    </AnimatedIcon.FallbackIconSource>
+                </win:AnimatedIcon>
+                <not_win:FontIcon Glyph="&#xE72B;" />
+            </Grid>
         </Button>
         <TextBlock
             x:Name="TitleText"
diff --git a/src/Platforms/SecureFolderFS.Uno/UserControls/DebugControls/DebugDashboardRepresentationControl.xaml b/src/Platforms/SecureFolderFS.Uno/UserControls/DebugControls/DebugDashboardRepresentationControl.xaml
new file mode 100644
index 000000000..0a8b95f7c
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Uno/UserControls/DebugControls/DebugDashboardRepresentationControl.xaml
@@ -0,0 +1,59 @@
+<UserControl
+    x:Class="SecureFolderFS.Uno.UserControls.DebugControls.DebugDashboardRepresentationControl"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ucab="using:SecureFolderFS.Uno.UserControls.ActionBlocks"
+    d:DesignHeight="300"
+    d:DesignWidth="400"
+    mc:Ignorable="d">
+
+    <Grid>
+        <!--  Overview  -->
+        <StackPanel
+            x:Name="Rt_Overview"
+            x:Load="{x:Bind IsOverviewVisible, Mode=OneWay}"
+            Spacing="8">
+
+            <!--  Health Widget  -->
+            <ucab:ActionBlockControl Title="Health Widget" BlockMode="Expandable">
+                <ucab:ActionBlockControl.ExpanderContent>
+                    <Grid ColumnSpacing="32" RowSpacing="16">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition />
+                            <RowDefinition />
+                        </Grid.RowDefinitions>
+
+                        <TextBlock
+                            Grid.Row="0"
+                            Grid.Column="0"
+                            VerticalAlignment="Center"
+                            Text="Date Checked" />
+
+
+                        <TextBox
+                            x:Name="Dbg_HealthWidget_DateChecked"
+                            Grid.Row="0"
+                            Grid.Column="1"
+                            TextChanged="HealthWidgetDateChecked_TextChanged" />
+                    </Grid>
+                </ucab:ActionBlockControl.ExpanderContent>
+            </ucab:ActionBlockControl>
+
+            <!--  Graphs Widget  -->
+            <ucab:ActionBlockControl Title="Graphs Widget" BlockMode="Expandable">
+                <ucab:ActionBlockControl.ExpanderContent>
+                    <StackPanel Spacing="8">
+                        <Button Click="SetGraphsViewMockup_Click" Content="Set Graphs View Mockup" />
+                        <Button Click="RestoreGraphs_Click" Content="Restore Graphs" />
+                    </StackPanel>
+                </ucab:ActionBlockControl.ExpanderContent>
+            </ucab:ActionBlockControl>
+        </StackPanel>
+    </Grid>
+</UserControl>
diff --git a/src/Platforms/SecureFolderFS.Uno/UserControls/DebugControls/DebugDashboardRepresentationControl.xaml.cs b/src/Platforms/SecureFolderFS.Uno/UserControls/DebugControls/DebugDashboardRepresentationControl.xaml.cs
new file mode 100644
index 000000000..d8094fa58
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Uno/UserControls/DebugControls/DebugDashboardRepresentationControl.xaml.cs
@@ -0,0 +1,115 @@
+using System.Linq;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using SecureFolderFS.Sdk.ViewModels.Controls.Widgets.Data;
+using SecureFolderFS.Sdk.ViewModels.Controls.Widgets.Health;
+using SecureFolderFS.Sdk.ViewModels.Views.Host;
+using SecureFolderFS.Sdk.ViewModels.Views.Vault;
+using SecureFolderFS.Shared.ComponentModel;
+using SecureFolderFS.Shared.Extensions;
+using SecureFolderFS.UI.Utils;
+using SecureFolderFS.Uno.UserControls.InterfaceRoot;
+
+// The User Control item template is documented at https://go.microsoft.com/fwlink/?LinkId=234236
+
+namespace SecureFolderFS.Uno.UserControls.DebugControls
+{
+    [INotifyPropertyChanged]
+    public sealed partial class DebugDashboardRepresentationControl : UserControl
+    {
+        private MainWindowRootControl? _rootControl;
+        private INavigator? _rootNavigationControl;
+        private VaultOverviewViewModel? _overviewViewModel;
+        private VaultPropertiesViewModel? _propertiesViewModel;
+        private GraphsWidgetViewModel? _graphsWidgetViewModel;
+        private HealthWidgetViewModel? _healthWidgetViewModel;
+
+        [ObservableProperty] private bool _IsOverviewVisible;
+        [ObservableProperty] private bool _IsPropertiesVisible;
+
+        public DebugDashboardRepresentationControl()
+        {
+            InitializeComponent();
+
+            _rootControl = App.Instance?.MainWindow?.Content as MainWindowRootControl;
+            _rootNavigationControl = (_rootControl?.RootNavigationService as INavigationControlContract)?.Navigator;
+            ResetView();
+        }
+
+        private void ResetView()
+        {
+            if (_rootControl is null)
+                return;
+
+            if (_rootControl.RootNavigationService.CurrentView is not MainHostViewModel mainHost)
+                return;
+
+            if (mainHost.NavigationService.CurrentView is not VaultDashboardViewModel vaultDashboard)
+                return;
+
+            _overviewViewModel = null;
+            _propertiesViewModel = null;
+            IsOverviewVisible = false;
+            IsPropertiesVisible = false;
+
+            if (vaultDashboard.DashboardNavigation.CurrentView is VaultOverviewViewModel vaultOverview)
+                _ = PresentVaultOverview(vaultOverview);
+
+            if (vaultDashboard.DashboardNavigation.CurrentView is VaultPropertiesViewModel vaultProperties)
+                _ = PresentVaultProperties(vaultProperties);
+        }
+
+        private async Task PresentVaultOverview(VaultOverviewViewModel viewModel)
+        {
+            _overviewViewModel = viewModel;
+            IsOverviewVisible = true;
+
+            _graphsWidgetViewModel = _overviewViewModel?.WidgetsViewModel.Widgets.FirstOrDefault(x => x is GraphsWidgetViewModel) as GraphsWidgetViewModel;
+            _healthWidgetViewModel = _overviewViewModel?.WidgetsViewModel.Widgets.FirstOrDefault(x => x is HealthWidgetViewModel) as HealthWidgetViewModel;
+
+            await Task.Delay(1000);
+            Dbg_HealthWidget_DateChecked.Text = _healthWidgetViewModel?.LastCheckedText;
+        }
+
+        private async Task PresentVaultProperties(VaultPropertiesViewModel viewModel)
+        {
+            _propertiesViewModel = viewModel;
+            IsPropertiesVisible = true;
+
+            await Task.CompletedTask;
+        }
+
+        private void SetGraphsViewMockup_Click(object sender, RoutedEventArgs e)
+        {
+            if (_graphsWidgetViewModel is null)
+                return;
+
+            _graphsWidgetViewModel.IsActive = false;
+            _graphsWidgetViewModel.ReadGraphViewModel.GraphSubHeader = "209mb/s";
+            _graphsWidgetViewModel.ReadGraphViewModel.Data.Clear();
+            _graphsWidgetViewModel.ReadGraphViewModel.Data.AddMultiple([ 4, 3, 6, 3, 20, 12, 30, 39 ]);
+
+            _graphsWidgetViewModel.WriteGraphViewModel.GraphSubHeader = "104,8mb/s";
+            _graphsWidgetViewModel.WriteGraphViewModel.Data.Clear();
+            _graphsWidgetViewModel.WriteGraphViewModel.Data.AddMultiple([ 4, 3, 6, 3, 20, 12, 30, 39]);
+        }
+
+        private void RestoreGraphs_Click(object sender, RoutedEventArgs e)
+        {
+            if (_graphsWidgetViewModel is null)
+                return;
+
+            _graphsWidgetViewModel.IsActive = true;
+        }
+
+        private void HealthWidgetDateChecked_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            if (_healthWidgetViewModel is null)
+                return;
+
+            _healthWidgetViewModel.LastCheckedText = Dbg_HealthWidget_DateChecked.Text;
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Uno/UserControls/DebugControls/DebugLoginRepresentationControl.xaml b/src/Platforms/SecureFolderFS.Uno/UserControls/DebugControls/DebugLoginRepresentationControl.xaml
new file mode 100644
index 000000000..59debabd2
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Uno/UserControls/DebugControls/DebugLoginRepresentationControl.xaml
@@ -0,0 +1,19 @@
+<UserControl
+    x:Class="SecureFolderFS.Uno.UserControls.DebugControls.DebugLoginRepresentationControl"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:SecureFolderFS.Uno.UserControls.DebugControls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d"
+    xmlns:ucab="using:SecureFolderFS.Uno.UserControls.ActionBlocks"
+
+    d:DesignHeight="300"
+    d:DesignWidth="400">
+
+    <Grid>
+      <StackPanel Spacing="8">
+        <ucab:ActionBlockControl BlockMode="Clickable" Title="Restart Login View" Click="RestartLoginView_Click"></ucab:ActionBlockControl>
+      </StackPanel>
+    </Grid>
+</UserControl>
diff --git a/src/Platforms/SecureFolderFS.Uno/UserControls/DebugControls/DebugLoginRepresentationControl.xaml.cs b/src/Platforms/SecureFolderFS.Uno/UserControls/DebugControls/DebugLoginRepresentationControl.xaml.cs
new file mode 100644
index 000000000..4370dfaa0
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Uno/UserControls/DebugControls/DebugLoginRepresentationControl.xaml.cs
@@ -0,0 +1,37 @@
+using System;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using SecureFolderFS.Sdk.ViewModels.Views.Host;
+using SecureFolderFS.Sdk.ViewModels.Views.Vault;
+using SecureFolderFS.Uno.UserControls.InterfaceRoot;
+
+// The User Control item template is documented at https://go.microsoft.com/fwlink/?LinkId=234236
+
+namespace SecureFolderFS.Uno.UserControls.DebugControls
+{
+    public sealed partial class DebugLoginRepresentationControl : UserControl
+    {
+        private MainWindowRootControl? _rootControl;
+
+        public DebugLoginRepresentationControl()
+        {
+            InitializeComponent();
+
+            _rootControl = App.Instance?.MainWindow?.Content as MainWindowRootControl;
+        }
+
+        private void RestartLoginView_Click(object sender, RoutedEventArgs e)
+        {
+            if (_rootControl is null)
+                return;
+
+            if (_rootControl.RootNavigationService.CurrentView is not MainHostViewModel mainHost)
+                return;
+
+            if (mainHost.NavigationService.CurrentView is not VaultLoginViewModel vaultLogin)
+                return;
+
+            _ = vaultLogin.InitAsync();
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Uno/UserControls/ErrorControl.xaml b/src/Platforms/SecureFolderFS.Uno/UserControls/ErrorControl.xaml
new file mode 100644
index 000000000..ffb311672
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Uno/UserControls/ErrorControl.xaml
@@ -0,0 +1,48 @@
+<UserControl
+    x:Class="SecureFolderFS.Uno.UserControls.ErrorControl"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:l="using:SecureFolderFS.Uno.Localization"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:vc="using:SecureFolderFS.Uno.ValueConverters"
+    d:DesignHeight="300"
+    d:DesignWidth="400"
+    mc:Ignorable="d">
+
+    <UserControl.Resources>
+        <vc:NullToBoolConverter x:Key="NullToBoolConverter" />
+    </UserControl.Resources>
+
+    <StackPanel MinWidth="500" Spacing="4">
+        <InfoBar
+            Title="{l:ResourceString Rid=Error}"
+            IsClosable="False"
+            IsOpen="True"
+            Message="{x:Bind Title, Mode=OneWay}"
+            Severity="Error" />
+        <Expander
+            x:Name="ErrorDetails"
+            HorizontalAlignment="Stretch"
+            x:Load="{x:Bind ExceptionMessage, Mode=OneWay, Converter={StaticResource NullToBoolConverter}}"
+            IsExpanded="True">
+            <Expander.Header>
+                <TextBlock Text="{l:ResourceString Rid=ErrorDetails}" />
+            </Expander.Header>
+            <ScrollViewer
+                Height="200"
+                MaxWidth="600"
+                Padding="4"
+                HorizontalScrollBarVisibility="Auto"
+                VerticalScrollBarVisibility="Auto">
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    FontSize="12"
+                    IsTextSelectionEnabled="True"
+                    Opacity="0.8"
+                    Text="{x:Bind ExceptionMessage, Mode=OneWay}"
+                    TextWrapping="Wrap" />
+            </ScrollViewer>
+        </Expander>
+    </StackPanel>
+</UserControl>
diff --git a/src/Platforms/SecureFolderFS.Uno/UserControls/ErrorControl.xaml.cs b/src/Platforms/SecureFolderFS.Uno/UserControls/ErrorControl.xaml.cs
new file mode 100644
index 000000000..bd4d4d98b
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Uno/UserControls/ErrorControl.xaml.cs
@@ -0,0 +1,32 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using SecureFolderFS.Sdk.Extensions;
+
+// The User Control item template is documented at https://go.microsoft.com/fwlink/?LinkId=234236
+
+namespace SecureFolderFS.Uno.UserControls
+{
+    public sealed partial class ErrorControl : UserControl
+    {
+        public ErrorControl()
+        {
+            InitializeComponent();
+        }
+
+        public string? ExceptionMessage
+        {
+            get => (string?)GetValue(ExceptionMessageProperty);
+            set => SetValue(ExceptionMessageProperty, value);
+        }
+        public static readonly DependencyProperty ExceptionMessageProperty =
+            DependencyProperty.Register(nameof(ExceptionMessage), typeof(string), typeof(ErrorControl), new PropertyMetadata(null));
+
+        public string? Title
+        {
+            get => (string?)GetValue(TitleProperty);
+            set => SetValue(TitleProperty, value);
+        }
+        public static readonly DependencyProperty TitleProperty =
+            DependencyProperty.Register(nameof(Title), typeof(string), typeof(ErrorControl), new PropertyMetadata("ErrorOccurred".ToLocalized()));
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Uno/UserControls/GraphControl.xaml b/src/Platforms/SecureFolderFS.Uno/UserControls/GraphControl.xaml
index 013f063f2..a490318fe 100644
--- a/src/Platforms/SecureFolderFS.Uno/UserControls/GraphControl.xaml
+++ b/src/Platforms/SecureFolderFS.Uno/UserControls/GraphControl.xaml
@@ -57,11 +57,11 @@
             <!--  Chart  -->
             <lvc:CartesianChart
                 x:Name="Chart"
-                Background="Transparent"
                 Grid.Row="2"
                 Margin="-12,8,-16,-12"
                 Padding="2"
                 x:Load="False"
+                Background="Transparent"
                 IsHitTestVisible="False"
                 Loaded="Chart_Loaded" />
         </Grid>
diff --git a/src/Platforms/SecureFolderFS.Uno/UserControls/GraphControl.xaml.cs b/src/Platforms/SecureFolderFS.Uno/UserControls/GraphControl.xaml.cs
index 3c32a901e..2402e90cc 100644
--- a/src/Platforms/SecureFolderFS.Uno/UserControls/GraphControl.xaml.cs
+++ b/src/Platforms/SecureFolderFS.Uno/UserControls/GraphControl.xaml.cs
@@ -1,9 +1,7 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using System.Threading.Tasks;
-using LiveChartsCore;
 using LiveChartsCore.Drawing;
-using LiveChartsCore.Kernel.Sketches;
 using LiveChartsCore.SkiaSharpView;
 using LiveChartsCore.SkiaSharpView.Painting;
 using LiveChartsCore.SkiaSharpView.WinUI;
@@ -50,8 +48,8 @@ private async void Chart_Loaded(object sender, RoutedEventArgs e)
             if (sender is not CartesianChart chart)
                 return;
 
-            chart.Series = new ISeries[]
-            {
+            chart.Series =
+            [
                 new LineSeries<double>()
                 {
                     Values = Data,
@@ -67,17 +65,17 @@ private async void Chart_Loaded(object sender, RoutedEventArgs e)
                     IsHoverable = false,
                     GeometrySize = 0d // TODO: Setting this to 0 causes a bug with jumping line series
                 }
-            };
-            chart.XAxes = new ICartesianAxis[]
-            {
+            ];
+            chart.XAxes =
+            [
                 new Axis()
                 {
                     Labeler = x => string.Empty,
                     ShowSeparatorLines = false
                 }
-            };
-            chart.YAxes = new ICartesianAxis[]
-            {
+            ];
+            chart.YAxes =
+            [
                 new Axis()
                 {
                     ShowSeparatorLines = false,
@@ -85,7 +83,7 @@ private async void Chart_Loaded(object sender, RoutedEventArgs e)
                     LabelsPaint = new SolidColorPaint(SKColors.Gray),
                     MinLimit = 0d
                 }
-            };
+            ];
 
             await Task.Delay(25);
             GraphLoaded = true;
@@ -96,13 +94,13 @@ private void RootButton_Click(object sender, RoutedEventArgs e)
             Click?.Invoke(sender, e);
         }
 
-        public ICollection? Data
+        public ICollection<double>? Data
         {
-            get => (ICollection?)GetValue(DataProperty);
+            get => (ICollection<double>?)GetValue(DataProperty);
             set => SetValue(DataProperty, value);
         }
         public static readonly DependencyProperty DataProperty =
-            DependencyProperty.Register(nameof(Data), typeof(ICollection), typeof(GraphControl), new PropertyMetadata(defaultValue: null));
+            DependencyProperty.Register(nameof(Data), typeof(ICollection<double>), typeof(GraphControl), new PropertyMetadata(defaultValue: null));
 
         public string? GraphHeader
         {
diff --git a/src/Platforms/SecureFolderFS.Uno/UserControls/InterfaceHost/MainAppHostControl.xaml b/src/Platforms/SecureFolderFS.Uno/UserControls/InterfaceHost/MainAppHostControl.xaml
index 4b123a298..b062b7c57 100644
--- a/src/Platforms/SecureFolderFS.Uno/UserControls/InterfaceHost/MainAppHostControl.xaml
+++ b/src/Platforms/SecureFolderFS.Uno/UserControls/InterfaceHost/MainAppHostControl.xaml
@@ -16,14 +16,18 @@
 
     <UserControl.Resources>
         <vc:BoolToStringConverter x:Key="BoolToStringConverter" />
-        <vc:BoolInvertConverter x:Key="BoolInvertConverter" />
+        <vc:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
         <vc:DateTimeToStringConverter x:Key="DateTimeToStringConverter" />
-        <vc:NullToBoolConverter x:Key="NullToBoolConverter" />
+        <vc:NullToVisibilityConverter x:Key="NullToVisibilityConverter" />
+        <vc:IconSourceConverter x:Key="IconSourceConverter" />
     </UserControl.Resources>
 
     <NavigationView
         x:Name="Sidebar"
+        AllowDrop="True"
         DisplayModeChanged="Sidebar_DisplayModeChanged"
+        DragOver="Sidebar_DragOver"
+        Drop="Sidebar_Drop"
         ExpandedModeThresholdWidth="816"
         IsBackButtonVisible="Collapsed"
         IsPaneToggleButtonVisible="True"
@@ -33,10 +37,7 @@
         PaneClosed="Sidebar_PaneClosed"
         PaneTitle="{x:Bind Sidebar.IsPaneOpen, Mode=OneWay, Converter={StaticResource BoolToStringConverter}, ConverterParameter='false:STANDARD|:true:LOCALIZE|MyVaults'}"
         SelectedItem="{x:Bind ViewModel.VaultListViewModel.SelectedItem, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-        SelectionChanged="Sidebar_SelectionChanged"
-        AllowDrop="True"
-        DragOver="Sidebar_DragOver"
-        Drop="Sidebar_Drop">
+        SelectionChanged="Sidebar_SelectionChanged">
 
         <Grid>
             <Grid
@@ -55,6 +56,8 @@
                     Click="PaneShowButton_Click"
                     CornerRadius="0 6 6 0"
                     Visibility="Collapsed">
+
+                    <!--  TODO: Blocked by Uno - https://github.com/unoplatform/uno/pull/18267  -->
                     <!--<anim:Implicit.ShowAnimations>
                         <anim:TranslationAnimation
                             EasingMode="EaseOut"
@@ -79,7 +82,7 @@
         <NavigationView.AutoSuggestBox>
             <AutoSuggestBox
                 ItemsSource="{x:Bind ViewModel.VaultListViewModel.SearchViewModel.SearchItems, Mode=OneWay}"
-                PlaceholderText="{l:ResourceString Name=Search}"
+                PlaceholderText="{l:ResourceString Rid=Search}"
                 QueryIcon="Find"
                 QuerySubmitted="SidebarSearchBox_QuerySubmitted"
                 TextChanged="SidebarSearchBox_TextChanged" />
@@ -101,7 +104,7 @@
                     VerticalAlignment="Center"
                     HorizontalContentAlignment="Center"
                     VerticalContentAlignment="Center"
-                    AutomationProperties.Name="{l:ResourceString Name=NewVault}"
+                    AutomationProperties.Name="{l:ResourceString Rid=NewVault}"
                     Command="{x:Bind ViewModel.VaultListViewModel.AddNewVaultCommand, Mode=OneWay}"
                     Style="{ThemeResource AccentButtonStyle}"
                     Visibility="{x:Bind Sidebar.IsPaneOpen, Mode=OneWay}">
@@ -110,9 +113,11 @@
                             Margin="2,0,2,-4"
                             FontSize="16"
                             Glyph="&#xECC8;" />
-                        <TextBlock Text="{l:ResourceString Name=NewVault}" />
+                        <TextBlock Text="{l:ResourceString Rid=NewVault}" />
                     </StackPanel>
                 </Button>
+
+                <!--  TODO(uno): #18589  -->
                 <Button
                     x:Name="CompactAddVaultButton"
                     Grid.Column="0"
@@ -122,10 +127,10 @@
                     VerticalAlignment="Center"
                     HorizontalContentAlignment="Center"
                     VerticalContentAlignment="Center"
-                    x:Load="{x:Bind Sidebar.IsPaneOpen, Mode=OneWay, Converter={StaticResource BoolInvertConverter}}"
-                    AutomationProperties.Name="{l:ResourceString Name=NewVault}"
+                    AutomationProperties.Name="{l:ResourceString Rid=NewVault}"
                     Command="{x:Bind ViewModel.VaultListViewModel.AddNewVaultCommand, Mode=OneWay}"
-                    Style="{ThemeResource AccentButtonStyle}">
+                    Style="{ThemeResource AccentButtonStyle}"
+                    Visibility="{x:Bind Sidebar.IsPaneOpen, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}, ConverterParameter='invert'}">
                     <FontIcon FontSize="16" Glyph="&#xECC8;" />
                 </Button>
 
@@ -138,7 +143,7 @@
                     VerticalAlignment="Center"
                     HorizontalContentAlignment="Center"
                     VerticalContentAlignment="Center"
-                    AutomationProperties.Name="{l:ResourceString Name=Settings}"
+                    AutomationProperties.Name="{l:ResourceString Rid=Settings}"
                     Background="Transparent"
                     BorderThickness="0"
                     Command="{x:Bind ViewModel.OpenSettingsCommand, Mode=OneWay}"
@@ -155,6 +160,7 @@
 
                 <win:TeachingTip
                     x:Name="BetaTeachingTip"
+                    Grid.Column="0"
                     MaxWidth="100"
                     x:FieldModifier="public"
                     CloseButtonClick="TeachingTip_CloseButtonClick"
@@ -171,40 +177,103 @@
             <DataTemplate x:DataType="vm:VaultListItemViewModel">
                 <NavigationViewItem
                     Height="64"
-                    AutomationProperties.Name="{x:Bind VaultModel.VaultName, Mode=OneWay}"
-                    ToolTipService.ToolTip="{x:Bind VaultModel.VaultName, Mode=OneWay}">
+                    AutomationProperties.Name="{x:Bind VaultViewModel.VaultModel.VaultName, Mode=OneWay}"
+                    ToolTipService.ToolTip="{x:Bind VaultViewModel.VaultModel.VaultName, Mode=OneWay}">
                     <NavigationViewItem.Icon>
-                        <FontIcon Glyph="&#xF540;" />
+                        <IconSourceElement IconSource="{x:Bind CustomIcon, Mode=OneWay, Converter={StaticResource IconSourceConverter}, ConverterParameter='&#xF540;'}" />
                     </NavigationViewItem.Icon>
                     <NavigationViewItem.Content>
-                        <StackPanel>
-                            <!--  Vault name  -->
-                            <TextBlock
-                                FontWeight="SemiBold"
-                                Text="{x:Bind VaultModel.VaultName, Mode=OneWay}"
-                                TextTrimming="CharacterEllipsis" />
-
-                            <!--  Last opened  -->
-                            <TextBlock
-                                x:Name="LastOpenedText"
-                                x:Load="{x:Bind LastAccessDate, Mode=OneWay, Converter={StaticResource NullToBoolConverter}}"
-                                FontSize="12"
-                                Opacity="0.6"
-                                Text="{x:Bind LastAccessDate, Mode=OneWay, Converter={StaticResource DateTimeToStringConverter}}" />
-                        </StackPanel>
+                        <Grid DataContext="{x:Bind}">
+                            <StackPanel Visibility="{x:Bind IsRenaming, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}, ConverterParameter='invert'}">
+                                <StackPanel.ChildrenTransitions>
+                                    <TransitionCollection>
+                                        <RepositionThemeTransition />
+                                    </TransitionCollection>
+                                </StackPanel.ChildrenTransitions>
+
+                                <!--  Vault name  -->
+                                <TextBlock
+                                    FontWeight="SemiBold"
+                                    Text="{x:Bind VaultViewModel.VaultName, Mode=OneWay}"
+                                    TextTrimming="CharacterEllipsis" />
+
+                                <!--  Last opened  -->
+                                <TextBlock
+                                    x:Name="LastOpenedText"
+                                    FontSize="12"
+                                    Opacity="0.6"
+                                    Text="{x:Bind VaultViewModel.LastAccessDate, Mode=OneWay, Converter={StaticResource DateTimeToStringConverter}}"
+                                    Visibility="{x:Bind VaultViewModel.LastAccessDate, Mode=OneWay, Converter={StaticResource NullToVisibilityConverter}}" />
+                            </StackPanel>
+                            <TextBox
+                                x:Name="RenameBox"
+                                VerticalAlignment="Center"
+                                x:Load="{x:Bind IsRenaming, Mode=OneWay}"
+                                KeyDown="RenameBox_KeyDown"
+                                Loaded="RenameBox_Loaded"
+                                LostFocus="RenameBox_LostFocus"
+                                Text="{x:Bind VaultViewModel.VaultName, Mode=OneWay}" />
+                        </Grid>
                     </NavigationViewItem.Content>
                     <NavigationViewItem.ContextFlyout>
                         <MenuFlyout>
-                            <!--  TODO: Determine the description and icon and update the item: "Show in Files"  -->
-                            <MenuFlyoutItem Command="{x:Bind RevealFolderCommand, Mode=OneWay}" Text="{l:ResourceString Name=ShowEncryptedVault}">
+                            <!--  Show in Explorer  -->
+                            <MenuFlyoutItem Command="{x:Bind RevealFolderCommand, Mode=OneWay}" Text="{l:ResourceString Rid=ShowEncryptedVault}">
                                 <MenuFlyoutItem.Icon>
                                     <FontIcon Glyph="&#xED25;" />
                                 </MenuFlyoutItem.Icon>
                             </MenuFlyoutItem>
+
+                            <!--  Rename  -->
+                            <MenuFlyoutSeparator />
+                            <MenuFlyoutItem
+                                Click="Rename_Click"
+                                DataContext="{x:Bind}"
+                                Text="{l:ResourceString Rid=Rename}">
+                                <MenuFlyoutItem.Icon>
+                                    <FontIcon Glyph="&#xE8AC;" />
+                                </MenuFlyoutItem.Icon>
+                            </MenuFlyoutItem>
+
+                            <!--  Change icon  -->
+                            <MenuFlyoutItem
+                                Command="{x:Bind CustomizeCommand, Mode=OneWay}"
+                                CommandParameter="Icon"
+                                Text="Change icon">
+                                <MenuFlyoutItem.Icon>
+                                    <FontIcon Glyph="&#xE70F;" />
+                                </MenuFlyoutItem.Icon>
+                            </MenuFlyoutItem>
+
+                            <!--  Move up/down  -->
+                            <MenuFlyoutSeparator Visibility="{x:Bind CanMove, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
+                            <MenuFlyoutItem
+                                x:Name="MoveUp"
+                                Command="{x:Bind MoveItemCommand, Mode=OneWay}"
+                                CommandParameter="up"
+                                Text="{l:ResourceString Rid=MoveUp}"
+                                Visibility="{x:Bind CanMoveUp, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
+                                <MenuFlyoutItem.Icon>
+                                    <FontIcon Glyph="&#xE70E;" />
+                                </MenuFlyoutItem.Icon>
+                            </MenuFlyoutItem>
+                            <MenuFlyoutItem
+                                x:Name="MoveDown"
+                                Command="{x:Bind MoveItemCommand, Mode=OneWay}"
+                                CommandParameter="down"
+                                Text="{l:ResourceString Rid=MoveDown}"
+                                Visibility="{x:Bind CanMoveDown, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
+                                <MenuFlyoutItem.Icon>
+                                    <FontIcon Glyph="&#xE70D;" />
+                                </MenuFlyoutItem.Icon>
+                            </MenuFlyoutItem>
+
+                            <!--  Remove  -->
+                            <MenuFlyoutSeparator />
                             <MenuFlyoutItem
                                 Command="{x:Bind RemoveVaultCommand, Mode=OneWay}"
                                 IsEnabled="{x:Bind CanRemoveVault, Mode=OneWay}"
-                                Text="{l:ResourceString Name=RemoveFromList}">
+                                Text="{l:ResourceString Rid=RemoveFromList}">
                                 <MenuFlyoutItem.Icon>
                                     <FontIcon Glyph="&#xE738;" />
                                 </MenuFlyoutItem.Icon>
diff --git a/src/Platforms/SecureFolderFS.Uno/UserControls/InterfaceHost/MainAppHostControl.xaml.cs b/src/Platforms/SecureFolderFS.Uno/UserControls/InterfaceHost/MainAppHostControl.xaml.cs
index e0cf823eb..a297bb356 100644
--- a/src/Platforms/SecureFolderFS.Uno/UserControls/InterfaceHost/MainAppHostControl.xaml.cs
+++ b/src/Platforms/SecureFolderFS.Uno/UserControls/InterfaceHost/MainAppHostControl.xaml.cs
@@ -5,17 +5,19 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Input;
-using OwlCore.Storage.System.IO;
+using SecureFolderFS.Sdk.Contexts;
 using SecureFolderFS.Sdk.Messages;
-using SecureFolderFS.Sdk.Models;
 using SecureFolderFS.Sdk.Services;
+using SecureFolderFS.Sdk.ViewModels;
 using SecureFolderFS.Sdk.ViewModels.Controls.VaultList;
 using SecureFolderFS.Sdk.ViewModels.Views.Host;
 using SecureFolderFS.Sdk.ViewModels.Views.Vault;
 using SecureFolderFS.Shared;
 using SecureFolderFS.Shared.Extensions;
+using SecureFolderFS.Storage.SystemStorageEx;
 using SecureFolderFS.UI.Helpers;
 using Windows.ApplicationModel.DataTransfer;
+using Windows.System;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
@@ -44,7 +46,7 @@ public void Receive(RemoveVaultMessage message)
         /// <inheritdoc/>
         public void Receive(AddVaultMessage message)
         {
-#if WINDOWS // TODO(u win)
+#if WINDOWS
             if (ViewModel?.VaultListViewModel.Items.Count >= SecureFolderFS.Sdk.Constants.Vault.MAX_FREE_AMOUNT_OF_VAULTS
                 && !SettingsService.AppSettings.WasBetaNotificationShown1)
             {
@@ -53,17 +55,17 @@ public void Receive(AddVaultMessage message)
 #endif
         }
 
-        private async Task NavigateToItem(IVaultModel vaultModel)
+        private async Task NavigateToItem(VaultViewModel vaultViewModel)
         {
             await SetupNavigationAsync();
             if (ViewModel is null)
                 return;
             
             // Find existing target or create new
-            var target = ViewModel.NavigationService.Views.FirstOrDefault(x => (x as BaseVaultViewModel)?.VaultModel.Equals(vaultModel) ?? false);
+            var target = ViewModel.NavigationService.Views.FirstOrDefault(x => (x as IVaultViewContext)?.VaultViewModel.VaultModel.Equals(vaultViewModel.VaultModel) ?? false);
             if (target is null)
             {
-                var vaultLoginViewModel = new VaultLoginViewModel(vaultModel, ViewModel.NavigationService);
+                var vaultLoginViewModel = new VaultLoginViewModel(vaultViewModel, ViewModel.NavigationService);
                 _ = vaultLoginViewModel.InitAsync();
                 target = vaultLoginViewModel;
             }
@@ -85,6 +87,57 @@ private async Task SetupNavigationAsync()
             }
         }
 
+        private void Rename_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is not MenuFlyoutItem menuItem)
+                return;
+
+            if (menuItem is not { DataContext: VaultListItemViewModel itemViewModel })
+                return;
+
+            itemViewModel.IsRenaming = true;
+        }
+
+        private async void RenameBox_KeyDown(object sender, KeyRoutedEventArgs e)
+        {
+            if (sender is not TextBox { DataContext: VaultListItemViewModel itemViewModel } textBox)
+                return;
+
+            switch (e.Key)
+            {
+                case VirtualKey.Enter:
+                {
+                    e.Handled = true;
+                    await itemViewModel.RenameCommand.ExecuteAsync(textBox.Text);
+                    break;
+                }
+
+                case VirtualKey.Escape:
+                {
+                    itemViewModel.IsRenaming = false;
+                    break;
+                }
+            }
+        }
+
+        private void RenameBox_Loaded(object sender, RoutedEventArgs e)
+        {
+            if (sender is not TextBox { DataContext: VaultListItemViewModel itemViewModel } textBox)
+                return;
+
+            textBox.Focus(FocusState.Programmatic);
+            textBox.Text = itemViewModel.VaultViewModel.VaultName;
+            textBox.SelectAll();
+        }
+
+        private void RenameBox_LostFocus(object sender, RoutedEventArgs e)
+        {
+            if (sender is not TextBox { DataContext: VaultListItemViewModel itemViewModel })
+                return;
+
+            itemViewModel.IsRenaming = false;
+        }
+
         private async void MainAppHostControl_Loaded(object sender, RoutedEventArgs e)
         {
             WeakReferenceMessenger.Default.Register<RemoveVaultMessage>(this);
@@ -96,17 +149,17 @@ private async void MainAppHostControl_Loaded(object sender, RoutedEventArgs e)
         private async void Sidebar_SelectionChanged(NavigationView sender, NavigationViewSelectionChangedEventArgs args)
         {
             if (args.SelectedItem is VaultListItemViewModel itemViewModel) 
-                await NavigateToItem(itemViewModel.VaultModel);
+                await NavigateToItem(itemViewModel.VaultViewModel);
         }
 
         private async void SidebarSearchBox_QuerySubmitted(AutoSuggestBox sender, AutoSuggestBoxQuerySubmittedEventArgs args)
         {
-            var chosenItem = ViewModel!.VaultListViewModel.Items.FirstOrDefault(x => x.VaultModel.VaultName.Equals(args.ChosenSuggestion));
+            var chosenItem = ViewModel!.VaultListViewModel.Items.FirstOrDefault(x => x.VaultViewModel.VaultName.Equals(args.ChosenSuggestion));
             if (chosenItem is null)
                 return;
 
             Sidebar.SelectedItem  = chosenItem;
-            await NavigateToItem(chosenItem.VaultModel);
+            await NavigateToItem(chosenItem.VaultViewModel);
         }
 
         private async void SidebarSearchBox_TextChanged(AutoSuggestBox sender, AutoSuggestBoxTextChangedEventArgs args)
@@ -146,7 +199,7 @@ private async void Sidebar_Drop(object sender, DragEventArgs e)
 
             // Recreate as SystemFolder for best performance.
             // The logic can be changed to handle Platform Storage Items in the future, if needed.
-            var folder = new SystemFolder(item.Path);
+            var folder = new SystemFolderEx(item.Path);
             await ViewModel.VaultListViewModel.AddNewVaultCommand.ExecuteAsync(folder);
         }
 
diff --git a/src/Platforms/SecureFolderFS.Uno/UserControls/InterfaceHost/NoVaultsAppHostControl.xaml b/src/Platforms/SecureFolderFS.Uno/UserControls/InterfaceHost/NoVaultsAppHostControl.xaml
index da84b121f..9e2ec8959 100644
--- a/src/Platforms/SecureFolderFS.Uno/UserControls/InterfaceHost/NoVaultsAppHostControl.xaml
+++ b/src/Platforms/SecureFolderFS.Uno/UserControls/InterfaceHost/NoVaultsAppHostControl.xaml
@@ -35,13 +35,13 @@
                     HorizontalAlignment="Center"
                     FontSize="22"
                     FontWeight="SemiBold"
-                    Text="{l:ResourceString Name=Welcome}" />
+                    Text="{l:ResourceString Rid=Welcome}" />
 
                 <TextBlock
                     MaxWidth="450"
                     HorizontalAlignment="Center"
                     Opacity="0.6"
-                    Text="{l:ResourceString Name=NoVaultsMessage}"
+                    Text="{l:ResourceString Rid=NoVaultsMessage}"
                     TextAlignment="Center"
                     TextWrapping="WrapWholeWords" />
             </StackPanel>
@@ -52,7 +52,7 @@
                 Padding="32,6"
                 HorizontalAlignment="Center"
                 Command="{x:Bind ViewModel.AddNewVaultCommand, Mode=OneWay}"
-                Content="{l:ResourceString Name=NewVault}"
+                Content="{l:ResourceString Rid=NewVault}"
                 Style="{ThemeResource AccentButtonStyle}" />
         </Grid>
 
@@ -67,7 +67,7 @@
             VerticalAlignment="Bottom"
             HorizontalContentAlignment="Center"
             VerticalContentAlignment="Center"
-            AutomationProperties.Name="{l:ResourceString Name=Settings}"
+            AutomationProperties.Name="{l:ResourceString Rid=Settings}"
             Background="Transparent"
             BorderThickness="0"
             Command="{x:Bind ViewModel.OpenSettingsCommand, Mode=OneWay}">
diff --git a/src/Platforms/SecureFolderFS.Uno/UserControls/InterfaceRoot/DebugWindowRootControl.xaml b/src/Platforms/SecureFolderFS.Uno/UserControls/InterfaceRoot/DebugWindowRootControl.xaml
new file mode 100644
index 000000000..fb0f42d99
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Uno/UserControls/InterfaceRoot/DebugWindowRootControl.xaml
@@ -0,0 +1,43 @@
+<UserControl
+    x:Class="SecureFolderFS.Uno.UserControls.InterfaceRoot.DebugWindowRootControl"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="300"
+    d:DesignWidth="400"
+    mc:Ignorable="d">
+
+    <Border Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+        <NavigationView
+            IsBackButtonVisible="Collapsed"
+            IsSettingsVisible="False"
+            PaneDisplayMode="Top"
+            SelectionChanged="NavigationView_SelectionChanged">
+            <NavigationView.MenuItems>
+
+                <!--  App Control  -->
+                <NavigationViewItem
+                    Content="App Control"
+                    IsSelected="True"
+                    Tag="0">
+                    <NavigationViewItem.Icon>
+                        <FontIcon Glyph="&#xE12A;" />
+                    </NavigationViewItem.Icon>
+                </NavigationViewItem>
+
+                <!--  File System Log  -->
+                <NavigationViewItem Content="File System Log" Tag="1">
+                    <NavigationViewItem.Icon>
+                        <FontIcon Glyph="&#xEADF;" />
+                    </NavigationViewItem.Icon>
+                </NavigationViewItem>
+            </NavigationView.MenuItems>
+
+            <!--  Display frame  -->
+            <ScrollViewer Width="644">
+                <Frame x:Name="Navigation" />
+            </ScrollViewer>
+        </NavigationView>
+    </Border>
+</UserControl>
diff --git a/src/Platforms/SecureFolderFS.Uno/UserControls/InterfaceRoot/DebugWindowRootControl.xaml.cs b/src/Platforms/SecureFolderFS.Uno/UserControls/InterfaceRoot/DebugWindowRootControl.xaml.cs
new file mode 100644
index 000000000..1032fa9b7
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Uno/UserControls/InterfaceRoot/DebugWindowRootControl.xaml.cs
@@ -0,0 +1,30 @@
+using System;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media.Animation;
+using SecureFolderFS.Uno.Views.DebugViews;
+
+// The User Control item template is documented at https://go.microsoft.com/fwlink/?LinkId=234236
+
+namespace SecureFolderFS.Uno.UserControls.InterfaceRoot
+{
+    public sealed partial class DebugWindowRootControl : UserControl
+    {
+        public DebugWindowRootControl()
+        {
+            InitializeComponent();
+        }
+
+        private void NavigationView_SelectionChanged(NavigationView sender, NavigationViewSelectionChangedEventArgs args)
+        {
+            var tag = Convert.ToInt32((args.SelectedItem as NavigationViewItem)?.Tag);
+            var pageType = tag switch
+            {
+                0 => typeof(DebugAppControlPage),
+                1 => typeof(DebugFileSystemLogPage),
+                _ => throw new ArgumentOutOfRangeException(nameof(tag))
+            };
+
+            Navigation.Navigate(pageType, null, new EntranceNavigationTransitionInfo());
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Uno/UserControls/InterfaceRoot/MainWindowRootControl.xaml b/src/Platforms/SecureFolderFS.Uno/UserControls/InterfaceRoot/MainWindowRootControl.xaml
index 1f2632082..8a7161bc3 100644
--- a/src/Platforms/SecureFolderFS.Uno/UserControls/InterfaceRoot/MainWindowRootControl.xaml
+++ b/src/Platforms/SecureFolderFS.Uno/UserControls/InterfaceRoot/MainWindowRootControl.xaml
@@ -3,18 +3,23 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:hni="using:H.NotifyIcon"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:not_win="http://uno.ui/not_win"
+    xmlns:svfs="using:SecureFolderFS.Storage.VirtualFileSystem"
     xmlns:ts="using:SecureFolderFS.Uno.TemplateSelectors"
     xmlns:uc="using:SecureFolderFS.Uno.UserControls"
     xmlns:uc2="using:SecureFolderFS.Uno.UserControls.InterfaceHost"
     xmlns:uc3="using:SecureFolderFS.Uno.UserControls.Navigation"
+    xmlns:vc="using:SecureFolderFS.Uno.ValueConverters"
     xmlns:vm="using:SecureFolderFS.Sdk.ViewModels.Views.Host"
     xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     Loaded="MainWindowRootControl_Loaded"
     mc:Ignorable="d not_win">
 
     <UserControl.Resources>
+        <vc:CountToBoolConverter x:Key="CountToBoolConverter" />
+
         <DataTemplate x:Key="MainAppHostDataTemplate" x:DataType="vm:MainHostViewModel">
             <uc2:MainAppHostControl ViewModel="{x:Bind}" />
         </DataTemplate>
@@ -44,5 +49,57 @@
                 <ts:InterfaceHostTemplateSelector MainAppHostDataTemplate="{StaticResource MainAppHostDataTemplate}" NoVaultsAppHostDataTemplate="{StaticResource NoVaultsAppHostDataTemplate}" />
             </uc3:RootNavigationControl.TemplateSelector>
         </uc3:RootNavigationControl>
+
+        <!--  Debugging Button  -->
+        <Button
+            x:Name="DebugButton"
+            Grid.Row="0"
+            Grid.RowSpan="2"
+            Width="32"
+            Height="32"
+            Padding="0"
+            HorizontalAlignment="Right"
+            VerticalAlignment="Bottom"
+            x:FieldModifier="public"
+            x:Load="{x:Bind IsDebugging, Mode=OneWay}"
+            Click="DebugButton_Click">
+            <FontIcon Glyph="&#xEBE8;" />
+        </Button>
+
+        <!--  Taskbar Icon  -->
+        <win:Border Grid.Row="0">
+            <hni:TaskbarIcon
+                x:Name="TaskbarIcon"
+                ContextMenuMode="SecondWindow"
+                DoubleClickCommand="{x:Bind TaskbarIconDoubleClickCommand, Mode=OneWay}"
+                IconSource="ms-appx:///Assets/Icons/app_icon.ico"
+                MenuActivation="LeftOrRightClick"
+                PopupActivation="DoubleClick"
+                ToolTipText="SecureFolderFS">
+                <hni:TaskbarIcon.ContextFlyout>
+                    <MenuFlyout Placement="Top">
+                        <MenuFlyoutItem Click="MenuShowApp_Click" Text="View in app">
+                            <MenuFlyoutItem.Icon>
+                                <FontIcon Glyph="&#xE8A7;" />
+                            </MenuFlyoutItem.Icon>
+                        </MenuFlyoutItem>
+                        <MenuFlyoutItem
+                            Click="MenuLockAll_Click"
+                            IsEnabled="{x:Bind svfs:FileSystemManager.Instance.FileSystems.Count, Mode=OneWay, Converter={StaticResource CountToBoolConverter}}"
+                            Text="Lock all vaults">
+                            <MenuFlyoutItem.Icon>
+                                <FontIcon Glyph="&#xE72E;" />
+                            </MenuFlyoutItem.Icon>
+                        </MenuFlyoutItem>
+                        <MenuFlyoutSeparator />
+                        <MenuFlyoutItem Click="MenuCloseApp_Click" Text="Exit">
+                            <MenuFlyoutItem.Icon>
+                                <FontIcon Glyph="&#xF78A;" />
+                            </MenuFlyoutItem.Icon>
+                        </MenuFlyoutItem>
+                    </MenuFlyout>
+                </hni:TaskbarIcon.ContextFlyout>
+            </hni:TaskbarIcon>
+        </win:Border>
     </Grid>
 </UserControl>
diff --git a/src/Platforms/SecureFolderFS.Uno/UserControls/InterfaceRoot/MainWindowRootControl.xaml.cs b/src/Platforms/SecureFolderFS.Uno/UserControls/InterfaceRoot/MainWindowRootControl.xaml.cs
index 0c60f0fec..e235144be 100644
--- a/src/Platforms/SecureFolderFS.Uno/UserControls/InterfaceRoot/MainWindowRootControl.xaml.cs
+++ b/src/Platforms/SecureFolderFS.Uno/UserControls/InterfaceRoot/MainWindowRootControl.xaml.cs
@@ -1,8 +1,14 @@
 using System;
+using System.Diagnostics;
+using System.Threading;
 using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using SecureFolderFS.Sdk.Extensions;
+using SecureFolderFS.Sdk.Messages;
 using SecureFolderFS.Sdk.Services;
 using SecureFolderFS.Sdk.ViewModels;
 using SecureFolderFS.Sdk.ViewModels.Views.Host;
@@ -16,9 +22,19 @@
 
 namespace SecureFolderFS.Uno.UserControls.InterfaceRoot
 {
+    [INotifyPropertyChanged]
     public sealed partial class MainWindowRootControl : UserControl
     {
-        private INavigationService RootNavigationService { get; } = DI.Service<INavigationService>();
+        public INavigationService RootNavigationService { get; } = DI.Service<INavigationService>();
+
+        public SynchronizationContext? Context { get; }
+
+        public bool IsDebugging { get; } =
+#if DEBUG
+            Debugger.IsAttached;
+#else
+            false;
+#endif
 
         public MainViewModel? ViewModel
         {
@@ -29,6 +45,7 @@ public MainViewModel? ViewModel
         public MainWindowRootControl()
         {
             InitializeComponent();
+            Context = SynchronizationContext.Current;
             ViewModel = new();
         }
 
@@ -70,5 +87,53 @@ private async Task EnsureRootAsync()
                 await RootNavigationService.TryNavigateAsync(() => new EmptyHostViewModel(RootNavigationService, ViewModel.VaultCollectionModel), false);
             }
         }
+
+        private void DebugButton_Click(object sender, RoutedEventArgs e)
+        {
+#if DEBUG
+            var window = new Window()
+            {
+                Content = new DebugWindowRootControl(),
+#if !__IOS__
+                Title = $"{nameof(SecureFolderFS)} Debug Window",
+#endif
+            };
+#if WINDOWS
+            window.AppWindow?.MoveAndResize(new(100, 100, 700, 900));
+#endif
+
+            global::Uno.UI.WindowExtensions.EnableHotReload(window);
+            window.Activate();
+#endif
+        }
+
+        [RelayCommand]
+        private void TaskbarIconDoubleClick()
+        {
+            App.Instance?.MainWindow?.Activate();
+        }
+
+        private void MenuCloseApp_Click(object sender, RoutedEventArgs e)
+        {
+            if (App.Instance is null)
+                return;
+
+            App.Instance.UseForceClose = true;
+            Application.Current.Exit();
+        }
+
+        private void MenuShowApp_Click(object sender, RoutedEventArgs e)
+        {
+            App.Instance?.MainWindow?.Activate();
+        }
+
+        private void MenuLockAll_Click(object sender, RoutedEventArgs e)
+        {
+            if (ViewModel is null)
+                return;
+
+            foreach (var item in ViewModel.VaultCollectionModel)
+                WeakReferenceMessenger.Default.Send(new VaultLockRequestedMessage(item));
+        }
     }
 }
diff --git a/src/Platforms/SecureFolderFS.Uno/UserControls/Introduction/WelcomeScreen.xaml b/src/Platforms/SecureFolderFS.Uno/UserControls/Introduction/WelcomeScreen.xaml
index d294c896b..66bc0f475 100644
--- a/src/Platforms/SecureFolderFS.Uno/UserControls/Introduction/WelcomeScreen.xaml
+++ b/src/Platforms/SecureFolderFS.Uno/UserControls/Introduction/WelcomeScreen.xaml
@@ -18,7 +18,7 @@
             Height="56"
             HorizontalAlignment="Center"
             VerticalAlignment="Bottom"
-            Source="ms-appx://SecureFolderFS.UI/Assets/AppAssets/AppIcon.png" />
+            Source="ms-appx://SecureFolderFS.UI/Assets/AppAssets/app_icon.png" />
 
         <TextBlock
             Grid.Row="1"
diff --git a/src/Platforms/SecureFolderFS.Uno/UserControls/LoginControl.xaml b/src/Platforms/SecureFolderFS.Uno/UserControls/LoginControl.xaml
index 040a4c772..6433d00bf 100644
--- a/src/Platforms/SecureFolderFS.Uno/UserControls/LoginControl.xaml
+++ b/src/Platforms/SecureFolderFS.Uno/UserControls/LoginControl.xaml
@@ -7,8 +7,9 @@
     xmlns:local="using:SecureFolderFS.Uno.UserControls"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ts="using:SecureFolderFS.Uno.TemplateSelectors"
+    xmlns:uc="using:SecureFolderFS.Uno.UserControls"
     xmlns:vc="using:SecureFolderFS.Uno.ValueConverters"
-    xmlns:vm="using:SecureFolderFS.UI.ViewModels"
+    xmlns:vm="using:SecureFolderFS.UI.ViewModels.Authentication"
     xmlns:vm2="using:SecureFolderFS.Uno.ViewModels"
     xmlns:vm3="using:SecureFolderFS.Sdk.ViewModels.Controls.Authentication"
     x:Name="ThisLoginControl"
@@ -35,7 +36,7 @@
                     HorizontalAlignment="Center"
                     Click="ContinueButton_Click"
                     Command="{x:Bind ProvideCredentialsCommand, Mode=OneWay}"
-                    Content="{l:ResourceString Name=Continue}"
+                    Content="{l:ResourceString Rid=Continue}"
                     Style="{ThemeResource AccentButtonStyle}"
                     Visibility="{Binding Path=ProvideContinuationButton, ElementName=ThisLoginControl, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
             </StackPanel>
@@ -54,14 +55,14 @@
                 <TextBlock
                     HorizontalAlignment="Center"
                     Opacity="0.8"
-                    Text="{l:ResourceString Name=LoginKeyFile}" />
+                    Text="{l:ResourceString Rid=LoginKeyFile}" />
 
                 <!--  Authenticate  -->
                 <Button
                     Padding="24,6"
                     HorizontalAlignment="Center"
                     Command="{x:Bind ProvideCredentialsCommand, Mode=OneWay}"
-                    Content="{l:ResourceString Name=Authenticate}"
+                    Content="{l:ResourceString Rid=Authenticate}"
                     Style="{ThemeResource AccentButtonStyle}"
                     Visibility="{Binding Path=ProvideContinuationButton, ElementName=ThisLoginControl, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
             </StackPanel>
@@ -80,14 +81,14 @@
                 <TextBlock
                     HorizontalAlignment="Center"
                     Opacity="0.8"
-                    Text="{l:ResourceString Name=LoginWindowsHello}" />
+                    Text="{l:ResourceString Rid=LoginWindowsHello}" />
 
                 <!--  Authenticate  -->
                 <Button
                     Padding="24,6"
                     HorizontalAlignment="Center"
                     Command="{x:Bind ProvideCredentialsCommand, Mode=OneWay}"
-                    Content="{l:ResourceString Name=Authenticate}"
+                    Content="{l:ResourceString Rid=Authenticate}"
                     Style="{ThemeResource AccentButtonStyle}"
                     Visibility="{Binding Path=ProvideContinuationButton, ElementName=ThisLoginControl, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
             </StackPanel>
@@ -100,7 +101,7 @@
                 <InfoBar
                     IsClosable="False"
                     IsOpen="True"
-                    Message="{l:ResourceString Name=VaultNeedsMigration}"
+                    Message="{l:ResourceString Rid=VaultNeedsMigration}"
                     Severity="Informational" />
 
                 <!--  Migrate  -->
@@ -109,7 +110,7 @@
                     Padding="24,6"
                     HorizontalAlignment="Center"
                     Command="{x:Bind OpenMigrationOverlayCommand, Mode=OneWay}"
-                    Content="{l:ResourceString Name=Migrate}"
+                    Content="{l:ResourceString Rid=Migrate}"
                     Style="{ThemeResource AccentButtonStyle}" />
 
                 <!--  Version info  -->
@@ -140,46 +141,11 @@
 
         <!--  Error Template  -->
         <DataTemplate x:Key="ErrorTemplate" x:DataType="vm3:ErrorViewModel">
-            <StackPanel Spacing="4">
-                <InfoBar
-                    Title="{l:ResourceString Name=Error}"
-                    IsClosable="False"
-                    IsOpen="True"
-                    Message="{l:ResourceString Name=VaultLoadError}"
-                    Severity="Error" />
-
-                <TextBlock
-                    x:Name="ErrorTitle"
-                    HorizontalAlignment="Center"
-                    x:Load="{x:Bind ErrorTitle, Mode=OneWay, Converter={StaticResource NullToBoolConverter}}"
-                    FontSize="20"
-                    FontWeight="SemiBold"
-                    Text="{x:Bind ErrorTitle, Mode=OneWay}" />
-
-                <Expander
-                    x:Name="ErrorDetails"
-                    Width="600"
-                    x:Load="{x:Bind ErrorMessage, Mode=OneWay, Converter={StaticResource NullToBoolConverter}}">
-                    <Expander.Header>
-                        <TextBlock Text="{l:ResourceString Name=ErrorDetails}" />
-                    </Expander.Header>
-                    <ScrollViewer
-                        Height="200"
-                        MaxWidth="600"
-                        Padding="4"
-                        HorizontalScrollBarVisibility="Auto"
-                        VerticalScrollBarVisibility="Auto">
-                        <TextBlock
-                            HorizontalAlignment="Center"
-                            FontSize="12"
-                            HorizontalTextAlignment="Center"
-                            IsTextSelectionEnabled="True"
-                            Opacity="0.8"
-                            Text="{x:Bind ErrorMessage, Mode=OneWay}"
-                            TextWrapping="Wrap" />
-                    </ScrollViewer>
-                </Expander>
-            </StackPanel>
+            <uc:ErrorControl
+                Title="{l:ResourceString Rid=VaultLoadError}"
+                HorizontalAlignment="Stretch"
+                HorizontalContentAlignment="Stretch"
+                ExceptionMessage="{x:Bind ExceptionMessage, Mode=OneWay}" />
         </DataTemplate>
     </UserControl.Resources>
 
diff --git a/src/Platforms/SecureFolderFS.Uno/UserControls/Migration/MigratorV1_V2.xaml b/src/Platforms/SecureFolderFS.Uno/UserControls/Migration/MigratorV1_V2.xaml
index f430cead9..2121ef310 100644
--- a/src/Platforms/SecureFolderFS.Uno/UserControls/Migration/MigratorV1_V2.xaml
+++ b/src/Platforms/SecureFolderFS.Uno/UserControls/Migration/MigratorV1_V2.xaml
@@ -6,16 +6,23 @@
     xmlns:l="using:SecureFolderFS.Uno.Localization"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:uc="using:SecureFolderFS.Uno.UserControls"
+    xmlns:vc="using:SecureFolderFS.Uno.ValueConverters"
     mc:Ignorable="d">
 
+    <UserControl.Resources>
+        <vc:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
+    </UserControl.Resources>
+
     <StackPanel Spacing="8">
         <uc:PasswordControl x:Name="Password" PasswordSubmitted="Password_PasswordSubmitted" />
+
+        <!--  TODO(uno): #18589  -->
         <Button
             x:Name="ContinueButton"
             HorizontalAlignment="Center"
-            x:Load="{x:Bind ProvideContinuationButton, Mode=OneWay}"
             Click="Password_PasswordSubmitted"
-            Content="{l:ResourceString Name=Continue}"
-            Style="{ThemeResource AccentButtonStyle}" />
+            Content="{l:ResourceString Rid=Continue}"
+            Style="{ThemeResource AccentButtonStyle}"
+            Visibility="{x:Bind ProvideContinuationButton, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
     </StackPanel>
 </UserControl>
diff --git a/src/Platforms/SecureFolderFS.Uno/UserControls/Navigation/ContentNavigationControl.xaml.cs b/src/Platforms/SecureFolderFS.Uno/UserControls/Navigation/ContentNavigationControl.xaml.cs
index af012e150..036a1cd12 100644
--- a/src/Platforms/SecureFolderFS.Uno/UserControls/Navigation/ContentNavigationControl.xaml.cs
+++ b/src/Platforms/SecureFolderFS.Uno/UserControls/Navigation/ContentNavigationControl.xaml.cs
@@ -13,7 +13,7 @@ namespace SecureFolderFS.Uno.UserControls.Navigation
     /// <summary>
     /// The base class that manages UI navigation using <see cref="ContentControl"/>.
     /// </summary>
-    public abstract partial class ContentNavigationControl : UserControl, INavigationControl
+    public abstract partial class ContentNavigationControl : UserControl, INavigator, IDisposable
     {
         protected ContentNavigationControl()
         {
@@ -21,15 +21,13 @@ protected ContentNavigationControl()
         }
 
         /// <inheritdoc/>
-        public virtual async Task<bool> NavigateAsync<TTarget, TTransition>(TTarget? target, TTransition? transition = default)
-            where TTransition : class
-            where TTarget : IViewDesignation
+        public async Task<bool> NavigateAsync(IViewDesignation? view)
         {
             // Get the transition finalizer which will be used to end the transition
-            var transitionFinalizer = await ApplyTransitionAsync(target, transition);
+            var transitionFinalizer = await ApplyTransitionAsync(view);
 
             // Navigate by setting the content
-            MainContent.Content = target;
+            MainContent.Content = view;
 
             // End the transition
             if (transitionFinalizer is not null)
@@ -38,10 +36,22 @@ public virtual async Task<bool> NavigateAsync<TTarget, TTransition>(TTarget? tar
             return true;
         }
 
-        protected abstract Task<IAsyncDisposable?> ApplyTransitionAsync<TTarget, TTransition>(TTarget? target, TTransition? transition = default) where TTransition : class;
+        /// <inheritdoc/>
+        public Task<bool> GoBackAsync()
+        {
+            return Task.FromResult(false);
+        }
+
+        /// <inheritdoc/>
+        public Task<bool> GoForwardAsync()
+        {
+            return Task.FromResult(false);
+        }
+
+        protected abstract Task<IAsyncDisposable?> ApplyTransitionAsync<TTarget>(TTarget? target);
 
         /// <inheritdoc/>
-        public virtual void Dispose()
+        public new void Dispose()
         {
             (MainContent.Content as IDisposable)?.Dispose();
         }
diff --git a/src/Platforms/SecureFolderFS.Uno/UserControls/Navigation/FrameNavigationControl.xaml.cs b/src/Platforms/SecureFolderFS.Uno/UserControls/Navigation/FrameNavigationControl.xaml.cs
index e178d1387..86f9b63cc 100644
--- a/src/Platforms/SecureFolderFS.Uno/UserControls/Navigation/FrameNavigationControl.xaml.cs
+++ b/src/Platforms/SecureFolderFS.Uno/UserControls/Navigation/FrameNavigationControl.xaml.cs
@@ -2,10 +2,8 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Media.Animation;
 using SecureFolderFS.Shared.ComponentModel;
 using SecureFolderFS.Shared.Extensions;
-using SecureFolderFS.UI.Utils;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
@@ -15,7 +13,7 @@ namespace SecureFolderFS.Uno.UserControls.Navigation
     /// <summary>
     /// The base class that manages UI navigation using <see cref="Frame"/>.
     /// </summary>
-    public abstract partial class FrameNavigationControl : UserControl, INavigationControl
+    public abstract partial class FrameNavigationControl : UserControl, INavigator, IDisposable
     {
         /// <summary>
         /// Gets a dictionary of types that bind view models and pages together.
@@ -28,24 +26,42 @@ protected FrameNavigationControl()
         }
 
         /// <inheritdoc/>
-        public virtual Task<bool> NavigateAsync<TTarget, TTransition>(TTarget? target, TTransition? transition = default)
-            where TTransition : class
-            where TTarget : IViewDesignation
+        public Task<bool> NavigateAsync(IViewDesignation? view)
         {
-            if (target is null)
+            if (view is null)
             {
                 ContentFrame.Content = null;
                 return Task.FromResult(true);
             }
 
-            var pageType = TypeBinding.GetByKeyOrValue(target.GetType());
+            var pageType = TypeBinding.GetByKeyOrValue(view.GetType());
             if (pageType is null)
                 return Task.FromResult(false);
 
-            var result = NavigateFrame(pageType, target, transition as NavigationTransitionInfo);
+            var result = NavigateFrame(pageType, view);
             return Task.FromResult(result);
         }
 
+        /// <inheritdoc/>
+        public Task<bool> GoBackAsync()
+        {
+            if (!ContentFrame.CanGoBack)
+                return Task.FromResult(false);
+                
+            ContentFrame.GoBack();
+            return Task.FromResult(true);
+        }
+
+        /// <inheritdoc/>
+        public Task<bool> GoForwardAsync()
+        {
+            if (!ContentFrame.CanGoForward)
+                return Task.FromResult(false);
+                
+            ContentFrame.GoForward();
+            return Task.FromResult(true);
+        }
+
         /// <summary>
         /// Resets the current content of the <see cref="ContentFrame"/>.
         /// </summary>
@@ -59,12 +75,11 @@ public virtual void ClearContent()
         /// </summary>
         /// <param name="pageType">The type of page to navigate to.</param>
         /// <param name="parameter">The parameter to pass to the page.</param>
-        /// <param name="transitionInfo">The transition to use when navigating.</param>
         /// <returns>If successful, returns true; otherwise false.</returns>
-        protected abstract bool NavigateFrame(Type pageType, object parameter, NavigationTransitionInfo? transitionInfo);
+        protected abstract bool NavigateFrame(Type pageType, object parameter);
 
         /// <inheritdoc/>
-        public virtual void Dispose()
+        public new void Dispose()
         {
             ClearContent();
             (ContentFrame.Content as IDisposable)?.Dispose();
diff --git a/src/Platforms/SecureFolderFS.Uno/UserControls/Navigation/RootNavigationControl.cs b/src/Platforms/SecureFolderFS.Uno/UserControls/Navigation/RootNavigationControl.cs
index cbfc93765..85c8a3253 100644
--- a/src/Platforms/SecureFolderFS.Uno/UserControls/Navigation/RootNavigationControl.cs
+++ b/src/Platforms/SecureFolderFS.Uno/UserControls/Navigation/RootNavigationControl.cs
@@ -9,7 +9,7 @@ namespace SecureFolderFS.Uno.UserControls.Navigation
     internal sealed partial class RootNavigationControl : ContentNavigationControl
     {
         /// <inheritdoc/>
-        protected override Task<IAsyncDisposable?> ApplyTransitionAsync<TTarget, TTransition>(TTarget? target, TTransition? transition = default) where TTarget : default where TTransition : class
+        protected override Task<IAsyncDisposable?> ApplyTransitionAsync<TTarget>(TTarget? target) where TTarget : default
         {
             // Use transitions only when the initial page view model is not MainAppHostViewModel 
             if ((MainContent.Content is null && target is not MainHostViewModel)
diff --git a/src/Platforms/SecureFolderFS.Uno/UserControls/Navigation/SettingsNavigationControl.cs b/src/Platforms/SecureFolderFS.Uno/UserControls/Navigation/SettingsNavigationControl.cs
index 942f3b01c..cb199370a 100644
--- a/src/Platforms/SecureFolderFS.Uno/UserControls/Navigation/SettingsNavigationControl.cs
+++ b/src/Platforms/SecureFolderFS.Uno/UserControls/Navigation/SettingsNavigationControl.cs
@@ -1,8 +1,8 @@
+using System;
+using System.Collections.Generic;
 using Microsoft.UI.Xaml.Media.Animation;
 using SecureFolderFS.Sdk.ViewModels.Views.Settings;
 using SecureFolderFS.Uno.Views.Settings;
-using System;
-using System.Collections.Generic;
 
 namespace SecureFolderFS.Uno.UserControls.Navigation
 {
@@ -19,9 +19,9 @@ internal sealed partial class SettingsNavigationControl : FrameNavigationControl
         };
 
         /// <inheritdoc/>
-        protected override bool NavigateFrame(Type pageType, object parameter, NavigationTransitionInfo? transitionInfo)
+        protected override bool NavigateFrame(Type pageType, object parameter)
         {
-            transitionInfo ??= new EntranceNavigationTransitionInfo();
+            var transitionInfo = new EntranceNavigationTransitionInfo();
             return ContentFrame.Navigate(pageType, parameter, transitionInfo);
         }
     }
diff --git a/src/Platforms/SecureFolderFS.Uno/UserControls/Navigation/VaultDashboardNavigationControl.cs b/src/Platforms/SecureFolderFS.Uno/UserControls/Navigation/VaultDashboardNavigationControl.cs
index fa602140c..f64927517 100644
--- a/src/Platforms/SecureFolderFS.Uno/UserControls/Navigation/VaultDashboardNavigationControl.cs
+++ b/src/Platforms/SecureFolderFS.Uno/UserControls/Navigation/VaultDashboardNavigationControl.cs
@@ -15,12 +15,14 @@ internal sealed partial class VaultDashboardNavigationControl : FrameNavigationC
         public override Dictionary<Type, Type> TypeBinding { get; } = new()
         {
             { typeof(VaultOverviewViewModel), typeof(VaultOverviewPage) },
-            { typeof(VaultPropertiesViewModel), typeof(VaultPropertiesPage) }
+            { typeof(VaultPropertiesViewModel), typeof(VaultPropertiesPage) },
+            { typeof(VaultHealthReportViewModel), typeof(VaultHealthPage) }
         };
 
         /// <inheritdoc/>
-        protected override bool NavigateFrame(Type pageType, object parameter, NavigationTransitionInfo? transitionInfo)
+        protected override bool NavigateFrame(Type pageType, object parameter)
         {
+            NavigationTransitionInfo? transitionInfo = null;
             if (_isFirstTime)
             {
                 _isFirstTime = false;
@@ -31,6 +33,7 @@ protected override bool NavigateFrame(Type pageType, object parameter, Navigatio
                 transitionInfo ??= parameter switch
                 {
                     VaultPropertiesViewModel => new SlideNavigationTransitionInfo() { Effect = SlideNavigationTransitionEffect.FromRight },
+                    VaultHealthReportViewModel => new SlideNavigationTransitionInfo() { Effect = SlideNavigationTransitionEffect.FromRight },
                     VaultOverviewViewModel => new SlideNavigationTransitionInfo() { Effect = SlideNavigationTransitionEffect.FromLeft },
                     _ => new EntranceNavigationTransitionInfo()
                 };
diff --git a/src/Platforms/SecureFolderFS.Uno/UserControls/Navigation/VaultNavigationControl.cs b/src/Platforms/SecureFolderFS.Uno/UserControls/Navigation/VaultNavigationControl.cs
index 56cc45281..77fbb5907 100644
--- a/src/Platforms/SecureFolderFS.Uno/UserControls/Navigation/VaultNavigationControl.cs
+++ b/src/Platforms/SecureFolderFS.Uno/UserControls/Navigation/VaultNavigationControl.cs
@@ -17,9 +17,9 @@ internal sealed partial class VaultNavigationControl : FrameNavigationControl
         };
 
         /// <inheritdoc/>
-        protected override bool NavigateFrame(Type pageType, object parameter, NavigationTransitionInfo? transitionInfo)
+        protected override bool NavigateFrame(Type pageType, object parameter)
         {
-            transitionInfo ??= ContentFrame.Content switch
+            NavigationTransitionInfo transitionInfo = ContentFrame.Content switch
             {
                 VaultDashboardPage => new ContinuumNavigationTransitionInfo(), // Dashboard closing animation
                 _ => new EntranceNavigationTransitionInfo() // Standard animation
diff --git a/src/Platforms/SecureFolderFS.Uno/UserControls/Navigation/VaultWizardNavigationControl.cs b/src/Platforms/SecureFolderFS.Uno/UserControls/Navigation/VaultWizardNavigationControl.cs
index 148e3de41..2cc2d6b8c 100644
--- a/src/Platforms/SecureFolderFS.Uno/UserControls/Navigation/VaultWizardNavigationControl.cs
+++ b/src/Platforms/SecureFolderFS.Uno/UserControls/Navigation/VaultWizardNavigationControl.cs
@@ -19,9 +19,9 @@ internal sealed partial class VaultWizardNavigationControl : FrameNavigationCont
         };
 
         /// <inheritdoc/>
-        protected override bool NavigateFrame(Type pageType, object parameter, NavigationTransitionInfo? transitionInfo)
+        protected override bool NavigateFrame(Type pageType, object parameter)
         {
-            transitionInfo ??= new SlideNavigationTransitionInfo() { Effect = SlideNavigationTransitionEffect.FromRight };
+            var transitionInfo = new SlideNavigationTransitionInfo() { Effect = SlideNavigationTransitionEffect.FromRight };
             return ContentFrame.Navigate(pageType, parameter, transitionInfo);
         }
     }
diff --git a/src/Platforms/SecureFolderFS.Uno/UserControls/PasswordControl.xaml b/src/Platforms/SecureFolderFS.Uno/UserControls/PasswordControl.xaml
index 9f1759891..18e051f70 100644
--- a/src/Platforms/SecureFolderFS.Uno/UserControls/PasswordControl.xaml
+++ b/src/Platforms/SecureFolderFS.Uno/UserControls/PasswordControl.xaml
@@ -21,11 +21,11 @@
             PlaceholderText="{x:Bind Placeholder, Mode=OneWay}" />
 
         <TeachingTip
-            Title="{l:ResourceString Name=InvalidPassword}"
+            Title="{l:ResourceString Rid=InvalidPassword}"
             IsLightDismissEnabled="True"
             IsOpen="{x:Bind ShowInvalidPasswordMessage, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
             PreferredPlacement="Bottom"
-            Subtitle="{l:ResourceString Name=InvalidPasswordMessage}"
+            Subtitle="{l:ResourceString Rid=InvalidPasswordMessage}"
             Target="{Binding ElementName=PasswordInput}">
             <TeachingTip.IconSource>
                 <FontIconSource Glyph="&#xE783;" />
diff --git a/src/Platforms/SecureFolderFS.Uno/UserControls/PasswordControl.xaml.cs b/src/Platforms/SecureFolderFS.Uno/UserControls/PasswordControl.xaml.cs
index 60447a592..80cf2a02e 100644
--- a/src/Platforms/SecureFolderFS.Uno/UserControls/PasswordControl.xaml.cs
+++ b/src/Platforms/SecureFolderFS.Uno/UserControls/PasswordControl.xaml.cs
@@ -60,9 +60,9 @@ public ICommand? PasswordSubmittedCommand
         public static readonly DependencyProperty PasswordSubmittedCommandProperty =
             DependencyProperty.Register(nameof(PasswordSubmittedCommand), typeof(ICommand), typeof(PasswordControl), new PropertyMetadata(defaultValue: null));
 
-        public string UnsecurePassword
+        public string? UnsecurePassword
         {
-            get => (string)GetValue(UnsecurePasswordProperty);
+            get => (string?)GetValue(UnsecurePasswordProperty);
             set => SetValue(UnsecurePasswordProperty, value);
         }
         public static readonly DependencyProperty UnsecurePasswordProperty =
diff --git a/src/Platforms/SecureFolderFS.Uno/UserControls/RecoveryPreviewControl.xaml b/src/Platforms/SecureFolderFS.Uno/UserControls/RecoveryPreviewControl.xaml
index a431bc6df..80607f864 100644
--- a/src/Platforms/SecureFolderFS.Uno/UserControls/RecoveryPreviewControl.xaml
+++ b/src/Platforms/SecureFolderFS.Uno/UserControls/RecoveryPreviewControl.xaml
@@ -18,10 +18,10 @@
             Grid.Row="0"
             IsClosable="False"
             IsOpen="True"
-            Message="{l:ResourceString Name=MasterKeyDescription}" />
+            Message="{l:ResourceString Rid=MasterKeyDescription}" />
 
         <ucab:ActionBlockControl
-            Title="{l:ResourceString Name=RevealMasterKey}"
+            Title="{l:ResourceString Rid=RevealMasterKey}"
             Grid.Row="1"
             BlockMode="Expandable"
             ExpanderExpandingCommand="{x:Bind RevealCommand, Mode=OneWay}"
@@ -53,7 +53,7 @@
                                 Margin="0,0,0,-4"
                                 FontSize="16"
                                 Glyph="&#xE749;" />
-                            <TextBlock Text="{l:ResourceString Name=Print}" />
+                            <TextBlock Text="{l:ResourceString Rid=Print}" />
                         </StackPanel>
                     </Button>
                 </StackPanel>
diff --git a/src/Platforms/SecureFolderFS.Uno/UserControls/RegisterControl.xaml b/src/Platforms/SecureFolderFS.Uno/UserControls/RegisterControl.xaml
index 342d2e064..75edc8f19 100644
--- a/src/Platforms/SecureFolderFS.Uno/UserControls/RegisterControl.xaml
+++ b/src/Platforms/SecureFolderFS.Uno/UserControls/RegisterControl.xaml
@@ -7,7 +7,7 @@
     xmlns:local="using:SecureFolderFS.Uno.UserControls"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ts="using:SecureFolderFS.Uno.TemplateSelectors"
-    xmlns:vm3="using:SecureFolderFS.UI.ViewModels"
+    xmlns:vm3="using:SecureFolderFS.UI.ViewModels.Authentication"
     xmlns:vm4="using:SecureFolderFS.Uno.ViewModels"
     xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     x:Name="RootControl"
@@ -19,11 +19,11 @@
             <StackPanel Spacing="16">
                 <local:PasswordControl
                     x:Name="FirstPassword"
-                    Title="{l:ResourceString Name=NewPassword}"
+                    Title="{l:ResourceString Rid=NewPassword}"
                     UnsecurePassword="{x:Bind PrimaryPassword, Mode=TwoWay}" />
                 <local:PasswordControl
                     x:Name="SecondPassword"
-                    Title="{l:ResourceString Name=RepeatPassword}"
+                    Title="{l:ResourceString Rid=RepeatPassword}"
                     UnsecurePassword="{x:Bind SecondaryPassword, Mode=TwoWay}" />
             </StackPanel>
         </DataTemplate>
@@ -41,14 +41,14 @@
                 <TextBlock
                     HorizontalAlignment="Center"
                     Opacity="0.8"
-                    Text="{l:ResourceString Name=SetupKeyFile}" />
+                    Text="{l:ResourceString Rid=SetupKeyFile}" />
 
                 <!--  Authenticate  -->
                 <Button
                     Padding="24,6"
                     HorizontalAlignment="Center"
                     Command="{x:Bind ProvideCredentialsCommand, Mode=OneWay}"
-                    Content="{l:ResourceString Name=Setup}"
+                    Content="{l:ResourceString Rid=Setup}"
                     Style="{ThemeResource AccentButtonStyle}" />
             </StackPanel>
         </DataTemplate>
@@ -66,14 +66,14 @@
                 <TextBlock
                     HorizontalAlignment="Center"
                     Opacity="0.8"
-                    Text="{l:ResourceString Name=SetupWindowsHello}" />
+                    Text="{l:ResourceString Rid=SetupWindowsHello}" />
 
                 <!--  Authenticate  -->
                 <Button
                     Padding="24,6"
                     HorizontalAlignment="Center"
                     Command="{x:Bind ProvideCredentialsCommand, Mode=OneWay}"
-                    Content="{l:ResourceString Name=Setup}"
+                    Content="{l:ResourceString Rid=Setup}"
                     Style="{ThemeResource AccentButtonStyle}" />
             </StackPanel>
         </win:DataTemplate>
diff --git a/src/Platforms/SecureFolderFS.Uno/UserControls/TitleBarControl.xaml b/src/Platforms/SecureFolderFS.Uno/UserControls/TitleBarControl.xaml
index dd22b8a6e..2ac3385ac 100644
--- a/src/Platforms/SecureFolderFS.Uno/UserControls/TitleBarControl.xaml
+++ b/src/Platforms/SecureFolderFS.Uno/UserControls/TitleBarControl.xaml
@@ -15,7 +15,9 @@
 
         <!--  Title  -->
         <StackPanel
+            x:Name="TitlePanel"
             HorizontalAlignment="Left"
+            x:FieldModifier="public"
             Orientation="Horizontal"
             Spacing="6">
             <TextBlock
@@ -28,9 +30,8 @@
                 CharacterSpacing="32"
                 FontSize="9"
                 FontWeight="Thin"
-                Loaded="VersionTitle_Loaded"
                 Opacity="0.8"
-                Text="BETA" />
+                Text="Beta5" />
         </StackPanel>
     </Border>
 </UserControl>
diff --git a/src/Platforms/SecureFolderFS.Uno/UserControls/TitleBarControl.xaml.cs b/src/Platforms/SecureFolderFS.Uno/UserControls/TitleBarControl.xaml.cs
index 0f1fa5e8e..5e4245f35 100644
--- a/src/Platforms/SecureFolderFS.Uno/UserControls/TitleBarControl.xaml.cs
+++ b/src/Platforms/SecureFolderFS.Uno/UserControls/TitleBarControl.xaml.cs
@@ -1,7 +1,4 @@
-using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using SecureFolderFS.Sdk.Services;
-using SecureFolderFS.Shared;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
@@ -10,19 +7,9 @@ namespace SecureFolderFS.Uno.UserControls
 {
     public sealed partial class TitleBarControl : UserControl
     {
-        private IApplicationService ApplicationService { get; } = DI.Service<IApplicationService>();
-
         public TitleBarControl()
         {
             InitializeComponent();
         }
-
-        private void VersionTitle_Loaded(object sender, RoutedEventArgs e)
-        {
-            if (sender is not TextBlock textBlock)
-                return;
-
-            textBlock.Text = $"BETA - v{ApplicationService.AppVersion}";
-        }
     }
 }
diff --git a/src/Platforms/SecureFolderFS.Uno/UserControls/VaultFolderSelectionControl.xaml b/src/Platforms/SecureFolderFS.Uno/UserControls/VaultFolderSelectionControl.xaml
index 9752b0fda..ef161ce85 100644
--- a/src/Platforms/SecureFolderFS.Uno/UserControls/VaultFolderSelectionControl.xaml
+++ b/src/Platforms/SecureFolderFS.Uno/UserControls/VaultFolderSelectionControl.xaml
@@ -29,6 +29,6 @@
             Grid.Column="1"
             VerticalAlignment="Center"
             Command="{x:Bind OpenCommand, Mode=OneWay}"
-            Content="{l:ResourceString Name=Open}" />
+            Content="{l:ResourceString Rid=Open}" />
     </Grid>
 </UserControl>
diff --git a/src/Platforms/SecureFolderFS.Uno/UserControls/Widgets/GraphsWidget.xaml b/src/Platforms/SecureFolderFS.Uno/UserControls/Widgets/GraphsWidget.xaml
index ae327fece..94e1fb213 100644
--- a/src/Platforms/SecureFolderFS.Uno/UserControls/Widgets/GraphsWidget.xaml
+++ b/src/Platforms/SecureFolderFS.Uno/UserControls/Widgets/GraphsWidget.xaml
@@ -70,7 +70,7 @@
             ChartStrokeColor="#00AED4"
             Click="ReadGraph_Click"
             Data="{x:Bind ReadGraphData, Mode=OneWay}"
-            GraphHeader="{l:ResourceString Name=ReadSpeeds}"
+            GraphHeader="{l:ResourceString Rid=ReadSpeeds}"
             GraphSubheader="{x:Bind ReadGraphSubheader, Mode=OneWay}">
             <uc:GraphControl.RenderTransform>
                 <ScaleTransform />
@@ -85,7 +85,7 @@
             ChartStrokeColor="#008D74"
             Click="WriteGraph_Click"
             Data="{x:Bind WriteGraphData, Mode=OneWay}"
-            GraphHeader="{l:ResourceString Name=WriteSpeeds}"
+            GraphHeader="{l:ResourceString Rid=WriteSpeeds}"
             GraphSubheader="{x:Bind WriteGraphSubheader, Mode=OneWay}"
             RenderTransformOrigin="1.0,0.0">
             <uc:GraphControl.RenderTransform>
diff --git a/src/Platforms/SecureFolderFS.Uno/UserControls/Widgets/GraphsWidget.xaml.cs b/src/Platforms/SecureFolderFS.Uno/UserControls/Widgets/GraphsWidget.xaml.cs
index f1068a790..00850d3f6 100644
--- a/src/Platforms/SecureFolderFS.Uno/UserControls/Widgets/GraphsWidget.xaml.cs
+++ b/src/Platforms/SecureFolderFS.Uno/UserControls/Widgets/GraphsWidget.xaml.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.UI.Xaml;
@@ -169,21 +169,21 @@ public bool WriteGraphIsExtended
         public static readonly DependencyProperty WriteGraphIsExtendedProperty =
             DependencyProperty.Register(nameof(WriteGraphIsExtended), typeof(bool), typeof(GraphsWidget), new PropertyMetadata(defaultValue: false));
 
-        public ICollection? ReadGraphData
+        public ICollection<double>? ReadGraphData
         {
-            get => (ICollection?)GetValue(ReadGraphDataProperty);
+            get => (ICollection<double>?)GetValue(ReadGraphDataProperty);
             set => SetValue(ReadGraphDataProperty, value);
         }
         public static readonly DependencyProperty ReadGraphDataProperty =
-            DependencyProperty.Register(nameof(ReadGraphData), typeof(ICollection), typeof(GraphsWidget), new PropertyMetadata(defaultValue: null));
+            DependencyProperty.Register(nameof(ReadGraphData), typeof(ICollection<double>), typeof(GraphsWidget), new PropertyMetadata(defaultValue: null));
 
-        public ICollection? WriteGraphData
+        public ICollection<double>? WriteGraphData
         {
-            get => (ICollection?)GetValue(WriteGraphDataProperty);
+            get => (ICollection<double>?)GetValue(WriteGraphDataProperty);
             set => SetValue(WriteGraphDataProperty, value);
         }
         public static readonly DependencyProperty WriteGraphDataProperty =
-            DependencyProperty.Register(nameof(WriteGraphData), typeof(ICollection), typeof(GraphsWidget), new PropertyMetadata(defaultValue: null));
+            DependencyProperty.Register(nameof(WriteGraphData), typeof(ICollection<double>), typeof(GraphsWidget), new PropertyMetadata(defaultValue: null));
 
         public string? ReadGraphSubheader
         {
diff --git a/src/Platforms/SecureFolderFS.Uno/UserControls/Widgets/HealthWidget.xaml b/src/Platforms/SecureFolderFS.Uno/UserControls/Widgets/HealthWidget.xaml
index 554cb21db..ccdb4f825 100644
--- a/src/Platforms/SecureFolderFS.Uno/UserControls/Widgets/HealthWidget.xaml
+++ b/src/Platforms/SecureFolderFS.Uno/UserControls/Widgets/HealthWidget.xaml
@@ -3,6 +3,7 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:l="using:SecureFolderFS.Uno.Localization"
     xmlns:local="using:SecureFolderFS.Uno.UserControls.Widgets"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:not_win="http://uno.ui/not_win"
@@ -12,28 +13,42 @@
     mc:Ignorable="d not_win">
 
     <UserControl.Resources>
-        <vc:DateTimeToStringConverter x:Key="DateTimeToStringConverter" />
-        <vc:VaultHealthStateToStringConverter x:Key="VaultHealthStateToStringConverter" />
+        <vc:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
+        <vc:ProgressIsDeterminateConverter x:Key="ProgressIsDeterminateConverter" />
+        <vc:SeverityHealthIconConverter x:Key="SeverityHealthIconConverter" />
 
-        <DataTemplate x:Key="WithDetailedHealthTemplate" x:DataType="local:HealthWidget">
-            <StackPanel Margin="0,-4,0,0">
+        <DataTemplate x:Key="DetailedHealthTemplate" x:DataType="local:HealthWidget">
+            <StackPanel Margin="0,-4,0,0" DataContext="{Binding ElementName=HealthControl}">
                 <!--  Vault status  -->
                 <TextBlock
                     HorizontalAlignment="Left"
                     VerticalAlignment="Center"
                     FontWeight="Medium"
-                    Text="{Binding Path=VaultHealthState, ElementName=HealthControl, Mode=OneWay, Converter={StaticResource VaultHealthStateToStringConverter}}"
-                    TextTrimming="CharacterEllipsis" />
-                <!--  Last checked  -->
-                <TextBlock
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Center"
-                    Opacity="0.6"
-                    Text="{Binding Path=HealthLastCheckedText, ElementName=HealthControl, Mode=OneWay, FallbackValue='Last checked: No data'}"
+                    Text="{Binding Path=StatusTitle, Mode=OneWay}"
                     TextTrimming="CharacterEllipsis" />
+
+                <!--  Subtitle  -->
+                <Grid>
+                    <!--  Last checked  -->
+                    <TextBlock
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        Opacity="0.6"
+                        Text="{Binding Path=LastCheckedText, Mode=OneWay, FallbackValue='Last checked: Unspecified'}"
+                        TextTrimming="CharacterEllipsis"
+                        Visibility="{Binding Path=IsProgressing, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}, ConverterParameter='invert'}" />
+
+                    <!--  Progress  -->
+                    <ProgressBar
+                        Margin="0,8,0,0"
+                        VerticalAlignment="Center"
+                        IsIndeterminate="{Binding Path=CurrentProgress, Mode=OneWay, Converter={StaticResource ProgressIsDeterminateConverter}}"
+                        Visibility="{Binding Path=IsProgressing, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
+                        Value="{Binding Path=CurrentProgress, Mode=OneWay}" />
+                </Grid>
             </StackPanel>
         </DataTemplate>
-        <DataTemplate x:Key="WithoutDetailedHealthTemplate" x:DataType="local:HealthWidget">
+        <DataTemplate x:Key="NotDetailedHealthTemplate" x:DataType="local:HealthWidget">
             <Grid />
         </DataTemplate>
     </UserControl.Resources>
@@ -52,28 +67,25 @@
                 Height="64"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center"
-                Stretch="UniformToFill">
-                <win:Image.Source>
-                    <SvgImageSource UriSource="ms-appx://SecureFolderFS.UI/Assets/AppAssets/GreenShield.svg" />
-                </win:Image.Source>
-            </win:Image>
+                Source="{x:Bind Severity, Mode=OneWay, Converter={StaticResource SeverityHealthIconConverter}}"
+                Stretch="UniformToFill" />
             <not_win:Image
                 Width="64"
                 Height="64"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center"
-                Source="/Assets/AppAssets/GreenShield.png"
+                Source="{x:Bind Severity, Mode=OneWay, Converter={StaticResource SeverityHealthIconConverter}}"
                 Stretch="UniformToFill" />
         </Grid>
 
         <!--  Health status  -->
         <ContentPresenter
-            x:Name="DetailedHealthContentPresenter"
+            x:Name="HealthContentPresenter"
             Grid.Column="1"
             VerticalContentAlignment="Center"
             Canvas.ZIndex="1" />
 
-        <!--  Start scanning  -->
+        <!--  Options  -->
         <StackPanel
             Grid.Column="2"
             Margin="0,-6,0,0"
@@ -81,20 +93,43 @@
             VerticalAlignment="Center"
             Orientation="Horizontal"
             Spacing="4">
-            <Button
+
+            <!--  Start scanning  -->
+            <SplitButton
+                Height="36"
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center"
                 VerticalContentAlignment="Center"
                 Command="{x:Bind StartScanningCommand, Mode=OneWay}"
+                CommandParameter=""
                 Content="Start scanning"
-                IsEnabled="False" />
+                Visibility="{x:Bind IsProgressing, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}, ConverterParameter='invert'}">
+                <SplitButton.Flyout>
+                    <MenuFlyout>
+                        <MenuFlyoutItem
+                            Command="{x:Bind StartScanningCommand, Mode=OneWay}"
+                            CommandParameter="include_file_contents"
+                            IsEnabled="False"
+                            Text="Include file contents (slower)" />
+                    </MenuFlyout>
+                </SplitButton.Flyout>
+            </SplitButton>
+
+            <!--  Cancel  -->
+            <Button
+                VerticalAlignment="Center"
+                Command="{x:Bind CancelCommand, Mode=OneWay}"
+                Content="{l:ResourceString Rid=Cancel}"
+                Visibility="{x:Bind IsProgressing, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
+
+            <!--  Open health details  -->
             <Button
                 Width="36"
-                Height="35"
+                Height="36"
                 Padding="0"
                 HorizontalAlignment="Center"
                 Command="{x:Bind OpenVaultHealthCommand, Mode=OneWay}"
-                IsEnabled="False"
+                IsEnabled="True"
                 ToolTipService.ToolTip="Go to Vault Health">
                 <FontIcon FontSize="15" Glyph="&#xE76C;" />
             </Button>
@@ -108,7 +143,7 @@
                         <AdaptiveTrigger MinWindowWidth="350" />
                     </VisualState.StateTriggers>
                     <VisualState.Setters>
-                        <Setter Target="DetailedHealthContentPresenter.ContentTemplate" Value="{StaticResource WithDetailedHealthTemplate}" />
+                        <Setter Target="HealthContentPresenter.ContentTemplate" Value="{StaticResource DetailedHealthTemplate}" />
                     </VisualState.Setters>
                 </VisualState>
                 <!--  Small window  -->
@@ -117,7 +152,7 @@
                         <AdaptiveTrigger MinWindowWidth="0" />
                     </VisualState.StateTriggers>
                     <VisualState.Setters>
-                        <Setter Target="DetailedHealthContentPresenter.ContentTemplate" Value="{StaticResource WithoutDetailedHealthTemplate}" />
+                        <Setter Target="HealthContentPresenter.ContentTemplate" Value="{StaticResource NotDetailedHealthTemplate}" />
                     </VisualState.Setters>
                 </VisualState>
             </VisualStateGroup>
diff --git a/src/Platforms/SecureFolderFS.Uno/UserControls/Widgets/HealthWidget.xaml.cs b/src/Platforms/SecureFolderFS.Uno/UserControls/Widgets/HealthWidget.xaml.cs
index 9ff4e943e..84c1bfb15 100644
--- a/src/Platforms/SecureFolderFS.Uno/UserControls/Widgets/HealthWidget.xaml.cs
+++ b/src/Platforms/SecureFolderFS.Uno/UserControls/Widgets/HealthWidget.xaml.cs
@@ -1,8 +1,7 @@
+using System.Windows.Input;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using SecureFolderFS.Sdk.Enums;
-using System;
-using System.Windows.Input;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
@@ -16,21 +15,29 @@ public HealthWidget()
             InitializeComponent();
         }
 
-        public VaultHealthState VaultHealthState
+        public SeverityType Severity
         {
-            get => (VaultHealthState)GetValue(VaultHealthStateProperty);
-            set => SetValue(VaultHealthStateProperty, value);
+            get => (SeverityType)GetValue(SeverityProperty);
+            set => SetValue(SeverityProperty, value);
         }
-        public static readonly DependencyProperty VaultHealthStateProperty =
-            DependencyProperty.Register(nameof(VaultHealthState), typeof(VaultHealthState), typeof(HealthWidget), new PropertyMetadata(defaultValue: null));
+        public static readonly DependencyProperty SeverityProperty =
+            DependencyProperty.Register(nameof(Severity), typeof(SeverityType), typeof(HealthWidget), new PropertyMetadata(SeverityType.Default));
 
-        public string HealthLastCheckedText
+        public string? StatusTitle
         {
-            get => (string)GetValue(HealthLastCheckedTextProperty);
-            set => SetValue(HealthLastCheckedTextProperty, value);
+            get => (string?)GetValue(StatusTitleProperty);
+            set => SetValue(StatusTitleProperty, value);
         }
-        public static readonly DependencyProperty HealthLastCheckedTextProperty =
-            DependencyProperty.Register(nameof(HealthLastCheckedText), typeof(string), typeof(HealthWidget), new PropertyMetadata(null));
+        public static readonly DependencyProperty StatusTitleProperty =
+            DependencyProperty.Register(nameof(StatusTitle), typeof(string), typeof(HealthWidget), new PropertyMetadata(null));
+
+        public string? LastCheckedText
+        {
+            get => (string?)GetValue(LastCheckedTextProperty);
+            set => SetValue(LastCheckedTextProperty, value);
+        }
+        public static readonly DependencyProperty LastCheckedTextProperty =
+            DependencyProperty.Register(nameof(LastCheckedText), typeof(string), typeof(HealthWidget), new PropertyMetadata(null));
 
         public ICommand? StartScanningCommand
         {
@@ -47,5 +54,29 @@ public ICommand? OpenVaultHealthCommand
         }
         public static readonly DependencyProperty OpenVaultHealthCommandProperty =
             DependencyProperty.Register(nameof(OpenVaultHealthCommand), typeof(ICommand), typeof(HealthWidget), new PropertyMetadata(defaultValue: null));
+
+        public ICommand? CancelCommand
+        {
+            get => (ICommand?)GetValue(CancelCommandProperty);
+            set => SetValue(CancelCommandProperty, value);
+        }
+        public static readonly DependencyProperty CancelCommandProperty =
+            DependencyProperty.Register(nameof(CancelCommand), typeof(ICommand), typeof(HealthWidget), new PropertyMetadata(null));
+
+        public bool IsProgressing
+        {
+            get => (bool)GetValue(IsProgressingProperty);
+            set => SetValue(IsProgressingProperty, value);
+        }
+        public static readonly DependencyProperty IsProgressingProperty =
+            DependencyProperty.Register(nameof(IsProgressing), typeof(bool), typeof(HealthWidget), new PropertyMetadata(false));
+
+        public double CurrentProgress
+        {
+            get => (double)GetValue(CurrentProgressProperty);
+            set => SetValue(CurrentProgressProperty, value);
+        }
+        public static readonly DependencyProperty CurrentProgressProperty =
+            DependencyProperty.Register(nameof(CurrentProgress), typeof(double), typeof(HealthWidget), new PropertyMetadata(0d));
     }
 }
diff --git a/src/Platforms/SecureFolderFS.Uno/ValueConverters/BoolToVisibilityConverter.cs b/src/Platforms/SecureFolderFS.Uno/ValueConverters/BoolToVisibilityConverter.cs
index 64b81e902..591aa7af0 100644
--- a/src/Platforms/SecureFolderFS.Uno/ValueConverters/BoolToVisibilityConverter.cs
+++ b/src/Platforms/SecureFolderFS.Uno/ValueConverters/BoolToVisibilityConverter.cs
@@ -12,16 +12,8 @@ internal sealed class BoolToVisibilityConverter : IValueConverter
             if (value is not bool bValue)
                 return false;
 
-            if (parameter is string strParam && strParam.ToLower() == "invert")
-            {
-                if (value is string str1)
-                    return string.IsNullOrEmpty(str1) ? Visibility.Visible : Visibility.Collapsed;
-
-                return bValue ? Visibility.Visible : Visibility.Collapsed;
-            }
-
-            if (value is string str)
-                return !string.IsNullOrEmpty(str) ? Visibility.Visible : Visibility.Collapsed;
+            var invert = parameter is string strParam && strParam.ToLower() == "invert";
+            bValue = invert ? !bValue : bValue;
 
             return bValue ? Visibility.Visible : Visibility.Collapsed;
         }
diff --git a/src/Platforms/SecureFolderFS.Uno/ValueConverters/CountToBoolConverter.cs b/src/Platforms/SecureFolderFS.Uno/ValueConverters/CountToBoolConverter.cs
new file mode 100644
index 000000000..2683fcfc0
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Uno/ValueConverters/CountToBoolConverter.cs
@@ -0,0 +1,23 @@
+using System;
+using Microsoft.UI.Xaml.Data;
+
+namespace SecureFolderFS.Uno.ValueConverters
+{
+    internal sealed class CountToBoolConverter : IValueConverter
+    {
+        /// <inheritdoc/>
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            if (value is not int numValue)
+                return false;
+
+            return numValue > 0;
+        }
+
+        /// <inheritdoc/>
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Uno/ValueConverters/CountToStringConverter.cs b/src/Platforms/SecureFolderFS.Uno/ValueConverters/CountToStringConverter.cs
new file mode 100644
index 000000000..4541dd625
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Uno/ValueConverters/CountToStringConverter.cs
@@ -0,0 +1,22 @@
+using System;
+using Microsoft.UI.Xaml.Data;
+using SecureFolderFS.UI.ValueConverters;
+
+namespace SecureFolderFS.Uno.ValueConverters
+{
+    /// <inheritdoc cref="BaseCountToStringConverter"/>
+    internal sealed class CountToStringConverter : BaseCountToStringConverter, IValueConverter
+    {
+        /// <inheritdoc/>
+        public object? Convert(object value, Type targetType, object parameter, string language)
+        {
+            return TryConvert(value, targetType, parameter);
+        }
+
+        /// <inheritdoc/>
+        public object? ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            return TryConvertBack(value, targetType, parameter);
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Uno/ValueConverters/IconSourceConverter.cs b/src/Platforms/SecureFolderFS.Uno/ValueConverters/IconSourceConverter.cs
new file mode 100644
index 000000000..05ca50ce6
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Uno/ValueConverters/IconSourceConverter.cs
@@ -0,0 +1,34 @@
+using System;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Data;
+using SecureFolderFS.Uno.AppModels;
+
+namespace SecureFolderFS.Uno.ValueConverters
+{
+    internal sealed class IconSourceConverter : IValueConverter
+    {
+        /// <inheritdoc/>
+        public object? Convert(object value, Type targetType, object parameter, string language)
+        {
+            return value switch
+            {
+                ImageBitmap bitmap => new ImageIconSource() { ImageSource = bitmap.Source },
+                _ => GetDefault()
+            };
+
+            IconSource? GetDefault()
+            {
+                if (parameter is not string strParam)
+                    return null;
+
+                return new FontIconSource() { Glyph = strParam };
+            }
+        }
+
+        /// <inheritdoc/>
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Uno/ValueConverters/IndexToProgressConverter.cs b/src/Platforms/SecureFolderFS.Uno/ValueConverters/IndexToProgressConverter.cs
index 217097733..7a45397c1 100644
--- a/src/Platforms/SecureFolderFS.Uno/ValueConverters/IndexToProgressConverter.cs
+++ b/src/Platforms/SecureFolderFS.Uno/ValueConverters/IndexToProgressConverter.cs
@@ -1,10 +1,11 @@
-using Microsoft.UI.Xaml.Data;
 using System;
+using Microsoft.UI.Xaml.Data;
 
 namespace SecureFolderFS.Uno.ValueConverters
 {
     internal sealed class IndexToProgressConverter : IValueConverter
     {
+        /// <inheritdoc/>
         public object Convert(object value, Type targetType, object parameter, string language)
         {
             if (value is not int currentIndex)
@@ -16,19 +17,19 @@ public object Convert(object value, Type targetType, object parameter, string la
 
             progressIndex += 1;
 
-            var progval = progressIndex * 2; // because each prog has 2 states
-            var newval = currentIndex - progval;
+            var progress = progressIndex * 2; // Because each progress has 2 states
+            var newValue = currentIndex - progress;
 
-            if (newval == -1)
+            if (newValue == -1)
                 return 50.0d;
 
-            if (newval >= 0)
+            if (newValue >= 0)
                 return 100.0d;
 
-
             return 0.0d;
         }
 
+        /// <inheritdoc/>
         public object ConvertBack(object value, Type targetType, object parameter, string language)
         {
             throw new NotImplementedException();
diff --git a/src/Platforms/SecureFolderFS.Uno/ValueConverters/LoginViewModelBoolConverter.cs b/src/Platforms/SecureFolderFS.Uno/ValueConverters/LoginViewModelBoolConverter.cs
index e33a025fe..ad50fb0a4 100644
--- a/src/Platforms/SecureFolderFS.Uno/ValueConverters/LoginViewModelBoolConverter.cs
+++ b/src/Platforms/SecureFolderFS.Uno/ValueConverters/LoginViewModelBoolConverter.cs
@@ -4,33 +4,19 @@
 
 namespace SecureFolderFS.Uno.ValueConverters
 {
-    /// <inheritdoc cref="BaseLoginViewModelBoolConverter"/>
-    internal sealed class LoginViewModelBoolConverter : BaseLoginViewModelBoolConverter, IValueConverter
+    /// <inheritdoc cref="BaseLoginViewModelConverter"/>
+    internal sealed class LoginViewModelBoolConverter : BaseLoginViewModelConverter, IValueConverter
     {
         /// <inheritdoc/>
-        public object Convert(object? value, Type targetType, object parameter, string language)
+        public object? Convert(object? value, Type targetType, object parameter, string language)
         {
-            if (parameter is not string strParam)
-                return false;
-
-            var split = strParam.Split('|');
-            var invert = split[1].Contains("invert", StringComparison.OrdinalIgnoreCase);
-            var result = false;
-
-            foreach (var item in split[0].Split(','))
-            {
-                result = value?.GetType().Name.Equals(item, StringComparison.OrdinalIgnoreCase) ?? false;
-                if (result)
-                    break;
-            }
-
-            return invert ? !result : result;
+            return TryConvert(value, targetType, parameter);
         }
 
         /// <inheritdoc/>
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        public object? ConvertBack(object value, Type targetType, object parameter, string language)
         {
-            throw new NotImplementedException();
+            return TryConvertBack(value, targetType, parameter);
         }
     }
 }
diff --git a/src/Platforms/SecureFolderFS.Uno/ValueConverters/LoginViewModelVisibilityConverter.cs b/src/Platforms/SecureFolderFS.Uno/ValueConverters/LoginViewModelVisibilityConverter.cs
new file mode 100644
index 000000000..87d0777d7
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Uno/ValueConverters/LoginViewModelVisibilityConverter.cs
@@ -0,0 +1,23 @@
+using System;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Data;
+using SecureFolderFS.UI.ValueConverters;
+
+namespace SecureFolderFS.Uno.ValueConverters
+{
+    /// <inheritdoc cref="BaseLoginViewModelConverter"/>
+    internal sealed class LoginViewModelVisibilityConverter : BaseLoginViewModelConverter, IValueConverter
+    {
+        /// <inheritdoc/>
+        public object? Convert(object? value, Type targetType, object parameter, string language)
+        {
+            return (bool?)TryConvert(value, targetType, parameter) ?? false ? Visibility.Visible : Visibility.Collapsed;
+        }
+
+        /// <inheritdoc/>
+        public object? ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            return (bool?)TryConvertBack(value, targetType, parameter) ?? false ? Visibility.Visible : Visibility.Collapsed;
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Uno/ValueConverters/SeverityHealthIconConverter.cs b/src/Platforms/SecureFolderFS.Uno/ValueConverters/SeverityHealthIconConverter.cs
new file mode 100644
index 000000000..1950c7a40
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Uno/ValueConverters/SeverityHealthIconConverter.cs
@@ -0,0 +1,47 @@
+using System;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Media.Imaging;
+using SecureFolderFS.UI.ValueConverters;
+
+namespace SecureFolderFS.Uno.ValueConverters
+{
+    /// <inheritdoc cref="BaseSeverityHealthIconConverter"/>
+    internal sealed class SeverityHealthIconConverter : BaseSeverityHealthIconConverter, IValueConverter
+    {
+        /// <inheritdoc/>
+        protected override object? SuccessIcon { get; } =
+#if WINDOWS && !HAS_UNO
+            new SvgImageSource(new("ms-appx://SecureFolderFS.UI/Assets/AppAssets/Shields/success_shield.svg"));
+#else
+            new BitmapImage(new("ms-appx://SecureFolderFS.UI/Assets/AppAssets/Shields/success_shield.png"));
+#endif
+
+        /// <inheritdoc/>
+        protected override object? WarningIcon { get; } =
+#if WINDOWS && !HAS_UNO
+            new SvgImageSource(new("ms-appx://SecureFolderFS.UI/Assets/AppAssets/Shields/warning_shield.svg"));
+#else
+            new BitmapImage(new("ms-appx://SecureFolderFS.UI/Assets/AppAssets/Shields/warning_shield.png"));
+#endif
+
+        /// <inheritdoc/>
+        protected override object? CriticalIcon { get; } =
+#if WINDOWS && !HAS_UNO
+            new SvgImageSource(new("ms-appx://SecureFolderFS.UI/Assets/AppAssets/Shields/error_shield.svg"));
+#else
+            new BitmapImage(new("ms-appx://SecureFolderFS.UI/Assets/AppAssets/Shields/error_shield.png"));
+#endif
+
+        /// <inheritdoc/>
+        public object? Convert(object value, Type targetType, object parameter, string language)
+        {
+            return TryConvert(value, targetType, parameter);
+        }
+
+        /// <inheritdoc/>
+        public object? ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            return TryConvertBack(value, targetType, parameter);
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Uno/ValueConverters/VaultHealthStateToStringConverter.cs b/src/Platforms/SecureFolderFS.Uno/ValueConverters/VaultHealthStateToStringConverter.cs
deleted file mode 100644
index f7a98386f..000000000
--- a/src/Platforms/SecureFolderFS.Uno/ValueConverters/VaultHealthStateToStringConverter.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using Microsoft.UI.Xaml.Data;
-using SecureFolderFS.Sdk.Enums;
-using SecureFolderFS.Sdk.Extensions;
-using System;
-
-namespace SecureFolderFS.Uno.ValueConverters
-{
-    internal sealed class VaultHealthStateToStringConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, string language)
-        {
-            if (value is not VaultHealthState vaultHealthState)
-            {
-                return string.Empty;
-            }
-
-            return vaultHealthState switch
-            {
-                VaultHealthState.Healthy => "HealthNoProblems".ToLocalized(),
-                VaultHealthState.NeedsAttention => "HealthAttention".ToLocalized(),
-                VaultHealthState.Error => "HealthProblems".ToLocalized(),
-                _ => throw new ArgumentOutOfRangeException(nameof(vaultHealthState))
-            };
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/src/Platforms/SecureFolderFS.Uno/ViewModels/WindowsHelloLoginViewModel.cs b/src/Platforms/SecureFolderFS.Uno/ViewModels/WindowsHelloLoginViewModel.cs
index e78067a66..c12c588ee 100644
--- a/src/Platforms/SecureFolderFS.Uno/ViewModels/WindowsHelloLoginViewModel.cs
+++ b/src/Platforms/SecureFolderFS.Uno/ViewModels/WindowsHelloLoginViewModel.cs
@@ -47,8 +47,7 @@ protected override async Task ProvideCredentialsAsync(CancellationToken cancella
                 var key = await CreateSignatureAsync(result.Credential, auth.Challenge, cancellationToken);
 
                 // Compile new challenge in preparation
-                // TODO: Important
-                // TODO: When doing the signing operation, check payload MAC
+                // TODO: Important When doing the signing operation, check payload MAC
                 // TODO: Do something to avoid triggering the Windows Hello dialog twice
                 //using var newChallenge = GenerateChallenge(config.Id);
                 //using var newSignedChallenge = await CreateSignatureAsync(result.Credential, newChallenge.Key, cancellationToken);
diff --git a/src/Platforms/SecureFolderFS.Uno/ViewModels/WindowsHelloViewModel.cs b/src/Platforms/SecureFolderFS.Uno/ViewModels/WindowsHelloViewModel.cs
index 624c534e7..c68b0b5a0 100644
--- a/src/Platforms/SecureFolderFS.Uno/ViewModels/WindowsHelloViewModel.cs
+++ b/src/Platforms/SecureFolderFS.Uno/ViewModels/WindowsHelloViewModel.cs
@@ -38,7 +38,7 @@ public abstract class WindowsHelloViewModel : AuthenticationViewModel
         protected WindowsHelloViewModel(IFolder vaultFolder, string vaultId)
             : base(Core.Constants.Vault.Authentication.AUTH_WINDOWS_HELLO)
         {
-            DisplayName = "WindowsHello".ToLocalized();
+            Title = "WindowsHello".ToLocalized();
             VaultFolder = vaultFolder;
             VaultId = vaultId;
             Icon = "\uEB68";
@@ -94,7 +94,7 @@ protected static SecretKey GenerateChallenge(string vaultId)
             // to use the length of the string ID as part of the SecretKey length above
             var written = Encoding.ASCII.GetBytes(vaultId, challenge.Key.AsSpan(KEY_PART_LENGTH));
             if (written != encodedVaultIdLength)
-                throw new FormatException("The allocated and vault ID written bytes amount were different.");
+                throw new FormatException("The allocated buffer and vault ID written bytes amount were different.");
             
             // Return a copy of the challenge since the original version is being disposed of
             return challenge.CreateCopy();
diff --git a/src/Platforms/SecureFolderFS.Uno/Views/DebugViews/DebugAppControlPage.xaml b/src/Platforms/SecureFolderFS.Uno/Views/DebugViews/DebugAppControlPage.xaml
new file mode 100644
index 000000000..1e9ccac61
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Uno/Views/DebugViews/DebugAppControlPage.xaml
@@ -0,0 +1,97 @@
+<Page
+    x:Class="SecureFolderFS.Uno.Views.DebugViews.DebugAppControlPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ucab="using:SecureFolderFS.Uno.UserControls.ActionBlocks"
+    Loaded="DebugAppControlPage_Loaded"
+    mc:Ignorable="d">
+
+    <StackPanel Spacing="8">
+        <!--  Runtime Information  -->
+        <ucab:ActionBlockControl Title="Runtime Information" BlockMode="Expandable">
+            <ucab:ActionBlockControl.ExpanderContent>
+                <Grid ColumnSpacing="32" RowSpacing="16">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition />
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition />
+                        <RowDefinition />
+                    </Grid.RowDefinitions>
+
+                    <TextBlock
+                        Grid.Row="0"
+                        Grid.Column="0"
+                        VerticalAlignment="Center"
+                        Text="CompositionCapabilities.AreEffectsFast" />
+
+                    <TextBlock
+                        x:Name="Dbg_AppInfo_AreEffectsFast"
+                        Grid.Row="0"
+                        Grid.Column="1"
+                        Opacity="0.6" />
+                </Grid>
+            </ucab:ActionBlockControl.ExpanderContent>
+        </ucab:ActionBlockControl>
+
+        <!--  App Title  -->
+        <ucab:ActionBlockControl Title="App Title" BlockMode="Expandable">
+            <ucab:ActionBlockControl.ExpanderContent>
+                <Grid ColumnSpacing="32" RowSpacing="16">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition />
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition />
+                        <RowDefinition />
+                    </Grid.RowDefinitions>
+
+                    <TextBlock
+                        Grid.Row="0"
+                        Grid.Column="0"
+                        VerticalAlignment="Center"
+                        Text="TitleBar Part 1" />
+                    <TextBlock
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        VerticalAlignment="Center"
+                        Text="TitleBar Part 2" />
+
+
+                    <TextBox
+                        x:Name="Dbg_AppTitle_Part1"
+                        Grid.Row="0"
+                        Grid.Column="1"
+                        TextChanged="AppTitlePart1_TextChanged" />
+                    <TextBox
+                        x:Name="Dbg_AppTitle_Part2"
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        TextChanged="AppTitlePart2_TextChanged" />
+                </Grid>
+            </ucab:ActionBlockControl.ExpanderContent>
+        </ucab:ActionBlockControl>
+
+        <!--  Current View options  -->
+        <ucab:ActionBlockControl Title="Current Primary View" BlockMode="Expandable">
+            <ucab:ActionBlockControl.ActionElement>
+                <Button Click="RefreshPrimaryView_Click" Content="Refresh" />
+            </ucab:ActionBlockControl.ActionElement>
+            <ucab:ActionBlockControl.ExpanderContent>
+                <ContentPresenter x:Name="Dbg_PrimaryView_Presenter">
+                    <TextBlock HorizontalAlignment="Center" Text="Refresh the view to see content" />
+                </ContentPresenter>
+            </ucab:ActionBlockControl.ExpanderContent>
+        </ucab:ActionBlockControl>
+
+        <!--  Hide/Show  -->
+        <ucab:ActionBlockControl
+            Title="Show/Hide Debugging Button"
+            BlockMode="Clickable"
+            Click="ShowHideDebuggingButton_Click" />
+    </StackPanel>
+</Page>
diff --git a/src/Platforms/SecureFolderFS.Uno/Views/DebugViews/DebugAppControlPage.xaml.cs b/src/Platforms/SecureFolderFS.Uno/Views/DebugViews/DebugAppControlPage.xaml.cs
new file mode 100644
index 000000000..121626d16
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Uno/Views/DebugViews/DebugAppControlPage.xaml.cs
@@ -0,0 +1,95 @@
+using System.Threading.Tasks;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using SecureFolderFS.Sdk.ViewModels.Views.Host;
+using SecureFolderFS.Sdk.ViewModels.Views.Vault;
+using SecureFolderFS.Uno.UserControls;
+using SecureFolderFS.Uno.UserControls.DebugControls;
+using SecureFolderFS.Uno.UserControls.InterfaceRoot;
+using Windows.UI.Composition;
+
+// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
+
+namespace SecureFolderFS.Uno.Views.DebugViews
+{
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class DebugAppControlPage : Page
+    {
+        private MainWindowRootControl? _rootControl;
+        private TitleBarControl? _titleBar;
+        private TextBlock? _titleBarPart1;
+        private TextBlock? _titleBarPart2;
+
+        public DebugAppControlPage()
+        {
+            InitializeComponent();
+        }
+
+        private async void DebugAppControlPage_Loaded(object sender, RoutedEventArgs e)
+        {
+            await Task.Delay(1000);
+
+            _rootControl = App.Instance?.MainWindow?.Content as MainWindowRootControl;
+#if WINDOWS
+            _titleBar = _rootControl?.CustomTitleBar;
+#endif
+            _titleBarPart1 = _titleBar?.TitlePanel?.Children?[0] as TextBlock;
+            _titleBarPart2 = _titleBar?.TitlePanel?.Children?[1] as TextBlock;
+
+            // App Info
+            Dbg_AppInfo_AreEffectsFast.Text = CompositionCapabilities.GetForCurrentView().AreEffectsFast().ToString();
+
+            // App Title
+            Dbg_AppTitle_Part1.Text = _titleBarPart1?.Text ??
+#if !__IOS__
+                                      App.Instance?.MainWindow?.Title;
+#else
+                                      null;
+#endif
+            Dbg_AppTitle_Part2.Text = _titleBarPart2?.Text;
+        }
+
+        private void AppTitlePart1_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            if (_titleBarPart1 is not null)
+                _titleBarPart1.Text = Dbg_AppTitle_Part1.Text;
+            else if (App.Instance?.MainWindow is { } mainWindow)
+            {
+#if !__IOS__
+                mainWindow.Title = Dbg_AppTitle_Part1.Text;
+#endif
+            }
+        }
+
+        private void AppTitlePart2_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            if (_titleBarPart2 is not null)
+                _titleBarPart2.Text = Dbg_AppTitle_Part2.Text;
+        }
+
+        private void RefreshPrimaryView_Click(object sender, RoutedEventArgs e)
+        {
+            if (_rootControl?.RootNavigationService.CurrentView is not MainHostViewModel mainHost)
+                return;
+
+            Dbg_PrimaryView_Presenter.Content = mainHost.NavigationService.CurrentView switch
+            {
+                VaultLoginViewModel => new DebugLoginRepresentationControl(),
+                VaultDashboardViewModel => new DebugDashboardRepresentationControl(),
+                _ => new TextBlock() { Text = "No content to show", HorizontalAlignment = HorizontalAlignment.Center }
+            };
+        }
+
+        private void ShowHideDebuggingButton_Click(object sender, RoutedEventArgs e)
+        {
+            if (_rootControl?.DebugButton is null)
+                return;
+
+            _rootControl.DebugButton.Visibility = _rootControl.DebugButton.Visibility == Visibility.Visible
+                ? Visibility.Collapsed
+                : Visibility.Visible;
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Uno/Views/DebugViews/DebugFileSystemLogPage.xaml b/src/Platforms/SecureFolderFS.Uno/Views/DebugViews/DebugFileSystemLogPage.xaml
new file mode 100644
index 000000000..8df325af3
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Uno/Views/DebugViews/DebugFileSystemLogPage.xaml
@@ -0,0 +1,11 @@
+<Page
+    x:Class="SecureFolderFS.Uno.Views.DebugViews.DebugFileSystemLogPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:SecureFolderFS.Uno.Views.DebugViews"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <Grid />
+</Page>
diff --git a/src/Platforms/SecureFolderFS.Uno/Views/DebugViews/DebugFileSystemLogPage.xaml.cs b/src/Platforms/SecureFolderFS.Uno/Views/DebugViews/DebugFileSystemLogPage.xaml.cs
new file mode 100644
index 000000000..6a13fcc7a
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Uno/Views/DebugViews/DebugFileSystemLogPage.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+
+// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
+
+namespace SecureFolderFS.Uno.Views.DebugViews;
+/// <summary>
+/// An empty page that can be used on its own or navigated to within a Frame.
+/// </summary>
+public sealed partial class DebugFileSystemLogPage : Page
+{
+    public DebugFileSystemLogPage()
+    {
+        this.InitializeComponent();
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Uno/Views/PrintPages/RecoveryKeyPrintPage.xaml b/src/Platforms/SecureFolderFS.Uno/Views/PrintPages/RecoveryKeyPrintPage.xaml
index 12803d6db..b261143b9 100644
--- a/src/Platforms/SecureFolderFS.Uno/Views/PrintPages/RecoveryKeyPrintPage.xaml
+++ b/src/Platforms/SecureFolderFS.Uno/Views/PrintPages/RecoveryKeyPrintPage.xaml
@@ -32,13 +32,13 @@
                 <Image
                     Height="52"
                     VerticalAlignment="Center"
-                    Source="ms-appx://SecureFolderFS.UI/Assets/AppAssets/AppIcon.png" />
+                    Source="ms-appx://SecureFolderFS.UI/Assets/AppAssets/app_icon.png" />
 
                 <Image
                     Height="29"
                     Margin="0,0,0,-3"
                     VerticalAlignment="Center"
-                    Source="ms-appx://SecureFolderFS.UI/Assets/AppAssets/AppTitle.png" />
+                    Source="ms-appx://SecureFolderFS.UI/Assets/AppAssets/app_title.png" />
 
             </StackPanel>
 
diff --git a/src/Platforms/SecureFolderFS.Uno/Views/Settings/AboutSettingsPage.xaml b/src/Platforms/SecureFolderFS.Uno/Views/Settings/AboutSettingsPage.xaml
index b8a61c453..9b019c2d1 100644
--- a/src/Platforms/SecureFolderFS.Uno/Views/Settings/AboutSettingsPage.xaml
+++ b/src/Platforms/SecureFolderFS.Uno/Views/Settings/AboutSettingsPage.xaml
@@ -32,23 +32,25 @@
         <!--  Banner  -->
         <uc:BannerControl Grid.Row="0">
             <uc:BannerControl.LeftSide>
-                <win:Image
-                    Width="230"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Center"
-                    Source="ms-appx://SecureFolderFS.UI/Assets/AppAssets/AppTitle.svg" />
-                <not_win:Image
-                    Width="230"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Center"
-                    Source="/Assets/AppAssets/AppTitle.png" />
+                <Grid>
+                    <win:Image
+                        Width="230"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        Source="ms-appx://SecureFolderFS.UI/Assets/AppAssets/app_title.svg" />
+                    <not_win:Image
+                        Width="192"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        Source="/Assets/AppAssets/app_title.png" />
+                </Grid>
             </uc:BannerControl.LeftSide>
             <uc:BannerControl.RightSide>
                 <StackPanel
                     HorizontalAlignment="Right"
                     Orientation="Horizontal"
                     Spacing="8">
-                    <Button AutomationProperties.Name="{l:ResourceString Name=Version}">
+                    <Button AutomationProperties.Name="{l:ResourceString Rid=Version}">
                         <Button.Flyout>
                             <Flyout Placement="Bottom">
                                 <Grid
@@ -68,13 +70,13 @@
                                     <TextBlock
                                         Grid.Row="0"
                                         FontWeight="SemiBold"
-                                        Text="{l:ResourceString Name=CopyVersion}" />
+                                        Text="{l:ResourceString Rid=CopyVersion}" />
 
                                     <!--  Description  -->
                                     <TextBlock
                                         Grid.Row="1"
                                         Opacity="0.8"
-                                        Text="{l:ResourceString Name=CopyVersionMessage}"
+                                        Text="{l:ResourceString Rid=CopyVersionMessage}"
                                         TextWrapping="WrapWholeWords" />
 
                                     <!--  Options  -->
@@ -89,32 +91,32 @@
                                         <Button
                                             Grid.Row="0"
                                             HorizontalAlignment="Stretch"
-                                            AutomationProperties.Name="{l:ResourceString Name=CopyAppVersion}"
+                                            AutomationProperties.Name="{l:ResourceString Rid=CopyAppVersion}"
                                             Click="CopyAppVersion_Click">
                                             <Grid x:Name="CopyAppVersionGrid">
-                                                <TextBlock HorizontalAlignment="Center" Text="{l:ResourceString Name=CopyAppVersion}" />
+                                                <TextBlock HorizontalAlignment="Center" Text="{l:ResourceString Rid=CopyAppVersion}" />
                                                 <StackPanel
                                                     Orientation="Horizontal"
                                                     Spacing="4"
                                                     Visibility="Collapsed">
                                                     <FontIcon Glyph="&#xE73E;" />
-                                                    <TextBlock Text="{l:ResourceString Name=Copied}" />
+                                                    <TextBlock Text="{l:ResourceString Rid=Copied}" />
                                                 </StackPanel>
                                             </Grid>
                                         </Button>
                                         <Button
                                             Grid.Row="1"
                                             HorizontalAlignment="Stretch"
-                                            AutomationProperties.Name="{l:ResourceString Name=CopySystemVersion}"
+                                            AutomationProperties.Name="{l:ResourceString Rid=CopySystemVersion}"
                                             Click="CopySystemVersion_Click">
                                             <Grid x:Name="CopySystemVersionGrid">
-                                                <TextBlock Text="{l:ResourceString Name=CopySystemVersion}" />
+                                                <TextBlock Text="{l:ResourceString Rid=CopySystemVersion}" />
                                                 <StackPanel
                                                     Orientation="Horizontal"
                                                     Spacing="4"
                                                     Visibility="Collapsed">
                                                     <FontIcon Glyph="&#xE73E;" />
-                                                    <TextBlock Text="{l:ResourceString Name=Copied}" />
+                                                    <TextBlock Text="{l:ResourceString Rid=Copied}" />
                                                 </StackPanel>
                                             </Grid>
                                         </Button>
@@ -128,7 +130,7 @@
                                 FontSize="14"
                                 Glyph="&#xE946;" />
                             <StackPanel VerticalAlignment="Center" Orientation="Vertical">
-                                <TextBlock FontWeight="SemiBold" Text="{l:ResourceString Name=Version}" />
+                                <TextBlock FontWeight="SemiBold" Text="{l:ResourceString Rid=Version}" />
                                 <TextBlock
                                     FontSize="12"
                                     Foreground="{ThemeResource ApplicationSecondaryForegroundThemeBrush}"
@@ -147,7 +149,7 @@
                                 <TextBlock
                                     FontSize="12"
                                     Foreground="{ThemeResource ApplicationSecondaryForegroundThemeBrush}"
-                                    Text="{l:ResourceString Name=ViewRepository}" />
+                                    Text="{l:ResourceString Rid=ViewRepository}" />
                             </StackPanel>
                         </StackPanel>
                     </Button>
@@ -157,9 +159,9 @@
 
         <StackPanel Grid.Row="1" Spacing="4">
             <ucab:ActionBlockControl
-                Title="{l:ResourceString Name=Social}"
+                Title="{l:ResourceString Rid=Social}"
                 BlockMode="Default"
-                Description="{l:ResourceString Name=SocialDescription}">
+                Description="{l:ResourceString Rid=SocialDescription}">
                 <ucab:ActionBlockControl.Icon>
                     <FontIcon Glyph="&#xE8BD;" />
                 </ucab:ActionBlockControl.Icon>
@@ -170,10 +172,10 @@
                 </ucab:ActionBlockControl.ActionElement>
             </ucab:ActionBlockControl>
             <ucab:ActionBlockControl
-                Title="{l:ResourceString Name=PrivacyPolicy}"
+                Title="{l:ResourceString Rid=PrivacyPolicy}"
                 BlockMode="Clickable"
                 ClickCommand="{x:Bind ViewModel.OpenPrivacyPolicyCommand, Mode=OneWay}"
-                Description="{l:ResourceString Name=PrivacyPolicyDescription}">
+                Description="{l:ResourceString Rid=PrivacyPolicyDescription}">
                 <ucab:ActionBlockControl.Icon>
                     <FontIcon Glyph="&#xEA18;" />
                 </ucab:ActionBlockControl.Icon>
@@ -182,10 +184,10 @@
                 </ucab:ActionBlockControl.ActionElement>
             </ucab:ActionBlockControl>
             <ucab:ActionBlockControl
-                Title="{l:ResourceString Name=Changelog}"
+                Title="{l:ResourceString Rid=Changelog}"
                 BlockMode="Clickable"
                 ClickCommand="{x:Bind ViewModel.OpenChangelogCommand, Mode=OneWay}"
-                Description="{l:ResourceString Name=ChangelogDescription}">
+                Description="{l:ResourceString Rid=ChangelogDescription}">
                 <ucab:ActionBlockControl.Icon>
                     <FontIcon Glyph="&#xE8FD;" />
                 </ucab:ActionBlockControl.Icon>
@@ -194,10 +196,10 @@
                 </ucab:ActionBlockControl.ActionElement>
             </ucab:ActionBlockControl>
             <ucab:ActionBlockControl
-                Title="{l:ResourceString Name=OpenLogLocation}"
+                Title="{l:ResourceString Rid=OpenLogLocation}"
                 BlockMode="Clickable"
                 ClickCommand="{x:Bind ViewModel.OpenLogLocationCommand, Mode=OneWay}"
-                Description="{l:ResourceString Name=OpenLogLocationDescription}">
+                Description="{l:ResourceString Rid=OpenLogLocationDescription}">
                 <ucab:ActionBlockControl.Icon>
                     <FontIcon Glyph="&#xE838;" />
                 </ucab:ActionBlockControl.Icon>
@@ -206,10 +208,10 @@
                 </ucab:ActionBlockControl.ActionElement>
             </ucab:ActionBlockControl>
             <ucab:ActionBlockControl
-                Title="{l:ResourceString Name=ThirdPartyLicenses}"
+                Title="{l:ResourceString Rid=ThirdPartyLicenses}"
                 BlockMode="Clickable"
                 ClickCommand="{x:Bind ViewModel.OpenLicensesCommand, Mode=OneWay}"
-                Description="{l:ResourceString Name=ThirdPartyLicensesDescription}">
+                Description="{l:ResourceString Rid=ThirdPartyLicensesDescription}">
                 <ucab:ActionBlockControl.Icon>
                     <FontIcon Glyph="&#xF000;" />
                 </ucab:ActionBlockControl.Icon>
diff --git a/src/Platforms/SecureFolderFS.Uno/Views/Settings/GeneralSettingsPage.xaml b/src/Platforms/SecureFolderFS.Uno/Views/Settings/GeneralSettingsPage.xaml
index a4f0a952c..7f746ccef 100644
--- a/src/Platforms/SecureFolderFS.Uno/Views/Settings/GeneralSettingsPage.xaml
+++ b/src/Platforms/SecureFolderFS.Uno/Views/Settings/GeneralSettingsPage.xaml
@@ -44,7 +44,7 @@
             <uc:BannerControl.RightSide>
                 <Grid>
                     <Button
-                        AutomationProperties.Name="{l:ResourceString Name=CheckForUpdates}"
+                        AutomationProperties.Name="{l:ResourceString Rid=CheckForUpdates}"
                         Command="{x:Bind ViewModel.BannerViewModel.UpdateAppCommand, Mode=OneWay}"
                         IsEnabled="{x:Bind ViewModel.BannerViewModel.AreUpdatesSupported, Mode=OneWay}">
                         <StackPanel Orientation="Horizontal" Spacing="8">
@@ -55,7 +55,7 @@
                             <TextBlock
                                 VerticalAlignment="Center"
                                 FontWeight="SemiBold"
-                                Text="{l:ResourceString Name=CheckForUpdates}" />
+                                Text="{l:ResourceString Rid=CheckForUpdates}" />
                         </StackPanel>
                     </Button>
                 </Grid>
@@ -64,7 +64,7 @@
                 <!--  Version InfoBar  -->
                 <InfoBar
                     Title="{x:Bind ViewModel.BannerViewModel.InfoBarViewModel.Title, Mode=OneWay}"
-                    IsClosable="{x:Bind ViewModel.BannerViewModel.InfoBarViewModel.CanBeClosed, Mode=OneWay}"
+                    IsClosable="{x:Bind ViewModel.BannerViewModel.InfoBarViewModel.IsCloseable, Mode=OneWay}"
                     IsOpen="True"
                     Message="{x:Bind ViewModel.BannerViewModel.InfoBarViewModel.Message, Mode=OneWay}"
                     Severity="{x:Bind ViewModel.BannerViewModel.InfoBarViewModel.Severity, Mode=OneWay, Converter={StaticResource GenericEnumConverter}}"
@@ -100,21 +100,20 @@
             Spacing="4">
             <StackPanel>
                 <ucab:ActionBlockControl
-                    Title="{l:ResourceString Name=Language}"
+                    Title="{l:ResourceString Rid=Language}"
                     BlockMode="Default"
-                    Description="{l:ResourceString Name=LanguageDescription}">
+                    Description="{l:ResourceString Rid=LanguageDescription}">
                     <ucab:ActionBlockControl.Icon>
                         <FontIcon Glyph="&#xF2B7;" />
                     </ucab:ActionBlockControl.Icon>
                     <ucab:ActionBlockControl.ActionElement>
                         <ComboBox
-                            x:Name="AppLanguageComboBox"
                             AutomationProperties.Name="{x:Bind ViewModel.SelectedLanguage, Mode=OneWay}"
                             ItemsSource="{x:Bind ViewModel.Languages, Mode=OneWay}"
                             SelectedItem="{x:Bind ViewModel.SelectedLanguage, Mode=TwoWay}">
                             <ComboBox.ItemTemplate>
                                 <DataTemplate x:DataType="vm:LanguageViewModel">
-                                    <TextBlock Text="{x:Bind DisplayName, Mode=OneWay}" />
+                                    <TextBlock Text="{x:Bind Title, Mode=OneWay}" />
                                 </DataTemplate>
                             </ComboBox.ItemTemplate>
                         </ComboBox>
@@ -122,7 +121,7 @@
                     <ucab:ActionBlockControl.CustomDescription />
                 </ucab:ActionBlockControl>
                 <InfoBar
-                    Title="{l:ResourceString Name=RestartRequired}"
+                    Title="{l:ResourceString Rid=RestartRequired}"
                     IsClosable="False"
                     IsOpen="True"
                     Severity="Warning"
@@ -150,28 +149,28 @@
                 </InfoBar>
             </StackPanel>
             <ucab:ActionBlockControl
-                Title="{l:ResourceString Name=Theme}"
+                Title="{l:ResourceString Rid=Theme}"
                 BlockMode="Default"
-                Description="{l:ResourceString Name=ThemeDescription}">
+                Description="{l:ResourceString Rid=ThemeDescription}">
                 <ucab:ActionBlockControl.Icon>
                     <FontIcon Glyph="&#xE790;" />
                 </ucab:ActionBlockControl.Icon>
                 <ucab:ActionBlockControl.ActionElement>
                     <ComboBox
                         x:Name="AppThemeComboBox"
-                        AutomationProperties.Name="{l:ResourceString Name=Theme}"
+                        AutomationProperties.Name="{l:ResourceString Rid=Theme}"
                         SelectedIndex="{x:Bind SelectedThemeIndex}"
                         SelectionChanged="AppThemeComboBox_SelectionChanged">
                         <ComboBox.Items>
-                            <ComboBoxItem Content="{l:ResourceString Name=ThemeSystemDefault}" />
-                            <ComboBoxItem Content="{l:ResourceString Name=ThemeLight}" />
-                            <ComboBoxItem Content="{l:ResourceString Name=ThemeDark}" />
+                            <ComboBoxItem Content="{l:ResourceString Rid=ThemeSystemDefault}" />
+                            <ComboBoxItem Content="{l:ResourceString Rid=ThemeLight}" />
+                            <ComboBoxItem Content="{l:ResourceString Rid=ThemeDark}" />
                         </ComboBox.Items>
                     </ComboBox>
                 </ucab:ActionBlockControl.ActionElement>
             </ucab:ActionBlockControl>
             <ucab:ActionBlockControl
-                Title="{l:ResourceString Name=ManageSettings}"
+                Title="{l:ResourceString Rid=ManageSettings}"
                 BlockMode="Expandable"
                 IsEnabled="False">
                 <ucab:ActionBlockControl.Icon>
@@ -179,7 +178,7 @@
                 </ucab:ActionBlockControl.Icon>
                 <ucab:ActionBlockControl.ExpanderContent>
                     <StackPanel Margin="-16" Spacing="1">
-                        <ucab:ActionBlockControl Title="{l:ResourceString Name=ImportSettings}" BlockMode="Clickable">
+                        <ucab:ActionBlockControl Title="{l:ResourceString Rid=ImportSettings}" BlockMode="Clickable">
                             <ucab:ActionBlockControl.Icon>
                                 <FontIcon Glyph="&#xE8B5;" />
                             </ucab:ActionBlockControl.Icon>
@@ -187,7 +186,7 @@
                                 <FontIcon FontSize="14" Glyph="&#xE2B4;" />
                             </ucab:ActionBlockControl.ActionElement>
                         </ucab:ActionBlockControl>
-                        <ucab:ActionBlockControl Title="{l:ResourceString Name=ExportSettings}" BlockMode="Clickable">
+                        <ucab:ActionBlockControl Title="{l:ResourceString Rid=ExportSettings}" BlockMode="Clickable">
                             <ucab:ActionBlockControl.Icon>
                                 <FontIcon Glyph="&#xEDE2;" />
                             </ucab:ActionBlockControl.Icon>
diff --git a/src/Platforms/SecureFolderFS.Uno/Views/Settings/PreferencesSettingsPage.xaml b/src/Platforms/SecureFolderFS.Uno/Views/Settings/PreferencesSettingsPage.xaml
index 997cf1077..b96eb368c 100644
--- a/src/Platforms/SecureFolderFS.Uno/Views/Settings/PreferencesSettingsPage.xaml
+++ b/src/Platforms/SecureFolderFS.Uno/Views/Settings/PreferencesSettingsPage.xaml
@@ -2,13 +2,10 @@
     x:Class="SecureFolderFS.Uno.Views.Settings.PreferencesSettingsPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:anim="using:CommunityToolkit.WinUI.UI.Animations"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:l="using:SecureFolderFS.Uno.Localization"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:ts="using:SecureFolderFS.Uno.TemplateSelectors"
     xmlns:uc="using:SecureFolderFS.Uno.UserControls"
-    xmlns:uc2="using:SecureFolderFS.UI.UserControls.InfoBars"
     xmlns:ucab="using:SecureFolderFS.Uno.UserControls.ActionBlocks"
     xmlns:vc="using:SecureFolderFS.Uno.ValueConverters"
     xmlns:vm="using:SecureFolderFS.Sdk.ViewModels.Controls.Banners"
@@ -16,52 +13,7 @@
 
     <Page.Resources>
         <vc:GenericEnumConverter x:Key="GenericEnumConverter" />
-
-        <DataTemplate x:Key="DokanyUnavailableInfoBarTemplate" x:DataType="uc2:DokanyInfoBar">
-            <InfoBar
-                IsClosable="{x:Bind CanBeClosed, Mode=OneWay}"
-                IsOpen="True"
-                Message="{x:Bind Message, Mode=OneWay}"
-                Severity="{x:Bind Severity, Mode=OneWay, Converter={StaticResource GenericEnumConverter}}"
-                Visibility="{x:Bind IsOpen, Mode=OneWay}">
-                <InfoBar.Content>
-                    <Grid Padding="16,8,16,8">
-                        <HyperlinkButton
-                            Margin="0,-16,0,0"
-                            HorizontalAlignment="Right"
-                            Content="{l:ResourceString Name=Website}"
-                            NavigateUri="https://github.com/dokan-dev/dokany/releases/tag/v2.0.5.1000" />
-                    </Grid>
-                </InfoBar.Content>
-                <!--<anim:Implicit.ShowAnimations>
-                    <anim:TranslationAnimation
-                        From="0,-15,0"
-                        To="0"
-                        Duration="0:0:0.4" />
-                    <anim:OpacityAnimation
-                        From="0"
-                        To="1.0"
-                        Duration="0:0:0.6" />
-                </anim:Implicit.ShowAnimations>
-                <anim:Implicit.HideAnimations>
-                    <anim:OpacityAnimation
-                        From="1.0"
-                        To="0.0"
-                        Duration="0:0:0.2" />
-                    <anim:TranslationAnimation
-                        From="0"
-                        To="0,-15,0"
-                        Duration="0:0:0.2" />
-                </anim:Implicit.HideAnimations>-->
-            </InfoBar>
-        </DataTemplate>
-        <DataTemplate x:Key="WebDavExperimentalInfoBarTemplate" x:DataType="uc2:WebDavInfoBar">
-            <InfoBar
-                IsClosable="{x:Bind CanBeClosed, Mode=OneWay}"
-                IsOpen="True"
-                Message="{x:Bind Message, Mode=OneWay}"
-                Severity="{x:Bind Severity, Mode=OneWay, Converter={StaticResource GenericEnumConverter}}" />
-        </DataTemplate>
+        <vc:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
     </Page.Resources>
 
     <Grid Loaded="Root_Loaded" RowSpacing="12">
@@ -79,11 +31,11 @@
                     <TextBlock
                         FontSize="21"
                         FontWeight="SemiBold"
-                        Text="{l:ResourceString Name=FileSystemProvider}" />
+                        Text="{l:ResourceString Rid=FileSystemProvider}" />
                     <TextBlock
                         FontSize="11"
                         Opacity="0.8"
-                        Text="{l:ResourceString Name=FileSystemProviderDescription}" />
+                        Text="{l:ResourceString Rid=FileSystemProviderDescription}" />
                 </StackPanel>
             </uc:BannerControl.LeftSide>
             <uc:BannerControl.RightSide>
@@ -101,44 +53,42 @@
             </uc:BannerControl.RightSide>
             <uc:BannerControl.AdditionalBottomContent>
                 <!--  File system InfoBar  -->
-                <ContentControl
-                    HorizontalContentAlignment="Stretch"
-                    VerticalContentAlignment="Stretch"
-                    Content="{x:Bind FileSystemInfoBar, Mode=OneWay}"
-                    Visibility="{x:Bind IsInfoBarOpen, Mode=OneWay}">
-                    <ContentControl.ContentTemplateSelector>
-                        <ts:FileSystemInfoBarTemplateSelector DokanyUnavailableInfoBarTemplate="{StaticResource DokanyUnavailableInfoBarTemplate}" WebDavExperimentalInfoBarTemplate="{StaticResource WebDavExperimentalInfoBarTemplate}" />
-                    </ContentControl.ContentTemplateSelector>
+                <InfoBar
+                    IsClosable="{x:Bind ViewModel.BannerViewModel.FileSystemInfoBar.IsCloseable, Mode=OneWay}"
+                    IsOpen="True"
+                    Message="{x:Bind ViewModel.BannerViewModel.FileSystemInfoBar.Message, Mode=OneWay}"
+                    Severity="{x:Bind ViewModel.BannerViewModel.FileSystemInfoBar.Severity, Mode=OneWay, Converter={StaticResource GenericEnumConverter}}"
+                    Visibility="{x:Bind ViewModel.BannerViewModel.FileSystemInfoBar.IsOpen, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
                     <!--<anim:Implicit.ShowAnimations>
-                        <anim:TranslationAnimation
-                            From="0,-15,0"
-                            To="0"
-                            Duration="0:0:0.4" />
-                        <anim:OpacityAnimation
-                            From="0"
-                            To="1.0"
-                            Duration="0:0:0.6" />
-                    </anim:Implicit.ShowAnimations>
-                    <anim:Implicit.HideAnimations>
-                        <anim:OpacityAnimation
-                            From="1.0"
-                            To="0.0"
-                            Duration="0:0:0.2" />
-                        <anim:TranslationAnimation
-                            From="0"
-                            To="0,-15,0"
-                            Duration="0:0:0.2" />
-                    </anim:Implicit.HideAnimations>-->
-                </ContentControl>
+                          <anim:TranslationAnimation
+                              From="0,-15,0"
+                              To="0"
+                              Duration="0:0:0.4" />
+                          <anim:OpacityAnimation
+                              From="0"
+                              To="1.0"
+                              Duration="0:0:0.6" />
+                      </anim:Implicit.ShowAnimations>
+                      <anim:Implicit.HideAnimations>
+                          <anim:OpacityAnimation
+                              From="1.0"
+                              To="0.0"
+                              Duration="0:0:0.2" />
+                          <anim:TranslationAnimation
+                              From="0"
+                              To="0,-15,0"
+                              Duration="0:0:0.2" />
+                      </anim:Implicit.HideAnimations>-->
+                </InfoBar>
             </uc:BannerControl.AdditionalBottomContent>
         </uc:BannerControl>
 
         <!--  Other settings  -->
         <StackPanel Grid.Row="1" Spacing="4">
             <ucab:ActionBlockControl
-                Title="{l:ResourceString Name=AutoStart}"
+                Title="{l:ResourceString Rid=AutoStart}"
                 BlockMode="Default"
-                Description="{l:ResourceString Name=AutoStartDescription}"
+                Description="{l:ResourceString Rid=AutoStartDescription}"
                 IsEnabled="False">
                 <ucab:ActionBlockControl.Icon>
                     <FontIcon Glyph="&#xF71C;" />
@@ -146,35 +96,49 @@
                 <ucab:ActionBlockControl.ActionElement>
                     <ToggleSwitch
                         MinWidth="0"
-                        AutomationProperties.Name="{l:ResourceString Name=AutoStart}"
+                        AutomationProperties.Name="{l:ResourceString Rid=AutoStart}"
                         IsOn="{x:Bind ViewModel.StartOnSystemStartup, Mode=TwoWay}" />
                 </ucab:ActionBlockControl.ActionElement>
             </ucab:ActionBlockControl>
             <ucab:ActionBlockControl
-                Title="{l:ResourceString Name=RestoreLastSession}"
+                Title="Put to background"
+                BlockMode="Default"
+                Description="Reduce the app to System Tray when closing the window">
+                <ucab:ActionBlockControl.Icon>
+                    <FontIcon Glyph="&#xE75B;" />
+                </ucab:ActionBlockControl.Icon>
+                <ucab:ActionBlockControl.ActionElement>
+                    <ToggleSwitch
+                        MinWidth="0"
+                        AutomationProperties.Name="Put to background"
+                        IsOn="{x:Bind ViewModel.ReduceToBackground, Mode=TwoWay}" />
+                </ucab:ActionBlockControl.ActionElement>
+            </ucab:ActionBlockControl>
+            <ucab:ActionBlockControl
+                Title="{l:ResourceString Rid=RestoreLastSession}"
                 BlockMode="Default"
-                Description="{l:ResourceString Name=RestoreLastSessionDescription}">
+                Description="{l:ResourceString Rid=RestoreLastSessionDescription}">
                 <ucab:ActionBlockControl.Icon>
                     <FontIcon Glyph="&#xE7E8;" />
                 </ucab:ActionBlockControl.Icon>
                 <ucab:ActionBlockControl.ActionElement>
                     <ToggleSwitch
                         MinWidth="0"
-                        AutomationProperties.Name="{l:ResourceString Name=RestoreLastSession}"
+                        AutomationProperties.Name="{l:ResourceString Rid=RestoreLastSession}"
                         IsOn="{x:Bind ViewModel.ContinueOnLastVault, Mode=TwoWay}" />
                 </ucab:ActionBlockControl.ActionElement>
             </ucab:ActionBlockControl>
             <ucab:ActionBlockControl
-                Title="{l:ResourceString Name=OpenVaultFolder}"
+                Title="{l:ResourceString Rid=OpenVaultFolder}"
                 BlockMode="Default"
-                Description="{l:ResourceString Name=OpenVaultFolderDescription}">
+                Description="{l:ResourceString Rid=OpenVaultFolderDescription}">
                 <ucab:ActionBlockControl.Icon>
                     <FontIcon Glyph="&#xED25;" />
                 </ucab:ActionBlockControl.Icon>
                 <ucab:ActionBlockControl.ActionElement>
                     <ToggleSwitch
                         MinWidth="0"
-                        AutomationProperties.Name="{l:ResourceString Name=OpenVaultFolder}"
+                        AutomationProperties.Name="{l:ResourceString Rid=OpenVaultFolder}"
                         IsOn="{x:Bind ViewModel.OpenFolderOnUnlock, Mode=TwoWay}" />
                 </ucab:ActionBlockControl.ActionElement>
             </ucab:ActionBlockControl>
diff --git a/src/Platforms/SecureFolderFS.Uno/Views/Settings/PreferencesSettingsPage.xaml.cs b/src/Platforms/SecureFolderFS.Uno/Views/Settings/PreferencesSettingsPage.xaml.cs
index e737ef465..ce17ff11d 100644
--- a/src/Platforms/SecureFolderFS.Uno/Views/Settings/PreferencesSettingsPage.xaml.cs
+++ b/src/Platforms/SecureFolderFS.Uno/Views/Settings/PreferencesSettingsPage.xaml.cs
@@ -7,10 +7,9 @@
 using Microsoft.UI.Xaml.Media.Animation;
 using Microsoft.UI.Xaml.Navigation;
 using SecureFolderFS.Sdk.Enums;
-using SecureFolderFS.Sdk.ViewModels.Controls;
 using SecureFolderFS.Sdk.ViewModels.Views.Settings;
 using SecureFolderFS.Shared.Extensions;
-using SecureFolderFS.UI.UserControls.InfoBars;
+using SecureFolderFS.Storage.Enums;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
@@ -65,50 +64,44 @@ private async Task UpdateAdapterStatus(CancellationToken cancellationToken = def
             if (ViewModel is null)
                 return;
 
-            var fileSystemAdapter = ViewModel.BannerViewModel.SelectedItem?.FileSystemInfoModel;
-            if (fileSystemAdapter is null)
+            var fileSystem = ViewModel.BannerViewModel.SelectedItem?.FileSystem;
+            if (fileSystem is null)
                 return;
 
-            var adapterResult = await fileSystemAdapter.GetStatusAsync(cancellationToken);
-            if (fileSystemAdapter.Id == Core.Constants.FileSystemId.FS_WEBDAV)
+            if (fileSystem.Id == Core.WebDav.Constants.FileSystem.FS_ID)
             {
-                FileSystemInfoBar = new WebDavInfoBar();
-                FileSystemInfoBar.IsOpen = true;
-                FileSystemInfoBar.Severity = ViewSeverityType.Warning;
-                FileSystemInfoBar.CanBeClosed = false;
+                ViewModel.BannerViewModel.FileSystemInfoBar.IsOpen = true;
+                ViewModel.BannerViewModel.FileSystemInfoBar.IsCloseable = false;
+                ViewModel.BannerViewModel.FileSystemInfoBar.Severity = SeverityType.Warning;
+                ViewModel.BannerViewModel.FileSystemInfoBar.Message = "WebDav is experimental. You may encounter bugs and stability issues. We recommend backing up your data before using WebDav.";
             }
-            else switch (adapterResult.Successful)
+            else
             {
-                case true when FileSystemInfoBar is not null:
-                    FileSystemInfoBar.IsOpen = false;
-                    break;
-
-                case false:
+                var fileSystemResult = await fileSystem.GetStatusAsync(cancellationToken);
+                if (fileSystemResult == FileSystemAvailability.Available)
                 {
-                    FileSystemInfoBar = fileSystemAdapter.Id switch
-                    {
-                        Core.Constants.FileSystemId.FS_DOKAN => new DokanyInfoBar(),
-                        _ => null
-                    };
-                    if (FileSystemInfoBar is null)
-                        return;
-
-                    await Task.Delay(800, cancellationToken);
-                    FileSystemInfoBar.IsOpen = true;
-                    FileSystemInfoBar.Severity = ViewSeverityType.Error;
-                    FileSystemInfoBar.CanBeClosed = false;
-                    FileSystemInfoBar.Message = adapterResult.GetMessage("Invalid state.");
-
-                    break;
+                    ViewModel.BannerViewModel.FileSystemInfoBar.IsOpen = false;
+                    return;
                 }
-            }
 
-            IsInfoBarOpen = FileSystemInfoBar?.IsOpen ?? false;
+                ViewModel.BannerViewModel.FileSystemInfoBar.IsOpen = true;
+                ViewModel.BannerViewModel.FileSystemInfoBar.IsCloseable = false;
+                ViewModel.BannerViewModel.FileSystemInfoBar.Severity = SeverityType.Critical;
+                ViewModel.BannerViewModel.FileSystemInfoBar.Message = fileSystemResult switch
+                {
+                    FileSystemAvailability.ModuleUnavailable or FileSystemAvailability.CoreUnavailable => "Dokany has not been detected. Please install Dokany (v2.0.5) to continue using SecureFolderFS.",
+                    FileSystemAvailability.VersionTooLow => "The installed version of Dokany is outdated. Please update Dokany to the match requested version. (v2.0.5)",
+                    FileSystemAvailability.VersionTooHigh => "The installed version of Dokany is not compatible with SecureFolderFS version. Please install requested version of Dokany. (v2.0.5)",
+                    _ => "SecureFolderFS cannot work with this version. Please install the required version of Dokany. (v2.0.5)"
+                };
+            }
         }
 
         private void Root_Loaded(object sender, RoutedEventArgs e)
         {
             _ = AddTransitionsAsync();
+            return;
+
             async Task AddTransitionsAsync()
             {
                 // Await a short delay for page navigation transition to complete and set ReorderThemeTransition to animate items when layout changes.
@@ -116,21 +109,5 @@ async Task AddTransitionsAsync()
                 (sender as Panel)?.ChildrenTransitions?.Add(new ReorderThemeTransition());
             }
         }
-
-        public InfoBarViewModel? FileSystemInfoBar
-        {
-            get => (InfoBarViewModel?)GetValue(FileSystemInfoBarProperty);
-            set => SetValue(FileSystemInfoBarProperty, value);
-        }
-        public static readonly DependencyProperty FileSystemInfoBarProperty =
-            DependencyProperty.Register(nameof(FileSystemInfoBar), typeof(InfoBarViewModel), typeof(PreferencesSettingsPage), new PropertyMetadata(defaultValue: null));
-
-        public bool IsInfoBarOpen
-        {
-            get => (bool)GetValue(IsInfoBarOpenProperty);
-            set => SetValue(IsInfoBarOpenProperty, value);
-        }
-        public static readonly DependencyProperty IsInfoBarOpenProperty =
-            DependencyProperty.Register(nameof(IsInfoBarOpen), typeof(bool), typeof(PreferencesSettingsPage), new PropertyMetadata(defaultValue: false));
     }
 }
diff --git a/src/Platforms/SecureFolderFS.Uno/Views/Settings/PrivacySettingsPage.xaml b/src/Platforms/SecureFolderFS.Uno/Views/Settings/PrivacySettingsPage.xaml
index 85ff35587..0e899c1f3 100644
--- a/src/Platforms/SecureFolderFS.Uno/Views/Settings/PrivacySettingsPage.xaml
+++ b/src/Platforms/SecureFolderFS.Uno/Views/Settings/PrivacySettingsPage.xaml
@@ -26,39 +26,38 @@
         <!--  Other settings  -->
         <StackPanel Grid.Row="1" Spacing="4">
             <ucab:ActionBlockControl
-                Title="{l:ResourceString Name=DisableRecentAccess}"
+                Title="{l:ResourceString Rid=DisableRecentAccess}"
                 BlockMode="Default"
-                Description="{l:ResourceString Name=DisableRecentAccessDescription}">
+                Description="{l:ResourceString Rid=DisableRecentAccessDescription}">
                 <ucab:ActionBlockControl.Icon>
                     <FontIcon Glyph="&#xE81C;" />
                 </ucab:ActionBlockControl.Icon>
                 <ucab:ActionBlockControl.ActionElement>
                     <ToggleSwitch
                         MinWidth="0"
-                        AutomationProperties.Name="{l:ResourceString Name=DisableRecentAccess}"
+                        AutomationProperties.Name="{l:ResourceString Rid=DisableRecentAccess}"
                         IsEnabled="False"
-                        IsOn="{x:Bind ViewModel.AutoLockVaults, Mode=TwoWay}" />
+                        IsOn="{x:Bind ViewModel.DisableRecentAccess, Mode=TwoWay}" />
                 </ucab:ActionBlockControl.ActionElement>
             </ucab:ActionBlockControl>
             <ucab:ActionBlockControl
-                Title="{l:ResourceString Name=AutoLock}"
+                Title="{l:ResourceString Rid=AutoLock}"
                 BlockMode="Default"
-                Description="{l:ResourceString Name=AutoLockDescription}">
+                Description="{l:ResourceString Rid=AutoLockDescription}">
                 <ucab:ActionBlockControl.Icon>
                     <FontIcon Glyph="&#xE72E;" />
                 </ucab:ActionBlockControl.Icon>
                 <ucab:ActionBlockControl.ActionElement>
                     <ToggleSwitch
                         MinWidth="0"
-                        AutomationProperties.Name="{l:ResourceString Name=AutoLock}"
-                        IsEnabled="False"
-                        IsOn="{x:Bind ViewModel.AutoLockVaults, Mode=TwoWay}" />
+                        AutomationProperties.Name="{l:ResourceString Rid=AutoLock}"
+                        IsOn="{x:Bind ViewModel.LockOnSystemLock, Mode=TwoWay}" />
                 </ucab:ActionBlockControl.ActionElement>
             </ucab:ActionBlockControl>
             <ucab:ActionBlockControl
-                Title="{l:ResourceString Name=Telemetry}"
+                Title="{l:ResourceString Rid=Telemetry}"
                 BlockMode="Default"
-                Description="{l:ResourceString Name=TelemetryDescription}">
+                Description="{l:ResourceString Rid=TelemetryDescription}">
                 <ucab:ActionBlockControl.Icon>
                     <FontIcon Glyph="&#xE9D2;" />
                 </ucab:ActionBlockControl.Icon>
@@ -66,7 +65,7 @@
                     <ToggleSwitch
                         x:Name="EnableTelemetry"
                         MinWidth="0"
-                        AutomationProperties.Name="{l:ResourceString Name=Telemetry}"
+                        AutomationProperties.Name="{l:ResourceString Rid=Telemetry}"
                         IsOn="{x:Bind ViewModel.IsTelemetryEnabled, Mode=TwoWay}" />
                 </ucab:ActionBlockControl.ActionElement>
             </ucab:ActionBlockControl>
diff --git a/src/Platforms/SecureFolderFS.Uno/Views/Vault/VaultDashboardPage.xaml b/src/Platforms/SecureFolderFS.Uno/Views/Vault/VaultDashboardPage.xaml
index b11eea22a..a2cca397e 100644
--- a/src/Platforms/SecureFolderFS.Uno/Views/Vault/VaultDashboardPage.xaml
+++ b/src/Platforms/SecureFolderFS.Uno/Views/Vault/VaultDashboardPage.xaml
@@ -73,7 +73,7 @@
                 Height="32"
                 Margin="0,0,16,0"
                 Padding="8"
-                AutomationProperties.Name="{l:ResourceString Name=Back}"
+                AutomationProperties.Name="{l:ResourceString Rid=Back}"
                 Background="Transparent"
                 BorderThickness="0"
                 Command="{x:Bind ViewModel.GoBackCommand, Mode=OneWay}">
diff --git a/src/Platforms/SecureFolderFS.Uno/Views/Vault/VaultDashboardPage.xaml.cs b/src/Platforms/SecureFolderFS.Uno/Views/Vault/VaultDashboardPage.xaml.cs
index c23bdeced..46f3f7aff 100644
--- a/src/Platforms/SecureFolderFS.Uno/Views/Vault/VaultDashboardPage.xaml.cs
+++ b/src/Platforms/SecureFolderFS.Uno/Views/Vault/VaultDashboardPage.xaml.cs
@@ -34,6 +34,7 @@ public VaultDashboardPage()
             InitializeComponent();
         }
 
+        /// <inheritdoc/>
         protected override async void OnNavigatedTo(NavigationEventArgs e)
         {
             if (e.Parameter is VaultDashboardViewModel viewModel)
@@ -51,7 +52,7 @@ protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
             {
                 // Remove the reference to the NavigationControl so the page can get properly garbage collected
                 ViewModel.DashboardNavigation.ResetNavigation();
-                ViewModel.DashboardNavigation.NavigationChanged -= DashboardNavigationService_NavigationChanged;
+                ViewModel.DashboardNavigation.NavigationChanged -= DashboardNavigation_NavigationChanged;
             }
             
             Navigation.Dispose();
@@ -67,7 +68,7 @@ private async Task LoadComponentsAsync()
             _isLoaded = true;
             
             // Attach navigation event
-            ViewModel.DashboardNavigation.NavigationChanged += DashboardNavigationService_NavigationChanged;
+            ViewModel.DashboardNavigation.NavigationChanged += DashboardNavigation_NavigationChanged;
 
             // Initialize navigation
             if (ViewModel.DashboardNavigation.SetupNavigation(Navigation, true))
@@ -80,7 +81,7 @@ IViewDesignation GetDefaultDashboardViewModel()
                     var vaultOverviewViewModel = new VaultOverviewViewModel(
                         ViewModel.UnlockedVaultViewModel,
                         new(ViewModel.VaultNavigation, ViewModel.DashboardNavigation, ViewModel.UnlockedVaultViewModel),
-                        new(ViewModel.UnlockedVaultViewModel, new WidgetsCollectionModel(ViewModel.VaultModel.Folder)));
+                        new(ViewModel.UnlockedVaultViewModel, ViewModel.DashboardNavigation, new WidgetsCollectionModel(ViewModel.VaultViewModel.VaultModel.Folder)));
 
                     _ = vaultOverviewViewModel.InitAsync();
                     return vaultOverviewViewModel;
@@ -93,7 +94,7 @@ private async void Navigation_Loaded(object sender, RoutedEventArgs e)
             await LoadComponentsAsync();
         }
 
-        private async void DashboardNavigationService_NavigationChanged(object? sender, IViewDesignation? e)
+        private async void DashboardNavigation_NavigationChanged(object? sender, IViewDesignation? e)
         {
             var canGoBack = e is not VaultOverviewViewModel;
             if (canGoBack)
diff --git a/src/Platforms/SecureFolderFS.Uno/Views/Vault/VaultHealthPage.xaml b/src/Platforms/SecureFolderFS.Uno/Views/Vault/VaultHealthPage.xaml
new file mode 100644
index 000000000..5c52e4a33
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Uno/Views/Vault/VaultHealthPage.xaml
@@ -0,0 +1,229 @@
+<Page
+    x:Class="SecureFolderFS.Uno.Views.Vault.VaultHealthPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ts="using:SecureFolderFS.Uno.TemplateSelectors"
+    xmlns:ucab="using:SecureFolderFS.Uno.UserControls.ActionBlocks"
+    xmlns:vc="using:SecureFolderFS.Uno.ValueConverters"
+    xmlns:vm="using:SecureFolderFS.Sdk.ViewModels.Controls.Widgets.Health"
+    xmlns:vm2="using:SecureFolderFS.UI.ViewModels.Health"
+    mc:Ignorable="d">
+
+    <Page.Resources>
+        <vc:GenericEnumConverter x:Key="GenericEnumConverter" />
+        <vc:CountToStringConverter x:Key="CountToStringConverter" />
+        <vc:ProgressIsDeterminateConverter x:Key="ProgressIsDeterminateConverter" />
+        <vc:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
+
+        <!--  Directory Issue  -->
+        <DataTemplate x:Key="DirectoryIssueTemplate" x:DataType="vm2:HealthDirectoryIssueViewModel">
+            <ucab:ActionBlockControl
+                Title="{x:Bind Title, Mode=OneWay}"
+                BlockMode="Expandable"
+                Description="{x:Bind ErrorMessage, Mode=OneWay}"
+                ToolTip="{x:Bind ExceptionMessage, Mode=OneWay}">
+                <ucab:ActionBlockControl.Icon>
+                    <FontIcon Glyph="{x:Bind Icon, Mode=OneWay, FallbackValue='&#xE783;'}" />
+                </ucab:ActionBlockControl.Icon>
+                <ucab:ActionBlockControl.ExpanderContent>
+                    <Border Margin="-16">
+                        <ListView
+                            Margin="-16,0"
+                            IsItemClickEnabled="False"
+                            ItemsSource="{x:Bind Issues, Mode=OneWay}"
+                            SelectionMode="None">
+                            <ListView.ItemTemplateSelector>
+                                <ts:HealthIssueTemplateSelector
+                                    DirectoryIssueTemplate="{StaticResource DirectoryIssueTemplate}"
+                                    IssueTemplate="{StaticResource IssueTemplate}"
+                                    NameIssueTemplate="{StaticResource NameIssueTemplate}" />
+                            </ListView.ItemTemplateSelector>
+                        </ListView>
+                    </Border>
+                </ucab:ActionBlockControl.ExpanderContent>
+                <ucab:ActionBlockControl.ContextFlyout>
+                    <MenuFlyout>
+                        <MenuFlyoutItem Command="{x:Bind CopyPathCommand, Mode=OneWay}" Text="Copy path">
+                            <MenuFlyoutItem.Icon>
+                                <FontIcon Glyph="&#xE62F;" />
+                            </MenuFlyoutItem.Icon>
+                        </MenuFlyoutItem>
+                        <MenuFlyoutItem Command="{x:Bind CopyErrorCommand, Mode=OneWay}" Text="Copy error">
+                            <MenuFlyoutItem.Icon>
+                                <FontIcon Glyph="&#xE8C8;" />
+                            </MenuFlyoutItem.Icon>
+                        </MenuFlyoutItem>
+                    </MenuFlyout>
+                </ucab:ActionBlockControl.ContextFlyout>
+            </ucab:ActionBlockControl>
+        </DataTemplate>
+
+        <!--  Name Issue  -->
+        <DataTemplate x:Key="NameIssueTemplate" x:DataType="vm2:HealthNameIssueViewModel">
+            <ucab:ActionBlockControl
+                Title="{x:Bind Title, Mode=OneWay}"
+                BlockMode="Default"
+                Description="{x:Bind ErrorMessage, Mode=OneWay}"
+                ToolTip="{x:Bind ExceptionMessage, Mode=OneWay}">
+                <ucab:ActionBlockControl.Icon>
+                    <FontIcon Grid.Column="0" Glyph="{x:Bind Icon, Mode=OneWay, FallbackValue='&#xE783;'}" />
+                </ucab:ActionBlockControl.Icon>
+                <ucab:ActionBlockControl.ActionElement>
+                    <Grid MaxWidth="200">
+                        <TextBlock
+                            FontSize="14"
+                            Opacity="0.8"
+                            Tapped="NameText_Tapped"
+                            Text="{x:Bind ItemName, Mode=OneWay}"
+                            TextTrimming="CharacterEllipsis"
+                            ToolTipService.ToolTip="{x:Bind ItemName, Mode=OneWay}"
+                            Visibility="{x:Bind IsEditing, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}, ConverterParameter='invert'}" />
+
+                        <TextBox
+                            x:Name="NameEdit"
+                            Width="200"
+                            IsEnabled="{x:Bind IsEditing, Mode=OneWay}"
+                            IsEnabledChanged="NameEdit_IsEnabledChanged"
+                            LostFocus="NameEdit_LostFocus"
+                            PreviewKeyDown="NameEdit_PreviewKeyDown"
+                            Text="{x:Bind ItemName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                            Visibility="{x:Bind IsEditing, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
+                    </Grid>
+                </ucab:ActionBlockControl.ActionElement>
+                <ucab:ActionBlockControl.ContextFlyout>
+                    <MenuFlyout>
+                        <MenuFlyoutItem Command="{x:Bind CopyPathCommand, Mode=OneWay}" Text="Copy path">
+                            <MenuFlyoutItem.Icon>
+                                <FontIcon Glyph="&#xE62F;" />
+                            </MenuFlyoutItem.Icon>
+                        </MenuFlyoutItem>
+                        <MenuFlyoutItem Command="{x:Bind CopyErrorCommand, Mode=OneWay}" Text="Copy error">
+                            <MenuFlyoutItem.Icon>
+                                <FontIcon Glyph="&#xE8C8;" />
+                            </MenuFlyoutItem.Icon>
+                        </MenuFlyoutItem>
+                    </MenuFlyout>
+                </ucab:ActionBlockControl.ContextFlyout>
+            </ucab:ActionBlockControl>
+        </DataTemplate>
+
+        <!--  Base Issue  -->
+        <DataTemplate x:Key="IssueTemplate" x:DataType="vm:HealthIssueViewModel">
+            <ucab:ActionBlockControl
+                Title="{x:Bind Title, Mode=OneWay}"
+                BlockMode="Default"
+                Description="{x:Bind ErrorMessage, Mode=OneWay}"
+                ToolTip="{x:Bind ExceptionMessage, Mode=OneWay}">
+                <ucab:ActionBlockControl.Icon>
+                    <FontIcon Grid.Column="0" Glyph="{x:Bind Icon, Mode=OneWay, FallbackValue='&#xE783;'}" />
+                </ucab:ActionBlockControl.Icon>
+                <ucab:ActionBlockControl.ContextFlyout>
+                    <MenuFlyout>
+                        <MenuFlyoutItem Command="{x:Bind CopyPathCommand, Mode=OneWay}" Text="Copy path">
+                            <MenuFlyoutItem.Icon>
+                                <FontIcon Glyph="&#xE62F;" />
+                            </MenuFlyoutItem.Icon>
+                        </MenuFlyoutItem>
+                        <MenuFlyoutItem Command="{x:Bind CopyErrorCommand, Mode=OneWay}" Text="Copy error">
+                            <MenuFlyoutItem.Icon>
+                                <FontIcon Glyph="&#xE8C8;" />
+                            </MenuFlyoutItem.Icon>
+                        </MenuFlyoutItem>
+                    </MenuFlyout>
+                </ucab:ActionBlockControl.ContextFlyout>
+            </ucab:ActionBlockControl>
+        </DataTemplate>
+    </Page.Resources>
+
+    <Grid Margin="0,0,0,4" RowSpacing="12">
+        <Grid.RowDefinitions>
+            <RowDefinition />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+
+        <!--  Scan details  -->
+        <Grid Grid.Row="0" RowSpacing="4">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+
+            <InfoBar
+                Title="{x:Bind ViewModel.FoundIssues.Count, Mode=OneWay, Converter={StaticResource CountToStringConverter}, ConverterParameter='STANDARD|Found {0} issue(s)'}"
+                Grid.Row="0"
+                VerticalContentAlignment="Center"
+                IsClosable="False"
+                IsOpen="True"
+                Severity="{x:Bind ViewModel.Severity, Mode=OneWay, Converter={StaticResource GenericEnumConverter}}">
+                <Grid>
+                    <ProgressRing
+                        Width="16"
+                        Height="16"
+                        Margin="0,-54,16,0"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Center"
+                        IsActive="True"
+                        IsIndeterminate="{x:Bind ViewModel.CurrentProgress, Mode=OneWay, Converter={StaticResource ProgressIsDeterminateConverter}}"
+                        Visibility="{x:Bind ViewModel.IsProgressing, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
+                        Value="{x:Bind ViewModel.CurrentProgress, Mode=OneWay}" />
+                    <Button
+                        Height="36"
+                        Margin="0,-54,16,0"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Center"
+                        Command="{x:Bind ViewModel.StartScanningCommand, Mode=OneWay}"
+                        CommandParameter="rescan"
+                        Content="Start scanning"
+                        Visibility="{x:Bind ViewModel.IsProgressing, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}, ConverterParameter='invert'}" />
+                </Grid>
+            </InfoBar>
+            <ListView
+                Grid.Row="1"
+                IsItemClickEnabled="False"
+                ItemsSource="{x:Bind ViewModel.FoundIssues, Mode=OneWay}"
+                ScrollViewer.VerticalScrollBarVisibility="Auto"
+                ScrollViewer.VerticalScrollMode="Enabled"
+                SelectionMode="None">
+                <ListView.ItemContainerStyle>
+                    <Style TargetType="ListViewItem">
+                        <Setter Property="Template">
+                            <Setter.Value>
+                                <ControlTemplate TargetType="ListViewItem">
+                                    <ListViewItemPresenter ContentMargin="0,0,0,4" />
+                                </ControlTemplate>
+                            </Setter.Value>
+                        </Setter>
+                    </Style>
+                </ListView.ItemContainerStyle>
+
+                <ListView.ItemTemplateSelector>
+                    <ts:HealthIssueTemplateSelector
+                        DirectoryIssueTemplate="{StaticResource DirectoryIssueTemplate}"
+                        IssueTemplate="{StaticResource IssueTemplate}"
+                        NameIssueTemplate="{StaticResource NameIssueTemplate}" />
+                </ListView.ItemTemplateSelector>
+            </ListView>
+        </Grid>
+
+        <!--  Continuation action  -->
+        <StackPanel
+            Grid.Row="1"
+            Orientation="Horizontal"
+            Spacing="8">
+            <!--<Button Width="124" Content="Ignore" />-->
+            <Button
+                Width="124"
+                Command="{x:Bind ViewModel.ResolveCommand, Mode=OneWay}"
+                Content="Repair"
+                IsEnabled="{x:Bind ViewModel.CanResolve, Mode=OneWay}" />
+            <TextBlock
+                VerticalAlignment="Center"
+                FontSize="12"
+                Opacity="0.8"
+                Text="During repair, your vault will be set into read-only mode."
+                TextTrimming="CharacterEllipsis" />
+        </StackPanel>
+    </Grid>
+</Page>
diff --git a/src/Platforms/SecureFolderFS.Uno/Views/Vault/VaultHealthPage.xaml.cs b/src/Platforms/SecureFolderFS.Uno/Views/Vault/VaultHealthPage.xaml.cs
new file mode 100644
index 000000000..df6b55523
--- /dev/null
+++ b/src/Platforms/SecureFolderFS.Uno/Views/Vault/VaultHealthPage.xaml.cs
@@ -0,0 +1,108 @@
+using System.Linq;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Navigation;
+using SecureFolderFS.Sdk.ViewModels.Views.Vault;
+using SecureFolderFS.Shared.Extensions;
+using SecureFolderFS.UI.ViewModels.Health;
+using SecureFolderFS.Uno.Extensions;
+using SecureFolderFS.Uno.UserControls.ActionBlocks;
+using Windows.System;
+
+// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
+
+namespace SecureFolderFS.Uno.Views.Vault
+{
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    [INotifyPropertyChanged]
+    public sealed partial class VaultHealthPage : Page
+    {
+        public VaultHealthReportViewModel? ViewModel
+        {
+            get => DataContext.TryCast<VaultHealthReportViewModel>();
+            set { DataContext = value; OnPropertyChanged(); }
+        }
+
+        public VaultHealthPage()
+        {
+            InitializeComponent();
+        }
+
+        /// <inheritdoc/>
+        protected override void OnNavigatedTo(NavigationEventArgs e)
+        {
+            if (e.Parameter is VaultHealthReportViewModel viewModel)
+                ViewModel = viewModel;
+
+            base.OnNavigatedTo(e);
+        }
+
+        private void NameText_Tapped(object sender, TappedRoutedEventArgs e)
+        {
+            if (sender is not FrameworkElement { DataContext: ActionBlockControl { DataContext: HealthNameIssueViewModel viewModel }} textBlock)
+                return;
+
+            viewModel.IsEditing = true;
+            var textBox = textBlock.GetParent<Grid>()?.Children.FirstOrDefaultType<UIElement, TextBox>();
+            textBox?.Focus(FocusState.Programmatic);
+            textBox?.SelectAll();
+        }
+
+        private void NameEdit_LostFocus(object sender, RoutedEventArgs e)
+        {
+            if (sender is not FrameworkElement { DataContext: ActionBlockControl { DataContext: HealthNameIssueViewModel viewModel } })
+                return;
+
+            viewModel.IsEditing = false;
+        }
+
+        private void NameEdit_IsEnabledChanged(object sender, DependencyPropertyChangedEventArgs e)
+        {
+            // Workaround: Since Visibility does not have *Changed event,
+            // we rely on IsEnabled to notify when the IsEditing property changes and set the focus
+            if (sender is not TextBox { DataContext: ActionBlockControl { DataContext: HealthNameIssueViewModel } } textBox)
+                return;
+
+            if (e.NewValue is not true)
+                return;
+
+            textBox.Focus(FocusState.Programmatic);
+            textBox.SelectAll();
+        }
+
+        private void NameEdit_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
+        {
+            if (sender is not FrameworkElement { DataContext: ActionBlockControl { DataContext: HealthNameIssueViewModel nameIssueViewModel } actionBlock })
+                return;
+
+            switch (e.Key)
+            {
+                case VirtualKey.Enter:
+                case VirtualKey.Escape:
+                    e.Handled = true;
+                    nameIssueViewModel.IsEditing = false;
+                    break;
+
+                case VirtualKey.Tab:
+                    if (actionBlock.GetParent<ListView>()?.DataContext is not ActionBlockControl { DataContext: HealthDirectoryIssueViewModel directoryIssueViewModel })
+                        break;
+
+                    e.Handled = true;
+                    nameIssueViewModel.IsEditing = false;
+
+                    var index = directoryIssueViewModel.Issues.IndexOf(directoryIssueViewModel) + 1;
+                    if (index >= directoryIssueViewModel.Issues.Count)
+                        index = 0;
+
+                    if (directoryIssueViewModel.Issues.ElementAtOrDefault(index) is HealthNameIssueViewModel nextElement)
+                        nextElement.IsEditing = true;
+
+                    break;
+            }
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Uno/Views/Vault/VaultLoginPage.xaml b/src/Platforms/SecureFolderFS.Uno/Views/Vault/VaultLoginPage.xaml
index 36cdaa8d8..7b22690ac 100644
--- a/src/Platforms/SecureFolderFS.Uno/Views/Vault/VaultLoginPage.xaml
+++ b/src/Platforms/SecureFolderFS.Uno/Views/Vault/VaultLoginPage.xaml
@@ -12,6 +12,8 @@
 
     <Page.Resources>
         <vc:LoginViewModelBoolConverter x:Key="LoginViewModelBoolConverter" />
+        <vc:LoginViewModelVisibilityConverter x:Key="LoginViewModelVisibilityConverter" />
+        <vc:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
     </Page.Resources>
 
     <ScrollViewer>
@@ -36,40 +38,44 @@
                         HorizontalAlignment="Center"
                         FontSize="26"
                         FontWeight="SemiBold"
-                        Text="{x:Bind ViewModel.Title, Mode=OneWay}"
+                        Text="{x:Bind ViewModel.VaultViewModel.VaultName, Mode=OneWay}"
                         TextTrimming="CharacterEllipsis"
-                        ToolTipService.ToolTip="{x:Bind ViewModel.Title, Mode=OneWay}" />
+                        ToolTipService.ToolTip="{x:Bind ViewModel.VaultViewModel.VaultName, Mode=OneWay}" />
                     <TextBlock
                         HorizontalAlignment="Center"
                         FontSize="14"
                         Opacity="0.6"
-                        Text="{l:ResourceString Name=VaultLocked}" />
+                        Text="{l:ResourceString Rid=VaultLocked}" />
                 </StackPanel>
 
                 <!--  Login  -->
                 <StackPanel Spacing="8">
                     <uc:LoginControl CurrentViewModel="{x:Bind ViewModel.LoginViewModel.CurrentViewModel, Mode=OneWay}" ProvideContinuationButton="True" />
+
+                    <!--  TODO(uno): #18589  -->
                     <HyperlinkButton
                         x:Name="LoginOptions"
                         Padding="4,2"
                         HorizontalAlignment="Center"
-                        x:Load="{x:Bind ViewModel.LoginViewModel.CurrentViewModel, Mode=OneWay, Converter={StaticResource LoginViewModelBoolConverter}, ConverterParameter='MigrationViewModel,ErrorViewModel|invert'}"
                         Click="LoginOptions_Click"
-                        Content="{l:ResourceString Name=LoginOptions}">
+                        Content="{l:ResourceString Rid=LoginOptions}"
+                        Visibility="{x:Bind ViewModel.LoginViewModel.CurrentViewModel, Mode=OneWay, Converter={StaticResource LoginViewModelVisibilityConverter}, ConverterParameter='MigrationViewModel,ErrorViewModel|invert'}">
                         <FlyoutBase.AttachedFlyout>
                             <Flyout>
                                 <StackPanel Spacing="4">
-                                    <CheckBox Content="Unlock as read-only" IsEnabled="False" />
+                                    <CheckBox Content="{l:ResourceString Rid=UnlockAsReadOnly}" IsChecked="{x:Bind ViewModel.IsReadOnly, Mode=TwoWay}" />
                                     <CheckBox Content="Save credentials" IsEnabled="False" />
+
+                                    <!--  TODO(uno): #18589  -->
                                     <Button
                                         x:Name="RestartProcessButton"
-                                        x:Load="{x:Bind ViewModel.LoginViewModel.IsLoginSequence, Mode=OneWay}"
                                         Command="{x:Bind ViewModel.LoginViewModel.RestartLoginProcessCommand, Mode=OneWay}"
-                                        Content="{l:ResourceString Name=RestartLogin}" />
+                                        Content="{l:ResourceString Rid=RestartLogin}"
+                                        Visibility="{x:Bind ViewModel.LoginViewModel.IsLoginSequence, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
                                     <Button
                                         HorizontalAlignment="Stretch"
-                                        Command="{x:Bind ViewModel.BeginRecoveryCommand, Mode=OneWay}"
-                                        Content="{l:ResourceString Name=RecoverAccess}" />
+                                        Command="{x:Bind ViewModel.LoginViewModel.RecoverAccessCommand, Mode=OneWay}"
+                                        Content="{l:ResourceString Rid=RecoverAccess}" />
                                 </StackPanel>
                             </Flyout>
                         </FlyoutBase.AttachedFlyout>
diff --git a/src/Platforms/SecureFolderFS.Uno/Views/Vault/VaultLoginPage.xaml.cs b/src/Platforms/SecureFolderFS.Uno/Views/Vault/VaultLoginPage.xaml.cs
index 90ac6694b..b5ba01e06 100644
--- a/src/Platforms/SecureFolderFS.Uno/Views/Vault/VaultLoginPage.xaml.cs
+++ b/src/Platforms/SecureFolderFS.Uno/Views/Vault/VaultLoginPage.xaml.cs
@@ -33,6 +33,7 @@ public VaultLoginPage()
             InitializeComponent();
         }
 
+        /// <inheritdoc/>
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
             if (e.Parameter is VaultLoginViewModel viewModel)
@@ -70,7 +71,6 @@ private async void ViewModel_NavigationRequested(object? sender, NavigationReque
 
             var dashboardNavigation = DI.Service<INavigationService>();
             var dashboardViewModel = new VaultDashboardViewModel(args.UnlockedVaultViewModel, ViewModel.VaultNavigation, dashboardNavigation);
-            _ = dashboardViewModel.InitAsync();
 
             await ViewModel.VaultNavigation.TryNavigateAndForgetAsync(dashboardViewModel);
         }
diff --git a/src/Platforms/SecureFolderFS.Uno/Views/Vault/VaultOverviewPage.xaml b/src/Platforms/SecureFolderFS.Uno/Views/Vault/VaultOverviewPage.xaml
index 8b046c5e9..ef3362bf3 100644
--- a/src/Platforms/SecureFolderFS.Uno/Views/Vault/VaultOverviewPage.xaml
+++ b/src/Platforms/SecureFolderFS.Uno/Views/Vault/VaultOverviewPage.xaml
@@ -9,7 +9,8 @@
     xmlns:ucab="using:SecureFolderFS.Uno.UserControls.ActionBlocks"
     xmlns:ucw="using:SecureFolderFS.Uno.UserControls.Widgets"
     xmlns:vm="using:SecureFolderFS.Sdk.ViewModels.Controls.Widgets"
-    xmlns:vm2="using:SecureFolderFS.Sdk.ViewModels.Controls.Widgets.Categories"
+    xmlns:vm2="using:SecureFolderFS.Sdk.ViewModels.Controls.Widgets.Health"
+    xmlns:vm3="using:SecureFolderFS.Sdk.ViewModels.Controls.Widgets.Data"
     NavigationCacheMode="Disabled"
     mc:Ignorable="d">
 
@@ -17,21 +18,25 @@
         <!--  Vault Health  -->
         <DataTemplate x:Key="HealthWidgetTemplate" x:DataType="vm2:HealthWidgetViewModel">
             <ucw:HealthWidget
-                HealthLastCheckedText="{x:Bind LastCheckedText, Mode=OneWay}"
+                CancelCommand="{x:Bind CancelScanningCommand, Mode=OneWay}"
+                CurrentProgress="{x:Bind HealthReportViewModel.CurrentProgress, Mode=OneWay}"
+                IsProgressing="{x:Bind HealthReportViewModel.IsProgressing, Mode=OneWay}"
+                LastCheckedText="{x:Bind LastCheckedText, Mode=OneWay}"
                 OpenVaultHealthCommand="{x:Bind OpenVaultHealthCommand, Mode=OneWay}"
+                Severity="{x:Bind HealthReportViewModel.Severity, Mode=OneWay}"
                 StartScanningCommand="{x:Bind StartScanningCommand, Mode=OneWay}"
-                VaultHealthState="{x:Bind VaultHealthState, Mode=OneWay}" />
+                StatusTitle="{x:Bind Title, Mode=OneWay}" />
         </DataTemplate>
 
         <!--  Resource Graphs  -->
-        <DataTemplate x:Key="GraphsWidgetTemplate" x:DataType="vm2:GraphsWidgetViewModel">
+        <DataTemplate x:Key="GraphsWidgetTemplate" x:DataType="vm3:GraphsWidgetViewModel">
             <ucw:GraphsWidget
                 ReadGraphData="{x:Bind ReadGraphViewModel.Data, Mode=OneWay}"
                 ReadGraphIsExtended="{x:Bind ReadGraphViewModel.IsExtended, Mode=TwoWay}"
-                ReadGraphSubheader="{x:Bind ReadGraphViewModel.GraphSubheader, Mode=OneWay}"
+                ReadGraphSubheader="{x:Bind ReadGraphViewModel.GraphSubHeader, Mode=OneWay}"
                 WriteGraphData="{x:Bind WriteGraphViewModel.Data, Mode=OneWay}"
                 WriteGraphIsExtended="{x:Bind WriteGraphViewModel.IsExtended, Mode=TwoWay}"
-                WriteGraphSubheader="{x:Bind WriteGraphViewModel.GraphSubheader, Mode=OneWay}" />
+                WriteGraphSubheader="{x:Bind WriteGraphViewModel.GraphSubHeader, Mode=OneWay}" />
         </DataTemplate>
     </Page.Resources>
 
@@ -56,12 +61,22 @@
 
             <!--  Vault options  -->
             <StackPanel Spacing="4">
+
+                <!--  Vault read-only InfoBar  -->
+                <InfoBar
+                    x:Name="ReadOnlyInfoBar"
+                    x:Load="{x:Bind ViewModel.UnlockedVaultViewModel.Options.IsReadOnly, Mode=OneWay}"
+                    IsClosable="False"
+                    IsOpen="True"
+                    Message="{l:ResourceString Rid=VaultReadOnlyMode}"
+                    Severity="Informational" />
+
                 <!--  Open in File Explorer  -->
                 <ucab:ActionBlockControl
-                    Title="{l:ResourceString Name=ViewVault}"
+                    Title="{l:ResourceString Rid=ViewVault}"
                     BlockMode="Clickable"
                     ClickCommand="{x:Bind ViewModel.VaultControlsViewModel.RevealFolderCommand, Mode=OneWay}"
-                    Description="{l:ResourceString Name=ViewVaultDescription}">
+                    Description="{l:ResourceString Rid=ViewVaultDescription}">
                     <ucab:ActionBlockControl.Icon>
                         <FontIcon Glyph="&#xEC50;" />
                     </ucab:ActionBlockControl.Icon>
@@ -72,10 +87,10 @@
 
                 <!--  Vault properties  -->
                 <ucab:ActionBlockControl
-                    Title="{l:ResourceString Name=VaultProperties}"
+                    Title="{l:ResourceString Rid=VaultProperties}"
                     BlockMode="Clickable"
                     ClickCommand="{x:Bind ViewModel.VaultControlsViewModel.OpenPropertiesCommand, Mode=OneWay}"
-                    Description="{l:ResourceString Name=VaultPropertiesDescription}">
+                    Description="{l:ResourceString Rid=VaultPropertiesDescription}">
                     <ucab:ActionBlockControl.Icon>
                         <FontIcon Glyph="&#xE946;" />
                     </ucab:ActionBlockControl.Icon>
@@ -86,10 +101,10 @@
 
                 <!--  Lock vault  -->
                 <ucab:ActionBlockControl
-                    Title="{l:ResourceString Name=LockVault}"
+                    Title="{l:ResourceString Rid=LockVault}"
                     BlockMode="Clickable"
                     ClickCommand="{x:Bind ViewModel.VaultControlsViewModel.LockVaultCommand, Mode=OneWay}"
-                    Description="{l:ResourceString Name=LockVaultDescription}">
+                    Description="{l:ResourceString Rid=LockVaultDescription}">
                     <ucab:ActionBlockControl.Icon>
                         <FontIcon Glyph="&#xE72E;" />
                     </ucab:ActionBlockControl.Icon>
diff --git a/src/Platforms/SecureFolderFS.Uno/Views/Vault/VaultPropertiesPage.xaml b/src/Platforms/SecureFolderFS.Uno/Views/Vault/VaultPropertiesPage.xaml
index 6411303f1..1363678d9 100644
--- a/src/Platforms/SecureFolderFS.Uno/Views/Vault/VaultPropertiesPage.xaml
+++ b/src/Platforms/SecureFolderFS.Uno/Views/Vault/VaultPropertiesPage.xaml
@@ -6,12 +6,26 @@
     xmlns:l="using:SecureFolderFS.Uno.Localization"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ucab="using:SecureFolderFS.Uno.UserControls.ActionBlocks"
+    xmlns:vc="using:SecureFolderFS.Uno.ValueConverters"
     NavigationCacheMode="Disabled"
     mc:Ignorable="d">
 
+    <Page.Resources>
+        <vc:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
+    </Page.Resources>
+
     <StackPanel Spacing="4">
+        <!--  Vault read-only InfoBar  -->
+        <InfoBar
+            x:Name="ReadOnlyInfoBar"
+            x:Load="{x:Bind ViewModel.UnlockedVaultViewModel.Options.IsReadOnly, Mode=OneWay}"
+            IsClosable="False"
+            IsOpen="True"
+            Message="{l:ResourceString Rid=VaultReadOnlyMode}"
+            Severity="Informational" />
+
         <ucab:ActionBlockControl
-            Title="{l:ResourceString Name=VaultInformation}"
+            Title="{l:ResourceString Rid=VaultInformation}"
             BlockMode="Expandable"
             IsExpanded="True">
             <ucab:ActionBlockControl.Icon>
@@ -25,58 +39,59 @@
                     </Grid.ColumnDefinitions>
 
                     <StackPanel Grid.Column="0" Spacing="4">
-                        <TextBlock Text="{l:ResourceString Name=Security}" />
-                        <TextBlock Text="{l:ResourceString Name=DataEncryption}" />
-                        <TextBlock Text="{l:ResourceString Name=FileNameEncryption}" />
-                        <TextBlock Text="{l:ResourceString Name=ActiveFileSystem}" />
+                        <TextBlock Text="{l:ResourceString Rid=Security}" />
+                        <TextBlock Text="{l:ResourceString Rid=DataEncryption}" />
+                        <TextBlock Text="{l:ResourceString Rid=FileNameEncryption}" />
+                        <TextBlock Text="{l:ResourceString Rid=ActiveFileSystem}" />
                     </StackPanel>
                     <StackPanel Grid.Column="1" Spacing="4">
                         <TextBlock
                             IsTextSelectionEnabled="True"
-                            Opacity="0.8"
+                            Opacity="0.6"
                             Text="{x:Bind ViewModel.SecurityText, Mode=OneWay}" />
                         <TextBlock
                             IsTextSelectionEnabled="True"
-                            Opacity="0.8"
+                            Opacity="0.6"
                             Text="{x:Bind ViewModel.ContentCipherText, Mode=OneWay}" />
                         <TextBlock
                             IsTextSelectionEnabled="True"
-                            Opacity="0.8"
+                            Opacity="0.6"
                             Text="{x:Bind ViewModel.FileNameCipherText, Mode=OneWay}" />
                         <TextBlock
                             IsTextSelectionEnabled="True"
-                            Opacity="0.8"
-                            Text="{x:Bind ViewModel.ActiveFileSystemText, Mode=OneWay}" />
+                            Opacity="0.6"
+                            Text="{x:Bind ViewModel.ActiveFileSystemText, Mode=OneWay}"
+                            ToolTipService.ToolTip="{x:Bind ViewModel.FileSystemDescriptionText, Mode=OneWay}" />
                     </StackPanel>
                 </Grid>
             </ucab:ActionBlockControl.ExpanderContent>
         </ucab:ActionBlockControl>
 
         <ucab:ActionBlockControl
-            Title="{l:ResourceString Name=ChangeCredentials}"
+            Title="{l:ResourceString Rid=ChangeCredentials}"
             BlockMode="Clickable"
             ClickCommand="{x:Bind ViewModel.ChangeFirstAuthenticationCommand, Mode=OneWay}"
-            Description="{l:ResourceString Name=ChangeCredentialsDescription}">
+            Description="{l:ResourceString Rid=ChangeCredentialsDescription}">
             <ucab:ActionBlockControl.Icon>
                 <FontIcon Glyph="&#xE8D7;" />
             </ucab:ActionBlockControl.Icon>
         </ucab:ActionBlockControl>
 
         <ucab:ActionBlockControl
-            Title="{l:ResourceString Name=TwoFactor}"
+            Title="{l:ResourceString Rid=TwoFactor}"
             BlockMode="Clickable"
             ClickCommand="{x:Bind ViewModel.ChangeSecondAuthenticationCommand, Mode=OneWay}"
-            Description="{l:ResourceString Name=TwoFactorDescription}">
+            Description="{l:ResourceString Rid=TwoFactorDescription}">
             <ucab:ActionBlockControl.Icon>
                 <FontIcon Glyph="&#xEC19;" />
             </ucab:ActionBlockControl.Icon>
         </ucab:ActionBlockControl>
 
         <ucab:ActionBlockControl
-            Title="{l:ResourceString Name=RecoveryCodes}"
+            Title="{l:ResourceString Rid=RecoveryCodes}"
             BlockMode="Clickable"
             ClickCommand="{x:Bind ViewModel.ViewRecoveryCommand, Mode=OneWay}"
-            Description="{l:ResourceString Name=RecoveryCodesDescription}">
+            Description="{l:ResourceString Rid=RecoveryCodesDescription}">
             <ucab:ActionBlockControl.Icon>
                 <FontIcon Glyph="&#xE777;" />
             </ucab:ActionBlockControl.Icon>
diff --git a/src/Platforms/SecureFolderFS.Uno/Views/VaultWizard/CredentialsWizardPage.xaml b/src/Platforms/SecureFolderFS.Uno/Views/VaultWizard/CredentialsWizardPage.xaml
index 3c268661c..8694fb494 100644
--- a/src/Platforms/SecureFolderFS.Uno/Views/VaultWizard/CredentialsWizardPage.xaml
+++ b/src/Platforms/SecureFolderFS.Uno/Views/VaultWizard/CredentialsWizardPage.xaml
@@ -19,7 +19,7 @@
 
         <!--  Unlocking method  -->
         <ucab:ActionBlockControl
-            Title="{l:ResourceString Name=LockType}"
+            Title="{l:ResourceString Rid=LockType}"
             Grid.Row="0"
             BlockMode="Expandable"
             IsExpanded="True">
@@ -30,7 +30,7 @@
                 <ComboBox ItemsSource="{x:Bind ViewModel.AuthenticationOptions, Mode=OneWay}" SelectedItem="{x:Bind ViewModel.RegisterViewModel.CurrentViewModel, Mode=TwoWay}">
                     <ComboBox.ItemTemplate>
                         <DataTemplate x:DataType="vm2:AuthenticationViewModel">
-                            <TextBlock Text="{x:Bind DisplayName, Mode=OneWay}" />
+                            <TextBlock Text="{x:Bind Title, Mode=OneWay}" />
                         </DataTemplate>
                     </ComboBox.ItemTemplate>
                 </ComboBox>
@@ -42,7 +42,7 @@
 
         <!--  Advanced  -->
         <ucab:ActionBlockControl
-            Title="{l:ResourceString Name=AdvancedOptions}"
+            Title="{l:ResourceString Rid=AdvancedOptions}"
             Grid.Row="1"
             HorizontalAlignment="Stretch"
             BlockMode="Expandable">
@@ -54,16 +54,18 @@
                     <Grid.RowDefinitions>
                         <RowDefinition />
                         <RowDefinition />
+                        <RowDefinition />
                     </Grid.RowDefinitions>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition />
                         <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
 
+                    <!--  Data Encryption  -->
                     <TextBlock
                         Grid.Row="0"
                         Grid.Column="0"
-                        Text="{l:ResourceString Name=DataEncryption}" />
+                        Text="{l:ResourceString Rid=DataEncryption}" />
                     <ComboBox
                         Grid.Row="0"
                         Grid.Column="1"
@@ -73,16 +75,17 @@
                         SelectedIndex="0"
                         SelectedItem="{x:Bind ViewModel.ContentCipher, Mode=TwoWay}">
                         <ComboBox.ItemTemplate>
-                            <DataTemplate x:DataType="vm:CipherViewModel">
-                                <TextBlock Text="{x:Bind Name, Mode=OneWay}" />
+                            <DataTemplate x:DataType="vm:VaultOptionViewModel">
+                                <TextBlock Text="{x:Bind Title, Mode=OneWay}" />
                             </DataTemplate>
                         </ComboBox.ItemTemplate>
                     </ComboBox>
 
+                    <!--  Name Encryption  -->
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Text="{l:ResourceString Name=FileNameEncryption}" />
+                        Text="{l:ResourceString Rid=FileNameEncryption}" />
                     <ComboBox
                         Grid.Row="1"
                         Grid.Column="1"
@@ -92,8 +95,28 @@
                         SelectedIndex="0"
                         SelectedItem="{x:Bind ViewModel.FileNameCipher, Mode=TwoWay}">
                         <ComboBox.ItemTemplate>
-                            <DataTemplate x:DataType="vm:CipherViewModel">
-                                <TextBlock Text="{x:Bind Name, Mode=OneWay}" />
+                            <DataTemplate x:DataType="vm:VaultOptionViewModel">
+                                <TextBlock Text="{x:Bind Title, Mode=OneWay}" />
+                            </DataTemplate>
+                        </ComboBox.ItemTemplate>
+                    </ComboBox>
+
+                    <!--  Name Encoding  -->
+                    <TextBlock
+                        Grid.Row="2"
+                        Grid.Column="0"
+                        Text="Name encoding" />
+                    <ComboBox
+                        Grid.Row="2"
+                        Grid.Column="1"
+                        HorizontalAlignment="Right"
+                        AutomationProperties.Name="{x:Bind ViewModel.EncodingOption, Mode=OneWay}"
+                        ItemsSource="{x:Bind ViewModel.EncodingOptions, Mode=OneWay}"
+                        SelectedIndex="0"
+                        SelectedItem="{x:Bind ViewModel.EncodingOption, Mode=TwoWay}">
+                        <ComboBox.ItemTemplate>
+                            <DataTemplate x:DataType="vm:VaultOptionViewModel">
+                                <TextBlock Text="{x:Bind Title, Mode=OneWay}" />
                             </DataTemplate>
                         </ComboBox.ItemTemplate>
                     </ComboBox>
diff --git a/src/Platforms/SecureFolderFS.Uno/Views/VaultWizard/MainWizardPage.xaml b/src/Platforms/SecureFolderFS.Uno/Views/VaultWizard/MainWizardPage.xaml
index 926a43948..ff9262c9a 100644
--- a/src/Platforms/SecureFolderFS.Uno/Views/VaultWizard/MainWizardPage.xaml
+++ b/src/Platforms/SecureFolderFS.Uno/Views/VaultWizard/MainWizardPage.xaml
@@ -32,8 +32,8 @@
             HorizontalAlignment="Center"
             SelectedIndex="0"
             SelectionChanged="Segmented_SelectionChanged">
-            <tuc:SegmentedItem Content="{l:ResourceString Name=AddExisting}" Tag="EXISTING" />
-            <tuc:SegmentedItem Content="{l:ResourceString Name=CreateNew}" Tag="CREATE" />
+            <tuc:SegmentedItem Content="{l:ResourceString Rid=AddExisting}" Tag="EXISTING" />
+            <tuc:SegmentedItem Content="{l:ResourceString Rid=CreateNew}" Tag="CREATE" />
         </tuc:Segmented>-->
         <StackPanel
             HorizontalAlignment="Center"
@@ -44,14 +44,14 @@
                 Height="28"
                 Padding="12,0"
                 Click="SegmentButton_Click"
-                Content="{l:ResourceString Name=CreateNew}"
+                Content="{l:ResourceString Rid=CreateNew}"
                 Style="{ThemeResource AccentButtonStyle}"
                 Tag="CREATE" />
             <Button
                 Height="28"
                 Padding="12,0"
                 Click="SegmentButton_Click"
-                Content="{l:ResourceString Name=AddExisting}"
+                Content="{l:ResourceString Rid=AddExisting}"
                 Tag="EXISTING" />
         </StackPanel>
 
diff --git a/src/Platforms/SecureFolderFS.Uno/Views/VaultWizard/MainWizardPage.xaml.cs b/src/Platforms/SecureFolderFS.Uno/Views/VaultWizard/MainWizardPage.xaml.cs
index 74bcda210..c3dcbb7ec 100644
--- a/src/Platforms/SecureFolderFS.Uno/Views/VaultWizard/MainWizardPage.xaml.cs
+++ b/src/Platforms/SecureFolderFS.Uno/Views/VaultWizard/MainWizardPage.xaml.cs
@@ -18,8 +18,8 @@ namespace SecureFolderFS.Uno.Views.VaultWizard
     [INotifyPropertyChanged]
     public sealed partial class MainWizardPage : Page
     {
-        private readonly LocationWizardViewModel _createNewViewModel = new(NewVaultCreationType.CreateNew);
-        private readonly LocationWizardViewModel _addExistingViewModel = new(NewVaultCreationType.AddExisting);
+        private LocationWizardViewModel? _createNewViewModel;
+        private LocationWizardViewModel? _addExistingViewModel;
         private Button? _lastClickedButton;
 
         [ObservableProperty] private LocationWizardViewModel? _CurrentViewModel;
@@ -41,6 +41,8 @@ protected override async void OnNavigatedTo(NavigationEventArgs e)
             {
                 ViewModel = viewModel;
                 ViewModel.CreationType = NewVaultCreationType.CreateNew; // Default value for the view
+                _createNewViewModel = new(viewModel.VaultCollectionModel, NewVaultCreationType.CreateNew);
+                _addExistingViewModel = new(viewModel.VaultCollectionModel, NewVaultCreationType.AddExisting);
                 CurrentViewModel = _createNewViewModel;
                 ViewModel.CanContinue = await CurrentViewModel.UpdateStatusAsync();
             }
@@ -83,7 +85,8 @@ private async void SegmentButton_Click(object sender, RoutedEventArgs e)
             // Change type
             ViewModel.CreationType = tag == "CREATE" ? NewVaultCreationType.CreateNew : NewVaultCreationType.AddExisting;
             CurrentViewModel = ViewModel.CreationType == NewVaultCreationType.CreateNew ? _createNewViewModel : _addExistingViewModel;
-            ViewModel.CanContinue = await CurrentViewModel.UpdateStatusAsync();
+            if (CurrentViewModel is not null)
+                ViewModel.CanContinue = await CurrentViewModel.UpdateStatusAsync();
 
             // Apply styles
             button.Style = (Style?)App.Instance?.Resources["AccentButtonStyle"];
diff --git a/src/Platforms/SecureFolderFS.Uno/Views/VaultWizard/SummaryWizardPage.xaml.cs b/src/Platforms/SecureFolderFS.Uno/Views/VaultWizard/SummaryWizardPage.xaml.cs
index 97cb2662a..9dd926502 100644
--- a/src/Platforms/SecureFolderFS.Uno/Views/VaultWizard/SummaryWizardPage.xaml.cs
+++ b/src/Platforms/SecureFolderFS.Uno/Views/VaultWizard/SummaryWizardPage.xaml.cs
@@ -33,7 +33,6 @@ public SummaryWizardViewModel? ViewModel
         public SummaryWizardPage()
         {
             InitializeComponent();
-
         }
 
         protected override void OnNavigatedTo(NavigationEventArgs e)
diff --git a/src/SecureFolderFS.Core.Cryptography/Cipher/AesGcm128.cs b/src/SecureFolderFS.Core.Cryptography/Cipher/AesGcm128.cs
index f93afb290..00dc63cf5 100644
--- a/src/SecureFolderFS.Core.Cryptography/Cipher/AesGcm128.cs
+++ b/src/SecureFolderFS.Core.Cryptography/Cipher/AesGcm128.cs
@@ -8,13 +8,13 @@ public static class AesGcm128
     {
         public static void Encrypt(ReadOnlySpan<byte> bytes, ReadOnlySpan<byte> key, ReadOnlySpan<byte> nonce, Span<byte> tag, Span<byte> result, ReadOnlySpan<byte> associatedData)
         {
-            using var aesGcm = new AesGcm(key);
+            using var aesGcm = new AesGcm(key, Constants.Crypto.Chunks.AesGcm.CHUNK_TAG_SIZE);
             aesGcm.Encrypt(nonce, bytes, result, tag, associatedData);
         }
 
         public static void Decrypt(ReadOnlySpan<byte> bytes, ReadOnlySpan<byte> key, ReadOnlySpan<byte> nonce, ReadOnlySpan<byte> tag, Span<byte> result, ReadOnlySpan<byte> associatedData)
         {
-            using var aesGcm = new AesGcm(key);
+            using var aesGcm = new AesGcm(key, Constants.Crypto.Chunks.AesGcm.CHUNK_TAG_SIZE);
             aesGcm.Decrypt(nonce, bytes, tag, result, associatedData);
         }
 
diff --git a/src/SecureFolderFS.Core.Cryptography/Cipher/Argon2id.cs b/src/SecureFolderFS.Core.Cryptography/Cipher/Argon2id.cs
index 034d454bf..1080202fe 100644
--- a/src/SecureFolderFS.Core.Cryptography/Cipher/Argon2id.cs
+++ b/src/SecureFolderFS.Core.Cryptography/Cipher/Argon2id.cs
@@ -13,7 +13,7 @@ public static void DeriveKey(ReadOnlySpan<byte> password, ReadOnlySpan<byte> sal
             argon2id.Iterations = Constants.Crypto.Argon2.ITERATIONS;
             argon2id.MemorySize = Constants.Crypto.Argon2.MEMORY_SIZE;
 
-            argon2id.GetBytes(Constants.ARGON2_KEK_LENGTH).CopyTo(result);
+            argon2id.GetBytes(Constants.KeyTraits.ARGON2_KEK_LENGTH).CopyTo(result);
         }
     }
 }
diff --git a/src/SecureFolderFS.Core.Cryptography/Cipher/XChaCha20Poly1305.cs b/src/SecureFolderFS.Core.Cryptography/Cipher/XChaCha20Poly1305.cs
index cd5a0bc0c..b9728266f 100644
--- a/src/SecureFolderFS.Core.Cryptography/Cipher/XChaCha20Poly1305.cs
+++ b/src/SecureFolderFS.Core.Cryptography/Cipher/XChaCha20Poly1305.cs
@@ -1,5 +1,5 @@
-using NSec.Cryptography;
-using System;
+using System;
+using NSec.Cryptography;
 
 namespace SecureFolderFS.Core.Cryptography.Cipher
 {
diff --git a/src/SecureFolderFS.Core.Cryptography/Constants.cs b/src/SecureFolderFS.Core.Cryptography/Constants.cs
index e4b19c570..5c608e996 100644
--- a/src/SecureFolderFS.Core.Cryptography/Constants.cs
+++ b/src/SecureFolderFS.Core.Cryptography/Constants.cs
@@ -2,10 +2,9 @@
 {
     public static class Constants
     {
-        public const int ARGON2_KEK_LENGTH = 32;
-
-        public static class KeyChains
+        public static class KeyTraits
         {
+            public const int ARGON2_KEK_LENGTH = 32;
             public const int ENCKEY_LENGTH = 32;
             public const int MACKEY_LENGTH = 32;
             public const int SALT_LENGTH = 16;
@@ -14,10 +13,13 @@ public static class KeyChains
         public static class CipherId
         {
             public const string NONE = ""; // Empty string
-            public const string AES_CTR_HMAC = "AES-CTR HMAC";
+            public const string AES_SIV = "AES-SIV";
             public const string AES_GCM = "AES-GCM";
+            public const string AES_CTR_HMAC = "AES-CTR HMAC";
             public const string XCHACHA20_POLY1305 = "XChaCha20-Poly1305";
-            public const string AES_SIV = "AES-SIV";
+
+            public const string ENCODING_BASE4K = "Base4K";
+            public const string ENCODING_BASE64URL = "Base64Url";
         }
 
         internal static class Crypto
@@ -26,26 +28,26 @@ internal static class Chunks
             {
                 internal static class XChaCha20Poly1305
                 {
-                    public const int CHUNK_CLEARTEXT_SIZE = 32 * 1024; // 32768
+                    public const int CHUNK_PLAINTEXT_SIZE = 32 * 1024; // 32768
                     public const int CHUNK_NONCE_SIZE = 24;
                     public const int CHUNK_TAG_SIZE = 16;
-                    public const int CHUNK_CIPHERTEXT_SIZE = CHUNK_NONCE_SIZE + CHUNK_CLEARTEXT_SIZE + CHUNK_TAG_SIZE;
+                    public const int CHUNK_CIPHERTEXT_SIZE = CHUNK_NONCE_SIZE + CHUNK_PLAINTEXT_SIZE + CHUNK_TAG_SIZE;
                 }
 
                 internal static class AesGcm
                 {
-                    public const int CHUNK_CLEARTEXT_SIZE = 32 * 1024; // 32768
+                    public const int CHUNK_PLAINTEXT_SIZE = 32 * 1024; // 32768
                     public const int CHUNK_NONCE_SIZE = 12;
                     public const int CHUNK_TAG_SIZE = 16;
-                    public const int CHUNK_CIPHERTEXT_SIZE = CHUNK_NONCE_SIZE + CHUNK_CLEARTEXT_SIZE + CHUNK_TAG_SIZE;
+                    public const int CHUNK_CIPHERTEXT_SIZE = CHUNK_NONCE_SIZE + CHUNK_PLAINTEXT_SIZE + CHUNK_TAG_SIZE;
                 }
 
                 internal static class AesCtrHmac
                 {
-                    public const int CHUNK_CLEARTEXT_SIZE = 32 * 1024; // 32768
+                    public const int CHUNK_PLAINTEXT_SIZE = 32 * 1024; // 32768
                     public const int CHUNK_NONCE_SIZE = 16;
                     public const int CHUNK_MAC_SIZE = 32;
-                    public const int CHUNK_CIPHERTEXT_SIZE = CHUNK_NONCE_SIZE + CHUNK_CLEARTEXT_SIZE + CHUNK_MAC_SIZE;
+                    public const int CHUNK_CIPHERTEXT_SIZE = CHUNK_NONCE_SIZE + CHUNK_PLAINTEXT_SIZE + CHUNK_MAC_SIZE;
                 }
             }
 
diff --git a/src/SecureFolderFS.Core.Cryptography/ContentCrypt/AesCtrHmacContentCrypt.cs b/src/SecureFolderFS.Core.Cryptography/ContentCrypt/AesCtrHmacContentCrypt.cs
index eda542bee..729aa0e90 100644
--- a/src/SecureFolderFS.Core.Cryptography/ContentCrypt/AesCtrHmacContentCrypt.cs
+++ b/src/SecureFolderFS.Core.Cryptography/ContentCrypt/AesCtrHmacContentCrypt.cs
@@ -15,7 +15,7 @@ internal sealed class AesCtrHmacContentCrypt : BaseContentCrypt
         private readonly SecretKey _macKey;
 
         /// <inheritdoc/>
-        public override int ChunkCleartextSize { get; } = CHUNK_CLEARTEXT_SIZE;
+        public override int ChunkPlaintextSize { get; } = CHUNK_PLAINTEXT_SIZE;
 
         /// <inheritdoc/>
         public override int ChunkCiphertextSize { get; } = CHUNK_CIPHERTEXT_SIZE;
@@ -29,31 +29,31 @@ public AesCtrHmacContentCrypt(SecretKey macKey)
         }
 
         /// <inheritdoc/>
-        public override void EncryptChunk(ReadOnlySpan<byte> cleartextChunk, long chunkNumber, ReadOnlySpan<byte> header, Span<byte> ciphertextChunk)
+        public override void EncryptChunk(ReadOnlySpan<byte> plaintextChunk, long chunkNumber, ReadOnlySpan<byte> header, Span<byte> ciphertextChunk)
         {
             // Chunk nonce
             secureRandom.GetBytes(ciphertextChunk.Slice(0, CHUNK_NONCE_SIZE));
 
             // Encrypt
             AesCtr128.Encrypt(
-                cleartextChunk,
+                plaintextChunk,
                 header.GetHeaderContentKey(),
                 ciphertextChunk.Slice(0, CHUNK_NONCE_SIZE),
-                ciphertextChunk.Slice(CHUNK_NONCE_SIZE, cleartextChunk.Length));
+                ciphertextChunk.Slice(CHUNK_NONCE_SIZE, plaintextChunk.Length));
 
             // Calculate MAC
             CalculateChunkMac(
                 header.GetHeaderNonce(),
                 ciphertextChunk.Slice(0, CHUNK_NONCE_SIZE),
-                ciphertextChunk.Slice(CHUNK_NONCE_SIZE, cleartextChunk.Length),
+                ciphertextChunk.Slice(CHUNK_NONCE_SIZE, plaintextChunk.Length),
                 chunkNumber,
-                ciphertextChunk.Slice(CHUNK_NONCE_SIZE + cleartextChunk.Length, CHUNK_MAC_SIZE));
+                ciphertextChunk.Slice(CHUNK_NONCE_SIZE + plaintextChunk.Length, CHUNK_MAC_SIZE));
         }
 
         /// <inheritdoc/>
         [SkipLocalsInit]
         public override bool DecryptChunk(ReadOnlySpan<byte> ciphertextChunk, long chunkNumber,
-            ReadOnlySpan<byte> header, Span<byte> cleartextChunk)
+            ReadOnlySpan<byte> header, Span<byte> plaintextChunk)
         {
             // Allocate byte* for MAC
             Span<byte> mac = stackalloc byte[CHUNK_MAC_SIZE];
@@ -75,7 +75,7 @@ public override bool DecryptChunk(ReadOnlySpan<byte> ciphertextChunk, long chunk
                 ciphertextChunk.GetChunkPayload(),
                 header.GetHeaderContentKey(),
                 ciphertextChunk.GetChunkNonce(),
-                cleartextChunk);
+                plaintextChunk);
 
             return true;
         }
diff --git a/src/SecureFolderFS.Core.Cryptography/ContentCrypt/AesGcmContentCrypt.cs b/src/SecureFolderFS.Core.Cryptography/ContentCrypt/AesGcmContentCrypt.cs
index 2dad4cac7..d68cdb9c5 100644
--- a/src/SecureFolderFS.Core.Cryptography/ContentCrypt/AesGcmContentCrypt.cs
+++ b/src/SecureFolderFS.Core.Cryptography/ContentCrypt/AesGcmContentCrypt.cs
@@ -13,7 +13,7 @@ namespace SecureFolderFS.Core.Cryptography.ContentCrypt
     internal sealed class AesGcmContentCrypt : BaseContentCrypt
     {
         /// <inheritdoc/>
-        public override int ChunkCleartextSize { get; } = CHUNK_CLEARTEXT_SIZE;
+        public override int ChunkPlaintextSize { get; } = CHUNK_PLAINTEXT_SIZE;
 
         /// <inheritdoc/>
         public override int ChunkCiphertextSize { get; } = CHUNK_CIPHERTEXT_SIZE;
@@ -23,7 +23,7 @@ internal sealed class AesGcmContentCrypt : BaseContentCrypt
 
         /// <inheritdoc/>
         [SkipLocalsInit]
-        public override void EncryptChunk(ReadOnlySpan<byte> cleartextChunk, long chunkNumber, ReadOnlySpan<byte> header, Span<byte> ciphertextChunk)
+        public override void EncryptChunk(ReadOnlySpan<byte> plaintextChunk, long chunkNumber, ReadOnlySpan<byte> header, Span<byte> ciphertextChunk)
         {
             // Chunk nonce
             secureRandom.GetBytes(ciphertextChunk.Slice(0, CHUNK_NONCE_SIZE));
@@ -34,17 +34,17 @@ public override void EncryptChunk(ReadOnlySpan<byte> cleartextChunk, long chunkN
 
             // Encrypt
             AesGcm128.Encrypt(
-                cleartextChunk,
+                plaintextChunk,
                 header.GetHeaderContentKey(),
                 ciphertextChunk.Slice(0, CHUNK_NONCE_SIZE),
-                ciphertextChunk.Slice(CHUNK_NONCE_SIZE + cleartextChunk.Length),
-                ciphertextChunk.Slice(CHUNK_NONCE_SIZE, cleartextChunk.Length),
+                ciphertextChunk.Slice(CHUNK_NONCE_SIZE + plaintextChunk.Length),
+                ciphertextChunk.Slice(CHUNK_NONCE_SIZE, plaintextChunk.Length),
                 associatedData);
         }
 
         /// <inheritdoc/>
         [SkipLocalsInit]
-        public override bool DecryptChunk(ReadOnlySpan<byte> ciphertextChunk, long chunkNumber, ReadOnlySpan<byte> header, Span<byte> cleartextChunk)
+        public override bool DecryptChunk(ReadOnlySpan<byte> ciphertextChunk, long chunkNumber, ReadOnlySpan<byte> header, Span<byte> plaintextChunk)
         {
             // Big Endian chunk number and file header nonce
             Span<byte> associatedData = stackalloc byte[sizeof(long) + HEADER_NONCE_SIZE];
@@ -56,7 +56,7 @@ public override bool DecryptChunk(ReadOnlySpan<byte> ciphertextChunk, long chunk
                 header.GetHeaderContentKey(),
                 ciphertextChunk.GetChunkNonce(),
                 ciphertextChunk.GetChunkTag(),
-                cleartextChunk.Slice(0, ciphertextChunk.Length - (CHUNK_NONCE_SIZE + CHUNK_TAG_SIZE)),
+                plaintextChunk.Slice(0, ciphertextChunk.Length - (CHUNK_NONCE_SIZE + CHUNK_TAG_SIZE)),
                 associatedData);
         }
     }
diff --git a/src/SecureFolderFS.Core.Cryptography/ContentCrypt/BaseContentCrypt.cs b/src/SecureFolderFS.Core.Cryptography/ContentCrypt/BaseContentCrypt.cs
index a5f551471..d2c8eda08 100644
--- a/src/SecureFolderFS.Core.Cryptography/ContentCrypt/BaseContentCrypt.cs
+++ b/src/SecureFolderFS.Core.Cryptography/ContentCrypt/BaseContentCrypt.cs
@@ -9,7 +9,7 @@ internal abstract class BaseContentCrypt : IContentCrypt
         protected readonly RandomNumberGenerator secureRandom;
 
         /// <inheritdoc/>
-        public abstract int ChunkCleartextSize { get; }
+        public abstract int ChunkPlaintextSize { get; }
 
         /// <inheritdoc/>
         public abstract int ChunkCiphertextSize { get; }
@@ -19,38 +19,41 @@ internal abstract class BaseContentCrypt : IContentCrypt
 
         protected BaseContentCrypt()
         {
-            this.secureRandom = RandomNumberGenerator.Create();
+            secureRandom = RandomNumberGenerator.Create();
         }
 
         /// <inheritdoc/>
-        public abstract void EncryptChunk(ReadOnlySpan<byte> cleartextChunk, long chunkNumber, ReadOnlySpan<byte> header, Span<byte> ciphertextChunk);
+        public abstract void EncryptChunk(ReadOnlySpan<byte> plaintextChunk, long chunkNumber, ReadOnlySpan<byte> header, Span<byte> ciphertextChunk);
 
         /// <inheritdoc/>
-        public abstract bool DecryptChunk(ReadOnlySpan<byte> ciphertextChunk, long chunkNumber, ReadOnlySpan<byte> header, Span<byte> cleartextChunk);
+        public abstract bool DecryptChunk(ReadOnlySpan<byte> ciphertextChunk, long chunkNumber, ReadOnlySpan<byte> header, Span<byte> plaintextChunk);
 
         /// <inheritdoc/>
-        public virtual long CalculateCiphertextSize(long cleartextSize)
+        public virtual long CalculateCiphertextSize(long plaintextSize)
         {
-            var overheadPerChunk = ChunkCiphertextSize - ChunkCleartextSize;
-            var fullChunksCount = cleartextSize / ChunkCleartextSize;
-            var additionalCleartextBytes = cleartextSize % ChunkCleartextSize;
-            var additionalCiphertextBytes = (additionalCleartextBytes == 0L) ? 0L : additionalCleartextBytes + overheadPerChunk;
+            var overheadPerChunk = ChunkCiphertextSize - ChunkPlaintextSize;
+            var fullChunksCount = plaintextSize / ChunkPlaintextSize;
+            var additionalPlaintextBytes = plaintextSize % ChunkPlaintextSize;
+            var additionalCiphertextBytes = (additionalPlaintextBytes == 0L) ? 0L : additionalPlaintextBytes + overheadPerChunk;
 
             return ChunkCiphertextSize * fullChunksCount + additionalCiphertextBytes;
         }
 
         /// <inheritdoc/>
-        public virtual long CalculateCleartextSize(long ciphertextSize)
+        public virtual long CalculatePlaintextSize(long ciphertextSize)
         {
-            var chunkOverhead = ChunkCiphertextSize - ChunkCleartextSize;
+            if (ciphertextSize == 0L)
+                return 0L;
+
+            var chunkOverhead = ChunkCiphertextSize - ChunkPlaintextSize;
             var chunksCount = ciphertextSize / ChunkCiphertextSize;
             var additionalCiphertextBytes = ciphertextSize % ChunkCiphertextSize;
 
             if (additionalCiphertextBytes > 0 && additionalCiphertextBytes <= chunkOverhead)
                 return -1L;
 
-            var additionalCleartextBytes = (additionalCiphertextBytes == 0L) ? 0L : additionalCiphertextBytes - chunkOverhead;
-            var final = ChunkCleartextSize * chunksCount + additionalCleartextBytes;
+            var additionalPlaintextBytes = (additionalCiphertextBytes == 0L) ? 0L : additionalCiphertextBytes - chunkOverhead;
+            var final = ChunkPlaintextSize * chunksCount + additionalPlaintextBytes;
 
             return final >= 0L ? final : -1L;
         }
diff --git a/src/SecureFolderFS.Core.Cryptography/ContentCrypt/IContentCrypt.cs b/src/SecureFolderFS.Core.Cryptography/ContentCrypt/IContentCrypt.cs
index 08644c346..b75a924b9 100644
--- a/src/SecureFolderFS.Core.Cryptography/ContentCrypt/IContentCrypt.cs
+++ b/src/SecureFolderFS.Core.Cryptography/ContentCrypt/IContentCrypt.cs
@@ -8,9 +8,9 @@ namespace SecureFolderFS.Core.Cryptography.ContentCrypt
     public interface IContentCrypt : IDisposable
     {
         /// <summary>
-        /// Gets the size of cleartext chunk.
+        /// Gets the size of plaintext chunk.
         /// </summary>
-        int ChunkCleartextSize { get; }
+        int ChunkPlaintextSize { get; }
 
         /// <summary>
         /// Gets the full size of ciphertext chunk.
@@ -23,36 +23,36 @@ public interface IContentCrypt : IDisposable
         int ChunkFirstReservedSize { get; }
 
         /// <summary>
-        /// Encrypts the <paramref name="cleartextChunk"/> and writes <paramref name="ciphertextChunk"/> with encrypted data.
+        /// Encrypts the <paramref name="plaintextChunk"/> and writes <paramref name="ciphertextChunk"/> with encrypted data.
         /// </summary>
-        /// <param name="cleartextChunk">The data to be encrypted.</param>
+        /// <param name="plaintextChunk">The data to be encrypted.</param>
         /// <param name="chunkNumber">The chunk number part of encrypted data.</param>
         /// <param name="header">The header of the whole data.</param>
         /// <param name="ciphertextChunk">The encrypted data to be written to.</param>
-        void EncryptChunk(ReadOnlySpan<byte> cleartextChunk, long chunkNumber, ReadOnlySpan<byte> header, Span<byte> ciphertextChunk);
+        void EncryptChunk(ReadOnlySpan<byte> plaintextChunk, long chunkNumber, ReadOnlySpan<byte> header, Span<byte> ciphertextChunk);
 
         /// <summary>
-        /// Decrypts the <paramref name="ciphertextChunk"/> and writes <paramref name="cleartextChunk"/> with decrypted data.
+        /// Decrypts the <paramref name="ciphertextChunk"/> and writes <paramref name="plaintextChunk"/> with decrypted data.
         /// </summary>
         /// <param name="ciphertextChunk">The data to be decrypted.</param>
         /// <param name="chunkNumber">The chunk number part of encrypted data.</param>
         /// <param name="header">The header of the whole data.</param>
-        /// <param name="cleartextChunk">The decrypted data to be written to.</param>
+        /// <param name="plaintextChunk">The decrypted data to be written to.</param>
         /// <returns>True if decryption was successful; otherwise false if an integrity error occurred.</returns>
-        bool DecryptChunk(ReadOnlySpan<byte> ciphertextChunk, long chunkNumber, ReadOnlySpan<byte> header, Span<byte> cleartextChunk);
+        bool DecryptChunk(ReadOnlySpan<byte> ciphertextChunk, long chunkNumber, ReadOnlySpan<byte> header, Span<byte> plaintextChunk);
 
         /// <summary>
-        /// Calculates the ciphertext size from <paramref name="cleartextSize"/>.
+        /// Calculates the ciphertext size from <paramref name="plaintextSize"/>.
         /// </summary>
-        /// <param name="cleartextSize">The size of cleartext.</param>
+        /// <param name="plaintextSize">The size of plaintext.</param>
         /// <returns>Aligned ciphertext size.</returns>
-        long CalculateCiphertextSize(long cleartextSize);
+        long CalculateCiphertextSize(long plaintextSize);
 
         /// <summary>
-        /// Calculates the cleartext size from <paramref name="ciphertextSize"/>.
+        /// Calculates the plaintext size from <paramref name="ciphertextSize"/>.
         /// </summary>
         /// <param name="ciphertextSize">The size of ciphertext.</param>
         /// <returns>Aligned ciphertext size. Value can be -1 if the provided <paramref name="ciphertextSize"/> is incorrect.</returns>
-        long CalculateCleartextSize(long ciphertextSize);
+        long CalculatePlaintextSize(long ciphertextSize);
     }
 }
diff --git a/src/SecureFolderFS.Core.Cryptography/ContentCrypt/XChaChaContentCrypt.cs b/src/SecureFolderFS.Core.Cryptography/ContentCrypt/XChaChaContentCrypt.cs
index 09bb2840d..ced6add47 100644
--- a/src/SecureFolderFS.Core.Cryptography/ContentCrypt/XChaChaContentCrypt.cs
+++ b/src/SecureFolderFS.Core.Cryptography/ContentCrypt/XChaChaContentCrypt.cs
@@ -13,7 +13,7 @@ namespace SecureFolderFS.Core.Cryptography.ContentCrypt
     internal sealed class XChaChaContentCrypt : BaseContentCrypt
     {
         /// <inheritdoc/>
-        public override int ChunkCleartextSize { get; } = CHUNK_CLEARTEXT_SIZE;
+        public override int ChunkPlaintextSize { get; } = CHUNK_PLAINTEXT_SIZE;
 
         /// <inheritdoc/>
         public override int ChunkCiphertextSize { get; } = CHUNK_CIPHERTEXT_SIZE;
@@ -23,7 +23,7 @@ internal sealed class XChaChaContentCrypt : BaseContentCrypt
 
         /// <inheritdoc/>
         [SkipLocalsInit]
-        public override void EncryptChunk(ReadOnlySpan<byte> cleartextChunk, long chunkNumber, ReadOnlySpan<byte> header, Span<byte> ciphertextChunk)
+        public override void EncryptChunk(ReadOnlySpan<byte> plaintextChunk, long chunkNumber, ReadOnlySpan<byte> header, Span<byte> ciphertextChunk)
         {
             // Chunk nonce
             secureRandom.GetBytes(ciphertextChunk.Slice(0, CHUNK_NONCE_SIZE));
@@ -34,7 +34,7 @@ public override void EncryptChunk(ReadOnlySpan<byte> cleartextChunk, long chunkN
 
             // Encrypt
             XChaCha20Poly1305.Encrypt(
-                cleartextChunk,
+                plaintextChunk,
                 header.GetHeaderContentKey(),
                 ciphertextChunk.Slice(0, CHUNK_NONCE_SIZE),
                 ciphertextChunk.Slice(CHUNK_NONCE_SIZE),
@@ -44,7 +44,7 @@ public override void EncryptChunk(ReadOnlySpan<byte> cleartextChunk, long chunkN
 
         /// <inheritdoc/>
         [SkipLocalsInit]
-        public override unsafe bool DecryptChunk(ReadOnlySpan<byte> ciphertextChunk, long chunkNumber, ReadOnlySpan<byte> header, Span<byte> cleartextChunk)
+        public override unsafe bool DecryptChunk(ReadOnlySpan<byte> ciphertextChunk, long chunkNumber, ReadOnlySpan<byte> header, Span<byte> plaintextChunk)
         {
             // Big Endian chunk number and file header nonce
             Span<byte> associatedData = stackalloc byte[sizeof(long) + HEADER_NONCE_SIZE];
@@ -55,7 +55,7 @@ public override unsafe bool DecryptChunk(ReadOnlySpan<byte> ciphertextChunk, lon
                 ciphertextChunk.GetChunkPayloadWithTag(),
                 header.GetHeaderContentKey(),
                 ciphertextChunk.GetChunkNonce(),
-                cleartextChunk.Slice(0, ciphertextChunk.Length - (CHUNK_NONCE_SIZE + CHUNK_TAG_SIZE)),
+                plaintextChunk.Slice(0, ciphertextChunk.Length - (CHUNK_NONCE_SIZE + CHUNK_TAG_SIZE)),
                 associatedData);
         }
     }
diff --git a/src/SecureFolderFS.Core.Cryptography/HeaderCrypt/AesCtrHmacHeaderCrypt.cs b/src/SecureFolderFS.Core.Cryptography/HeaderCrypt/AesCtrHmacHeaderCrypt.cs
index 36a4ff0d8..1185feb24 100644
--- a/src/SecureFolderFS.Core.Cryptography/HeaderCrypt/AesCtrHmacHeaderCrypt.cs
+++ b/src/SecureFolderFS.Core.Cryptography/HeaderCrypt/AesCtrHmacHeaderCrypt.cs
@@ -15,7 +15,7 @@ internal sealed class AesCtrHmacHeaderCrypt : BaseHeaderCrypt
         public override int HeaderCiphertextSize { get; } = HEADER_SIZE;
 
         /// <inheritdoc/>
-        public override int HeaderCleartextSize { get; } = HEADER_NONCE_SIZE + HEADER_CONTENTKEY_SIZE;
+        public override int HeaderPlaintextSize { get; } = HEADER_NONCE_SIZE + HEADER_CONTENTKEY_SIZE;
 
         public AesCtrHmacHeaderCrypt(SecretKey encKey, SecretKey macKey)
             : base(encKey, macKey)
@@ -23,38 +23,38 @@ public AesCtrHmacHeaderCrypt(SecretKey encKey, SecretKey macKey)
         }
 
         /// <inheritdoc/>
-        public override void CreateHeader(Span<byte> cleartextHeader)
+        public override void CreateHeader(Span<byte> plaintextHeader)
         {
             // Nonce
-            secureRandom.GetNonZeroBytes(cleartextHeader.Slice(0, HEADER_NONCE_SIZE));
+            secureRandom.GetNonZeroBytes(plaintextHeader.Slice(0, HEADER_NONCE_SIZE));
 
             // Content key
-            secureRandom.GetBytes(cleartextHeader.Slice(HEADER_NONCE_SIZE, HEADER_CONTENTKEY_SIZE));
+            secureRandom.GetBytes(plaintextHeader.Slice(HEADER_NONCE_SIZE, HEADER_CONTENTKEY_SIZE));
         }
 
         /// <inheritdoc/>
-        public override void EncryptHeader(ReadOnlySpan<byte> cleartextHeader, Span<byte> ciphertextHeader)
+        public override void EncryptHeader(ReadOnlySpan<byte> plaintextHeader, Span<byte> ciphertextHeader)
         {
             // Nonce
-            cleartextHeader.Slice(0, HEADER_NONCE_SIZE).CopyTo(ciphertextHeader);
+            plaintextHeader.Slice(0, HEADER_NONCE_SIZE).CopyTo(ciphertextHeader);
 
             // Encrypt
             AesCtr128.Encrypt(
-                cleartextHeader.GetHeaderContentKey(),
+                plaintextHeader.GetHeaderContentKey(),
                 encKey,
-                cleartextHeader.GetHeaderNonce(),
+                plaintextHeader.GetHeaderNonce(),
                 ciphertextHeader.Slice(HEADER_NONCE_SIZE, HEADER_CONTENTKEY_SIZE));
 
             // Calculate MAC
             CalculateHeaderMac(
-                cleartextHeader.GetHeaderNonce(),
+                plaintextHeader.GetHeaderNonce(),
                 ciphertextHeader.Slice(HEADER_NONCE_SIZE, HEADER_CONTENTKEY_SIZE),
-                ciphertextHeader.Slice(cleartextHeader.Length)); // cleartextHeader.Length already includes HEADER_NONCE_SIZE
+                ciphertextHeader.Slice(plaintextHeader.Length)); // plaintextHeader.Length already includes HEADER_NONCE_SIZE
         }
 
         /// <inheritdoc/>
         [SkipLocalsInit]
-        public override bool DecryptHeader(ReadOnlySpan<byte> ciphertextHeader, Span<byte> cleartextHeader)
+        public override bool DecryptHeader(ReadOnlySpan<byte> ciphertextHeader, Span<byte> plaintextHeader)
         {
             // Allocate byte* for MAC
             Span<byte> mac = stackalloc byte[HEADER_MAC_SIZE];
@@ -70,14 +70,14 @@ public override bool DecryptHeader(ReadOnlySpan<byte> ciphertextHeader, Span<byt
                 return false;
 
             // Nonce
-            ciphertextHeader.GetHeaderNonce().CopyTo(cleartextHeader);
+            ciphertextHeader.GetHeaderNonce().CopyTo(plaintextHeader);
 
             // Decrypt
             AesCtr128.Decrypt(
                 ciphertextHeader.GetHeaderContentKey(),
                 encKey,
                 ciphertextHeader.GetHeaderNonce(),
-                cleartextHeader.Slice(HEADER_NONCE_SIZE));
+                plaintextHeader.Slice(HEADER_NONCE_SIZE));
 
             return true;
         }
diff --git a/src/SecureFolderFS.Core.Cryptography/HeaderCrypt/AesGcmHeaderCrypt.cs b/src/SecureFolderFS.Core.Cryptography/HeaderCrypt/AesGcmHeaderCrypt.cs
index 97f43fec9..6377e5e32 100644
--- a/src/SecureFolderFS.Core.Cryptography/HeaderCrypt/AesGcmHeaderCrypt.cs
+++ b/src/SecureFolderFS.Core.Cryptography/HeaderCrypt/AesGcmHeaderCrypt.cs
@@ -13,7 +13,7 @@ internal sealed class AesGcmHeaderCrypt : BaseHeaderCrypt
         public override int HeaderCiphertextSize { get; } = HEADER_SIZE;
 
         /// <inheritdoc/>
-        public override int HeaderCleartextSize { get; } = HEADER_NONCE_SIZE + HEADER_CONTENTKEY_SIZE;
+        public override int HeaderPlaintextSize { get; } = HEADER_NONCE_SIZE + HEADER_CONTENTKEY_SIZE;
 
         public AesGcmHeaderCrypt(SecretKey encKey, SecretKey macKey)
             : base(encKey, macKey)
@@ -21,36 +21,36 @@ public AesGcmHeaderCrypt(SecretKey encKey, SecretKey macKey)
         }
 
         /// <inheritdoc/>
-        public override void CreateHeader(Span<byte> cleartextHeader)
+        public override void CreateHeader(Span<byte> plaintextHeader)
         {
             // Nonce
-            secureRandom.GetNonZeroBytes(cleartextHeader.Slice(0, HEADER_NONCE_SIZE));
+            secureRandom.GetNonZeroBytes(plaintextHeader.Slice(0, HEADER_NONCE_SIZE));
 
             // Content key
-            secureRandom.GetBytes(cleartextHeader.Slice(HEADER_NONCE_SIZE, HEADER_CONTENTKEY_SIZE));
+            secureRandom.GetBytes(plaintextHeader.Slice(HEADER_NONCE_SIZE, HEADER_CONTENTKEY_SIZE));
         }
 
         /// <inheritdoc/>
-        public override void EncryptHeader(ReadOnlySpan<byte> cleartextHeader, Span<byte> ciphertextHeader)
+        public override void EncryptHeader(ReadOnlySpan<byte> plaintextHeader, Span<byte> ciphertextHeader)
         {
             // Nonce
-            cleartextHeader.GetHeaderNonce().CopyTo(ciphertextHeader);
+            plaintextHeader.GetHeaderNonce().CopyTo(ciphertextHeader);
 
             // Encrypt
             AesGcm128.Encrypt(
-                cleartextHeader.GetHeaderContentKey(),
+                plaintextHeader.GetHeaderContentKey(),
                 encKey,
-                cleartextHeader.GetHeaderNonce(),
+                plaintextHeader.GetHeaderNonce(),
                 ciphertextHeader.GetHeaderTag(),
                 ciphertextHeader.Slice(HEADER_NONCE_SIZE, HEADER_CONTENTKEY_SIZE),
                 default);
         }
 
         /// <inheritdoc/>
-        public override bool DecryptHeader(ReadOnlySpan<byte> ciphertextHeader, Span<byte> cleartextHeader)
+        public override bool DecryptHeader(ReadOnlySpan<byte> ciphertextHeader, Span<byte> plaintextHeader)
         {
             // Nonce
-            ciphertextHeader.GetHeaderNonce().CopyTo(cleartextHeader);
+            ciphertextHeader.GetHeaderNonce().CopyTo(plaintextHeader);
 
             // Decrypt
             return AesGcm128.TryDecrypt(
@@ -58,7 +58,7 @@ public override bool DecryptHeader(ReadOnlySpan<byte> ciphertextHeader, Span<byt
                 encKey,
                 ciphertextHeader.GetHeaderNonce(),
                 ciphertextHeader.GetHeaderTag(),
-                cleartextHeader.Slice(HEADER_NONCE_SIZE),
+                plaintextHeader.Slice(HEADER_NONCE_SIZE),
                 default);
         }
     }
diff --git a/src/SecureFolderFS.Core.Cryptography/HeaderCrypt/BaseHeaderCrypt.cs b/src/SecureFolderFS.Core.Cryptography/HeaderCrypt/BaseHeaderCrypt.cs
index 08a495625..5ada693c3 100644
--- a/src/SecureFolderFS.Core.Cryptography/HeaderCrypt/BaseHeaderCrypt.cs
+++ b/src/SecureFolderFS.Core.Cryptography/HeaderCrypt/BaseHeaderCrypt.cs
@@ -15,7 +15,7 @@ internal abstract class BaseHeaderCrypt : IHeaderCrypt
         public abstract int HeaderCiphertextSize { get; }
 
         /// <inheritdoc/>
-        public abstract int HeaderCleartextSize { get; }
+        public abstract int HeaderPlaintextSize { get; }
 
         protected BaseHeaderCrypt(SecretKey encKey, SecretKey macKey)
         {
@@ -25,13 +25,13 @@ protected BaseHeaderCrypt(SecretKey encKey, SecretKey macKey)
         }
 
         /// <inheritdoc/>
-        public abstract void CreateHeader(Span<byte> cleartextHeader);
+        public abstract void CreateHeader(Span<byte> plaintextHeader);
 
         /// <inheritdoc/>
-        public abstract void EncryptHeader(ReadOnlySpan<byte> cleartextHeader, Span<byte> ciphertextHeader);
+        public abstract void EncryptHeader(ReadOnlySpan<byte> plaintextHeader, Span<byte> ciphertextHeader);
 
         /// <inheritdoc/>
-        public abstract bool DecryptHeader(ReadOnlySpan<byte> ciphertextHeader, Span<byte> cleartextHeader);
+        public abstract bool DecryptHeader(ReadOnlySpan<byte> ciphertextHeader, Span<byte> plaintextHeader);
 
         /// <inheritdoc/>
         public virtual void Dispose()
diff --git a/src/SecureFolderFS.Core.Cryptography/HeaderCrypt/IHeaderCrypt.cs b/src/SecureFolderFS.Core.Cryptography/HeaderCrypt/IHeaderCrypt.cs
index 2c2692ea7..d929e0232 100644
--- a/src/SecureFolderFS.Core.Cryptography/HeaderCrypt/IHeaderCrypt.cs
+++ b/src/SecureFolderFS.Core.Cryptography/HeaderCrypt/IHeaderCrypt.cs
@@ -13,28 +13,28 @@ public interface IHeaderCrypt : IDisposable
         int HeaderCiphertextSize { get; }
 
         /// <summary>
-        /// Gets the size of cleartext header.
+        /// Gets the size of plaintext header.
         /// </summary>
-        int HeaderCleartextSize { get; }
+        int HeaderPlaintextSize { get; }
 
         /// <summary>
-        /// Creates a new cleartext header.
+        /// Creates a new plaintext header.
         /// </summary>
-        /// <param name="cleartextHeader">The cleartext header to fill.</param>
-        void CreateHeader(Span<byte> cleartextHeader);
+        /// <param name="plaintextHeader">The plaintext header to fill.</param>
+        void CreateHeader(Span<byte> plaintextHeader);
 
         /// <summary>
-        /// Encrypts the <paramref name="cleartextHeader"/> and writes <paramref name="ciphertextHeader"/> with encrypted data.
+        /// Encrypts the <paramref name="plaintextHeader"/> and writes <paramref name="ciphertextHeader"/> with encrypted data.
         /// </summary>
-        /// <param name="cleartextHeader">The data to be encrypted with header nonce prepended.</param>
+        /// <param name="plaintextHeader">The data to be encrypted with header nonce prepended.</param>
         /// <param name="ciphertextHeader">The encrypted data to be written to.</param>
-        void EncryptHeader(ReadOnlySpan<byte> cleartextHeader, Span<byte> ciphertextHeader);
+        void EncryptHeader(ReadOnlySpan<byte> plaintextHeader, Span<byte> ciphertextHeader);
 
         /// <summary>
-        /// Decrypts the <paramref name="ciphertextHeader"/> and writes <paramref name="cleartextHeader"/> with decrypted data.
+        /// Decrypts the <paramref name="ciphertextHeader"/> and writes <paramref name="plaintextHeader"/> with decrypted data.
         /// </summary>
         /// <param name="ciphertextHeader">The data to be decrypted.</param>
-        /// <param name="cleartextHeader">The decrypted data to be written to with header nonce prepended.</param>
-        bool DecryptHeader(ReadOnlySpan<byte> ciphertextHeader, Span<byte> cleartextHeader);
+        /// <param name="plaintextHeader">The decrypted data to be written to with header nonce prepended.</param>
+        bool DecryptHeader(ReadOnlySpan<byte> ciphertextHeader, Span<byte> plaintextHeader);
     }
 }
diff --git a/src/SecureFolderFS.Core.Cryptography/HeaderCrypt/XChaChaHeaderCrypt.cs b/src/SecureFolderFS.Core.Cryptography/HeaderCrypt/XChaChaHeaderCrypt.cs
index da2b06260..fa07284c7 100644
--- a/src/SecureFolderFS.Core.Cryptography/HeaderCrypt/XChaChaHeaderCrypt.cs
+++ b/src/SecureFolderFS.Core.Cryptography/HeaderCrypt/XChaChaHeaderCrypt.cs
@@ -13,7 +13,7 @@ internal sealed class XChaChaHeaderCrypt : BaseHeaderCrypt
         public override int HeaderCiphertextSize { get; } = HEADER_SIZE;
 
         /// <inheritdoc/>
-        public override int HeaderCleartextSize { get; } = HEADER_NONCE_SIZE + HEADER_CONTENTKEY_SIZE;
+        public override int HeaderPlaintextSize { get; } = HEADER_NONCE_SIZE + HEADER_CONTENTKEY_SIZE;
 
         public XChaChaHeaderCrypt(SecretKey encKey, SecretKey macKey)
             : base(encKey, macKey)
@@ -21,42 +21,42 @@ public XChaChaHeaderCrypt(SecretKey encKey, SecretKey macKey)
         }
 
         /// <inheritdoc/>
-        public override void CreateHeader(Span<byte> cleartextHeader)
+        public override void CreateHeader(Span<byte> plaintextHeader)
         {
             // Nonce
-            secureRandom.GetNonZeroBytes(cleartextHeader.Slice(0, HEADER_NONCE_SIZE));
+            secureRandom.GetNonZeroBytes(plaintextHeader.Slice(0, HEADER_NONCE_SIZE));
 
             // Content key
-            secureRandom.GetBytes(cleartextHeader.Slice(HEADER_NONCE_SIZE, HEADER_CONTENTKEY_SIZE));
+            secureRandom.GetBytes(plaintextHeader.Slice(HEADER_NONCE_SIZE, HEADER_CONTENTKEY_SIZE));
         }
 
         /// <inheritdoc/>
-        public override void EncryptHeader(ReadOnlySpan<byte> cleartextHeader, Span<byte> ciphertextHeader)
+        public override void EncryptHeader(ReadOnlySpan<byte> plaintextHeader, Span<byte> ciphertextHeader)
         {
             // Nonce
-            cleartextHeader.GetHeaderNonce().CopyTo(ciphertextHeader);
+            plaintextHeader.GetHeaderNonce().CopyTo(ciphertextHeader);
 
             // Encrypt
             XChaCha20Poly1305.Encrypt(
-                cleartextHeader.GetHeaderContentKey(),
+                plaintextHeader.GetHeaderContentKey(),
                 encKey,
-                cleartextHeader.GetHeaderNonce(),
+                plaintextHeader.GetHeaderNonce(),
                 ciphertextHeader.Slice(HEADER_NONCE_SIZE),
                 default);
         }
 
         /// <inheritdoc/>
-        public override bool DecryptHeader(ReadOnlySpan<byte> ciphertextHeader, Span<byte> cleartextHeader)
+        public override bool DecryptHeader(ReadOnlySpan<byte> ciphertextHeader, Span<byte> plaintextHeader)
         {
             // Nonce
-            ciphertextHeader.GetHeaderNonce().CopyTo(cleartextHeader);
+            ciphertextHeader.GetHeaderNonce().CopyTo(plaintextHeader);
 
             // Decrypt
             return XChaCha20Poly1305.Decrypt(
                 ciphertextHeader.Slice(HEADER_NONCE_SIZE),
                 encKey,
                 ciphertextHeader.GetHeaderNonce(),
-                cleartextHeader.Slice(HEADER_NONCE_SIZE),
+                plaintextHeader.Slice(HEADER_NONCE_SIZE),
                 default);
         }
     }
diff --git a/src/SecureFolderFS.Core.Cryptography/NameCrypt/AesSivNameCrypt.cs b/src/SecureFolderFS.Core.Cryptography/NameCrypt/AesSivNameCrypt.cs
index 9ab9e25ed..7e88b555f 100644
--- a/src/SecureFolderFS.Core.Cryptography/NameCrypt/AesSivNameCrypt.cs
+++ b/src/SecureFolderFS.Core.Cryptography/NameCrypt/AesSivNameCrypt.cs
@@ -7,15 +7,15 @@ namespace SecureFolderFS.Core.Cryptography.NameCrypt
     /// <inheritdoc cref="INameCrypt"/>
     internal sealed class AesSivNameCrypt : BaseNameCrypt
     {
-        public AesSivNameCrypt(SecretKey encKey, SecretKey macKey)
-            : base(encKey, macKey)
+        public AesSivNameCrypt(SecretKey encKey, SecretKey macKey, string fileNameEncodingId)
+            : base(encKey, macKey, fileNameEncodingId)
         {
         }
 
         /// <inheritdoc/>
-        protected override byte[] EncryptFileName(ReadOnlySpan<byte> cleartextFileNameBuffer, ReadOnlySpan<byte> directoryId)
+        protected override byte[] EncryptFileName(ReadOnlySpan<byte> plaintextFileNameBuffer, ReadOnlySpan<byte> directoryId)
         {
-            return aesSiv128.Encrypt(cleartextFileNameBuffer, directoryId);
+            return aesSiv128.Encrypt(plaintextFileNameBuffer, directoryId);
         }
 
         /// <inheritdoc/>
diff --git a/src/SecureFolderFS.Core.Cryptography/NameCrypt/BaseNameCrypt.cs b/src/SecureFolderFS.Core.Cryptography/NameCrypt/BaseNameCrypt.cs
index 716566d74..4822e8c82 100644
--- a/src/SecureFolderFS.Core.Cryptography/NameCrypt/BaseNameCrypt.cs
+++ b/src/SecureFolderFS.Core.Cryptography/NameCrypt/BaseNameCrypt.cs
@@ -1,7 +1,8 @@
-using SecureFolderFS.Core.Cryptography.Cipher;
+using Lex4K;
+using SecureFolderFS.Core.Cryptography.Cipher;
 using SecureFolderFS.Core.Cryptography.SecureStore;
-using SecureFolderFS.Shared.Helpers;
 using System;
+using System.Buffers.Text;
 using System.Runtime.CompilerServices;
 using System.Text;
 
@@ -11,10 +12,12 @@ namespace SecureFolderFS.Core.Cryptography.NameCrypt
     internal abstract class BaseNameCrypt : INameCrypt
     {
         protected readonly AesSiv128 aesSiv128;
+        protected readonly string fileNameEncodingId;
 
-        protected BaseNameCrypt(SecretKey encKey, SecretKey macKey)
+        protected BaseNameCrypt(SecretKey encKey, SecretKey macKey, string fileNameEncodingId)
         {
-            aesSiv128 = AesSiv128.CreateInstance(encKey, macKey);
+            this.aesSiv128 = AesSiv128.CreateInstance(encKey, macKey);
+            this.fileNameEncodingId = fileNameEncodingId;
         }
 
         /// <inheritdoc/>
@@ -29,20 +32,24 @@ public virtual string EncryptName(ReadOnlySpan<char> plaintextName, ReadOnlySpan
             var count = Encoding.UTF8.GetBytes(plaintextName, bytes);
 
             // Encrypt
-            var encryptedName = EncryptFileName(bytes.Slice(0, count), directoryId);
+            var ciphertextNameBuffer = EncryptFileName(bytes.Slice(0, count), directoryId);
 
-            // Encode with url64
-            return EncodingHelpers.EncodeBaseUrl64(Convert.ToBase64String(encryptedName));
+            // Encode string
+            return Encode(ciphertextNameBuffer);
         }
 
         /// <inheritdoc/>
         public virtual string? DecryptName(ReadOnlySpan<char> ciphertextName, ReadOnlySpan<byte> directoryId)
         {
-            var ciphertextNameBuffer = Convert.FromBase64String(EncodingHelpers.DecodeBaseUrl64(ciphertextName.ToString()));
+            // Decode buffer
+            var ciphertextNameBuffer = Decode(ciphertextName);
+
+            // Decrypt
             var plaintextNameBuffer = DecryptFileName(ciphertextNameBuffer, directoryId);
             if (plaintextNameBuffer is null)
                 return null;
 
+            // Get string from plaintext buffer
             return Encoding.UTF8.GetString(plaintextNameBuffer);
         }
 
@@ -50,6 +57,28 @@ public virtual string EncryptName(ReadOnlySpan<char> plaintextName, ReadOnlySpan
 
         protected abstract byte[]? DecryptFileName(ReadOnlySpan<byte> ciphertextFileNameBuffer, ReadOnlySpan<byte> directoryId);
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private string Encode(ReadOnlySpan<byte> bytes)
+        {
+            return fileNameEncodingId switch
+            {
+                Constants.CipherId.ENCODING_BASE64URL => Base64Url.EncodeToString(bytes),
+                Constants.CipherId.ENCODING_BASE4K => Base4K.EncodeChainToString(bytes),
+                _ => throw new ArgumentOutOfRangeException(nameof(fileNameEncodingId))
+            };
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private ReadOnlySpan<byte> Decode(ReadOnlySpan<char> encoded)
+        {
+            return fileNameEncodingId switch
+            {
+                Constants.CipherId.ENCODING_BASE64URL => Base64Url.DecodeFromChars(encoded),
+                Constants.CipherId.ENCODING_BASE4K => Base4K.DecodeChainToNewBuffer(encoded),
+                _ => throw new ArgumentOutOfRangeException(nameof(fileNameEncodingId))
+            };
+        }
+
         /// <inheritdoc/>
         public virtual void Dispose()
         {
diff --git a/src/SecureFolderFS.Core.Cryptography/SecureFolderFS.Core.Cryptography.csproj b/src/SecureFolderFS.Core.Cryptography/SecureFolderFS.Core.Cryptography.csproj
index a0977dd20..bc85742ee 100644
--- a/src/SecureFolderFS.Core.Cryptography/SecureFolderFS.Core.Cryptography.csproj
+++ b/src/SecureFolderFS.Core.Cryptography/SecureFolderFS.Core.Cryptography.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>disable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
@@ -9,9 +9,10 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Base4K" Version="1.0.4" />
     <PackageReference Include="Konscious.Security.Cryptography.Argon2" Version="1.3.1" />
     <PackageReference Include="Miscreant" Version="0.3.3" />
-    <PackageReference Include="NSec.Cryptography" Version="24.4.0" />
+    <PackageReference Include="NSec.Cryptography" Version="24.9.0-preview.2" />
     <PackageReference Include="RFC3394.net" Version="1.0.0" />
   </ItemGroup>
 
diff --git a/src/SecureFolderFS.Core.Cryptography/Security.cs b/src/SecureFolderFS.Core.Cryptography/Security.cs
index 20ee22c72..eca8b3a26 100644
--- a/src/SecureFolderFS.Core.Cryptography/Security.cs
+++ b/src/SecureFolderFS.Core.Cryptography/Security.cs
@@ -43,10 +43,11 @@ public SecretKey CopyMacKey()
         /// </summary>
         /// <param name="encKey">The DEK key that this class takes ownership of.</param>
         /// <param name="macKey">The MAC key that this class takes ownership of.</param>
-        /// <param name="contentCipherId">The content cipher id.</param>
-        /// <param name="fileNameCipherId">The file name cipher id.</param>
+        /// <param name="contentCipherId">The content cipher ID.</param>
+        /// <param name="fileNameCipherId">The file name cipher ID.</param>
+        /// <param name="fileNameEncodingId">The file name encoding ID.</param>
         /// <returns>A new <see cref="Security"/> object.</returns>
-        public static Security CreateNew(SecretKey encKey, SecretKey macKey, string contentCipherId, string fileNameCipherId)
+        public static Security CreateNew(SecretKey encKey, SecretKey macKey, string contentCipherId, string fileNameCipherId, string fileNameEncodingId)
         {
             // Initialize crypt implementation
             IHeaderCrypt headerCrypt = contentCipherId switch
@@ -65,7 +66,7 @@ public static Security CreateNew(SecretKey encKey, SecretKey macKey, string cont
             };
             INameCrypt? nameCrypt = fileNameCipherId switch
             {
-                CipherId.AES_SIV => new AesSivNameCrypt(encKey, macKey),
+                CipherId.AES_SIV => new AesSivNameCrypt(encKey, macKey, fileNameEncodingId),
                 CipherId.NONE => null,
                 _ => throw new ArgumentOutOfRangeException(nameof(fileNameCipherId))
             };
diff --git a/src/SecureFolderFS.Core.Dokany/AppModels/DokanyOptions.cs b/src/SecureFolderFS.Core.Dokany/AppModels/DokanyOptions.cs
new file mode 100644
index 000000000..d5b401663
--- /dev/null
+++ b/src/SecureFolderFS.Core.Dokany/AppModels/DokanyOptions.cs
@@ -0,0 +1,37 @@
+using SecureFolderFS.Core.FileSystem.AppModels;
+using SecureFolderFS.Shared.Extensions;
+using SecureFolderFS.Storage.VirtualFileSystem;
+using System;
+using System.Collections.Generic;
+
+namespace SecureFolderFS.Core.Dokany.AppModels
+{
+    /// <inheritdoc cref="FileSystemOptions"/>
+    public sealed class DokanyOptions : FileSystemOptions
+    {
+        private string? _mountPoint;
+
+        /// <summary>
+        /// Gets the path where the file system should be mounted. If a null value is given, default mount point will be used.
+        /// </summary>
+        public string? MountPoint { get => _mountPoint; init => _mountPoint = value; }
+
+        internal void SetMountPointInternal(string? value) => _mountPoint = value;
+
+        public static DokanyOptions ToOptions(IDictionary<string, object> options)
+        {
+            return new()
+            {
+                VolumeName = (string?)options.Get(nameof(VolumeName)) ?? throw new ArgumentNullException(nameof(VolumeName)),
+                HealthStatistics = (IHealthStatistics?)options.Get(nameof(HealthStatistics)) ?? new HealthStatistics(),
+                FileSystemStatistics = (IFileSystemStatistics?)options.Get(nameof(FileSystemStatistics)) ?? new FileSystemStatistics(),
+                IsReadOnly = (bool?)options.Get(nameof(IsReadOnly)) ?? false,
+                IsCachingChunks = (bool?)options.Get(nameof(IsCachingChunks)) ?? true,
+                IsCachingFileNames = (bool?)options.Get(nameof(IsCachingFileNames)) ?? true,
+
+                // Dokany specific
+                MountPoint = (string?)options.Get(nameof(MountPoint))
+            };
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Core.Dokany/Callbacks/BaseDokanyCallbacks.cs b/src/SecureFolderFS.Core.Dokany/Callbacks/BaseDokanyCallbacks.cs
index c7c79ce37..fde463a36 100644
--- a/src/SecureFolderFS.Core.Dokany/Callbacks/BaseDokanyCallbacks.cs
+++ b/src/SecureFolderFS.Core.Dokany/Callbacks/BaseDokanyCallbacks.cs
@@ -83,6 +83,9 @@ public virtual NtStatus FindFiles(string fileName, out IList<FileInformation> fi
         /// <inheritdoc/>
         public virtual NtStatus SetEndOfFile(string fileName, long length, IDokanFileInfo info)
         {
+            if (Specifics.Options.IsReadOnly)
+                return Trace(DokanResult.AccessDenied, fileName, info);
+
             if (handlesManager.GetHandle<FileHandle>(GetContextValue(info)) is not { } fileHandle)
                 return Trace(DokanResult.InvalidHandle, fileName, info);
 
@@ -149,10 +152,17 @@ public virtual unsafe NtStatus ReadFile(string fileName, IntPtr buffer, uint buf
             {
                 // Invalid handle...
                 contextHandle = handlesManager.OpenFileHandle(ciphertextPath, FileMode.Open, System.IO.FileAccess.Read, FileShare.Read, FileOptions.None);
-                fileHandle = handlesManager.GetHandle<FileHandle>(contextHandle)!;
+                fileHandle = handlesManager.GetHandle<FileHandle>(contextHandle);
                 openedNewHandle = true;
             }
 
+            // Re-check handle
+            if (fileHandle is null)
+            {
+                bytesRead = 0;
+                return Trace(DokanResult.AccessDenied, fileName, info);
+            }
+
             try
             {
                 // Check EOF
@@ -196,6 +206,12 @@ public virtual unsafe NtStatus ReadFile(string fileName, IntPtr buffer, uint buf
         [MethodImpl(MethodImplOptions.Synchronized)]
         public virtual unsafe NtStatus WriteFile(string fileName, IntPtr buffer, uint bufferLength, out int bytesWritten, long offset, IDokanFileInfo info)
         {
+            if (Specifics.Options.IsReadOnly)
+            {
+                bytesWritten = 0;
+                return Trace(DokanResult.AccessDenied, fileName, info);
+            }
+
             var ciphertextPath = GetCiphertextPath(fileName);
             var appendToFile = offset == -1;
             var contextHandle = FileSystem.Constants.INVALID_HANDLE;
@@ -213,10 +229,17 @@ public virtual unsafe NtStatus WriteFile(string fileName, IntPtr buffer, uint bu
             {
                 // Invalid handle...
                 contextHandle = handlesManager.OpenFileHandle(ciphertextPath, appendToFile ? FileMode.Append : FileMode.Open, System.IO.FileAccess.ReadWrite, FileShare.Read, FileOptions.None);
-                fileHandle = handlesManager.GetHandle<FileHandle>(contextHandle)!;
+                fileHandle = handlesManager.GetHandle<FileHandle>(contextHandle);
                 openedNewHandle = true;
             }
 
+            // Re-check handle
+            if (fileHandle is null)
+            {
+                bytesWritten = 0;
+                return Trace(DokanResult.AccessDenied, fileName, info);
+            }
+
             try
             {
                 // Align for Paging I/O
@@ -250,6 +273,11 @@ public virtual unsafe NtStatus WriteFile(string fileName, IntPtr buffer, uint bu
                 bytesWritten = 0;
                 return Trace(NtStatus.HandleNoLongerValid, fileName, info);
             }
+            catch (UnauthorizedAccessException)
+            {
+                bytesWritten = 0;
+                return Trace(DokanResult.AccessDenied, fileName, info);
+            }
             catch (IOException ioEx)
             {
                 if (ErrorHandlingHelpers.NtStatusFromException(ioEx, out var ntStatus))
@@ -310,7 +338,7 @@ public virtual unsafe NtStatus WriteFile(string fileName, IntPtr buffer, uint bu
         public abstract NtStatus SetFileSecurity(string fileName, FileSystemSecurity security, AccessControlSections sections, IDokanFileInfo info);
 
         // TODO: Add checks for nullable in places where this function is called
-        protected abstract string? GetCiphertextPath(string cleartextName);
+        protected abstract string? GetCiphertextPath(string plaintextName);
 
         protected void CloseHandle(IDokanFileInfo info)
         {
@@ -364,7 +392,9 @@ protected static NtStatus Trace(NtStatus result, string fileName, IDokanFileInfo
         {
 #if !DEBUG
             return result;
-#endif
+#else
+            if (Debugger.IsAttached)
+                return result;
 
             if (!Core.FileSystem.Constants.OPT_IN_FOR_OPTIONAL_DEBUG_TRACING)
                 return result;
@@ -376,6 +406,7 @@ protected static NtStatus Trace(NtStatus result, string fileName, IDokanFileInfo
             Debug.WriteLine(message);
 
             return result;
+#endif
         }
 
         protected static NtStatus Trace(NtStatus result, string? fileName, IDokanFileInfo info, [CallerMemberName] string methodName = "", params object[]? args)
diff --git a/src/SecureFolderFS.Core.Dokany/Callbacks/OnDeviceDokany.cs b/src/SecureFolderFS.Core.Dokany/Callbacks/OnDeviceDokany.cs
index ad2df3bc2..3d0211eb1 100644
--- a/src/SecureFolderFS.Core.Dokany/Callbacks/OnDeviceDokany.cs
+++ b/src/SecureFolderFS.Core.Dokany/Callbacks/OnDeviceDokany.cs
@@ -4,9 +4,11 @@
 using SecureFolderFS.Core.Dokany.OpenHandles;
 using SecureFolderFS.Core.Dokany.UnsafeNative;
 using SecureFolderFS.Core.FileSystem;
-using SecureFolderFS.Core.FileSystem.Helpers;
-using SecureFolderFS.Core.FileSystem.Helpers.Abstract;
-using SecureFolderFS.Core.FileSystem.Helpers.Native;
+using SecureFolderFS.Core.FileSystem.Exceptions;
+using SecureFolderFS.Core.FileSystem.Extensions;
+using SecureFolderFS.Core.FileSystem.Helpers.Paths;
+using SecureFolderFS.Core.FileSystem.Helpers.Paths.Abstract;
+using SecureFolderFS.Core.FileSystem.Helpers.Paths.Native;
 using SecureFolderFS.Core.FileSystem.OpenHandles;
 using System;
 using System.Collections.Generic;
@@ -70,6 +72,9 @@ public override NtStatus CreateFile(string fileName, FileAccess access, FileShar
 
                         case FileMode.CreateNew:
                         {
+                            if (Specifics.Options.IsReadOnly)
+                                throw FileSystemExceptions.FileSystemReadOnly;
+
                             if (Directory.Exists(ciphertextPath))
                                 return Trace(DokanResult.FileExists, fileName, info, access, share, mode, options, attributes);
 
@@ -87,7 +92,7 @@ public override NtStatus CreateFile(string fileName, FileAccess access, FileShar
 
                             // Create new DirectoryID
                             var directoryId = Guid.NewGuid().ToByteArray();
-                            var directoryIdPath = Path.Combine(ciphertextPath, FileSystem.Constants.DIRECTORY_ID_FILENAME);
+                            var directoryIdPath = Path.Combine(ciphertextPath, FileSystem.Constants.Names.DIRECTORY_ID_FILENAME);
 
                             // Initialize directory with DirectoryID
                             using var directoryIdStream = File.Open(directoryIdPath, FileMode.OpenOrCreate, System.IO.FileAccess.ReadWrite, FileShare.ReadWrite | FileShare.Delete);
@@ -109,8 +114,8 @@ public override NtStatus CreateFile(string fileName, FileAccess access, FileShar
                 var pathExists = true;
                 var pathIsDirectory = false;
 
-                var readWriteAttributes = (access & Constants.FileSystem.DATA_ACCESS) == 0;
-                var readAccess = (access & Constants.FileSystem.DATA_WRITE_ACCESS) == 0;
+                var readWriteAttributes = (access & Constants.Dokan.DATA_ACCESS) == 0;
+                var readAccess = (access & Constants.Dokan.DATA_WRITE_ACCESS) == 0;
 
                 try
                 {
@@ -161,6 +166,9 @@ public override NtStatus CreateFile(string fileName, FileAccess access, FileShar
 
                 try
                 {
+                    if (Specifics.Options.IsReadOnly && mode.IsWriteFlag())
+                        throw FileSystemExceptions.FileSystemReadOnly;
+
                     var openAccess = readAccess ? System.IO.FileAccess.Read : System.IO.FileAccess.ReadWrite;
                     if (mode == FileMode.CreateNew && readAccess)
                         openAccess = System.IO.FileAccess.ReadWrite;
@@ -223,7 +231,7 @@ public override void Cleanup(string fileName, IDokanFileInfo info)
             InvalidateContext(info);
 
             // Make sure we delete redirected items from DeleteDirectory() and DeleteFile() here.
-            if (info.DeleteOnClose)
+            if (info.DeleteOnClose && !Specifics.Options.IsReadOnly)
             {
                 var ciphertextPath = GetCiphertextPath(fileName);
                 if (ciphertextPath is null)
@@ -233,7 +241,7 @@ public override void Cleanup(string fileName, IDokanFileInfo info)
                 {
                     if (info.IsDirectory)
                     {
-                        var directoryIdPath = Path.Combine(ciphertextPath, FileSystem.Constants.DIRECTORY_ID_FILENAME);
+                        var directoryIdPath = Path.Combine(ciphertextPath, FileSystem.Constants.Names.DIRECTORY_ID_FILENAME);
                         Specifics.DirectoryIdCache.CacheRemove(directoryIdPath);
                         Directory.Delete(ciphertextPath, true);
                     }
@@ -260,19 +268,19 @@ public override NtStatus GetFileInformation(string fileName, out FileInformation
                     return Trace(DokanResult.PathNotFound, fileName, info);
                 }
 
-                FileSystemInfo finfo = new FileInfo(ciphertextPath);
-                if (!finfo.Exists)
-                    finfo = new DirectoryInfo(ciphertextPath);
+                FileSystemInfo fsInfo = new FileInfo(ciphertextPath);
+                if (!fsInfo.Exists)
+                    fsInfo = new DirectoryInfo(ciphertextPath);
                 
                 fileInfo = new FileInformation()
                 {
-                    FileName = finfo.Name,
-                    Attributes = finfo.Attributes,
-                    CreationTime = finfo.CreationTime,
-                    LastAccessTime = finfo.LastAccessTime,
-                    LastWriteTime = finfo.LastWriteTime,
-                    Length = finfo is FileInfo fileInfo2
-                        ? Specifics.Security.ContentCrypt.CalculateCleartextSize(fileInfo2.Length - Specifics.Security.HeaderCrypt.HeaderCiphertextSize)
+                    FileName = fsInfo.Name,
+                    Attributes = fsInfo.Attributes,
+                    CreationTime = fsInfo.CreationTime,
+                    LastAccessTime = fsInfo.LastAccessTime,
+                    LastWriteTime = fsInfo.LastWriteTime,
+                    Length = fsInfo is FileInfo fileInfo2
+                        ? Specifics.Security.ContentCrypt.CalculatePlaintextSize(Math.Max(0L, fileInfo2.Length - Specifics.Security.HeaderCrypt.HeaderCiphertextSize))
                         : 0L
                 };
 
@@ -308,7 +316,7 @@ public override NtStatus GetFileInformation(string fileName, out FileInformation
         /// <inheritdoc/>
         public override NtStatus GetDiskFreeSpace(out long freeBytesAvailable, out long totalNumberOfBytes, out long totalNumberOfFreeBytes, IDokanFileInfo info)
         {
-            if (_vaultDriveInfo is null && _vaultDriveInfoTries < Constants.FileSystem.MAX_DRIVE_INFO_CALLS_UNTIL_GIVE_UP)
+            if (_vaultDriveInfo is null && _vaultDriveInfoTries < Constants.Dokan.MAX_DRIVE_INFO_CALLS_UNTIL_GIVE_UP)
             {
                 _vaultDriveInfoTries++;
                 _vaultDriveInfo ??= DriveInfo.GetDrives().SingleOrDefault(di => 
@@ -338,12 +346,12 @@ public override NtStatus FindFilesWithPattern(string fileName, string searchPatt
                 var directory = new DirectoryInfo(ciphertextPath);
                 List<FileInformation>? fileList = null;
 
-                var directoryId = AbstractPathHelpers.AllocateDirectoryId(Specifics, fileName);
+                var directoryId = AbstractPathHelpers.AllocateDirectoryId(Specifics.Security, fileName);
                 var itemsEnumerable = Specifics.Security.NameCrypt is null ? directory.EnumerateFileSystemInfos(searchPattern) : directory.EnumerateFileSystemInfos();
 
                 foreach (var item in itemsEnumerable)
                 {
-                    if (PathHelpers.IsCoreFile(item.Name))
+                    if (PathHelpers.IsCoreName(item.Name))
                         continue;
 
                     var plaintextName = NativePathHelpers.GetPlaintextPath(item.FullName, Specifics, directoryId);
@@ -366,7 +374,7 @@ public override NtStatus FindFilesWithPattern(string fileName, string searchPatt
                         LastAccessTime = item.LastAccessTime,
                         LastWriteTime = item.LastWriteTime,
                         Length = item is FileInfo fileInfo
-                            ? Specifics.Security.ContentCrypt.CalculateCleartextSize(fileInfo.Length - Specifics.Security.HeaderCrypt.HeaderCiphertextSize)
+                            ? Specifics.Security.ContentCrypt.CalculatePlaintextSize(Math.Max(0L, fileInfo.Length - Specifics.Security.HeaderCrypt.HeaderCiphertextSize))
                             : 0L
                     });
                 }
@@ -384,6 +392,9 @@ public override NtStatus FindFilesWithPattern(string fileName, string searchPatt
         /// <inheritdoc/>
         public override NtStatus SetFileAttributes(string fileName, FileAttributes attributes, IDokanFileInfo info)
         {
+            if (Specifics.Options.IsReadOnly)
+                return Trace(DokanResult.AccessDenied, fileName, info);
+
             try
             {
                 // MS-FSCC 2.6 File Attributes : There is no file attribute with the value 0x00000000
@@ -475,9 +486,17 @@ public override NtStatus SetFileTime(string fileName, DateTime? creationTime, Da
         /// <inheritdoc/>
         public override NtStatus DeleteFile(string fileName, IDokanFileInfo info)
         {
+            // Just check if we can delete the file - the true deletion is done in Cleanup()
+
+            if (Specifics.Options.IsReadOnly)
+                return Trace(DokanResult.AccessDenied, fileName, info);
+
+            // Get ciphertext path
             var ciphertextPath = GetCiphertextPath(fileName);
+            if (ciphertextPath is null)
+                return Trace(NtStatus.ObjectPathInvalid, fileName, info);
 
-            // Just check if we can delete the file - the true deletion is done in Cleanup()
+            // Perform checks
             if (Directory.Exists(ciphertextPath))
                 return Trace(DokanResult.AccessDenied, fileName, info);
 
@@ -493,17 +512,19 @@ public override NtStatus DeleteFile(string fileName, IDokanFileInfo info)
         /// <inheritdoc/>
         public override NtStatus DeleteDirectory(string fileName, IDokanFileInfo info)
         {
+            if (Specifics.Options.IsReadOnly)
+                return Trace(DokanResult.AccessDenied, fileName, info);
+
             var canDelete = true;
             var ciphertextPath = GetCiphertextPath(fileName);
             if (ciphertextPath is null)
                 return Trace(NtStatus.ObjectPathInvalid, fileName, info);
 
             using var directoryEnumerator = Directory.EnumerateFileSystemEntries(ciphertextPath).GetEnumerator();
-
             while (directoryEnumerator.MoveNext())
             {
                 // Check for any files except core files
-                canDelete &= PathHelpers.IsCoreFile(Path.GetFileName(directoryEnumerator.Current));
+                canDelete &= PathHelpers.IsCoreName(Path.GetFileName(directoryEnumerator.Current));
 
                 // If the flag changed (directory is not empty), break the loop
                 if (!canDelete)
@@ -519,7 +540,6 @@ public override NtStatus MoveFile(string oldName, string newName, bool replace,
         {
             var oldCiphertextPath = GetCiphertextPath(oldName);
             var newCiphertextPath = GetCiphertextPath(newName);
-
             var fileNameCombined = $"{oldName} -> {newName}";
 
             if (oldCiphertextPath is null || newCiphertextPath is null)
@@ -528,8 +548,10 @@ public override NtStatus MoveFile(string oldName, string newName, bool replace,
             CloseHandle(info);
             InvalidateContext(info);
 
-            var newPathExists = info.IsDirectory ? Directory.Exists(newCiphertextPath) : File.Exists(newCiphertextPath);
+            if (Specifics.Options.IsReadOnly)
+                return Trace(DokanResult.AccessDenied, fileNameCombined, info);
 
+            var newPathExists = info.IsDirectory ? Directory.Exists(newCiphertextPath) : File.Exists(newCiphertextPath);
             try
             {
                 if (!newPathExists)
@@ -605,9 +627,9 @@ public override NtStatus SetEndOfFile(string fileName, long length, IDokanFileIn
             {
                 return base.SetEndOfFile(fileName, length, info);
             }
-            catch (IOException ioEx)
+            catch (IOException ex)
             {
-                if (ErrorHandlingHelpers.NtStatusFromException(ioEx, out var ntStatus))
+                if (ErrorHandlingHelpers.NtStatusFromException(ex, out var ntStatus))
                     return Trace((NtStatus)ntStatus, fileName, info);
 
                 throw;
@@ -697,6 +719,9 @@ public override NtStatus GetFileSecurity(string fileName, out FileSystemSecurity
         /// <inheritdoc/>
         public override NtStatus SetFileSecurity(string fileName, FileSystemSecurity security, AccessControlSections sections, IDokanFileInfo info)
         {
+            if (Specifics.Options.IsReadOnly)
+                return Trace(DokanResult.AccessDenied, fileName, info);
+
             try
             {
                 var ciphertextPath = GetCiphertextPath(fileName);
@@ -770,9 +795,9 @@ public override NtStatus WriteFile(string fileName, IntPtr buffer, uint bufferLe
             {
                 return base.WriteFile(fileName, buffer, bufferLength, out bytesWritten, offset, info);
             }
-            catch (IOException ioEx)
+            catch (IOException ex)
             {
-                if (ErrorHandlingHelpers.NtStatusFromException(ioEx, out var ntStatus))
+                if (ErrorHandlingHelpers.NtStatusFromException(ex, out var ntStatus))
                 {
                     bytesWritten = 0;
                     return Trace((NtStatus)ntStatus, fileName, info);
@@ -797,10 +822,10 @@ public override NtStatus FindStreams(string fileName, out IList<FileInformation>
         }
 
         /// <inheritdoc/>
-        protected override string? GetCiphertextPath(string cleartextName)
+        protected override string? GetCiphertextPath(string plaintextName)
         {
             var directoryId = new byte[FileSystem.Constants.DIRECTORY_ID_SIZE];
-            return NativePathHelpers.GetCiphertextPath(cleartextName, Specifics, directoryId);
+            return NativePathHelpers.GetCiphertextPath(plaintextName, Specifics, directoryId);
         }
     }
 }
diff --git a/src/SecureFolderFS.Core.Dokany/Constants.cs b/src/SecureFolderFS.Core.Dokany/Constants.cs
index f6029a35a..9988fcc07 100644
--- a/src/SecureFolderFS.Core.Dokany/Constants.cs
+++ b/src/SecureFolderFS.Core.Dokany/Constants.cs
@@ -2,18 +2,18 @@
 {
     public static class Constants
     {
-        public const string FILE_SYSTEM_NAME = "Dokany";
+        public static class FileSystem
+        {
+            public const string FS_ID = "DOKANY";
+            public const string FS_NAME = "Dokany";
+        }
 
         internal static class Dokan
         {
+            public const string FS_TYPE_ID = "NTFS";
             public const string DOKAN_DLL = "dokan2.dll";
             public const int DOKAN_VERSION = 205;
             public const int DOKAN_MAX_VERSION = 210;
-        }
-
-        internal static class FileSystem
-        {
-            public const string FSRID = "NTFS";
             public const uint MAX_COMPONENT_LENGTH = 256;
             public const int MAX_DRIVE_INFO_CALLS_UNTIL_GIVE_UP = 5;
 
diff --git a/src/SecureFolderFS.Core.Dokany/DokanyFileSystem.Availability.cs b/src/SecureFolderFS.Core.Dokany/DokanyFileSystem.Availability.cs
new file mode 100644
index 000000000..5c1270f07
--- /dev/null
+++ b/src/SecureFolderFS.Core.Dokany/DokanyFileSystem.Availability.cs
@@ -0,0 +1,53 @@
+using SecureFolderFS.Core.Dokany.UnsafeNative;
+using SecureFolderFS.Storage.Enums;
+using SecureFolderFS.Storage.VirtualFileSystem;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace SecureFolderFS.Core.Dokany
+{
+    /// <inheritdoc cref="IFileSystem"/>
+    public sealed partial class DokanyFileSystem
+    {
+        /// <inheritdoc/>
+        public partial Task<FileSystemAvailability> GetStatusAsync(CancellationToken cancellationToken)
+        {
+            return Task.FromResult(IsSupported());
+        }
+
+        private static FileSystemAvailability IsSupported()
+        {
+            ulong dokanVersion;
+            ulong dokanDriverVersion;
+
+            try
+            {
+                dokanVersion = UnsafeNativeApis.DokanVersion();
+                if (dokanVersion <= 0)
+                    return FileSystemAvailability.ModuleUnavailable;
+            }
+            catch (Exception)
+            {
+                return FileSystemAvailability.ModuleUnavailable;
+            }
+
+            try
+            {
+                dokanDriverVersion = UnsafeNativeApis.DokanDriverVersion();
+                if (dokanDriverVersion <= 0)
+                    return FileSystemAvailability.CoreUnavailable;
+            }
+            catch (Exception)
+            {
+                return FileSystemAvailability.CoreUnavailable;
+            }
+
+            var error = FileSystemAvailability.None;
+            error |= dokanVersion > Constants.Dokan.DOKAN_MAX_VERSION ? FileSystemAvailability.VersionTooHigh : error;
+            error |= dokanVersion < Constants.Dokan.DOKAN_VERSION ? FileSystemAvailability.VersionTooLow : error;
+
+            return error == FileSystemAvailability.None ? FileSystemAvailability.Available : error;
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Core.Dokany/DokanyFileSystem.cs b/src/SecureFolderFS.Core.Dokany/DokanyFileSystem.cs
new file mode 100644
index 000000000..7c871a6a6
--- /dev/null
+++ b/src/SecureFolderFS.Core.Dokany/DokanyFileSystem.cs
@@ -0,0 +1,71 @@
+using DokanNet;
+using OwlCore.Storage;
+using SecureFolderFS.Core.Cryptography;
+using SecureFolderFS.Core.Dokany.AppModels;
+using SecureFolderFS.Core.Dokany.Callbacks;
+using SecureFolderFS.Core.Dokany.OpenHandles;
+using SecureFolderFS.Core.FileSystem;
+using SecureFolderFS.Core.FileSystem.Extensions;
+using SecureFolderFS.Core.FileSystem.Helpers.Paths;
+using SecureFolderFS.Shared.ComponentModel;
+using SecureFolderFS.Storage.Enums;
+using SecureFolderFS.Storage.SystemStorageEx;
+using SecureFolderFS.Storage.VirtualFileSystem;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace SecureFolderFS.Core.Dokany
+{
+    /// <inheritdoc cref="IFileSystem"/>
+    public sealed partial class DokanyFileSystem : IFileSystem
+    {
+        /// <inheritdoc/>
+        public string Id { get; } = Constants.FileSystem.FS_ID;
+
+        /// <inheritdoc/>
+        public string Name { get; } = Constants.FileSystem.FS_NAME;
+
+        /// <inheritdoc/>
+        public partial Task<FileSystemAvailability> GetStatusAsync(CancellationToken cancellationToken = default);
+
+        /// <inheritdoc/>
+        public async Task<IVFSRoot> MountAsync(IFolder folder, IDisposable unlockContract, IDictionary<string, object> options, CancellationToken cancellationToken = default)
+        {
+            if (unlockContract is not IWrapper<Security> wrapper)
+                throw new ArgumentException($"The {nameof(unlockContract)} is invalid.");
+
+            var dokanyOptions = DokanyOptions.ToOptions(options);
+            var specifics = FileSystemSpecifics.CreateNew(wrapper.Inner, folder, dokanyOptions);
+            dokanyOptions.SetupValidators(specifics);
+
+            var volumeModel = new DokanyVolumeModel()
+            {
+                FileSystemName = Constants.Dokan.FS_TYPE_ID,
+                MaximumComponentLength = Constants.Dokan.MAX_COMPONENT_LENGTH,
+                VolumeName = specifics.Options.VolumeName,
+                FileSystemFeatures = FileSystemFeatures.CasePreservedNames
+                                     | FileSystemFeatures.CaseSensitiveSearch
+                                     | FileSystemFeatures.PersistentAcls
+                                     | FileSystemFeatures.SupportsRemoteStorage
+                                     | FileSystemFeatures.UnicodeOnDisk
+            };
+
+            if (dokanyOptions.MountPoint is null)
+                dokanyOptions.SetMountPointInternal(PathHelpers.GetFreeMountPath(dokanyOptions.VolumeName));
+            
+            if (dokanyOptions.MountPoint is null)
+                throw new DirectoryNotFoundException("No available free mount points for vault file system.");
+
+            var handlesManager = new DokanyHandlesManager(specifics.StreamsAccess, specifics.Options);
+            var dokanyCallbacks = new OnDeviceDokany(specifics, handlesManager, volumeModel);
+            var dokanyWrapper = new DokanyWrapper(dokanyCallbacks);
+            dokanyWrapper.StartFileSystem(dokanyOptions.MountPoint);
+
+            await Task.CompletedTask;
+            return new DokanyVFSRoot(dokanyWrapper, new SystemFolderEx(dokanyOptions.MountPoint), specifics);
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Core.Dokany/DokanyMountOptions.cs b/src/SecureFolderFS.Core.Dokany/DokanyMountOptions.cs
deleted file mode 100644
index abd397a17..000000000
--- a/src/SecureFolderFS.Core.Dokany/DokanyMountOptions.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using SecureFolderFS.Core.FileSystem.AppModels;
-
-namespace SecureFolderFS.Core.Dokany
-{
-    /// <inheritdoc cref="MountOptions"/>
-    public sealed class DokanyMountOptions : MountOptions
-    {
-        /// <summary>
-        /// Gets the path where the file system should be mounted. If a null value is given, default mount point will be used.
-        /// </summary>
-        public string? MountPath { get; init; }
-    }
-}
diff --git a/src/SecureFolderFS.Core.Dokany/DokanyMountable.cs b/src/SecureFolderFS.Core.Dokany/DokanyMountable.cs
deleted file mode 100644
index 5bb0b5ba9..000000000
--- a/src/SecureFolderFS.Core.Dokany/DokanyMountable.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-using DokanNet;
-using OwlCore.Storage.System.IO;
-using SecureFolderFS.Core.Dokany.AppModels;
-using SecureFolderFS.Core.Dokany.Callbacks;
-using SecureFolderFS.Core.Dokany.OpenHandles;
-using SecureFolderFS.Core.Dokany.UnsafeNative;
-using SecureFolderFS.Core.FileSystem;
-using SecureFolderFS.Core.FileSystem.AppModels;
-using SecureFolderFS.Core.FileSystem.Enums;
-using SecureFolderFS.Core.FileSystem.Helpers;
-using SecureFolderFS.Storage.VirtualFileSystem;
-using System;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace SecureFolderFS.Core.Dokany
-{
-    /// <inheritdoc cref="IMountableFileSystem"/>
-    public sealed class DokanyMountable : IMountableFileSystem, IAvailabilityChecker
-    {
-        private readonly FileSystemOptions _options;
-        private readonly DokanyWrapper _dokanyWrapper;
-
-        private DokanyMountable(FileSystemOptions options, BaseDokanyCallbacks baseDokanyCallbacks)
-        {
-            _options = options;
-            _dokanyWrapper = new(baseDokanyCallbacks);
-        }
-
-        /// <inheritdoc/>
-        public static FileSystemAvailabilityType IsSupported()
-        {
-            ulong dokanVersion;
-            ulong dokanDriverVersion;
-
-            try
-            {
-                dokanVersion = UnsafeNativeApis.DokanVersion();
-                if (dokanVersion <= 0)
-                    return FileSystemAvailabilityType.ModuleUnavailable;
-            }
-            catch (Exception)
-            {
-                return FileSystemAvailabilityType.ModuleUnavailable;
-            }
-
-            try
-            {
-                dokanDriverVersion = UnsafeNativeApis.DokanDriverVersion();
-                if (dokanDriverVersion <= 0)
-                    return FileSystemAvailabilityType.CoreUnavailable;
-            }
-            catch (Exception)
-            {
-                return FileSystemAvailabilityType.CoreUnavailable;
-            }
-
-            var error = FileSystemAvailabilityType.None;
-            error |= dokanVersion > Constants.Dokan.DOKAN_MAX_VERSION ? FileSystemAvailabilityType.VersionTooHigh : error;
-            error |= dokanVersion < Constants.Dokan.DOKAN_VERSION ? FileSystemAvailabilityType.VersionTooLow : error;
-
-            return error == FileSystemAvailabilityType.None ? FileSystemAvailabilityType.Available : error;
-        }
-
-        /// <inheritdoc/>
-        public async Task<IVFSRoot> MountAsync(MountOptions mountOptions, CancellationToken cancellationToken = default)
-        {
-            await Task.CompletedTask;
-            if (mountOptions is not DokanyMountOptions dokanyMountOptions)
-                throw new ArgumentException($"Parameter {nameof(mountOptions)} does not implement {nameof(DokanyMountOptions)}.");
-
-            var mountPath = dokanyMountOptions.MountPath ?? PathHelpers.GetFreeMountPath(_options.VolumeName);
-            if (mountPath is null)
-                throw new DirectoryNotFoundException("No available free mount points for vault file system.");
-
-            _dokanyWrapper.StartFileSystem(mountPath);
-            return new DokanyVFSRoot(_dokanyWrapper, new SystemFolder(mountPath), _options);
-        }
-
-        public static IMountableFileSystem CreateMountable(FileSystemSpecifics specifics)
-        {
-            var volumeModel = new DokanyVolumeModel()
-            {
-                FileSystemName = Constants.FileSystem.FSRID,
-                MaximumComponentLength = Constants.FileSystem.MAX_COMPONENT_LENGTH,
-                VolumeName = specifics.FileSystemOptions.VolumeName,
-                FileSystemFeatures = FileSystemFeatures.CasePreservedNames
-                                     | FileSystemFeatures.CaseSensitiveSearch
-                                     | FileSystemFeatures.PersistentAcls
-                                     | FileSystemFeatures.SupportsRemoteStorage
-                                     | FileSystemFeatures.UnicodeOnDisk
-            };
-
-            var handlesManager = new DokanyHandlesManager(specifics.StreamsAccess);
-            var dokanyCallbacks = new OnDeviceDokany(specifics, handlesManager, volumeModel);
-
-            return new DokanyMountable(specifics.FileSystemOptions, dokanyCallbacks);
-        }
-    }
-}
diff --git a/src/SecureFolderFS.Core.Dokany/DokanyVFSRoot.cs b/src/SecureFolderFS.Core.Dokany/DokanyVFSRoot.cs
index b18874bcd..a429e1636 100644
--- a/src/SecureFolderFS.Core.Dokany/DokanyVFSRoot.cs
+++ b/src/SecureFolderFS.Core.Dokany/DokanyVFSRoot.cs
@@ -1,7 +1,5 @@
 using OwlCore.Storage;
 using SecureFolderFS.Core.FileSystem;
-using SecureFolderFS.Core.FileSystem.AppModels;
-using SecureFolderFS.Core.FileSystem.Enums;
 using SecureFolderFS.Storage.VirtualFileSystem;
 using System.Threading.Tasks;
 
@@ -14,10 +12,10 @@ internal sealed class DokanyVFSRoot : VFSRoot
         private bool _disposed;
 
         /// <inheritdoc/>
-        public override string FileSystemName { get; } = Constants.FILE_SYSTEM_NAME;
+        public override string FileSystemName { get; } = Constants.FileSystem.FS_NAME;
 
-        public DokanyVFSRoot(DokanyWrapper dokanyWrapper, IFolder storageRoot, FileSystemOptions options)
-            : base(storageRoot, options)
+        public DokanyVFSRoot(DokanyWrapper dokanyWrapper, IFolder storageRoot, FileSystemSpecifics specifics)
+            : base(storageRoot, specifics)
         {
             _dokanyWrapper = dokanyWrapper;
         }
@@ -27,10 +25,13 @@ public override async ValueTask DisposeAsync()
         {
             if (_disposed)
                 return;
-         
-            _disposed = await Task.Run(() => _dokanyWrapper.CloseFileSystem(FileSystemCloseMethod.CloseForcefully));
+
+            _disposed = await Task.Run(_dokanyWrapper.CloseFileSystem);
             if (_disposed)
-                FileSystemManager.Instance.RemoveRoot(this);
+            {
+                FileSystemManager.Instance.FileSystems.Remove(this);
+                await base.DisposeAsync();
+            }
         }
     }
 }
diff --git a/src/SecureFolderFS.Core.Dokany/DokanyWrapper.cs b/src/SecureFolderFS.Core.Dokany/DokanyWrapper.cs
index 3d9a0e6b1..fae9112c0 100644
--- a/src/SecureFolderFS.Core.Dokany/DokanyWrapper.cs
+++ b/src/SecureFolderFS.Core.Dokany/DokanyWrapper.cs
@@ -1,7 +1,6 @@
 using DokanNet;
 using DokanNet.Logging;
 using SecureFolderFS.Core.Dokany.Callbacks;
-using SecureFolderFS.Core.FileSystem.Enums;
 
 namespace SecureFolderFS.Core.Dokany
 {
@@ -30,9 +29,8 @@ public void StartFileSystem(string mountPoint)
             _dokanInstance = dokanBuilder.Build(_dokanCallbacks);
         }
 
-        public bool CloseFileSystem(FileSystemCloseMethod closeMethod)
+        public bool CloseFileSystem()
         {
-            _ = closeMethod; // TODO: Implement close method
             _dokanInstance?.Dispose();
             _dokanCallbacks.Dispose();
 
diff --git a/src/SecureFolderFS.Core.Dokany/OpenHandles/DokanyHandlesManager.cs b/src/SecureFolderFS.Core.Dokany/OpenHandles/DokanyHandlesManager.cs
index 291a50d98..aef86cacf 100644
--- a/src/SecureFolderFS.Core.Dokany/OpenHandles/DokanyHandlesManager.cs
+++ b/src/SecureFolderFS.Core.Dokany/OpenHandles/DokanyHandlesManager.cs
@@ -1,5 +1,7 @@
-using SecureFolderFS.Core.FileSystem.OpenHandles;
+using SecureFolderFS.Core.FileSystem.Extensions;
+using SecureFolderFS.Core.FileSystem.OpenHandles;
 using SecureFolderFS.Core.FileSystem.Streams;
+using SecureFolderFS.Storage.VirtualFileSystem;
 using System.IO;
 
 namespace SecureFolderFS.Core.Dokany.OpenHandles
@@ -7,8 +9,8 @@ namespace SecureFolderFS.Core.Dokany.OpenHandles
     /// <inheritdoc cref="BaseHandlesManager"/>
     internal sealed class DokanyHandlesManager : BaseHandlesManager
     {
-        public DokanyHandlesManager(StreamsAccess streamsAccess)
-            : base(streamsAccess)
+        public DokanyHandlesManager(StreamsAccess streamsAccess, FileSystemOptions fileSystemOptions)
+            : base(streamsAccess, fileSystemOptions)
         {
         }
 
@@ -19,24 +21,23 @@ public override ulong OpenFileHandle(string ciphertextPath, FileMode mode, FileA
             if (disposed)
                 return FileSystem.Constants.INVALID_HANDLE;
 
-            // TODO: Temporary fix for file share issue
-            //share = FileShare.ReadWrite | FileShare.Delete;
+            if (fileSystemOptions.IsReadOnly && mode.IsWriteFlag())
+                return FileSystem.Constants.INVALID_HANDLE;
 
             // Open ciphertext stream
             var ciphertextStream = new FileStream(ciphertextPath, mode, access, share, 4096, options);
 
-            // Open cleartext stream on top of ciphertext stream
-            var cleartextStream = streamsAccess.OpenPlaintextStream(ciphertextPath, ciphertextStream);
-
-            if (cleartextStream is null)
+            // Open plaintext stream on top of ciphertext stream
+            var plaintextStream = streamsAccess.TryOpenPlaintextStream(ciphertextPath, ciphertextStream);
+            if (plaintextStream is null)
                 return FileSystem.Constants.INVALID_HANDLE;
 
             // Flush ChunkAccess if opened with Truncate flag
             if (mode == FileMode.Truncate)
-                cleartextStream.Flush();
+                plaintextStream.Flush();
 
             // Create handle
-            var fileHandle = new Win32FileHandle(cleartextStream); // TODO: For now it's Win32FileHandle
+            var fileHandle = new Win32FileHandle(plaintextStream);
             var handleId = handlesGenerator.ThreadSafeIncrement();
 
             // Lock collection and add handle
diff --git a/src/SecureFolderFS.Core.Dokany/OpenHandles/Win32DirectoryHandle.cs b/src/SecureFolderFS.Core.Dokany/OpenHandles/Win32DirectoryHandle.cs
index b021940b8..317479903 100644
--- a/src/SecureFolderFS.Core.Dokany/OpenHandles/Win32DirectoryHandle.cs
+++ b/src/SecureFolderFS.Core.Dokany/OpenHandles/Win32DirectoryHandle.cs
@@ -8,7 +8,6 @@ internal sealed class Win32DirectoryHandle : DirectoryHandle
         /// <inheritdoc/>
         public override void Dispose()
         {
-            // TODO: Close hFolder handle?
         }
     }
 }
diff --git a/src/SecureFolderFS.Core.Dokany/SecureFolderFS.Core.Dokany.csproj b/src/SecureFolderFS.Core.Dokany/SecureFolderFS.Core.Dokany.csproj
index 16ac9b89b..0e6508d4f 100644
--- a/src/SecureFolderFS.Core.Dokany/SecureFolderFS.Core.Dokany.csproj
+++ b/src/SecureFolderFS.Core.Dokany/SecureFolderFS.Core.Dokany.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>disable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
diff --git a/src/SecureFolderFS.Core.FUSE/AppModels/FuseMountOptions.cs b/src/SecureFolderFS.Core.FUSE/AppModels/FuseMountOptions.cs
deleted file mode 100644
index ae99d34ab..000000000
--- a/src/SecureFolderFS.Core.FUSE/AppModels/FuseMountOptions.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using SecureFolderFS.Core.FileSystem.AppModels;
-
-namespace SecureFolderFS.Core.FUSE.AppModels
-{
-    /// <inheritdoc cref="MountOptions"/>
-    public class FuseMountOptions : MountOptions
-    {
-        /// <summary>
-        /// Gets the path where the file system should be mounted. If a null value is given, default mount point will be used.
-        /// </summary>
-        public string? MountPoint { get; init; } = null;
-
-        /// <summary>
-        /// Gets whether the root user should have access to the filesystem.
-        /// </summary>
-        /// <remarks>
-        /// <para>
-        /// Requires <i>user_allow_other</i> to be uncommented in /etc/fuse.conf.
-        /// </para>
-        /// <para>
-        /// This option is mutually exclusive with <see cref="AllowOtherUserAccess"/>.
-        /// </para>
-        /// </remarks>
-        public bool AllowRootUserAccess { get; init; }
-
-        /// <summary>
-        /// Gets whether other users, including root, should have access to the filesystem.
-        /// </summary>
-        /// <remarks>
-        /// <para>
-        /// Requires <i>user_allow_other</i> to be uncommented in /etc/fuse.conf.
-        /// </para>
-        /// <para>
-        /// This option is mutually exclusive with <see cref="AllowRootUserAccess"/>.
-        /// </para>
-        /// </remarks>
-        public bool AllowOtherUserAccess { get; init; }
-
-        /// <summary>
-        /// Gets whether the filesystem is read-only.
-        /// </summary>
-        public bool IsReadOnly { get; init; }
-
-        /// <summary>
-        /// Gets whether to print debugging information to the console.
-        /// </summary>
-        public bool PrintDebugInformation { get; init; }
-    }
-}
\ No newline at end of file
diff --git a/src/SecureFolderFS.Core.FUSE/AppModels/FuseOptions.cs b/src/SecureFolderFS.Core.FUSE/AppModels/FuseOptions.cs
new file mode 100644
index 000000000..3cb4b4850
--- /dev/null
+++ b/src/SecureFolderFS.Core.FUSE/AppModels/FuseOptions.cs
@@ -0,0 +1,66 @@
+using OwlCore.Storage;
+using SecureFolderFS.Core.FileSystem.AppModels;
+using SecureFolderFS.Shared.Extensions;
+using SecureFolderFS.Storage.VirtualFileSystem;
+
+namespace SecureFolderFS.Core.FUSE.AppModels
+{
+    /// <inheritdoc cref="FileSystemOptions"/>
+    public sealed class FuseOptions : FileSystemOptions
+    {
+        /// <summary>
+        /// Gets the path where the file system should be mounted. If a null value is given, default mount point will be used.
+        /// </summary>
+        public string? MountPoint { get; init; } = null;
+
+        /// <summary>
+        /// Gets whether the root user should have access to the filesystem.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// Requires <i>user_allow_other</i> to be uncommented in /etc/fuse.conf.
+        /// </para>
+        /// <para>
+        /// This option is mutually exclusive with <see cref="AllowOtherUserAccess"/>.
+        /// </para>
+        /// </remarks>
+        public bool AllowRootUserAccess { get; init; }
+
+        /// <summary>
+        /// Gets whether other users, including root, should have access to the filesystem.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// Requires <i>user_allow_other</i> to be uncommented in /etc/fuse.conf.
+        /// </para>
+        /// <para>
+        /// This option is mutually exclusive with <see cref="AllowRootUserAccess"/>.
+        /// </para>
+        /// </remarks>
+        public bool AllowOtherUserAccess { get; init; }
+
+        /// <summary>
+        /// Gets whether to print debugging information to the console.
+        /// </summary>
+        public bool PrintDebugInformation { get; init; } // TODO: Use ILogger in the base class
+
+        public static FuseOptions ToOptions(IDictionary<string, object> options)
+        {
+            return new()
+            {
+                VolumeName = (string?)options.Get(nameof(VolumeName)) ?? throw new ArgumentNullException(nameof(VolumeName)),
+                HealthStatistics = (IHealthStatistics?)options.Get(nameof(HealthStatistics)) ?? new HealthStatistics(),
+                FileSystemStatistics = (IFileSystemStatistics?)options.Get(nameof(FileSystemStatistics)) ?? new FileSystemStatistics(),
+                IsReadOnly = (bool?)options.Get(nameof(IsReadOnly)) ?? false,
+                IsCachingChunks = (bool?)options.Get(nameof(IsCachingChunks)) ?? true,
+                IsCachingFileNames = (bool?)options.Get(nameof(IsCachingFileNames)) ?? true,
+
+                // FUSE specific
+                MountPoint = (string?)options.Get(nameof(MountPoint)),
+                AllowRootUserAccess = (bool?)options.Get(nameof(AllowRootUserAccess)) ?? false,
+                AllowOtherUserAccess = (bool?)options.Get(nameof(AllowOtherUserAccess)) ?? false,
+                PrintDebugInformation = (bool?)options.Get(nameof(AllowOtherUserAccess)) ?? false
+            };
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/SecureFolderFS.Core.FUSE/Callbacks/BaseFuseCallbacks.cs b/src/SecureFolderFS.Core.FUSE/Callbacks/BaseFuseCallbacks.cs
index ac63e0d49..98defcf8c 100644
--- a/src/SecureFolderFS.Core.FUSE/Callbacks/BaseFuseCallbacks.cs
+++ b/src/SecureFolderFS.Core.FUSE/Callbacks/BaseFuseCallbacks.cs
@@ -20,8 +20,8 @@ protected BaseFuseCallbacks(FileSystemSpecifics specifics, FuseHandlesManager ha
         /// <remarks>
         /// Null before the filesystem has been mounted.
         /// </remarks>
-        public FuseMountOptions? MountOptions { get; set; }
+        public FuseOptions? FuseOptions { get; set; } // TODO: Get instance from Specifics.FileSystemOptions and cast to FuseOptions
 
-        protected abstract string? GetCiphertextPath(ReadOnlySpan<byte> cleartextName);
+        protected abstract string? GetCiphertextPath(ReadOnlySpan<byte> plaintextName);
     }
 }
\ No newline at end of file
diff --git a/src/SecureFolderFS.Core.FUSE/Callbacks/OnDeviceFuse.cs b/src/SecureFolderFS.Core.FUSE/Callbacks/OnDeviceFuse.cs
index c168499d3..f2a639a54 100644
--- a/src/SecureFolderFS.Core.FUSE/Callbacks/OnDeviceFuse.cs
+++ b/src/SecureFolderFS.Core.FUSE/Callbacks/OnDeviceFuse.cs
@@ -1,6 +1,6 @@
 using SecureFolderFS.Core.FileSystem;
-using SecureFolderFS.Core.FileSystem.Helpers;
-using SecureFolderFS.Core.FileSystem.Helpers.Native;
+using SecureFolderFS.Core.FileSystem.Helpers.Paths;
+using SecureFolderFS.Core.FileSystem.Helpers.Paths.Native;
 using SecureFolderFS.Core.FUSE.OpenHandles;
 using SecureFolderFS.Core.FUSE.UnsafeNative;
 using System.Runtime.CompilerServices;
@@ -25,7 +25,7 @@ public OnDeviceFuse(FileSystemSpecifics specifics, FuseHandlesManager handlesMan
 
         public override unsafe int ChMod(ReadOnlySpan<byte> path, mode_t mode, FuseFileInfoRef fiRef)
         {
-            if (MountOptions!.IsReadOnly)
+            if (FuseOptions!.IsReadOnly)
                 return -EROFS;
 
             var ciphertextPath = GetCiphertextPath(path);
@@ -43,7 +43,7 @@ public override unsafe int ChMod(ReadOnlySpan<byte> path, mode_t mode, FuseFileI
 
         public override unsafe int Chown(ReadOnlySpan<byte> path, uint uid, uint gid, FuseFileInfoRef fiRef)
         {
-            if (MountOptions!.IsReadOnly)
+            if (FuseOptions!.IsReadOnly)
                 return -EROFS;
 
             var ciphertextPath = GetCiphertextPath(path);
@@ -61,7 +61,7 @@ public override unsafe int Chown(ReadOnlySpan<byte> path, uint uid, uint gid, Fu
 
         public override unsafe int Create(ReadOnlySpan<byte> path, mode_t mode, ref FuseFileInfo fi)
         {
-            if (MountOptions!.IsReadOnly)
+            if (FuseOptions!.IsReadOnly)
                 return -EROFS;
 
             var ciphertextPath = GetCiphertextPath(path);
@@ -85,7 +85,7 @@ public override unsafe int Create(ReadOnlySpan<byte> path, mode_t mode, ref Fuse
         [MethodImpl(MethodImplOptions.Synchronized)]
         public override int FAllocate(ReadOnlySpan<byte> path, int mode, ulong offset, long length, ref FuseFileInfo fi)
         {
-            if (MountOptions!.IsReadOnly)
+            if (FuseOptions!.IsReadOnly)
                 return -EROFS;
 
             var ciphertextPath = GetCiphertextPath(path);
@@ -151,7 +151,7 @@ public override unsafe int FSync(ReadOnlySpan<byte> path, bool onlyData, ref Fus
         [MethodImpl(MethodImplOptions.Synchronized)]
         public override unsafe int FSyncDir(ReadOnlySpan<byte> path, bool onlyData, ref FuseFileInfo fi)
         {
-            if (MountOptions!.IsReadOnly)
+            if (FuseOptions!.IsReadOnly)
                 return -EROFS;
 
             var ciphertextPath = GetCiphertextPath(path);
@@ -198,7 +198,7 @@ public override unsafe int GetAttr(ReadOnlySpan<byte> path, ref stat stat, FuseF
                     return -errno;
 
                 if (File.Exists(ciphertextPath))
-                    stat.st_size = Math.Max(0, Specifics.Security.ContentCrypt.CalculateCleartextSize(stat.st_size - Specifics.Security.HeaderCrypt.HeaderCiphertextSize));
+                    stat.st_size = Math.Max(0, Specifics.Security.ContentCrypt.CalculatePlaintextSize(stat.st_size - Specifics.Security.HeaderCrypt.HeaderCiphertextSize));
 
                 return 0;
             }
@@ -255,7 +255,7 @@ public override unsafe int ListXAttr(ReadOnlySpan<byte> path, Span<byte> list)
 
         public override unsafe int MkDir(ReadOnlySpan<byte> path, mode_t mode)
         {
-            if (MountOptions!.IsReadOnly)
+            if (FuseOptions!.IsReadOnly)
                 return -EROFS;
 
             var ciphertextPath = GetCiphertextPath(path);
@@ -270,7 +270,7 @@ public override unsafe int MkDir(ReadOnlySpan<byte> path, mode_t mode)
 
             // Create new DirectoryID
             var directoryId = Guid.NewGuid().ToByteArray();
-            var directoryIdPath = Path.Combine(ciphertextPath, FileSystem.Constants.DIRECTORY_ID_FILENAME);
+            var directoryIdPath = Path.Combine(ciphertextPath, FileSystem.Constants.Names.DIRECTORY_ID_FILENAME);
 
             // Initialize directory with DirectoryID
             using var directoryIdStream = File.Create(directoryIdPath);
@@ -309,7 +309,7 @@ public override int Open(ReadOnlySpan<byte> path, ref FuseFileInfo fi)
             if ((fi.flags & O_TMPFILE) != 0)
                 options |= FileOptions.DeleteOnClose;
 
-            if (MountOptions!.IsReadOnly && (mode == FileMode.Create || mode == FileMode.Truncate || (fi.flags & O_WRONLY) != 0 || (fi.flags & O_RDWR) != 0))
+            if (FuseOptions!.IsReadOnly && (mode == FileMode.Create || mode == FileMode.Truncate || (fi.flags & O_WRONLY) != 0 || (fi.flags & O_RDWR) != 0))
                 return -EROFS;
 
             var access = mode == FileMode.Append ? FileAccess.Write : FileAccess.ReadWrite;
@@ -361,7 +361,7 @@ public override int ReadDir(ReadOnlySpan<byte> path, ulong offset, ReadDirFlags
 
             foreach (var entry in Directory.GetFileSystemEntries(ciphertextPath))
             {
-                if (PathHelpers.IsCoreFile(entry))
+                if (PathHelpers.IsCoreName(entry))
                     continue;
 
                 var directoryId = new byte[FileSystem.Constants.DIRECTORY_ID_SIZE];
@@ -385,7 +385,7 @@ public override int ReleaseDir(ReadOnlySpan<byte> path, ref FuseFileInfo fi)
 
         public override unsafe int RemoveXAttr(ReadOnlySpan<byte> path, ReadOnlySpan<byte> name)
         {
-            if (MountOptions!.IsReadOnly)
+            if (FuseOptions!.IsReadOnly)
                 return -EROFS;
 
             var ciphertextPath = GetCiphertextPath(path);
@@ -404,7 +404,7 @@ public override unsafe int RemoveXAttr(ReadOnlySpan<byte> path, ReadOnlySpan<byt
 
         public override unsafe int Rename(ReadOnlySpan<byte> path, ReadOnlySpan<byte> newPath, int flags)
         {
-            if (MountOptions!.IsReadOnly)
+            if (FuseOptions!.IsReadOnly)
                 return -EROFS;
 
             var ciphertextPath = GetCiphertextPath(path);
@@ -424,17 +424,17 @@ public override unsafe int Rename(ReadOnlySpan<byte> path, ReadOnlySpan<byte> ne
 
         public override unsafe int RmDir(ReadOnlySpan<byte> path)
         {
-            if (MountOptions!.IsReadOnly)
+            if (FuseOptions!.IsReadOnly)
                 return -EROFS;
 
             var ciphertextPath = GetCiphertextPath(path);
             if (ciphertextPath is null)
                 return -ENOENT;
 
-            if (Directory.EnumerateFileSystemEntries(ciphertextPath).Any(x => !PathHelpers.IsCoreFile(x)))
+            if (Directory.EnumerateFileSystemEntries(ciphertextPath).Any(x => !PathHelpers.IsCoreName(x)))
                 return -ENOTEMPTY;
 
-            var directoryIdPath = Path.Combine(ciphertextPath, FileSystem.Constants.DIRECTORY_ID_FILENAME);
+            var directoryIdPath = Path.Combine(ciphertextPath, FileSystem.Constants.Names.DIRECTORY_ID_FILENAME);
 
             // Remove DirectoryID
             File.Delete(directoryIdPath);
@@ -451,7 +451,7 @@ public override unsafe int RmDir(ReadOnlySpan<byte> path)
 
         public override unsafe int SetXAttr(ReadOnlySpan<byte> path, ReadOnlySpan<byte> name, ReadOnlySpan<byte> value, int flags)
         {
-            if (MountOptions!.IsReadOnly)
+            if (FuseOptions!.IsReadOnly)
                 return -EROFS;
 
             var ciphertextPath = GetCiphertextPath(path);
@@ -488,7 +488,7 @@ public override unsafe int StatFS(ReadOnlySpan<byte> path, ref statvfs statfs)
         [MethodImpl(MethodImplOptions.Synchronized)]
         public override int Truncate(ReadOnlySpan<byte> path, ulong length, FuseFileInfoRef fiRef)
         {
-            if (MountOptions!.IsReadOnly)
+            if (FuseOptions!.IsReadOnly)
                 return -EROFS;
 
             var ciphertextPath = GetCiphertextPath(path);
@@ -529,7 +529,7 @@ public override int Truncate(ReadOnlySpan<byte> path, ulong length, FuseFileInfo
         /// </remarks>
         public override unsafe int Unlink(ReadOnlySpan<byte> path)
         {
-            if (MountOptions!.IsReadOnly)
+            if (FuseOptions!.IsReadOnly)
                 return -EROFS;
 
             var ciphertextPath = GetCiphertextPath(path);
@@ -550,7 +550,7 @@ public override unsafe int Unlink(ReadOnlySpan<byte> path)
 
         public override unsafe int UpdateTimestamps(ReadOnlySpan<byte> path, ref timespec atime, ref timespec mtime, FuseFileInfoRef fiRef)
         {
-            if (MountOptions!.IsReadOnly)
+            if (FuseOptions!.IsReadOnly)
                 return -EROFS;
 
             var ciphertextPath = GetCiphertextPath(path);
@@ -612,12 +612,12 @@ public override int Write(ReadOnlySpan<byte> path, ulong offset, ReadOnlySpan<by
             return buffer.Length;
         }
 
-        protected override unsafe string? GetCiphertextPath(ReadOnlySpan<byte> cleartextName)
+        protected override unsafe string? GetCiphertextPath(ReadOnlySpan<byte> plaintextName)
         {
-            fixed (byte *cleartextNamePtr = cleartextName)
+            fixed (byte *plaintextNamePtr = plaintextName)
             {
                 var directoryId = new byte[FileSystem.Constants.DIRECTORY_ID_SIZE];
-                return NativePathHelpers.GetCiphertextPath(Encoding.UTF8.GetString(cleartextNamePtr, cleartextName.Length), Specifics, directoryId);
+                return NativePathHelpers.GetCiphertextPath(Encoding.UTF8.GetString(plaintextNamePtr, plaintextName.Length), Specifics, directoryId);
             }
         }
     }
diff --git a/src/SecureFolderFS.Core.FUSE/Constants.cs b/src/SecureFolderFS.Core.FUSE/Constants.cs
index 105df2c0f..f7d4d5c0b 100644
--- a/src/SecureFolderFS.Core.FUSE/Constants.cs
+++ b/src/SecureFolderFS.Core.FUSE/Constants.cs
@@ -2,6 +2,10 @@
 {
     public static class Constants
     {
-        public const string FILE_SYSTEM_NAME = "FUSE";
+        public static class FileSystem
+        {
+            public const string FS_ID = "FUSE";
+            public const string FS_NAME = "FUSE";
+        }
     }
 }
diff --git a/src/SecureFolderFS.Core.FUSE/FuseFileSystem.Availability.cs b/src/SecureFolderFS.Core.FUSE/FuseFileSystem.Availability.cs
new file mode 100644
index 000000000..b4a415fa2
--- /dev/null
+++ b/src/SecureFolderFS.Core.FUSE/FuseFileSystem.Availability.cs
@@ -0,0 +1,24 @@
+using SecureFolderFS.Storage.Enums;
+using SecureFolderFS.Storage.VirtualFileSystem;
+using Tmds.Fuse;
+
+namespace SecureFolderFS.Core.FUSE
+{
+    /// <inheritdoc cref="IFileSystem"/>
+    public sealed partial class FuseFileSystem
+    {
+        /// <inheritdoc/>
+        public partial async Task<FileSystemAvailability> GetStatusAsync(CancellationToken cancellationToken)
+        {
+            await Task.CompletedTask;
+            try
+            {
+                return Fuse.CheckDependencies() ? FileSystemAvailability.Available : FileSystemAvailability.ModuleUnavailable;
+            }
+            catch (TypeInitializationException) // Fuse might sometimes throw (tested on Windows)
+            {
+                return FileSystemAvailability.ModuleUnavailable;
+            }
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Core.FUSE/FuseFileSystem.Helpers.cs b/src/SecureFolderFS.Core.FUSE/FuseFileSystem.Helpers.cs
new file mode 100644
index 000000000..e3d63a75c
--- /dev/null
+++ b/src/SecureFolderFS.Core.FUSE/FuseFileSystem.Helpers.cs
@@ -0,0 +1,87 @@
+using SecureFolderFS.Storage.VirtualFileSystem;
+using System.Text;
+using Tmds.Fuse;
+using Tmds.Linux;
+
+namespace SecureFolderFS.Core.FUSE
+{
+    /// <inheritdoc cref="IFileSystem"/>
+    public sealed partial class FuseFileSystem
+    {
+        private static string MountDirectory { get; } = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), nameof(SecureFolderFS), "mount");
+
+        /// <returns>Whether a filesystem is mounted in the specified directory.</returns>
+        private static unsafe bool IsMountPoint(string directory)
+        {
+            stat stat = new();
+            fixed (byte* pathPtr = Encoding.UTF8.GetBytes(directory))
+            {
+                if (LibC.stat(pathPtr, &stat) == -1)
+                    return false;
+            }
+
+            stat parentStat = new();
+            fixed (byte* parentPathPtr = Encoding.UTF8.GetBytes(Directory.GetParent(directory)!.FullName))
+            {
+                if (LibC.stat(parentPathPtr, &parentStat) == -1)
+                    return false;
+            }
+
+            return stat.st_dev != parentStat.st_dev;
+        }
+
+        private static string GetFreeMountPoint(string vaultName)
+        {
+            var mountPoint = Path.Combine(MountDirectory, vaultName);
+
+            var i = 1;
+            while (IsMountPoint(mountPoint))
+            {
+                mountPoint = Path.Combine(MountDirectory, $"{vaultName} ({i++})");
+            }
+
+            return mountPoint;
+        }
+
+        /// <summary>
+        /// Removes mount points without a connected transport endpoint in the default mount directory.
+        /// </summary>
+        private static void Cleanup()
+        {
+            foreach (var directory in Directory.GetDirectories(MountDirectory))
+            {
+                Cleanup(directory);
+            }
+        }
+
+        /// <summary>
+        /// Unmounts and deletes the specified directory if it is a mount point without a connected transport endpoint.
+        /// Otherwise, nothing happens.
+        /// </summary>
+        private static void Cleanup(string directory)
+        {
+            try
+            {
+                Directory.EnumerateFileSystemEntries(directory);
+            }
+            catch (IOException)
+            {
+                Fuse.LazyUnmount(directory);
+                Directory.Delete(directory);
+            }
+        }
+
+        /// <returns>Whether the user_allow_other option is uncommented in /etc/fuse.conf</returns>
+        private static bool CanAllowOtherUsers()
+        {
+            try
+            {
+                return File.ReadAllLines("/etc/fuse.conf").Any(x => x.Trim() == "user_allow_other");
+            }
+            catch
+            {
+                return false;
+            }
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Core.FUSE/FuseFileSystem.cs b/src/SecureFolderFS.Core.FUSE/FuseFileSystem.cs
new file mode 100644
index 000000000..e4703199a
--- /dev/null
+++ b/src/SecureFolderFS.Core.FUSE/FuseFileSystem.cs
@@ -0,0 +1,68 @@
+using OwlCore.Storage;
+using SecureFolderFS.Core.Cryptography;
+using SecureFolderFS.Core.FileSystem;
+using SecureFolderFS.Core.FileSystem.Extensions;
+using SecureFolderFS.Core.FUSE.AppModels;
+using SecureFolderFS.Core.FUSE.Callbacks;
+using SecureFolderFS.Core.FUSE.OpenHandles;
+using SecureFolderFS.Shared.ComponentModel;
+using SecureFolderFS.Storage.Enums;
+using SecureFolderFS.Storage.SystemStorageEx;
+using SecureFolderFS.Storage.VirtualFileSystem;
+
+namespace SecureFolderFS.Core.FUSE
+{
+    /// <inheritdoc cref="IFileSystem"/>
+    public sealed partial class FuseFileSystem : IFileSystem
+    {
+        /// <inheritdoc/>
+        public string Id { get; } = Constants.FileSystem.FS_ID;
+
+        /// <inheritdoc/>
+        public string Name { get; } = Constants.FileSystem.FS_NAME;
+
+        /// <inheritdoc/>
+        public partial Task<FileSystemAvailability> GetStatusAsync(CancellationToken cancellationToken = default);
+
+        /// <inheritdoc/>
+        public async Task<IVFSRoot> MountAsync(IFolder folder, IDisposable unlockContract, IDictionary<string, object> options, CancellationToken cancellationToken = default)
+        {
+            if (unlockContract is not IWrapper<Security> wrapper)
+                throw new ArgumentException($"The {nameof(unlockContract)} is invalid.");
+
+            var fuseOptions = FuseOptions.ToOptions(options);
+            if (!Directory.Exists(MountDirectory))
+                Directory.CreateDirectory(MountDirectory);
+
+            if (fuseOptions is { AllowOtherUserAccess: true, AllowRootUserAccess: true })
+                throw new ArgumentException($"{nameof(FuseOptions)}.{nameof(fuseOptions.AllowOtherUserAccess)} and {nameof(FuseOptions)}.{nameof(fuseOptions.AllowRootUserAccess)} are mutually exclusive.");
+
+            if ((fuseOptions.AllowOtherUserAccess || fuseOptions.AllowRootUserAccess) && !CanAllowOtherUsers())
+                throw new ArgumentException($"{nameof(fuseOptions.AllowOtherUserAccess)} has been specified but user_allow_other is not uncommented in /etc/fuse.conf.");
+
+            var mountPoint = fuseOptions.MountPoint;
+            if (mountPoint == null)
+                Cleanup();
+            else
+                Cleanup(mountPoint);
+
+            if (mountPoint != null && IsMountPoint(mountPoint))
+                throw new ArgumentException("A filesystem is already mounted in the specified path.");
+
+            mountPoint ??= GetFreeMountPoint(fuseOptions.VolumeName);
+            if (!Directory.Exists(mountPoint))
+                Directory.CreateDirectory(mountPoint);
+
+            var specifics = FileSystemSpecifics.CreateNew(wrapper.Inner, folder, fuseOptions);
+            fuseOptions.SetupValidators(specifics);
+
+            var handlesManager = new FuseHandlesManager(specifics.StreamsAccess, specifics.Options);
+            var fuseCallbacks = new OnDeviceFuse(specifics, handlesManager);
+            var fuseWrapper = new FuseWrapper(fuseCallbacks);
+            fuseWrapper.StartFileSystem(mountPoint, fuseOptions);
+
+            await Task.CompletedTask;
+            return new FuseVFSRoot(fuseWrapper, new SystemFolderEx(mountPoint), specifics);
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Core.FUSE/FuseMountable.cs b/src/SecureFolderFS.Core.FUSE/FuseMountable.cs
deleted file mode 100644
index 2326af0e2..000000000
--- a/src/SecureFolderFS.Core.FUSE/FuseMountable.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-using OwlCore.Storage.System.IO;
-using SecureFolderFS.Core.FileSystem;
-using SecureFolderFS.Core.FileSystem.AppModels;
-using SecureFolderFS.Core.FileSystem.Enums;
-using SecureFolderFS.Core.FUSE.AppModels;
-using SecureFolderFS.Core.FUSE.Callbacks;
-using SecureFolderFS.Core.FUSE.OpenHandles;
-using SecureFolderFS.Storage.VirtualFileSystem;
-using System.Text;
-using Tmds.Fuse;
-using Tmds.Linux;
-using MountOptions = SecureFolderFS.Core.FileSystem.AppModels.MountOptions;
-
-namespace SecureFolderFS.Core.FUSE
-{
-    /// <inheritdoc cref="IMountableFileSystem"/>
-    public sealed class FuseMountable : IMountableFileSystem, IAvailabilityChecker
-    {
-        private static readonly string MountDirectory = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), nameof(SecureFolderFS), "mount");
-
-        private readonly FileSystemOptions _options;
-        private readonly FuseWrapper _fuseWrapper;
-
-        private FuseMountable(FileSystemOptions options, OnDeviceFuse fuseCallbacks)
-        {
-            _options = options;    
-            _fuseWrapper = new(fuseCallbacks);
-        }
-
-        /// <inheritdoc/>
-        public static FileSystemAvailabilityType IsSupported()
-        {
-            try
-            {
-                return Fuse.CheckDependencies() ? FileSystemAvailabilityType.Available : FileSystemAvailabilityType.ModuleUnavailable;
-            }
-            catch (TypeInitializationException) // Fuse might sometimes throw (tested on Windows)
-            {
-                return FileSystemAvailabilityType.ModuleUnavailable;
-            }
-        }
-
-        /// <inheritdoc/>
-        public async Task<IVFSRoot> MountAsync(MountOptions mountOptions, CancellationToken cancellationToken = default)
-        {
-            await Task.CompletedTask;
-            if (!Directory.Exists(MountDirectory))
-                Directory.CreateDirectory(MountDirectory);
-
-            if (mountOptions is not FuseMountOptions fuseMountOptions)
-                throw new ArgumentException($"Parameter {nameof(mountOptions)} does not implement {nameof(FuseMountOptions)}.");
-
-            if (fuseMountOptions.AllowOtherUserAccess && fuseMountOptions.AllowRootUserAccess)
-                throw new ArgumentException($"{nameof(FuseMountOptions)}.{nameof(fuseMountOptions.AllowOtherUserAccess)} and " +
-                                            $"{nameof(FuseMountOptions)}.{nameof(fuseMountOptions.AllowRootUserAccess)} are mutually exclusive.");
-
-            if ((fuseMountOptions.AllowOtherUserAccess || fuseMountOptions.AllowRootUserAccess) && !CanAllowOtherUsers())
-                throw new ArgumentException($"{nameof(fuseMountOptions.AllowOtherUserAccess)} has been specified but user_allow_other is not uncommented " +
-                                            "in /etc/fuse.conf.");
-
-            var mountPoint = fuseMountOptions.MountPoint;
-            if (mountPoint == null)
-                Cleanup();
-            else
-                Cleanup(mountPoint);
-
-            if (mountPoint != null && IsMountPoint(mountPoint))
-                throw new ArgumentException("A filesystem is already mounted in the specified path.");
-
-            mountPoint ??= GetFreeMountPoint(_options.VolumeName);
-            if (!Directory.Exists(mountPoint))
-                Directory.CreateDirectory(mountPoint);
-
-            _fuseWrapper.StartFileSystem(mountPoint, fuseMountOptions);
-            return new FuseRootFolder(_fuseWrapper, new SystemFolder(mountPoint), _options);
-        }
-
-        public static IMountableFileSystem CreateMountable(FileSystemSpecifics specifics)
-        {
-            var handlesManager = new FuseHandlesManager(specifics.StreamsAccess);
-            var fuseCallbacks = new OnDeviceFuse(specifics, handlesManager);
-
-            return new FuseMountable(specifics.FileSystemOptions, fuseCallbacks);
-        }
-
-        /// <returns>Whether a filesystem is mounted in the specified directory.</returns>
-        private static unsafe bool IsMountPoint(string directory)
-        {
-            stat stat = new();
-            fixed (byte* pathPtr = Encoding.UTF8.GetBytes(directory))
-            {
-                if (LibC.stat(pathPtr, &stat) == -1)
-                    return false;
-            }
-
-            stat parentStat = new();
-            fixed (byte* parentPathPtr = Encoding.UTF8.GetBytes(Directory.GetParent(directory)!.FullName))
-            {
-                if (LibC.stat(parentPathPtr, &parentStat) == -1)
-                    return false;
-            }
-
-            return stat.st_dev != parentStat.st_dev;
-        }
-
-        private static string GetFreeMountPoint(string vaultName)
-        {
-            var mountPoint = Path.Combine(MountDirectory, vaultName);
-
-            var i = 1;
-            while (IsMountPoint(mountPoint))
-            {
-                mountPoint = Path.Combine(MountDirectory, $"{vaultName} ({i++})");
-            }
-
-            return mountPoint;
-        }
-
-        /// <summary>
-        /// Removes mount points without a connected transport endpoint in the default mount directory.
-        /// </summary>
-        private static void Cleanup()
-        {
-            foreach (var directory in Directory.GetDirectories(MountDirectory))
-            {
-                Cleanup(directory);
-            }
-        }
-
-        /// <summary>
-        /// Unmounts and deletes the specified directory if it is a mount point without a connected transport endpoint.
-        /// Otherwise, nothing happens.
-        /// </summary>
-        private static void Cleanup(string directory)
-        {
-            try
-            {
-                Directory.EnumerateFileSystemEntries(directory);
-            }
-            catch (IOException)
-            {
-                Fuse.LazyUnmount(directory);
-                Directory.Delete(directory);
-            }
-        }
-
-        /// <returns>Whether the user_allow_other option is uncommented in /etc/fuse.conf</returns>
-        private static bool CanAllowOtherUsers()
-        {
-            try
-            {
-                return File.ReadAllLines("/etc/fuse.conf").Any(x => x.Trim() == "user_allow_other");
-            }
-            catch
-            {
-                return false;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/SecureFolderFS.Core.FUSE/FuseRootFolder.cs b/src/SecureFolderFS.Core.FUSE/FuseVFSRoot.cs
similarity index 62%
rename from src/SecureFolderFS.Core.FUSE/FuseRootFolder.cs
rename to src/SecureFolderFS.Core.FUSE/FuseVFSRoot.cs
index d34657c23..fa0cbbd2b 100644
--- a/src/SecureFolderFS.Core.FUSE/FuseRootFolder.cs
+++ b/src/SecureFolderFS.Core.FUSE/FuseVFSRoot.cs
@@ -1,22 +1,20 @@
 using OwlCore.Storage;
 using SecureFolderFS.Core.FileSystem;
-using SecureFolderFS.Core.FileSystem.AppModels;
-using SecureFolderFS.Core.FileSystem.Enums;
 using SecureFolderFS.Storage.VirtualFileSystem;
 
 namespace SecureFolderFS.Core.FUSE
 {
     /// <inheritdoc cref="IVFSRoot"/>
-    internal sealed class FuseRootFolder : VFSRoot
+    internal sealed class FuseVFSRoot : VFSRoot
     {
         private readonly FuseWrapper _fuseWrapper;
         private bool _disposed;
 
         /// <inheritdoc/>
-        public override string FileSystemName { get; } = Constants.FILE_SYSTEM_NAME;
+        public override string FileSystemName { get; } = Constants.FileSystem.FS_NAME;
 
-        public FuseRootFolder(FuseWrapper fuseWrapper, IFolder storageRoot, FileSystemOptions options)
-            : base(storageRoot, options)
+        public FuseVFSRoot(FuseWrapper fuseWrapper, IFolder storageRoot, FileSystemSpecifics specifics)
+            : base(storageRoot, specifics)
         {
             _fuseWrapper = fuseWrapper;
         }
@@ -27,9 +25,9 @@ public override async ValueTask DisposeAsync()
             if (_disposed)
                 return;
 
-            _disposed = await _fuseWrapper.CloseFileSystemAsync(FileSystemCloseMethod.CloseForcefully);
+            _disposed = await _fuseWrapper.CloseFileSystemAsync();
             if (_disposed)
-                FileSystemManager.Instance.RemoveRoot(this);
+                FileSystemManager.Instance.FileSystems.Remove(this);
         }
     }
 }
\ No newline at end of file
diff --git a/src/SecureFolderFS.Core.FUSE/FuseWrapper.cs b/src/SecureFolderFS.Core.FUSE/FuseWrapper.cs
index 7d8e79707..0f6e2125b 100644
--- a/src/SecureFolderFS.Core.FUSE/FuseWrapper.cs
+++ b/src/SecureFolderFS.Core.FUSE/FuseWrapper.cs
@@ -1,4 +1,3 @@
-using SecureFolderFS.Core.FileSystem.Enums;
 using SecureFolderFS.Core.FUSE.AppModels;
 using SecureFolderFS.Core.FUSE.Callbacks;
 using Tmds.Fuse;
@@ -15,7 +14,7 @@ public FuseWrapper(BaseFuseCallbacks fuseCallbacks)
             _fuseCallbacks = fuseCallbacks;
         }
 
-        public void StartFileSystem(string mountPoint, FuseMountOptions mountOptions)
+        public void StartFileSystem(string mountPoint, FuseOptions mountOptions)
         {
             var rawOptions = "default_permissions";
             if (mountOptions.AllowOtherUserAccess)
@@ -30,19 +29,19 @@ public void StartFileSystem(string mountPoint, FuseMountOptions mountOptions)
             if (mountOptions.PrintDebugInformation)
                 rawOptions += ",debug";
 
-            _fuseCallbacks.MountOptions = mountOptions;
-            _fuseMount = Fuse.Mount(mountPoint, _fuseCallbacks, new MountOptions
+            _fuseCallbacks.FuseOptions = mountOptions;
+            _fuseMount = Fuse.Mount(mountPoint, _fuseCallbacks, new MountOptions()
             {
                 Options = rawOptions
             });
         }
 
-        public Task<bool> CloseFileSystemAsync(FileSystemCloseMethod closeMethod)
+        public Task<bool> CloseFileSystemAsync()
         {
             if (_fuseMount == null)
                 throw new InvalidOperationException("The filesystem has not been started.");
 
-            return _fuseMount.UnmountAsync(force: closeMethod == FileSystemCloseMethod.CloseForcefully);
+            return _fuseMount.UnmountAsync(force: true);
         }
     }
 }
\ No newline at end of file
diff --git a/src/SecureFolderFS.Core.FUSE/OpenHandles/FuseHandlesManager.cs b/src/SecureFolderFS.Core.FUSE/OpenHandles/FuseHandlesManager.cs
index 3f2829b9e..ea332d3d9 100644
--- a/src/SecureFolderFS.Core.FUSE/OpenHandles/FuseHandlesManager.cs
+++ b/src/SecureFolderFS.Core.FUSE/OpenHandles/FuseHandlesManager.cs
@@ -1,13 +1,15 @@
+using SecureFolderFS.Core.FileSystem.Extensions;
 using SecureFolderFS.Core.FileSystem.OpenHandles;
 using SecureFolderFS.Core.FileSystem.Streams;
+using SecureFolderFS.Storage.VirtualFileSystem;
 
 namespace SecureFolderFS.Core.FUSE.OpenHandles
 {
     /// <inheritdoc cref="BaseHandlesManager"/>
     internal sealed class FuseHandlesManager : BaseHandlesManager
     {
-        public FuseHandlesManager(StreamsAccess streamsAccess)
-            : base(streamsAccess)
+        public FuseHandlesManager(StreamsAccess streamsAccess, FileSystemOptions fileSystemOptions)
+            : base(streamsAccess, fileSystemOptions)
         {
         }
 
@@ -23,8 +25,15 @@ public IEnumerable<IDisposable> OpenHandles
         /// <inheritdoc/>
         public override ulong OpenFileHandle(string ciphertextPath, FileMode mode, FileAccess access, FileShare share, FileOptions options)
         {
+            // Make sure the handles manager was not disposed
+            if (disposed)
+                return FileSystem.Constants.INVALID_HANDLE;
+
+            if (fileSystemOptions.IsReadOnly && mode.IsWriteFlag())
+                return FileSystem.Constants.INVALID_HANDLE;
+
             // Open ciphertext stream
-            var ciphertextStream = new FileStream(ciphertextPath, new FileStreamOptions
+            var ciphertextStream = new FileStream(ciphertextPath, new FileStreamOptions()
             {
                 // A file cannot be opened with both FileMode.Append and FileMode.Read, but opening it with
                 // FileMode.Write would cause an error when writing, as the stream needs to be readable.
@@ -34,17 +43,17 @@ public override ulong OpenFileHandle(string ciphertextPath, FileMode mode, FileA
                 Options = options
             });
 
-            // Open cleartext stream on top of ciphertext stream
-            var cleartextStream = streamsAccess.OpenPlaintextStream(ciphertextPath, ciphertextStream);
-            if (cleartextStream is null)
+            // Open plaintext stream on top of ciphertext stream
+            var plaintextStream = streamsAccess.TryOpenPlaintextStream(ciphertextPath, ciphertextStream);
+            if (plaintextStream is null)
                 return FileSystem.Constants.INVALID_HANDLE;
 
             // Flush ChunkAccess if the opened to Truncate
             if (mode == FileMode.Truncate)
-                cleartextStream.Flush();
+                plaintextStream.Flush();
 
             // Create handle
-            var fileHandle = new FuseFileHandle(cleartextStream, access, mode, Path.GetDirectoryName(ciphertextPath)!);
+            var fileHandle = new FuseFileHandle(plaintextStream, access, mode, Path.GetDirectoryName(ciphertextPath)!);
             var handle = handlesGenerator.ThreadSafeIncrement();
 
             lock (handles)
diff --git a/src/SecureFolderFS.Core.FUSE/SecureFolderFS.Core.FUSE.csproj b/src/SecureFolderFS.Core.FUSE/SecureFolderFS.Core.FUSE.csproj
index a89d70b60..088db5280 100644
--- a/src/SecureFolderFS.Core.FUSE/SecureFolderFS.Core.FUSE.csproj
+++ b/src/SecureFolderFS.Core.FUSE/SecureFolderFS.Core.FUSE.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <Platforms>AnyCPU;ARM64;x64;x86</Platforms>
diff --git a/src/SecureFolderFS.Core.FileSystem/AppModels/FileSystemOptions.cs b/src/SecureFolderFS.Core.FileSystem/AppModels/FileSystemOptions.cs
deleted file mode 100644
index be3bcae03..000000000
--- a/src/SecureFolderFS.Core.FileSystem/AppModels/FileSystemOptions.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using SecureFolderFS.Core.FileSystem.Statistics;
-
-namespace SecureFolderFS.Core.FileSystem.AppModels
-{
-    /// <summary>
-    /// Specifies file system related options to use.
-    /// </summary>
-    public sealed class FileSystemOptions
-    {
-        /// <summary>
-        /// Gets or sets the name to use for the volume.
-        /// </summary>
-        public required string VolumeName { get; init; }
-
-        /// <summary>
-        /// Gets or sets the type of the virtual file system adapter ID to be used.
-        /// </summary>
-        public required string FileSystemId { get; init; }
-
-        /// <summary>
-        /// Gets or sets the instance file system health statistics which are reported by the underlying virtual file system.
-        /// </summary>
-        public required IHealthStatistics HealthStatistics { get; init; }
-
-        /// <summary>
-        /// Gets or sets the instance file system statistics which are reported by the underlying virtual file system.
-        /// </summary>
-        public required IFileSystemStatistics FileSystemStatistics { get; init; }
-
-        /// <summary>
-        /// Gets or sets whether to enable caching for decrypted content chunks.
-        /// </summary>
-        public bool EnableChunkCache { get; init; } = true;
-
-        /// <summary>
-        /// Gets or sets whether to enable caching for ciphertext and cleartext names.
-        /// </summary>
-        public bool EnableFileNameCache { get; init; } = true;
-    }
-}
diff --git a/src/SecureFolderFS.Core.FileSystem/AppModels/ConsolidatedStatisticsModel.cs b/src/SecureFolderFS.Core.FileSystem/AppModels/FileSystemStatistics.cs
similarity index 61%
rename from src/SecureFolderFS.Core.FileSystem/AppModels/ConsolidatedStatisticsModel.cs
rename to src/SecureFolderFS.Core.FileSystem/AppModels/FileSystemStatistics.cs
index b98f2cee0..1f763cd83 100644
--- a/src/SecureFolderFS.Core.FileSystem/AppModels/ConsolidatedStatisticsModel.cs
+++ b/src/SecureFolderFS.Core.FileSystem/AppModels/FileSystemStatistics.cs
@@ -1,10 +1,11 @@
-using SecureFolderFS.Core.FileSystem.Statistics;
-using SecureFolderFS.Shared.Enums;
+using SecureFolderFS.Shared.Enums;
+using SecureFolderFS.Storage.VirtualFileSystem;
 using System;
 
 namespace SecureFolderFS.Core.FileSystem.AppModels
 {
-    public sealed class ConsolidatedStatisticsModel : IFileSystemStatistics, IHealthStatistics
+    /// <inheritdoc cref="IFileSystemStatistics"/>
+    public sealed class FileSystemStatistics : IFileSystemStatistics
     {
         /// <inheritdoc/>
         public IProgress<long>? BytesRead { get; set; }
@@ -26,14 +27,5 @@ public sealed class ConsolidatedStatisticsModel : IFileSystemStatistics, IHealth
 
         /// <inheritdoc/>
         public IProgress<CacheAccessType>? DirectoryIdCache { get; set; }
-
-        /// <inheritdoc/>
-        public IProgress<string>? DirectoryIdNotFound { get; set; }
-
-        /// <inheritdoc/>
-        public IProgress<string>? DirectoryIdInvalid { get; set; }
-
-        /// <inheritdoc/>
-        public IProgress<string>? InvalidPath { get; set; }
     }
 }
diff --git a/src/SecureFolderFS.Core.FileSystem/AppModels/HealthStatistics.cs b/src/SecureFolderFS.Core.FileSystem/AppModels/HealthStatistics.cs
new file mode 100644
index 000000000..d6544006c
--- /dev/null
+++ b/src/SecureFolderFS.Core.FileSystem/AppModels/HealthStatistics.cs
@@ -0,0 +1,29 @@
+using OwlCore.Storage;
+using SecureFolderFS.Shared.ComponentModel;
+using SecureFolderFS.Storage.VirtualFileSystem;
+using System;
+
+namespace SecureFolderFS.Core.FileSystem.AppModels
+{
+    /// <inheritdoc cref="IHealthStatistics"/>
+    public sealed class HealthStatistics : IHealthStatistics
+    {
+        /// <inheritdoc/>
+        public IAsyncValidator<IFile, IResult>? FileValidator { get; set; }
+
+        /// <inheritdoc/>
+        public IAsyncValidator<IFolder, IResult>? FolderValidator { get; set; }
+
+        /// <inheritdoc/>
+        public IAsyncValidator<(IFolder, IProgress<IResult>?), IResult>? StructureValidator { get; set; }
+
+        /// <inheritdoc/>
+        public IProgress<string>? DirectoryIdNotFound { get; set; }
+
+        /// <inheritdoc/>
+        public IProgress<string>? DirectoryIdInvalid { get; set; }
+
+        /// <inheritdoc/>
+        public IProgress<string>? InvalidPath { get; set; }
+    }
+}
diff --git a/src/SecureFolderFS.Core.FileSystem/Chunks/CachingChunkAccess.cs b/src/SecureFolderFS.Core.FileSystem/Chunks/CachingChunkAccess.cs
index b3e9c897d..212782366 100644
--- a/src/SecureFolderFS.Core.FileSystem/Chunks/CachingChunkAccess.cs
+++ b/src/SecureFolderFS.Core.FileSystem/Chunks/CachingChunkAccess.cs
@@ -1,17 +1,27 @@
 using SecureFolderFS.Core.Cryptography.ContentCrypt;
 using SecureFolderFS.Core.FileSystem.Buffers;
-using SecureFolderFS.Core.FileSystem.Statistics;
 using SecureFolderFS.Shared.Enums;
+using SecureFolderFS.Storage.VirtualFileSystem;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 
 namespace SecureFolderFS.Core.FileSystem.Chunks
 {
-    /// <inheritdoc cref="IChunkAccess"/>
+    /// <inheritdoc cref="ChunkAccess"/>
     internal sealed class CachingChunkAccess : ChunkAccess
     {
-        private readonly Dictionary<long, ChunkBuffer> _chunkCache;
+        private readonly OrderedDictionary<long, ChunkBuffer> _chunkCache;
+
+        /// <inheritdoc/>
+        public override bool FlushAvailable
+        {
+            get
+            {
+                lock (_chunkCache)
+                    return _chunkCache.Count > 0;
+            }
+        }
 
         public CachingChunkAccess(ChunkReader chunkReader, ChunkWriter chunkWriter, IContentCrypt contentCrypt, IFileSystemStatistics fileSystemStatistics)
             : base(chunkReader, chunkWriter, contentCrypt, fileSystemStatistics)
@@ -23,16 +33,16 @@ public CachingChunkAccess(ChunkReader chunkReader, ChunkWriter chunkWriter, ICon
         public override int CopyFromChunk(long chunkNumber, Span<byte> destination, int offsetInChunk)
         {
             // Get chunk
-            var cleartextChunk = GetChunk(chunkNumber);
-            if (cleartextChunk is null)
+            var plaintextChunk = GetChunk(chunkNumber);
+            if (plaintextChunk is null)
                 return -1;
 
             // Copy from chunk
-            var count = Math.Min(cleartextChunk.ActualLength - offsetInChunk, destination.Length);
+            var count = Math.Min(plaintextChunk.ActualLength - offsetInChunk, destination.Length);
             if (count < 0)
                 return -1;
 
-            cleartextChunk.Buffer.AsSpan(offsetInChunk, count).CopyTo(destination);
+            plaintextChunk.Buffer.AsSpan(offsetInChunk, count).CopyTo(destination);
 
             return count;
         }
@@ -41,23 +51,23 @@ public override int CopyFromChunk(long chunkNumber, Span<byte> destination, int
         public override int CopyToChunk(long chunkNumber, ReadOnlySpan<byte> source, int offsetInChunk)
         {
             // Get chunk
-            var cleartextChunk = GetChunk(chunkNumber);
-            if (cleartextChunk is null)
+            var plaintextChunk = GetChunk(chunkNumber);
+            if (plaintextChunk is null)
                 return -1;
 
             // Update state of chunk
-            cleartextChunk.WasModified = true;
+            plaintextChunk.WasModified = true;
 
             // Copy to chunk
-            var count = Math.Min(contentCrypt.ChunkCleartextSize - offsetInChunk, source.Length);
+            var count = Math.Min(contentCrypt.ChunkPlaintextSize - offsetInChunk, source.Length);
             if (count < 0)
                 return -1;
 
-            var destination = cleartextChunk.Buffer.AsSpan(offsetInChunk, count);
+            var destination = plaintextChunk.Buffer.AsSpan(offsetInChunk, count);
             source.Slice(0, count).CopyTo(destination);
 
             // Update actual length
-            cleartextChunk.ActualLength = Math.Max(cleartextChunk.ActualLength, count + offsetInChunk);
+            plaintextChunk.ActualLength = Math.Max(plaintextChunk.ActualLength, count + offsetInChunk);
 
             return count;
         }
@@ -66,29 +76,29 @@ public override int CopyToChunk(long chunkNumber, ReadOnlySpan<byte> source, int
         public override void SetChunkLength(long chunkNumber, int length, bool includeCurrentLength = false)
         {
             // Get chunk
-            var cleartextChunk = GetChunk(chunkNumber);
-            if (cleartextChunk is null)
+            var plaintextChunk = GetChunk(chunkNumber);
+            if (plaintextChunk is null)
                 return;
 
             // Add read length of existing chunk data to the full length if specified
-            length += includeCurrentLength ? cleartextChunk.ActualLength : 0;
+            length += includeCurrentLength ? plaintextChunk.ActualLength : 0;
             length = Math.Max(length, 0);
 
             // Determine whether to extend or truncate the chunk
-            if (length < cleartextChunk.ActualLength)
+            if (length < plaintextChunk.ActualLength)
             {
                 // Truncate chunk
-                cleartextChunk.ActualLength = Math.Min(cleartextChunk.ActualLength, length);
+                plaintextChunk.ActualLength = Math.Min(plaintextChunk.ActualLength, length);
             }
-            else if (cleartextChunk.ActualLength < length)
+            else if (plaintextChunk.ActualLength < length)
             {
                 // Extend chunk
-                cleartextChunk.ActualLength = Math.Min(length, contentCrypt.ChunkCleartextSize);
+                plaintextChunk.ActualLength = Math.Min(length, contentCrypt.ChunkPlaintextSize);
             }
             else
                 return; // Ignore resizing the same length
 
-            cleartextChunk.WasModified = true;
+            plaintextChunk.WasModified = true;
         }
 
         /// <inheritdoc/>
@@ -110,21 +120,21 @@ public override void Flush()
         {
             lock (_chunkCache)
             {
-                if (!_chunkCache.TryGetValue(chunkNumber, out var cleartextChunk))
+                if (!_chunkCache.TryGetValue(chunkNumber, out var plaintextChunk))
                 {
                     // Cache miss, update stats
                     fileSystemStatistics.ChunkCache?.Report(CacheAccessType.CacheAccess);
                     fileSystemStatistics.ChunkCache?.Report(CacheAccessType.CacheMiss);
 
                     // Read chunk
-                    var buffer = new byte[contentCrypt.ChunkCleartextSize];
+                    var buffer = new byte[contentCrypt.ChunkPlaintextSize];
                     var read = chunkReader.ReadChunk(chunkNumber, buffer);
                     if (read < 0)
                         return null;
 
-                    // Create cleartext and set it to cache
-                    cleartextChunk = new ChunkBuffer(buffer, read);
-                    SetChunk(chunkNumber, cleartextChunk);
+                    // Create plaintext and set it to cache
+                    plaintextChunk = new ChunkBuffer(buffer, read);
+                    SetChunk(chunkNumber, plaintextChunk);
                 }
                 else
                 {
@@ -133,11 +143,11 @@ public override void Flush()
                     fileSystemStatistics.ChunkCache?.Report(CacheAccessType.CacheHit);
                 }
 
-                return cleartextChunk;
+                return plaintextChunk;
             }
         }
 
-        private void SetChunk(long chunkNumber, ChunkBuffer cleartextChunk)
+        private void SetChunk(long chunkNumber, ChunkBuffer plaintextChunk)
         {
             lock (_chunkCache)
             {
@@ -154,7 +164,7 @@ private void SetChunk(long chunkNumber, ChunkBuffer cleartextChunk)
                     }
                 }
 
-                _chunkCache[chunkNumber] = cleartextChunk;
+                _chunkCache[chunkNumber] = plaintextChunk;
             }
         }
 
diff --git a/src/SecureFolderFS.Core.FileSystem/Chunks/ChunkAccess.cs b/src/SecureFolderFS.Core.FileSystem/Chunks/ChunkAccess.cs
index 576309f81..c35e7a893 100644
--- a/src/SecureFolderFS.Core.FileSystem/Chunks/ChunkAccess.cs
+++ b/src/SecureFolderFS.Core.FileSystem/Chunks/ChunkAccess.cs
@@ -1,5 +1,5 @@
 using SecureFolderFS.Core.Cryptography.ContentCrypt;
-using SecureFolderFS.Core.FileSystem.Statistics;
+using SecureFolderFS.Storage.VirtualFileSystem;
 using System;
 using System.Buffers;
 using System.Security.Cryptography;
@@ -7,7 +7,7 @@
 namespace SecureFolderFS.Core.FileSystem.Chunks
 {
     /// <summary>
-    /// Provides access to cleartext chunks data in individual files.
+    /// Provides access to plaintext chunks data in individual files.
     /// </summary>
     internal class ChunkAccess : IDisposable
     {
@@ -16,6 +16,11 @@ internal class ChunkAccess : IDisposable
         protected readonly IContentCrypt contentCrypt;
         protected readonly IFileSystemStatistics fileSystemStatistics;
 
+        /// <summary>
+        /// Determines whether there are outstanding chunks ready to be flushed to disk.
+        /// </summary>
+        public virtual bool FlushAvailable { get; } = false;
+
         public ChunkAccess(ChunkReader chunkReader, ChunkWriter chunkWriter, IContentCrypt contentCrypt, IFileSystemStatistics fileSystemStatistics)
         {
             this.chunkReader = chunkReader;
@@ -34,14 +39,14 @@ public ChunkAccess(ChunkReader chunkReader, ChunkWriter chunkWriter, IContentCry
         public virtual int CopyFromChunk(long chunkNumber, Span<byte> destination, int offsetInChunk)
         {
             // Rent buffer
-            var cleartextChunk = ArrayPool<byte>.Shared.Rent(contentCrypt.ChunkCleartextSize);
+            var plaintextChunk = ArrayPool<byte>.Shared.Rent(contentCrypt.ChunkPlaintextSize);
             try
             {
                 // ArrayPool may return larger array than requested
-                var realCleartextChunk = cleartextChunk.AsSpan(0, contentCrypt.ChunkCleartextSize);
+                var realPlaintextChunk = plaintextChunk.AsSpan(0, contentCrypt.ChunkPlaintextSize);
 
                 // Read chunk
-                var read = chunkReader.ReadChunk(chunkNumber, realCleartextChunk);
+                var read = chunkReader.ReadChunk(chunkNumber, realPlaintextChunk);
 
                 // Check for any errors
                 if (read < 0)
@@ -52,14 +57,14 @@ public virtual int CopyFromChunk(long chunkNumber, Span<byte> destination, int o
                 if (count <= 0)
                     return 0;
 
-                realCleartextChunk.Slice(offsetInChunk, count).CopyTo(destination);
+                realPlaintextChunk.Slice(offsetInChunk, count).CopyTo(destination);
 
                 return count;
             }
             finally
             {
                 // Return buffer
-                ArrayPool<byte>.Shared.Return(cleartextChunk);
+                ArrayPool<byte>.Shared.Return(plaintextChunk);
             }
         }
 
@@ -73,25 +78,25 @@ public virtual int CopyFromChunk(long chunkNumber, Span<byte> destination, int o
         public virtual int CopyToChunk(long chunkNumber, ReadOnlySpan<byte> source, int offsetInChunk)
         {
             // Rent buffer
-            var cleartextChunk = ArrayPool<byte>.Shared.Rent(contentCrypt.ChunkCleartextSize);
+            var plaintextChunk = ArrayPool<byte>.Shared.Rent(contentCrypt.ChunkPlaintextSize);
             try
             {
                 // ArrayPool may return larger array than requested
-                var realCleartextChunk = cleartextChunk.AsSpan(0, contentCrypt.ChunkCleartextSize);
+                var realPlaintextChunk = plaintextChunk.AsSpan(0, contentCrypt.ChunkPlaintextSize);
 
                 // Read chunk
-                var read = chunkReader.ReadChunk(chunkNumber, realCleartextChunk);
+                var read = chunkReader.ReadChunk(chunkNumber, realPlaintextChunk);
 
                 // Check for any errors
                 if (read < 0)
                     return read;
 
                 // Copy to chunk
-                var count = Math.Min(contentCrypt.ChunkCleartextSize - offsetInChunk, source.Length);
+                var count = Math.Min(contentCrypt.ChunkPlaintextSize - offsetInChunk, source.Length);
                 if (count <= 0)
                     return 0;
 
-                var destination = realCleartextChunk.Slice(offsetInChunk, count);
+                var destination = realPlaintextChunk.Slice(offsetInChunk, count);
                 source.Slice(0, count).CopyTo(destination);
 
                 // Write to chunk
@@ -102,7 +107,7 @@ public virtual int CopyToChunk(long chunkNumber, ReadOnlySpan<byte> source, int
             finally
             {
                 // Return buffer
-                ArrayPool<byte>.Shared.Return(cleartextChunk);
+                ArrayPool<byte>.Shared.Return(plaintextChunk);
             }
         }
 
@@ -115,14 +120,14 @@ public virtual int CopyToChunk(long chunkNumber, ReadOnlySpan<byte> source, int
         public virtual void SetChunkLength(long chunkNumber, int length, bool includeCurrentLength = false)
         {
             // Rent buffer
-            var cleartextChunk = ArrayPool<byte>.Shared.Rent(contentCrypt.ChunkCleartextSize);
+            var plaintextChunk = ArrayPool<byte>.Shared.Rent(contentCrypt.ChunkPlaintextSize);
             try
             {
                 // ArrayPool may return larger array than requested
-                var realCleartextChunk = cleartextChunk.AsSpan(0, contentCrypt.ChunkCleartextSize);
+                var realPlaintextChunk = plaintextChunk.AsSpan(0, contentCrypt.ChunkPlaintextSize);
 
                 // Read chunk
-                var read = chunkReader.ReadChunk(chunkNumber, realCleartextChunk);
+                var read = chunkReader.ReadChunk(chunkNumber, realPlaintextChunk);
 
                 // Check for any errors
                 if (read < 0)
@@ -132,32 +137,32 @@ public virtual void SetChunkLength(long chunkNumber, int length, bool includeCur
                 length += includeCurrentLength ? read : 0;
                 length = Math.Max(length, 0);
 
-                Span<byte> newCleartextChunk;
+                Span<byte> newPlaintextChunk;
 
                 // Determine whether to extend or truncate the chunk
                 if (length < read)
                 {
                     // Truncate chunk
-                    newCleartextChunk = realCleartextChunk.Slice(0, Math.Min(read, length));
+                    newPlaintextChunk = realPlaintextChunk.Slice(0, Math.Min(read, length));
                 }
                 else if (read < length)
                 {
                     // Clear residual data from ArrayPool and append zeros
-                    realCleartextChunk.Slice(read).Clear();
+                    realPlaintextChunk.Slice(read).Clear();
 
                     // Extend chunk
-                    newCleartextChunk = realCleartextChunk.Slice(0, Math.Min(length, contentCrypt.ChunkCleartextSize));
+                    newPlaintextChunk = realPlaintextChunk.Slice(0, Math.Min(length, contentCrypt.ChunkPlaintextSize));
                 }
                 else
                     return; // Ignore resizing the same length
                 
                 // Save newly modified chunk
-                chunkWriter.WriteChunk(chunkNumber, newCleartextChunk);
+                chunkWriter.WriteChunk(chunkNumber, newPlaintextChunk);
             }
             finally
             {
                 // Return buffer
-                ArrayPool<byte>.Shared.Return(cleartextChunk);
+                ArrayPool<byte>.Shared.Return(plaintextChunk);
             }
         }
 
diff --git a/src/SecureFolderFS.Core.FileSystem/Chunks/ChunkReader.cs b/src/SecureFolderFS.Core.FileSystem/Chunks/ChunkReader.cs
index a62806658..7483bd0f3 100644
--- a/src/SecureFolderFS.Core.FileSystem/Chunks/ChunkReader.cs
+++ b/src/SecureFolderFS.Core.FileSystem/Chunks/ChunkReader.cs
@@ -1,9 +1,9 @@
 using SecureFolderFS.Core.Cryptography;
 using SecureFolderFS.Core.FileSystem.Exceptions;
-using SecureFolderFS.Core.FileSystem.Statistics;
 using SecureFolderFS.Core.FileSystem.Streams;
 using SecureFolderFS.Shared.Extensions;
 using SecureFolderFS.Shared.Models;
+using SecureFolderFS.Storage.VirtualFileSystem;
 using System;
 using System.Buffers;
 using System.Diagnostics;
@@ -29,16 +29,16 @@ public ChunkReader(Security security, BufferHolder fileHeader, StreamsManager st
         }
 
         /// <summary>
-        /// Reads chunk at specified <paramref name="chunkNumber"/> into <paramref name="cleartextChunk"/>.
+        /// Reads chunk at specified <paramref name="chunkNumber"/> into <paramref name="plaintextChunk"/>.
         /// </summary>
         /// <param name="chunkNumber">The chunk number to read at.</param>
-        /// <param name="cleartextChunk">The cleartext chunk to write to.</param>
-        /// <returns>The amount of cleartext bytes or -1 if integrity error occurred.</returns>
-        public int ReadChunk(long chunkNumber, Span<byte> cleartextChunk)
+        /// <param name="plaintextChunk">The plaintext chunk to write to.</param>
+        /// <returns>The amount of plaintext bytes or -1 if integrity error occurred.</returns>
+        public int ReadChunk(long chunkNumber, Span<byte> plaintextChunk)
         {
             // Calculate sizes
             var ciphertextSize = _security.ContentCrypt.ChunkCiphertextSize;
-            var cleartextSize = _security.ContentCrypt.ChunkCleartextSize;
+            var plaintextSize = _security.ContentCrypt.ChunkPlaintextSize;
             var ciphertextPosition = _security.HeaderCrypt.HeaderCiphertextSize + (chunkNumber * ciphertextSize);
 
             // Rent buffer
@@ -49,12 +49,16 @@ public int ReadChunk(long chunkNumber, Span<byte> cleartextChunk)
                 var realCiphertextChunk = ciphertextChunk.AsSpan(0, ciphertextSize);
 
                 // Get available read stream or throw
-                var ciphertextFileStream = _streamsManager.GetReadOnlyStream();
-                _ = ciphertextFileStream ?? throw new UnavailableStreamException();
+                var ciphertextStream = _streamsManager.GetReadOnlyStream();
+                _ = ciphertextStream ?? throw new UnavailableStreamException();
+
+                // Check position bounds
+                if (ciphertextPosition > ciphertextStream.Length)
+                    return 0;
 
                 // Read from stream at correct chunk
-                ciphertextFileStream.Position = ciphertextPosition;
-                var read = ciphertextFileStream.Read(realCiphertextChunk);
+                ciphertextStream.Position = ciphertextPosition;
+                var read = ciphertextStream.Read(realCiphertextChunk);
 
                 // Check for end of file
                 if (read == FileSystem.Constants.FILE_EOF)
@@ -69,8 +73,8 @@ public int ReadChunk(long chunkNumber, Span<byte> cleartextChunk)
                 // Check if the reserved part is all zeros in which case the decryption will be skipped (the chunk was extended)
                 if (SpanExtensions.IsAllZeros(chunkReserved))
                 {
-                    cleartextChunk.Clear();
-                    return read - (ciphertextSize - cleartextSize);
+                    plaintextChunk.Clear();
+                    return read - (ciphertextSize - plaintextSize);
                 }
 
                 // Decrypt
@@ -78,7 +82,7 @@ public int ReadChunk(long chunkNumber, Span<byte> cleartextChunk)
                     realCiphertextChunk.Slice(0, read),
                     chunkNumber,
                     _fileHeader,
-                    cleartextChunk);
+                    plaintextChunk);
 
                 _fileSystemStatistics.BytesDecrypted?.Report(read);
 
@@ -89,7 +93,7 @@ public int ReadChunk(long chunkNumber, Span<byte> cleartextChunk)
                     return -1;
                 }
 
-                return read - (ciphertextSize - cleartextSize);
+                return read - (ciphertextSize - plaintextSize);
             }
             finally
             {
diff --git a/src/SecureFolderFS.Core.FileSystem/Chunks/ChunkWriter.cs b/src/SecureFolderFS.Core.FileSystem/Chunks/ChunkWriter.cs
index 2b764186d..d2230bd05 100644
--- a/src/SecureFolderFS.Core.FileSystem/Chunks/ChunkWriter.cs
+++ b/src/SecureFolderFS.Core.FileSystem/Chunks/ChunkWriter.cs
@@ -1,8 +1,8 @@
 using SecureFolderFS.Core.Cryptography;
 using SecureFolderFS.Core.FileSystem.Buffers;
 using SecureFolderFS.Core.FileSystem.Exceptions;
-using SecureFolderFS.Core.FileSystem.Statistics;
 using SecureFolderFS.Core.FileSystem.Streams;
+using SecureFolderFS.Storage.VirtualFileSystem;
 using System;
 using System.Buffers;
 
@@ -27,14 +27,14 @@ public ChunkWriter(Security security, HeaderBuffer fileHeader, StreamsManager st
         }
 
         /// <summary>
-        /// Writes <paramref name="cleartextChunk"/> into chunk at specified <paramref name="chunkNumber"/>.
+        /// Writes <paramref name="plaintextChunk"/> into chunk at specified <paramref name="chunkNumber"/>.
         /// </summary>
         /// <param name="chunkNumber">The chunk number to write to.</param>
-        /// <param name="cleartextChunk">The cleartext chunk to read from.</param>
-        public void WriteChunk(long chunkNumber, ReadOnlySpan<byte> cleartextChunk)
+        /// <param name="plaintextChunk">The plaintext chunk to read from.</param>
+        public void WriteChunk(long chunkNumber, ReadOnlySpan<byte> plaintextChunk)
         {
             // Calculate size of ciphertext
-            var ciphertextSize = Math.Min(cleartextChunk.Length + (_security.ContentCrypt.ChunkCiphertextSize - _security.ContentCrypt.ChunkCleartextSize), _security.ContentCrypt.ChunkCiphertextSize);
+            var ciphertextSize = Math.Min(plaintextChunk.Length + (_security.ContentCrypt.ChunkCiphertextSize - _security.ContentCrypt.ChunkPlaintextSize), _security.ContentCrypt.ChunkCiphertextSize);
 
             // Calculate position in ciphertext stream
             var streamPosition = _security.HeaderCrypt.HeaderCiphertextSize + chunkNumber * _security.ContentCrypt.ChunkCiphertextSize;
@@ -45,20 +45,26 @@ public void WriteChunk(long chunkNumber, ReadOnlySpan<byte> cleartextChunk)
 
             // Encrypt
             _security.ContentCrypt.EncryptChunk(
-                cleartextChunk,
+                plaintextChunk,
                 chunkNumber,
                 _fileHeader,
                 realCiphertextChunk);
 
-            _fileSystemStatistics.BytesEncrypted?.Report(cleartextChunk.Length);
+            _fileSystemStatistics.BytesEncrypted?.Report(plaintextChunk.Length);
 
-            // Get and write to ciphertext stream
+            // Get available read-write stream or throw
             var ciphertextStream = _streamsManager.GetReadWriteStream();
             _ = ciphertextStream ?? throw new UnavailableStreamException();
+
+            // Check position bounds
+            if (streamPosition > ciphertextStream.Length)
+                return;
+            
+            // Write to stream at correct chunk
             ciphertextStream.Position = streamPosition;
             ciphertextStream.Write(realCiphertextChunk);
 
-            _fileSystemStatistics.BytesWritten?.Report(cleartextChunk.Length);
+            _fileSystemStatistics.BytesWritten?.Report(plaintextChunk.Length);
 
             // Return array
             ArrayPool<byte>.Shared.Return(ciphertextChunk);
diff --git a/src/SecureFolderFS.Core.FileSystem/Constants.cs b/src/SecureFolderFS.Core.FileSystem/Constants.cs
index 5b9127f3e..bbc38f46e 100644
--- a/src/SecureFolderFS.Core.FileSystem/Constants.cs
+++ b/src/SecureFolderFS.Core.FileSystem/Constants.cs
@@ -5,23 +5,30 @@ public static class Constants
         public const string LOCAL_FILE_SYSTEM_NAME = "AbstractStorage";
 
         public const string UNC_NAME = "securefolderfs";
-        public const string DIRECTORY_ID_FILENAME = "dirid.iv";
         public const int FILE_EOF = 0;
         public const int DIRECTORY_ID_SIZE = 16;
         public const ulong INVALID_HANDLE = 0UL;
         public const bool OPT_IN_FOR_OPTIONAL_DEBUG_TRACING = true;
 
+        public static class FileSystem
+        {
+            public const string FS_ID = "ABSTRACT_STORAGE";
+            public const string FS_NAME = "Local File System";
+        }
+
         public static class Names
         {
             public const string ENCRYPTED_FILE_EXTENSION = ".sffs";
+            public const string DIRECTORY_ID_FILENAME = "dirid.iv";
+            public const string RECYCLE_BIN_NAME = "recycle_bin.vi";
         }
 
         public static class Caching
         {
             public const int RECOMMENDED_SIZE_CHUNK = 6;
-            public const int RECOMMENDED_SIZE_DIRECTORYID = 1000;
+            public const int RECOMMENDED_SIZE_DIRECTORY_ID = 1000;
             public const int RECOMMENDED_SIZE_CIPHERTEXT_FILENAMES = 2000;
-            public const int RECOMMENDED_SIZE_CLEARTEXT_FILENAMES = 2000;
+            public const int RECOMMENDED_SIZE_Plaintext_FILENAMES = 2000;
         }
     }
 }
diff --git a/src/SecureFolderFS.Core.FileSystem/CryptFiles/OpenCryptFile.cs b/src/SecureFolderFS.Core.FileSystem/CryptFiles/OpenCryptFile.cs
index 3adbd8e9c..ba4bef331 100644
--- a/src/SecureFolderFS.Core.FileSystem/CryptFiles/OpenCryptFile.cs
+++ b/src/SecureFolderFS.Core.FileSystem/CryptFiles/OpenCryptFile.cs
@@ -2,7 +2,6 @@
 using SecureFolderFS.Core.FileSystem.Buffers;
 using SecureFolderFS.Core.FileSystem.Chunks;
 using SecureFolderFS.Core.FileSystem.Streams;
-using SecureFolderFS.Core.Streams;
 using SecureFolderFS.Shared.Extensions;
 using System;
 using System.Collections.Generic;
@@ -45,23 +44,23 @@ public OpenCryptFile(
         }
 
         /// <summary>
-        /// Opens a new <see cref="CleartextStream"/> on top of <paramref name="ciphertextStream"/>.
+        /// Opens a new <see cref="PlaintextStream"/> on top of <paramref name="ciphertextStream"/>.
         /// </summary>
         /// <param name="ciphertextStream">The ciphertext stream to be wrapped by encrypting stream.</param>
-        /// <returns>A new instance of <see cref="CleartextStream"/>.</returns>
-        public CleartextStream OpenStream(Stream ciphertextStream)
+        /// <returns>A new instance of <see cref="PlaintextStream"/>.</returns>
+        public PlaintextStream OpenStream(Stream ciphertextStream)
         {
             // Register ciphertext stream
-            if (_openedStreams.ContainsKey(ciphertextStream))
-                _openedStreams[ciphertextStream]++;
+            if (_openedStreams.TryGetValue(ciphertextStream, out var value))
+                _openedStreams[ciphertextStream] = ++value;
             else
                 _openedStreams.Add(ciphertextStream, 1L);
 
             // Make sure to also add it to streams manager
             _streamsManager.AddStream(ciphertextStream);
             
-            // Open the cleartext stream
-            return new CleartextStream(ciphertextStream, _security, _chunkAccess, _headerBuffer, NotifyClosed);
+            // Open the plaintext stream
+            return new PlaintextStream(ciphertextStream, _security, _chunkAccess, _headerBuffer, NotifyClosed);
         }
 
         private void NotifyClosed(Stream ciphertextStream)
diff --git a/src/SecureFolderFS.Core.FileSystem/CryptFiles/OpenCryptFileManager.cs b/src/SecureFolderFS.Core.FileSystem/CryptFiles/OpenCryptFileManager.cs
index 5301b805a..4882cc5d1 100644
--- a/src/SecureFolderFS.Core.FileSystem/CryptFiles/OpenCryptFileManager.cs
+++ b/src/SecureFolderFS.Core.FileSystem/CryptFiles/OpenCryptFileManager.cs
@@ -1,17 +1,15 @@
 using SecureFolderFS.Core.Cryptography;
 using SecureFolderFS.Core.FileSystem.Buffers;
 using SecureFolderFS.Core.FileSystem.Chunks;
-using SecureFolderFS.Core.FileSystem.CryptFiles;
-using SecureFolderFS.Core.FileSystem.Statistics;
 using SecureFolderFS.Core.FileSystem.Streams;
 using SecureFolderFS.Shared.Extensions;
 using SecureFolderFS.Shared.Models;
+using SecureFolderFS.Storage.VirtualFileSystem;
 using System;
 using System.Collections.Generic;
 
-namespace SecureFolderFS.Core.CryptFiles
+namespace SecureFolderFS.Core.FileSystem.CryptFiles
 {
-    /// <inheritdoc cref="ICryptFileManager"/>
     internal sealed class OpenCryptFileManager : IDisposable
     {
         private readonly Security _security;
@@ -45,7 +43,7 @@ public OpenCryptFileManager(Security security, bool enableChunkCache, IFileSyste
         /// Creates a new instance of <see cref="OpenCryptFile"/>.
         /// </summary>
         /// <param name="id">The unique ID of the file.</param>
-        /// <param name="headerBuffer">The cleartext header of the file.</param>
+        /// <param name="headerBuffer">The plaintext header of the file.</param>
         /// <returns>If successful, returns an instance of <see cref="OpenCryptFile"/>.</returns>
         public OpenCryptFile NewCryptFile(string id, BufferHolder headerBuffer)
         {
diff --git a/src/SecureFolderFS.Core.FileSystem/DataModels/RecycleBinItemDataModel.cs b/src/SecureFolderFS.Core.FileSystem/DataModels/RecycleBinItemDataModel.cs
new file mode 100644
index 000000000..177443441
--- /dev/null
+++ b/src/SecureFolderFS.Core.FileSystem/DataModels/RecycleBinItemDataModel.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Text.Json.Serialization;
+
+namespace SecureFolderFS.Core.FileSystem.DataModels
+{
+    [Serializable]
+    public sealed class RecycleBinItemDataModel
+    {
+        /// <summary>
+        /// Gets the original (relative) ciphertext path of the item before it was deleted.
+        /// </summary>
+        [JsonPropertyName("originalPath")]
+        public required string? OriginalPath { get; init; }
+        
+        /// <summary>
+        /// Gets the <see cref="DateTime"/> timestamp of the deletion.
+        /// </summary>
+        [JsonPropertyName("deletionTimestamp")]
+        public required DateTime? DeletionTimestamp { get; init; }
+    }
+}
diff --git a/src/SecureFolderFS.Core.FileSystem/Directories/DirectoryIdCache.cs b/src/SecureFolderFS.Core.FileSystem/Directories/DirectoryIdCache.cs
index 6c98031cf..4f64dcd5c 100644
--- a/src/SecureFolderFS.Core.FileSystem/Directories/DirectoryIdCache.cs
+++ b/src/SecureFolderFS.Core.FileSystem/Directories/DirectoryIdCache.cs
@@ -1,6 +1,6 @@
-using SecureFolderFS.Core.FileSystem.Statistics;
-using SecureFolderFS.Shared.Enums;
+using SecureFolderFS.Shared.Enums;
 using SecureFolderFS.Shared.Models;
+using SecureFolderFS.Storage.VirtualFileSystem;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -19,7 +19,7 @@ public sealed class DirectoryIdCache
         public DirectoryIdCache(IFileSystemStatistics statistics)
         {
             _statistics = statistics;
-            _cache = new(Constants.Caching.RECOMMENDED_SIZE_DIRECTORYID);
+            _cache = new(Constants.Caching.RECOMMENDED_SIZE_DIRECTORY_ID);
         }
 
         /// <summary>
@@ -68,7 +68,7 @@ public void SetDirectoryId(string ciphertextPath, ReadOnlySpan<byte> directoryId
             lock (_lock)
             {
                 // Remove first item from cache if exceeds size
-                if (_cache.Count >= FileSystem.Constants.Caching.RECOMMENDED_SIZE_DIRECTORYID)
+                if (_cache.Count >= FileSystem.Constants.Caching.RECOMMENDED_SIZE_DIRECTORY_ID)
                     _cache.Remove(_cache.Keys.First());
 
                 // Copy directoryId to cache
diff --git a/src/SecureFolderFS.Core.FileSystem/Enums/FileSystemCloseMethod.cs b/src/SecureFolderFS.Core.FileSystem/Enums/FileSystemCloseMethod.cs
deleted file mode 100644
index 3c4fc4af4..000000000
--- a/src/SecureFolderFS.Core.FileSystem/Enums/FileSystemCloseMethod.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-namespace SecureFolderFS.Core.FileSystem.Enums
-{
-    // TODO: Needs docs
-    public enum FileSystemCloseMethod : byte
-    {
-        /// <summary>
-        /// Closes the file system if possible; otherwise fails.
-        /// </summary>
-        CloseIfPossible = 0,
-
-        /// <summary>
-        /// Tries to close the file system waiting for all processes to finish execution.
-        /// </summary>
-        CloseGracefully = 2,
-
-        /// <summary>
-        /// Forcefully closes the file system regardless of its state.
-        /// </summary>
-        CloseForcefully = 4
-    }
-}
diff --git a/src/SecureFolderFS.Core.FileSystem/Exceptions/FileSystemExceptions.cs b/src/SecureFolderFS.Core.FileSystem/Exceptions/FileSystemExceptions.cs
new file mode 100644
index 000000000..96f351287
--- /dev/null
+++ b/src/SecureFolderFS.Core.FileSystem/Exceptions/FileSystemExceptions.cs
@@ -0,0 +1,13 @@
+using System;
+
+namespace SecureFolderFS.Core.FileSystem.Exceptions
+{
+    public static class FileSystemExceptions
+    {
+        public static Exception FileSystemReadOnly { get; } = new UnauthorizedAccessException("The file system is read-only.");
+
+        public static Exception StreamReadOnly { get; } = new NotSupportedException("The Stream instance is read-only.");
+        
+        public static Exception StreamNotSeekable { get; } = new NotSupportedException("Seek is not supported for this stream.");
+    }
+}
diff --git a/src/SecureFolderFS.Core.FileSystem/Extensions/FileSystemOptionsExtensions.cs b/src/SecureFolderFS.Core.FileSystem/Extensions/FileSystemOptionsExtensions.cs
new file mode 100644
index 000000000..988073ea9
--- /dev/null
+++ b/src/SecureFolderFS.Core.FileSystem/Extensions/FileSystemOptionsExtensions.cs
@@ -0,0 +1,16 @@
+using SecureFolderFS.Core.FileSystem.Validators;
+using SecureFolderFS.Storage.VirtualFileSystem;
+
+namespace SecureFolderFS.Core.FileSystem.Extensions
+{
+    public static class FileSystemOptionsExtensions
+    {
+        public static void SetupValidators<TOptions>(this TOptions fileSystemOptions, FileSystemSpecifics specifics)
+            where TOptions : FileSystemOptions
+        {
+            fileSystemOptions.HealthStatistics.FileValidator ??= new FileValidator(specifics);
+            fileSystemOptions.HealthStatistics.FolderValidator ??= new FolderValidator(specifics);
+            fileSystemOptions.HealthStatistics.StructureValidator ??= new StructureValidator(specifics, fileSystemOptions.HealthStatistics.FileValidator, fileSystemOptions.HealthStatistics.FolderValidator);
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Core.FileSystem/Extensions/StreamingExtensions.cs b/src/SecureFolderFS.Core.FileSystem/Extensions/StreamingExtensions.cs
new file mode 100644
index 000000000..ff0a6c3db
--- /dev/null
+++ b/src/SecureFolderFS.Core.FileSystem/Extensions/StreamingExtensions.cs
@@ -0,0 +1,27 @@
+using SecureFolderFS.Core.FileSystem.Streams;
+using System;
+using System.IO;
+
+namespace SecureFolderFS.Core.FileSystem.Extensions
+{
+    public static class StreamingExtensions
+    {
+        /// <inheritdoc cref="StreamsAccess.OpenPlaintextStream"/>
+        public static Stream? TryOpenPlaintextStream(this StreamsAccess streamsAccess, string id, Stream ciphertextStream, bool takeFailureOwnership = true)
+        {
+            try
+            {
+                return streamsAccess.OpenPlaintextStream(id, ciphertextStream, takeFailureOwnership);
+            }
+            catch (Exception)
+            {
+                return null;
+            }
+        }
+
+        public static bool IsWriteFlag(this FileMode mode)
+        {
+            return mode is FileMode.Create or FileMode.CreateNew or FileMode.Append or FileMode.Truncate;
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Core.FileSystem/FileNames/CachingFileNameAccess.cs b/src/SecureFolderFS.Core.FileSystem/FileNames/CachingFileNameAccess.cs
index fec606576..320333bc2 100644
--- a/src/SecureFolderFS.Core.FileSystem/FileNames/CachingFileNameAccess.cs
+++ b/src/SecureFolderFS.Core.FileSystem/FileNames/CachingFileNameAccess.cs
@@ -1,6 +1,6 @@
 using SecureFolderFS.Core.Cryptography;
-using SecureFolderFS.Core.FileSystem.Statistics;
 using SecureFolderFS.Shared.Enums;
+using SecureFolderFS.Storage.VirtualFileSystem;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -10,68 +10,68 @@ namespace SecureFolderFS.Core.FileSystem.FileNames
     /// <inheritdoc cref="FileNameAccess"/>
     internal sealed class CachingFileNameAccess : FileNameAccess
     {
-        private readonly Dictionary<NameWithDirectoryId, string> _cleartextNames;
+        private readonly Dictionary<NameWithDirectoryId, string> _PlaintextNames;
         private readonly Dictionary<NameWithDirectoryId, string> _ciphertextNames;
 
         public CachingFileNameAccess(Security security, IFileSystemStatistics fileSystemStatistics)
             : base(security, fileSystemStatistics)
         {
-            _cleartextNames = new(FileSystem.Constants.Caching.RECOMMENDED_SIZE_CLEARTEXT_FILENAMES);
+            _PlaintextNames = new(FileSystem.Constants.Caching.RECOMMENDED_SIZE_Plaintext_FILENAMES);
             _ciphertextNames = new(FileSystem.Constants.Caching.RECOMMENDED_SIZE_CIPHERTEXT_FILENAMES);
         }
 
         /// <inheritdoc/>
-        public override string GetCleartextName(ReadOnlySpan<char> ciphertextName, ReadOnlySpan<byte> directoryId)
+        public override string GetPlaintextName(ReadOnlySpan<char> ciphertextName, ReadOnlySpan<byte> directoryId)
         {
-            string cleartextName;
+            string plaintextName;
             string stringCiphertext = ciphertextName.ToString();
 
-            lock (_cleartextNames)
+            lock (_PlaintextNames)
             {
-                if (!_cleartextNames.TryGetValue(new(directoryId.ToArray(), stringCiphertext), out cleartextName!))
+                if (!_PlaintextNames.TryGetValue(new(directoryId.ToArray(), stringCiphertext), out plaintextName!))
                 {
                     // Not found in cache
                     statistics.FileNameCache?.Report(CacheAccessType.CacheMiss);
 
-                    // Get new cleartext name
-                    var newCleartextName = base.GetCleartextName(ciphertextName, directoryId);
-                    if (newCleartextName == string.Empty)
+                    // Get new plaintext name
+                    var newPlaintextName = base.GetPlaintextName(ciphertextName, directoryId);
+                    if (newPlaintextName == string.Empty)
                         return string.Empty;
 
                     // Update cache
-                    SetCleartextName(newCleartextName, stringCiphertext, directoryId);
+                    SetPlaintextName(newPlaintextName, stringCiphertext, directoryId);
 
-                    return newCleartextName;
+                    return newPlaintextName;
                 }
             }
 
             statistics.FileNameCache?.Report(CacheAccessType.CacheAccess);
             statistics.FileNameCache?.Report(CacheAccessType.CacheHit);
 
-            // Return existing cleartext name
-            return cleartextName;
+            // Return existing plaintext name
+            return plaintextName;
         }
 
         /// <inheritdoc/>
-        public override string GetCiphertextName(ReadOnlySpan<char> cleartextName, ReadOnlySpan<byte> directoryId)
+        public override string GetCiphertextName(ReadOnlySpan<char> plaintextName, ReadOnlySpan<byte> directoryId)
         {
             string ciphertextName;
-            string stringCleartext = cleartextName.ToString();
+            string stringPlaintext = plaintextName.ToString();
 
             lock (_ciphertextNames)
             {
-                if (!_ciphertextNames.TryGetValue(new(directoryId.ToArray(), stringCleartext), out ciphertextName!))
+                if (!_ciphertextNames.TryGetValue(new(directoryId.ToArray(), stringPlaintext), out ciphertextName!))
                 {
                     // Not found in cache
                     statistics.FileNameCache?.Report(CacheAccessType.CacheMiss);
 
                     // Get new ciphertext name
-                    var newCiphertextName = base.GetCiphertextName(cleartextName, directoryId);
+                    var newCiphertextName = base.GetCiphertextName(plaintextName, directoryId);
                     if (newCiphertextName == string.Empty)
                         return string.Empty;
 
                     // Update cache
-                    SetCiphertextName(newCiphertextName, stringCleartext, directoryId);
+                    SetCiphertextName(newCiphertextName, stringPlaintext, directoryId);
 
                     return newCiphertextName;
                 }
@@ -84,20 +84,20 @@ public override string GetCiphertextName(ReadOnlySpan<char> cleartextName, ReadO
             return ciphertextName;
         }
 
-        private void SetCleartextName(string cleartextName, string ciphertextName, ReadOnlySpan<byte> directoryId)
+        private void SetPlaintextName(string plaintextName, string ciphertextName, ReadOnlySpan<byte> directoryId)
         {
-            if (_cleartextNames.Count >= FileSystem.Constants.Caching.RECOMMENDED_SIZE_CLEARTEXT_FILENAMES)
-                _cleartextNames.Remove(_cleartextNames.Keys.First(), out _);
+            if (_PlaintextNames.Count >= FileSystem.Constants.Caching.RECOMMENDED_SIZE_Plaintext_FILENAMES)
+                _PlaintextNames.Remove(_PlaintextNames.Keys.First(), out _);
 
-            _cleartextNames[new(directoryId.ToArray(), ciphertextName)] = cleartextName;
+            _PlaintextNames[new(directoryId.ToArray(), ciphertextName)] = plaintextName;
         }
 
-        private void SetCiphertextName(string ciphertextName, string cleartextName, ReadOnlySpan<byte> directoryId)
+        private void SetCiphertextName(string ciphertextName, string plaintextName, ReadOnlySpan<byte> directoryId)
         {
             if (_ciphertextNames.Count >= FileSystem.Constants.Caching.RECOMMENDED_SIZE_CIPHERTEXT_FILENAMES)
                 _ciphertextNames.Remove(_ciphertextNames.Keys.First(), out _);
 
-            _ciphertextNames[new(directoryId.ToArray(), cleartextName)] = ciphertextName;
+            _ciphertextNames[new(directoryId.ToArray(), plaintextName)] = ciphertextName;
         }
     }
 }
diff --git a/src/SecureFolderFS.Core.FileSystem/FileNames/FileNameAccess.cs b/src/SecureFolderFS.Core.FileSystem/FileNames/FileNameAccess.cs
index af910bc1c..a270e28b5 100644
--- a/src/SecureFolderFS.Core.FileSystem/FileNames/FileNameAccess.cs
+++ b/src/SecureFolderFS.Core.FileSystem/FileNames/FileNameAccess.cs
@@ -1,13 +1,13 @@
 using SecureFolderFS.Core.Cryptography;
-using SecureFolderFS.Core.FileSystem.Statistics;
 using SecureFolderFS.Shared.Enums;
+using SecureFolderFS.Storage.VirtualFileSystem;
 using System;
 using System.IO;
 
 namespace SecureFolderFS.Core.FileSystem.FileNames
 {
     /// <summary>
-    /// Accesses cleartext and ciphertext names of files and folders found on the encrypting file system.
+    /// Accesses plaintext and ciphertext names of files and folders found on the encrypting file system.
     /// </summary>
     internal class FileNameAccess
     {
@@ -21,12 +21,12 @@ public FileNameAccess(Security security, IFileSystemStatistics statistics)
         }
 
         /// <summary>
-        /// Gets cleartext name from associated <paramref name="ciphertextName"/>.
+        /// Gets plaintext name from associated <paramref name="ciphertextName"/>.
         /// </summary>
         /// <param name="ciphertextName">The associated ciphertext name.</param>
         /// <param name="directoryId">The ID of a directory where the item is stored.</param>
-        /// <returns>If successful, returns a cleartext representation of the name; otherwise empty.</returns>
-        public virtual string GetCleartextName(ReadOnlySpan<char> ciphertextName, ReadOnlySpan<byte> directoryId)
+        /// <returns>If successful, returns a plaintext representation of the name; otherwise empty.</returns>
+        public virtual string GetPlaintextName(ReadOnlySpan<char> ciphertextName, ReadOnlySpan<byte> directoryId)
         {
             statistics.FileNameCache?.Report(CacheAccessType.CacheAccess);
 
@@ -34,24 +34,24 @@ public virtual string GetCleartextName(ReadOnlySpan<char> ciphertextName, ReadOn
             if (nameWithoutExt.IsEmpty)
                 return string.Empty;
 
-            var cleartextName = security.NameCrypt!.DecryptName(nameWithoutExt, directoryId);
-            if (cleartextName is null)
+            var plaintextName = security.NameCrypt!.DecryptName(nameWithoutExt, directoryId);
+            if (plaintextName is null)
                 return string.Empty;
 
-            return cleartextName;
+            return plaintextName;
         }
 
         /// <summary>
-        /// Gets ciphertext name from associated <paramref name="cleartextName"/>.
+        /// Gets ciphertext name from associated <paramref name="plaintextName"/>.
         /// </summary>
-        /// <param name="cleartextName">The associated cleartext name.</param>
+        /// <param name="plaintextName">The associated plaintext name.</param>
         /// <param name="directoryId">The ID of a directory where the item is stored.</param>
         /// <returns>If successful, returns a ciphertext representation of the name; otherwise empty.</returns>
-        public virtual string GetCiphertextName(ReadOnlySpan<char> cleartextName, ReadOnlySpan<byte> directoryId)
+        public virtual string GetCiphertextName(ReadOnlySpan<char> plaintextName, ReadOnlySpan<byte> directoryId)
         {
             statistics.FileNameCache?.Report(CacheAccessType.CacheAccess);
 
-            var ciphertextName = security.NameCrypt!.EncryptName(cleartextName, directoryId);
+            var ciphertextName = security.NameCrypt!.EncryptName(plaintextName, directoryId);
             return Path.ChangeExtension(ciphertextName, Constants.Names.ENCRYPTED_FILE_EXTENSION);
         }
     }
diff --git a/src/SecureFolderFS.Core.FileSystem/FileSystemSpecifics.cs b/src/SecureFolderFS.Core.FileSystem/FileSystemSpecifics.cs
index 6b61e72f3..9e1f5fd0e 100644
--- a/src/SecureFolderFS.Core.FileSystem/FileSystemSpecifics.cs
+++ b/src/SecureFolderFS.Core.FileSystem/FileSystemSpecifics.cs
@@ -1,10 +1,10 @@
-using System;
-using OwlCore.Storage;
+using OwlCore.Storage;
 using SecureFolderFS.Core.Cryptography;
-using SecureFolderFS.Core.FileSystem.AppModels;
 using SecureFolderFS.Core.FileSystem.FileNames;
 using SecureFolderFS.Core.FileSystem.Streams;
 using SecureFolderFS.Shared.Models;
+using SecureFolderFS.Storage.VirtualFileSystem;
+using System;
 
 namespace SecureFolderFS.Core.FileSystem
 {
@@ -19,7 +19,7 @@ public sealed class FileSystemSpecifics : IDisposable
 
         public required StreamsAccess StreamsAccess { get; init; }
 
-        public required FileSystemOptions FileSystemOptions { get; init; }
+        public required FileSystemOptions Options { get; init; }
 
         public required UniversalCache<string, BufferHolder> DirectoryIdCache { get; init; }
         
@@ -46,15 +46,15 @@ public static FileSystemSpecifics CreateNew(Security security, IFolder contentFo
             return new()
             {
                 ContentFolder = contentFolder,
-                PlaintextFileNameCache = options.EnableFileNameCache
-                    ? new(FileSystem.Constants.Caching.RECOMMENDED_SIZE_CLEARTEXT_FILENAMES, options.FileSystemStatistics.FileNameCache)
+                PlaintextFileNameCache = options.IsCachingFileNames
+                    ? new(FileSystem.Constants.Caching.RECOMMENDED_SIZE_Plaintext_FILENAMES, options.FileSystemStatistics.FileNameCache)
                     : new(false, options.FileSystemStatistics.FileNameCache),
-                CiphertextFileNameCache = options.EnableFileNameCache
+                CiphertextFileNameCache = options.IsCachingFileNames
                     ? new(FileSystem.Constants.Caching.RECOMMENDED_SIZE_CIPHERTEXT_FILENAMES, options.FileSystemStatistics.FileNameCache)
                     : new(false, options.FileSystemStatistics.FileNameCache),
                 DirectoryIdCache = new(true, options.FileSystemStatistics.DirectoryIdCache),
-                FileSystemOptions = options,
-                StreamsAccess = StreamsAccess.CreateNew(security, options.EnableChunkCache, options.FileSystemStatistics),
+                Options = options,
+                StreamsAccess = StreamsAccess.CreateNew(security, options.IsCachingChunks, options.FileSystemStatistics),
                 Security = security
             };
         }
diff --git a/src/SecureFolderFS.Core.FileSystem/Helpers/Health/HealthHelpers.Directory.cs b/src/SecureFolderFS.Core.FileSystem/Helpers/Health/HealthHelpers.Directory.cs
new file mode 100644
index 000000000..38c14eefa
--- /dev/null
+++ b/src/SecureFolderFS.Core.FileSystem/Helpers/Health/HealthHelpers.Directory.cs
@@ -0,0 +1,57 @@
+using OwlCore.Storage;
+using SecureFolderFS.Core.Cryptography;
+using SecureFolderFS.Shared.ComponentModel;
+using SecureFolderFS.Shared.Models;
+using SecureFolderFS.Storage.Extensions;
+using SecureFolderFS.Storage.Renamable;
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using SecureFolderFS.Core.FileSystem.Helpers.Paths;
+
+namespace SecureFolderFS.Core.FileSystem.Helpers.Health
+{
+    public static partial class HealthHelpers
+    {
+        public static async Task<IResult> RepairDirectoryAsync(IFolder affected, Security security, CancellationToken cancellationToken)
+        {
+            // Return success, if no encryption is used
+            if (security.NameCrypt is null)
+                return Result.Success;
+
+            if (affected is not IRenamableFolder renamableFolder)
+                return Result.Failure(FolderNotRenamable);
+
+            try
+            {
+                // Overwrite existing DirectoryID
+                var directoryIdFile = await renamableFolder.CreateFileAsync(Constants.Names.DIRECTORY_ID_FILENAME, true, cancellationToken);
+                await using var directoryIdStream = await directoryIdFile.OpenStreamAsync(FileAccess.ReadWrite, FileShare.Read, cancellationToken);
+
+                var directoryId = Guid.NewGuid().ToByteArray();
+                await directoryIdStream.WriteAsync(directoryId, cancellationToken);
+
+                // Encrypt child item names
+                await foreach (var item in affected.GetItemsAsync(StorableType.All, cancellationToken))
+                {
+                    if (PathHelpers.IsCoreName(item.Name))
+                        continue;
+
+                    // Encrypt new name
+                    var encryptedName = security.NameCrypt.EncryptName(item.Name, directoryId);
+                    encryptedName = $"{encryptedName}{Constants.Names.ENCRYPTED_FILE_EXTENSION}";
+
+                    // Rename
+                    _ = await renamableFolder.RenameAsync(item, encryptedName, cancellationToken);
+                }
+
+                return Result.Success;
+            }
+            catch (Exception ex)
+            {
+                return Result.Failure(ex);
+            }
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Core.FileSystem/Helpers/Health/HealthHelpers.Name.cs b/src/SecureFolderFS.Core.FileSystem/Helpers/Health/HealthHelpers.Name.cs
new file mode 100644
index 000000000..25611670f
--- /dev/null
+++ b/src/SecureFolderFS.Core.FileSystem/Helpers/Health/HealthHelpers.Name.cs
@@ -0,0 +1,66 @@
+using OwlCore.Storage;
+using SecureFolderFS.Core.Cryptography;
+using SecureFolderFS.Shared.ComponentModel;
+using SecureFolderFS.Shared.Models;
+using SecureFolderFS.Storage.Extensions;
+using SecureFolderFS.Storage.Renamable;
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace SecureFolderFS.Core.FileSystem.Helpers.Health
+{
+    public static partial class HealthHelpers
+    {
+        public static async Task<IResult> RepairNameAsync(IStorableChild affected, FileSystemSpecifics specifics, string newName, CancellationToken cancellationToken)
+        {
+            return await RepairNameAsync(affected, specifics.Security, specifics.ContentFolder, newName, cancellationToken);
+
+            // TODO: Update caches in FileSystemSpecifics
+        }
+
+        public static async Task<IResult> RepairNameAsync(IStorableChild affected, Security security, IFolder contentFolder, string newName, CancellationToken cancellationToken)
+        {
+            // Return success, if no encryption is used
+            if (security.NameCrypt is null)
+                return Result.Success;
+
+            try
+            {
+                // Get Directory ID
+                var parentFolder = await affected.GetParentAsync(cancellationToken);
+                if (parentFolder is not IRenamableFolder renamableFolder)
+                    return Result.Failure(FolderNotRenamable);
+
+                byte[] directoryId;
+                if (parentFolder.Id != contentFolder.Id) // TODO: Remove code duplication with AbstractPathHelpers
+                {
+                    var directoryIdFile = await parentFolder.GetFileByNameAsync(Constants.Names.DIRECTORY_ID_FILENAME, cancellationToken);
+                    await using var directoryIdStream = await directoryIdFile.OpenStreamAsync(FileAccess.Read, FileShare.Read, cancellationToken);
+
+                    directoryId = new byte[Constants.DIRECTORY_ID_SIZE];
+                    var read = await directoryIdStream.ReadAsync(directoryId, cancellationToken);
+
+                    if (read < Constants.DIRECTORY_ID_SIZE)
+                        throw new IOException($"The data inside Directory ID file is of incorrect size: {read}.");
+                }
+                else
+                    directoryId = Array.Empty<byte>();
+
+                // Encrypt new name
+                var encryptedName = security.NameCrypt.EncryptName(newName, directoryId);
+                encryptedName = $"{encryptedName}{Constants.Names.ENCRYPTED_FILE_EXTENSION}";
+
+                // Rename
+                _ = await renamableFolder.RenameAsync(affected, encryptedName, cancellationToken);
+            }
+            catch (Exception ex)
+            {
+                return Result.Failure(ex);
+            }
+
+            return Result.Success;
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Core.FileSystem/Helpers/Health/HealthHelpers.Shared.cs b/src/SecureFolderFS.Core.FileSystem/Helpers/Health/HealthHelpers.Shared.cs
new file mode 100644
index 000000000..c621debae
--- /dev/null
+++ b/src/SecureFolderFS.Core.FileSystem/Helpers/Health/HealthHelpers.Shared.cs
@@ -0,0 +1,10 @@
+using SecureFolderFS.Storage.Renamable;
+using System;
+
+namespace SecureFolderFS.Core.FileSystem.Helpers.Health
+{
+    public static partial class HealthHelpers
+    {
+        private static Exception FolderNotRenamable { get; } = new InvalidOperationException($"Folder is not of type {nameof(IRenamableFolder)}.");
+    }
+}
diff --git a/src/SecureFolderFS.Core.FileSystem/Helpers/Abstract/AbstractPathHelpers.Cipher.cs b/src/SecureFolderFS.Core.FileSystem/Helpers/Paths/Abstract/AbstractPathHelpers.Cipher.cs
similarity index 73%
rename from src/SecureFolderFS.Core.FileSystem/Helpers/Abstract/AbstractPathHelpers.Cipher.cs
rename to src/SecureFolderFS.Core.FileSystem/Helpers/Paths/Abstract/AbstractPathHelpers.Cipher.cs
index cc3443771..eeb305a3f 100644
--- a/src/SecureFolderFS.Core.FileSystem/Helpers/Abstract/AbstractPathHelpers.Cipher.cs
+++ b/src/SecureFolderFS.Core.FileSystem/Helpers/Paths/Abstract/AbstractPathHelpers.Cipher.cs
@@ -1,33 +1,34 @@
 using OwlCore.Storage;
 using SecureFolderFS.Shared.ComponentModel;
+using SecureFolderFS.Shared.Models;
 using SecureFolderFS.Storage.Extensions;
 using System;
 using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 
-namespace SecureFolderFS.Core.FileSystem.Helpers.Abstract
+namespace SecureFolderFS.Core.FileSystem.Helpers.Paths.Abstract
 {
     /// <summary>
     /// A set of file system path management helpers that work on any platform including constrained environments with limited file system access.
     /// </summary>
     public static partial class AbstractPathHelpers
     {
-        public static async Task<string?> GetCiphertextPathAsync(IStorableChild plaintextStorable, FileSystemSpecifics specifics)
+        public static async Task<string?> GetCiphertextPathAsync(IStorableChild plaintextStorable, FileSystemSpecifics specifics, CancellationToken cancellationToken)
         {
             if (specifics.Security.NameCrypt is null)
                 return plaintextStorable.Id;
 
-            IChildFolder? currentParent;
             var currentStorable = plaintextStorable;
             var expendableDirectoryId = new byte[Constants.DIRECTORY_ID_SIZE];
             var finalPath = string.Empty;
 
-            while ((currentParent = await currentStorable.GetParentAsync() as IChildFolder) is not null)
+            while (await currentStorable.GetParentAsync(cancellationToken).ConfigureAwait(false) is IChildFolder currentParent)
             {
                 if (currentParent is not IWrapper<IFolder> { Inner: { } ciphertextParent })
                     return null;
 
-                var result = await GetDirectoryIdAsync(ciphertextParent, specifics, expendableDirectoryId);
+                var result = await GetDirectoryIdAsync(ciphertextParent, specifics, expendableDirectoryId, cancellationToken).ConfigureAwait(false);
                 var ciphertextName = specifics.Security.NameCrypt.EncryptName(currentStorable.Name, result ? expendableDirectoryId : ReadOnlySpan<byte>.Empty);
 
                 finalPath = Path.Combine($"{ciphertextName}{Constants.Names.ENCRYPTED_FILE_EXTENSION}", finalPath);
@@ -37,22 +38,21 @@ public static partial class AbstractPathHelpers
             return Path.Combine(specifics.ContentFolder.Id, finalPath);
         }
 
-        public static async Task<string?> GetPlaintextPathAsync(IStorableChild ciphertextStorable, FileSystemSpecifics specifics)
+        public static async Task<string?> GetPlaintextPathAsync(IStorableChild ciphertextStorable, FileSystemSpecifics specifics, CancellationToken cancellationToken)
         {
             if (specifics.Security.NameCrypt is null)
                 return ciphertextStorable.Id;
 
-            IChildFolder? currentParent;
             var currentStorable = ciphertextStorable;
             var expendableDirectoryId = new byte[Constants.DIRECTORY_ID_SIZE];
             var finalPath = string.Empty;
 
-            while ((currentParent = await currentStorable.GetParentAsync() as IChildFolder) is not null)
+            while (await currentStorable.GetParentAsync(cancellationToken).ConfigureAwait(false) is IChildFolder currentParent)
             {
                 if (!currentParent.Id.Contains(specifics.ContentFolder.Id))
                     break;
 
-                var result = await GetDirectoryIdAsync(currentParent, specifics, expendableDirectoryId);
+                var result = await GetDirectoryIdAsync(currentParent, specifics, expendableDirectoryId, cancellationToken).ConfigureAwait(false);
                 var plaintextName = specifics.Security.NameCrypt.DecryptName(Path.GetFileNameWithoutExtension(currentStorable.Name), result ? expendableDirectoryId : ReadOnlySpan<byte>.Empty);
                 if (plaintextName is null)
                     return null;
@@ -64,30 +64,34 @@ public static partial class AbstractPathHelpers
             return finalPath;
         }
 
-        public static async Task<bool> GetDirectoryIdAsync(IFolder folderOfDirectoryId, FileSystemSpecifics specifics, Memory<byte> directoryId)
+        public static async Task<bool> GetDirectoryIdAsync(IFolder folderOfDirectoryId, FileSystemSpecifics specifics, Memory<byte> directoryId, CancellationToken cancellationToken)
         {
             if (folderOfDirectoryId.Id == specifics.ContentFolder.Id)
                 return false;
 
-            var cachedId = specifics.DirectoryIdCache.CacheGet(folderOfDirectoryId.Id);
-            if (cachedId is not null)
+            BufferHolder? cachedId;
+            if (specifics.DirectoryIdCache.IsAvailable)
             {
-                cachedId.Buffer.CopyTo(directoryId);
-                return true;
+                cachedId = specifics.DirectoryIdCache.CacheGet(folderOfDirectoryId.Id);
+                if (cachedId is not null)
+                {
+                    cachedId.Buffer.CopyTo(directoryId);
+                    return true;
+                }
             }
 
-            var directoryIdFile = await folderOfDirectoryId.GetFileByNameAsync(Constants.DIRECTORY_ID_FILENAME);
-            await using var directoryIdStream = await directoryIdFile.OpenReadAsync();
+            var directoryIdFile = await folderOfDirectoryId.GetFileByNameAsync(Constants.Names.DIRECTORY_ID_FILENAME, cancellationToken).ConfigureAwait(false);
+            await using var directoryIdStream = await directoryIdFile.OpenStreamAsync(FileAccess.Read, FileShare.Read, cancellationToken).ConfigureAwait(false);
             
             int read;
             if (specifics.DirectoryIdCache.IsAvailable)
             {
                 cachedId = new(Constants.DIRECTORY_ID_SIZE);
-                read = await directoryIdStream.ReadAsync(cachedId.Buffer);
+                read = await directoryIdStream.ReadAsync(cachedId.Buffer, cancellationToken).ConfigureAwait(false);
                 specifics.DirectoryIdCache.CacheSet(folderOfDirectoryId.Id, cachedId);
             }
             else
-                read = await directoryIdStream.ReadAsync(directoryId);
+                read = await directoryIdStream.ReadAsync(directoryId, cancellationToken).ConfigureAwait(false);
             
             if (read < Constants.DIRECTORY_ID_SIZE)
                 throw new IOException($"The data inside Directory ID file is of incorrect size: {read}.");
diff --git a/src/SecureFolderFS.Core.FileSystem/Helpers/Abstract/AbstractPathHelpers.Shared.cs b/src/SecureFolderFS.Core.FileSystem/Helpers/Paths/Abstract/AbstractPathHelpers.Shared.cs
similarity index 66%
rename from src/SecureFolderFS.Core.FileSystem/Helpers/Abstract/AbstractPathHelpers.Shared.cs
rename to src/SecureFolderFS.Core.FileSystem/Helpers/Paths/Abstract/AbstractPathHelpers.Shared.cs
index 33e6fa58c..1b5a2e99e 100644
--- a/src/SecureFolderFS.Core.FileSystem/Helpers/Abstract/AbstractPathHelpers.Shared.cs
+++ b/src/SecureFolderFS.Core.FileSystem/Helpers/Paths/Abstract/AbstractPathHelpers.Shared.cs
@@ -1,16 +1,17 @@
-using System;
+using SecureFolderFS.Core.Cryptography;
+using System;
 using System.IO;
 
-namespace SecureFolderFS.Core.FileSystem.Helpers.Abstract
+namespace SecureFolderFS.Core.FileSystem.Helpers.Paths.Abstract
 {
     /// <summary>
     /// A set of file system path management helpers that work on any platform including constrained environments with limited file system access.
     /// </summary>
     public static partial class AbstractPathHelpers
     {
-        public static byte[] AllocateDirectoryId(FileSystemSpecifics specifics, string? path = null)
+        public static byte[] AllocateDirectoryId(Security security, string? path = null)
         {
-            if (specifics.Security.NameCrypt is null)
+            if (security.NameCrypt is null)
                 return Array.Empty<byte>();
 
             if (path == Path.DirectorySeparatorChar.ToString())
diff --git a/src/SecureFolderFS.Core.FileSystem/Helpers/Native/NativePathHelpers.Cipher.cs b/src/SecureFolderFS.Core.FileSystem/Helpers/Paths/Native/NativePathHelpers.Cipher.cs
similarity index 81%
rename from src/SecureFolderFS.Core.FileSystem/Helpers/Native/NativePathHelpers.Cipher.cs
rename to src/SecureFolderFS.Core.FileSystem/Helpers/Paths/Native/NativePathHelpers.Cipher.cs
index 5c8e6937f..2a3aa1983 100644
--- a/src/SecureFolderFS.Core.FileSystem/Helpers/Native/NativePathHelpers.Cipher.cs
+++ b/src/SecureFolderFS.Core.FileSystem/Helpers/Paths/Native/NativePathHelpers.Cipher.cs
@@ -1,13 +1,37 @@
 using System;
 using System.IO;
 
-namespace SecureFolderFS.Core.FileSystem.Helpers.Native
+namespace SecureFolderFS.Core.FileSystem.Helpers.Paths.Native
 {
     /// <summary>
     /// A set of file system path management helpers that only work in a native environment with unlimited file system access.
     /// </summary>
     public static partial class NativePathHelpers
     {
+        /// <summary>
+        /// Encrypts and gets the ciphertext path from provided <paramref name="plaintextRelativePath"/>.
+        /// </summary>
+        /// <param name="plaintextRelativePath">The relative plaintext path to an item.</param>
+        /// <param name="specifics">The specifics.</param>
+        /// <returns>A full ciphertext path.</returns>
+        public static string GetCiphertextPath(string plaintextRelativePath, FileSystemSpecifics specifics)
+        {
+            var directoryId = new byte[FileSystem.Constants.DIRECTORY_ID_SIZE];
+            return GetCiphertextPath(plaintextRelativePath, specifics, directoryId);
+        }
+
+        /// <summary>
+        /// Decrypts and gets the plaintext path from provided <paramref name="ciphertextPath"/>.
+        /// </summary>
+        /// <param name="ciphertextPath">The relative plaintext path to an item.</param>
+        /// <param name="specifics">The specifics.</param>
+        /// <returns>A relative plaintext path.</returns>
+        public static string? GetPlaintextPath(string ciphertextPath, FileSystemSpecifics specifics)
+        {
+            var directoryId = new byte[FileSystem.Constants.DIRECTORY_ID_SIZE];
+            return GetPlaintextPath(ciphertextPath, specifics, directoryId);
+        }
+
         /// <summary>
         /// Encrypts and gets the ciphertext path from provided <paramref name="plaintextRelativePath"/>.
         /// </summary>
diff --git a/src/SecureFolderFS.Core.FileSystem/Helpers/Native/NativePathHelpers.Shared.cs b/src/SecureFolderFS.Core.FileSystem/Helpers/Paths/Native/NativePathHelpers.Shared.cs
similarity index 92%
rename from src/SecureFolderFS.Core.FileSystem/Helpers/Native/NativePathHelpers.Shared.cs
rename to src/SecureFolderFS.Core.FileSystem/Helpers/Paths/Native/NativePathHelpers.Shared.cs
index dd48d2b32..69e0107c8 100644
--- a/src/SecureFolderFS.Core.FileSystem/Helpers/Native/NativePathHelpers.Shared.cs
+++ b/src/SecureFolderFS.Core.FileSystem/Helpers/Paths/Native/NativePathHelpers.Shared.cs
@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 
-namespace SecureFolderFS.Core.FileSystem.Helpers.Native
+namespace SecureFolderFS.Core.FileSystem.Helpers.Paths.Native
 {
     /// <summary>
     /// A set of file system path management helpers that only work in a native environment with unlimited file system access.
@@ -21,12 +21,12 @@ public static partial class NativePathHelpers
             if (parentPath == Path.DirectorySeparatorChar.ToString() || parentPath.Equals(rootPath))
                 return string.Empty;
 
-            return Path.Combine(parentPath, Constants.DIRECTORY_ID_FILENAME);
+            return Path.Combine(parentPath, Constants.Names.DIRECTORY_ID_FILENAME);
         }
 
         public static string MakeRelative(string fullPath, string basePath)
         {
-            return PathHelpers.EnsureNoLeadingPathSeparator(Path.DirectorySeparatorChar + fullPath.Replace(basePath, ""));
+            return PathHelpers.EnsureNoLeadingPathSeparator(Path.DirectorySeparatorChar + fullPath.Replace(basePath, string.Empty));
         }
 
         public static bool GetDirectoryId(string ciphertextChildPath, FileSystemSpecifics specifics, Span<byte> directoryId)
diff --git a/src/SecureFolderFS.Core.FileSystem/Helpers/PathHelpers.cs b/src/SecureFolderFS.Core.FileSystem/Helpers/Paths/PathHelpers.cs
similarity index 59%
rename from src/SecureFolderFS.Core.FileSystem/Helpers/PathHelpers.cs
rename to src/SecureFolderFS.Core.FileSystem/Helpers/Paths/PathHelpers.cs
index 3f41a6f7d..eb40dcca5 100644
--- a/src/SecureFolderFS.Core.FileSystem/Helpers/PathHelpers.cs
+++ b/src/SecureFolderFS.Core.FileSystem/Helpers/Paths/PathHelpers.cs
@@ -3,28 +3,16 @@
 using System.Linq;
 using System.Runtime.CompilerServices;
 
-namespace SecureFolderFS.Core.FileSystem.Helpers
+namespace SecureFolderFS.Core.FileSystem.Helpers.Paths
 {
     public static class PathHelpers
     {
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static bool IsCoreFile(string fileName)
+        public static bool IsCoreName(string itemName)
         {
-            return fileName.Contains(Constants.DIRECTORY_ID_FILENAME, StringComparison.Ordinal);
-        }
-        
-        #region Legacy helpers (To be removed)
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static string EnsureTrailingPathSeparator(string path)
-        {
-            return path[^1] == Path.DirectorySeparatorChar ? path : path + Path.DirectorySeparatorChar;
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static string EnsureNoTrailingPathSeparator(string path)
-        {
-            return path[^1] == Path.DirectorySeparatorChar ? path.Substring(0, path.Length - 1) : path;
+            return 
+                itemName.Contains(Constants.Names.DIRECTORY_ID_FILENAME, StringComparison.OrdinalIgnoreCase) ||
+                itemName.Contains(Constants.Names.RECYCLE_BIN_NAME, StringComparison.OrdinalIgnoreCase);
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -33,8 +21,6 @@ public static string EnsureNoLeadingPathSeparator(string path)
             return path.StartsWith(Path.DirectorySeparatorChar) ? path.Substring(1) : path;
         }
 
-        #endregion
-
         public static string? GetFreeMountPath(string nameHint)
         {
             if (OperatingSystem.IsWindows())
diff --git a/src/SecureFolderFS.Core.FileSystem/Helpers/RecycleBin/Abstract/AbstractRecycleBinHelpers.cs b/src/SecureFolderFS.Core.FileSystem/Helpers/RecycleBin/Abstract/AbstractRecycleBinHelpers.cs
new file mode 100644
index 000000000..5ee52ea6a
--- /dev/null
+++ b/src/SecureFolderFS.Core.FileSystem/Helpers/RecycleBin/Abstract/AbstractRecycleBinHelpers.cs
@@ -0,0 +1,104 @@
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using OwlCore.Storage;
+using SecureFolderFS.Core.FileSystem.DataModels;
+using SecureFolderFS.Shared.ComponentModel;
+using SecureFolderFS.Shared.Extensions;
+using SecureFolderFS.Storage.Extensions;
+using SecureFolderFS.Storage.Renamable;
+
+namespace SecureFolderFS.Core.FileSystem.Helpers.RecycleBin.Abstract
+{
+    public static class AbstractRecycleBinHelpers
+    {
+        public static async Task RestoreAsync(IStorableChild item, FileSystemSpecifics specifics, IAsyncSerializer<Stream> streamSerializer, CancellationToken cancellationToken = default)
+        {
+            if (specifics.Options.IsReadOnly)
+                return;
+            
+            // Get recycle bin
+            var recycleBin = await GetOrCreateRecycleBinAsync(specifics, cancellationToken);
+            
+            // Read configuration file
+            var configurationFile = await recycleBin.GetFileByNameAsync(Constants.Names.RECYCLE_BIN_NAME, cancellationToken);
+            await using var configurationStream = await configurationFile.OpenReadAsync(cancellationToken);
+
+            // Deserialize configuration
+            var deserialized = await streamSerializer.DeserializeAsync<Stream, RecycleBinItemDataModel>(configurationStream, cancellationToken);
+            if (deserialized is not { OriginalPath: { }})
+                throw new FormatException("Could not deserialize recycle bin configuration file.");
+
+            // Get parent destination folder
+            var id = Path.GetDirectoryName(deserialized.OriginalPath.Replace('/', Path.DirectorySeparatorChar)) ?? string.Empty;
+            var parentFolder = await specifics.ContentFolder.GetItemRecursiveAsync(id, cancellationToken);
+            if (parentFolder is not IModifiableFolder modifiableParent)
+                throw new UnauthorizedAccessException("The parent folder is not modifiable.");
+            
+            await RestoreAsync(item, modifiableParent, specifics, cancellationToken);
+        }
+
+        public static async Task RestoreAsync(IStorableChild item, IModifiableFolder destinationFolder, FileSystemSpecifics specifics, CancellationToken cancellationToken = default)
+        {
+            // Get recycle bin
+            var recycleBin = await GetOrCreateRecycleBinAsync(specifics, cancellationToken);
+            if (recycleBin is not IRenamableFolder renamableRecycleBin)
+                throw new UnauthorizedAccessException("The recycle bin is not renamable.");
+        }
+        
+        public static async Task DeleteOrTrashAsync(IModifiableFolder sourceFolder, IStorableChild item, FileSystemSpecifics specifics, IAsyncSerializer<Stream> streamSerializer, CancellationToken cancellationToken = default)
+        {
+            if (specifics.Options.IsReadOnly)
+                return;
+            
+            if (!specifics.Options.IsRecycleBinEnabled)
+            {
+                await sourceFolder.DeleteAsync(item, cancellationToken);
+                return;
+            }
+            
+            // Get recycle bin
+            var recycleBin = await GetOrCreateRecycleBinAsync(specifics, cancellationToken);
+            if (recycleBin is not IRenamableFolder renamableRecycleBin)
+                throw new UnauthorizedAccessException("The recycle bin is not renamable.");
+            
+            // Move and rename item
+            var guid = Guid.NewGuid().ToString();
+            var movedItem = await renamableRecycleBin.MoveStorableFromAsync(item, sourceFolder, false, cancellationToken);
+            _ = await renamableRecycleBin.RenameAsync(movedItem, guid, cancellationToken);
+            
+            // Create configuration file
+            var configurationFile = await renamableRecycleBin.CreateFileAsync($"{guid}.json", false, cancellationToken);
+            await using var configurationStream = await configurationFile.OpenReadWriteAsync(cancellationToken);
+
+            // Serialize configuration data model
+            await using var serializedStream = await streamSerializer.SerializeAsync(
+                new RecycleBinItemDataModel()
+                {
+                    OriginalPath = item.Id.Replace(Path.DirectorySeparatorChar, '/'),
+                    DeletionTimestamp = DateTime.Now
+                }, cancellationToken);
+            
+            // Write to destination stream
+            await serializedStream.CopyToAsync(configurationStream, cancellationToken);
+        }
+        
+        public static async Task<IFolder> GetOrCreateRecycleBinAsync(FileSystemSpecifics specifics, CancellationToken cancellationToken = default)
+        {
+            try
+            {
+                return await specifics.ContentFolder.GetFolderByNameAsync(Constants.Names.RECYCLE_BIN_NAME, cancellationToken);
+            }
+            catch (Exception ex)
+            {
+                _ = ex;
+            }
+            
+            if (specifics.ContentFolder is not IModifiableFolder modifiableFolder)
+                throw new UnauthorizedAccessException("The content folder is not modifiable.");
+
+            return await modifiableFolder.CreateFolderAsync(Constants.Names.RECYCLE_BIN_NAME, false, cancellationToken);
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Core.FileSystem/IAvailabilityChecker.cs b/src/SecureFolderFS.Core.FileSystem/IAvailabilityChecker.cs
deleted file mode 100644
index 2b5285203..000000000
--- a/src/SecureFolderFS.Core.FileSystem/IAvailabilityChecker.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using SecureFolderFS.Core.FileSystem.Enums;
-
-namespace SecureFolderFS.Core.FileSystem
-{
-    /// <summary>
-    /// Provides methods to retrieve status about file system's availability.
-    /// </summary>
-    public interface IAvailabilityChecker
-    {
-        /// <summary>
-        /// Determines whether the file system is supported by the device.
-        /// </summary>
-        /// <returns><see cref="FileSystemAvailabilityType"/> that determines whether the file system component is supported.</returns>
-        static abstract FileSystemAvailabilityType IsSupported();
-    }
-}
diff --git a/src/SecureFolderFS.Core.FileSystem/LocalFileSystem.cs b/src/SecureFolderFS.Core.FileSystem/LocalFileSystem.cs
new file mode 100644
index 000000000..00760c4ba
--- /dev/null
+++ b/src/SecureFolderFS.Core.FileSystem/LocalFileSystem.cs
@@ -0,0 +1,47 @@
+using OwlCore.Storage;
+using SecureFolderFS.Core.Cryptography;
+using SecureFolderFS.Core.FileSystem.AppModels;
+using SecureFolderFS.Core.FileSystem.Extensions;
+using SecureFolderFS.Core.FileSystem.Storage;
+using SecureFolderFS.Shared.ComponentModel;
+using SecureFolderFS.Storage.Enums;
+using SecureFolderFS.Storage.VirtualFileSystem;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace SecureFolderFS.Core.FileSystem
+{
+    /// <inheritdoc cref="IFileSystem"/>
+    public sealed class LocalFileSystem : IFileSystem
+    {
+        /// <inheritdoc/>
+        public string Id { get; } = Constants.FileSystem.FS_ID;
+
+        /// <inheritdoc/>
+        public string Name { get; } = Constants.FileSystem.FS_NAME;
+
+        /// <inheritdoc/>
+        public Task<FileSystemAvailability> GetStatusAsync(CancellationToken cancellationToken = default)
+        {
+            return Task.FromResult(FileSystemAvailability.Available);
+        }
+
+        /// <inheritdoc/>
+        public async Task<IVFSRoot> MountAsync(IFolder folder, IDisposable unlockContract, IDictionary<string, object> options, CancellationToken cancellationToken = default)
+        {
+            await Task.CompletedTask;
+            if (unlockContract is not IWrapper<Security> wrapper)
+                throw new ArgumentException($"The {nameof(unlockContract)} is invalid.");
+
+            var fileSystemOptions = FileSystemOptions.ToOptions(options, () => new HealthStatistics(), static () => new FileSystemStatistics());
+            var specifics = FileSystemSpecifics.CreateNew(wrapper.Inner, folder, fileSystemOptions);
+            fileSystemOptions.SetupValidators(specifics);
+
+            var storageRoot = new CryptoFolder(Path.DirectorySeparatorChar.ToString(), specifics.ContentFolder, specifics);
+            return new LocalVFSRoot(specifics, storageRoot, specifics);
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Core.FileSystem/LocalVFSRoot.cs b/src/SecureFolderFS.Core.FileSystem/LocalVFSRoot.cs
index b0b7c9bac..3943cb04b 100644
--- a/src/SecureFolderFS.Core.FileSystem/LocalVFSRoot.cs
+++ b/src/SecureFolderFS.Core.FileSystem/LocalVFSRoot.cs
@@ -1,5 +1,4 @@
 using OwlCore.Storage;
-using SecureFolderFS.Core.FileSystem.AppModels;
 using SecureFolderFS.Storage.VirtualFileSystem;
 using System;
 using System.Threading.Tasks;
@@ -14,8 +13,8 @@ public sealed class LocalVFSRoot : VFSRoot
         /// <inheritdoc/>
         public override string FileSystemName { get; } = Constants.LOCAL_FILE_SYSTEM_NAME;
 
-        public LocalVFSRoot(IDisposable disposable, IFolder storageRoot, FileSystemOptions options)
-            : base(storageRoot, options)
+        public LocalVFSRoot(IDisposable disposable, IFolder storageRoot, FileSystemSpecifics specifics)
+            : base(storageRoot, specifics)
         {
             _disposable = disposable;
         }
diff --git a/src/SecureFolderFS.Core.FileSystem/OpenHandles/BaseHandlesManager.cs b/src/SecureFolderFS.Core.FileSystem/OpenHandles/BaseHandlesManager.cs
index 5054bb593..cd592161b 100644
--- a/src/SecureFolderFS.Core.FileSystem/OpenHandles/BaseHandlesManager.cs
+++ b/src/SecureFolderFS.Core.FileSystem/OpenHandles/BaseHandlesManager.cs
@@ -1,5 +1,6 @@
 using SecureFolderFS.Core.FileSystem.Streams;
 using SecureFolderFS.Shared.Extensions;
+using SecureFolderFS.Storage.VirtualFileSystem;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -17,11 +18,13 @@ public abstract class BaseHandlesManager : IDisposable
         protected readonly object handlesLock = new();
         protected readonly StreamsAccess streamsAccess;
         protected readonly HandlesGenerator handlesGenerator;
+        protected readonly FileSystemOptions fileSystemOptions;
         protected readonly Dictionary<ulong, IDisposable> handles;
 
-        protected BaseHandlesManager(StreamsAccess streamsAccess)
+        protected BaseHandlesManager(StreamsAccess streamsAccess, FileSystemOptions fileSystemOptions)
         {
             this.streamsAccess = streamsAccess;
+            this.fileSystemOptions = fileSystemOptions;
             this.handlesGenerator = new();
             this.handles = new();
         }
@@ -42,7 +45,7 @@ protected BaseHandlesManager(StreamsAccess streamsAccess)
         /// </summary>
         /// <param name="ciphertextPath">The ciphertext path that points to a directory.</param>
         /// <returns>If successful, value is non-zero.</returns>
-        public abstract ulong OpenDirectoryHandle(string ciphertextPath); // TODO: Add open flags as needed
+        public abstract ulong OpenDirectoryHandle(string ciphertextPath);
 
         /// <summary>
         /// Gets a handle of type <typeparamref name="THandle"/> with associated <paramref name="handleId"/>.
@@ -66,7 +69,7 @@ protected BaseHandlesManager(StreamsAccess streamsAccess)
         }
 
         /// <summary>
-        /// Removes <paramref name="handleId"/> from the manager and disposes of the <see cref="ObjectHandle"/>.
+        /// Removes <paramref name="handleId"/> from the manager and disposes of the associated handle.
         /// </summary>
         /// <param name="handleId">The ID of the handle.</param>
         public virtual void CloseHandle(ulong handleId)
diff --git a/src/SecureFolderFS.Core.FileSystem/Paths/CiphertextPathConverter.cs b/src/SecureFolderFS.Core.FileSystem/Paths/CiphertextPathConverter.cs
deleted file mode 100644
index cfcb0469a..000000000
--- a/src/SecureFolderFS.Core.FileSystem/Paths/CiphertextPathConverter.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-using OwlCore.Storage;
-using SecureFolderFS.Core.Cryptography;
-using SecureFolderFS.Core.FileSystem.Directories;
-using SecureFolderFS.Core.FileSystem.FileNames;
-using SecureFolderFS.Core.FileSystem.Helpers;
-using SecureFolderFS.Core.FileSystem.Helpers.Native;
-using SecureFolderFS.Core.FileSystem.Statistics;
-using System;
-using System.IO;
-using System.Runtime.CompilerServices;
-
-namespace SecureFolderFS.Core.FileSystem.Paths
-{
-    /// <inheritdoc cref="IPathConverter"/>
-    public sealed class CiphertextPathConverter : IPathConverter
-    {
-        private readonly FileNameAccess _fileNameAccess;
-        private readonly DirectoryIdCache _directoryIdCache;
-
-        /// <inheritdoc/>
-        public IFolder ContentFolder { get; }
-
-        private CiphertextPathConverter(IFolder contentFolder, FileNameAccess fileNameAccess, DirectoryIdCache directoryIdCache)
-        {
-            _fileNameAccess = fileNameAccess;
-            _directoryIdCache = directoryIdCache;
-            ContentFolder = contentFolder;
-        }
-
-        /// <inheritdoc/>
-        public string? ToCiphertext(string cleartextPath)
-        {
-            return ConstructPath(cleartextPath, true);
-        }
-
-        /// <inheritdoc/>
-        public string? ToCleartext(string ciphertextPath)
-        {
-            return ConstructPath(ciphertextPath, false);
-        }
-
-        /// <inheritdoc/>
-        [SkipLocalsInit]
-        public string? GetCleartextFileName(string ciphertextFilePath)
-        {
-            // Construct DirectoryID path for the parent directory of ciphertextFilePath
-            var directoryIdPath = NativePathHelpers.GetDirectoryIdPathOfParent(ciphertextFilePath, ContentFolder.Id);
-            if (directoryIdPath is null)
-                return null;
-
-            // Allocate byte* for DirectoryID, or empty if path is root
-            var directoryId = directoryIdPath.Length == 0 ? Span<byte>.Empty : stackalloc byte[FileSystem.Constants.DIRECTORY_ID_SIZE];
-            if (directoryId.Length != 0 && !_directoryIdCache.GetDirectoryId(directoryIdPath, directoryId))
-            {
-                using var directoryIdStream = File.Open(directoryIdPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite | FileShare.Delete);
-                var read = directoryIdStream.Read(directoryId);
-
-                // Check the ID size
-                if (read < FileSystem.Constants.DIRECTORY_ID_SIZE)
-                {
-                    // TODO: Report health status
-                    return null;
-                }
-
-                // Set the DirectoryID to known IDs
-                _directoryIdCache.SetDirectoryId(directoryIdPath, directoryId);
-            }
-
-            // Get cleartext name
-            return _fileNameAccess.GetCleartextName(Path.GetFileName(ciphertextFilePath), directoryId);
-        }
-
-        /// <inheritdoc/>
-        [SkipLocalsInit]
-        public string? GetCiphertextFileName(string cleartextFilePath)
-        {
-            // Construct DirectoryID path for the parent directory of cleartextFilePath
-            var directoryIdPath = NativePathHelpers.GetDirectoryIdPathOfParent(cleartextFilePath, ContentFolder.Id);
-            if (directoryIdPath is null)
-                return null;
-
-            // Allocate byte* for DirectoryID, or empty if path is root
-            var directoryId = directoryIdPath.Length == 0 ? Span<byte>.Empty : stackalloc byte[FileSystem.Constants.DIRECTORY_ID_SIZE];
-            if (directoryId.Length != 0 && !_directoryIdCache.GetDirectoryId(directoryIdPath, directoryId))
-            {
-                using var directoryIdStream = File.Open(directoryIdPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite | FileShare.Delete);
-                var read = directoryIdStream.Read(directoryId);
-
-                // Check the ID size
-                if (read < FileSystem.Constants.DIRECTORY_ID_SIZE)
-                {
-                    // TODO: Report health status
-                    return null;
-                }
-
-                // Set the DirectoryID to known IDs
-                _directoryIdCache.SetDirectoryId(directoryIdPath, directoryId);
-            }
-
-            // Get ciphertext name
-            return _fileNameAccess.GetCiphertextName(Path.GetFileName(cleartextFilePath), directoryId);
-        }
-
-        // TODO: Refactor
-        private string? ConstructPath(string rawPath, bool convertToCiphertext)
-        {
-            var onlyPathAfterContent = rawPath.Substring(ContentFolder.Id.Length, rawPath.Length - ContentFolder.Id.Length);
-            var correctPath = PathHelpers.EnsureTrailingPathSeparator(ContentFolder.Id);
-            var path = correctPath;
-
-            foreach (var item in onlyPathAfterContent.Split(Path.DirectorySeparatorChar, StringSplitOptions.RemoveEmptyEntries))
-            {
-                var name = convertToCiphertext ? GetCiphertextFileName(Path.Combine(correctPath, item)) : GetCleartextFileName(Path.Combine(path, item));
-                if (name is null)
-                    return null;
-
-                correctPath += $"{name}{Path.DirectorySeparatorChar}";
-                path += $"{item}{Path.DirectorySeparatorChar}";
-            }
-
-            return !rawPath.EndsWith(Path.DirectorySeparatorChar) ? PathHelpers.EnsureNoTrailingPathSeparator(correctPath) : correctPath;
-        }
-
-        /// <summary>
-        /// Creates a new instance of <see cref="IPathConverter"/>.
-        /// </summary>
-        /// <param name="security">The <see cref="Security"/> contract.</param>
-        /// <param name="contentFolder">The ciphertext root content folder.</param>
-        /// <param name="enableFileNameCache">Determines if file paths should cache names.</param>
-        /// <param name="directoryIdCache">The <see cref="DirectoryIdCache"/> that stored directory IDs.</param>
-        /// <param name="statistics">The <see cref="IFileSystemStatistics"/> to report statistics of opened streams.</param>
-        /// <returns>A new instance of <see cref="IPathConverter"/>.</returns>
-        public static IPathConverter CreateNew(Security security, IFolder contentFolder, DirectoryIdCache directoryIdCache, bool enableFileNameCache, IFileSystemStatistics statistics)
-        {
-            var fileNameAccess = enableFileNameCache
-                ? new FileNameAccess(security, statistics)
-                : new CachingFileNameAccess(security, statistics);
-
-            return new CiphertextPathConverter(contentFolder, fileNameAccess, directoryIdCache);
-        }
-    }
-}
diff --git a/src/SecureFolderFS.Core.FileSystem/Paths/CleartextPathConverter.cs b/src/SecureFolderFS.Core.FileSystem/Paths/CleartextPathConverter.cs
deleted file mode 100644
index 25f81c9c3..000000000
--- a/src/SecureFolderFS.Core.FileSystem/Paths/CleartextPathConverter.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using OwlCore.Storage;
-using System.IO;
-
-namespace SecureFolderFS.Core.FileSystem.Paths
-{
-    /// <inheritdoc cref="IPathConverter"/>
-    public sealed class CleartextPathConverter : IPathConverter
-    {
-        // Paths are not encrypted hence we use the same path for every return value (ciphertext == cleartext)
-
-        /// <inheritdoc/>
-        public IFolder ContentFolder { get; }
-
-        private CleartextPathConverter(IFolder contentFolder)
-        {
-            ContentFolder = contentFolder;
-        }
-
-        /// <inheritdoc/>
-        public string? ToCiphertext(string cleartextPath)
-        {
-            return cleartextPath;
-        }
-
-        /// <inheritdoc/>
-        public string? ToCleartext(string ciphertextPath)
-        {
-            return ciphertextPath;
-        }
-
-        /// <inheritdoc/>
-        public string? GetCleartextFileName(string ciphertextFilePath)
-        {
-            return Path.GetFileName(ciphertextFilePath);
-        }
-
-        /// <inheritdoc/>
-        public string? GetCiphertextFileName(string cleartextFilePath)
-        {
-            return Path.GetFileName(cleartextFilePath);
-        }
-
-        /// <summary>
-        /// Creates a new instance of <see cref="IPathConverter"/>.
-        /// </summary>
-        /// <param name="contentFolder">The ciphertext root content folder.</param>
-        /// <returns>A new instance of <see cref="IPathConverter"/>.</returns>
-        public static IPathConverter CreateNew(IFolder contentFolder)
-        {
-            return new CleartextPathConverter(contentFolder);
-        }
-    }
-}
diff --git a/src/SecureFolderFS.Core.FileSystem/Paths/IPathConverter.cs b/src/SecureFolderFS.Core.FileSystem/Paths/IPathConverter.cs
deleted file mode 100644
index 721bb5044..000000000
--- a/src/SecureFolderFS.Core.FileSystem/Paths/IPathConverter.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using OwlCore.Storage;
-
-namespace SecureFolderFS.Core.FileSystem.Paths
-{
-    /// <summary>
-    /// Manages and converts paths between their ciphertext and plaintext forms.
-    /// </summary>
-    [Obsolete("Use INameCrypt")]
-    public interface IPathConverter
-    {
-        [Obsolete]
-        IFolder ContentFolder { get; }
-
-        [Obsolete]
-        string? ToCiphertext(string cleartextPath);
-
-        [Obsolete]
-        string? ToCleartext(string ciphertextPath);
-
-        [Obsolete]
-        string? GetCleartextFileName(string ciphertextFilePath);
-
-        [Obsolete]
-        string? GetCiphertextFileName(string cleartextFilePath);
-    }
-}
diff --git a/src/SecureFolderFS.Core.FileSystem/SecureFolderFS.Core.FileSystem.csproj b/src/SecureFolderFS.Core.FileSystem/SecureFolderFS.Core.FileSystem.csproj
index cdaca9347..47a6c91fe 100644
--- a/src/SecureFolderFS.Core.FileSystem/SecureFolderFS.Core.FileSystem.csproj
+++ b/src/SecureFolderFS.Core.FileSystem/SecureFolderFS.Core.FileSystem.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <ImplicitUsings>disable</ImplicitUsings>
     <Nullable>enable</Nullable>
diff --git a/src/SecureFolderFS.Core.FileSystem/Statistics/IFileSystemStatistics.cs b/src/SecureFolderFS.Core.FileSystem/Statistics/IFileSystemStatistics.cs
deleted file mode 100644
index a7948b47d..000000000
--- a/src/SecureFolderFS.Core.FileSystem/Statistics/IFileSystemStatistics.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using SecureFolderFS.Shared.Enums;
-using SecureFolderFS.Storage.VirtualFileSystem;
-using System;
-
-namespace SecureFolderFS.Core.FileSystem.Statistics
-{
-    public interface IFileSystemStatistics : IReadWriteStatistics
-    {
-        #region Cryptography
-
-        /// <summary>
-        /// Gets the <see cref="IProgress{T}"/> that reports the number of bytes encrypted.
-        /// </summary>
-        IProgress<long>? BytesEncrypted { get; set; }
-
-        /// <summary>
-        /// Gets the <see cref="IProgress{T}"/> that reports the number of bytes decrypted.
-        /// </summary>
-        IProgress<long>? BytesDecrypted { get; set; }
-
-        #endregion
-
-        #region Caching
-
-        /// <summary>
-        /// Gets the <see cref="IProgress{T}"/> that reports on cache state of chunks.
-        /// </summary>
-        IProgress<CacheAccessType>? ChunkCache { get; set; }
-
-        /// <summary>
-        /// Gets the <see cref="IProgress{T}"/> that reports on cache state of file names.
-        /// </summary>
-        IProgress<CacheAccessType>? FileNameCache { get; set; }
-
-        /// <summary>
-        /// Gets the <see cref="IProgress{T}"/> that reports on cache state of directory IDs.
-        /// </summary>
-        IProgress<CacheAccessType>? DirectoryIdCache { get; set; }
-
-        #endregion
-    }
-}
diff --git a/src/SecureFolderFS.Core.FileSystem/Statistics/IHealthStatistics.cs b/src/SecureFolderFS.Core.FileSystem/Statistics/IHealthStatistics.cs
deleted file mode 100644
index a3033b5ff..000000000
--- a/src/SecureFolderFS.Core.FileSystem/Statistics/IHealthStatistics.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-
-namespace SecureFolderFS.Core.FileSystem.Statistics
-{
-    public interface IHealthStatistics
-    {
-        /// <summary>
-        /// Gets the <see cref="IProgress{T}"/> that reports when the file containing DirectoryID was not found.
-        /// </summary>
-        IProgress<string>? DirectoryIdNotFound { get; set; }
-
-        /// <summary>
-        /// Gets the <see cref="IProgress{T}"/> that reports when the file contents containing DirectoryID are invalid.
-        /// </summary>
-        IProgress<string>? DirectoryIdInvalid { get; set; }
-
-        /// <summary>
-        /// Gets the <see cref="IProgress{T}"/> that reports when the file name could not be encrypted or decrypted.
-        /// </summary>
-        IProgress<string>? InvalidPath { get; set; }
-    }
-}
diff --git a/src/SecureFolderFS.Core.FileSystem/Storage/CryptoFile.cs b/src/SecureFolderFS.Core.FileSystem/Storage/CryptoFile.cs
index 8820138e1..b4e10723d 100644
--- a/src/SecureFolderFS.Core.FileSystem/Storage/CryptoFile.cs
+++ b/src/SecureFolderFS.Core.FileSystem/Storage/CryptoFile.cs
@@ -1,7 +1,11 @@
-using OwlCore.Storage;
+using System;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
+using OwlCore.Storage;
+using SecureFolderFS.Core.FileSystem.Exceptions;
+using SecureFolderFS.Core.FileSystem.Storage.StorageProperties;
+using SecureFolderFS.Storage.StorageProperties;
 
 namespace SecureFolderFS.Core.FileSystem.Storage
 {
@@ -16,8 +20,23 @@ public CryptoFile(string plaintextId, IFile inner, FileSystemSpecifics specifics
         /// <inheritdoc/>
         public virtual async Task<Stream> OpenStreamAsync(FileAccess access, CancellationToken cancellationToken = default)
         {
+            if (specifics.Options.IsReadOnly && access.HasFlag(FileAccess.Write))
+                throw FileSystemExceptions.FileSystemReadOnly;
+
             var stream = await Inner.OpenStreamAsync(access, cancellationToken);
-            return CreateCleartextStream(stream);
+            return CreatePlaintextStream(stream);
+        }
+        
+        /// <inheritdoc/>
+        public override async Task<IBasicProperties> GetPropertiesAsync()
+        {
+            if (Inner is not IStorableProperties storableProperties)
+                throw new NotSupportedException($"Properties on {nameof(CryptoFile)}.{nameof(Inner)} are not supported.");
+
+            var innerProperties = await storableProperties.GetPropertiesAsync();
+            properties ??= new CryptoFileProperties(specifics, innerProperties);
+            
+            return properties;
         }
 
         /// <summary>
@@ -25,7 +44,7 @@ public virtual async Task<Stream> OpenStreamAsync(FileAccess access, Cancellatio
         /// </summary>
         /// <param name="stream">The data stream to wrap.</param>
         /// <returns>An encrypting <see cref="Stream"/> instance.</returns>
-        protected virtual Stream CreateCleartextStream(Stream stream)
+        protected virtual Stream CreatePlaintextStream(Stream stream)
         {
             return specifics.StreamsAccess.OpenPlaintextStream(Inner.Id, stream);
         }
diff --git a/src/SecureFolderFS.Core.FileSystem/Storage/CryptoFolder.cs b/src/SecureFolderFS.Core.FileSystem/Storage/CryptoFolder.cs
index 073a90aa3..0af6a3a78 100644
--- a/src/SecureFolderFS.Core.FileSystem/Storage/CryptoFolder.cs
+++ b/src/SecureFolderFS.Core.FileSystem/Storage/CryptoFolder.cs
@@ -1,32 +1,58 @@
-using OwlCore.Storage;
-using SecureFolderFS.Core.FileSystem.Helpers;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
+using OwlCore.Storage;
+using SecureFolderFS.Core.FileSystem.Helpers.Paths;
+using SecureFolderFS.Core.FileSystem.Storage.StorageProperties;
+using SecureFolderFS.Storage.Renamable;
+using SecureFolderFS.Storage.StorageProperties;
 
 namespace SecureFolderFS.Core.FileSystem.Storage
 {
     // TODO(ns): Add move and copy support
     /// <inheritdoc cref="IFolder"/>
-    public class CryptoFolder : CryptoStorable<IFolder>, IChildFolder, IModifiableFolder, IGetFirstByName
+    public class CryptoFolder : CryptoStorable<IFolder>, IChildFolder, IModifiableFolder, IGetFirstByName, IRenamableFolder
     {
         public CryptoFolder(string plaintextId, IFolder inner, FileSystemSpecifics specifics, CryptoFolder? parent = null)
             : base(plaintextId, inner, specifics, parent)
         {
         }
+        
+        /// <inheritdoc/>
+        public async Task<IStorableChild> RenameAsync(IStorableChild storable, string newName, CancellationToken cancellationToken = default)
+        {
+            if (Inner is not IRenamableFolder renamableFolder)
+                throw new NotSupportedException("Renaming folder contents is not supported.");
+            
+            // We need to get the equivalent on the disk
+            var ciphertextName = await EncryptNameAsync(storable.Name, Inner, cancellationToken);
+            var ciphertextItem = await Inner.GetFirstByNameAsync(ciphertextName, cancellationToken);
+            
+            // Encrypt name
+            var newCiphertextName = await EncryptNameAsync(newName, Inner, cancellationToken);
+            var renamedCiphertextItem = await renamableFolder.RenameAsync(ciphertextItem, newCiphertextName, cancellationToken);
+
+            var plaintextId = Path.Combine(Inner.Id, newName);
+            return renamedCiphertextItem switch
+            {
+                IFile file => new CryptoFile(plaintextId, file, specifics, this),
+                IFolder folder => new CryptoFolder(plaintextId, folder, specifics, this),
+                _ => throw new ArgumentOutOfRangeException(nameof(renamedCiphertextItem))
+            };
+        }
 
         /// <inheritdoc/>
         public async IAsyncEnumerable<IStorableChild> GetItemsAsync(StorableType type = StorableType.All, [EnumeratorCancellation] CancellationToken cancellationToken = default)
         {
             await foreach (var item in Inner.GetItemsAsync(type, cancellationToken))
             {
-                if (PathHelpers.IsCoreFile(item.Name))
+                if (PathHelpers.IsCoreName(item.Name))
                     continue;
 
-                var plaintextName = await DecryptNameAsync(item.Name, Inner);
+                var plaintextName = await DecryptNameAsync(item.Name, Inner, cancellationToken);
                 if (plaintextName is null)
                     continue;
 
@@ -42,7 +68,7 @@ public async IAsyncEnumerable<IStorableChild> GetItemsAsync(StorableType type =
         /// <inheritdoc/>
         public async Task<IStorableChild> GetFirstByNameAsync(string name, CancellationToken cancellationToken = default)
         {
-            var ciphertextName = await EncryptNameAsync(name, Inner);
+            var ciphertextName = await EncryptNameAsync(name, Inner, cancellationToken);
             return await Inner.GetFirstByNameAsync(ciphertextName, cancellationToken) switch
             {
                 IChildFile file => (IStorableChild)Wrap(file, name),
@@ -59,14 +85,20 @@ public Task<IFolderWatcher> GetFolderWatcherAsync(CancellationToken cancellation
         }
 
         /// <inheritdoc/>
-        public Task DeleteAsync(IStorableChild item, CancellationToken cancellationToken = default)
+        public async Task DeleteAsync(IStorableChild item, CancellationToken cancellationToken = default)
         {
             if (Inner is not IModifiableFolder modifiableFolder)
                 throw new NotSupportedException("Modifying folder contents is not supported.");
 
-            // TODO: Get and delete the ciphertext item on disk, not plaintext representation
             // TODO: Invalidate cache on success
-            return modifiableFolder.DeleteAsync(item, cancellationToken);
+            // TODO: Get by ID instead of name
+            
+            // We need to get the equivalent on the disk
+            var ciphertextName = await EncryptNameAsync(item.Name, Inner, cancellationToken);
+            var ciphertextItem = await Inner.GetFirstByNameAsync(ciphertextName, cancellationToken);
+            
+            // Delete the ciphertext item
+            await modifiableFolder.DeleteAsync(ciphertextItem, cancellationToken);
         }
 
         /// <inheritdoc/>
@@ -75,21 +107,21 @@ public async Task<IChildFolder> CreateFolderAsync(string name, bool overwrite =
             if (Inner is not IModifiableFolder modifiableFolder)
                 throw new NotSupportedException("Modifying folder contents is not supported.");
 
-            var encryptedName = await EncryptNameAsync(name, Inner);
+            var encryptedName = await EncryptNameAsync(name, Inner, cancellationToken);
             var folder = await modifiableFolder.CreateFolderAsync(encryptedName, overwrite, cancellationToken);
             if (folder is not IModifiableFolder createdModifiableFolder)
                 throw new ArgumentException("The created folder is not modifiable.");
 
             // Get the DirectoryID file
-            var dirIdFile = await createdModifiableFolder.CreateFileAsync(FileSystem.Constants.DIRECTORY_ID_FILENAME, false, cancellationToken);
-            var directoryId = Guid.NewGuid().ToByteArray();
+            var directoryIdFile = await createdModifiableFolder.CreateFileAsync(Constants.Names.DIRECTORY_ID_FILENAME, false, cancellationToken);
+            await using var directoryIdStream = await directoryIdFile.OpenStreamAsync(FileAccess.ReadWrite, cancellationToken);
 
             // Initialize directory with DirectoryID
-            await using var directoryIdStream = await dirIdFile.OpenStreamAsync(FileAccess.ReadWrite, cancellationToken);
+            var directoryId = Guid.NewGuid().ToByteArray();
             await directoryIdStream.WriteAsync(directoryId, cancellationToken);
 
             // Set DirectoryID to known IDs
-            specifics.DirectoryIdCache.CacheSet(dirIdFile.Id, new(Guid.NewGuid().ToByteArray()));
+            specifics.DirectoryIdCache.CacheSet(directoryIdFile.Id, new(Guid.NewGuid().ToByteArray()));
 
             return (IChildFolder)Wrap(folder, name);
         }
@@ -100,10 +132,22 @@ public async Task<IChildFile> CreateFileAsync(string name, bool overwrite = fals
             if (Inner is not IModifiableFolder modifiableFolder)
                 throw new NotSupportedException("Modifying folder contents is not supported.");
 
-            var encryptedName = await EncryptNameAsync(name, Inner);
+            var encryptedName = await EncryptNameAsync(name, Inner, cancellationToken);
             var file = await modifiableFolder.CreateFileAsync(encryptedName, overwrite, cancellationToken);
 
             return (IChildFile)Wrap(file, name);
         }
+
+        /// <inheritdoc/>
+        public override async Task<IBasicProperties> GetPropertiesAsync()
+        {
+            if (Inner is not IStorableProperties storableProperties)
+                throw new NotSupportedException($"Properties on {nameof(CryptoFolder)}.{nameof(Inner)} are not supported.");
+
+            var innerProperties = await storableProperties.GetPropertiesAsync();
+            properties ??= new CryptoFileProperties(specifics, innerProperties);
+            
+            return properties;
+        }
     }
 }
diff --git a/src/SecureFolderFS.Core.FileSystem/Storage/CryptoStorable.cs b/src/SecureFolderFS.Core.FileSystem/Storage/CryptoStorable.cs
index 2f136c66b..1bea084c8 100644
--- a/src/SecureFolderFS.Core.FileSystem/Storage/CryptoStorable.cs
+++ b/src/SecureFolderFS.Core.FileSystem/Storage/CryptoStorable.cs
@@ -1,6 +1,7 @@
 using OwlCore.Storage;
-using SecureFolderFS.Core.FileSystem.Helpers.Abstract;
+using SecureFolderFS.Core.FileSystem.Helpers.Paths.Abstract;
 using SecureFolderFS.Shared.ComponentModel;
+using SecureFolderFS.Storage.StorageProperties;
 using System;
 using System.IO;
 using System.Threading;
@@ -9,11 +10,12 @@
 namespace SecureFolderFS.Core.FileSystem.Storage
 {
     /// <inheritdoc cref="IStorable"/>
-    public abstract class CryptoStorable<TCapability> : IWrapper<TCapability>, IStorableChild
+    public abstract class CryptoStorable<TCapability> : IWrapper<TCapability>, IStorableChild, IStorableProperties
         where TCapability : IStorable
     {
         protected readonly CryptoFolder? parent;
         protected readonly FileSystemSpecifics specifics;
+        protected IBasicProperties? properties;
 
         /// <inheritdoc/>
         public TCapability Inner { get; }
@@ -58,13 +60,16 @@ protected CryptoStorable(string plaintextId, TCapability inner, FileSystemSpecif
             // If the parent of parent is null, then we can assume we are at the root level and should use ContentFolder
             var ciphertextParentOfParent = await ciphertextParentFolder.GetParentAsync(cancellationToken) ?? specifics.ContentFolder;
 
-            var plaintextName = await DecryptNameAsync(ciphertextParent.Name, ciphertextParentOfParent);
+            var plaintextName = await DecryptNameAsync(ciphertextParent.Name, ciphertextParentOfParent, cancellationToken);
             if (plaintextName is null)
                 return null;
 
             return (IFolder?)Wrap(ciphertextParent, plaintextName);
         }
 
+        /// <inheritdoc/>
+        public abstract Task<IBasicProperties> GetPropertiesAsync();
+
         protected virtual IWrapper<IFile> Wrap(IFile file, params object[] objects)
         {
             if (objects[0] is not string plaintextName)
@@ -88,14 +93,15 @@ protected virtual IWrapper<IFolder> Wrap(IFolder folder, params object[] objects
         /// </summary>
         /// <param name="plaintextName">The name to encrypt.</param>
         /// <param name="parentFolder">The ciphertext parent folder.</param>
+        /// <param name="cancellationToken">A <see cref="CancellationToken"/> that cancels this action.</param>
         /// <returns>A <see cref="Task"/> that represents the asynchronous operation. Value is an encrypted name.</returns>
-        protected virtual async Task<string> EncryptNameAsync(string plaintextName, IFolder parentFolder)
+        protected virtual async Task<string> EncryptNameAsync(string plaintextName, IFolder parentFolder, CancellationToken cancellationToken = default)
         {
             if (specifics.Security.NameCrypt is null)
                 return plaintextName;
 
-            var directoryId = AbstractPathHelpers.AllocateDirectoryId(specifics, plaintextName);
-            var result = await AbstractPathHelpers.GetDirectoryIdAsync(parentFolder, specifics, directoryId);
+            var directoryId = AbstractPathHelpers.AllocateDirectoryId(specifics.Security, plaintextName);
+            var result = await AbstractPathHelpers.GetDirectoryIdAsync(parentFolder, specifics, directoryId, cancellationToken);
 
             return specifics.Security.NameCrypt.EncryptName(plaintextName, result ? directoryId : ReadOnlySpan<byte>.Empty) + FileSystem.Constants.Names.ENCRYPTED_FILE_EXTENSION;
         }
@@ -105,14 +111,15 @@ protected virtual async Task<string> EncryptNameAsync(string plaintextName, IFol
         /// </summary>
         /// <param name="ciphertextName">The name to decrypt.</param>
         /// <param name="parentFolder">The ciphertext parent folder.</param>
+        /// <param name="cancellationToken">A <see cref="CancellationToken"/> that cancels this action.</param>
         /// <returns>A <see cref="Task"/> that represents the asynchronous operation. Value is a decrypted name.</returns>
-        protected virtual async Task<string?> DecryptNameAsync(string ciphertextName, IFolder parentFolder)
+        protected virtual async Task<string?> DecryptNameAsync(string ciphertextName, IFolder parentFolder, CancellationToken cancellationToken = default)
         {
             if (specifics.Security.NameCrypt is null)
                 return ciphertextName;
 
-            var directoryId = AbstractPathHelpers.AllocateDirectoryId(specifics, ciphertextName);
-            var result = await AbstractPathHelpers.GetDirectoryIdAsync(parentFolder, specifics, directoryId);
+            var directoryId = AbstractPathHelpers.AllocateDirectoryId(specifics.Security, ciphertextName);
+            var result = await AbstractPathHelpers.GetDirectoryIdAsync(parentFolder, specifics, directoryId, cancellationToken);
 
             return specifics.Security.NameCrypt.DecryptName(Path.GetFileNameWithoutExtension(ciphertextName), result ? directoryId : ReadOnlySpan<byte>.Empty);
         }
diff --git a/src/SecureFolderFS.Core.FileSystem/Storage/StorageProperties/CryptoFileProperties.cs b/src/SecureFolderFS.Core.FileSystem/Storage/StorageProperties/CryptoFileProperties.cs
new file mode 100644
index 000000000..df8c337e9
--- /dev/null
+++ b/src/SecureFolderFS.Core.FileSystem/Storage/StorageProperties/CryptoFileProperties.cs
@@ -0,0 +1,42 @@
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+using OwlCore.Storage;
+using SecureFolderFS.Storage.StorageProperties;
+
+namespace SecureFolderFS.Core.FileSystem.Storage.StorageProperties
+{
+    /// <inheritdoc cref="IBasicProperties"/>
+    public class CryptoFileProperties : ISizeProperties, IBasicProperties
+    {
+        private readonly FileSystemSpecifics _specifics;
+        private readonly IBasicProperties _properties;
+
+        public CryptoFileProperties(FileSystemSpecifics specifics, IBasicProperties properties)
+        {
+            _specifics = specifics;
+            _properties = properties;
+        }
+
+        /// <inheritdoc/>
+        public async Task<IStorageProperty<long>?> GetSizeAsync(CancellationToken cancellationToken = default)
+        {
+            if (_properties is not ISizeProperties sizeProperties)
+                return null;
+
+            var sizeProperty = await sizeProperties.GetSizeAsync(cancellationToken);
+            if (sizeProperty is null)
+                return null;
+            
+            var plaintextSize = _specifics.Security.ContentCrypt.CalculatePlaintextSize(sizeProperty.Value);
+            return new GenericProperty<long>(plaintextSize);
+        }
+        
+        /// <inheritdoc/>
+        public async IAsyncEnumerable<IStorageProperty<object>> GetPropertiesAsync([EnumeratorCancellation] CancellationToken cancellationToken = default)
+        {
+            yield return await GetSizeAsync(cancellationToken) as IStorageProperty<object>;
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Core.FileSystem/Storage/StorageProperties/CryptoFolderProperties.cs b/src/SecureFolderFS.Core.FileSystem/Storage/StorageProperties/CryptoFolderProperties.cs
new file mode 100644
index 000000000..6fddeee1b
--- /dev/null
+++ b/src/SecureFolderFS.Core.FileSystem/Storage/StorageProperties/CryptoFolderProperties.cs
@@ -0,0 +1,42 @@
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+using OwlCore.Storage;
+using SecureFolderFS.Storage.StorageProperties;
+
+namespace SecureFolderFS.Core.FileSystem.Storage.StorageProperties
+{
+    /// <inheritdoc cref="IBasicProperties"/>
+    public class CryptoFolderProperties : ISizeProperties, IBasicProperties
+    {
+        private readonly FileSystemSpecifics _specifics;
+        private readonly IBasicProperties _properties;
+
+        public CryptoFolderProperties(FileSystemSpecifics specifics, IBasicProperties properties)
+        {
+            _specifics = specifics;
+            _properties = properties;
+        }
+
+        /// <inheritdoc/>
+        public async Task<IStorageProperty<long>?> GetSizeAsync(CancellationToken cancellationToken = default)
+        {
+            if (_properties is not ISizeProperties sizeProperties)
+                return null;
+
+            var sizeProperty = await sizeProperties.GetSizeAsync(cancellationToken);
+            if (sizeProperty is null)
+                return null;
+            
+            var plaintextSize = _specifics.Security.ContentCrypt.CalculatePlaintextSize(sizeProperty.Value);
+            return new GenericProperty<long>(plaintextSize);
+        }
+        
+        /// <inheritdoc/>
+        public async IAsyncEnumerable<IStorageProperty<object>> GetPropertiesAsync([EnumeratorCancellation] CancellationToken cancellationToken = default)
+        {
+            yield return await GetSizeAsync(cancellationToken) as IStorageProperty<object>;
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Core.FileSystem/Streams/CleartextStream.cs b/src/SecureFolderFS.Core.FileSystem/Streams/PlaintextStream.cs
similarity index 66%
rename from src/SecureFolderFS.Core.FileSystem/Streams/CleartextStream.cs
rename to src/SecureFolderFS.Core.FileSystem/Streams/PlaintextStream.cs
index f894c9346..a689ffe76 100644
--- a/src/SecureFolderFS.Core.FileSystem/Streams/CleartextStream.cs
+++ b/src/SecureFolderFS.Core.FileSystem/Streams/PlaintextStream.cs
@@ -1,21 +1,23 @@
 using SecureFolderFS.Core.Cryptography;
 using SecureFolderFS.Core.FileSystem.Buffers;
 using SecureFolderFS.Core.FileSystem.Chunks;
+using SecureFolderFS.Core.FileSystem.Exceptions;
 using SecureFolderFS.Shared.ComponentModel;
 using System;
 using System.IO;
 using System.Runtime.CompilerServices;
 using System.Security.Cryptography;
 
-namespace SecureFolderFS.Core.Streams
+namespace SecureFolderFS.Core.FileSystem.Streams
 {
-    /// <inheritdoc cref="CleartextStream"/>
-    internal sealed class CleartextStream : Stream, IWrapper<Stream>
+    /// <inheritdoc cref="PlaintextStream"/>
+    internal sealed class PlaintextStream : Stream, IWrapper<Stream>
     {
         private readonly Security _security;
         private readonly ChunkAccess _chunkAccess;
         private readonly HeaderBuffer _headerBuffer;
         private readonly Action<Stream> _notifyStreamClosed;
+        private readonly object _writeLock = new();
 
         private long _Length;
         private long _Position;
@@ -42,7 +44,7 @@ public override long Position
             set => Seek(value, SeekOrigin.Begin);
         }
 
-        public CleartextStream(
+        public PlaintextStream(
             Stream ciphertextStream,
             Security security,
             ChunkAccess chunkAccess,
@@ -54,7 +56,9 @@ public CleartextStream(
             _chunkAccess = chunkAccess;
             _headerBuffer = headerBuffer;
             _notifyStreamClosed = notifyStreamClosed;
-            _Length = Math.Max(_security.ContentCrypt.CalculateCleartextSize(ciphertextStream.Length - _security.HeaderCrypt.HeaderCiphertextSize), 0L);
+            
+            if (CanSeek)
+                _Length = _security.ContentCrypt.CalculatePlaintextSize(Math.Max(0L, ciphertextStream.Length - _security.HeaderCrypt.HeaderCiphertextSize));
         }
 
         /// <inheritdoc/>
@@ -73,7 +77,6 @@ public override void Write(byte[] buffer, int offset, int count)
         public override int Read(Span<byte> buffer)
         {
             var ciphertextStreamLength = Inner.Length;
-
             if (ciphertextStreamLength == 0L)
                 return FileSystem.Constants.FILE_EOF;
 
@@ -81,7 +84,7 @@ public override int Read(Span<byte> buffer)
                 return FileSystem.Constants.FILE_EOF; // TODO: HealthAPI - report invalid header size
 
             var lengthToEof = Length - _Position;
-            if (lengthToEof < 1L)
+            if (lengthToEof <= 0L)
                 return FileSystem.Constants.FILE_EOF;
 
             // Read header if not ready
@@ -90,15 +93,15 @@ public override int Read(Span<byte> buffer)
 
             var read = 0;
             var positionInBuffer = 0;
-            var cleartextChunkSize = _security.ContentCrypt.ChunkCleartextSize;
+            var plaintextChunkSize = _security.ContentCrypt.ChunkPlaintextSize;
             var adjustedBuffer = buffer.Slice(0, (int)Math.Min(buffer.Length, lengthToEof));
 
             while (positionInBuffer < adjustedBuffer.Length)
             {
                 var readPosition = _Position + read;
-                var chunkNumber = readPosition / cleartextChunkSize;
-                var offsetInChunk = (int)(readPosition % cleartextChunkSize);
-                var length = Math.Min(adjustedBuffer.Length - positionInBuffer, cleartextChunkSize - offsetInChunk);
+                var chunkNumber = readPosition / plaintextChunkSize;
+                var offsetInChunk = (int)(readPosition % plaintextChunkSize);
+                var length = Math.Min(adjustedBuffer.Length - positionInBuffer, plaintextChunkSize - offsetInChunk);
 
                 var copied = _chunkAccess.CopyFromChunk(chunkNumber, adjustedBuffer.Slice(positionInBuffer), offsetInChunk);
                 if (copied < 0)
@@ -116,11 +119,14 @@ public override int Read(Span<byte> buffer)
         [SkipLocalsInit]
         public override void Write(ReadOnlySpan<byte> buffer)
         {
+            if (!CanWrite)
+                throw FileSystemExceptions.StreamReadOnly;
+
             // Don't initiate write if the buffer is empty
             if (buffer.IsEmpty)
                 return;
 
-            if (Position > Length)
+            if (CanSeek && Position > Length)
             {
                 // TODO: Maybe throw an exception?
 
@@ -137,30 +143,36 @@ public override void Write(ReadOnlySpan<byte> buffer)
             else
             {
                 // Write contents
-                WriteInternal(buffer, Position);
+                WriteInternal(buffer, CanSeek ? Position : 0L);
             }
         }
 
         /// <inheritdoc/>
         public override void SetLength(long value)
         {
-            // Make sure header is ready before we can read/modify chunks
-            if (!TryWriteHeader() && !TryReadHeader())
-                throw new CryptographicException();
+            if (!CanWrite)
+                throw FileSystemExceptions.StreamReadOnly;
+
+            if (!CanSeek)
+                throw FileSystemExceptions.StreamNotSeekable;
 
             // Ignore resizing the same length
             if (value == Length)
                 return;
 
-            var cleartextChunkSize = _security.ContentCrypt.ChunkCleartextSize;
+            // Make sure header is ready before we can read/modify chunks
+            if (!TryWriteHeader() && !TryReadHeader())
+                throw new CryptographicException();
+
+            var plaintextChunkSize = _security.ContentCrypt.ChunkPlaintextSize;
 
             // Determine whether to extend or truncate the file
             if (value < Length)
             {
-                var remainingSize = (int)(value % cleartextChunkSize);
+                var remainingSize = (int)(value % plaintextChunkSize);
                 if (remainingSize > 0)
                 {
-                    var lastChunkNumber = value / cleartextChunkSize;
+                    var lastChunkNumber = value / plaintextChunkSize;
                     _chunkAccess.SetChunkLength(lastChunkNumber, remainingSize);
                 }
 
@@ -172,16 +184,16 @@ public override void SetLength(long value)
                 // Flush remaining chunks before base stream is accessed
                 _chunkAccess.Flush();
 
-                // Calculate cleartext size here because cleartext Length might not be initialized yet
-                var cleartextFileSize = _security.ContentCrypt.CalculateCleartextSize(Inner.Length - _security.HeaderCrypt.HeaderCiphertextSize);
-                var lastChunkNumber = cleartextFileSize / cleartextChunkSize;
-                var amountToWrite = cleartextFileSize % cleartextChunkSize != 0 ? (int)Math.Min(cleartextChunkSize, value - cleartextFileSize) : 0;
+                // Calculate plaintext size here because plaintext Length might not be initialized yet
+                var plaintextFileSize = _security.ContentCrypt.CalculatePlaintextSize(Inner.Length - _security.HeaderCrypt.HeaderCiphertextSize);
+                var lastChunkNumber = plaintextFileSize / plaintextChunkSize;
+                var amountToWrite = plaintextFileSize % plaintextChunkSize != 0 ? (int)Math.Min(plaintextChunkSize, value - plaintextFileSize) : 0;
 
                 // Extend the chunk including already existing data
                 _chunkAccess.SetChunkLength(lastChunkNumber, amountToWrite, true);
             }
 
-            // Calculate ciphertext size based on new cleartext length
+            // Calculate ciphertext size based on new plaintext length
             var ciphertextFileSize = _security.HeaderCrypt.HeaderCiphertextSize + Math.Max(_security.ContentCrypt.CalculateCiphertextSize(value), 0L);
 
             // Flush modified chunks
@@ -190,7 +202,7 @@ public override void SetLength(long value)
             // Resize base stream to the ciphertext size
             Inner.SetLength(ciphertextFileSize);
 
-            // Update cleartext length
+            // Update plaintext length
             _Length = value;
 
             // Update last write time, if possible
@@ -201,6 +213,9 @@ public override void SetLength(long value)
         /// <inheritdoc/>
         public override long Seek(long offset, SeekOrigin origin)
         {
+            if (!CanSeek)
+                throw FileSystemExceptions.StreamNotSeekable;
+            
             var seekPosition = origin switch
             {
                 SeekOrigin.Begin => offset,
@@ -209,7 +224,7 @@ public override long Seek(long offset, SeekOrigin origin)
                 _ => throw new ArgumentOutOfRangeException(nameof(origin))
             };
 
-            var ciphertextPosition = AlignToChunkStartPosition(seekPosition);
+            var ciphertextPosition = Math.Max(0L, AlignToChunkStartPosition(seekPosition));
             Inner.Position = ciphertextPosition;
             _Position = seekPosition;
 
@@ -234,11 +249,12 @@ public override void Close()
         /// <inheritdoc/>
         public override void Flush()
         {
-            if (!CanWrite)
-                return;
-
-            TryWriteHeader();
-            _chunkAccess.Flush();
+            // Only flush when there's a need to
+            if (_chunkAccess.FlushAvailable)
+            {
+                TryWriteHeader();
+                _chunkAccess.Flush();
+            }
         }
 
         private void WriteInternal(ReadOnlySpan<byte> buffer, long position)
@@ -246,20 +262,21 @@ private void WriteInternal(ReadOnlySpan<byte> buffer, long position)
             if (!TryWriteHeader() && !TryReadHeader())
                 throw new CryptographicException();
 
-            var cleartextChunkSize = _security.ContentCrypt.ChunkCleartextSize;
+            var plaintextChunkSize = _security.ContentCrypt.ChunkPlaintextSize;
             var written = 0;
             var positionInBuffer = 0;
 
             while (positionInBuffer < buffer.Length)
             {
                 var currentPosition = position + written;
-                var chunkNumber = currentPosition / cleartextChunkSize;
-                var offsetInChunk = (int)(currentPosition % cleartextChunkSize);
-                var length = Math.Min(buffer.Length - positionInBuffer, cleartextChunkSize - offsetInChunk);
+                var chunkNumber = currentPosition / plaintextChunkSize;
+                var offsetInChunk = (int)(currentPosition % plaintextChunkSize);
+                var length = Math.Min(buffer.Length - positionInBuffer, plaintextChunkSize - offsetInChunk);
 
                 var copy = _chunkAccess.CopyToChunk(
                     chunkNumber,
-                    buffer.Slice(positionInBuffer), (offsetInChunk == 0 && length == cleartextChunkSize) ? 0 : offsetInChunk);
+                    buffer.Slice(positionInBuffer),
+                    (offsetInChunk == 0 && length == plaintextChunkSize) ? 0 : offsetInChunk);
 
                 if (copy < 0)
                     throw new CryptographicException();
@@ -268,11 +285,14 @@ private void WriteInternal(ReadOnlySpan<byte> buffer, long position)
                 written += length;
             }
 
-            // Update length after writing
-            _Length = Math.Max(position + written, Length);
+            if (CanSeek)
+            {
+                // Update length after writing
+                _Length = Math.Max(position + written, Length);
 
-            // Update position after writing
-            _Position += written;
+                // Update position after writing
+                _Position += written;
+            }
 
             // Update last write time
             if (Inner is FileStream fileStream)
@@ -282,7 +302,7 @@ private void WriteInternal(ReadOnlySpan<byte> buffer, long position)
         [SkipLocalsInit]
         private bool TryReadHeader()
         {
-            if (!_headerBuffer.IsHeaderReady && CanRead && Inner.Length >= _security.HeaderCrypt.HeaderCiphertextSize)
+            if (!_headerBuffer.IsHeaderReady && CanRead && CanSeek)
             {
                 // Allocate ciphertext header
                 Span<byte> ciphertextHeader = stackalloc byte[_security.HeaderCrypt.HeaderCiphertextSize];
@@ -307,35 +327,50 @@ private bool TryReadHeader()
         [SkipLocalsInit]
         private bool TryWriteHeader()
         {
-            if (!_headerBuffer.IsHeaderReady && CanWrite && Inner.Length == 0L)
-            {
-                // Make sure we save the header state
-                _headerBuffer.IsHeaderReady = true;
-
-                // Allocate ciphertext header
-                Span<byte> ciphertextHeader = stackalloc byte[_security.HeaderCrypt.HeaderCiphertextSize];
-
-                // Get and encrypt header
-                _security.HeaderCrypt.CreateHeader(_headerBuffer);
-                _security.HeaderCrypt.EncryptHeader(_headerBuffer, ciphertextHeader);
-
-                // Write header
-                var savedPos = Inner.Position;
-                Inner.Position = 0L;
-                Inner.Write(ciphertextHeader);
-                Inner.Position = savedPos + ciphertextHeader.Length;
+            if (!CanWrite)
+                throw FileSystemExceptions.StreamReadOnly;
 
-                return true;
-            }
+            lock (_writeLock)
+                if (!_headerBuffer.IsHeaderReady && CanWrite)
+                {
+                    // Check if there is data already written only when we can seek
+                    if (CanSeek && Inner.Length > 0L)
+                        return false;
+                    
+                    // Make sure we save the header state
+                    _headerBuffer.IsHeaderReady = true;
+
+                    // Allocate ciphertext header
+                    Span<byte> ciphertextHeader = stackalloc byte[_security.HeaderCrypt.HeaderCiphertextSize];
+
+                    // Get and encrypt header
+                    _security.HeaderCrypt.CreateHeader(_headerBuffer);
+                    _security.HeaderCrypt.EncryptHeader(_headerBuffer, ciphertextHeader);
+
+                    // Write header
+                    if (CanSeek)
+                    {
+                        var savedPos = Inner.Position;
+                        Inner.Position = 0L;
+                        Inner.Write(ciphertextHeader);
+                        Inner.Position = savedPos + ciphertextHeader.Length;
+                    }
+                    else
+                    {
+                        Inner.Write(ciphertextHeader);
+                    }
+
+                    return true;
+                }
 
             return false;
         }
 
-        private long AlignToChunkStartPosition(long cleartextPosition)
+        private long AlignToChunkStartPosition(long plaintextPosition)
         {
             var maxCiphertextPayloadSize = long.MaxValue - _security.HeaderCrypt.HeaderCiphertextSize;
             var maxChunks = maxCiphertextPayloadSize / _security.ContentCrypt.ChunkCiphertextSize;
-            var chunkNumber = cleartextPosition / _security.ContentCrypt.ChunkCleartextSize;
+            var chunkNumber = plaintextPosition / _security.ContentCrypt.ChunkPlaintextSize;
 
             if (chunkNumber > maxChunks)
                 return long.MaxValue;
diff --git a/src/SecureFolderFS.Core.FileSystem/Streams/StreamsAccess.cs b/src/SecureFolderFS.Core.FileSystem/Streams/StreamsAccess.cs
index 49291a04b..0c5b7a27b 100644
--- a/src/SecureFolderFS.Core.FileSystem/Streams/StreamsAccess.cs
+++ b/src/SecureFolderFS.Core.FileSystem/Streams/StreamsAccess.cs
@@ -1,7 +1,7 @@
-using SecureFolderFS.Core.CryptFiles;
-using SecureFolderFS.Core.Cryptography;
+using SecureFolderFS.Core.Cryptography;
 using SecureFolderFS.Core.FileSystem.Buffers;
-using SecureFolderFS.Core.FileSystem.Statistics;
+using SecureFolderFS.Core.FileSystem.CryptFiles;
+using SecureFolderFS.Storage.VirtualFileSystem;
 using System;
 using System.IO;
 
@@ -23,20 +23,23 @@ private StreamsAccess(Security security, OpenCryptFileManager cryptFileManager)
         /// </summary>
         /// <param name="id">The unique ID of the file.</param>
         /// <param name="ciphertextStream">The ciphertext stream to wrap by the plaintext stream.</param>
+        /// <param name="takeFailureOwnership">Determines whether to close the <paramref name="ciphertextStream"/> when a new plaintext stream fails to open.</param>
         /// <returns>If successful, returns a new instance of plaintext <see cref="Stream"/>.</returns>
-        public Stream OpenPlaintextStream(string id, Stream ciphertextStream)
+        public Stream OpenPlaintextStream(string id, Stream ciphertextStream, bool takeFailureOwnership = true)
         {
             try
             {
                 // Get or create encrypted file from the file system
-                var openCryptFile = _cryptFileManager.TryGet(id) ?? _cryptFileManager.NewCryptFile(id, new HeaderBuffer(_security.HeaderCrypt.HeaderCleartextSize));
+                var openCryptFile = _cryptFileManager.TryGet(id) ?? _cryptFileManager.NewCryptFile(id, new HeaderBuffer(_security.HeaderCrypt.HeaderPlaintextSize));
 
                 // Open a new stream for that file registering existing ciphertext stream
                 return openCryptFile.OpenStream(ciphertextStream);
             }
             catch (Exception)
             {
-                ciphertextStream.Dispose();
+                if (takeFailureOwnership)
+                    ciphertextStream.Dispose();
+
                 throw;
             }
         }
diff --git a/src/SecureFolderFS.Core.FileSystem/VFSRoot.cs b/src/SecureFolderFS.Core.FileSystem/VFSRoot.cs
index fcd61ecac..6bb1b013f 100644
--- a/src/SecureFolderFS.Core.FileSystem/VFSRoot.cs
+++ b/src/SecureFolderFS.Core.FileSystem/VFSRoot.cs
@@ -1,42 +1,49 @@
 using OwlCore.Storage;
-using SecureFolderFS.Core.FileSystem.AppModels;
+using SecureFolderFS.Shared.ComponentModel;
 using SecureFolderFS.Storage.VirtualFileSystem;
 using System.Threading.Tasks;
 
 namespace SecureFolderFS.Core.FileSystem
 {
     /// <inheritdoc cref="IVFSRoot"/>
-    public abstract class VFSRoot : IVFSRoot
+    public abstract class VFSRoot : IVFSRoot, IWrapper<FileSystemSpecifics>
     {
+        protected readonly IFolder storageRoot;
+        protected readonly FileSystemSpecifics specifics;
+
         /// <inheritdoc/>
-        public IFolder Inner { get; }
+        IFolder IWrapper<IFolder>.Inner => storageRoot;
 
         /// <inheritdoc/>
-        public string StorageName { get; }
+        FileSystemSpecifics IWrapper<FileSystemSpecifics>.Inner => specifics;
 
         /// <inheritdoc/>
         public abstract string FileSystemName { get; }
 
         /// <inheritdoc/>
-        public virtual IReadWriteStatistics ReadWriteStatistics { get; }
+        public FileSystemOptions Options { get; }
 
-        protected VFSRoot(IFolder storageRoot, FileSystemOptions options)
+        protected VFSRoot(IFolder storageRoot, FileSystemSpecifics specifics)
         {
-            Inner = storageRoot;
-            StorageName = options.VolumeName;
-            ReadWriteStatistics = options.FileSystemStatistics;
+            this.storageRoot = storageRoot;
+            this.specifics = specifics;
+            Options = specifics.Options;
 
             // Automatically add created root
-            FileSystemManager.Instance.AddRoot(this);
+            FileSystemManager.Instance.FileSystems.Add(this);
         }
 
         /// <inheritdoc/>
         public virtual void Dispose()
         {
-            _ = DisposeAsync();
+            specifics.Dispose();
         }
 
         /// <inheritdoc/>
-        public abstract ValueTask DisposeAsync();
+        public virtual ValueTask DisposeAsync()
+        {
+            Dispose();
+            return ValueTask.CompletedTask;
+        }
     }
 }
diff --git a/src/SecureFolderFS.Core.FileSystem/Validators/BaseFileSystemValidator.cs b/src/SecureFolderFS.Core.FileSystem/Validators/BaseFileSystemValidator.cs
new file mode 100644
index 000000000..ce2eb2bf0
--- /dev/null
+++ b/src/SecureFolderFS.Core.FileSystem/Validators/BaseFileSystemValidator.cs
@@ -0,0 +1,78 @@
+using OwlCore.Storage;
+using SecureFolderFS.Core.FileSystem.Helpers.Paths.Abstract;
+using SecureFolderFS.Shared.ComponentModel;
+using SecureFolderFS.Shared.Models;
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace SecureFolderFS.Core.FileSystem.Validators
+{
+    /// <inheritdoc cref="IAsyncValidator{T, TResult}"/>
+    public abstract class BaseFileSystemValidator<T> : IAsyncValidator<T, IResult>
+    {
+        protected FileSystemSpecifics specifics;
+
+        protected BaseFileSystemValidator(FileSystemSpecifics specifics)
+        {
+            this.specifics = specifics;
+        }
+
+        /// <inheritdoc/>
+        public abstract Task ValidateAsync(T value, CancellationToken cancellationToken = default);
+
+        /// <inheritdoc/>
+        public abstract Task<IResult> ValidateResultAsync(T value, CancellationToken cancellationToken = default);
+
+        protected async Task ValidateNameAsync(IStorableChild storable, CancellationToken cancellationToken)
+        {
+            if (specifics.Security.NameCrypt is null)
+                return;
+
+            var decryptedName = await DecryptNameAsync(storable, cancellationToken).ConfigureAwait(false);
+            if (decryptedName is null)
+                throw new FormatException("The item name is invalid.");
+        }
+
+        protected async Task<IResult> ValidateNameResultAsync(IStorableChild storable, CancellationToken cancellationToken)
+        {
+            try
+            {
+                await ValidateNameAsync(storable, cancellationToken).ConfigureAwait(false);
+                return Result.Success;
+            }
+            catch (Exception ex)
+            {
+                return Result<IStorable>.Failure(storable, ex);
+            }
+        }
+
+        protected async Task<string?> DecryptNameAsync(IStorableChild storable, CancellationToken cancellationToken)
+        {
+            if (specifics.Security.NameCrypt is null)
+                return null;
+
+            var parentFolder = await storable.GetParentAsync(cancellationToken).ConfigureAwait(false);
+            if (parentFolder is null)
+                return null;
+
+            var ciphertextName = storable.Name;
+            var directoryId = AbstractPathHelpers.AllocateDirectoryId(specifics.Security, ciphertextName);
+
+            try
+            {
+                var result = await AbstractPathHelpers.GetDirectoryIdAsync(parentFolder, specifics, directoryId, cancellationToken).ConfigureAwait(false);
+                return specifics.Security.NameCrypt.DecryptName(Path.GetFileNameWithoutExtension(ciphertextName), result ? directoryId : ReadOnlySpan<byte>.Empty);
+            }
+            catch (FileNotFoundException)
+            {
+                // We want to suppress FileNotFoundException that might be raised when the DirectoryID file is not found.
+                // This case should be already handled in the folder validator
+
+                // Return an empty string to prevent raising exceptions due to the name being null
+                return string.Empty;
+            }
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Core.FileSystem/Validators/FileValidator.cs b/src/SecureFolderFS.Core.FileSystem/Validators/FileValidator.cs
new file mode 100644
index 000000000..4b7b60a38
--- /dev/null
+++ b/src/SecureFolderFS.Core.FileSystem/Validators/FileValidator.cs
@@ -0,0 +1,45 @@
+using OwlCore.Storage;
+using SecureFolderFS.Core.FileSystem.Helpers.Paths;
+using SecureFolderFS.Shared.ComponentModel;
+using SecureFolderFS.Shared.Models;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace SecureFolderFS.Core.FileSystem.Validators
+{
+    /// <inheritdoc cref="IAsyncValidator{T, TResult}"/>
+    public sealed class FileValidator : BaseFileSystemValidator<IFile>
+    {
+        private IResult<StorableType> FileSuccess { get; } = Result<StorableType>.Success(StorableType.File);
+
+        public FileValidator(FileSystemSpecifics specifics)
+            : base(specifics)
+        {
+        }
+
+        /// <inheritdoc/>
+        public override Task ValidateAsync(IFile value, CancellationToken cancellationToken = default)
+        {
+            if (PathHelpers.IsCoreName(value.Name))
+                return Task.CompletedTask;
+
+            // TODO: Implement file validation (invalid chunks, checksum mismatch, etc...?)
+            return Task.CompletedTask;
+        }
+
+        /// <inheritdoc/>
+        public override async Task<IResult> ValidateResultAsync(IFile value, CancellationToken cancellationToken = default)
+        {
+            try
+            {
+                await ValidateAsync(value, cancellationToken).ConfigureAwait(false);
+                return FileSuccess;
+            }
+            catch (Exception ex)
+            {
+                return Result<IStorable>.Failure(value, ex);
+            }
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Core.FileSystem/Validators/FolderValidator.cs b/src/SecureFolderFS.Core.FileSystem/Validators/FolderValidator.cs
new file mode 100644
index 000000000..7455a0446
--- /dev/null
+++ b/src/SecureFolderFS.Core.FileSystem/Validators/FolderValidator.cs
@@ -0,0 +1,63 @@
+using OwlCore.Storage;
+using SecureFolderFS.Core.FileSystem.Helpers.Paths;
+using SecureFolderFS.Shared.ComponentModel;
+using SecureFolderFS.Shared.Models;
+using SecureFolderFS.Storage.Extensions;
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace SecureFolderFS.Core.FileSystem.Validators
+{
+    /// <inheritdoc cref="IAsyncValidator{T, TResult}"/>
+    public sealed class FolderValidator : BaseFileSystemValidator<IFolder>
+    {
+        private IResult<StorableType> FolderSuccess { get; } = Result<StorableType>.Success(StorableType.Folder);
+
+        public FolderValidator(FileSystemSpecifics specifics)
+            : base(specifics)
+        {
+        }
+
+        /// <inheritdoc/>
+        public override async Task ValidateAsync(IFolder value, CancellationToken cancellationToken = default)
+        {
+            try
+            {
+                if (PathHelpers.IsCoreName(value.Name))
+                    return;
+
+                if (value.Id.Equals(specifics.ContentFolder.Id, StringComparison.OrdinalIgnoreCase))
+                    return;
+
+                // Check if Directory ID exists
+                var directoryIdFile = await value.GetFileByNameAsync(Core.FileSystem.Constants.Names.DIRECTORY_ID_FILENAME, cancellationToken).ConfigureAwait(false);
+
+                // Check the size
+                await using var stream = await directoryIdFile.OpenReadAsync(cancellationToken).ConfigureAwait(false);
+                if (stream.Length != Core.FileSystem.Constants.DIRECTORY_ID_SIZE)
+                    throw new EndOfStreamException($"The Directory ID size is invalid. Expected: {Core.FileSystem.Constants.DIRECTORY_ID_SIZE}; Got: {stream.Length}.");
+            }
+            catch (Exception ex)
+            {
+                // TODO: Consider using the original exception to preserve stacktrace (in such case, also change IVaultFileSystemService)
+                throw new AggregateException(ex);
+            }
+        }
+
+        /// <inheritdoc/>
+        public override async Task<IResult> ValidateResultAsync(IFolder value, CancellationToken cancellationToken = default)
+        {
+            try
+            {
+                await ValidateAsync(value, cancellationToken).ConfigureAwait(false);
+                return FolderSuccess;
+            }
+            catch (Exception ex)
+            {
+                return Result<IStorable>.Failure(value, ex);
+            }
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Core.FileSystem/Validators/StructureValidator.cs b/src/SecureFolderFS.Core.FileSystem/Validators/StructureValidator.cs
new file mode 100644
index 000000000..b07e866e5
--- /dev/null
+++ b/src/SecureFolderFS.Core.FileSystem/Validators/StructureValidator.cs
@@ -0,0 +1,62 @@
+using OwlCore.Storage;
+using SecureFolderFS.Shared.ComponentModel;
+using SecureFolderFS.Shared.Models;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using SecureFolderFS.Core.FileSystem.Helpers.Paths;
+
+namespace SecureFolderFS.Core.FileSystem.Validators
+{
+    /// <inheritdoc cref="IAsyncValidator{T, TResult}"/>
+    internal sealed class StructureValidator : BaseFileSystemValidator<(IFolder, IProgress<IResult>?)>
+    {
+        private readonly IAsyncValidator<IFile, IResult> _fileValidator;
+        private readonly IAsyncValidator<IFolder, IResult> _folderValidator;
+
+        public StructureValidator(FileSystemSpecifics specifics, IAsyncValidator<IFile, IResult> fileValidator, IAsyncValidator<IFolder, IResult> folderValidator)
+            : base(specifics)
+        {
+            _fileValidator = fileValidator;
+            _folderValidator = folderValidator;
+        }
+
+        /// <inheritdoc/>
+        public override Task ValidateAsync((IFolder, IProgress<IResult>?) value, CancellationToken cancellationToken = default)
+        {
+            // TODO: Implement
+            throw new NotImplementedException();
+        }
+
+        /// <inheritdoc/>
+        public override async Task<IResult> ValidateResultAsync((IFolder, IProgress<IResult>?) value, CancellationToken cancellationToken = default)
+        {
+            var scannedFolder = value.Item1;
+            var reporter = value.Item2;
+
+            var folderResult = await _folderValidator.ValidateResultAsync(scannedFolder, cancellationToken).ConfigureAwait(false);
+            reporter?.Report(folderResult);
+
+            await foreach (var item in scannedFolder.GetItemsAsync(StorableType.All, cancellationToken).ConfigureAwait(false))
+            {
+                if (PathHelpers.IsCoreName(item.Name))
+                    continue;
+
+                if (item is IChildFile file)
+                {
+                    var result = await _fileValidator.ValidateResultAsync(file, cancellationToken).ConfigureAwait(false);
+                    reporter?.Report(result);
+                }
+
+                if (folderResult.Successful)
+                {
+                    var nameResult = await ValidateNameResultAsync(item, cancellationToken).ConfigureAwait(false);
+                    reporter?.Report(nameResult);
+                }
+            }
+
+            // TODO: Return appropriate result
+            return Result.Success;
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Core.Migration/AppModels/EncAndMacKey.cs b/src/SecureFolderFS.Core.Migration/AppModels/EncAndMacKey.cs
new file mode 100644
index 000000000..bd235b855
--- /dev/null
+++ b/src/SecureFolderFS.Core.Migration/AppModels/EncAndMacKey.cs
@@ -0,0 +1,15 @@
+using SecureFolderFS.Core.Cryptography.SecureStore;
+using System;
+
+namespace SecureFolderFS.Core.Migration.AppModels
+{
+    internal sealed record class EncAndMacKey(SecretKey EncKey, SecretKey MacKey) : IDisposable
+    {
+        /// <inheritdoc/>
+        public void Dispose()
+        {
+            EncKey.Dispose();
+            MacKey.Dispose();
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Core.Migration/AppModels/V1_V2/MigratorV1_V2.cs b/src/SecureFolderFS.Core.Migration/AppModels/MigratorV1_V2.cs
similarity index 73%
rename from src/SecureFolderFS.Core.Migration/AppModels/V1_V2/MigratorV1_V2.cs
rename to src/SecureFolderFS.Core.Migration/AppModels/MigratorV1_V2.cs
index 5811ae934..866e3c093 100644
--- a/src/SecureFolderFS.Core.Migration/AppModels/V1_V2/MigratorV1_V2.cs
+++ b/src/SecureFolderFS.Core.Migration/AppModels/MigratorV1_V2.cs
@@ -1,8 +1,10 @@
 using OwlCore.Storage;
 using SecureFolderFS.Core.Cryptography.Cipher;
+using SecureFolderFS.Core.Cryptography.Helpers;
 using SecureFolderFS.Core.Cryptography.SecureStore;
 using SecureFolderFS.Core.DataModels;
-using SecureFolderFS.Core.VaultAccess;
+using SecureFolderFS.Core.Migration.DataModels;
+using SecureFolderFS.Core.Migration.Helpers;
 using SecureFolderFS.Shared.ComponentModel;
 using SecureFolderFS.Shared.Extensions;
 using SecureFolderFS.Shared.Models;
@@ -11,10 +13,11 @@
 using System.IO;
 using System.Linq;
 using System.Security.Cryptography;
+using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace SecureFolderFS.Core.Migration.AppModels.V1_V2
+namespace SecureFolderFS.Core.Migration.AppModels
 {
     /// <inheritdoc cref="IVaultMigratorModel"/>
     internal sealed class MigratorV1_V2 : IVaultMigratorModel
@@ -49,10 +52,9 @@ public async Task<IDisposable> UnlockAsync<T>(T credentials, CancellationToken c
             if (_v1KeystoreDataModel is null)
                 throw new FormatException($"{nameof(VaultKeystoreDataModel)} was not in the correct format.");
 
-            
-            var kek = new byte[Cryptography.Constants.ARGON2_KEK_LENGTH];
-            using var encKey = new SecureKey(Cryptography.Constants.KeyChains.ENCKEY_LENGTH);
-            using var macKey = new SecureKey(Cryptography.Constants.KeyChains.MACKEY_LENGTH);
+            var kek = new byte[Cryptography.Constants.KeyTraits.ARGON2_KEK_LENGTH];
+            using var encKey = new SecureKey(Cryptography.Constants.KeyTraits.ENCKEY_LENGTH);
+            using var macKey = new SecureKey(Cryptography.Constants.KeyTraits.MACKEY_LENGTH);
 
             Argon2id.DeriveKey(password.ToArray(), _v1KeystoreDataModel.Salt, kek);
 
@@ -66,7 +68,7 @@ public async Task<IDisposable> UnlockAsync<T>(T credentials, CancellationToken c
         }
 
         /// <inheritdoc/>
-        public async Task MigrateAsync(IDisposable unlockContract, ProgressModel progress, CancellationToken cancellationToken = default)
+        public async Task MigrateAsync(IDisposable unlockContract, ProgressModel<IResult> progress, CancellationToken cancellationToken = default)
         {
             if (_v1ConfigDataModel is null)
                 throw new InvalidOperationException($"{nameof(_v1ConfigDataModel)} is null.");
@@ -75,10 +77,10 @@ public async Task MigrateAsync(IDisposable unlockContract, ProgressModel progres
                 throw new ArgumentException($"{nameof(unlockContract)} is not of correct type.");
 
             // Begin progress report
-            progress.PrecisionProgress?.Report(0d);
+            progress.PercentageProgress?.Report(0d);
 
             var vaultId = Guid.NewGuid().ToString();
-            var v2ConfigDataModel = new VaultConfigurationDataModel()
+            var v2ConfigDataModel = new V2VaultConfigurationDataModel()
             {
                 AuthenticationMethod = Constants.Vault.Authentication.AUTH_PASSWORD,
                 ContentCipherId = GetContentCipherId(_v1ConfigDataModel.ContentCipherScheme),
@@ -89,45 +91,38 @@ public async Task MigrateAsync(IDisposable unlockContract, ProgressModel progres
             };
 
             // Calculate and update configuration MAC
-            VaultParser.CalculateConfigMac(v2ConfigDataModel, encAndMacKey.MacKey, v2ConfigDataModel.PayloadMac);
+
+            var encKey = encAndMacKey.EncKey;
+            var macKey = encAndMacKey.MacKey;
+
+            // Initialize HMAC
+            using var hmacSha256 = new HMACSHA256(macKey.Key);
+
+            // Update HMAC
+            hmacSha256.AppendData(BitConverter.GetBytes(Constants.Vault.Versions.LATEST_VERSION));
+            hmacSha256.AppendData(BitConverter.GetBytes(CryptHelpers.ContentCipherId(v2ConfigDataModel.ContentCipherId)));
+            hmacSha256.AppendData(BitConverter.GetBytes(CryptHelpers.FileNameCipherId(v2ConfigDataModel.FileNameCipherId)));
+            hmacSha256.AppendData(Encoding.UTF8.GetBytes(v2ConfigDataModel.Uid));
+            hmacSha256.AppendFinalData(Encoding.UTF8.GetBytes(v2ConfigDataModel.AuthenticationMethod));
+
+            // Fill the hash to payload
+            hmacSha256.GetCurrentHash(v2ConfigDataModel.PayloadMac);
 
             var configFile = await VaultFolder.GetFileByNameAsync(Constants.Vault.Names.VAULT_CONFIGURATION_FILENAME, cancellationToken);
             await using var configStream = await configFile.OpenReadWriteAsync(cancellationToken);
 
             // Create backup
-            await CreateConfigBackup(configStream, cancellationToken);
-            await CreateKeystoreBackup(cancellationToken);
+            if (VaultFolder is IModifiableFolder modifiableFolder)
+            {
+                await BackupHelpers.CreateConfigBackup(modifiableFolder, configStream, cancellationToken);
+                await BackupHelpers.CreateKeystoreBackup(modifiableFolder, cancellationToken);
+            }
 
             await using var serializedStream = await _streamSerializer.SerializeAsync(v2ConfigDataModel, cancellationToken);
             await serializedStream.CopyToAsync(configStream, cancellationToken);
 
             // End progress report
-            progress.PrecisionProgress?.Report(100d);
-        }
-
-        private async Task CreateConfigBackup(Stream configStream, CancellationToken cancellationToken)
-        {
-            if (VaultFolder is not IModifiableFolder modifiableFolder)
-                return;
-
-            var backupConfigName = $"{Constants.Vault.Names.VAULT_CONFIGURATION_FILENAME}.bkup";
-            var backupConfigFile = await modifiableFolder.CreateFileAsync(backupConfigName, true, cancellationToken);
-            await using var backupConfigStream = await backupConfigFile.OpenWriteAsync(cancellationToken);
-
-            await configStream.CopyToAsync(backupConfigStream, cancellationToken);
-            configStream.Position = 0L;
-        }
-
-        private async Task CreateKeystoreBackup(CancellationToken cancellationToken)
-        {
-            if (VaultFolder is not IModifiableFolder modifiableFolder)
-                return;
-
-            var keystoreFile = await VaultFolder.GetFileByNameAsync(Constants.Vault.Names.VAULT_KEYSTORE_FILENAME, cancellationToken);
-            var backupKeystoreName = $"{Constants.Vault.Names.VAULT_KEYSTORE_FILENAME}.bkup";
-            var backupKeystoreFile = await modifiableFolder.CreateFileAsync(backupKeystoreName, true, cancellationToken);
-
-            await keystoreFile.CopyContentsToAsync(backupKeystoreFile, cancellationToken);
+            progress.PercentageProgress?.Report(100d);
         }
 
         private static string GetContentCipherId(int v1ContentCipherScheme)
diff --git a/src/SecureFolderFS.Core.Migration/AppModels/MigratorV2_V3.cs b/src/SecureFolderFS.Core.Migration/AppModels/MigratorV2_V3.cs
new file mode 100644
index 000000000..2088cde41
--- /dev/null
+++ b/src/SecureFolderFS.Core.Migration/AppModels/MigratorV2_V3.cs
@@ -0,0 +1,129 @@
+using OwlCore.Storage;
+using SecureFolderFS.Core.Cryptography.Cipher;
+using SecureFolderFS.Core.Cryptography.Helpers;
+using SecureFolderFS.Core.Cryptography.SecureStore;
+using SecureFolderFS.Core.DataModels;
+using SecureFolderFS.Core.Migration.DataModels;
+using SecureFolderFS.Core.Migration.Helpers;
+using SecureFolderFS.Shared.ComponentModel;
+using SecureFolderFS.Shared.Extensions;
+using SecureFolderFS.Shared.Models;
+using SecureFolderFS.Storage.Extensions;
+using System;
+using System.IO;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace SecureFolderFS.Core.Migration.AppModels
+{
+    /// <inheritdoc cref="IVaultMigratorModel"/>
+    internal sealed class MigratorV2_V3 : IVaultMigratorModel
+    {
+        private readonly IAsyncSerializer<Stream> _streamSerializer;
+        private V2VaultConfigurationDataModel? _v2ConfigDataModel;
+        private VaultKeystoreDataModel? _v2KeystoreDataModel;
+
+        /// <inheritdoc/>
+        public IFolder VaultFolder { get; }
+
+        public MigratorV2_V3(IFolder vaultFolder, IAsyncSerializer<Stream> streamSerializer)
+        {
+            VaultFolder = vaultFolder;
+            _streamSerializer = streamSerializer;
+        }
+
+        /// <inheritdoc/>
+        public async Task<IDisposable> UnlockAsync<T>(T credentials, CancellationToken cancellationToken = default)
+        {
+            if (credentials is not KeyChain keyChain)
+                throw new ArgumentException($"Argument {credentials} is not of type {typeof(KeyChain)}.");
+
+            var configFile = await VaultFolder.GetFileByNameAsync(Constants.Vault.Names.VAULT_CONFIGURATION_FILENAME, cancellationToken);
+            var keystoreFile = await VaultFolder.GetFileByNameAsync(Constants.Vault.Names.VAULT_KEYSTORE_FILENAME, cancellationToken);
+
+            await using var configStream = await configFile.OpenReadAsync(cancellationToken);
+            await using var keystoreStream = await keystoreFile.OpenReadAsync(cancellationToken);
+
+            _v2ConfigDataModel = await _streamSerializer.DeserializeAsync<Stream, V2VaultConfigurationDataModel>(configStream, cancellationToken);
+            _v2KeystoreDataModel = await _streamSerializer.DeserializeAsync<Stream, VaultKeystoreDataModel>(keystoreStream, cancellationToken);
+            if (_v2KeystoreDataModel is null)
+                throw new FormatException($"{nameof(VaultKeystoreDataModel)} was not in the correct format.");
+
+            var kek = new byte[Cryptography.Constants.KeyTraits.ARGON2_KEK_LENGTH];
+            using var encKey = new SecureKey(Cryptography.Constants.KeyTraits.ENCKEY_LENGTH);
+            using var macKey = new SecureKey(Cryptography.Constants.KeyTraits.MACKEY_LENGTH);
+
+            Argon2id.DeriveKey(keyChain.ToArray(), _v2KeystoreDataModel.Salt, kek);
+
+            // Unwrap keys
+            using var rfc3394 = new Rfc3394KeyWrap();
+            rfc3394.UnwrapKey(_v2KeystoreDataModel.WrappedEncKey, kek, encKey.Key);
+            rfc3394.UnwrapKey(_v2KeystoreDataModel.WrappedMacKey, kek, macKey.Key);
+
+            // Create copies of keys for later use
+            return new EncAndMacKey(encKey.CreateCopy(), macKey.CreateCopy());
+        }
+
+        /// <inheritdoc/>
+        public async Task MigrateAsync(IDisposable unlockContract, ProgressModel<IResult> progress, CancellationToken cancellationToken = default)
+        {
+            if (_v2ConfigDataModel is null)
+                throw new InvalidOperationException($"{nameof(_v2ConfigDataModel)} is null.");
+
+            if (unlockContract is not EncAndMacKey encAndMacKey)
+                throw new ArgumentException($"{nameof(unlockContract)} is not of correct type.");
+
+            // Begin progress report
+            progress.PercentageProgress?.Report(0d);
+
+            var vaultId = Guid.NewGuid().ToString();
+            var v3ConfigDataModel = new VaultConfigurationDataModel()
+            {
+                AuthenticationMethod = _v2ConfigDataModel.AuthenticationMethod,
+                ContentCipherId = _v2ConfigDataModel.ContentCipherId,
+                FileNameCipherId = _v2ConfigDataModel.FileNameCipherId,
+                PayloadMac = new byte[HMACSHA256.HashSizeInBytes],
+                Uid = _v2ConfigDataModel.Uid,
+                Version = Constants.Vault.Versions.V3
+            };
+
+            // Calculate and update configuration MAC
+
+            var encKey = encAndMacKey.EncKey;
+            var macKey = encAndMacKey.MacKey;
+
+            // Initialize HMAC
+            using var hmacSha256 = new HMACSHA256(macKey.Key);
+
+            // Update HMAC
+            hmacSha256.AppendData(BitConverter.GetBytes(Constants.Vault.Versions.LATEST_VERSION));
+            hmacSha256.AppendData(BitConverter.GetBytes(CryptHelpers.ContentCipherId(v3ConfigDataModel.ContentCipherId)));
+            hmacSha256.AppendData(BitConverter.GetBytes(CryptHelpers.FileNameCipherId(v3ConfigDataModel.FileNameCipherId)));
+            hmacSha256.AppendData(Encoding.UTF8.GetBytes(v3ConfigDataModel.FileNameEncodingId));
+            hmacSha256.AppendData(Encoding.UTF8.GetBytes(v3ConfigDataModel.Uid));
+            hmacSha256.AppendFinalData(Encoding.UTF8.GetBytes(v3ConfigDataModel.AuthenticationMethod));
+
+            // Fill the hash to payload
+            hmacSha256.GetCurrentHash(v3ConfigDataModel.PayloadMac);
+
+            var configFile = await VaultFolder.GetFileByNameAsync(Constants.Vault.Names.VAULT_CONFIGURATION_FILENAME, cancellationToken);
+            await using var configStream = await configFile.OpenReadWriteAsync(cancellationToken);
+
+            // Create backup
+            if (VaultFolder is IModifiableFolder modifiableFolder)
+            {
+                await BackupHelpers.CreateConfigBackup(modifiableFolder, configStream, cancellationToken);
+                await BackupHelpers.CreateKeystoreBackup(modifiableFolder, cancellationToken);
+            }
+
+            await using var serializedStream = await _streamSerializer.SerializeAsync(v3ConfigDataModel, cancellationToken);
+            await serializedStream.CopyToAsync(configStream, cancellationToken);
+
+            // End progress report
+            progress.PercentageProgress?.Report(100d);
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Core.Migration/AppModels/V1_V2/V1VaultConfigurationDataModel.cs b/src/SecureFolderFS.Core.Migration/DataModels/V1VaultConfigurationDataModel.cs
similarity index 95%
rename from src/SecureFolderFS.Core.Migration/AppModels/V1_V2/V1VaultConfigurationDataModel.cs
rename to src/SecureFolderFS.Core.Migration/DataModels/V1VaultConfigurationDataModel.cs
index c5ddff8bc..4602653c6 100644
--- a/src/SecureFolderFS.Core.Migration/AppModels/V1_V2/V1VaultConfigurationDataModel.cs
+++ b/src/SecureFolderFS.Core.Migration/DataModels/V1VaultConfigurationDataModel.cs
@@ -2,7 +2,7 @@
 using System.ComponentModel;
 using System.Text.Json.Serialization;
 
-namespace SecureFolderFS.Core.Migration.AppModels.V1_V2
+namespace SecureFolderFS.Core.Migration.DataModels
 {
     [Serializable]
     [EditorBrowsable(EditorBrowsableState.Never)]
diff --git a/src/SecureFolderFS.Core.Migration/DataModels/V2VaultConfigurationDataModel.cs b/src/SecureFolderFS.Core.Migration/DataModels/V2VaultConfigurationDataModel.cs
new file mode 100644
index 000000000..5c5f8d8aa
--- /dev/null
+++ b/src/SecureFolderFS.Core.Migration/DataModels/V2VaultConfigurationDataModel.cs
@@ -0,0 +1,46 @@
+using SecureFolderFS.Core.DataModels;
+using System;
+using System.ComponentModel;
+using System.Text.Json.Serialization;
+using static SecureFolderFS.Core.Constants.Vault;
+
+namespace SecureFolderFS.Core.Migration.DataModels
+{
+    [Serializable]
+    public sealed class V2VaultConfigurationDataModel : VersionDataModel
+    {
+        /// <summary>
+        /// Gets the ID for content encryption.
+        /// </summary>
+        [JsonPropertyName(Associations.ASSOC_CONTENT_CIPHER_ID)]
+        [DefaultValue("")]
+        public required string ContentCipherId { get; init; }
+
+        /// <summary>
+        /// Gets the ID for file name encryption.
+        /// </summary>
+        [JsonPropertyName(Associations.ASSOC_FILENAME_CIPHER_ID)]
+        [DefaultValue("")]
+        public required string FileNameCipherId { get; init; }
+
+        /// <summary>
+        /// Gets the information about the authentication method used for this vault.
+        /// </summary>
+        [JsonPropertyName(Associations.ASSOC_AUTHENTICATION)]
+        [DefaultValue("")]
+        public required string AuthenticationMethod { get; set; } = string.Empty;
+
+        /// <summary>
+        /// Gets the unique identifier of the vault represented by a GUID.
+        /// </summary>
+        [JsonPropertyName(Associations.ASSOC_VAULT_ID)]
+        [DefaultValue("")]
+        public required string Uid { get; init; } = string.Empty;
+
+        /// <summary>
+        /// Gets the HMAC-SHA256 hash of the payload.
+        /// </summary>
+        [JsonPropertyName("hmacsha256mac")]
+        public byte[]? PayloadMac { get; set; }
+    }
+}
diff --git a/src/SecureFolderFS.Core.Migration/Helpers/BackupHelpers.cs b/src/SecureFolderFS.Core.Migration/Helpers/BackupHelpers.cs
new file mode 100644
index 000000000..a6d588c9b
--- /dev/null
+++ b/src/SecureFolderFS.Core.Migration/Helpers/BackupHelpers.cs
@@ -0,0 +1,30 @@
+using OwlCore.Storage;
+using SecureFolderFS.Storage.Extensions;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace SecureFolderFS.Core.Migration.Helpers
+{
+    internal static class BackupHelpers
+    {
+        public static async Task CreateConfigBackup(IModifiableFolder vaultFolder, Stream configStream, CancellationToken cancellationToken)
+        {
+            var backupConfigName = $"{Constants.Vault.Names.VAULT_CONFIGURATION_FILENAME}.bkup";
+            var backupConfigFile = await vaultFolder.CreateFileAsync(backupConfigName, true, cancellationToken);
+            await using var backupConfigStream = await backupConfigFile.OpenWriteAsync(cancellationToken);
+
+            await configStream.CopyToAsync(backupConfigStream, cancellationToken);
+            configStream.Position = 0L;
+        }
+
+        public static async Task CreateKeystoreBackup(IModifiableFolder vaultFolder, CancellationToken cancellationToken)
+        {
+            var keystoreFile = await vaultFolder.GetFileByNameAsync(Constants.Vault.Names.VAULT_KEYSTORE_FILENAME, cancellationToken);
+            var backupKeystoreName = $"{Constants.Vault.Names.VAULT_KEYSTORE_FILENAME}.bkup";
+            var backupKeystoreFile = await vaultFolder.CreateFileAsync(backupKeystoreName, true, cancellationToken);
+
+            await keystoreFile.CopyContentsToAsync(backupKeystoreFile, cancellationToken);
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Core.Migration/Migrators.cs b/src/SecureFolderFS.Core.Migration/Migrators.cs
index cd95ad864..421fcff0f 100644
--- a/src/SecureFolderFS.Core.Migration/Migrators.cs
+++ b/src/SecureFolderFS.Core.Migration/Migrators.cs
@@ -1,5 +1,5 @@
 using OwlCore.Storage;
-using SecureFolderFS.Core.Migration.AppModels.V1_V2;
+using SecureFolderFS.Core.Migration.AppModels;
 using SecureFolderFS.Shared.ComponentModel;
 using SecureFolderFS.Shared.Models;
 using System.IO;
@@ -12,5 +12,10 @@ public static IVaultMigratorModel GetMigratorV1_V2(IFolder vaultFolder, IAsyncSe
         {
             return new MigratorV1_V2(vaultFolder, streamSerializer);
         }
+
+        public static IVaultMigratorModel GetMigratorV2_V3(IFolder vaultFolder, IAsyncSerializer<Stream> streamSerializer)
+        {
+            return new MigratorV2_V3(vaultFolder, streamSerializer);
+        }
     }
 }
diff --git a/src/SecureFolderFS.Core.Migration/SecureFolderFS.Core.Migration.csproj b/src/SecureFolderFS.Core.Migration/SecureFolderFS.Core.Migration.csproj
index 060cd8e13..80fc7f5b8 100644
--- a/src/SecureFolderFS.Core.Migration/SecureFolderFS.Core.Migration.csproj
+++ b/src/SecureFolderFS.Core.Migration/SecureFolderFS.Core.Migration.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
diff --git a/src/SecureFolderFS.Core.MobileFS/Constants.cs b/src/SecureFolderFS.Core.MobileFS/Constants.cs
index 07835b260..a4c67423b 100644
--- a/src/SecureFolderFS.Core.MobileFS/Constants.cs
+++ b/src/SecureFolderFS.Core.MobileFS/Constants.cs
@@ -2,16 +2,31 @@
 {
     public static class Constants
     {
-        public const string ANDROID_FILE_SYSTEM_NAME = "Android SAF";
-        public const string IOS_FILE_SYSTEM_NAME = "iOS File Provider Extension";
+        public static class IOS
+        {
+            public static class FileSystem
+            {
+                public const string FS_ID = "IOS_FILE_PROVIDER";
+                public const string FS_NAME = "iOS File Provider";
+            }
+        }
 
-        internal static class AndroidSaf
+        public static class Android
         {
-            public const string FILE_SYSTEM_ROOT_ID = "root";
-            public const string ROOT_DIRECTORY_ID = "directoryRoot";
-            public const string ROOT_DIRECTORY_SECONDARY_ID = "shallowRoot";
+            public static class FileSystem
+            {
+                public const string FS_ID = "ANDROID_DOCUMENTS_PROVIDER";
+                public const string FS_NAME = "Android SAF";
+            }
+
+            internal static class Saf
+            {
+                public const string FILE_SYSTEM_ROOT_ID = "root";
+                public const string ROOT_DIRECTORY_ID = "directoryRoot";
+                public const string ROOT_DIRECTORY_SECONDARY_ID = "shallowRoot";
 
-            public const int IC_LOCK_LOCK = 0x0108002f; // ic_lock_lock
+                public const int IC_LOCK_LOCK = 0x0108002f; // ic_lock_lock
+            }
         }
     }
 }
diff --git a/src/SecureFolderFS.Core.MobileFS/Platforms/Android/AndroidFileSystem.cs b/src/SecureFolderFS.Core.MobileFS/Platforms/Android/AndroidFileSystem.cs
new file mode 100644
index 000000000..bb2e9c304
--- /dev/null
+++ b/src/SecureFolderFS.Core.MobileFS/Platforms/Android/AndroidFileSystem.cs
@@ -0,0 +1,45 @@
+using OwlCore.Storage;
+using SecureFolderFS.Core.Cryptography;
+using SecureFolderFS.Core.FileSystem;
+using SecureFolderFS.Core.FileSystem.AppModels;
+using SecureFolderFS.Core.FileSystem.Extensions;
+using SecureFolderFS.Core.FileSystem.Storage;
+using SecureFolderFS.Core.MobileFS.Platforms.Android.FileSystem;
+using SecureFolderFS.Shared.ComponentModel;
+using SecureFolderFS.Storage.Enums;
+using SecureFolderFS.Storage.VirtualFileSystem;
+using IFileSystem = SecureFolderFS.Storage.VirtualFileSystem.IFileSystem;
+
+namespace SecureFolderFS.Core.MobileFS.Platforms.Android
+{
+    /// <inheritdoc cref="IFileSystem"/>
+    public sealed class AndroidFileSystem : IFileSystem
+    {
+        /// <inheritdoc/>
+        public string Id { get; } = Constants.Android.FileSystem.FS_ID;
+
+        /// <inheritdoc/>
+        public string Name { get; } = Constants.Android.FileSystem.FS_NAME;
+
+        /// <inheritdoc/>
+        public Task<FileSystemAvailability> GetStatusAsync(CancellationToken cancellationToken = default)
+        {
+            return Task.FromResult(FileSystemAvailability.Available);
+        }
+
+        /// <inheritdoc/>
+        public async Task<IVFSRoot> MountAsync(IFolder folder, IDisposable unlockContract, IDictionary<string, object> options, CancellationToken cancellationToken = default)
+        {
+            await Task.CompletedTask;
+            if (unlockContract is not IWrapper<Security> wrapper)
+                throw new ArgumentException($"The {nameof(unlockContract)} is invalid.");
+
+            var fileSystemOptions = FileSystemOptions.ToOptions(options, static () => new HealthStatistics(), static () => new FileSystemStatistics());
+            var specifics = FileSystemSpecifics.CreateNew(wrapper.Inner, folder, fileSystemOptions);
+            fileSystemOptions.SetupValidators(specifics);
+
+            var storageRoot = new CryptoFolder(Path.DirectorySeparatorChar.ToString(), specifics.ContentFolder, specifics);
+            return new AndroidVFSRoot(storageRoot, specifics);
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Core.MobileFS/Platforms/Android/AndroidFileSystemMountable.cs b/src/SecureFolderFS.Core.MobileFS/Platforms/Android/AndroidFileSystemMountable.cs
deleted file mode 100644
index d579b9b20..000000000
--- a/src/SecureFolderFS.Core.MobileFS/Platforms/Android/AndroidFileSystemMountable.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using OwlCore.Storage;
-using SecureFolderFS.Core.FileSystem;
-using SecureFolderFS.Core.FileSystem.AppModels;
-using SecureFolderFS.Core.FileSystem.Enums;
-using SecureFolderFS.Core.FileSystem.Storage;
-using SecureFolderFS.Core.MobileFS.Platforms.Android.FileSystem;
-using SecureFolderFS.Storage.VirtualFileSystem;
-
-namespace SecureFolderFS.Core.MobileFS.Platforms.Android
-{
-    /// <inheritdoc cref="IMountableFileSystem"/>
-    public sealed class AndroidFileSystemMountable : IMountableFileSystem, IAvailabilityChecker
-    {
-        private readonly IFolder _storageRoot;
-        private readonly FileSystemOptions _options;
-
-        private AndroidFileSystemMountable(IFolder storageRoot, FileSystemOptions options)
-        {
-            _storageRoot = storageRoot;
-            _options = options;
-        }
-
-        /// <inheritdoc/>
-        public static FileSystemAvailabilityType IsSupported()
-        {
-            return FileSystemAvailabilityType.Available;
-        }
-
-        /// <inheritdoc/>
-        public async Task<IVFSRoot> MountAsync(MountOptions mountOptions, CancellationToken cancellationToken = default)
-        {
-            await Task.CompletedTask;
-            return new AndroidVFSRoot(_storageRoot, _options);
-        }
-
-        public static IMountableFileSystem CreateMountable(FileSystemSpecifics specifics)
-        {
-            var cryptoFolder = new CryptoFolder(Path.DirectorySeparatorChar.ToString(), specifics.ContentFolder, specifics);
-            return new AndroidFileSystemMountable(cryptoFolder, specifics.FileSystemOptions);
-        }
-    }
-}
diff --git a/src/SecureFolderFS.Core.MobileFS/Platforms/Android/AndroidMountOptions.cs b/src/SecureFolderFS.Core.MobileFS/Platforms/Android/AndroidMountOptions.cs
deleted file mode 100644
index c1d319a27..000000000
--- a/src/SecureFolderFS.Core.MobileFS/Platforms/Android/AndroidMountOptions.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using SecureFolderFS.Core.FileSystem.AppModels;
-
-namespace SecureFolderFS.Core.MobileFS.Platforms.Android
-{
-    /// <inheritdoc cref="MountOptions"/>
-    public sealed class AndroidMountOptions : MountOptions
-    {
-        // TODO: Maybe add root_id?
-    }
-}
diff --git a/src/SecureFolderFS.Core.MobileFS/Platforms/Android/FileSystem/AndroidVFSRoot.cs b/src/SecureFolderFS.Core.MobileFS/Platforms/Android/FileSystem/AndroidVFSRoot.cs
index 11a7eaa43..1cd5ffaea 100644
--- a/src/SecureFolderFS.Core.MobileFS/Platforms/Android/FileSystem/AndroidVFSRoot.cs
+++ b/src/SecureFolderFS.Core.MobileFS/Platforms/Android/FileSystem/AndroidVFSRoot.cs
@@ -1,6 +1,5 @@
 using OwlCore.Storage;
 using SecureFolderFS.Core.FileSystem;
-using SecureFolderFS.Core.FileSystem.AppModels;
 using SecureFolderFS.Storage.VirtualFileSystem;
 
 namespace SecureFolderFS.Core.MobileFS.Platforms.Android.FileSystem
@@ -11,10 +10,10 @@ internal sealed class AndroidVFSRoot : VFSRoot
         private bool _disposed;
 
         /// <inheritdoc/>
-        public override string FileSystemName { get; } = Constants.ANDROID_FILE_SYSTEM_NAME;
+        public override string FileSystemName { get; } = Constants.Android.FileSystem.FS_NAME;
 
-        public AndroidVFSRoot(IFolder storageRoot, FileSystemOptions options)
-            : base(storageRoot, options)
+        public AndroidVFSRoot(IFolder storageRoot, FileSystemSpecifics specifics)
+            : base(storageRoot, specifics)
         {
         }
 
@@ -24,7 +23,7 @@ public override ValueTask DisposeAsync()
             if (!_disposed)
             {
                 _disposed = true;
-                FileSystemManager.Instance.RemoveRoot(this);
+                FileSystemManager.Instance.FileSystems.Remove(this);
             }
 
             return ValueTask.CompletedTask;
diff --git a/src/SecureFolderFS.Core.MobileFS/Platforms/Android/FileSystem/FileSystemProvider.Helpers.cs b/src/SecureFolderFS.Core.MobileFS/Platforms/Android/FileSystem/FileSystemProvider.Helpers.cs
index 2c6965e9e..cbb49ce16 100644
--- a/src/SecureFolderFS.Core.MobileFS/Platforms/Android/FileSystem/FileSystemProvider.Helpers.cs
+++ b/src/SecureFolderFS.Core.MobileFS/Platforms/Android/FileSystem/FileSystemProvider.Helpers.cs
@@ -2,6 +2,8 @@
 using Android.Provider;
 using Android.Webkit;
 using OwlCore.Storage;
+using SecureFolderFS.Storage.Extensions;
+using SecureFolderFS.Storage.StorageProperties;
 using static Android.Provider.DocumentsContract;
 using IOPath = System.IO.Path;
 
@@ -9,41 +11,112 @@ namespace SecureFolderFS.Core.MobileFS.Platforms.Android.FileSystem
 {
     internal sealed partial class FileSystemProvider
     {
-        private bool AddStorable(MatrixCursor matrix, IStorable storable, string? documentId)
+        private bool AddRoot(MatrixCursor matrix, SafRoot safRoot, int iconRid)
         {
-            documentId ??= GetDocumentIdForStorable(storable, null);
             var row = matrix.NewRow();
             if (row is null)
                 return false;
 
-            // TODO(saf): Implement columns
-            row.Add(Document.ColumnSize, 6);
-            row.Add(Document.ColumnLastModified, DateTimeOffset.UtcNow.ToUnixTimeSeconds().ToString());
+            var rootFolderId = GetDocumentIdForStorable(safRoot.StorageRoot.Inner, safRoot.RootId);
+            row.Add(DocumentsContract.Root.ColumnRootId, safRoot.RootId);
+            row.Add(DocumentsContract.Root.ColumnDocumentId, rootFolderId);
+            row.Add(DocumentsContract.Root.ColumnTitle, safRoot.StorageRoot.Options.VolumeName);
+            row.Add(DocumentsContract.Root.ColumnIcon, iconRid);
+            row.Add(DocumentsContract.Root.ColumnFlags, (int)(DocumentRootFlags.LocalOnly | DocumentRootFlags.SupportsCreate));
 
-            row.Add(Document.ColumnDocumentId, documentId);
-            row.Add(Document.ColumnMimeType, GetMimeForStorable(storable));
+            return true;
+        }
+        
+        private async Task<bool> AddDocumentAsync(MatrixCursor matrix, IStorable storable, string? documentId)
+        {
+            documentId ??= GetDocumentIdForStorable(storable, null);
+            var row = matrix.NewRow();
+            if (row is null)
+                return false;
 
-            if (storable is not IFolder)
-                row.Add(Document.ColumnFlags, (int)(DocumentContractFlags.SupportsDelete | DocumentContractFlags.SupportsWrite));
-            else
-                row.Add(Document.ColumnFlags, (int)(DocumentContractFlags.DirSupportsCreate | DocumentContractFlags.DirPrefersLastModified | DocumentContractFlags.DirPrefersGrid));
+            var safRoot = _rootCollection?.GetSafRootForStorable(storable);
+            if (safRoot is null)
+                return false;
+            
+            AddDocumentId();
+            AddDisplayName();
+            await AddSizeAsync();
+            AddMimeType();
+            AddFlags();
+            
+            return true;
 
-            if (string.IsNullOrEmpty(storable.Name))
+            async Task AddSizeAsync()
             {
-                var safRoot = _rootCollection?.GetRootForRootId(documentId?.Split(':')[0] ?? string.Empty);
-                row.Add(Document.ColumnDisplayName, safRoot?.StorageRoot.StorageName ?? storable.Name);
+                if (storable is not IStorableProperties storableProperties)
+                {
+                    row.Add(Document.ColumnSize, 0);
+                    return;
+                }
+
+                var basicProperties = await storableProperties.TryGetPropertiesAsync();
+                if (basicProperties is not ISizeProperties sizeProperties)
+                {
+                    row.Add(Document.ColumnSize, 0);
+                    return;
+                }
+
+                var sizeProperty = await sizeProperties.GetSizeAsync();
+                if (sizeProperty is null)
+                {
+                    row.Add(Document.ColumnSize, 0);
+                    return;
+                }
+
+                row.Add(Document.ColumnSize, sizeProperty.Value);
+            }
+            void AddFlags()
+            {
+                var baseFlags = (DocumentContractFlags)0;
+                if (!safRoot.StorageRoot.Options.IsReadOnly)
+                {
+                    baseFlags |= DocumentContractFlags.SupportsCopy
+                                 | DocumentContractFlags.SupportsMove
+                                 | DocumentContractFlags.SupportsRename
+                                 | DocumentContractFlags.SupportsDelete
+                                 | DocumentContractFlags.SupportsRemove;
+                }
+                
+                if (storable is IFile)
+                {
+                    if (!safRoot.StorageRoot.Options.IsReadOnly)
+                        baseFlags |= DocumentContractFlags.SupportsWrite;
+                    
+                    row.Add(Document.ColumnFlags, (int)baseFlags);
+                }
+                else
+                {
+                    baseFlags |= DocumentContractFlags.DirPrefersGrid;
+                    if (!safRoot.StorageRoot.Options.IsReadOnly)
+                        baseFlags |= DocumentContractFlags.DirSupportsCreate;
+                    
+                    row.Add(Document.ColumnFlags, (int)baseFlags);
+                }
+            }
+            void AddMimeType() => row.Add(Document.ColumnMimeType, GetMimeForStorable(storable));
+            void AddDocumentId() => row.Add(Document.ColumnDocumentId, documentId);
+            void AddDisplayName()
+            {
+                if (string.IsNullOrEmpty(storable.Name))
+                {
+                    var safRoot = _rootCollection?.GetSafRootForRootId(documentId?.Split(':')[0] ?? string.Empty);
+                    row.Add(Document.ColumnDisplayName, safRoot?.StorageRoot.Options.VolumeName ?? storable.Name);
+                }
+                else
+                    row.Add(Document.ColumnDisplayName, storable.Name);
             }
-            else
-                row.Add(Document.ColumnDisplayName, storable.Name);
-
-            return true;
         }
 
         private string? GetDocumentIdForStorable(IStorable storable, string? rootId)
         {
             var safRoot = rootId is not null
-                ? _rootCollection?.GetRootForRootId(rootId)
-                : _rootCollection?.GetRootForStorable(storable);
+                ? _rootCollection?.GetSafRootForRootId(rootId)
+                : _rootCollection?.GetSafRootForStorable(storable);
 
             if (safRoot is null)
                 return null;
@@ -59,16 +132,23 @@ private bool AddStorable(MatrixCursor matrix, IStorable storable, string? docume
             if (_rootCollection is null)
                 return null;
 
-            var split = documentId.Split(':');
+            // Split the documentId into two:
+            // 1. RootID - The source root of the document provider where the item belongs
+            // 2. Path - The path to an item
+            var split = documentId.Split(':', 2);
             if (split.Length < 2)
-                throw new FileNotFoundException("Invalid document ID: " + documentId);
+                return null;
 
+            // Extract RootID and Path
             var rootId = split[0];
-            var safRoot = _rootCollection.GetRootForRootId(rootId);
+            var path = split[1];
+            
+            // Get root
+            var safRoot = _rootCollection.GetSafRootForRootId(rootId);
             if (safRoot is null)
                 return null;
 
-            var path = split[1];
+            // Return base folder if the path is empty
             if (string.IsNullOrEmpty(path))
                 return safRoot.StorageRoot.Inner;
 
@@ -80,9 +160,13 @@ private string GetMimeForStorable(IStorable storable)
             if (storable is IFolder)
                 return Document.MimeTypeDir;
 
-            // Get extension without the starting . (dot)
-            var extension = IOPath.GetExtension(storable.Name).Substring(1);
-            return MimeTypeMap.Singleton?.GetMimeTypeFromExtension(extension) ?? string.Empty;
+            // Get the extension
+            var extension = IOPath.GetExtension(storable.Name);
+            if (string.IsNullOrEmpty(extension))
+                return "application/octet-stream";
+
+            // Remove the starting . (dot)
+            return MimeTypeMap.Singleton?.GetMimeTypeFromExtension(extension.Substring(1)) ?? string.Empty;
         }
     }
 }
diff --git a/src/SecureFolderFS.Core.MobileFS/Platforms/Android/FileSystem/FileSystemProvider.Main.cs b/src/SecureFolderFS.Core.MobileFS/Platforms/Android/FileSystem/FileSystemProvider.Main.cs
index 9800953ea..fcd8b020b 100644
--- a/src/SecureFolderFS.Core.MobileFS/Platforms/Android/FileSystem/FileSystemProvider.Main.cs
+++ b/src/SecureFolderFS.Core.MobileFS/Platforms/Android/FileSystem/FileSystemProvider.Main.cs
@@ -2,16 +2,18 @@
 using Android.Content;
 using Android.Database;
 using Android.OS;
+using Android.OS.Storage;
 using Android.Provider;
 using OwlCore.Storage;
+using SecureFolderFS.Shared.ComponentModel;
 using SecureFolderFS.Storage.Extensions;
-using static Android.Provider.DocumentsContract;
+using SecureFolderFS.Storage.Renamable;
 using static SecureFolderFS.Core.MobileFS.Platforms.Android.FileSystem.Projections;
 
 namespace SecureFolderFS.Core.MobileFS.Platforms.Android.FileSystem
 {
     [ContentProvider(["${applicationId}.provider"],
-        Name = "com.securefolderfs.securefolderfs.provider",
+        Name = "org.securefolderfs.securefolderfs.provider",
         Permission = "android.permission.MANAGE_DOCUMENTS",
         Enabled = true,
         Exported = true,
@@ -19,8 +21,14 @@ namespace SecureFolderFS.Core.MobileFS.Platforms.Android.FileSystem
     [IntentFilter(["android.content.action.DOCUMENTS_PROVIDER"])]
     internal sealed partial class FileSystemProvider : DocumentsProvider
     {
+        private readonly StorageManagerCompat _storageManager;
         private RootCollection? _rootCollection;
 
+        public FileSystemProvider()
+        {
+            _storageManager = new(Platform.AppContext);
+        }
+
         /// <inheritdoc/>
         public override bool OnCreate()
         {
@@ -34,74 +42,96 @@ public override bool OnCreate()
             var matrix = new MatrixCursor(projection ?? DefaultRootProjection);
             foreach (var item in _rootCollection?.Roots ?? Enumerable.Empty<SafRoot>())
             {
-                var row = matrix.NewRow();
-                if (row is null)
-                    return null;
-
-                row.Add(Root.ColumnRootId, item.RootId);
-                row.Add(Root.ColumnIcon, Constants.AndroidSaf.IC_LOCK_LOCK);
-                row.Add(Root.ColumnTitle, item.StorageRoot.StorageName);
-                row.Add(Root.ColumnDocumentId, GetDocumentIdForStorable(item.StorageRoot.Inner, item.RootId));
-                row.Add(Root.ColumnFlags, (int)(DocumentRootFlags.LocalOnly | DocumentRootFlags.SupportsCreate));
+                AddRoot(matrix, item, Constants.Android.Saf.IC_LOCK_LOCK);
             }
 
             return matrix;
         }
 
+        /// <inheritdoc/>
+        public override string? CreateDocument(string? parentDocumentId, string? mimeType, string? displayName)
+        {
+            parentDocumentId = parentDocumentId == "null" ? null : parentDocumentId;
+            if (parentDocumentId is null || displayName is null)
+                return null;
+
+            var parentStorable = GetStorableForDocumentId(parentDocumentId);
+            if (parentStorable is not IModifiableFolder parentFolder)
+                return null;
+
+            var safRoot = _rootCollection?.GetSafRootForStorable(parentStorable);
+            if (safRoot is null)
+                return null;
+
+            if (safRoot.StorageRoot.Options.IsReadOnly)
+                return null;
+
+            var createdItem = (IStorableChild)(mimeType switch
+            {
+                DocumentsContract.Document.MimeTypeDir => parentFolder.CreateFolderAsync(displayName, false)
+                    .ConfigureAwait(false).GetAwaiter().GetResult(),
+                _ => parentFolder.CreateFileAsync(displayName, false).ConfigureAwait(false).GetAwaiter().GetResult()
+            });
+
+            var rootId = parentDocumentId.Split(':', 2)[0];
+            return $"{rootId}:{createdItem.Id}";
+        }
+
         /// <inheritdoc/>
         public override ParcelFileDescriptor? OpenDocument(string? documentId, string? mode, CancellationSignal? signal)
         {
+            documentId = documentId == "null" ? null : documentId;
             if (documentId is null)
                 return null;
 
             var file = GetStorableForDocumentId(documentId);
             if (file is not IChildFile childFile)
                 return null;
+            
+            var safRoot = _rootCollection?.GetSafRootForStorable(file);
+            if (safRoot is null)
+                return null;
 
             var fileAccess = ToFileAccess(mode);
-            if (fileAccess is null)
+            if (safRoot.StorageRoot.Options.IsReadOnly && fileAccess.HasFlag(FileAccess.Write))
                 return null;
-
-            var stream = childFile.TryOpenStreamAsync(fileAccess.Value).ConfigureAwait(false).GetAwaiter().GetResult();
+            
+            var stream = childFile.TryOpenStreamAsync(fileAccess).ConfigureAwait(false).GetAwaiter().GetResult();
             if (stream is null)
                 return null;
 
-            var pipe = ParcelFileDescriptor.CreatePipe();
-            if (pipe is null)
+            var parcelFileMode = ToParcelFileMode(mode);
+            if (safRoot.StorageRoot.Options.IsReadOnly && parcelFileMode is ParcelFileMode.WriteOnly or ParcelFileMode.ReadWrite)
                 return null;
+            
+            return _storageManager.OpenProxyFileDescriptor(parcelFileMode, new ReadWriteCallbacks(stream), new Handler(Looper.MainLooper));
+            
+            // var storageManager = (StorageManager?)this.Context?.GetSystemService(Context.StorageService);
+            // if (storageManager is null)
+            //     return null;
+            //
+            // var parcelFileMode = ToParcelFileMode(mode);
+            // return storageManager.OpenProxyFileDescriptor(parcelFileMode, new ReadWriteCallbacks(stream), new Handler(Looper.MainLooper!));
 
-            var readingPipe = pipe[0];
-            var writingPipe = pipe[1];
-
-            try
+            static ParcelFileMode ToParcelFileMode(string? fileMode)
             {
-                using var output = new ParcelFileDescriptor.AutoCloseOutputStream(writingPipe);
-                var buffer = new byte[8192];
-                int bytesRead;
-                while ((bytesRead = stream.Read(buffer, 0, buffer.Length)) > 0)
+                return fileMode switch
                 {
-                    output.Write(buffer, 0, bytesRead);
-                }
-                output.Flush();
-            }
-            catch (IOException e)
-            {
-                System.Diagnostics.Debug.WriteLine("Error writing to pipe: " + e.Message);
+                    "r" => ParcelFileMode.ReadOnly,
+                    "w" => ParcelFileMode.WriteOnly,
+                    "rw" => ParcelFileMode.ReadWrite,
+                    _ => throw new ArgumentException($"Unsupported mode: {fileMode}")
+                };
             }
-
-            return readingPipe;
-
-            static FileAccess? ToFileAccess(string? mode)
+            
+            static FileAccess ToFileAccess(string? fileMode)
             {
-                if (string.IsNullOrEmpty(mode))
-                    return null;
-
-                return mode switch
+                return fileMode switch
                 {
                     "r" => FileAccess.Read,
                     "w" => FileAccess.Write,
                     "rw" => FileAccess.ReadWrite,
-                    _ => FileAccess.Read
+                    _ => throw new ArgumentException($"Unsupported mode: {fileMode}")
                 };
             }
         }
@@ -109,6 +139,7 @@ public override bool OnCreate()
         /// <inheritdoc/>
         public override ICursor? QueryDocument(string? documentId, string[]? projection)
         {
+            documentId = documentId == "null" ? null : documentId;
             var matrix = new MatrixCursor(projection ?? DefaultDocumentProjection);
             if (documentId is null)
                 return matrix;
@@ -117,13 +148,14 @@ public override bool OnCreate()
             if (storable is null)
                 return matrix;
 
-            AddStorable(matrix, storable, documentId);
+            AddDocumentAsync(matrix, storable, documentId).ConfigureAwait(false).GetAwaiter().GetResult();
             return matrix;
         }
 
         /// <inheritdoc/>
         public override ICursor? QueryChildDocuments(string? parentDocumentId, string[]? projection, string? sortOrder)
         {
+            parentDocumentId = parentDocumentId == "null" ? null : parentDocumentId;
             var matrix = new MatrixCursor(projection ?? DefaultDocumentProjection);
             if (parentDocumentId is null)
                 return matrix;
@@ -135,10 +167,158 @@ public override bool OnCreate()
             var items = folder.GetItemsAsync().ToArrayAsync().ConfigureAwait(false).GetAwaiter().GetResult();
             foreach (var item in items)
             {
-                AddStorable(matrix, item, null);
+                AddDocumentAsync(matrix, item, null).ConfigureAwait(false).GetAwaiter().GetResult();
             }
 
             return matrix;
         }
+
+        /// <inheritdoc/>
+        public override void RemoveDocument(string? documentId, string? parentDocumentId)
+        {
+            DeleteDocument(documentId);
+        }
+
+        /// <inheritdoc/>
+        public override void DeleteDocument(string? documentId)
+        {
+            documentId = documentId == "null" ? null : documentId;
+            if (documentId is null)
+                return;
+            
+            var storable = GetStorableForDocumentId(documentId);
+            if (storable is not IStorableChild storableChild)
+                return;
+            
+            var safRoot = _rootCollection?.GetSafRootForStorable(storable);
+            if (safRoot is null)
+                return;
+            
+            if (safRoot.StorageRoot.Options.IsReadOnly)
+                return;
+
+            var parentFolder = storableChild.GetParentAsync().ConfigureAwait(false).GetAwaiter().GetResult();
+            if (parentFolder is not IModifiableFolder modifiableFolder)
+                return;
+
+            // Revoke permissions first
+            RevokeDocumentPermission(documentId);
+            
+            // Perform deletion
+            modifiableFolder.DeleteAsync(storableChild).ConfigureAwait(false).GetAwaiter().GetResult();
+        }
+
+        /// <inheritdoc/>
+        public override string? MoveDocument(string? sourceDocumentId, string? sourceParentDocumentId, string? targetParentDocumentId)
+        {
+            sourceDocumentId = sourceDocumentId == "null" ? null : sourceDocumentId;
+            sourceParentDocumentId = sourceParentDocumentId == "null" ? null : sourceParentDocumentId;
+            targetParentDocumentId = targetParentDocumentId == "null" ? null : targetParentDocumentId;
+            if (sourceDocumentId is null || targetParentDocumentId is null || sourceParentDocumentId is null)
+                return null;
+
+            var destinationStorable = GetStorableForDocumentId(targetParentDocumentId);
+            if (destinationStorable is not IModifiableFolder destinationFolder)
+                return null;
+            
+            var safRoot = _rootCollection?.GetSafRootForStorable(destinationStorable);
+            if (safRoot is null)
+                return null;
+            
+            if (safRoot.StorageRoot.Options.IsReadOnly)
+                return null;
+
+            var sourceParentStorable = GetStorableForDocumentId(sourceParentDocumentId);
+            if (sourceParentStorable is not IModifiableFolder sourceParentFolder)
+                return null;
+            
+            var sourceStorable = GetStorableForDocumentId(sourceDocumentId);
+            switch (sourceStorable)
+            {
+                case IChildFile file:
+                {
+                    var movedFile = destinationFolder.MoveFromAsync(file, sourceParentFolder, false).ConfigureAwait(false).GetAwaiter().GetResult();
+                    return Path.Combine(targetParentDocumentId, movedFile.Name);
+                }
+                
+                case IChildFolder folder:
+                {
+                    var movedFolder = destinationFolder.MoveFromAsync(folder, sourceParentFolder, false).ConfigureAwait(false).GetAwaiter().GetResult();
+                    return Path.Combine(targetParentDocumentId, movedFolder.Name);
+                }
+                
+                default: return null;
+            }
+        }
+
+        /// <inheritdoc/>
+        public override string? RenameDocument(string? documentId, string? displayName)
+        {
+            if (string.IsNullOrWhiteSpace(displayName))
+                return null;
+            
+            documentId = documentId == "null" ? null : documentId;
+            if (documentId is null)
+                return null;
+            
+            var storable = GetStorableForDocumentId(documentId);
+            if (storable is not IStorableChild storableChild)
+                return null;
+            
+            var safRoot = _rootCollection?.GetSafRootForStorable(storable);
+            if (safRoot is null)
+                return null;
+            
+            if (safRoot.StorageRoot.Options.IsReadOnly)
+                return null;
+            
+            var parentFolder = storableChild.GetParentAsync().ConfigureAwait(false).GetAwaiter().GetResult();
+            if (parentFolder is not IRenamableFolder renamableFolder)
+                return null;
+            
+            var renamedItem = renamableFolder.RenameAsync(storableChild, displayName).ConfigureAwait(false).GetAwaiter().GetResult();
+            if (renamedItem is IWrapper<IFile> { Inner: IWrapper<global::Android.Net.Uri> uriWrapper })
+                return uriWrapper.Inner.ToString();
+            
+            throw new InvalidOperationException($"{nameof(renamedItem)} does not implement {nameof(IWrapper<global::Android.Net.Uri>)}.");
+        }
+
+        /// <inheritdoc/>
+        public override string? CopyDocument(string? sourceDocumentId, string? targetParentDocumentId)
+        {
+            sourceDocumentId = sourceDocumentId == "null" ? null : sourceDocumentId;
+            targetParentDocumentId = targetParentDocumentId == "null" ? null : targetParentDocumentId;
+            if (sourceDocumentId is null || targetParentDocumentId is null)
+                return null;
+
+            var destinationStorable = GetStorableForDocumentId(targetParentDocumentId);
+            if (destinationStorable is not IModifiableFolder destinationFolder)
+                return null;
+            
+            var safRoot = _rootCollection?.GetSafRootForStorable(destinationStorable);
+            if (safRoot is null)
+                return null;
+            
+            if (safRoot.StorageRoot.Options.IsReadOnly)
+                return null;
+            
+            var sourceStorable = GetStorableForDocumentId(sourceDocumentId);
+            switch (sourceStorable)
+            {
+                case IFile file:
+                {
+                    var copiedFile = destinationFolder.CreateCopyOfAsync(file, false).ConfigureAwait(false).GetAwaiter().GetResult();
+                    return Path.Combine(targetParentDocumentId, copiedFile.Name);
+                }
+                
+                case IFolder folder:
+                {
+                    var copiedFolder = destinationFolder.CreateCopyOfAsync(folder, false).ConfigureAwait(false).GetAwaiter().GetResult();
+                    return Path.Combine(targetParentDocumentId, copiedFolder.Name);
+                }
+                
+                default: return null;
+            }
+        }
     }
 }
diff --git a/src/SecureFolderFS.Core.MobileFS/Platforms/Android/FileSystem/Projections.cs b/src/SecureFolderFS.Core.MobileFS/Platforms/Android/FileSystem/Projections.cs
index 294337945..a72ccd5f5 100644
--- a/src/SecureFolderFS.Core.MobileFS/Platforms/Android/FileSystem/Projections.cs
+++ b/src/SecureFolderFS.Core.MobileFS/Platforms/Android/FileSystem/Projections.cs
@@ -7,20 +7,19 @@ internal static class Projections
         public static string[] DefaultRootProjection { get; } =
         [
             Root.ColumnRootId,
+            Root.ColumnDocumentId,
             Root.ColumnIcon,
             Root.ColumnTitle,
-            Root.ColumnFlags,
-            Root.ColumnDocumentId
+            Root.ColumnFlags
         ];
 
         public static string[] DefaultDocumentProjection { get; } =
         [
             Document.ColumnDocumentId,
-            Document.ColumnMimeType,
             Document.ColumnDisplayName,
-            Document.ColumnLastModified,
-            Document.ColumnFlags,
-            Document.ColumnSize
+            Document.ColumnMimeType,
+            Document.ColumnSize,
+            Document.ColumnFlags
         ];
     }
 }
diff --git a/src/SecureFolderFS.Core.MobileFS/Platforms/Android/FileSystem/ReadWriteCallbacks.cs b/src/SecureFolderFS.Core.MobileFS/Platforms/Android/FileSystem/ReadWriteCallbacks.cs
new file mode 100644
index 000000000..d636b6ff4
--- /dev/null
+++ b/src/SecureFolderFS.Core.MobileFS/Platforms/Android/FileSystem/ReadWriteCallbacks.cs
@@ -0,0 +1,91 @@
+using Android.OS;
+using Android.Systems;
+
+namespace SecureFolderFS.Core.MobileFS.Platforms.Android.FileSystem
+{
+    internal sealed class ReadWriteCallbacks : StorageManagerCompat.ProxyFileDescriptorCallbackCompat
+    {
+        private readonly Stream _stream;
+
+        public ReadWriteCallbacks(Stream stream)
+        {
+            _stream = stream;
+        }
+
+        /// <inheritdoc/>
+        public override long OnGetSize()
+        {
+            return _stream.Length;
+        }
+
+        /// <inheritdoc/>
+        public override int OnRead(long offset, int size, byte[]? data)
+        {
+            try
+            {
+                if (data is null)
+                    return 0;
+                
+                // Seek to the requested offset
+                if (offset > 0)
+                    _stream.Seek(offset, SeekOrigin.Begin);
+                
+                // Read the requested data
+                return _stream.Read(data.AsSpan(0, size));
+            }
+            catch (Exception)
+            {
+                // TODO: Implement more exception handlers
+                return 0;
+                //throw new ErrnoException(nameof(OnRead), OsConstants.Eio);
+            }
+        }
+        
+        /// <inheritdoc/>
+        public override int OnWrite(long offset, int size, byte[]? data)
+        {
+            try
+            {
+                if (data is null)
+                    return 0;
+                
+                // Seek to the requested offset
+                if (offset > 0)
+                    _stream.Seek(offset, SeekOrigin.Begin);
+                
+                // Write the requested data
+                _stream.Write(data.AsSpan(0, size));
+
+                return size;
+            }
+            catch (Exception ex)
+            {
+                // TODO: Implement more exception handlers
+                _ = ex;
+                return 0;
+                //throw new ErrnoException(nameof(OnRead), OsConstants.Eio);
+            }
+        }
+
+        /// <inheritdoc/>
+        public override void OnFsync()
+        {
+            try
+            {
+                _stream.Flush();
+            }
+            catch (Exception ex)
+            {
+                _ = ex;
+                // TODO: Implement more exception handlers
+                //throw new ErrnoException(nameof(OnRead), OsConstants.Eio);
+            }
+        }
+
+        /// <inheritdoc/>
+        public override void OnRelease()
+        {
+            _stream.Dispose();
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Core.MobileFS/Platforms/Android/FileSystem/RootCollection.cs b/src/SecureFolderFS.Core.MobileFS/Platforms/Android/FileSystem/RootCollection.cs
index 0d92da521..dfd44001f 100644
--- a/src/SecureFolderFS.Core.MobileFS/Platforms/Android/FileSystem/RootCollection.cs
+++ b/src/SecureFolderFS.Core.MobileFS/Platforms/Android/FileSystem/RootCollection.cs
@@ -18,15 +18,15 @@ public RootCollection(Context context)
             _context = context;
             Roots = new();
 
-            FileSystemManager.Instance.CollectionChanged += FileSystemManager_CollectionChanged;
+            FileSystemManager.Instance.FileSystems.CollectionChanged += FileSystemManager_CollectionChanged;
         }
 
-        public SafRoot? GetRootForRootId(string rootId)
+        public SafRoot? GetSafRootForRootId(string rootId)
         {
             return Roots.FirstOrDefault(x => x.RootId == rootId);
         }
 
-        public SafRoot? GetRootForStorable(IStorable storable)
+        public SafRoot? GetSafRootForStorable(IStorable storable)
         {
             foreach (var safRoot in Roots)
             {
@@ -71,7 +71,7 @@ void NotifySafChange()
             {
                 // TODO: Make the authority change resistant to avoid unexpected errors
                 // Authority taken from ContentProviderAttribute on FileSystemProvider
-                var rootsUri = DocumentsContract.BuildRootsUri("com.securefolderfs.securefolderfs.provider");
+                var rootsUri = DocumentsContract.BuildRootsUri("org.securefolderfs.securefolderfs.provider");
                 if (rootsUri is not null)
                     _context.ContentResolver?.NotifyChange(rootsUri, null);
             }
@@ -80,7 +80,7 @@ void NotifySafChange()
         /// <inheritdoc/>
         public void Dispose()
         {
-            FileSystemManager.Instance.CollectionChanged -= FileSystemManager_CollectionChanged;
+            FileSystemManager.Instance.FileSystems.CollectionChanged -= FileSystemManager_CollectionChanged;
         }
     }
 }
diff --git a/src/SecureFolderFS.Core.MobileFS/Platforms/Android/StorageManagerCompat.cs b/src/SecureFolderFS.Core.MobileFS/Platforms/Android/StorageManagerCompat.cs
new file mode 100644
index 000000000..152eea21a
--- /dev/null
+++ b/src/SecureFolderFS.Core.MobileFS/Platforms/Android/StorageManagerCompat.cs
@@ -0,0 +1,130 @@
+using Android.Content;
+using Android.OS;
+using Android.OS.Storage;
+using Android.Systems;
+using Android.Util;
+
+namespace SecureFolderFS.Core.MobileFS.Platforms.Android
+{
+    public sealed class StorageManagerCompat
+    {
+        private const string TAG = nameof(StorageManagerCompat);
+
+        private readonly StorageManager _storageManager;
+
+        public StorageManagerCompat(Context context)
+        {
+            _storageManager = (StorageManager)context.GetSystemService(Context.StorageService)!;
+        }
+
+        public static StorageManagerCompat From(Context context) => new StorageManagerCompat(context);
+
+        public ParcelFileDescriptor OpenProxyFileDescriptor(
+            ParcelFileMode mode,
+            ProxyFileDescriptorCallbackCompat callback,
+            Handler handler)
+        {
+            // if (Build.VERSION.SdkInt >= BuildVersionCodes.O)
+            // {
+            //     return _storageManager.OpenProxyFileDescriptor(
+            //         mode,
+            //         callback.ToAndroidOsProxyFileDescriptorCallback(),
+            //         handler
+            //     );
+            // }
+
+            // Handle pre-Android O compatibility
+            if (mode != ParcelFileMode.ReadOnly && mode != ParcelFileMode.WriteOnly)
+            {
+                throw new NotSupportedException($"Mode {mode} is not supported.");
+            }
+
+            var pipe = ParcelFileDescriptor.CreateReliablePipe();
+            if (mode == ParcelFileMode.ReadOnly)
+            {
+                handler.Post(() =>
+                {
+                    try
+                    {
+                        using var outputStream = new ParcelFileDescriptor.AutoCloseOutputStream(pipe[1]);
+                        var size = (int)callback.OnGetSize();
+                        var buffer = new byte[size];
+                        callback.OnRead(0, size, buffer);
+                        outputStream.Write(buffer);
+                        callback.OnRelease();
+                    }
+                    catch (Exception e)
+                    {
+                        Log.Error(TAG, "Failed to read file.", e);
+                        pipe[1].CloseWithError(e.Message);
+                    }
+                });
+
+                return pipe[0];
+            }
+
+            if (mode == ParcelFileMode.WriteOnly)
+            {
+                handler.Post(() =>
+                {
+                    try
+                    {
+                        using var inputStream = new ParcelFileDescriptor.AutoCloseInputStream(pipe[0]);
+                        var buffer = new byte[inputStream.Available()];
+                        inputStream.Read(buffer);
+                        callback.OnWrite(0, buffer.Length, buffer);
+                        callback.OnRelease();
+                    }
+                    catch (Exception e)
+                    {
+                        Log.Error(TAG, "Failed to write file.", e);
+                        pipe[0].CloseWithError(e.Message);
+                    }
+                });
+
+                return pipe[1];
+            }
+
+            // Should never reach here
+            throw new NotSupportedException($"Mode {mode} is not supported.");
+        }
+
+        public abstract class ProxyFileDescriptorCallbackCompat
+        {
+            public virtual long OnGetSize() => throw new ErrnoException("onGetSize", OsConstants.Ebadf);
+
+            public virtual int OnRead(long offset, int size, byte[] data) => throw new ErrnoException("onRead", OsConstants.Ebadf);
+
+            public virtual int OnWrite(long offset, int size, byte[] data) => throw new ErrnoException("onWrite", OsConstants.Ebadf);
+
+            public virtual void OnFsync() => throw new ErrnoException("onFsync", OsConstants.Einval);
+
+            public abstract void OnRelease();
+
+            public ProxyFileDescriptorCallback ToAndroidOsProxyFileDescriptorCallback()
+            {
+                return new ProxyFileDescriptorCallbackWrapper(this);
+            }
+
+            private class ProxyFileDescriptorCallbackWrapper : ProxyFileDescriptorCallback
+            {
+                private readonly ProxyFileDescriptorCallbackCompat _compat;
+
+                public ProxyFileDescriptorCallbackWrapper(ProxyFileDescriptorCallbackCompat compat)
+                {
+                    _compat = compat;
+                }
+
+                public override int OnRead(long offset, int size, byte[] data) => _compat.OnRead(offset, size, data);
+
+                public override int OnWrite(long offset, int size, byte[] data) => _compat.OnWrite(offset, size, data);
+
+                public override long OnGetSize() => _compat.OnGetSize();
+
+                public override void OnFsync() => _compat.OnFsync();
+
+                public override void OnRelease() => _compat.OnRelease();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/SecureFolderFS.Core.MobileFS/Platforms/Android/Streams/InputOutputStream.cs b/src/SecureFolderFS.Core.MobileFS/Platforms/Android/Streams/InputOutputStream.cs
new file mode 100644
index 000000000..c619070dc
--- /dev/null
+++ b/src/SecureFolderFS.Core.MobileFS/Platforms/Android/Streams/InputOutputStream.cs
@@ -0,0 +1,172 @@
+using Java.IO;
+
+namespace SecureFolderFS.Core.MobileFS.Platforms.Android.Streams
+{
+    public class InputOutputStream : Stream
+    {
+        private readonly InputStream _inputStream;
+        private readonly OutputStream _outputStream;
+        private bool _disposed;
+        private long _position;
+        private long _length;
+        
+        /// <inheritdoc/>
+        public override bool CanRead => true;
+        
+        /// <inheritdoc/>
+        public override bool CanSeek => true;
+        
+        /// <inheritdoc/>
+        public override bool CanWrite => true;
+        
+        /// <inheritdoc/>
+        public override long Length => _length;
+
+        /// <inheritdoc/>
+        public override long Position
+        {
+            get => _position;
+            set
+            {
+                // if (value < 0 || (value > 0 && _length != -1 && value > _length))
+                //     throw new ArgumentOutOfRangeException(nameof(value));
+
+                if (value < 0)
+                    throw new ArgumentOutOfRangeException(nameof(value));
+                
+                if (value != _position)
+                {
+                    // Reset input stream and skip to the desired position
+                    _inputStream.Reset(); // Resets to the beginning of the stream
+
+                    // Skip to the desired position
+                    var skipAmount = value;
+                    while (skipAmount > 0)
+                    {
+                        var skipped = _inputStream.Skip(skipAmount);
+                        if (skipped <= 0) break;
+                        skipAmount -= skipped;
+                    }
+
+                    _position = value;
+                }
+            }
+        }
+
+        public InputOutputStream(InputStream inputStream, OutputStream outputStream, long length)
+        {
+            _inputStream = inputStream;
+            _outputStream = outputStream;
+            _length = length;
+            _position = 0;
+        }
+
+        /// <inheritdoc/>
+        public override int Read(byte[] buffer, int offset, int count)
+        {
+            // Adjust count if it would read past the end of the stream
+            if (_length != -1)
+            {
+                count = (int)Math.Min(count, _length - _position);
+            }
+
+            if (count <= 0) return 0;
+
+            int bytesRead;
+            if (offset != 0)
+            {
+                // Create a temporary buffer if offset is not 0
+                var tempBuffer = new byte[count];
+                bytesRead = _inputStream.Read(tempBuffer);
+                if (bytesRead > 0)
+                {
+                    Array.Copy(tempBuffer, 0, buffer, offset, bytesRead);
+                }
+            }
+            else
+            {
+                bytesRead = _inputStream.Read(buffer);
+            }
+
+            if (bytesRead > 0)
+            {
+                _position += bytesRead;
+            }
+
+            return bytesRead;
+        }
+
+        /// <inheritdoc/>
+        public override void Write(byte[] buffer, int offset, int count)
+        {
+            if (offset != 0)
+            {
+                // Create a temporary buffer if offset is not 0
+                var tempBuffer = new byte[count];
+                Array.Copy(buffer, offset, tempBuffer, 0, count);
+                _outputStream.Write(tempBuffer, 0, count);
+            }
+            else
+            {
+                _outputStream.Write(buffer, 0, count);
+            }
+
+            // Update position after writing
+            _position += count;
+
+            // If length was unknown, update it
+            if (_length == -1)
+                _position = Math.Max(_position, _length);
+            else
+            {
+                // Just update length
+                if (_length < _position || (_position < _length && count + _position > _length))
+                    _length = _position;
+            }
+        }
+        
+        /// <inheritdoc/>
+        public override void Flush()
+        {
+            _outputStream.Flush();
+        }
+        
+        /// <inheritdoc/>
+        public override long Seek(long offset, SeekOrigin origin)
+        {
+            long newPosition = origin switch
+            {
+                SeekOrigin.Begin => offset,
+                SeekOrigin.Current => _position + offset,
+                SeekOrigin.End => _length + offset,
+                _ => throw new ArgumentException("Invalid seek origin")
+            };
+
+            Position = newPosition;
+            return _position;
+        }
+        
+        /// <inheritdoc/>
+        public override void SetLength(long value)
+        {
+            throw new NotSupportedException("Cannot modify file length on this stream");
+        }        
+
+        /// <inheritdoc/>
+        protected override void Dispose(bool disposing)
+        {
+            if (!_disposed)
+            {
+                if (disposing)
+                {
+                    _inputStream.Close();
+                    _outputStream.Close();
+                }
+
+                _disposed = true;
+            }
+
+            base.Dispose(disposing);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/SecureFolderFS.Core.MobileFS/Platforms/iOS/Entitlements.plist b/src/SecureFolderFS.Core.MobileFS/Platforms/iOS/Entitlements.plist
new file mode 100644
index 000000000..c64bc3991
--- /dev/null
+++ b/src/SecureFolderFS.Core.MobileFS/Platforms/iOS/Entitlements.plist
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+    <dict>
+<!--        <key>com.apple.security.application-groups</key>-->
+<!--        <array>-->
+<!--            <string>group.org.securefolderfs.securefolderfs</string>-->
+<!--        </array>-->
+<!--        -->
+<!--        <key>com.apple.developer.fileprovider.testing-mode</key>-->
+<!--        <true/>-->
+    </dict>
+</plist>
\ No newline at end of file
diff --git a/src/SecureFolderFS.Core.MobileFS/Platforms/iOS/FileSystem/FileSystemExtension.Actions.cs b/src/SecureFolderFS.Core.MobileFS/Platforms/iOS/FileSystem/FileProviderExtension.Actions.cs
similarity index 90%
rename from src/SecureFolderFS.Core.MobileFS/Platforms/iOS/FileSystem/FileSystemExtension.Actions.cs
rename to src/SecureFolderFS.Core.MobileFS/Platforms/iOS/FileSystem/FileProviderExtension.Actions.cs
index ac72c2614..880c466f0 100644
--- a/src/SecureFolderFS.Core.MobileFS/Platforms/iOS/FileSystem/FileSystemExtension.Actions.cs
+++ b/src/SecureFolderFS.Core.MobileFS/Platforms/iOS/FileSystem/FileProviderExtension.Actions.cs
@@ -3,30 +3,35 @@
 
 namespace SecureFolderFS.Core.MobileFS.FileSystem
 {
-    public sealed partial class FileSystemExtension
+    public sealed partial class FileProviderExtension
     {
         public override Task<INSFileProviderItem> CreateDirectoryAsync(string directoryName, string parentItemIdentifier)
         {
+            _ = 0;
             return base.CreateDirectoryAsync(directoryName, parentItemIdentifier);
         }
 
         public override Task DeleteItemAsync(string itemIdentifier)
         {
+            _ = 0;
             return base.DeleteItemAsync(itemIdentifier);
         }
 
         public override Task<INSFileProviderItem> ImportDocumentAsync(NSUrl fileUrl, string parentItemIdentifier)
         {
+            _ = 0;
             return base.ImportDocumentAsync(fileUrl, parentItemIdentifier);
         }
 
         public override Task<INSFileProviderItem> RenameItemAsync(string itemIdentifier, string itemName)
         {
+            _ = 0;
             return base.RenameItemAsync(itemIdentifier, itemName);
         }
 
         public override Task<INSFileProviderItem> ReparentItemAsync(string itemIdentifier, string parentItemIdentifier, string? newName)
         {
+            _ = 0;
             return base.ReparentItemAsync(itemIdentifier, parentItemIdentifier, newName);
         }
         
@@ -34,26 +39,31 @@ public override Task<INSFileProviderItem> ReparentItemAsync(string itemIdentifie
         
         public override Task<INSFileProviderItem> SetFavoriteRankAsync(NSNumber? favoriteRank, string itemIdentifier)
         {
+            _ = 0;
             return base.SetFavoriteRankAsync(favoriteRank, itemIdentifier);
         }
 
         public override Task<INSFileProviderItem> SetLastUsedDateAsync(NSDate? lastUsedDate, string itemIdentifier)
         {
+            _ = 0;
             return base.SetLastUsedDateAsync(lastUsedDate, itemIdentifier);
         }
 
         public override Task<INSFileProviderItem> SetTagDataAsync(NSData? tagData, string itemIdentifier)
         {
+            _ = 0;
             return base.SetTagDataAsync(tagData, itemIdentifier);
         }
 
         public override Task<INSFileProviderItem> TrashItemAsync(string itemIdentifier)
         {
+            _ = 0;
             return base.TrashItemAsync(itemIdentifier);
         }
 
         public override Task<INSFileProviderItem> UntrashItemAsync(string itemIdentifier, string? parentItemIdentifier)
         {
+            _ = 0;
             return base.UntrashItemAsync(itemIdentifier, parentItemIdentifier);
         }
 
diff --git a/src/SecureFolderFS.Core.MobileFS/Platforms/iOS/FileSystem/FileSystemExtension.Identifiers.cs b/src/SecureFolderFS.Core.MobileFS/Platforms/iOS/FileSystem/FileProviderExtension.Identifiers.cs
similarity index 85%
rename from src/SecureFolderFS.Core.MobileFS/Platforms/iOS/FileSystem/FileSystemExtension.Identifiers.cs
rename to src/SecureFolderFS.Core.MobileFS/Platforms/iOS/FileSystem/FileProviderExtension.Identifiers.cs
index c3cd97681..43fbd3d61 100644
--- a/src/SecureFolderFS.Core.MobileFS/Platforms/iOS/FileSystem/FileSystemExtension.Identifiers.cs
+++ b/src/SecureFolderFS.Core.MobileFS/Platforms/iOS/FileSystem/FileProviderExtension.Identifiers.cs
@@ -3,25 +3,29 @@
 
 namespace SecureFolderFS.Core.MobileFS.FileSystem
 {
-    public sealed partial class FileSystemExtension
+    public sealed partial class FileProviderExtension
     {
         public override string? GetPersistentIdentifier(NSUrl itemUrl)
         {
+            _ = 0;
             return base.GetPersistentIdentifier(itemUrl);
         }
 
         public override NSUrl? GetUrlForItem(string persistentIdentifier)
         {
+            _ = 0;
             return base.GetUrlForItem(persistentIdentifier);
         }
 
         public override INSFileProviderItem? GetItem(NSString identifier, out NSError error)
         {
+            _ = 0;
             return base.GetItem(identifier, out error);
         }
 
         public override INSFileProviderEnumerator? GetEnumerator(string containerItemIdentifier, out NSError error)
         {
+            _ = 0;
             return base.GetEnumerator(containerItemIdentifier, out error);
         }
     }
diff --git a/src/SecureFolderFS.Core.MobileFS/Platforms/iOS/FileSystem/FileSystemExtension.SharedFiles.cs b/src/SecureFolderFS.Core.MobileFS/Platforms/iOS/FileSystem/FileProviderExtension.SharedFiles.cs
similarity index 52%
rename from src/SecureFolderFS.Core.MobileFS/Platforms/iOS/FileSystem/FileSystemExtension.SharedFiles.cs
rename to src/SecureFolderFS.Core.MobileFS/Platforms/iOS/FileSystem/FileProviderExtension.SharedFiles.cs
index 9a723a28a..c14f54ada 100644
--- a/src/SecureFolderFS.Core.MobileFS/Platforms/iOS/FileSystem/FileSystemExtension.SharedFiles.cs
+++ b/src/SecureFolderFS.Core.MobileFS/Platforms/iOS/FileSystem/FileProviderExtension.SharedFiles.cs
@@ -1,26 +1,37 @@
+using FileProvider;
 using Foundation;
+using OwlCore.Storage.Memory;
 
 namespace SecureFolderFS.Core.MobileFS.FileSystem
 {
-    public sealed partial class FileSystemExtension
+    public sealed partial class FileProviderExtension
     {
         public override void ItemChangedAtUrl(NSUrl url)
         {
+            _ = 0;
             base.ItemChangedAtUrl(url);
         }
 
         public override Task ProvidePlaceholderAtUrlAsync(NSUrl url)
         {
-            return base.ProvidePlaceholderAtUrlAsync(url);
+            // Provide a placeholder for a file
+            var fpi = FileProviderItem.FromFile(new MemoryFile("id", "id", new()));
+            var placeholderUrl = NSFileProviderManager.GetPlaceholderUrl(url);
+
+            NSError error;
+            NSFileProviderManager.WritePlaceholder(placeholderUrl, fpi, out error);
+            return Task.CompletedTask;
         }
 
         public override Task StartProvidingItemAtUrlAsync(NSUrl url)
         {
+            _ = 0;
             return base.StartProvidingItemAtUrlAsync(url);
         }
 
         public override void StopProvidingItemAtUrl(NSUrl url)
         {
+            _ = 0;
             base.StopProvidingItemAtUrl(url);
         }
     }
diff --git a/src/SecureFolderFS.Core.MobileFS/Platforms/iOS/FileSystem/FileProviderExtension.cs b/src/SecureFolderFS.Core.MobileFS/Platforms/iOS/FileSystem/FileProviderExtension.cs
new file mode 100644
index 000000000..9ccc3e81a
--- /dev/null
+++ b/src/SecureFolderFS.Core.MobileFS/Platforms/iOS/FileSystem/FileProviderExtension.cs
@@ -0,0 +1,14 @@
+using FileProvider;
+using Foundation;
+
+namespace SecureFolderFS.Core.MobileFS.FileSystem
+{
+    [Register("FileProviderExtension")]
+    public sealed partial class FileProviderExtension : NSFileProviderExtension
+    {
+        public FileProviderExtension()
+        {
+            _ = 0;
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Core.MobileFS/Platforms/iOS/FileSystem/FileSystemExtension.cs b/src/SecureFolderFS.Core.MobileFS/Platforms/iOS/FileSystem/FileSystemExtension.cs
deleted file mode 100644
index d1ff91a8e..000000000
--- a/src/SecureFolderFS.Core.MobileFS/Platforms/iOS/FileSystem/FileSystemExtension.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using FileProvider;
-
-namespace SecureFolderFS.Core.MobileFS.FileSystem
-{
-    public sealed partial class FileSystemExtension : NSFileProviderExtension
-    {
-    }
-}
diff --git a/src/SecureFolderFS.Core.MobileFS/Platforms/iOS/IOSFileSystem.cs b/src/SecureFolderFS.Core.MobileFS/Platforms/iOS/IOSFileSystem.cs
new file mode 100644
index 000000000..f62ad9dc3
--- /dev/null
+++ b/src/SecureFolderFS.Core.MobileFS/Platforms/iOS/IOSFileSystem.cs
@@ -0,0 +1,41 @@
+using OwlCore.Storage;
+using SecureFolderFS.Core.FileSystem;
+using SecureFolderFS.Core.FileSystem.AppModels;
+using SecureFolderFS.Core.FileSystem.Storage;
+using SecureFolderFS.Shared.ComponentModel;
+using SecureFolderFS.Storage.Enums;
+using SecureFolderFS.Storage.VirtualFileSystem;
+using IFileSystem = SecureFolderFS.Storage.VirtualFileSystem.IFileSystem;
+
+namespace SecureFolderFS.Core.MobileFS.Platforms.iOS
+{
+    /// <inheritdoc cref="IFileSystem"/>
+    public sealed class IOSFileSystem : IFileSystem
+    {
+        /// <inheritdoc/>
+        public string Id { get; } = Constants.IOS.FileSystem.FS_ID;
+
+        /// <inheritdoc/>
+        public string Name { get; } = Constants.IOS.FileSystem.FS_NAME;
+
+        /// <inheritdoc/>
+        public Task<FileSystemAvailability> GetStatusAsync(CancellationToken cancellationToken = default)
+        {
+            return Task.FromResult(FileSystemAvailability.Available);
+        }
+
+        /// <inheritdoc/>
+        public async Task<IVFSRoot> MountAsync(IFolder folder, IDisposable unlockContract, IDictionary<string, object> options, CancellationToken cancellationToken = default)
+        {
+            if (unlockContract is not IWrapper<Cryptography.Security> wrapper)
+                throw new ArgumentException($"The {nameof(unlockContract)} is invalid.");
+
+            var fileSystemOptions = FileSystemOptions.ToOptions(options, () => new HealthStatistics(folder), static () => new FileSystemStatistics());
+            var specifics = FileSystemSpecifics.CreateNew(wrapper.Inner, folder, fileSystemOptions);
+            var storageRoot = new CryptoFolder(Path.DirectorySeparatorChar.ToString(), specifics.ContentFolder, specifics);
+
+            await Task.CompletedTask;
+            return new IOSVFSRoot(storageRoot, fileSystemOptions);
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Core.MobileFS/Platforms/iOS/IOSFileSystemMountable.cs b/src/SecureFolderFS.Core.MobileFS/Platforms/iOS/IOSFileSystemMountable.cs
deleted file mode 100644
index f7698e4a3..000000000
--- a/src/SecureFolderFS.Core.MobileFS/Platforms/iOS/IOSFileSystemMountable.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using OwlCore.Storage;
-using SecureFolderFS.Core.FileSystem;
-using SecureFolderFS.Core.FileSystem.AppModels;
-using SecureFolderFS.Core.FileSystem.Enums;
-using SecureFolderFS.Core.FileSystem.Storage;
-using SecureFolderFS.Storage.VirtualFileSystem;
-
-namespace SecureFolderFS.Core.MobileFS.Platforms.iOS
-{
-    /// <inheritdoc cref="IMountableFileSystem"/>
-    public sealed class IOSFileSystemMountable : IMountableFileSystem, IAvailabilityChecker
-    {
-        private readonly IFolder _storageRoot;
-        private readonly FileSystemOptions _options;
-
-        private IOSFileSystemMountable(IFolder storageRoot, FileSystemOptions options)
-        {
-            _storageRoot = storageRoot;
-            _options = options;
-        }
-        
-        /// <inheritdoc/>
-        public static FileSystemAvailabilityType IsSupported()
-        {
-            return FileSystemAvailabilityType.Available;
-        }
-
-        /// <inheritdoc/>
-        public async Task<IVFSRoot> MountAsync(MountOptions mountOptions, CancellationToken cancellationToken = default)
-        {
-            await Task.CompletedTask;
-            return new IOSVFSRoot(_storageRoot, _options);
-        }
-        
-        public static IMountableFileSystem CreateMountable(FileSystemSpecifics specifics)
-        {
-            var cryptoFolder = new CryptoFolder(Path.DirectorySeparatorChar.ToString(), specifics.ContentFolder, specifics);
-            return new IOSFileSystemMountable(cryptoFolder, specifics.FileSystemOptions);
-        }
-    }
-}
diff --git a/src/SecureFolderFS.Core.MobileFS/Platforms/iOS/IOSVFSRoot.cs b/src/SecureFolderFS.Core.MobileFS/Platforms/iOS/IOSVFSRoot.cs
index ec0684c72..53dc6d44f 100644
--- a/src/SecureFolderFS.Core.MobileFS/Platforms/iOS/IOSVFSRoot.cs
+++ b/src/SecureFolderFS.Core.MobileFS/Platforms/iOS/IOSVFSRoot.cs
@@ -1,6 +1,5 @@
 using OwlCore.Storage;
 using SecureFolderFS.Core.FileSystem;
-using SecureFolderFS.Core.FileSystem.AppModels;
 using SecureFolderFS.Storage.VirtualFileSystem;
 
 namespace SecureFolderFS.Core.MobileFS.Platforms.iOS
@@ -11,7 +10,7 @@ internal sealed class IOSVFSRoot : VFSRoot
         private bool _disposed;
         
         /// <inheritdoc/>
-        public override string FileSystemName { get; } = Constants.IOS_FILE_SYSTEM_NAME;
+        public override string FileSystemName { get; } = Constants.IOS.FileSystem.FS_NAME;
 
         public IOSVFSRoot(IFolder storageRoot, FileSystemOptions options)
             : base(storageRoot, options)
diff --git a/src/SecureFolderFS.Core.MobileFS/Platforms/iOS/Info.plist b/src/SecureFolderFS.Core.MobileFS/Platforms/iOS/Info.plist
new file mode 100644
index 000000000..6574356bb
--- /dev/null
+++ b/src/SecureFolderFS.Core.MobileFS/Platforms/iOS/Info.plist
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+    <dict>
+<!--        <key>CFBundleDevelopmentRegion</key>-->
+<!--        <string>en</string>-->
+<!--        <key>CFBundleExecutable</key>-->
+<!--        <string>$(EXECUTABLE_NAME)</string>-->
+<!--        <key>CFBundleIdentifier</key>-->
+<!--        <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>-->
+<!--        <key>CFBundleInfoDictionaryVersion</key>-->
+<!--        <string>6.0</string>-->
+<!--        <key>CFBundleName</key>-->
+<!--        <string>$(PRODUCT_NAME)</string>-->
+<!--        <key>CFBundlePackageType</key>-->
+<!--        <string>XPC!</string>-->
+<!--        -->
+<!--        <key>NSExtension</key>-->
+<!--        <dict>-->
+<!--            <key>NSExtensionFileProviderDocumentGroup</key>-->
+<!--            <string>group.org.securefolderfs.securefolderfs</string>-->
+<!--            <key>NSExtensionFileProviderSupportsEnumeration</key>-->
+<!--            <true/>-->
+<!--            <key>NSExtensionPointIdentifier</key>-->
+<!--            <string>com.apple.fileprovider-nonui</string>-->
+<!--            <key>NSExtensionPrincipalClass</key>-->
+<!--            <string>$(PRODUCT_MODULE_NAME).FileProviderExtension</string>-->
+<!--        </dict>-->
+    </dict>
+</plist>
diff --git a/src/SecureFolderFS.Core.MobileFS/SecureFolderFS.Core.MobileFS.csproj b/src/SecureFolderFS.Core.MobileFS/SecureFolderFS.Core.MobileFS.csproj
index e91441b67..56ef54cbd 100644
--- a/src/SecureFolderFS.Core.MobileFS/SecureFolderFS.Core.MobileFS.csproj
+++ b/src/SecureFolderFS.Core.MobileFS/SecureFolderFS.Core.MobileFS.csproj
@@ -1,21 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
-		<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
-		<!-- <TargetFrameworks>$(TargetFrameworks);net8.0-tizen</TargetFrameworks> -->
+<!--		<TargetFrameworks>net9.0-android;net9.0-ios;net9.0</TargetFrameworks>-->
+		<TargetFramework>net9.0-android</TargetFramework>
+<!--		<TargetFramework>net9.0-ios</TargetFramework>-->
+		
 		<UseMaui>true</UseMaui>
 		<SingleProject>true</SingleProject>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
-		<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">12.2</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">26.0</SupportedOSPlatformVersion>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/src/SecureFolderFS.Core.WebDav/AppModels/NameValueCollectionToReadOnlyDictionaryBridge.cs b/src/SecureFolderFS.Core.WebDav/AppModels/NameValueCollectionToReadOnlyDictionaryBridge.cs
deleted file mode 100644
index ac6afaf9f..000000000
--- a/src/SecureFolderFS.Core.WebDav/AppModels/NameValueCollectionToReadOnlyDictionaryBridge.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Linq;
-using System.Reflection;
-
-namespace SecureFolderFS.Core.WebDav.AppModels
-{
-    internal sealed class NameValueCollectionToReadOnlyDictionaryBridge : IReadOnlyDictionary<string, string?>
-    {
-        private readonly NameValueCollection _collectionInternal;
-        private readonly Hashtable? _collectionPrivate;
-
-        /// <inheritdoc/>
-        public int Count => _collectionInternal.Count;
-
-        /// <inheritdoc/>
-        public IEnumerable<string> Keys => _collectionInternal.AllKeys;
-
-        /// <inheritdoc/>
-        public IEnumerable<string?> Values => ((IEnumerable<string?>?)_collectionPrivate?.Values) ?? Enumerable.Empty<string?>();
-
-        /// <inheritdoc/>
-        public string? this[string? key] => _collectionInternal[key];
-
-        public NameValueCollectionToReadOnlyDictionaryBridge(NameValueCollection collectionInternal)
-        {
-            _collectionInternal = collectionInternal;
-
-            var field = typeof(NameValueCollection).GetField("_entriesTable", BindingFlags.Instance | BindingFlags.NonPublic);
-            _collectionPrivate = (Hashtable?)field?.GetValue(_collectionInternal);
-        }
-
-        /// <inheritdoc/>
-        public IEnumerator<KeyValuePair<string, string?>> GetEnumerator()
-        {
-            if (_collectionPrivate is null)
-                yield break;
-
-            var enumerator = _collectionPrivate.GetEnumerator();
-            while (enumerator.MoveNext())
-            {
-                yield return new((string?)enumerator.Entry.Key ?? string.Empty, (string?)enumerator.Entry.Value);
-            }
-        }
-
-        /// <inheritdoc/>
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-
-        /// <inheritdoc/>
-        public bool ContainsKey(string? key)
-        {
-            return _collectionInternal.Get(key) is not null;
-        }
-
-        /// <inheritdoc/>
-        public bool TryGetValue(string? key, out string? value)
-        {
-            value = _collectionInternal.Get(key);
-            return value is not null;
-        }
-    }
-}
diff --git a/src/SecureFolderFS.Core.WebDav/AppModels/WebDavMountOptions.cs b/src/SecureFolderFS.Core.WebDav/AppModels/WebDavMountOptions.cs
deleted file mode 100644
index 848ac2b3a..000000000
--- a/src/SecureFolderFS.Core.WebDav/AppModels/WebDavMountOptions.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using SecureFolderFS.Core.FileSystem.AppModels;
-using SecureFolderFS.Core.WebDav.Enums;
-
-namespace SecureFolderFS.Core.WebDav.AppModels
-{
-    /// <inheritdoc cref="MountOptions"/>
-    public sealed class WebDavMountOptions : MountOptions
-    {
-        /// <summary>
-        /// Gets the protocol used for the connection.
-        /// </summary>
-        public WebDavProtocolMode Protocol { get; init; } = WebDavProtocolMode.Http;
-
-        /// <summary>
-        /// Gets the domain address used for the connection.
-        /// </summary>
-        public required string Domain { get; init; }
-
-        /// <summary>
-        /// Gets the port number used for the connection.
-        /// </summary>
-        /// <remarks>
-        /// This property does not guarantee that the specified port will be used.
-        /// </remarks>
-        public required int PreferredPort { get; init; }
-    }
-}
diff --git a/src/SecureFolderFS.Core.WebDav/AppModels/WebDavOptions.cs b/src/SecureFolderFS.Core.WebDav/AppModels/WebDavOptions.cs
new file mode 100644
index 000000000..485648406
--- /dev/null
+++ b/src/SecureFolderFS.Core.WebDav/AppModels/WebDavOptions.cs
@@ -0,0 +1,58 @@
+using SecureFolderFS.Core.FileSystem.AppModels;
+using SecureFolderFS.Shared.Extensions;
+using SecureFolderFS.Storage.VirtualFileSystem;
+using System;
+using System.Collections.Generic;
+
+namespace SecureFolderFS.Core.WebDav.AppModels
+{
+    /// <inheritdoc cref="FileSystemOptions"/>
+    public sealed class WebDavOptions : FileSystemOptions
+    {
+        private int _port = 4949;
+
+        /// <summary>
+        /// Gets the protocol used for the connection.
+        /// </summary>
+        public string Protocol { get; init; } = "http";
+
+        /// <summary>
+        /// Gets the domain address used for the connection.
+        /// </summary>
+        public string Domain { get; init; } = "localhost";
+
+        /// <summary>
+        /// Gets the preferred port number used for the connection.
+        /// </summary>
+        /// <remarks>
+        /// This property does not guarantee that the specified port will be used.
+        /// </remarks>
+        public int Port { get => _port; init => _port = value; }
+
+        /// <inheritdoc/>
+        public override string? GetDescription()
+        {
+            return $"{Protocol}://{Domain}:{Port}";
+        }
+
+        internal void SetPortInternal(int value) => _port = value;
+
+        public static WebDavOptions ToOptions(IDictionary<string, object> options)
+        {
+            return new()
+            {
+                VolumeName = (string?)options.Get(nameof(VolumeName)) ?? throw new ArgumentNullException(nameof(VolumeName)),
+                HealthStatistics = (IHealthStatistics?)options.Get(nameof(HealthStatistics)) ?? new HealthStatistics(),
+                FileSystemStatistics = (IFileSystemStatistics?)options.Get(nameof(FileSystemStatistics)) ?? new FileSystemStatistics(),
+                IsReadOnly = (bool?)options.Get(nameof(IsReadOnly)) ?? false,
+                IsCachingChunks = (bool?)options.Get(nameof(IsCachingChunks)) ?? true,
+                IsCachingFileNames = (bool?)options.Get(nameof(IsCachingFileNames)) ?? true,
+
+                // WebDav specific
+                Protocol = (string?)options.Get(nameof(Protocol)) ?? "http",
+                Domain = (string?)options.Get(nameof(Domain)) ?? "localhost",
+                Port = (int?)options.Get(nameof(Port)) ?? 4949
+            };
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Core.WebDav/Constants.cs b/src/SecureFolderFS.Core.WebDav/Constants.cs
index 2153f5e72..6521589bc 100644
--- a/src/SecureFolderFS.Core.WebDav/Constants.cs
+++ b/src/SecureFolderFS.Core.WebDav/Constants.cs
@@ -2,7 +2,11 @@
 {
     public static class Constants
     {
-        public const string FILE_SYSTEM_NAME = "WebDav";
+        public static class FileSystem
+        {
+            public const string FS_ID = "WEBDAV";
+            public const string FS_NAME = "WebDav";
+        }
 
         internal static class Headers
         {
@@ -15,11 +19,6 @@ internal static class Headers
             public const string DEPTH = "Depth";
         }
 
-        internal static class WebDavOptions
-        {
-            public const string DAV_COMPLIANCE_LEVEL = "1";
-        }
-
         internal static class WebDavNamespaces
         {
             public const string DAV_NAMESPACE = "Dav:";
diff --git a/src/SecureFolderFS.Core.WebDav/EncryptingStorage2/EncryptingDiskStore.cs b/src/SecureFolderFS.Core.WebDav/EncryptingStorage2/EncryptingDiskStore.cs
index 2887fda5d..149c6a4f8 100644
--- a/src/SecureFolderFS.Core.WebDav/EncryptingStorage2/EncryptingDiskStore.cs
+++ b/src/SecureFolderFS.Core.WebDav/EncryptingStorage2/EncryptingDiskStore.cs
@@ -1,11 +1,10 @@
-using NWebDav.Server.Http;
-using NWebDav.Server.Locking;
+using NWebDav.Server.Locking;
 using NWebDav.Server.Stores;
 using SecureFolderFS.Core.FileSystem;
-using SecureFolderFS.Core.FileSystem.Paths;
+using SecureFolderFS.Core.FileSystem.Helpers.Paths.Native;
 using System;
 using System.IO;
-using System.Security.Cryptography;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace SecureFolderFS.Core.WebDav.EncryptingStorage2
@@ -13,33 +12,31 @@ namespace SecureFolderFS.Core.WebDav.EncryptingStorage2
     internal sealed class EncryptingDiskStore : DiskStore
     {
         private readonly FileSystemSpecifics _specifics;
-        private readonly IPathConverter _pathConverter;
 
-        public EncryptingDiskStore(string directory, FileSystemSpecifics specifics, IPathConverter pathConverter, bool isWritable = true, ILockingManager? lockingManager = null)
+        public EncryptingDiskStore(string directory, FileSystemSpecifics specifics, bool isWritable = true, ILockingManager? lockingManager = null)
             : base(directory, isWritable, lockingManager)
         {
             _specifics = specifics;
-            _pathConverter = pathConverter;
         }
 
-        public override Task<IStoreItem> GetItemAsync(Uri uri, IHttpContext context)
+        public override Task<IStoreItem?> GetItemAsync(Uri uri, CancellationToken cancellationToken)
         {
             // Determine the path from the uri
             var path = GetPathFromUri(uri);
 
             // Check if it's a directory
             if (Directory.Exists(path))
-                return Task.FromResult<IStoreItem>(new EncryptingDiskStoreCollection(LockingManager, new DirectoryInfo(path), IsWritable, _specifics, _pathConverter));
+                return Task.FromResult<IStoreItem?>(new EncryptingDiskStoreCollection(LockingManager, new DirectoryInfo(path), IsWritable, _specifics));
 
             // Check if it's a file
             if (File.Exists(path))
-                return Task.FromResult<IStoreItem>(new EncryptingDiskStoreItem(LockingManager, new FileInfo(path), IsWritable, _specifics, _pathConverter));
+                return Task.FromResult<IStoreItem?>(new EncryptingDiskStoreFile(LockingManager, new FileInfo(path), IsWritable, _specifics));
 
             // The item doesn't exist
-            return Task.FromResult<IStoreItem>(null);
+            return Task.FromResult<IStoreItem?>(null);
         }
 
-        public override Task<IStoreCollection> GetCollectionAsync(Uri uri, IHttpContext context)
+        public override Task<IStoreCollection?> GetCollectionAsync(Uri uri, CancellationToken cancellationToken)
         {
             // Determine the path from the uri
             var path = GetPathFromUri(uri);
@@ -47,13 +44,13 @@ public override Task<IStoreCollection> GetCollectionAsync(Uri uri, IHttpContext
                 return Task.FromResult<IStoreCollection>(null);
 
             // Return the item
-            return Task.FromResult<IStoreCollection>(new EncryptingDiskStoreCollection(LockingManager, new DirectoryInfo(path), IsWritable, _specifics, _pathConverter));
+            return Task.FromResult<IStoreCollection>(new EncryptingDiskStoreCollection(LockingManager, new DirectoryInfo(path), IsWritable, _specifics));
         }
 
         protected override string GetPathFromUri(Uri uri)
         {
             var path = base.GetPathFromUri(uri);
-            return _pathConverter.ToCiphertext(path) ?? throw new CryptographicException("Could convert to ciphertext path.");
+            return NativePathHelpers.GetCiphertextPath(path, _specifics);
         }
     }
 }
diff --git a/src/SecureFolderFS.Core.WebDav/EncryptingStorage2/EncryptingDiskStoreCollection.cs b/src/SecureFolderFS.Core.WebDav/EncryptingStorage2/EncryptingDiskStoreCollection.cs
index 88f4f85ff..e9e449823 100644
--- a/src/SecureFolderFS.Core.WebDav/EncryptingStorage2/EncryptingDiskStoreCollection.cs
+++ b/src/SecureFolderFS.Core.WebDav/EncryptingStorage2/EncryptingDiskStoreCollection.cs
@@ -1,39 +1,262 @@
 using NWebDav.Server;
 using NWebDav.Server.Enums;
-using NWebDav.Server.Http;
 using NWebDav.Server.Locking;
 using NWebDav.Server.Props;
 using NWebDav.Server.Stores;
+using OwlCore.Storage;
 using SecureFolderFS.Core.FileSystem;
-using SecureFolderFS.Core.FileSystem.Helpers;
-using SecureFolderFS.Core.FileSystem.Paths;
+using SecureFolderFS.Core.FileSystem.Helpers.Paths;
+using SecureFolderFS.Core.FileSystem.Helpers.Paths.Native;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Net;
+using System.Runtime.CompilerServices;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 
 namespace SecureFolderFS.Core.WebDav.EncryptingStorage2
 {
-    internal sealed class EncryptingDiskStoreCollection : IDiskStoreCollection
+    internal sealed class EncryptingDiskStoreCollection : IStoreCollection
     {
         private static readonly XElement s_xDavCollection = new XElement(WebDavNamespaces.DavNs + "collection");
         private readonly DirectoryInfo _directoryInfo;
         private readonly FileSystemSpecifics _specifics;
-        private readonly IPathConverter _pathConverter;
 
-        public EncryptingDiskStoreCollection(ILockingManager lockingManager, DirectoryInfo directoryInfo, bool isWritable, FileSystemSpecifics specifics, IPathConverter pathConverter)
+        /// <inheritdoc/>
+        public string Id { get; }
+
+        /// <inheritdoc/>
+        public string Name { get; }
+
+        public EncryptingDiskStoreCollection(ILockingManager lockingManager, DirectoryInfo directoryInfo, bool isWritable, FileSystemSpecifics specifics)
         {
-            LockingManager = lockingManager;
+            _specifics = specifics;
             _directoryInfo = directoryInfo;
+
+            Id = NativePathHelpers.GetPlaintextPath(_directoryInfo.FullName, _specifics) ?? string.Empty;
+            Name = Path.GetFileName(Id);
+            LockingManager = lockingManager;
             IsWritable = isWritable;
-            _specifics = specifics;
-            _pathConverter = pathConverter;
         }
 
+        /// <inheritdoc/>
+        public async IAsyncEnumerable<IStoreItem> GetItemsAsync(StorableType type = StorableType.All, [EnumeratorCancellation] CancellationToken cancellationToken = default)
+        {
+            await Task.CompletedTask;
+            cancellationToken.ThrowIfCancellationRequested();
+
+            switch (type)
+            {
+                case StorableType.File:
+                {
+                    foreach (var file in _directoryInfo.GetFiles())
+                    {
+                        if (PathHelpers.IsCoreName(file.Name))
+                            continue;
+
+                        yield return new DiskStoreFile(LockingManager, file, IsWritable);
+                    }
+
+                    break;
+                }
+
+                case StorableType.Folder:
+                {
+                    foreach (var folder in _directoryInfo.GetDirectories())
+                    {
+                        if (PathHelpers.IsCoreName(folder.Name))
+                            continue;
+
+                        yield return new DiskStoreCollection(LockingManager, folder, IsWritable);
+                    }
+
+                    break;
+                }
+
+                case StorableType.All:
+                {
+                    foreach (var folder in _directoryInfo.GetDirectories())
+                    {
+                        if (PathHelpers.IsCoreName(folder.Name))
+                            continue;
+
+
+                        yield return new EncryptingDiskStoreCollection(LockingManager, folder, IsWritable, _specifics);
+                    }
+
+                    foreach (var file in _directoryInfo.GetFiles())
+                    {
+                        if (PathHelpers.IsCoreName(file.Name))
+                            continue;
+
+                        yield return new EncryptingDiskStoreFile(LockingManager, file, IsWritable, _specifics);
+                    }
+
+                    break;
+                }
+            }
+        }
+
+        /// <inheritdoc/>
+        public async Task<IStoreItem> GetFirstByNameAsync(string name, CancellationToken cancellationToken)
+        {
+            await Task.CompletedTask;
+            cancellationToken.ThrowIfCancellationRequested();
+
+            // Determine the path
+            var id = NativePathHelpers.GetCiphertextPath(Path.Combine(Id, name), _specifics);
+
+            // Check if the item is a file
+            if (File.Exists(id))
+                return new EncryptingDiskStoreFile(LockingManager, new(id), IsWritable, _specifics);
+
+            // Check if the item is a directory
+            if (Directory.Exists(id))
+                return new EncryptingDiskStoreCollection(LockingManager, new(id), IsWritable, _specifics);
+
+            // Item not found
+            throw new FileNotFoundException($"An item was not found. Name: '{name}'.");
+        }
+
+        /// <inheritdoc/>
+        public async Task<IStoreItem> MoveItemAsync(IStoreItem storeItem, IStoreCollection destinationCollection, string destinationName, bool overwrite, CancellationToken cancellationToken)
+        {
+            // Return error
+            if (!IsWritable)
+                throw new HttpListenerException((int)HttpStatusCode.PreconditionFailed);
+
+            try
+            {
+                // If the destination collection is a directory too, then we can simply move the file
+                if (destinationCollection is EncryptingDiskStoreCollection destinationDiskStoreCollection)
+                {
+                    // Return error
+                    if (!destinationDiskStoreCollection.IsWritable)
+                        throw new HttpListenerException((int)HttpStatusCode.PreconditionFailed);
+
+                    // Determine source and destination paths
+                    var sourcePath = NativePathHelpers.GetCiphertextPath(storeItem.Id, _specifics);
+                    var destinationPath = NativePathHelpers.GetCiphertextPath(Path.Combine(destinationDiskStoreCollection.Id, destinationName), _specifics);
+
+                    // Check if the file already exists
+                    HttpStatusCode result;
+                    if (File.Exists(destinationPath))
+                    {
+                        // Remove the file if it already exists (if allowed)
+                        if (!overwrite)
+                            throw new HttpListenerException((int)HttpStatusCode.Forbidden);
+
+                        // The file will be overwritten
+                        File.Delete(destinationPath);
+                        result = HttpStatusCode.NoContent;
+                    }
+                    else if (Directory.Exists(destinationPath))
+                    {
+                        // Remove the directory if it already exists (if allowed)
+                        if (!overwrite)
+                            throw new HttpListenerException((int)HttpStatusCode.Forbidden);
+
+                        // The file will be overwritten
+                        Directory.Delete(destinationPath, true);
+                        result = HttpStatusCode.NoContent;
+                    }
+                    else
+                    {
+                        // The file will be "created"
+                        result = HttpStatusCode.Created;
+                    }
+
+                    switch (storeItem)
+                    {
+                        case EncryptingDiskStoreFile _:
+                            // Move the file
+                            File.Move(sourcePath, destinationPath);
+                            return new EncryptingDiskStoreFile(LockingManager, new FileInfo(destinationPath), IsWritable, _specifics);
+
+                        case EncryptingDiskStoreCollection _:
+                            // Move the directory
+                            Directory.Move(sourcePath, destinationPath);
+                            return new EncryptingDiskStoreCollection(LockingManager, new DirectoryInfo(destinationPath), IsWritable, _specifics);
+
+                        default:
+                            // Invalid item
+                            Debug.Fail($"Invalid item {storeItem.GetType()} inside the {nameof(DiskStoreCollection)}.");
+                            throw new HttpListenerException((int)HttpStatusCode.InternalServerError);
+                    }
+                }
+                else
+                {
+                    // Attempt to copy the item to the destination collection
+                    var result = await storeItem.CopyAsync(destinationCollection, destinationName, overwrite, cancellationToken).ConfigureAwait(false);
+                    if (result.Result == HttpStatusCode.Created || result.Result == HttpStatusCode.NoContent)
+                    {
+                        await DeleteAsync(storeItem, cancellationToken).ConfigureAwait(false);
+                        return result.Item!;
+                    }
+                    else
+                    {
+                        throw new HttpListenerException((int)result.Result);
+                    }
+                }
+            }
+            catch (UnauthorizedAccessException)
+            {
+                throw new HttpListenerException((int)HttpStatusCode.Forbidden);
+            }
+        }
+
+        /// <inheritdoc/>
+        public async Task DeleteAsync(IStoreItem storeItem, CancellationToken cancellationToken)
+        {
+            await Task.CompletedTask;
+
+            // Return error
+            if (!IsWritable)
+                throw new HttpListenerException((int)HttpStatusCode.PreconditionFailed);
+
+            // Determine the full path
+            var fullPath = NativePathHelpers.GetCiphertextPath(Path.Combine(Id, storeItem.Name), _specifics);
+            try
+            {
+                // Check if the file exists
+                if (File.Exists(fullPath))
+                {
+                    // Delete the file
+                    File.Delete(fullPath);
+                    return;
+                }
+
+                // Check if the directory exists
+                if (Directory.Exists(fullPath))
+                {
+                    // Delete the directory
+                    Directory.Delete(fullPath, true);
+                    return;
+                }
+
+                // Item not found
+                throw new HttpListenerException((int)HttpStatusCode.NotFound);
+            }
+            catch (UnauthorizedAccessException)
+            {
+                throw new HttpListenerException((int)HttpStatusCode.Forbidden);
+            }
+            catch (Exception)
+            {
+                // Log exception
+                // TODO(wd): Add logging
+                //s_log.Log(LogLevel.Error, () => $"Unable to delete '{fullPath}' directory.", exc);
+                throw new HttpListenerException((int)HttpStatusCode.InternalServerError);
+            }
+        }
+
+
+
+
         public static PropertyManager<EncryptingDiskStoreCollection> DefaultPropertyManager { get; } = new(new DavProperty<EncryptingDiskStoreCollection>[]
         {
             // RFC-2518 properties
@@ -154,68 +377,17 @@ public EncryptingDiskStoreCollection(ILockingManager lockingManager, DirectoryIn
         });
 
         public bool IsWritable { get; }
-        public string Name => _pathConverter.GetCleartextFileName(_directoryInfo.FullName) ?? string.Empty;
-        public string UniqueKey => _directoryInfo.FullName;
-        public string FullPath => _pathConverter.ToCleartext(_directoryInfo.FullName) ?? string.Empty;
-
-        // Disk collections (a.k.a. directories don't have their own data)
-        public Task<Stream> GetReadableStreamAsync(IHttpContext context) => Task.FromResult((Stream)null);
-        public Task<HttpStatusCode> UploadFromStreamAsync(IHttpContext context, Stream inputStream) => Task.FromResult(HttpStatusCode.Conflict);
-
         public IPropertyManager PropertyManager => DefaultPropertyManager;
         public ILockingManager LockingManager { get; }
 
-        public Task<IStoreItem> GetItemAsync(string name, IHttpContext context)
-        {
-            // Determine the full path
-            var fullPath = _pathConverter.ToCiphertext(Path.Combine(FullPath, name));
-
-            // Check if the item is a file
-            if (File.Exists(fullPath))
-                return Task.FromResult<IStoreItem>(new EncryptingDiskStoreItem(LockingManager, new FileInfo(fullPath), IsWritable, _specifics, _pathConverter));
-
-            // Check if the item is a directory
-            if (Directory.Exists(fullPath))
-                return Task.FromResult<IStoreItem>(new EncryptingDiskStoreCollection(LockingManager, new DirectoryInfo(fullPath), IsWritable, _specifics, _pathConverter));
-
-            // Item not found
-            return Task.FromResult<IStoreItem>(null);
-        }
-
-        public Task<IEnumerable<IStoreItem>> GetItemsAsync(IHttpContext context)
-        {
-            IEnumerable<IStoreItem> GetItemsInternal()
-            {
-                // Add all directories
-                foreach (var subDirectory in _directoryInfo.GetDirectories())
-                {
-                    if (PathHelpers.IsCoreFile(subDirectory.Name))
-                        continue;
-
-                    yield return new EncryptingDiskStoreCollection(LockingManager, subDirectory, IsWritable, _specifics, _pathConverter);
-                }
-
-                // Add all files
-                foreach (var file in _directoryInfo.GetFiles())
-                {
-                    if (PathHelpers.IsCoreFile(file.Name))
-                        continue;
-
-                    yield return new EncryptingDiskStoreItem(LockingManager, file, IsWritable, _specifics, _pathConverter);
-                }
-            }
-
-            return Task.FromResult(GetItemsInternal());
-        }
-
-        public Task<StoreItemResult> CreateItemAsync(string name, bool overwrite, IHttpContext context)
+        public Task<StoreItemResult> CreateItemAsync(string name, bool overwrite, CancellationToken cancellationToken)
         {
             // Return error
             if (!IsWritable)
                 return Task.FromResult(new StoreItemResult(HttpStatusCode.Forbidden));
 
             // Determine the destination path
-            var destinationPath = _pathConverter.ToCiphertext(Path.Combine(FullPath, name));
+            var destinationPath = NativePathHelpers.GetCiphertextPath(Path.Combine(Id, name), _specifics);
 
             // Determine result
             HttpStatusCode result;
@@ -247,17 +419,17 @@ public Task<StoreItemResult> CreateItemAsync(string name, bool overwrite, IHttpC
             }
 
             // Return result
-            return Task.FromResult(new StoreItemResult(result, new EncryptingDiskStoreItem(LockingManager, new FileInfo(destinationPath), IsWritable, _specifics, _pathConverter)));
+            return Task.FromResult(new StoreItemResult(result, new EncryptingDiskStoreFile(LockingManager, new FileInfo(destinationPath), IsWritable, _specifics)));
         }
 
-        public Task<StoreCollectionResult> CreateCollectionAsync(string name, bool overwrite, IHttpContext context)
+        public Task<StoreCollectionResult> CreateCollectionAsync(string name, bool overwrite, CancellationToken cancellationToken)
         {
             // Return error
             if (!IsWritable)
                 return Task.FromResult(new StoreCollectionResult(HttpStatusCode.Forbidden));
 
             // Determine the destination path
-            var destinationPath = _pathConverter.ToCiphertext(Path.Combine(FullPath, name));
+            var destinationPath = NativePathHelpers.GetCiphertextPath(Path.Combine(Id, name), _specifics);
 
             // Check if the directory can be overwritten
             HttpStatusCode result;
@@ -283,7 +455,7 @@ public Task<StoreCollectionResult> CreateCollectionAsync(string name, bool overw
 
                 // Create new DirectoryID
                 var directoryId = Guid.NewGuid().ToByteArray();
-                var directoryIdPath = Path.Combine(destinationPath, FileSystem.Constants.DIRECTORY_ID_FILENAME);
+                var directoryIdPath = Path.Combine(destinationPath, FileSystem.Constants.Names.DIRECTORY_ID_FILENAME);
 
                 // Initialize directory with DirectoryID
                 using var directoryIdStream = File.Open(directoryIdPath, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.ReadWrite | FileShare.Delete);
@@ -301,164 +473,22 @@ public Task<StoreCollectionResult> CreateCollectionAsync(string name, bool overw
             }
 
             // Return the collection
-            return Task.FromResult(new StoreCollectionResult(result, new EncryptingDiskStoreCollection(LockingManager, new DirectoryInfo(destinationPath), IsWritable, _specifics, _pathConverter)));
+            return Task.FromResult(new StoreCollectionResult(result, new EncryptingDiskStoreCollection(LockingManager, new DirectoryInfo(destinationPath), IsWritable, _specifics)));
         }
 
-        public async Task<StoreItemResult> CopyAsync(IStoreCollection destinationCollection, string name, bool overwrite, IHttpContext context)
+        public async Task<StoreItemResult> CopyAsync(IStoreCollection destinationCollection, string name, bool overwrite, CancellationToken cancellationToken)
         {
             // Just create the folder itself
-            var result = await destinationCollection.CreateCollectionAsync(name, overwrite, context).ConfigureAwait(false);
+            var result = await destinationCollection.CreateCollectionAsync(name, overwrite, cancellationToken).ConfigureAwait(false);
             return new StoreItemResult(result.Result, result.Collection);
         }
 
-        public bool SupportsFastMove(IStoreCollection destination, string destinationName, bool overwrite, IHttpContext context)
+        public bool SupportsFastMove(IStoreCollection destination, string destinationName, bool overwrite)
         {
             // We can only move disk-store collections
             return destination is EncryptingDiskStoreCollection;
         }
 
-        public async Task<StoreItemResult> MoveItemAsync(string sourceName, IStoreCollection destinationCollection, string destinationName, bool overwrite, IHttpContext context)
-        {
-            // Return error
-            if (!IsWritable)
-                return new StoreItemResult(HttpStatusCode.Forbidden);
-
-            // Determine the object that is being moved
-            var item = await GetItemAsync(sourceName, context).ConfigureAwait(false);
-            if (item == null)
-                return new StoreItemResult(HttpStatusCode.NotFound);
-
-            try
-            {
-                // If the destination collection is a directory too, then we can simply move the file
-                if (destinationCollection is EncryptingDiskStoreCollection destinationDiskStoreCollection)
-                {
-                    // Return error
-                    if (!destinationDiskStoreCollection.IsWritable)
-                        return new StoreItemResult(HttpStatusCode.Forbidden);
-
-                    // Determine source and destination paths
-                    var sourcePath = _pathConverter.ToCiphertext(Path.Combine(FullPath, sourceName));
-                    var destinationPath = _pathConverter.ToCiphertext(Path.Combine(destinationDiskStoreCollection.FullPath, destinationName));
-
-                    // Check if the file already exists
-                    HttpStatusCode result;
-                    if (File.Exists(destinationPath))
-                    {
-                        // Remove the file if it already exists (if allowed)
-                        if (!overwrite)
-                            return new StoreItemResult(HttpStatusCode.PreconditionFailed);
-
-                        // The file will be overwritten
-                        File.Delete(destinationPath);
-                        result = HttpStatusCode.NoContent;
-                    }
-                    else if (Directory.Exists(destinationPath))
-                    {
-                        // Remove the directory if it already exists (if allowed)
-                        if (!overwrite)
-                            return new StoreItemResult(HttpStatusCode.PreconditionFailed);
-
-                        // The file will be overwritten
-                        Directory.Delete(destinationPath, true);
-                        result = HttpStatusCode.NoContent;
-                    }
-                    else
-                    {
-                        // The file will be "created"
-                        result = HttpStatusCode.Created;
-                    }
-
-                    switch (item)
-                    {
-                        case EncryptingDiskStoreItem _:
-                            // Move the file
-                            File.Move(sourcePath, destinationPath);
-                            return new StoreItemResult(result, new EncryptingDiskStoreItem(LockingManager, new FileInfo(destinationPath), IsWritable, _specifics, _pathConverter));
-
-                        case EncryptingDiskStoreCollection _:
-                            // Move the directory
-                            Directory.Move(sourcePath, destinationPath);
-                            return new StoreItemResult(result, new EncryptingDiskStoreCollection(LockingManager, new DirectoryInfo(destinationPath), IsWritable, _specifics, _pathConverter));
-
-                        default:
-                            // Invalid item
-                            Debug.Fail($"Invalid item {item.GetType()} inside the {nameof(DiskStoreCollection)}.");
-                            return new StoreItemResult(HttpStatusCode.InternalServerError);
-                    }
-                }
-                else
-                {
-                    // Attempt to copy the item to the destination collection
-                    var result = await item.CopyAsync(destinationCollection, destinationName, overwrite, context).ConfigureAwait(false);
-                    if (result.Result == HttpStatusCode.Created || result.Result == HttpStatusCode.NoContent)
-                        await DeleteItemAsync(sourceName, context).ConfigureAwait(false);
-
-                    // Return the result
-                    return result;
-                }
-            }
-            catch (UnauthorizedAccessException)
-            {
-                return new StoreItemResult(HttpStatusCode.Forbidden);
-            }
-        }
-
-        public Task<HttpStatusCode> DeleteItemAsync(string name, IHttpContext context)
-        {
-            // Return error
-            if (!IsWritable)
-                return Task.FromResult(HttpStatusCode.Forbidden);
-
-            // Determine the full path
-            var fullPath = _pathConverter.ToCiphertext(Path.Combine(FullPath, name));
-            try
-            {
-                // Check if the file exists
-                if (File.Exists(fullPath))
-                {
-                    // Delete the file
-                    File.Delete(fullPath);
-                    return Task.FromResult(HttpStatusCode.NoContent);
-                }
-
-                // Check if the directory exists
-                if (Directory.Exists(fullPath))
-                {
-                    // Delete the directory
-                    Directory.Delete(fullPath, true);
-                    return Task.FromResult(HttpStatusCode.NoContent);
-                }
-
-                // Item not found
-                return Task.FromResult(HttpStatusCode.NotFound);
-            }
-            catch (UnauthorizedAccessException)
-            {
-                return Task.FromResult(HttpStatusCode.Forbidden);
-            }
-            catch (Exception exc)
-            {
-                // Log exception
-                // TODO(wd): Add logging
-                //s_log.Log(LogLevel.Error, () => $"Unable to delete '{fullPath}' directory.", exc);
-                return Task.FromResult(HttpStatusCode.InternalServerError);
-            }
-        }
-
         public EnumerationDepthMode InfiniteDepthMode => EnumerationDepthMode.Rejected;
-
-        public override int GetHashCode()
-        {
-            return _directoryInfo.FullName.GetHashCode();
-        }
-
-        public override bool Equals(object obj)
-        {
-            var storeCollection = obj as EncryptingDiskStoreCollection;
-            if (storeCollection == null)
-                return false;
-            return storeCollection._directoryInfo.FullName.Equals(_directoryInfo.FullName, StringComparison.CurrentCultureIgnoreCase);
-        }
     }
 }
diff --git a/src/SecureFolderFS.Core.WebDav/EncryptingStorage2/EncryptingDiskStoreItem.cs b/src/SecureFolderFS.Core.WebDav/EncryptingStorage2/EncryptingDiskStoreFile.cs
similarity index 70%
rename from src/SecureFolderFS.Core.WebDav/EncryptingStorage2/EncryptingDiskStoreItem.cs
rename to src/SecureFolderFS.Core.WebDav/EncryptingStorage2/EncryptingDiskStoreFile.cs
index 8a70a666b..0790d57f1 100644
--- a/src/SecureFolderFS.Core.WebDav/EncryptingStorage2/EncryptingDiskStoreItem.cs
+++ b/src/SecureFolderFS.Core.WebDav/EncryptingStorage2/EncryptingDiskStoreFile.cs
@@ -1,38 +1,34 @@
 using NWebDav.Server.Helpers;
-using NWebDav.Server.Http;
 using NWebDav.Server.Locking;
 using NWebDav.Server.Props;
 using NWebDav.Server.Stores;
-using SecureFolderFS.Core.Cryptography;
-using SecureFolderFS.Core.FileSystem.Paths;
-using SecureFolderFS.Core.FileSystem.Streams;
+using SecureFolderFS.Core.FileSystem;
+using SecureFolderFS.Core.FileSystem.Helpers.Paths.Native;
 using System;
 using System.IO;
 using System.Net;
+using System.Threading;
 using System.Threading.Tasks;
-using SecureFolderFS.Core.FileSystem;
 
 namespace SecureFolderFS.Core.WebDav.EncryptingStorage2
 {
-    internal class EncryptingDiskStoreItem : IDiskStoreItem
+    internal class EncryptingDiskStoreFile : IStoreFile
     {
         private readonly FileSystemSpecifics _specifics;
-        private readonly IPathConverter _pathConverter;
         private readonly FileInfo _fileInfo;
 
-        public EncryptingDiskStoreItem(ILockingManager lockingManager, FileInfo fileInfo, bool isWritable, FileSystemSpecifics specifics, IPathConverter pathConverter)
+        public EncryptingDiskStoreFile(ILockingManager lockingManager, FileInfo fileInfo, bool isWritable, FileSystemSpecifics specifics)
         {
             LockingManager = lockingManager;
             IsWritable = isWritable;
             _fileInfo = fileInfo;
             _specifics = specifics;
-            _pathConverter = pathConverter;
         }
 
-        public static PropertyManager<EncryptingDiskStoreItem> DefaultPropertyManager { get; } = new(new DavProperty<EncryptingDiskStoreItem>[]
+        public static PropertyManager<EncryptingDiskStoreFile> DefaultPropertyManager { get; } = new(new DavProperty<EncryptingDiskStoreFile>[]
         {
             // RFC-2518 properties
-            new DavCreationDate<EncryptingDiskStoreItem>
+            new DavCreationDate<EncryptingDiskStoreFile>
             {
                 Getter = (context, item) => item._fileInfo.CreationTimeUtc,
                 Setter = (context, item, value) =>
@@ -41,23 +37,23 @@ public EncryptingDiskStoreItem(ILockingManager lockingManager, FileInfo fileInfo
                     return HttpStatusCode.OK;
                 }
             },
-            new DavDisplayName<EncryptingDiskStoreItem>
+            new DavDisplayName<EncryptingDiskStoreFile>
             {
                 Getter = (context, item) => item.Name
             },
-            new DavGetContentLength<EncryptingDiskStoreItem>
+            new DavGetContentLength<EncryptingDiskStoreFile>
             {
-                Getter = (context, item) => Math.Max(0, item._specifics.Security.ContentCrypt.CalculateCleartextSize(item._fileInfo.Length - item._specifics.Security.HeaderCrypt.HeaderCiphertextSize))
+                Getter = (context, item) => Math.Max(0, item._specifics.Security.ContentCrypt.CalculatePlaintextSize(item._fileInfo.Length - item._specifics.Security.HeaderCrypt.HeaderCiphertextSize))
             },
-            new DavGetContentType<EncryptingDiskStoreItem>
+            new DavGetContentType<EncryptingDiskStoreFile>
             {
                 Getter = (context, item) => item.DetermineContentType()
             },
-            new DavGetEtag<EncryptingDiskStoreItem>
+            new DavGetEtag<EncryptingDiskStoreFile>
             {
                 Getter = (context, item) => $"{item._fileInfo.Length}-{item._fileInfo.LastWriteTimeUtc.ToFileTime()}"
             },
-            new DavGetLastModified<EncryptingDiskStoreItem>
+            new DavGetLastModified<EncryptingDiskStoreFile>
             {
                 Getter = (context, item) => item._fileInfo.LastWriteTimeUtc,
                 Setter = (context, item, value) =>
@@ -66,24 +62,24 @@ public EncryptingDiskStoreItem(ILockingManager lockingManager, FileInfo fileInfo
                     return HttpStatusCode.OK;
                 }
             },
-            new DavGetResourceType<EncryptingDiskStoreItem>
+            new DavGetResourceType<EncryptingDiskStoreFile>
             {
                 Getter = (context, item) => null
             },
 
             // Default locking property handling via the LockingManager
-            new DavLockDiscoveryDefault<EncryptingDiskStoreItem>(),
-            new DavSupportedLockDefault<EncryptingDiskStoreItem>(),
+            new DavLockDiscoveryDefault<EncryptingDiskStoreFile>(),
+            new DavSupportedLockDefault<EncryptingDiskStoreFile>(),
 
             // Hopmann/Lippert collection properties
             // (although not a collection, the IsHidden property might be valuable)
-            new DavExtCollectionIsHidden<EncryptingDiskStoreItem>
+            new DavExtCollectionIsHidden<EncryptingDiskStoreFile>
             {
                 Getter = (context, item) => (item._fileInfo.Attributes & FileAttributes.Hidden) != 0
             },
 
             // Win32 extensions
-            new Win32CreationTime<EncryptingDiskStoreItem>
+            new Win32CreationTime<EncryptingDiskStoreFile>
             {
                 Getter = (context, item) => item._fileInfo.CreationTimeUtc,
                 Setter = (context, item, value) =>
@@ -92,7 +88,7 @@ public EncryptingDiskStoreItem(ILockingManager lockingManager, FileInfo fileInfo
                     return HttpStatusCode.OK;
                 }
             },
-            new Win32LastAccessTime<EncryptingDiskStoreItem>
+            new Win32LastAccessTime<EncryptingDiskStoreFile>
             {
                 Getter = (context, item) => item._fileInfo.LastAccessTimeUtc,
                 Setter = (context, item, value) =>
@@ -101,7 +97,7 @@ public EncryptingDiskStoreItem(ILockingManager lockingManager, FileInfo fileInfo
                     return HttpStatusCode.OK;
                 }
             },
-            new Win32LastModifiedTime<EncryptingDiskStoreItem>
+            new Win32LastModifiedTime<EncryptingDiskStoreFile>
             {
                 Getter = (context, item) => item._fileInfo.LastWriteTimeUtc,
                 Setter = (context, item, value) =>
@@ -110,7 +106,7 @@ public EncryptingDiskStoreItem(ILockingManager lockingManager, FileInfo fileInfo
                     return HttpStatusCode.OK;
                 }
             },
-            new Win32FileAttributes<EncryptingDiskStoreItem>
+            new Win32FileAttributes<EncryptingDiskStoreFile>
             {
                 Getter = (context, item) => item._fileInfo.Attributes,
                 Setter = (context, item, value) =>
@@ -122,13 +118,12 @@ public EncryptingDiskStoreItem(ILockingManager lockingManager, FileInfo fileInfo
         });
 
         public bool IsWritable { get; }
-        public string Name => _pathConverter.GetCleartextFileName(_fileInfo.FullName) ?? string.Empty;
-        public string UniqueKey => _fileInfo.FullName;
-        public string FullPath => _pathConverter.ToCleartext(_fileInfo.FullName) ?? string.Empty;
-        public Task<Stream> GetReadableStreamAsync(IHttpContext context) => Task.FromResult<Stream?>(_specifics.StreamsAccess.OpenPlaintextStream(_fileInfo.FullName, _fileInfo.OpenRead()));
-        public Task<Stream> GetWritableStreamAsync(IHttpContext context) => Task.FromResult<Stream?>(_specifics.StreamsAccess.OpenPlaintextStream(_fileInfo.FullName, _fileInfo.Open(FileMode.OpenOrCreate, FileAccess.ReadWrite)));
+        public string Name => Path.GetFileName(Id);
+        public string Id => NativePathHelpers.GetPlaintextPath(_fileInfo.FullName, _specifics) ?? string.Empty;
+        public Task<Stream> GetReadableStreamAsync(CancellationToken cancellationToken) => Task.FromResult<Stream?>(_specifics.StreamsAccess.OpenPlaintextStream(_fileInfo.FullName, _fileInfo.OpenRead()));
+        public Task<Stream> GetWritableStreamAsync(CancellationToken cancellationToken) => Task.FromResult<Stream?>(_specifics.StreamsAccess.OpenPlaintextStream(_fileInfo.FullName, _fileInfo.Open(FileMode.OpenOrCreate, FileAccess.ReadWrite)));
 
-        public async Task<HttpStatusCode> UploadFromStreamAsync(IHttpContext context, Stream inputStream)
+        public async Task<HttpStatusCode> UploadFromStreamAsync(Stream inputStream, CancellationToken cancellationToken)
         {
             // Check if the item is writable
             if (!IsWritable)
@@ -138,22 +133,28 @@ public async Task<HttpStatusCode> UploadFromStreamAsync(IHttpContext context, St
             try
             {
                 // Copy the information to the destination stream
-                using (var outputStream = await GetWritableStreamAsync(context).ConfigureAwait(false))
+                using (var outputStream = await GetWritableStreamAsync(cancellationToken).ConfigureAwait(false))
                 {
                     await inputStream.CopyToAsync(outputStream).ConfigureAwait(false);
                 }
+
                 return HttpStatusCode.OK;
             }
             catch (IOException ioException) when (ioException.IsDiskFull())
             {
                 return HttpStatusCode.InsufficientStorage;
             }
+            catch (Exception ex)
+            {
+                _ = ex;
+                throw;
+            }
         }
 
         public IPropertyManager PropertyManager => DefaultPropertyManager;
         public ILockingManager LockingManager { get; }
 
-        public async Task<StoreItemResult> CopyAsync(IStoreCollection destination, string name, bool overwrite, IHttpContext context)
+        public async Task<StoreItemResult> CopyAsync(IStoreCollection destination, string name, bool overwrite, CancellationToken cancellationToken)
         {
             try
             {
@@ -165,7 +166,7 @@ public async Task<StoreItemResult> CopyAsync(IStoreCollection destination, strin
                     if (!diskCollection.IsWritable)
                         return new StoreItemResult(HttpStatusCode.Forbidden);
 
-                    var destinationPath = _pathConverter.ToCiphertext(Path.Combine(diskCollection.FullPath, name));
+                    var destinationPath = NativePathHelpers.GetCiphertextPath(Path.Combine(diskCollection.Id, name), _specifics);
 
                     // Check if the file already exists
                     var fileExists = File.Exists(destinationPath);
@@ -181,18 +182,23 @@ public async Task<StoreItemResult> CopyAsync(IStoreCollection destination, strin
                 else
                 {
                     // Create the item in the destination collection
-                    var result = await destination.CreateItemAsync(name, overwrite, context).ConfigureAwait(false);
+                    var result = await destination.CreateItemAsync(name, overwrite, cancellationToken).ConfigureAwait(false);
 
                     // Check if the item could be created
-                    if (result.Item != null)
+                    if (result.Item is IStoreFile storeFile)
                     {
-                        using (var sourceStream = await GetWritableStreamAsync(context).ConfigureAwait(false))
+                        using (var sourceStream = await GetWritableStreamAsync(cancellationToken).ConfigureAwait(false))
                         {
-                            var copyResult = await result.Item.UploadFromStreamAsync(context, sourceStream).ConfigureAwait(false);
+                            var copyResult = await storeFile.UploadFromStreamAsync(sourceStream, cancellationToken).ConfigureAwait(false);
                             if (copyResult != HttpStatusCode.OK)
                                 return new StoreItemResult(copyResult, result.Item);
                         }
                     }
+                    else
+                    {
+                        // Item is directory
+                        return new(HttpStatusCode.Conflict, result.Item);
+                    }
 
                     // Return result
                     return new StoreItemResult(result.Result, result.Item);
@@ -211,10 +217,11 @@ public override int GetHashCode()
             return _fileInfo.FullName.GetHashCode();
         }
 
-        public override bool Equals(object obj)
+        public override bool Equals(object? obj)
         {
-            if (!(obj is EncryptingDiskStoreItem storeItem))
+            if (obj is not EncryptingDiskStoreFile storeItem)
                 return false;
+            
             return storeItem._fileInfo.FullName.Equals(_fileInfo.FullName, StringComparison.CurrentCultureIgnoreCase);
         }
 
diff --git a/src/SecureFolderFS.Core.WebDav/Enums/WebDavProtocolMode.cs b/src/SecureFolderFS.Core.WebDav/Enums/WebDavProtocolMode.cs
deleted file mode 100644
index 5e9add7c6..000000000
--- a/src/SecureFolderFS.Core.WebDav/Enums/WebDavProtocolMode.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace SecureFolderFS.Core.WebDav.Enums
-{
-    /// <summary>
-    /// Defines modes of the WebDav protocol.
-    /// </summary>
-    public enum WebDavProtocolMode : uint
-    {
-        Http = 0,
-        Https = 1
-    }
-}
diff --git a/src/SecureFolderFS.Core.WebDav/Helpers/DriveMappingHelpers.cs b/src/SecureFolderFS.Core.WebDav/Helpers/DriveMappingHelpers.cs
index 90a264bf5..046232662 100644
--- a/src/SecureFolderFS.Core.WebDav/Helpers/DriveMappingHelpers.cs
+++ b/src/SecureFolderFS.Core.WebDav/Helpers/DriveMappingHelpers.cs
@@ -1,87 +1,15 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Text;
-using SecureFolderFS.Core.WebDav.UnsafeNative;
-using System.Threading;
-using System.Threading.Tasks;
+using SecureFolderFS.Core.WebDav.UnsafeNative;
+using System;
 using System.Diagnostics;
 
 namespace SecureFolderFS.Core.WebDav.Helpers
 {
     internal static class DriveMappingHelpers
     {
-        public static string GetRemotePath(
-            string protocol,
-            string domain,
-            int port,
-            string name)
-        {
-            var sep = Path.DirectorySeparatorChar;
-            if (OperatingSystem.IsWindows())
-            {
-                return $"{sep}{sep}{domain}@{port}{sep}{name}{sep}";
-            }
-            else if (OperatingSystem.IsMacCatalyst())
-            {
-                return $"{protocol}:{sep}{sep}{domain}:{port}{sep}{name}";
-            }
-            else if (OperatingSystem.IsLinux())
-            {
-                return $"{protocol}:{sep}{sep}{domain}:{port}{sep}{name}";
-            }
-
-            throw new PlatformNotSupportedException();
-        }
-
-        /// <summary>
-        /// Attempts to map a network drive. Doesn't throw on failure.
-        /// </summary>
-        public static async Task MapNetworkDriveAsync(
-            string mountPath,
-            string remotePath,
-            CancellationToken cancellationToken = default)
-        {
-            if (OperatingSystem.IsWindows())
-            {
-                var netResource = new NETRESOURCE()
-                {
-                    dwType = UnsafeNativeApis.RESOURCETYPE_DISK,
-                    lpLocalName = mountPath,
-                    lpRemoteName = remotePath,
-                };
-
-                // WNetAddConnection2 doesn't return until it has either successfully established a connection or timed out,
-                // so it has to be run in another thread to prevent blocking the server from responding.
-                _ = Task.Run(() => UnsafeNativeApis.WNetAddConnection2(netResource, null!, null!, UnsafeNativeApis.CONNECT_TEMPORARY), cancellationToken);
-            }
-            else if (OperatingSystem.IsMacCatalyst())
-            {
-                var args = $"mount_webdav {remotePath} {mountPath}";
-                var process = new Process()
-                {
-                    StartInfo = new ProcessStartInfo()
-                    {
-                        FileName = "/bin/bash",
-                        Arguments = $"-c \"{args}\"",
-                        RedirectStandardOutput = true,
-                        RedirectStandardError = true,
-                        UseShellExecute = false,
-                        CreateNoWindow = true
-                    }
-                };
-
-                process.Start();
-                await process.WaitForExitAsync(cancellationToken);
-                var error = await process.StandardError.ReadToEndAsync(cancellationToken);
-                _ = error;
-            }
-        }
-
         /// <summary>
         /// Attempts to disconnect a mapped network drive. Doesn't throw on failure.
         /// </summary>
-        public static async Task DisconnectNetworkDriveAsync(string mountPath, bool force)
+        public static void DisconnectNetworkDrive(string mountPath, bool force)
         {
             if (OperatingSystem.IsWindows())
             {
@@ -89,74 +17,8 @@ public static async Task DisconnectNetworkDriveAsync(string mountPath, bool forc
             }
             else if (OperatingSystem.IsMacCatalyst())
             {
-                var args = $"umount {mountPath}";
-                var process = new Process()
-                {
-                    StartInfo = new ProcessStartInfo()
-                    {
-                        FileName = "/bin/bash",
-                        Arguments = $"-c \"{args}\"",
-                        RedirectStandardOutput = true,
-                        RedirectStandardError = true,
-                        UseShellExecute = false,
-                        CreateNoWindow = true
-                    }
-                };
-
-                process.Start();
-                await process.WaitForExitAsync();
-            }
-        }
-
-        public static async Task<string?> GetMountPathForRemotePathAsync(string remotePath)
-        {
-            if (OperatingSystem.IsWindows())
-            {
-                remotePath = remotePath.TrimEnd('\\');
-
-                var bufferSize = remotePath.Length + 1; // Null-terminated
-                var driveRemotePathBuilder = new StringBuilder(bufferSize);
-
-                foreach (var drive in DriveInfo.GetDrives().Select(item => $"{item.Name[0]}:"))
-                {
-                    if (UnsafeNativeApis.WNetGetConnection(drive, driveRemotePathBuilder, ref bufferSize) == 0 && driveRemotePathBuilder.ToString() == remotePath)
-                        return drive;
-
-                    driveRemotePathBuilder.Clear();
-                }
-            }
-            else if (OperatingSystem.IsMacCatalyst())
-            {
-                var process = new Process()
-                {
-                    StartInfo = new ProcessStartInfo()
-                    {
-                        FileName = "mount",
-                        Arguments = "-t webdav",
-                        RedirectStandardOutput = true,
-                        RedirectStandardError = true,
-                        UseShellExecute = false,
-                        CreateNoWindow = true
-                    }
-                };
-
-                process.Start();
-                var output = await process.StandardOutput.ReadToEndAsync();
-                await process.WaitForExitAsync();
-
-                var lines = output.Split('\n');
-                foreach (var line in lines)
-                {
-                    if (line.Contains(remotePath))
-                    {
-                        var parts = line.Split(' ');
-                        if (parts.Length > 2)
-                            return parts[2]; // Assuming the mount path is the third part
-                    }
-                }
+                Process.Start("sh", $"-c \"diskutil unmount force \"{mountPath}\"\"");
             }
-
-            return null;
         }
     }
 }
diff --git a/src/SecureFolderFS.Core.WebDav/SecureFolderFS.Core.WebDav.csproj b/src/SecureFolderFS.Core.WebDav/SecureFolderFS.Core.WebDav.csproj
index 22c716f67..177062348 100644
--- a/src/SecureFolderFS.Core.WebDav/SecureFolderFS.Core.WebDav.csproj
+++ b/src/SecureFolderFS.Core.WebDav/SecureFolderFS.Core.WebDav.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>disable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <Platforms>AnyCPU;ARM64;x64;x86</Platforms>
diff --git a/src/SecureFolderFS.Core.WebDav/UnsafeNative/UnsafeNativeApis.cs b/src/SecureFolderFS.Core.WebDav/UnsafeNative/UnsafeNativeApis.cs
index 3a818f042..5c5401d90 100644
--- a/src/SecureFolderFS.Core.WebDav/UnsafeNative/UnsafeNativeApis.cs
+++ b/src/SecureFolderFS.Core.WebDav/UnsafeNative/UnsafeNativeApis.cs
@@ -6,16 +6,6 @@ namespace SecureFolderFS.Core.WebDav.UnsafeNative
 {
     internal static class UnsafeNativeApis
     {
-        public const int CONNECT_TEMPORARY = 4;
-        public const int RESOURCETYPE_DISK = 1;
-
-        [DllImport("Mpr.dll")]
-        public static extern int WNetAddConnection2(
-            [In] NETRESOURCE lpNetResource,
-            [In] string lpPassword,
-            [In] string lpUserName,
-            [In] uint dwFlags);
-
         [DllImport("Mpr.dll")]
         public static extern int WNetCancelConnection2(
             [In] string lpName,
@@ -35,22 +25,4 @@ public static extern int SendMessageA(
             [In] IntPtr wParam,
             [In] IntPtr lParam);
     }
-
-    [StructLayout(LayoutKind.Sequential)]
-    internal class NETRESOURCE
-    {
-        public uint dwScope;
-        public uint dwType;
-        public uint dwDisplayType;
-        public uint dwUsage;
-        public string lpLocalName = null!;
-        public string lpRemoteName = null!;
-        public string lpComment = null!;
-        public string lpProvider = null!;
-    }
-
-    internal static class WindowMessages
-    {
-        public const uint WM_CLOSE = 0x0010;
-    }
 }
diff --git a/src/SecureFolderFS.Core.WebDav/WebDavFileSystem.cs b/src/SecureFolderFS.Core.WebDav/WebDavFileSystem.cs
new file mode 100644
index 000000000..8ab5e5e34
--- /dev/null
+++ b/src/SecureFolderFS.Core.WebDav/WebDavFileSystem.cs
@@ -0,0 +1,77 @@
+using NWebDav.Server;
+using NWebDav.Server.Dispatching;
+using NWebDav.Server.Storage;
+using NWebDav.Server.Stores;
+using OwlCore.Storage;
+using SecureFolderFS.Core.Cryptography;
+using SecureFolderFS.Core.FileSystem;
+using SecureFolderFS.Core.FileSystem.Extensions;
+using SecureFolderFS.Core.WebDav.AppModels;
+using SecureFolderFS.Core.WebDav.EncryptingStorage2;
+using SecureFolderFS.Core.WebDav.Helpers;
+using SecureFolderFS.Shared.ComponentModel;
+using SecureFolderFS.Storage.Enums;
+using SecureFolderFS.Storage.VirtualFileSystem;
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace SecureFolderFS.Core.WebDav
+{
+    /// <inheritdoc cref="IFileSystem"/>
+    public abstract class WebDavFileSystem : IFileSystem
+    {
+        /// <inheritdoc/>
+        public string Id { get; } = Constants.FileSystem.FS_ID;
+
+        /// <inheritdoc/>
+        public string Name { get; } = Constants.FileSystem.FS_NAME;
+
+        /// <inheritdoc/>
+        public virtual Task<FileSystemAvailability> GetStatusAsync(CancellationToken cancellationToken = default)
+        {
+            // WebDav should be supported by majority of platforms
+            return Task.FromResult(FileSystemAvailability.Available);
+        }
+
+        /// <inheritdoc/>
+        public virtual async Task<IVFSRoot> MountAsync(IFolder folder, IDisposable unlockContract, IDictionary<string, object> options, CancellationToken cancellationToken = default)
+        {
+            if (unlockContract is not IWrapper<Security> wrapper)
+                throw new ArgumentException($"The {nameof(unlockContract)} is invalid.");
+
+            var webDavOptions = WebDavOptions.ToOptions(options);
+            var specifics = FileSystemSpecifics.CreateNew(wrapper.Inner, folder, webDavOptions);
+            webDavOptions.SetupValidators(specifics);
+
+            // Check if the port is available
+            if (!PortHelpers.IsPortAvailable(webDavOptions.Port))
+                webDavOptions.SetPortInternal(PortHelpers.GetNextAvailablePort(webDavOptions.Port));
+
+            var prefix = $"{webDavOptions.Protocol}://{webDavOptions.Domain}:{webDavOptions.Port}/";
+            var httpListener = new HttpListener();
+
+            httpListener.Prefixes.Add(prefix);
+            httpListener.AuthenticationSchemes = AuthenticationSchemes.Anonymous;
+
+            var encryptingDiskStore = new EncryptingDiskStore(specifics.ContentFolder.Id, specifics, !specifics.Options.IsReadOnly);
+            var dispatcher = new WebDavDispatcher(new RootDiskStore(specifics.Options.VolumeName, encryptingDiskStore), new RequestHandlerProvider(), null);
+
+            return await MountAsync(
+                specifics,
+                httpListener,
+                webDavOptions,
+                dispatcher,
+                cancellationToken);
+        }
+
+        protected abstract Task<IVFSRoot> MountAsync(
+            FileSystemSpecifics specifics,
+            HttpListener listener,
+            WebDavOptions options,
+            IRequestDispatcher requestDispatcher,
+            CancellationToken cancellationToken);
+    }
+}
diff --git a/src/SecureFolderFS.Core.WebDav/WebDavMountable.cs b/src/SecureFolderFS.Core.WebDav/WebDavMountable.cs
deleted file mode 100644
index a628df623..000000000
--- a/src/SecureFolderFS.Core.WebDav/WebDavMountable.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-using NWebDav.Server;
-using NWebDav.Server.Dispatching;
-using NWebDav.Server.Storage;
-using NWebDav.Server.Stores;
-using OwlCore.Storage;
-using OwlCore.Storage.System.IO;
-using SecureFolderFS.Core.FileSystem;
-using SecureFolderFS.Core.FileSystem.AppModels;
-using SecureFolderFS.Core.FileSystem.Enums;
-using SecureFolderFS.Core.FileSystem.Helpers;
-using SecureFolderFS.Core.FileSystem.Paths;
-using SecureFolderFS.Core.WebDav.AppModels;
-using SecureFolderFS.Core.WebDav.EncryptingStorage2;
-using SecureFolderFS.Core.WebDav.Enums;
-using SecureFolderFS.Core.WebDav.Helpers;
-using SecureFolderFS.Storage.VirtualFileSystem;
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Net;
-using System.Threading;
-using System.Threading.Tasks;
-using OwlCore.Storage.Memory;
-
-namespace SecureFolderFS.Core.WebDav
-{
-    /// <inheritdoc cref="IMountableFileSystem"/>
-    public sealed class WebDavMountable : IMountableFileSystem, IAvailabilityChecker
-    {      
-        private readonly FileSystemOptions _options;
-        private readonly IRequestDispatcher _requestDispatcher;
-
-        private WebDavMountable(FileSystemOptions options, IRequestDispatcher requestDispatcher)
-        {
-            _options = options;
-            _requestDispatcher = requestDispatcher;
-        }
-
-        /// <inheritdoc/>
-        public static FileSystemAvailabilityType IsSupported()
-        {
-            return FileSystemAvailabilityType.Available;
-        }
-
-        /// <inheritdoc/>
-        public async Task<IVFSRoot> MountAsync(MountOptions mountOptions, CancellationToken cancellationToken = default)
-        {
-            await Task.CompletedTask;
-            if (mountOptions is not WebDavMountOptions webDavMountOptions)
-                throw new ArgumentException(
-                    $"Parameter {nameof(mountOptions)} does not implement {nameof(WebDavMountOptions)}.");
-
-            var port = webDavMountOptions.PreferredPort;
-            if (port > 65536 || port <= 0)
-                throw new ArgumentException($"Parameter {nameof(WebDavMountOptions.PreferredPort)} is invalid.");
-
-            if (!PortHelpers.IsPortAvailable(port))
-                port = PortHelpers.GetNextAvailablePort(port);
-
-            var protocol = webDavMountOptions.Protocol == WebDavProtocolMode.Http ? "http" : "https";
-            var prefix = $"{protocol}://{webDavMountOptions.Domain}:{port}/";
-
-            var httpListener = new HttpListener();
-            httpListener.Prefixes.Add(prefix);
-            httpListener.AuthenticationSchemes = AuthenticationSchemes.Anonymous;
-
-            var remotePath = DriveMappingHelpers.GetRemotePath(protocol, "localhost", port, _options.VolumeName);
-            var mountPath = await DriveMappingHelpers.GetMountPathForRemotePathAsync(remotePath);
-            if (mountPath is null && !OperatingSystem.IsLinux())
-            {
-                mountPath = PathHelpers.GetFreeMountPath(_options.VolumeName);
-                if (mountPath is null)
-                    throw new IOException("No free mount points found.");
-                
-                await DriveMappingHelpers.MapNetworkDriveAsync(mountPath, remotePath, cancellationToken);    
-            }
-
-            var webDavWrapper = new WebDavWrapper(httpListener, _requestDispatcher, mountPath);
-            webDavWrapper.StartFileSystem();
-
-            // TODO: Remove once the port is displayed in the UI.
-            Debug.WriteLine($"WebDAV server started on port {port}.");
-            Debug.WriteLine($"MountableDAV\nmountPath: {mountPath}\nremotePath: {remotePath}");
-
-            // TODO: Currently using MemoryFolder because the check in SystemFolder might sometimes fail
-            return new WebDavRootFolder(webDavWrapper, new MemoryFolder(remotePath, _options.VolumeName), _options);
-        }
-
-        public static IMountableFileSystem CreateMountable(FileSystemSpecifics specifics, IPathConverter pathConverter)
-        {
-            // TODO: Implement FileSystemSpecifics
-            var cryptoFolder = (IFolder)null!; // new CryptoFolder(contentFolder, streamsAccess, pathConverter, directoryIdCache);
-            var davFolder = new DavFolder(cryptoFolder);
-
-            // TODO: Remove the following line once the new DavStorage is fully implemented.
-            var encryptingDiskStore = new EncryptingDiskStore(specifics.ContentFolder.Id, specifics, pathConverter);
-            var dispatcher = new WebDavDispatcher(new RootDiskStore(specifics.FileSystemOptions.VolumeName, encryptingDiskStore), davFolder, new RequestHandlerProvider(), null);
-            return new WebDavMountable(specifics.FileSystemOptions, dispatcher);
-        }
-    }
-}
diff --git a/src/SecureFolderFS.Core.WebDav/WebDavRootFolder.cs b/src/SecureFolderFS.Core.WebDav/WebDavRootFolder.cs
index fa887fe05..07664a8ee 100644
--- a/src/SecureFolderFS.Core.WebDav/WebDavRootFolder.cs
+++ b/src/SecureFolderFS.Core.WebDav/WebDavRootFolder.cs
@@ -1,23 +1,21 @@
 using OwlCore.Storage;
 using SecureFolderFS.Core.FileSystem;
-using SecureFolderFS.Core.FileSystem.AppModels;
-using SecureFolderFS.Core.FileSystem.Enums;
 using SecureFolderFS.Storage.VirtualFileSystem;
 using System.Threading.Tasks;
 
 namespace SecureFolderFS.Core.WebDav
 {
     /// <inheritdoc cref="IVFSRoot"/>
-    internal sealed class WebDavRootFolder : VFSRoot
+    public sealed class WebDavRootFolder : VFSRoot
     {
         private readonly WebDavWrapper _webDavWrapper;
         private bool _disposed;
 
         /// <inheritdoc/>
-        public override string FileSystemName { get; } = Constants.FILE_SYSTEM_NAME;
+        public override string FileSystemName { get; } = Constants.FileSystem.FS_NAME;
 
-        public WebDavRootFolder(WebDavWrapper webDavWrapper, IFolder storageRoot, FileSystemOptions options)
-            : base(storageRoot, options)
+        public WebDavRootFolder(WebDavWrapper webDavWrapper, IFolder storageRoot, FileSystemSpecifics specifics)
+            : base(storageRoot, specifics)
         {
             _webDavWrapper = webDavWrapper;
         }
@@ -28,73 +26,9 @@ public override async ValueTask DisposeAsync()
             if (_disposed)
                 return;
 
-            _disposed = await _webDavWrapper.CloseFileSystemAsync(FileSystemCloseMethod.CloseForcefully);
+            _disposed = await _webDavWrapper.CloseFileSystemAsync();
             if (_disposed)
-                FileSystemManager.Instance.RemoveRoot(this);
+                FileSystemManager.Instance.FileSystems.Remove(this);
         }
-
-        // TODO: Using FileSystemManager.CollectionChanged, detect filesystem changes and handle it in Uno Windows
-        //private static Task CloseExplorerShellAsync(string path)
-        //{
-        //    _ = path;
-        //    return Task.CompletedTask;
-        //    try
-        //    {
-        //        var formattedPath = PathHelpers.EnsureNoTrailingPathSeparator(path);
-        //        var shellWindows = new SHDocVw.ShellWindows();
-
-        //        foreach (SHDocVw.InternetExplorer ie in shellWindows)
-        //        {
-        //            var formattedName = Path.GetFileNameWithoutExtension(ie.FullName);
-        //            if (!formattedName.Equals("explorer", StringComparison.OrdinalIgnoreCase))
-        //                continue;
-
-        //            var url = ie.LocationURL.Replace('/', Path.DirectorySeparatorChar);
-        //            var formattedUrl = Uri.UnescapeDataString(url);
-        //            if (!formattedUrl.Contains(formattedPath))
-        //                continue;
-
-        //            var windowClosed = false;
-        //            try
-        //            {
-        //                // Attach closing event
-        //                ie.WindowClosing += Window_Closing;
-
-        //                // Try quit first
-        //                ie.Quit();
-
-        //                // Wait a short delay
-        //                await Task.Delay(100);
-
-        //                if (!windowClosed)
-        //                {
-        //                    // Retry with WM_CLOSE
-        //                    var hWnd = new IntPtr(ie.HWND);
-        //                    _ = UnsafeNativeApis.SendMessageA(hWnd, WindowMessages.WM_CLOSE, IntPtr.Zero, IntPtr.Zero);
-        //                }
-        //            }
-        //            catch (Exception ex)
-        //            {
-        //                // May sometimes throw when trying to access invalid window handle
-        //                _ = ex;
-        //            }
-        //            finally
-        //            {
-        //                // Detach to avoid leaking memory
-        //                ie.WindowClosing -= Window_Closing;
-        //            }
-
-        //            void Window_Closing(bool IsChildWindow, ref bool Cancel)
-        //            {
-        //                windowClosed = true;
-        //            }
-        //        }
-        //    }
-        //    catch (Exception)
-        //    {
-        //        // Something went terribly wrong
-        //        Debugger.Break();
-        //    }
-        //}
     }
 }
diff --git a/src/SecureFolderFS.Core.WebDav/WebDavWrapper.cs b/src/SecureFolderFS.Core.WebDav/WebDavWrapper.cs
index 5aa0c6574..267175b94 100644
--- a/src/SecureFolderFS.Core.WebDav/WebDavWrapper.cs
+++ b/src/SecureFolderFS.Core.WebDav/WebDavWrapper.cs
@@ -1,8 +1,6 @@
-using System;
-using NWebDav.Server.Dispatching;
-using NWebDav.Server.HttpListener;
-using SecureFolderFS.Core.FileSystem.Enums;
+using NWebDav.Server.Dispatching;
 using SecureFolderFS.Core.WebDav.Helpers;
+using System;
 using System.Diagnostics;
 using System.Net;
 using System.Threading;
@@ -10,7 +8,7 @@
 
 namespace SecureFolderFS.Core.WebDav
 {
-    internal sealed class WebDavWrapper
+    public sealed class WebDavWrapper
     {
         private Thread? _fsThead;
         private readonly HttpListener _httpListener;
@@ -43,25 +41,22 @@ private async Task EnsureFileSystemAsync()
                     if (httpListenerContext.Request.IsAuthenticated)
                         Debugger.Break();
 
-                    var context = new HttpContext(httpListenerContext);
-                    await _requestDispatcher.DispatchRequestAsync(context, _fileSystemCts.Token);
+                    await _requestDispatcher.DispatchRequestAsync(httpListenerContext, _fileSystemCts.Token);
                 }
             }
             catch (Exception ex)
             {
                 _ = ex;
-                Debugger.Break();
             }
         }
 
-        public async Task<bool> CloseFileSystemAsync(FileSystemCloseMethod closeMethod)
+        public async Task<bool> CloseFileSystemAsync()
         {
-            _ = closeMethod; // TODO: Implement close method
             _httpListener.Close();
             await _fileSystemCts.CancelAsync();
 
             if (_mountPath is not null)
-                await DriveMappingHelpers.DisconnectNetworkDriveAsync(_mountPath, true);
+                DriveMappingHelpers.DisconnectNetworkDrive(_mountPath, true);
 
             return true;
         }
diff --git a/src/SecureFolderFS.Core/Constants.cs b/src/SecureFolderFS.Core/Constants.cs
index 7a3704c8d..8c9cfb571 100644
--- a/src/SecureFolderFS.Core/Constants.cs
+++ b/src/SecureFolderFS.Core/Constants.cs
@@ -45,6 +45,7 @@ public static class Associations
             {
                 public const string ASSOC_CONTENT_CIPHER_ID = "contentCipherScheme";
                 public const string ASSOC_FILENAME_CIPHER_ID = "filenameCipherScheme";
+                public const string ASSOC_FILENAME_ENCODING_ID = "filenameEncoding";
                 public const string ASSOC_SPECIALIZATION = "spec";
                 public const string ASSOC_AUTHENTICATION = "authMode";
                 public const string ASSOC_VAULT_ID = "vaultId";
@@ -55,16 +56,17 @@ public static class Versions
             {
                 public const int V1 = 1;
                 public const int V2 = 2;
-                public const int LATEST_VERSION = V2;
+                public const int V3 = 3;
+                public const int LATEST_VERSION = V2; // TODO: (v3) Update version
             }
         }
 
         public static class FileSystemId
         {
-            public const string FS_DOKAN = "DOKANY";
             public const string FS_FUSE = "FUSE";
             public const string FS_WEBDAV = "WEBDAV";
             public const string FS_ANDROID = "ANDROID_DOCUMENTS_PROVIDER";
+            public const string FS_IOS = "IOS_FILE_PROVIDER";
             public const string FS_LOCAL = "ABSTRACT_STORAGE";
         }
     }
diff --git a/src/SecureFolderFS.Core/Contracts/SecurityContract.cs b/src/SecureFolderFS.Core/Contracts/SecurityContract.cs
index f451c758f..3c0dfefe2 100644
--- a/src/SecureFolderFS.Core/Contracts/SecurityContract.cs
+++ b/src/SecureFolderFS.Core/Contracts/SecurityContract.cs
@@ -1,23 +1,31 @@
 using SecureFolderFS.Core.Cryptography;
 using SecureFolderFS.Core.Cryptography.SecureStore;
 using SecureFolderFS.Core.DataModels;
+using SecureFolderFS.Shared.ComponentModel;
 
 namespace SecureFolderFS.Core.Contracts
 {
-    internal class SecurityContract : KeystoreContract
+    internal class SecurityContract : KeystoreContract, IWrapper<Security>
     {
-        public Security Security { get; }
+        private Security? _security;
+
+        /// <inheritdoc/>
+        public Security Inner => _security ??= Security.CreateNew(
+            encKey: EncKey,
+            macKey: MacKey,
+            contentCipherId: ConfigurationDataModel.ContentCipherId,
+            fileNameCipherId: ConfigurationDataModel.FileNameCipherId,
+            fileNameEncodingId: ConfigurationDataModel.FileNameEncodingId);
 
         public SecurityContract(SecretKey encKey, SecretKey macKey, VaultKeystoreDataModel keystoreDataModel, VaultConfigurationDataModel configurationDataModel)
             : base(encKey, macKey, keystoreDataModel, configurationDataModel)
         {
-            Security = Security.CreateNew(encKey, macKey, ConfigurationDataModel.ContentCipherId, ConfigurationDataModel.FileNameCipherId);
         }
 
         /// <inheritdoc/>
         public override void Dispose()
         {
-            Security.Dispose();
+            _security?.Dispose();
             base.Dispose();
         }
     }
diff --git a/src/SecureFolderFS.Core/DataModels/VaultConfigurationDataModel.cs b/src/SecureFolderFS.Core/DataModels/VaultConfigurationDataModel.cs
index e57bcd54c..c0c0903a0 100644
--- a/src/SecureFolderFS.Core/DataModels/VaultConfigurationDataModel.cs
+++ b/src/SecureFolderFS.Core/DataModels/VaultConfigurationDataModel.cs
@@ -9,19 +9,27 @@ namespace SecureFolderFS.Core.DataModels
     public sealed class VaultConfigurationDataModel : VersionDataModel
     {
         /// <summary>
-        /// Gets scheme type of the vault for content encryption.
+        /// Gets the ID for content encryption.
         /// </summary>
         [JsonPropertyName(Associations.ASSOC_CONTENT_CIPHER_ID)]
         [DefaultValue("")]
         public required string ContentCipherId { get; init; }
 
         /// <summary>
-        /// Gets scheme type of the vault for name encryption.
+        /// Gets the ID for file name encryption.
         /// </summary>
         [JsonPropertyName(Associations.ASSOC_FILENAME_CIPHER_ID)]
         [DefaultValue("")]
         public required string FileNameCipherId { get; init; }
 
+        /// <summary>
+        /// Gets the ID for file name encoding.
+        /// </summary>
+        //[JsonPropertyName(Associations.ASSOC_FILENAME_ENCODING_ID)]
+        //[DefaultValue("")]
+        [JsonIgnore]
+        public string FileNameEncodingId { get; set; } = Cryptography.Constants.CipherId.ENCODING_BASE64URL;
+
         ///// <summary>
         ///// Gets the specialization of the vault that hints how the user data should be handled.
         ///// </summary>
diff --git a/src/SecureFolderFS.Core/DataModels/VaultKeystoreDataModel.cs b/src/SecureFolderFS.Core/DataModels/VaultKeystoreDataModel.cs
index 06f95be7f..70c157753 100644
--- a/src/SecureFolderFS.Core/DataModels/VaultKeystoreDataModel.cs
+++ b/src/SecureFolderFS.Core/DataModels/VaultKeystoreDataModel.cs
@@ -7,13 +7,13 @@ namespace SecureFolderFS.Core.DataModels
     public sealed class VaultKeystoreDataModel
     {
         /// <summary>
-        /// Gets wrapped version stored in keystore of the encryption key.
+        /// Gets the wrapped version of the DEK key.
         /// </summary>
         [JsonPropertyName("c_encryptionKey")]
         public byte[]? WrappedEncKey { get; init; }
 
         /// <summary>
-        /// Gets wrapped version stored in keystore of the mac key.
+        /// Gets the wrapped version of the MAC key.
         /// </summary>
         [JsonPropertyName("c_macKey")]
         public byte[]? WrappedMacKey { get; init; }
diff --git a/src/SecureFolderFS.Core/Routines/IStorageRoutine.cs b/src/SecureFolderFS.Core/Routines/IStorageRoutine.cs
deleted file mode 100644
index 7a241c7fe..000000000
--- a/src/SecureFolderFS.Core/Routines/IStorageRoutine.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using OwlCore.Storage;
-using SecureFolderFS.Core.FileSystem;
-using SecureFolderFS.Core.FileSystem.AppModels;
-using SecureFolderFS.Core.FileSystem.Paths;
-using System;
-
-namespace SecureFolderFS.Core.Routines
-{
-    // TODO: Needs docs
-    public interface IStorageRoutine : IContractRoutine
-    {
-        [Obsolete("Use FileSystemSpecifics")]
-        IPathConverter CreateStorageComponents(IFolder contentRoot, FileSystemOptions options);
-
-        FileSystemSpecifics GetSpecifics(IFolder contentFolder, FileSystemOptions options);
-    }
-}
diff --git a/src/SecureFolderFS.Core/Routines/Operational/CreationRoutine.cs b/src/SecureFolderFS.Core/Routines/Operational/CreationRoutine.cs
index 2cddb8bdf..b8ec97edf 100644
--- a/src/SecureFolderFS.Core/Routines/Operational/CreationRoutine.cs
+++ b/src/SecureFolderFS.Core/Routines/Operational/CreationRoutine.cs
@@ -39,9 +39,9 @@ public Task InitAsync(CancellationToken cancellationToken = default)
         public void SetCredentials(SecretKey passkey)
         {
             // Allocate shallow keys which will be later disposed of
-            using var encKey = new SecureKey(Cryptography.Constants.KeyChains.ENCKEY_LENGTH);
-            using var macKey = new SecureKey(Cryptography.Constants.KeyChains.MACKEY_LENGTH);
-            var salt = new byte[Cryptography.Constants.KeyChains.SALT_LENGTH];
+            using var encKey = new SecureKey(KeyTraits.ENCKEY_LENGTH);
+            using var macKey = new SecureKey(KeyTraits.MACKEY_LENGTH);
+            var salt = new byte[KeyTraits.SALT_LENGTH];
 
             // Fill keys
             using var secureRandom = RandomNumberGenerator.Create();
@@ -65,6 +65,7 @@ public void SetOptions(IDictionary<string, object?> options)
                 Version = Versions.LATEST_VERSION,
                 ContentCipherId = options.Get(Associations.ASSOC_CONTENT_CIPHER_ID).TryCast<string>() ?? CipherId.XCHACHA20_POLY1305,
                 FileNameCipherId = options.Get(Associations.ASSOC_FILENAME_CIPHER_ID).TryCast<string>() ?? CipherId.AES_SIV,
+                FileNameEncodingId = options.Get(Associations.ASSOC_FILENAME_ENCODING_ID).TryCast<string>() ?? CipherId.ENCODING_BASE64URL,
                 AuthenticationMethod = options.Get(Associations.ASSOC_AUTHENTICATION).TryCast<string>() ?? throw new InvalidOperationException($"Cannot create vault without specifying {Associations.ASSOC_AUTHENTICATION}."),
                 Uid = options.Get(Associations.ASSOC_VAULT_ID).TryCast<string>() ?? Guid.NewGuid().ToString(),
                 PayloadMac = new byte[HMACSHA256.HashSizeInBytes]
diff --git a/src/SecureFolderFS.Core/Routines/Operational/ModifyCredentialsRoutine.cs b/src/SecureFolderFS.Core/Routines/Operational/ModifyCredentialsRoutine.cs
index 4914644ee..2aa3fb957 100644
--- a/src/SecureFolderFS.Core/Routines/Operational/ModifyCredentialsRoutine.cs
+++ b/src/SecureFolderFS.Core/Routines/Operational/ModifyCredentialsRoutine.cs
@@ -48,6 +48,7 @@ public void SetOptions(IDictionary<string, object?> options)
                 Version = options.Get(Associations.ASSOC_VERSION).TryCast<int?>() ?? throw GetException(nameof(Associations.ASSOC_VERSION)),
                 ContentCipherId = options.Get(Associations.ASSOC_CONTENT_CIPHER_ID).TryCast<string?>() ?? throw GetException(nameof(Associations.ASSOC_CONTENT_CIPHER_ID)),
                 FileNameCipherId = options.Get(Associations.ASSOC_FILENAME_CIPHER_ID).TryCast<string?>() ?? throw GetException(nameof(Associations.ASSOC_FILENAME_CIPHER_ID)),
+                FileNameEncodingId = options.Get(Associations.ASSOC_FILENAME_ENCODING_ID).TryCast<string?>() ?? throw GetException(nameof(Associations.ASSOC_FILENAME_ENCODING_ID)),
                 AuthenticationMethod = options.Get(Associations.ASSOC_AUTHENTICATION).TryCast<string?>() ?? throw GetException(nameof(Associations.ASSOC_AUTHENTICATION)),
                 Uid = options.Get(Associations.ASSOC_VAULT_ID).TryCast<string?>() ?? throw GetException(nameof(Associations.ASSOC_VAULT_ID)),
                 PayloadMac = new byte[HMACSHA256.HashSizeInBytes]
@@ -67,7 +68,7 @@ public void SetCredentials(SecretKey passkey)
 
             // Generate new salt
             using var secureRandom = RandomNumberGenerator.Create();
-            var salt = new byte[Cryptography.Constants.KeyChains.SALT_LENGTH];
+            var salt = new byte[Cryptography.Constants.KeyTraits.SALT_LENGTH];
             secureRandom.GetNonZeroBytes(salt);
 
             // Encrypt new keystore
@@ -87,8 +88,7 @@ public async Task<IDisposable> FinalizeAsync(CancellationToken cancellationToken
             await _vaultWriter.WriteKeystoreAsync(_keystoreDataModel, cancellationToken);
             await _vaultWriter.WriteConfigurationAsync(_configDataModel, cancellationToken);
 
-            // TODO: Return UnlockContract
-            return null!;
+            return _unlockContract;
         }
 
         /// <inheritdoc/>
diff --git a/src/SecureFolderFS.Core/Routines/Operational/RecoverRoutine.cs b/src/SecureFolderFS.Core/Routines/Operational/RecoverRoutine.cs
index 99a6cebf1..83f3c71a9 100644
--- a/src/SecureFolderFS.Core/Routines/Operational/RecoverRoutine.cs
+++ b/src/SecureFolderFS.Core/Routines/Operational/RecoverRoutine.cs
@@ -21,8 +21,8 @@ public sealed class RecoverRoutine : ICredentialsRoutine
         public RecoverRoutine(VaultReader vaultReader)
         {
             _vaultReader = vaultReader;
-            _encKey = new SecureKey(Cryptography.Constants.KeyChains.ENCKEY_LENGTH);
-            _macKey = new SecureKey(Cryptography.Constants.KeyChains.MACKEY_LENGTH);
+            _encKey = new SecureKey(Cryptography.Constants.KeyTraits.ENCKEY_LENGTH);
+            _macKey = new SecureKey(Cryptography.Constants.KeyTraits.MACKEY_LENGTH);
         }
 
         /// <inheritdoc/>
@@ -36,10 +36,10 @@ public async Task InitAsync(CancellationToken cancellationToken)
         public void SetCredentials(SecretKey passkey)
         {
             // Copy the first part (DEK) of the master key
-            passkey.Key.AsSpan(0, Cryptography.Constants.KeyChains.ENCKEY_LENGTH).CopyTo(_encKey.Key);
+            passkey.Key.AsSpan(0, Cryptography.Constants.KeyTraits.ENCKEY_LENGTH).CopyTo(_encKey.Key);
 
             // Copy the second part (MAC) of the master key
-            passkey.Key.AsSpan(Cryptography.Constants.KeyChains.MACKEY_LENGTH).CopyTo(_macKey.Key);
+            passkey.Key.AsSpan(Cryptography.Constants.KeyTraits.MACKEY_LENGTH).CopyTo(_macKey.Key);
         }
 
         /// <inheritdoc/>
diff --git a/src/SecureFolderFS.Core/Routines/Operational/StorageRoutine.cs b/src/SecureFolderFS.Core/Routines/Operational/StorageRoutine.cs
deleted file mode 100644
index 7f261ee3b..000000000
--- a/src/SecureFolderFS.Core/Routines/Operational/StorageRoutine.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using OwlCore.Storage;
-using SecureFolderFS.Core.Contracts;
-using SecureFolderFS.Core.FileSystem;
-using SecureFolderFS.Core.FileSystem.AppModels;
-using SecureFolderFS.Core.FileSystem.Directories;
-using SecureFolderFS.Core.FileSystem.Paths;
-using System;
-
-namespace SecureFolderFS.Core.Routines.Operational
-{
-    /// <inheritdoc cref="IStorageRoutine"/>
-    internal sealed class StorageRoutine : IStorageRoutine
-    {
-        private SecurityContract? _unlockContract;
-
-        /// <inheritdoc/>
-        public void SetUnlockContract(IDisposable unlockContract)
-        {
-            if (unlockContract is not SecurityContract contract)
-                throw new ArgumentException($"The {nameof(unlockContract)} is invalid.");
-
-            _unlockContract = contract;
-        }
-
-        /// <inheritdoc/>
-        public IPathConverter CreateStorageComponents(IFolder contentFolder, FileSystemOptions options)
-        {
-            ArgumentNullException.ThrowIfNull(_unlockContract);
-
-            var directoryIdCache = new DirectoryIdCache(options.FileSystemStatistics);
-            var pathConverter = _unlockContract.ConfigurationDataModel.FileNameCipherId != Cryptography.Constants.CipherId.NONE
-                ? CiphertextPathConverter.CreateNew(_unlockContract.Security, contentFolder, directoryIdCache, options.EnableFileNameCache, options.FileSystemStatistics)
-                : CleartextPathConverter.CreateNew(contentFolder);
-
-            return pathConverter;
-        }
-
-        /// <inheritdoc/>
-        public FileSystemSpecifics GetSpecifics(IFolder contentFolder, FileSystemOptions options)
-        {
-            ArgumentNullException.ThrowIfNull(_unlockContract);
-            return FileSystemSpecifics.CreateNew(_unlockContract.Security, contentFolder, options);
-        }
-    }
-}
diff --git a/src/SecureFolderFS.Core/Routines/Operational/VaultRoutines.cs b/src/SecureFolderFS.Core/Routines/Operational/VaultRoutines.cs
index dcd21dcb4..671907549 100644
--- a/src/SecureFolderFS.Core/Routines/Operational/VaultRoutines.cs
+++ b/src/SecureFolderFS.Core/Routines/Operational/VaultRoutines.cs
@@ -45,12 +45,6 @@ public ICredentialsRoutine RecoverVault()
             return new RecoverRoutine(VaultReader);
         }
 
-        public IStorageRoutine BuildStorage()
-        {
-            CheckVaultValidation();
-            return new StorageRoutine();
-        }
-
         public IModifyCredentialsRoutine ModifyCredentials()
         {
             CheckVaultValidation();
diff --git a/src/SecureFolderFS.Core/SecureFolderFS.Core.csproj b/src/SecureFolderFS.Core/SecureFolderFS.Core.csproj
index 2aff88897..a917c1091 100644
--- a/src/SecureFolderFS.Core/SecureFolderFS.Core.csproj
+++ b/src/SecureFolderFS.Core/SecureFolderFS.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Platforms>AnyCPU;x64;ARM64;x86</Platforms>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <Nullable>enable</Nullable>
diff --git a/src/SecureFolderFS.Core/Validators/VersionValidator.cs b/src/SecureFolderFS.Core/Validators/VersionValidator.cs
index e46c56836..0cbc9184d 100644
--- a/src/SecureFolderFS.Core/Validators/VersionValidator.cs
+++ b/src/SecureFolderFS.Core/Validators/VersionValidator.cs
@@ -25,7 +25,7 @@ public async Task ValidateAsync(Stream value, CancellationToken cancellationToke
         {
             var versionDataModel = await _serializer.DeserializeAsync<Stream, VersionDataModel?>(value, cancellationToken);
             if (versionDataModel is null)
-                throw new SerializationException("Couldn't deserialize configuration buffer to version data model.");
+                throw new SerializationException($"Couldn't deserialize configuration buffer to {nameof(VersionDataModel)}.");
 
             if (versionDataModel.Version > LATEST_VERSION)
                 throw new FormatException("Unknown vault version.");
diff --git a/src/SecureFolderFS.Core/VaultAccess/VaultParser.cs b/src/SecureFolderFS.Core/VaultAccess/VaultParser.cs
index dbc41167d..7edbdd322 100644
--- a/src/SecureFolderFS.Core/VaultAccess/VaultParser.cs
+++ b/src/SecureFolderFS.Core/VaultAccess/VaultParser.cs
@@ -27,6 +27,7 @@ public static void CalculateConfigMac(VaultConfigurationDataModel configDataMode
             hmacSha256.AppendData(BitConverter.GetBytes(Constants.Vault.Versions.LATEST_VERSION));                              // Version
             hmacSha256.AppendData(BitConverter.GetBytes(CryptHelpers.ContentCipherId(configDataModel.ContentCipherId)));        // ContentCipherScheme
             hmacSha256.AppendData(BitConverter.GetBytes(CryptHelpers.FileNameCipherId(configDataModel.FileNameCipherId)));      // FileNameCipherScheme
+            //hmacSha256.AppendData(Encoding.UTF8.GetBytes(configDataModel.FileNameEncodingId));                                // FileNameEncodingId // TODO: (v3) Hash Encoding ID
             hmacSha256.AppendData(Encoding.UTF8.GetBytes(configDataModel.Uid));                                                 // Id
             hmacSha256.AppendFinalData(Encoding.UTF8.GetBytes(configDataModel.AuthenticationMethod));                           // AuthMethod
 
@@ -43,11 +44,11 @@ public static void CalculateConfigMac(VaultConfigurationDataModel configDataMode
         [SkipLocalsInit]
         public static (SecretKey encKey, SecretKey macKey) DeriveKeystore(SecretKey passkey, VaultKeystoreDataModel keystoreDataModel)
         {
-            var encKey = new SecureKey(Cryptography.Constants.KeyChains.ENCKEY_LENGTH);
-            var macKey = new SecureKey(Cryptography.Constants.KeyChains.MACKEY_LENGTH);
+            var encKey = new SecureKey(Cryptography.Constants.KeyTraits.ENCKEY_LENGTH);
+            var macKey = new SecureKey(Cryptography.Constants.KeyTraits.MACKEY_LENGTH);
 
             // Derive KEK
-            Span<byte> kek = stackalloc byte[Cryptography.Constants.ARGON2_KEK_LENGTH];
+            Span<byte> kek = stackalloc byte[Cryptography.Constants.KeyTraits.ARGON2_KEK_LENGTH];
             Argon2id.DeriveKey(passkey.Key, keystoreDataModel.Salt, kek);
 
             // Unwrap keys
@@ -74,7 +75,7 @@ public static VaultKeystoreDataModel EncryptKeystore(
             byte[] salt)
         {
             // Derive KEK
-            Span<byte> kek = stackalloc byte[Cryptography.Constants.ARGON2_KEK_LENGTH];
+            Span<byte> kek = stackalloc byte[Cryptography.Constants.KeyTraits.ARGON2_KEK_LENGTH];
             Argon2id.DeriveKey(passkey, salt, kek);
 
             // Wrap keys
diff --git a/src/SecureFolderFS.Sdk/AppModels/DoubleSerializedStreamSerializer.cs b/src/SecureFolderFS.Sdk/AppModels/DoubleSerializedStreamSerializer.cs
index 038912d73..76848b198 100644
--- a/src/SecureFolderFS.Sdk/AppModels/DoubleSerializedStreamSerializer.cs
+++ b/src/SecureFolderFS.Sdk/AppModels/DoubleSerializedStreamSerializer.cs
@@ -1,12 +1,13 @@
-using SecureFolderFS.Sdk.Models;
-using SecureFolderFS.Shared.Extensions;
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
+using SecureFolderFS.Sdk.Models;
+using SecureFolderFS.Shared.Extensions;
+using SecureFolderFS.Shared.Models;
 
 namespace SecureFolderFS.Sdk.AppModels
 {
diff --git a/src/SecureFolderFS.Sdk/AppModels/HealthModel.cs b/src/SecureFolderFS.Sdk/AppModels/HealthModel.cs
new file mode 100644
index 000000000..5defafd92
--- /dev/null
+++ b/src/SecureFolderFS.Sdk/AppModels/HealthModel.cs
@@ -0,0 +1,193 @@
+using OwlCore.Storage;
+using SecureFolderFS.Sdk.Attributes;
+using SecureFolderFS.Sdk.EventArguments;
+using SecureFolderFS.Sdk.Models;
+using SecureFolderFS.Sdk.Services;
+using SecureFolderFS.Shared;
+using SecureFolderFS.Shared.ComponentModel;
+using SecureFolderFS.Storage.Scanners;
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace SecureFolderFS.Sdk.AppModels
+{
+    /// <inheritdoc cref="IHealthModel"/>
+    [Inject<IVaultService>]
+    public sealed partial class HealthModel : IHealthModel, IProgress<IResult>
+    {
+        private readonly IFolderScanner _folderScanner;
+        private readonly List<IChildFile> _scannedFiles;
+        private readonly List<IChildFolder> _scannedFolders;
+        private readonly ProgressModel<TotalProgress> _progress;
+        private readonly IAsyncValidator<(IFolder, IProgress<IResult>?), IResult>? _structureValidator;
+        private int _updateCount;
+        private int _updateInterval;
+        private volatile int _totalFilesScanned;
+        private volatile int _totalFoldersScanned;
+
+        /// <inheritdoc/>
+        public event EventHandler<HealthIssueEventArgs>? IssueFound;
+
+        public HealthModel(IFolderScanner folderScanner, ProgressModel<TotalProgress> progress, IAsyncValidator<(IFolder, IProgress<IResult>?), IResult>? structureValidator)
+        {
+            ServiceProvider = DI.Default;
+            _scannedFiles = new();
+            _scannedFolders = new();
+            _folderScanner = folderScanner;
+            _progress = progress;
+            _structureValidator = structureValidator;
+        }
+
+        /// <inheritdoc/>
+        public async Task ScanAsync(bool includeFileContents, CancellationToken cancellationToken = default)
+        {
+            await Task.Run(async () =>
+            {
+                _progress.PercentageProgress?.Report(0d);
+
+                _totalFilesScanned = 0;
+                _totalFoldersScanned = 0;
+                _scannedFiles.Clear();
+                _scannedFolders.Clear();
+
+                // Start collecting items
+                _progress.CallbackProgress?.Report(new());
+                await Task.Delay(750, cancellationToken);
+
+                // Do not forget to add the RootFolder
+                AddScannedItem(_folderScanner.RootFolder);
+
+                // Continue enumeration as usual
+                await foreach (var item in _folderScanner.ScanFolderAsync(cancellationToken).ConfigureAwait(false))
+                {
+                    if (cancellationToken.IsCancellationRequested)
+                        return;
+
+                    if (VaultService.IsNameReserved(item.Name))
+                        continue;
+
+                    AddScannedItem(item);
+                }
+
+                if (Constants.Widgets.Health.ARE_UPDATES_OPTIMIZED)
+                {
+                    var totalUpdatesOptimized = (int)((_scannedFiles.Count + _scannedFolders.Count) * Constants.Widgets.Health.INTERVAL_MULTIPLIER);
+                    _updateInterval = (_scannedFiles.Count + _scannedFolders.Count) / Math.Max(100, totalUpdatesOptimized);
+                }
+
+                // Report initial progress
+                ReportProgress(_progress);
+                await Task.Delay(750, cancellationToken);
+
+                // Begin scanning
+                await ScanStructureAsync(cancellationToken).ConfigureAwait(false);
+
+                // Report final progress
+                ReportProgress(_progress);
+                await Task.Delay(1500, cancellationToken);
+            }, cancellationToken).ConfigureAwait(false);
+        }
+
+        private void AddScannedItem(IStorable storable)
+        {
+            switch (storable)
+            {
+                case IChildFile file:
+                    _scannedFiles.Add(file);
+                    break;
+
+                case IChildFolder folder:
+                    _scannedFolders.Add(folder);
+                    break;
+
+                default: return;
+            }
+
+            if (!Constants.Widgets.Health.ARE_UPDATES_OPTIMIZED)
+                _progress.CallbackProgress?.Report(new(_scannedFolders.Count + _scannedFiles.Count, 0));
+        }
+
+        /// <inheritdoc/>
+        public void Report(IResult value)
+        {
+            switch (value)
+            {
+                case IResult<StorableType> typeResult:
+                {
+                    if (typeResult.Value == StorableType.File)
+                        Interlocked.Increment(ref _totalFilesScanned);
+                    else if (typeResult.Value == StorableType.Folder)
+                        Interlocked.Increment(ref _totalFoldersScanned);
+                    break;
+                }
+
+                case IResult<IStorable> storableResult:
+                {
+                    if (storableResult.Value is IFile)
+                        Interlocked.Increment(ref _totalFilesScanned);
+                    else if (storableResult.Value is IFolder)
+                        Interlocked.Increment(ref _totalFoldersScanned);
+
+                    IssueFound?.Invoke(this, new(value, storableResult.Value as IStorableChild));
+                    break;
+                }
+
+                default: return;
+            }
+
+            ReportProgress(_progress);
+        }
+
+        private async Task ScanStructureAsync(CancellationToken cancellationToken)
+        {
+            if (_structureValidator is null)
+                return;
+
+            if (Constants.Widgets.Health.IS_SCANNING_PARALLELIZED)
+            {
+                var tasks = new List<Task>(_scannedFolders.Count);
+                foreach (var folder in _scannedFolders)
+                    tasks.Add(ScanFolderAsync(folder, cancellationToken));
+
+                await Task.WhenAll(tasks).ConfigureAwait(false);
+            }
+            else
+            {
+                foreach (var folder in _scannedFolders)
+                    await ScanFolderAsync(folder, cancellationToken).ConfigureAwait(false);
+            }
+
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            async Task ScanFolderAsync(IChildFolder folder, CancellationToken token)
+            {
+                // We do not care about the result, since we assume it is reported through IProgress
+                _ = await _structureValidator.ValidateResultAsync((folder, this), token).ConfigureAwait(false);
+            }
+        }
+
+        private void ReportProgress(ProgressModel<TotalProgress> progress)
+        {
+            if (Constants.Widgets.Health.ARE_UPDATES_OPTIMIZED)
+            {
+                _updateCount++;
+                if (_updateCount < _updateInterval)
+                    return;
+
+                _updateCount = 0;
+            }
+
+            progress.PercentageProgress?.Report((double)(_totalFilesScanned + _totalFoldersScanned) / (_scannedFiles.Count + _scannedFolders.Count) * 100d);
+            progress.CallbackProgress?.Report(new(_totalFilesScanned + _totalFoldersScanned, _scannedFiles.Count + _scannedFolders.Count));
+        }
+
+        /// <inheritdoc/>
+        public void Dispose()
+        {
+            _scannedFiles.Clear();
+            _scannedFolders.Clear();
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Sdk/AppModels/Progress.cs b/src/SecureFolderFS.Sdk/AppModels/Progress.cs
new file mode 100644
index 000000000..530dc51ae
--- /dev/null
+++ b/src/SecureFolderFS.Sdk/AppModels/Progress.cs
@@ -0,0 +1,9 @@
+namespace SecureFolderFS.Sdk.AppModels
+{
+    /// <summary>
+    /// Represents the current progress stage and total progress.
+    /// </summary>
+    /// <param name="Achieved">The current achieved progress so far.</param>
+    /// <param name="Total">The total progress to achieve.</param>
+    public readonly record struct TotalProgress(int Achieved, int Total);
+}
diff --git a/src/SecureFolderFS.Sdk/AppModels/SidebarSearchModel.cs b/src/SecureFolderFS.Sdk/AppModels/SidebarSearchModel.cs
index 88802fede..81cc7cb4a 100644
--- a/src/SecureFolderFS.Sdk/AppModels/SidebarSearchModel.cs
+++ b/src/SecureFolderFS.Sdk/AppModels/SidebarSearchModel.cs
@@ -26,7 +26,7 @@ public async IAsyncEnumerable<object> SearchAsync(string query, [EnumeratorCance
             var splitQuery = query.ToLowerInvariant().Split(' ');
             foreach (var item in _items)
             {
-                var found = splitQuery.All(item.VaultModel.VaultName.Contains);
+                var found = splitQuery.All(item.VaultViewModel.VaultName.Contains);
                 if (found)
                     yield return item;
             }
diff --git a/src/SecureFolderFS.Sdk/AppModels/SystemMonitorModel.cs b/src/SecureFolderFS.Sdk/AppModels/SystemMonitorModel.cs
new file mode 100644
index 000000000..3475f0ca7
--- /dev/null
+++ b/src/SecureFolderFS.Sdk/AppModels/SystemMonitorModel.cs
@@ -0,0 +1,68 @@
+using CommunityToolkit.Mvvm.Messaging;
+using SecureFolderFS.Sdk.Attributes;
+using SecureFolderFS.Sdk.Messages;
+using SecureFolderFS.Sdk.Models;
+using SecureFolderFS.Sdk.Services;
+using SecureFolderFS.Sdk.Services.Settings;
+using SecureFolderFS.Shared;
+using System;
+using System.ComponentModel;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace SecureFolderFS.Sdk.AppModels
+{
+    [Inject<ISettingsService>, Inject<ISystemService>]
+    public sealed partial class SystemMonitorModel : ISystemMonitorModel
+    {
+        /// <inheritdoc/>
+        public IVaultCollectionModel VaultCollectionModel { get; }
+
+        public SystemMonitorModel(IVaultCollectionModel vaultCollectionModel)
+        {
+            ServiceProvider = DI.Default;
+            VaultCollectionModel = vaultCollectionModel;
+        }
+
+        /// <inheritdoc/>
+        public Task InitAsync(CancellationToken cancellationToken = default)
+        {
+            SettingsService.UserSettings.PropertyChanged += UserSettings_PropertyChanged;
+            AttachEvents();
+
+            return Task.CompletedTask;
+        }
+
+        private void AttachEvents()
+        {
+            if (SettingsService.UserSettings.LockOnSystemLock)
+                SystemService.DesktopLocked += SystemService_DesktopLocked;
+            else
+                SystemService.DesktopLocked -= SystemService_DesktopLocked;
+        }
+
+        private void SystemService_DesktopLocked(object? sender, EventArgs e)
+        {
+            if (!SettingsService.UserSettings.LockOnSystemLock)
+                return;
+
+            foreach (var item in VaultCollectionModel)
+                WeakReferenceMessenger.Default.Send(new VaultLockRequestedMessage(item));
+        }
+
+        private void UserSettings_PropertyChanged(object? sender, PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName != nameof(IUserSettings.LockOnSystemLock))
+                return;
+
+            AttachEvents();
+        }
+
+        /// <inheritdoc/>
+        public void Dispose()
+        {
+            SystemService.DesktopLocked -= SystemService_DesktopLocked;
+            SettingsService.UserSettings.PropertyChanged -= UserSettings_PropertyChanged;
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Sdk/AppModels/TypeClassification.cs b/src/SecureFolderFS.Sdk/AppModels/TypeClassification.cs
new file mode 100644
index 000000000..e210b6bdd
--- /dev/null
+++ b/src/SecureFolderFS.Sdk/AppModels/TypeClassification.cs
@@ -0,0 +1,29 @@
+using SecureFolderFS.Sdk.Enums;
+
+namespace SecureFolderFS.Sdk.AppModels
+{
+    public struct TypeClassification
+    {
+        /// <summary>
+        /// Gets the MIME content type.
+        /// </summary>
+        public string MimeType { get; }
+
+        /// <summary>
+        /// Gets the hint which may or may not indicate the correct type.
+        /// </summary>
+        public TypeHint TypeHint { get; }
+
+        /// <summary>
+        /// Gets the content extension, if any.
+        /// </summary>
+        public string? Extension { get; }
+
+        public TypeClassification(string mimeType, TypeHint typeHint, string? extension = null)
+        {
+            MimeType = mimeType;
+            TypeHint = typeHint;
+            Extension = extension;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/SecureFolderFS.Sdk/AppModels/VaultCollectionModel.cs b/src/SecureFolderFS.Sdk/AppModels/VaultCollectionModel.cs
index c5b606d5b..8c2fef8dd 100644
--- a/src/SecureFolderFS.Sdk/AppModels/VaultCollectionModel.cs
+++ b/src/SecureFolderFS.Sdk/AppModels/VaultCollectionModel.cs
@@ -33,6 +33,52 @@ public VaultCollectionModel()
             ServiceProvider = DI.Default;
         }
 
+        /// <inheritdoc/>
+        public void Move(int oldIndex, int newIndex)
+        {
+            var item = base[oldIndex];
+            base.RemoveItem(oldIndex);
+            base.InsertItem(newIndex, item);
+
+            CollectionChanged?.Invoke(this, new(NotifyCollectionChangedAction.Move, item, oldIndex, newIndex));
+        }
+
+        /// <inheritdoc/>
+        public async Task LoadAsync(CancellationToken cancellationToken = default)
+        {
+            await Task.WhenAll(VaultConfigurations.LoadAsync(cancellationToken), VaultWidgets.LoadAsync(cancellationToken));
+
+            // Clear previous vaults
+            Items.Clear();
+
+            VaultConfigurations.SavedVaults ??= new List<VaultDataModel>();
+            foreach (var item in VaultConfigurations.SavedVaults)
+            {
+                if (item.PersistableId is null)
+                    continue;
+
+                try
+                {
+                    var folder = await StorageService.GetPersistedAsync<IFolder>(item.PersistableId, cancellationToken);
+                    var vaultModel = new VaultModel(folder, item.VaultName, item.LastAccessDate);
+
+                    Items.Add(vaultModel);
+                    CollectionChanged?.Invoke(this, new(NotifyCollectionChangedAction.Add, vaultModel));
+                }
+                catch (Exception ex)
+                {
+                    _ = ex;
+                    continue;
+                }
+            }
+        }
+
+        /// <inheritdoc/>
+        public Task SaveAsync(CancellationToken cancellationToken = default)
+        {
+            return Task.WhenAll(VaultConfigurations.SaveAsync(cancellationToken), VaultWidgets.SaveAsync(cancellationToken));
+        }
+
         /// <inheritdoc/>
         protected override void ClearItems()
         {
@@ -97,41 +143,5 @@ protected override void SetItem(int index, IVaultModel item)
             base.SetItem(index, item);
             CollectionChanged?.Invoke(this, new(NotifyCollectionChangedAction.Replace, item, oldItem, index));
         }
-
-        /// <inheritdoc/>
-        public async Task LoadAsync(CancellationToken cancellationToken = default)
-        {
-            await Task.WhenAll(VaultConfigurations.LoadAsync(cancellationToken), VaultWidgets.LoadAsync(cancellationToken));
-
-            // Clear previous vaults
-            Items.Clear();
-
-            VaultConfigurations.SavedVaults ??= new List<VaultDataModel>();
-            foreach (var item in VaultConfigurations.SavedVaults)
-            {
-                if (item.PersistableId is null)
-                    continue;
-
-                try
-                {
-                    var folder = await StorageService.GetPersistedAsync<IFolder>(item.PersistableId, cancellationToken);
-                    var vaultModel = new VaultModel(folder, item.VaultName, item.LastAccessDate);
-
-                    Items.Add(vaultModel);
-                    CollectionChanged?.Invoke(this, new(NotifyCollectionChangedAction.Add, vaultModel));
-                }
-                catch (Exception ex)
-                {
-                    _ = ex;
-                    continue;
-                }
-            }
-        }
-
-        /// <inheritdoc/>
-        public Task SaveAsync(CancellationToken cancellationToken = default)
-        {
-            return Task.WhenAll(VaultConfigurations.SaveAsync(cancellationToken), VaultWidgets.SaveAsync(cancellationToken));
-        }
     }
 }
diff --git a/src/SecureFolderFS.Sdk/AppModels/VaultModel.cs b/src/SecureFolderFS.Sdk/AppModels/VaultModel.cs
index 264cbb956..0b435e8c1 100644
--- a/src/SecureFolderFS.Sdk/AppModels/VaultModel.cs
+++ b/src/SecureFolderFS.Sdk/AppModels/VaultModel.cs
@@ -65,10 +65,7 @@ public async Task<bool> SetVaultNameAsync(string value, CancellationToken cancel
 
         private async Task<bool> UpdateConfigurationAsync(Action<VaultDataModel> updateAction, CancellationToken cancellationToken)
         {
-            if (VaultConfigurations.SavedVaults is null)
-                return false;
-
-            var item = VaultConfigurations.SavedVaults.FirstOrDefault(x => x.PersistableId == Folder.GetPersistableId());
+            var item = VaultConfigurations.SavedVaults?.FirstOrDefault(x => x.PersistableId == Folder.GetPersistableId());
             if (item is null)
                 return false;
 
diff --git a/src/SecureFolderFS.Sdk/Constants.cs b/src/SecureFolderFS.Sdk/Constants.cs
index 409825e81..2bb5061bd 100644
--- a/src/SecureFolderFS.Sdk/Constants.cs
+++ b/src/SecureFolderFS.Sdk/Constants.cs
@@ -2,18 +2,26 @@
 {
     public static class Constants
     {
-        public static class Graphs
-        {
-            public const int MAX_GRAPH_POINTS = 30;
-            public const int GRAPH_UPDATE_INTERVAL_MS = 200; // 0.2s
-            public const int GRAPH_REFRESH_RATE = 1000 / GRAPH_UPDATE_INTERVAL_MS;
-        }
-
         public static class Widgets
         {
             public const string HEALTH_WIDGET_ID = "health_widget";
             public const string GRAPHS_WIDGET_ID = "graphs_widget";
             public const string AGGREGATED_DATA_WIDGET_ID = "aggregatedStatistics_widget";
+
+            public static class Graphs
+            {
+                public const int MAX_GRAPH_POINTS = 30;
+                public const int GRAPH_UPDATE_INTERVAL_MS = 200; // 0.2s
+                public const int GRAPH_REFRESH_RATE = 1000 / GRAPH_UPDATE_INTERVAL_MS;
+            }
+
+            public static class Health
+            {
+                public static bool ARE_UPDATES_OPTIMIZED = true;
+                public static bool IS_SCANNING_PARALLELIZED = false;
+                public static bool IS_DISCOVERY_ASSUMED_FAST = true;
+                public static double INTERVAL_MULTIPLIER = 0.2d;
+            }
         }
 
         public static class Dialogs
@@ -23,6 +31,7 @@ public static class Dialogs
 
         public static class Vault
         {
+            public const string VAULT_ICON_FILENAME = "vault.icon";
             public const int MAX_FREE_AMOUNT_OF_VAULTS = 2;
             public const string VAULT_README_FILENAME = "_readme_before_continuing.txt";
             public const string VAULT_README_MESSAGE = """
diff --git a/src/SecureFolderFS.Sdk/Contexts/IUnlockedViewContext.cs b/src/SecureFolderFS.Sdk/Contexts/IUnlockedViewContext.cs
new file mode 100644
index 000000000..2203592e2
--- /dev/null
+++ b/src/SecureFolderFS.Sdk/Contexts/IUnlockedViewContext.cs
@@ -0,0 +1,15 @@
+using SecureFolderFS.Sdk.ViewModels;
+
+namespace SecureFolderFS.Sdk.Contexts
+{
+    /// <summary>
+    /// A context for interacting with <see cref="Sdk.ViewModels.UnlockedVaultViewModel"/>.
+    /// </summary>
+    public interface IUnlockedViewContext : IVaultViewContext
+    {
+        /// <summary>
+        /// Gets the <see cref="Sdk.ViewModels.UnlockedVaultViewModel"/> associated with this context.
+        /// </summary>
+        UnlockedVaultViewModel UnlockedVaultViewModel { get; }
+    }
+}
diff --git a/src/SecureFolderFS.Sdk/Contexts/IVaultViewContext.cs b/src/SecureFolderFS.Sdk/Contexts/IVaultViewContext.cs
new file mode 100644
index 000000000..bae98272b
--- /dev/null
+++ b/src/SecureFolderFS.Sdk/Contexts/IVaultViewContext.cs
@@ -0,0 +1,16 @@
+using SecureFolderFS.Sdk.ViewModels;
+using SecureFolderFS.Shared.ComponentModel;
+
+namespace SecureFolderFS.Sdk.Contexts
+{
+    /// <summary>
+    /// A context for interacting with <see cref="Sdk.ViewModels.VaultViewModel"/>.
+    /// </summary>
+    public interface IVaultViewContext : IViewable
+    {
+        /// <summary>
+        /// Gets the <see cref="Sdk.ViewModels.VaultViewModel"/> associated with this context.
+        /// </summary>
+        VaultViewModel VaultViewModel { get; }
+    }
+}
diff --git a/src/SecureFolderFS.Sdk/Enums/SeverityType.cs b/src/SecureFolderFS.Sdk/Enums/SeverityType.cs
new file mode 100644
index 000000000..d50071008
--- /dev/null
+++ b/src/SecureFolderFS.Sdk/Enums/SeverityType.cs
@@ -0,0 +1,25 @@
+namespace SecureFolderFS.Sdk.Enums
+{
+    public enum SeverityType
+    {
+        /// <summary>
+        /// Informational status.
+        /// </summary>
+        Default = 0,
+
+        /// <summary>
+        /// Success status.
+        /// </summary>
+        Success = 1,
+
+        /// <summary>
+        /// Warn status.
+        /// </summary>
+        Warning = 2,
+
+        /// <summary>
+        /// Error status.
+        /// </summary>
+        Critical = 3
+    }
+}
diff --git a/src/SecureFolderFS.Sdk/Enums/TransferType.cs b/src/SecureFolderFS.Sdk/Enums/TransferType.cs
new file mode 100644
index 000000000..5e04a63ec
--- /dev/null
+++ b/src/SecureFolderFS.Sdk/Enums/TransferType.cs
@@ -0,0 +1,9 @@
+namespace SecureFolderFS.Sdk.Enums
+{
+    public enum TransferType
+    {
+        Copy = 0,
+        Move = 1,
+        Recycle = 2
+    }
+}
diff --git a/src/SecureFolderFS.Sdk/Enums/TypeHint.cs b/src/SecureFolderFS.Sdk/Enums/TypeHint.cs
new file mode 100644
index 000000000..99dc9c266
--- /dev/null
+++ b/src/SecureFolderFS.Sdk/Enums/TypeHint.cs
@@ -0,0 +1,14 @@
+namespace SecureFolderFS.Sdk.Enums
+{
+    public enum TypeHint
+    {
+        Unclassified,
+        PlainText,
+        Document,
+        UriLink,
+        Storage,
+        Image,
+        Media,
+        Audio
+    }
+}
\ No newline at end of file
diff --git a/src/SecureFolderFS.Sdk/Enums/VaultHealthState.cs b/src/SecureFolderFS.Sdk/Enums/VaultHealthState.cs
deleted file mode 100644
index 04aea0010..000000000
--- a/src/SecureFolderFS.Sdk/Enums/VaultHealthState.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-namespace SecureFolderFS.Sdk.Enums
-{
-    public enum VaultHealthState
-    {
-        /// <summary>
-        /// The vault is healthy and does not have any problems.
-        /// </summary>
-        Healthy = 0,
-
-        /// <summary>
-        /// The vault needs attention (usually when the version is outdated).
-        /// </summary>
-        NeedsAttention = 1,
-
-        /// <summary>
-        /// Problems have been detected with vault's integrity.
-        /// </summary>
-        Error = 2
-    }
-}
diff --git a/src/SecureFolderFS.Sdk/Enums/VaultValidationResultType.cs b/src/SecureFolderFS.Sdk/Enums/VaultValidationResultType.cs
deleted file mode 100644
index 4f4a3ab86..000000000
--- a/src/SecureFolderFS.Sdk/Enums/VaultValidationResultType.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace SecureFolderFS.Sdk.Enums
-{
-    public enum VaultValidationResultType
-    {
-        Success = 0,
-        ContentNotFound = 1,
-        ConfigNotFound = 2,
-        KeystoreNotFound = 4,
-    }
-}
diff --git a/src/SecureFolderFS.Sdk/Enums/ViewSeverityType.cs b/src/SecureFolderFS.Sdk/Enums/ViewSeverityType.cs
deleted file mode 100644
index ff52afdd9..000000000
--- a/src/SecureFolderFS.Sdk/Enums/ViewSeverityType.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace SecureFolderFS.Sdk.Enums
-{
-    public enum ViewSeverityType
-    {
-        Default = 0,
-        Success = 1,
-        Warning = 2,
-        Error = 3
-    }
-}
diff --git a/src/SecureFolderFS.Sdk/EventArguments/BackNavigationRequestedEventArgs.cs b/src/SecureFolderFS.Sdk/EventArguments/BackNavigationRequestedEventArgs.cs
index 5e5d3f2e1..d03f0a881 100644
--- a/src/SecureFolderFS.Sdk/EventArguments/BackNavigationRequestedEventArgs.cs
+++ b/src/SecureFolderFS.Sdk/EventArguments/BackNavigationRequestedEventArgs.cs
@@ -6,7 +6,5 @@ namespace SecureFolderFS.Sdk.EventArguments
     /// <summary>
     /// Event arguments for back navigation requests.
     /// </summary>
-    public sealed class BackNavigationRequestedEventArgs(IViewable? origin) : NavigationRequestedEventArgs(origin)
-    {
-    }
+    public sealed class BackNavigationRequestedEventArgs(IViewable? origin) : NavigationRequestedEventArgs(origin);
 }
diff --git a/src/SecureFolderFS.Sdk/EventArguments/CloseNavigationRequestedEventArgs.cs b/src/SecureFolderFS.Sdk/EventArguments/CloseNavigationRequestedEventArgs.cs
index 1b200fe15..623a99f63 100644
--- a/src/SecureFolderFS.Sdk/EventArguments/CloseNavigationRequestedEventArgs.cs
+++ b/src/SecureFolderFS.Sdk/EventArguments/CloseNavigationRequestedEventArgs.cs
@@ -6,7 +6,5 @@ namespace SecureFolderFS.Sdk.EventArguments
     /// <summary>
     /// Event arguments for close navigation requests.
     /// </summary>
-    public sealed class CloseNavigationRequestedEventArgs(IViewable? origin) : NavigationRequestedEventArgs(origin)
-    {
-    }
+    public sealed class CloseNavigationRequestedEventArgs(IViewable? origin) : NavigationRequestedEventArgs(origin);
 }
diff --git a/src/SecureFolderFS.Sdk/EventArguments/HealthIssueEventArgs.cs b/src/SecureFolderFS.Sdk/EventArguments/HealthIssueEventArgs.cs
new file mode 100644
index 000000000..b39744e2e
--- /dev/null
+++ b/src/SecureFolderFS.Sdk/EventArguments/HealthIssueEventArgs.cs
@@ -0,0 +1,22 @@
+using OwlCore.Storage;
+using SecureFolderFS.Shared.ComponentModel;
+using System;
+
+namespace SecureFolderFS.Sdk.EventArguments
+{
+    /// <summary>
+    /// Event arguments for vault health issues.
+    /// </summary>
+    public sealed class HealthIssueEventArgs(IResult result, IStorableChild? storable) : EventArgs
+    {
+        /// <summary>
+        /// Gets the <see cref="IResult"/> of the validation.
+        /// </summary>
+        public IResult Result { get; } = result;
+
+        /// <summary>
+        /// Gets the affected <see cref="IStorable"/>, if any.
+        /// </summary>
+        public IStorableChild? Storable { get; } = storable;
+    }
+}
diff --git a/src/SecureFolderFS.Sdk/EventArguments/MigrationCompletedEventArgs.cs b/src/SecureFolderFS.Sdk/EventArguments/MigrationCompletedEventArgs.cs
index 59ce9f6ea..25c42905f 100644
--- a/src/SecureFolderFS.Sdk/EventArguments/MigrationCompletedEventArgs.cs
+++ b/src/SecureFolderFS.Sdk/EventArguments/MigrationCompletedEventArgs.cs
@@ -5,7 +5,5 @@ namespace SecureFolderFS.Sdk.EventArguments
     /// <summary>
     /// Event arguments for migration notifications.
     /// </summary>
-    public sealed class MigrationCompletedEventArgs : EventArgs
-    {
-    }
+    public sealed class MigrationCompletedEventArgs : EventArgs;
 }
diff --git a/src/SecureFolderFS.Sdk/Extensions/FolderViewModelExtensions.cs b/src/SecureFolderFS.Sdk/Extensions/FolderViewModelExtensions.cs
new file mode 100644
index 000000000..8a5471ed0
--- /dev/null
+++ b/src/SecureFolderFS.Sdk/Extensions/FolderViewModelExtensions.cs
@@ -0,0 +1,39 @@
+using System.Collections.Generic;
+using SecureFolderFS.Sdk.ViewModels.Views.Browser;
+
+namespace SecureFolderFS.Sdk.Extensions
+{
+    public static class FolderViewModelExtensions
+    {
+        public static void SelectAll(this FolderViewModel folderViewModel)
+        {
+            if (!folderViewModel.BrowserViewModel.IsSelecting)
+                return;
+            
+            foreach (var item in folderViewModel.Items)
+            {
+                item.IsSelected = true;
+            }
+        }
+
+        public static void UnselectAll(this FolderViewModel folderViewModel)
+        {
+            foreach (var item in folderViewModel.Items)
+            {
+                item.IsSelected = false;
+            }
+        }
+
+        public static IEnumerable<BrowserItemViewModel> GetSelectedItems(this FolderViewModel folderViewModel)
+        {
+            if (!folderViewModel.BrowserViewModel.IsSelecting)
+                yield break;
+            
+            foreach (var item in folderViewModel.Items)
+            {
+                if (item.IsSelected)
+                    yield return item;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/SecureFolderFS.Sdk/Extensions/LocalizationExtensions.cs b/src/SecureFolderFS.Sdk/Extensions/LocalizationExtensions.cs
index 574b7c5ac..5194187bf 100644
--- a/src/SecureFolderFS.Sdk/Extensions/LocalizationExtensions.cs
+++ b/src/SecureFolderFS.Sdk/Extensions/LocalizationExtensions.cs
@@ -1,4 +1,5 @@
-using SecureFolderFS.Sdk.Services;
+using System.Runtime.CompilerServices;
+using SecureFolderFS.Sdk.Services;
 using SecureFolderFS.Shared;
 
 namespace SecureFolderFS.Sdk.Extensions
@@ -12,10 +13,10 @@ public static string ToLocalized(this string resourceKey, ILocalizationService?
             localizationService = GetLocalizationService(localizationService);
             return localizationService?.TryGetString(resourceKey) ?? $"{{{resourceKey}}}";
 
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
             static ILocalizationService? GetLocalizationService(ILocalizationService? fallback)
             {
-                FallbackLocalizationService ??= fallback ?? DI.OptionalService<ILocalizationService>();
-                return FallbackLocalizationService;
+                return FallbackLocalizationService ??= fallback ?? DI.OptionalService<ILocalizationService>();
             }
         }
     }
diff --git a/src/SecureFolderFS.Sdk/Extensions/LocalizationServiceExtensions.cs b/src/SecureFolderFS.Sdk/Extensions/LocalizationServiceExtensions.cs
new file mode 100644
index 000000000..de175fa1c
--- /dev/null
+++ b/src/SecureFolderFS.Sdk/Extensions/LocalizationServiceExtensions.cs
@@ -0,0 +1,23 @@
+using System;
+using SecureFolderFS.Sdk.Services;
+using SecureFolderFS.Shared.Helpers;
+
+namespace SecureFolderFS.Sdk.Extensions
+{
+    public static class LocalizationServiceExtensions
+    {
+        public static string LocalizeDate(this ILocalizationService localizationService, DateTime dateTime)
+        {
+            var cultureInfo = localizationService.CurrentCulture;
+            var dateString = dateTime switch
+            {
+                _ when dateTime.Year == 1 => "Unspecified",
+                _ when dateTime.Date == DateTime.Today => SafetyHelpers.NoThrowResult(() => string.Format("DateToday".ToLocalized(), dateTime.ToString("t", cultureInfo))),
+                _ => null
+            };
+
+            dateString ??= $"{dateTime.ToString("d", cultureInfo)}, {dateTime.ToString("t", cultureInfo)}";
+            return dateString;
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Sdk/Extensions/TransferExtensions.cs b/src/SecureFolderFS.Sdk/Extensions/TransferExtensions.cs
new file mode 100644
index 000000000..9ffb8d8bd
--- /dev/null
+++ b/src/SecureFolderFS.Sdk/Extensions/TransferExtensions.cs
@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using OwlCore.Storage;
+using SecureFolderFS.Sdk.ViewModels.Controls.Transfer;
+using SecureFolderFS.Shared.Extensions;
+
+namespace SecureFolderFS.Sdk.Extensions
+{
+    public static class TransferExtensions
+    {
+        public static Task TransferAsync<TStorable>(
+            this TransferViewModel transferViewModel,
+            TStorable item,
+            Func<TStorable, CancellationToken, Task> callback,
+            CancellationToken cancellationToken = default)
+        where TStorable : IStorable
+        {
+            return TransferAsync(transferViewModel, [ item ], callback, cancellationToken);
+        }
+        
+        public static async Task TransferAsync<TStorable>(
+            this TransferViewModel transferViewModel,
+            IEnumerable<TStorable> items,
+            Func<TStorable, CancellationToken, Task> callback,
+            CancellationToken cancellationToken = default)
+        where TStorable : IStorable
+        {
+            var collection = items.ToOrAsCollection();
+            transferViewModel.IsProgressing = true;
+            transferViewModel.IsVisible = true;
+            transferViewModel.Report(new(0, collection.Count));
+            
+            for (var i = 0; i < collection.Count; i++)
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+                
+                var item = collection.ElementAt(i);
+                await callback(item, cancellationToken);
+                transferViewModel.Report(new((i + 1), collection.Count));
+            }
+
+            await Task.Delay(1000);
+            transferViewModel.IsProgressing = false;
+            transferViewModel.IsVisible = false;
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Sdk/Extensions/VaultFileSystemServiceExtensions.cs b/src/SecureFolderFS.Sdk/Extensions/VaultFileSystemServiceExtensions.cs
new file mode 100644
index 000000000..d56e44792
--- /dev/null
+++ b/src/SecureFolderFS.Sdk/Extensions/VaultFileSystemServiceExtensions.cs
@@ -0,0 +1,39 @@
+using SecureFolderFS.Sdk.Services;
+using SecureFolderFS.Shared;
+using SecureFolderFS.Storage.Enums;
+using SecureFolderFS.Storage.VirtualFileSystem;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace SecureFolderFS.Sdk.Extensions
+{
+    public static class VaultFileSystemServiceExtensions
+    {
+        public static async Task<IFileSystem> GetBestFileSystemAsync(this IVaultFileSystemService vaultFileSystemService, CancellationToken cancellationToken = default)
+        {
+            var vaultService = DI.Service<IVaultService>();
+            var settingsService = DI.Service<ISettingsService>();
+
+            IFileSystem? lastBest = null;
+            await foreach (var item in vaultFileSystemService.GetFileSystemsAsync(cancellationToken))
+            {
+                if (item.Id == settingsService.UserSettings.PreferredFileSystemId)
+                {
+                    if (await item.GetStatusAsync(cancellationToken) == FileSystemAvailability.Available)
+                        return item;
+                }
+                else
+                {
+                    if (lastBest is null && await item.GetStatusAsync(cancellationToken) == FileSystemAvailability.Available)
+                        lastBest = item;
+                }
+            }
+
+            if (lastBest is null)
+                throw new NotSupportedException("No supported adapters found.");
+
+            return lastBest;
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Sdk/Extensions/VaultModelExtensions.cs b/src/SecureFolderFS.Sdk/Extensions/VaultModelExtensions.cs
new file mode 100644
index 000000000..c2ddafbd4
--- /dev/null
+++ b/src/SecureFolderFS.Sdk/Extensions/VaultModelExtensions.cs
@@ -0,0 +1,19 @@
+using OwlCore.Storage;
+using SecureFolderFS.Sdk.Models;
+using SecureFolderFS.Sdk.Services;
+using SecureFolderFS.Shared;
+using SecureFolderFS.Storage.Extensions;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace SecureFolderFS.Sdk.Extensions
+{
+    public static class VaultModelExtensions
+    {
+        public static async Task<IChildFolder> GetContentFolderAsync(this IVaultModel vaultModel, CancellationToken cancellationToken = default)
+        {
+            var vaultService = DI.Service<IVaultService>();
+            return await vaultModel.Folder.GetFolderByNameAsync(vaultService.ContentFolderName, cancellationToken);
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Sdk/Helpers/FileTypeHelper.cs b/src/SecureFolderFS.Sdk/Helpers/FileTypeHelper.cs
new file mode 100644
index 000000000..705c54698
--- /dev/null
+++ b/src/SecureFolderFS.Sdk/Helpers/FileTypeHelper.cs
@@ -0,0 +1,178 @@
+using System.IO;
+using System.Linq;
+using MimeTypes;
+using OwlCore.Storage;
+using SecureFolderFS.Sdk.AppModels;
+using SecureFolderFS.Sdk.Enums;
+
+namespace SecureFolderFS.Sdk.Helpers
+{
+    public static class FileTypeHelper
+    {
+        public static TypeClassification GetClassification(IStorable storable)
+        {
+            var mimeType = MimeTypeMap.GetMimeType(storable.Id);
+            var extension = Path.GetExtension(storable.Id);
+            var typeHint = GetTypeFromMime(mimeType);
+            typeHint = typeHint == TypeHint.Unclassified ? GetTypeFromExtension(Path.GetExtension(storable.Id)) : typeHint;
+
+            return new(mimeType, typeHint, extension);
+        }
+
+        public static TypeHint GetType(IStorable storable)
+        {
+            var mimeType = MimeTypeMap.GetMimeType(storable.Id);
+            var typeHint = GetTypeFromMime(mimeType);
+
+            return typeHint == TypeHint.Unclassified ? GetTypeFromExtension(Path.GetExtension(storable.Id)) : typeHint;
+        }
+
+        public static TypeHint GetTypeFromMime(string mimeType)
+        {
+            return Image()
+                   ?? PlainText()
+                   ?? Document()
+                   ?? Media()
+                   // TODO
+                   ?? TypeHint.Unclassified;
+
+            TypeHint? Media()
+            {
+                return mimeType.Equals("video/x-msvideo")
+                    || mimeType.Equals("video/mp4")
+                    || mimeType.Equals("video/mpeg")
+                    || mimeType.Equals("video/ogg")
+                    || mimeType.Equals("video/webm")
+                    || mimeType.Equals("video/3gpp")
+                    || mimeType.Equals("video/3gpp2")
+
+                    ? TypeHint.Media : null;
+            }
+
+            TypeHint? Document()
+            {
+                return mimeType.Equals("application/pdf")
+                    || mimeType.Equals("text/csv")
+                    || mimeType.Equals("application/msword")
+                    || mimeType.Equals("application/vnd.openxmlformats-officedocument.wordprocessingml.document")
+
+                    ? TypeHint.Document : null;
+            }
+
+            TypeHint? PlainText()
+            {
+                return mimeType.StartsWith("text/")
+                    && !mimeType.Equals("text/csv")
+                    //|| mimeType.StartsWith("")
+
+                    ? TypeHint.PlainText : null;
+            }
+
+            TypeHint? Image()
+            {
+                return mimeType.StartsWith("image/")
+                    //|| mimeType.StartsWith("")
+
+                    ? TypeHint.Image : null;
+            }
+        }
+
+        public static TypeHint GetTypeFromExtension(string extension)
+        {
+            if (!extension.StartsWith('.'))
+                extension = $".{extension}";
+
+            // PlainText (code)
+            if (CodeExtensions.Contains(extension))
+                return TypeHint.PlainText;
+
+            // PlainText (text)
+            if (TextExtensions.Contains(extension))
+                return TypeHint.PlainText;
+
+            // Document
+            if (DocumentExtensions.Contains(extension))
+                return TypeHint.Document;
+
+            // Image
+            if (ImageExtensions.Contains(extension))
+                return TypeHint.Image;
+
+            // Media
+            if (MediaExtensions.Contains(extension))
+                return TypeHint.Media;
+
+            // Audio
+            if (AudioExtensions.Contains(extension))
+                return TypeHint.Audio;
+
+            return TypeHint.Unclassified;
+        }
+
+        public static string[] CodeExtensions { get; } =
+        {
+            // Low level languages
+            ".cpp", ".c", ".cxx",
+            ".h", ".def", ".pl",
+            ".rs",
+
+            // Common languages
+            ".java", ".cs", ".py",
+
+            // Web languages
+            ".htm", ".html", ".js",
+            ".css", ".svelte", ".php",
+            ".scss", ".ts",
+
+            // Other
+            ".bat", ".xml", ".json",
+            ".inc", ".ini"
+        };
+
+        public static string[] TextExtensions { get; } =
+        {
+            // Text based
+            ".txt", ".md", ".markdown", ".rtf"
+        };
+
+        public static string[] DocumentExtensions { get; } =
+        {
+            // Document based
+            ".doc", ".docx", ".html",
+            ".odt", ".pdf", ".htm",
+
+            // Sheet based
+            ".xls", ".xlsx", ".ods",
+
+            // Presentation based
+            ".ppt", ".pptx"
+        };
+
+        public static string[] ImageExtensions { get; } =
+        {
+            // Special types
+            ".apng", ".avif", ".gif",
+
+            // JPEG types
+            ".jpg", ".jpeg", ".jfif",
+            ".pjpeg", ".pjp",
+
+            // Other types
+            ".png", ".svg", ".webp",
+            ".bmp", ".tif", ".tiff"
+        };
+
+        public static string[] MediaExtensions { get; } =
+        {
+            ".mp4", ".mov", ".avi",
+            ".wmv", ".flv", ".webm",
+            ".mkv", ".avi"
+        };
+
+        public static string[] AudioExtensions { get; } =
+        {
+            ".3gp", ".flac", ".mp3",
+            ".ogg", ".wav"
+        };
+    }
+}
\ No newline at end of file
diff --git a/src/SecureFolderFS.Sdk/Helpers/FormattingHelpers.cs b/src/SecureFolderFS.Sdk/Helpers/FormattingHelpers.cs
new file mode 100644
index 000000000..c35639c9a
--- /dev/null
+++ b/src/SecureFolderFS.Sdk/Helpers/FormattingHelpers.cs
@@ -0,0 +1,25 @@
+using System.IO;
+using System.Linq;
+
+namespace SecureFolderFS.Sdk.Helpers
+{
+    public static class FormattingHelpers
+    {
+        public static string SanitizeItemName(string itemName, string fallback)
+        {
+            var invalidChars = Path.GetInvalidFileNameChars();
+            var sanitizedItemName = new string(itemName.Where(ch => !invalidChars.Contains(ch)).ToArray());
+
+            // Ensure the sanitized name is not empty and has a minimum length
+            if (string.IsNullOrWhiteSpace(sanitizedItemName) || sanitizedItemName.Length < 3)
+                sanitizedItemName = SanitizeVolumeName(fallback, null);
+
+            return sanitizedItemName;
+        }
+
+        public static string SanitizeVolumeName(string volumeName, string? fallback)
+        {
+            return SanitizeItemName(volumeName, fallback ?? "Mounted Volume");
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Sdk/Helpers/ValidationHelpers.cs b/src/SecureFolderFS.Sdk/Helpers/ValidationHelpers.cs
index e7983d9f1..0b5d13680 100644
--- a/src/SecureFolderFS.Sdk/Helpers/ValidationHelpers.cs
+++ b/src/SecureFolderFS.Sdk/Helpers/ValidationHelpers.cs
@@ -14,7 +14,7 @@ namespace SecureFolderFS.Sdk.Helpers
 {
     public static class ValidationHelpers
     {
-        public static async Task<IResultWithMessage<ViewSeverityType>> ValidateExistingVault(IFolder vaultFolder, CancellationToken cancellationToken)
+        public static async Task<IResultWithMessage<SeverityType>> ValidateExistingVault(IFolder vaultFolder, CancellationToken cancellationToken)
         {
             var vaultService = DI.Service<IVaultService>();
             var validationResult = await vaultService.VaultValidator.TryValidateAsync(vaultFolder, cancellationToken);
@@ -24,26 +24,26 @@ public static async Task<IResultWithMessage<ViewSeverityType>> ValidateExistingV
                 if (validationResult.Exception is NotSupportedException)
                 {
                     // Allow unsupported vaults to be migrated
-                    return new MessageResult<ViewSeverityType>(ViewSeverityType.Warning, "SelectedMayNotBeSupported".ToLocalized());
+                    return new MessageResult<SeverityType>(SeverityType.Warning, "SelectedMayNotBeSupported".ToLocalized());
                 }
 
-                return new MessageResult<ViewSeverityType>(ViewSeverityType.Error, "SelectedInvalidVault".ToLocalized(), false);
+                return new MessageResult<SeverityType>(SeverityType.Critical, "SelectedInvalidVault".ToLocalized(), false);
             }
 
-            return new MessageResult<ViewSeverityType>(ViewSeverityType.Success, "SelectedValidVault".ToLocalized());
+            return new MessageResult<SeverityType>(SeverityType.Success, "SelectedValidVault".ToLocalized());
         }
 
-        public static async Task<IResultWithMessage<ViewSeverityType>> ValidateNewVault(IFolder vaultFolder, CancellationToken cancellationToken)
+        public static async Task<IResultWithMessage<SeverityType>> ValidateNewVault(IFolder vaultFolder, CancellationToken cancellationToken)
         {
             var vaultService = DI.Service<IVaultService>();
             var validationResult = await vaultService.VaultValidator.TryValidateAsync(vaultFolder, cancellationToken);
             if (validationResult.Successful || validationResult.Exception is NotSupportedException)
             {
                 // Check if a valid (or unsupported) vault exists at a specified path
-                return new MessageResult<ViewSeverityType>(ViewSeverityType.Warning, "SelectedToBeOverwritten".ToLocalized());
+                return new MessageResult<SeverityType>(SeverityType.Warning, "SelectedToBeOverwritten".ToLocalized());
             }
 
-            return new MessageResult<ViewSeverityType>(ViewSeverityType.Success, "SelectedWillCreate".ToLocalized());
+            return new MessageResult<SeverityType>(SeverityType.Success, "SelectedWillCreate".ToLocalized());
         }
     }
 }
diff --git a/src/SecureFolderFS.Sdk/Messages/VaultLockRequestedMessage.cs b/src/SecureFolderFS.Sdk/Messages/VaultLockRequestedMessage.cs
new file mode 100644
index 000000000..74c210248
--- /dev/null
+++ b/src/SecureFolderFS.Sdk/Messages/VaultLockRequestedMessage.cs
@@ -0,0 +1,15 @@
+using SecureFolderFS.Sdk.Models;
+
+namespace SecureFolderFS.Sdk.Messages
+{
+    /// <summary>
+    /// Represents a message that is emitted to request locking of a vault.
+    /// </summary>
+    public sealed class VaultLockRequestedMessage(IVaultModel vaultModel)
+    {
+        /// <summary>
+        /// Gets the <see cref="IVaultModel"/> of the locked vault.
+        /// </summary>
+        public IVaultModel VaultModel { get; } = vaultModel;
+    }
+}
diff --git a/src/SecureFolderFS.Sdk/Messages/VaultLockedMessage.cs b/src/SecureFolderFS.Sdk/Messages/VaultLockedMessage.cs
index c006422dc..eecc6087e 100644
--- a/src/SecureFolderFS.Sdk/Messages/VaultLockedMessage.cs
+++ b/src/SecureFolderFS.Sdk/Messages/VaultLockedMessage.cs
@@ -8,7 +8,7 @@ namespace SecureFolderFS.Sdk.Messages
     public sealed class VaultLockedMessage(IVaultModel vaultModel)
     {
         /// <summary>
-        /// Gets the <see cref="IVaultModel"/> of the locked vault.
+        /// Gets the <see cref="IVaultModel"/> of the vault that was locked.
         /// </summary>
         public IVaultModel VaultModel { get; } = vaultModel;
     }
diff --git a/src/SecureFolderFS.Sdk/Messages/VaultUnlockedMessage.cs b/src/SecureFolderFS.Sdk/Messages/VaultUnlockedMessage.cs
index 8efb9e7e9..182aba45e 100644
--- a/src/SecureFolderFS.Sdk/Messages/VaultUnlockedMessage.cs
+++ b/src/SecureFolderFS.Sdk/Messages/VaultUnlockedMessage.cs
@@ -8,7 +8,7 @@ namespace SecureFolderFS.Sdk.Messages
     public sealed class VaultUnlockedMessage(IVaultModel vaultModel)
     {
         /// <summary>
-        /// Gets the <see cref="IVaultModel"/> of the unlocked vault.
+        /// Gets the <see cref="IVaultModel"/> of the vault that was unlocked.
         /// </summary>
         public IVaultModel VaultModel { get; } = vaultModel;
     }
diff --git a/src/SecureFolderFS.Sdk/Models/IFileSystemInfoModel.cs b/src/SecureFolderFS.Sdk/Models/IFileSystemInfoModel.cs
deleted file mode 100644
index 348ea3694..000000000
--- a/src/SecureFolderFS.Sdk/Models/IFileSystemInfoModel.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using SecureFolderFS.Shared.ComponentModel;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace SecureFolderFS.Sdk.Models
-{
-    /// <summary>
-    /// Represents a file system descriptor.
-    /// </summary>
-    public interface IFileSystemInfoModel
-    {
-        /// <summary>
-        /// Gets an unique id associated with this file system.
-        /// </summary>
-        string Id { get; }
-
-        /// <summary>
-        /// Gets the name of this file system.
-        /// </summary>
-        string Name { get; }
-
-        /// <summary>
-        /// Determines whether this file system is available on the device.
-        /// </summary>
-        /// <param name="cancellationToken">A <see cref="CancellationToken"/> that cancels this action.</param>
-        /// <returns>A <see cref="Task"/> that represents the asynchronous operation. Value is <see cref="IResult"/> that represents the status of the file system provider.</returns>
-        Task<IResult> GetStatusAsync(CancellationToken cancellationToken = default);
-    }
-}
diff --git a/src/SecureFolderFS.Sdk/Models/IHealthModel.cs b/src/SecureFolderFS.Sdk/Models/IHealthModel.cs
new file mode 100644
index 000000000..af1fbf961
--- /dev/null
+++ b/src/SecureFolderFS.Sdk/Models/IHealthModel.cs
@@ -0,0 +1,26 @@
+using SecureFolderFS.Sdk.EventArguments;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace SecureFolderFS.Sdk.Models
+{
+    /// <summary>
+    /// Scans the ciphertext folder and reports any problems through <see cref="IssueFound"/> event.
+    /// </summary>
+    public interface IHealthModel : IDisposable
+    {
+        /// <summary>
+        /// Occurs when an issue is found within the file system structure.
+        /// </summary>
+        event EventHandler<HealthIssueEventArgs>? IssueFound;
+
+        /// <summary>
+        /// Starts the scanning of the file system structure and reports errors through <see cref="IssueFound"/> event.
+        /// </summary>
+        /// <param name="includeFileContents">Determines whether to include file contents during the scan operation.</param>
+        /// <param name="cancellationToken">A <see cref="CancellationToken"/> that cancels this action.</param>
+        /// <returns>A <see cref="Task"/> that represents the asynchronous operation.</returns>
+        Task ScanAsync(bool includeFileContents, CancellationToken cancellationToken = default);
+    }
+}
diff --git a/src/SecureFolderFS.Sdk/Models/ISystemMonitorModel.cs b/src/SecureFolderFS.Sdk/Models/ISystemMonitorModel.cs
new file mode 100644
index 000000000..0d5026a58
--- /dev/null
+++ b/src/SecureFolderFS.Sdk/Models/ISystemMonitorModel.cs
@@ -0,0 +1,16 @@
+using SecureFolderFS.Shared.ComponentModel;
+using System;
+
+namespace SecureFolderFS.Sdk.Models
+{
+    /// <summary>
+    /// A model used to monitor system events.
+    /// </summary>
+    public interface ISystemMonitorModel : IAsyncInitialize, IDisposable
+    {
+        /// <summary>
+        /// Gets the collection model of vaults associated with this instance.
+        /// </summary>
+        IVaultCollectionModel VaultCollectionModel { get; }
+    }
+}
diff --git a/src/SecureFolderFS.Sdk/Models/IVaultCollectionModel.cs b/src/SecureFolderFS.Sdk/Models/IVaultCollectionModel.cs
index 7b686c7ea..caf2644a9 100644
--- a/src/SecureFolderFS.Sdk/Models/IVaultCollectionModel.cs
+++ b/src/SecureFolderFS.Sdk/Models/IVaultCollectionModel.cs
@@ -7,7 +7,13 @@ namespace SecureFolderFS.Sdk.Models
     /// <summary>
     /// Manages the collection of user-saved vaults.
     /// </summary>
-    public interface IVaultCollectionModel : ICollection<IVaultModel>, INotifyCollectionChanged, IPersistable
+    public interface IVaultCollectionModel : IList<IVaultModel>, INotifyCollectionChanged, IPersistable
     {
+        /// <summary>
+        /// Move item at <paramref name="oldIndex"/> to <paramref name="newIndex"/>.
+        /// </summary>
+        /// <param name="oldIndex">The zero-based index specifying the location of the item to be moved.</param>
+        /// <param name="newIndex">The zero-based index specifying the new location of the item.</param>
+        void Move(int oldIndex, int newIndex);
     }
 }
\ No newline at end of file
diff --git a/src/SecureFolderFS.Sdk/Results/FileSystemResult.cs b/src/SecureFolderFS.Sdk/Results/FileSystemResult.cs
deleted file mode 100644
index 83469c9c5..000000000
--- a/src/SecureFolderFS.Sdk/Results/FileSystemResult.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using SecureFolderFS.Shared.Models;
-using SecureFolderFS.Shared.ComponentModel;
-using System;
-
-namespace SecureFolderFS.Sdk.Results
-{
-    /// <inheritdoc cref="IResult"/>
-    public sealed class FileSystemResult : Result
-    {
-        /// <summary>
-        /// Gets the value that determines whether the device can support a given file system.
-        /// <remarks>
-        /// The value might be true even when the file system is unavailable.</remarks>
-        /// </summary>
-        public bool CanSupport { get; }
-
-        public FileSystemResult(bool canSupport, bool isSuccess)
-            : base(isSuccess)
-        {
-            CanSupport = canSupport;
-        }
-
-        public FileSystemResult(bool canSupport, Exception? exception)
-            : base(exception)
-        {
-            CanSupport = canSupport;
-        }
-    }
-}
diff --git a/src/SecureFolderFS.Sdk/SecureFolderFS.Sdk.csproj b/src/SecureFolderFS.Sdk/SecureFolderFS.Sdk.csproj
index 171ed7ec3..38fbb7677 100644
--- a/src/SecureFolderFS.Sdk/SecureFolderFS.Sdk.csproj
+++ b/src/SecureFolderFS.Sdk/SecureFolderFS.Sdk.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>disable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
@@ -10,8 +10,9 @@
 
   <ItemGroup>
     <PackageReference Include="ByteSize" Version="2.1.2" />
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
+    <PackageReference Include="MimeTypeMapOfficial" Version="1.0.17" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/SecureFolderFS.Sdk/Services/IApplicationService.cs b/src/SecureFolderFS.Sdk/Services/IApplicationService.cs
index b8c0ea6c2..29e800241 100644
--- a/src/SecureFolderFS.Sdk/Services/IApplicationService.cs
+++ b/src/SecureFolderFS.Sdk/Services/IApplicationService.cs
@@ -36,7 +36,7 @@ public interface IApplicationService
         string GetSystemVersion();
 
         /// <summary>
-        /// Launches an URI from app. This can be an URL, folder path, etc.
+        /// Launches a URI from app. This can be a URL, folder path, etc.
         /// </summary>
         /// <param name="uri">The URI to launch.</param>
         /// <returns>A <see cref="Task"/> that represents the asynchronous operation.</returns>
diff --git a/src/SecureFolderFS.Sdk/Services/IAuthenticationService.cs b/src/SecureFolderFS.Sdk/Services/IAuthenticationService.cs
deleted file mode 100644
index d4b7597e7..000000000
--- a/src/SecureFolderFS.Sdk/Services/IAuthenticationService.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Principal;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SecureFolderFS.Sdk.Services
-{
-    internal interface IAuthenticationService
-    {
-        Task<IIdentity> SystemAsync();
-
-        Task<IIdentity> HardwareKeyAsync();
-    }
-}
diff --git a/src/SecureFolderFS.Sdk/Services/IFileExplorerService.cs b/src/SecureFolderFS.Sdk/Services/IFileExplorerService.cs
index 6cae0bba4..f9ce93bbf 100644
--- a/src/SecureFolderFS.Sdk/Services/IFileExplorerService.cs
+++ b/src/SecureFolderFS.Sdk/Services/IFileExplorerService.cs
@@ -14,7 +14,7 @@ public interface IFileExplorerService
         /// <summary>
         /// Tries to open the provided <paramref name="folder"/> in platform's default file explorer.
         /// </summary>
-        /// <param name="folder">The folder to open file explorer in.</param>
+        /// <param name="folder">The folder to open the file explorer at.</param>
         /// <param name="cancellationToken">A <see cref="CancellationToken"/> that cancels this action.</param>
         /// <returns>A <see cref="Task"/> that represents the asynchronous operation.</returns>
         Task TryOpenInFileExplorerAsync(IFolder folder, CancellationToken cancellationToken = default);
@@ -33,15 +33,17 @@ public interface IFileExplorerService
         /// Awaits the user input and picks single file from the file explorer dialog.
         /// </summary>
         /// <param name="filter">The filter to apply when picking files.</param>
+        /// <param name="persist">Determines whether to persist access to the picked item or not.</param>
         /// <param name="cancellationToken">A <see cref="CancellationToken"/> that cancels this action.</param>
-        /// <returns>A <see cref="Task"/> that represents the asynchronous operation. If successful and a file has been picked, returns <see cref="ILocatableFile"/>; otherwise null.</returns>
-        Task<IFile?> PickFileAsync(IEnumerable<string>? filter, CancellationToken cancellationToken = default);
+        /// <returns>A <see cref="Task"/> that represents the asynchronous operation. If successful and a file has been picked, returns <see cref="IFile"/>; otherwise null.</returns>
+        Task<IFile?> PickFileAsync(IEnumerable<string>? filter, bool persist = true, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Awaits the user input and picks single folder from the file explorer dialog.
         /// </summary>
+        /// <param name="persist">Determines whether to persist access to the picked item or not.</param>
         /// <param name="cancellationToken">A <see cref="CancellationToken"/> that cancels this action.</param>
-        /// <returns>A <see cref="Task"/> that represents the asynchronous operation. If successful and a folder has been picked, returns <see cref="ILocatableFolder"/>; otherwise null.</returns>
-        Task<IFolder?> PickFolderAsync(CancellationToken cancellationToken = default);
+        /// <returns>A <see cref="Task"/> that represents the asynchronous operation. If successful and a folder has been picked, returns <see cref="IFolder"/>; otherwise null.</returns>
+        Task<IFolder?> PickFolderAsync(bool persist = true, CancellationToken cancellationToken = default);
     }
 }
diff --git a/src/SecureFolderFS.Sdk/Services/ILocalizationService.cs b/src/SecureFolderFS.Sdk/Services/ILocalizationService.cs
index 76b7b28a2..cfe30f2f1 100644
--- a/src/SecureFolderFS.Sdk/Services/ILocalizationService.cs
+++ b/src/SecureFolderFS.Sdk/Services/ILocalizationService.cs
@@ -20,7 +20,7 @@ public interface ILocalizationService
         IReadOnlyList<CultureInfo> AppLanguages { get; }
 
         /// <summary>
-        /// Tries to gets the localized string for the <paramref name="resourceKey"/>.
+        /// Tries to get the localized string for the <paramref name="resourceKey"/>.
         /// </summary>
         /// <param name="resourceKey">The resource key that associates with translations.</param>
         /// <returns>If successful, returns a localized string for the <see cref="CurrentCulture"/>; otherwise null.</returns>
diff --git a/src/SecureFolderFS.Sdk/Services/IMediaService.cs b/src/SecureFolderFS.Sdk/Services/IMediaService.cs
new file mode 100644
index 000000000..82cd83a25
--- /dev/null
+++ b/src/SecureFolderFS.Sdk/Services/IMediaService.cs
@@ -0,0 +1,21 @@
+using System;
+using OwlCore.Storage;
+using SecureFolderFS.Shared.ComponentModel;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace SecureFolderFS.Sdk.Services
+{
+    public interface IMediaService
+    {
+        /// <summary>
+        /// Reads an image file and returns a new instance of <see cref="IImage"/>
+        /// </summary>
+        /// <param name="file">The <see cref="IFile"/> to read.</param>
+        /// <param name="cancellationToken">A <see cref="CancellationToken"/> that cancels this action.</param>
+        /// <returns>A <see cref="Task"/> that represents the asynchronous operation. Value is the image read from file.</returns>
+        Task<IImage> ReadImageFileAsync(IFile file, CancellationToken cancellationToken);
+        
+        Task<IDisposable> StreamVideoAsync(IFile file, CancellationToken cancellationToken);
+    }
+}
diff --git a/src/SecureFolderFS.Sdk/Services/INavigationService.cs b/src/SecureFolderFS.Sdk/Services/INavigationService.cs
index f4f26827d..0002460f6 100644
--- a/src/SecureFolderFS.Sdk/Services/INavigationService.cs
+++ b/src/SecureFolderFS.Sdk/Services/INavigationService.cs
@@ -22,6 +22,6 @@ public interface INavigationService : INavigator, IDisposable
         /// <summary>
         /// Gets the collection of all previously navigated-to targets.
         /// </summary>
-        ICollection<IViewDesignation> Views { get; }
+        List<IViewDesignation> Views { get; }
     }
 }
diff --git a/src/SecureFolderFS.Sdk/Services/ISystemService.cs b/src/SecureFolderFS.Sdk/Services/ISystemService.cs
new file mode 100644
index 000000000..be64a7955
--- /dev/null
+++ b/src/SecureFolderFS.Sdk/Services/ISystemService.cs
@@ -0,0 +1,15 @@
+using System;
+
+namespace SecureFolderFS.Sdk.Services
+{
+    /// <summary>
+    /// A service to control system related actions and events.
+    /// </summary>
+    public interface ISystemService
+    {
+        /// <summary>
+        /// Occurs when the user locks their desktop.
+        /// </summary>
+        event EventHandler? DesktopLocked;
+    }
+}
diff --git a/src/SecureFolderFS.Sdk/Services/IThreadingService.cs b/src/SecureFolderFS.Sdk/Services/IThreadingService.cs
index d7a371455..c6a9c4d0b 100644
--- a/src/SecureFolderFS.Sdk/Services/IThreadingService.cs
+++ b/src/SecureFolderFS.Sdk/Services/IThreadingService.cs
@@ -1,4 +1,5 @@
-using SecureFolderFS.Shared.ComponentModel;
+using System.Threading;
+using SecureFolderFS.Shared.ComponentModel;
 
 namespace SecureFolderFS.Sdk.Services
 {
@@ -7,6 +8,12 @@ namespace SecureFolderFS.Sdk.Services
     /// </summary>
     public interface IThreadingService
     {
+        /// <summary>
+        /// Gets the <see cref="SynchronizationContext"/> of the UI thread.
+        /// </summary>
+        /// <returns>The UI thread context, if available.</returns>
+        SynchronizationContext? GetContext();
+
         /// <summary>
         /// Changes current thread to execute on UI thread.
         /// </summary>
diff --git a/src/SecureFolderFS.Sdk/Services/IVaultCredentialsService.cs b/src/SecureFolderFS.Sdk/Services/IVaultCredentialsService.cs
new file mode 100644
index 000000000..adfbb82e7
--- /dev/null
+++ b/src/SecureFolderFS.Sdk/Services/IVaultCredentialsService.cs
@@ -0,0 +1,28 @@
+using OwlCore.Storage;
+using SecureFolderFS.Sdk.ViewModels.Controls.Authentication;
+using System.Collections.Generic;
+using System.Threading;
+
+namespace SecureFolderFS.Sdk.Services
+{
+    public interface IVaultCredentialsService
+    {
+        /// <summary>
+        /// Gets all content ciphers that are supported by SecureFolderFS.
+        /// </summary>
+        /// <returns>Returns <see cref="IEnumerable{T}"/> of type <see cref="string"/> that represents IDs of content ciphers.</returns>
+        IEnumerable<string> GetContentCiphers();
+
+        /// <summary>
+        /// Gets all filename ciphers that are supported by SecureFolderFS.
+        /// </summary>
+        /// <returns>Returns <see cref="IEnumerable{T}"/> of type <see cref="string"/> that represents IDs of filename ciphers.</returns>
+        IEnumerable<string> GetFileNameCiphers();
+
+        // TODO: Needs docs
+
+        IAsyncEnumerable<AuthenticationViewModel> GetLoginAsync(IFolder vaultFolder, CancellationToken cancellationToken = default);
+
+        IAsyncEnumerable<AuthenticationViewModel> GetCreationAsync(IFolder vaultFolder, string vaultId, CancellationToken cancellationToken = default);
+    }
+}
diff --git a/src/SecureFolderFS.Sdk/Services/IVaultFileSystemService.cs b/src/SecureFolderFS.Sdk/Services/IVaultFileSystemService.cs
new file mode 100644
index 000000000..19c1751cd
--- /dev/null
+++ b/src/SecureFolderFS.Sdk/Services/IVaultFileSystemService.cs
@@ -0,0 +1,43 @@
+using System;
+using SecureFolderFS.Sdk.ViewModels.Controls.Widgets.Health;
+using SecureFolderFS.Shared.ComponentModel;
+using SecureFolderFS.Storage.VirtualFileSystem;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using OwlCore.Storage;
+
+namespace SecureFolderFS.Sdk.Services
+{
+    public interface IVaultFileSystemService
+    {
+        public delegate void IssueDelegate(HealthIssueViewModel issueViewModel, IResult result);
+
+        /// <summary>
+        /// Gets the local representation of a file system.
+        /// </summary>
+        /// <returns>A new local file system instance.</returns>
+        Task<IFileSystem> GetLocalFileSystemAsync(CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Gets all file systems that are supported by the app.
+        /// </summary>
+        /// <remarks>
+        /// Returned file systems that are available, may not be supported on this device. 
+        /// Use <see cref="IFileSystem.GetStatusAsync"/> to check if a given file system is supported.
+        /// </remarks>
+        /// <returns>An <see cref="IEnumerable{T}"/> of type <see cref="IFileSystem"/> of available file systems.</returns>
+        IAsyncEnumerable<IFileSystem> GetFileSystemsAsync(CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Gets the <see cref="HealthIssueViewModel"/> implementation for associated <see cref="IResult"/> from item validation.
+        /// </summary>
+        /// <param name="result">The result of validation.</param>
+        /// <param name="storable">The affected storable.</param>
+        /// <param name="cancellationToken">A <see cref="CancellationToken"/> that cancels this action.</param>
+        /// <returns>A <see cref="Task"/> that represents the asynchronous operation. If available, value is <see cref="HealthIssueViewModel"/>; otherwise false.</returns>
+        Task<HealthIssueViewModel?> GetIssueViewModelAsync(IResult result, IStorableChild storable, CancellationToken cancellationToken = default);
+
+        Task ResolveIssuesAsync(IEnumerable<HealthIssueViewModel> issues, IDisposable contractOrRoot, IssueDelegate? issueDelegate, CancellationToken cancellationToken = default);
+    }
+}
diff --git a/src/SecureFolderFS.Sdk/Services/IVaultManagerService.cs b/src/SecureFolderFS.Sdk/Services/IVaultManagerService.cs
index b38870d2e..fcfb29ce9 100644
--- a/src/SecureFolderFS.Sdk/Services/IVaultManagerService.cs
+++ b/src/SecureFolderFS.Sdk/Services/IVaultManagerService.cs
@@ -1,9 +1,6 @@
 using OwlCore.Storage;
-using SecureFolderFS.Sdk.AppModels;
-using SecureFolderFS.Sdk.Models;
 using SecureFolderFS.Shared.ComponentModel;
 using SecureFolderFS.Shared.Models;
-using SecureFolderFS.Storage.VirtualFileSystem;
 using System;
 using System.Collections.Generic;
 using System.Threading;
@@ -27,7 +24,7 @@ public interface IVaultManagerService
         /// <param name="passkey">The passkey represented by <see cref="IEnumerable{T}"/> of <see cref="IDisposable"/> representing authentication elements to set for this vault.</param>
         /// <param name="vaultOptions">The required options to set for this vault.</param>
         /// <param name="cancellationToken">A <see cref="CancellationToken"/> that cancels this action.</param>
-        /// <returns>A <see cref="Task"/> that represents the asynchronous operation. Value is <see cref="IDisposable"/> that represents the master key used to decrypt the vault.</returns>
+        /// <returns>A <see cref="Task"/> that represents the asynchronous operation. Value is <see cref="IDisposable"/> that represents the recovery key used to decrypt the vault.</returns>
         Task<IDisposable> CreateAsync(IFolder vaultFolder, IKey passkey, VaultOptions vaultOptions, CancellationToken cancellationToken = default);
 
         /// <summary>
@@ -36,7 +33,7 @@ public interface IVaultManagerService
         /// <param name="vaultFolder">The <see cref="IFolder"/> that represents the vault.</param>
         /// <param name="passkey"></param>
         /// <param name="cancellationToken">A <see cref="CancellationToken"/> that cancels this action.</param>
-        /// <returns>A <see cref="Task"/> that represents the asynchronous operation. Value is <see cref="IDisposable"/> that represents the master key used to decrypt the vault.</returns>
+        /// <returns>A <see cref="Task"/> that represents the asynchronous operation. Value is <see cref="IDisposable"/> that represents the recovery key used to decrypt the vault.</returns>
         Task<IDisposable> UnlockAsync(IFolder vaultFolder, IKey passkey, CancellationToken cancellationToken = default);
 
         /// <summary>
@@ -45,22 +42,18 @@ public interface IVaultManagerService
         /// <param name="vaultFolder">The <see cref="IFolder"/> that represents the vault.</param>
         /// <param name="encodedRecoveryKey">The Base64 encoded recovery key.</param>
         /// <param name="cancellationToken">A <see cref="CancellationToken"/> that cancels this action.</param>
-        /// <returns>A <see cref="Task"/> that represents the asynchronous operation. Value is <see cref="IDisposable"/> that represents the master key used to decrypt the vault.</returns>
+        /// <returns>A <see cref="Task"/> that represents the asynchronous operation. Value is <see cref="IDisposable"/> that represents the recovery key used to decrypt the vault.</returns>
         Task<IDisposable> RecoverAsync(IFolder vaultFolder, string encodedRecoveryKey, CancellationToken cancellationToken = default);
 
-        // TODO: Needs docs
-
-        Task<IVFSRoot> CreateFileSystemAsync(IVaultModel vaultModel, IDisposable unlockContract, CancellationToken cancellationToken);
-
-        Task<IVFSRoot> CreateLocalStorageAsync(IVaultModel vaultModel, IDisposable unlockContract, CancellationToken cancellationToken);
-        
-        //Task<IFileSystem> GetLocalFileSystemAsync(CancellationToken cancellationToken);
-
-        //IAsyncEnumerable<IFileSystem> GetFileSystemsAsync(CancellationToken cancellationToken);
-
-        Task<IVaultMigratorModel> GetMigratorAsync(IFolder vaultFolder, CancellationToken cancellationToken = default);
-
-        // API not final. TBD
-        Task ChangeAuthenticationAsync(IFolder vaultFolder, IDisposable unlockContract, IKey newPasskey, VaultOptions vaultOptions, CancellationToken cancellationToken = default);
+        /// <summary>
+        /// Modifies the configured authentication for the specified <paramref name="vaultFolder"/>.
+        /// </summary>
+        /// <param name="vaultFolder">The <see cref="IFolder"/> that represents the vault.</param>
+        /// <param name="unlockContract">The recovery key used to decrypt the vault</param>
+        /// <param name="newPasskey">The new passkey to secure the vault with.</param>
+        /// <param name="vaultOptions">>The required options to set for this vault.</param>
+        /// <param name="cancellationToken">A <see cref="CancellationToken"/> that cancels this action.</param>
+        /// <returns>A <see cref="Task"/> that represents the asynchronous operation.</returns>
+        Task ModifyAuthenticationAsync(IFolder vaultFolder, IDisposable unlockContract, IKey newPasskey, VaultOptions vaultOptions, CancellationToken cancellationToken = default);
     }
 }
diff --git a/src/SecureFolderFS.Sdk/Services/IVaultService.cs b/src/SecureFolderFS.Sdk/Services/IVaultService.cs
index c2b077cc8..32fe91a2c 100644
--- a/src/SecureFolderFS.Sdk/Services/IVaultService.cs
+++ b/src/SecureFolderFS.Sdk/Services/IVaultService.cs
@@ -1,6 +1,4 @@
 using OwlCore.Storage;
-using SecureFolderFS.Sdk.Models;
-using SecureFolderFS.Sdk.ViewModels.Controls.Authentication;
 using SecureFolderFS.Shared.ComponentModel;
 using SecureFolderFS.Shared.Models;
 using System.Collections.Generic;
@@ -19,6 +17,11 @@ public interface IVaultService // TODO: Move some of the methods to IVaultModel?
         /// </summary>
         int LatestVaultVersion { get; }
 
+        /// <summary>
+        /// Gets the name of the vault's content folder.
+        /// </summary>
+        string ContentFolderName { get; }
+
         /// <summary>
         /// Gets the <see cref="IAsyncValidator{T}"/> of type <see cref="IFolder"/> used to validate vaults.
         /// </summary>
@@ -32,39 +35,25 @@ public interface IVaultService // TODO: Move some of the methods to IVaultModel?
         bool IsNameReserved(string? name);
 
         /// <summary>
-        /// Gets all file systems that are supported by SecureFolderFS.
-        /// </summary>
-        /// <remarks>
-        /// Returned file systems that are available, may not be supported on this device. 
-        /// Use <see cref="IFileSystemInfoModel.GetStatusAsync"/> to check if a given file system is supported.
-        /// </remarks>
-        /// <returns>Returns <see cref="IEnumerable{T}"/> of type <see cref="IFileSystemInfoModel"/> of available file systems.</returns>
-        IEnumerable<IFileSystemInfoModel> GetFileSystems();
-
-        /// <summary>
-        /// Gets all content ciphers that are supported by SecureFolderFS.
-        /// </summary>
-        /// <returns>Returns <see cref="IEnumerable{T}"/> of type <see cref="string"/> that represents IDs of content ciphers.</returns>
-        IEnumerable<string> GetContentCiphers();
-
-        /// <summary>
-        /// Gets all filename ciphers that are supported by SecureFolderFS.
+        /// Gets all encoding options that are supported by SecureFolderFS.
         /// </summary>
-        /// <returns>Returns <see cref="IEnumerable{T}"/> of type <see cref="string"/> that represents IDs  of filename ciphers.</returns>
-        IEnumerable<string> GetFileNameCiphers();
+        /// <returns>Returns <see cref="IEnumerable{T}"/> of type <see cref="string"/> that represents IDs of encodings.</returns>
+        IEnumerable<string> GetEncodingOptions();
 
         /// <summary>
         /// Gets an instance of <see cref="VaultOptions"/> that contains information about the vault.
         /// </summary>
-        /// <param name="vaultFolder">The folder of the vault.</param>
+        /// <param name="vaultFolder">The <see cref="IFolder"/> that represents the vault.</param>
         /// <param name="cancellationToken">A <see cref="CancellationToken"/> that cancels this action.</param>
         /// <returns>A <see cref="Task"/> that represents the asynchronous operation. Value is <see cref="VaultOptions"/> of the additional vault information.</returns>
         Task<VaultOptions> GetVaultOptionsAsync(IFolder vaultFolder, CancellationToken cancellationToken = default);
 
-        // TODO: Needs docs
-
-        IAsyncEnumerable<AuthenticationViewModel> GetLoginAsync(IFolder vaultFolder, CancellationToken cancellationToken = default);
-
-        IAsyncEnumerable<AuthenticationViewModel> GetCreationAsync(IFolder vaultFolder, string vaultId, CancellationToken cancellationToken = default);
+        /// <summary>
+        /// Gets the appropriate migrator for a vault.
+        /// </summary>
+        /// <param name="vaultFolder">The <see cref="IFolder"/> that represents the vault.</param>
+        /// <param name="cancellationToken">A <see cref="CancellationToken"/> that cancels this action.</param>
+        /// <returns>A <see cref="Task"/> that represents the asynchronous operation. Value is <see cref="IVaultMigratorModel"/> that is used to migrate a vault.</returns>
+        Task<IVaultMigratorModel> GetMigratorAsync(IFolder vaultFolder, CancellationToken cancellationToken = default);
     }
 }
diff --git a/src/SecureFolderFS.Sdk/Services/Settings/IUserSettings.cs b/src/SecureFolderFS.Sdk/Services/Settings/IUserSettings.cs
index ca75125ed..a1e7e7112 100644
--- a/src/SecureFolderFS.Sdk/Services/Settings/IUserSettings.cs
+++ b/src/SecureFolderFS.Sdk/Services/Settings/IUserSettings.cs
@@ -20,6 +20,11 @@ public interface IUserSettings : IPersistable, INotifyPropertyChanged
         /// </summary>
         bool StartOnSystemStartup { get; set; }
 
+        /// <summary>
+        /// Gets or sets the value that determines whether to put the app to background system Task Bar when closing the window.
+        /// </summary>
+        bool ReduceToBackground { get; set; }
+
         /// <summary>
         /// Gets or sets the value that determines whether to continue on the previously selected vault.
         /// </summary>
@@ -37,13 +42,18 @@ public interface IUserSettings : IPersistable, INotifyPropertyChanged
         /// <summary>
         /// Gets or sets the value that determines whether to lock all unlocked vaults when the system is locked.
         /// </summary>
-        bool AutoLockVaults { get; set; }
+        bool LockOnSystemLock { get; set; }
 
         /// <summary>
         /// Gets or sets the value that determines whether to use telemetry.
         /// </summary>
         bool IsTelemetryEnabled { get; set; }
 
+        /// <summary>
+        /// Gets or sets the value that determines whether to periodically clear or untrack system-wide recently accessed items.
+        /// </summary>
+        bool DisableRecentAccess { get; set; }
+
         #endregion
     }
 }
diff --git a/src/SecureFolderFS.Sdk/ViewModels/CipherViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/CipherViewModel.cs
deleted file mode 100644
index 95adecd06..000000000
--- a/src/SecureFolderFS.Sdk/ViewModels/CipherViewModel.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using CommunityToolkit.Mvvm.ComponentModel;
-using System.ComponentModel;
-
-namespace SecureFolderFS.Sdk.ViewModels
-{
-    /// <summary>
-    /// Represents a cryptographic cipher descriptor.
-    /// </summary>
-    [Bindable(true)]
-    public sealed class CipherViewModel : ObservableObject
-    {
-        /// <summary>
-        /// Gets an unique id associated with this cipher.
-        /// </summary>
-        public string Id { get; }
-
-        /// <summary>
-        /// Gets the name of this cipher.
-        /// </summary>
-        public string Name { get; }
-
-        public CipherViewModel(string id, string? name = null)
-        {
-            Id = id;
-            Name = name ?? id;
-        }
-
-        /// <inheritdoc/>
-        public override string ToString()
-        {
-            return Name;
-        }
-    }
-}
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Controls/Authentication/AuthenticationViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Controls/Authentication/AuthenticationViewModel.cs
index 4fbcb6fe2..ec416626f 100644
--- a/src/SecureFolderFS.Sdk/ViewModels/Controls/Authentication/AuthenticationViewModel.cs
+++ b/src/SecureFolderFS.Sdk/ViewModels/Controls/Authentication/AuthenticationViewModel.cs
@@ -14,7 +14,6 @@ namespace SecureFolderFS.Sdk.ViewModels.Controls.Authentication
     public abstract partial class AuthenticationViewModel(string id)
         : ReportableViewModel, IAuthenticator, IDisposable
     {
-        [ObservableProperty] private string? _DisplayName;
         [ObservableProperty] private string? _Description;
         [ObservableProperty] private string? _Icon; // TODO: Change to IImage
 
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Controls/Authentication/ErrorViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Controls/Authentication/ErrorViewModel.cs
index cb52d5326..97c897d7d 100644
--- a/src/SecureFolderFS.Sdk/ViewModels/Controls/Authentication/ErrorViewModel.cs
+++ b/src/SecureFolderFS.Sdk/ViewModels/Controls/Authentication/ErrorViewModel.cs
@@ -7,24 +7,53 @@
 namespace SecureFolderFS.Sdk.ViewModels.Controls.Authentication
 {
     [Bindable(true)]
-    public sealed partial class ErrorViewModel : ReportableViewModel
+    public partial class ErrorViewModel : ReportableViewModel
     {
-        [ObservableProperty] private string? _ErrorTitle;
+        /// <summary>
+        /// Gets the error message of the <see cref="IResult"/>. If no errors are reported, value is null.
+        /// </summary>
         [ObservableProperty] private string? _ErrorMessage;
 
+        /// <summary>
+        /// Gets the exception message of the <see cref="IResult"/>. If no errors are reported, value is null.
+        /// </summary>
+        [ObservableProperty] private string? _ExceptionMessage;
+
         /// <inheritdoc/>
         public override event EventHandler<EventArgs>? StateChanged;
 
-        public ErrorViewModel(string? errorTitle, string? errorMessage)
+        public ErrorViewModel(string? title)
+        {
+            Title = title;
+        }
+
+        public ErrorViewModel(IResult? error)
         {
-            _ErrorTitle = errorTitle;
-            _ErrorMessage = errorMessage;
+            Report(error);
         }
 
         /// <inheritdoc/>
-        public override void Report(IResult? result)
+        public sealed override void Report(IResult? result)
+        {
+            UpdateStatus(result);
+        }
+
+        /// <summary>
+        /// Updates the current state upon error report.
+        /// </summary>
+        /// <param name="result">The <see cref="IResult"/> that was reported.</param>
+        protected virtual void UpdateStatus(IResult? result)
         {
-            ErrorMessage = result?.GetMessage();
+            if (result is { Successful: false })
+            {
+                ErrorMessage = result.GetMessage();
+                ExceptionMessage = result.GetExceptionMessage();
+            }
+            else
+            {
+                ErrorMessage = null;
+                ExceptionMessage = null;
+            }
         }
     }
 }
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Controls/Authentication/ReportableViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Controls/Authentication/ReportableViewModel.cs
index 206d6f93c..7e4d3c5c9 100644
--- a/src/SecureFolderFS.Sdk/ViewModels/Controls/Authentication/ReportableViewModel.cs
+++ b/src/SecureFolderFS.Sdk/ViewModels/Controls/Authentication/ReportableViewModel.cs
@@ -6,8 +6,11 @@
 namespace SecureFolderFS.Sdk.ViewModels.Controls.Authentication
 {
     [Bindable(true)]
-    public abstract class ReportableViewModel : ObservableObject, IProgress<IResult?>, INotifyStateChanged
+    public abstract partial class ReportableViewModel : ObservableObject, IViewable, IProgress<IResult?>, INotifyStateChanged
     {
+        /// <inheritdoc cref="IViewable.Title"/>
+        [ObservableProperty] private string? _Title;
+
         /// <inheritdoc/>
         public abstract event EventHandler<EventArgs>? StateChanged;
 
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Controls/Banners/FileSystemBannerViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Controls/Banners/FileSystemBannerViewModel.cs
index dfdf27457..3f69ccc20 100644
--- a/src/SecureFolderFS.Sdk/ViewModels/Controls/Banners/FileSystemBannerViewModel.cs
+++ b/src/SecureFolderFS.Sdk/ViewModels/Controls/Banners/FileSystemBannerViewModel.cs
@@ -1,10 +1,10 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using SecureFolderFS.Sdk.Attributes;
-using SecureFolderFS.Sdk.Models;
-using SecureFolderFS.Sdk.Results;
 using SecureFolderFS.Sdk.Services;
 using SecureFolderFS.Shared;
 using SecureFolderFS.Shared.ComponentModel;
+using SecureFolderFS.Storage.Enums;
+using SecureFolderFS.Storage.VirtualFileSystem;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Linq;
@@ -13,40 +13,42 @@
 
 namespace SecureFolderFS.Sdk.ViewModels.Controls.Banners
 {
-    [Inject<IVaultService>, Inject<ISettingsService>]
+    [Inject<IVaultFileSystemService>, Inject<ISettingsService>]
     [Bindable(true)]
     public sealed partial class FileSystemBannerViewModel : ObservableObject, IAsyncInitialize
     {
         [ObservableProperty] private ObservableCollection<FileSystemItemViewModel> _FileSystemAdapters;
         [ObservableProperty] private FileSystemItemViewModel? _SelectedItem;
+        [ObservableProperty] private InfoBarViewModel _FileSystemInfoBar;
 
         public FileSystemBannerViewModel()
         {
             ServiceProvider = DI.Default;
+            FileSystemInfoBar = new();
             FileSystemAdapters = new();
         }
 
         /// <inheritdoc/>
         public async Task InitAsync(CancellationToken cancellationToken = default)
         {
-            foreach (var item in VaultService.GetFileSystems())
+            await foreach (var item in VaultFileSystemService.GetFileSystemsAsync(cancellationToken))
             {
                 var fileSystemResult = await item.GetStatusAsync(cancellationToken);
-                if (fileSystemResult is FileSystemResult { CanSupport: true } || (fileSystemResult.Successful && fileSystemResult is not FileSystemResult))
+                if (fileSystemResult == FileSystemAvailability.Available)
                     FileSystemAdapters.Add(new(item, item.Name));
             }
 
-            SelectedItem = FileSystemAdapters.FirstOrDefault(x => x.FileSystemInfoModel.Id == SettingsService.UserSettings.PreferredFileSystemId);
+            SelectedItem = FileSystemAdapters.FirstOrDefault(x => x.FileSystem.Id == SettingsService.UserSettings.PreferredFileSystemId);
         }
 
         partial void OnSelectedItemChanged(FileSystemItemViewModel? value)
         {
             if (value is not null)
-                SettingsService.UserSettings.PreferredFileSystemId = value.FileSystemInfoModel.Id;
+                SettingsService.UserSettings.PreferredFileSystemId = value.FileSystem.Id;
         }
     }
 
-    public sealed record FileSystemItemViewModel(IFileSystemInfoModel FileSystemInfoModel, string Name)
+    public sealed record FileSystemItemViewModel(IFileSystem FileSystem, string Name)
     {
         /// <inheritdoc/>
         public override string ToString()
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Controls/Banners/UpdateBannerViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Controls/Banners/UpdateBannerViewModel.cs
index 9f693ba3e..e955fe62a 100644
--- a/src/SecureFolderFS.Sdk/ViewModels/Controls/Banners/UpdateBannerViewModel.cs
+++ b/src/SecureFolderFS.Sdk/ViewModels/Controls/Banners/UpdateBannerViewModel.cs
@@ -45,7 +45,7 @@ public async Task InitAsync(CancellationToken cancellationToken = default)
             {
                 InfoBarViewModel.IsOpen = true;
                 InfoBarViewModel.Message = "Updates are not supported for the sideloaded version.";
-                InfoBarViewModel.Severity = ViewSeverityType.Warning;
+                InfoBarViewModel.Severity = SeverityType.Warning;
             }
         }
 
@@ -68,9 +68,9 @@ private void UpdateService_StateChanged(object? sender, EventArgs e)
 
             InfoBarViewModel.IsOpen = true;
             InfoBarViewModel.Title = "Error".ToLocalized();
-            InfoBarViewModel.CanBeClosed = true;
+            InfoBarViewModel.IsCloseable = true;
             InfoBarViewModel.Message = GetMessageForUpdateState(args.UpdateState);
-            InfoBarViewModel.Severity = ViewSeverityType.Error;
+            InfoBarViewModel.Severity = SeverityType.Critical;
         }
 
         [RelayCommand]
@@ -91,9 +91,9 @@ private async Task UpdateAppAsync(CancellationToken cancellationToken)
             {
                 InfoBarViewModel.IsOpen = true;
                 InfoBarViewModel.Title = "Error".ToLocalized();
-                InfoBarViewModel.CanBeClosed = true;
+                InfoBarViewModel.IsCloseable = true;
                 InfoBarViewModel.Message = result.GetMessage();
-                InfoBarViewModel.Severity = ViewSeverityType.Error;
+                InfoBarViewModel.Severity = SeverityType.Critical;
             }
         }
 
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Controls/BreadcrumbItemViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Controls/BreadcrumbItemViewModel.cs
new file mode 100644
index 000000000..f59ed182b
--- /dev/null
+++ b/src/SecureFolderFS.Sdk/ViewModels/Controls/BreadcrumbItemViewModel.cs
@@ -0,0 +1,22 @@
+using System.ComponentModel;
+using System.Windows.Input;
+using CommunityToolkit.Mvvm.ComponentModel;
+using SecureFolderFS.Shared.ComponentModel;
+
+namespace SecureFolderFS.Sdk.ViewModels.Controls
+{
+    [Bindable(true)]
+    public sealed partial class BreadcrumbItemViewModel : ObservableObject, IViewable
+    {
+        [ObservableProperty] private string? _Title;
+        [ObservableProperty] private bool _IsLeading;
+        [ObservableProperty] private ICommand? _Command;
+
+        public BreadcrumbItemViewModel(string? title, ICommand? command)
+        {
+            Title = title;
+            Command = command;
+            IsLeading = true;
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Controls/InfoBarViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Controls/InfoBarViewModel.cs
index 12552b119..874a3bfd8 100644
--- a/src/SecureFolderFS.Sdk/ViewModels/Controls/InfoBarViewModel.cs
+++ b/src/SecureFolderFS.Sdk/ViewModels/Controls/InfoBarViewModel.cs
@@ -1,17 +1,18 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using SecureFolderFS.Sdk.Enums;
+using SecureFolderFS.Shared.ComponentModel;
 using System.ComponentModel;
 
 namespace SecureFolderFS.Sdk.ViewModels.Controls
 {
     // TODO: add docs
     [Bindable(true)]
-    public partial class InfoBarViewModel : ObservableObject
+    public partial class InfoBarViewModel : ObservableObject, IViewable
     {
         [ObservableProperty] private bool _IsOpen;
         [ObservableProperty] private string? _Title;
         [ObservableProperty] private string? _Message;
-        [ObservableProperty] private bool _CanBeClosed;
-        [ObservableProperty] private ViewSeverityType _Severity;
+        [ObservableProperty] private bool _IsCloseable;
+        [ObservableProperty] private SeverityType _Severity;
     }
 }
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Controls/LanguageViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Controls/LanguageViewModel.cs
index 65feee47c..a319f0190 100644
--- a/src/SecureFolderFS.Sdk/ViewModels/Controls/LanguageViewModel.cs
+++ b/src/SecureFolderFS.Sdk/ViewModels/Controls/LanguageViewModel.cs
@@ -1,4 +1,5 @@
 using CommunityToolkit.Mvvm.ComponentModel;
+using SecureFolderFS.Shared.ComponentModel;
 using System;
 using System.ComponentModel;
 using System.Diagnostics;
@@ -10,33 +11,31 @@ namespace SecureFolderFS.Sdk.ViewModels.Controls
     /// Represents a language view model.
     /// </summary>
     [Bindable(true)]
-    public sealed class LanguageViewModel : ObservableObject
+    public sealed partial class LanguageViewModel : ObservableObject, IViewable
     {
         /// <summary>
         /// Gets the <see cref="CultureInfo"/> of the language.
         /// </summary>
         public CultureInfo CultureInfo { get; }
 
-        /// <summary>
-        /// Gets the user-friendly name representation of the language.
-        /// </summary>
-        public string DisplayName { get; }
+        /// <inheritdoc cref="IViewable.Title"/>
+        [ObservableProperty] private string? _Title;
 
         public LanguageViewModel(CultureInfo cultureInfo)
             : this(cultureInfo, FormatName(cultureInfo))
         {
         }
 
-        public LanguageViewModel(CultureInfo cultureInfo, string displayName)
+        public LanguageViewModel(CultureInfo cultureInfo, string title)
         {
             CultureInfo = cultureInfo;
-            DisplayName = displayName;
+            Title = title;
         }
 
         /// <inheritdoc/>
         public override string ToString()
         {
-            return DisplayName;
+            return Title ?? CultureInfo.DisplayName;
         }
 
         private static string FormatName(CultureInfo cultureInfo)
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Controls/LoginViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Controls/LoginViewModel.cs
index 7ac3fa5da..f2f9206cd 100644
--- a/src/SecureFolderFS.Sdk/ViewModels/Controls/LoginViewModel.cs
+++ b/src/SecureFolderFS.Sdk/ViewModels/Controls/LoginViewModel.cs
@@ -1,26 +1,28 @@
-using CommunityToolkit.Mvvm.ComponentModel;
+using System;
+using System.ComponentModel;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows.Input;
+using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using SecureFolderFS.Sdk.AppModels;
 using SecureFolderFS.Sdk.Attributes;
 using SecureFolderFS.Sdk.Enums;
 using SecureFolderFS.Sdk.EventArguments;
+using SecureFolderFS.Sdk.Extensions;
 using SecureFolderFS.Sdk.Models;
 using SecureFolderFS.Sdk.Services;
 using SecureFolderFS.Sdk.ViewModels.Controls.Authentication;
+using SecureFolderFS.Sdk.ViewModels.Views.Overlays;
 using SecureFolderFS.Shared;
 using SecureFolderFS.Shared.ComponentModel;
 using SecureFolderFS.Shared.Extensions;
 using SecureFolderFS.Shared.Models;
-using System;
-using System.ComponentModel;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Windows.Input;
 
 namespace SecureFolderFS.Sdk.ViewModels.Controls
 {
-    [Inject<IVaultService>, Inject<IVaultManagerService>]
+    [Inject<IVaultService>, Inject<IVaultManagerService>, Inject<IVaultCredentialsService>, Inject<IOverlayService>]
     [Bindable(true)]
     public sealed partial class LoginViewModel : ObservableObject, IAsyncInitialize, IDisposable
     {
@@ -60,17 +62,21 @@ public async Task InitAsync(CancellationToken cancellationToken = default)
             //      2b. Offer to unlock (from 'provide keystore' view) using recovery key, if possible
             //
 
+            // Dispose previous state, if any
+            _keyChain.Dispose();
+            _loginSequence?.Dispose();
+
             var validationResult = await VaultService.VaultValidator.TryValidateAsync(_vaultModel.Folder, cancellationToken);
             if (validationResult.Successful)
             {
                 // Get the authentication method enumerator for this vault
-                _loginSequence = new(await VaultService.GetLoginAsync(_vaultModel.Folder, cancellationToken).ToArrayAsync(cancellationToken));
+                _loginSequence = new(await VaultCredentialsService.GetLoginAsync(_vaultModel.Folder, cancellationToken).ToArrayAsync(cancellationToken));
                 IsLoginSequence = _loginSequence.Count > 1;
 
                 // Set up the first authentication method
                 var result = ProceedAuthentication();
                 if (!result.Successful)
-                    CurrentViewModel = new ErrorViewModel(null, result.GetMessage());
+                    CurrentViewModel = new ErrorViewModel(result);
             }
             else
             {
@@ -81,11 +87,11 @@ public async Task InitAsync(CancellationToken cancellationToken = default)
                     CurrentViewModel = _loginViewMode switch
                     {
                         LoginViewType.Full => new MigrationViewModel(_vaultModel, currentVersion),
-                        _ => new ErrorViewModel("You'll need to migrate this vault before it can be used.", null)
+                        _ => new ErrorViewModel("You'll need to migrate this vault before it can be used.") // TODO: Localize
                     };
                 }
                 else
-                    CurrentViewModel = new ErrorViewModel(null, validationResult.GetMessage());
+                    CurrentViewModel = new ErrorViewModel(validationResult);
             }
 
             // TODO: VaultWatcherModel.InitAsync is never called
@@ -95,16 +101,29 @@ public async Task InitAsync(CancellationToken cancellationToken = default)
         private async Task RecoverAccessAsync(string? recoveryKey, CancellationToken cancellationToken)
         {
             if (recoveryKey is null)
-                return;
-
-            try
             {
-                var unlockContract = await VaultManagerService.RecoverAsync(_vaultModel.Folder, recoveryKey, cancellationToken);
-                VaultUnlocked?.Invoke(this, new(unlockContract, _vaultModel.Folder, true));
+                var recoveryOverlay = new RecoveryOverlayViewModel(_vaultModel.Folder);
+                var result = await OverlayService.ShowAsync(recoveryOverlay);
+                if (!result.Positive() || recoveryOverlay.UnlockContract is null)
+                {
+                    recoveryOverlay.Dispose();
+                    return;
+                }
+
+                VaultUnlocked?.Invoke(this, new(recoveryOverlay.UnlockContract, _vaultModel.Folder, true));
             }
-            catch (Exception ex)
+            else
             {
-                _ = ex;
+                try
+                {
+                    var unlockContract = await VaultManagerService.RecoverAsync(_vaultModel.Folder, recoveryKey, cancellationToken);
+                    VaultUnlocked?.Invoke(this, new(unlockContract, _vaultModel.Folder, true));
+                }
+                catch (Exception ex)
+                {
+                    // TODO: Report to user
+                    _ = ex;
+                }
             }
         }
 
@@ -120,7 +139,7 @@ private void RestartLoginProcess()
                 _loginSequence?.Reset();
                 var result = ProceedAuthentication();
                 if (!result.Successful)
-                    CurrentViewModel = new ErrorViewModel(null, result.GetMessage());
+                    CurrentViewModel = new ErrorViewModel(result);
             }
         }
 
@@ -167,7 +186,7 @@ private async void VaultWatcherModel_StateChanged(object? sender, EventArgs e)
                 if (result.Successful)
                     return;
 
-                CurrentViewModel = new ErrorViewModel(null, result.GetMessage());
+                CurrentViewModel = new ErrorViewModel(result);
             }
         }
 
@@ -181,9 +200,6 @@ private async void CurrentViewModel_StateChanged(object? sender, EventArgs e)
             }
             else if (e is MigrationCompletedEventArgs)
             {
-                _keyChain.Dispose();
-                _loginSequence?.Dispose();
-
                 await InitAsync();
             }
         }
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Controls/Previewers/BasePreviewerViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Controls/Previewers/BasePreviewerViewModel.cs
new file mode 100644
index 000000000..463979d35
--- /dev/null
+++ b/src/SecureFolderFS.Sdk/ViewModels/Controls/Previewers/BasePreviewerViewModel.cs
@@ -0,0 +1,24 @@
+using System.ComponentModel;
+using System.Threading;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.ComponentModel;
+using SecureFolderFS.Shared.ComponentModel;
+
+namespace SecureFolderFS.Sdk.ViewModels.Controls.Previewers
+{
+    [Bindable(true)]
+    public abstract partial class BasePreviewerViewModel<TSource> : ObservableObject, IAsyncInitialize, IViewable
+        where TSource : class
+    {
+        /// <summary>
+        /// Gets the data source of the previewer.
+        /// </summary>
+        [ObservableProperty] private TSource? _Source;
+        
+        /// <inheritdoc cref="IViewable.Title"/>
+        [ObservableProperty] private string? _Title;
+        
+        /// <inheritdoc/>
+        public abstract Task InitAsync(CancellationToken cancellationToken = default);
+    }
+}
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Controls/Previewers/ImagePreviewerViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Controls/Previewers/ImagePreviewerViewModel.cs
new file mode 100644
index 000000000..0b1ec628a
--- /dev/null
+++ b/src/SecureFolderFS.Sdk/ViewModels/Controls/Previewers/ImagePreviewerViewModel.cs
@@ -0,0 +1,45 @@
+using System;
+using System.ComponentModel;
+using System.Threading;
+using System.Threading.Tasks;
+using OwlCore.Storage;
+using SecureFolderFS.Sdk.Attributes;
+using SecureFolderFS.Sdk.Services;
+using SecureFolderFS.Shared;
+using SecureFolderFS.Shared.ComponentModel;
+
+namespace SecureFolderFS.Sdk.ViewModels.Controls.Previewers
+{
+    [Inject<IMediaService>]
+    [Bindable(true)]
+    public sealed partial class ImagePreviewerViewModel : BasePreviewerViewModel<IImage>, IDisposable
+    {
+        private readonly IFile? _file;
+        
+        public ImagePreviewerViewModel(IFile file)
+        {
+            ServiceProvider = DI.Default;
+            _file = file;
+            // We do not want to set the Title property for an image
+        }
+
+        public ImagePreviewerViewModel(IImage image)
+        {
+            ServiceProvider = DI.Default;
+            Source = image;
+        }
+
+        /// <inheritdoc/>
+        public override async Task InitAsync(CancellationToken cancellationToken = default)
+        {
+            if (_file is not null)
+                Source = await MediaService.ReadImageFileAsync(_file, cancellationToken);
+        }
+
+        /// <inheritdoc/>
+        public void Dispose()
+        {
+            Source?.Dispose();
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Controls/Previewers/TextPreviewerViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Controls/Previewers/TextPreviewerViewModel.cs
new file mode 100644
index 000000000..1d26637b4
--- /dev/null
+++ b/src/SecureFolderFS.Sdk/ViewModels/Controls/Previewers/TextPreviewerViewModel.cs
@@ -0,0 +1,33 @@
+using System.ComponentModel;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using OwlCore.Storage;
+using SecureFolderFS.Storage.Extensions;
+
+namespace SecureFolderFS.Sdk.ViewModels.Controls.Previewers
+{
+    [Bindable(true)]
+    public sealed class TextPreviewerViewModel : BasePreviewerViewModel<string>
+    {
+        private readonly IFile? _file;
+
+        public TextPreviewerViewModel(IFile file)
+        {
+            _file = file;
+            Title = file.Name;
+        }
+
+        public TextPreviewerViewModel(string text)
+        {
+            Source = text;
+        }
+
+        /// <inheritdoc/>
+        public override async Task InitAsync(CancellationToken cancellationToken = default)
+        {
+            if (_file is not null)
+                Source = await _file.ReadAllTextAsync(Encoding.UTF8, cancellationToken);
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Controls/Previewers/VideoPreviewerViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Controls/Previewers/VideoPreviewerViewModel.cs
new file mode 100644
index 000000000..7162df733
--- /dev/null
+++ b/src/SecureFolderFS.Sdk/ViewModels/Controls/Previewers/VideoPreviewerViewModel.cs
@@ -0,0 +1,41 @@
+using System;
+using System.ComponentModel;
+using System.Threading;
+using System.Threading.Tasks;
+using OwlCore.Storage;
+using SecureFolderFS.Sdk.Attributes;
+using SecureFolderFS.Sdk.Services;
+using SecureFolderFS.Shared;
+using SecureFolderFS.Shared.ComponentModel;
+
+namespace SecureFolderFS.Sdk.ViewModels.Controls.Previewers
+{
+    [Inject<IMediaService>]
+    [Bindable(true)]
+    public sealed partial class VideoPreviewerViewModel : BasePreviewerViewModel<IDisposable>, IDisposable
+    {
+        private readonly IFile _file;
+        
+        public VideoPreviewerViewModel(IFile file)
+        {
+            _file = file;
+            ServiceProvider = DI.Default;
+        }
+        
+        /// <inheritdoc/>
+        public override async Task InitAsync(CancellationToken cancellationToken = default)
+        {
+            var streamedVideo = await MediaService.StreamVideoAsync(_file, cancellationToken);
+            if (streamedVideo is IAsyncInitialize asyncInitialize)
+                await asyncInitialize.InitAsync(cancellationToken);
+            
+            Source = streamedVideo;
+        }
+        
+        /// <inheritdoc/>
+        public void Dispose()
+        {
+            Source?.Dispose();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Controls/RecoveryPreviewControlViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Controls/RecoveryPreviewControlViewModel.cs
index 4cdedfa2f..12c40503e 100644
--- a/src/SecureFolderFS.Sdk/ViewModels/Controls/RecoveryPreviewControlViewModel.cs
+++ b/src/SecureFolderFS.Sdk/ViewModels/Controls/RecoveryPreviewControlViewModel.cs
@@ -24,10 +24,10 @@ public RecoveryPreviewControlViewModel()
         }
 
         [RelayCommand]
-        private async Task ExportAsync(string? exportHint, CancellationToken cancellationToken)
+        private async Task ExportAsync(string? exportOption, CancellationToken cancellationToken)
         {
             _ = VaultName ?? throw new ArgumentNullException(nameof(VaultName));
-            switch (exportHint?.ToLowerInvariant())
+            switch (exportOption?.ToLowerInvariant())
             {
                 case "print":
                 {
@@ -40,7 +40,8 @@ private async Task ExportAsync(string? exportHint, CancellationToken cancellatio
 
                 case "copy":
                 {
-                    await ClipboardService.SetTextAsync(RecoveryKey ?? string.Empty, cancellationToken);
+                    if (await ClipboardService.IsSupportedAsync())
+                        await ClipboardService.SetTextAsync(RecoveryKey ?? string.Empty, cancellationToken);
                     break;
                 }
 
@@ -49,8 +50,6 @@ private async Task ExportAsync(string? exportHint, CancellationToken cancellatio
                     // TODO: Share
                     break;
                 }
-
-                default: break;
             }
         }
     }
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Controls/Transfer/TransferViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Controls/Transfer/TransferViewModel.cs
new file mode 100644
index 000000000..4fafb900b
--- /dev/null
+++ b/src/SecureFolderFS.Sdk/ViewModels/Controls/Transfer/TransferViewModel.cs
@@ -0,0 +1,104 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using SecureFolderFS.Sdk.AppModels;
+using SecureFolderFS.Sdk.Enums;
+using SecureFolderFS.Sdk.ViewModels.Views.Browser;
+using SecureFolderFS.Shared.ComponentModel;
+using System;
+using System.ComponentModel;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace SecureFolderFS.Sdk.ViewModels.Controls.Transfer
+{
+    [Bindable(true)]
+    public sealed partial class TransferViewModel : ObservableObject, IViewable, IProgress<TotalProgress>
+    {
+        private readonly BrowserViewModel _browserViewModel;
+        private TaskCompletionSource<FolderViewModel?>? _tcs;
+        private CancellationTokenSource? _cts;
+        
+        [ObservableProperty] private string? _Title;
+        [ObservableProperty] private bool _IsVisible;
+        [ObservableProperty] private bool _IsProgressing;
+        [ObservableProperty] private TransferType _TransferType;
+
+        public TransferViewModel(BrowserViewModel browserViewModel)
+        {
+            _browserViewModel = browserViewModel;
+        }
+
+        /// <inheritdoc/>
+        public void Report(TotalProgress value)
+        {
+            if (value.Achieved >= value.Total)
+            {
+                Title = "Done";
+                return;
+            }
+            
+            Title = $"{TransferType switch
+            {
+                TransferType.Copy => "Copying",
+                TransferType.Move => "Moving",
+                _ => string.Empty,
+            }} {GetItemsCount(value)} item(s)";
+
+            static string GetItemsCount(TotalProgress totalProgress)
+            {
+                return totalProgress switch
+                {
+                    { Achieved: < 0 } => totalProgress.Total.ToString(),
+                    { Total: < 0 } => totalProgress.Achieved.ToString(),
+                    _ => $"{totalProgress.Achieved}/{totalProgress.Total}"
+                };
+            }
+        }
+
+        public async Task<FolderViewModel?> SelectFolderAsync(TransferType transferType, CancellationTokenSource? cts)
+        {
+            try
+            {
+                _tcs?.TrySetCanceled();
+                _tcs = new();
+                _cts = cts;
+                TransferType = transferType;
+                Title = "Choose destination folder";
+                IsVisible = true;
+                return await _tcs.Task;
+            }
+            finally
+            {
+                _tcs = null;
+                _cts = null;
+            }
+        }
+
+        [RelayCommand]
+        private void Confirm()
+        {
+            // Only used for confirming the destination folder
+            _tcs?.TrySetResult(_browserViewModel.CurrentFolder);
+        }
+
+        [RelayCommand]
+        private async Task CancelAsync()
+        {
+            if (_tcs is not null)
+            {
+                _tcs?.TrySetCanceled();
+                IsVisible = false;
+                return;
+            }
+
+            // Cancel here using the provided CancellationTokenSource
+            if (_cts is not null)
+            {
+                Title = "Cancelling";
+                await _cts.CancelAsync();
+
+                IsVisible = false;
+            }
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Controls/VaultControlsViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Controls/VaultControlsViewModel.cs
index 12470c412..13aee4f38 100644
--- a/src/SecureFolderFS.Sdk/ViewModels/Controls/VaultControlsViewModel.cs
+++ b/src/SecureFolderFS.Sdk/ViewModels/Controls/VaultControlsViewModel.cs
@@ -1,43 +1,70 @@
-using CommunityToolkit.Mvvm.ComponentModel;
+using System;
+using System.ComponentModel;
+using System.Threading;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
 using SecureFolderFS.Sdk.Attributes;
 using SecureFolderFS.Sdk.Extensions;
 using SecureFolderFS.Sdk.Messages;
 using SecureFolderFS.Sdk.Services;
+using SecureFolderFS.Sdk.ViewModels.Views.Browser;
 using SecureFolderFS.Sdk.ViewModels.Views.Vault;
 using SecureFolderFS.Shared;
 using SecureFolderFS.Shared.ComponentModel;
-using System.ComponentModel;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace SecureFolderFS.Sdk.ViewModels.Controls
 {
     [Inject<IFileExplorerService>]
     [Bindable(true)]
-    public sealed partial class VaultControlsViewModel : ObservableObject
+    public sealed partial class VaultControlsViewModel : ObservableObject, IRecipient<VaultLockRequestedMessage>, IDisposable
     {
         private readonly INavigator _dashboardNavigator;
         private readonly INavigationService _vaultNavigation;
         private readonly UnlockedVaultViewModel _unlockedVaultViewModel;
+        private readonly BrowserViewModel? _browserViewModel;
         private VaultPropertiesViewModel? _propertiesViewModel;
 
-        public VaultControlsViewModel(INavigationService vaultNavigation, INavigator dashboardNavigator, UnlockedVaultViewModel unlockedVaultViewModel, VaultPropertiesViewModel? propertiesViewModel = null)
+        public VaultControlsViewModel(
+            INavigationService vaultNavigation,
+            INavigator dashboardNavigator,
+            UnlockedVaultViewModel unlockedVaultViewModel,
+            BrowserViewModel? browserViewModel = null,
+            VaultPropertiesViewModel? propertiesViewModel = null)
         {
+            ServiceProvider = DI.Default;
             _vaultNavigation = vaultNavigation;
             _dashboardNavigator = dashboardNavigator;
             _unlockedVaultViewModel = unlockedVaultViewModel;
+            _browserViewModel = browserViewModel;
             _propertiesViewModel = propertiesViewModel;
-            ServiceProvider = DI.Default;
+
+            WeakReferenceMessenger.Default.Register(this);
         }
 
-        [RelayCommand(AllowConcurrentExecutions = true)]
+        /// <inheritdoc/>
+        public async void Receive(VaultLockRequestedMessage message)
+        {
+            if (!message.VaultModel.Equals(_unlockedVaultViewModel.VaultViewModel.VaultModel))
+                return;
+
+            await LockVaultAsync();
+        }
+
+        [RelayCommand]
         private async Task RevealFolderAsync(CancellationToken cancellationToken)
         {
             await FileExplorerService.TryOpenInFileExplorerAsync(_unlockedVaultViewModel.StorageRoot.Inner, cancellationToken);
         }
 
+        [RelayCommand]
+        private async Task BrowseAsync(CancellationToken cancellationToken)
+        {
+            if (_browserViewModel is not null)
+                await _dashboardNavigator.NavigateAsync(_browserViewModel);
+        }
+
         [RelayCommand]
         private async Task LockVaultAsync()
         {
@@ -45,12 +72,12 @@ private async Task LockVaultAsync()
             await _unlockedVaultViewModel.DisposeAsync();
 
             // Prepare login page
-            var loginPageViewModel = new VaultLoginViewModel(_unlockedVaultViewModel.VaultModel, _vaultNavigation);
+            var loginPageViewModel = new VaultLoginViewModel(_unlockedVaultViewModel.VaultViewModel, _vaultNavigation);
             _ = loginPageViewModel.InitAsync();
 
             // Navigate away
             await _vaultNavigation.TryNavigateAndForgetAsync(loginPageViewModel);
-            WeakReferenceMessenger.Default.Send(new VaultLockedMessage(_unlockedVaultViewModel.VaultModel));
+            WeakReferenceMessenger.Default.Send(new VaultLockedMessage(_unlockedVaultViewModel.VaultViewModel.VaultModel));
         }
 
         [RelayCommand]
@@ -64,5 +91,11 @@ private async Task OpenPropertiesAsync(CancellationToken cancellationToken)
 
             await _dashboardNavigator.NavigateAsync(_propertiesViewModel);
         }
+
+        /// <inheritdoc/>
+        public void Dispose()
+        {
+            WeakReferenceMessenger.Default.UnregisterAll(this);
+        }
     }
 }
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Controls/VaultList/VaultListItemViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Controls/VaultList/VaultListItemViewModel.cs
index ece7963bd..8323cbae7 100644
--- a/src/SecureFolderFS.Sdk/ViewModels/Controls/VaultList/VaultListItemViewModel.cs
+++ b/src/SecureFolderFS.Sdk/ViewModels/Controls/VaultList/VaultListItemViewModel.cs
@@ -11,62 +11,159 @@
 using System.ComponentModel;
 using System.Threading;
 using System.Threading.Tasks;
+using OwlCore.Storage;
+using SecureFolderFS.Sdk.Extensions;
+using SecureFolderFS.Shared.ComponentModel;
+using SecureFolderFS.Shared.Helpers;
+using SecureFolderFS.Storage.Extensions;
+using SecureFolderFS.Sdk.ViewModels.Views.Overlays;
 
 namespace SecureFolderFS.Sdk.ViewModels.Controls.VaultList
 {
-    [Inject<IFileExplorerService>]
+    [Inject<IFileExplorerService>, Inject<IOverlayService>, Inject<IMediaService>]
     [Bindable(true)]
-    public sealed partial class VaultListItemViewModel : ObservableObject, IRecipient<VaultUnlockedMessage>, IRecipient<VaultLockedMessage>
+    public sealed partial class VaultListItemViewModel : ObservableObject, IAsyncInitialize, IRecipient<VaultUnlockedMessage>, IRecipient<VaultLockedMessage>
     {
         private readonly IVaultCollectionModel _vaultCollectionModel;
 
-        [ObservableProperty] private bool _CanRemoveVault = true;
-        [ObservableProperty] private DateTime? _LastAccessDate;
+        [ObservableProperty] private bool _IsRenaming;
+        [ObservableProperty] private bool _CanMove;
+        [ObservableProperty] private bool _CanMoveUp;
+        [ObservableProperty] private bool _CanMoveDown;
+        [ObservableProperty] private bool _CanRemoveVault;
+        [ObservableProperty] private IImage? _CustomIcon;
+        [ObservableProperty] private VaultViewModel _VaultViewModel;
 
-        public IVaultModel VaultModel { get; }
-
-        public VaultListItemViewModel(IVaultModel vaultModel, IVaultCollectionModel vaultCollectionModel)
+        public VaultListItemViewModel(VaultViewModel vaultViewModel, IVaultCollectionModel vaultCollectionModel)
         {
-            _vaultCollectionModel = vaultCollectionModel;
-            LastAccessDate = vaultModel.LastAccessDate;
-            VaultModel = vaultModel;
             ServiceProvider = DI.Default;
+            CanRemoveVault = true;
+            VaultViewModel = vaultViewModel;
+            _vaultCollectionModel = vaultCollectionModel;
 
+            UpdateCanMove();
             WeakReferenceMessenger.Default.Register<VaultUnlockedMessage>(this);
             WeakReferenceMessenger.Default.Register<VaultLockedMessage>(this);
         }
 
+        /// <inheritdoc/>
+        public async Task InitAsync(CancellationToken cancellationToken = default)
+        {
+            await UpdateIconAsync(cancellationToken);
+        }
+
         /// <inheritdoc/>
         public void Receive(VaultUnlockedMessage message)
         {
-            if (VaultModel.Equals(message.VaultModel))
+            if (VaultViewModel.VaultModel.Equals(message.VaultModel))
             {
                 // Prevent from removing vault if it is unlocked
                 CanRemoveVault = false;
-
-                // Update last accessed date
-                LastAccessDate = VaultModel.LastAccessDate;
             }
         }
 
         /// <inheritdoc/>
         public void Receive(VaultLockedMessage message)
         {
-            if (VaultModel.Equals(message.VaultModel))
+            if (VaultViewModel.VaultModel.Equals(message.VaultModel))
                 CanRemoveVault = true;
         }
 
         [RelayCommand]
-        private Task RemoveVaultAsync(CancellationToken cancellationToken)
+        private async Task MoveItemAsync(string? direction, CancellationToken cancellationToken)
+        {
+            var oldIndex = _vaultCollectionModel.IndexOf(VaultViewModel.VaultModel);
+            var newIndex = direction?.ToLower() switch
+            {
+                "up" => Math.Max(oldIndex - 1, 0),
+                "down" => Math.Min(oldIndex + 1, _vaultCollectionModel.Count - 1),
+                _ => throw new ArgumentOutOfRangeException(nameof(direction))
+            };
+
+            _vaultCollectionModel.Move(oldIndex, newIndex);
+            UpdateCanMove();
+
+            // Save after move
+            await _vaultCollectionModel.SaveAsync(cancellationToken);
+        }
+
+        [RelayCommand]
+        private async Task CustomizeAsync(string? option, CancellationToken cancellationToken)
+        {
+            switch (option?.ToLower())
+            {
+                case "icon":
+                {
+                    if (VaultViewModel.VaultModel.Folder is not IModifiableFolder modifiableFolder)
+                        return;
+
+                    var sourceIconFile = await FileExplorerService.PickFileAsync(null, false, cancellationToken);
+                    if (sourceIconFile is null)
+                        return;
+
+                    // TODO: Resize icon (don't load large icons)
+                    // TODO: Add .ico file with desktop.ini
+                    var destinationIconFile = await modifiableFolder.CreateFileAsync(Constants.Vault.VAULT_ICON_FILENAME, true, cancellationToken);
+                    await sourceIconFile.CopyContentsToAsync(destinationIconFile, cancellationToken);
+                    await UpdateIconAsync(cancellationToken);
+
+                    break;
+                }
+
+                case "name": // TODO: Use this on mobile platforms where having an overlay is desirable
+                {
+                    var overlayViewModel = new RenameOverlayViewModel("Rename".ToLocalized());
+                    var result = await OverlayService.ShowAsync(overlayViewModel);
+                    if (!result.Positive())
+                        return;
+
+                    IsRenaming = true;
+                    await RenameAsync(overlayViewModel.NewName, cancellationToken);
+                    break;
+                }
+            }
+        }
+
+        [RelayCommand]
+        private async Task RenameAsync(string? newName, CancellationToken cancellationToken)
         {
-            _vaultCollectionModel.Remove(VaultModel);
-            return _vaultCollectionModel.TrySaveAsync(cancellationToken);
+            if (string.IsNullOrWhiteSpace(newName))
+                newName = VaultViewModel.VaultModel.Folder.Name;
+
+            IsRenaming = false;
+            if (await VaultViewModel.VaultModel.SetVaultNameAsync(newName, cancellationToken))
+                VaultViewModel.VaultName = newName;
         }
 
         [RelayCommand]
-        private Task RevealFolderAsync(CancellationToken cancellationToken)
+        private async Task RemoveVaultAsync(CancellationToken cancellationToken)
+        {
+            CustomIcon?.Dispose();
+            _vaultCollectionModel.Remove(VaultViewModel.VaultModel);
+            await _vaultCollectionModel.TrySaveAsync(cancellationToken);
+        }
+
+        [RelayCommand]
+        private async Task RevealFolderAsync(CancellationToken cancellationToken)
+        {
+            await FileExplorerService.TryOpenInFileExplorerAsync(VaultViewModel.VaultModel.Folder, cancellationToken);
+        }
+
+        private async Task UpdateIconAsync(CancellationToken cancellationToken)
+        {
+            var imageFile = await SafetyHelpers.NoThrowAsync(async () => await VaultViewModel.VaultModel.Folder.GetFileByNameAsync(Constants.Vault.VAULT_ICON_FILENAME, cancellationToken));
+            if (imageFile is null)
+                return;
+
+            CustomIcon = await MediaService.ReadImageFileAsync(imageFile, cancellationToken);
+        }
+
+        private void UpdateCanMove()
         {
-            return FileExplorerService.TryOpenInFileExplorerAsync(VaultModel.Folder, cancellationToken);
+            var itemIndex = _vaultCollectionModel.IndexOf(VaultViewModel.VaultModel);
+            CanMoveDown = itemIndex < _vaultCollectionModel.Count - 1;
+            CanMoveUp = itemIndex > 0;
+            CanMove = CanMoveUp && CanMoveDown;
         }
     }
 }
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Controls/VaultList/VaultListSearchViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Controls/VaultList/VaultListSearchViewModel.cs
index 9f12cf840..266140b7d 100644
--- a/src/SecureFolderFS.Sdk/ViewModels/Controls/VaultList/VaultListSearchViewModel.cs
+++ b/src/SecureFolderFS.Sdk/ViewModels/Controls/VaultList/VaultListSearchViewModel.cs
@@ -4,11 +4,13 @@
 using SecureFolderFS.Sdk.Models;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.ComponentModel;
 using System.Threading;
 using System.Threading.Tasks;
 
 namespace SecureFolderFS.Sdk.ViewModels.Controls.VaultList
 {
+    [Bindable(true)]
     public sealed partial class VaultListSearchViewModel(IEnumerable<VaultListItemViewModel> sidebarItems) : ObservableObject
     {
         private ISearchModel SearchModel { get; } = new SidebarSearchModel(sidebarItems);
@@ -22,7 +24,7 @@ public async Task SubmitQueryAsync(string query, CancellationToken cancellationT
             await foreach (var item in SearchModel.SearchAsync(query, cancellationToken))
             {
                 if (item is VaultListItemViewModel sidebarItem)
-                    SearchItems.Add(sidebarItem.VaultModel.VaultName);
+                    SearchItems.Add(sidebarItem.VaultViewModel.VaultName);
             }
         }
     }
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Controls/VaultList/VaultListViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Controls/VaultList/VaultListViewModel.cs
index 982b977e0..28ce70e1d 100644
--- a/src/SecureFolderFS.Sdk/ViewModels/Controls/VaultList/VaultListViewModel.cs
+++ b/src/SecureFolderFS.Sdk/ViewModels/Controls/VaultList/VaultListViewModel.cs
@@ -55,6 +55,10 @@ private void VaultCollectionModel_CollectionChanged(object? sender, NotifyCollec
                     RemoveVault(vaultModel);
                     break;
 
+                case NotifyCollectionChangedAction.Move:
+                    Items.Move(e.OldStartingIndex, e.NewStartingIndex);
+                    break;
+
                 case NotifyCollectionChangedAction.Reset:
                     SelectedItem = null;
                     Items.Clear();
@@ -73,7 +77,7 @@ public Task InitAsync(CancellationToken cancellationToken = default)
                 AddVault(item);
 
             if (SettingsService.UserSettings.ContinueOnLastVault)
-                SelectedItem = Items.FirstOrDefault(x => x.VaultModel.Folder.Id.Equals(SettingsService.AppSettings.LastVaultFolderId));
+                SelectedItem = Items.FirstOrDefault(x => x.VaultViewModel.VaultModel.Folder.Id.Equals(SettingsService.AppSettings.LastVaultFolderId));
 
             SelectedItem ??= Items.FirstOrDefault();
             HasVaults = !Items.IsEmpty();
@@ -95,6 +99,11 @@ private async Task AddNewVaultAsync(IFolder? folder, CancellationToken cancellat
 
             if (folder is not null)
             {
+                // Check for duplicates
+                var isDuplicate = _vaultCollectionModel.Any(x => x.Folder.Id == folder.Id);
+                if (isDuplicate)
+                    return;
+
                 // Validate vault. We assume the user is adding an existing vault
                 var result = await ValidationHelpers.ValidateExistingVault(folder, cancellationToken);
                 if (!result.Successful)
@@ -113,14 +122,16 @@ private async Task AddNewVaultAsync(IFolder? folder, CancellationToken cancellat
 
         private void AddVault(IVaultModel vaultModel)
         {
-            var listItem = new VaultListItemViewModel(vaultModel, _vaultCollectionModel);
+            var listItem = new VaultListItemViewModel(new(vaultModel), _vaultCollectionModel);
+            _ = listItem.InitAsync();
+
             Items.Add(listItem);
             HasVaults = true;
         }
 
         private void RemoveVault(IVaultModel vaultModel)
         {
-            var itemToRemove = Items.FirstOrDefault(x => x.VaultModel == vaultModel);
+            var itemToRemove = Items.FirstOrDefault(x => x.VaultViewModel.VaultModel == vaultModel);
             if (itemToRemove is null)
                 return;
 
@@ -140,7 +151,7 @@ private void RemoveVault(IVaultModel vaultModel)
         partial void OnSelectedItemChanged(VaultListItemViewModel? value)
         {
             if (SettingsService.UserSettings.ContinueOnLastVault)
-                SettingsService.AppSettings.LastVaultFolderId = value?.VaultModel.Folder.Id;
+                SettingsService.AppSettings.LastVaultFolderId = value?.VaultViewModel.VaultModel.Folder.Id;
         }
     }
 }
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Controls/Widgets/Categories/AggregatedDataWidgetViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Controls/Widgets/Categories/AggregatedDataWidgetViewModel.cs
deleted file mode 100644
index 4f2fc7cda..000000000
--- a/src/SecureFolderFS.Sdk/ViewModels/Controls/Widgets/Categories/AggregatedDataWidgetViewModel.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Threading;
-using System.Threading.Tasks;
-using ByteSizeLib;
-using CommunityToolkit.Mvvm.ComponentModel;
-using SecureFolderFS.Sdk.Models;
-using SecureFolderFS.Storage.VirtualFileSystem;
-
-namespace SecureFolderFS.Sdk.ViewModels.Controls.Widgets.Categories
-{
-    [Bindable(true)]
-    public sealed partial class AggregatedDataWidgetViewModel : BaseWidgetViewModel
-    {
-        private readonly IReadWriteStatistics _readWriteStatistics;
-        private readonly PeriodicTimer _periodicTimer;
-        private ByteSize _bytesRead;
-        private ByteSize _bytesWritten;
-
-        [ObservableProperty] private string? _TotalRead;
-        [ObservableProperty] private string? _TotalWrite;
-        
-        public AggregatedDataWidgetViewModel(IReadWriteStatistics readWriteStatistics, IWidgetModel widgetModel)
-            : base(widgetModel)
-        {
-            _readWriteStatistics = readWriteStatistics;
-            _periodicTimer = new(TimeSpan.FromMilliseconds(Constants.Graphs.GRAPH_UPDATE_INTERVAL_MS));
-        }
-
-        /// <inheritdoc/>
-        public override Task InitAsync(CancellationToken cancellationToken = default)
-        {
-            _bytesRead = new();
-            _bytesWritten = new();
-            _readWriteStatistics.BytesRead = new Progress<long>(x => _bytesRead.AddBytes(x));
-            _readWriteStatistics.BytesWritten = new Progress<long>(x => _bytesWritten.AddBytes(x));
-            
-            // We don't want to await it, since it's an async based timer
-            _ = InitializeBlockingTimer(cancellationToken);
-            
-            return Task.CompletedTask;
-        }
-
-        private async Task InitializeBlockingTimer(CancellationToken cancellationToken)
-        {
-            while (await _periodicTimer.WaitForNextTickAsync(cancellationToken))
-            {
-                TotalRead = _bytesRead.ToString();
-                TotalWrite = _bytesWritten.ToString();
-            }
-        }
-        
-        /// <inheritdoc/>
-        public override void Dispose()
-        {
-            _readWriteStatistics.BytesRead = null;
-            _readWriteStatistics.BytesWritten = null;
-            _periodicTimer.Dispose();
-        }
-    }
-}
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Controls/Widgets/Categories/HealthWidgetViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Controls/Widgets/Categories/HealthWidgetViewModel.cs
deleted file mode 100644
index eeb408f35..000000000
--- a/src/SecureFolderFS.Sdk/ViewModels/Controls/Widgets/Categories/HealthWidgetViewModel.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Input;
-using SecureFolderFS.Sdk.Enums;
-using SecureFolderFS.Sdk.Extensions;
-using SecureFolderFS.Sdk.Models;
-using System.ComponentModel;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace SecureFolderFS.Sdk.ViewModels.Controls.Widgets.Categories
-{
-    [Bindable(true)]
-    public sealed partial class HealthWidgetViewModel : BaseWidgetViewModel
-    {
-        [ObservableProperty] private string _LastCheckedText;
-        [ObservableProperty] private VaultHealthState _VaultHealthState;
-
-        public HealthWidgetViewModel(IWidgetModel widgetModel)
-            : base(widgetModel)
-        {
-            LastCheckedText = string.Format("LastChecked".ToLocalized(), "Unspecified");
-        }
-
-        [RelayCommand]
-        private Task StartScanningAsync()
-        {
-            return Task.CompletedTask;
-        }
-
-        [RelayCommand]
-        private void OpenVaultHealth()
-        {
-        }
-
-        /// <inheritdoc/>
-        public override Task InitAsync(CancellationToken cancellationToken = default)
-        {
-            return Task.CompletedTask;
-        }
-    }
-}
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Controls/Widgets/Data/AggregatedDataWidgetViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Controls/Widgets/Data/AggregatedDataWidgetViewModel.cs
new file mode 100644
index 000000000..2e12f7cda
--- /dev/null
+++ b/src/SecureFolderFS.Sdk/ViewModels/Controls/Widgets/Data/AggregatedDataWidgetViewModel.cs
@@ -0,0 +1,85 @@
+using ByteSizeLib;
+using CommunityToolkit.Mvvm.ComponentModel;
+using SecureFolderFS.Sdk.Models;
+using SecureFolderFS.Storage.VirtualFileSystem;
+using System;
+using System.ComponentModel;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace SecureFolderFS.Sdk.ViewModels.Controls.Widgets.Data
+{
+    [Bindable(true)]
+    public sealed partial class AggregatedDataWidgetViewModel : BaseWidgetViewModel
+    {
+        private readonly IFileSystemStatistics _fileSystemStatistics;
+        private readonly PeriodicTimer _periodicTimer;
+        private ulong _pendingBytesRead;
+        private ulong _pendingBytesWritten;
+        private ByteSize _bytesRead;
+        private ByteSize _bytesWritten;
+
+        [ObservableProperty] private string? _TotalRead;
+        [ObservableProperty] private string? _TotalWrite;
+        
+        public AggregatedDataWidgetViewModel(UnlockedVaultViewModel unlockedVaultViewModel, IWidgetModel widgetModel)
+            : base(widgetModel)
+        {
+            _fileSystemStatistics = unlockedVaultViewModel.StorageRoot.Options.FileSystemStatistics;
+            _periodicTimer = new(TimeSpan.FromMilliseconds(Constants.Widgets.Graphs.GRAPH_UPDATE_INTERVAL_MS));
+        }
+
+        /// <inheritdoc/>
+        public override Task InitAsync(CancellationToken cancellationToken = default)
+        {
+            _bytesRead = new();
+            _bytesWritten = new();
+            TotalRead = "0B";
+            TotalWrite = "0B";
+            
+            _fileSystemStatistics.BytesRead = new Progress<long>(x =>
+            {
+                if (x > 0)
+                    _pendingBytesRead += (ulong)x;
+            });
+            _fileSystemStatistics.BytesWritten = new Progress<long>(x =>
+            {
+                if (x > 0)
+                    _pendingBytesWritten += (ulong)x;
+            });
+            
+            // We don't want to await it, since it's an async based timer
+            _ = InitializeBlockingTimer(cancellationToken);
+            
+            return Task.CompletedTask;
+        }
+
+        private async Task InitializeBlockingTimer(CancellationToken cancellationToken)
+        {
+            while (await _periodicTimer.WaitForNextTickAsync(cancellationToken))
+            {
+                if (_pendingBytesRead > 0UL)
+                {
+                    _bytesRead = _bytesRead.AddBytes(_pendingBytesRead);
+                    TotalRead = _bytesRead.ToString().Replace(" ", string.Empty);
+                    _pendingBytesRead = 0UL;
+                }
+                
+                if (_pendingBytesWritten > 0UL)
+                {
+                    _bytesWritten = _bytesWritten.AddBytes(_pendingBytesWritten);
+                    TotalWrite = _bytesWritten.ToString().Replace(" ", string.Empty);
+                    _pendingBytesWritten = 0UL;
+                }
+            }
+        }
+        
+        /// <inheritdoc/>
+        public override void Dispose()
+        {
+            _fileSystemStatistics.BytesRead = null;
+            _fileSystemStatistics.BytesWritten = null;
+            _periodicTimer.Dispose();
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Controls/Widgets/Categories/GraphControlViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Controls/Widgets/Data/GraphControlViewModel.cs
similarity index 76%
rename from src/SecureFolderFS.Sdk/ViewModels/Controls/Widgets/Categories/GraphControlViewModel.cs
rename to src/SecureFolderFS.Sdk/ViewModels/Controls/Widgets/Data/GraphControlViewModel.cs
index 333c9f364..96ba2a774 100644
--- a/src/SecureFolderFS.Sdk/ViewModels/Controls/Widgets/Categories/GraphControlViewModel.cs
+++ b/src/SecureFolderFS.Sdk/ViewModels/Controls/Widgets/Data/GraphControlViewModel.cs
@@ -6,13 +6,13 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace SecureFolderFS.Sdk.ViewModels.Controls.Widgets.Categories
+namespace SecureFolderFS.Sdk.ViewModels.Controls.Widgets.Data
 {
     [Bindable(true)]
     public sealed partial class GraphControlViewModel : ObservableObject, IProgress<double>, IAsyncInitialize
     {
         [ObservableProperty] private bool _IsExtended;
-        [ObservableProperty] private string? _GraphSubheader = "0mb/s";
+        [ObservableProperty] private string? _GraphSubHeader = "0MB/s";
         [ObservableProperty] private ObservableCollection<double> _Data;
 
         public GraphControlViewModel()
@@ -23,13 +23,13 @@ public GraphControlViewModel()
         /// <inheritdoc/>
         public void Report(double value)
         {
-            GraphSubheader = $"{value.ToString("0.#")}mb/s";
+            GraphSubHeader = $"{value.ToString("0.#")}MB/s";
         }
 
         /// <inheritdoc/>
         public Task InitAsync(CancellationToken cancellationToken = default)
         {
-            for (var i = 0; i < Constants.Graphs.MAX_GRAPH_POINTS; i++)
+            for (var i = 0; i < Constants.Widgets.Graphs.MAX_GRAPH_POINTS; i++)
                 Data.Add(0d);
 
             return Task.CompletedTask;
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Controls/Widgets/Categories/GraphsWidgetViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Controls/Widgets/Data/GraphsWidgetViewModel.cs
similarity index 68%
rename from src/SecureFolderFS.Sdk/ViewModels/Controls/Widgets/Categories/GraphsWidgetViewModel.cs
rename to src/SecureFolderFS.Sdk/ViewModels/Controls/Widgets/Data/GraphsWidgetViewModel.cs
index 403d28daf..148e1154f 100644
--- a/src/SecureFolderFS.Sdk/ViewModels/Controls/Widgets/Categories/GraphsWidgetViewModel.cs
+++ b/src/SecureFolderFS.Sdk/ViewModels/Controls/Widgets/Data/GraphsWidgetViewModel.cs
@@ -1,4 +1,5 @@
 using ByteSizeLib;
+using CommunityToolkit.Mvvm.ComponentModel;
 using SecureFolderFS.Sdk.Models;
 using SecureFolderFS.Shared.Extensions;
 using SecureFolderFS.Storage.VirtualFileSystem;
@@ -9,12 +10,12 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace SecureFolderFS.Sdk.ViewModels.Controls.Widgets.Categories
+namespace SecureFolderFS.Sdk.ViewModels.Controls.Widgets.Data
 {
     [Bindable(true)]
-    public sealed class GraphsWidgetViewModel : BaseWidgetViewModel
+    public sealed partial class GraphsWidgetViewModel : BaseWidgetViewModel
     {
-        private readonly IReadWriteStatistics _readWriteStatistics;
+        private readonly IFileSystemStatistics _fileSystemStatistics;
         private readonly PeriodicTimer _periodicTimer;
         private readonly List<long> _readRates;
         private readonly List<long> _writeRates;
@@ -22,18 +23,19 @@ public sealed class GraphsWidgetViewModel : BaseWidgetViewModel
         private long _currentWriteAmount;
         private int _updateTimeCount;
 
-        public GraphControlViewModel ReadGraphViewModel { get; }
+        [ObservableProperty] private GraphControlViewModel _ReadGraphViewModel;
+        [ObservableProperty] private GraphControlViewModel _WriteGraphViewModel;
+        [ObservableProperty] private bool _IsActive;
 
-        public GraphControlViewModel WriteGraphViewModel { get; }
-
-        public GraphsWidgetViewModel(IReadWriteStatistics readWriteStatistics, IWidgetModel widgetModel)
+        public GraphsWidgetViewModel(UnlockedVaultViewModel unlockedVaultViewModel, IWidgetModel widgetModel)
             : base(widgetModel)
         {
+            IsActive = true;
             ReadGraphViewModel = new();
             WriteGraphViewModel = new();
-            _readWriteStatistics = readWriteStatistics;
+            _fileSystemStatistics = unlockedVaultViewModel.StorageRoot.Options.FileSystemStatistics;
 
-            _periodicTimer = new(TimeSpan.FromMilliseconds(Constants.Graphs.GRAPH_UPDATE_INTERVAL_MS));
+            _periodicTimer = new(TimeSpan.FromMilliseconds(Constants.Widgets.Graphs.GRAPH_UPDATE_INTERVAL_MS));
             _readRates = [ 0 ];
             _writeRates = [ 0 ];
         }
@@ -44,8 +46,8 @@ public override async Task InitAsync(CancellationToken cancellationToken = defau
             await ReadGraphViewModel.InitAsync(cancellationToken);
             await WriteGraphViewModel.InitAsync(cancellationToken);
 
-            _readWriteStatistics.BytesRead = new Progress<long>(x => _currentReadAmount += x);
-            _readWriteStatistics.BytesWritten = new Progress<long>(x => _currentWriteAmount += x);
+            _fileSystemStatistics.BytesRead = new Progress<long>(x => _currentReadAmount += x);
+            _fileSystemStatistics.BytesWritten = new Progress<long>(x => _currentWriteAmount += x);
             
             // We don't want to await it, since it's an async based timer
             _ = InitializeBlockingTimer(cancellationToken);
@@ -55,8 +57,11 @@ private async Task InitializeBlockingTimer(CancellationToken cancellationToken)
         {
             while (await _periodicTimer.WaitForNextTickAsync(cancellationToken))
             {
-                _readRates.AddWithMaxCapacity(_currentReadAmount, Constants.Graphs.GRAPH_REFRESH_RATE);
-                _writeRates.AddWithMaxCapacity(_currentWriteAmount, Constants.Graphs.GRAPH_REFRESH_RATE);
+                if (!IsActive)
+                    continue;
+
+                _readRates.AddWithMaxCapacity(_currentReadAmount, Constants.Widgets.Graphs.GRAPH_REFRESH_RATE);
+                _writeRates.AddWithMaxCapacity(_currentWriteAmount, Constants.Widgets.Graphs.GRAPH_REFRESH_RATE);
 
                 CalculateStatistics();
             }
@@ -67,8 +72,6 @@ private void CalculateStatistics()
             var read = Convert.ToInt64(ByteSize.FromBytes(_currentReadAmount).MegaBytes);
             var write = Convert.ToInt64(ByteSize.FromBytes(_currentWriteAmount).MegaBytes);
 
-            var now = DateTime.Now;
-
             // Update graph for read
             ReadGraphViewModel.Data.RemoveAt(0);
             ReadGraphViewModel.Data.Add(read);
@@ -82,7 +85,7 @@ private void CalculateStatistics()
             _currentWriteAmount = 0;
 
             _updateTimeCount++;
-            if (_updateTimeCount == Constants.Graphs.GRAPH_REFRESH_RATE)
+            if (_updateTimeCount == Constants.Widgets.Graphs.GRAPH_REFRESH_RATE)
             {
                 _updateTimeCount = 0;
 
@@ -97,8 +100,8 @@ private void CalculateStatistics()
         /// <inheritdoc/>
         public override void Dispose()
         {
-            _readWriteStatistics.BytesRead = null;
-            _readWriteStatistics.BytesWritten = null;
+            _fileSystemStatistics.BytesRead = null;
+            _fileSystemStatistics.BytesWritten = null;
             _periodicTimer.Dispose();
         }
     }
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Controls/Widgets/Health/HealthIssueViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Controls/Widgets/Health/HealthIssueViewModel.cs
new file mode 100644
index 000000000..e738db23c
--- /dev/null
+++ b/src/SecureFolderFS.Sdk/ViewModels/Controls/Widgets/Health/HealthIssueViewModel.cs
@@ -0,0 +1,75 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using OwlCore.Storage;
+using SecureFolderFS.Sdk.Attributes;
+using SecureFolderFS.Sdk.Enums;
+using SecureFolderFS.Sdk.Services;
+using SecureFolderFS.Sdk.ViewModels.Controls.Authentication;
+using SecureFolderFS.Shared;
+using SecureFolderFS.Shared.ComponentModel;
+using SecureFolderFS.Shared.Extensions;
+using System.ComponentModel;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace SecureFolderFS.Sdk.ViewModels.Controls.Widgets.Health
+{
+    [Inject<IClipboardService>]
+    [Bindable(true)]
+    public partial class HealthIssueViewModel : ErrorViewModel, IWrapper<IStorableChild>
+    {
+        [ObservableProperty] private string? _Icon; // TODO: Change to IImage
+        [ObservableProperty] private SeverityType _Severity;
+
+        /// <summary>
+        /// Gets the <see cref="IResult"/> associated with this view model.
+        /// </summary>
+        protected IResult? Result { get; set; }
+
+        /// <inheritdoc/>
+        public IStorableChild Inner { get; }
+
+        public HealthIssueViewModel(IStorableChild storable, IResult? result, string? title = null)
+            : this(storable, title ?? "Unknown error")
+        {
+            Result = result;
+        }
+
+        public HealthIssueViewModel(IStorableChild storable, string title)
+            : base(title)
+        {
+            ServiceProvider = DI.Default;
+            Severity = SeverityType.Warning;
+            Inner = storable;
+            Title = title;
+        }
+
+        /// <inheritdoc/>
+        protected override void UpdateStatus(IResult? result)
+        {
+            // Check if the result is null, in which case return since there always must be a result reported
+            if (result is null)
+                return;
+
+            Result = result;
+            base.UpdateStatus(result);
+        }
+
+        [RelayCommand]
+        protected virtual async Task CopyErrorAsync(CancellationToken cancellationToken)
+        {
+            if (await ClipboardService.IsSupportedAsync())
+                await ClipboardService.SetTextAsync(ExceptionMessage
+                                                    ?? Result?.GetExceptionMessage()
+                                                    ?? ErrorMessage
+                                                    ?? "Unknown error", cancellationToken);
+        }
+
+        [RelayCommand]
+        protected virtual async Task CopyPathAsync(CancellationToken cancellationToken)
+        {
+            if (await ClipboardService.IsSupportedAsync())
+                await ClipboardService.SetTextAsync(Inner.Id, cancellationToken);
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Controls/Widgets/Health/HealthWidgetViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Controls/Widgets/Health/HealthWidgetViewModel.cs
new file mode 100644
index 000000000..2ed9942d9
--- /dev/null
+++ b/src/SecureFolderFS.Sdk/ViewModels/Controls/Widgets/Health/HealthWidgetViewModel.cs
@@ -0,0 +1,223 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using SecureFolderFS.Sdk.AppModels;
+using SecureFolderFS.Sdk.Attributes;
+using SecureFolderFS.Sdk.Enums;
+using SecureFolderFS.Sdk.EventArguments;
+using SecureFolderFS.Sdk.Extensions;
+using SecureFolderFS.Sdk.Models;
+using SecureFolderFS.Sdk.Services;
+using SecureFolderFS.Sdk.ViewModels.Views.Vault;
+using SecureFolderFS.Shared;
+using SecureFolderFS.Shared.ComponentModel;
+using SecureFolderFS.Shared.Extensions;
+using SecureFolderFS.Storage.Scanners;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace SecureFolderFS.Sdk.ViewModels.Controls.Widgets.Health
+{
+    [Inject<ILocalizationService>, Inject<IVaultFileSystemService>]
+    [Bindable(true)]
+    public sealed partial class HealthWidgetViewModel : BaseWidgetViewModel, IProgress<double>, IProgress<TotalProgress>, IViewable
+    {
+        private readonly UnlockedVaultViewModel _unlockedVaultViewModel;
+        private readonly List<HealthIssueViewModel> _savedState;
+        private readonly SynchronizationContext? _context;
+        private readonly INavigator _dashboardNavigator;
+        private IHealthModel? _vaultHealthModel;
+        private CancellationTokenSource? _cts;
+        private string? _lastScanMode;
+
+        [ObservableProperty] private string? _Title;
+        [ObservableProperty] private string? _LastCheckedText;
+        [ObservableProperty] private VaultHealthReportViewModel _HealthReportViewModel;
+
+        public HealthWidgetViewModel(UnlockedVaultViewModel unlockedVaultViewModel, INavigator dashboardNavigator, IWidgetModel widgetModel)
+            : base(widgetModel)
+        {
+            ServiceProvider = DI.Default;
+            _cts = new();
+            _savedState = new();
+            _context = SynchronizationContext.Current;
+            _dashboardNavigator = dashboardNavigator;
+            _unlockedVaultViewModel = unlockedVaultViewModel;
+            HealthReportViewModel = new(unlockedVaultViewModel, _context) { StartScanningCommand = StartScanningCommand };
+            LastCheckedText = string.Format("LastChecked".ToLocalized(), "Unspecified");
+            Title = "HealthNoProblems".ToLocalized();
+        }
+
+        /// <inheritdoc/>
+        public override async Task InitAsync(CancellationToken cancellationToken = default)
+        {
+            var vaultModel = _unlockedVaultViewModel.VaultViewModel.VaultModel;
+            var contentFolder = await vaultModel.GetContentFolderAsync(cancellationToken);
+            var folderScanner = new DeepFolderScanner(contentFolder);
+            var structureValidator = _unlockedVaultViewModel.StorageRoot.Options.HealthStatistics.StructureValidator;
+
+            if (_vaultHealthModel is not null)
+            {
+                _vaultHealthModel.IssueFound -= VaultHealthModel_IssueFound;
+                _vaultHealthModel.Dispose();
+            }
+            _vaultHealthModel = new HealthModel(folderScanner, new(this, this), structureValidator);
+            _vaultHealthModel.IssueFound += VaultHealthModel_IssueFound;
+
+            // Get persisted last scanned date
+            var rawLastScanDate = await WidgetModel.GetWidgetDataAsync(cancellationToken);
+            if (rawLastScanDate is null)
+                return;
+
+            if (!DateTime.TryParse(rawLastScanDate, out var lastScanDate))
+                return;
+
+            var localizedDate = LocalizationService.LocalizeDate(lastScanDate);
+            LastCheckedText = string.Format("LastChecked".ToLocalized(), localizedDate);
+        }
+
+        /// <inheritdoc/>
+        public void Report(double value)
+        {
+            if (!HealthReportViewModel.IsProgressing)
+                return;
+
+            _context?.Post(_ => HealthReportViewModel.CurrentProgress = Math.Round(value), null);
+        }
+
+        /// <inheritdoc/>
+        public void Report(TotalProgress value)
+        {
+            if (!HealthReportViewModel.IsProgressing)
+                return;
+
+            _context?.Post(_ =>
+            {
+                if (value.Total == 0)
+                    Title = value.Achieved == 0
+                        ? "Collecting items..."
+                        : $"Collecting items ({value.Achieved})";
+                else
+                    Title = value.Achieved == value.Total
+                            ? "Scan completed"
+                            : $"Scanning items ({value.Achieved} of {value.Total})";
+            }, null);
+        }
+
+        [RelayCommand]
+        private async Task OpenVaultHealthAsync()
+        {
+            await _dashboardNavigator.NavigateAsync(HealthReportViewModel);
+        }
+
+        [RelayCommand]
+        private async Task StartScanningAsync(string? mode)
+        {
+            if (_vaultHealthModel is null)
+                return;
+
+            // Set IsProgressing status
+            HealthReportViewModel.IsProgressing = true;
+            Title = "Scanning...";
+
+            // Save last scan state
+            _savedState.AddMultiple(HealthReportViewModel.FoundIssues);
+            HealthReportViewModel.FoundIssues.Clear();
+
+            // Determine scan mode
+            if (mode?.Contains("rescan", StringComparison.OrdinalIgnoreCase) ?? false)
+                mode = _lastScanMode;
+            else
+                _lastScanMode = mode;
+
+            var includeFileContents = mode?.Contains("include_file_contents", StringComparison.OrdinalIgnoreCase) ?? false;
+
+            // Begin scanning
+            await Task.Delay(10);
+            _ = Task.Run(() => ScanAsync(includeFileContents, _cts?.Token ?? default));
+            await Task.Yield();
+        }
+
+        [RelayCommand]
+        private void CancelScanning()
+        {
+            // Restore last scan state
+            HealthReportViewModel.FoundIssues.AddMultiple(_savedState);
+
+            _cts?.CancelAsync();
+            _cts?.Dispose();
+            _cts = new();
+            EndScanning();
+            _context?.Post(_ => HealthReportViewModel.CanResolve = false, null);
+        }
+
+        private async Task ScanAsync(bool includeFileContents, CancellationToken cancellationToken)
+        {
+            if (_vaultHealthModel is null)
+                return;
+
+            // Begin scanning
+            _context?.Post(_ => HealthReportViewModel.CanResolve = false, null);
+            await _vaultHealthModel.ScanAsync(includeFileContents, cancellationToken).ConfigureAwait(false);
+            EndScanning();
+
+            // Finish scanning
+            var scanDate = DateTime.Now;
+            _context?.Post(_ =>
+            {
+                HealthReportViewModel.CanResolve = !HealthReportViewModel.FoundIssues.IsEmpty();
+                var localizedDate = LocalizationService.LocalizeDate(scanDate);
+                LastCheckedText = string.Format("LastChecked".ToLocalized(), localizedDate);
+            }, null);
+
+            // Persist last scanned date
+            await WidgetModel.SetWidgetDataAsync(scanDate.ToString("o"), cancellationToken);
+        }
+
+        private void EndScanning()
+        {
+            if (!HealthReportViewModel.IsProgressing)
+                return;
+
+            _context?.Post(_ =>
+            {
+                // Reset progress
+                HealthReportViewModel.IsProgressing = false;
+                HealthReportViewModel.CurrentProgress = 0d;
+                _savedState.Clear();
+
+                // Update status
+                Title = HealthReportViewModel.Severity switch
+                {
+                    SeverityType.Warning => "HealthAttention".ToLocalized(),
+                    SeverityType.Critical => "HealthProblems".ToLocalized(),
+                    _ => "HealthNoProblems".ToLocalized()
+                };
+            }, null);
+        }
+
+        private async void VaultHealthModel_IssueFound(object? sender, HealthIssueEventArgs e)
+        {
+            if (e.Result.Successful || e.Storable is null)
+                return;
+
+            var issueViewModel = await VaultFileSystemService.GetIssueViewModelAsync(e.Result, e.Storable);
+            _context?.Post(_ => HealthReportViewModel.FoundIssues.Add(issueViewModel ?? new(e.Storable, e.Result)), null);
+        }
+
+        /// <inheritdoc/>
+        public override void Dispose()
+        {
+            if (_vaultHealthModel is not null)
+            {
+                _vaultHealthModel.IssueFound -= VaultHealthModel_IssueFound;
+                _vaultHealthModel.Dispose();
+            }
+
+            HealthReportViewModel.Dispose();
+            base.Dispose();
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Controls/Widgets/WidgetsListViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Controls/Widgets/WidgetsListViewModel.cs
index dc376d144..970e36b7f 100644
--- a/src/SecureFolderFS.Sdk/ViewModels/Controls/Widgets/WidgetsListViewModel.cs
+++ b/src/SecureFolderFS.Sdk/ViewModels/Controls/Widgets/WidgetsListViewModel.cs
@@ -1,27 +1,30 @@
-using System;
+using CommunityToolkit.Mvvm.ComponentModel;
+using SecureFolderFS.Sdk.Models;
+using SecureFolderFS.Sdk.ViewModels.Controls.Widgets.Data;
+using SecureFolderFS.Sdk.ViewModels.Controls.Widgets.Health;
+using SecureFolderFS.Shared.ComponentModel;
+using SecureFolderFS.Shared.Extensions;
+using System;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Threading;
 using System.Threading.Tasks;
-using CommunityToolkit.Mvvm.ComponentModel;
-using SecureFolderFS.Sdk.Models;
-using SecureFolderFS.Sdk.ViewModels.Controls.Widgets.Categories;
-using SecureFolderFS.Shared.ComponentModel;
-using SecureFolderFS.Shared.Extensions;
 
 namespace SecureFolderFS.Sdk.ViewModels.Controls.Widgets
 {
     [Bindable(true)]
     public sealed class WidgetsListViewModel : ObservableObject, IAsyncInitialize, IDisposable
     {
+        private readonly INavigator _dashboardNavigator;
         private readonly UnlockedVaultViewModel _unlockedVaultViewModel;
 
         public IWidgetsCollectionModel WidgetsCollectionModel { get; }
 
         public ObservableCollection<BaseWidgetViewModel> Widgets { get; }
 
-        public WidgetsListViewModel(UnlockedVaultViewModel unlockedVaultViewModel, IWidgetsCollectionModel widgetsCollectionModel)
+        public WidgetsListViewModel(UnlockedVaultViewModel unlockedVaultViewModel, INavigator dashboardNavigator, IWidgetsCollectionModel widgetsCollectionModel)
         {
+            _dashboardNavigator = dashboardNavigator;
             _unlockedVaultViewModel = unlockedVaultViewModel;
             WidgetsCollectionModel = widgetsCollectionModel;
             Widgets = new();
@@ -51,13 +54,13 @@ public async Task InitAsync(CancellationToken cancellationToken = default)
             switch (widgetModel.WidgetId)
             {
                 case Constants.Widgets.HEALTH_WIDGET_ID:
-                    return new HealthWidgetViewModel(widgetModel);
+                    return new HealthWidgetViewModel(_unlockedVaultViewModel, _dashboardNavigator, widgetModel);
 
                 case Constants.Widgets.GRAPHS_WIDGET_ID:
-                    return new GraphsWidgetViewModel(_unlockedVaultViewModel.StorageRoot.ReadWriteStatistics, widgetModel);
+                    return new GraphsWidgetViewModel(_unlockedVaultViewModel, widgetModel);
                 
                 case Constants.Widgets.AGGREGATED_DATA_WIDGET_ID:
-                    return new AggregatedDataWidgetViewModel(_unlockedVaultViewModel.StorageRoot.ReadWriteStatistics, widgetModel);
+                    return new AggregatedDataWidgetViewModel(_unlockedVaultViewModel, widgetModel);
 
                 default:
                     return null;
diff --git a/src/SecureFolderFS.Sdk/ViewModels/UnlockedVaultViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/UnlockedVaultViewModel.cs
index b8b6bbd7f..07977886b 100644
--- a/src/SecureFolderFS.Sdk/ViewModels/UnlockedVaultViewModel.cs
+++ b/src/SecureFolderFS.Sdk/ViewModels/UnlockedVaultViewModel.cs
@@ -1,8 +1,8 @@
 using CommunityToolkit.Mvvm.ComponentModel;
-using SecureFolderFS.Sdk.Models;
 using SecureFolderFS.Shared.Extensions;
 using SecureFolderFS.Storage.VirtualFileSystem;
 using System;
+using System.ComponentModel;
 using System.Threading.Tasks;
 
 namespace SecureFolderFS.Sdk.ViewModels
@@ -10,7 +10,8 @@ namespace SecureFolderFS.Sdk.ViewModels
     /// <summary>
     /// Represents the view model of an unlocked vault.
     /// </summary>
-    public sealed class UnlockedVaultViewModel : ObservableObject, IAsyncDisposable
+    [Bindable(true)]
+    public sealed partial class UnlockedVaultViewModel : ObservableObject, IAsyncDisposable
     {
         /// <summary>
         /// Gets the unlocked root folder of the vault.
@@ -18,14 +19,20 @@ public sealed class UnlockedVaultViewModel : ObservableObject, IAsyncDisposable
         public IVFSRoot StorageRoot { get; }
 
         /// <summary>
-        /// Gets the vault model associated with the vault.
+        /// Gets the options of the unlocked vault.
         /// </summary>
-        public IVaultModel VaultModel { get; }
+        public FileSystemOptions Options { get; }
 
-        public UnlockedVaultViewModel(IVFSRoot storageRoot, IVaultModel vaultModel)
+        /// <summary>
+        /// Gets the vault view model associated with the vault.
+        /// </summary>
+        public VaultViewModel VaultViewModel { get; }
+
+        public UnlockedVaultViewModel(IVFSRoot storageRoot, VaultViewModel vaultViewModel)
         {
             StorageRoot = storageRoot;
-            VaultModel = vaultModel;
+            Options = storageRoot.Options;
+            VaultViewModel = vaultViewModel;
         }
 
         /// <inheritdoc/>
diff --git a/src/SecureFolderFS.Sdk/ViewModels/VaultOptionViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/VaultOptionViewModel.cs
new file mode 100644
index 000000000..496fc2db5
--- /dev/null
+++ b/src/SecureFolderFS.Sdk/ViewModels/VaultOptionViewModel.cs
@@ -0,0 +1,27 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using SecureFolderFS.Shared.ComponentModel;
+using System.ComponentModel;
+
+namespace SecureFolderFS.Sdk.ViewModels
+{
+    /// <summary>
+    /// Represents a vault option.
+    /// </summary>
+    [Bindable(true)]
+    public sealed class VaultOptionViewModel(string id, string? title = null) : ObservableObject, IViewable
+    {
+        /// <summary>
+        /// Gets the unique ID associated with this option.
+        /// </summary>
+        public string Id { get; } = id;
+
+        /// <inheritdoc/>
+        public string Title { get; } = title ?? id;
+
+        /// <inheritdoc/>
+        public override string ToString()
+        {
+            return Title;
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Sdk/ViewModels/VaultViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/VaultViewModel.cs
new file mode 100644
index 000000000..272af4cfd
--- /dev/null
+++ b/src/SecureFolderFS.Sdk/ViewModels/VaultViewModel.cs
@@ -0,0 +1,78 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Messaging;
+using OwlCore.Storage;
+using SecureFolderFS.Sdk.Attributes;
+using SecureFolderFS.Sdk.Extensions;
+using SecureFolderFS.Sdk.Helpers;
+using SecureFolderFS.Sdk.Messages;
+using SecureFolderFS.Sdk.Models;
+using SecureFolderFS.Sdk.Services;
+using SecureFolderFS.Shared;
+using SecureFolderFS.Shared.Helpers;
+using SecureFolderFS.Storage.VirtualFileSystem;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Threading.Tasks;
+
+namespace SecureFolderFS.Sdk.ViewModels
+{
+    [Inject<IVaultService>]
+    [Inject<IVaultFileSystemService>]
+    [Bindable(true)]
+    public sealed partial class VaultViewModel : ObservableObject
+    {
+        [ObservableProperty] private string _VaultName;
+        [ObservableProperty] private DateTime? _LastAccessDate;
+
+        public IVaultModel VaultModel { get; }
+
+        public VaultViewModel(IVaultModel vaultModel)
+        {
+            ServiceProvider = DI.Default;
+            VaultModel = vaultModel;
+            VaultName = vaultModel.VaultName;
+            LastAccessDate = vaultModel.LastAccessDate;
+        }
+
+        public async Task<UnlockedVaultViewModel> UnlockAsync(IDisposable unlockContract, bool isReadOnly)
+        {
+            // Get the file system
+            var fileSystem = await VaultFileSystemService.GetBestFileSystemAsync();
+
+            // Format volume name
+            var volumeName = FormattingHelpers.SanitizeVolumeName(VaultModel.VaultName, VaultModel.Folder.Name);
+
+            // Configure options
+            var options = new Dictionary<string, object>()
+            {
+                { nameof(FileSystemOptions.IsReadOnly), isReadOnly },
+                { nameof(FileSystemOptions.VolumeName), volumeName }
+            };
+
+            var contentFolder = await GetOrCreateContentFolder();
+            _ = contentFolder ?? throw new InvalidOperationException("Could not retrieve the content folder.");
+
+            // Create the storage layer
+            var storageRoot = await fileSystem.MountAsync(contentFolder, unlockContract, options);
+
+            // Update last access date
+            await VaultModel.SetLastAccessDateAsync(DateTime.Now);
+            LastAccessDate = VaultModel.LastAccessDate;
+
+            // Notify that the vault has been unlocked
+            WeakReferenceMessenger.Default.Send(new VaultUnlockedMessage(VaultModel));
+
+            return new(storageRoot, this);
+        }
+
+        private async Task<IFolder?> GetOrCreateContentFolder()
+        {
+            var contentFolder = await SafetyHelpers.NoThrowAsync(async () => await VaultModel.GetContentFolderAsync());
+            if (VaultModel.Folder is not IModifiableFolder modifiableFolder)
+                return contentFolder;
+
+            return contentFolder ?? await modifiableFolder.CreateFolderAsync(VaultService.ContentFolderName);
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Views/Browser/BrowserItemViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Views/Browser/BrowserItemViewModel.cs
index c715ce350..4cd749aaf 100644
--- a/src/SecureFolderFS.Sdk/ViewModels/Views/Browser/BrowserItemViewModel.cs
+++ b/src/SecureFolderFS.Sdk/ViewModels/Views/Browser/BrowserItemViewModel.cs
@@ -1,22 +1,236 @@
-using CommunityToolkit.Mvvm.ComponentModel;
-using OwlCore.Storage;
-using SecureFolderFS.Shared.ComponentModel;
+using System;
 using System.ComponentModel;
+using System.IO;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using OwlCore.Storage;
+using SecureFolderFS.Sdk.Attributes;
+using SecureFolderFS.Sdk.Enums;
+using SecureFolderFS.Sdk.Extensions;
+using SecureFolderFS.Sdk.Helpers;
+using SecureFolderFS.Sdk.Services;
+using SecureFolderFS.Sdk.ViewModels.Views.Overlays;
+using SecureFolderFS.Shared;
+using SecureFolderFS.Shared.ComponentModel;
+using SecureFolderFS.Shared.Extensions;
+using SecureFolderFS.Storage.Extensions;
+using SecureFolderFS.Storage.Renamable;
 
 namespace SecureFolderFS.Sdk.ViewModels.Views.Browser
 {
+    [Inject<IFileExplorerService>, Inject<IOverlayService>]
     [Bindable(true)]
     public abstract partial class BrowserItemViewModel : ObservableObject, IWrapper<IStorable>, IViewable, IAsyncInitialize
     {
         [ObservableProperty] private string? _Title;
+        [ObservableProperty] private bool _IsSelected;
         [ObservableProperty] private IImage? _Thumbnail;
 
         /// <inheritdoc/>
         public abstract IStorable Inner { get; }
 
+        /// <summary>
+        /// Gets the parent <see cref="FolderViewModel"/> that this item resides in, if any.
+        /// </summary>
+        public FolderViewModel? ParentFolder { get; }
+
+        protected BrowserItemViewModel(FolderViewModel? parentFolder)
+        {
+            ServiceProvider = DI.Default;
+            ParentFolder = parentFolder;
+        }
+
         /// <inheritdoc/>
         public abstract Task InitAsync(CancellationToken cancellationToken = default);
+
+        protected abstract void UpdateStorable(IStorable storable);
+
+        [RelayCommand]
+        protected virtual async Task MoveAsync(CancellationToken cancellationToken)
+        {
+            var items = ParentFolder?.GetSelectedItems().ToArray();
+            if (items?.IsEmpty() ?? true)
+                items = [ this ];
+            
+            if (ParentFolder?.BrowserViewModel.TransferViewModel is not { IsProgressing: false } transferViewModel || ParentFolder?.Folder is not IModifiableFolder modifiableParent)
+                return;
+
+            try
+            {
+                // Disable selection, if called with selected items
+                ParentFolder.BrowserViewModel.IsSelecting = false;
+                
+                using var cts = new CancellationTokenSource();
+                var destination = await transferViewModel.SelectFolderAsync(TransferType.Move, cts);
+                if (destination is not { Folder: IModifiableFolder destinationFolder })
+                    return;
+                
+                foreach (var item in items)
+                {
+                    if (destination.Folder.Id.Contains(item.Inner.Id, StringComparison.InvariantCultureIgnoreCase))
+                        return;
+                }
+
+                await transferViewModel.TransferAsync(items.Select(x => (IStorableChild)x.Inner), async (storable, token) =>
+                {
+                    // Move
+                    var movedItem = await destinationFolder.MoveStorableFromAsync(storable, modifiableParent, false, token);
+                    
+                    // Remove existing from folder
+                    ParentFolder.Items.RemoveMatch(x => x.Inner.Id == storable.Id);
+                    
+                    // Add to destination
+                    destination.Items.Add(movedItem switch
+                    {
+                        IFile file => new FileViewModel(file, destination),
+                        IFolder folder => new FolderViewModel(folder, ParentFolder.BrowserViewModel, destination),
+                        _ => throw new ArgumentOutOfRangeException(nameof(movedItem))
+                    });
+                }, cts.Token);
+            }
+            catch (Exception ex) when (ex is TaskCanceledException or OperationCanceledException)
+            {
+                _ = ex;
+                // TODO: Report error
+            }
+            finally
+            {
+                transferViewModel.IsVisible = false;
+                transferViewModel.IsProgressing = false;
+            }
+        }
+        
+        [RelayCommand]
+        protected virtual async Task CopyAsync(CancellationToken cancellationToken)
+        {
+            var items = ParentFolder?.GetSelectedItems().ToArray();
+            if (items?.IsEmpty() ?? true)
+                items = [ this ];
+            
+            if (ParentFolder?.BrowserViewModel.TransferViewModel is not { IsProgressing: false } transferViewModel)
+                return;
+
+            try
+            {
+                // Disable selection, if called with selected items
+                ParentFolder.BrowserViewModel.IsSelecting = false;
+
+                using var cts = new CancellationTokenSource();
+                var destination = await transferViewModel.SelectFolderAsync(TransferType.Copy, cts);
+                if (destination is not { Folder: IModifiableFolder destinationFolder })
+                    return;
+
+                foreach (var item in items)
+                {
+                    if (destination.Folder.Id.Contains(item.Inner.Id, StringComparison.InvariantCultureIgnoreCase))
+                        return;
+                }
+
+                await transferViewModel.TransferAsync(items.Select(x => x.Inner), async (storable, token) =>
+                {
+                    // Copy
+                    var copiedItem = await destinationFolder.CreateCopyOfStorableAsync(storable, false, token);
+
+                    // Add to destination
+                    destination.Items.Add(copiedItem switch
+                    {
+                        IFile file => new FileViewModel(file, destination),
+                        IFolder folder => new FolderViewModel(folder, ParentFolder.BrowserViewModel, destination),
+                        _ => throw new ArgumentOutOfRangeException(nameof(copiedItem))
+                    });
+                }, cts.Token);
+            }
+            catch (Exception ex) when (ex is TaskCanceledException or OperationCanceledException)
+            {
+                _ = ex;
+                // TODO: Report error
+            }
+            finally
+            {
+                transferViewModel.IsVisible = false;
+                transferViewModel.IsProgressing = false;
+            }
+        }
+
+        [RelayCommand]
+        protected virtual async Task RenameAsync(CancellationToken cancellationToken)
+        {
+            if (ParentFolder?.Folder is not IRenamableFolder renamableFolder)
+                return;
+            
+            if (Inner is not IStorableChild innerChild)
+                return;
+
+            try
+            {
+                var viewModel = new RenameOverlayViewModel("Rename item") { Message = "Choose a new name" };
+                var result = await OverlayService.ShowAsync(viewModel);
+                if (!result.Positive())
+                    return;
+
+                if (string.IsNullOrWhiteSpace(viewModel.NewName))
+                    return;
+
+                var formattedName = FormattingHelpers.SanitizeItemName(viewModel.NewName, "item");
+                if (!Path.HasExtension(formattedName))
+                    formattedName = $"{formattedName}{Path.GetExtension(innerChild.Name)}";
+                
+                var renamedStorable = await renamableFolder.RenameAsync(innerChild, formattedName, cancellationToken);
+
+                Title = formattedName;
+                UpdateStorable(renamedStorable);
+            }
+            catch (Exception ex)
+            {
+                // TODO: Report error
+                _ = ex;
+            }
+        }
+
+        [RelayCommand]
+        protected virtual async Task DeleteAsync(CancellationToken cancellationToken)
+        {
+            if (ParentFolder?.Folder is not IModifiableFolder modifiableFolder)
+                return;
+
+            // TODO: Show an overlay to ask the user **when deleting permanently**
+            // TODO: If moving to trash, show TransferViewModel (with try..catch..finally), otherwise don't show anything
+            
+            var items = ParentFolder.GetSelectedItems().ToArray();
+            if (items.IsEmpty())
+                items = [this];
+            
+            // Disable selection, if called with selected items
+            ParentFolder.BrowserViewModel.IsSelecting = false;
+
+            foreach (var item in items)
+            {
+                await modifiableFolder.DeleteAsync((IStorableChild)item.Inner, cancellationToken);
+                ParentFolder?.Items.Remove(item);
+            }
+        }
+
+        [RelayCommand]
+        protected virtual async Task ExportAsync(CancellationToken cancellationToken)
+        {
+            if (ParentFolder?.Folder is not IModifiableFolder parentModifiableFolder)
+                return;
+            
+            var destination = await FileExplorerService.PickFolderAsync(false, cancellationToken);
+            if (destination is not IModifiableFolder destinationFolder)
+                return;
+
+            // Copy and delete
+            await destinationFolder.CreateCopyOfStorableAsync(Inner, false, cancellationToken);
+            await parentModifiableFolder.DeleteAsync((IStorableChild)Inner, cancellationToken);
+            
+            ParentFolder.Items.Remove(this);
+        }
+        
+        [RelayCommand]
+        protected abstract Task OpenAsync(CancellationToken cancellationToken);
     }
 }
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Views/Browser/BrowserViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Views/Browser/BrowserViewModel.cs
index 195d5ad3f..e85c54b1e 100644
--- a/src/SecureFolderFS.Sdk/ViewModels/Views/Browser/BrowserViewModel.cs
+++ b/src/SecureFolderFS.Sdk/ViewModels/Views/Browser/BrowserViewModel.cs
@@ -1,91 +1,169 @@
-using CommunityToolkit.Mvvm.ComponentModel;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Threading;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using OwlCore.Storage;
 using SecureFolderFS.Sdk.Attributes;
+using SecureFolderFS.Sdk.Extensions;
 using SecureFolderFS.Sdk.Services;
+using SecureFolderFS.Sdk.ViewModels.Controls;
+using SecureFolderFS.Sdk.ViewModels.Controls.Transfer;
+using SecureFolderFS.Sdk.ViewModels.Views.Overlays;
 using SecureFolderFS.Shared;
 using SecureFolderFS.Shared.ComponentModel;
-using SecureFolderFS.Shared.Extensions;
-using System.Collections;
-using System.ComponentModel;
-using System.Threading;
-using System.Threading.Tasks;
+using SecureFolderFS.Storage.Extensions;
 
 namespace SecureFolderFS.Sdk.ViewModels.Views.Browser
 {
-    [Inject<IOverlayService>]
+    [Inject<IOverlayService>, Inject<IFileExplorerService>]
     [Bindable(true)]
-    public partial class BrowserViewModel : ObservableObject
+    public partial class BrowserViewModel : ObservableObject, IViewDesignation
     {
-        [ObservableProperty] private IViewable? _CurrentView;
+        [ObservableProperty] private string? _Title;
+        [ObservableProperty] private bool _IsSelecting;
+        [ObservableProperty] private VaultViewModel _VaultViewModel;
+        [ObservableProperty] private FolderViewModel? _CurrentFolder;
+        [ObservableProperty] private TransferViewModel? _TransferViewModel;
+        [ObservableProperty] private ObservableCollection<BreadcrumbItemViewModel> _Breadcrumbs;
+        
+        public IFolder BaseFolder { get; }
+        
+        public INavigator Navigator { get; }
 
-        public BrowserViewModel()
+        public BrowserViewModel(INavigator navigator, IFolder baseFolder, VaultViewModel vaultViewModel)
         {
             ServiceProvider = DI.Default;
+            Navigator = navigator;
+            BaseFolder = baseFolder;
+            VaultViewModel = vaultViewModel;
+            Breadcrumbs = new()
+            {
+                new(vaultViewModel.VaultName, NavigateBreadcrumbCommand)
+            };
+        }
+        
+        /// <inheritdoc/>
+        public virtual void OnAppearing()
+        {
         }
 
-        [RelayCommand]
-        protected virtual async Task NewFolderAsync(CancellationToken cancellationToken)
+        /// <inheritdoc/>
+        public virtual void OnDisappearing()
         {
-            if (CurrentView is not FolderViewModel { Folder: IModifiableFolder modifiableFolder } folderViewModel)
-                return;
+        }
 
-            // TODO: Add NewFolderOverlayViewModel
-            _ = modifiableFolder;
-            var result = await OverlayService.ShowAsync(null!);
-            if (result is IResult<IFolder> { Successful: true, Value: not null } folderResult)
-                folderViewModel.Items.Add(new FolderViewModel(folderResult.Value));
+        partial void OnCurrentFolderChanged(FolderViewModel? oldValue, FolderViewModel? newValue)
+        {
+            oldValue?.UnselectAll();
+            IsSelecting = false;
+            Title = newValue?.Title;
+            if (string.IsNullOrEmpty(Title))
+                Title = VaultViewModel.VaultName;
         }
 
         [RelayCommand]
-        protected virtual async Task CopyAsync(IEnumerable items, CancellationToken cancellationToken)
+        protected virtual async Task NavigateBreadcrumbAsync(BreadcrumbItemViewModel? itemViewModel, CancellationToken cancellationToken)
         {
-            // TODO: Add CopyOverlayViewModel
-            var result = await OverlayService.ShowAsync(null!);
-            if (result is not IResult<IFolder> { Successful: true, Value: ICreateCopyOf folderCreateCopyOf /*IDirectCopy directCopy*/ })
+            if (itemViewModel is null)
                 return;
 
-            foreach (IStorableChild item in items)
+            var lastIndex = Breadcrumbs.Count - 1;
+            var breadcrumbIndex = Breadcrumbs.IndexOf(itemViewModel);
+            var difference = lastIndex - breadcrumbIndex;
+            for (var i = 0; i < difference; i++)
             {
-                // TODO(ns)
-                //folderCreateCopyOf.CreateCopyOfAsync(item, default, cancellationToken);
+                await Navigator.GoBackAsync();
             }
         }
 
         [RelayCommand]
-        protected virtual async Task MoveAsync(IEnumerable items, CancellationToken cancellationToken)
+        protected virtual async Task RefreshAsync(CancellationToken cancellationToken)
         {
-            if (CurrentView is not FolderViewModel { Folder: IModifiableFolder modifiableFolder } folderViewModel)
+            if (CurrentFolder is not null)
+                await CurrentFolder.ListContentsAsync(cancellationToken);
+        }
+        
+        [RelayCommand]
+        protected virtual void ToggleSelection()
+        {
+            IsSelecting = !IsSelecting;
+            CurrentFolder?.UnselectAll();
+        }
+
+        [RelayCommand]
+        protected virtual async Task NewItemAsync(string? itemType, CancellationToken cancellationToken)
+        {
+            if (itemType is null)
                 return;
 
-            // TODO: Add MoveOverlayViewModel
-            var result = await OverlayService.ShowAsync(null!);
-            if (result is not IResult<IFolder> { Successful: true, Value: IMoveFrom folderMoveFrom })
+            itemType = itemType.ToLower();
+            if (itemType is not ("folder" or "file"))
+                return;
+            
+            if (CurrentFolder?.Folder is not IModifiableFolder modifiableFolder)
+                return;
+            
+            var viewModel = new NewItemOverlayViewModel();
+            var result = await OverlayService.ShowAsync(viewModel);
+            if (result.Aborted() || viewModel.ItemName is null)
                 return;
 
-            foreach (IStorableChild item in items)
+            switch (itemType)
             {
-                // TODO(ns)
-                //await folderMoveFrom.MoveFromAsync(item, modifiableFolder, default, cancellationToken);
-                //folderViewModel.Items.RemoveMatch(x => x.Inner.Id == item.Id);
+                case "file":
+                {
+                    var file = await modifiableFolder.CreateFileAsync(viewModel.ItemName, false, cancellationToken);
+                    CurrentFolder.Items.Add(new FileViewModel(file, CurrentFolder));
+                    break;
+                }
+
+                case "folder":
+                {
+                    var folder = await modifiableFolder.CreateFolderAsync(viewModel.ItemName, false, cancellationToken);
+                    CurrentFolder.Items.Add(new FolderViewModel(folder, this, CurrentFolder));
+                    break;
+                }
             }
         }
 
         [RelayCommand]
-        protected virtual async Task DeleteAsync(IEnumerable items, CancellationToken cancellationToken)
+        protected virtual async Task ImportItemAsync(string? itemType, CancellationToken cancellationToken)
         {
-            if (CurrentView is not FolderViewModel { Folder: IModifiableFolder modifiableFolder } folderViewModel)
+            if (itemType is null)
                 return;
 
-            // TODO: Add DeletionOverlayViewModel
-            var result = await OverlayService.ShowAsync(null!);
-            if (!result.Successful)
+            itemType = itemType.ToLower();
+            if (itemType is not ("folder" or "file"))
+                return;
+            
+            if (CurrentFolder?.Folder is not IModifiableFolder modifiableFolder)
                 return;
 
-            foreach (IStorableChild item in items)
+            switch (itemType)
             {
-                await modifiableFolder.DeleteAsync(item, cancellationToken);
-                folderViewModel.Items.RemoveMatch(x => x.Inner.Id == item.Id);
+                case "file":
+                {
+                    var file = await FileExplorerService.PickFileAsync(null, false, cancellationToken);
+                    if (file is null)
+                        return;
+
+                    var copiedFile = await modifiableFolder.CreateCopyOfAsync(file, false, cancellationToken);
+                    CurrentFolder.Items.Add(new FileViewModel(copiedFile, CurrentFolder));
+                    break;
+                }
+
+                case "folder":
+                {
+                    var folder = await FileExplorerService.PickFolderAsync(false, cancellationToken);
+                    if (folder is null)
+                        return;
+                    
+                    var copiedFolder = await modifiableFolder.CreateCopyOfAsync(folder, false, cancellationToken);
+                    CurrentFolder.Items.Add(new FolderViewModel(copiedFolder, this, CurrentFolder));
+                    break;
+                }
             }
         }
     }
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Views/Browser/FileViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Views/Browser/FileViewModel.cs
index 20b94f986..d7eacc609 100644
--- a/src/SecureFolderFS.Sdk/ViewModels/Views/Browser/FileViewModel.cs
+++ b/src/SecureFolderFS.Sdk/ViewModels/Views/Browser/FileViewModel.cs
@@ -1,13 +1,17 @@
 using OwlCore.Storage;
-using System;
+using SecureFolderFS.Sdk.Attributes;
+using SecureFolderFS.Sdk.Services;
+using SecureFolderFS.Sdk.ViewModels.Views.Overlays;
+using SecureFolderFS.Shared;
 using System.ComponentModel;
 using System.Threading;
 using System.Threading.Tasks;
 
 namespace SecureFolderFS.Sdk.ViewModels.Views.Browser
 {
+    [Inject<IOverlayService>]
     [Bindable(true)]
-    public class FileViewModel : BrowserItemViewModel
+    public partial class FileViewModel : BrowserItemViewModel
     {
         /// <inheritdoc/>
         public override IStorable Inner => File;
@@ -15,10 +19,12 @@ public class FileViewModel : BrowserItemViewModel
         /// <summary>
         /// Gets the file associated with this view model.
         /// </summary>
-        public IFile File { get; }
+        public IFile File { get; protected set; }
 
-        public FileViewModel(IFile file)
+        public FileViewModel(IFile file, FolderViewModel? parentFolder)
+            : base(parentFolder)
         {
+            ServiceProvider = DI.Default;
             File = file;
             Title = file.Name;
         }
@@ -26,8 +32,22 @@ public FileViewModel(IFile file)
         /// <inheritdoc/>
         public override Task InitAsync(CancellationToken cancellationToken = default)
         {
-            throw new NotImplementedException();
             // TODO: Load thumbnail
+            return Task.CompletedTask;
+        }
+
+        /// <inheritdoc/>
+        protected override void UpdateStorable(IStorable storable)
+        {
+            File = (IFile)storable;
+        }
+
+        /// <inheritdoc/>
+        protected override async Task OpenAsync(CancellationToken cancellationToken)
+        {
+            using var viewModel = new PreviewerOverlayViewModel();
+            await viewModel.LoadFromStorableAsync(Inner, cancellationToken);
+            await OverlayService.ShowAsync(viewModel);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Views/Browser/FolderViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Views/Browser/FolderViewModel.cs
index 6a508b2d0..5fd684d75 100644
--- a/src/SecureFolderFS.Sdk/ViewModels/Views/Browser/FolderViewModel.cs
+++ b/src/SecureFolderFS.Sdk/ViewModels/Views/Browser/FolderViewModel.cs
@@ -1,19 +1,26 @@
-using OwlCore.Storage;
-using System;
+using System;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Threading;
 using System.Threading.Tasks;
+using OwlCore.Storage;
+using SecureFolderFS.Shared.ComponentModel;
+using SecureFolderFS.Shared.Extensions;
 
 namespace SecureFolderFS.Sdk.ViewModels.Views.Browser
 {
     [Bindable(true)]
-    public class FolderViewModel : BrowserItemViewModel
+    public partial class FolderViewModel : BrowserItemViewModel, IViewDesignation
     {
+        /// <summary>
+        /// Gets the <see cref="Sdk.ViewModels.Views.Browser.BrowserViewModel"/> instance, which this folder belongs to.
+        /// </summary>
+        public BrowserViewModel BrowserViewModel { get; }
+        
         /// <summary>
         /// Gets the folder associated with this view model.
         /// </summary>
-        public IFolder Folder { get; }
+        public IFolder Folder { get; protected set; }
 
         /// <summary>
         /// Gets the items in this folder.
@@ -23,27 +30,59 @@ public class FolderViewModel : BrowserItemViewModel
         /// <inheritdoc/>
         public override IStorable Inner => Folder;
 
-        public FolderViewModel(IFolder folder)
+        public FolderViewModel(IFolder folder, BrowserViewModel browserViewModel, FolderViewModel? parentFolder)
+            : base(parentFolder)
         {
             Folder = folder;
+            BrowserViewModel = browserViewModel;
             Title = folder.Name;
             Items = new();
         }
 
         /// <inheritdoc/>
-        public override async Task InitAsync(CancellationToken cancellationToken = default)
+        public override Task InitAsync(CancellationToken cancellationToken = default)
+        {
+            // TODO: Load thumbnail
+            return Task.CompletedTask;
+        }
+
+        public async Task ListContentsAsync(CancellationToken cancellationToken = default)
         {
+            Items.Clear();
             await foreach (var item in Folder.GetItemsAsync(StorableType.All, cancellationToken))
             {
                 Items.Add(item switch
                 {
-                    IFile file => new FileViewModel(file),
-                    IFolder folder => new FolderViewModel(folder),
+                    IFile file => new FileViewModel(file, this).WithInitAsync(),
+                    IFolder folder => new FolderViewModel(folder, BrowserViewModel, this).WithInitAsync(),
                     _ => throw new ArgumentOutOfRangeException(nameof(item))
                 });
             }
+        }
+        
+        /// <inheritdoc/>
+        public virtual void OnAppearing()
+        {
+        }
 
-            // TODO: Load thumbnail
+        /// <inheritdoc/>
+        public virtual void OnDisappearing()
+        {
+        }
+        
+        /// <inheritdoc/>
+        protected override void UpdateStorable(IStorable storable)
+        {
+            Folder = (IFolder)storable;
+        }
+
+        /// <inheritdoc/>
+        protected override async Task OpenAsync(CancellationToken cancellationToken)
+        {
+            if (Items.IsEmpty())
+                _ = ListContentsAsync(cancellationToken);
+            
+            await BrowserViewModel.Navigator.NavigateAsync(this);
         }
     }
 }
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Views/Credentials/CredentialsConfirmationViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Views/Credentials/CredentialsConfirmationViewModel.cs
index b9c44b3f7..412c044e9 100644
--- a/src/SecureFolderFS.Sdk/ViewModels/Views/Credentials/CredentialsConfirmationViewModel.cs
+++ b/src/SecureFolderFS.Sdk/ViewModels/Views/Credentials/CredentialsConfirmationViewModel.cs
@@ -47,6 +47,14 @@ public CredentialsConfirmationViewModel(IFolder vaultFolder, RegisterViewModel r
 
         [RelayCommand]
         public async Task ConfirmAsync(CancellationToken cancellationToken)
+        {
+            if (IsRemoving)
+                await RemoveAsync(cancellationToken);
+            else
+                await ModifyAsync(cancellationToken);
+        }
+        
+        private async Task ModifyAsync(CancellationToken cancellationToken)
         {
             RegisterViewModel.ConfirmCredentialsCommand.Execute(null);
             var key = await _credentialsTcs.Task;
@@ -71,8 +79,7 @@ string[] GetAuthenticationMethod()
             }
         }
 
-        [RelayCommand]
-        public async Task RemoveAsync(CancellationToken cancellationToken)
+        private async Task RemoveAsync(CancellationToken cancellationToken)
         {
             if (_authenticationStage != AuthenticationType.ProceedingStageOnly)
                 return;
@@ -91,11 +98,12 @@ private async Task ChangeCredentialsAsync(IKey key, VaultOptions configuredOptio
                 AuthenticationMethod = authenticationMethod,
                 ContentCipherId = configuredOptions.ContentCipherId,
                 FileNameCipherId = configuredOptions.FileNameCipherId,
+                NameEncodingId = configuredOptions.NameEncodingId,
                 VaultId = configuredOptions.VaultId,
                 Version = configuredOptions.Version
             };
 
-            await VaultManagerService.ChangeAuthenticationAsync(_vaultFolder, UnlockContract, key, newOptions, cancellationToken);
+            await VaultManagerService.ModifyAuthenticationAsync(_vaultFolder, UnlockContract, key, newOptions, cancellationToken);
             if (ConfiguredViewModel is not null)
                 await ConfiguredViewModel.RevokeAsync(null, cancellationToken);
         }
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Views/Credentials/CredentialsResetViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Views/Credentials/CredentialsResetViewModel.cs
index e2c4f85ea..9dac2ec57 100644
--- a/src/SecureFolderFS.Sdk/ViewModels/Views/Credentials/CredentialsResetViewModel.cs
+++ b/src/SecureFolderFS.Sdk/ViewModels/Views/Credentials/CredentialsResetViewModel.cs
@@ -18,7 +18,7 @@
 
 namespace SecureFolderFS.Sdk.ViewModels.Views.Credentials
 {
-    [Inject<IVaultManagerService>, Inject<IVaultService>]
+    [Inject<IVaultManagerService>, Inject<IVaultService>, Inject<IVaultCredentialsService>]
     [Bindable(true)]
     public sealed partial class CredentialsResetViewModel : ObservableObject, IAsyncInitialize, IDisposable
     {
@@ -48,7 +48,7 @@ public async Task InitAsync(CancellationToken cancellationToken = default)
                 return;
 
             AuthenticationOptions.Clear();
-            await foreach (var item in VaultService.GetCreationAsync(_vaultFolder, vaultOptions.VaultId, cancellationToken))
+            await foreach (var item in VaultCredentialsService.GetCreationAsync(_vaultFolder, vaultOptions.VaultId, cancellationToken))
                 AuthenticationOptions.Add(item);
 
             RegisterViewModel.CurrentViewModel = AuthenticationOptions.FirstOrDefault();
@@ -67,11 +67,12 @@ public async Task ConfirmAsync(CancellationToken cancellationToken)
                 AuthenticationMethod = [ RegisterViewModel.CurrentViewModel.Id ],
                 ContentCipherId = configuredOptions.ContentCipherId,
                 FileNameCipherId = configuredOptions.FileNameCipherId,
+                NameEncodingId = configuredOptions.NameEncodingId,
                 VaultId = configuredOptions.VaultId,
                 Version = configuredOptions.Version
             };
 
-            await VaultManagerService.ChangeAuthenticationAsync(_vaultFolder, _unlockContract, key, newOptions, cancellationToken);
+            await VaultManagerService.ModifyAuthenticationAsync(_vaultFolder, _unlockContract, key, newOptions, cancellationToken);
         }
 
         private void RegisterViewModel_CredentialsProvided(object? sender, CredentialsProvidedEventArgs e)
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Views/Credentials/CredentialsSelectionViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Views/Credentials/CredentialsSelectionViewModel.cs
index 7f9df7ba5..c109720dc 100644
--- a/src/SecureFolderFS.Sdk/ViewModels/Views/Credentials/CredentialsSelectionViewModel.cs
+++ b/src/SecureFolderFS.Sdk/ViewModels/Views/Credentials/CredentialsSelectionViewModel.cs
@@ -18,7 +18,7 @@
 
 namespace SecureFolderFS.Sdk.ViewModels.Views.Credentials
 {
-    [Inject<IVaultService>]
+    [Inject<IVaultService>, Inject<IVaultCredentialsService>]
     [Bindable(true)]
     public sealed partial class CredentialsSelectionViewModel : ObservableObject, IAsyncInitialize, IDisposable
     {
@@ -51,7 +51,7 @@ public async Task InitAsync(CancellationToken cancellationToken = default)
             if (vaultOptions.VaultId is null)
                 return;
 
-            await foreach (var item in VaultService.GetCreationAsync(_vaultFolder, vaultOptions.VaultId, cancellationToken))
+            await foreach (var item in VaultCredentialsService.GetCreationAsync(_vaultFolder, vaultOptions.VaultId, cancellationToken))
             {
                 // Don't add authentication methods to list which are already in use
                 if (vaultOptions.AuthenticationMethod.Contains(item.Id))
@@ -107,7 +107,7 @@ private async Task ItemSelected(AuthenticationViewModel? authenticationViewModel
             if (vaultOptions.VaultId is null)
                 return null;
 
-            return await VaultService.GetCreationAsync(_vaultFolder, vaultOptions.VaultId, cancellationToken)
+            return await VaultCredentialsService.GetCreationAsync(_vaultFolder, vaultOptions.VaultId, cancellationToken)
                 .FirstOrDefaultAsync(x => x.Id == ConfiguredViewModel?.Id, cancellationToken: cancellationToken);
         }
 
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Views/Host/MainHostViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Views/Host/MainHostViewModel.cs
index 20867e54a..6888e1490 100644
--- a/src/SecureFolderFS.Sdk/ViewModels/Views/Host/MainHostViewModel.cs
+++ b/src/SecureFolderFS.Sdk/ViewModels/Views/Host/MainHostViewModel.cs
@@ -1,14 +1,16 @@
-using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Input;
+using CommunityToolkit.Mvvm.Input;
+using SecureFolderFS.Sdk.AppModels;
 using SecureFolderFS.Sdk.Attributes;
+using SecureFolderFS.Sdk.Contexts;
+using SecureFolderFS.Sdk.Extensions;
 using SecureFolderFS.Sdk.Models;
 using SecureFolderFS.Sdk.Services;
 using SecureFolderFS.Sdk.ViewModels.Controls.VaultList;
 using SecureFolderFS.Sdk.ViewModels.Views.Overlays;
-using SecureFolderFS.Sdk.ViewModels.Views.Vault;
 using SecureFolderFS.Shared;
 using SecureFolderFS.Shared.ComponentModel;
 using SecureFolderFS.Shared.Extensions;
+using System;
 using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Linq;
@@ -19,33 +21,28 @@ namespace SecureFolderFS.Sdk.ViewModels.Views.Host
 {
     [Inject<INavigationService>(Visibility = "public"), Inject<IOverlayService>, Inject<ISettingsService>]
     [Bindable(true)]
-    public sealed partial class MainHostViewModel : ObservableObject, IViewDesignation, IAsyncInitialize
+    public sealed partial class MainHostViewModel : BaseDesignationViewModel, IAsyncInitialize, IDisposable
     {
-        [ObservableProperty] private string? _Title;
+        private readonly IVaultCollectionModel _vaultCollectionModel;
+        private readonly ISystemMonitorModel _systemMonitorModel;
 
         public VaultListViewModel VaultListViewModel { get; }
 
         public MainHostViewModel(IVaultCollectionModel vaultCollectionModel)
         {
             ServiceProvider = DI.Default;
+            _vaultCollectionModel = vaultCollectionModel;
+            _systemMonitorModel = new SystemMonitorModel(vaultCollectionModel);
+            Title = "MyVaults".ToLocalized();
             VaultListViewModel = new(vaultCollectionModel);
-            vaultCollectionModel.CollectionChanged += VaultCollectionModel_CollectionChanged;
+            _vaultCollectionModel.CollectionChanged += VaultCollectionModel_CollectionChanged;
         }
 
         /// <inheritdoc/>
-        public Task InitAsync(CancellationToken cancellationToken = default)
-        {
-            return VaultListViewModel.InitAsync(cancellationToken);
-        }
-
-        /// <inheritdoc/>
-        public void OnAppearing()
-        {
-        }
-
-        /// <inheritdoc/>
-        public void OnDisappearing()
+        public async Task InitAsync(CancellationToken cancellationToken = default)
         {
+            await VaultListViewModel.InitAsync(cancellationToken);
+            await _systemMonitorModel.InitAsync(cancellationToken);
         }
         
         [RelayCommand]
@@ -54,17 +51,17 @@ private async Task OpenSettingsAsync()
             await OverlayService.ShowAsync(SettingsOverlayViewModel.Instance);
             await SettingsService.TrySaveAsync();
         }
-        
+
         private void VaultCollectionModel_CollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
         {
             switch (e.Action)
             {
                 case NotifyCollectionChangedAction.Remove when e.OldItems is not null && e.OldItems[0] is IVaultModel vaultModel:
-                    if (NavigationService.Views.FirstOrDefault(x => (x as BaseVaultViewModel)?.VaultModel.Equals(vaultModel) ?? false) is not BaseVaultViewModel viewModel)
+                    if (NavigationService.Views.FirstOrDefault(x => (x as IVaultViewContext)?.VaultViewModel.VaultModel.Equals(vaultModel) ?? false) is not { } viewModel)
                         return;
 
                     NavigationService.Views.Remove(viewModel);
-                    viewModel.Dispose();
+                    (viewModel as IDisposable)?.Dispose();
                     break;
                 
                 case NotifyCollectionChangedAction.Reset:
@@ -73,5 +70,12 @@ private void VaultCollectionModel_CollectionChanged(object? sender, NotifyCollec
                     break;
             }
         }
+
+        /// <inheritdoc/>
+        public void Dispose()
+        {
+            _vaultCollectionModel.CollectionChanged += VaultCollectionModel_CollectionChanged;
+            _systemMonitorModel.Dispose();
+        }
     }
 }
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Views/IOverlayControls.cs b/src/SecureFolderFS.Sdk/ViewModels/Views/IOverlayControls.cs
new file mode 100644
index 000000000..db2479830
--- /dev/null
+++ b/src/SecureFolderFS.Sdk/ViewModels/Views/IOverlayControls.cs
@@ -0,0 +1,31 @@
+using SecureFolderFS.Shared.ComponentModel;
+using System.ComponentModel;
+
+namespace SecureFolderFS.Sdk.ViewModels.Views
+{
+    /// <summary>
+    /// Represents basic overlay controls to display in the UI.
+    /// </summary>
+    public interface IOverlayControls : IViewable, INotifyPropertyChanged
+    {
+        /// <summary>
+        /// Gets whether the continuation should be possible or not.
+        /// </summary>
+        public bool CanContinue { get; }
+
+        /// <summary>
+        /// Gets whether the cancellation should be possible or not.
+        /// </summary>
+        public bool CanCancel { get; }
+
+        /// <summary>
+        /// Gets the text of primary action. If value is null, the action is hidden.
+        /// </summary>
+        public string? PrimaryText { get; }
+
+        /// <summary>
+        /// Gets the text of secondary action. If value is null, the action is hidden.
+        /// </summary>
+        public string? SecondaryText { get; }
+    }
+}
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Views/MainViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Views/MainViewModel.cs
index b1f084e50..0930b3a79 100644
--- a/src/SecureFolderFS.Sdk/ViewModels/Views/MainViewModel.cs
+++ b/src/SecureFolderFS.Sdk/ViewModels/Views/MainViewModel.cs
@@ -1,5 +1,4 @@
 using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.DependencyInjection;
 using SecureFolderFS.Sdk.AppModels;
 using SecureFolderFS.Sdk.Attributes;
 using SecureFolderFS.Sdk.Enums;
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Views/Overlays/AgreementOverlayViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Views/Overlays/AgreementOverlayViewModel.cs
index 257822df0..a50b16694 100644
--- a/src/SecureFolderFS.Sdk/ViewModels/Views/Overlays/AgreementOverlayViewModel.cs
+++ b/src/SecureFolderFS.Sdk/ViewModels/Views/Overlays/AgreementOverlayViewModel.cs
@@ -3,7 +3,7 @@
 namespace SecureFolderFS.Sdk.ViewModels.Views.Overlays
 {
     [Bindable(true)]
-    public sealed class AgreementOverlayViewModel : OverlayViewModel
+    public sealed class AgreementOverlayViewModel : BaseDesignationViewModel
     {
     }
 }
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Views/Overlays/CredentialsOverlayViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Views/Overlays/CredentialsOverlayViewModel.cs
index 44aab9628..48c1527b5 100644
--- a/src/SecureFolderFS.Sdk/ViewModels/Views/Overlays/CredentialsOverlayViewModel.cs
+++ b/src/SecureFolderFS.Sdk/ViewModels/Views/Overlays/CredentialsOverlayViewModel.cs
@@ -20,14 +20,14 @@
 namespace SecureFolderFS.Sdk.ViewModels.Views.Overlays
 {
     [Bindable(true)]
-    [Inject<IVaultService>]
+    [Inject<IVaultService>, Inject<IVaultCredentialsService>]
     public sealed partial class CredentialsOverlayViewModel : OverlayViewModel, IAsyncInitialize, IDisposable
     {
         private readonly KeyChain _keyChain;
         private readonly IVaultModel _vaultModel;
         private readonly AuthenticationType _authenticationStage;
 
-        [ObservableProperty] private bool _CanContinue;
+        [ObservableProperty] private bool _CanContinue; // TODO: Use OverlayViewModel.IsPrimaryButtonEnabled
         [ObservableProperty] private LoginViewModel _LoginViewModel;
         [ObservableProperty] private RegisterViewModel _RegisterViewModel;
         [ObservableProperty] private CredentialsSelectionViewModel _SelectionViewModel;
@@ -55,7 +55,7 @@ public CredentialsOverlayViewModel(IVaultModel vaultModel, AuthenticationType au
         /// <inheritdoc/>
         public async Task InitAsync(CancellationToken cancellationToken = default)
         {
-            var loginMethods = VaultService.GetLoginAsync(_vaultModel.Folder, cancellationToken);
+            var loginMethods = VaultCredentialsService.GetLoginAsync(_vaultModel.Folder, cancellationToken);
             SelectionViewModel.ConfiguredViewModel = _authenticationStage switch
             {
                 AuthenticationType.FirstStageOnly => await loginMethods.FirstOrDefaultAsync(cancellationToken),
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Views/Overlays/CustomizationOverlayViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Views/Overlays/CustomizationOverlayViewModel.cs
new file mode 100644
index 000000000..9d2f6fa53
--- /dev/null
+++ b/src/SecureFolderFS.Sdk/ViewModels/Views/Overlays/CustomizationOverlayViewModel.cs
@@ -0,0 +1,16 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using System.ComponentModel;
+
+namespace SecureFolderFS.Sdk.ViewModels.Views.Overlays
+{
+    [Bindable(true)]
+    public sealed partial class CustomizationOverlayViewModel : OverlayViewModel
+    {
+        [ObservableProperty] private VaultViewModel _VaultViewModel;
+
+        public CustomizationOverlayViewModel(VaultViewModel vaultViewModel)
+        {
+            VaultViewModel = vaultViewModel;
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Views/Overlays/ExplanationOverlayViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Views/Overlays/ExplanationOverlayViewModel.cs
index 4b5bc73e7..517d9f5d9 100644
--- a/src/SecureFolderFS.Sdk/ViewModels/Views/Overlays/ExplanationOverlayViewModel.cs
+++ b/src/SecureFolderFS.Sdk/ViewModels/Views/Overlays/ExplanationOverlayViewModel.cs
@@ -22,7 +22,7 @@ public ExplanationOverlayViewModel()
         /// <inheritdoc/>
         public Task InitAsync(CancellationToken cancellationToken = default)
         {
-            // We don't want to await it, since it's an async based timer
+            // We don't want to await it, since the timer is supposed to run in the background
             _ = InitializeBlockingTimer(cancellationToken);
             return Task.CompletedTask;
         }
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Views/Overlays/MigrationOverlayViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Views/Overlays/MigrationOverlayViewModel.cs
index d4a76a312..09ddcd7ab 100644
--- a/src/SecureFolderFS.Sdk/ViewModels/Views/Overlays/MigrationOverlayViewModel.cs
+++ b/src/SecureFolderFS.Sdk/ViewModels/Views/Overlays/MigrationOverlayViewModel.cs
@@ -16,7 +16,7 @@
 namespace SecureFolderFS.Sdk.ViewModels.Views.Overlays
 {
     [Bindable(true)]
-    [Inject<IVaultManagerService>]
+    [Inject<IVaultService>]
     public sealed partial class MigrationOverlayViewModel : OverlayViewModel, IProgress<double>, IProgress<IResult>, INotifyStateChanged, IAsyncInitialize, IDisposable
     {
         private IDisposable? _unlockContract;
@@ -43,7 +43,7 @@ public MigrationOverlayViewModel(MigrationViewModel migrationViewModel)
         /// <inheritdoc/>
         public async Task InitAsync(CancellationToken cancellationToken = default)
         {
-            _vaultMigrator = await VaultManagerService.GetMigratorAsync(MigrationViewModel.VaultFolder, cancellationToken);
+            _vaultMigrator = await VaultService.GetMigratorAsync(MigrationViewModel.VaultFolder, cancellationToken);
         }
 
         /// <inheritdoc/>
@@ -102,8 +102,6 @@ private async Task MigrateAsync(CancellationToken cancellationToken)
                 SecondaryButtonEnabled = false;
 
                 // Await a short delay for better UX
-                #if !DEBUG
-                #endif
                 await Task.Delay(1000);
 
                 // Migrate
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Views/Overlays/NewItemOverlayViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Views/Overlays/NewItemOverlayViewModel.cs
new file mode 100644
index 000000000..a676b432c
--- /dev/null
+++ b/src/SecureFolderFS.Sdk/ViewModels/Views/Overlays/NewItemOverlayViewModel.cs
@@ -0,0 +1,19 @@
+using System.ComponentModel;
+using CommunityToolkit.Mvvm.ComponentModel;
+using SecureFolderFS.Shared.ComponentModel;
+
+namespace SecureFolderFS.Sdk.ViewModels.Views.Overlays
+{
+    [Bindable(true)]
+    public sealed partial class NewItemOverlayViewModel : OverlayViewModel, IViewable
+    {
+        [ObservableProperty] private string? _Message;
+        [ObservableProperty] private string? _ItemName;
+
+        public NewItemOverlayViewModel()
+        {
+            Title = "Set new name";
+            Message = "A new item will be created with the provided name.";
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Views/Overlays/OverlayViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Views/Overlays/OverlayViewModel.cs
index 97ae89b4d..552fe5b67 100644
--- a/src/SecureFolderFS.Sdk/ViewModels/Views/Overlays/OverlayViewModel.cs
+++ b/src/SecureFolderFS.Sdk/ViewModels/Views/Overlays/OverlayViewModel.cs
@@ -1,5 +1,5 @@
-using CommunityToolkit.Mvvm.ComponentModel;
-using SecureFolderFS.Shared.ComponentModel;
+using System;
+using CommunityToolkit.Mvvm.ComponentModel;
 using System.ComponentModel;
 
 namespace SecureFolderFS.Sdk.ViewModels.Views.Overlays
@@ -8,13 +8,9 @@ namespace SecureFolderFS.Sdk.ViewModels.Views.Overlays
     /// Serves as the base dialog view model containing reusable code for every dialog.
     /// </summary>
     [Bindable(true)]
-    public abstract partial class OverlayViewModel : ObservableObject, IViewDesignation
+    [Obsolete("Use BaseDesignationViewModel and IOverlayControls.")]
+    public abstract partial class OverlayViewModel : BaseDesignationViewModel
     {
-        /// <summary>
-        /// Gets or sets the title of the dialog.
-        /// </summary>
-        [ObservableProperty] private string? _Title;
-
         /// <summary>
         /// Gets or sets whether the primary button should be enabled or not.
         /// </summary>
@@ -39,15 +35,5 @@ public abstract partial class OverlayViewModel : ObservableObject, IViewDesignat
         /// Gets or sets the text of close button. If value is null, the button is hidden.
         /// </summary>
         [ObservableProperty] private string? _CloseButtonText;
-
-        /// <inheritdoc/>
-        public virtual void OnAppearing()
-        {
-        }
-
-        /// <inheritdoc/>
-        public virtual void OnDisappearing()
-        {
-        }
     }
 }
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Views/Overlays/PreviewerOverlayViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Views/Overlays/PreviewerOverlayViewModel.cs
new file mode 100644
index 000000000..5278af4ec
--- /dev/null
+++ b/src/SecureFolderFS.Sdk/ViewModels/Views/Overlays/PreviewerOverlayViewModel.cs
@@ -0,0 +1,48 @@
+using System;
+using System.ComponentModel;
+using System.Threading;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.ComponentModel;
+using OwlCore.Storage;
+using SecureFolderFS.Sdk.Enums;
+using SecureFolderFS.Sdk.Helpers;
+using SecureFolderFS.Sdk.ViewModels.Controls.Previewers;
+using SecureFolderFS.Shared.ComponentModel;
+
+namespace SecureFolderFS.Sdk.ViewModels.Views.Overlays
+{
+    [Bindable(true)]
+    public sealed partial class PreviewerOverlayViewModel : OverlayViewModel, IDisposable
+    {
+        [ObservableProperty] private IViewable? _PreviewerViewModel;
+
+        public async Task LoadFromStorableAsync(IStorable storable, CancellationToken cancellationToken = default)
+        {
+            // Only handle files for now
+            if (storable is not IFile file)
+                return;
+
+            var classification = FileTypeHelper.GetClassification(storable);
+            var previewer = (IAsyncInitialize?)(classification.TypeHint switch
+            {
+                TypeHint.Image => new ImagePreviewerViewModel(file),
+                TypeHint.Media => new VideoPreviewerViewModel(file),
+                TypeHint.PlainText => new TextPreviewerViewModel(file),
+                _ => null
+            });
+            
+            if (previewer is null)
+                return;
+
+            await previewer.InitAsync(cancellationToken);
+            (PreviewerViewModel as IDisposable)?.Dispose();
+            PreviewerViewModel = previewer as IViewable;
+        }
+        
+        /// <inheritdoc/>
+        public void Dispose()
+        {
+            (PreviewerViewModel as IDisposable)?.Dispose();
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Views/Overlays/RecoveryOverlayViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Views/Overlays/RecoveryOverlayViewModel.cs
index 98ae7d5dd..492790df8 100644
--- a/src/SecureFolderFS.Sdk/ViewModels/Views/Overlays/RecoveryOverlayViewModel.cs
+++ b/src/SecureFolderFS.Sdk/ViewModels/Views/Overlays/RecoveryOverlayViewModel.cs
@@ -8,6 +8,7 @@
 using System.ComponentModel;
 using System.Threading;
 using System.Threading.Tasks;
+using SecureFolderFS.Sdk.Extensions;
 
 namespace SecureFolderFS.Sdk.ViewModels.Views.Overlays
 {
@@ -17,6 +18,7 @@ public sealed partial class RecoveryOverlayViewModel : OverlayViewModel, IDispos
     {
         private readonly IFolder _vaultFolder;
 
+        [ObservableProperty] private string? _Message;
         [ObservableProperty] private string? _RecoveryKey;
         [ObservableProperty] private string? _ErrorMessage;
 
@@ -25,6 +27,8 @@ public sealed partial class RecoveryOverlayViewModel : OverlayViewModel, IDispos
         public RecoveryOverlayViewModel(IFolder vaultFolder)
         {
             ServiceProvider = DI.Default;
+            Title = "RecoverAccess".ToLocalized();
+            Message = "EnterRecoveryKey".ToLocalized();
             _vaultFolder = vaultFolder;
         }
 
@@ -40,7 +44,8 @@ public async Task<bool> RecoverAsync(CancellationToken cancellationToken)
             }
             catch (Exception)
             {
-                ErrorMessage = "The provided recovery key is invalid";
+                // TODO: Localize
+                ErrorMessage = "The provided recovery key is invalid.";
                 return false;
             }
         }
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Views/Overlays/RenameOverlayViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Views/Overlays/RenameOverlayViewModel.cs
new file mode 100644
index 000000000..e7aef18a0
--- /dev/null
+++ b/src/SecureFolderFS.Sdk/ViewModels/Views/Overlays/RenameOverlayViewModel.cs
@@ -0,0 +1,19 @@
+using System.ComponentModel;
+using CommunityToolkit.Mvvm.ComponentModel;
+using SecureFolderFS.Shared.ComponentModel;
+
+namespace SecureFolderFS.Sdk.ViewModels.Views.Overlays
+{
+    [Bindable(true)]
+    public sealed partial class RenameOverlayViewModel : ObservableObject, IViewable
+    {
+        [ObservableProperty] private string? _Title;
+        [ObservableProperty] private string? _Message;
+        [ObservableProperty] private string? _NewName;
+
+        public RenameOverlayViewModel(string? title)
+        {
+            Title = title;
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Views/Overlays/WizardOverlayViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Views/Overlays/WizardOverlayViewModel.cs
index 6fa9fed71..41d212b45 100644
--- a/src/SecureFolderFS.Sdk/ViewModels/Views/Overlays/WizardOverlayViewModel.cs
+++ b/src/SecureFolderFS.Sdk/ViewModels/Views/Overlays/WizardOverlayViewModel.cs
@@ -13,7 +13,8 @@
 
 namespace SecureFolderFS.Sdk.ViewModels.Views.Overlays
 {
-    public sealed partial class WizardOverlayViewModel: OverlayViewModel, INavigatable, IDisposable
+    [Bindable(true)]
+    public sealed partial class WizardOverlayViewModel : OverlayViewModel, INavigatable, IDisposable
     {
         [ObservableProperty] private BaseWizardViewModel? _CurrentViewModel;
 
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Views/Settings/PreferencesSettingsViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Views/Settings/PreferencesSettingsViewModel.cs
index d8bc25436..15c887754 100644
--- a/src/SecureFolderFS.Sdk/ViewModels/Views/Settings/PreferencesSettingsViewModel.cs
+++ b/src/SecureFolderFS.Sdk/ViewModels/Views/Settings/PreferencesSettingsViewModel.cs
@@ -23,6 +23,12 @@ public bool StartOnSystemStartup
             set => UserSettings.StartOnSystemStartup = value;
         }
 
+        public bool ReduceToBackground
+        {
+            get => UserSettings.ReduceToBackground;
+            set => UserSettings.ReduceToBackground = value;
+        }
+
         public bool ContinueOnLastVault
         {
             get => UserSettings.ContinueOnLastVault;
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Views/Settings/PrivacySettingsViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Views/Settings/PrivacySettingsViewModel.cs
index abc108afc..a6e9b789f 100644
--- a/src/SecureFolderFS.Sdk/ViewModels/Views/Settings/PrivacySettingsViewModel.cs
+++ b/src/SecureFolderFS.Sdk/ViewModels/Views/Settings/PrivacySettingsViewModel.cs
@@ -18,10 +18,16 @@ public PrivacySettingsViewModel()
             UserSettings.PropertyChanged += UserSettings_PropertyChanged;
         }
 
-        public bool AutoLockVaults
+        public bool DisableRecentAccess
         {
-            get => UserSettings.AutoLockVaults;
-            set => UserSettings.AutoLockVaults = value;
+            get => UserSettings.DisableRecentAccess;
+            set => UserSettings.DisableRecentAccess = value;
+        }
+
+        public bool LockOnSystemLock
+        {
+            get => UserSettings.LockOnSystemLock;
+            set => UserSettings.LockOnSystemLock = value;
         }
 
         public bool IsTelemetryEnabled
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Views/Vault/BaseDashboardViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Views/Vault/BaseDashboardViewModel.cs
deleted file mode 100644
index 0eea03ccb..000000000
--- a/src/SecureFolderFS.Sdk/ViewModels/Views/Vault/BaseDashboardViewModel.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using SecureFolderFS.Shared.ComponentModel;
-
-namespace SecureFolderFS.Sdk.ViewModels.Views.Vault
-{
-    /// <inheritdoc cref="IViewDesignation"/>
-    public abstract class BaseDashboardViewModel(UnlockedVaultViewModel unlockedVaultViewModel)
-        : BaseVaultViewModel(unlockedVaultViewModel.VaultModel)
-    {
-        /// <summary>
-        /// Gets the view model of the unlocked vault.
-        /// </summary>
-        public UnlockedVaultViewModel UnlockedVaultViewModel { get; } = unlockedVaultViewModel;
-    }
-}
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Views/Vault/BaseVaultViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Views/Vault/BaseVaultViewModel.cs
deleted file mode 100644
index 26f176549..000000000
--- a/src/SecureFolderFS.Sdk/ViewModels/Views/Vault/BaseVaultViewModel.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using SecureFolderFS.Sdk.Models;
-using SecureFolderFS.Shared.ComponentModel;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace SecureFolderFS.Sdk.ViewModels.Views.Vault
-{
-    /// <inheritdoc cref="IViewDesignation"/>
-    public abstract partial class BaseVaultViewModel(IVaultModel vaultModel)
-        : BaseDesignationViewModel, IAsyncInitialize, IDisposable
-    {
-        /// <summary>
-        /// Gets the vault model associated with the vault.
-        /// </summary>
-        public IVaultModel VaultModel { get; } = vaultModel;
-
-        /// <inheritdoc/>
-        public abstract Task InitAsync(CancellationToken cancellationToken = default);
-
-        /// <inheritdoc/>
-        public virtual void Dispose()
-        {
-        }
-    }
-}
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Views/Vault/VaultDashboardViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Views/Vault/VaultDashboardViewModel.cs
index c41930a5b..4b024f5db 100644
--- a/src/SecureFolderFS.Sdk/ViewModels/Views/Vault/VaultDashboardViewModel.cs
+++ b/src/SecureFolderFS.Sdk/ViewModels/Views/Vault/VaultDashboardViewModel.cs
@@ -1,46 +1,59 @@
-using System.ComponentModel;
-using System.Threading;
-using System.Threading.Tasks;
-using CommunityToolkit.Mvvm.Input;
+using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
+using SecureFolderFS.Sdk.Contexts;
 using SecureFolderFS.Sdk.Extensions;
 using SecureFolderFS.Sdk.Messages;
 using SecureFolderFS.Sdk.Services;
 using SecureFolderFS.Shared.ComponentModel;
+using System;
+using System.ComponentModel;
+using System.Threading.Tasks;
 
 namespace SecureFolderFS.Sdk.ViewModels.Views.Vault
 {
     [Bindable(true)]
-    public sealed partial class VaultDashboardViewModel : BaseDashboardViewModel, IRecipient<VaultLockedMessage>
+    public sealed partial class VaultDashboardViewModel : BaseDesignationViewModel, IRecipient<VaultLockedMessage>, IUnlockedViewContext, IDisposable
     {
         public INavigationService VaultNavigation { get; }
         
         public INavigationService DashboardNavigation { get; }
 
+        /// <inheritdoc/>
+        public UnlockedVaultViewModel UnlockedVaultViewModel { get; }
+
+        /// <inheritdoc/>
+        public VaultViewModel VaultViewModel => UnlockedVaultViewModel.VaultViewModel;
+
         public VaultDashboardViewModel(UnlockedVaultViewModel unlockedVaultViewModel, INavigationService vaultNavigation, INavigationService dashboardNavigation)
-            : base(unlockedVaultViewModel)
         {
+            UnlockedVaultViewModel = unlockedVaultViewModel;
             VaultNavigation = vaultNavigation;
             DashboardNavigation = dashboardNavigation;
             DashboardNavigation.NavigationChanged += DashboardNavigation_NavigationChanged;
+            VaultViewModel.PropertyChanged += VaultViewModel_PropertyChanged;
 
             WeakReferenceMessenger.Default.Register(this);
         }
 
-        /// <inheritdoc/>
-        public override Task InitAsync(CancellationToken cancellationToken = default)
-        {
-            return Task.CompletedTask;
-        }
-
         /// <inheritdoc/>
         public void Receive(VaultLockedMessage message)
         {
             // Free resources that are used by the dashboard
-            if (VaultModel.Equals(message.VaultModel))
+            if (UnlockedVaultViewModel.VaultViewModel.VaultModel.Equals(message.VaultModel))
                 Dispose();
         }
 
+        private void VaultViewModel_PropertyChanged(object? sender, PropertyChangedEventArgs e)
+        {
+            if (DashboardNavigation.CurrentView is not VaultOverviewViewModel)
+                return;
+
+            if (e.PropertyName != nameof(VaultViewModel.VaultName))
+                return;
+
+            Title = VaultViewModel.VaultName;
+        }
+
         [RelayCommand]
         private async Task GoBackAsync()
         {
@@ -58,8 +71,10 @@ private void DashboardNavigation_NavigationChanged(object? sender, IViewDesignat
         }
 
         /// <inheritdoc/>
-        public override void Dispose()
+        public void Dispose()
         {
+            WeakReferenceMessenger.Default.UnregisterAll(this);
+            VaultViewModel.PropertyChanged -= VaultViewModel_PropertyChanged;
             DashboardNavigation.NavigationChanged -= DashboardNavigation_NavigationChanged;
             DashboardNavigation.Dispose();
         }
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Views/Vault/VaultHealthReportViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Views/Vault/VaultHealthReportViewModel.cs
new file mode 100644
index 000000000..222d14b18
--- /dev/null
+++ b/src/SecureFolderFS.Sdk/ViewModels/Views/Vault/VaultHealthReportViewModel.cs
@@ -0,0 +1,122 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using SecureFolderFS.Sdk.Attributes;
+using SecureFolderFS.Sdk.Contexts;
+using SecureFolderFS.Sdk.Enums;
+using SecureFolderFS.Sdk.Extensions;
+using SecureFolderFS.Sdk.Services;
+using SecureFolderFS.Sdk.ViewModels.Controls.Widgets.Health;
+using SecureFolderFS.Shared;
+using SecureFolderFS.Shared.ComponentModel;
+using SecureFolderFS.Shared.Extensions;
+using System;
+using System.Collections;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows.Input;
+
+namespace SecureFolderFS.Sdk.ViewModels.Views.Vault
+{
+    [Bindable(true)]
+    [Inject<IVaultFileSystemService>]
+    public sealed partial class VaultHealthReportViewModel : BaseDesignationViewModel, IUnlockedViewContext, IDisposable
+    {
+        private readonly SynchronizationContext? _context;
+
+        [ObservableProperty] private bool _CanResolve;
+        [ObservableProperty] private bool _IsProgressing;
+        [ObservableProperty] private double _CurrentProgress;
+        [ObservableProperty] private SeverityType _Severity;
+        [ObservableProperty] private ICommand? _StartScanningCommand;
+        [ObservableProperty] private ObservableCollection<HealthIssueViewModel> _FoundIssues;
+
+        /// <inheritdoc/>
+        public UnlockedVaultViewModel UnlockedVaultViewModel { get; }
+
+        /// <inheritdoc/>
+        public VaultViewModel VaultViewModel => UnlockedVaultViewModel.VaultViewModel;
+
+        public VaultHealthReportViewModel(UnlockedVaultViewModel unlockedVaultViewModel, SynchronizationContext? context)
+        {
+            ServiceProvider = DI.Default;
+            UnlockedVaultViewModel = unlockedVaultViewModel;
+            Title = "HealthReport".ToLocalized();
+            FoundIssues = new();
+            FoundIssues.CollectionChanged += FoundIssues_CollectionChanged;
+            _context = context;
+        }
+
+        partial void OnIsProgressingChanged(bool value)
+        {
+            _ = value;
+            UpdateSeverity(FoundIssues);
+        }
+
+        [RelayCommand]
+        private async Task ResolveAsync(CancellationToken cancellationToken)
+        {
+            // Get the readonly status and set IsReadOnly to true
+            var isReadOnly = UnlockedVaultViewModel.Options.IsReadOnly;
+            UnlockedVaultViewModel.Options.DangerousSetReadOnly(true);
+
+            // Resolve issues and restore readonly status
+            await VaultFileSystemService.ResolveIssuesAsync(FoundIssues, UnlockedVaultViewModel.StorageRoot, IssueResolved, cancellationToken);
+            UnlockedVaultViewModel.Options.DangerousSetReadOnly(isReadOnly);
+        }
+
+        private void IssueResolved(HealthIssueViewModel issueViewModel, IResult result)
+        {
+            if (result.Successful)
+                FoundIssues.RemoveMatch(x => x.Inner.Id == issueViewModel.Inner.Id);
+        }
+
+        private void FoundIssues_CollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
+        {
+            if (IsProgressing)
+                return;
+
+            UpdateSeverity(e is
+            {
+                Action:
+                    NotifyCollectionChangedAction.Add or
+                    NotifyCollectionChangedAction.Replace or
+                    NotifyCollectionChangedAction.Move,
+                NewItems: not null
+            } ? e.NewItems : FoundIssues);
+        }
+
+        private void UpdateSeverity(IEnumerable enumerable)
+        {
+#pragma warning disable MVVMTK0034
+            var severity = Severity;
+            if (severity != SeverityType.Success && FoundIssues.IsEmpty())
+            {
+                _Severity = SeverityType.Success;
+                _context?.Post(_ => OnPropertyChanged(nameof(Severity)), null);
+                return;
+            }
+
+            foreach (HealthIssueViewModel item in enumerable)
+            {
+                if (severity < item.Severity)
+                    severity = item.Severity;
+            }
+
+            if (Severity != severity)
+            {
+                _Severity = severity;
+                _context?.Post(_ => OnPropertyChanged(nameof(Severity)), null);
+            }
+#pragma warning restore MVVMTK0034
+        }
+
+        /// <inheritdoc/>
+        public void Dispose()
+        {
+            FoundIssues.CollectionChanged -= FoundIssues_CollectionChanged;
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Views/Vault/VaultLoginViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Views/Vault/VaultLoginViewModel.cs
index a425c65f4..38ba046cd 100644
--- a/src/SecureFolderFS.Sdk/ViewModels/Views/Vault/VaultLoginViewModel.cs
+++ b/src/SecureFolderFS.Sdk/ViewModels/Views/Vault/VaultLoginViewModel.cs
@@ -1,12 +1,10 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
-using CommunityToolkit.Mvvm.Messaging;
 using SecureFolderFS.Sdk.Attributes;
+using SecureFolderFS.Sdk.Contexts;
 using SecureFolderFS.Sdk.Enums;
 using SecureFolderFS.Sdk.EventArguments;
 using SecureFolderFS.Sdk.Extensions;
-using SecureFolderFS.Sdk.Messages;
-using SecureFolderFS.Sdk.Models;
 using SecureFolderFS.Sdk.Services;
 using SecureFolderFS.Sdk.ViewModels.Controls;
 using SecureFolderFS.Sdk.ViewModels.Views.Overlays;
@@ -23,27 +21,31 @@ namespace SecureFolderFS.Sdk.ViewModels.Views.Vault
 {
     [Inject<IOverlayService>, Inject<ISettingsService>, Inject<IVaultManagerService>]
     [Bindable(true)]
-    public sealed partial class VaultLoginViewModel : BaseVaultViewModel, INavigatable
+    public sealed partial class VaultLoginViewModel : BaseDesignationViewModel, IVaultViewContext, INavigatable, IAsyncInitialize, IDisposable
     {
+        [ObservableProperty] private bool _IsReadOnly;
         [ObservableProperty] private LoginViewModel _LoginViewModel;
 
         public INavigationService VaultNavigation { get; }
 
+        /// <inheritdoc/>
+        public VaultViewModel VaultViewModel { get; }
+
         /// <inheritdoc/>
         public event EventHandler<NavigationRequestedEventArgs>? NavigationRequested;
 
-        public VaultLoginViewModel(IVaultModel vaultModel, INavigationService vaultNavigation)
-            : base(vaultModel)
+        public VaultLoginViewModel(VaultViewModel vaultViewModel, INavigationService vaultNavigation)
         {
             ServiceProvider = DI.Default;
-            Title = vaultModel.VaultName;
+            Title = vaultViewModel.VaultName;
             VaultNavigation = vaultNavigation;
-            _LoginViewModel = new(vaultModel, LoginViewType.Full);
+            VaultViewModel = vaultViewModel;
+            _LoginViewModel = new(vaultViewModel.VaultModel, LoginViewType.Full);
             _LoginViewModel.VaultUnlocked += LoginViewModel_VaultUnlocked;
         }
 
         /// <inheritdoc/>
-        public override async Task InitAsync(CancellationToken cancellationToken = default)
+        public async Task InitAsync(CancellationToken cancellationToken = default)
         {
             await LoginViewModel.InitAsync(cancellationToken);
         }
@@ -51,13 +53,13 @@ public override async Task InitAsync(CancellationToken cancellationToken = defau
         [RelayCommand]
         private async Task BeginRecoveryAsync(CancellationToken cancellationToken)
         {
-            var recoveryOverlay = new RecoveryOverlayViewModel(VaultModel.Folder);
+            var recoveryOverlay = new RecoveryOverlayViewModel(VaultViewModel.VaultModel.Folder);
             var result = await OverlayService.ShowAsync(recoveryOverlay);
-            if (!result.Positive())
-                return;
-
-            if (recoveryOverlay.UnlockContract is null)
+            if (!result.Positive() || recoveryOverlay.UnlockContract is null)
+            {
+                recoveryOverlay.Dispose();
                 return;
+            }
 
             await UnlockAsync(recoveryOverlay.UnlockContract);
         }
@@ -66,17 +68,8 @@ private async Task UnlockAsync(IDisposable unlockContract)
         {
             try
             {
-                // Create the storage layer
-                var storageRoot = await VaultManagerService.CreateFileSystemAsync(VaultModel, unlockContract, default);
-
-                // Update last access date
-                await VaultModel.SetLastAccessDateAsync(DateTime.Now);
-
-                // Notify that the vault has been unlocked
-                WeakReferenceMessenger.Default.Send(new VaultUnlockedMessage(VaultModel));
-
                 // Navigate away
-                var unlockedVaultViewModel = new UnlockedVaultViewModel(storageRoot, VaultModel);
+                var unlockedVaultViewModel = await VaultViewModel.UnlockAsync(unlockContract, IsReadOnly);
                 NavigationRequested?.Invoke(this, new UnlockNavigationRequestedEventArgs(unlockedVaultViewModel, this));
 
                 // Show vault tutorial
@@ -103,7 +96,7 @@ private async void LoginViewModel_VaultUnlocked(object? sender, VaultUnlockedEve
         }
 
         /// <inheritdoc/>
-        public override void Dispose()
+        public void Dispose()
         {
             LoginViewModel.VaultUnlocked -= LoginViewModel_VaultUnlocked;
             LoginViewModel.Dispose();
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Views/Vault/VaultOverviewViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Views/Vault/VaultOverviewViewModel.cs
index dee1b41fd..ff8f06621 100644
--- a/src/SecureFolderFS.Sdk/ViewModels/Views/Vault/VaultOverviewViewModel.cs
+++ b/src/SecureFolderFS.Sdk/ViewModels/Views/Vault/VaultOverviewViewModel.cs
@@ -1,9 +1,12 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using SecureFolderFS.Sdk.Attributes;
+using SecureFolderFS.Sdk.Contexts;
 using SecureFolderFS.Sdk.Services;
 using SecureFolderFS.Sdk.ViewModels.Controls;
 using SecureFolderFS.Sdk.ViewModels.Controls.Widgets;
 using SecureFolderFS.Shared;
+using SecureFolderFS.Shared.ComponentModel;
+using System;
 using System.ComponentModel;
 using System.Threading;
 using System.Threading.Tasks;
@@ -12,22 +15,29 @@ namespace SecureFolderFS.Sdk.ViewModels.Views.Vault
 {
     [Inject<ISettingsService>, Inject<IFileExplorerService>]
     [Bindable(true)]
-    public sealed partial class VaultOverviewViewModel : BaseDashboardViewModel
+    public sealed partial class VaultOverviewViewModel : BaseDesignationViewModel, IUnlockedViewContext, IAsyncInitialize, IDisposable
     {
         [ObservableProperty] private WidgetsListViewModel _WidgetsViewModel;
         [ObservableProperty] private VaultControlsViewModel _VaultControlsViewModel;
 
+        /// <inheritdoc/>
+        public UnlockedVaultViewModel UnlockedVaultViewModel { get; }
+
+        /// <inheritdoc/>
+        public VaultViewModel VaultViewModel => UnlockedVaultViewModel.VaultViewModel;
+
         public VaultOverviewViewModel(UnlockedVaultViewModel unlockedVaultViewModel, VaultControlsViewModel vaultControlsViewModel, WidgetsListViewModel widgetsViewModel)
-            : base(unlockedVaultViewModel)
         {
             ServiceProvider = DI.Default;
+            UnlockedVaultViewModel = unlockedVaultViewModel;
             WidgetsViewModel = widgetsViewModel;
             VaultControlsViewModel = vaultControlsViewModel;
-            Title = UnlockedVaultViewModel.VaultModel.VaultName;
+            Title = unlockedVaultViewModel.VaultViewModel.VaultName;
+            VaultViewModel.PropertyChanged += VaultViewModel_PropertyChanged;
         }
 
         /// <inheritdoc/>
-        public override async Task InitAsync(CancellationToken cancellationToken = default)
+        public async Task InitAsync(CancellationToken cancellationToken = default)
         {
             if (SettingsService.UserSettings.OpenFolderOnUnlock)
                 _ = FileExplorerService.TryOpenInFileExplorerAsync(UnlockedVaultViewModel.StorageRoot.Inner, cancellationToken);
@@ -35,10 +45,21 @@ public override async Task InitAsync(CancellationToken cancellationToken = defau
             await WidgetsViewModel.InitAsync(cancellationToken);
         }
 
+        private void VaultViewModel_PropertyChanged(object? sender, PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName != nameof(VaultViewModel.VaultName))
+                return;
+
+            Title = VaultViewModel.VaultName;
+        }
+
+
         /// <inheritdoc/>
-        public override void Dispose()
+        public void Dispose()
         {
             WidgetsViewModel.Dispose();
+            VaultViewModel.PropertyChanged -= VaultViewModel_PropertyChanged;
+            VaultControlsViewModel.Dispose();
         }
     }
 }
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Views/Vault/VaultPropertiesViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Views/Vault/VaultPropertiesViewModel.cs
index fb2c3fe6b..9f3d822af 100644
--- a/src/SecureFolderFS.Sdk/ViewModels/Views/Vault/VaultPropertiesViewModel.cs
+++ b/src/SecureFolderFS.Sdk/ViewModels/Views/Vault/VaultPropertiesViewModel.cs
@@ -1,12 +1,13 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using SecureFolderFS.Sdk.Attributes;
+using SecureFolderFS.Sdk.Contexts;
 using SecureFolderFS.Sdk.Enums;
 using SecureFolderFS.Sdk.Extensions;
 using SecureFolderFS.Sdk.Services;
-using SecureFolderFS.Sdk.ViewModels.Views.Credentials;
 using SecureFolderFS.Sdk.ViewModels.Views.Overlays;
 using SecureFolderFS.Shared;
+using SecureFolderFS.Shared.ComponentModel;
 using System.ComponentModel;
 using System.Linq;
 using System.Threading;
@@ -14,29 +15,37 @@
 
 namespace SecureFolderFS.Sdk.ViewModels.Views.Vault
 {
-    [Inject<IOverlayService>, Inject<IVaultService>]
+    [Inject<IOverlayService>, Inject<IVaultService>, Inject<IVaultCredentialsService>]
     [Bindable(true)]
-    public sealed partial class VaultPropertiesViewModel : BaseDashboardViewModel
+    public sealed partial class VaultPropertiesViewModel : BaseDesignationViewModel, IUnlockedViewContext, IAsyncInitialize
     {
         [ObservableProperty] private string? _SecurityText;
         [ObservableProperty] private string? _ContentCipherText;
         [ObservableProperty] private string? _FileNameCipherText;
         [ObservableProperty] private string? _ActiveFileSystemText;
+        [ObservableProperty] private string? _FileSystemDescriptionText;
+
+        /// <inheritdoc/>
+        public UnlockedVaultViewModel UnlockedVaultViewModel { get; }
+
+        /// <inheritdoc/>
+        public VaultViewModel VaultViewModel => UnlockedVaultViewModel.VaultViewModel;
 
         public VaultPropertiesViewModel(UnlockedVaultViewModel unlockedVaultViewModel)
-            : base(unlockedVaultViewModel)
         {
             ServiceProvider = DI.Default;
+            UnlockedVaultViewModel = unlockedVaultViewModel;
             Title = "VaultProperties".ToLocalized();
         }
 
         /// <inheritdoc/>
-        public override async Task InitAsync(CancellationToken cancellationToken = default)
+        public async Task InitAsync(CancellationToken cancellationToken = default)
         {
-            var vaultOptions = await VaultService.GetVaultOptionsAsync(UnlockedVaultViewModel.VaultModel.Folder, cancellationToken);
+            var vaultOptions = await VaultService.GetVaultOptionsAsync(UnlockedVaultViewModel.VaultViewModel.VaultModel.Folder, cancellationToken);
             ContentCipherText = string.IsNullOrEmpty(vaultOptions.ContentCipherId) ? "NoEncryption".ToLocalized() : (vaultOptions.ContentCipherId ?? "Unknown");
-            FileNameCipherText = string.IsNullOrEmpty(vaultOptions.FileNameCipherId) ? "NoEncryption".ToLocalized() : (vaultOptions.FileNameCipherId ?? "Unknown");
+            FileNameCipherText = string.IsNullOrEmpty(vaultOptions.FileNameCipherId) ? "NoEncryption".ToLocalized() : (vaultOptions.FileNameCipherId ?? "Unknown") + $" + {vaultOptions.NameEncodingId}";
             ActiveFileSystemText = UnlockedVaultViewModel.StorageRoot.FileSystemName;
+            FileSystemDescriptionText = UnlockedVaultViewModel.StorageRoot.Options.GetDescription();
 
             await UpdateSecurityTextAsync(cancellationToken);
         }
@@ -44,7 +53,7 @@ public override async Task InitAsync(CancellationToken cancellationToken = defau
         [RelayCommand]
         private async Task ChangeFirstAuthenticationAsync(CancellationToken cancellationToken)
         {
-            using var credentialsOverlay = new CredentialsOverlayViewModel(UnlockedVaultViewModel.VaultModel, AuthenticationType.FirstStageOnly);
+            using var credentialsOverlay = new CredentialsOverlayViewModel(UnlockedVaultViewModel.VaultViewModel.VaultModel, AuthenticationType.FirstStageOnly);
             await credentialsOverlay.InitAsync(cancellationToken);
             await OverlayService.ShowAsync(credentialsOverlay);
             await UpdateSecurityTextAsync(cancellationToken);
@@ -53,7 +62,7 @@ private async Task ChangeFirstAuthenticationAsync(CancellationToken cancellation
         [RelayCommand]
         private async Task ChangeSecondAuthenticationAsync(CancellationToken cancellationToken)
         {
-            using var credentialsOverlay = new CredentialsOverlayViewModel(UnlockedVaultViewModel.VaultModel, AuthenticationType.ProceedingStageOnly);
+            using var credentialsOverlay = new CredentialsOverlayViewModel(UnlockedVaultViewModel.VaultViewModel.VaultModel, AuthenticationType.ProceedingStageOnly);
             await credentialsOverlay.InitAsync(cancellationToken);
             await OverlayService.ShowAsync(credentialsOverlay);
             await UpdateSecurityTextAsync(cancellationToken);
@@ -62,7 +71,7 @@ private async Task ChangeSecondAuthenticationAsync(CancellationToken cancellatio
         [RelayCommand]
         private async Task ViewRecoveryAsync(CancellationToken cancellationToken)
         {
-            using var previewRecoveryOverlay = new PreviewRecoveryOverlayViewModel(UnlockedVaultViewModel.VaultModel);
+            using var previewRecoveryOverlay = new PreviewRecoveryOverlayViewModel(UnlockedVaultViewModel.VaultViewModel.VaultModel);
 
             await previewRecoveryOverlay.InitAsync(cancellationToken);
             await OverlayService.ShowAsync(previewRecoveryOverlay);
@@ -70,8 +79,8 @@ private async Task ViewRecoveryAsync(CancellationToken cancellationToken)
 
         private async Task UpdateSecurityTextAsync(CancellationToken cancellationToken)
         {
-            var items = await VaultService.GetLoginAsync(UnlockedVaultViewModel.VaultModel.Folder, cancellationToken).ToArrayAsync(cancellationToken);
-            SecurityText = string.Join(" + ", items.Select(x => x.DisplayName));
+            var items = await VaultCredentialsService.GetLoginAsync(UnlockedVaultViewModel.VaultViewModel.VaultModel.Folder, cancellationToken).ToArrayAsync(cancellationToken);
+            SecurityText = string.Join(" + ", items.Select(x => x.Title));
         }
     }
 }
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Views/Wizard/BaseWizardViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Views/Wizard/BaseWizardViewModel.cs
index c535072d1..a38fd27dc 100644
--- a/src/SecureFolderFS.Sdk/ViewModels/Views/Wizard/BaseWizardViewModel.cs
+++ b/src/SecureFolderFS.Sdk/ViewModels/Views/Wizard/BaseWizardViewModel.cs
@@ -7,7 +7,7 @@
 namespace SecureFolderFS.Sdk.ViewModels.Views.Wizard
 {
     [Bindable(true)]
-    public abstract partial class BaseWizardViewModel : ObservableObject, IViewDesignation
+    public abstract partial class BaseWizardViewModel : ObservableObject, IViewDesignation // TODO: Use IOverlayControls
     {
         /// <inheritdoc cref="IViewable.Title"/>
         [ObservableProperty] private string? _Title;
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Views/Wizard/CredentialsWizardViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Views/Wizard/CredentialsWizardViewModel.cs
index 87082a107..7cf29ee20 100644
--- a/src/SecureFolderFS.Sdk/ViewModels/Views/Wizard/CredentialsWizardViewModel.cs
+++ b/src/SecureFolderFS.Sdk/ViewModels/Views/Wizard/CredentialsWizardViewModel.cs
@@ -22,17 +22,19 @@
 
 namespace SecureFolderFS.Sdk.ViewModels.Views.Wizard
 {
-    [Inject<IVaultService>, Inject<IVaultManagerService>]
+    [Inject<IVaultCredentialsService>, Inject<IVaultManagerService>, Inject<IVaultService>]
     [Bindable(true)]
     public sealed partial class CredentialsWizardViewModel : BaseWizardViewModel
     {
         private readonly string _vaultId;
         private readonly TaskCompletionSource<IKey> _credentialsTcs;
 
-        [ObservableProperty] private CipherViewModel? _ContentCipher;
-        [ObservableProperty] private CipherViewModel? _FileNameCipher;
-        [ObservableProperty] private ObservableCollection<CipherViewModel> _ContentCiphers = new();
-        [ObservableProperty] private ObservableCollection<CipherViewModel> _FileNameCiphers = new();
+        [ObservableProperty] private VaultOptionViewModel? _ContentCipher;
+        [ObservableProperty] private VaultOptionViewModel? _FileNameCipher;
+        [ObservableProperty] private VaultOptionViewModel? _EncodingOption;
+        [ObservableProperty] private ObservableCollection<VaultOptionViewModel> _ContentCiphers = new();
+        [ObservableProperty] private ObservableCollection<VaultOptionViewModel> _FileNameCiphers = new();
+        [ObservableProperty] private ObservableCollection<VaultOptionViewModel> _EncodingOptions = new();
         [ObservableProperty] private ObservableCollection<AuthenticationViewModel> _AuthenticationOptions = new();
         [ObservableProperty] private RegisterViewModel _RegisterViewModel;
 
@@ -61,6 +63,7 @@ public override async Task<IResult> TryContinueAsync(CancellationToken cancellat
         {
             ArgumentNullException.ThrowIfNull(ContentCipher);
             ArgumentNullException.ThrowIfNull(FileNameCipher);
+            ArgumentNullException.ThrowIfNull(EncodingOption);
             ArgumentNullException.ThrowIfNull(RegisterViewModel.CurrentViewModel);
 
             // Await the credentials
@@ -74,6 +77,7 @@ public override async Task<IResult> TryContinueAsync(CancellationToken cancellat
                 {
                     ContentCipherId = ContentCipher.Id,
                     FileNameCipherId = FileNameCipher.Id,
+                    NameEncodingId = EncodingOption.Id,
                     AuthenticationMethod = [ RegisterViewModel.CurrentViewModel.Id ],
                     VaultId = _vaultId
                 };
@@ -98,24 +102,26 @@ public override Task<IResult> TryCancelAsync(CancellationToken cancellationToken
         /// <inheritdoc/>
         public override async void OnAppearing()
         {
-            // Get ciphers
-            EnumerateCiphers(VaultService.GetContentCiphers(), ContentCiphers);
-            EnumerateCiphers(VaultService.GetFileNameCiphers(), FileNameCiphers);
+            // Get options
+            EnumerateOptions(VaultService.GetEncodingOptions(), EncodingOptions);
+            EnumerateOptions(VaultCredentialsService.GetContentCiphers(), ContentCiphers);
+            EnumerateOptions(VaultCredentialsService.GetFileNameCiphers(), FileNameCiphers);
 
             // Set default cipher options
             ContentCipher = ContentCiphers.FirstOrDefault();
             FileNameCipher = FileNameCiphers.FirstOrDefault();
+            EncodingOption = EncodingOptions.FirstOrDefault();
 
             // Get authentication options
             AuthenticationOptions.Clear();
-            await foreach (var item in VaultService.GetCreationAsync(Folder, _vaultId))
+            await foreach (var item in VaultCredentialsService.GetCreationAsync(Folder, _vaultId))
                 AuthenticationOptions.Add(item);
 
             // Set default authentication option
             RegisterViewModel.CurrentViewModel = AuthenticationOptions.FirstOrDefault();
             return;
 
-            static void EnumerateCiphers(IEnumerable<string> source, ICollection<CipherViewModel> destination)
+            static void EnumerateOptions(IEnumerable<string> source, ICollection<VaultOptionViewModel> destination)
             {
                 destination.Clear();
                 foreach (var item in source)
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Views/Wizard/LocationWizardViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Views/Wizard/LocationWizardViewModel.cs
index 9f9bb61f7..64d740a2c 100644
--- a/src/SecureFolderFS.Sdk/ViewModels/Views/Wizard/LocationWizardViewModel.cs
+++ b/src/SecureFolderFS.Sdk/ViewModels/Views/Wizard/LocationWizardViewModel.cs
@@ -5,14 +5,17 @@
 using SecureFolderFS.Sdk.Enums;
 using SecureFolderFS.Sdk.Extensions;
 using SecureFolderFS.Sdk.Helpers;
+using SecureFolderFS.Sdk.Models;
 using SecureFolderFS.Sdk.Services;
 using SecureFolderFS.Shared;
 using SecureFolderFS.Shared.ComponentModel;
 using SecureFolderFS.Shared.Extensions;
 using SecureFolderFS.Shared.Models;
 using System.ComponentModel;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using SecureFolderFS.Storage;
 
 namespace SecureFolderFS.Sdk.ViewModels.Views.Wizard
 {
@@ -20,19 +23,21 @@ namespace SecureFolderFS.Sdk.ViewModels.Views.Wizard
     [Bindable(true)]
     public sealed partial class LocationWizardViewModel : BaseWizardViewModel
     {
+        private readonly IVaultCollectionModel _vaultCollectionModel;
+
         [ObservableProperty] private string? _Message;
         [ObservableProperty] private string? _SelectedLocation;
-        [ObservableProperty] private ViewSeverityType _Severity;
+        [ObservableProperty] private SeverityType _Severity;
 
         public NewVaultCreationType CreationType { get; }
 
         public IFolder? SelectedFolder { get; private set; }
 
-        public LocationWizardViewModel(NewVaultCreationType creationType)
+        public LocationWizardViewModel(IVaultCollectionModel vaultCollectionModel, NewVaultCreationType creationType)
         {
             ServiceProvider = DI.Default;
+            _vaultCollectionModel = vaultCollectionModel;
             CreationType = creationType;
-
             CanCancel = true;
             CanContinue = false;
             CancelText = "Cancel".ToLocalized();
@@ -64,7 +69,11 @@ public override async void OnAppearing()
         [RelayCommand]
         private async Task SelectLocationAsync(CancellationToken cancellationToken)
         {
-            SelectedFolder = await FileExplorerService.PickFolderAsync(cancellationToken);
+            // Remove previous bookmark
+            if (SelectedFolder is IBookmark bookmark)
+                await bookmark.RemoveBookmarkAsync(cancellationToken);
+            
+            SelectedFolder = await FileExplorerService.PickFolderAsync(true, cancellationToken);
             CanContinue = await UpdateStatusAsync(cancellationToken);
         }
 
@@ -72,13 +81,23 @@ public async Task<bool> UpdateStatusAsync(CancellationToken cancellationToken =
         {
             try
             {
+                // No folder selected
                 if (SelectedFolder is null)
                 {
-                    Severity = ViewSeverityType.Default;
+                    Severity = SeverityType.Default;
                     Message = "SelectFolderToContinue".ToLocalized();
                     return false;
                 }
 
+                // Check for duplicates
+                var isDuplicate = _vaultCollectionModel.Any(x => x.Folder.Id == SelectedFolder.Id);
+                if (isDuplicate)
+                {
+                    Severity = SeverityType.Warning;
+                    Message = "VaultAlreadyExists".ToLocalized();
+                    return false;
+                }
+
                 // Validate vault
                 var result = CreationType == NewVaultCreationType.AddExisting
                     ? await ValidationHelpers.ValidateExistingVault(SelectedFolder, cancellationToken)
diff --git a/src/SecureFolderFS.Sdk/ViewModels/Views/Wizard/MainWizardViewModel.cs b/src/SecureFolderFS.Sdk/ViewModels/Views/Wizard/MainWizardViewModel.cs
index e698f1b9c..46abe4b95 100644
--- a/src/SecureFolderFS.Sdk/ViewModels/Views/Wizard/MainWizardViewModel.cs
+++ b/src/SecureFolderFS.Sdk/ViewModels/Views/Wizard/MainWizardViewModel.cs
@@ -1,6 +1,7 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using SecureFolderFS.Sdk.Enums;
 using SecureFolderFS.Sdk.Extensions;
+using SecureFolderFS.Sdk.Models;
 using SecureFolderFS.Shared.ComponentModel;
 using SecureFolderFS.Shared.Models;
 using System.ComponentModel;
@@ -14,8 +15,11 @@ public sealed partial class MainWizardViewModel : BaseWizardViewModel
     {
         [ObservableProperty] private NewVaultCreationType _CreationType;
 
-        public MainWizardViewModel()
+        public IVaultCollectionModel VaultCollectionModel { get; }
+
+        public MainWizardViewModel(IVaultCollectionModel vaultCollectionModel)
         {
+            VaultCollectionModel = vaultCollectionModel;
             CanCancel = true;
             CanContinue = true;
             Title = "AddNewVault".ToLocalized();
diff --git a/src/SecureFolderFS.Shared/ComponentModel/IAsyncValidator.cs b/src/SecureFolderFS.Shared/ComponentModel/IAsyncValidator.cs
index 1be3bed30..beaa3a91c 100644
--- a/src/SecureFolderFS.Shared/ComponentModel/IAsyncValidator.cs
+++ b/src/SecureFolderFS.Shared/ComponentModel/IAsyncValidator.cs
@@ -17,4 +17,20 @@ public interface IAsyncValidator<in T>
         /// <returns>A <see cref="Task"/> that represents the asynchronous operation.</returns>
         Task ValidateAsync(T value, CancellationToken cancellationToken = default);
     }
+
+    /// <summary>
+    /// Provides data validation abstractions for <typeparamref name="T"/> data.
+    /// </summary>
+    /// <typeparam name="T">The type of data validated.</typeparam>
+    /// <typeparam name="TResult">The result of the validation.</typeparam>
+    public interface IAsyncValidator<in T, TResult> : IAsyncValidator<T>
+    {
+        /// <summary>
+        /// Validates <paramref name="value"/> and returns <see cref="TResult"/> of validation.
+        /// </summary>
+        /// <param name="value">The value to validate.</param>
+        /// <param name="cancellationToken">A <see cref="CancellationToken"/> that cancels this action.</param>
+        /// <returns>A <see cref="Task"/> that represents the asynchronous operation.</returns>
+        Task<TResult> ValidateResultAsync(T value, CancellationToken cancellationToken = default);
+    }
 }
diff --git a/src/SecureFolderFS.Shared/ComponentModel/IImage.cs b/src/SecureFolderFS.Shared/ComponentModel/IImage.cs
index 85a506a64..4b27688d1 100644
--- a/src/SecureFolderFS.Shared/ComponentModel/IImage.cs
+++ b/src/SecureFolderFS.Shared/ComponentModel/IImage.cs
@@ -1,9 +1,11 @@
-namespace SecureFolderFS.Shared.ComponentModel
+using System;
+
+namespace SecureFolderFS.Shared.ComponentModel
 {
     /// <summary>
     /// Represents an image which can be displayed in the UI.
     /// </summary>
-    public interface IImage
+    public interface IImage : IDisposable
     {
     }
 }
diff --git a/src/SecureFolderFS.Shared/ComponentModel/INavigator.cs b/src/SecureFolderFS.Shared/ComponentModel/INavigator.cs
index 0f3126d2d..cb512c6d1 100644
--- a/src/SecureFolderFS.Shared/ComponentModel/INavigator.cs
+++ b/src/SecureFolderFS.Shared/ComponentModel/INavigator.cs
@@ -9,7 +9,7 @@ public interface INavigator
         /// </summary>
         /// <param name="view">The target to navigate to.</param>
         /// <returns>A <see cref="Task"/> that represents the asynchronous operation. If successful, returns true; otherwise false.</returns>
-        Task<bool> NavigateAsync(IViewDesignation view);
+        Task<bool> NavigateAsync(IViewDesignation? view);
 
         /// <summary>
         /// Tries to navigate to the previous target, if possible.
diff --git a/src/SecureFolderFS.Shared/ComponentModel/IWrappable.cs b/src/SecureFolderFS.Shared/ComponentModel/IWrappable.cs
index a39bacd23..6fb376ff9 100644
--- a/src/SecureFolderFS.Shared/ComponentModel/IWrappable.cs
+++ b/src/SecureFolderFS.Shared/ComponentModel/IWrappable.cs
@@ -9,8 +9,8 @@ public interface IWrappable<T>
         /// <summary>
         /// Wraps an object into <see cref="IWrapper{T}"/>.
         /// </summary>
-        /// <param name="obj">The object to wrap.</param>
+        /// <param name="wrapped">The object to wrap.</param>
         /// <returns>A wrapped object by the implementation represented by <see cref="IWrapper{T}"/>.</returns>
-        IWrapper<T> Wrap(T obj);
+        IWrapper<T> Wrap(T wrapped);
     }
 }
diff --git a/src/SecureFolderFS.Shared/ComponentModel/ProgressModel.cs b/src/SecureFolderFS.Shared/ComponentModel/ProgressModel.cs
index 4149442de..0ff65f27c 100644
--- a/src/SecureFolderFS.Shared/ComponentModel/ProgressModel.cs
+++ b/src/SecureFolderFS.Shared/ComponentModel/ProgressModel.cs
@@ -5,7 +5,7 @@ namespace SecureFolderFS.Shared.ComponentModel
     /// <summary>
     /// Represents a generic model for reporting progress updates.
     /// </summary>
-    /// <param name="PrecisionProgress">Optional precise progress represented by a value between 0 and 100.</param>
+    /// <param name="PercentageProgress">An optional percentage progress represented by a value between 0 and 100.</param>
     /// <param name="CallbackProgress">An optional callback that reports of any failures or next progress stages.</param>
-    public readonly record struct ProgressModel(IProgress<double>? PrecisionProgress = null, IProgress<IResult>? CallbackProgress = null);
+    public readonly record struct ProgressModel<T>(IProgress<double>? PercentageProgress = null, IProgress<T>? CallbackProgress = null);
 }
diff --git a/src/SecureFolderFS.Shared/ComponentModel/Wrapper.cs b/src/SecureFolderFS.Shared/ComponentModel/Wrapper.cs
new file mode 100644
index 000000000..a25d464a5
--- /dev/null
+++ b/src/SecureFolderFS.Shared/ComponentModel/Wrapper.cs
@@ -0,0 +1,9 @@
+namespace SecureFolderFS.Shared.ComponentModel
+{
+    /// <inheritdoc cref="IWrapper{T}"/>
+    public sealed class Wrapper<T>(T inner) : IWrapper<T>
+    {
+        /// <inheritdoc/>
+        public T Inner { get; } = inner;
+    }
+}
diff --git a/src/SecureFolderFS.Shared/Extensions/CollectionExtensions.cs b/src/SecureFolderFS.Shared/Extensions/CollectionExtensions.cs
index a1d79bf6a..6638bb475 100644
--- a/src/SecureFolderFS.Shared/Extensions/CollectionExtensions.cs
+++ b/src/SecureFolderFS.Shared/Extensions/CollectionExtensions.cs
@@ -7,6 +7,14 @@ namespace SecureFolderFS.Shared.Extensions
 {
     public static class CollectionExtensions
     {
+        public static ICollection<T> ToOrAsCollection<T>(this IEnumerable<T> enumerable)
+        {
+            if (enumerable is ICollection<T> collection)
+                return collection;
+
+            return enumerable.ToArray();
+        }
+        
         public static TDestination? FirstOrDefaultType<TSource, TDestination>(this IEnumerable<TSource> enumerable)
             where TDestination : class, TSource
         {
@@ -25,6 +33,14 @@ public static TDestination GetOrAdd<TSource, TDestination>(this ICollection<TSou
 
             return item;
         }
+
+        public static void AddMultiple<T>(this ICollection<T> collection, IEnumerable<T> enumerable)
+        {
+            foreach (var item in enumerable)
+            {
+                collection.Add(item);
+            }
+        }
         
         public static bool RemoveMatch<T>(this IList<T> list, Func<T, bool> predicate)
         {
diff --git a/src/SecureFolderFS.Shared/Extensions/DictionaryExtensions.cs b/src/SecureFolderFS.Shared/Extensions/DictionaryExtensions.cs
index 0fa93db38..23665fd17 100644
--- a/src/SecureFolderFS.Shared/Extensions/DictionaryExtensions.cs
+++ b/src/SecureFolderFS.Shared/Extensions/DictionaryExtensions.cs
@@ -6,11 +6,12 @@ namespace SecureFolderFS.Shared.Extensions
     public static class DictionaryExtensions
     {
         public static TValue? Get<TKey, TValue>(this IDictionary<TKey, TValue> dictionary, TKey key)
+            where TValue : class?
         {
             if (dictionary.TryGetValue(key, out var value))
                 return value;
 
-            return default;
+            return null;
         }
 
         public static TKV? GetByKeyOrValue<TKV>(this IDictionary<TKV, TKV> dictionary, TKV tkv)
diff --git a/src/SecureFolderFS.Shared/Extensions/DisposableExtensions.cs b/src/SecureFolderFS.Shared/Extensions/DisposableExtensions.cs
index e09c0a524..f0f0920c0 100644
--- a/src/SecureFolderFS.Shared/Extensions/DisposableExtensions.cs
+++ b/src/SecureFolderFS.Shared/Extensions/DisposableExtensions.cs
@@ -5,9 +5,9 @@ namespace SecureFolderFS.Shared.Extensions
 {
     public static class DisposableExtensions
     {
-        public static async Task TryDisposeAsync(object obj)
+        public static async Task TryDisposeAsync(object presumedDisposable)
         {
-            switch (obj)
+            switch (presumedDisposable)
             {
                 case IAsyncDisposable asyncDisposable:
                     await asyncDisposable.DisposeAsync();
@@ -19,9 +19,9 @@ public static async Task TryDisposeAsync(object obj)
             }
         }
 
-        public static void TryDispose(object obj)
+        public static void TryDispose(object presumedDisposable)
         {
-            switch (obj)
+            switch (presumedDisposable)
             {
                 case IDisposable disposable:
                     disposable.Dispose();
diff --git a/src/SecureFolderFS.Shared/Extensions/GenericExtensions.cs b/src/SecureFolderFS.Shared/Extensions/GenericExtensions.cs
index cbd18ffcd..767e08448 100644
--- a/src/SecureFolderFS.Shared/Extensions/GenericExtensions.cs
+++ b/src/SecureFolderFS.Shared/Extensions/GenericExtensions.cs
@@ -11,7 +11,7 @@ public static class GenericExtensions
             if (value is TOut outValue)
                 return outValue;
 
-            return defaultValue is not null ? defaultValue() : default;
+            return defaultValue is not null ? defaultValue.Invoke() : default;
         }
     }
 }
diff --git a/src/SecureFolderFS.Shared/Extensions/ResultExtensions.cs b/src/SecureFolderFS.Shared/Extensions/ResultExtensions.cs
index 3ae0f4308..a3302a979 100644
--- a/src/SecureFolderFS.Shared/Extensions/ResultExtensions.cs
+++ b/src/SecureFolderFS.Shared/Extensions/ResultExtensions.cs
@@ -9,7 +9,15 @@ public static string GetMessage(this IResult result, string? fallback = null)
             if (result is IResultWithMessage resultWithMessage)
                 return resultWithMessage.Message ?? (fallback ?? "Unknown error");
 
-            return result.ToString() ?? result.Exception?.Message ?? (fallback ?? "Unknown error");
+            return fallback ?? "Unknown error";
+        }
+
+        public static string GetExceptionMessage(this IResult result, string? fallback = null)
+        {
+            return result.ToString()
+                   ?? (string.IsNullOrEmpty(result.Exception?.Message) ? null : result.Exception?.Message)
+                   ?? fallback
+                   ?? "Unknown error";
         }
     }
 }
diff --git a/src/SecureFolderFS.Shared/Helpers/EncodingHelpers.cs b/src/SecureFolderFS.Shared/Helpers/EncodingHelpers.cs
index 0d2efa13f..aedc30162 100644
--- a/src/SecureFolderFS.Shared/Helpers/EncodingHelpers.cs
+++ b/src/SecureFolderFS.Shared/Helpers/EncodingHelpers.cs
@@ -18,22 +18,5 @@ public static string EncodeStorableId(string id)
 
             return BitConverter.ToString(hash).Replace("-", string.Empty);
         }
-
-        public static string EncodeBaseUrl64(string base64str)
-        {
-            var trimmedStr = base64str.TrimEnd('=');
-            return trimmedStr.Replace('/', '_').Replace('+', '-');
-        }
-
-        public static string DecodeBaseUrl64(string base64UrlStr)
-        {
-            var decoded = base64UrlStr.Replace('_', '/').Replace('-', '+');
-            return (decoded.Length % 4) switch
-            {
-                2 => decoded + "==",
-                3 => decoded + "=",
-                _ => decoded
-            };
-        }
     }
 }
diff --git a/src/SecureFolderFS.Shared/Models/IVaultMigratorModel.cs b/src/SecureFolderFS.Shared/Models/IVaultMigratorModel.cs
index 3c4fa125b..1a750c54e 100644
--- a/src/SecureFolderFS.Shared/Models/IVaultMigratorModel.cs
+++ b/src/SecureFolderFS.Shared/Models/IVaultMigratorModel.cs
@@ -12,6 +12,6 @@ public interface IVaultMigratorModel
 
         Task<IDisposable> UnlockAsync<T>(T credentials, CancellationToken cancellationToken = default);
 
-        Task MigrateAsync(IDisposable unlockContract, ProgressModel progress, CancellationToken cancellationToken = default);
+        Task MigrateAsync(IDisposable unlockContract, ProgressModel<IResult> progress, CancellationToken cancellationToken = default);
     }
 }
diff --git a/src/SecureFolderFS.Shared/Models/Result.cs b/src/SecureFolderFS.Shared/Models/Result.cs
index f53ce4f32..c85c66111 100644
--- a/src/SecureFolderFS.Shared/Models/Result.cs
+++ b/src/SecureFolderFS.Shared/Models/Result.cs
@@ -56,6 +56,12 @@ protected Result(Exception? exception)
         {
         }
 
+        protected Result(T value, Exception exception)
+            : base(exception)
+        {
+            Value = value;
+        }
+
         /// <summary>
         /// Creates a new <see cref="Result{T}"/> with a value.
         /// </summary>
@@ -76,5 +82,13 @@ protected Result(Exception? exception)
         /// <param name="value">The vault of the result.</param>
         /// <returns>A new failed <see cref="Result{T}"/>.</returns>
         public static Result<T> Failure(T value) => new(value);
+
+        /// <summary>
+        /// Creates a new <see cref="Result{T}"/> with an exception and the <typeparamref name="T"/> value that usually indicates the origin of the error.
+        /// </summary>
+        /// <param name="value">The vault of the result.</param>
+        /// <param name="exception">The <see cref="System.Exception"/> instance of the operation.</param>
+        /// <returns>A new failed <see cref="Result{T}"/>.</returns>
+        public static Result<T> Failure(T value, Exception exception) => new(value, exception);
     }
 }
diff --git a/src/SecureFolderFS.Sdk/AppModels/StreamSerializer.cs b/src/SecureFolderFS.Shared/Models/StreamSerializer.cs
similarity index 97%
rename from src/SecureFolderFS.Sdk/AppModels/StreamSerializer.cs
rename to src/SecureFolderFS.Shared/Models/StreamSerializer.cs
index c1869e8fc..6ea3424e2 100644
--- a/src/SecureFolderFS.Sdk/AppModels/StreamSerializer.cs
+++ b/src/SecureFolderFS.Shared/Models/StreamSerializer.cs
@@ -5,7 +5,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace SecureFolderFS.Sdk.AppModels
+namespace SecureFolderFS.Shared.Models
 {
     /// <summary>
     /// Implementation for <see cref="IAsyncSerializer{TSerialized}"/> that uses <see cref="Stream"/> to serialize/deserialize JSON.
diff --git a/src/SecureFolderFS.Shared/Models/VaultOptions.cs b/src/SecureFolderFS.Shared/Models/VaultOptions.cs
index cb621a31b..8048d3021 100644
--- a/src/SecureFolderFS.Shared/Models/VaultOptions.cs
+++ b/src/SecureFolderFS.Shared/Models/VaultOptions.cs
@@ -20,6 +20,11 @@ public sealed class VaultOptions
         /// </summary>
         public string? FileNameCipherId { get; init; }
 
+        /// <summary>
+        /// Gets the ID of the encoding method to use during filename encryption and decryption.
+        /// </summary>
+        public string? NameEncodingId { get; init; }
+
         /// <summary>
         /// Gets the unique identifier of the vault.
         /// </summary>
diff --git a/src/SecureFolderFS.Shared/SecureFolderFS.Shared.csproj b/src/SecureFolderFS.Shared/SecureFolderFS.Shared.csproj
index 83ff36f10..dfac8c156 100644
--- a/src/SecureFolderFS.Shared/SecureFolderFS.Shared.csproj
+++ b/src/SecureFolderFS.Shared/SecureFolderFS.Shared.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>disable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
diff --git a/src/SecureFolderFS.SourceGenerator/AttributeWithTypeGenerator.cs b/src/SecureFolderFS.SourceGenerator/AttributeWithTypeGenerator.cs
index 6e3686024..378daf728 100644
--- a/src/SecureFolderFS.SourceGenerator/AttributeWithTypeGenerator.cs
+++ b/src/SecureFolderFS.SourceGenerator/AttributeWithTypeGenerator.cs
@@ -1,5 +1,5 @@
 // Some parts of the following code were used from WinUI3Utilities on the MIT License basis.
-// See the license file for more information.
+// See the associated license file for more information.
 
 using Microsoft.CodeAnalysis;
 using System.Collections.Immutable;
diff --git a/src/SecureFolderFS.SourceGenerator/Helpers/SourceGeneratorHelpers.cs b/src/SecureFolderFS.SourceGenerator/Helpers/SourceGeneratorHelpers.cs
index f2efc8145..62508b35e 100644
--- a/src/SecureFolderFS.SourceGenerator/Helpers/SourceGeneratorHelpers.cs
+++ b/src/SecureFolderFS.SourceGenerator/Helpers/SourceGeneratorHelpers.cs
@@ -1,5 +1,5 @@
 // Some parts of the following code were used from WinUI3Utilities on the MIT License basis.
-// See the license file for more information.
+// See the associated license file for more information.
 
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
diff --git a/src/SecureFolderFS.SourceGenerator/InjectGenerator.cs b/src/SecureFolderFS.SourceGenerator/InjectGenerator.cs
index 13eb0308a..6484a5b2d 100644
--- a/src/SecureFolderFS.SourceGenerator/InjectGenerator.cs
+++ b/src/SecureFolderFS.SourceGenerator/InjectGenerator.cs
@@ -1,5 +1,5 @@
 // Some parts of the following code were used from WinUI3Utilities on the MIT License basis.
-// See the license file for more information.
+// See the associated license file for more information.
 
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
diff --git a/src/SecureFolderFS.SourceGenerator/SecureFolderFS.SourceGenerator.csproj b/src/SecureFolderFS.SourceGenerator/SecureFolderFS.SourceGenerator.csproj
index 6dd7f53d7..c26207a5d 100644
--- a/src/SecureFolderFS.SourceGenerator/SecureFolderFS.SourceGenerator.csproj
+++ b/src/SecureFolderFS.SourceGenerator/SecureFolderFS.SourceGenerator.csproj
@@ -10,9 +10,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.10.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" PrivateAssets="all" />
-    <PackageReference Include="PolySharp" Version="1.14.1" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" PrivateAssets="all" />
+    <PackageReference Include="PolySharp" Version="1.15.0" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
   </ItemGroup>
 
 </Project>
diff --git a/src/SecureFolderFS.Core.FileSystem/Enums/FileSystemAvailabilityType.cs b/src/SecureFolderFS.Storage/Enums/FileSystemAvailability.cs
similarity index 90%
rename from src/SecureFolderFS.Core.FileSystem/Enums/FileSystemAvailabilityType.cs
rename to src/SecureFolderFS.Storage/Enums/FileSystemAvailability.cs
index 2f0e8c159..2a6097da9 100644
--- a/src/SecureFolderFS.Core.FileSystem/Enums/FileSystemAvailabilityType.cs
+++ b/src/SecureFolderFS.Storage/Enums/FileSystemAvailability.cs
@@ -1,12 +1,12 @@
 using System;
 
-namespace SecureFolderFS.Core.FileSystem.Enums
+namespace SecureFolderFS.Storage.Enums
 {
     /// <summary>
     /// Defines types of possible file system availability errors.
     /// </summary>
     [Flags]
-    public enum FileSystemAvailabilityType : uint
+    public enum FileSystemAvailability : uint
     {
         /// <summary>
         /// Undetermined state.
diff --git a/src/SecureFolderFS.Storage/Extensions/NativeExtensions.cs b/src/SecureFolderFS.Storage/Extensions/NativeExtensions.cs
new file mode 100644
index 000000000..fd3d962b5
--- /dev/null
+++ b/src/SecureFolderFS.Storage/Extensions/NativeExtensions.cs
@@ -0,0 +1,22 @@
+using OwlCore.Storage;
+using OwlCore.Storage.System.IO;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace SecureFolderFS.Storage.Extensions
+{
+    public static class NativeExtensions
+    {
+        public static async Task<Stream> OpenStreamAsync(this IFile file, FileAccess accessMode, FileShare shareMode, CancellationToken cancellationToken = default)
+        {
+            if (file is SystemFile systemFile)
+                return systemFile.Info.Open(new FileStreamOptions()
+                {
+                    Access = accessMode, Share = shareMode, Options = FileOptions.Asynchronous
+                });
+
+            return await file.OpenStreamAsync(accessMode, cancellationToken);
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Storage/Extensions/StorageExtensions.Folder.cs b/src/SecureFolderFS.Storage/Extensions/StorageExtensions.Folder.cs
index e23ff889e..ddb799e99 100644
--- a/src/SecureFolderFS.Storage/Extensions/StorageExtensions.Folder.cs
+++ b/src/SecureFolderFS.Storage/Extensions/StorageExtensions.Folder.cs
@@ -2,6 +2,9 @@
 using SecureFolderFS.Shared.ComponentModel;
 using SecureFolderFS.Shared.Models;
 using System;
+using System.ComponentModel;
+using System.IO;
+using System.Security.Cryptography;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -9,6 +12,131 @@ namespace SecureFolderFS.Storage.Extensions
 {
     public static partial class StorageExtensions
     {
+        /// <summary>
+        /// Creates a copy of the provided storable within this folder.
+        /// </summary>
+        /// <typeparam name="TStorable">The type of storable, whether a <see cref="IFile"/> or a <see cref="IFolder"/>.</typeparam>
+        /// <param name="destinationFolder">The folder where the copy is created.</param>
+        /// <param name="itemToCopy">The storable to be copied into this folder.</param>
+        /// <param name="overwrite"><code>true</code> if any existing destination folder can be overwritten; otherwise, <c>false</c>.</param>
+        /// <param name="cancellationToken">A token that can be used to cancel the ongoing operation.</param>
+        public static async Task<TStorable> CreateCopyOfStorableAsync<TStorable>(this IModifiableFolder destinationFolder, TStorable itemToCopy, bool overwrite = false, CancellationToken cancellationToken = default)
+            where TStorable : IStorable
+        {
+            return itemToCopy switch
+            {
+                IFile fileToCopy => (TStorable)await destinationFolder.CreateCopyOfAsync(fileToCopy, overwrite, cancellationToken),
+                IFolder folderToCopy => (TStorable)await destinationFolder.CreateCopyOfAsync(folderToCopy, overwrite, cancellationToken),
+                _ => throw new ArgumentOutOfRangeException(nameof(itemToCopy))
+            };
+        }
+        
+        /// <summary>
+        /// Moves a storable from the source folder into the destination folder. Returns the new storable that resides in the destination folder.
+        /// </summary>
+        /// <typeparam name="TStorable">The type of storable, whether a <see cref="IFile"/> or a <see cref="IFolder"/>.</typeparam>
+        /// <param name="destinationFolder">The folder where the storable is moved to.</param>
+        /// <param name="itemToMove">The storable being moved into this folder.</param>
+        /// <param name="source">The folder that <paramref name="itemToMove"/> is being moved from.</param>
+        /// <param name="overwrite"><code>true</code> if the destination folder can be overwritten; otherwise, <c>false</c>.</param>
+        /// <param name="cancellationToken">A token that can be used to cancel the ongoing operation.</param>
+        public static async Task<TStorable> MoveStorableFromAsync<TStorable>(this IModifiableFolder destinationFolder, TStorable itemToMove, IModifiableFolder source, bool overwrite, CancellationToken cancellationToken = default)
+            where TStorable : IStorableChild
+        {
+            return itemToMove switch
+            {
+                IChildFile fileToMove => (TStorable)await destinationFolder.MoveFromAsync(fileToMove, source, overwrite, cancellationToken),
+                IChildFolder folderToMove => (TStorable)await destinationFolder.MoveFromAsync(folderToMove, source, overwrite, cancellationToken),
+                _ => throw new ArgumentOutOfRangeException(nameof(itemToMove))
+            };
+        }        
+        
+        /// <summary>
+        /// Creates a copy of the provided folder within this folder.
+        /// </summary>
+        /// <param name="destinationFolder">The folder where the copy is created.</param>
+        /// <param name="folderToCopy">The folder to be copied into this folder.</param>
+        /// <param name="overwrite"><code>true</code> if any existing destination folder can be overwritten; otherwise, <c>false</c>.</param>
+        /// <param name="cancellationToken">A token that can be used to cancel the ongoing operation.</param>
+        public static async Task<IModifiableFolder> CreateCopyOfAsync(this IModifiableFolder destinationFolder, IFolder folderToCopy, bool overwrite, CancellationToken cancellationToken = default)
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+
+            // Create the corresponding folder in the destination
+            var copiedFolder = (IModifiableFolder)await destinationFolder.CreateFolderAsync(folderToCopy.Name, overwrite, cancellationToken);
+
+            // Iterate through all items in the source folder
+            await foreach (var item in folderToCopy.GetItemsAsync(StorableType.All, cancellationToken))
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+
+                switch (item)
+                {
+                    case IFile file:
+                    {
+                        // Copy the file to the destination folder
+                        await copiedFolder.CreateCopyOfAsync(file, overwrite, cancellationToken);
+                        break;
+                    }
+                    
+                    case IFolder subFolder:
+                    {
+                        // Recursively copy the subfolder
+                        await copiedFolder.CreateCopyOfAsync(subFolder, overwrite, cancellationToken);
+                        break;
+                    }
+                }
+            }
+
+            return copiedFolder;
+        }
+
+        /// <summary>
+        /// Moves a folder from the source folder into the destination folder. Returns the new folder that resides in the destination folder.
+        /// </summary>
+        /// <param name="destinationFolder">The folder where the folder is moved to.</param>
+        /// <param name="folderToMove">The folder being moved into this folder.</param>
+        /// <param name="source">The folder that <paramref name="folderToMove"/> is being moved from.</param>
+        /// <param name="overwrite"><code>true</code> if the destination folder can be overwritten; otherwise, <c>false</c>.</param>
+        /// <param name="cancellationToken">A token that can be used to cancel the ongoing operation.</param>
+        public static async Task<IModifiableFolder> MoveFromAsync(this IModifiableFolder destinationFolder, IChildFolder folderToMove, IModifiableFolder source, bool overwrite, CancellationToken cancellationToken = default)
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+
+            // Check if a folder with the same name already exists in the destination
+            if (!overwrite)
+            {
+                try
+                {
+                    var existing = await destinationFolder.GetFirstByNameAsync(folderToMove.Name, cancellationToken);
+                    if (existing is not null)
+                        throw new FileAlreadyExistsException(folderToMove.Name);
+                }
+                catch (DirectoryNotFoundException)
+                {
+                }
+            }
+
+            // If the destination folder supports optimized moving, use it
+            // if (destinationFolder is IMoveFrom fastPath)
+            //     return await fastPath.MoveFromAsync(folderToMove, source, overwrite, cancellationToken,
+            //         fallback: MoveFromFallbackAsync);
+
+            // Perform a manual move (fallback)
+            return await MoveFromFallbackAsync(destinationFolder, folderToMove, source, overwrite, cancellationToken);
+
+            async Task<IModifiableFolder> MoveFromFallbackAsync(IModifiableFolder destinationFolder, IChildFolder folderToMove, IModifiableFolder source, bool overwrite, CancellationToken cancellationToken = default)
+            {
+                // Create a copy of the folder in the destination
+                var movedFolder = await destinationFolder.CreateCopyOfAsync(folderToMove, overwrite, cancellationToken);
+
+                // Delete the original folder
+                await source.DeleteAsync(folderToMove, cancellationToken);
+
+                return movedFolder;
+            }
+        }
+        
         /// <summary>
         /// Gets a file in the current directory by name.
         /// </summary>
diff --git a/src/SecureFolderFS.Storage/Extensions/StorageExtensions.Storable.cs b/src/SecureFolderFS.Storage/Extensions/StorageExtensions.Storable.cs
index 6f4d17e18..8b86b53a2 100644
--- a/src/SecureFolderFS.Storage/Extensions/StorageExtensions.Storable.cs
+++ b/src/SecureFolderFS.Storage/Extensions/StorageExtensions.Storable.cs
@@ -1,4 +1,7 @@
-using OwlCore.Storage;
+using System;
+using System.Threading.Tasks;
+using OwlCore.Storage;
+using SecureFolderFS.Storage.StorageProperties;
 
 namespace SecureFolderFS.Storage.Extensions
 {
@@ -14,5 +17,17 @@ public static string GetPersistableId(this IStorable storable)
 
             return bookmark.BookmarkId;
         }
+
+        public static async Task<IBasicProperties?> TryGetPropertiesAsync(this IStorableProperties storableProperties)
+        {
+            try
+            {
+                return await storableProperties.GetPropertiesAsync();
+            }
+            catch (Exception)
+            {
+                return null;
+            }
+        }
     }
 }
diff --git a/src/SecureFolderFS.Storage/IBookmark.cs b/src/SecureFolderFS.Storage/IBookmark.cs
index 4a8076a42..452fc0822 100644
--- a/src/SecureFolderFS.Storage/IBookmark.cs
+++ b/src/SecureFolderFS.Storage/IBookmark.cs
@@ -6,6 +6,9 @@ namespace SecureFolderFS.Storage
 {
     public interface IBookmark : IStorable
     {
+        /// <summary>
+        /// Gets the unique ID used to represent a bookmark to this storable.
+        /// </summary>
         string? BookmarkId { get; }
 
         /// <summary>
diff --git a/src/SecureFolderFS.Storage/Renamable/IRenamableFolder.cs b/src/SecureFolderFS.Storage/Renamable/IRenamableFolder.cs
new file mode 100644
index 000000000..d2cee6209
--- /dev/null
+++ b/src/SecureFolderFS.Storage/Renamable/IRenamableFolder.cs
@@ -0,0 +1,21 @@
+using OwlCore.Storage;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace SecureFolderFS.Storage.Renamable
+{
+    /// <summary>
+    /// Represents a folder that can rename items.
+    /// </summary>
+    public interface IRenamableFolder : IModifiableFolder
+    {
+        /// <summary>
+        /// Renames the specified storable to a new name.
+        /// </summary>
+        /// <param name="storable">The storable to rename.</param>
+        /// <param name="newName">The new name for the storable.</param>
+        /// <param name="cancellationToken">A <see cref="CancellationToken"/> that cancels this action.</param>
+        /// <returns>A <see cref="Task"/> that represents the asynchronous operation. The result contains the renamed storable.</returns>
+        Task<IStorableChild> RenameAsync(IStorableChild storable, string newName, CancellationToken cancellationToken = default);
+    }
+}
diff --git a/src/SecureFolderFS.Storage/Scanners/DeepFolderScanner.cs b/src/SecureFolderFS.Storage/Scanners/DeepFolderScanner.cs
new file mode 100644
index 000000000..9ec29dd16
--- /dev/null
+++ b/src/SecureFolderFS.Storage/Scanners/DeepFolderScanner.cs
@@ -0,0 +1,61 @@
+using OwlCore.Storage;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace SecureFolderFS.Storage.Scanners
+{
+    /// <inheritdoc cref="IFolderScanner"/>
+    public class DeepFolderScanner : IFolderScanner
+    {
+        private readonly StorableType _storableType;
+
+        /// <inheritdoc/>
+        public IFolder RootFolder { get; }
+
+        public DeepFolderScanner(IFolder rootFolder, StorableType storableType = StorableType.All)
+        {
+            RootFolder = rootFolder;
+            _storableType = storableType;
+        }
+
+        /// <inheritdoc/>
+        public async IAsyncEnumerable<IStorableChild> ScanFolderAsync([EnumeratorCancellation] CancellationToken cancellationToken = default)
+        {
+            await foreach (var item in RecursiveScanAsync(RootFolder, cancellationToken).ConfigureAwait(false))
+            {
+                if (_storableType == StorableType.All
+                    || (_storableType == StorableType.File && item is IChildFile)
+                    || (_storableType == StorableType.Folder && item is IChildFolder))
+                    yield return item;
+            }
+        }
+
+        private async IAsyncEnumerable<IStorableChild> RecursiveScanAsync(IFolder folderToScan, [EnumeratorCancellation] CancellationToken cancellationToken = default)
+        {
+            if (_storableType == StorableType.Folder)
+            {
+                await foreach (var folder in folderToScan.GetFoldersAsync(cancellationToken: cancellationToken).ConfigureAwait(false))
+                {
+                    yield return folder;
+                    await foreach (var subFolder in RecursiveScanAsync(folder, cancellationToken).ConfigureAwait(false))
+                        yield return subFolder;
+                }
+            }
+            else
+            {
+                await foreach (var item in folderToScan.GetItemsAsync(cancellationToken: cancellationToken).ConfigureAwait(false))
+                {
+                    yield return item;
+
+                    if (item is not IFolder folder)
+                        continue;
+
+                    await foreach (var subItem in RecursiveScanAsync(folder, cancellationToken).ConfigureAwait(false))
+                        yield return subItem;
+                }
+            }
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Storage/Scanners/IFolderScanner.cs b/src/SecureFolderFS.Storage/Scanners/IFolderScanner.cs
new file mode 100644
index 000000000..13dd46b6c
--- /dev/null
+++ b/src/SecureFolderFS.Storage/Scanners/IFolderScanner.cs
@@ -0,0 +1,24 @@
+using OwlCore.Storage;
+using System.Collections.Generic;
+using System.Threading;
+
+namespace SecureFolderFS.Storage.Scanners
+{
+    /// <summary>
+    /// Handles discovery of items in a given folder.
+    /// </summary>
+    public interface IFolderScanner
+    {
+        /// <summary>
+        /// The root folder to scan for items.
+        /// </summary>
+        IFolder RootFolder { get; }
+
+        /// <summary>
+        /// Scans a folder and all subfolders for items.
+        /// </summary>
+        /// <param name="cancellationToken">A <see cref="CancellationToken"/> that cancels this action.</param>
+        /// <returns>Returns an async operation represented by <see cref="IAsyncEnumerable{T}"/> of type <see cref="IStorableChild"/> of found items.</returns>
+        IAsyncEnumerable<IStorableChild> ScanFolderAsync(CancellationToken cancellationToken = default);
+    }
+}
diff --git a/src/SecureFolderFS.Storage/Scanners/ShallowFolderScanner.cs b/src/SecureFolderFS.Storage/Scanners/ShallowFolderScanner.cs
new file mode 100644
index 000000000..2be12855c
--- /dev/null
+++ b/src/SecureFolderFS.Storage/Scanners/ShallowFolderScanner.cs
@@ -0,0 +1,31 @@
+using OwlCore.Storage;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+namespace SecureFolderFS.Storage.Scanners
+{
+    /// <inheritdoc cref="IFolderScanner"/>
+    public class ShallowFolderScanner : IFolderScanner
+    {
+        private readonly StorableType _storableType;
+
+        /// <inheritdoc/>
+        public IFolder RootFolder { get; }
+
+        public ShallowFolderScanner(IFolder rootFolder, StorableType storableType = StorableType.All)
+        {
+            RootFolder = rootFolder;
+            _storableType = storableType;
+        }
+
+        /// <inheritdoc/>
+        public async IAsyncEnumerable<IStorableChild> ScanFolderAsync([EnumeratorCancellation] CancellationToken cancellationToken = default)
+        {
+            await foreach (var item in RootFolder.GetItemsAsync(_storableType, cancellationToken))
+            {
+                yield return item;
+            }
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Storage/SecureFolderFS.Storage.csproj b/src/SecureFolderFS.Storage/SecureFolderFS.Storage.csproj
index 57a20311e..9e5b86e0e 100644
--- a/src/SecureFolderFS.Storage/SecureFolderFS.Storage.csproj
+++ b/src/SecureFolderFS.Storage/SecureFolderFS.Storage.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>disable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <LangVersion>latest</LangVersion>
+    <LangVersion>preview</LangVersion>
     <Platforms>AnyCPU;ARM64;x64;x86</Platforms>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="OwlCore.Storage" Version="0.12.0" />
+    <PackageReference Include="OwlCore.Storage" Version="0.12.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/SecureFolderFS.Storage/StorageProperties/GenericProperty.cs b/src/SecureFolderFS.Storage/StorageProperties/GenericProperty.cs
new file mode 100644
index 000000000..a6e8bcc22
--- /dev/null
+++ b/src/SecureFolderFS.Storage/StorageProperties/GenericProperty.cs
@@ -0,0 +1,21 @@
+using System;
+using OwlCore.Storage;
+
+namespace SecureFolderFS.Storage.StorageProperties
+{
+    /// <inheritdoc cref="IStorageProperty{T}"/>
+    public class GenericProperty<T>(T value) : IStorageProperty<T>
+    {
+        /// <inheritdoc/>
+        public T Value { get; } = value;
+
+        /// <inheritdoc/>
+        public event EventHandler<T>? ValueUpdated;
+
+        /// <inheritdoc/>
+        public virtual void Dispose()
+        {
+            (Value as IDisposable)?.Dispose();
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Storage/StorageProperties/IBasicProperties.cs b/src/SecureFolderFS.Storage/StorageProperties/IBasicProperties.cs
index a0d59aca0..e51534147 100644
--- a/src/SecureFolderFS.Storage/StorageProperties/IBasicProperties.cs
+++ b/src/SecureFolderFS.Storage/StorageProperties/IBasicProperties.cs
@@ -1,8 +1,6 @@
 using OwlCore.Storage;
-using System;
 using System.Collections.Generic;
 using System.Threading;
-using System.Threading.Tasks;
 
 namespace SecureFolderFS.Storage.StorageProperties
 {
@@ -11,20 +9,6 @@ namespace SecureFolderFS.Storage.StorageProperties
     /// </summary>
     public interface IBasicProperties
     {
-        /// <summary>
-        /// Gets the date created of the storage object.
-        /// </summary>
-        /// <param name="cancellationToken">A <see cref="CancellationToken"/> that cancels this action.</param>
-        /// <returns>A <see cref="Task"/> that represents the asynchronous operation. Value is <see cref="IStorageProperty{T}"/> of type <see cref="DateTime"/> that represents date created.</returns>
-        Task<IStorageProperty<DateTime>> GetDateCreatedAsync(CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Gets the date modified of the storage object.
-        /// </summary>
-        /// <param name="cancellationToken">A <see cref="CancellationToken"/> that cancels this action.</param>
-        /// <returns>A <see cref="Task"/> that represents the asynchronous operation. Value is <see cref="IStorageProperty{T}"/> of type <see cref="DateTime"/> that represents date modified.</returns>
-        Task<IStorageProperty<DateTime>> GetDateModifiedAsync(CancellationToken cancellationToken = default);
-
         /// <summary>
         /// Gets all available properties of the storage object.
         /// </summary>
diff --git a/src/SecureFolderFS.Storage/StorageProperties/IDateProperties.cs b/src/SecureFolderFS.Storage/StorageProperties/IDateProperties.cs
new file mode 100644
index 000000000..703dc3608
--- /dev/null
+++ b/src/SecureFolderFS.Storage/StorageProperties/IDateProperties.cs
@@ -0,0 +1,27 @@
+using OwlCore.Storage;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace SecureFolderFS.Storage.StorageProperties
+{
+    /// <summary>
+    /// Exposes access to date-related storage object properties.
+    /// </summary>
+    public interface IDateProperties
+    {
+        /// <summary>
+        /// Gets the date created of the storage object.
+        /// </summary>
+        /// <param name="cancellationToken">A <see cref="CancellationToken"/> that cancels this action.</param>
+        /// <returns>A <see cref="Task"/> that represents the asynchronous operation. Value is <see cref="IStorageProperty{T}"/> of type <see cref="DateTime"/> that represents date created.</returns>
+        Task<IStorageProperty<DateTime>> GetDateCreatedAsync(CancellationToken cancellationToken = default);
+
+        /// <summary>
+        /// Gets the date modified of the storage object.
+        /// </summary>
+        /// <param name="cancellationToken">A <see cref="CancellationToken"/> that cancels this action.</param>
+        /// <returns>A <see cref="Task"/> that represents the asynchronous operation. Value is <see cref="IStorageProperty{T}"/> of type <see cref="DateTime"/> that represents date modified.</returns>
+        Task<IStorageProperty<DateTime>> GetDateModifiedAsync(CancellationToken cancellationToken = default);
+    }
+}
diff --git a/src/SecureFolderFS.Storage/StorageProperties/ISizeProperties.cs b/src/SecureFolderFS.Storage/StorageProperties/ISizeProperties.cs
new file mode 100644
index 000000000..c9a6b2950
--- /dev/null
+++ b/src/SecureFolderFS.Storage/StorageProperties/ISizeProperties.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using OwlCore.Storage;
+
+namespace SecureFolderFS.Storage.StorageProperties
+{
+    /// <summary>
+    /// Exposes access to storage object size properties.
+    /// </summary>
+    public interface ISizeProperties
+    {
+        /// <summary>
+        /// Gets the size of the storage object.
+        /// </summary>
+        /// <param name="cancellationToken">A <see cref="CancellationToken"/> that cancels this action.</param>
+        /// <returns>A <see cref="Task"/> that represents the asynchronous operation. Value is <see cref="IStorageProperty{T}"/> of type <see cref="long"/> that represents the size.</returns>
+        Task<IStorageProperty<long>?> GetSizeAsync(CancellationToken cancellationToken = default);
+    }
+}
\ No newline at end of file
diff --git a/src/SecureFolderFS.Storage/StorageProperties/IStorableProperties.cs b/src/SecureFolderFS.Storage/StorageProperties/IStorableProperties.cs
new file mode 100644
index 000000000..ebf9274ed
--- /dev/null
+++ b/src/SecureFolderFS.Storage/StorageProperties/IStorableProperties.cs
@@ -0,0 +1,17 @@
+using System.Threading.Tasks;
+using OwlCore.Storage;
+
+namespace SecureFolderFS.Storage.StorageProperties
+{
+    /// <summary>
+    /// Provides access to properties of storage objects.
+    /// </summary>
+    public interface IStorableProperties : IStorable
+    {
+        /// <summary>
+        /// Gets the <see cref="IBasicProperties"/> interface that allows access to all properties.
+        /// </summary>
+        /// <returns>A <see cref="Task"/> that represents the asynchronous operation. Value is <see cref="IBasicProperties"/> that exposes access to storage object properties.</returns>
+        Task<IBasicProperties> GetPropertiesAsync();
+    }
+}
diff --git a/src/SecureFolderFS.Storage/SystemStorageEx/SystemFileEx.cs b/src/SecureFolderFS.Storage/SystemStorageEx/SystemFileEx.cs
new file mode 100644
index 000000000..ecd3b6588
--- /dev/null
+++ b/src/SecureFolderFS.Storage/SystemStorageEx/SystemFileEx.cs
@@ -0,0 +1,38 @@
+using OwlCore.Storage;
+using OwlCore.Storage.System.IO;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace SecureFolderFS.Storage.SystemStorageEx
+{
+    /// <inheritdoc cref="SystemFile"/>
+    public class SystemFileEx : SystemFile
+    {
+        /// <inheritdoc/>
+        public SystemFileEx(string path)
+            : base(path)
+        {
+        }
+
+        /// <inheritdoc/>
+        public SystemFileEx(FileInfo info)
+            : base(info)
+        {
+        }
+
+        /// <inheritdoc/>
+        public override Task<IFolder?> GetParentAsync(CancellationToken cancellationToken = default)
+        {
+            var parent = Directory.GetParent(Path);
+            return Task.FromResult<IFolder?>(parent != null ? new SystemFolderEx(parent) : null);
+        }
+
+        /// <inheritdoc/>
+        public override Task<IFolder?> GetRootAsync(CancellationToken cancellationToken = default)
+        {
+            var root = new DirectoryInfo(Path).Root;
+            return Task.FromResult<IFolder?>(new SystemFolderEx(root));
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Storage/SystemStorageEx/SystemFolderEx.cs b/src/SecureFolderFS.Storage/SystemStorageEx/SystemFolderEx.cs
new file mode 100644
index 000000000..a866e1971
--- /dev/null
+++ b/src/SecureFolderFS.Storage/SystemStorageEx/SystemFolderEx.cs
@@ -0,0 +1,138 @@
+using OwlCore.Storage;
+using OwlCore.Storage.System.IO;
+using SecureFolderFS.Storage.Renamable;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace SecureFolderFS.Storage.SystemStorageEx
+{
+    /// <inheritdoc cref="SystemFolder"/>
+    public class SystemFolderEx : SystemFolder, IRenamableFolder
+    {
+        /// <inheritdoc/>
+        public SystemFolderEx(string path)
+            : base(path)
+        {
+        }
+
+        /// <inheritdoc/>
+        public SystemFolderEx(DirectoryInfo info)
+            : base(info)
+        {
+        }
+
+        /// <inheritdoc/>
+        public async Task<IStorableChild> RenameAsync(IStorableChild storable, string newName, CancellationToken cancellationToken = default)
+        {
+            var oldPath = storable.Id;
+            var newPath = System.IO.Path.Combine(Id, newName);
+
+            await Task.CompletedTask;
+            if (storable is IFile)
+            {
+                File.Move(oldPath, newPath);
+                return new SystemFileEx(newPath);
+            }
+            else if (storable is IFolder)
+            {
+                Directory.Move(oldPath, newPath);
+                return new SystemFolderEx(newPath);
+            }
+
+            throw new ArgumentOutOfRangeException(nameof(storable));
+        }
+
+        /// <inheritdoc/>
+        public override async IAsyncEnumerable<IStorableChild> GetItemsAsync(StorableType type = StorableType.All, [EnumeratorCancellation] CancellationToken cancellationToken = default)
+        {
+            await foreach (var item in base.GetItemsAsync(type, cancellationToken))
+            {
+                yield return item switch
+                {
+                    IFile file => new SystemFileEx(file.Id),
+                    IFolder folder => new SystemFolderEx(folder.Id),
+                    _ => throw new ArgumentOutOfRangeException()
+                };
+            }
+        }
+
+        /// <inheritdoc/>
+        public override async Task<IStorableChild> GetItemRecursiveAsync(string id, CancellationToken cancellationToken = default)
+        {
+            return await base.GetItemRecursiveAsync(id, cancellationToken) switch
+            {
+                IFile file => new SystemFileEx(file.Id),
+                IFolder folder => new SystemFolderEx(folder.Id),
+                _ => throw new ArgumentOutOfRangeException()
+            };
+        }
+
+        /// <inheritdoc/>
+        public override async Task<IStorableChild> GetItemAsync(string id, CancellationToken cancellationToken = default)
+        {
+            return await base.GetItemAsync(id, cancellationToken) switch
+            {
+                IFile file => new SystemFileEx(file.Id),
+                IFolder folder => new SystemFolderEx(folder.Id),
+                _ => throw new ArgumentOutOfRangeException()
+            };
+        }
+
+        /// <inheritdoc/>
+        public override async Task<IStorableChild> GetFirstByNameAsync(string name, CancellationToken cancellationToken = default)
+        {
+            return await base.GetFirstByNameAsync(name, cancellationToken) switch
+            {
+                IFile file => new SystemFileEx(file.Id),
+                IFolder folder => new SystemFolderEx(folder.Id),
+                _ => throw new ArgumentOutOfRangeException()
+            };
+        }
+
+        /// <inheritdoc/>
+        public override async Task<IChildFile> CreateCopyOfAsync(IFile fileToCopy, bool overwrite, CancellationToken cancellationToken, CreateCopyOfDelegate fallback)
+        {
+            var file = await base.CreateCopyOfAsync(fileToCopy, overwrite, cancellationToken, fallback);
+            return new SystemFileEx(file.Id);
+        }
+
+        /// <inheritdoc/>
+        public override async Task<IChildFile> MoveFromAsync(IChildFile fileToMove, IModifiableFolder source, bool overwrite, CancellationToken cancellationToken, MoveFromDelegate fallback)
+        {
+            var file = await base.MoveFromAsync(fileToMove, source, overwrite, cancellationToken, fallback);
+            return new SystemFileEx(file.Id);
+        }
+
+        /// <inheritdoc/>
+        public override async Task<IChildFolder> CreateFolderAsync(string name, bool overwrite = false, CancellationToken cancellationToken = default)
+        {
+            var folder = await base.CreateFolderAsync(name, overwrite, cancellationToken);
+            return new SystemFolderEx(folder.Id);
+        }
+
+        /// <inheritdoc/>
+        public override async Task<IChildFile> CreateFileAsync(string name, bool overwrite = false, CancellationToken cancellationToken = default)
+        {
+            var file = await base.CreateFileAsync(name, overwrite, cancellationToken);
+            return new SystemFileEx(file.Id);
+        }
+
+        /// <inheritdoc/>
+        public override Task<IFolder?> GetParentAsync(CancellationToken cancellationToken = default)
+        {
+            var parent = Directory.GetParent(Path);
+            return Task.FromResult<IFolder?>(parent != null ? new SystemFolderEx(parent) : null);
+        }
+
+        /// <inheritdoc/>
+        public override Task<IFolder?> GetRootAsync(CancellationToken cancellationToken = default)
+        {
+            var root = new DirectoryInfo(Path).Root;
+            return Task.FromResult<IFolder?>(new SystemFolderEx(root));
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Storage/VirtualFileSystem/FileSystemManager.cs b/src/SecureFolderFS.Storage/VirtualFileSystem/FileSystemManager.cs
index 206c90952..c39aa5b1f 100644
--- a/src/SecureFolderFS.Storage/VirtualFileSystem/FileSystemManager.cs
+++ b/src/SecureFolderFS.Storage/VirtualFileSystem/FileSystemManager.cs
@@ -1,51 +1,25 @@
-using System.Collections.Generic;
-using System.Collections.Specialized;
+using System.Collections.ObjectModel;
 
 namespace SecureFolderFS.Storage.VirtualFileSystem
 {
     /// <summary>
     /// A manager type to keep track of all opened virtual file systems.
     /// </summary>
-    public sealed class FileSystemManager : INotifyCollectionChanged
+    public sealed class FileSystemManager
     {
-        private readonly List<IVFSRoot> _fileSystems;
-
-        /// <inheritdoc/>
-        public event NotifyCollectionChangedEventHandler? CollectionChanged;
-
         /// <summary>
         /// Gets the universal instance of <see cref="FileSystemManager"/>.
         /// </summary>
         public static FileSystemManager Instance { get; } = new();
 
         /// <summary>
-        /// Gets the readonly list of registered <see cref="IVFSRoot"/>s.
+        /// Gets the collection of registered <see cref="IVFSRoot"/>s.
         /// </summary>
-        public IReadOnlyList<IVFSRoot> FileSystems => _fileSystems;
+        public ObservableCollection<IVFSRoot> FileSystems { get; }
 
         private FileSystemManager()
         {
-            _fileSystems = new();
-        }
-
-        /// <summary>
-        /// Registers a new virtual file system root.
-        /// </summary>
-        /// <param name="vfsRoot">The <see cref="IVFSRoot"/> to register.</param>
-        public void AddRoot(IVFSRoot vfsRoot)
-        {
-            _fileSystems.Add(vfsRoot);
-            CollectionChanged?.Invoke(this, new(NotifyCollectionChangedAction.Add, vfsRoot));
-        }
-
-        /// <summary>
-        /// Removes a new virtual file system root from known file systems.
-        /// </summary>
-        /// <param name="vfsRoot">The <see cref="IVFSRoot"/> to remove.</param>
-        public void RemoveRoot(IVFSRoot vfsRoot)
-        {
-            _fileSystems.Remove(vfsRoot);
-            CollectionChanged?.Invoke(this, new(NotifyCollectionChangedAction.Remove, vfsRoot));
+            FileSystems = new();
         }
     }
 }
diff --git a/src/SecureFolderFS.Storage/VirtualFileSystem/FileSystemOptions.cs b/src/SecureFolderFS.Storage/VirtualFileSystem/FileSystemOptions.cs
new file mode 100644
index 000000000..5dca3cdc7
--- /dev/null
+++ b/src/SecureFolderFS.Storage/VirtualFileSystem/FileSystemOptions.cs
@@ -0,0 +1,115 @@
+using SecureFolderFS.Shared.Extensions;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+
+namespace SecureFolderFS.Storage.VirtualFileSystem
+{
+    /// <summary>
+    /// Specifies file system related options to use.
+    /// </summary>
+    public class FileSystemOptions : INotifyPropertyChanged
+    {
+        /// <summary>
+        /// Gets or sets the name to use for the volume.
+        /// </summary>
+        public required string VolumeName { get; init; }
+
+        /// <summary>
+        /// Gets or sets the instance file system health statistics which are reported by the underlying virtual file system.
+        /// </summary>
+        public required IHealthStatistics HealthStatistics { get; init; }
+
+        /// <summary>
+        /// Gets or sets the instance file system statistics which are reported by the underlying virtual file system.
+        /// </summary>
+        public required IFileSystemStatistics FileSystemStatistics { get; init; }
+
+        /// <summary>
+        /// Gets or sets whether to use a read-only file system.
+        /// </summary>
+        public bool IsReadOnly { get; protected set => SetField(ref field, value); }
+
+        /// <summary>
+        /// Gets or sets whether to enable caching for decrypted content chunks.
+        /// </summary>
+        public bool IsCachingChunks { get; protected set => SetField(ref field, value); } = true;
+
+        /// <summary>
+        /// Gets or sets whether to enable caching for ciphertext and plaintext names.
+        /// </summary>
+        public bool IsCachingFileNames { get; protected set => SetField(ref field, value); } = true;
+        
+        /// <summary>
+        /// Gets or sets whether to use recycle bin for the vault.
+        /// </summary>
+        public bool IsRecycleBinEnabled { get; protected set => SetField(ref field, value); }
+
+        /// <inheritdoc/>
+        public event PropertyChangedEventHandler? PropertyChanged;
+
+        /// <summary>
+        /// Sets the read-only status of the file system.
+        /// </summary>
+        /// <param name="value">If true, sets the file system to read-only mode; otherwise, sets it to read-write mode.</param>
+        public void DangerousSetReadOnly(bool value)
+        {
+            IsReadOnly = value;
+        }
+
+        /// <summary>
+        /// Gets an optional, detailed description of the file system-specific information to display for the user.
+        /// </summary>
+        /// <returns>If available, returns a short description about the file system specifics; otherwise null.</returns>
+        public virtual string? GetDescription()
+        {
+            return null;
+        }
+
+        /// <summary>
+        /// Converts a dictionary of options to a <see cref="FileSystemOptions"/> instance.
+        /// </summary>
+        /// <param name="options">The dictionary of options.</param>
+        /// <param name="healthStatistics">The function to get health statistics.</param>
+        /// <param name="fileSystemStatistics">The function to get file system statistics.</param>
+        /// <returns>A <see cref="FileSystemOptions"/> instance.</returns>
+        public static FileSystemOptions ToOptions(
+            IDictionary<string, object> options,
+            Func<IHealthStatistics> healthStatistics,
+            Func<IFileSystemStatistics> fileSystemStatistics)
+        {
+            return new FileSystemOptions
+            {
+                VolumeName = GetOption<string>(options, nameof(VolumeName)) ?? throw new ArgumentNullException(nameof(VolumeName)),
+                HealthStatistics = GetOption<IHealthStatistics>(options, nameof(HealthStatistics)) ?? healthStatistics.Invoke(),
+                FileSystemStatistics = GetOption<IFileSystemStatistics>(options, nameof(FileSystemStatistics)) ?? fileSystemStatistics.Invoke(),
+                IsReadOnly = GetOption<bool?>(options, nameof(IsReadOnly)) ?? false,
+                IsCachingChunks = GetOption<bool?>(options, nameof(IsCachingChunks)) ?? true,
+                IsCachingFileNames = GetOption<bool?>(options, nameof(IsCachingFileNames)) ?? true,
+            };
+        }
+
+        /// <summary>
+        /// Gets an option from the dictionary.
+        /// </summary>
+        /// <typeparam name="T">The type of the option.</typeparam>
+        /// <param name="options">The dictionary of options.</param>
+        /// <param name="name">The name of the option.</param>
+        /// <returns>The option value if found; otherwise, the default value of <typeparamref name="T"/>.</returns>
+        private static T? GetOption<T>(IDictionary<string, object> options, string name)
+        {
+            return options.Get(name) is T value ? value : default;
+        }
+
+        protected bool SetField<T>(ref T field, T value, [CallerMemberName] string? propertyName = null)
+        {
+            if (EqualityComparer<T>.Default.Equals(field, value))
+                return false;
+
+            field = value;
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+            return true;
+        }
+    }
+}
diff --git a/src/SecureFolderFS.Storage/VirtualFileSystem/IFileSystem.cs b/src/SecureFolderFS.Storage/VirtualFileSystem/IFileSystem.cs
index 1027f040b..c2959c917 100644
--- a/src/SecureFolderFS.Storage/VirtualFileSystem/IFileSystem.cs
+++ b/src/SecureFolderFS.Storage/VirtualFileSystem/IFileSystem.cs
@@ -1,15 +1,17 @@
+using OwlCore.Storage;
+using SecureFolderFS.Shared.ComponentModel;
+using SecureFolderFS.Storage.Enums;
 using System;
+using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using OwlCore.Storage;
-using SecureFolderFS.Shared.ComponentModel;
 
 namespace SecureFolderFS.Storage.VirtualFileSystem
 {
     public interface IFileSystem
     {
         /// <summary>
-        /// Gets an unique id associated with this file system.
+        /// Gets the unique id associated with this file system.
         /// </summary>
         string Id { get; }
 
@@ -23,8 +25,8 @@ public interface IFileSystem
         /// </summary>
         /// <param name="cancellationToken">A <see cref="CancellationToken"/> that cancels this action.</param>
         /// <returns>A <see cref="Task"/> that represents the asynchronous operation. Value is <see cref="IResult"/> that represents the status of the file system provider.</returns>
-        Task<IResult> GetStatusAsync(CancellationToken cancellationToken = default);
+        Task<FileSystemAvailability> GetStatusAsync(CancellationToken cancellationToken = default);
         
-        Task<IVFSRoot> MountAsync(IFolder folder, IDisposable unlockContract, CancellationToken cancellationToken = default);
+        Task<IVFSRoot> MountAsync(IFolder vaultFolder, IDisposable unlockContract, IDictionary<string, object> options, CancellationToken cancellationToken = default);
     }
 }
diff --git a/src/SecureFolderFS.Storage/VirtualFileSystem/IFileSystemStatistics.cs b/src/SecureFolderFS.Storage/VirtualFileSystem/IFileSystemStatistics.cs
new file mode 100644
index 000000000..b7a6e6dfc
--- /dev/null
+++ b/src/SecureFolderFS.Storage/VirtualFileSystem/IFileSystemStatistics.cs
@@ -0,0 +1,58 @@
+using SecureFolderFS.Shared.Enums;
+using System;
+
+namespace SecureFolderFS.Storage.VirtualFileSystem
+{
+    /// <summary>
+    /// Allows for IO statistics to be reported.
+    /// </summary>
+    public interface IFileSystemStatistics
+    {
+        #region ReadWrite
+
+        /// <summary>
+        /// Gets or sets the <see cref="IProgress{T}"/> that reports the number of bytes read.
+        /// </summary>
+        IProgress<long>? BytesRead { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="IProgress{T}"/> that reports the number of bytes written.
+        /// </summary>
+        IProgress<long>? BytesWritten { get; set; }
+
+        #endregion
+
+        #region Cryptography
+
+        /// <summary>
+        /// Gets or sets the <see cref="IProgress{T}"/> that reports the number of bytes encrypted.
+        /// </summary>
+        IProgress<long>? BytesEncrypted { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="IProgress{T}"/> that reports the number of bytes decrypted.
+        /// </summary>
+        IProgress<long>? BytesDecrypted { get; set; }
+
+        #endregion
+
+        #region Caching
+
+        /// <summary>
+        /// Gets or sets the <see cref="IProgress{T}"/> that reports on cache state of chunks.
+        /// </summary>
+        IProgress<CacheAccessType>? ChunkCache { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="IProgress{T}"/> that reports on cache state of file names.
+        /// </summary>
+        IProgress<CacheAccessType>? FileNameCache { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="IProgress{T}"/> that reports on cache state of directory IDs.
+        /// </summary>
+        IProgress<CacheAccessType>? DirectoryIdCache { get; set; }
+
+        #endregion
+    }
+}
diff --git a/src/SecureFolderFS.Storage/VirtualFileSystem/IHealthStatistics.cs b/src/SecureFolderFS.Storage/VirtualFileSystem/IHealthStatistics.cs
new file mode 100644
index 000000000..8d2c14026
--- /dev/null
+++ b/src/SecureFolderFS.Storage/VirtualFileSystem/IHealthStatistics.cs
@@ -0,0 +1,45 @@
+using OwlCore.Storage;
+using SecureFolderFS.Shared.ComponentModel;
+using System;
+
+namespace SecureFolderFS.Storage.VirtualFileSystem
+{
+    public interface IHealthStatistics
+    {
+        /// <summary>
+        /// Gets the file health validator associated with this instance.
+        /// </summary>
+        IAsyncValidator<IFile, IResult>? FileValidator { get; set; }
+
+        /// <summary>
+        /// Gets the file health validator associated with this instance.
+        /// </summary>
+        IAsyncValidator<IFolder, IResult>? FolderValidator { get; set; }
+
+        /// <summary>
+        /// Gets the file system structure validator.
+        /// </summary>
+        /// <remarks>
+        /// The consumer might provide an implementation of <see cref="IProgress{T}"/> of <see cref="IResult"/> to capture errors in real-time.
+        /// <br/>
+        /// The reporting of errors, however, is not guaranteed by the implementation and the consuming side should always
+        /// account for this and consider using a fallback in the form of the return value.
+        /// </remarks>
+        IAsyncValidator<(IFolder, IProgress<IResult>?), IResult>? StructureValidator { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="IProgress{T}"/> that reports when the file containing DirectoryID was not found.
+        /// </summary>
+        IProgress<string>? DirectoryIdNotFound { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="IProgress{T}"/> that reports when the file contents containing DirectoryID are invalid.
+        /// </summary>
+        IProgress<string>? DirectoryIdInvalid { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="IProgress{T}"/> that reports when the file name could not be encrypted or decrypted.
+        /// </summary>
+        IProgress<string>? InvalidPath { get; set; }
+    }
+}
diff --git a/src/SecureFolderFS.Storage/VirtualFileSystem/IReadWriteStatistics.cs b/src/SecureFolderFS.Storage/VirtualFileSystem/IReadWriteStatistics.cs
deleted file mode 100644
index 0576953e4..000000000
--- a/src/SecureFolderFS.Storage/VirtualFileSystem/IReadWriteStatistics.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-
-namespace SecureFolderFS.Storage.VirtualFileSystem
-{
-    /// <summary>
-    /// Allows for IO statistics to be reported.
-    /// </summary>
-    public interface IReadWriteStatistics
-    {
-        /// <summary>
-        /// Gets the <see cref="IProgress{T}"/> that reports the number of bytes read.
-        /// </summary>
-        IProgress<long>? BytesRead { get; set; }
-
-        /// <summary>
-        /// Gets the <see cref="IProgress{T}"/> that reports the number of bytes written.
-        /// </summary>
-        IProgress<long>? BytesWritten { get; set; }
-    }
-}
diff --git a/src/SecureFolderFS.Storage/VirtualFileSystem/IVFSRoot.cs b/src/SecureFolderFS.Storage/VirtualFileSystem/IVFSRoot.cs
index aaf9fcc39..1a39153db 100644
--- a/src/SecureFolderFS.Storage/VirtualFileSystem/IVFSRoot.cs
+++ b/src/SecureFolderFS.Storage/VirtualFileSystem/IVFSRoot.cs
@@ -9,19 +9,14 @@ namespace SecureFolderFS.Storage.VirtualFileSystem
     /// </summary>
     public interface IVFSRoot : IWrapper<IFolder>, IAsyncDisposable, IDisposable
     {
-        /// <summary>
-        /// Gets the display name of the storage.
-        /// </summary>
-        string StorageName { get; }
-
         /// <summary>
         /// Gets the fully-qualified name of the file system this storage root is a part of.
         /// </summary>
         string FileSystemName { get; }
 
         /// <summary>
-        /// Gets the instance of <see cref="IReadWriteStatistics"/> which is used to report the read-write statistics for this storage root.
+        /// Gets the <see cref="FileSystemOptions"/> instance for this file system.
         /// </summary>
-        IReadWriteStatistics ReadWriteStatistics { get; }
+        FileSystemOptions Options { get; }
     }
 }
diff --git a/tests/SecureFolderFS.Tests/FileSystemTests/BaseFileSystemTests.cs b/tests/SecureFolderFS.Tests/FileSystemTests/BaseFileSystemTests.cs
new file mode 100644
index 000000000..fadc82cb3
--- /dev/null
+++ b/tests/SecureFolderFS.Tests/FileSystemTests/BaseFileSystemTests.cs
@@ -0,0 +1,30 @@
+using SecureFolderFS.Sdk.Services;
+using SecureFolderFS.Shared;
+using SecureFolderFS.Storage.Extensions;
+using SecureFolderFS.Storage.VirtualFileSystem;
+using SecureFolderFS.Tests.Helpers;
+
+namespace SecureFolderFS.Tests.FileSystemTests
+{
+    public abstract class BaseFileSystemTests
+    {
+        protected async Task<IVFSRoot> MountVault(IFileSystem fileSystem)
+        {
+            var (vaultFolder, recoveryKey) = await MockVaultHelpers.CreateVaultLatestAsync();
+
+            var vaultService = DI.Service<IVaultService>();
+            var vaultManagerService = DI.Service<IVaultManagerService>();
+            var unlockContract = await vaultManagerService.RecoverAsync(vaultFolder, recoveryKey);
+
+            // Configure options
+            var options = new Dictionary<string, object>()
+            {
+                { nameof(FileSystemOptions.VolumeName), Guid.NewGuid().ToString() }
+            };
+
+            // Create the storage layer
+            var contentFolder = await vaultFolder.GetFolderByNameAsync(vaultService.ContentFolderName);
+            return await fileSystem.MountAsync(contentFolder, unlockContract, options);
+        }
+    }
+}
diff --git a/tests/SecureFolderFS.Tests/FileSystemTests/FileStructureTests.cs b/tests/SecureFolderFS.Tests/FileSystemTests/FileStructureTests.cs
new file mode 100644
index 000000000..f9600c92d
--- /dev/null
+++ b/tests/SecureFolderFS.Tests/FileSystemTests/FileStructureTests.cs
@@ -0,0 +1,75 @@
+using NUnit.Framework;
+using OwlCore.Storage;
+using SecureFolderFS.Sdk.Services;
+using SecureFolderFS.Shared;
+using SecureFolderFS.Storage.VirtualFileSystem;
+
+namespace SecureFolderFS.Tests.FileSystemTests
+{
+    [TestFixture]
+    public class FileStructureTests : BaseFileSystemTests
+    {
+        private IVFSRoot? _storageRoot;
+
+        [SetUp]
+        public async Task Initialize()
+        {
+            var vaultFileSystemService = DI.Service<IVaultFileSystemService>();
+            var localFileSystem = await vaultFileSystemService.GetLocalFileSystemAsync(default);
+
+            _storageRoot = await MountVault(localFileSystem);
+        }
+
+        [Test]
+        public async Task Create_FolderWith_SubFile_SubFolder_Delete_EachItem_ShouldThrow()
+        {
+            ArgumentNullException.ThrowIfNull(_storageRoot);
+
+            // Arrange
+            if (_storageRoot.Inner is not IModifiableFolder modifiableFolder)
+            {
+                Assert.Fail($"Folder is not {nameof(IModifiableFolder)}.");
+                return;
+            }
+
+            // Act
+            var subFolder = await modifiableFolder.CreateFolderAsync("FOLDER") as IModifiableFolder;
+            _ = subFolder ?? throw new ArgumentException($"Folder is not {nameof(IModifiableFolder)}.");
+
+            var createdFile = await subFolder.CreateFileAsync("SUB_FILE");
+            var createdFolder = await subFolder.CreateFolderAsync("SUB_FOLDER");
+
+            await subFolder.DeleteAsync(createdFile);
+            await subFolder.DeleteAsync(createdFolder);
+
+            // Assert
+            Assert.ThrowsAsync<FileNotFoundException>(async () => await subFolder.GetFirstByNameAsync("SUB_FILE"));
+            Assert.ThrowsAsync<FileNotFoundException>(async () => await subFolder.GetFirstByNameAsync("SUB_FOLDER"));
+        }
+
+        [Test]
+        public async Task Create_FolderWith_SubFile_SubFolder_Delete_Folder_ShouldThrow()
+        {
+            ArgumentNullException.ThrowIfNull(_storageRoot);
+
+            // Arrange
+            if (_storageRoot.Inner is not IModifiableFolder modifiableFolder)
+            {
+                Assert.Fail($"Folder is not {nameof(IModifiableFolder)}.");
+                return;
+            }
+
+            // Act
+            var subFolder = await modifiableFolder.CreateFolderAsync("FOLDER") as IModifiableFolder;
+            _ = subFolder ?? throw new ArgumentException($"Folder is not {nameof(IModifiableFolder)}.");
+
+            _ = await subFolder.CreateFileAsync("SUB_FILE");
+            _ = await subFolder.CreateFolderAsync("SUB_FOLDER");
+
+            await modifiableFolder.DeleteAsync((IStorableChild)subFolder);
+
+            // Assert
+            Assert.ThrowsAsync<FileNotFoundException>(async () => await modifiableFolder.GetFirstByNameAsync("FOLDER"));
+        }
+    }
+}
diff --git a/tests/SecureFolderFS.Tests/FileSystemTests/ReadWriteTests.cs b/tests/SecureFolderFS.Tests/FileSystemTests/ReadWriteTests.cs
new file mode 100644
index 000000000..1562589f7
--- /dev/null
+++ b/tests/SecureFolderFS.Tests/FileSystemTests/ReadWriteTests.cs
@@ -0,0 +1,69 @@
+using FluentAssertions;
+using NUnit.Framework;
+using OwlCore.Storage;
+using SecureFolderFS.Sdk.Services;
+using SecureFolderFS.Shared;
+using SecureFolderFS.Storage.VirtualFileSystem;
+
+namespace SecureFolderFS.Tests.FileSystemTests
+{
+    [TestFixture]
+    public class ReadWriteTests : BaseFileSystemTests
+    {
+        private IVFSRoot? _storageRoot;
+
+        [SetUp]
+        public async Task Initialize()
+        {
+            var vaultFileSystemService = DI.Service<IVaultFileSystemService>();
+            var localFileSystem = await vaultFileSystemService.GetLocalFileSystemAsync(default);
+
+            _storageRoot = await MountVault(localFileSystem);
+        }
+
+        [Test]
+        public async Task Write_SmallFile_Read_SameContent_NoThrow()
+        {
+            ArgumentNullException.ThrowIfNull(_storageRoot);
+
+            // Arrange
+            const string dataString = "test";
+            if (_storageRoot.Inner is not IModifiableFolder modifiableFolder)
+            {
+                Assert.Fail($"Folder is not {nameof(IModifiableFolder)}.");
+                return;
+            }
+
+            // Act
+            var file = await modifiableFolder.CreateFileAsync("SMALL_FILE");
+            await file.WriteTextAsync(dataString);
+            var compareString = await file.ReadTextAsync();
+
+            // Assert
+            dataString.SequenceEqual(compareString).Should().BeTrue();
+        }
+
+        [Test]
+        public async Task Write_LargeFile_Read_SameContent_NoThrow()
+        {
+            ArgumentNullException.ThrowIfNull(_storageRoot);
+
+            // Arrange
+            var data = new byte[300_000];
+            Random.Shared.NextBytes(data);
+            if (_storageRoot.Inner is not IModifiableFolder modifiableFolder)
+            {
+                Assert.Fail($"Folder is not {nameof(IModifiableFolder)}.");
+                return;
+            }
+
+            // Act
+            var file = await modifiableFolder.CreateFileAsync("LARGE_FILE");
+            await file.WriteBytesAsync(data);
+            var compareData = await file.ReadBytesAsync(default);
+
+            // Assert
+            data.SequenceEqual(compareData).Should().BeTrue();
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/SecureFolderFS.Tests/GlobalSetup.cs b/tests/SecureFolderFS.Tests/GlobalSetup.cs
index 7fb2588de..1e3026e82 100644
--- a/tests/SecureFolderFS.Tests/GlobalSetup.cs
+++ b/tests/SecureFolderFS.Tests/GlobalSetup.cs
@@ -1,20 +1,22 @@
 using Microsoft.Extensions.DependencyInjection;
+using NUnit.Framework;
 using OwlCore.Storage;
 using OwlCore.Storage.Memory;
 using SecureFolderFS.Sdk.Services;
 using SecureFolderFS.Shared;
 using SecureFolderFS.Tests.ServiceImplementation;
+using SecureFolderFS.UI;
 using SecureFolderFS.UI.ServiceImplementation;
 
 namespace SecureFolderFS.Tests
 {
-    [TestClass]
+    [SetUpFixture]
     public class GlobalSetup
     {
-        [AssemblyInitialize]
-        public static void GlobalInitialize(TestContext testContext)
+        [OneTimeSetUp]
+        public static void GlobalInitialize()
         {
-            var settingsFolderPath = Path.Combine(Path.DirectorySeparatorChar.ToString(), UI.Constants.FileNames.SETTINGS_FOLDER_NAME);
+            var settingsFolderPath = Path.Combine(Path.DirectorySeparatorChar.ToString(), Constants.FileNames.SETTINGS_FOLDER_NAME);
             var settingsFolder = new MemoryFolder(settingsFolderPath, Path.GetFileName(settingsFolderPath));
 
             var serviceProvider = BuildServiceProvider(settingsFolder);
@@ -28,9 +30,11 @@ private static IServiceProvider BuildServiceProvider(IModifiableFolder settingsF
                 // Singleton services
                 .AddSingleton<IVaultPersistenceService, VaultPersistenceService>(_ => new(settingsFolder))
                 .AddSingleton<IChangelogService, GitHubChangelogService>()
-                .AddSingleton<IVaultService, MockVaultService>()
+                .AddSingleton<IVaultService, VaultService>()
                 //.AddSingleton<IApplicationService, MockApplicationService>()
-                .AddSingleton<IVaultManagerService, MockVaultManagerService>()
+                .AddSingleton<IVaultManagerService, VaultManagerService>()
+                .AddSingleton<IVaultFileSystemService, MockVaultFileSystemService>()
+                .AddSingleton<IVaultCredentialsService, MockVaultCredentialsService>()
                 .AddSingleton<ITelemetryService, DebugTelemetryService>()
                 .AddSingleton<IIapService, DebugIapService>()
                 .AddSingleton<IUpdateService, DebugUpdateService>()
diff --git a/tests/SecureFolderFS.Tests/Helpers/MockVaultHelpers.Latest.cs b/tests/SecureFolderFS.Tests/Helpers/MockVaultHelpers.Latest.cs
new file mode 100644
index 000000000..c2d9bb0de
--- /dev/null
+++ b/tests/SecureFolderFS.Tests/Helpers/MockVaultHelpers.Latest.cs
@@ -0,0 +1,12 @@
+using OwlCore.Storage;
+
+namespace SecureFolderFS.Tests.Helpers
+{
+    internal static partial class MockVaultHelpers
+    {
+        public static async Task<(IFolder, string)> CreateVaultLatestAsync(CancellationToken cancellationToken = default)
+        {
+            return await CreateVaultV2Async(cancellationToken);
+        }
+    }
+}
diff --git a/tests/SecureFolderFS.Tests/Helpers/MockVaultHelpers.V2.cs b/tests/SecureFolderFS.Tests/Helpers/MockVaultHelpers.V2.cs
index df4b943c1..307573302 100644
--- a/tests/SecureFolderFS.Tests/Helpers/MockVaultHelpers.V2.cs
+++ b/tests/SecureFolderFS.Tests/Helpers/MockVaultHelpers.V2.cs
@@ -26,9 +26,9 @@ internal static partial class MockVaultHelpers
                                                   }
                                                   """;
 
-        public static async Task<IFolder> CreateVaultV2Async(CancellationToken cancellationToken = default)
+        public static async Task<(IFolder, string)> CreateVaultV2Async(CancellationToken cancellationToken = default)
         {
-            return await SetupMockVault(V2_SFCONFIG_STRING, V2_KEYSTORE_STRING, cancellationToken);
+            return (await SetupMockVault(V2_SFCONFIG_STRING, V2_KEYSTORE_STRING, cancellationToken), V2_RECOVERY_KEY);
         }
     }
 }
diff --git a/tests/SecureFolderFS.Tests/SecureFolderFS.Tests.csproj b/tests/SecureFolderFS.Tests/SecureFolderFS.Tests.csproj
index 72e56c4e7..8ef04be61 100644
--- a/tests/SecureFolderFS.Tests/SecureFolderFS.Tests.csproj
+++ b/tests/SecureFolderFS.Tests/SecureFolderFS.Tests.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
@@ -10,22 +10,19 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="6.0.2">
+    <PackageReference Include="FluentAssertions" Version="[7.0.0]" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="NUnit" Version="4.3.1" />
+    <PackageReference Include="NUnit.Analyzers" Version="4.4.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.5.2" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.5.2" />
+    <PackageReference Include="NUnit3TestAdapter" Version="5.0.0-beta.5" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Platforms\SecureFolderFS.UI\SecureFolderFS.UI.csproj" />
     <ProjectReference Include="..\..\src\SecureFolderFS.Sdk\SecureFolderFS.Sdk.csproj" />
   </ItemGroup>
-
-  <ItemGroup>
-    <Using Include="Microsoft.VisualStudio.TestTools.UnitTesting" />
-  </ItemGroup>
-
+  
 </Project>
diff --git a/tests/SecureFolderFS.Tests/ServiceImplementation/MockVaultService.cs b/tests/SecureFolderFS.Tests/ServiceImplementation/MockVaultCredentialsService.cs
similarity index 74%
rename from tests/SecureFolderFS.Tests/ServiceImplementation/MockVaultService.cs
rename to tests/SecureFolderFS.Tests/ServiceImplementation/MockVaultCredentialsService.cs
index 326d23322..b8b08dd9b 100644
--- a/tests/SecureFolderFS.Tests/ServiceImplementation/MockVaultService.cs
+++ b/tests/SecureFolderFS.Tests/ServiceImplementation/MockVaultCredentialsService.cs
@@ -1,5 +1,4 @@
 using OwlCore.Storage;
-using SecureFolderFS.Sdk.Models;
 using SecureFolderFS.Sdk.Services;
 using SecureFolderFS.Sdk.ViewModels.Controls.Authentication;
 using SecureFolderFS.UI.ServiceImplementation;
@@ -7,15 +6,9 @@
 
 namespace SecureFolderFS.Tests.ServiceImplementation
 {
-    /// <inheritdoc cref="IVaultService"/>
-    internal sealed class MockVaultService : BaseVaultService
+    /// <inheritdoc cref="IVaultCredentialsService"/>
+    internal sealed class MockVaultCredentialsService : BaseVaultCredentialsService
     {
-        /// <inheritdoc/>
-        public override IEnumerable<IFileSystemInfoModel> GetFileSystems()
-        {
-            yield break;
-        }
-
         public override async IAsyncEnumerable<AuthenticationViewModel> GetLoginAsync(IFolder vaultFolder, [EnumeratorCancellation] CancellationToken cancellationToken = default)
         {
             await Task.CompletedTask;
diff --git a/tests/SecureFolderFS.Tests/ServiceImplementation/MockVaultFileSystemService.cs b/tests/SecureFolderFS.Tests/ServiceImplementation/MockVaultFileSystemService.cs
new file mode 100644
index 000000000..875fee047
--- /dev/null
+++ b/tests/SecureFolderFS.Tests/ServiceImplementation/MockVaultFileSystemService.cs
@@ -0,0 +1,16 @@
+using SecureFolderFS.Sdk.Services;
+using SecureFolderFS.Storage.VirtualFileSystem;
+using SecureFolderFS.UI.ServiceImplementation;
+
+namespace SecureFolderFS.Tests.ServiceImplementation
+{
+    /// <inheritdoc cref="IVaultFileSystemService"/>
+    internal sealed class MockVaultFileSystemService : BaseVaultFileSystemService
+    {
+        /// <inheritdoc/>
+        public override IAsyncEnumerable<IFileSystem> GetFileSystemsAsync(CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/tests/SecureFolderFS.Tests/ServiceImplementation/MockVaultManagerService.cs b/tests/SecureFolderFS.Tests/ServiceImplementation/MockVaultManagerService.cs
deleted file mode 100644
index 501eeb4a1..000000000
--- a/tests/SecureFolderFS.Tests/ServiceImplementation/MockVaultManagerService.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using SecureFolderFS.Sdk.Models;
-using SecureFolderFS.Sdk.Services;
-using SecureFolderFS.Storage.VirtualFileSystem;
-using SecureFolderFS.UI.ServiceImplementation;
-
-namespace SecureFolderFS.Tests.ServiceImplementation
-{
-    /// <inheritdoc cref="IVaultManagerService"/>
-    internal sealed class MockVaultManagerService : BaseVaultManagerService
-    {
-        /// <inheritdoc/>
-        public override Task<IVFSRoot> CreateFileSystemAsync(IVaultModel vaultModel, IDisposable unlockContract, CancellationToken cancellationToken)
-        {
-            return Task.FromException<IVFSRoot>(new NotImplementedException());
-        }
-    }
-}
diff --git a/tests/SecureFolderFS.Tests/ServiceTests/MigrationTests.cs b/tests/SecureFolderFS.Tests/ServiceTests/MigrationTests.cs
index 660ce4a84..d10301266 100644
--- a/tests/SecureFolderFS.Tests/ServiceTests/MigrationTests.cs
+++ b/tests/SecureFolderFS.Tests/ServiceTests/MigrationTests.cs
@@ -1,4 +1,6 @@
-using OwlCore.Storage;
+using FluentAssertions;
+using NUnit.Framework;
+using OwlCore.Storage;
 using SecureFolderFS.Core;
 using SecureFolderFS.Sdk.Services;
 using SecureFolderFS.Shared;
@@ -8,15 +10,15 @@
 
 namespace SecureFolderFS.Tests.ServiceTests
 {
-    [TestClass]
+    [TestFixture]
     public class MigrationTests
     {
-        [TestMethod]
+        [Test]
         public async Task Create_V1Vault_MigrateTo_V2Vault_NoThrow()
         {
             // Arrange
             var v1VaultFolder = await MockVaultHelpers.CreateVaultV1Async();
-            var service = DI.Service<IVaultManagerService>();
+            var service = DI.Service<IVaultService>();
 
             // Act
             var migrator = await service.GetMigratorAsync(v1VaultFolder);
@@ -27,7 +29,7 @@ public async Task Create_V1Vault_MigrateTo_V2Vault_NoThrow()
             var v2ConfigFile = await v1VaultFolder.GetFileByNameAsync(Constants.Vault.Names.VAULT_CONFIGURATION_FILENAME);
             await using var v2ConfigStream = await v2ConfigFile.OpenReadAsync();
 
-            Assert.IsTrue(v2ConfigStream.Length > 0L);
+            v2ConfigStream.Length.Should().BeGreaterThan(0L);
         }
     }
 }