diff --git a/src/Languages/lang_en.json b/src/Languages/lang_en.json
index 57e75dc5f3..98227dbc73 100644
--- a/src/Languages/lang_en.json
+++ b/src/Languages/lang_en.json
@@ -57,6 +57,48 @@
   "The selected package manager is not ready.": "The selected package manager is not ready.",
   "Catalog package search failed: {0}": "Catalog package search failed: {0}",
   "Discard unsaved catalog changes?": "Discard unsaved catalog changes?",
+  "New file": "New file",
+  "Add packages": "Add packages",
+  "Add packages to {0}": "Add packages to {0}",
+  "Search for packages, check the ones you want, then click Add selection to catalog.": "Search for packages, check the ones you want, then click Add selection to catalog.",
+  "Packages added to catalog": "Packages added to catalog",
+  "More actions": "More actions",
+  "No software catalog has been set up on this device yet.": "No software catalog has been set up on this device yet.",
+  "Expected at {0}": "Expected at {0}",
+  "The software catalog is not valid. Ask an administrator to fix it.": "The software catalog is not valid. Ask an administrator to fix it.",
+  "The software catalog could not be read. Ask an administrator to check its permissions.": "The software catalog could not be read. Ask an administrator to check its permissions.",
+  "Version {0}": "Version {0}",
+  "Loading versions": "Loading versions",
+  "Pin version": "Pin version",
+  "Enable this package's manager and source to pin its version.": "Enable this package's manager and source to pin its version.",
+  "{0} cannot install a specific version, so this package always installs the latest version.": "{0} cannot install a specific version, so this package always installs the latest version.",
+  "Choose the version of {0} that this catalog installs.": "Choose the version of {0} that this catalog installs.",
+  "The available versions could not be loaded: {0}": "The available versions could not be loaded: {0}",
+  "The sources of {0} could not be listed. Check the log, then try again.": "The sources of {0} could not be listed. Check the log, then try again.",
+  "1 package added to catalog {0}. Save the catalog to keep your changes.": "1 package added to catalog {0}. Save the catalog to keep your changes.",
+  "1 package added to {0} catalogs. Save the catalog to keep your changes.": "1 package added to {0} catalogs. Save the catalog to keep your changes.",
+  "Choose the catalogs to add the selected package to.": "Choose the catalogs to add the selected package to.",
+  "1 was already in the catalog.": "1 was already in the catalog.",
+  "Remove catalog {0} and its package?": "Remove catalog {0} and its package?",
+  "Choose the catalogs to add the {0} selected packages to.": "Choose the catalogs to add the {0} selected packages to.",
+  "Add to {0} catalogs": "Add to {0} catalogs",
+  "{0} were already in the catalog.": "{0} were already in the catalog.",
+  "{0}: {1} added": "{0}: {1} added",
+  "{0}: {1} added, {2} already there": "{0}: {1} added, {2} already there",
+  "Save the catalog to keep your changes.": "Save the catalog to keep your changes.",
+  "Packages added to {0} catalogs": "Packages added to {0} catalogs",
+  "{0} packages added to {1} catalogs. Save the catalog to keep your changes.": "{0} packages added to {1} catalogs. Save the catalog to keep your changes.",
+  "Create a catalog in the Catalog Editor first.": "Create a catalog in the Catalog Editor first.",
+  "Catalog saved": "Catalog saved",
+  "The catalog was not saved.": "The catalog was not saved.",
+  "UniGetUI needs administrator rights to save the software catalog.": "UniGetUI needs administrator rights to save the software catalog.",
+  "Could not copy the file to {0} as an administrator (robocopy exit code {1}).": "Could not copy the file to {0} as an administrator (robocopy exit code {1}).",
+  "Remove": "Remove",
+  "Remove catalog": "Remove catalog",
+  "Remove catalog {0}": "Remove catalog {0}",
+  "Remove catalog {0} and its {1} packages?": "Remove catalog {0} and its {1} packages?",
+  "Discard unsaved catalog changes and start a new catalog file?": "Discard unsaved catalog changes and start a new catalog file?",
+  "Close the current catalog file and start a new one? Use New catalog to add a catalog to this file instead.": "Close the current catalog file and start a new one? Use New catalog to add a catalog to this file instead.",
   "Select a local catalog file.": "Select a local catalog file.",
   "Could not select a catalog file: {0}": "Could not select a catalog file: {0}",
   "The catalog editor could not be opened: {0}": "The catalog editor could not be opened: {0}",
diff --git a/src/SharedAssets/Assets/Symbols/catalog_add.svg b/src/SharedAssets/Assets/Symbols/catalog_add.svg
new file mode 100644
index 0000000000..1d21ff3480
--- /dev/null
+++ b/src/SharedAssets/Assets/Symbols/catalog_add.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.5 3C11.7426 3 12.75 4.00736 12.75 5.25V11.25H18.75C19.9926 11.25 21 12.2574 21 13.5V18.75C21 19.9926 19.9926 21 18.75 21H5.25C4.00736 21 3 19.9926 3 18.75V5.25C3 4.00736 4.00736 3 5.25 3H10.5ZM11.25 12.75H4.5V18.75C4.5 19.1642 4.83579 19.5 5.25 19.5H11.249L11.25 12.75ZM18.75 12.75H12.749V19.5H18.75C19.1642 19.5 19.5 19.1642 19.5 18.75V13.5C19.5 13.0858 19.1642 12.75 18.75 12.75ZM10.5 4.5H5.25C4.83579 4.5 4.5 4.83579 4.5 5.25V11.25H11.25V5.25C11.25 4.83579 10.9142 4.5 10.5 4.5ZM17.8982 2.00685L18 2C18.3797 2 18.6935 2.28215 18.7432 2.64823L18.75 2.75V5.25H21.25C21.6297 5.25 21.9435 5.53215 21.9932 5.89823L22 6C22 6.3797 21.7178 6.69349 21.3518 6.74315L21.25 6.75H18.75V9.25C18.75 9.6297 18.4678 9.94349 18.1018 9.99315L18 10C17.6203 10 17.3065 9.71785 17.2568 9.35177L17.25 9.25V6.75H14.75C14.3703 6.75 14.0565 6.46785 14.0068 6.10177L14 6C14 5.6203 14.2822 5.30651 14.6482 5.25685L14.75 5.25H17.25V2.75C17.25 2.3703 17.5322 2.05651 17.8982 2.00685Z" fill="#212121"/>
+</svg>
diff --git a/src/SharedAssets/Assets/Symbols/collections_add.svg b/src/SharedAssets/Assets/Symbols/collections_add.svg
new file mode 100644
index 0000000000..93a08ea938
--- /dev/null
+++ b/src/SharedAssets/Assets/Symbols/collections_add.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.0656 8.00389L11.25 7.99875H18.75C20.483 7.99875 21.8992 9.3552 21.9949 11.0643L22 11.2487V12.8096C21.5557 12.3832 21.051 12.0194 20.5 11.7322V11.2487C20.5 10.2822 19.7165 9.49875 18.75 9.49875H11.25C10.3318 9.49875 9.57881 10.2059 9.5058 11.1052L9.5 11.2487V18.7487C9.5 19.6669 10.2071 20.4199 11.1065 20.4929L11.25 20.4987H11.7316C12.0186 21.0497 12.3822 21.5544 12.8084 21.9987H11.25C9.51697 21.9987 8.10075 20.6423 8.00514 18.9332L8 18.7487V11.2487C8 9.51571 9.35645 8.0995 11.0656 8.00389ZM15.5818 4.23284L15.6345 4.40964L16.327 6.998H14.774L14.1856 4.79787C13.9355 3.86431 12.9759 3.31029 12.0423 3.56044L4.79787 5.50158C3.91344 5.73856 3.36966 6.61227 3.52756 7.49737L3.56044 7.64488L5.50158 14.8893C5.69372 15.6064 6.30445 16.0996 7.00045 16.1764L7.00056 17.6816C5.69932 17.6051 4.52962 16.7445 4.10539 15.4544L4.05269 15.2776L2.11155 8.03311C1.66301 6.35913 2.6067 4.6401 4.23284 4.10539L4.40964 4.05269L11.6541 2.11155C13.3281 1.66301 15.0471 2.6067 15.5818 4.23284ZM23 17.5C23 14.4624 20.5376 12 17.5 12C14.4624 12 12 14.4624 12 17.5C12 20.5376 14.4624 23 17.5 23C20.5376 23 23 20.5376 23 17.5ZM17.4101 14.0073L17.5 13.9992L17.5899 14.0073C17.794 14.0443 17.9549 14.2053 17.9919 14.4094L18 14.4992L17.9996 16.9992L20.5046 17L20.5944 17.0081C20.7985 17.0451 20.9595 17.206 20.9965 17.4101L21.0046 17.5L20.9965 17.5899C20.9595 17.794 20.7985 17.9549 20.5944 17.9919L20.5046 18L18.0007 17.9992L18.0011 20.5035L17.9931 20.5934C17.956 20.7975 17.7951 20.9584 17.591 20.9954L17.5011 21.0035L17.4112 20.9954C17.2071 20.9584 17.0462 20.7975 17.0092 20.5934L17.0011 20.5035L17.0007 17.9992L14.4977 18L14.4078 17.9919C14.2037 17.9549 14.0427 17.794 14.0057 17.5899L13.9977 17.5L14.0057 17.4101C14.0427 17.206 14.2037 17.0451 14.4078 17.0081L14.4977 17L16.9996 16.9992L17 14.4992L17.0081 14.4094C17.0451 14.2053 17.206 14.0443 17.4101 14.0073Z" fill="#212121"/>
+</svg>
diff --git a/src/SharedAssets/Assets/Symbols/document_add.svg b/src/SharedAssets/Assets/Symbols/document_add.svg
new file mode 100644
index 0000000000..f474900a5e
--- /dev/null
+++ b/src/SharedAssets/Assets/Symbols/document_add.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M18.5 20C18.5 20.275 18.276 20.5 18 20.5H12.2678C11.9806 21.051 11.6168 21.5557 11.1904 22H18C19.104 22 20 21.104 20 20V9.828C20 9.298 19.789 8.789 19.414 8.414L13.585 2.586C13.2277 2.22867 12.6729 2 12.172 2H6C4.896 2 4 2.896 4 4V11.4982C4.47417 11.3004 4.97679 11.1572 5.5 11.0764V4C5.5 3.725 5.724 3.5 6 3.5H12V8C12 9.104 12.896 10 14 10H18.5V20ZM13.5 4.621L17.378 8.5H14C13.724 8.5 13.5 8.275 13.5 8V4.621ZM12 17.5C12 14.4624 9.53757 12 6.5 12C3.46243 12 1 14.4624 1 17.5C1 20.5376 3.46243 23 6.5 23C9.53757 23 12 20.5376 12 17.5ZM7.00065 18L7.00111 20.5035C7.00111 20.7797 6.77725 21.0035 6.50111 21.0035C6.22497 21.0035 6.00111 20.7797 6.00111 20.5035L6.00065 18H3.4956C3.21973 18 2.99609 17.7762 2.99609 17.5C2.99609 17.2239 3.21973 17 3.4956 17H6.00046L6 14.4993C6 14.2231 6.22386 13.9993 6.5 13.9993C6.77614 13.9993 7 14.2231 7 14.4993L7.00046 17H9.49659C9.77246 17 9.99609 17.2239 9.99609 17.5C9.99609 17.7762 9.77246 18 9.49659 18H7.00065Z" fill="#212121"/>
+</svg>
diff --git a/src/SharedAssets/Assets/Symbols/rename.svg b/src/SharedAssets/Assets/Symbols/rename.svg
new file mode 100644
index 0000000000..048b8fe0b5
--- /dev/null
+++ b/src/SharedAssets/Assets/Symbols/rename.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14.2502 2C14.6645 2 15.0002 2.33579 15.0002 2.75C15.0002 3.16421 14.6645 3.5 14.2502 3.5H12.7502V20.5H14.2502C14.6645 20.5 15.0002 20.8358 15.0002 21.25C15.0002 21.6642 14.6645 22 14.2502 22H9.75024C9.33603 22 9.00024 21.6642 9.00024 21.25C9.00024 20.8358 9.33603 20.5 9.75024 20.5H11.2502V3.5H9.75024C9.33603 3.5 9.00024 3.16421 9.00024 2.75C9.00024 2.33579 9.33603 2 9.75024 2H14.2502ZM10.2502 6.5H5.25024C4.28375 6.5 3.50024 7.2835 3.50024 8.25V15.75C3.50024 16.7165 4.28375 17.5 5.25024 17.5H10.2502V19H5.25024C3.45532 19 2.00024 17.5449 2.00024 15.75V8.25C2.00024 6.45507 3.45532 5 5.25024 5H10.2502V6.5ZM18.7502 5C20.5452 5 22.0002 6.45507 22.0002 8.25V15.75C22.0002 17.5449 20.5452 19 18.7502 19H13.7502V17.5H18.7502C19.7167 17.5 20.5002 16.7165 20.5002 15.75V8.25C20.5002 7.2835 19.7167 6.5 18.7502 6.5H13.7502V5H18.7502Z" fill="#212121"/>
+</svg>
diff --git a/src/UniGetUI.Avalonia/Assets/Styles/Styles.MacGlassControls.axaml b/src/UniGetUI.Avalonia/Assets/Styles/Styles.MacGlassControls.axaml
index 5471f59d31..4d33c2c401 100644
--- a/src/UniGetUI.Avalonia/Assets/Styles/Styles.MacGlassControls.axaml
+++ b/src/UniGetUI.Avalonia/Assets/Styles/Styles.MacGlassControls.axaml
@@ -82,6 +82,20 @@
         <Setter Property="CornerRadius" Value="18"/>
         <Setter Property="Margin" Value="0,2"/>
     </Style>
+    <!-- Grouped buttons sit inside a capsule with a 1px rim; keep their highlight inside that rim. -->
+    <Style Selector="controls|ToolbarOverflowPanel#ToolBar Button:not(:disabled) /template/ ContentPresenter#PART_ContentPresenter,
+                     controls|ToolbarOverflowPanel#ToolBar Button:disabled /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Margin" Value="1,3"/>
+    </Style>
+    <!-- A dropdown in a group (e.g. the catalog selector) blends into the capsule the same way. -->
+    <Style Selector="controls|ToolbarOverflowPanel#ToolBar ComboBox">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="CornerRadius" Value="18"/>
+        <Setter Property="MinHeight" Value="0"/>
+        <Setter Property="Margin" Value="1,3"/>
+        <Setter Property="VerticalAlignment" Value="Stretch"/>
+    </Style>
     <Style Selector="Button#MainToolbarButton:not(:disabled) /template/ ContentPresenter#PART_ContentPresenter,
                      Button#MainToolbarButton:disabled /template/ ContentPresenter#PART_ContentPresenter">
         <Setter Property="CornerRadius" Value="18,0,0,18"/>
@@ -90,6 +104,10 @@
                      Button#MainToolbarButtonDropdown:disabled /template/ ContentPresenter#PART_ContentPresenter">
         <Setter Property="CornerRadius" Value="0,18,18,0"/>
     </Style>
+    <Style Selector="Button#MainToolbarButton.standalone:not(:disabled) /template/ ContentPresenter#PART_ContentPresenter,
+                     Button#MainToolbarButton.standalone:disabled /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="CornerRadius" Value="18"/>
+    </Style>
     <Style Selector="#ToolbarRow ToggleButton:not(:disabled), #ToolbarRow ToggleButton:disabled">
         <Setter Property="Background" Value="{DynamicResource MacGlassControlBackground}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource MacGlassPanelBorderBrush}"/>
diff --git a/src/UniGetUI.Avalonia/Infrastructure/AvaloniaAppHost.cs b/src/UniGetUI.Avalonia/Infrastructure/AvaloniaAppHost.cs
index 0234b7a79a..2069142fd4 100644
--- a/src/UniGetUI.Avalonia/Infrastructure/AvaloniaAppHost.cs
+++ b/src/UniGetUI.Avalonia/Infrastructure/AvaloniaAppHost.cs
@@ -1,6 +1,9 @@
 using System.IO;
+using System.Runtime.ExceptionServices;
 using System.Runtime.InteropServices;
 using Avalonia;
+using Avalonia.Automation;
+using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Media;
 #if WINDOWS
 using Avalonia.Win32;
@@ -134,7 +137,51 @@ Welcome to UniGetUI Version {CoreData.VersionName}
             return;
         }
 
-        BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
+        try
+        {
+            BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
+        }
+        catch (ElementNotEnabledException ex)
+        {
+            ResumeAfterRefusedAutomation(ex);
+        }
+    }
+
+    /// <summary>
+    /// An accessibility client (VoiceOver, UI automation) invoking a disabled control makes Avalonia
+    /// throw <see cref="ElementNotEnabledException"/>. On macOS that escapes the native run loop with
+    /// no handler and would end the app, although the right outcome is to ignore the request. The
+    /// windows and lifetime are still intact, so log it and keep running the main loop until the
+    /// lifetime's normal exit.
+    /// </summary>
+    private static void ResumeAfterRefusedAutomation(ElementNotEnabledException first)
+    {
+        if (Application.Current?.ApplicationLifetime is not IClassicDesktopStyleApplicationLifetime lifetime)
+        {
+            ExceptionDispatchInfo.Capture(first).Throw();
+            return;
+        }
+        using var exited = new CancellationTokenSource();
+        lifetime.Exit += (_, e) =>
+        {
+            Environment.ExitCode = e.ApplicationExitCode;
+            exited.Cancel();
+        };
+        Exception? refused = first;
+        while (!exited.IsCancellationRequested)
+        {
+            Logger.Warn("An accessibility client tried to invoke a disabled control; ignoring it.");
+            Logger.Warn(refused!);
+            try
+            {
+                Dispatcher.UIThread.MainLoop(exited.Token);
+                refused = null;
+            }
+            catch (ElementNotEnabledException ex)
+            {
+                refused = ex;
+            }
+        }
     }
 
     /// <summary>
diff --git a/src/UniGetUI.Avalonia/Infrastructure/MacAdminFileInstaller.cs b/src/UniGetUI.Avalonia/Infrastructure/MacAdminFileInstaller.cs
new file mode 100644
index 0000000000..a16a618a71
--- /dev/null
+++ b/src/UniGetUI.Avalonia/Infrastructure/MacAdminFileInstaller.cs
@@ -0,0 +1,55 @@
+using System.Diagnostics;
+using System.Runtime.Versioning;
+
+namespace UniGetUI.Avalonia.Infrastructure;
+
+/// <summary>
+/// Writes a file to a root-owned location on macOS through the system administrator prompt.
+/// </summary>
+[SupportedOSPlatform("macos")]
+internal static class MacAdminFileInstaller
+{
+    private const int UserCanceledError = -128;
+
+    /// <summary>
+    /// Copies <paramref name="contents"/> to <paramref name="destination"/> as root, creating its folder.
+    /// <paramref name="prompt"/> is shown in the password dialog. Returns false when the user cancels it.
+    /// </summary>
+    public static async Task<bool> WriteAsync(string destination, string contents, string prompt)
+    {
+        string stagingDirectory = Directory.CreateTempSubdirectory("unigetui-admin-write-").FullName;
+        try
+        {
+            string staged = Path.Combine(stagingDirectory, Path.GetFileName(destination));
+            await File.WriteAllTextAsync(staged, contents);
+
+            string folder = Path.GetDirectoryName(destination)!;
+            string command = $"/bin/mkdir -p {ShellQuote(folder)} && /usr/bin/install -m 0644 {ShellQuote(staged)} {ShellQuote(destination)}";
+            var startInfo = new ProcessStartInfo("/usr/bin/osascript")
+            {
+                RedirectStandardError = true,
+                RedirectStandardOutput = true,
+                UseShellExecute = false,
+            };
+            startInfo.ArgumentList.Add("-e");
+            startInfo.ArgumentList.Add($"do shell script \"{AppleScriptEscape(command)}\" with prompt \"{AppleScriptEscape(prompt)}\" with administrator privileges");
+
+            using var process = Process.Start(startInfo)
+                ?? throw new IOException("Could not start the administrator prompt.");
+            string error = await process.StandardError.ReadToEndAsync();
+            await process.WaitForExitAsync();
+            if (process.ExitCode == 0) return true;
+            if (error.Contains($"({UserCanceledError})", StringComparison.Ordinal)) return false;
+            throw new IOException(error.Trim());
+        }
+        finally
+        {
+            try { Directory.Delete(stagingDirectory, recursive: true); }
+            catch { /* best effort cleanup of a temp folder */ }
+        }
+    }
+
+    internal static string ShellQuote(string value) => "'" + value.Replace("'", "'\\''") + "'";
+
+    internal static string AppleScriptEscape(string value) => value.Replace("\\", "\\\\").Replace("\"", "\\\"");
+}
diff --git a/src/UniGetUI.Avalonia/Infrastructure/WindowsAdminFileInstaller.cs b/src/UniGetUI.Avalonia/Infrastructure/WindowsAdminFileInstaller.cs
new file mode 100644
index 0000000000..a3943de964
--- /dev/null
+++ b/src/UniGetUI.Avalonia/Infrastructure/WindowsAdminFileInstaller.cs
@@ -0,0 +1,60 @@
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Runtime.Versioning;
+using UniGetUI.Core.Tools;
+
+namespace UniGetUI.Avalonia.Infrastructure;
+
+[SupportedOSPlatform("windows")]
+internal static class WindowsAdminFileInstaller
+{
+    private const int ErrorCancelled = 1223;
+    private const int RobocopyFirstFailureCode = 8;
+
+    public static async Task<bool> WriteAsync(string destination, string contents)
+    {
+        string stagingDirectory = Directory.CreateTempSubdirectory("unigetui-admin-write-").FullName;
+        try
+        {
+            await File.WriteAllTextAsync(Path.Combine(stagingDirectory, Path.GetFileName(destination)), contents);
+
+            using var process = new Process { StartInfo = CreateStartInfo(stagingDirectory, destination) };
+            CoreTools.PrepareForegroundForElevation();
+            try
+            {
+                process.Start();
+            }
+            catch (Win32Exception ex) when (ex.NativeErrorCode == ErrorCancelled)
+            {
+                return false;
+            }
+            await process.WaitForExitAsync();
+            if (process.ExitCode >= RobocopyFirstFailureCode)
+                throw new IOException(CoreTools.Translate("Could not copy the file to {0} as an administrator (robocopy exit code {1}).",
+                    destination, process.ExitCode));
+            return true;
+        }
+        finally
+        {
+            try { Directory.Delete(stagingDirectory, recursive: true); }
+            catch { }
+        }
+    }
+
+    internal static ProcessStartInfo CreateStartInfo(string stagingDirectory, string destination)
+    {
+        var startInfo = new ProcessStartInfo(Path.Combine(Environment.SystemDirectory, "robocopy.exe"))
+        {
+            UseShellExecute = true,
+            Verb = "runas",
+            WindowStyle = ProcessWindowStyle.Hidden,
+        };
+        foreach (string argument in new[]
+        {
+            stagingDirectory, Path.GetDirectoryName(destination)!, Path.GetFileName(destination),
+            "/IS", "/IT", "/R:0", "/W:0", "/NP", "/NJH", "/NJS",
+        })
+            startInfo.ArgumentList.Add(argument);
+        return startInfo;
+    }
+}
diff --git a/src/UniGetUI.Avalonia/Models/SoftwareCatalog.cs b/src/UniGetUI.Avalonia/Models/SoftwareCatalog.cs
index cb363d2568..1baf858762 100644
--- a/src/UniGetUI.Avalonia/Models/SoftwareCatalog.cs
+++ b/src/UniGetUI.Avalonia/Models/SoftwareCatalog.cs
@@ -1,6 +1,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using UniGetUI.Avalonia.Infrastructure;
 using UniGetUI.Core.Data;
+using UniGetUI.Core.Tools;
 using UniGetUI.PackageEngine.Classes.Serializable;
 using UniGetUI.PackageEngine.Interfaces;
 
@@ -78,11 +80,35 @@ internal static class SoftwareCatalog
 {
     public static string FilePath => Path.Combine(CoreData.UniGetUIGlobalDirectory, "SoftwareCatalog.json");
 
-    internal static async Task SaveAsync(string filePath, CatalogDefinition[] catalogs)
+    private static string Serialize(CatalogDefinition[] catalogs)
     {
         var document = new CatalogDocument { Version = 1, Catalogs = catalogs };
         string json = JsonSerializer.Serialize(document, CatalogJsonContext.Default.CatalogDocument);
         Parse(json);
+        return json;
+    }
+
+    /// <summary>
+    /// Saves through the administrator prompt (macOS password dialog, Windows UAC), for a
+    /// machine-wide location the user cannot write. Returns false when the user cancels the prompt.
+    /// </summary>
+    internal static Task<bool> SaveWithAdminRightsAsync(string filePath, CatalogDefinition[] catalogs)
+    {
+        string destination = Path.GetFullPath(filePath);
+        string contents = Serialize(catalogs) + Environment.NewLine;
+        if (OperatingSystem.IsWindows())
+            return WindowsAdminFileInstaller.WriteAsync(destination, contents);
+        if (OperatingSystem.IsMacOS())
+            return MacAdminFileInstaller.WriteAsync(destination, contents,
+                CoreTools.Translate("UniGetUI needs administrator rights to save the software catalog."));
+        throw new PlatformNotSupportedException();
+    }
+
+    internal static bool CanSaveWithAdminRights => OperatingSystem.IsWindows() || OperatingSystem.IsMacOS();
+
+    internal static async Task SaveAsync(string filePath, CatalogDefinition[] catalogs)
+    {
+        string json = Serialize(catalogs);
         string destination = Path.GetFullPath(filePath);
         string temporary = Path.Combine(Path.GetDirectoryName(destination)!, $".catalog-{Guid.NewGuid():N}.tmp");
         try
@@ -102,6 +128,24 @@ internal static async Task SaveAsync(string filePath, CatalogDefinition[] catalo
 
     public static Task<CatalogDefinition[]> LoadAsync() => LoadAsync(FilePath);
 
+    /// <summary>
+    /// Whether the machine-wide catalog exists, loads and lists at least one package: only then is
+    /// it worth leading the navigation with. Missing, empty and broken catalogs all count as unset.
+    /// </summary>
+    public static bool HasUsableCatalog() => HasUsableCatalog(FilePath);
+
+    internal static bool HasUsableCatalog(string filePath)
+    {
+        try
+        {
+            return File.Exists(filePath) && Parse(File.ReadAllText(filePath)).Any(c => c.Packages.Length > 0);
+        }
+        catch (Exception ex) when (ex is IOException or UnauthorizedAccessException or JsonException)
+        {
+            return false;
+        }
+    }
+
     internal static async Task<CatalogDefinition[]> LoadAsync(string filePath)
     {
         await using var stream = File.OpenRead(filePath);
diff --git a/src/UniGetUI.Avalonia/ViewModels/DialogPages/CatalogEditorViewModel.cs b/src/UniGetUI.Avalonia/ViewModels/DialogPages/CatalogEditorViewModel.cs
index f461a04e95..58a4667d95 100644
--- a/src/UniGetUI.Avalonia/ViewModels/DialogPages/CatalogEditorViewModel.cs
+++ b/src/UniGetUI.Avalonia/ViewModels/DialogPages/CatalogEditorViewModel.cs
@@ -31,6 +31,8 @@ public CatalogEditorCatalog(CatalogDefinition definition)
     public CatalogDefinition ToDefinition() => new() { Id = Id, Name = Name, Packages = Packages.ToArray() };
 }
 
+public sealed record CatalogAddResult(CatalogEditorCatalog Catalog, int Added, int AlreadyPresent);
+
 public partial class CatalogEditorViewModel : ViewModelBase
 {
     public ObservableCollection<CatalogEditorCatalog> Catalogs { get; } = [];
@@ -69,7 +71,14 @@ public CatalogEditorViewModel() : this(AccessibilityAnnouncementService.Announce
 
     internal CatalogEditorViewModel(Action<string?, AutomationLiveSetting> announce) => _announce = announce;
 
-    public void SetErrorMessage(string message) => SetMessage(message, AutomationLiveSetting.Assertive);
+    /// <summary>Raised with the text of every error, so the view can show it to the user.</summary>
+    public event Action<string>? ErrorRaised;
+
+    public void SetErrorMessage(string message)
+    {
+        SetMessage(message, AutomationLiveSetting.Assertive);
+        ErrorRaised?.Invoke(message);
+    }
 
     private void SetMessage(string message, AutomationLiveSetting liveSetting = AutomationLiveSetting.Polite)
     {
@@ -93,8 +102,44 @@ private void SetMessage(string message, AutomationLiveSetting liveSetting = Auto
     private Task<bool>? _initialLoad;
     private CatalogDefinition[] _savedCatalogs = [];
 
-    public Task<bool> EnsureLoadedAsync() =>
-        IsLoaded ? Task.FromResult(true) : _initialLoad ??= LoadAsync(FilePath);
+    public Task<bool> EnsureLoadedAsync()
+    {
+        if (IsLoaded) return Task.FromResult(true);
+        // A failed load is retried on the next visit, so a file fixed or deployed later is picked up.
+        if (_initialLoad is { IsCompleted: true } done && !done.Result) _initialLoad = null;
+        return _initialLoad ??= LoadOrStartAsync(FilePath);
+    }
+
+    // No catalog deployed yet: start an empty document that saves to that path, so a first
+    // catalog can be created there instead of the editor opening disabled.
+    private Task<bool> LoadOrStartAsync(string path)
+    {
+        if (!IsMissing(path)) return LoadAsync(path);
+        SelectedCatalog = null;
+        Catalogs.Clear();
+        FilePath = Path.GetFullPath(path);
+        _savedCatalogs = [];
+        IsLoaded = true;
+        IsDirty = false;
+        return Task.FromResult(true);
+    }
+
+    internal static bool IsMissing(string path)
+    {
+        if (File.Exists(path)) return false;
+        try
+        {
+            using (File.OpenRead(path)) return false;
+        }
+        catch (Exception ex) when (ex is FileNotFoundException or DirectoryNotFoundException)
+        {
+            return true;
+        }
+        catch
+        {
+            return false;
+        }
+    }
 
     public void NewDocument()
     {
@@ -112,17 +157,42 @@ public int AddPackages(IEnumerable<IPackage> packages)
     {
         if (!CanEdit || SelectedCatalog is not { } catalog)
             throw new InvalidOperationException(CoreTools.Translate("Open or create a catalog before adding packages."));
-        int added = 0;
-        foreach (var package in packages)
+        return AddPackages(packages, [catalog])[0].Added;
+    }
+
+    /// <summary>
+    /// Adds <paramref name="packages"/> to each of <paramref name="catalogs"/>, skipping ones a catalog
+    /// already holds, and reports what happened per catalog.
+    /// </summary>
+    public IReadOnlyList<CatalogAddResult> AddPackages(IEnumerable<IPackage> packages, IReadOnlyList<CatalogEditorCatalog> catalogs)
+    {
+        if (!CanEdit || catalogs.Count == 0 || catalogs.Any(c => !Catalogs.Contains(c)))
+            throw new InvalidOperationException(CoreTools.Translate("Open or create a catalog before adding packages."));
+        var selection = packages.ToList();
+        var results = new List<CatalogAddResult>();
+        foreach (var catalog in catalogs)
         {
-            if (catalog.Packages.Any(p => p.Matches(package))) continue;
-            catalog.Packages.Add(CatalogEntry.FromPackage(package));
-            added++;
+            int added = 0;
+            foreach (var package in selection)
+            {
+                if (catalog.Packages.Any(p => p.Matches(package))) continue;
+                catalog.Packages.Add(CatalogEntry.FromPackage(package));
+                added++;
+            }
+            results.Add(new CatalogAddResult(catalog, added, selection.Count - added));
         }
-        Message = CoreTools.Translate("{0} packages added to catalog {1}. Save the catalog to keep your changes.", added, catalog.Name);
-        return added;
+        Message = results.Count == 1
+            ? AddedToCatalogMessage(results[0].Added, results[0].Catalog.Name)
+            : results.Sum(r => r.Added) == 1
+                ? CoreTools.Translate("1 package added to {0} catalogs. Save the catalog to keep your changes.", results.Count)
+                : CoreTools.Translate("{0} packages added to {1} catalogs. Save the catalog to keep your changes.", results.Sum(r => r.Added), results.Count);
+        return results;
     }
 
+    internal static string AddedToCatalogMessage(int added, string catalogName) => added == 1
+        ? CoreTools.Translate("1 package added to catalog {0}. Save the catalog to keep your changes.", catalogName)
+        : CoreTools.Translate("{0} packages added to catalog {1}. Save the catalog to keep your changes.", added, catalogName);
+
     public bool CanEdit => IsLoaded && !IsBusy;
     public bool CanDiscardChanges => CanEdit && IsDirty;
     public bool HasSelectedCatalog => SelectedCatalog is not null;
@@ -227,7 +297,23 @@ public async Task<bool> SaveAsync(string path)
         try
         {
             var definitions = CopyCatalogs(Catalogs.Select(c => c.ToDefinition()));
-            await SoftwareCatalog.SaveAsync(path, definitions);
+            try
+            {
+                // The machine-wide folder belongs to UniGetUI; create it on first save (as an administrator when needed).
+                if (string.Equals(Path.GetFullPath(path), Path.GetFullPath(SoftwareCatalog.FilePath),
+                        OperatingSystem.IsWindows() ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal))
+                    Directory.CreateDirectory(Path.GetDirectoryName(Path.GetFullPath(path))!);
+                await SoftwareCatalog.SaveAsync(path, definitions);
+            }
+            catch (UnauthorizedAccessException) when (SoftwareCatalog.CanSaveWithAdminRights)
+            {
+                // The machine-wide catalog can be admin-owned; ask for an administrator instead.
+                if (!await SoftwareCatalog.SaveWithAdminRightsAsync(path, definitions))
+                {
+                    Message = CoreTools.Translate("The catalog was not saved.");
+                    return false;
+                }
+            }
             FilePath = Path.GetFullPath(path);
             _savedCatalogs = definitions;
             IsDirty = false;
@@ -308,6 +394,19 @@ public void NewCatalog()
         IsDirty = true;
     }
 
+    public void RemoveCatalog(CatalogEditorCatalog catalog)
+    {
+        int index = Catalogs.IndexOf(catalog);
+        if (!CanEdit || index < 0) return;
+        bool wasSelected = ReferenceEquals(SelectedCatalog, catalog);
+        if (wasSelected) SelectedCatalog = null;
+        Catalogs.RemoveAt(index);
+        if (wasSelected)
+            SelectedCatalog = Catalogs.Count == 0 ? null : Catalogs[Math.Min(index, Catalogs.Count - 1)];
+        IsDirty = true;
+        Message = "";
+    }
+
     [RelayCommand]
     private void AddPackage()
     {
diff --git a/src/UniGetUI.Avalonia/ViewModels/MainWindowViewModel.cs b/src/UniGetUI.Avalonia/ViewModels/MainWindowViewModel.cs
index 6a79a980fe..bd2f19cefa 100644
--- a/src/UniGetUI.Avalonia/ViewModels/MainWindowViewModel.cs
+++ b/src/UniGetUI.Avalonia/ViewModels/MainWindowViewModel.cs
@@ -657,6 +657,8 @@ public void LoadDefaultPage()
             "catalog" when Sidebar.SoftwareCatalogEnabled => PageType.Catalog,
             "catalog-editor" when Sidebar.SoftwareCatalogEnabled => PageType.CatalogEditor,
             "settings" => PageType.Settings,
+            // A usable admin-curated catalog is the simplest starting point, so it wins over the default pages.
+            _ when Sidebar.HasUsableCatalog => PageType.Catalog,
             _ => UpgradablePackagesLoader.Instance is { } l && l.Count() > 0 ? PageType.Updates : PageType.Discover,
         };
         NavigateTo(type);
@@ -690,39 +692,29 @@ private Control GetPageForType(PageType type) =>
             _ => throw new InvalidDataException($"Unknown page type {type}"),
         };
 
-    public static PageType GetNextPage(PageType type) =>
-        GetNextPage(type, Settings.Get(Settings.K.EnableSoftwareCatalog));
+    /// <summary>
+    /// The navigation pages in sidebar order: Ctrl/Cmd+1, +2, … follow it (the More menu takes the
+    /// next number), and so does the previous/next page cycle.
+    /// </summary>
+    internal static PageType[] GetShortcutPages(bool catalogEnabled) => catalogEnabled
+        ? [PageType.Catalog, PageType.Discover, PageType.Updates, PageType.Installed, PageType.Bundles,
+            PageType.CatalogEditor, PageType.Settings, PageType.Managers]
+        : [PageType.Discover, PageType.Updates, PageType.Installed, PageType.Bundles,
+            PageType.Settings, PageType.Managers];
 
-    internal static PageType GetNextPage(PageType type, bool catalogEnabled) =>
-        type switch
-        {
-            PageType.Discover => PageType.Updates,
-            PageType.Updates => PageType.Installed,
-            PageType.Installed => PageType.Bundles,
-            PageType.Bundles => catalogEnabled ? PageType.Catalog : PageType.Settings,
-            PageType.Catalog => catalogEnabled ? PageType.CatalogEditor : PageType.Settings,
-            PageType.CatalogEditor => PageType.Settings,
-            PageType.Settings => PageType.Managers,
-            PageType.Managers => PageType.Discover,
-            _ => PageType.Discover,
-        };
+    public PageType[] ShortcutPages => GetShortcutPages(Sidebar.SoftwareCatalogEnabled);
 
-    public static PageType GetPreviousPage(PageType type) =>
-        GetPreviousPage(type, Settings.Get(Settings.K.EnableSoftwareCatalog));
+    internal static PageType GetNextPage(PageType type, bool catalogEnabled) => Step(type, catalogEnabled, +1);
 
-    internal static PageType GetPreviousPage(PageType type, bool catalogEnabled) =>
-        type switch
-        {
-            PageType.Discover => PageType.Managers,
-            PageType.Updates => PageType.Discover,
-            PageType.Installed => PageType.Updates,
-            PageType.Bundles => PageType.Installed,
-            PageType.Catalog => PageType.Bundles,
-            PageType.CatalogEditor => catalogEnabled ? PageType.Catalog : PageType.Bundles,
-            PageType.Settings => catalogEnabled ? PageType.CatalogEditor : PageType.Bundles,
-            PageType.Managers => PageType.Settings,
-            _ => PageType.Discover,
-        };
+    internal static PageType GetPreviousPage(PageType type, bool catalogEnabled) => Step(type, catalogEnabled, -1);
+
+    // Pages outside the sidebar order (logs, help, …) step to Discover.
+    private static PageType Step(PageType type, bool catalogEnabled, int direction)
+    {
+        var pages = GetShortcutPages(catalogEnabled);
+        int index = Array.IndexOf(pages, type);
+        return index < 0 ? PageType.Discover : pages[(index + direction + pages.Length) % pages.Length];
+    }
 
     public void NavigateTo(PageType newPage_t, bool toHistory = true) =>
         _ = NavigateToAsync(newPage_t, toHistory);
diff --git a/src/UniGetUI.Avalonia/ViewModels/SidebarViewModel.cs b/src/UniGetUI.Avalonia/ViewModels/SidebarViewModel.cs
index 4f8bf290de..bada85990b 100644
--- a/src/UniGetUI.Avalonia/ViewModels/SidebarViewModel.cs
+++ b/src/UniGetUI.Avalonia/ViewModels/SidebarViewModel.cs
@@ -1,6 +1,7 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using UniGetUI.Avalonia.Infrastructure;
+using UniGetUI.Avalonia.Models;
 using UniGetUI.Avalonia.Views;
 using UniGetUI.Core.Data;
 using UniGetUI.Core.SettingsEngine;
@@ -12,6 +13,11 @@ public partial class SidebarViewModel : ViewModelBase
 {
     public bool SoftwareCatalogEnabled { get; } = Settings.Get(Settings.K.EnableSoftwareCatalog);
 
+    // Only a catalog with packages to offer becomes the startup page; an unset or broken one would
+    // open the app on an empty page. Checked once at startup, like the setting itself.
+    public bool HasUsableCatalog { get; } =
+        Settings.Get(Settings.K.EnableSoftwareCatalog) && SoftwareCatalog.HasUsableCatalog();
+
     // ─── Badge properties ─────────────────────────────────────────────────────
     [ObservableProperty]
     [NotifyPropertyChangedFor(nameof(UpdatesBadgeText))]
diff --git a/src/UniGetUI.Avalonia/ViewModels/SoftwarePages/PackagesPageViewModel.cs b/src/UniGetUI.Avalonia/ViewModels/SoftwarePages/PackagesPageViewModel.cs
index 396dcb2b87..d4cde5ac28 100644
--- a/src/UniGetUI.Avalonia/ViewModels/SoftwarePages/PackagesPageViewModel.cs
+++ b/src/UniGetUI.Avalonia/ViewModels/SoftwarePages/PackagesPageViewModel.cs
@@ -1043,6 +1043,18 @@ public void UpdatePackageCount()
     }
 
     // ─── Subtitle ─────────────────────────────────────────────────────────────
+    // Page-specific state appended to the subtitle, e.g. an editor's unsaved-changes marker.
+    private string _subtitleSuffix = "";
+    public string SubtitleSuffix
+    {
+        get => _subtitleSuffix;
+        set
+        {
+            _subtitleSuffix = value;
+            UpdateSubtitle();
+        }
+    }
+
     public void UpdateSubtitle()
     {
         if (Loader.IsLoading || (LoadsOnStart && Loader.HasPendingInitialLoad))
@@ -1063,13 +1075,13 @@ public void UpdateSubtitle()
             if (_showLastCheckedTime)
                 r += " " + CoreTools.Translate("(Last checked: {0})", _lastLoadTime.ToString(CultureInfo.CurrentCulture));
 
-            Subtitle = r;
+            Subtitle = r + SubtitleSuffix;
         }
         else
         {
             Subtitle = _noPackagesSubtitleBase + (_showLastCheckedTime
                 ? " " + CoreTools.Translate("(Last checked: {0})", _lastLoadTime.ToString(CultureInfo.CurrentCulture))
-                : "");
+                : "") + SubtitleSuffix;
         }
     }
 
@@ -1135,12 +1147,14 @@ public static async Task LaunchInstall(
         IEnumerable<IPackage> packages,
         bool? elevated = null,
         bool? interactive = null,
-        bool? no_integrity = null)
+        bool? no_integrity = null,
+        string? version = null)
     {
         foreach (var pkg in packages)
         {
             var opts = await InstallOptionsFactory.LoadApplicableAsync(
                 pkg, elevated: elevated, interactive: interactive, no_integrity: no_integrity);
+            if (!string.IsNullOrEmpty(version)) opts.Version = version;
             if (PackageOperation.HasPendingOperation(pkg, OperationType.Install)) continue;
             var op = new InstallPackageOperation(pkg, opts);
             op.OperationSucceeded += (_, _) => TelemetryHandler.InstallPackage(pkg, TEL_OP_RESULT.SUCCESS, TEL_InstallReferral.DIRECT_SEARCH);
diff --git a/src/UniGetUI.Avalonia/ViewModels/SoftwarePages/SoftwareCatalogViewModel.cs b/src/UniGetUI.Avalonia/ViewModels/SoftwarePages/SoftwareCatalogViewModel.cs
index b30c8ca12b..4e3ea3322f 100644
--- a/src/UniGetUI.Avalonia/ViewModels/SoftwarePages/SoftwareCatalogViewModel.cs
+++ b/src/UniGetUI.Avalonia/ViewModels/SoftwarePages/SoftwareCatalogViewModel.cs
@@ -1,12 +1,18 @@
 using System.Collections.ObjectModel;
+using System.Text.Json;
+using System.Text.Json.Serialization.Metadata;
 using Avalonia.Media.Imaging;
 using Avalonia.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
+using UniGetUI.Avalonia.Infrastructure;
 using UniGetUI.Avalonia.Models;
 using UniGetUI.Avalonia.Views;
+using UniGetUI.Avalonia.Views.Pages;
 using UniGetUI.Core.Logging;
+using UniGetUI.Core.SettingsEngine;
 using UniGetUI.Core.Tools;
+using UniGetUI.Interface.Telemetry;
 using UniGetUI.PackageEngine;
 using UniGetUI.PackageEngine.Enums;
 using UniGetUI.PackageEngine.Interfaces;
@@ -19,7 +25,7 @@ namespace UniGetUI.Avalonia.ViewModels.Pages;
 
 public partial class SoftwareCatalogViewModel : ViewModelBase
 {
-    private readonly Dictionary<string, IReadOnlyList<IManagerSource>> _sources = new(StringComparer.OrdinalIgnoreCase);
+    private Dictionary<string, IReadOnlyList<IManagerSource>> _sources = new(StringComparer.OrdinalIgnoreCase);
     private readonly List<CatalogTileViewModel> _allPackages = [];
     private readonly Dictionary<(string Manager, string Source), SourceTreeNode> _catalogSources = [];
     private bool _updatingSourceSelection;
@@ -33,7 +39,7 @@ public partial class SoftwareCatalogViewModel : ViewModelBase
     [ObservableProperty]
     private bool _groupByCatalog = true;
 
-    partial void OnGroupByCatalogChanged(bool value) => RebuildGroups();
+    partial void OnGroupByCatalogChanged(bool value) => ApplyAvailabilityFilter();
 
     [ObservableProperty]
     private bool _hideUnavailablePackages = true;
@@ -85,7 +91,25 @@ partial void OnSearchModeChanged(SearchMode value)
     [NotifyPropertyChangedFor(nameof(IsGridView))]
     [NotifyPropertyChangedFor(nameof(IsIconsView))]
     [NotifyPropertyChangedFor(nameof(IsTilesView))]
-    private int _viewModeIndex = 3;
+    private int _viewModeIndex = LoadViewModeIndex();
+
+    // Shares the per-page view and sort settings with the other package pages; Icons by default.
+    private const string ViewModeSettingKey = "SoftwarePages.SoftwareCatalogPage";
+    private const int DefaultViewModeIndex = 2;
+
+    private static int LoadViewModeIndex()
+    {
+        if (!Settings.DictionaryContainsKey<string, int>(Settings.K.PackageListViewMode, ViewModeSettingKey))
+            return DefaultViewModeIndex;
+        int saved = Settings.GetDictionaryItem<string, int>(Settings.K.PackageListViewMode, ViewModeSettingKey);
+        return saved is >= 0 and <= 3 ? saved : DefaultViewModeIndex;
+    }
+
+    partial void OnViewModeIndexChanged(int value)
+    {
+        if (value is >= 0 and <= 3)
+            Settings.SetDictionaryItem(Settings.K.PackageListViewMode, ViewModeSettingKey, value);
+    }
 
     public bool IsListView => ViewModeIndex == 0;
     public bool IsGridView => ViewModeIndex == 1;
@@ -106,9 +130,21 @@ public bool HasHiddenPackages
                 && MatchesQuery(p.Entry, query));
         }
     }
-    public string EmptyMessage => CoreTools.Translate(_allPackages.Count > 0
-        ? "No packages are available with the current filters."
-        : "No packages to display.");
+    public string EmptyMessage => _notConfigured
+        ? CoreTools.Translate("No software catalog has been set up on this device yet.")
+        : CoreTools.Translate(_allPackages.Count > 0
+            ? "No packages are available with the current filters."
+            : "No packages to display.");
+
+    // No catalog file at all is the normal state on most devices, not an error.
+    private bool _notConfigured;
+
+    // The path and technical reason under the headline; selectable so it can be copied.
+    [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(HasBackgroundDetail))]
+    private string _backgroundDetail = "";
+
+    public bool HasBackgroundDetail => BackgroundDetail.Length > 0 && HasBackgroundText;
 
     public bool IsEmpty => !IsLoading && !HasError && Packages.Count == 0;
 
@@ -131,6 +167,7 @@ private void NotifyBackgroundTextChanged()
     {
         OnPropertyChanged(nameof(BackgroundText));
         OnPropertyChanged(nameof(HasBackgroundText));
+        OnPropertyChanged(nameof(HasBackgroundDetail));
     }
 
     private bool IsSelectedByFilters(CatalogTileViewModel tile) =>
@@ -139,8 +176,33 @@ private bool IsSelectedByFilters(CatalogTileViewModel tile) =>
 
     private readonly Dictionary<string, CatalogFilterNode> _catalogSelection = new(StringComparer.OrdinalIgnoreCase);
 
+    private string? _loadedSignature;
+
+    // A stable fingerprint of the loaded catalogs, to skip rebuilding tiles when nothing changed.
+    private static readonly JsonTypeInfo<CatalogDocument> DocumentTypeInfo = CatalogJsonContext.Default.CatalogDocument;
+
+    private static string Signature(IReadOnlyList<CatalogDefinition> catalogs) =>
+        JsonSerializer.Serialize(new CatalogDocument { Version = 1, Catalogs = [.. catalogs] }, DocumentTypeInfo);
+
+    // Icons need the entry's manager and source; tiles that lacked them earlier get another try.
+    private void EnsureIcons()
+    {
+        foreach (var tile in _allPackages)
+        {
+            if (tile.IconRequested) continue;
+            var manager = FindManager(tile.Entry);
+            var source = FindSource(tile.Entry);
+            if (manager is null || source is null) continue;
+            tile.IconRequested = true;
+            var package = InstalledPackagesLoader.Instance?.Packages.FirstOrDefault(tile.Entry.MatchesInstalled)
+                ?? new Package(tile.Entry.Name, tile.Entry.Id, tile.Entry.Version, source, manager);
+            _ = tile.LoadIconAsync(package);
+        }
+    }
+
     public void LoadCatalogs(IReadOnlyList<CatalogDefinition> catalogs)
     {
+        _loadedSignature = Signature(catalogs);
         var previous = CatalogNodes.ToDictionary(n => n.Definition.Id, n => n.IsSelected, StringComparer.OrdinalIgnoreCase);
         _catalogSelection.Clear();
         CatalogNodes.Clear();
@@ -159,19 +221,11 @@ public void LoadCatalogs(IReadOnlyList<CatalogDefinition> catalogs)
                 CatalogNodes.Add(node);
                 _catalogSelection.TryAdd(catalog.Id, node);
                 foreach (var entry in catalog.Packages)
-                {
-                    var tile = new CatalogTileViewModel(entry, catalog);
-                    _allPackages.Add(tile);
-                    var manager = FindManager(entry);
-                    var source = FindSource(entry);
-                    if (manager is null || source is null) continue;
-                    var package = InstalledPackagesLoader.Instance?.Packages.FirstOrDefault(entry.MatchesInstalled)
-                        ?? new Package(entry.Name, entry.Id, entry.Version, source, manager);
-                    _ = tile.LoadIconAsync(package);
-                }
+                    _allPackages.Add(new CatalogTileViewModel(entry, catalog) { Owner = this });
             }
         }
         finally { _updatingCatalogSelection = false; }
+        EnsureIcons();
         BuildSourceNodes();
         UpdateStates();
         OnPropertyChanged(nameof(IsEmpty));
@@ -231,34 +285,110 @@ private async Task EditAsync()
         }
     }
 
+    private bool _waitingForManagers;
+
+    // What the catalog file looked like when it was last loaded: existence, size and write time.
+    private (bool Exists, long Length, DateTime WriteTime)? _fileStamp;
+
+    private static (bool, long, DateTime) ReadFileStamp()
+    {
+        try
+        {
+            var file = new FileInfo(SoftwareCatalog.FilePath);
+            return file.Exists ? (true, file.Length, file.LastWriteTimeUtc) : (false, 0, default);
+        }
+        catch (Exception ex) when (ex is IOException or UnauthorizedAccessException)
+        {
+            return (false, 0, default);
+        }
+    }
+
+    /// <summary>
+    /// Reloads the catalog when its file was created, changed or removed since the last load, so
+    /// an administrator's deployment shows up without leaving the page.
+    /// </summary>
+    public void CheckForCatalogChanges()
+    {
+        if (IsLoading || _fileStamp is not { } loaded) return;
+        if (ReadFileStamp() != loaded) _ = RefreshAsync();
+    }
+
+    private void OnManagersLoaded(object? sender, EventArgs e) => Dispatcher.UIThread.Post(() =>
+    {
+        if (!_waitingForManagers) return;
+        _waitingForManagers = false;
+        PEInterface.ManagersLoaded -= OnManagersLoaded;
+        IsLoading = false;
+        _ = RefreshAsync();
+    });
+
     [RelayCommand]
     public async Task RefreshAsync()
     {
+        // Until managers finish starting, every entry would look unavailable (and be hidden), so
+        // keep showing the loading state and refresh once they are ready.
+        if (!PEInterface.AreManagersLoaded)
+        {
+            IsLoading = true;
+            if (!_waitingForManagers)
+            {
+                _waitingForManagers = true;
+                PEInterface.ManagersLoaded += OnManagersLoaded;
+                if (PEInterface.AreManagersLoaded) OnManagersLoaded(null, EventArgs.Empty);
+            }
+            return;
+        }
         if (IsLoading) return;
         IsLoading = true;
         ErrorMessage = "";
+        // Stamp before reading: a change made while loading is caught by the next check.
+        _fileStamp = ReadFileStamp();
         UpdateStates();
         try
         {
             var catalogs = await SoftwareCatalog.LoadAsync();
-            _sources.Clear();
+            _notConfigured = false;
+            BackgroundDetail = "";
 
+            // Fill a new map and swap it in at the end: the state timer reads _sources between
+            // these slow awaits, and a half-filled map would mark tiles "source not enabled".
+            var sources = new Dictionary<string, IReadOnlyList<IManagerSource>>(StringComparer.OrdinalIgnoreCase);
             foreach (var manager in catalogs.SelectMany(c => c.Packages).Select(FindManager).OfType<IPackageManager>().Distinct())
             {
                 if (!manager.IsReady()) continue;
-                _sources[manager.Id] = manager.Capabilities.SupportsCustomSources
+                sources[manager.Id] = manager.Capabilities.SupportsCustomSources
                     ? await Task.Run(manager.SourcesHelper.GetSources)
                     : [manager.DefaultSource];
             }
+            _sources = sources;
 
-            LoadCatalogs(catalogs);
+            // Rebuilding identical tiles would reset the scroll position and make icons blink.
+            if (_allPackages.Count > 0 && Signature(catalogs) == _loadedSignature)
+                EnsureIcons();
+            else
+                LoadCatalogs(catalogs);
+        }
+        catch (Exception ex) when (ex is FileNotFoundException or DirectoryNotFoundException)
+        {
+            Logger.Info($"No software catalog at {SoftwareCatalog.FilePath}.");
+            _notConfigured = true;
+            LoadCatalogs([]);
+            BackgroundDetail = CoreTools.Translate("Expected at {0}", SoftwareCatalog.FilePath);
         }
         catch (Exception ex)
         {
             Logger.Error("Could not load the software catalog.");
             Logger.Error(ex);
+            _notConfigured = false;
             LoadCatalogs([]);
-            ErrorMessage = CoreTools.Translate("The software catalog could not be loaded. Ask an administrator to check {0}, then try again.", SoftwareCatalog.FilePath);
+            BackgroundDetail = SoftwareCatalog.FilePath + "\n" + ex.Message;
+            ErrorMessage = ex switch
+            {
+                JsonException => CoreTools.Translate("The software catalog is not valid. Ask an administrator to fix it."),
+                UnauthorizedAccessException or IOException =>
+                    CoreTools.Translate("The software catalog could not be read. Ask an administrator to check its permissions."),
+                _ => CoreTools.Translate("The software catalog could not be loaded. Ask an administrator to check {0}, then try again.", SoftwareCatalog.FilePath),
+            };
         }
         finally
         {
@@ -349,6 +479,8 @@ private void SetSourceSelection(bool selected)
         ApplyAvailabilityFilter();
     }
 
+    private CatalogPackageIdentitySet? _lastInstalled;
+
     private IManagerSource? FindSource(CatalogEntry entry) =>
         FindManager(entry) is { } manager && _sources.TryGetValue(manager.Id, out var sources)
             ? sources.FirstOrDefault(s => string.Equals(s.Name, entry.Source, StringComparison.OrdinalIgnoreCase))
@@ -362,34 +494,48 @@ public void UpdateStates()
             return;
         }
         var loader = InstalledPackagesLoader.Instance;
-        var installed = new CatalogPackageIdentitySet(loader?.Packages ?? [], installedInventory: true);
+        // While the installed list reloads it is empty; keep the last complete one so installed
+        // tiles don't flip to a disabled Install for the whole reload.
+        bool inventoryLive = loader is { HasPendingInitialLoad: false, IsLoading: false };
+        var installed = inventoryLive
+            ? _lastInstalled = new CatalogPackageIdentitySet(loader!.Packages, installedInventory: true)
+            : _lastInstalled ?? new CatalogPackageIdentitySet([], installedInventory: true);
+        var upgradable = new CatalogPackageIdentitySet(
+            UpgradablePackagesLoader.Instance?.Packages ?? [], installedInventory: true);
         var pending = new CatalogPackageIdentitySet(
             Avalonia.Infrastructure.AvaloniaOperationRegistry.OperationViewModels
                 .Select(o => o.Operation)
                 .OfType<PackageOperation>()
                 .Where(o => o.Status is OperationStatus.InQueue or OperationStatus.Running)
                 .Select(o => o.Package));
+        bool sourcesMissing = false;
         foreach (var tile in _allPackages)
         {
             var manager = FindManager(tile.Entry);
             var source = FindSource(tile.Entry);
+            if (manager is not null && manager.IsReady() && !_sources.ContainsKey(manager.Id))
+                sourcesMissing = true;
             string? unavailableReason = manager is null
                 ? CoreTools.Translate("The package manager {0} is not available on this platform.", tile.Entry.ManagerName)
                 : !manager.IsEnabled()
                     ? CoreTools.Translate("The package manager {0} is disabled. Enable it in Package Managers.", manager.DisplayName)
                     : !manager.IsReady()
                         ? CoreTools.Translate("The package manager {0} is not available or is still initializing.", manager.DisplayName)
-                        : source is null
-                            ? CoreTools.Translate("The source {0} is not enabled for {1}. Add it in Package Managers.", tile.Entry.Source, manager.DisplayName)
-                            : null;
+                        : source is not null ? null
+                        // Every manager lists at least its default source: none means the listing failed.
+                        : _sources.TryGetValue(manager.Id, out var listed) && listed.Count == 0
+                            ? CoreTools.Translate("The sources of {0} could not be listed. Check the log, then try again.", manager.DisplayName)
+                            : CoreTools.Translate("The source {0} is not enabled for {1}. Add it in Package Managers.", tile.Entry.Source, manager.DisplayName);
+            tile.HasUpdate = upgradable.Contains(tile.Entry);
             tile.UpdateState(
                 installed.Contains(tile.Entry),
                 unavailableReason,
-                !IsLoading && loader is { HasPendingInitialLoad: false, IsLoading: false }
-                    && manager is { LastInstalledListingFailed: false },
+                (inventoryLive || _lastInstalled is not null) && manager is { LastInstalledListingFailed: false },
                 pending.Contains(tile.Entry));
         }
         ApplyAvailabilityFilter();
+        if (sourcesMissing && !IsLoading && PEInterface.AreManagersLoaded)
+            _ = RefreshAsync();
     }
 
     internal void ApplyAvailabilityFilter()
@@ -398,6 +544,9 @@ internal void ApplyAvailabilityFilter()
         var visible = _allPackages.Where(p => (!HideUnavailablePackages || p.UnavailableReason is null)
             && IsSelectedByFilters(p)
             && MatchesQuery(p.Entry, query)).ToArray();
+        // Without catalog groups, a package listed in several catalogs would show up repeatedly.
+        if (!GroupByCatalog)
+            visible = visible.DistinctBy(p => (p.Entry.Id.ToUpperInvariant(), SourceKey(p.Entry))).ToArray();
         visible = SortTiles(visible);
         if (!Packages.SequenceEqual(visible))
         {
@@ -414,10 +563,17 @@ internal void ApplyAvailabilityFilter()
 
     [ObservableProperty]
     [NotifyPropertyChangedFor(nameof(SortFieldName))]
-    private CatalogSortField _sortField = CatalogSortField.Name;
+    private CatalogSortField _sortField = LoadSortField();
 
     [ObservableProperty]
-    private bool _sortAscending = true;
+    private bool _sortAscending =
+        !Settings.GetDictionaryItem<string, bool>(Settings.K.PackageListSortDescending, ViewModeSettingKey);
+
+    private static CatalogSortField LoadSortField()
+    {
+        int saved = Settings.GetDictionaryItem<string, int>(Settings.K.PackageListSortFieldIndex, ViewModeSettingKey);
+        return Enum.IsDefined((CatalogSortField)saved) ? (CatalogSortField)saved : CatalogSortField.Name;
+    }
 
     public string SortFieldName => SortField switch
     {
@@ -426,8 +582,20 @@ internal void ApplyAvailabilityFilter()
         _ => CoreTools.Translate("Name"),
     };
 
-    partial void OnSortFieldChanged(CatalogSortField value) => ApplyAvailabilityFilter();
-    partial void OnSortAscendingChanged(bool value) => ApplyAvailabilityFilter();
+    partial void OnSortFieldChanged(CatalogSortField value)
+    {
+        Settings.SetDictionaryItem(Settings.K.PackageListSortFieldIndex, ViewModeSettingKey, (int)value);
+        ApplyAvailabilityFilter();
+    }
+
+    partial void OnSortAscendingChanged(bool value)
+    {
+        SaveSortDirection(value);
+        ApplyAvailabilityFilter();
+    }
+
+    private static void SaveSortDirection(bool ascending) =>
+        Settings.SetDictionaryItem(Settings.K.PackageListSortDescending, ViewModeSettingKey, !ascending);
 
     [RelayCommand] private void SortByName() => SortField = CatalogSortField.Name;
     [RelayCommand] private void SortById() => SortField = CatalogSortField.Id;
@@ -442,6 +610,7 @@ public void ToggleSort(CatalogSortField field)
         else
         {
             _sortAscending = true;
+            SaveSortDirection(true);
             OnPropertyChanged(nameof(SortAscending));
             SortField = field;
         }
@@ -450,7 +619,7 @@ public void ToggleSort(CatalogSortField field)
     private static string SortKey(CatalogSortField field, CatalogTileViewModel t) => field switch
     {
         CatalogSortField.Id => t.Entry.Id,
-        CatalogSortField.Source => t.Entry.ManagerName + "/" + t.Entry.Source,
+        CatalogSortField.Source => t.ManagerDisplayName + "/" + t.Entry.Source,
         _ => t.Entry.Name,
     };
 
@@ -493,7 +662,8 @@ private void RebuildGroups()
             || entry.Id.Contains(query, StringComparison.OrdinalIgnoreCase),
     };
 
-    [RelayCommand]
+    // Tiles share this command; each tile's IsBusy guards its own button, so other tiles stay usable.
+    [RelayCommand(AllowConcurrentExecutions = true)]
     private async Task InstallAsync(CatalogTileViewModel? tile)
     {
         UpdateStates();
@@ -507,8 +677,15 @@ private async Task InstallAsync(CatalogTileViewModel? tile)
             var package = matches.FirstOrDefault(tile.Entry.Matches)
                 ?? throw new InvalidOperationException($"Package {tile.Entry.Id} was not found in {tile.Entry.ManagerName}/{tile.Entry.Source}.");
             UpdateStates();
-            if (tile.IsInstalled || tile.UnavailableReason is not null || !tile.InventoryKnown || tile.IsPending) return;
-            await PackagesPageViewModel.LaunchInstall([package]);
+            if (tile.UnavailableReason is { } reason)
+            {
+                MainWindow.Instance?.ShowBanner(CoreTools.Translate("Unable to install {0}", tile.Entry.Name), reason,
+                    MainWindow.RuntimeNotificationLevel.Error);
+                return;
+            }
+            // Installed or queued meanwhile: nothing left to do.
+            if (tile.IsInstalled || !tile.InventoryKnown || tile.IsPending) return;
+            await PackagesPageViewModel.LaunchInstall([package], version: PinnedVersion(tile.Entry, manager));
         }
         catch (Exception ex)
         {
@@ -529,6 +706,79 @@ private async Task InstallAsync(CatalogTileViewModel? tile)
 
 public enum CatalogSortField { Name, Id, Source }
 
+public partial class SoftwareCatalogViewModel
+{
+    private static string? PinnedVersion(CatalogEntry entry, IPackageManager manager)
+    {
+        if (entry.Version.Length == 0) return null;
+        if (manager.Capabilities.SupportsCustomVersions) return entry.Version;
+        Logger.Warn($"{manager.DisplayName} cannot install a specific version; installing the latest {entry.Id} instead of {entry.Version}.");
+        return null;
+    }
+
+    private static IPackage? FindInstalled(CatalogEntry entry) =>
+        InstalledPackagesLoader.Instance?.Packages.FirstOrDefault(entry.MatchesInstalled);
+
+    internal async Task UpdateTileAsync(CatalogTileViewModel tile)
+    {
+        if (FindInstalled(tile.Entry) is not { } installed) return;
+        await InstalledPackagesPage.LaunchUpdate(installed);
+        UpdateStates();
+    }
+
+    internal async Task UninstallTileAsync(CatalogTileViewModel tile)
+    {
+        if (FindInstalled(tile.Entry) is not { } installed || MainWindow.Instance is not { } window) return;
+        if (!await UninstallConfirmationDialog.ConfirmAsync(window, installed)) return;
+        await InstalledPackagesPage.LaunchUninstall([installed]);
+        UpdateStates();
+    }
+
+    internal async Task ShowTileDetailsAsync(CatalogTileViewModel tile)
+    {
+        if (MainWindow.Instance is not { } window) return;
+        // The details window's main action follows the tile: update, uninstall, or install (the pin as version).
+        IPackage? package = null;
+        string? pin = null;
+        var installed = FindInstalled(tile.Entry);
+        var role = OperationType.Install;
+        if (installed is not null)
+        {
+            var upgradable = tile.HasUpdate ? installed.GetUpgradablePackage() : null;
+            package = upgradable ?? installed;
+            role = upgradable is null ? OperationType.Uninstall : OperationType.Update;
+        }
+        else if (FindManager(tile.Entry) is { } manager && FindSource(tile.Entry) is { } source)
+        {
+            package = new Package(tile.Entry.Name, tile.Entry.Id, tile.Entry.Version, source, manager);
+            pin = tile.Entry.Version.Length > 0 && manager.Capabilities.SupportsCustomVersions ? tile.Entry.Version : null;
+        }
+        if (package is null)
+        {
+            window.ShowBanner(CoreTools.Translate("Package unavailable"),
+                tile.UnavailableReason ?? CoreTools.Translate("Enable this package's manager and source to view its details."),
+                MainWindow.RuntimeNotificationLevel.Error);
+            return;
+        }
+        var dialog = new PackageDetailsWindow(package, role, TEL_InstallReferral.DIRECT_SEARCH) { InstallVersion = pin };
+        await dialog.ShowDialog(window);
+        if (!dialog.ShouldProceedWithOperation) return;
+        switch (role)
+        {
+            case OperationType.Install:
+                await InstallCommand.ExecuteAsync(tile);
+                break;
+            case OperationType.Update:
+                await InstalledPackagesPage.LaunchUpdate(installed);
+                break;
+            case OperationType.Uninstall:
+                await InstalledPackagesPage.LaunchUninstall([installed!]);
+                break;
+        }
+        UpdateStates();
+    }
+}
+
 public partial class CatalogFilterNode(CatalogDefinition definition) : ObservableObject
 {
     public CatalogDefinition Definition { get; } = definition;
@@ -551,6 +801,42 @@ public partial class CatalogTileViewModel(CatalogEntry entry, CatalogDefinition?
     public string CatalogId { get; } = catalog?.Id ?? "";
     public string CatalogName { get; } = catalog?.Name ?? "";
 
+    // The file may name the manager by id or alias ("winps"); show the name users know.
+    public string ManagerDisplayName { get; } =
+        PEInterface.Managers.FirstOrDefault(entry.MatchesManager)?.DisplayName ?? entry.ManagerName;
+
+    public string SourceDisplay => $"{ManagerDisplayName}: {Entry.Source}";
+
+    // An administrator can pin the version the catalog installs; empty means the latest.
+    public bool HasPinnedVersion => Entry.Version.Length > 0;
+    public string PinnedVersionText => HasPinnedVersion ? CoreTools.Translate("Version {0}", Entry.Version) : "";
+
+    // Views that show no status line surface it, with the source and pin, in the tooltip.
+    public string ToolTipText => string.Join("\n",
+        new[] { SourceDisplay, PinnedVersionText, StatusText }.Where(line => line.Length > 0));
+
+    internal bool IconRequested { get; set; }
+
+    internal SoftwareCatalogViewModel? Owner { get; init; }
+
+    // An installed catalog package can be updated, uninstalled or inspected instead of being a dead end.
+    [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(ShowUpdate))]
+    [NotifyPropertyChangedFor(nameof(ShowInstalledLabel))]
+    private bool _hasUpdate;
+
+    public bool ShowUpdate => IsInstalled && HasUpdate && !IsPending;
+    public bool ShowInstalledLabel => IsInstalled && !ShowUpdate;
+
+    [RelayCommand]
+    private Task Update() => Owner?.UpdateTileAsync(this) ?? Task.CompletedTask;
+
+    [RelayCommand]
+    private Task Uninstall() => Owner?.UninstallTileAsync(this) ?? Task.CompletedTask;
+
+    [RelayCommand]
+    private Task Details() => Owner?.ShowTileDetailsAsync(this) ?? Task.CompletedTask;
+
     [ObservableProperty]
     [NotifyPropertyChangedFor(nameof(HasCustomIcon))]
     private Bitmap? _iconBitmap;
@@ -574,27 +860,35 @@ internal async Task LoadIconAsync(IPackage package)
     [ObservableProperty]
     [NotifyPropertyChangedFor(nameof(ShowInstall))]
     [NotifyPropertyChangedFor(nameof(CanInstall))]
+    [NotifyPropertyChangedFor(nameof(ShowUpdate))]
+    [NotifyPropertyChangedFor(nameof(ShowInstalledLabel))]
     private bool _isInstalled;
 
     [ObservableProperty]
     [NotifyPropertyChangedFor(nameof(TitleOpacity))]
     [NotifyPropertyChangedFor(nameof(CanInstall))]
     [NotifyPropertyChangedFor(nameof(StatusText))]
+    [NotifyPropertyChangedFor(nameof(ToolTipText))]
     private string? _unavailableReason;
 
     [ObservableProperty]
     [NotifyPropertyChangedFor(nameof(CanInstall))]
     [NotifyPropertyChangedFor(nameof(StatusText))]
+    [NotifyPropertyChangedFor(nameof(ToolTipText))]
     private bool _inventoryKnown;
 
     [ObservableProperty]
     [NotifyPropertyChangedFor(nameof(CanInstall))]
     [NotifyPropertyChangedFor(nameof(StatusText))]
+    [NotifyPropertyChangedFor(nameof(ToolTipText))]
+    [NotifyPropertyChangedFor(nameof(ShowUpdate))]
+    [NotifyPropertyChangedFor(nameof(ShowInstalledLabel))]
     private bool _isPending;
 
     [ObservableProperty]
     [NotifyPropertyChangedFor(nameof(CanInstall))]
     [NotifyPropertyChangedFor(nameof(StatusText))]
+    [NotifyPropertyChangedFor(nameof(ToolTipText))]
     private bool _isBusy;
 
     public bool ShowInstall => !IsInstalled;
diff --git a/src/UniGetUI.Avalonia/Views/Controls/CatalogSelector.cs b/src/UniGetUI.Avalonia/Views/Controls/CatalogSelector.cs
index bc64629380..1a665bb5de 100644
--- a/src/UniGetUI.Avalonia/Views/Controls/CatalogSelector.cs
+++ b/src/UniGetUI.Avalonia/Views/Controls/CatalogSelector.cs
@@ -1,8 +1,11 @@
 using System.ComponentModel;
+using Avalonia;
 using Avalonia.Automation;
 using Avalonia.Controls;
 using Avalonia.Controls.Templates;
 using Avalonia.Layout;
+using Avalonia.Media;
+using Avalonia.Threading;
 using UniGetUI.Avalonia.ViewModels;
 using UniGetUI.Core.Tools;
 
@@ -15,7 +18,7 @@ public sealed class CatalogSelector : ComboBox
     private readonly CatalogEditorViewModel _document;
     private bool _syncing;
 
-    public CatalogSelector(CatalogEditorViewModel document)
+    public CatalogSelector(CatalogEditorViewModel document, Func<CatalogEditorCatalog, Task>? removeCatalog = null)
     {
         _document = document;
         MinWidth = 180;
@@ -25,25 +28,12 @@ public CatalogSelector(CatalogEditorViewModel document)
         PlaceholderText = CoreTools.Translate("Select a catalog");
         AutomationProperties.SetName(this, CoreTools.Translate("Catalog"));
         ItemsSource = document.Catalogs;
-        ItemTemplate = new FuncDataTemplate<CatalogEditorCatalog>((catalog, _) =>
-        {
-            var label = new TextBlock { Text = catalog?.Name };
-            if (catalog is not null)
-            {
-                void UpdateName(object? sender, PropertyChangedEventArgs e)
-                {
-                    if (e.PropertyName == nameof(CatalogEditorCatalog.Name))
-                        label.Text = catalog.Name;
-                }
-                label.AttachedToVisualTree += (_, _) =>
-                {
-                    label.Text = catalog.Name;
-                    catalog.PropertyChanged += UpdateName;
-                };
-                label.DetachedFromVisualTree += (_, _) => catalog.PropertyChanged -= UpdateName;
-            }
-            return label;
-        }, supportsRecycling: false);
+        SelectionBoxItemTemplate = new FuncDataTemplate<CatalogEditorCatalog>(
+            (catalog, _) => CreateLabel(catalog), supportsRecycling: false);
+        ItemTemplate = removeCatalog is null
+            ? SelectionBoxItemTemplate
+            : new FuncDataTemplate<CatalogEditorCatalog>(
+                (catalog, _) => CreateRemovableItem(catalog, removeCatalog), supportsRecycling: false);
         SelectionChanged += (_, _) =>
         {
             if (!_syncing && document.CanEdit)
@@ -58,6 +48,86 @@ or nameof(CatalogEditorViewModel.CanEdit))
         SyncSelection();
     }
 
+    private static TextBlock CreateLabel(CatalogEditorCatalog? catalog)
+    {
+        var label = new TextBlock { Text = catalog?.Name, VerticalAlignment = VerticalAlignment.Center };
+        if (catalog is not null)
+        {
+            void UpdateName(object? sender, PropertyChangedEventArgs e)
+            {
+                if (e.PropertyName == nameof(CatalogEditorCatalog.Name))
+                    label.Text = catalog.Name;
+            }
+            label.AttachedToVisualTree += (_, _) =>
+            {
+                label.Text = catalog.Name;
+                catalog.PropertyChanged += UpdateName;
+            };
+            label.DetachedFromVisualTree += (_, _) => catalog.PropertyChanged -= UpdateName;
+        }
+        return label;
+    }
+
+    private Control CreateRemovableItem(CatalogEditorCatalog? catalog, Func<CatalogEditorCatalog, Task> removeCatalog)
+    {
+        var grid = new Grid { ColumnDefinitions = new ColumnDefinitions("*,Auto") };
+        grid.Children.Add(CreateLabel(catalog));
+        if (catalog is null) return grid;
+
+        var remove = new Button
+        {
+            Width = 24,
+            Height = 24,
+            Padding = new Thickness(0),
+            Margin = new Thickness(8, 0, 0, 0),
+            CornerRadius = new CornerRadius(4),
+            BorderThickness = new Thickness(0),
+            Background = Brushes.Transparent,
+            IsEnabled = _document.CanEdit,
+            Content = new SvgIcon { Path = "avares://UniGetUI/Assets/Symbols/cross.svg", Width = 12, Height = 12 },
+        };
+        // Keep the name in the tooltip and accessible name current when the catalog is renamed.
+        void UpdateTip()
+        {
+            string tip = CoreTools.Translate("Remove catalog {0}", catalog.Name);
+            AutomationProperties.SetName(remove, tip);
+            ToolTip.SetTip(remove, tip);
+        }
+        void OnCatalogChanged(object? sender, PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == nameof(CatalogEditorCatalog.Name)) UpdateTip();
+        }
+        remove.AttachedToVisualTree += (_, _) =>
+        {
+            UpdateTip();
+            catalog.PropertyChanged += OnCatalogChanged;
+        };
+        remove.DetachedFromVisualTree += (_, _) => catalog.PropertyChanged -= OnCatalogChanged;
+        UpdateTip();
+        Grid.SetColumn(remove, 1);
+        remove.Click += async (_, e) =>
+        {
+            e.Handled = true;
+            // Keep the list available so several catalogs can be removed in a row; it only steps
+            // aside for the confirmation that a catalog with packages asks for.
+            bool confirms = catalog.Packages.Count > 0;
+            if (confirms) IsDropDownOpen = false;
+            await removeCatalog(catalog);
+            // Cancelled: nothing changed, so leave the list closed as the dialog left it.
+            if (confirms && _document.Catalogs.Contains(catalog)) return;
+            if (_document.Catalogs.Count == 0)
+            {
+                IsDropDownOpen = false;
+                return;
+            }
+            // The open popup keeps shrunken rows after a removal; reopening it lays them out afresh.
+            IsDropDownOpen = false;
+            Dispatcher.UIThread.Post(() => IsDropDownOpen = true);
+        };
+        grid.Children.Add(remove);
+        return grid;
+    }
+
     private void SyncSelection()
     {
         _syncing = true;
diff --git a/src/UniGetUI.Avalonia/Views/DialogPages/PackageDetailsWindow.axaml.cs b/src/UniGetUI.Avalonia/Views/DialogPages/PackageDetailsWindow.axaml.cs
index fbc67b6e93..9a12ee0e54 100644
--- a/src/UniGetUI.Avalonia/Views/DialogPages/PackageDetailsWindow.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/DialogPages/PackageDetailsWindow.axaml.cs
@@ -51,6 +51,8 @@ private enum GestureAxis { Undecided, Horizontal, Vertical }
     /// <summary>True when the user confirmed the main action (install/update/uninstall) without extras.</summary>
     public bool ShouldProceedWithOperation { get; private set; }
 
+    public string? InstallVersion { get; init; }
+
     private readonly PackageDetailsViewModel _vm;
     private readonly TEL_InstallReferral _referral;
     private InstallOptionsViewModel? _installVm;
@@ -1107,6 +1109,8 @@ private async Task LaunchAndClose(
             interactive: interactive,
             no_integrity: no_integrity,
             remove_data: remove_data);
+        if (role is OperationType.Install && !string.IsNullOrEmpty(InstallVersion))
+            opts.Version = InstallVersion;
 
         if (PackageOperation.HasPendingOperation(pkg, role)) return;
 
diff --git a/src/UniGetUI.Avalonia/Views/MainWindow.MacMenu.cs b/src/UniGetUI.Avalonia/Views/MainWindow.MacMenu.cs
index 39ead962ff..60830aadf7 100644
--- a/src/UniGetUI.Avalonia/Views/MainWindow.MacMenu.cs
+++ b/src/UniGetUI.Avalonia/Views/MainWindow.MacMenu.cs
@@ -60,17 +60,19 @@ private void SetupMacMenuBar()
             new NativeMenuItemSeparator(),
             Action(CoreTools.Translate("Find"), TriggerPageSearch, Key.F, enabled: () => PageShortcutListener is not null));
 
-        var view = Submenu(CoreTools.Translate("View"),
-            Item(CoreTools.Translate("Discover Packages"), navigate, "Discover", Key.D1),
-            Item(CoreTools.Translate("Software Updates"), navigate, "Updates", Key.D2),
-            Item(CoreTools.Translate("Installed Packages"), navigate, "Installed", Key.D3),
-            Item(CoreTools.Translate("Package Bundles"), navigate, "Bundles", Key.D4),
-            Item(CoreTools.Translate("Package Managers"), navigate, "Managers", Key.D6),
+        // Settings is reached from the application menu (⌘,), so the View menu skips it.
+        NativeMenuItemBase[] pageItems = ViewModel.ShortcutPages
+            .Select((page, index) => (page, key: Key.D1 + index))
+            .Where(p => p.page != PageType.Settings)
+            .Select(p => (NativeMenuItemBase)Item(PageMenuTitle(p.page), navigate, p.page.ToString(), p.key))
+            .ToArray();
+        var view = Submenu(CoreTools.Translate("View"), [
+            .. pageItems,
             new NativeMenuItemSeparator(),
             Item(CoreTools.Translate("Toggle navigation panel"), ViewModel.ToggleSidebarCommand, null, Key.S, KeyModifiers.Control),
             new NativeMenuItemSeparator(),
             Action(CoreTools.Translate("Reload"), TriggerPageReload, Key.R, enabled: () => PageShortcutListener is not null),
-            Action(CoreTools.Translate("Package details"), TriggerPageDetails, Key.I, enabled: () => PageShortcutListener is not null));
+            Action(CoreTools.Translate("Package details"), TriggerPageDetails, Key.I, enabled: () => PageShortcutListener is not null)]);
 
         // macOS greys Minimize and Zoom out for a window in full screen.
         var window = Submenu(CoreTools.Translate("Window"),
@@ -145,6 +147,18 @@ private NativeMenuItem TextAction(string header, Action<TextBox> onTextBox, Acti
         }, key, extraModifiers, enabled: () => _menuTextBox is { } textBox ? canTextBox(textBox)
             : _menuEditor is { } editor && canEditor(editor));
 
+    private static string PageMenuTitle(PageType page) => page switch
+    {
+        PageType.Catalog => CoreTools.Translate("Software Catalog"),
+        PageType.Discover => CoreTools.Translate("Discover Packages"),
+        PageType.Updates => CoreTools.Translate("Software Updates"),
+        PageType.Installed => CoreTools.Translate("Installed Packages"),
+        PageType.Bundles => CoreTools.Translate("Package Bundles"),
+        PageType.CatalogEditor => CoreTools.Translate("Catalog Editor"),
+        PageType.Managers => CoreTools.Translate("Package Managers"),
+        _ => CoreTools.Translate("Settings"),
+    };
+
     private NativeMenuItem Submenu(string header, params NativeMenuItemBase[] items)
     {
         var menu = new NativeMenu();
diff --git a/src/UniGetUI.Avalonia/Views/MainWindow.axaml.cs b/src/UniGetUI.Avalonia/Views/MainWindow.axaml.cs
index dbf9d26d11..829617d956 100644
--- a/src/UniGetUI.Avalonia/Views/MainWindow.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/MainWindow.axaml.cs
@@ -361,23 +361,20 @@ private void Window_KeyDown(object? sender, KeyEventArgs e)
             TriggerPageSelectAll();
             e.Handled = true;
         }
-        else if (isCtrl && !isShift && e.Key is Key.D1 or Key.D2 or Key.D3 or Key.D4 or Key.D5 or Key.D6)
+        else if (isCtrl && !isShift && e.Key is >= Key.D1 and <= Key.D9
+                 && e.Key - Key.D1 <= ViewModel.ShortcutPages.Length)
         {
-            _focusSidebarSelectionOnNextPageChange = true;
-            ViewModel.NavigateTo(e.Key switch
+            var pages = ViewModel.ShortcutPages;
+            int index = e.Key - Key.D1;
+            if (index == pages.Length)
             {
-                Key.D1 => PageType.Discover,
-                Key.D2 => PageType.Updates,
-                Key.D3 => PageType.Installed,
-                Key.D4 => PageType.Bundles,
-                Key.D5 => PageType.Settings,
-                _ => PageType.Managers,
-            });
-            e.Handled = true;
-        }
-        else if (isCtrl && !isShift && e.Key == Key.D7)
-        {
-            ShowMoreMenu();
+                ShowMoreMenu();
+            }
+            else
+            {
+                _focusSidebarSelectionOnNextPageChange = true;
+                ViewModel.NavigateTo(pages[index]);
+            }
             e.Handled = true;
         }
         else if (isCtrl && !isShift && (e.Key == Key.D || (OperatingSystem.IsMacOS() && e.Key == Key.I)))
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Interface_P.axaml.cs b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Interface_P.axaml.cs
index b97e0d20bf..d5e9d37ac0 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Interface_P.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Interface_P.axaml.cs
@@ -38,16 +38,16 @@ public Interface_P()
         ThemeSelector.ShowAddedItems();
         ThemeSelector.ValueChanged += (_, _) => App.ApplyTheme(CoreSettings.GetValue(CoreSettings.K.PreferredTheme));
 
+        bool catalogEnabled = CoreSettings.Get(CoreSettings.K.EnableSoftwareCatalog);
         StartupPageSelector.AddItem(CoreTools.Translate("Default"), "default");
+        if (catalogEnabled)
+            StartupPageSelector.AddItem(CoreTools.Translate("Software Catalog"), "catalog");
         StartupPageSelector.AddItem(CoreTools.Translate("Discover Packages"), "discover");
         StartupPageSelector.AddItem(CoreTools.Translate("Software Updates"), "updates");
         StartupPageSelector.AddItem(CoreTools.Translate("Installed Packages"), "installed");
         StartupPageSelector.AddItem(CoreTools.Translate("Package Bundles"), "bundles");
-        if (CoreSettings.Get(CoreSettings.K.EnableSoftwareCatalog))
-        {
-            StartupPageSelector.AddItem(CoreTools.Translate("Software Catalog"), "catalog");
+        if (catalogEnabled)
             StartupPageSelector.AddItem(CoreTools.Translate("Catalog Editor"), "catalog-editor");
-        }
         StartupPageSelector.AddItem(CoreTools.Translate("Settings"), "settings");
         StartupPageSelector.SettingName = CoreSettings.K.StartupPage;
         StartupPageSelector.Text = CoreTools.Translate("UniGetUI startup page:");
diff --git a/src/UniGetUI.Avalonia/Views/SidebarView.axaml b/src/UniGetUI.Avalonia/Views/SidebarView.axaml
index 74155e4cb7..8776a45ec1 100644
--- a/src/UniGetUI.Avalonia/Views/SidebarView.axaml
+++ b/src/UniGetUI.Avalonia/Views/SidebarView.axaml
@@ -27,10 +27,22 @@
                  automation:AutomationProperties.Name="{t:Translate Navigation}"
                  Padding="8,10,8,0">
 
+            <!-- Software Catalog: first when enabled, as the curated starting point -->
+            <ListBoxItem x:Name="CatalogNavBtn" Tag="Catalog" Classes="nav-item" Padding="4,2" CornerRadius="6"
+                         automation:AutomationProperties.Name="{t:Translate Software Catalog}"
+                         ToolTip.Tip="{t:Translate Software Catalog}">
+                <Grid ColumnDefinitions="Auto,*" ColumnSpacing="12" Margin="8,8">
+                    <controls:SvgIcon Path="avares://UniGetUI/Assets/Symbols/catalog.svg"
+                                      Width="24" Height="24" VerticalAlignment="Center"/>
+                    <TextBlock Grid.Column="1" Text="{t:Translate Software Catalog}" FontSize="14"
+                               VerticalAlignment="Center"
+                               IsVisible="{Binding $parent[local:SidebarView].ShowLabels}"/>
+                </Grid>
+            </ListBoxItem>
+
             <!-- Discover Packages -->
             <ListBoxItem x:Name="DiscoverNavBtn" Tag="Discover" Classes="nav-item" Padding="4,2" CornerRadius="6"
                          automation:AutomationProperties.Name="{t:Translate Discover Packages}"
-                         automation:AutomationProperties.AcceleratorKey="Ctrl+1"
                          ToolTip.Tip="{t:Translate Discover Packages}">
                 <Panel>
                     <Grid ColumnDefinitions="Auto,*" ColumnSpacing="12" Margin="8,8">
@@ -55,7 +67,6 @@
             <!-- Software Updates -->
             <ListBoxItem x:Name="UpdatesNavBtn" Tag="Updates" Classes="nav-item" Padding="4,2" CornerRadius="6"
                          automation:AutomationProperties.Name="{t:Translate Software Updates}"
-                         automation:AutomationProperties.AcceleratorKey="Ctrl+2"
                          ToolTip.Tip="{t:Translate Software Updates}">
                 <Panel>
                     <Grid ColumnDefinitions="Auto,*" ColumnSpacing="12" Margin="8,8">
@@ -97,7 +108,6 @@
             <!-- Installed Packages -->
             <ListBoxItem x:Name="InstalledNavBtn" Tag="Installed" Classes="nav-item" Padding="4,2" CornerRadius="6"
                          automation:AutomationProperties.Name="{t:Translate Installed Packages}"
-                         automation:AutomationProperties.AcceleratorKey="Ctrl+3"
                          ToolTip.Tip="{t:Translate Installed Packages}">
                 <Panel>
                     <Grid ColumnDefinitions="Auto,*" ColumnSpacing="12" Margin="8,8">
@@ -122,7 +132,6 @@
             <!-- Package Bundles -->
             <ListBoxItem x:Name="BundlesNavBtn" Tag="Bundles" Classes="nav-item" Padding="4,2" CornerRadius="6"
                          automation:AutomationProperties.Name="{t:Translate Package Bundles}"
-                         automation:AutomationProperties.AcceleratorKey="Ctrl+4"
                          ToolTip.Tip="{t:Translate Package Bundles}">
                 <Panel>
                     <Grid ColumnDefinitions="Auto,*" ColumnSpacing="12" Margin="8,8">
@@ -145,23 +154,11 @@
                 </Panel>
             </ListBoxItem>
 
-            <ListBoxItem x:Name="CatalogNavBtn" Tag="Catalog" Classes="nav-item" Padding="4,2" CornerRadius="6"
-                         automation:AutomationProperties.Name="{t:Translate Software Catalog}"
-                         ToolTip.Tip="{t:Translate Software Catalog}">
-                <Grid ColumnDefinitions="Auto,*" ColumnSpacing="12" Margin="8,8">
-                    <controls:SvgIcon Path="avares://UniGetUI/Assets/Symbols/catalog.svg"
-                                      Width="24" Height="24" VerticalAlignment="Center"/>
-                    <TextBlock Grid.Column="1" Text="{t:Translate Software Catalog}" FontSize="14"
-                               VerticalAlignment="Center"
-                               IsVisible="{Binding $parent[local:SidebarView].ShowLabels}"/>
-                </Grid>
-            </ListBoxItem>
-
             <ListBoxItem x:Name="CatalogEditorNavBtn" Tag="CatalogEditor" Classes="nav-item" Padding="4,2" CornerRadius="6"
                         automation:AutomationProperties.Name="{t:Translate Catalog Editor}"
                         ToolTip.Tip="{t:Translate Catalog Editor}">
                 <Grid ColumnDefinitions="Auto,*" ColumnSpacing="12" Margin="8,8">
-                    <controls:SvgIcon Path="avares://UniGetUI/Assets/Symbols/add_to.svg"
+                    <controls:SvgIcon Path="avares://UniGetUI/Assets/Symbols/catalog_add.svg"
                                       Width="24" Height="24" VerticalAlignment="Center"/>
                     <TextBlock Grid.Column="1" Text="{t:Translate Catalog Editor}" FontSize="14"
                                VerticalAlignment="Center"
@@ -189,7 +186,6 @@
                 <ListBoxItem x:Name="SettingsNavBtn" Tag="Settings" Classes="nav-item" Padding="4,2" CornerRadius="6"
                              Tapped="SettingsNavBtn_Tapped"
                              automation:AutomationProperties.Name="{t:Translate Settings}"
-                             automation:AutomationProperties.AcceleratorKey="Ctrl+5"
                              ToolTip.Tip="{t:Translate Settings}">
                     <Grid ColumnDefinitions="Auto,*" ColumnSpacing="12" Margin="8,8">
                         <controls:SvgIcon Grid.Column="0" x:Name="SettingsIcon" Path="avares://UniGetUI/Assets/Symbols/settings.svg" Width="24" Height="24" VerticalAlignment="Center" RenderTransformOrigin="50%,50%"/>
@@ -201,7 +197,6 @@
                 <!-- Package Managers -->
                 <ListBoxItem x:Name="ManagersNavBtn" Tag="Managers" Classes="nav-item" Padding="4,2" CornerRadius="6"
                              automation:AutomationProperties.Name="{t:Translate Package Managers}"
-                             automation:AutomationProperties.AcceleratorKey="Ctrl+6"
                              ToolTip.Tip="{t:Translate Package Managers}">
                     <Grid ColumnDefinitions="Auto,*" ColumnSpacing="12" Margin="8,8">
                         <controls:SvgIcon Grid.Column="0" Path="avares://UniGetUI/Assets/Symbols/package_managers.svg" Width="24" Height="24" VerticalAlignment="Center"/>
@@ -213,7 +208,6 @@
                 <!-- More is kept selected while its flyout is open so its navigation pill remains visible. -->
                 <ListBoxItem x:Name="MoreNavBtn" Tag="More" Classes="nav-item" Padding="4,2" CornerRadius="6"
                              automation:AutomationProperties.Name="{t:Translate More}"
-                             automation:AutomationProperties.AcceleratorKey="Ctrl+7"
                              ToolTip.Tip="{t:Translate More}">
                     <Grid ColumnDefinitions="Auto,*" ColumnSpacing="12" Margin="8,8">
                         <TextBlock Grid.Column="0" Text="···" FontSize="20" Width="24" HorizontalAlignment="Center" VerticalAlignment="Center" TextAlignment="Center"
diff --git a/src/UniGetUI.Avalonia/Views/SidebarView.axaml.cs b/src/UniGetUI.Avalonia/Views/SidebarView.axaml.cs
index 6423a8296d..fff4c987f4 100644
--- a/src/UniGetUI.Avalonia/Views/SidebarView.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/SidebarView.axaml.cs
@@ -2,6 +2,7 @@
 using Avalonia;
 using Avalonia.Animation;
 using Avalonia.Animation.Easings;
+using Avalonia.Automation;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
 using Avalonia.Input;
@@ -84,6 +85,7 @@ protected override void OnDataContextChanged(EventArgs e)
                 NavListBox.Items.Remove(CatalogNavBtn);
                 NavListBox.Items.Remove(CatalogEditorNavBtn);
             }
+            AssignShortcutKeys(MainWindowViewModel.GetShortcutPages(vm.SoftwareCatalogEnabled));
 
             vm.PropertyChanged += (_, args) =>
             {
@@ -95,6 +97,31 @@ protected override void OnDataContextChanged(EventArgs e)
         }
     }
 
+    // Announces each item's Ctrl/Cmd+number shortcut, which shifts when the catalog is enabled.
+    private void AssignShortcutKeys(PageType[] pages)
+    {
+        string modifier = OperatingSystem.IsMacOS() ? "Cmd" : "Ctrl";
+        for (int i = 0; i < pages.Length; i++)
+        {
+            if (NavButtonFor(pages[i]) is { } button)
+                AutomationProperties.SetAcceleratorKey(button, $"{modifier}+{i + 1}");
+        }
+        AutomationProperties.SetAcceleratorKey(MoreNavBtn, $"{modifier}+{pages.Length + 1}");
+    }
+
+    private ListBoxItem? NavButtonFor(PageType page) => page switch
+    {
+        PageType.Catalog => CatalogNavBtn,
+        PageType.Discover => DiscoverNavBtn,
+        PageType.Updates => UpdatesNavBtn,
+        PageType.Installed => InstalledNavBtn,
+        PageType.Bundles => BundlesNavBtn,
+        PageType.CatalogEditor => CatalogEditorNavBtn,
+        PageType.Settings => SettingsNavBtn,
+        PageType.Managers => ManagersNavBtn,
+        _ => null,
+    };
+
     private void SyncListBoxSelection(PageType page)
     {
         if (_isMoreFlyoutOpen)
diff --git a/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml.cs b/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml.cs
index 7530454626..e32752db8c 100644
--- a/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml.cs
@@ -356,6 +356,9 @@ protected void SetMainButtonState(bool enabled, bool showDropdown = true)
     {
         MainToolbarButton.IsEnabled = enabled;
         MainToolbarButtonDropdown.IsVisible = showDropdown;
+        // Without its dropdown half, the main button must round its trailing corners too.
+        MainToolbarButton.CornerRadius = showDropdown ? new CornerRadius(4, 0, 0, 4) : new CornerRadius(4);
+        MainToolbarButton.Classes.Set("standalone", !showDropdown);
     }
 
     // ─── Package selection ────────────────────────────────────────────────────
diff --git a/src/UniGetUI.Avalonia/Views/SoftwarePages/CatalogEditorPage.cs b/src/UniGetUI.Avalonia/Views/SoftwarePages/CatalogEditorPage.cs
index 9540b26b87..31127ffd23 100644
--- a/src/UniGetUI.Avalonia/Views/SoftwarePages/CatalogEditorPage.cs
+++ b/src/UniGetUI.Avalonia/Views/SoftwarePages/CatalogEditorPage.cs
@@ -3,6 +3,8 @@
 using Avalonia;
 using Avalonia.Automation;
 using Avalonia.Controls;
+using Avalonia.Input.Platform;
+using Avalonia.Layout;
 using Avalonia.Media;
 using Avalonia.Platform.Storage;
 using Avalonia.Threading;
@@ -28,10 +30,11 @@ public sealed class CatalogEditorPage : AbstractPackagesPage
     private readonly CatalogEditorViewModel _document;
     private readonly CatalogPackagesLoader _loader;
     private CatalogEditorCatalog? _observedCatalog;
-    private readonly TextBlock _status = new() { TextWrapping = TextWrapping.Wrap };
     private Button? _renameButton;
+    private Button? _addButton;
     private Button? _discardButton;
     private bool _pickingFile;
+    private bool _saveFailed;
 
     public CatalogEditorPage(CatalogEditorViewModel document)
         : this(document, new CatalogPackagesLoader()) { }
@@ -53,47 +56,44 @@ private CatalogEditorPage(CatalogEditorViewModel document, CatalogPackagesLoader
             NoMatches_BackgroundText = CoreTools.Translate("No packages match your filters"),
         }, vm =>
         {
-            var selector = new CatalogSelector(document) { MinWidth = 260, MaxWidth = double.PositiveInfinity };
-            vm.AddToolbarEntry(new ToolbarEntry(selector, "add_to", CoreTools.Translate("Select a catalog"),
+            var selector = new CatalogSelector(document, catalog => RemoveCatalogAsync(document, catalog))
+            { MinWidth = 260, MaxWidth = double.PositiveInfinity };
+            vm.AddToolbarEntry(new ToolbarEntry(selector, "catalog", CoreTools.Translate("Select a catalog"),
                 null, selector.ShowFlyoutAt), index: vm.ToolbarEntries.Count - 1);
         })
     {
         _document = document;
         _loader = loader;
-        HideVersionColumn();
-        var options = new StackPanel { Spacing = 8, Margin = new Thickness(8, 0, 8, 12) };
-        options.Children.Add(_status);
-        SetPageOptions(options);
 
         document.PropertyChanged += DocumentChanged;
+        document.ErrorRaised += message => Dispatcher.UIThread.Post(() =>
+        {
+            _saveFailed = true;
+            // Discover shares this document; only interrupt with a dialog while the editor is on screen.
+            if (TopLevel.GetTopLevel(this) is not null && IsEffectivelyVisible) _ = ShowErrorAsync(message);
+        });
         SyncCatalog();
         SyncStatus();
     }
 
-    private void HideVersionColumn()
-    {
-        foreach (var col in PackageList.Columns)
-            if (col.Tag as string == "Version") col.IsVisible = false;
-        OrderByVersion_Menu.IsVisible = false;
-        if (ViewModel.SortFieldIndex == 2) ViewModel.SortFieldIndex = 0;
-    }
-
     protected override void GenerateToolBar(PackagesPageViewModel vm)
     {
         SetMainButton("save_as", CoreTools.Translate("Save"), () => _ = SaveAsync(false));
-        vm.AddToolbarButton("add_to", CoreTools.Translate("New"), () => _ = NewAsync());
+        vm.AddToolbarButton("document_add", CoreTools.Translate("New file"), () => _ = NewAsync());
         vm.AddToolbarButton("open_folder", CoreTools.Translate("Open file"), () => _ = OpenAsync());
         vm.AddToolbarButton("save_as", CoreTools.Translate("Save as"), () => _ = SaveAsync(true));
         _discardButton = vm.AddToolbarButton("undo", CoreTools.Translate("Discard changes"),
             () => _ = DiscardChangesAsync());
-        vm.AddToolbarButton("add_to", CoreTools.Translate("New catalog"), () =>
+        vm.AddToolbarButton("collections_add", CoreTools.Translate("New catalog"), () =>
         {
             if (_document.CanEdit && !_pickingFile) _document.NewCatalog();
         });
+        _addButton = vm.AddToolbarButton("catalog_add", CoreTools.Translate("Add packages"), AddPackages);
         vm.AddToolbarButton("delete", CoreTools.Translate("Remove selection from catalog"), RemoveSelection);
+        vm.AddToolbarButton("version", CoreTools.Translate("Pin version"), () => _ = PinVersionAsync(SelectedItem));
         vm.AddToolbarButton("info_round", CoreTools.Translate("Package details"),
             () => _ = ShowDetailsForPackage(SelectedItem));
-        _renameButton = vm.AddToolbarButton("options", CoreTools.Translate("Rename catalog"),
+        _renameButton = vm.AddToolbarButton("rename", CoreTools.Translate("Rename catalog"),
             () => _ = RenameCatalogAsync());
     }
 
@@ -103,6 +103,9 @@ protected override ContextMenu GenerateContextMenu()
         var remove = new MenuItem { Header = CoreTools.Translate("Remove selection from catalog") };
         remove.Click += (_, _) => RemoveSelection();
         menu.Items.Add(remove);
+        var pin = new MenuItem { Header = CoreTools.Translate("Pin version") };
+        pin.Click += (_, _) => _ = PinVersionAsync(SelectedItem);
+        menu.Items.Add(pin);
         return menu;
     }
 
@@ -153,9 +156,9 @@ private void PackagesChanged(object? sender, NotifyCollectionChangedEventArgs e)
 
     private void SyncStatus()
     {
-        _status.Text = (_document.IsDirty ? CoreTools.Translate("Unsaved changes") + "\n" : "")
-            + _document.Message;
+        ViewModel.SubtitleSuffix = _document.IsDirty ? " · " + CoreTools.Translate("Unsaved changes") : "";
         _renameButton?.IsEnabled = _document.CanEdit && _document.HasSelectedCatalog && !_pickingFile;
+        _addButton?.IsEnabled = _document.CanEdit && _document.HasSelectedCatalog && !_pickingFile;
         _discardButton?.IsEnabled = _document.CanDiscardChanges && !_pickingFile;
         SetMainButtonState(_document.CanEdit && !_pickingFile, showDropdown: false);
     }
@@ -197,12 +200,130 @@ private async Task RenameCatalogAsync()
             catalog.Name = input.Text.Trim();
     }
 
+    private static async Task RemoveCatalogAsync(CatalogEditorViewModel document, CatalogEditorCatalog catalog)
+    {
+        if (!document.CanEdit) return;
+        if (catalog.Packages.Count > 0)
+        {
+            var dialog = new ImmersiveConfirmationDialog(CoreTools.Translate("Remove catalog"),
+                new TextBlock
+                {
+                    Text = catalog.Packages.Count == 1
+                        ? CoreTools.Translate("Remove catalog {0} and its package?", catalog.Name)
+                        : CoreTools.Translate("Remove catalog {0} and its {1} packages?", catalog.Name, catalog.Packages.Count),
+                    TextWrapping = TextWrapping.Wrap,
+                },
+                CoreTools.Translate("Remove"), CoreTools.Translate("Cancel"));
+            await dialog.ShowDialog(MainWindow.Instance!);
+            if (dialog.Result is not true) return;
+        }
+        document.RemoveCatalog(catalog);
+    }
+
     private async Task DiscardChangesAsync()
     {
         if (!_document.CanDiscardChanges || _pickingFile) return;
         if (await ConfirmDiscardAsync()) _document.DiscardChanges();
     }
 
+    // Packages are added from Discover, which shares this editor's selected catalog.
+    private void AddPackages()
+    {
+        if (!_document.CanEdit || _pickingFile || _document.SelectedCatalog is not { } catalog
+            || GetMainWindow() is not { DataContext: MainWindowViewModel main }) return;
+        main.NavigateTo(PageType.Discover);
+        var hint = new InfoBarViewModel
+        {
+            Title = CoreTools.Translate("Add packages to {0}", catalog.Name),
+            Message = CoreTools.Translate("Search for packages, check the ones you want, then click Add selection to catalog."),
+            Severity = InfoBarSeverity.Informational,
+            IsClosable = true,
+            IsOpen = true,
+        };
+        hint.OnClosed = () => main.DismissToast(hint);
+        main.ShowToast(hint);
+    }
+
+    // Picks the version the catalog installs for a package: "Latest", or one the manager offers.
+    private async Task PinVersionAsync(IPackage? package)
+    {
+        if (!_document.CanEdit || _pickingFile || _document.SelectedCatalog is not { } catalog || package is null
+            || _loader.FindEntry(package) is not { } entry || GetMainWindow() is not { } window) return;
+        if (package is InvalidImportedPackage)
+        {
+            window.ShowBanner(CoreTools.Translate("Package unavailable"),
+                CoreTools.Translate("Enable this package's manager and source to pin its version."),
+                MainWindow.RuntimeNotificationLevel.Error);
+            return;
+        }
+        if (!package.Manager.Capabilities.SupportsCustomVersions)
+        {
+            window.ShowBanner(CoreTools.Translate("Pin version"),
+                CoreTools.Translate("{0} cannot install a specific version, so this package always installs the latest version.", package.Manager.DisplayName),
+                MainWindow.RuntimeNotificationLevel.Error);
+            return;
+        }
+
+        string latest = CoreTools.Translate("Latest");
+        var initialItems = entry.Version.Length > 0 ? new List<string> { latest, entry.Version } : [latest];
+        var picker = new ComboBox
+        {
+            ItemsSource = initialItems,
+            SelectedItem = initialItems[^1],
+            IsEnabled = false,
+            HorizontalAlignment = HorizontalAlignment.Stretch,
+            MinWidth = 280,
+        };
+        AutomationProperties.SetName(picker, CoreTools.Translate("Version"));
+        var status = new TextBlock { Text = CoreTools.Translate("Loading versions"), TextWrapping = TextWrapping.Wrap };
+        var body = new StackPanel { Spacing = 8 };
+        body.Children.Add(new TextBlock
+        {
+            Text = CoreTools.Translate("Choose the version of {0} that this catalog installs.", entry.Name),
+            TextWrapping = TextWrapping.Wrap,
+        });
+        body.Children.Add(picker);
+        body.Children.Add(status);
+        var dialog = new ImmersiveConfirmationDialog(CoreTools.Translate("Pin version"), body,
+            CoreTools.Translate("Pin version"), CoreTools.Translate("Cancel"));
+
+        async Task LoadVersionsAsync()
+        {
+            var items = new List<string> { latest };
+            try
+            {
+                items.AddRange(await Task.Run(() => package.Manager.DetailsHelper.GetVersions(package)));
+                status.IsVisible = false;
+            }
+            catch (Exception ex)
+            {
+                Logger.Warn($"Could not list the versions of {entry.Id}.");
+                Logger.Warn(ex);
+                status.Text = CoreTools.Translate("The available versions could not be loaded: {0}", ex.Message);
+            }
+            if (entry.Version.Length > 0 && !items.Contains(entry.Version)) items.Insert(1, entry.Version);
+            picker.ItemsSource = items;
+            picker.SelectedItem = entry.Version.Length > 0 ? entry.Version : latest;
+            picker.IsEnabled = true;
+        }
+        _ = LoadVersionsAsync();
+        await dialog.ShowDialog(window);
+
+        if (dialog.Result is not true || picker.SelectedItem is not string chosen || !_document.CanEdit) return;
+        string version = chosen == latest ? "" : chosen;
+        int index = catalog.Packages.IndexOf(entry);
+        if (version == entry.Version || index < 0) return;
+        // Replace the entry rather than mutating it, so the list and the unsaved-changes state update.
+        catalog.Packages[index] = new CatalogEntry
+        {
+            Id = entry.Id,
+            Name = entry.Name,
+            Version = version,
+            Source = entry.Source,
+            ManagerName = entry.ManagerName,
+        };
+    }
+
     private void RemoveSelection()
     {
         if (!_document.CanEdit || _pickingFile || _document.SelectedCatalog is not { } catalog) return;
@@ -219,13 +340,31 @@ public async Task<bool> ConfirmDiscardAsync()
         var dialog = new ImmersiveConfirmationDialog(CoreTools.Translate("Unsaved changes"),
             new TextBlock { Text = CoreTools.Translate("Discard unsaved catalog changes?"), TextWrapping = TextWrapping.Wrap },
             CoreTools.Translate("Discard changes"), CoreTools.Translate("Cancel"));
-        await dialog.ShowDialog(MainWindow.Instance!);
+        var window = MainWindow.Instance!;
+        // Quitting can ask while the window is hidden (macOS, tray); a dialog hosted in a hidden
+        // window never completes. Keep it shown afterwards so a cancelled quit can still save.
+        if (!window.IsVisible || window.WindowState == WindowState.Minimized)
+            window.ShowFromTray();
+        await dialog.ShowDialog(window);
         return dialog.Result is true;
     }
 
     private async Task NewAsync()
     {
-        if (await ConfirmDiscardAsync()) _document.NewDocument();
+        if (_document.IsBusy || _pickingFile) return;
+        // Starting a new file closes every catalog, so confirm even when nothing is unsaved.
+        if (_document.IsDirty || _document.Catalogs.Count > 0)
+        {
+            string text = _document.IsDirty
+                ? CoreTools.Translate("Discard unsaved catalog changes and start a new catalog file?")
+                : CoreTools.Translate("Close the current catalog file and start a new one? Use New catalog to add a catalog to this file instead.");
+            var dialog = new ImmersiveConfirmationDialog(CoreTools.Translate("New file"),
+                new TextBlock { Text = text, TextWrapping = TextWrapping.Wrap },
+                CoreTools.Translate("New file"), CoreTools.Translate("Cancel"));
+            await dialog.ShowDialog(MainWindow.Instance!);
+            if (dialog.Result is not true) return;
+        }
+        _document.NewDocument();
     }
 
     private async Task OpenAsync()
@@ -271,12 +410,40 @@ private async Task SaveAsync(bool saveAs)
                 path = file.TryGetLocalPath()
                     ?? throw new IOException(CoreTools.Translate("Select a local catalog file."));
             }
-            await _document.SaveAsync(path);
+            _saveFailed = false;
+            if (await _document.SaveAsync(path))
+                GetMainWindow()?.ShowBanner(CoreTools.Translate("Catalog saved"), _document.FilePath,
+                    MainWindow.RuntimeNotificationLevel.Success);
+            else if (!_saveFailed && GetMainWindow()?.DataContext is MainWindowViewModel main)
+            {
+                // No error was reported, so the administrator prompt was dismissed: say nothing was saved.
+                var notice = new InfoBarViewModel
+                {
+                    Title = CoreTools.Translate("The catalog was not saved."),
+                    Severity = InfoBarSeverity.Informational,
+                    IsClosable = true,
+                    IsOpen = true,
+                };
+                notice.OnClosed = () => main.DismissToast(notice);
+                main.ShowToast(notice);
+            }
         }
         catch (Exception ex) { ReportFileError(ex); }
         finally { _pickingFile = false; SyncStatus(); }
     }
 
+    private static async Task ShowErrorAsync(string message)
+    {
+        if (GetMainWindow() is not { } window) return;
+        var text = new SelectableTextBlock { Text = message, TextWrapping = TextWrapping.Wrap };
+        var dialog = new ImmersiveConfirmationDialog(CoreTools.Translate("Catalog Editor"), text,
+            CoreTools.Translate("Copy"), CoreTools.Translate("Close"))
+        { FocusPrimaryButton = false };
+        await dialog.ShowDialog(window);
+        if (dialog.Result is true && window.Clipboard is { } clipboard)
+            await clipboard.SetTextAsync(message);
+    }
+
     private void ReportFileError(Exception ex)
     {
         Logger.Error("Could not select a catalog file.");
@@ -300,6 +467,9 @@ public void Replace(IEnumerable<CatalogEntry> entries)
         foreach (var entry in entries)
         {
             var raw = entry.AsSerializable();
+            // The Version column shows an imported package's pinned install version, or "Latest".
+            raw.InstallationOptions.Version = entry.Version;
+            if (raw.Version.Length == 0) raw.Version = CoreTools.Translate("Latest");
             var manager = PEInterface.Managers.FirstOrDefault(entry.MatchesManager);
             if (manager is not null)
                 raw.ManagerName = manager.Name;
diff --git a/src/UniGetUI.Avalonia/Views/SoftwarePages/DiscoverSoftwarePage.cs b/src/UniGetUI.Avalonia/Views/SoftwarePages/DiscoverSoftwarePage.cs
index c4e9001bb5..77fbb5bd8e 100644
--- a/src/UniGetUI.Avalonia/Views/SoftwarePages/DiscoverSoftwarePage.cs
+++ b/src/UniGetUI.Avalonia/Views/SoftwarePages/DiscoverSoftwarePage.cs
@@ -1,11 +1,14 @@
 using Avalonia;
+using Avalonia.Automation;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Media;
 using UniGetUI.Avalonia.Infrastructure;
 using UniGetUI.Avalonia.ViewModels;
 using UniGetUI.Avalonia.ViewModels.Pages;
 using UniGetUI.Avalonia.Views;
 using UniGetUI.Avalonia.Views.Controls;
+using UniGetUI.Avalonia.Views.DialogPages;
 using UniGetUI.Core.Logging;
 using UniGetUI.Core.Tools;
 using UniGetUI.Interface.Enums;
@@ -46,24 +49,31 @@ public DiscoverSoftwarePage(CatalogEditorViewModel? catalogEditor = null) : base
         MainSubtitle_StillLoading = CoreTools.Translate("Loading packages"),
         NoMatches_BackgroundText = CoreTools.Translate("No results were found matching the input criteria"),
     }, vm => AddCatalogToolbar(vm, catalogEditor))
-    { }
+    {
+        _catalogEditor = catalogEditor;
+    }
+
+    private readonly CatalogEditorViewModel? _catalogEditor;
 
     private static void AddCatalogToolbar(PackagesPageViewModel vm, CatalogEditorViewModel? document)
     {
         if (document is null) return;
-        var selector = new CatalogSelector(document);
-        var button = vm.AddToolbarButton("add_to", CoreTools.Translate("Add selection to catalog"),
+        // The target catalog is picked in a dialog when adding, so no selector sits in the toolbar.
+        var button = vm.AddToolbarButton("catalog_add", CoreTools.Translate("Add selection to catalog"),
             () => _ = AddSelectionToCatalogAsync(vm, document));
         ToolTip.SetShowOnDisabled(button, true);
-        vm.AddToolbarEntry(new ToolbarEntry(selector, "add_to", CoreTools.Translate("Select a catalog"), null,
-            selector.ShowFlyoutAt));
         void UpdateState()
         {
-            button.IsEnabled = document.CanEdit && document.HasSelectedCatalog
+            button.IsEnabled = document.CanEdit && document.Catalogs.Count > 0
                 && vm.FilteredPackages.GetCheckedPackages().Count > 0;
-            ToolTip.SetTip(selector, string.IsNullOrEmpty(document.Message) ? document.FilePath : document.Message);
+            ToolTip.SetTip(button, !document.IsLoaded && document.Message.Length > 0
+                ? document.Message
+                : document.IsLoaded && document.Catalogs.Count == 0
+                    ? CoreTools.Translate("Create a catalog in the Catalog Editor first.")
+                    : CoreTools.Translate("Add selection to catalog"));
         }
         document.PropertyChanged += (_, _) => UpdateState();
+        document.Catalogs.CollectionChanged += (_, _) => UpdateState();
         vm.PackageCountUpdated += UpdateState;
         UpdateState();
     }
@@ -71,7 +81,9 @@ void UpdateState()
     public override async void OnEnter()
     {
         base.OnEnter();
-        if (GetMainWindow()?.DataContext is MainWindowViewModel { CatalogEditor: { } document })
+        // Use the document handed in at construction: when Discover is the startup page it is entered
+        // before the main window is registered, so looking it up through the window would find nothing.
+        if (_catalogEditor is { } document)
             await document.EnsureLoadedAsync();
     }
 
@@ -82,9 +94,18 @@ private static async Task AddSelectionToCatalogAsync(PackagesPageViewModel vm, C
             var packages = vm.FilteredPackages.GetCheckedPackages();
             if (packages.Count == 0) return;
             if (!await document.EnsureLoadedAsync()) return;
-            document.AddPackages(packages);
-            if (GetMainWindow()?.DataContext is MainWindowViewModel main)
+            var targets = await ChooseCatalogsAsync(document, packages.Count);
+            if (targets.Count == 0) return;
+            var results = document.AddPackages(packages, targets);
+            document.SelectedCatalog = targets[0];
+            if (GetMainWindow() is { DataContext: MainWindowViewModel main } window)
+            {
                 await main.NavigateToAsync(PageType.CatalogEditor);
+                window.ShowBanner(results.Count == 1
+                        ? CoreTools.Translate("Packages added to catalog")
+                        : CoreTools.Translate("Packages added to {0} catalogs", results.Count),
+                    DescribeAddResults(results), MainWindow.RuntimeNotificationLevel.Success);
+            }
         }
         catch (Exception ex)
         {
@@ -96,6 +117,64 @@ private static async Task AddSelectionToCatalogAsync(PackagesPageViewModel vm, C
         }
     }
 
+    // Asks which catalogs receive the selection; the one last used or open in the editor starts ticked.
+    private static async Task<IReadOnlyList<CatalogEditorCatalog>> ChooseCatalogsAsync(CatalogEditorViewModel document, int count)
+    {
+        if (GetMainWindow() is not { } window || document.Catalogs.Count == 0) return [];
+        var catalogs = document.Catalogs.ToList();
+        var initial = document.SelectedCatalog is { } current && catalogs.Contains(current) ? current : catalogs[0];
+        var boxes = catalogs.Select(c => new CheckBox { Content = c.Name, IsChecked = ReferenceEquals(c, initial) }).ToList();
+
+        var list = new StackPanel { Spacing = 2 };
+        foreach (var box in boxes) list.Children.Add(box);
+        var body = new StackPanel { Spacing = 8 };
+        body.Children.Add(new TextBlock
+        {
+            Text = count == 1
+                ? CoreTools.Translate("Choose the catalogs to add the selected package to.")
+                : CoreTools.Translate("Choose the catalogs to add the {0} selected packages to.", count),
+            TextWrapping = TextWrapping.Wrap,
+        });
+        body.Children.Add(new ScrollViewer { Content = list, MaxHeight = 260 });
+
+        var dialog = new ImmersiveConfirmationDialog(CoreTools.Translate("Add selection to catalog"), body,
+            CoreTools.Translate("Add"), CoreTools.Translate("Cancel"));
+        var confirm = dialog.GetControl<Button>("PrimaryButton");
+        void UpdateConfirm()
+        {
+            int ticked = boxes.Count(b => b.IsChecked == true);
+            string label = ticked <= 1 ? CoreTools.Translate("Add") : CoreTools.Translate("Add to {0} catalogs", ticked);
+            confirm.Content = label;
+            AutomationProperties.SetName(confirm, label);
+            confirm.IsEnabled = ticked > 0;
+        }
+        foreach (var box in boxes) box.IsCheckedChanged += (_, _) => UpdateConfirm();
+        UpdateConfirm();
+
+        await dialog.ShowDialog(window);
+        if (dialog.Result is not true || !document.CanEdit) return [];
+        return catalogs.Where((c, i) => boxes[i].IsChecked == true && document.Catalogs.Contains(c)).ToList();
+    }
+
+    private static string DescribeAddResults(IReadOnlyList<CatalogAddResult> results)
+    {
+        if (results.Count == 1)
+        {
+            var only = results[0];
+            string text = CatalogEditorViewModel.AddedToCatalogMessage(only.Added, only.Catalog.Name);
+            return only.AlreadyPresent switch
+            {
+                0 => text,
+                1 => text + "\n" + CoreTools.Translate("1 was already in the catalog."),
+                _ => text + "\n" + CoreTools.Translate("{0} were already in the catalog.", only.AlreadyPresent),
+            };
+        }
+        var lines = results.Select(r => r.AlreadyPresent == 0
+            ? CoreTools.Translate("{0}: {1} added", r.Catalog.Name, r.Added)
+            : CoreTools.Translate("{0}: {1} added, {2} already there", r.Catalog.Name, r.Added, r.AlreadyPresent));
+        return string.Join("\n", lines.Append(CoreTools.Translate("Save the catalog to keep your changes.")));
+    }
+
     protected override void GenerateToolBar(PackagesPageViewModel vm)
     {
         // ── Main button dropdown: install variants ──────────────────────────
diff --git a/src/UniGetUI.Avalonia/Views/SoftwarePages/InstalledPackagesPage.cs b/src/UniGetUI.Avalonia/Views/SoftwarePages/InstalledPackagesPage.cs
index 597901483d..e07a12af15 100644
--- a/src/UniGetUI.Avalonia/Views/SoftwarePages/InstalledPackagesPage.cs
+++ b/src/UniGetUI.Avalonia/Views/SoftwarePages/InstalledPackagesPage.cs
@@ -383,7 +383,7 @@ private static async Task ExportSelectionToBundleAsync(PackagesPageViewModel vm)
             await PackageBundlesLoader.Instance.AddPackagesAsync(packages);
     }
 
-    private static async Task LaunchUninstall(
+    internal static async Task LaunchUninstall(
         IEnumerable<IPackage> packages,
         bool? elevated = null,
         bool? interactive = null,
@@ -405,7 +405,7 @@ private static async Task LaunchUninstall(
         }
     }
 
-    private static async Task LaunchUpdate(IPackage? package, bool? elevated = null)
+    internal static async Task LaunchUpdate(IPackage? package, bool? elevated = null)
     {
         // Updates must run on the upgradable instance: the installed one reports
         // NewVersionString == VersionString, which managers read as "nothing to do".
diff --git a/src/UniGetUI.Avalonia/Views/SoftwarePages/SoftwareCatalogPage.axaml b/src/UniGetUI.Avalonia/Views/SoftwarePages/SoftwareCatalogPage.axaml
index 58f06faebe..a256d85b99 100644
--- a/src/UniGetUI.Avalonia/Views/SoftwarePages/SoftwareCatalogPage.axaml
+++ b/src/UniGetUI.Avalonia/Views/SoftwarePages/SoftwareCatalogPage.axaml
@@ -129,15 +129,41 @@
             </Panel>
         </DataTemplate>
         <DataTemplate x:Key="CatalogInstallAction" x:DataType="vm:CatalogTileViewModel">
-            <Panel>
-                <Button Content="{t:Translate Install}" IsVisible="{Binding ShowInstall}" IsEnabled="{Binding CanInstall}"
-                        HorizontalAlignment="Stretch" HorizontalContentAlignment="Center"
-                        ToolTip.Tip="{Binding StatusText}" ToolTip.ShowOnDisabled="True"
-                        Command="{Binding $parent[UserControl].((vm:SoftwareCatalogViewModel)DataContext).InstallCommand}"
-                        CommandParameter="{Binding}"/>
-                <TextBlock Text="{t:Translate Installed}" IsVisible="{Binding IsInstalled}"
-                           FontWeight="SemiBold" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0,8"/>
-            </Panel>
+            <Grid ColumnDefinitions="*,Auto" ColumnSpacing="4">
+                <Panel>
+                    <Button Content="{t:Translate Install}" IsVisible="{Binding ShowInstall}" IsEnabled="{Binding CanInstall}"
+                            HorizontalAlignment="Stretch" HorizontalContentAlignment="Center"
+                            ToolTip.Tip="{Binding StatusText}" ToolTip.ShowOnDisabled="True"
+                            Command="{Binding $parent[UserControl].((vm:SoftwareCatalogViewModel)DataContext).InstallCommand}"
+                            CommandParameter="{Binding}"/>
+                    <Button Content="{t:Translate Update}" IsVisible="{Binding ShowUpdate}" Classes="accent"
+                            HorizontalAlignment="Stretch" HorizontalContentAlignment="Center"
+                            Command="{Binding UpdateCommand}"/>
+                    <TextBlock Text="{t:Translate Installed}" IsVisible="{Binding ShowInstalledLabel}"
+                               FontWeight="SemiBold" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0,8"/>
+                </Panel>
+                <Button Grid.Column="1" Width="32" Padding="0"
+                        HorizontalContentAlignment="Center" VerticalContentAlignment="Center"
+                        VerticalAlignment="Stretch"
+                        ToolTip.Tip="{t:Translate More actions}"
+                        automation:AutomationProperties.Name="{t:Translate More actions}">
+                    <!-- Drawn dots rather than a "⋯" glyph, whose font metrics sit it above centre. -->
+                    <StackPanel Orientation="Horizontal" Spacing="3"
+                                HorizontalAlignment="Center" VerticalAlignment="Center"
+                                automation:AutomationProperties.AccessibilityView="Raw">
+                        <Ellipse Width="3.5" Height="3.5" Fill="{Binding $parent[Button].Foreground}"/>
+                        <Ellipse Width="3.5" Height="3.5" Fill="{Binding $parent[Button].Foreground}"/>
+                        <Ellipse Width="3.5" Height="3.5" Fill="{Binding $parent[Button].Foreground}"/>
+                    </StackPanel>
+                    <Button.Flyout>
+                        <MenuFlyout>
+                            <MenuItem Header="{t:Translate Update}" IsVisible="{Binding ShowUpdate}" Command="{Binding UpdateCommand}"/>
+                            <MenuItem Header="{t:Translate Uninstall}" IsVisible="{Binding IsInstalled}" Command="{Binding UninstallCommand}"/>
+                            <MenuItem Header="{t:Translate Package details}" Command="{Binding DetailsCommand}"/>
+                        </MenuFlyout>
+                    </Button.Flyout>
+                </Button>
+            </Grid>
         </DataTemplate>
         </ResourceDictionary>
     </UserControl.Resources>
@@ -381,10 +407,12 @@
                                             <TextBlock Text="{Binding Entry.Id}" FontSize="12" TextWrapping="Wrap"
                                                        Foreground="{DynamicResource TextFillColorSecondaryBrush}"/>
                                             <StackPanel Orientation="Horizontal" Spacing="6">
-                                                <TextBlock Text="{Binding Entry.ManagerName}" FontSize="12"/>
+                                                <TextBlock Text="{Binding ManagerDisplayName}" FontSize="12"/>
                                                 <TextBlock Text=" / " FontSize="12"/>
                                                 <TextBlock Text="{Binding Entry.Source}" FontSize="12"/>
                                             </StackPanel>
+                                            <TextBlock Text="{Binding PinnedVersionText}" IsVisible="{Binding HasPinnedVersion}" FontSize="12"
+                                                       Foreground="{DynamicResource TextFillColorSecondaryBrush}"/>
                                         </StackPanel>
                                         <TextBlock Grid.Row="3" Text="{Binding StatusText}" TextWrapping="Wrap" FontSize="12"
                                                    Foreground="{DynamicResource TextFillColorSecondaryBrush}"/>
@@ -432,7 +460,7 @@
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate x:DataType="vm:CatalogTileViewModel">
                                     <StackPanel Spacing="2" VerticalAlignment="Center" Margin="8,0">
-                                        <TextBlock Text="{Binding Entry.ManagerName}" TextTrimming="CharacterEllipsis"/>
+                                        <TextBlock Text="{Binding ManagerDisplayName}" TextTrimming="CharacterEllipsis"/>
                                         <TextBlock Text="{Binding Entry.Source}" FontSize="11" TextTrimming="CharacterEllipsis"/>
                                     </StackPanel>
                                 </DataTemplate>
@@ -472,15 +500,16 @@
                         <ItemsControl.ItemTemplate>
                             <DataTemplate x:DataType="vm:CatalogTileViewModel">
                                 <Border Width="350" MinHeight="124" Margin="4" Padding="12" CornerRadius="4"
-                                        Background="{DynamicResource ControlFillColorDefaultBrush}">
+                                        Background="{DynamicResource ControlFillColorDefaultBrush}"
+                                        ToolTip.Tip="{Binding ToolTipText}">
                                     <Grid ColumnDefinitions="Auto,*,Auto" ColumnSpacing="8">
                                         <ContentControl Content="{Binding}" ContentTemplate="{StaticResource CatalogSmallIcon}"
                                                         VerticalAlignment="Center"/>
                                         <StackPanel Grid.Column="1" Spacing="4" VerticalAlignment="Center">
                                             <TextBlock Text="{Binding Entry.Name}" FontWeight="SemiBold" TextTrimming="CharacterEllipsis"
-                                                       Opacity="{Binding TitleOpacity}" ToolTip.Tip="{Binding UnavailableReason}"/>
+                                                       Opacity="{Binding TitleOpacity}"/>
                                             <TextBlock Text="{Binding Entry.Id}" FontSize="11" TextTrimming="CharacterEllipsis"/>
-                                            <TextBlock Text="{Binding Entry.Source}" FontSize="11" TextTrimming="CharacterEllipsis"/>
+                                            <TextBlock Text="{Binding SourceDisplay}" FontSize="11" TextTrimming="CharacterEllipsis"/>
                                         </StackPanel>
                                         <ContentControl Grid.Column="2" Content="{Binding}"
                                                         ContentTemplate="{StaticResource CatalogInstallAction}" VerticalAlignment="Center"/>
@@ -509,7 +538,8 @@
                         <ItemsControl.ItemTemplate>
                             <DataTemplate x:DataType="vm:CatalogTileViewModel">
                                 <Border Width="160" MinHeight="196" Margin="4" Padding="8" CornerRadius="4"
-                                        Background="{DynamicResource ControlFillColorDefaultBrush}">
+                                        Background="{DynamicResource ControlFillColorDefaultBrush}"
+                                        ToolTip.Tip="{Binding ToolTipText}">
                                     <StackPanel Spacing="8">
                                         <Panel Width="64" Height="64" HorizontalAlignment="Center" Opacity="{Binding TitleOpacity}">
                                             <Image Source="{Binding IconBitmap}" IsVisible="{Binding HasCustomIcon}" Stretch="Uniform"
@@ -518,8 +548,7 @@
                                                               Width="64" Height="64" IsVisible="{Binding !HasCustomIcon}"/>
                                         </Panel>
                                         <TextBlock Text="{Binding Entry.Name}" TextTrimming="CharacterEllipsis"
-                                                   TextAlignment="Center" Opacity="{Binding TitleOpacity}"
-                                                   ToolTip.Tip="{Binding UnavailableReason}"/>
+                                                   TextAlignment="Center" Opacity="{Binding TitleOpacity}"/>
                                         <TextBlock Text="{Binding Entry.Id}" FontSize="11" TextTrimming="CharacterEllipsis"
                                                    TextAlignment="Center"/>
                                         <ContentControl Content="{Binding}" ContentTemplate="{StaticResource CatalogInstallAction}"/>
@@ -533,12 +562,17 @@
                       </ItemsControl.ItemTemplate>
                     </ItemsControl>
                 </ScrollViewer>
-                <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center"
-                           FontSize="30" FontWeight="Bold" Opacity="0.5"
-                           TextAlignment="Center" TextWrapping="Wrap"
-                           Text="{Binding BackgroundText}"
-                           IsVisible="{Binding HasBackgroundText}"
-                           IsHitTestVisible="False"/>
+                <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Spacing="12" Margin="24,0"
+                            IsVisible="{Binding HasBackgroundText}">
+                    <TextBlock FontSize="30" FontWeight="Bold" Opacity="0.5"
+                               TextAlignment="Center" TextWrapping="Wrap"
+                               Text="{Binding BackgroundText}"
+                               IsHitTestVisible="False"/>
+                    <SelectableTextBlock FontSize="13" Opacity="0.7"
+                                         TextAlignment="Center" TextWrapping="Wrap"
+                                         Text="{Binding BackgroundDetail}"
+                                         IsVisible="{Binding HasBackgroundDetail}"/>
+                </StackPanel>
             </Panel>
         </Grid>
         <Grid Grid.Row="4" Margin="0,4" HorizontalAlignment="Right">
diff --git a/src/UniGetUI.Avalonia/Views/SoftwarePages/SoftwareCatalogPage.axaml.cs b/src/UniGetUI.Avalonia/Views/SoftwarePages/SoftwareCatalogPage.axaml.cs
index 1152a913a1..c4c81ef50a 100644
--- a/src/UniGetUI.Avalonia/Views/SoftwarePages/SoftwareCatalogPage.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/SoftwarePages/SoftwareCatalogPage.axaml.cs
@@ -35,7 +35,11 @@ public SoftwareCatalogPage()
     {
         InitializeComponent();
         DataContext = _viewModel;
-        _stateTimer.Tick += (_, _) => _viewModel.UpdateStates();
+        _stateTimer.Tick += (_, _) =>
+        {
+            _viewModel.UpdateStates();
+            _viewModel.CheckForCatalogChanges();
+        };
 
         // Restore the per-page filter pane width from settings.
         var savedWidth = Settings.GetDictionaryItem<string, int>(Settings.K.SidepanelWidths, FilterPaneWidthKey);
diff --git a/src/UniGetUI.PackageEngine.PackageEngine/PEInterface.cs b/src/UniGetUI.PackageEngine.PackageEngine/PEInterface.cs
index 1d1ebd4771..dae71a7a53 100644
--- a/src/UniGetUI.PackageEngine.PackageEngine/PEInterface.cs
+++ b/src/UniGetUI.PackageEngine.PackageEngine/PEInterface.cs
@@ -123,6 +123,14 @@ public static void LoadLoaders()
             PackageBundlesLoader.Instance = new PackageBundlesLoader_I(Managers);
         }
 
+        private static volatile bool _managersLoaded;
+
+        /// <summary>True once <see cref="LoadManagers"/> has finished, including after a timeout.</summary>
+        public static bool AreManagersLoaded => _managersLoaded;
+
+        /// <summary>Raised once, from a background thread, when <see cref="AreManagersLoaded"/> becomes true.</summary>
+        public static event EventHandler? ManagersLoaded;
+
         public static void LoadManagers()
         {
             try
@@ -153,6 +161,11 @@ public static void LoadManagers()
             {
                 Logger.Error(ex);
             }
+            finally
+            {
+                _managersLoaded = true;
+                ManagersLoaded?.Invoke(null, EventArgs.Empty);
+            }
         }
 
 #if !WINDOWS
diff --git a/src/UniGetUI.Tests/CatalogEditorTests.cs b/src/UniGetUI.Tests/CatalogEditorTests.cs
index cb8d95d7cb..7734adb0ab 100644
--- a/src/UniGetUI.Tests/CatalogEditorTests.cs
+++ b/src/UniGetUI.Tests/CatalogEditorTests.cs
@@ -141,6 +141,31 @@ public async Task DiscoverAddsSelectionToTheFirstCatalogAndPreservesTheOtherCata
         Assert.Equal(2, vm.Catalogs.Count);
     }
 
+    [Fact]
+    public async Task DiscoverAddsSelectionToSeveralCatalogsAndReportsDuplicatesPerCatalog()
+    {
+        var vm = await LoadEditorAsync();
+        var manager = new SearchManager();
+        var source = new ManagerSource(manager, "private", new Uri("https://example.test/feed"));
+        var tool = new Package("Tool", "Company.Tool", "2.0", source, manager);
+        var other = new Package("Other", "Company.Other", "1.0", source, manager);
+        vm.Catalogs[1].Packages.Add(CatalogEntry.FromPackage(tool));
+
+        var results = vm.AddPackages([tool, other], [vm.Catalogs[0], vm.Catalogs[1]]);
+
+        Assert.Equal([vm.Catalogs[0], vm.Catalogs[1]], results.Select(r => r.Catalog));
+        Assert.Equal((2, 0), (results[0].Added, results[0].AlreadyPresent));
+        Assert.Equal((1, 1), (results[1].Added, results[1].AlreadyPresent));
+        Assert.Equal(3, vm.Catalogs[0].Packages.Count);
+        Assert.Equal(2, vm.Catalogs[1].Packages.Count);
+        Assert.True(vm.IsDirty);
+
+        var removed = vm.Catalogs[1];
+        vm.RemoveCatalog(removed);
+        Assert.Throws<InvalidOperationException>(() => vm.AddPackages([tool], [removed]));
+        Assert.Throws<InvalidOperationException>(() => vm.AddPackages([tool], []));
+    }
+
     [Theory]
     [InlineData("catalog-test")]
     [InlineData("CatalogTest")]
@@ -196,6 +221,22 @@ public async Task SharedDocumentDoesNotReloadAndDiscardUnsavedChanges()
         Assert.True(vm.IsDirty);
     }
 
+    [Fact]
+    public async Task MissingCatalogFileStartsAnEmptyEditableDocumentThatSavesThere()
+    {
+        string missing = Path.Combine(_directory, "not-deployed-yet.json");
+        var vm = new CatalogEditorViewModel { FilePath = missing };
+        Assert.True(await vm.EnsureLoadedAsync());
+        Assert.True(vm.CanEdit);
+        Assert.Empty(vm.Catalogs);
+        Assert.False(vm.IsDirty);
+        Assert.Equal(missing, vm.FilePath);
+
+        vm.NewCatalog();
+        Assert.True(await vm.SaveAsync(vm.FilePath));
+        Assert.Equal("catalog", Assert.Single(await SoftwareCatalog.LoadAsync(missing)).Id);
+    }
+
     [Fact]
     public void CatalogPackageListPreservesUnavailableIdentitiesAndDoesNotTouchBundles()
     {
@@ -219,7 +260,9 @@ public void CatalogEntryLookupUsesTheLoaderIdentityRatherThanPackageObjectEquali
         var entry = new CatalogEntry { Id = "tool", Name = "Tool", ManagerName = "missing", Source = "private" };
         loader.Replace([entry]);
         var original = Assert.Single(loader.Packages);
-        var equivalent = new InvalidImportedPackage(entry.AsSerializable().GetInvalidEquivalent(), original.Source,
+        var raw = entry.AsSerializable();
+        raw.Version = original.VersionString;
+        var equivalent = new InvalidImportedPackage(raw.GetInvalidEquivalent(), original.Source,
             $"{entry.ManagerName}\0{entry.Source}\0{entry.Id}");
         Assert.NotSame(original, equivalent);
         Assert.Equal(original.GetVersionedHash(), equivalent.GetVersionedHash());
@@ -249,6 +292,29 @@ public async Task DiscardRestoresEveryCatalogAndItsPackagesWithoutWritingToDisk(
         Assert.Equal("Devolutions", vm.SelectedCatalog!.Name);
     }
 
+    [Fact]
+    public async Task RemovingACatalogKeepsTheOthersAndSelectsANeighbour()
+    {
+        var vm = await LoadEditorAsync();
+        vm.NewCatalog();
+        var added = vm.SelectedCatalog!;
+        vm.RemoveCatalog(added);
+        Assert.True(vm.IsDirty);
+        Assert.Equal(["devolutions", "tools"], vm.Catalogs.Select(c => c.Id));
+        Assert.Equal("tools", vm.SelectedCatalog!.Id);
+
+        vm.RemoveCatalog(vm.Catalogs[0]);
+        Assert.Equal("tools", Assert.Single(vm.Catalogs).Id);
+        Assert.Equal("tools", vm.SelectedCatalog!.Id);
+        vm.RemoveCatalog(vm.Catalogs[0]);
+        Assert.Empty(vm.Catalogs);
+        Assert.Null(vm.SelectedCatalog);
+
+        vm.DiscardChanges();
+        Assert.Equal(["devolutions", "tools"], vm.Catalogs.Select(c => c.Id));
+        Assert.False(vm.IsDirty);
+    }
+
     [Fact]
     public async Task DiscardUsesTheLastSuccessfulSaveAndRetainsTheSelectedCatalog()
     {
@@ -620,5 +686,22 @@ public IReadOnlyList<IPackage> FindPackages(string query)
         public Tuple<bool, string> GetExecutableFile() => Tuple.Create(false, "");
     }
 
+    [Fact]
+    public async Task OnlyAMissingCatalogCountsAsMissing()
+    {
+        Assert.True(CatalogEditorViewModel.IsMissing(FilePath));
+        Assert.True(CatalogEditorViewModel.IsMissing(Path.Combine(_directory, "absent", "catalog.json")));
+        await File.WriteAllTextAsync(FilePath, "{}");
+        Assert.False(CatalogEditorViewModel.IsMissing(FilePath));
+    }
+
+    [Fact]
+    public void ACatalogPathThatExistsButCannotBeOpenedIsNotMissing()
+    {
+        Directory.CreateDirectory(FilePath);
+        Assert.False(File.Exists(FilePath));
+        Assert.False(CatalogEditorViewModel.IsMissing(FilePath));
+    }
+
     public void Dispose() => Directory.Delete(_directory, true);
 }
diff --git a/src/UniGetUI.Tests/SoftwareCatalogTests.cs b/src/UniGetUI.Tests/SoftwareCatalogTests.cs
index df4a82b066..f7e6535d61 100644
--- a/src/UniGetUI.Tests/SoftwareCatalogTests.cs
+++ b/src/UniGetUI.Tests/SoftwareCatalogTests.cs
@@ -5,11 +5,29 @@
 using UniGetUI.Avalonia.Views;
 using UniGetUI.Core.Data;
 using UniGetUI.Interface;
+using CoreSettings = UniGetUI.Core.SettingsEngine.Settings;
 
 namespace UniGetUI.Tests;
 
-public class SoftwareCatalogTests
+public sealed class SoftwareCatalogTests : IDisposable
 {
+    // The catalog saves its view and sort, so keep that away from the real settings.
+    private readonly string _testRoot = Path.Combine(Path.GetTempPath(), nameof(SoftwareCatalogTests), Guid.NewGuid().ToString("N"));
+
+    public SoftwareCatalogTests()
+    {
+        CoreData.TEST_DataDirectoryOverride = Path.Combine(_testRoot, "Data");
+        Directory.CreateDirectory(CoreData.UniGetUIUserConfigurationDirectory);
+        CoreSettings.ResetSettings();
+    }
+
+    public void Dispose()
+    {
+        CoreSettings.ResetSettings();
+        CoreData.TEST_DataDirectoryOverride = null;
+        Directory.Delete(_testRoot, recursive: true);
+    }
+
     [Theory]
     [InlineData("clAuDe")]
     [InlineData("Anthropic.")]
@@ -48,7 +66,7 @@ public void CatalogSearchMatchesNameAndIdCaseInsensitively(string query)
     }
 
     [Fact]
-    public void CatalogDefaultsToTilesAndViewSwitchingPreservesPackagesAndFilters()
+    public void CatalogDefaultsToIconsAndViewSwitchingPreservesPackagesAndFilters()
     {
         var vm = new SoftwareCatalogViewModel
         {
@@ -56,9 +74,9 @@ public void CatalogDefaultsToTilesAndViewSwitchingPreservesPackagesAndFilters()
             Query = "Claude",
         };
         vm.LoadCatalogs([new CatalogDefinition { Id = "test", Name = "Test", Packages = [Entry] }]);
-        Assert.Equal(3, vm.ViewModeIndex);
+        Assert.Equal(2, vm.ViewModeIndex);
         Assert.False(vm.IsFilterPaneOpen);
-        Assert.True(vm.IsTilesView);
+        Assert.True(vm.IsIconsView);
         var tile = Assert.Single(vm.Packages);
         for (int index = 0; index < 4; index++)
         {
@@ -73,6 +91,52 @@ public void CatalogDefaultsToTilesAndViewSwitchingPreservesPackagesAndFilters()
         }
     }
 
+    [Fact]
+    public void PinnedVersionIsShownOnTheTileAndUnpinnedEntriesShowNone()
+    {
+        var pinned = new CatalogTileViewModel(new CatalogEntry
+        {
+            Id = "is-number",
+            Name = "Is Number",
+            Version = "6.0.0",
+            Source = "npm",
+            ManagerName = "Npm",
+        });
+        Assert.True(pinned.HasPinnedVersion);
+        Assert.Equal("Version 6.0.0", pinned.PinnedVersionText);
+        Assert.Contains("Version 6.0.0", pinned.ToolTipText);
+
+        var latest = new CatalogTileViewModel(new CatalogEntry
+        {
+            Id = "is-number",
+            Name = "Is Number",
+            Source = "npm",
+            ManagerName = "Npm",
+        });
+        Assert.False(latest.HasPinnedVersion);
+        Assert.Equal("", latest.PinnedVersionText);
+        Assert.DoesNotContain("Version", latest.ToolTipText);
+    }
+
+    [Fact]
+    public void ViewModeAndSortAreRestoredByTheNextCatalog()
+    {
+        var first = new SoftwareCatalogViewModel { ViewModeIndex = 0 };
+        first.ToggleSort(CatalogSortField.Source);
+        first.ToggleSort(CatalogSortField.Source);
+        Assert.False(first.SortAscending);
+
+        var restored = new SoftwareCatalogViewModel();
+        Assert.Equal(0, restored.ViewModeIndex);
+        Assert.Equal(CatalogSortField.Source, restored.SortField);
+        Assert.False(restored.SortAscending);
+
+        restored.ToggleSort(CatalogSortField.Id);
+        var afterHeaderClick = new SoftwareCatalogViewModel();
+        Assert.Equal(CatalogSortField.Id, afterHeaderClick.SortField);
+        Assert.True(afterHeaderClick.SortAscending);
+    }
+
     private const string EntryJson = """
         {"Id":"Anthropic.Claude","Name":"Claude","Version":"","Source":"winget","ManagerName":"WinGet"}
         """;
@@ -624,17 +688,50 @@ public void TileTracksInstallAndUninstall()
         Assert.True(tile.CanInstall);
     }
 
+    [Fact]
+    public void NumberShortcutsFollowTheSidebarOrder()
+    {
+        Assert.Equal(
+            [PageType.Catalog, PageType.Discover, PageType.Updates, PageType.Installed, PageType.Bundles,
+                PageType.CatalogEditor, PageType.Settings, PageType.Managers],
+            MainWindowViewModel.GetShortcutPages(true));
+        Assert.Equal(
+            [PageType.Discover, PageType.Updates, PageType.Installed, PageType.Bundles, PageType.Settings, PageType.Managers],
+            MainWindowViewModel.GetShortcutPages(false));
+    }
+
     [Theory]
     [InlineData(true)]
     [InlineData(false)]
-    public void CatalogParticipatesInKeyboardPageCycleOnlyWhenEnabled(bool enabled)
-    {
-        Assert.Equal(enabled ? PageType.Catalog : PageType.Settings, MainWindowViewModel.GetNextPage(PageType.Bundles, enabled));
-        Assert.Equal(enabled ? PageType.CatalogEditor : PageType.Settings, MainWindowViewModel.GetNextPage(PageType.Catalog, enabled));
-        Assert.Equal(PageType.Settings, MainWindowViewModel.GetNextPage(PageType.CatalogEditor, enabled));
-        Assert.Equal(enabled ? PageType.CatalogEditor : PageType.Bundles, MainWindowViewModel.GetPreviousPage(PageType.Settings, enabled));
-        Assert.Equal(enabled ? PageType.Catalog : PageType.Bundles, MainWindowViewModel.GetPreviousPage(PageType.CatalogEditor, enabled));
-        Assert.Equal(PageType.Bundles, MainWindowViewModel.GetPreviousPage(PageType.Catalog));
+    public void KeyboardPageCycleFollowsTheSidebarOrderInBothDirections(bool catalogEnabled)
+    {
+        var pages = MainWindowViewModel.GetShortcutPages(catalogEnabled);
+        for (int i = 0; i < pages.Length; i++)
+        {
+            var next = pages[(i + 1) % pages.Length];
+            Assert.Equal(next, MainWindowViewModel.GetNextPage(pages[i], catalogEnabled));
+            Assert.Equal(pages[i], MainWindowViewModel.GetPreviousPage(next, catalogEnabled));
+        }
+        Assert.Equal(PageType.Discover, MainWindowViewModel.GetNextPage(PageType.OwnLog, catalogEnabled));
+    }
+
+    [Fact]
+    public void OnlyACatalogWithPackagesCountsAsUsable()
+    {
+        string file = Path.Combine(_testRoot, "SoftwareCatalog.json");
+        Assert.False(SoftwareCatalog.HasUsableCatalog(file));
+
+        File.WriteAllText(file, "{ not json");
+        Assert.False(SoftwareCatalog.HasUsableCatalog(file));
+
+        File.WriteAllText(file, """{"version":1,"catalogs":[]}""");
+        Assert.False(SoftwareCatalog.HasUsableCatalog(file));
+
+        File.WriteAllText(file, """{"version":1,"catalogs":[{"id":"a","name":"A","packages":[]}]}""");
+        Assert.False(SoftwareCatalog.HasUsableCatalog(file));
+
+        File.WriteAllText(file, """{"version":1,"catalogs":[{"id":"a","name":"A","packages":[{"Id":"jq","Name":"jq","Version":"","Source":"Homebrew","ManagerName":"Homebrew"}]}]}""");
+        Assert.True(SoftwareCatalog.HasUsableCatalog(file));
     }
 
     [Fact]
diff --git a/src/UniGetUI.Tests/WindowsAdminFileInstallerTests.cs b/src/UniGetUI.Tests/WindowsAdminFileInstallerTests.cs
new file mode 100644
index 0000000000..8fc1a3adb3
--- /dev/null
+++ b/src/UniGetUI.Tests/WindowsAdminFileInstallerTests.cs
@@ -0,0 +1,54 @@
+using System.Diagnostics;
+using UniGetUI.Avalonia.Infrastructure;
+
+namespace UniGetUI.Tests;
+
+public sealed class WindowsAdminFileInstallerTests : IDisposable
+{
+    private readonly string _root = Path.Combine(Path.GetTempPath(), nameof(WindowsAdminFileInstallerTests), Guid.NewGuid().ToString("N"));
+
+    public void Dispose()
+    {
+        if (Directory.Exists(_root)) Directory.Delete(_root, recursive: true);
+    }
+
+    [Fact]
+    public void ElevatesTheSystemRobocopyWithoutAShell()
+    {
+        if (!OperatingSystem.IsWindows()) return;
+        var startInfo = WindowsAdminFileInstaller.CreateStartInfo(@"C:\Staging Dir", @"C:\Program Data\Org & Co\SoftwareCatalog.json");
+        Assert.Equal(Path.Combine(Environment.SystemDirectory, "robocopy.exe"), startInfo.FileName);
+        Assert.Equal("runas", startInfo.Verb);
+        Assert.True(startInfo.UseShellExecute);
+        Assert.Equal(ProcessWindowStyle.Hidden, startInfo.WindowStyle);
+        Assert.Equal([@"C:\Staging Dir", @"C:\Program Data\Org & Co", "SoftwareCatalog.json"], startInfo.ArgumentList.Take(3));
+    }
+
+    [Theory]
+    [InlineData(false)]
+    [InlineData(true)]
+    public async Task TheCopyCommandCreatesTheFolderAndReplacesTheFile(bool destinationExists)
+    {
+        if (!OperatingSystem.IsWindows()) return;
+        string staging = Path.Combine(_root, "staging dir");
+        string destination = Path.Combine(_root, "dest & folder", "nested", "SoftwareCatalog.json");
+        Directory.CreateDirectory(staging);
+        await File.WriteAllTextAsync(Path.Combine(staging, "SoftwareCatalog.json"), "new");
+        if (destinationExists)
+        {
+            Directory.CreateDirectory(Path.GetDirectoryName(destination)!);
+            await File.WriteAllTextAsync(destination, "old contents");
+            File.SetLastWriteTimeUtc(destination, DateTime.UtcNow.AddDays(1));
+        }
+
+        var startInfo = WindowsAdminFileInstaller.CreateStartInfo(staging, destination);
+        startInfo.Verb = "";
+        startInfo.UseShellExecute = false;
+        startInfo.CreateNoWindow = true;
+        using var process = Process.Start(startInfo)!;
+        await process.WaitForExitAsync();
+
+        Assert.InRange(process.ExitCode, 0, 7);
+        Assert.Equal("new", await File.ReadAllTextAsync(destination));
+    }
+}